diff --git a/src/main/java/tconstruct/client/armor/RenderArmorCast.java b/src/main/java/tconstruct/client/armor/RenderArmorCast.java index 8eeefe651b5..364c12a587a 100644 --- a/src/main/java/tconstruct/client/armor/RenderArmorCast.java +++ b/src/main/java/tconstruct/client/armor/RenderArmorCast.java @@ -11,9 +11,9 @@ import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; public class RenderArmorCast implements IItemRenderer { @@ -49,7 +49,7 @@ public void renderItem (ItemRenderType type, ItemStack item, Object... data) { RenderBlocks renderer = Minecraft.getMinecraft().renderGlobal.globalRenderBlocks; Tessellator tessellator = Tessellator.instance; - Icon baseIcon = item.getItem() instanceof ArmorPattern ? ((ArmorPattern) item.getItem()).getBaseIcon() : item.getIconIndex(); + IIcon baseIcon = item.getItem() instanceof ArmorPattern ? ((ArmorPattern) item.getItem()).getBaseIcon() : item.getIconIndex(); GL11.glPushMatrix(); switch (type) { @@ -70,9 +70,9 @@ public void renderItem (ItemRenderType type, ItemStack item, Object... data) default: break; } - renderer.setRenderBounds(0.1F, 0.1F, 0.1F, 0.9F, 0.83F, 0.9F); + renderer.func_147782_a(0.1F, 0.1F, 0.1F, 0.9F, 0.83F, 0.9F); renderCube(tessellator, renderer, baseIcon); - renderer.setRenderBounds(0.1F, 0.1F, 0.1F, 0.9F, 1.0F, 0.9F); + renderer.func_147782_a(0.1F, 0.1F, 0.1F, 0.9F, 1.0F, 0.9F); ArrayList sides = new ArrayList(); sides.add(ForgeDirection.NORTH); sides.add(ForgeDirection.SOUTH); @@ -129,7 +129,7 @@ public void renderSelectedCube (Tessellator tessellator, RenderBlocks renderer, public void renderCastTop (ItemStack par1ItemStack, ItemRenderType type) { GL11.glPushMatrix(); - Icon icon = par1ItemStack.getIconIndex(); + IIcon icon = par1ItemStack.getIconIndex(); if (icon == null) { diff --git a/src/main/java/tconstruct/client/block/BarricadeRender.java b/src/main/java/tconstruct/client/block/BarricadeRender.java index cdccefb053b..3f9e0a67a24 100644 --- a/src/main/java/tconstruct/client/block/BarricadeRender.java +++ b/src/main/java/tconstruct/client/block/BarricadeRender.java @@ -27,100 +27,101 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block if (meta / 4 == 0) { //if (type >= 0) - renderer.setRenderBounds(0.125, 0.0, 0.5, 0.375, 1.0, 0.75); - renderer.renderStandardBlock(barricade, x, y, z); + //TODO func_147782_a + renderer.func_147782_a(0.125, 0.0, 0.5, 0.375, 1.0, 0.75); + renderer.func_147784_q(barricade, x, y, z); if (type >= 1) { - renderer.setRenderBounds(0.625, 0.0, 0.5, 0.875, 1.0, 0.75); - renderer.renderStandardBlock(barricade, x, y, z); + renderer.func_147782_a(0.625, 0.0, 0.5, 0.875, 1.0, 0.75); + renderer.func_147784_q(barricade, x, y, z); } if (type >= 2) { - renderer.setRenderBounds(0.0, 0.125, 0.25, 1.0, 0.375, 0.5); - renderer.renderStandardBlock(barricade, x, y, z); + renderer.func_147782_a(0.0, 0.125, 0.25, 1.0, 0.375, 0.5); + renderer.func_147784_q(barricade, x, y, z); } if (type >= 3) { - renderer.setRenderBounds(0.0, 0.625, 0.25, 1.0, 0.875, 0.5); - renderer.renderStandardBlock(barricade, x, y, z); + renderer.func_147782_a(0.0, 0.625, 0.25, 1.0, 0.875, 0.5); + renderer.func_147784_q(barricade, x, y, z); } } if (meta / 4 == 1) { //if (type >= 0) - renderer.setRenderBounds(0.25, 0.0, 0.125, 0.5, 1.0, 0.375); - renderer.renderStandardBlock(barricade, x, y, z); + renderer.func_147782_a(0.25, 0.0, 0.125, 0.5, 1.0, 0.375); + renderer.func_147784_q(barricade, x, y, z); if (type >= 1) { - renderer.setRenderBounds(0.25, 0.0, 0.625, 0.5, 1.0, 0.875); - renderer.renderStandardBlock(barricade, x, y, z); + renderer.func_147782_a(0.25, 0.0, 0.625, 0.5, 1.0, 0.875); + renderer.func_147784_q(barricade, x, y, z); } if (type >= 2) { - renderer.setRenderBounds(0.5, 0.125, 0.0, 0.75, 0.375, 1.0); - renderer.renderStandardBlock(barricade, x, y, z); + renderer.func_147782_a(0.5, 0.125, 0.0, 0.75, 0.375, 1.0); + renderer.func_147784_q(barricade, x, y, z); } if (type >= 3) { - renderer.setRenderBounds(0.5, 0.625, 0.0, 0.75, 0.875, 1.0); - renderer.renderStandardBlock(barricade, x, y, z); + renderer.func_147782_a(0.5, 0.625, 0.0, 0.75, 0.875, 1.0); + renderer.func_147784_q(barricade, x, y, z); } } if (meta / 4 == 2) { //if (type >= 0) - renderer.setRenderBounds(0.125, 0.0, 0.25, 0.375, 1.0, 0.5); - renderer.renderStandardBlock(barricade, x, y, z); + renderer.func_147782_a(0.125, 0.0, 0.25, 0.375, 1.0, 0.5); + renderer.func_147784_q(barricade, x, y, z); if (type >= 1) { - renderer.setRenderBounds(0.625, 0.0, 0.25, 0.875, 1.0, 0.5); - renderer.renderStandardBlock(barricade, x, y, z); + renderer.func_147782_a(0.625, 0.0, 0.25, 0.875, 1.0, 0.5); + renderer.func_147784_q(barricade, x, y, z); } if (type >= 2) { - renderer.setRenderBounds(0.0, 0.125, 0.5, 1.0, 0.375, 0.75); - renderer.renderStandardBlock(barricade, x, y, z); + renderer.func_147782_a(0.0, 0.125, 0.5, 1.0, 0.375, 0.75); + renderer.func_147784_q(barricade, x, y, z); } if (type >= 3) { - renderer.setRenderBounds(0.0, 0.625, 0.5, 1.0, 0.875, 0.75); - renderer.renderStandardBlock(barricade, x, y, z); + renderer.func_147782_a(0.0, 0.625, 0.5, 1.0, 0.875, 0.75); + renderer.func_147784_q(barricade, x, y, z); } } if (meta / 4 == 3) { //if (type >= 0) - renderer.setRenderBounds(0.5, 0.0, 0.125, 0.75, 1.0, 0.375); - renderer.renderStandardBlock(barricade, x, y, z); + renderer.func_147782_a(0.5, 0.0, 0.125, 0.75, 1.0, 0.375); + renderer.func_147784_q(barricade, x, y, z); if (type >= 1) { - renderer.setRenderBounds(0.5, 0.0, 0.625, 0.75, 1.0, 0.875); - renderer.renderStandardBlock(barricade, x, y, z); + renderer.func_147782_a(0.5, 0.0, 0.625, 0.75, 1.0, 0.875); + renderer.func_147784_q(barricade, x, y, z); } if (type >= 2) { - renderer.setRenderBounds(0.25, 0.125, 0.0, 0.5, 0.375, 1.0); - renderer.renderStandardBlock(barricade, x, y, z); + renderer.func_147782_a(0.25, 0.125, 0.0, 0.5, 0.375, 1.0); + renderer.func_147784_q(barricade, x, y, z); } if (type >= 3) { - renderer.setRenderBounds(0.25, 0.625, 0.0, 0.5, 0.875, 1.0); - renderer.renderStandardBlock(barricade, x, y, z); + renderer.func_147782_a(0.25, 0.625, 0.0, 0.5, 0.875, 1.0); + renderer.func_147784_q(barricade, x, y, z); } } @@ -134,15 +135,15 @@ public void renderInventoryBlock (Block block, int metadata, int modelID, Render { if (modelID == model) { - renderer.setRenderBounds(0.375F, 0.0F, 0.375F, 0.625F, 1.0F, 0.625F); + renderer.func_147782_a(0.375F, 0.0F, 0.375F, 0.625F, 1.0F, 0.625F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.375F, 0.375F, 0.0F, 0.625F, 0.625F, 1.0F); + renderer.func_147782_a(0.375F, 0.375F, 0.0F, 0.625F, 0.625F, 1.0F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); } } @Override - public boolean shouldRender3DInInventory () + public boolean shouldRender3DInInventory (int modelId) { return true; } @@ -152,4 +153,6 @@ public int getRenderId () { return model; } + + } diff --git a/src/main/java/tconstruct/client/block/BlockRenderCastingChannel.java b/src/main/java/tconstruct/client/block/BlockRenderCastingChannel.java index 0a486311216..57c74445f9d 100644 --- a/src/main/java/tconstruct/client/block/BlockRenderCastingChannel.java +++ b/src/main/java/tconstruct/client/block/BlockRenderCastingChannel.java @@ -28,28 +28,28 @@ public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer) { //Floor - renderer.setRenderBounds(0.3125D, 0.375D, 0.3125D, 0.6875D, 0.5D, 0.6875D); - this.renderStandardBlock(block, metadata, renderer); + renderer.func_147782_a(0.3125D, 0.375D, 0.3125D, 0.6875D, 0.5D, 0.6875D); + this.func_147784_q(block, metadata, renderer); //Channel Z- - renderer.setRenderBounds(0.3125D, 0.375D, 0D, 0.6875D, 0.5D, 0.3125D); - this.renderStandardBlock(block, metadata, renderer); - renderer.setRenderBounds(0.3125D, 0.5D, 0D, 0.375D, 0.625D, 0.3125D); - this.renderStandardBlock(block, metadata, renderer); - renderer.setRenderBounds(0.625D, 0.5D, 0D, 0.6875D, 0.625D, 0.3125D); - this.renderStandardBlock(block, metadata, renderer); + renderer.func_147782_a(0.3125D, 0.375D, 0D, 0.6875D, 0.5D, 0.3125D); + this.func_147784_q(block, metadata, renderer); + renderer.func_147782_a(0.3125D, 0.5D, 0D, 0.375D, 0.625D, 0.3125D); + this.func_147784_q(block, metadata, renderer); + renderer.func_147782_a(0.625D, 0.5D, 0D, 0.6875D, 0.625D, 0.3125D); + this.func_147784_q(block, metadata, renderer); //Channel Z+ - renderer.setRenderBounds(0.3125D, 0.375D, 0.6875D, 0.6875D, 0.5D, 1D); - this.renderStandardBlock(block, metadata, renderer); - renderer.setRenderBounds(0.3125D, 0.5D, 0.6875D, 0.375D, 0.625D, 1D); - this.renderStandardBlock(block, metadata, renderer); - renderer.setRenderBounds(0.625D, 0.5D, 0.6875D, 0.6875D, 0.625D, 1D); - this.renderStandardBlock(block, metadata, renderer); + renderer.func_147782_a(0.3125D, 0.375D, 0.6875D, 0.6875D, 0.5D, 1D); + this.func_147784_q(block, metadata, renderer); + renderer.func_147782_a(0.3125D, 0.5D, 0.6875D, 0.375D, 0.625D, 1D); + this.func_147784_q(block, metadata, renderer); + renderer.func_147782_a(0.625D, 0.5D, 0.6875D, 0.6875D, 0.625D, 1D); + this.func_147784_q(block, metadata, renderer); //Wall X- - renderer.setRenderBounds(0.3125D, 0.375D, 0.3125D, 0.375D, 0.625D, 0.6875D); - this.renderStandardBlock(block, metadata, renderer); + renderer.func_147782_a(0.3125D, 0.375D, 0.3125D, 0.375D, 0.625D, 0.6875D); + this.func_147784_q(block, metadata, renderer); //Wall X+ - renderer.setRenderBounds(0.625D, 0.375D, 0.3125D, 0.6875D, 0.625D, 0.6875D); - this.renderStandardBlock(block, metadata, renderer); + renderer.func_147782_a(0.625D, 0.375D, 0.3125D, 0.6875D, 0.625D, 0.6875D); + this.func_147784_q(block, metadata, renderer); } @Override @@ -61,91 +61,91 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block if (!tile.hasTankConnected(ForgeDirection.DOWN))//CentrePiece, floor is removed if tank below is found { - renderer.setRenderBounds(0.3125D, 0.375D, 0.3125D, 0.6875D, 0.5D, 0.6875D); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.3125D, 0.375D, 0.3125D, 0.6875D, 0.5D, 0.6875D); + renderer.func_147784_q(block, x, y, z); } else //"Guiding Borders" when tank below is found { - renderer.setRenderBounds(0.375D, 0.125D, 0.3125D, 0.625D, 0.5D, 0.375D); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.375D, 0.125D, 0.625D, 0.625D, 0.5D, 0.6875D); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.3125D, 0.125D, 0.3125D, 0.375D, 0.5D, 0.6875D); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.625D, 0.125D, 0.3125D, 0.6875D, 0.5D, 0.6875D); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.375D, 0.125D, 0.3125D, 0.625D, 0.5D, 0.375D); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.375D, 0.125D, 0.625D, 0.625D, 0.5D, 0.6875D); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.3125D, 0.125D, 0.3125D, 0.375D, 0.5D, 0.6875D); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.625D, 0.125D, 0.3125D, 0.6875D, 0.5D, 0.6875D); + renderer.func_147784_q(block, x, y, z); } - /*renderer.setRenderBounds(0.3125D, 0.375D, 0.3125D, 0.375D, 0.625D, 0.375D); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.3125D, 0.375D, 0.625D, 0.375D, 0.625D, 0.6875D); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.625D, 0.375D, 0.3125D, 0.6875D, 0.625D, 0.375D); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.625D, 0.375D, 0.625D, 0.6875D, 0.625D, 0.6875D); - renderer.renderStandardBlock(block, x, y, z);*/ + /*renderer.func_147782_a(0.3125D, 0.375D, 0.3125D, 0.375D, 0.625D, 0.375D); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.3125D, 0.375D, 0.625D, 0.375D, 0.625D, 0.6875D); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.625D, 0.375D, 0.3125D, 0.6875D, 0.625D, 0.375D); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.625D, 0.375D, 0.625D, 0.6875D, 0.625D, 0.6875D); + renderer.func_147784_q(block, x, y, z);*/ if (tile.hasTankConnected(ForgeDirection.NORTH))//Channel to Z- { - renderer.setRenderBounds(0.3125D, 0.375D, 0D, 0.6875D, 0.5D, 0.3125D); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.3125D, 0.5D, 0D, 0.375D, 0.625D, 0.3125D); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.625D, 0.5D, 0D, 0.6875D, 0.625D, 0.3125D); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.3125D, 0.375D, 0D, 0.6875D, 0.5D, 0.3125D); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.3125D, 0.5D, 0D, 0.375D, 0.625D, 0.3125D); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.625D, 0.5D, 0D, 0.6875D, 0.625D, 0.3125D); + renderer.func_147784_q(block, x, y, z); } else //Wall to Z- { - renderer.setRenderBounds(0.375D, 0.5D, 0.3125D, 0.625D, 0.625D, 0.375D); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.375D, 0.5D, 0.3125D, 0.625D, 0.625D, 0.375D); + renderer.func_147784_q(block, x, y, z); } if (tile.hasTankConnected(ForgeDirection.SOUTH))//Channel to Z+ { - renderer.setRenderBounds(0.3125D, 0.375D, 0.6875D, 0.6875D, 0.5D, 1D); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.3125D, 0.5D, 0.6875D, 0.375D, 0.625D, 1D); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.625D, 0.5D, 0.6875D, 0.6875D, 0.625D, 1D); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.3125D, 0.375D, 0.6875D, 0.6875D, 0.5D, 1D); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.3125D, 0.5D, 0.6875D, 0.375D, 0.625D, 1D); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.625D, 0.5D, 0.6875D, 0.6875D, 0.625D, 1D); + renderer.func_147784_q(block, x, y, z); } else //Wall to Z+ { - renderer.setRenderBounds(0.375D, 0.5D, 0.625D, 0.625D, 0.625D, 0.6875D); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.375D, 0.5D, 0.625D, 0.625D, 0.625D, 0.6875D); + renderer.func_147784_q(block, x, y, z); } if (tile.hasTankConnected(ForgeDirection.WEST))//Channel to X- { - renderer.setRenderBounds(0D, 0.375D, 0.3125D, 0.3125D, 0.5D, 0.6875D); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0D, 0.5D, 0.3125D, 0.375D, 0.625D, 0.375D); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0D, 0.5D, 0.625D, 0.375D, 0.625D, 0.6875D); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0D, 0.375D, 0.3125D, 0.3125D, 0.5D, 0.6875D); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0D, 0.5D, 0.3125D, 0.375D, 0.625D, 0.375D); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0D, 0.5D, 0.625D, 0.375D, 0.625D, 0.6875D); + renderer.func_147784_q(block, x, y, z); } else //Wall to X- { - renderer.setRenderBounds(0.3125D, 0.5D, 0.3125D, 0.375D, 0.625D, 0.6875D); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.3125D, 0.5D, 0.3125D, 0.375D, 0.625D, 0.6875D); + renderer.func_147784_q(block, x, y, z); } if (tile.hasTankConnected(ForgeDirection.EAST))//Channel to X+ { - renderer.setRenderBounds(0.6875D, 0.375D, 0.3125D, 1D, 0.5D, 0.6875D); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.625D, 0.5D, 0.3125D, 1D, 0.625D, 0.375D); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.625D, 0.5D, 0.625D, 1D, 0.625D, 0.6875D); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.6875D, 0.375D, 0.3125D, 1D, 0.5D, 0.6875D); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.625D, 0.5D, 0.3125D, 1D, 0.625D, 0.375D); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.625D, 0.5D, 0.625D, 1D, 0.625D, 0.6875D); + renderer.func_147784_q(block, x, y, z); } else //Wall to X+ { - renderer.setRenderBounds(0.625D, 0.5D, 0.3125D, 0.6875D, 0.625D, 0.6875D); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.625D, 0.5D, 0.3125D, 0.6875D, 0.625D, 0.6875D); + renderer.func_147784_q(block, x, y, z); } if (tile.liquid != null) @@ -156,7 +156,7 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block //if(tile.nearbyChannel(ForgeDirection.DOWN))startY = -0.5D; //else if(tile.hasTankConnected(ForgeDirection.DOWN))startY = 0D; float liquidAmount = tile.liquid.amount / 288f * 0.125f; - renderer.setRenderBounds(0.375D, startY, 0.375D, 0.625D, 0.5 + liquidAmount, 0.625D); //Center + renderer.func_147782_a(0.375D, startY, 0.375D, 0.625D, 0.5 + liquidAmount, 0.625D); //Center renderLiquidPart(world, x, y, z, block, renderer, tile); //TConstruct.logger.info(tile.recentlyFilledDelay); @@ -164,14 +164,14 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block { if (tile.lastProvider == ForgeDirection.NORTH) { - renderer.setRenderBounds(0.375D, 0.5D, 0D, 0.625D, 0.5 + liquidAmount, 0.375D); + renderer.func_147782_a(0.375D, 0.5D, 0D, 0.625D, 0.5 + liquidAmount, 0.375D); renderLiquidPart(world, x, y, z, block, renderer, tile); } else { if (tile.recentlyFilledDelay == 0) { - renderer.setRenderBounds(0.375D, 0.5D, 0D, 0.625D, 0.5 + liquidAmount, 0.375D); + renderer.func_147782_a(0.375D, 0.5D, 0D, 0.625D, 0.5 + liquidAmount, 0.375D); renderLiquidPart(world, x, y, z, block, renderer, tile); } } @@ -180,14 +180,14 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block { if (tile.lastProvider == ForgeDirection.SOUTH) { - renderer.setRenderBounds(0.375D, 0.5D, 0.625D, 0.625D, 0.5 + liquidAmount, 1D); + renderer.func_147782_a(0.375D, 0.5D, 0.625D, 0.625D, 0.5 + liquidAmount, 1D); renderLiquidPart(world, x, y, z, block, renderer, tile); } else { if (tile.recentlyFilledDelay == 0) { - renderer.setRenderBounds(0.375D, 0.5D, 0.625D, 0.625D, 0.5 + liquidAmount, 1D); + renderer.func_147782_a(0.375D, 0.5D, 0.625D, 0.625D, 0.5 + liquidAmount, 1D); renderLiquidPart(world, x, y, z, block, renderer, tile); } } @@ -196,14 +196,14 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block { if (tile.lastProvider == ForgeDirection.WEST) { - renderer.setRenderBounds(0D, 0.5D, 0.375D, 0.375D, 0.5 + liquidAmount, 0.625D); + renderer.func_147782_a(0D, 0.5D, 0.375D, 0.375D, 0.5 + liquidAmount, 0.625D); renderLiquidPart(world, x, y, z, block, renderer, tile); } else { if (tile.recentlyFilledDelay == 0) { - renderer.setRenderBounds(0D, 0.5D, 0.375D, 0.375D, 0.5 + liquidAmount, 0.625D); + renderer.func_147782_a(0D, 0.5D, 0.375D, 0.375D, 0.5 + liquidAmount, 0.625D); renderLiquidPart(world, x, y, z, block, renderer, tile); } } @@ -212,14 +212,14 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block { if (tile.lastProvider == ForgeDirection.EAST) { - renderer.setRenderBounds(0.625D, 0.5D, 0.375D, 1D, 0.5 + liquidAmount, 0.625D); + renderer.func_147782_a(0.625D, 0.5D, 0.375D, 1D, 0.5 + liquidAmount, 0.625D); renderLiquidPart(world, x, y, z, block, renderer, tile); } else { if (tile.recentlyFilledDelay == 0) { - renderer.setRenderBounds(0.625D, 0.5D, 0.375D, 1D, 0.5 + liquidAmount, 0.625D); + renderer.func_147782_a(0.625D, 0.5D, 0.375D, 1D, 0.5 + liquidAmount, 0.625D); renderLiquidPart(world, x, y, z, block, renderer, tile); } } @@ -227,7 +227,7 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block } /*if(tile.lastProvider==ForgeDirection.UP && tile.recentlyFilledDelay != 0) { - renderer.setRenderBounds(0.375D, 0.5D, 0.375D, 0.625D, 1D, 0.625D); + renderer.func_147782_a(0.375D, 0.5D, 0.375D, 0.625D, 1D, 0.625D); renderLiquidPart(world, x, y, z, block, renderer, tile); }*/ @@ -235,12 +235,12 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block { if(tile.recentlyFilledDelay == 0 || tile.lastProvider == ForgeDirection.UP) { - renderer.setRenderBounds(0.375D, 0.5D, 0D, 0.625D, 0.625D, 0.375D); + renderer.func_147782_a(0.375D, 0.5D, 0D, 0.625D, 0.625D, 0.375D); renderLiquidPart(world, x, y, z, block, renderer, tile); } if(tile.recentlyFilledDelay != 0 && tile.lastProvider == ForgeDirection.UP) { - renderer.setRenderBounds(0.375D, 0.375D, 0.375D, 0.625D, 1D, 0.625D); + renderer.func_147782_a(0.375D, 0.375D, 0.375D, 0.625D, 1D, 0.625D); renderLiquidPart(world, x, y, z, block, renderer, tile); } } @@ -248,12 +248,12 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block { if(tile.recentlyFilledDelay == 0 || tile.lastProvider == ForgeDirection.UP) { - renderer.setRenderBounds(0.375D, 0.5D, 0.625D, 0.625D, 0.625D, 1D); + renderer.func_147782_a(0.375D, 0.5D, 0.625D, 0.625D, 0.625D, 1D); renderLiquidPart(world, x, y, z, block, renderer, tile); } if(tile.recentlyFilledDelay != 0 && tile.lastProvider == ForgeDirection.UP) { - renderer.setRenderBounds(0.375D, 0.375D, 0.375D, 0.625D, 1D, 0.625D); + renderer.func_147782_a(0.375D, 0.375D, 0.375D, 0.625D, 1D, 0.625D); renderLiquidPart(world, x, y, z, block, renderer, tile); } } @@ -261,12 +261,12 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block { if(tile.recentlyFilledDelay == 0 || tile.lastProvider == ForgeDirection.UP) { - renderer.setRenderBounds(0D, 0.5D, 0.375D, 0.375D, 0.625D, 0.625D); + renderer.func_147782_a(0D, 0.5D, 0.375D, 0.375D, 0.625D, 0.625D); renderLiquidPart(world, x, y, z, block, renderer, tile); } if(tile.recentlyFilledDelay != 0 && tile.lastProvider == ForgeDirection.UP) { - renderer.setRenderBounds(0.375D, 0.375D, 0.375D, 0.625D, 1D, 0.625D); + renderer.func_147782_a(0.375D, 0.375D, 0.375D, 0.625D, 1D, 0.625D); renderLiquidPart(world, x, y, z, block, renderer, tile); } } @@ -274,33 +274,33 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block { if(tile.recentlyFilledDelay == 0 || tile.lastProvider == ForgeDirection.UP) { - renderer.setRenderBounds(0.625D, 0.5D, 0.375D, 1D, 0.625D, 0.625D); + renderer.func_147782_a(0.625D, 0.5D, 0.375D, 1D, 0.625D, 0.625D); renderLiquidPart(world, x, y, z, block, renderer, tile); } if(tile.recentlyFilledDelay != 0 && tile.lastProvider == ForgeDirection.UP) { - renderer.setRenderBounds(0.375D, 0.375D, 0.375D, 0.625D, 1D, 0.625D); + renderer.func_147782_a(0.375D, 0.375D, 0.375D, 0.625D, 1D, 0.625D); renderLiquidPart(world, x, y, z, block, renderer, tile); } } if(tile.lastProvider==ForgeDirection.NORTH && tile.recentlyFilledDelay != 0) { - renderer.setRenderBounds(0.375D, 0.5D, 0.625D, 0.625D, 0.625D, 1D); + renderer.func_147782_a(0.375D, 0.5D, 0.625D, 0.625D, 0.625D, 1D); renderLiquidPart(world, x, y, z, block, renderer, tile); } if(tile.lastProvider==ForgeDirection.SOUTH && tile.recentlyFilledDelay != 0) { - renderer.setRenderBounds(0.375D, 0.5D, 0D, 0.625D, 0.625D, 0.375D); + renderer.func_147782_a(0.375D, 0.5D, 0D, 0.625D, 0.625D, 0.375D); renderLiquidPart(world, x, y, z, block, renderer, tile); } if(tile.lastProvider==ForgeDirection.WEST && tile.recentlyFilledDelay != 0) { - renderer.setRenderBounds(0.625D, 0.5D, 0.375D, 1D, 0.625D, 0.625D); + renderer.func_147782_a(0.625D, 0.5D, 0.375D, 1D, 0.625D, 0.625D); renderLiquidPart(world, x, y, z, block, renderer, tile); } if(tile.lastProvider==ForgeDirection.EAST && tile.recentlyFilledDelay != 0) { - renderer.setRenderBounds(0D, 0.5D, 0.375D, 0.375D, 0.625D, 0.625D); + renderer.func_147782_a(0D, 0.5D, 0.375D, 0.375D, 0.625D, 0.625D); renderLiquidPart(world, x, y, z, block, renderer, tile); }*/ } @@ -323,7 +323,7 @@ private void renderLiquidPart (IBlockAccess world, int x, int y, int z, Block bl BlockSkinRenderHelper.renderLiquidBlock(fluid.getStillIcon(), fluid.getFlowingIcon(), x, y, z, renderer, world); } - private void renderStandardBlock (Block block, int meta, RenderBlocks renderer) + private void func_147784_q (Block block, int meta, RenderBlocks renderer) { Tessellator tessellator = Tessellator.instance; GL11.glTranslatef(-0.5F, -0.5F, -0.5F); @@ -355,7 +355,7 @@ private void renderStandardBlock (Block block, int meta, RenderBlocks renderer) } @Override - public boolean shouldRender3DInInventory () + public boolean shouldRender3DInInventory (int modelID) { // TODO Auto-generated method stub return true; diff --git a/src/main/java/tconstruct/client/block/DryingRackRender.java b/src/main/java/tconstruct/client/block/DryingRackRender.java index 22fa19b32ec..351c71d7255 100644 --- a/src/main/java/tconstruct/client/block/DryingRackRender.java +++ b/src/main/java/tconstruct/client/block/DryingRackRender.java @@ -21,7 +21,7 @@ public void renderInventoryBlock (Block block, int metadata, int modelID, Render { if (modelID == model) { - renderer.setRenderBounds(0.375F, 0.375F, 0.0F, 0.625F, 0.625F, 1.0F); + renderer.func_147782_a(0.375F, 0.375F, 0.0F, 0.625F, 0.625F, 1.0F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); } } @@ -34,36 +34,36 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block int metadata = world.getBlockMetadata(x, y, z); if (metadata == 0) { - renderer.setRenderBounds(0.0F, 0.0, 0.375F, 1.0F, 0.25F, 0.625F); + renderer.func_147782_a(0.0F, 0.0, 0.375F, 1.0F, 0.25F, 0.625F); } if (metadata == 1) { - renderer.setRenderBounds(0.375F, 0.0, 0.0f, 0.625F, 0.25F, 1F); + renderer.func_147782_a(0.375F, 0.0, 0.0f, 0.625F, 0.25F, 1F); } if (metadata == 2) { - renderer.setRenderBounds(0.0F, 0.75F, 0.75F, 1F, 1.0F, 1F); + renderer.func_147782_a(0.0F, 0.75F, 0.75F, 1F, 1.0F, 1F); } if (metadata == 3) { - renderer.setRenderBounds(0.0F, 0.75F, 0F, 1F, 1.0F, 0.25F); + renderer.func_147782_a(0.0F, 0.75F, 0F, 1F, 1.0F, 0.25F); } if (metadata == 4) { - renderer.setRenderBounds(0.75F, 0.75F, 0.0f, 1F, 1.0F, 1F); + renderer.func_147782_a(0.75F, 0.75F, 0.0f, 1F, 1.0F, 1F); } if (metadata == 5) { - renderer.setRenderBounds(0F, 0.75F, 0.0f, 0.25F, 1.0F, 1F); + renderer.func_147782_a(0F, 0.75F, 0.0f, 0.25F, 1.0F, 1F); } - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147784_q(block, x, y, z); } return true; } @Override - public boolean shouldRender3DInInventory () + public boolean shouldRender3DInInventory (int modelID) { return true; } diff --git a/src/main/java/tconstruct/client/block/FrypanRender.java b/src/main/java/tconstruct/client/block/FrypanRender.java index a5659661cd3..8bce6e26340 100644 --- a/src/main/java/tconstruct/client/block/FrypanRender.java +++ b/src/main/java/tconstruct/client/block/FrypanRender.java @@ -19,18 +19,18 @@ public void renderInventoryBlock (Block block, int metadata, int modelID, Render @Override public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { - renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.125F, 1.0F); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.0F, 0.125F, 0.0F, 0.125F, 0.25F, 1.0F); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.125F, 0.125F, 0.875F, 0.875F, 0.25F, 1.0F); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.875F, 0.125F, 0.0F, 1.0F, 0.25F, 1.0F); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.125F, 0.125F, 0.0F, 0.875F, 0.25F, 0.125F); - renderer.renderStandardBlock(block, x, y, z); - // renderer.setRenderBounds(1F, 0.0F, 0.4375F, 2F, 0.125F, 0.5625F); - // renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.0F, 0.0F, 0.0F, 1.0F, 0.125F, 1.0F); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.0F, 0.125F, 0.0F, 0.125F, 0.25F, 1.0F); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.125F, 0.125F, 0.875F, 0.875F, 0.25F, 1.0F); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.875F, 0.125F, 0.0F, 1.0F, 0.25F, 1.0F); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.125F, 0.125F, 0.0F, 0.875F, 0.25F, 0.125F); + renderer.func_147784_q(block, x, y, z); + // renderer.func_147782_a(1F, 0.0F, 0.4375F, 2F, 0.125F, 0.5625F); + // renderer.func_147784_q(block, x, y, z); renderHandle(world, x, y, z, block, renderer); return true; } @@ -40,24 +40,24 @@ public void renderHandle (IBlockAccess world, int x, int y, int z, Block block, switch (world.getBlockMetadata(x, y, z)) { case 0: - renderer.setRenderBounds(1F, 0.0F, 0.4375F, 2F, 0.125F, 0.5625F); + renderer.func_147782_a(1F, 0.0F, 0.4375F, 2F, 0.125F, 0.5625F); break; case 1: - renderer.setRenderBounds(-1F, 0.0F, 0.4375F, 0F, 0.125F, 0.5625F); + renderer.func_147782_a(-1F, 0.0F, 0.4375F, 0F, 0.125F, 0.5625F); break; case 2: - renderer.setRenderBounds(0.4375F, 0.0F, -1F, 0.5625F, 0.125F, 0F); + renderer.func_147782_a(0.4375F, 0.0F, -1F, 0.5625F, 0.125F, 0F); break; case 3: - renderer.setRenderBounds(0.4375F, 0.0F, 1F, 0.5625F, 0.125F, 2F); + renderer.func_147782_a(0.4375F, 0.0F, 1F, 0.5625F, 0.125F, 2F); break; } - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147784_q(block, x, y, z); } @Override - public boolean shouldRender3DInInventory () + public boolean shouldRender3DInInventory (int modelid) { return true; } diff --git a/src/main/java/tconstruct/client/block/OreberryRender.java b/src/main/java/tconstruct/client/block/OreberryRender.java index 520185fb565..b52a1158fb6 100644 --- a/src/main/java/tconstruct/client/block/OreberryRender.java +++ b/src/main/java/tconstruct/client/block/OreberryRender.java @@ -20,18 +20,18 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block int md = world.getBlockMetadata(x, y, z); if (md < 4) { - renderer.setRenderBounds(0.25F, 0.0F, 0.25F, 0.75F, 0.5F, 0.75F); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.25F, 0.0F, 0.25F, 0.75F, 0.5F, 0.75F); + renderer.func_147784_q(block, x, y, z); } else if (md < 8) { - renderer.setRenderBounds(0.125F, 0.0F, 0.125F, 0.875F, 0.75F, 0.875F); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.125F, 0.0F, 0.125F, 0.875F, 0.75F, 0.875F); + renderer.func_147784_q(block, x, y, z); } else { - renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + renderer.func_147784_q(block, x, y, z); } } return true; @@ -42,13 +42,13 @@ public void renderInventoryBlock (Block block, int metadata, int modelID, Render { if (modelID == model) { - renderer.setRenderBounds(0.125F, 0.0F, 0.125F, 0.875F, 0.75F, 0.875F); + renderer.func_147782_a(0.125F, 0.0F, 0.125F, 0.875F, 0.75F, 0.875F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); } } @Override - public boolean shouldRender3DInInventory () + public boolean shouldRender3DInInventory (int modelID) { return true; } diff --git a/src/main/java/tconstruct/client/block/PaneConnectedRender.java b/src/main/java/tconstruct/client/block/PaneConnectedRender.java index 14fc5f9ac46..035da403938 100644 --- a/src/main/java/tconstruct/client/block/PaneConnectedRender.java +++ b/src/main/java/tconstruct/client/block/PaneConnectedRender.java @@ -42,41 +42,41 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block if (!flag && !flag1 && !flag2 && !flag3) { - renderer.setRenderBounds(0D, 0D, 0.45D, 1D, 1D, 0.55D); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.45D, 0D, 0D, 0.55D, 1D, 1D); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0D, 0D, 0.45D, 1D, 1D, 0.55D); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.45D, 0D, 0D, 0.55D, 1D, 1D); + renderer.func_147784_q(block, x, y, z); } else { - // renderer.setRenderBounds(0.45D, 0D, 0.45D, 0.55D, 1D, 0.55D); - // renderer.renderStandardBlock(block, x, y, z); + // renderer.func_147782_a(0.45D, 0D, 0.45D, 0.55D, 1D, 0.55D); + // renderer.func_147784_q(block, x, y, z); } // renderer.setOverrideBlockTexture(sideTexture); if (flag) { - renderer.setRenderBounds(0.45D, 0D, 0.45D, 1D, 1D, 0.55D); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.45D, 0D, 0.45D, 1D, 1D, 0.55D); + renderer.func_147784_q(block, x, y, z); } if (flag1) { - renderer.setRenderBounds(0D, 0D, 0.45D, 0.45D, 1D, 0.55D); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0D, 0D, 0.45D, 0.45D, 1D, 0.55D); + renderer.func_147784_q(block, x, y, z); } if (flag2) { - renderer.setRenderBounds(0.45D, 0D, 0.45D, 0.55D, 1D, 1D); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.45D, 0D, 0.45D, 0.55D, 1D, 1D); + renderer.func_147784_q(block, x, y, z); } if (flag3) { - renderer.setRenderBounds(0.45D, 0D, 0D, 0.55D, 1D, 0.45D); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.45D, 0D, 0D, 0.55D, 1D, 0.45D); + renderer.func_147784_q(block, x, y, z); } renderer.clearOverrideBlockTexture(); @@ -86,7 +86,7 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block } @Override - public boolean shouldRender3DInInventory () + public boolean shouldRender3DInInventory (int modelID) { return false; } diff --git a/src/main/java/tconstruct/client/block/PaneRender.java b/src/main/java/tconstruct/client/block/PaneRender.java index a2ed47914d3..69c0fbb6a18 100644 --- a/src/main/java/tconstruct/client/block/PaneRender.java +++ b/src/main/java/tconstruct/client/block/PaneRender.java @@ -20,7 +20,7 @@ public void renderInventoryBlock (Block block, int metadata, int modelID, Render { if (modelID == model) { - renderer.setRenderBounds(0.0F, 0.0F, 0.4375F, 1.0F, 1.0F, 0.5625F); + renderer.func_147782_a(0.0F, 0.0F, 0.4375F, 1.0F, 1.0F, 0.5625F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); } } @@ -40,7 +40,7 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block } @Override - public boolean shouldRender3DInInventory () + public boolean shouldRender3DInInventory (int modelID) { return true; } diff --git a/src/main/java/tconstruct/client/block/PunjiRender.java b/src/main/java/tconstruct/client/block/PunjiRender.java index 29348c28e8d..edde861c195 100644 --- a/src/main/java/tconstruct/client/block/PunjiRender.java +++ b/src/main/java/tconstruct/client/block/PunjiRender.java @@ -19,7 +19,7 @@ public void renderInventoryBlock (Block block, int metadata, int modelID, Render { if (modelID == model) { - renderer.setRenderBounds(0.4375, 0.0, 0.4375, 0.5625, 1.0f, 0.5625); + renderer.func_147782_a(0.4375, 0.0, 0.4375, 0.5625, 1.0f, 0.5625); renderStandardInvBlock(renderer, block, metadata); } } @@ -30,52 +30,52 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block if (modelID == model) { int metadata = world.getBlockMetadata(x, y, z); - renderer.setRenderBounds(0.4375, 0.0, 0.4375, 0.5625, 0.375f, 0.5625); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.4375, 0.0, 0.4375, 0.5625, 0.375f, 0.5625); + renderer.func_147784_q(block, x, y, z); if (metadata >= 1) { - renderer.setRenderBounds(0.125, 0.0, 0.125, 0.25, 0.375f, 0.25); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.125, 0.0, 0.125, 0.25, 0.375f, 0.25); + renderer.func_147784_q(block, x, y, z); } if (metadata >= 2) { - renderer.setRenderBounds(0.75, 0.0, 0.75, 0.875, 0.375f, 0.875); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.75, 0.0, 0.75, 0.875, 0.375f, 0.875); + renderer.func_147784_q(block, x, y, z); } if (metadata >= 3) { - renderer.setRenderBounds(0.125, 0.0, 0.75, 0.25, 0.375f, 0.875); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.125, 0.0, 0.75, 0.25, 0.375f, 0.875); + renderer.func_147784_q(block, x, y, z); } if (metadata >= 4) { - renderer.setRenderBounds(0.75, 0.0, 0.125, 0.875, 0.375f, 0.25); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.75, 0.0, 0.125, 0.875, 0.375f, 0.25); + renderer.func_147784_q(block, x, y, z); } /*if (metadata == 5) { - renderer.setRenderBounds(0.0F, 0.0, 0.0F, 1.0F, 0.875F, 1.0F); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.0F, 0.0, 0.0F, 1.0F, 0.875F, 1.0F); + renderer.func_147784_q(block, x, y, z); } else { - renderer.setRenderBounds(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 0.25F, 0.75F, 0.25F); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.75F, 0.0F, 0.0F, 1.0F, 0.75F, 0.25F); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.0F, 0.0F, 0.75F, 0.25F, 0.75F, 1.0F); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.75F, 0.0F, 0.75F, 1.0F, 0.75F, 1.0F); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.0F, 0.0F, 0.0F, 0.25F, 0.75F, 0.25F); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.75F, 0.0F, 0.0F, 1.0F, 0.75F, 0.25F); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.0F, 0.0F, 0.75F, 0.25F, 0.75F, 1.0F); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.75F, 0.0F, 0.75F, 1.0F, 0.75F, 1.0F); + renderer.func_147784_q(block, x, y, z); }*/ } return true; } @Override - public boolean shouldRender3DInInventory () + public boolean shouldRender3DInInventory (int modelID) { return true; } diff --git a/src/main/java/tconstruct/client/block/RenderLandmine.java b/src/main/java/tconstruct/client/block/RenderLandmine.java index c4e01cd8479..49e327d41b4 100644 --- a/src/main/java/tconstruct/client/block/RenderLandmine.java +++ b/src/main/java/tconstruct/client/block/RenderLandmine.java @@ -27,7 +27,7 @@ public void renderInventoryBlock (Block block, int metadata, int modelID, Render GL11.glPushMatrix(); GL11.glTranslatef(-0.5F, 0F, -0.5F); - renderer.setRenderBounds(0.0625F, 0.0F, 0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F); + renderer.func_147782_a(0.0625F, 0.0F, 0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F); Helper.renderInventoryCube(block, metadata, modelID, renderer); GL11.glPopMatrix(); @@ -61,26 +61,26 @@ public void renderBasedOnSide (IBlockAccess world, int x, int y, int z, Block bl switch (dir) { case DOWN: - renderer.setRenderBounds(0.0625F, 0.0F, 0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F); + renderer.func_147782_a(0.0625F, 0.0F, 0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F); break; case UP: - renderer.setRenderBounds(0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F, 1.0F - 0.0625F); + renderer.func_147782_a(0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F, 1.0F - 0.0625F); break; case NORTH: - renderer.setRenderBounds(0.0625F, 0.0625F, 0.0F, 1.0F - 0.0625F, 1.0F - 0.0625F, 0.0625F); + renderer.func_147782_a(0.0625F, 0.0625F, 0.0F, 1.0F - 0.0625F, 1.0F - 0.0625F, 0.0625F); break; case SOUTH: - renderer.setRenderBounds(0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F, 1.0F); + renderer.func_147782_a(0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F, 1.0F); break; case EAST: - renderer.setRenderBounds(1.0F - 0.0625F, 0.0625F, 0.0625F, 1.0F, 1.0F - 0.0625F, 1.0F - 0.0625F); + renderer.func_147782_a(1.0F - 0.0625F, 0.0625F, 0.0625F, 1.0F, 1.0F - 0.0625F, 1.0F - 0.0625F); break; case WEST: - renderer.setRenderBounds(0.0F, 0.0625F, 0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F); + renderer.func_147782_a(0.0F, 0.0625F, 0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F); break; } - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147784_q(block, x, y, z); } @Override diff --git a/src/main/java/tconstruct/client/block/SearedRender.java b/src/main/java/tconstruct/client/block/SearedRender.java index 57def2bcb81..49e64f16085 100644 --- a/src/main/java/tconstruct/client/block/SearedRender.java +++ b/src/main/java/tconstruct/client/block/SearedRender.java @@ -24,104 +24,104 @@ public void renderInventoryBlock (Block block, int metadata, int modelID, Render if (metadata == 0) { //Top - renderer.setRenderBounds(0.0F, 0.625F, 0.0F, 1.0F, 0.9375F, 1.0F); + renderer.func_147782_a(0.0F, 0.625F, 0.0F, 1.0F, 0.9375F, 1.0F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); //Lip - renderer.setRenderBounds(0.0F, 0.9375, 0.0F, 0.0625, 1.0, 1.0F); + renderer.func_147782_a(0.0F, 0.9375, 0.0F, 0.0625, 1.0, 1.0F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.0625, 0.9375, 0.9375, 0.9375, 1.0, 1.0F); + renderer.func_147782_a(0.0625, 0.9375, 0.9375, 0.9375, 1.0, 1.0F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.9375, 0.9375, 0.0F, 1.0F, 1.0, 1.0F); + renderer.func_147782_a(0.9375, 0.9375, 0.0F, 1.0F, 1.0, 1.0F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.0625, 0.9375, 0.0F, 0.9375, 1.0, 0.0625); + renderer.func_147782_a(0.0625, 0.9375, 0.0F, 0.9375, 1.0, 0.0625); TProxyClient.renderStandardInvBlock(renderer, block, metadata); //Legs - renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 0.3125F, 0.625F, 0.3125F); + renderer.func_147782_a(0.0F, 0.0F, 0.0F, 0.3125F, 0.625F, 0.3125F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.6875, 0.0F, 0.0F, 1.0F, 0.625F, 0.25F); + renderer.func_147782_a(0.6875, 0.0F, 0.0F, 1.0F, 0.625F, 0.25F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.0F, 0.0F, 0.6875, 0.3125F, 0.625F, 1.0F); + renderer.func_147782_a(0.0F, 0.0F, 0.6875, 0.3125F, 0.625F, 1.0F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.6875, 0.0F, 0.6875, 1.0F, 0.625F, 1.0F); + renderer.func_147782_a(0.6875, 0.0F, 0.6875, 1.0F, 0.625F, 1.0F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); } else if (metadata == 1) { - renderer.setRenderBounds(0.25, 0.25, 0.625, 0.75, 0.375, 1); + renderer.func_147782_a(0.25, 0.25, 0.625, 0.75, 0.375, 1); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.25, 0.25, 0.625, 0.375, 0.625, 1); + renderer.func_147782_a(0.25, 0.25, 0.625, 0.375, 0.625, 1); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.625, 0.25, 0.625, 0.75, 0.625, 1); + renderer.func_147782_a(0.625, 0.25, 0.625, 0.75, 0.625, 1); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.375, 0.375, 0.625, 0.625, 0.625, 1); + renderer.func_147782_a(0.375, 0.375, 0.625, 0.625, 0.625, 1); } else if (metadata == 2) { - renderer.setRenderBounds(0.125F, 0.125f, 0.125F, 0.875F, 0.25F, 0.875F); + renderer.func_147782_a(0.125F, 0.125f, 0.125F, 0.875F, 0.25F, 0.875F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); //Details - renderer.setRenderBounds(0.001f, 0.1245f, 0.001f, 0.1245f, 0.999f, 0.4375f); + renderer.func_147782_a(0.001f, 0.1245f, 0.001f, 0.1245f, 0.999f, 0.4375f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.001f, 0.1245f, 0.5625f, 0.1245f, 0.999f, 0.999f); + renderer.func_147782_a(0.001f, 0.1245f, 0.5625f, 0.1245f, 0.999f, 0.999f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.001f, 0.8755f, 0.4375f, 0.1245f, 0.999f, 0.5625f); + renderer.func_147782_a(0.001f, 0.8755f, 0.4375f, 0.1245f, 0.999f, 0.5625f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.001f, 0.1245f, 0.4375f, 0.1245f, 0.25F, 0.5625f); + renderer.func_147782_a(0.001f, 0.1245f, 0.4375f, 0.1245f, 0.25F, 0.5625f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.8755f, 0.1245f, 0f, 0.999f, 0.999f, 0.4375f); + renderer.func_147782_a(0.8755f, 0.1245f, 0f, 0.999f, 0.999f, 0.4375f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.8755f, 0.1245f, 0.5625f, 0.999f, 0.999f, 0.999f); + renderer.func_147782_a(0.8755f, 0.1245f, 0.5625f, 0.999f, 0.999f, 0.999f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.8755f, 0.8755f, 0.4375f, 0.999f, 0.999f, 0.5625f); + renderer.func_147782_a(0.8755f, 0.8755f, 0.4375f, 0.999f, 0.999f, 0.5625f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.8755f, 0.1245f, 0.4375f, 0.999f, 0.25F, 0.5625f); + renderer.func_147782_a(0.8755f, 0.1245f, 0.4375f, 0.999f, 0.25F, 0.5625f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.1245f, 0.1245f, 0.8755f, 0.4375f, 0.999f, 0.999f); + renderer.func_147782_a(0.1245f, 0.1245f, 0.8755f, 0.4375f, 0.999f, 0.999f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.5625f, 0.1245f, 0.8755f, 0.8755f, 0.999f, 0.999f); + renderer.func_147782_a(0.5625f, 0.1245f, 0.8755f, 0.8755f, 0.999f, 0.999f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.4375f, 0.8755f, 0.8755f, 0.5625f, 0.999f, 0.999f); + renderer.func_147782_a(0.4375f, 0.8755f, 0.8755f, 0.5625f, 0.999f, 0.999f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.4375f, 0.1245f, 0.8755f, 0.5625f, 0.2495F, 0.999f); + renderer.func_147782_a(0.4375f, 0.1245f, 0.8755f, 0.5625f, 0.2495F, 0.999f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.1245f, 0.1245f, 0.001f, 0.4375f, 0.999f, 0.1245f); + renderer.func_147782_a(0.1245f, 0.1245f, 0.001f, 0.4375f, 0.999f, 0.1245f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.5625f, 0.1245f, 0.001f, 0.8755f, 0.999f, 0.1245f); + renderer.func_147782_a(0.5625f, 0.1245f, 0.001f, 0.8755f, 0.999f, 0.1245f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.4375f, 0.8755f, 0.001f, 0.5625f, 0.999f, 0.1245f); + renderer.func_147782_a(0.4375f, 0.8755f, 0.001f, 0.5625f, 0.999f, 0.1245f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.4375f, 0.1245f, 0.001f, 0.5625f, 0.25F, 0.1245f); + renderer.func_147782_a(0.4375f, 0.1245f, 0.001f, 0.5625f, 0.25F, 0.1245f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); //Legs - renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 0.3125F, 0.125, 0.3125F); + renderer.func_147782_a(0.0F, 0.0F, 0.0F, 0.3125F, 0.125, 0.3125F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.6875F, 0.0F, 0.0F, 1.0F, 0.125, 0.3125F); + renderer.func_147782_a(0.6875F, 0.0F, 0.0F, 1.0F, 0.125, 0.3125F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.0F, 0.0F, 0.6875F, 0.3125F, 0.125, 1.0F); + renderer.func_147782_a(0.0F, 0.0F, 0.6875F, 0.3125F, 0.125, 1.0F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.6875F, 0.0F, 0.6875F, 1.0F, 0.125, 1.0F); + renderer.func_147782_a(0.6875F, 0.0F, 0.6875F, 1.0F, 0.125, 1.0F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); //Outside - renderer.setRenderBounds(0.0f, 0.125, 0f, 0.125, 1.0F, 1); + renderer.func_147782_a(0.0f, 0.125, 0f, 0.125, 1.0F, 1); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.875f, 0.125, 0f, 1, 1.0F, 1); + renderer.func_147782_a(0.875f, 0.125, 0f, 1, 1.0F, 1); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.125f, 0.125, 0f, 0.875f, 1.0F, 0.125f); + renderer.func_147782_a(0.125f, 0.125, 0f, 0.875f, 1.0F, 0.125f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.125f, 0.125, 0.875f, 0.875f, 1.0F, 1); + renderer.func_147782_a(0.125f, 0.125, 0.875f, 0.875f, 1.0F, 1); TProxyClient.renderStandardInvBlock(renderer, block, metadata); } else { - renderer.setRenderBounds(0, 0, 0, 1, 1, 1); + renderer.func_147782_a(0, 0, 0, 1, 1, 1); TProxyClient.renderStandardInvBlock(renderer, block, metadata); } } @@ -136,28 +136,28 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block if (metadata == 0) { //Top - renderer.setRenderBounds(0.0F, 0.625F, 0.0F, 1.0F, 0.9375F, 1.0F); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.0F, 0.625F, 0.0F, 1.0F, 0.9375F, 1.0F); + renderer.func_147784_q(block, x, y, z); //Lip - renderer.setRenderBounds(0.0F, 0.9375, 0.0F, 0.0625, 1.0, 1.0F); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.0625, 0.9375, 0.9375, 0.9375, 1.0, 1.0F); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.9375, 0.9375, 0.0F, 1.0F, 1.0, 1.0F); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.0625, 0.9375, 0.0F, 0.9375, 1.0, 0.0625); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.0F, 0.9375, 0.0F, 0.0625, 1.0, 1.0F); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.0625, 0.9375, 0.9375, 0.9375, 1.0, 1.0F); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.9375, 0.9375, 0.0F, 1.0F, 1.0, 1.0F); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.0625, 0.9375, 0.0F, 0.9375, 1.0, 0.0625); + renderer.func_147784_q(block, x, y, z); //Legs - renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 0.3125F, 0.625F, 0.3125F); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.6875, 0.0F, 0.0F, 1.0F, 0.625F, 0.25F); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.0F, 0.0F, 0.6875, 0.3125F, 0.625F, 1.0F); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.6875, 0.0F, 0.6875, 1.0F, 0.625F, 1.0F); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.0F, 0.0F, 0.0F, 0.3125F, 0.625F, 0.3125F); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.6875, 0.0F, 0.0F, 1.0F, 0.625F, 0.25F); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.0F, 0.0F, 0.6875, 0.3125F, 0.625F, 1.0F); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.6875, 0.0F, 0.6875, 1.0F, 0.625F, 1.0F); + renderer.func_147784_q(block, x, y, z); if (world.getBlockTileEntity(x, y, z) instanceof CastingTableLogic) { @@ -191,7 +191,7 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block float percent = (float) logic.getLiquidAmount() / (float) logic.getCapacity(); float height = percent * (maxHeight - minHeight); //float height = logic.getLiquidAmount() / (logic.getCapacity() * 1.03F) / 16F; - renderer.setRenderBounds(minX, minHeight, minZ, maxX, minHeight + height, maxZ); + renderer.func_147782_a(minX, minHeight, minZ, maxX, minHeight + height, maxZ); Fluid fluid = logic.liquid.getFluid(); BlockSkinRenderHelper.renderLiquidBlock(fluid.getStillIcon(), fluid.getFlowingIcon(), x, y, z, renderer, world); @@ -207,44 +207,44 @@ else if (metadata == 1) switch (logic.getRenderDirection()) { case 2: - renderer.setRenderBounds(0.25, 0.25, 0.625, 0.75, 0.375, 1); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.25, 0.375, 0.625, 0.375, 0.625, 1); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.625, 0.375, 0.625, 0.75, 0.625, 1); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.375, 0.375, 0.625, 0.625, 0.625, 1); + renderer.func_147782_a(0.25, 0.25, 0.625, 0.75, 0.375, 1); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.25, 0.375, 0.625, 0.375, 0.625, 1); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.625, 0.375, 0.625, 0.75, 0.625, 1); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.375, 0.375, 0.625, 0.625, 0.625, 1); zMin = 0.5F; //zMin = 0.625F; break; case 3: - renderer.setRenderBounds(0.25, 0.25, 0, 0.75, 0.375, 0.375); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.25, 0.375, 0, 0.375, 0.625, 0.375); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.625, 0.375, 0, 0.75, 0.625, 0.375); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.375, 0.375, 0, 0.625, 0.625, 0.375); + renderer.func_147782_a(0.25, 0.25, 0, 0.75, 0.375, 0.375); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.25, 0.375, 0, 0.375, 0.625, 0.375); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.625, 0.375, 0, 0.75, 0.625, 0.375); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.375, 0.375, 0, 0.625, 0.625, 0.375); zMax = 0.5F; break; case 4: - renderer.setRenderBounds(0.625, 0.25, 0.25, 1, 0.375, 0.75); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.625, 0.375, 0.25, 1, 0.625, 0.375); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.625, 0.375, 0.625, 1, 0.625, 0.75); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.625, 0.375, 0.375, 1, 0.625, 0.625); + renderer.func_147782_a(0.625, 0.25, 0.25, 1, 0.375, 0.75); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.625, 0.375, 0.25, 1, 0.625, 0.375); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.625, 0.375, 0.625, 1, 0.625, 0.75); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.625, 0.375, 0.375, 1, 0.625, 0.625); xMin = 0.5F; break; case 5: - renderer.setRenderBounds(0, 0.25, 0.25, 0.375, 0.375, 0.75); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0, 0.375, 0.25, 0.375, 0.625, 0.375); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0, 0.375, 0.625, 0.375, 0.625, 0.75); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0, 0.375, 0.375, 0.375, 0.625, 0.625); + renderer.func_147782_a(0, 0.25, 0.25, 0.375, 0.375, 0.75); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0, 0.375, 0.25, 0.375, 0.625, 0.375); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0, 0.375, 0.625, 0.375, 0.625, 0.75); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0, 0.375, 0.375, 0.375, 0.625, 0.625); xMax = 0.5F; break; } @@ -272,7 +272,7 @@ else if (uID == TRepo.castingChannel.blockID) if (logic.liquid != null) { Fluid fluid = logic.liquid.getFluid(); - renderer.setRenderBounds(xMin, yMin, zMin, xMax, 0.625, zMax); + renderer.func_147782_a(xMin, yMin, zMin, xMax, 0.625, zMax); BlockSkinRenderHelper.renderLiquidBlock(fluid.getStillIcon(), fluid.getFlowingIcon(), x, y, z, renderer, world); //float xMin = 0.375F, zMin = 0.375F, xMax = 0.625F, zMax = 0.625F; @@ -295,73 +295,73 @@ else if (uID == TRepo.castingChannel.blockID) xMax = 1.0F; break; } - renderer.setRenderBounds(xMin, 0.5F, zMin, xMax, 0.625F, zMax); + renderer.func_147782_a(xMin, 0.5F, zMin, xMax, 0.625F, zMax); BlockSkinRenderHelper.renderLiquidBlock(fluid.getStillIcon(), fluid.getFlowingIcon(), x, y, z, renderer, world); } } } else if (metadata == 2) { - renderer.setRenderBounds(0.125F, 0.125f, 0.125F, 0.875F, 0.25F, 0.875F); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.125F, 0.125f, 0.125F, 0.875F, 0.25F, 0.875F); + renderer.func_147784_q(block, x, y, z); //Outside - renderer.setRenderBounds(0.0f, 0.125, 0f, 0.125, 1.0F, 1); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.875f, 0.125, 0f, 1, 1.0F, 1); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.125f, 0.125, 0f, 0.875f, 1.0F, 0.125f); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.125f, 0.125, 0.875f, 0.875f, 1.0F, 1); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.0f, 0.125, 0f, 0.125, 1.0F, 1); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.875f, 0.125, 0f, 1, 1.0F, 1); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.125f, 0.125, 0f, 0.875f, 1.0F, 0.125f); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.125f, 0.125, 0.875f, 0.875f, 1.0F, 1); + renderer.func_147784_q(block, x, y, z); //Details - renderer.setRenderBounds(0.001f, 0.1245f, 0.001f, 0.1245f, 0.999f, 0.4375f); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.001f, 0.1245f, 0.5625f, 0.1245f, 0.999f, 0.999f); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.001f, 0.8755f, 0.4375f, 0.1245f, 0.999f, 0.5625f); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.001f, 0.1245f, 0.4375f, 0.1245f, 0.25F, 0.5625f); - renderer.renderStandardBlock(block, x, y, z); - - renderer.setRenderBounds(0.8755f, 0.1245f, 0f, 0.999f, 0.999f, 0.4375f); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.8755f, 0.1245f, 0.5625f, 0.999f, 0.999f, 0.999f); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.8755f, 0.8755f, 0.4375f, 0.999f, 0.999f, 0.5625f); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.8755f, 0.1245f, 0.4375f, 0.999f, 0.25F, 0.5625f); - renderer.renderStandardBlock(block, x, y, z); - - renderer.setRenderBounds(0.1245f, 0.1245f, 0.8755f, 0.4375f, 0.999f, 0.999f); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.5625f, 0.1245f, 0.8755f, 0.8755f, 0.999f, 0.999f); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.4375f, 0.8755f, 0.8755f, 0.5625f, 0.999f, 0.999f); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.4375f, 0.1245f, 0.8755f, 0.5625f, 0.2495F, 0.999f); - renderer.renderStandardBlock(block, x, y, z); - - renderer.setRenderBounds(0.1245f, 0.1245f, 0.001f, 0.4375f, 0.999f, 0.1245f); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.5625f, 0.1245f, 0.001f, 0.8755f, 0.999f, 0.1245f); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.4375f, 0.8755f, 0.001f, 0.5625f, 0.999f, 0.1245f); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.4375f, 0.1245f, 0.001f, 0.5625f, 0.25F, 0.1245f); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.001f, 0.1245f, 0.001f, 0.1245f, 0.999f, 0.4375f); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.001f, 0.1245f, 0.5625f, 0.1245f, 0.999f, 0.999f); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.001f, 0.8755f, 0.4375f, 0.1245f, 0.999f, 0.5625f); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.001f, 0.1245f, 0.4375f, 0.1245f, 0.25F, 0.5625f); + renderer.func_147784_q(block, x, y, z); + + renderer.func_147782_a(0.8755f, 0.1245f, 0f, 0.999f, 0.999f, 0.4375f); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.8755f, 0.1245f, 0.5625f, 0.999f, 0.999f, 0.999f); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.8755f, 0.8755f, 0.4375f, 0.999f, 0.999f, 0.5625f); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.8755f, 0.1245f, 0.4375f, 0.999f, 0.25F, 0.5625f); + renderer.func_147784_q(block, x, y, z); + + renderer.func_147782_a(0.1245f, 0.1245f, 0.8755f, 0.4375f, 0.999f, 0.999f); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.5625f, 0.1245f, 0.8755f, 0.8755f, 0.999f, 0.999f); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.4375f, 0.8755f, 0.8755f, 0.5625f, 0.999f, 0.999f); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.4375f, 0.1245f, 0.8755f, 0.5625f, 0.2495F, 0.999f); + renderer.func_147784_q(block, x, y, z); + + renderer.func_147782_a(0.1245f, 0.1245f, 0.001f, 0.4375f, 0.999f, 0.1245f); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.5625f, 0.1245f, 0.001f, 0.8755f, 0.999f, 0.1245f); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.4375f, 0.8755f, 0.001f, 0.5625f, 0.999f, 0.1245f); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.4375f, 0.1245f, 0.001f, 0.5625f, 0.25F, 0.1245f); + renderer.func_147784_q(block, x, y, z); //Legs - renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 0.3125F, 0.125, 0.3125F); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.6875F, 0.0F, 0.0F, 1.0F, 0.125, 0.3125F); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.0F, 0.0F, 0.6875F, 0.3125F, 0.125, 1.0F); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.6875F, 0.0F, 0.6875F, 1.0F, 0.125, 1.0F); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.0F, 0.0F, 0.0F, 0.3125F, 0.125, 0.3125F); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.6875F, 0.0F, 0.0F, 1.0F, 0.125, 0.3125F); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.0F, 0.0F, 0.6875F, 0.3125F, 0.125, 1.0F); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.6875F, 0.0F, 0.6875F, 1.0F, 0.125, 1.0F); + renderer.func_147784_q(block, x, y, z); //Liquids if (world.getBlockTileEntity(x, y, z) instanceof CastingBasinLogic) @@ -396,7 +396,7 @@ else if (metadata == 2) float height = percent * (maxHeight - minHeight); //float height = (logic.getLiquidAmount() / (logic.getCapacity() * 1.05F) * 0.6875F) / maxHeight; - renderer.setRenderBounds(minX, minHeight, minZ, maxX, minHeight + height, maxZ); + renderer.func_147782_a(minX, minHeight, minZ, maxX, minHeight + height, maxZ); Fluid fluid = logic.liquid.getFluid(); BlockSkinRenderHelper.renderLiquidBlock(fluid.getStillIcon(), fluid.getFlowingIcon(), x, y, z, renderer, world); @@ -405,23 +405,23 @@ else if (metadata == 2) } else { - renderer.setRenderBounds(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 0.25F, 0.75F, 0.25F); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.75F, 0.0F, 0.0F, 1.0F, 0.75F, 0.25F); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.0F, 0.0F, 0.75F, 0.25F, 0.75F, 1.0F); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.75F, 0.0F, 0.75F, 1.0F, 0.75F, 1.0F); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.0F, 0.0F, 0.0F, 0.25F, 0.75F, 0.25F); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.75F, 0.0F, 0.0F, 1.0F, 0.75F, 0.25F); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.0F, 0.0F, 0.75F, 0.25F, 0.75F, 1.0F); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.75F, 0.0F, 0.75F, 1.0F, 0.75F, 1.0F); + renderer.func_147784_q(block, x, y, z); } } return true; } @Override - public boolean shouldRender3DInInventory () + public boolean shouldRender3DInInventory (int modelid) { return true; } diff --git a/src/main/java/tconstruct/client/block/SlimeChannelRender.java b/src/main/java/tconstruct/client/block/SlimeChannelRender.java index 518781037f5..e12fd1544c3 100644 --- a/src/main/java/tconstruct/client/block/SlimeChannelRender.java +++ b/src/main/java/tconstruct/client/block/SlimeChannelRender.java @@ -4,7 +4,7 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; @@ -45,7 +45,7 @@ public boolean renderRotatedBlock (Block block, int x, int y, int z, IBlockAcces { Tessellator tessellator = Tessellator.instance; int bMeta = world.getBlockMetadata(x, y, z); - Icon iconStill = block.getIcon(1, bMeta); + IIcon iconStill = block.getIcon(1, bMeta); float flowDir = (float) (bMeta / 8f * 2 * Math.PI); //Tau, radians double u1, u2, u3, u4, v1, v2, v3, v4; @@ -86,7 +86,7 @@ public boolean renderRotatedBlock (Block block, int x, int y, int z, IBlockAcces tessellator.addVertexWithUV(x + 1, y + 0.5, z + 1, u4, v4); tessellator.addVertexWithUV(x + 1, y + 0.5, z + 0, u3, v3); } - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147784_q(block, x, y, z); /*int direction = world.getBlockMetadata(x, y, z) % 4; if (direction == 0) renderer.uvRotateTop = 2; @@ -97,14 +97,14 @@ public boolean renderRotatedBlock (Block block, int x, int y, int z, IBlockAcces if (direction == 3) renderer.uvRotateTop = 3; - boolean flag = renderer.renderStandardBlock(block, x, y, z); + boolean flag = renderer.func_147784_q(block, x, y, z); renderer.uvRotateTop = 0; return flag;*/ return true; } @Override - public boolean shouldRender3DInInventory () + public boolean shouldRender3DInInventory (int modelID) { return true; } diff --git a/src/main/java/tconstruct/client/block/SlimePadRender.java b/src/main/java/tconstruct/client/block/SlimePadRender.java index b12b081cb79..b31124f0bde 100644 --- a/src/main/java/tconstruct/client/block/SlimePadRender.java +++ b/src/main/java/tconstruct/client/block/SlimePadRender.java @@ -27,13 +27,13 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block { if (modelID == model) { - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0f, 0f, 0f, 1f, 0.5f, 1f); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0f, 0f, 0f, 1f, 0.5f, 1f); int metadata = world.getBlockMetadata(x, y, z); BlockSkinRenderHelper.renderLiquidBlock(((SlimePad) block).getFluidIcon(metadata), ((SlimePad) block).getFluidIcon(metadata), x, y, z, renderer, world); float[] size = size(metadata % 8); - renderer.setRenderBounds(size[0], 0.5f, size[1], size[2], 0.6875f, size[3]); + renderer.func_147782_a(size[0], 0.5f, size[1], size[2], 0.6875f, size[3]); BlockSkinRenderHelper.renderLiquidBlock(((SlimePad) block).getNubIcon(metadata), ((SlimePad) block).getNubIcon(metadata), x, y, z, renderer, world); } return true; @@ -65,7 +65,7 @@ float[] size (int meta) } @Override - public boolean shouldRender3DInInventory () + public boolean shouldRender3DInInventory (int modelID) { return true; } diff --git a/src/main/java/tconstruct/client/block/SmelteryRender.java b/src/main/java/tconstruct/client/block/SmelteryRender.java index 9aae4b3ed25..76e5462611f 100644 --- a/src/main/java/tconstruct/client/block/SmelteryRender.java +++ b/src/main/java/tconstruct/client/block/SmelteryRender.java @@ -35,14 +35,14 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block if (world.getBlockMetadata(x, y, z) == 0) return renderSmeltery(world, x, y, z, block, modelID, renderer); else - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147784_q(block, x, y, z); } return true; } public boolean renderSmeltery (IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147784_q(block, x, y, z); SmelteryLogic logic = (SmelteryLogic) world.getBlockTileEntity(x, y, z); if (logic.validStructure) { @@ -70,7 +70,7 @@ public boolean renderSmeltery (IBlockAccess world, int x, int y, int z, Block bl liquidSize -= countSize; float height = countSize > 20000 ? 1.0F : countSize / 20000F; - //renderer.setRenderBounds(0, base, 0, 1, height + base, 1); + //renderer.func_147782_a(0, base, 0, 1, height + base, 1); float renderBase = base; float renderHeight = height + base; base += height; @@ -83,7 +83,7 @@ public boolean renderSmeltery (IBlockAccess world, int x, int y, int z, Block bl float minZ = i / 3 == 0 ? -0.001F : 0F; float maxX = i % 3 == 2 ? 1.001F : 1F; float maxZ = i / 3 == 2 ? 1.001F : 1F; - renderer.setRenderBounds(minX, renderBase, minZ, maxX, renderHeight, maxZ); + renderer.func_147782_a(minX, renderBase, minZ, maxX, renderHeight, maxZ); if (fluid.canBePlacedInWorld()) BlockSkinRenderHelper.renderMetadataBlock(Block.blocksList[fluid.getBlockID()], 0, posX + i % 3, posY + yBase, posZ + i / 3, renderer, world); else @@ -98,7 +98,7 @@ public boolean renderSmeltery (IBlockAccess world, int x, int y, int z, Block bl float minZ = i / 3 == 0 ? -0.001F : 0F; float maxX = i % 3 == 2 ? 1.001F : 1F; float maxZ = i / 3 == 2 ? 1.001F : 1F; - renderer.setRenderBounds(minX, renderBase, minZ, maxX, renderHeight, maxZ); + renderer.func_147782_a(minX, renderBase, minZ, maxX, renderHeight, maxZ); BlockSkinRenderHelper.renderMetadataBlock(liquidBlock, liquid.itemMeta, posX + i % 3, posY + yBase, posZ + i / 3, renderer, world); } } @@ -112,7 +112,7 @@ public boolean renderSmeltery (IBlockAccess world, int x, int y, int z, Block bl float minZ = i / 3 == 0 ? -0.001F : 0F; float maxX = i % 3 == 2 ? 1.001F : 1F; float maxZ = i / 3 == 2 ? 1.001F : 1F; - renderer.setRenderBounds(minX, renderBase, minZ, maxX, renderHeight, maxZ); + renderer.func_147782_a(minX, renderBase, minZ, maxX, renderHeight, maxZ); BlockSkinRenderHelper.renderFakeBlock(liquidItem.getIconFromDamage(liquid.itemMeta), posX, posY + yBase, posZ, renderer, world); } }*/ @@ -131,7 +131,7 @@ public boolean renderSmeltery (IBlockAccess world, int x, int y, int z, Block bl void renderLayer (SmelteryLogic logic, int start, int posX, int posY, int posZ, RenderBlocks renderer, IBlockAccess world) { - renderer.setRenderBounds(-0.001F, -0.001F, -0.001F, 1.001F, 1.001F, 1.001F); + renderer.func_147782_a(-0.001F, -0.001F, -0.001F, 1.001F, 1.001F, 1.001F); for (int i = 0; i < 9; i++) { ItemStack input = logic.getStackInSlot(i + start); @@ -141,7 +141,7 @@ void renderLayer (SmelteryLogic logic, int start, int posX, int posY, int posZ, if (blockToRender != null) { float blockHeight = input.stackSize / (float) blockToRender.stackSize; - renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, MathHelper.clamp_float(blockHeight, 0.01F, 1.0F), 1.0F); + renderer.func_147782_a(0.0F, 0.0F, 0.0F, 1.0F, MathHelper.clamp_float(blockHeight, 0.01F, 1.0F), 1.0F); if (blockToRender.itemID < 4096) //Block { @@ -162,7 +162,7 @@ void renderLayer (SmelteryLogic logic, int start, int posX, int posY, int posZ, } @Override - public boolean shouldRender3DInInventory () + public boolean shouldRender3DInInventory (int modelID) { return true; } diff --git a/src/main/java/tconstruct/client/block/TableForgeRender.java b/src/main/java/tconstruct/client/block/TableForgeRender.java index a9af58c356e..e5ff10e3e62 100644 --- a/src/main/java/tconstruct/client/block/TableForgeRender.java +++ b/src/main/java/tconstruct/client/block/TableForgeRender.java @@ -19,15 +19,15 @@ public void renderInventoryBlock (Block block, int metadata, int modelID, Render { if (modelID == model) { - renderer.setRenderBounds(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F); + renderer.func_147782_a(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F); renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 0.25F, 0.75F, 0.25F); + renderer.func_147782_a(0.0F, 0.0F, 0.0F, 0.25F, 0.75F, 0.25F); renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.75F, 0.0F, 0.0F, 1.0F, 0.75F, 0.25F); + renderer.func_147782_a(0.75F, 0.0F, 0.0F, 1.0F, 0.75F, 0.25F); renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.0F, 0.0F, 0.75F, 0.25F, 0.75F, 1.0F); + renderer.func_147782_a(0.0F, 0.0F, 0.75F, 0.25F, 0.75F, 1.0F); renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.75F, 0.0F, 0.75F, 1.0F, 0.75F, 1.0F); + renderer.func_147782_a(0.75F, 0.0F, 0.75F, 1.0F, 0.75F, 1.0F); renderStandardInvBlock(renderer, block, metadata); } } @@ -37,22 +37,22 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block { if (modelID == model) { - renderer.setRenderBounds(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 0.25F, 0.75F, 0.25F); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.75F, 0.0F, 0.0F, 1.0F, 0.75F, 0.25F); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.0F, 0.0F, 0.75F, 0.25F, 0.75F, 1.0F); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.75F, 0.0F, 0.75F, 1.0F, 0.75F, 1.0F); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.0F, 0.0F, 0.0F, 0.25F, 0.75F, 0.25F); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.75F, 0.0F, 0.0F, 1.0F, 0.75F, 0.25F); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.0F, 0.0F, 0.75F, 0.25F, 0.75F, 1.0F); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.75F, 0.0F, 0.75F, 1.0F, 0.75F, 1.0F); + renderer.func_147784_q(block, x, y, z); } return true; } @Override - public boolean shouldRender3DInInventory () + public boolean shouldRender3DInInventory (int modelID) { return true; } diff --git a/src/main/java/tconstruct/client/block/TableRender.java b/src/main/java/tconstruct/client/block/TableRender.java index 489c863bb94..d28884194d2 100644 --- a/src/main/java/tconstruct/client/block/TableRender.java +++ b/src/main/java/tconstruct/client/block/TableRender.java @@ -21,20 +21,20 @@ public void renderInventoryBlock (Block block, int metadata, int modelID, Render { if (metadata == 5) { - renderer.setRenderBounds(0.0F, 0.0, 0.0F, 1.0F, 0.875F, 1.0F); + renderer.func_147782_a(0.0F, 0.0, 0.0F, 1.0F, 0.875F, 1.0F); renderStandardInvBlock(renderer, block, metadata); } else { - renderer.setRenderBounds(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F); + renderer.func_147782_a(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F); renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 0.25F, 0.75F, 0.25F); + renderer.func_147782_a(0.0F, 0.0F, 0.0F, 0.25F, 0.75F, 0.25F); renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.75F, 0.0F, 0.0F, 1.0F, 0.75F, 0.25F); + renderer.func_147782_a(0.75F, 0.0F, 0.0F, 1.0F, 0.75F, 0.25F); renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.0F, 0.0F, 0.75F, 0.25F, 0.75F, 1.0F); + renderer.func_147782_a(0.0F, 0.0F, 0.75F, 0.25F, 0.75F, 1.0F); renderStandardInvBlock(renderer, block, metadata); - renderer.setRenderBounds(0.75F, 0.0F, 0.75F, 1.0F, 0.75F, 1.0F); + renderer.func_147782_a(0.75F, 0.0F, 0.75F, 1.0F, 0.75F, 1.0F); renderStandardInvBlock(renderer, block, metadata); } } @@ -48,28 +48,28 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block int metadata = world.getBlockMetadata(x, y, z); if (metadata == 5) { - renderer.setRenderBounds(0.0F, 0.0, 0.0F, 1.0F, 0.875F, 1.0F); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.0F, 0.0, 0.0F, 1.0F, 0.875F, 1.0F); + renderer.func_147784_q(block, x, y, z); } else { - renderer.setRenderBounds(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 0.25F, 0.75F, 0.25F); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.75F, 0.0F, 0.0F, 1.0F, 0.75F, 0.25F); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.0F, 0.0F, 0.75F, 0.25F, 0.75F, 1.0F); - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBounds(0.75F, 0.0F, 0.75F, 1.0F, 0.75F, 1.0F); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.0F, 0.0F, 0.0F, 0.25F, 0.75F, 0.25F); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.75F, 0.0F, 0.0F, 1.0F, 0.75F, 0.25F); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.0F, 0.0F, 0.75F, 0.25F, 0.75F, 1.0F); + renderer.func_147784_q(block, x, y, z); + renderer.func_147782_a(0.75F, 0.0F, 0.75F, 1.0F, 0.75F, 1.0F); + renderer.func_147784_q(block, x, y, z); } } return true; } @Override - public boolean shouldRender3DInInventory () + public boolean shouldRender3DInInventory (int modelID) { return true; } diff --git a/src/main/java/tconstruct/client/block/TankAirRender.java b/src/main/java/tconstruct/client/block/TankAirRender.java index 7a6c298c28d..3eeb057c2c1 100644 --- a/src/main/java/tconstruct/client/block/TankAirRender.java +++ b/src/main/java/tconstruct/client/block/TankAirRender.java @@ -47,7 +47,7 @@ else if (logic.hasFluids()) { Fluid fluid = fluidstack.getFluid(); //System.out.println("Base: "+getBaseAmount(base)+", Height: "+getHeightAmount(base, fluidstack.amount)+", fluid amount: "+fluidstack.amount); - renderer.setRenderBounds(0.0, getBaseAmount(base), 0.0, 1.0, getHeightAmount(base, fluidstack.amount), 1.0); + renderer.func_147782_a(0.0, getBaseAmount(base), 0.0, 1.0, getHeightAmount(base, fluidstack.amount), 1.0); if (fluid.canBePlacedInWorld()) BlockSkinRenderHelper.renderMetadataBlock(Block.blocksList[fluid.getBlockID()], 0, x, y, z, renderer, world); else @@ -70,7 +70,7 @@ private double getHeightAmount (int base, int amount) } @Override - public boolean shouldRender3DInInventory () + public boolean shouldRender3DInInventory (int modelID) { return true; } diff --git a/src/main/java/tconstruct/client/block/TankRender.java b/src/main/java/tconstruct/client/block/TankRender.java index 9b297503598..c680894fe42 100644 --- a/src/main/java/tconstruct/client/block/TankRender.java +++ b/src/main/java/tconstruct/client/block/TankRender.java @@ -28,7 +28,7 @@ public void renderInventoryBlock (Block block, int metadata, int modelID, Render TProxyClient.renderStandardInvBlock(renderer, block, metadata); if (metadata == 0) { - renderer.setRenderBounds(0.1875, 0, 0.1875, 0.8125, 0.125, 0.8125); + renderer.func_147782_a(0.1875, 0, 0.1875, 0.8125, 0.125, 0.8125); renderDoRe(renderer, block, metadata); } } @@ -44,31 +44,31 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block if (logic.containsFluid()) { FluidStack liquid = logic.tank.getFluid(); - renderer.setRenderBounds(0.001, 0.001, 0.001, 0.999, logic.getFluidAmountScaled(), 0.999); + renderer.func_147782_a(0.001, 0.001, 0.001, 0.999, logic.getFluidAmountScaled(), 0.999); Fluid fluid = liquid.getFluid(); if (fluid.canBePlacedInWorld()) BlockSkinRenderHelper.renderMetadataBlock(Block.blocksList[fluid.getBlockID()], 0, x, y, z, renderer, world); else BlockSkinRenderHelper.renderLiquidBlock(fluid.getStillIcon(), fluid.getFlowingIcon(), x, y, z, renderer, world); - renderer.setRenderBounds(00, 0.001, 0.001, 0.999, logic.getFluidAmountScaled(), 0.999); + renderer.func_147782_a(00, 0.001, 0.001, 0.999, logic.getFluidAmountScaled(), 0.999); } //Block int meta = world.getBlockMetadata(x, y, z); if (meta == 0 && world.getBlockId(x, y + 1, z) == 0) { - renderer.setRenderBounds(0.1875, 0, 0.1875, 0.8125, 0.125, 0.8125); - renderer.renderStandardBlock(block, x, y + 1, z); + renderer.func_147782_a(0.1875, 0, 0.1875, 0.8125, 0.125, 0.8125); + renderer.func_147784_q(block, x, y + 1, z); } - renderer.setRenderBounds(0, 0, 0, 1, 1, 1); - renderer.renderStandardBlock(block, x, y, z); + renderer.func_147782_a(0, 0, 0, 1, 1, 1); + renderer.func_147784_q(block, x, y, z); } return true; } @Override - public boolean shouldRender3DInInventory () + public boolean shouldRender3DInInventory (int modelID) { return true; } diff --git a/src/main/java/tconstruct/client/entity/CartRender.java b/src/main/java/tconstruct/client/entity/CartRender.java index 62cf5e4d766..e8941ea72e6 100644 --- a/src/main/java/tconstruct/client/entity/CartRender.java +++ b/src/main/java/tconstruct/client/entity/CartRender.java @@ -5,6 +5,7 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; +import net.minecraft.init.Blocks; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraft.util.Vec3; @@ -12,7 +13,6 @@ import org.lwjgl.opengl.GL11; import tconstruct.entity.CartEntity; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -98,7 +98,7 @@ public void renderPullcart (CartEntity cart, double posX, double posY, double po if (cart.getCartType() == 1) { GL11.glTranslatef(0.0F, 0.5F, 0.0F); - renderblocks.renderBlockAsItem(Block.chest, 0, cart.getBrightness(par9)); + renderblocks.renderBlockAsItem(Blocks.chest, 0, cart.getBrightness(par9)); GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.5F, 0.0F, -0.5F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); @@ -106,7 +106,7 @@ public void renderPullcart (CartEntity cart, double posX, double posY, double po else if (cart.getCartType() == 2) { GL11.glTranslatef(0.0F, 0.3125F, 0.0F); - renderblocks.renderBlockAsItem(Block.furnaceIdle, 0, cart.getBrightness(par9)); + renderblocks.renderBlockAsItem(Blocks.furnace, 0, cart.getBrightness(par9)); GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.0F, -0.3125F, 0.0F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); diff --git a/src/main/java/tconstruct/client/entity/FancyItemRender.java b/src/main/java/tconstruct/client/entity/FancyItemRender.java index 04637ea3f68..cf8a1ae41fa 100644 --- a/src/main/java/tconstruct/client/entity/FancyItemRender.java +++ b/src/main/java/tconstruct/client/entity/FancyItemRender.java @@ -15,7 +15,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.ForgeHooksClient; @@ -136,7 +136,7 @@ else if (itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.r for (int k = 0; k < itemstack.getItem().getRenderPasses(itemstack.getItemDamage()); ++k) { this.random.setSeed(187L); - Icon icon = itemstack.getItem().getIcon(itemstack, k); + IIcon icon = itemstack.getItem().getIcon(itemstack, k); f8 = 1.0F; if (this.renderWithColor) @@ -166,7 +166,7 @@ else if (itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.r GL11.glScalef(0.5F, 0.5F, 0.5F); } - Icon icon1 = itemstack.getIconIndex(); + IIcon icon1 = itemstack.getIconIndex(); if (this.renderWithColor) { @@ -213,10 +213,10 @@ private void renderDroppedItem (EntityItem par1EntityItem, Icon par2Icon, int pa par2Icon = ((TextureMap) texturemanager.getTexture(resourcelocation)).getAtlasSprite("missingno"); } - float f4 = ((Icon) par2Icon).getMinU(); - float f5 = ((Icon) par2Icon).getMaxU(); - float f6 = ((Icon) par2Icon).getMinV(); - float f7 = ((Icon) par2Icon).getMaxV(); + float f4 = ((IIcon) par2Icon).getMinU(); + float f5 = ((IIcon) par2Icon).getMaxU(); + float f6 = ((IIcon) par2Icon).getMinV(); + float f7 = ((IIcon) par2Icon).getMaxV(); float f8 = 1.0F; float f9 = 0.5F; float f10 = 0.25F; @@ -356,7 +356,7 @@ else if (Item.itemsList[k].requiresMultipleRenderPasses()) for (int j1 = 0; j1 < Item.itemsList[k].getRenderPasses(l); ++j1) { par2TextureManager.bindTexture(par3ItemStack.getItemSpriteNumber() == 0 ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture); - Icon icon = Item.itemsList[k].getIcon(par3ItemStack, j1); + IIcon icon = Item.itemsList[k].getIcon(par3ItemStack, j1); int k1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, j1); f1 = (float) (k1 >> 16 & 255) / 255.0F; f2 = (float) (k1 >> 8 & 255) / 255.0F; @@ -398,7 +398,7 @@ else if (Item.itemsList[k].requiresMultipleRenderPasses()) GL11.glColor4f(f, f1, f2, 1.0F); } - this.renderIcon(par4, par5, (Icon) object, 16, 16); + this.renderIcon(par4, par5, (IIcon) object, 16, 16); GL11.glEnable(GL11.GL_LIGHTING); if (par3ItemStack.hasEffect(0)) @@ -557,7 +557,7 @@ private void renderQuad (Tessellator par1Tessellator, int par2, int par3, int pa par1Tessellator.draw(); } - public void renderIcon (int par1, int par2, Icon par3Icon, int par4, int par5) + public void renderIcon (int par1, int par2, IIcon par3Icon, int par4, int par5) { Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); diff --git a/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java b/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java index 95aa481347f..d5d1177b112 100644 --- a/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java +++ b/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java @@ -6,6 +6,7 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityTNTPrimed; +import net.minecraft.init.Blocks; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -62,7 +63,7 @@ public void renderPrimedTNT (ExplosivePrimed par1EntityTNTPrimed, double par2, d GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_DST_ALPHA); GL11.glColor4f(1.0F, 1.0F, 1.0F, f2); - this.blockRenderer.renderBlockAsItem(Block.tnt, 0, 1.0F); + this.blockRenderer.renderBlockAsItem(Blocks.tnt, 0, 1.0F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glDisable(GL11.GL_BLEND); GL11.glEnable(GL11.GL_LIGHTING); diff --git a/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java b/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java index 2495c3e935a..4fbdf7ab39d 100644 --- a/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java +++ b/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java @@ -14,7 +14,7 @@ import net.minecraft.entity.Entity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.ForgeHooksClient; @@ -118,7 +118,7 @@ public void doRenderItem (ArrowEntity par1ArrowEntity, double par2, double par4, for (int k = 0; k < itemstack.getItem().getRenderPasses(itemstack.getItemDamage()); ++k) { this.random.setSeed(187L); - Icon icon = itemstack.getItem().getIcon(itemstack, k); + IIcon icon = itemstack.getItem().getIcon(itemstack, k); f8 = 1.0F; if (this.renderWithColor) @@ -140,7 +140,7 @@ public void doRenderItem (ArrowEntity par1ArrowEntity, double par2, double par4, { GL11.glScalef(0.5F, 0.5F, 0.5F); - Icon icon1 = itemstack.getIconIndex(); + IIcon icon1 = itemstack.getIconIndex(); if (this.renderWithColor) { @@ -171,12 +171,12 @@ protected ResourceLocation func_110796_a (ArrowEntity par1ArrowEntity) /** * Renders a dropped item */ - private void renderDroppedItem (ArrowEntity par1ArrowEntity, Icon par2Icon, int par3, float par4, float par5, float par6, float par7) + private void renderDroppedItem (ArrowEntity par1ArrowEntity, IIcon par2Icon, int par3, float par4, float par5, float par6, float par7) { renderDroppedItem(par1ArrowEntity, par2Icon, par3, par4, par5, par6, par7, 0); } - private void renderDroppedItem (ArrowEntity arrow, Icon par2Icon, int par3, float par4, float par5, float par6, float par7, int pass) + private void renderDroppedItem (ArrowEntity arrow, IIcon par2Icon, int par3, float par4, float par5, float par6, float par7, int pass) { Tessellator tessellator = Tessellator.instance; @@ -187,10 +187,10 @@ private void renderDroppedItem (ArrowEntity arrow, Icon par2Icon, int par3, floa par2Icon = ((TextureMap) texturemanager.getTexture(resourcelocation)).getAtlasSprite("missingno"); } - float f4 = ((Icon) par2Icon).getMinU(); - float f5 = ((Icon) par2Icon).getMaxU(); - float f6 = ((Icon) par2Icon).getMinV(); - float f7 = ((Icon) par2Icon).getMaxV(); + float f4 = ((IIcon) par2Icon).getMinU(); + float f5 = ((IIcon) par2Icon).getMaxU(); + float f6 = ((IIcon) par2Icon).getMinV(); + float f7 = ((IIcon) par2Icon).getMaxV(); float f8 = 1.0F; float f9 = 0.5F; float f10 = 0.25F; @@ -236,7 +236,7 @@ private void renderDroppedItem (ArrowEntity arrow, Icon par2Icon, int par3, floa GL11.glColor4f(par5, par6, par7, 1.0F); - ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, ((Icon) par2Icon).getIconWidth(), ((Icon) par2Icon).getIconHeight(), f12); + ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, ((IIcon) par2Icon).getIconWidth(), ((IIcon) par2Icon).getIconHeight(), f12); if (itemstack.hasEffect(pass)) { diff --git a/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java b/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java index 19982d07d75..04d879d1730 100644 --- a/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java +++ b/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java @@ -14,7 +14,7 @@ import net.minecraft.entity.Entity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.ForgeHooksClient; @@ -133,7 +133,7 @@ public void doRenderItem (DaggerEntity par1ArrowEntity, double par2, double par4 for (int k = 0; k < itemstack.getItem().getRenderPasses(itemstack.getItemDamage()); ++k) { this.random.setSeed(187L); - Icon icon = itemstack.getItem().getIcon(itemstack, k); + IIcon icon = itemstack.getItem().getIcon(itemstack, k); f8 = 1.0F; if (this.renderWithColor) @@ -163,7 +163,7 @@ public void doRenderItem (DaggerEntity par1ArrowEntity, double par2, double par4 GL11.glScalef(0.5F, 0.5F, 0.5F); } - Icon icon1 = itemstack.getIconIndex(); + IIcon icon1 = itemstack.getIconIndex(); if (this.renderWithColor) { @@ -210,10 +210,10 @@ private void renderDroppedItem (DaggerEntity dagger, Icon par2Icon, int par3, fl par2Icon = ((TextureMap) texturemanager.getTexture(resourcelocation)).getAtlasSprite("missingno"); } - float f4 = ((Icon) par2Icon).getMinU(); - float f5 = ((Icon) par2Icon).getMaxU(); - float f6 = ((Icon) par2Icon).getMinV(); - float f7 = ((Icon) par2Icon).getMaxV(); + float f4 = ((IIcon) par2Icon).getMinU(); + float f5 = ((IIcon) par2Icon).getMaxU(); + float f6 = ((IIcon) par2Icon).getMinV(); + float f7 = ((IIcon) par2Icon).getMaxV(); float f8 = 1.0F; float f9 = 0.5F; float f10 = 0.25F; @@ -259,7 +259,7 @@ private void renderDroppedItem (DaggerEntity dagger, Icon par2Icon, int par3, fl GL11.glColor4f(par5, par6, par7, 1.0F); GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); GL11.glRotatef(rotation, 0.0F, 0.0F, 1.0F); - ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, ((Icon) par2Icon).getIconWidth(), ((Icon) par2Icon).getIconHeight(), f12); + ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, ((IIcon) par2Icon).getIconWidth(), ((IIcon) par2Icon).getIconHeight(), f12); /*if (itemstack.hasEffect(pass)) { @@ -348,7 +348,7 @@ else if (Item.itemsList[k].requiresMultipleRenderPasses()) for (int j1 = 0; j1 < Item.itemsList[k].getRenderPasses(l); ++j1) { par2TextureManager.bindTexture(par3ItemStack.getItemSpriteNumber() == 0 ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture); - Icon icon = Item.itemsList[k].getIcon(par3ItemStack, j1); + IIcon icon = Item.itemsList[k].getIcon(par3ItemStack, j1); int k1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, j1); f1 = (float) (k1 >> 16 & 255) / 255.0F; f2 = (float) (k1 >> 8 & 255) / 255.0F; @@ -390,7 +390,7 @@ else if (Item.itemsList[k].requiresMultipleRenderPasses()) GL11.glColor4f(f, f1, f2, 1.0F); } - this.renderIcon(par4, par5, (Icon) object, 16, 16); + this.renderIcon(par4, par5, (IIcon) object, 16, 16); GL11.glEnable(GL11.GL_LIGHTING); if (par3ItemStack.hasEffect(0)) @@ -549,7 +549,7 @@ private void renderQuad (Tessellator par1Tessellator, int par2, int par3, int pa par1Tessellator.draw(); } - public void renderIcon (int par1, int par2, Icon par3Icon, int par4, int par5) + public void renderIcon (int par1, int par2, IIcon par3Icon, int par4, int par5) { Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); diff --git a/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java b/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java index b76fffa9aab..34ce414f3dc 100644 --- a/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java +++ b/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java @@ -7,7 +7,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemPotion; import net.minecraft.potion.PotionHelper; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -43,7 +43,7 @@ public LaunchedItemRender(Item par1Item) */ public void doRender (Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { - Icon icon = this.field_94151_a.getIconFromDamage(this.field_94150_f); + IIcon icon = this.field_94151_a.getIconFromDamage(this.field_94150_f); if (icon != null) { diff --git a/src/main/java/tconstruct/client/gui/AdaptiveSmelteryGui.java b/src/main/java/tconstruct/client/gui/AdaptiveSmelteryGui.java index 71cceac31fb..d14b66f53d5 100644 --- a/src/main/java/tconstruct/client/gui/AdaptiveSmelteryGui.java +++ b/src/main/java/tconstruct/client/gui/AdaptiveSmelteryGui.java @@ -8,7 +8,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.*; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.*; import net.minecraft.util.StatCollector; @@ -177,7 +177,7 @@ protected void drawGuiContainerBackgroundLayer (float f, int mouseX, int mouseY) this.mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture); if (scomp.fuelGague > 0) { - Icon lavaIcon = Block.lavaStill.getIcon(0, 0); + IIcon lavaIcon = Block.lavaStill.getIcon(0, 0); int fuel = scomp.getScaledFuelGague(52); int count = 0; while (fuel > 0)