lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Added a lot more framework for the node routing.

Browse source
This commit is contained in:
WayofTime 2016-01-12 17:05:56 -05:00
parent 1b6e3442ae
commit 269459c5c5
19 changed files with 677 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/WayofTime/bloodmagic/api/Constants.java
View file

@ -84,6 +84,12 @@ public class Constants
public static final String SOUL_FORGE_BURN = "burnTime";
public static final String SOUL_FORGE_CONSUMED = "consumedSouls";
public static final String ROUTING_MASTER = "master";
public static final String ROUTING_CONNECTION = "connections";
public static final String ROUTING_MASTER_GENERAL = "generalList";
public static final String ROUTING_MASTER_INPUT = "inputList";
public static final String ROUTING_MASTER_OUTPUT = "outputList";
}
public static class Mod

85
src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java Normal file
View file

@ -0,0 +1,85 @@
package WayofTime.bloodmagic.block;
import java.util.LinkedList;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.routing.IMasterRoutingNode;
import WayofTime.bloodmagic.routing.IRoutingNode;
import WayofTime.bloodmagic.tile.routing.TileInputRoutingNode;
import WayofTime.bloodmagic.util.ChatUtil;
public class BlockInputRoutingNode extends BlockContainer
{
public BlockInputRoutingNode()
{
super(Material.rock);
setUnlocalizedName(Constants.Mod.MODID + ".inputRouting");
setCreativeTab(BloodMagic.tabBloodMagic);
setHardness(2.0F);
setResistance(5.0F);
setHarvestLevel("pickaxe", 2);
}
@Override
public int getRenderType()
{
return 3;
}
@Override
public TileEntity createNewTileEntity(World worldIn, int meta)
{
return new TileInputRoutingNode();
}
@Override
public void breakBlock(World world, BlockPos pos, IBlockState state)
{
TileEntity tile = world.getTileEntity(pos);
if (tile instanceof IRoutingNode)
{
((IRoutingNode) tile).removeAllConnections();
}
super.breakBlock(world, pos, state);
}
@Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ)
{
if (world.isRemote)
{
return false;
}
TileEntity tile = world.getTileEntity(pos);
IRoutingNode node = (IRoutingNode) tile;
ChatUtil.sendChat(player, "Master: " + node.getMasterPos().toString());
for (BlockPos connPos : node.getConnected())
{
ChatUtil.sendChat(player, "Connected to: " + connPos.toString());
}
BlockPos masterPos = node.getMasterPos();
TileEntity testTile = world.getTileEntity(masterPos);
if (testTile instanceof IMasterRoutingNode)
{
IMasterRoutingNode master = (IMasterRoutingNode) testTile;
if (master.isConnected(new LinkedList<BlockPos>(), pos))
{
ChatUtil.sendChat(player, "Can find the path to the master");
}
}
return false;
}
}

6
src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java
View file

@ -21,6 +21,12 @@ public class BlockMasterRoutingNode extends BlockContainer
setHarvestLevel("pickaxe", 2);
}
@Override
public int getRenderType()
{
return 3;
}
@Override
public TileEntity createNewTileEntity(World worldIn, int meta)
{

86
src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java Normal file
View file

@ -0,0 +1,86 @@
package WayofTime.bloodmagic.block;
import java.util.LinkedList;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.routing.IMasterRoutingNode;
import WayofTime.bloodmagic.routing.IRoutingNode;
import WayofTime.bloodmagic.tile.routing.TileOutputRoutingNode;
import WayofTime.bloodmagic.util.ChatUtil;
public class BlockOutputRoutingNode extends BlockContainer
{
public BlockOutputRoutingNode()
{
super(Material.rock);
setUnlocalizedName(Constants.Mod.MODID + ".outputRouting");
setCreativeTab(BloodMagic.tabBloodMagic);
setHardness(2.0F);
setResistance(5.0F);
setHarvestLevel("pickaxe", 2);
}
@Override
public int getRenderType()
{
return 3;
}
@Override
public TileEntity createNewTileEntity(World worldIn, int meta)
{
return new TileOutputRoutingNode();
}
@Override
//TODO: Combine BlockOutputRoutingNode and BlockInputRoutingNode so they have the same superclass
public void breakBlock(World world, BlockPos pos, IBlockState state)
{
TileEntity tile = world.getTileEntity(pos);
if (tile instanceof IRoutingNode)
{
((IRoutingNode) tile).removeAllConnections();
}
super.breakBlock(world, pos, state);
}
@Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ)
{
if (world.isRemote)
{
return false;
}
TileEntity tile = world.getTileEntity(pos);
IRoutingNode node = (IRoutingNode) tile;
ChatUtil.sendChat(player, "Master: " + node.getMasterPos().toString());
for (BlockPos connPos : node.getConnected())
{
ChatUtil.sendChat(player, "Connected to: " + connPos.toString());
}
BlockPos masterPos = node.getMasterPos();
TileEntity testTile = world.getTileEntity(masterPos);
if (testTile instanceof IMasterRoutingNode)
{
IMasterRoutingNode master = (IMasterRoutingNode) testTile;
if (master.isConnected(new LinkedList<BlockPos>(), pos))
{
ChatUtil.sendChat(player, "Can find the path to the master");
}
}
return false;
}
}

206
src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java Normal file
View file

@ -0,0 +1,206 @@
package WayofTime.bloodmagic.item.routing;
import java.util.LinkedList;
import java.util.List;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.util.helper.NBTHelper;
import WayofTime.bloodmagic.routing.IMasterRoutingNode;
import WayofTime.bloodmagic.routing.IRoutingNode;
import WayofTime.bloodmagic.util.ChatUtil;
import WayofTime.bloodmagic.util.helper.TextHelper;
public class ItemNodeRouter extends Item
{
public ItemNodeRouter()
{
setUnlocalizedName(Constants.Mod.MODID + ".nodeRouter");
setMaxStackSize(1);
setCreativeTab(BloodMagic.tabBloodMagic);
}
@Override
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced)
{
stack = NBTHelper.checkNBT(stack);
NBTTagCompound tag = stack.getTagCompound();
BlockPos coords = getBlockPos(stack);
if (coords != null && tag != null)
{
tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.telepositionFocus.coords", coords.getX(), coords.getY(), coords.getZ()));
}
}
public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ)
{
if (world.isRemote)
{
return true;
}
TileEntity tileHit = world.getTileEntity(pos);
if (!(tileHit instanceof IRoutingNode))
{
// TODO: Remove contained position?
BlockPos containedPos = getBlockPos(stack);
if (!containedPos.equals(BlockPos.ORIGIN))
{
this.setBlockPos(stack, BlockPos.ORIGIN);
ChatUtil.sendChat(player, "Removing contained location");
return false;
}
return false;
}
IRoutingNode node = (IRoutingNode) tileHit;
BlockPos containedPos = getBlockPos(stack);
if (containedPos.equals(BlockPos.ORIGIN))
{
this.setBlockPos(stack, pos);
ChatUtil.sendChat(player, "Setting node location");
return true;
} else
{
TileEntity pastTile = world.getTileEntity(containedPos);
if (pastTile instanceof IRoutingNode)
{
IRoutingNode pastNode = (IRoutingNode) pastTile;
if (pastNode instanceof IMasterRoutingNode)
{
IMasterRoutingNode master = (IMasterRoutingNode) pastNode;
if (!node.isMaster(master))
{
if (node.getMasterPos().equals(BlockPos.ORIGIN))
{
node.connectMasterToRemainingNode(world, new LinkedList<BlockPos>(), master);
master.addConnection(pos, containedPos);
master.addNodeToList(node);
node.addConnection(containedPos);
ChatUtil.sendChat(player, "Linked node to master!");
this.setBlockPos(stack, BlockPos.ORIGIN);
return true;
}
} else
{
master.addConnection(pos, containedPos);
node.addConnection(containedPos);
ChatUtil.sendChat(player, "Linked node to master!");
this.setBlockPos(stack, BlockPos.ORIGIN);
return true;
}
} else if (node instanceof IMasterRoutingNode)
{
IMasterRoutingNode master = (IMasterRoutingNode) node;
if (!pastNode.isMaster(master))
{
if (pastNode.getMasterPos().equals(BlockPos.ORIGIN))
{
pastNode.connectMasterToRemainingNode(world, new LinkedList<BlockPos>(), master);
master.addConnection(pos, containedPos);
pastNode.addConnection(pos);
master.addNodeToList(pastNode);
ChatUtil.sendChat(player, "Linked node to master!");
this.setBlockPos(stack, BlockPos.ORIGIN);
return true;
}
} else
{
master.addConnection(pos, containedPos);
pastNode.addConnection(pos);
ChatUtil.sendChat(player, "Linked node to master!");
this.setBlockPos(stack, BlockPos.ORIGIN);
return true;
}
} else
{
//Both nodes are not master nodes, so normal linking
if (pastNode.getMasterPos().equals(node.getMasterPos()))
{
if (!pastNode.getMasterPos().equals(BlockPos.ORIGIN))
{
TileEntity testTile = world.getTileEntity(pastNode.getMasterPos());
if (testTile instanceof IMasterRoutingNode)
{
IMasterRoutingNode master = (IMasterRoutingNode) testTile;
master.addConnection(pos, containedPos);
}
}
pastNode.addConnection(pos);
node.addConnection(containedPos);
ChatUtil.sendChat(player, "Linked nodes together.");
this.setBlockPos(stack, BlockPos.ORIGIN);
return true;
} else if (pastNode.getMasterPos().equals(BlockPos.ORIGIN)) //pastNode is not connected to a master, but node is
{
TileEntity tile = world.getTileEntity(node.getMasterPos());
if (tile instanceof IMasterRoutingNode)
{
IMasterRoutingNode master = (IMasterRoutingNode) tile;
master.addConnection(pos, containedPos);
master.addNodeToList(pastNode);
pastNode.connectMasterToRemainingNode(world, new LinkedList<BlockPos>(), master);
}
pastNode.addConnection(pos);
node.addConnection(containedPos);
ChatUtil.sendChat(player, "Linked nodes together.");
this.setBlockPos(stack, BlockPos.ORIGIN);
return true;
} else if (node.getMasterPos().equals(BlockPos.ORIGIN)) //node is not connected to a master, but pastNode is
{
TileEntity tile = world.getTileEntity(pastNode.getMasterPos());
if (tile instanceof IMasterRoutingNode)
{
IMasterRoutingNode master = (IMasterRoutingNode) tile;
master.addConnection(pos, containedPos);
master.addNodeToList(node);
node.connectMasterToRemainingNode(world, new LinkedList<BlockPos>(), master);
}
pastNode.addConnection(pos);
node.addConnection(containedPos);
ChatUtil.sendChat(player, "Linked nodes together.");
this.setBlockPos(stack, BlockPos.ORIGIN);
return true;
} else
{
this.setBlockPos(stack, BlockPos.ORIGIN);
return true;
}
}
}
}
return false;
}
public BlockPos getBlockPos(ItemStack stack)
{
stack = NBTHelper.checkNBT(stack);
return new BlockPos(stack.getTagCompound().getInteger(Constants.NBT.X_COORD), stack.getTagCompound().getInteger(Constants.NBT.Y_COORD), stack.getTagCompound().getInteger(Constants.NBT.Z_COORD));
}
public ItemStack setBlockPos(ItemStack stack, BlockPos pos)
{
NBTHelper.checkNBT(stack);
NBTTagCompound itemTag = stack.getTagCompound();
itemTag.setInteger(Constants.NBT.X_COORD, pos.getX());
itemTag.setInteger(Constants.NBT.Y_COORD, pos.getY());
itemTag.setInteger(Constants.NBT.Z_COORD, pos.getZ());
return stack;
}
}

10
src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java
View file

@ -13,8 +13,10 @@ import WayofTime.bloodmagic.block.BlockBloodLight;
import WayofTime.bloodmagic.block.BlockBloodRune;
import WayofTime.bloodmagic.block.BlockBloodStoneBrick;
import WayofTime.bloodmagic.block.BlockCrystal;
import WayofTime.bloodmagic.block.BlockInputRoutingNode;
import WayofTime.bloodmagic.block.BlockLifeEssence;
import WayofTime.bloodmagic.block.BlockMasterRoutingNode;
import WayofTime.bloodmagic.block.BlockOutputRoutingNode;
import WayofTime.bloodmagic.block.BlockPedestal;
import WayofTime.bloodmagic.block.BlockPhantom;
import WayofTime.bloodmagic.block.BlockRitualController;
@ -39,6 +41,8 @@ import WayofTime.bloodmagic.tile.TilePlinth;
import WayofTime.bloodmagic.tile.TileSoulForge;
import WayofTime.bloodmagic.tile.TileSpectralBlock;
import WayofTime.bloodmagic.tile.TileTeleposer;
import WayofTime.bloodmagic.tile.routing.TileInputRoutingNode;
import WayofTime.bloodmagic.tile.routing.TileOutputRoutingNode;
import WayofTime.bloodmagic.util.helper.InventoryRenderHelper;
public class ModBlocks
@ -62,6 +66,8 @@ public class ModBlocks
public static Block bloodStoneBrick;
public static Block masterRoutingNode;
public static Block inputRoutingNode;
public static Block outputRoutingNode;
public static void init()
{
@ -83,6 +89,8 @@ public class ModBlocks
crystal = registerBlock(new BlockCrystal(), ItemBlockCrystal.class);
bloodStoneBrick = registerBlock(new BlockBloodStoneBrick(), ItemBlockBloodStoneBrick.class);
masterRoutingNode = registerBlock(new BlockMasterRoutingNode());
inputRoutingNode = registerBlock(new BlockInputRoutingNode());
outputRoutingNode = registerBlock(new BlockOutputRoutingNode());
initTiles();
}
@ -99,6 +107,8 @@ public class ModBlocks
GameRegistry.registerTileEntity(TileTeleposer.class, Constants.Mod.MODID + ":" + TileTeleposer.class.getSimpleName());
GameRegistry.registerTileEntity(TileSoulForge.class, Constants.Mod.MODID + ":" + TileSoulForge.class.getSimpleName());
GameRegistry.registerTileEntity(TileMasterRoutingNode.class, Constants.Mod.MODID + ":" + TileMasterRoutingNode.class.getSimpleName());
GameRegistry.registerTileEntity(TileInputRoutingNode.class, Constants.Mod.MODID + ":" + TileInputRoutingNode.class.getSimpleName());
GameRegistry.registerTileEntity(TileOutputRoutingNode.class, Constants.Mod.MODID + ":" + TileOutputRoutingNode.class.getSimpleName());
}
public static void initRenders()

5
src/main/java/WayofTime/bloodmagic/registry/ModItems.java
View file

@ -32,6 +32,7 @@ import WayofTime.bloodmagic.item.armour.ItemLivingArmour;
import WayofTime.bloodmagic.item.armour.ItemSentientArmour;
import WayofTime.bloodmagic.item.gear.ItemPackSacrifice;
import WayofTime.bloodmagic.item.gear.ItemPackSelfSacrifice;
import WayofTime.bloodmagic.item.routing.ItemNodeRouter;
import WayofTime.bloodmagic.item.sigil.ItemSigilAir;
import WayofTime.bloodmagic.item.sigil.ItemSigilBloodLight;
import WayofTime.bloodmagic.item.sigil.ItemSigilCompression;
@ -131,6 +132,8 @@ public class ModItems
public static Item sentientBow;
public static Item sentientArmourGem;
public static Item nodeRouter;
public static Item.ToolMaterial boundToolMaterial = EnumHelper.addToolMaterial("BoundToolMaterial", 4, 0, 10, 8, 50);
public static Item.ToolMaterial soulToolMaterial = EnumHelper.addToolMaterial("SoulToolMaterial", 4, 520, 7, 8, 50);
@ -215,6 +218,8 @@ public class ModItems
sentientSword = registerItem(new ItemSentientSword());
sentientBow = registerItem(new ItemSentientBow());
sentientArmourGem = registerItem(new ItemSentientArmourGem());
nodeRouter = registerItem(new ItemNodeRouter());
}
public static void initRenders()

8
src/main/java/WayofTime/bloodmagic/routing/IRoutingNode.java
View file

@ -16,4 +16,12 @@ public interface IRoutingNode
public BlockPos getMasterPos();
public boolean isConnectionEnabled(BlockPos testPos);
public boolean isMaster(IMasterRoutingNode master);
public void addConnection(BlockPos pos1);
public void removeConnection(BlockPos pos1);
public void removeAllConnections();
}

148
src/main/java/WayofTime/bloodmagic/routing/TileMasterRoutingNode.java
View file

@ -4,52 +4,136 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.ITickable;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.tile.routing.TileInputRoutingNode;
import WayofTime.bloodmagic.tile.routing.TileOutputRoutingNode;
public class TileMasterRoutingNode extends TileEntity implements IMasterRoutingNode
public class TileMasterRoutingNode extends TileEntity implements IMasterRoutingNode, ITickable
{
// A list of connections
private HashMap<BlockPos, List<BlockPos>> connectionMap = new HashMap<BlockPos, List<BlockPos>>();
private List<BlockPos> generalNodeList = new LinkedList<BlockPos>();
private List<BlockPos> outputNodeList = new LinkedList<BlockPos>();
private List<BlockPos> inputNodeList = new LinkedList<BlockPos>();
@Override
public void update()
{
}
@Override
public void writeToNBT(NBTTagCompound tag)
{
super.writeToNBT(tag);
NBTTagList tags = new NBTTagList();
for (BlockPos pos : generalNodeList)
{
NBTTagCompound posTag = new NBTTagCompound();
posTag.setInteger(Constants.NBT.X_COORD, pos.getX());
posTag.setInteger(Constants.NBT.Y_COORD, pos.getY());
posTag.setInteger(Constants.NBT.Z_COORD, pos.getZ());
tags.appendTag(posTag);
}
tag.setTag(Constants.NBT.ROUTING_MASTER_GENERAL, tags);
tags = new NBTTagList();
for (BlockPos pos : inputNodeList)
{
NBTTagCompound posTag = new NBTTagCompound();
posTag.setInteger(Constants.NBT.X_COORD, pos.getX());
posTag.setInteger(Constants.NBT.Y_COORD, pos.getY());
posTag.setInteger(Constants.NBT.Z_COORD, pos.getZ());
tags.appendTag(posTag);
}
tag.setTag(Constants.NBT.ROUTING_MASTER_INPUT, tags);
tags = new NBTTagList();
for (BlockPos pos : outputNodeList)
{
NBTTagCompound posTag = new NBTTagCompound();
posTag.setInteger(Constants.NBT.X_COORD, pos.getX());
posTag.setInteger(Constants.NBT.Y_COORD, pos.getY());
posTag.setInteger(Constants.NBT.Z_COORD, pos.getZ());
tags.appendTag(posTag);
}
tag.setTag(Constants.NBT.ROUTING_MASTER_OUTPUT, tags);
}
@Override
public void readFromNBT(NBTTagCompound tag)
{
super.readFromNBT(tag);
NBTTagList tags = tag.getTagList(Constants.NBT.ROUTING_MASTER_GENERAL, 10);
for (int i = 0; i < tags.tagCount(); i++)
{
NBTTagCompound blockTag = tags.getCompoundTagAt(i);
BlockPos newPos = new BlockPos(blockTag.getInteger(Constants.NBT.X_COORD), blockTag.getInteger(Constants.NBT.Y_COORD), blockTag.getInteger(Constants.NBT.Z_COORD));
generalNodeList.add(newPos);
}
tags = tag.getTagList(Constants.NBT.ROUTING_MASTER_INPUT, 10);
for (int i = 0; i < tags.tagCount(); i++)
{
NBTTagCompound blockTag = tags.getCompoundTagAt(i);
BlockPos newPos = new BlockPos(blockTag.getInteger(Constants.NBT.X_COORD), blockTag.getInteger(Constants.NBT.Y_COORD), blockTag.getInteger(Constants.NBT.Z_COORD));
inputNodeList.add(newPos);
}
tags = tag.getTagList(Constants.NBT.ROUTING_MASTER_OUTPUT, 10);
for (int i = 0; i < tags.tagCount(); i++)
{
NBTTagCompound blockTag = tags.getCompoundTagAt(i);
BlockPos newPos = new BlockPos(blockTag.getInteger(Constants.NBT.X_COORD), blockTag.getInteger(Constants.NBT.Y_COORD), blockTag.getInteger(Constants.NBT.Z_COORD));
outputNodeList.add(newPos);
}
}
@Override
public boolean isConnected(List<BlockPos> path, BlockPos nodePos)
{
if (!connectionMap.containsKey(nodePos))
{
return false;
}
//TODO: Figure out how to make it so the path is obtained
// if (!connectionMap.containsKey(nodePos))
// {
// return false;
// }
TileEntity tile = worldObj.getTileEntity(nodePos);
if (!(tile instanceof IRoutingNode))
{
connectionMap.remove(nodePos);
// connectionMap.remove(nodePos);
return false;
}
IRoutingNode node = (IRoutingNode) tile;
List<BlockPos> connectionList = node.getConnected();
List<BlockPos> testPath = path.subList(0, path.size());
testPath.add(nodePos);
// List<BlockPos> testPath = path.subList(0, path.size());
path.add(nodePos);
for (BlockPos testPos : connectionList)
{
if (testPath.contains(testPos))
if (path.contains(testPos))
{
continue;
}
if (testPos.equals(this.getPos()) && node.isConnectionEnabled(testPos))
{
path.clear();
path.addAll(testPath);
// path.clear();
// path.addAll(testPath);
return true;
} else if (NodeHelper.isNodeConnectionEnabled(worldObj, node, testPos))
{
if (isConnected(testPath, testPos))
if (isConnected(path, testPos))
{
path.clear();
path.addAll(testPath);
// path.clear();
// path.addAll(testPath);
return true;
}
}
@ -72,8 +156,14 @@ public class TileMasterRoutingNode extends TileEntity implements IMasterRoutingN
{
generalNodeList.add(newPos);
}
//TODO: make more node lists so that you can more easily differentiate the different types of nodes
if (node instanceof TileInputRoutingNode && !inputNodeList.contains(newPos))
{
inputNodeList.add(newPos);
}
if (node instanceof TileOutputRoutingNode && !outputNodeList.contains(newPos))
{
outputNodeList.add(newPos);
}
}
@Override
@ -156,4 +246,30 @@ public class TileMasterRoutingNode extends TileEntity implements IMasterRoutingN
{
return this.getPos();
}
@Override
public boolean isMaster(IMasterRoutingNode master)
{
return false;
}
@Override
public void addConnection(BlockPos pos1)
{
// Empty
}
@Override
public void removeConnection(BlockPos pos1)
{
generalNodeList.remove(pos1);
inputNodeList.remove(pos1);
outputNodeList.remove(pos1);
}
@Override
public void removeAllConnections()
{
// Empty
}
}

91
src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java
View file

@ -3,9 +3,12 @@ package WayofTime.bloodmagic.tile.routing;
import java.util.LinkedList;
import java.util.List;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.routing.IMasterRoutingNode;
import WayofTime.bloodmagic.routing.IRoutingNode;
@ -14,9 +17,67 @@ public class TileRoutingNode extends TileEntity implements IRoutingNode
private BlockPos masterPos = BlockPos.ORIGIN;
private List<BlockPos> connectionList = new LinkedList<BlockPos>();
@Override
public void writeToNBT(NBTTagCompound tag)
{
super.writeToNBT(tag);
NBTTagCompound masterTag = new NBTTagCompound();
masterTag.setInteger(Constants.NBT.X_COORD, masterPos.getX());
masterTag.setInteger(Constants.NBT.Y_COORD, masterPos.getY());
masterTag.setInteger(Constants.NBT.Z_COORD, masterPos.getZ());
tag.setTag(Constants.NBT.ROUTING_MASTER, masterTag);
NBTTagList tags = new NBTTagList();
for (BlockPos pos : connectionList)
{
NBTTagCompound posTag = new NBTTagCompound();
posTag.setInteger(Constants.NBT.X_COORD, pos.getX());
posTag.setInteger(Constants.NBT.Y_COORD, pos.getY());
posTag.setInteger(Constants.NBT.Z_COORD, pos.getZ());
tags.appendTag(posTag);
}
tag.setTag(Constants.NBT.ROUTING_CONNECTION, tags);
}
@Override
public void readFromNBT(NBTTagCompound tag)
{
super.readFromNBT(tag);
NBTTagCompound masterTag = tag.getCompoundTag(Constants.NBT.ROUTING_MASTER);
masterPos = new BlockPos(masterTag.getInteger(Constants.NBT.X_COORD), masterTag.getInteger(Constants.NBT.Y_COORD), masterTag.getInteger(Constants.NBT.Z_COORD));
NBTTagList tags = tag.getTagList(Constants.NBT.ROUTING_CONNECTION, 10);
for (int i = 0; i < tags.tagCount(); i++)
{
NBTTagCompound blockTag = tags.getCompoundTagAt(i);
BlockPos newPos = new BlockPos(blockTag.getInteger(Constants.NBT.X_COORD), blockTag.getInteger(Constants.NBT.Y_COORD), blockTag.getInteger(Constants.NBT.Z_COORD));
connectionList.add(newPos);
}
}
@Override
public void removeAllConnections()
{
TileEntity testTile = worldObj.getTileEntity(getMasterPos());
if (testTile instanceof IMasterRoutingNode)
{
((IMasterRoutingNode) testTile).removeConnection(pos); // Remove this node from the master
}
for (BlockPos testPos : connectionList)
{
this.removeConnection(testPos);
TileEntity tile = worldObj.getTileEntity(testPos);
if (tile instanceof IRoutingNode)
{
((IRoutingNode) tile).removeConnection(pos);
}
}
}
@Override
public void connectMasterToRemainingNode(World world, List<BlockPos> alreadyChecked, IMasterRoutingNode master)
{
this.masterPos = master.getBlockPos();
List<BlockPos> connectedList = this.getConnected();
for (BlockPos testPos : connectedList)
{
@ -59,9 +120,39 @@ public class TileRoutingNode extends TileEntity implements IRoutingNode
return masterPos;
}
@Override
public boolean isMaster(IMasterRoutingNode master)
{
BlockPos checkPos = master.getBlockPos();
if (checkPos.equals(getMasterPos()))
{
return true;
}
return false;
}
@Override
public boolean isConnectionEnabled(BlockPos testPos)
{
return true;
}
@Override
public void addConnection(BlockPos pos1)
{
if (!connectionList.contains(pos1))
{
connectionList.add(pos1);
}
}
@Override
public void removeConnection(BlockPos pos1)
{
if (connectionList.contains(pos1))
{
connectionList.remove(pos1);
}
}
}

7
src/main/resources/assets/bloodmagic/blockstates/BlockInputRoutingNode.json Normal file
View file

@ -0,0 +1,7 @@
{
"variants": {
"normal": { "model": "bloodmagic:BlockInputRoutingNode" }
}
}

7
src/main/resources/assets/bloodmagic/blockstates/BlockMasterRoutingNode.json Normal file
View file

@ -0,0 +1,7 @@
{
"variants": {
"normal": { "model": "bloodmagic:BlockMasterRoutingNode" }
}
}

6
src/main/resources/assets/bloodmagic/blockstates/BlockOutputRoutingNode.json Normal file
View file

@ -0,0 +1,6 @@
{
"variants": {
"normal": { "model": "bloodmagic:BlockOutputRoutingNode" }
}
}

7
src/main/resources/assets/bloodmagic/models/block/BlockInputRoutingNode.json Normal file
View file

@ -0,0 +1,7 @@
{
"parent": "block/cube_all",
"textures": {
"all": "bloodmagic:blocks/InputRoutingNode"
}
}

8
src/main/resources/assets/bloodmagic/models/block/BlockMasterRoutingNode.json Normal file
View file

@ -0,0 +1,8 @@
{
"parent": "block/cube_all",
"textures": {
"all": "bloodmagic:blocks/MasterRoutingNode"
}
}

7
src/main/resources/assets/bloodmagic/models/block/BlockOutputRoutingNode.json Normal file
View file

@ -0,0 +1,7 @@
{
"parent": "block/cube_all",
"textures": {
"all": "bloodmagic:blocks/OutputRoutingNode"
}
}

BIN
src/main/resources/assets/bloodmagic/textures/blocks/InputRoutingNode.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 191 B

BIN
src/main/resources/assets/bloodmagic/textures/blocks/MasterRoutingNode.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 220 B

BIN
src/main/resources/assets/bloodmagic/textures/blocks/OutputRoutingNode.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 217 B