4 files changed, 153 insertions, 65 deletions

diff --git a/src/main/java/blocks/Block_ItemDistributionNode.java b/src/main/java/blocks/Block_ItemDistributionNode.java
deleted file mode 100644
index 07fd988445..0000000000
--- a/src/main/java/blocks/Block_ItemDistributionNode.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package blocks;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import itemBlocks.IB_ItemDistributionNode;
-import kekztech.KekzCore;
-import net.minecraft.block.BlockContainer;
-import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import tileentities.TE_ItemDistributionNode;
-
-public class Block_ItemDistributionNode extends BlockContainer {
-	
-	private static Block_ItemDistributionNode instance = new Block_ItemDistributionNode();
-	
-	private Block_ItemDistributionNode() {
-		super(Material.glass);
-	}
-	
-	public static Block_ItemDistributionNode getInstance() {
-		return instance;
-	}
-	
-	public void registerBlock() {
-		final String blockName = "kekztech_itemdistributionnode_block";
-		super.setBlockName(blockName);
-		super.setCreativeTab(CreativeTabs.tabMisc);
-		super.setBlockTextureName(KekzCore.MODID + ":" + "ItemDistributionNode");
-		super.setHardness(3.0f);
-		super.setResistance(2.0f);
-		GameRegistry.registerBlock(getInstance(), IB_ItemDistributionNode.class, blockName);
-	}
-	
-	@Override
-	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float lx, float ly, float lz) {
-		if(world.isRemote) {
-			return true;
-		}
-		
-		final TileEntity te = world.getTileEntity(x, y, z);
-		if(te != null && te instanceof TE_ItemDistributionNode) {
-			player.openGui(KekzCore.instance, 0, world, x, y, z);
-			return true;
-		}
-		return false;
-	}
-	
-	@Override
-	public TileEntity createNewTileEntity(World world, int p_149915_2_) {
-		return new TE_ItemDistributionNode();
-	}
-
-}
diff --git a/src/main/java/blocks/Block_ItemDistributionCable.java b/src/main/java/blocks/Block_ItemProxyCable.java
index 3caefc313a..dee566bab7 100644
--- a/src/main/java/blocks/Block_ItemDistributionCable.java
+++ b/src/main/java/blocks/Block_ItemProxyCable.java
@@ -1,40 +1,45 @@
 package blocks;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import itemBlocks.IB_ItemDistributionCable;
+import itemBlocks.IB_ItemProxyCable;
 import kekztech.KekzCore;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import tileentities.TE_ItemDistributionCable;
+import tileentities.TE_ItemProxyCable;
 
-public class Block_ItemDistributionCable extends BlockContainer {
+public class Block_ItemProxyCable extends BlockContainer {
 	
-	private static Block_ItemDistributionCable instance = new Block_ItemDistributionCable();
+	private static Block_ItemProxyCable instance = new Block_ItemProxyCable();
 	
-	private Block_ItemDistributionCable() {
+	private Block_ItemProxyCable() {
 		super(Material.glass);
 	}
 	
-	public static Block_ItemDistributionCable getInstance() {
+	public static Block_ItemProxyCable getInstance() {
 		return instance;
 	}
 	
 	public void registerBlock() {
-		final String blockName = "kekztech_itemdistributioncable_block";
+		final String blockName = "kekztech_itemproxycable_block";
 		super.setBlockName(blockName);
 		super.setCreativeTab(CreativeTabs.tabMisc);
-		super.setBlockTextureName(KekzCore.MODID + ":" + "ItemDistributionCable");
+		super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTCasing");
 		super.setHardness(3.0f);
 		super.setResistance(2.0f);
-		GameRegistry.registerBlock(getInstance(), IB_ItemDistributionCable.class, blockName);
+		GameRegistry.registerBlock(getInstance(), IB_ItemProxyCable.class, blockName);
+	}
+	
+	@Override
+	public boolean isOpaqueCube() {
+		return false;
 	}
 	
 	@Override
 	public TileEntity createNewTileEntity(World world, int p_149915_2_) {
-		return new TE_ItemDistributionCable();
+		return new TE_ItemProxyCable();
 	}
 
 }
diff --git a/src/main/java/blocks/Block_ItemProxyEndpoint.java b/src/main/java/blocks/Block_ItemProxyEndpoint.java
new file mode 100644
index 0000000000..762880c877
--- /dev/null
+++ b/src/main/java/blocks/Block_ItemProxyEndpoint.java
@@ -0,0 +1,69 @@
+package blocks;
+
+import java.util.UUID;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import itemBlocks.IB_ItemProxyEndpoint;
+import items.Item_Configurator;
+import kekztech.GuiHandler;
+import kekztech.KekzCore;
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+import tileentities.TE_ItemProxyEndpoint;
+
+public class Block_ItemProxyEndpoint extends BlockContainer {
+	
+	private static Block_ItemProxyEndpoint instance = new Block_ItemProxyEndpoint();
+	
+	private Block_ItemProxyEndpoint() {
+		super(Material.glass);
+	}
+	
+	public static Block_ItemProxyEndpoint getInstance() {
+		return instance;
+	}
+	
+	public void registerBlock() {
+		final String blockName = "kekztech_itemproxyendpoint_block";
+		super.setBlockName(blockName);
+		super.setCreativeTab(CreativeTabs.tabMisc);
+		super.setBlockTextureName(KekzCore.MODID + ":" + "ItemProxyEndpoint");
+		super.setHardness(3.0f);
+		super.setResistance(2.0f);
+		GameRegistry.registerBlock(getInstance(), IB_ItemProxyEndpoint.class, blockName);
+	}
+	
+	@Override
+	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float lx, float ly, float lz) {
+		if(world.isRemote) {
+			return true;
+		}
+		
+		final TileEntity te = world.getTileEntity(x, y, z);
+		if(te != null && te instanceof TE_ItemProxyEndpoint) {
+			final TE_ItemProxyEndpoint endpoint = (TE_ItemProxyEndpoint) te;
+			if(player.inventory.getCurrentItem() != null && player.inventory.getCurrentItem().getItem() instanceof Item_Configurator) {
+				
+				final ItemStack held = player.inventory.getCurrentItem();
+				if(held.hasTagCompound() && held.getTagCompound().hasKey("config")) {
+					endpoint.setChannel(UUID.fromString(held.getTagCompound().getString("config")));
+				}
+			} else {
+				player.openGui(KekzCore.instance, GuiHandler.ITEM_PROXY_ENDPOINT, world, x, y, z);				
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	@Override
+	public TileEntity createNewTileEntity(World world, int p_149915_2_) {
+		return new TE_ItemProxyEndpoint();
+	}
+
+}
\ No newline at end of file
diff --git a/src/main/java/blocks/Block_ItemProxySource.java b/src/main/java/blocks/Block_ItemProxySource.java
new file mode 100644
index 0000000000..b2cdd4a656
--- /dev/null
+++ b/src/main/java/blocks/Block_ItemProxySource.java
@@ -0,0 +1,69 @@
+package blocks;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import itemBlocks.IB_ItemProxySource;
+import items.Item_Configurator;
+import kekztech.GuiHandler;
+import kekztech.KekzCore;
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+import tileentities.TE_ItemProxySource;
+
+public class Block_ItemProxySource extends BlockContainer {
+	
+	private static Block_ItemProxySource instance = new Block_ItemProxySource();
+	
+	private Block_ItemProxySource() {
+		super(Material.glass);
+	}
+	
+	public static Block_ItemProxySource getInstance() {
+		return instance;
+	}
+	
+	public void registerBlock() {
+		final String blockName = "kekztech_itemproxysource_block";
+		super.setBlockName(blockName);
+		super.setCreativeTab(CreativeTabs.tabMisc);
+		super.setBlockTextureName(KekzCore.MODID + ":" + "ItemProxySource");
+		super.setHardness(3.0f);
+		super.setResistance(2.0f);
+		GameRegistry.registerBlock(getInstance(), IB_ItemProxySource.class, blockName);
+	}
+	
+	@Override
+	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float lx, float ly, float lz) {
+		if(world.isRemote) {
+			return true;
+		}
+		
+		final TileEntity te = world.getTileEntity(x, y, z);
+		if(te != null && te instanceof TE_ItemProxySource) {
+			final TE_ItemProxySource source = (TE_ItemProxySource) te;
+			if(player.inventory.getCurrentItem() != null && player.inventory.getCurrentItem().getItem() instanceof Item_Configurator) {
+				
+				final NBTTagCompound configNBT = new NBTTagCompound();
+				configNBT.setString("config", source.getChannel().toString());
+				final ItemStack held = player.inventory.getCurrentItem();
+				held.setTagCompound(configNBT);
+				
+			} else {
+				player.openGui(KekzCore.instance, GuiHandler.ITEM_PROXY_SOURCE, world, x, y, z);				
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	@Override
+	public TileEntity createNewTileEntity(World world, int p_149915_2_) {
+		return new TE_ItemProxySource();
+	}
+
+}