Migrated gates

Minor renaming

common/buildcraft/transport/GateVanilla.java

@@ -250,76 +250,42 @@ public class GateVanilla extends Gate {
 
 	}
 
-	// / TEXTURES
+	// / ICONS
 	@Override
-	public final int getTexture(boolean isSignalActive) {
+	public final int getTextureIconIndex(boolean isSignalActive) {
 
 		boolean isGateActive = isSignalActive;
 		if (hasPulser() && pulser.isActive()) {
 			isGateActive = true;
 		}
-
-		int n = getTextureRow();
-		switch (kind) {
-		case None:
-			break;
-		case Single:
-			if (!isGateActive)
-				return n * 16 + 12;
-			else
-				return n * 16 + 13;
-		case AND_2:
-			if (!isGateActive) {
-				if (hasPulser())
-					return 9 * 16 + 0;
-				else
-					return 6 * 16 + 7;
-			} else if (hasPulser())
-				return 9 * 16 + 1;
-			else
-				return 6 * 16 + 8;
-		case OR_2:
-			if (!isGateActive) {
-				if (hasPulser())
-					return 9 * 16 + 2;
-				else
-					return 6 * 16 + 9;
-			} else if (hasPulser())
-				return 9 * 16 + 3;
-			else
-				return 6 * 16 + 10;
-		case AND_3:
-			if (!isGateActive)
-				return n * 16 + 4;
-			else
-				return n * 16 + 5;
-		case OR_3:
-			if (!isGateActive)
-				return n * 16 + 6;
-			else
-				return n * 16 + 7;
-		case AND_4:
-			if (!isGateActive)
-				return n * 16 + 8;
-			else
-				return n * 16 + 9;
-		case OR_4:
-			if (!isGateActive)
-				return n * 16 + 10;
-			else
-				return n * 16 + 11;
+	
+		if (!hasPulser()){
+			switch (kind){
+				case None: return 0;
+				case Single: return isGateActive ? IconTerrainConstants.Gate_Dark : IconTerrainConstants.Gate_Lit;
+				case AND_2: return isGateActive ? IconTerrainConstants.Gate_Iron_And_Dark : IconTerrainConstants.Gate_Iron_And_Lit;
+				case OR_2: return isGateActive ? IconTerrainConstants.Gate_Iron_Or_Dark : IconTerrainConstants.Gate_Iron_Or_Lit;
+				case AND_3: return isGateActive ? IconTerrainConstants.Gate_Gold_And_Dark : IconTerrainConstants.Gate_Gold_And_Lit;
+				case OR_3: return isGateActive ? IconTerrainConstants.Gate_Gold_Or_Dark : IconTerrainConstants.Gate_Gold_Or_Lit;
+				case AND_4: return isGateActive ? IconTerrainConstants.Gate_Diamond_And_Dark : IconTerrainConstants.Gate_Diamond_And_Lit;
+				case OR_4: return isGateActive ? IconTerrainConstants.Gate_Diamond_Or_Dark : IconTerrainConstants.Gate_Diamond_Or_Lit;
+			}
+		} else {
+			switch (kind){
+				case None: return 0; 
+				case Single: return isGateActive ? IconTerrainConstants.Gate_Autarchic_Dark : IconTerrainConstants.Gate_Autarchic_Lit;
+				case AND_2: return isGateActive ? IconTerrainConstants.Gate_Autarchic_Iron_And_Dark : IconTerrainConstants.Gate_Autarchic_Iron_And_Lit;
+				case OR_2: return isGateActive ? IconTerrainConstants.Gate_Autarchic_Iron_Or_Dark : IconTerrainConstants.Gate_Autarchic_Iron_Or_Lit;
+				case AND_3: return isGateActive ? IconTerrainConstants.Gate_Autarchic_Gold_And_Dark : IconTerrainConstants.Gate_Autarchic_Gold_And_Lit;
+				case OR_3: return isGateActive ? IconTerrainConstants.Gate_Autarchic_Gold_Or_Dark : IconTerrainConstants.Gate_Autarchic_Gold_Or_Lit;
+				case AND_4: return isGateActive ? IconTerrainConstants.Gate_Autarchic_Diamond_And_Dark : IconTerrainConstants.Gate_Autarchic_Diamond_And_Lit;
+				case OR_4: return isGateActive ? IconTerrainConstants.Gate_Autarchic_Diamond_Or_Dark : IconTerrainConstants.Gate_Autarchic_Diamond_Or_Lit;
+			}
 		}
 
 		return 0;
 	}
 
-	private int getTextureRow() {
-		if (hasPulser())
-			return 9;
-		else
-			return 8;
-	}
-
 	@Override
 	public String getGuiFile() {
 		if (kind == GateKind.Single)

common/buildcraft/transport/IconItemConstants.java

@@ -0,0 +1,23 @@
+package buildcraft.transport;
+
+public class IconItemConstants {
+	
+	public static final int Gate						=  0;
+	public static final int Gate_Iron_And					=  1;
+	public static final int Gate_Iron_Or					=  2;
+	public static final int Gate_Gold_And					=  3;
+	public static final int Gate_Gold_Or					=  4;
+	public static final int Gate_Diamond_And				=  5;
+	public static final int Gate_Diamond_Or					=  6;
+	
+	public static final int Autarchic_Gate					=  7;
+	public static final int Autarchic_Gate_Iron_And			=  8;
+	public static final int Autarchic_Gate_Iron_Or			=  9;
+	public static final int Autarchic_Gate_Gold_And			= 10;
+	public static final int Autarchic_Gate_Gold_Or			= 11;
+	public static final int Autarchic_Gate_Diamond_And		= 12;
+	public static final int Autarchic_Gate_Diamond_Or		= 13;
+
+	public static final int MAX 							= 14;
+
+}

common/buildcraft/transport/IconTerrainConstants.java

@@ -1,6 +1,6 @@
 package buildcraft.transport;
 
-public class IconConstants {
+public class IconTerrainConstants {
 	
 	public static final int PipeStructureCobblestone 		=  0;
 	public static final int PipeItemsCobbleStone 			=  1;
@@ -44,7 +44,39 @@ public class IconConstants {
 	public static final int Texture_Yellow_Lit				= 38;
 	public static final int Texture_Cyan 					= 39;
 	
-	public static final int MAX 							= 40;
+	public static final int Gate_Dark 						= 40;
+	public static final int Gate_Lit 						= 41;
+	public static final int Gate_Iron_And_Dark 				= 42;
+	public static final int Gate_Iron_And_Lit 				= 43;
+	public static final int Gate_Iron_Or_Dark 				= 43;
+	public static final int Gate_Iron_Or_Lit 				= 44;
+	public static final int Gate_Gold_And_Dark 				= 45;
+	public static final int Gate_Gold_And_Lit 				= 46;
+	public static final int Gate_Gold_Or_Dark 				= 47;
+	public static final int Gate_Gold_Or_Lit 				= 48;
+	public static final int Gate_Diamond_And_Dark 			= 49;
+	public static final int Gate_Diamond_And_Lit 			= 50;
+	public static final int Gate_Diamond_Or_Dark 			= 51;
+	public static final int Gate_Diamond_Or_Lit 			= 52;	
+	
+	public static final int Gate_Autarchic_Dark 			= 53;
+	public static final int Gate_Autarchic_Lit 				= 54;
+	public static final int Gate_Autarchic_Iron_And_Dark 	= 55;
+	public static final int Gate_Autarchic_Iron_And_Lit 	= 56;
+	public static final int Gate_Autarchic_Iron_Or_Dark 	= 57;
+	public static final int Gate_Autarchic_Iron_Or_Lit 		= 58;
+	public static final int Gate_Autarchic_Gold_And_Dark 	= 59;
+	public static final int Gate_Autarchic_Gold_And_Lit 	= 60;
+	public static final int Gate_Autarchic_Gold_Or_Dark 	= 61;
+	public static final int Gate_Autarchic_Gold_Or_Lit 		= 62;
+	public static final int Gate_Autarchic_Diamond_And_Dark = 63;
+	public static final int Gate_Autarchic_Diamond_And_Lit 	= 64;
+	public static final int Gate_Autarchic_Diamond_Or_Dark 	= 65;
+	public static final int Gate_Autarchic_Diamond_Or_Lit 	= 66;	
+	
+	public static final int MAX 							= 67;
+	
+	
 
 
 }

common/buildcraft/transport/ItemGate.java

@@ -7,6 +7,8 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.Icon;
+import buildcraft.BuildCraftTransport;
 import buildcraft.core.CreativeTabBuildCraft;
 import buildcraft.core.ItemBuildCraft;
 
@@ -26,30 +28,51 @@ public class ItemGate extends ItemBuildCraft {
 
 	@SuppressWarnings({ "all" })
 	@Override
-	public int getIconFromDamage(int i) {
+	@SideOnly(Side.CLIENT)
+	public Icon getIconFromDamage(int i) {
 		int n = 0;
 		if (series > 0) {
 			n = 3;
 		} else {
 			n = 2;
 		}
-
-		switch (i) {
-		case 0:
-			return n * 16 + 6;
-		case 1:
-			return n * 16 + 7;
-		case 2:
-			return n * 16 + 8;
-		case 3:
-			return n * 16 + 9;
-		case 4:
-			return n * 16 + 10;
-		case 5:
-			return n * 16 + 11;
-		default:
-			return n * 16 + 12;
+		
+		if (series == 0){	//Normal Gates
+			switch (i) {
+			case 0:
+				return BuildCraftTransport.instance.itemIcons[IconItemConstants.Gate];
+			case 1:
+				return BuildCraftTransport.instance.itemIcons[IconItemConstants.Gate_Iron_And];
+			case 2:
+				return BuildCraftTransport.instance.itemIcons[IconItemConstants.Gate_Iron_Or];
+			case 3:
+				return BuildCraftTransport.instance.itemIcons[IconItemConstants.Gate_Gold_And];
+			case 4:
+				return BuildCraftTransport.instance.itemIcons[IconItemConstants.Gate_Gold_Or];
+			case 5:
+				return BuildCraftTransport.instance.itemIcons[IconItemConstants.Gate_Diamond_And];
+			default:
+				return BuildCraftTransport.instance.itemIcons[IconItemConstants.Gate_Diamond_Or];
+			}
+		} else if (series == 1){
+			switch (i) {
+			case 0:
+				return BuildCraftTransport.instance.itemIcons[IconItemConstants.Autarchic_Gate];
+			case 1:
+				return BuildCraftTransport.instance.itemIcons[IconItemConstants.Autarchic_Gate_Iron_And];
+			case 2:
+				return BuildCraftTransport.instance.itemIcons[IconItemConstants.Autarchic_Gate_Iron_Or];
+			case 3:
+				return BuildCraftTransport.instance.itemIcons[IconItemConstants.Autarchic_Gate_Gold_And];
+			case 4:
+				return BuildCraftTransport.instance.itemIcons[IconItemConstants.Autarchic_Gate_Gold_Or];
+			case 5:
+				return BuildCraftTransport.instance.itemIcons[IconItemConstants.Autarchic_Gate_Diamond_And];
+			default:
+				return BuildCraftTransport.instance.itemIcons[IconItemConstants.Autarchic_Gate_Diamond_Or];
+			}
 		}
+		return null;
 	}
 
 	@Override

common/buildcraft/transport/PipeRenderState.java

@@ -16,7 +16,7 @@ import buildcraft.transport.utils.WireMatrix;
 public class PipeRenderState implements IClientState {
 
 	private boolean hasGate = false;
-	private int gateTextureIndex = 0;
+	private int gateIconIndex = 0;
 
 	public final ConnectionMatrix pipeConnectionMatrix = new ConnectionMatrix();
 	public final TextureMatrix textureMatrix = new TextureMatrix();
@@ -42,15 +42,15 @@ public class PipeRenderState implements IClientState {
 		return hasGate;
 	}
 
-	public void setGateTexture(int value) {
-		if (gateTextureIndex != value) {
-			gateTextureIndex = value;
+	public void setGateIconIndex(int value) {
+		if (gateIconIndex != value) {
+			gateIconIndex = value;
 			dirty = true;
 		}
 	}
 
-	public int getGateTextureIndex() {
-		return gateTextureIndex;
+	public int getGateIconIndex() {
+		return gateIconIndex;
 	}
 
 	public void clean() {
@@ -68,7 +68,7 @@ public class PipeRenderState implements IClientState {
 	@Override
 	public void writeData(DataOutputStream data) throws IOException {
 		data.writeBoolean(hasGate);
-		data.writeInt(gateTextureIndex);
+		data.writeInt(gateIconIndex);
 		pipeConnectionMatrix.writeData(data);
 		textureMatrix.writeData(data);
 		wireMatrix.writeData(data);
@@ -78,7 +78,7 @@ public class PipeRenderState implements IClientState {
 	@Override
 	public void readData(DataInputStream data) throws IOException {
 		hasGate = data.readBoolean();
-		gateTextureIndex = data.readInt();
+		gateIconIndex = data.readInt();
 		pipeConnectionMatrix.readData(data);
 		textureMatrix.readData(data);
 		wireMatrix.readData(data);

common/buildcraft/transport/TileGenericPipe.java

@@ -219,7 +219,7 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, ITank
 
 		// Gate Textures
 		renderState.setHasGate(pipe.hasGate());
-		renderState.setGateTexture(!pipe.hasGate() ? 0 : pipe.gate.getTexture(pipe.isGateActive()));
+		renderState.setGateIconIndex(!pipe.hasGate() ? 0 : pipe.gate.getTextureIconIndex(pipe.isGateActive()));
 
 		// Facades
 		for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) {

common/buildcraft/transport/TransportProxy.java

@@ -18,7 +18,11 @@ public class TransportProxy {
 	public void registerRenderers() {
 	}
 
-	public void loadIcons(BuildCraftTransport buildCraftTransport) {
+	public void loadTerrainIcons(BuildCraftTransport instance) {
+	}
+	
+	public void loadItemIcons(BuildCraftTransport instance){
+		
 	}
 
 }

common/buildcraft/transport/TransportProxyClient.java

@@ -62,60 +62,112 @@ public class TransportProxyClient extends TransportProxy {
 	}
 	
 	@Override
-	public void loadIcons(BuildCraftTransport instance) {
-		instance.icons = new Icon[IconConstants.MAX];
+	public void loadTerrainIcons(BuildCraftTransport instance) {
+		instance.terrainIcons = new Icon[IconTerrainConstants.MAX];
 		TextureMap terrainTextures = Minecraft.getMinecraft().renderEngine.field_94154_l;
-		instance.icons[IconConstants.PipeStructureCobblestone] = terrainTextures.func_94245_a("buildcraft:pipeStructureCobblestone");
 		
-		instance.icons[IconConstants.PipeItemsCobbleStone] = terrainTextures.func_94245_a("buildcraft:pipeItemsCobblestone");
+		instance.terrainIcons[IconTerrainConstants.PipeStructureCobblestone] = terrainTextures.func_94245_a("buildcraft:pipeStructureCobblestone");
 		
-		instance.icons[IconConstants.PipeItemsDiamond_Center] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_center");
-		instance.icons[IconConstants.PipeItemsDiamond_Down] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_down");
-		instance.icons[IconConstants.PipeItemsDiamond_Up] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_up");
-		instance.icons[IconConstants.PipeItemsDiamond_North] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_north");
-		instance.icons[IconConstants.PipeItemsDiamond_South] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_south");
-		instance.icons[IconConstants.PipeItemsDiamond_West] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_west");
-		instance.icons[IconConstants.PipeItemsDiamond_East] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_east");
+		instance.terrainIcons[IconTerrainConstants.PipeItemsCobbleStone] = terrainTextures.func_94245_a("buildcraft:pipeItemsCobblestone");
 		
-		instance.icons[IconConstants.PipeItemsWood_Standard] = terrainTextures.func_94245_a("buildcraft:pipeItemsWood_standard");
-		instance.icons[IconConstants.PipeAllWood_Solid] = terrainTextures.func_94245_a("buildcraft:pipeAllWood_solid");
+		instance.terrainIcons[IconTerrainConstants.PipeItemsDiamond_Center] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_center");
+		instance.terrainIcons[IconTerrainConstants.PipeItemsDiamond_Down] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_down");
+		instance.terrainIcons[IconTerrainConstants.PipeItemsDiamond_Up] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_up");
+		instance.terrainIcons[IconTerrainConstants.PipeItemsDiamond_North] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_north");
+		instance.terrainIcons[IconTerrainConstants.PipeItemsDiamond_South] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_south");
+		instance.terrainIcons[IconTerrainConstants.PipeItemsDiamond_West] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_west");
+		instance.terrainIcons[IconTerrainConstants.PipeItemsDiamond_East] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_east");
 		
-		instance.icons[IconConstants.PipeItemsEmerald_Standard] = terrainTextures.func_94245_a("buildcraft:pipeItemsEmerald_standard");
-		instance.icons[IconConstants.PipeAllEmerald_Solid] = terrainTextures.func_94245_a("buildcraft:pipeAllEmerald_solid");
+		instance.terrainIcons[IconTerrainConstants.PipeItemsWood_Standard] = terrainTextures.func_94245_a("buildcraft:pipeItemsWood_standard");
+		instance.terrainIcons[IconTerrainConstants.PipeAllWood_Solid] = terrainTextures.func_94245_a("buildcraft:pipeAllWood_solid");
 		
-		instance.icons[IconConstants.PipeItemsGold] = terrainTextures.func_94245_a("buildcraft:pipeItemsGold");
+		instance.terrainIcons[IconTerrainConstants.PipeItemsEmerald_Standard] = terrainTextures.func_94245_a("buildcraft:pipeItemsEmerald_standard");
+		instance.terrainIcons[IconTerrainConstants.PipeAllEmerald_Solid] = terrainTextures.func_94245_a("buildcraft:pipeAllEmerald_solid");
 		
-		instance.icons[IconConstants.PipeItemsIron_Standard] = terrainTextures.func_94245_a("buildcraft:pipeItemsIron_standard");
-		instance.icons[IconConstants.PipeAllIron_Solid] = terrainTextures.func_94245_a("buildcraft:pipeAllIron_solid");
+		instance.terrainIcons[IconTerrainConstants.PipeItemsGold] = terrainTextures.func_94245_a("buildcraft:pipeItemsGold");
 		
-		instance.icons[IconConstants.PipeItemsObsidian] = terrainTextures.func_94245_a("buildcraft:pipeItemsObsidian");
-		instance.icons[IconConstants.PipeItemsSandstone] = terrainTextures.func_94245_a("buildcraft:pipeItemsSandstone");
-		instance.icons[IconConstants.PipeItemsStone] = terrainTextures.func_94245_a("buildcraft:pipeItemsStone");
-		instance.icons[IconConstants.PipeItemsVoid] = terrainTextures.func_94245_a("buildcraft:pipeItemsVoid");
+		instance.terrainIcons[IconTerrainConstants.PipeItemsIron_Standard] = terrainTextures.func_94245_a("buildcraft:pipeItemsIron_standard");
+		instance.terrainIcons[IconTerrainConstants.PipeAllIron_Solid] = terrainTextures.func_94245_a("buildcraft:pipeAllIron_solid");
 		
-		instance.icons[IconConstants.PipeLiquidsCobblestone] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsCobblestone");
-		instance.icons[IconConstants.PipeLiquidsWood_Standard] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsWood_standard");
-		instance.icons[IconConstants.PipeLiquidsEmerald_Standard] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsEmerald_standard");
-		instance.icons[IconConstants.PipeLiquidsGold] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsGold");
-		instance.icons[IconConstants.PipeLiquidsIron_Standard] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsIron_standard");
-		instance.icons[IconConstants.PipeLiquidsSandstone] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsSandstone");
-		instance.icons[IconConstants.PipeLiquidsStone] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsStone");
-		instance.icons[IconConstants.PipeLiquidsVoid] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsVoid");
+		instance.terrainIcons[IconTerrainConstants.PipeItemsObsidian] = terrainTextures.func_94245_a("buildcraft:pipeItemsObsidian");
+		instance.terrainIcons[IconTerrainConstants.PipeItemsSandstone] = terrainTextures.func_94245_a("buildcraft:pipeItemsSandstone");
+		instance.terrainIcons[IconTerrainConstants.PipeItemsStone] = terrainTextures.func_94245_a("buildcraft:pipeItemsStone");
+		instance.terrainIcons[IconTerrainConstants.PipeItemsVoid] = terrainTextures.func_94245_a("buildcraft:pipeItemsVoid");
 		
-		instance.icons[IconConstants.PipePowerGold] = terrainTextures.func_94245_a("buildcraft:pipePowerGold");
-		instance.icons[IconConstants.PipePowerStone] = terrainTextures.func_94245_a("buildcraft:pipePowerStone");
-		instance.icons[IconConstants.PipePowerWood_Standard] = terrainTextures.func_94245_a("buildcraft:pipePowerWood_standard");
+		instance.terrainIcons[IconTerrainConstants.PipeLiquidsCobblestone] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsCobblestone");
+		instance.terrainIcons[IconTerrainConstants.PipeLiquidsWood_Standard] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsWood_standard");
+		instance.terrainIcons[IconTerrainConstants.PipeLiquidsEmerald_Standard] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsEmerald_standard");
+		instance.terrainIcons[IconTerrainConstants.PipeLiquidsGold] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsGold");
+		instance.terrainIcons[IconTerrainConstants.PipeLiquidsIron_Standard] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsIron_standard");
+		instance.terrainIcons[IconTerrainConstants.PipeLiquidsSandstone] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsSandstone");
+		instance.terrainIcons[IconTerrainConstants.PipeLiquidsStone] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsStone");
+		instance.terrainIcons[IconTerrainConstants.PipeLiquidsVoid] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsVoid");
 		
-		instance.icons[IconConstants.Texture_Red_Dark] = terrainTextures.func_94245_a("buildcraft:texture_red_dark");
-		instance.icons[IconConstants.Texture_Red_Lit] = terrainTextures.func_94245_a("buildcraft:texture_red_lit");
-		instance.icons[IconConstants.Texture_Blue_Dark] = terrainTextures.func_94245_a("buildcraft:texture_blue_dark");
-		instance.icons[IconConstants.Texture_Blue_Lit] = terrainTextures.func_94245_a("buildcraft:texture_blue_lit");
-		instance.icons[IconConstants.Texture_Green_Dark] = terrainTextures.func_94245_a("buildcraft:texture_green_dark");
-		instance.icons[IconConstants.Texture_Green_Lit] = terrainTextures.func_94245_a("buildcraft:texture_green_lit");
-		instance.icons[IconConstants.Texture_Yellow_Dark] = terrainTextures.func_94245_a("buildcraft:texture_yellow_dark");
-		instance.icons[IconConstants.Texture_Yellow_Lit] = terrainTextures.func_94245_a("buildcraft:texture_yellow_lit");
-		instance.icons[IconConstants.Texture_Cyan] = terrainTextures.func_94245_a("buildcraft:texture_cyan");
+		instance.terrainIcons[IconTerrainConstants.PipePowerGold] = terrainTextures.func_94245_a("buildcraft:pipePowerGold");
+		instance.terrainIcons[IconTerrainConstants.PipePowerStone] = terrainTextures.func_94245_a("buildcraft:pipePowerStone");
+		instance.terrainIcons[IconTerrainConstants.PipePowerWood_Standard] = terrainTextures.func_94245_a("buildcraft:pipePowerWood_standard");
 		
+		instance.terrainIcons[IconTerrainConstants.Texture_Red_Dark] = terrainTextures.func_94245_a("buildcraft:texture_red_dark");
+		instance.terrainIcons[IconTerrainConstants.Texture_Red_Lit] = terrainTextures.func_94245_a("buildcraft:texture_red_lit");
+		instance.terrainIcons[IconTerrainConstants.Texture_Blue_Dark] = terrainTextures.func_94245_a("buildcraft:texture_blue_dark");
+		instance.terrainIcons[IconTerrainConstants.Texture_Blue_Lit] = terrainTextures.func_94245_a("buildcraft:texture_blue_lit");
+		instance.terrainIcons[IconTerrainConstants.Texture_Green_Dark] = terrainTextures.func_94245_a("buildcraft:texture_green_dark");
+		instance.terrainIcons[IconTerrainConstants.Texture_Green_Lit] = terrainTextures.func_94245_a("buildcraft:texture_green_lit");
+		instance.terrainIcons[IconTerrainConstants.Texture_Yellow_Dark] = terrainTextures.func_94245_a("buildcraft:texture_yellow_dark");
+		instance.terrainIcons[IconTerrainConstants.Texture_Yellow_Lit] = terrainTextures.func_94245_a("buildcraft:texture_yellow_lit");
+		instance.terrainIcons[IconTerrainConstants.Texture_Cyan] = terrainTextures.func_94245_a("buildcraft:texture_cyan");
 		
+		instance.terrainIcons[IconTerrainConstants.Gate_Dark] = terrainTextures.func_94245_a("buildcraft:gate_dark");
+		instance.terrainIcons[IconTerrainConstants.Gate_Lit] = terrainTextures.func_94245_a("buildcraft:gate_lit");
+		instance.terrainIcons[IconTerrainConstants.Gate_Iron_And_Dark] = terrainTextures.func_94245_a("buildcraft:gate_iron_and_dark");
+		instance.terrainIcons[IconTerrainConstants.Gate_Iron_And_Lit] = terrainTextures.func_94245_a("buildcraft:gate_iron_and_lit");
+		instance.terrainIcons[IconTerrainConstants.Gate_Iron_Or_Dark] = terrainTextures.func_94245_a("buildcraft:gate_iron_or_dark");
+		instance.terrainIcons[IconTerrainConstants.Gate_Iron_Or_Lit] = terrainTextures.func_94245_a("buildcraft:gate_iron_or_lit");
+		instance.terrainIcons[IconTerrainConstants.Gate_Gold_And_Dark] = terrainTextures.func_94245_a("buildcraft:gate_gold_and_dark");
+		instance.terrainIcons[IconTerrainConstants.Gate_Gold_And_Lit] = terrainTextures.func_94245_a("buildcraft:gate_gold_and_lit");
+		instance.terrainIcons[IconTerrainConstants.Gate_Gold_Or_Dark] = terrainTextures.func_94245_a("buildcraft:gate_gold_or_dark");
+		instance.terrainIcons[IconTerrainConstants.Gate_Gold_Or_Lit] = terrainTextures.func_94245_a("buildcraft:gate_gold_or_lit");
+		instance.terrainIcons[IconTerrainConstants.Gate_Diamond_And_Dark] = terrainTextures.func_94245_a("buildcraft:gate_diamond_and_dark");
+		instance.terrainIcons[IconTerrainConstants.Gate_Diamond_And_Lit] = terrainTextures.func_94245_a("buildcraft:gate_diamond_and_lit");
+		instance.terrainIcons[IconTerrainConstants.Gate_Diamond_Or_Dark] = terrainTextures.func_94245_a("buildcraft:gate_diamond_or_dark");
+		instance.terrainIcons[IconTerrainConstants.Gate_Diamond_Or_Lit] = terrainTextures.func_94245_a("buildcraft:gate_diamond_or_lit");
+		
+		instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Dark] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_dark");
+		instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Lit] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_lit");
+		instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Iron_And_Dark] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_iron_and_dark");
+		instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Iron_And_Lit] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_iron_and_lit");
+		instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Iron_Or_Dark] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_iron_or_dark");
+		instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Iron_Or_Lit] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_iron_or_lit");
+		instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Gold_And_Dark] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_gold_and_dark");
+		instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Gold_And_Lit] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_gold_and_lit");
+		instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Gold_Or_Dark] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_gold_or_dark");
+		instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Gold_Or_Lit] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_gold_or_lit");
+		instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Diamond_And_Dark] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_diamond_and_dark");
+		instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Diamond_And_Lit] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_diamond_and_lit");
+		instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Diamond_Or_Dark] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_diamond_or_dark");
+		instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Diamond_Or_Lit] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_diamond_or_lit");	
+	}
+	
+	@Override
+	public void loadItemIcons(BuildCraftTransport instance) {
+		instance.itemIcons = new Icon[IconItemConstants.MAX];
+		TextureMap itemTextures = Minecraft.getMinecraft().renderEngine.field_94155_m;
+		
+		instance.itemIcons[IconItemConstants.Gate] = itemTextures.func_94245_a("buildcraft:gate");
+		instance.itemIcons[IconItemConstants.Gate_Iron_And] = itemTextures.func_94245_a("buildcraft:gate_iron_and");
+		instance.itemIcons[IconItemConstants.Gate_Iron_Or] = itemTextures.func_94245_a("buildcraft:gate_iron_or");
+		instance.itemIcons[IconItemConstants.Gate_Gold_And] = itemTextures.func_94245_a("buildcraft:gate_gold_and");
+		instance.itemIcons[IconItemConstants.Gate_Gold_Or] = itemTextures.func_94245_a("buildcraft:gate_gold_or");
+		instance.itemIcons[IconItemConstants.Gate_Diamond_And] = itemTextures.func_94245_a("buildcraft:gate_diamond_and");
+		instance.itemIcons[IconItemConstants.Gate_Diamond_Or] = itemTextures.func_94245_a("buildcraft:gate_diamond_or");
+		
+		instance.itemIcons[IconItemConstants.Autarchic_Gate] = itemTextures.func_94245_a("buildcraft:autarchic_gate");
+		instance.itemIcons[IconItemConstants.Autarchic_Gate_Iron_And] = itemTextures.func_94245_a("buildcraft:autarchic_gate_iron_and");
+		instance.itemIcons[IconItemConstants.Autarchic_Gate_Iron_Or] = itemTextures.func_94245_a("buildcraft:autarchic_gate_iron_or");
+		instance.itemIcons[IconItemConstants.Autarchic_Gate_Gold_And] = itemTextures.func_94245_a("buildcraft:autarchic_gate_gold_and");
+		instance.itemIcons[IconItemConstants.Autarchic_Gate_Gold_Or] = itemTextures.func_94245_a("buildcraft:autarchic_gate_gold_or");
+		instance.itemIcons[IconItemConstants.Autarchic_Gate_Diamond_And] = itemTextures.func_94245_a("buildcraft:autarchic_gate_diamond_and");
+		instance.itemIcons[IconItemConstants.Autarchic_Gate_Diamond_Or] = itemTextures.func_94245_a("buildcraft:autarchic_gate_diamond_or");
+
 	}
 }

common/buildcraft/transport/pipes/PipeItemsCobblestone.java

@@ -14,7 +14,7 @@ import net.minecraft.util.Icon;
 import net.minecraftforge.common.ForgeDirection;
 import buildcraft.BuildCraftTransport;
 import buildcraft.core.DefaultProps;
-import buildcraft.transport.IconConstants;
+import buildcraft.transport.IconTerrainConstants;
 import buildcraft.transport.Pipe;
 import buildcraft.transport.PipeTransportItems;
 
@@ -28,12 +28,12 @@ public class PipeItemsCobblestone extends Pipe {
 	@Override
 	@SideOnly(Side.CLIENT)
 	public Icon[] getTextureIcons() {
-		return BuildCraftTransport.instance.icons;
+		return BuildCraftTransport.instance.terrainIcons;
 	}
 
 	@Override
 	public int getIconIndex(ForgeDirection direction) {
-		return IconConstants.PipeItemsCobbleStone;
+		return IconTerrainConstants.PipeItemsCobbleStone;
 	}
 
 }

common/buildcraft/transport/pipes/PipeItemsDiamond.java

@@ -28,7 +28,7 @@ import buildcraft.api.transport.IPipedItem;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.network.IClientState;
 import buildcraft.transport.IPipeTransportItemsHook;
-import buildcraft.transport.IconConstants;
+import buildcraft.transport.IconTerrainConstants;
 import buildcraft.transport.Pipe;
 import buildcraft.transport.PipeTransportItems;
 
@@ -41,19 +41,19 @@ public class PipeItemsDiamond extends Pipe implements IPipeTransportItemsHook, I
 	@Override
 	@SideOnly(Side.CLIENT)
 	public Icon[] getTextureIcons() {
-		return BuildCraftTransport.instance.icons;
+		return BuildCraftTransport.instance.terrainIcons;
 	}
 
 	@Override
 	public int getIconIndex(ForgeDirection direction) {
 		switch(direction){
-			case UNKNOWN: return IconConstants.PipeItemsDiamond_Center;
-			case DOWN: return IconConstants.PipeItemsDiamond_Down;
-			case UP: return IconConstants.PipeItemsDiamond_Up;
-			case NORTH: return IconConstants.PipeItemsDiamond_North;
-			case SOUTH: return IconConstants.PipeItemsDiamond_South;
-			case WEST: return IconConstants.PipeItemsDiamond_West;
-			case EAST: return IconConstants.PipeItemsDiamond_East;
+			case UNKNOWN: return IconTerrainConstants.PipeItemsDiamond_Center;
+			case DOWN: return IconTerrainConstants.PipeItemsDiamond_Down;
+			case UP: return IconTerrainConstants.PipeItemsDiamond_Up;
+			case NORTH: return IconTerrainConstants.PipeItemsDiamond_North;
+			case SOUTH: return IconTerrainConstants.PipeItemsDiamond_South;
+			case WEST: return IconTerrainConstants.PipeItemsDiamond_West;
+			case EAST: return IconTerrainConstants.PipeItemsDiamond_East;
 			default: throw new IllegalArgumentException("direction out of bounds");
 		}
 	}

common/buildcraft/transport/pipes/PipeItemsEmerald.java

@@ -22,7 +22,7 @@ import buildcraft.core.proxy.CoreProxy;
 import buildcraft.core.utils.SimpleInventory;
 import buildcraft.core.utils.Utils;
 import buildcraft.transport.BlockGenericPipe;
-import buildcraft.transport.IconConstants;
+import buildcraft.transport.IconTerrainConstants;
 import buildcraft.transport.PipeTransportItems;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -40,8 +40,8 @@ public class PipeItemsEmerald extends PipeItemsWood implements ISpecialInventory
 	protected PipeItemsEmerald(int itemID, PipeTransportItems transport) {
 		super(transport, new PipeLogicEmerald(), itemID);
 
-		standardIconIndex = IconConstants.PipeItemsEmerald_Standard;
-		solidIconIndex = IconConstants.PipeAllEmerald_Solid;
+		standardIconIndex = IconTerrainConstants.PipeItemsEmerald_Standard;
+		solidIconIndex = IconTerrainConstants.PipeAllEmerald_Solid;
 	}
 
 	public PipeItemsEmerald(int itemID) {

common/buildcraft/transport/pipes/PipeItemsGold.java

@@ -21,7 +21,7 @@ import buildcraft.api.transport.IPipedItem;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.utils.Utils;
 import buildcraft.transport.IPipeTransportItemsHook;
-import buildcraft.transport.IconConstants;
+import buildcraft.transport.IconTerrainConstants;
 import buildcraft.transport.Pipe;
 import buildcraft.transport.PipeTransportItems;
 
@@ -34,12 +34,12 @@ public class PipeItemsGold extends Pipe implements IPipeTransportItemsHook {
 	@Override
 	@SideOnly(Side.CLIENT)
 	public Icon[] getTextureIcons() {
-		return BuildCraftTransport.instance.icons;
+		return BuildCraftTransport.instance.terrainIcons;
 	}
 
 	@Override
 	public int getIconIndex(ForgeDirection direction) {
-		return IconConstants.PipeItemsGold;
+		return IconTerrainConstants.PipeItemsGold;
 	}
 
 	@Override

common/buildcraft/transport/pipes/PipeItemsIron.java

@@ -14,14 +14,14 @@ import net.minecraft.util.Icon;
 import net.minecraftforge.common.ForgeDirection;
 import buildcraft.BuildCraftTransport;
 import buildcraft.core.DefaultProps;
-import buildcraft.transport.IconConstants;
+import buildcraft.transport.IconTerrainConstants;
 import buildcraft.transport.Pipe;
 import buildcraft.transport.PipeTransportItems;
 
 public class PipeItemsIron extends Pipe {
 
-	private int standardIconIndex = IconConstants.PipeItemsIron_Standard;
-	private int solidIconIndex = IconConstants.PipeAllIron_Solid;
+	private int standardIconIndex = IconTerrainConstants.PipeItemsIron_Standard;
+	private int solidIconIndex = IconTerrainConstants.PipeAllIron_Solid;
 
 	public PipeItemsIron(int itemID) {
 		super(new PipeTransportItems(), new PipeLogicIron(), itemID);
@@ -32,7 +32,7 @@ public class PipeItemsIron extends Pipe {
 	@Override
 	@SideOnly(Side.CLIENT)
 	public Icon[] getTextureIcons() {
-		return BuildCraftTransport.instance.icons;
+		return BuildCraftTransport.instance.terrainIcons;
 	}
 
 	@Override

common/buildcraft/transport/pipes/PipeItemsObsidian.java

@@ -34,7 +34,7 @@ import buildcraft.core.DefaultProps;
 import buildcraft.core.EntityPassiveItem;
 import buildcraft.core.proxy.CoreProxy;
 import buildcraft.core.utils.Utils;
-import buildcraft.transport.IconConstants;
+import buildcraft.transport.IconTerrainConstants;
 import buildcraft.transport.Pipe;
 import buildcraft.transport.PipeTransportItems;
 
@@ -62,12 +62,12 @@ public class PipeItemsObsidian extends Pipe implements IPowerReceptor {
 	@Override
 	@SideOnly(Side.CLIENT)
 	public Icon[] getTextureIcons() {
-		return BuildCraftTransport.instance.icons;
+		return BuildCraftTransport.instance.terrainIcons;
 	}
 
 	@Override
 	public int getIconIndex(ForgeDirection direction) {
-		return IconConstants.PipeItemsObsidian;
+		return IconTerrainConstants.PipeItemsObsidian;
 	}
 
 	@Override

common/buildcraft/transport/pipes/PipeItemsSandstone.java

@@ -15,7 +15,7 @@ import net.minecraft.util.Icon;
 import net.minecraftforge.common.ForgeDirection;
 import buildcraft.BuildCraftTransport;
 import buildcraft.core.DefaultProps;
-import buildcraft.transport.IconConstants;
+import buildcraft.transport.IconTerrainConstants;
 import buildcraft.transport.Pipe;
 import buildcraft.transport.PipeTransportItems;
 
@@ -27,11 +27,11 @@ public class PipeItemsSandstone extends Pipe {
 	@Override
 	@SideOnly(Side.CLIENT)
 	public Icon[] getTextureIcons() {
-		return BuildCraftTransport.instance.icons;
+		return BuildCraftTransport.instance.terrainIcons;
 	}
 
 	@Override
 	public int getIconIndex(ForgeDirection direction) {
-		return IconConstants.PipeItemsSandstone;
+		return IconTerrainConstants.PipeItemsSandstone;
 	}
 }

common/buildcraft/transport/pipes/PipeItemsStone.java

@@ -21,7 +21,7 @@ import buildcraft.api.transport.IPipedItem;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.utils.Utils;
 import buildcraft.transport.IPipeTransportItemsHook;
-import buildcraft.transport.IconConstants;
+import buildcraft.transport.IconTerrainConstants;
 import buildcraft.transport.Pipe;
 import buildcraft.transport.PipeTransportItems;
 
@@ -35,12 +35,12 @@ public class PipeItemsStone extends Pipe implements IPipeTransportItemsHook {
 	@Override
 	@SideOnly(Side.CLIENT)
 	public Icon[] getTextureIcons() {
-		return BuildCraftTransport.instance.icons;
+		return BuildCraftTransport.instance.terrainIcons;
 	}
 
 	@Override
 	public int getIconIndex(ForgeDirection direction) {
-		return IconConstants.PipeItemsStone;
+		return IconTerrainConstants.PipeItemsStone;
 	}
 
 	@Override

common/buildcraft/transport/pipes/PipeItemsVoid.java

@@ -18,7 +18,7 @@ import buildcraft.BuildCraftTransport;
 import buildcraft.core.DefaultProps;
 import buildcraft.transport.EntityData;
 import buildcraft.transport.IItemTravelingHook;
-import buildcraft.transport.IconConstants;
+import buildcraft.transport.IconTerrainConstants;
 import buildcraft.transport.Pipe;
 import buildcraft.transport.PipeTransportItems;
 
@@ -32,12 +32,12 @@ public class PipeItemsVoid extends Pipe implements IItemTravelingHook {
 	@Override
 	@SideOnly(Side.CLIENT)
 	public Icon[] getTextureIcons() {
-		return BuildCraftTransport.instance.icons;
+		return BuildCraftTransport.instance.terrainIcons;
 	}
 
 	@Override
 	public int getIconIndex(ForgeDirection direction) {
-		return IconConstants.PipeItemsVoid;
+		return IconTerrainConstants.PipeItemsVoid;
 	}
 
 	// This is called if the void pipe is only connected to one pipe

common/buildcraft/transport/pipes/PipeItemsWood.java

@@ -29,7 +29,7 @@ import buildcraft.core.DefaultProps;
 import buildcraft.core.EntityPassiveItem;
 import buildcraft.core.RedstonePowerFramework;
 import buildcraft.core.utils.Utils;
-import buildcraft.transport.IconConstants;
+import buildcraft.transport.IconTerrainConstants;
 import buildcraft.transport.Pipe;
 import buildcraft.transport.PipeTransportItems;
 
@@ -37,8 +37,8 @@ public class PipeItemsWood extends Pipe implements IPowerReceptor {
 
 	private IPowerProvider powerProvider;
 	
-	protected int standardIconIndex = IconConstants.PipeItemsWood_Standard;
-	protected int solidIconIndex = IconConstants.PipeAllWood_Solid;
+	protected int standardIconIndex = IconTerrainConstants.PipeItemsWood_Standard;
+	protected int solidIconIndex = IconTerrainConstants.PipeAllWood_Solid;
 
 	protected PipeItemsWood(PipeTransportItems transport, PipeLogic logic, int itemID) {
 		super(transport, logic, itemID);
@@ -59,7 +59,7 @@ public class PipeItemsWood extends Pipe implements IPowerReceptor {
 	@Override
 	@SideOnly(Side.CLIENT)
 	public Icon[] getTextureIcons() {
-		return BuildCraftTransport.instance.icons;
+		return BuildCraftTransport.instance.terrainIcons;
 	}
 
 	@Override

common/buildcraft/transport/pipes/PipeLiquidsCobblestone.java

@@ -14,7 +14,7 @@ import net.minecraft.util.Icon;
 import net.minecraftforge.common.ForgeDirection;
 import buildcraft.BuildCraftTransport;
 import buildcraft.core.DefaultProps;
-import buildcraft.transport.IconConstants;
+import buildcraft.transport.IconTerrainConstants;
 import buildcraft.transport.Pipe;
 import buildcraft.transport.PipeTransportLiquids;
 
@@ -27,11 +27,11 @@ public class PipeLiquidsCobblestone extends Pipe {
 	@Override
 	@SideOnly(Side.CLIENT)
 	public Icon[] getTextureIcons() {
-		return BuildCraftTransport.instance.icons;
+		return BuildCraftTransport.instance.terrainIcons;
 	}
 
 	@Override
 	public int getIconIndex(ForgeDirection direction) {
-		return IconConstants.PipeLiquidsCobblestone;
+		return IconTerrainConstants.PipeLiquidsCobblestone;
 	}
 }

common/buildcraft/transport/pipes/PipeLiquidsEmerald.java

@@ -8,7 +8,7 @@
  */
 package buildcraft.transport.pipes;
 
-import buildcraft.transport.IconConstants;
+import buildcraft.transport.IconTerrainConstants;
 import buildcraft.transport.PipeTransportLiquids;
 
 /**
@@ -20,8 +20,8 @@ public class PipeLiquidsEmerald extends PipeLiquidsWood {
 	public PipeLiquidsEmerald(int itemID) {
 		super(new PipeLogicEmerald(), itemID);
 
-		standardIconIndex = IconConstants.PipeLiquidsEmerald_Standard;
-		solidIconIndex = IconConstants.PipeAllEmerald_Solid;
+		standardIconIndex = IconTerrainConstants.PipeLiquidsEmerald_Standard;
+		solidIconIndex = IconTerrainConstants.PipeAllEmerald_Solid;
 
 		((PipeTransportLiquids) transport).flowRate = 40;
 		((PipeTransportLiquids) transport).travelDelay = 4;

common/buildcraft/transport/pipes/PipeLiquidsGold.java

@@ -14,7 +14,7 @@ import net.minecraft.util.Icon;
 import net.minecraftforge.common.ForgeDirection;
 import buildcraft.BuildCraftTransport;
 import buildcraft.core.DefaultProps;
-import buildcraft.transport.IconConstants;
+import buildcraft.transport.IconTerrainConstants;
 import buildcraft.transport.Pipe;
 import buildcraft.transport.PipeTransportLiquids;
 
@@ -30,12 +30,12 @@ public class PipeLiquidsGold extends Pipe {
 	@Override
 	@SideOnly(Side.CLIENT)
 	public Icon[] getTextureIcons() {
-		return BuildCraftTransport.instance.icons;
+		return BuildCraftTransport.instance.terrainIcons;
 	}
 
 	@Override
 	public int getIconIndex(ForgeDirection direction) {
-		return IconConstants.PipeLiquidsGold;
+		return IconTerrainConstants.PipeLiquidsGold;
 	}
 
 }

common/buildcraft/transport/pipes/PipeLiquidsIron.java

@@ -14,14 +14,14 @@ import net.minecraft.util.Icon;
 import net.minecraftforge.common.ForgeDirection;
 import buildcraft.BuildCraftTransport;
 import buildcraft.core.DefaultProps;
-import buildcraft.transport.IconConstants;
+import buildcraft.transport.IconTerrainConstants;
 import buildcraft.transport.Pipe;
 import buildcraft.transport.PipeTransportLiquids;
 
 public class PipeLiquidsIron extends Pipe {
 	
-	protected int standardIconIndex = IconConstants.PipeLiquidsIron_Standard;
-	protected int solidIconIndex = IconConstants.PipeAllIron_Solid;
+	protected int standardIconIndex = IconTerrainConstants.PipeLiquidsIron_Standard;
+	protected int solidIconIndex = IconTerrainConstants.PipeAllIron_Solid;
 
 
 	public PipeLiquidsIron(int itemID) {
@@ -31,7 +31,7 @@ public class PipeLiquidsIron extends Pipe {
 	@Override
 	@SideOnly(Side.CLIENT)
 	public Icon[] getTextureIcons() {
-		return BuildCraftTransport.instance.icons;
+		return BuildCraftTransport.instance.terrainIcons;
 	}
 
 	@Override

common/buildcraft/transport/pipes/PipeLiquidsSandstone.java

@@ -17,7 +17,7 @@ import net.minecraftforge.liquids.LiquidStack;
 import buildcraft.BuildCraftTransport;
 import buildcraft.core.DefaultProps;
 import buildcraft.transport.IPipeTransportLiquidsHook;
-import buildcraft.transport.IconConstants;
+import buildcraft.transport.IconTerrainConstants;
 import buildcraft.transport.Pipe;
 import buildcraft.transport.PipeTransportLiquids;
 import buildcraft.transport.TileGenericPipe;
@@ -30,12 +30,12 @@ public class PipeLiquidsSandstone extends Pipe implements IPipeTransportLiquidsH
 	@Override
 	@SideOnly(Side.CLIENT)
 	public Icon[] getTextureIcons() {
-		return BuildCraftTransport.instance.icons;
+		return BuildCraftTransport.instance.terrainIcons;
 	}
 
 	@Override
 	public int getIconIndex(ForgeDirection direction) {
-		return IconConstants.PipeLiquidsSandstone;
+		return IconTerrainConstants.PipeLiquidsSandstone;
 	}
 
 	@Override

common/buildcraft/transport/pipes/PipeLiquidsStone.java

@@ -14,7 +14,7 @@ import net.minecraft.util.Icon;
 import net.minecraftforge.common.ForgeDirection;
 import buildcraft.BuildCraftTransport;
 import buildcraft.core.DefaultProps;
-import buildcraft.transport.IconConstants;
+import buildcraft.transport.IconTerrainConstants;
 import buildcraft.transport.Pipe;
 import buildcraft.transport.PipeTransportLiquids;
 
@@ -29,12 +29,12 @@ public class PipeLiquidsStone extends Pipe {
 	@Override
 	@SideOnly(Side.CLIENT)
 	public Icon[] getTextureIcons() {
-		return BuildCraftTransport.instance.icons;
+		return BuildCraftTransport.instance.terrainIcons;
 	}
 
 	@Override
 	public int getIconIndex(ForgeDirection direction) {
-		return IconConstants.PipeLiquidsStone;
+		return IconTerrainConstants.PipeLiquidsStone;
 	}
 
 }

common/buildcraft/transport/pipes/PipeLiquidsVoid.java

@@ -17,7 +17,7 @@ import net.minecraftforge.liquids.LiquidStack;
 import buildcraft.BuildCraftTransport;
 import buildcraft.core.DefaultProps;
 import buildcraft.transport.IPipeTransportLiquidsHook;
-import buildcraft.transport.IconConstants;
+import buildcraft.transport.IconTerrainConstants;
 import buildcraft.transport.Pipe;
 import buildcraft.transport.PipeTransportLiquids;
 
@@ -30,12 +30,12 @@ public class PipeLiquidsVoid extends Pipe implements IPipeTransportLiquidsHook {
 	@Override
 	@SideOnly(Side.CLIENT)
 	public Icon[] getTextureIcons() {
-		return BuildCraftTransport.instance.icons;
+		return BuildCraftTransport.instance.terrainIcons;
 	}
 
 	@Override
 	public int getIconIndex(ForgeDirection direction) {
-		return IconConstants.PipeLiquidsVoid;
+		return IconTerrainConstants.PipeLiquidsVoid;
 	}
 
 	@Override

common/buildcraft/transport/pipes/PipeLiquidsWood.java

@@ -26,7 +26,7 @@ import buildcraft.api.transport.PipeManager;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.RedstonePowerFramework;
 import buildcraft.core.network.TileNetworkData;
-import buildcraft.transport.IconConstants;
+import buildcraft.transport.IconTerrainConstants;
 import buildcraft.transport.Pipe;
 import buildcraft.transport.PipeTransportLiquids;
 
@@ -37,8 +37,8 @@ public class PipeLiquidsWood extends Pipe implements IPowerReceptor {
 
 	private IPowerProvider powerProvider;
 
-	protected int standardIconIndex = IconConstants.PipeLiquidsWood_Standard;
-	protected int solidIconIndex = IconConstants.PipeAllWood_Solid;
+	protected int standardIconIndex = IconTerrainConstants.PipeLiquidsWood_Standard;
+	protected int solidIconIndex = IconTerrainConstants.PipeAllWood_Solid;
 
 	long lastMining = 0;
 	boolean lastPower = false;
@@ -128,7 +128,7 @@ public class PipeLiquidsWood extends Pipe implements IPowerReceptor {
 	@Override
 	@SideOnly(Side.CLIENT)
 	public Icon[] getTextureIcons() {
-		return BuildCraftTransport.instance.icons;
+		return BuildCraftTransport.instance.terrainIcons;
 	}
 
 	@Override

common/buildcraft/transport/pipes/PipePowerGold.java

@@ -14,7 +14,7 @@ import net.minecraft.util.Icon;
 import net.minecraftforge.common.ForgeDirection;
 import buildcraft.BuildCraftTransport;
 import buildcraft.core.DefaultProps;
-import buildcraft.transport.IconConstants;
+import buildcraft.transport.IconTerrainConstants;
 import buildcraft.transport.Pipe;
 import buildcraft.transport.PipeTransportPower;
 
@@ -29,12 +29,12 @@ public class PipePowerGold extends Pipe {
 	@Override
 	@SideOnly(Side.CLIENT)
 	public Icon[] getTextureIcons() {
-		return BuildCraftTransport.instance.icons;
+		return BuildCraftTransport.instance.terrainIcons;
 	}
 
 	@Override
 	public int getIconIndex(ForgeDirection direction) {
-		return IconConstants.PipePowerGold;
+		return IconTerrainConstants.PipePowerGold;
 	}
 
 }

common/buildcraft/transport/pipes/PipePowerStone.java

@@ -14,7 +14,7 @@ import net.minecraft.util.Icon;
 import net.minecraftforge.common.ForgeDirection;
 import buildcraft.BuildCraftTransport;
 import buildcraft.core.DefaultProps;
-import buildcraft.transport.IconConstants;
+import buildcraft.transport.IconTerrainConstants;
 import buildcraft.transport.Pipe;
 import buildcraft.transport.PipeTransportPower;
 
@@ -27,12 +27,12 @@ public class PipePowerStone extends Pipe {
 	@Override
 	@SideOnly(Side.CLIENT)
 	public Icon[] getTextureIcons() {
-		return BuildCraftTransport.instance.icons;
+		return BuildCraftTransport.instance.terrainIcons;
 	}
 
 	@Override
 	public int getIconIndex(ForgeDirection direction) {
-		return IconConstants.PipePowerStone;
+		return IconTerrainConstants.PipePowerStone;
 	}
 
 }

common/buildcraft/transport/pipes/PipePowerWood.java

@@ -19,7 +19,7 @@ import buildcraft.api.power.IPowerReceptor;
 import buildcraft.api.power.PowerFramework;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.utils.Utils;
-import buildcraft.transport.IconConstants;
+import buildcraft.transport.IconTerrainConstants;
 import buildcraft.transport.Pipe;
 import buildcraft.transport.PipeTransportPower;
 import buildcraft.transport.TileGenericPipe;
@@ -30,8 +30,8 @@ public class PipePowerWood extends Pipe implements IPowerReceptor {
 
 	private IPowerProvider powerProvider;
 	
-	protected int standardIconIndex = IconConstants.PipePowerWood_Standard;
-	protected int solidIconIndex = IconConstants.PipeAllWood_Solid;
+	protected int standardIconIndex = IconTerrainConstants.PipePowerWood_Standard;
+	protected int solidIconIndex = IconTerrainConstants.PipeAllWood_Solid;
 
 
 	private int overheatTicks;
@@ -47,7 +47,7 @@ public class PipePowerWood extends Pipe implements IPowerReceptor {
 	@Override
 	@SideOnly(Side.CLIENT)
 	public Icon[] getTextureIcons() {
-		return BuildCraftTransport.instance.icons;
+		return BuildCraftTransport.instance.terrainIcons;
 	}
 
 	@Override

common/buildcraft/transport/pipes/PipeStructureCobblestone.java

@@ -6,7 +6,7 @@ import net.minecraft.util.Icon;
 import net.minecraftforge.common.ForgeDirection;
 import buildcraft.BuildCraftTransport;
 import buildcraft.core.DefaultProps;
-import buildcraft.transport.IconConstants;
+import buildcraft.transport.IconTerrainConstants;
 import buildcraft.transport.Pipe;
 import buildcraft.transport.PipeTransportStructure;
 
@@ -19,11 +19,11 @@ public class PipeStructureCobblestone extends Pipe {
 	@Override
 	@SideOnly(Side.CLIENT)
 	public Icon[] getTextureIcons() {
-		return BuildCraftTransport.instance.icons;
+		return BuildCraftTransport.instance.terrainIcons;
 	}
 	
 	@Override
 	public int getIconIndex(ForgeDirection direction) {
-		return IconConstants.PipeStructureCobblestone;
+		return IconTerrainConstants.PipeStructureCobblestone;
 	}
 }

common/buildcraft/transport/render/FacadeItemRenderer.java

@@ -13,7 +13,7 @@ import org.lwjgl.opengl.GL11;
 import buildcraft.BuildCraftTransport;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.utils.Utils;
-import buildcraft.transport.IconConstants;
+import buildcraft.transport.IconTerrainConstants;
 import buildcraft.transport.ItemFacade;
 import buildcraft.transport.pipes.PipeStructureCobblestone;
 
@@ -65,7 +65,7 @@ public class FacadeItemRenderer implements IItemRenderer {
 
 		// Render StructurePipe
 		block = BuildCraftTransport.genericPipeBlock;
-		Icon textureID = BuildCraftTransport.instance.icons[IconConstants.PipeStructureCobblestone]; // Structure pipe
+		Icon textureID = BuildCraftTransport.instance.terrainIcons[IconTerrainConstants.PipeStructureCobblestone]; // Structure pipe
 		
 		block.setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos - 1F / 16F);
 		block.setBlockBoundsForItemRender();

common/buildcraft/transport/render/PipeWorldRenderer.java

@@ -12,7 +12,7 @@ import buildcraft.api.transport.IPipe.WireColor;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.utils.Utils;
 import buildcraft.transport.IPipeRenderState;
-import buildcraft.transport.IconConstants;
+import buildcraft.transport.IconTerrainConstants;
 import buildcraft.transport.PipeRenderState;
 import buildcraft.transport.TransportProxy;
 import buildcraft.transport.pipes.PipeStructureCobblestone;
@@ -139,22 +139,22 @@ public class PipeWorldRenderer implements ISimpleBlockRenderingHandler {
 		block.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
 
 		if (state.wireMatrix.hasWire(WireColor.Red)) {
-			state.currentTexture = BuildCraftTransport.instance.icons[state.wireMatrix.isWireLit(WireColor.Red)?IconConstants.Texture_Red_Lit:IconConstants.Texture_Red_Dark];
+			state.currentTexture = BuildCraftTransport.instance.terrainIcons[state.wireMatrix.isWireLit(WireColor.Red)?IconTerrainConstants.Texture_Red_Lit:IconTerrainConstants.Texture_Red_Dark];
 			pipeWireRender(renderblocks, block, state, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMinPos, IPipe.WireColor.Red, x, y, z);
 		}
 
 		if (state.wireMatrix.hasWire(WireColor.Blue)) {
-			state.currentTexture = BuildCraftTransport.instance.icons[state.wireMatrix.isWireLit(WireColor.Blue)?IconConstants.Texture_Blue_Lit:IconConstants.Texture_Blue_Dark];
+			state.currentTexture = BuildCraftTransport.instance.terrainIcons[state.wireMatrix.isWireLit(WireColor.Blue)?IconTerrainConstants.Texture_Blue_Lit:IconTerrainConstants.Texture_Blue_Dark];
 			pipeWireRender(renderblocks, block, state, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos, IPipe.WireColor.Blue, x, y, z);
 		}
 
 		if (state.wireMatrix.hasWire(WireColor.Green)) {
-			state.currentTexture = BuildCraftTransport.instance.icons[state.wireMatrix.isWireLit(WireColor.Green)?IconConstants.Texture_Green_Lit:IconConstants.Texture_Green_Dark];
+			state.currentTexture = BuildCraftTransport.instance.terrainIcons[state.wireMatrix.isWireLit(WireColor.Green)?IconTerrainConstants.Texture_Green_Lit:IconTerrainConstants.Texture_Green_Dark];
 			pipeWireRender(renderblocks, block, state, Utils.pipeMaxPos, Utils.pipeMinPos, Utils.pipeMinPos, IPipe.WireColor.Green, x, y, z);
 		}
 
 		if (state.wireMatrix.hasWire(WireColor.Yellow)) {
-			state.currentTexture = BuildCraftTransport.instance.icons[state.wireMatrix.isWireLit(WireColor.Yellow)?IconConstants.Texture_Yellow_Lit:IconConstants.Texture_Yellow_Dark];
+			state.currentTexture = BuildCraftTransport.instance.terrainIcons[state.wireMatrix.isWireLit(WireColor.Yellow)?IconTerrainConstants.Texture_Yellow_Lit:IconTerrainConstants.Texture_Yellow_Dark];
 			pipeWireRender(renderblocks, block, state, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, IPipe.WireColor.Yellow, x, y, z);
 		}
 
@@ -241,7 +241,7 @@ public class PipeWorldRenderer implements ISimpleBlockRenderingHandler {
 		zeroState[2][0] = Utils.pipeMinPos;
 		zeroState[2][1] = Utils.pipeMaxPos;
 
-		state.currentTexture = BuildCraftTransport.instance.icons[IconConstants.PipeStructureCobblestone]; // Structure Pipe
+		state.currentTexture = BuildCraftTransport.instance.terrainIcons[IconTerrainConstants.PipeStructureCobblestone]; // Structure Pipe
 
 		for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) {
 			if (state.facadeMatrix.isConnected(direction) && !state.pipeConnectionMatrix.isConnected(direction)) {
@@ -476,7 +476,7 @@ public class PipeWorldRenderer implements ISimpleBlockRenderingHandler {
 
 	private void pipeGateRender(RenderBlocks renderblocks, Block block, PipeRenderState state, int x, int y, int z) {
 
-		state.currentTexture = state.getGateTextureIndex();
+		state.currentTexture = BuildCraftTransport.instance.itemIcons[state.getGateIconIndex()];
 
 		float min = Utils.pipeMinPos + 0.05F;
 		float max = Utils.pipeMaxPos - 0.05F;

common/buildcraft/transport/render/RenderPipe.java

@@ -36,7 +36,7 @@ import buildcraft.core.render.RenderEntityBlock;
 import buildcraft.core.render.RenderEntityBlock.BlockInterface;
 import buildcraft.core.utils.Utils;
 import buildcraft.transport.EntityData;
-import buildcraft.transport.IconConstants;
+import buildcraft.transport.IconTerrainConstants;
 import buildcraft.transport.Pipe;
 import buildcraft.transport.PipeTransportItems;
 import buildcraft.transport.PipeTransportLiquids;
@@ -195,7 +195,7 @@ public class RenderPipe extends TileEntitySpecialRenderer {
 		initialized = true;
 
 		BlockInterface block = new BlockInterface();
-		block.texture = BuildCraftTransport.instance.icons[IconConstants.Texture_Cyan];
+		block.texture = BuildCraftTransport.instance.terrainIcons[IconTerrainConstants.Texture_Cyan];
 
 		float size = Utils.pipeMaxPos - Utils.pipeMinPos;
 
@@ -221,7 +221,7 @@ public class RenderPipe extends TileEntitySpecialRenderer {
 			GL11.glEndList();
 		}
 
-		block.texture = BuildCraftTransport.instance.icons[IconConstants.Texture_Red_Dark];
+		block.texture = BuildCraftTransport.instance.terrainIcons[IconTerrainConstants.Texture_Red_Dark];
 
 		size = Utils.pipeMaxPos - Utils.pipeMinPos;