Fix for MCP names update

Fix liquid render breaking texture binds
BuildCraft · Apr 11, 2013 · e80d50e · e80d50e
1 parent 027a700
commit e80d50e
Show file tree

Hide file tree

Showing 28 changed files with 90 additions and 90 deletions.
diff --git a/common/buildcraft/BuildCraftBuilders.java b/common/buildcraft/BuildCraftBuilders.java
@@ -198,7 +198,7 @@ public void load(FMLInitializationEvent evt) {
 		new BptBlockStairs(Block.stairsStoneBrick.blockID);
 
 		new BptBlockDoor(Block.doorWood.blockID, new ItemStack(Item.doorWood));
-		new BptBlockDoor(Block.doorSteel.blockID, new ItemStack(Item.doorSteel));
+		new BptBlockDoor(Block.doorIron.blockID, new ItemStack(Item.doorIron));
 
 		new BptBlockBed(Block.bed.blockID);
 

diff --git a/common/buildcraft/BuildCraftFactory.java b/common/buildcraft/BuildCraftFactory.java
@@ -224,7 +224,7 @@ public static void loadRecipes() {
 
 		if (allowMining) {
 			CoreProxy.proxy.addCraftingRecipe(new ItemStack(miningWellBlock, 1), new Object[] { "ipi", "igi", "iPi", Character.valueOf('p'), Item.redstone,
-					Character.valueOf('i'), Item.ingotIron, Character.valueOf('g'), BuildCraftCore.ironGearItem, Character.valueOf('P'), Item.pickaxeSteel });
+					Character.valueOf('i'), Item.ingotIron, Character.valueOf('g'), BuildCraftCore.ironGearItem, Character.valueOf('P'), Item.pickaxeIron });
 
 			CoreProxy.proxy.addCraftingRecipe(
 					new ItemStack(quarryBlock),

diff --git a/common/buildcraft/builders/BlockArchitect.java b/common/buildcraft/builders/BlockArchitect.java
@@ -116,11 +116,11 @@ public Icon getBlockTexture(IBlockAccess iblockaccess, int i, int j, int k, int
 		if (l == 1)
 			return blockTextureTopArchitect;
 
-		return getBlockTextureFromSideAndMetadata(l, m);
+		return getIcon(l, m);
 	}
 
 	@Override
-	public Icon getBlockTextureFromSideAndMetadata(int i, int j) {
+	public Icon getIcon(int i, int j) {
 		if (j == 0 && i == 3)
 			return blockTextureFront;
 

diff --git a/common/buildcraft/builders/BlockBlueprintLibrary.java b/common/buildcraft/builders/BlockBlueprintLibrary.java
@@ -62,7 +62,7 @@ public TileEntity createNewTileEntity(World var1) {
 	}
 
 	@Override
-	public Icon getBlockTextureFromSideAndMetadata(int i, int j) {
+	public Icon getIcon(int i, int j) {
 		switch (i) {
 		case 0:
 		case 1:

diff --git a/common/buildcraft/builders/BlockBuilder.java b/common/buildcraft/builders/BlockBuilder.java
@@ -50,7 +50,7 @@ public TileEntity createNewTileEntity(World var1) {
 	}
 
 	@Override
-	public Icon getBlockTextureFromSideAndMetadata(int i, int j) {
+	public Icon getIcon(int i, int j) {
 		if (j == 0 && i == 3)
 			return blockTextureFront;
 

diff --git a/common/buildcraft/builders/BlockFiller.java b/common/buildcraft/builders/BlockFiller.java
@@ -62,7 +62,7 @@ public Icon getBlockTexture(IBlockAccess iblockaccess, int i, int j, int k, int
 		int m = iblockaccess.getBlockMetadata(i, j, k);
 
 		if (iblockaccess == null)
-			return getBlockTextureFromSideAndMetadata(i, m);
+			return getIcon(i, m);
 
 		TileEntity tile = iblockaccess.getBlockTileEntity(i, j, k);
 
@@ -79,11 +79,11 @@ public Icon getBlockTexture(IBlockAccess iblockaccess, int i, int j, int k, int
 				return textureSides;
 		}
 
-		return getBlockTextureFromSideAndMetadata(l, m);
+		return getIcon(l, m);
 	}
 
 	@Override
-	public Icon getBlockTextureFromSideAndMetadata(int i, int j) {
+	public Icon getIcon(int i, int j) {
 		if (i == 0 || i == 1)
 			return textureTopOn;
 		else

diff --git a/common/buildcraft/builders/ItemBptBluePrint.java b/common/buildcraft/builders/ItemBptBluePrint.java
@@ -33,7 +33,7 @@ public Icon getIconFromDamage(int i) {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void updateIcons(IconRegister par1IconRegister)
+	public void registerIcons(IconRegister par1IconRegister)
 	{
 	    cleanBlueprint = par1IconRegister.registerIcon("buildcraft:blueprint_clean");
 	    usedBlueprint = par1IconRegister.registerIcon("buildcraft:blueprint_used");

diff --git a/common/buildcraft/builders/ItemBptTemplate.java b/common/buildcraft/builders/ItemBptTemplate.java
@@ -14,16 +14,16 @@ public ItemBptTemplate(int i) {
 	@Override
 	public Icon getIconFromDamage(int i) {
 		if (i == 0)
-			return iconIndex;
+			return itemIcon;
 		else
 			return usedTemplate;
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void updateIcons(IconRegister par1IconRegister)
+	public void registerIcons(IconRegister par1IconRegister)
 	{
-		iconIndex = par1IconRegister.registerIcon("buildcraft:template_clean");
+		itemIcon = par1IconRegister.registerIcon("buildcraft:template_clean");
 		usedTemplate = par1IconRegister.registerIcon("buildcraft:template_used");
 	}
 }
diff --git a/common/buildcraft/core/ItemBuildCraft.java b/common/buildcraft/core/ItemBuildCraft.java
@@ -28,17 +28,17 @@ public ItemBuildCraft(int i) {
 	public String getItemDisplayName(ItemStack itemstack) {
 		return StringUtil.localize(getUnlocalizedName(itemstack));
 	}
-	
+
 	@Override
 	public Item setUnlocalizedName(String par1Str) {
 		iconName = par1Str;
 		return super.setUnlocalizedName(par1Str);
 	}
-	
+
 	@Override
     @SideOnly(Side.CLIENT)
-    public void updateIcons(IconRegister par1IconRegister)
+    public void registerIcons(IconRegister par1IconRegister)
     {
-        this.iconIndex = par1IconRegister.registerIcon("buildcraft:" + iconName);
+        this.itemIcon = par1IconRegister.registerIcon("buildcraft:" + iconName);
     }
 }
diff --git a/common/buildcraft/core/ItemRedstoneChipset.java b/common/buildcraft/core/ItemRedstoneChipset.java
@@ -44,7 +44,7 @@ public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List itemList)
 	private static String[] chipsetNames = { "redstone_red", "redstone_iron", "redstone_gold", "redstone_diamond", "redstone_pulsating" };
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void updateIcons(IconRegister par1IconRegister)
+	public void registerIcons(IconRegister par1IconRegister)
 	{
 	    icons = new Icon[chipsetNames.length];
 	    int i = 0;

diff --git a/common/buildcraft/core/render/RenderingEntityBlocks.java b/common/buildcraft/core/render/RenderingEntityBlocks.java
@@ -63,27 +63,27 @@ public void renderInventoryBlock(Block block, int metadata, int modelID, RenderB
 			GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
 			tessellator.startDrawingQuads();
 			tessellator.setNormal(0.0F, -1F, 0.0F);
-			renderer.renderBottomFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(0, metadata));
+			renderer.renderBottomFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, metadata));
 			tessellator.draw();
 			tessellator.startDrawingQuads();
 			tessellator.setNormal(0.0F, 1.0F, 0.0F);
-			renderer.renderTopFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(1, metadata));
+			renderer.renderTopFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, metadata));
 			tessellator.draw();
 			tessellator.startDrawingQuads();
 			tessellator.setNormal(0.0F, 0.0F, -1F);
-			renderer.renderEastFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(2, metadata));
+			renderer.renderEastFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, metadata));
 			tessellator.draw();
 			tessellator.startDrawingQuads();
 			tessellator.setNormal(0.0F, 0.0F, 1.0F);
-			renderer.renderWestFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(3, metadata));
+			renderer.renderWestFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, metadata));
 			tessellator.draw();
 			tessellator.startDrawingQuads();
 			tessellator.setNormal(-1F, 0.0F, 0.0F);
-			renderer.renderNorthFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(4, metadata));
+			renderer.renderNorthFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, metadata));
 			tessellator.draw();
 			tessellator.startDrawingQuads();
 			tessellator.setNormal(1.0F, 0.0F, 0.0F);
-			renderer.renderSouthFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(5, metadata));
+			renderer.renderSouthFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, metadata));
 			tessellator.draw();
 			GL11.glTranslatef(0.5F, 0.5F, 0.5F);
 			block.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);

diff --git a/common/buildcraft/energy/BlockOilFlowing.java b/common/buildcraft/energy/BlockOilFlowing.java
@@ -29,7 +29,7 @@ public class BlockOilFlowing extends BlockFluid implements ILiquid {
 	int numAdjacentSources = 0;
 	boolean isOptimalFlowDirection[] = new boolean[4];
 	int flowCost[] = new int[4];
-	
+
 	public BlockOilFlowing(int i, Material material) {
 		super(i, material);
 
@@ -209,7 +209,7 @@ private boolean[] getOptimalFlowDirections(World world, int i, int j, int k) {
 
 	private boolean blockBlocksFlow(World world, int i, int j, int k) {
 		int l = world.getBlockId(i, j, k);
-		if (l == Block.doorWood.blockID || l == Block.doorSteel.blockID || l == Block.signPost.blockID || l == Block.ladder.blockID || l == Block.reed.blockID)
+		if (l == Block.doorWood.blockID || l == Block.doorIron.blockID || l == Block.signPost.blockID || l == Block.ladder.blockID || l == Block.reed.blockID)
 			return true;
 		if (l == 0)
 			return false;
@@ -262,11 +262,11 @@ public int stillLiquidMeta() {
 	public boolean isBlockReplaceable(World world, int i, int j, int k) {
 		return true;
 	}
-	
+
 	@Override
     	@SideOnly(Side.CLIENT)
 	public void registerIcons(IconRegister iconRegister){
 		this.theIcon = new Icon[] {iconRegister.registerIcon("buildcraft:oil"), iconRegister.registerIcon("buildcraft:oil_flow")};
 	}
-	
+
 }
diff --git a/common/buildcraft/energy/ItemBucketOil.java b/common/buildcraft/energy/ItemBucketOil.java
@@ -32,8 +32,8 @@ public String getItemDisplayName(ItemStack itemstack) {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void updateIcons(IconRegister par1IconRegister)
+	public void registerIcons(IconRegister par1IconRegister)
 	{
-		this.iconIndex = par1IconRegister.registerIcon("buildcraft:oil_bucket");
+		this.itemIcon = par1IconRegister.registerIcon("buildcraft:oil_bucket");
 	}
 }
diff --git a/common/buildcraft/factory/BlockAutoWorkbench.java b/common/buildcraft/factory/BlockAutoWorkbench.java
@@ -37,7 +37,7 @@ public BlockAutoWorkbench(int i) {
 	}
 
 	@Override
-	public Icon getBlockTextureFromSideAndMetadata(int i, int j) {
+	public Icon getIcon(int i, int j) {
 		if (i == 1 || i == 0)
 			return topTexture;
 		else

diff --git a/common/buildcraft/factory/BlockMiningWell.java b/common/buildcraft/factory/BlockMiningWell.java
@@ -38,7 +38,7 @@ public BlockMiningWell(int i) {
 	}
 
 	@Override
-	public Icon getBlockTextureFromSideAndMetadata(int i, int j) {
+	public Icon getIcon(int i, int j) {
 		if (j == 0 && i == 3)
 			return textureFront;
 

diff --git a/common/buildcraft/factory/BlockPump.java b/common/buildcraft/factory/BlockPump.java
@@ -41,7 +41,7 @@ public TileEntity createNewTileEntity(World var1) {
 	}
 
 	@Override
-	public Icon getBlockTextureFromSideAndMetadata(int i, int j) {
+	public Icon getIcon(int i, int j) {
 		switch (i) {
 		case 0:
 			return textureBottom;

diff --git a/common/buildcraft/factory/BlockQuarry.java b/common/buildcraft/factory/BlockQuarry.java
@@ -58,7 +58,7 @@ public void onBlockPlacedBy(World world, int i, int j, int k, EntityLiving entit
 	}
 
 	@Override
-	public Icon getBlockTextureFromSideAndMetadata(int i, int j) {
+	public Icon getIcon(int i, int j) {
 		// If no metadata is set, then this is an icon.
 		if (j == 0 && i == 3)
 			return textureFront;

diff --git a/common/buildcraft/factory/BlockTank.java b/common/buildcraft/factory/BlockTank.java
@@ -63,7 +63,7 @@ public TileEntity createNewTileEntity(World var1) {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) {
+	public Icon getIcon(int par1, int par2) {
 		switch(par1){
 		case 0:
 		case 1:
@@ -72,7 +72,7 @@ public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) {
 			return textureBottomSide;
 		}
 	}
-	
+
 	@SuppressWarnings({ "all" })
 	public Icon getBlockTexture(IBlockAccess iblockaccess, int i, int j, int k, int l) {
 		switch (l) {

diff --git a/common/buildcraft/silicon/BlockAssemblyTable.java b/common/buildcraft/silicon/BlockAssemblyTable.java
@@ -65,7 +65,7 @@ public void breakBlock(World world, int x, int y, int z, int par5, int par6) {
 	}
 
 	@Override
-	public Icon getBlockTextureFromSideAndMetadata(int i, int j) {
+	public Icon getIcon(int i, int j) {
 	    int s = i > 1 ? 2 : i;
 	    return icons[j][s];
 	}

diff --git a/common/buildcraft/silicon/BlockLaser.java b/common/buildcraft/silicon/BlockLaser.java
@@ -59,7 +59,7 @@ public TileEntity createNewTileEntity(World var1) {
 	}
 
 	@Override
-	public Icon getBlockTextureFromSideAndMetadata(int i, int j) {
+	public Icon getIcon(int i, int j) {
 		if (i == ForgeDirection.values()[j].getOpposite().ordinal())
 			return textureBottom;
 		else if (i == j)

diff --git a/common/buildcraft/silicon/SiliconRenderBlock.java b/common/buildcraft/silicon/SiliconRenderBlock.java
@@ -142,32 +142,32 @@ private void renderBlockInInv(RenderBlocks renderblocks, Block block, int i) {
 		Tessellator tessellator = Tessellator.instance;
 		tessellator.startDrawingQuads();
 		tessellator.setNormal(0.0F, -1F, 0.0F);
-		renderblocks.renderBottomFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(0, i));
+		renderblocks.renderBottomFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, i));
 		tessellator.draw();
 
 		tessellator.startDrawingQuads();
 		tessellator.setNormal(0.0F, 1.0F, 0.0F);
-		renderblocks.renderTopFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(1, i));
+		renderblocks.renderTopFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, i));
 		tessellator.draw();
 
 		tessellator.startDrawingQuads();
 		tessellator.setNormal(0.0F, 0.0F, -1F);
-		renderblocks.renderEastFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(2, i));
+		renderblocks.renderEastFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, i));
 		tessellator.draw();
 
 		tessellator.startDrawingQuads();
 		tessellator.setNormal(0.0F, 0.0F, 1.0F);
-		renderblocks.renderWestFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(3, i));
+		renderblocks.renderWestFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, i));
 		tessellator.draw();
 
 		tessellator.startDrawingQuads();
 		tessellator.setNormal(-1F, 0.0F, 0.0F);
-		renderblocks.renderNorthFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(4, i));
+		renderblocks.renderNorthFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, i));
 		tessellator.draw();
 
 		tessellator.startDrawingQuads();
 		tessellator.setNormal(1.0F, 0.0F, 0.0F);
-		renderblocks.renderSouthFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(5, i));
+		renderblocks.renderSouthFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, i));
 		tessellator.draw();
 	}
 
@@ -179,13 +179,13 @@ private void renderBlockInInv(RenderBlocks renderblocks, Block block, int i) {
 	/*
 	 * @Override public void handlePacket(Packet230ModLoader packet) { switch (PacketIds.values()[packet.packetType]) { case AssemblyTableSelect: GuiScreen
 	 * screen = ModLoader.getMinecraftInstance().currentScreen;
-	 * 
+	 *
 	 * if (screen instanceof GuiAssemblyTable) { GuiAssemblyTable gui = (GuiAssemblyTable) screen; SelectionMessage message = new SelectionMessage();
-	 * 
+	 *
 	 * TileAssemblyTable.selectionMessageWrapper.updateFromPacket(message, packet);
-	 * 
+	 *
 	 * gui.handleSelectionMessage (message); }
-	 * 
+	 *
 	 * break; } }
 	 */