Worked on ConduitRenderer. Block bounds are soon correctly set. The TE's isConnected() method doesn't work.

4 files changed, 50 insertions, 57 deletions

diff --git a/src/main/java/common/Blocks.java b/src/main/java/common/Blocks.java
index f6939ffd90..cab14a6ca8 100644
--- a/src/main/java/common/Blocks.java
+++ b/src/main/java/common/Blocks.java
@@ -61,7 +61,7 @@ public class Blocks {
 		registerBlocks_TFFT();
 		registerBlocks_Nuclear();
 		//registerBlocks_ItemServer();
-		//registerBlocks_ItemProxy();
+		registerBlocks_ItemProxy();
 		registerBlocks_Jars();
 		registerBlocks_LSC();
 
diff --git a/src/main/java/common/tileentities/TE_ItemProxyCable.java b/src/main/java/common/tileentities/TE_ItemProxyCable.java
index 30b3e15c38..c65ba7be02 100644
--- a/src/main/java/common/tileentities/TE_ItemProxyCable.java
+++ b/src/main/java/common/tileentities/TE_ItemProxyCable.java
@@ -10,7 +10,8 @@ public class TE_ItemProxyCable extends TileEntity {
 	private String idCache = null;
 	
 	public TE_ItemProxyCable() {
-		connections = 63; // set all connections active until I have something actually control connections
+		connections = 63;
+		this.setConnection(ForgeDirection.DOWN, true);
 	}
 	
 	public static float getThickness() {
diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java
index 2b7fbe9087..2a068a7eb4 100644
--- a/src/main/java/kekztech/KekzCore.java
+++ b/src/main/java/kekztech/KekzCore.java
@@ -4,6 +4,7 @@ import common.Blocks;
 import common.Recipes;

 import common.Researches;

 import common.tileentities.*;

+import cpw.mods.fml.client.registry.RenderingRegistry;

 import cpw.mods.fml.common.Mod;

 import cpw.mods.fml.common.event.FMLInitializationEvent;

 import cpw.mods.fml.common.event.FMLPostInitializationEvent;

@@ -11,10 +12,12 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.network.NetworkRegistry;

 import cpw.mods.fml.common.registry.GameRegistry;

 import items.ErrorItem;

+import items.Item_Configurator;

 import items.MetaItem_CraftingComponent;

 import items.MetaItem_ReactorComponent;

 import org.apache.logging.log4j.LogManager;

 import org.apache.logging.log4j.Logger;

+import render.ConduitRenderer;

 

 /**

  * My GT-Meta-IDs are: 13101 - 13500

@@ -56,7 +59,7 @@ public class KekzCore {
 		ErrorItem.getInstance().registerItem();

 		MetaItem_ReactorComponent.getInstance().registerItem();

 		MetaItem_CraftingComponent.getInstance().registerItem();

-		//Item_Configurator.getInstance().registerItem();

+		Item_Configurator.getInstance().registerItem();

 		Items.registerOreDictNames();

 		

 		Blocks.preInit();

@@ -64,9 +67,9 @@ public class KekzCore {
 		// Register TileEntities

 		GameRegistry.registerTileEntity(TE_TFFTMultiHatch.class, "kekztech_tfftmultihatch_tile");

 		//GameRegistry.registerTileEntity(TE_ItemServerIOPort.class, "kekztech_itemserverioport_tile");

-		//GameRegistry.registerTileEntity(TE_ItemProxyCable.class, "kekztech_itemproxycable_tile");

-		//GameRegistry.registerTileEntity(TE_ItemProxySource.class, "kekztech_itemproxysource_tile");

-		//GameRegistry.registerTileEntity(TE_ItemProxyEndpoint.class, "kekztech_itemproxyendpoint_tile");

+		GameRegistry.registerTileEntity(TE_ItemProxyCable.class, "kekztech_itemproxycable_tile");

+		GameRegistry.registerTileEntity(TE_ItemProxySource.class, "kekztech_itemproxysource_tile");

+		GameRegistry.registerTileEntity(TE_ItemProxyEndpoint.class, "kekztech_itemproxyendpoint_tile");

 		

 		GameRegistry.registerTileEntity(TE_ThaumiumReinforcedJar.class, "kekztech_thaumiumreinforcedjar");

 		GameRegistry.registerTileEntity(TE_IchorJar.class, "kekztech_ichorjar");

@@ -87,7 +90,7 @@ public class KekzCore {
 		//is = new GTMTE_ItemServer(13105, "multimachine.itemserver", "Item Server");

         lsc = new GTMTE_LapotronicSuperCapacitor(13106, "multimachine.supercapacitor", "Lapotronic Supercapacitor");

 		// Register renderer

-		//RenderingRegistry.registerBlockHandler(ConduitRenderer.getInstance());

+		RenderingRegistry.registerBlockHandler(ConduitRenderer.getInstance());

 	}

 	

 	@Mod.EventHandler

diff --git a/src/main/java/render/ConduitRenderer.java b/src/main/java/render/ConduitRenderer.java
index 3f4f97a95c..e1b083004c 100644
--- a/src/main/java/render/ConduitRenderer.java
+++ b/src/main/java/render/ConduitRenderer.java
@@ -27,36 +27,7 @@ public class ConduitRenderer implements ISimpleBlockRenderingHandler {
 
 	@Override
 	public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) {
-		Tessellator tessellator = Tessellator.instance;
-		block.setBlockBoundsForItemRender();
-		renderer.setRenderBoundsFromBlock(block);
-		GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F);
-		GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
-		tessellator.startDrawingQuads();
-		tessellator.setNormal(0.0F, -1.0F, 0.0F);
-		renderer.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, renderer.getBlockIconFromSideAndMetadata(block, 0, metadata));
-		tessellator.draw();
-		tessellator.startDrawingQuads();
-		tessellator.setNormal(0.0F, 1.0F, 0.0F);
-		renderer.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, renderer.getBlockIconFromSideAndMetadata(block, 1, metadata));
-		tessellator.draw();
-		tessellator.startDrawingQuads();
-		tessellator.setNormal(0.0F, 0.0F, -1.0F);
-		renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, renderer.getBlockIconFromSideAndMetadata(block, 2, metadata));
-		tessellator.draw();
-		tessellator.startDrawingQuads();
-		tessellator.setNormal(0.0F, 0.0F, 1.0F);
-		renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, renderer.getBlockIconFromSideAndMetadata(block, 3, metadata));
-		tessellator.draw();
-		tessellator.startDrawingQuads();
-		tessellator.setNormal(-1.0F, 0.0F, 0.0F);
-		renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, renderer.getBlockIconFromSideAndMetadata(block, 4, metadata));
-		tessellator.draw();
-		tessellator.startDrawingQuads();
-		tessellator.setNormal(1.0F, 0.0F, 0.0F);
-		renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, renderer.getBlockIconFromSideAndMetadata(block, 5, metadata));
-		tessellator.draw();
-		GL11.glTranslatef(0.5F, 0.5F, 0.5F);
+
 	}
 
 	@Override
@@ -68,27 +39,45 @@ public class ConduitRenderer implements ISimpleBlockRenderingHandler {
 			
 			final float thickness = TE_ItemProxyCable.getThickness();
 			final float space = (1.0f - thickness) / 2.0f;
-			
-			if(cable.getConnections() == 63) { // No need to render a center cube if it's hidden anyways
-				block.setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f);
-				renderer.setRenderBounds(0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f);
-			} else if (cable.getConnections() == 0) { // Only center cube required
-				block.setBlockBounds(space, space, space, space + thickness, space + thickness, space + thickness);
-				renderer.setRenderBounds(space, space, space, space + thickness, space + thickness, space + thickness);
-			}
-			
-			final Tessellator f = Tessellator.instance;
-			f.startDrawingQuads();
-			IIcon icon = block.getIcon(0, 0);
-			// South face
-			if(cable.isConnected(ForgeDirection.SOUTH)) {
-				f.addVertexWithUV(x + space + thickness, y + space, z + 1, icon.getMaxU(), icon.getMaxV());
-				f.addVertexWithUV(x + space + thickness, y + space + thickness, z + 1, icon.getMaxU(), icon.getMinV());
-				f.addVertexWithUV(x + space, y + space + thickness, z + 1, icon.getMinU(), icon.getMinV());
-				f.addVertexWithUV(x + space, y + space, z + 1, icon.getMinU(), icon.getMaxV());
+
+			float xThickness = thickness;
+			float xOffset = space;
+			float yThickness = thickness;
+			float yOffset = space;
+			float zThickness = thickness;
+			float zOffset = space;
+
+			for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) {
+				if(cable.isConnected(side)) {
+					switch(side) {
+						case DOWN:
+							yOffset = 0.0F;
+							yThickness += space;
+							break;
+						case UP:
+							yThickness += space;
+							break;
+						case NORTH:
+							zOffset = 0.0F;
+							zThickness += space;
+							break;
+						case SOUTH:
+							zThickness += space;
+							break;
+						case WEST:
+							xOffset += 0.0F;
+							xThickness += space;
+							break;
+						case EAST:
+							xThickness += space;
+							break;
+					}
+				}
 			}
-			
-			f.draw();
+
+			block.setBlockBounds(xOffset, yOffset, zOffset,
+					xOffset + xThickness, yOffset + yThickness, zOffset + zThickness);
+			renderer.setRenderBoundsFromBlock(block);
 		}
 		
 		return false;