diff --git a/src/main/java/tconstruct/blocks/traps/Punji.java b/src/main/java/tconstruct/blocks/traps/Punji.java index 4723b6f9..0d231a6f 100644 --- a/src/main/java/tconstruct/blocks/traps/Punji.java +++ b/src/main/java/tconstruct/blocks/traps/Punji.java @@ -26,7 +26,7 @@ public class Punji extends MantleBlock public Punji() { - super(Material.plants); + super(Material.field_151585_k); this.func_149676_a(0.125f, 0, 0.125f, 0.875f, 0.375f, 0.875f); this.setStepSound(Block.soundGrassFootstep); this.func_149647_a(TConstructRegistry.blockTab); diff --git a/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java b/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java index 5812d7c6..4a4e7619 100644 --- a/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java +++ b/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java @@ -29,7 +29,7 @@ public class BlockSkinRenderHelper var8 = var11; } - return Minecraft.isAmbientOcclusionEnabled() && block.lightValue == 0 ? renderMetadataBlockWithAmbientOcclusion(block, metadata, x, y, z, var6, var7, var8, renderer, world) + return Minecraft.isAmbientOcclusionEnabled() && block.func_149750_m() == 0 ? renderMetadataBlockWithAmbientOcclusion(block, metadata, x, y, z, var6, var7, var8, renderer, world) : renderMetadataBlockWithColorMultiplier(block, metadata, x, y, z, var6, var7, var8, renderer, world); } @@ -47,11 +47,11 @@ public class BlockSkinRenderHelper Tessellator tessellator = Tessellator.instance; tessellator.setBrightness(983055); - if (render.getBlockIcon(block).getIconName().equals("grass_top")) + if (render.func_147745_b(block).getIconName().equals("grass_top")) { flag1 = false; } - else if (render.hasOverrideBlockTexture()) + else if (render.func_147744_b()) { flag1 = false; } @@ -65,7 +65,7 @@ public class BlockSkinRenderHelper if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos - 1, zPos, 0)) { - if (render.renderMinY <= 0.0D) + if (render.field_147855_j <= 0.0D) { --yPos; } @@ -127,14 +127,14 @@ public class BlockSkinRenderHelper render.field_147834_Y = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos + 1); } - if (render.renderMinY <= 0.0D) + if (render.field_147855_j <= 0.0D) { ++yPos; } i1 = l; - if (render.renderMinY <= 0.0D || !render.field_147845_a.isBlockOpaqueCube(xPos, yPos - 1, zPos)) + if (render.field_147855_j <= 0.0D || !render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos).func_149662_c()) { i1 = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); } @@ -144,10 +144,10 @@ public class BlockSkinRenderHelper f6 = (render.field_147815_B + f7 + render.field_147811_E + render.field_147810_D) / 4.0F; f5 = (f7 + render.field_147814_A + render.field_147810_D + render.field_147816_C) / 4.0F; f4 = (render.field_147886_y + render.field_147888_x + f7 + render.field_147814_A) / 4.0F; - render.field_147864_al = render.getAoBrightness(render.field_147826_T, render.field_147831_S, render.field_147828_V, i1); - render.field_147870_ao = render.getAoBrightness(render.field_147828_V, render.field_147834_Y, render.field_147835_X, i1); - render.field_147876_an = render.getAoBrightness(render.field_147825_U, render.field_147835_X, render.field_147827_W, i1); - render.field_147874_am = render.getAoBrightness(render.field_147831_S, render.field_147832_R, render.field_147825_U, i1); + render.field_147864_al = render.func_147778_a(render.field_147826_T, render.field_147831_S, render.field_147828_V, i1); + render.field_147870_ao = render.func_147778_a(render.field_147828_V, render.field_147834_Y, render.field_147835_X, i1); + render.field_147876_an = render.func_147778_a(render.field_147825_U, render.field_147835_X, render.field_147827_W, i1); + render.field_147874_am = render.func_147778_a(render.field_147831_S, render.field_147832_R, render.field_147825_U, i1); if (flag1) { @@ -174,13 +174,13 @@ public class BlockSkinRenderHelper render.field_147848_as *= f6; render.field_147856_aw *= f6; render.field_147833_aA *= f6; - render.func_147768_a(block, (double) xPos, (double) yPos, (double) zPos, block.getIcon(0, metadata)); + render.func_147768_a(block, (double) xPos, (double) yPos, (double) zPos, block.func_149691_a(0, metadata)); flag = true; } if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos + 1, zPos, 1)) { - if (render.renderMaxY >= 1.0D) + if (render.field_147857_k >= 1.0D) { ++yPos; } @@ -242,14 +242,14 @@ public class BlockSkinRenderHelper render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos + 1); } - if (render.renderMaxY >= 1.0D) + if (render.field_147857_k >= 1.0D) { --yPos; } i1 = l; - if (render.renderMaxY >= 1.0D || !render.field_147845_a.isBlockOpaqueCube(xPos, yPos + 1, zPos)) + if (render.field_147857_k >= 1.0D || !render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos).func_149662_c()) { i1 = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); } @@ -259,10 +259,10 @@ public class BlockSkinRenderHelper f3 = (render.field_147817_L + f7 + render.field_147819_N + render.field_147824_K) / 4.0F; f4 = (f7 + render.field_147822_I + render.field_147824_K + render.field_147823_J) / 4.0F; f5 = (render.field_147813_G + render.field_147812_F + f7 + render.field_147822_I) / 4.0F; - render.field_147870_ao = render.getAoBrightness(render.field_147881_ab, render.field_147880_aa, render.field_147887_af, i1); - render.field_147864_al = render.getAoBrightness(render.field_147887_af, render.field_147882_ag, render.field_147885_ae, i1); - render.field_147874_am = render.getAoBrightness(render.field_147878_ac, render.field_147885_ae, render.field_147879_ad, i1); - render.field_147876_an = render.getAoBrightness(render.field_147880_aa, render.field_147836_Z, render.field_147878_ac, i1); + render.field_147870_ao = render.func_147778_a(render.field_147881_ab, render.field_147880_aa, render.field_147887_af, i1); + render.field_147864_al = render.func_147778_a(render.field_147887_af, render.field_147882_ag, render.field_147885_ae, i1); + render.field_147874_am = render.func_147778_a(render.field_147878_ac, render.field_147885_ae, render.field_147879_ad, i1); + render.field_147876_an = render.func_147778_a(render.field_147880_aa, render.field_147836_Z, render.field_147878_ac, i1); render.field_147872_ap = render.field_147852_aq = render.field_147850_ar = render.field_147848_as = colorRed; render.field_147846_at = render.field_147860_au = render.field_147858_av = render.field_147856_aw = colorGreen; render.field_147854_ax = render.field_147841_ay = render.field_147839_az = render.field_147833_aA = colorBlue; @@ -278,7 +278,7 @@ public class BlockSkinRenderHelper render.field_147848_as *= f6; render.field_147856_aw *= f6; render.field_147833_aA *= f6; - render.renderFaceYPos(block, (double) xPos, (double) yPos, (double) zPos, block.getIcon(1, metadata)); + render.func_147806_b(block, (double) xPos, (double) yPos, (double) zPos, block.func_149691_a(1, metadata)); flag = true; } @@ -286,7 +286,7 @@ public class BlockSkinRenderHelper if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos, zPos - 1, 2)) { - if (render.renderMinZ <= 0.0D) + if (render.field_147851_l <= 0.0D) { --zPos; } @@ -348,14 +348,14 @@ public class BlockSkinRenderHelper render.field_147879_ad = block.func_149677_c(render.field_147845_a, xPos + 1, yPos + 1, zPos); } - if (render.renderMinZ <= 0.0D) + if (render.field_147851_l <= 0.0D) { ++zPos; } i1 = l; - if (render.renderMinZ <= 0.0D || !render.field_147845_a.isBlockOpaqueCube(xPos, yPos, zPos - 1)) + if (render.field_147851_l <= 0.0D || !render.field_147845_a.func_147439_a(xPos, yPos, zPos - 1).func_149662_c()) { i1 = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); } @@ -365,10 +365,10 @@ public class BlockSkinRenderHelper f4 = (f7 + render.field_147822_I + render.field_147820_O + render.field_147823_J) / 4.0F; f5 = (render.field_147814_A + f7 + render.field_147816_C + render.field_147820_O) / 4.0F; f6 = (render.field_147888_x + render.field_147820_O + render.field_147814_A + f7) / 4.0F; - render.field_147864_al = render.getAoBrightness(render.field_147883_ah, render.field_147836_Z, render.field_147878_ac, i1); - render.field_147874_am = render.getAoBrightness(render.field_147878_ac, render.field_147866_ai, render.field_147879_ad, i1); - render.field_147876_an = render.getAoBrightness(render.field_147825_U, render.field_147827_W, render.field_147866_ai, i1); - render.field_147870_ao = render.getAoBrightness(render.field_147832_R, render.field_147883_ah, render.field_147825_U, i1); + render.field_147864_al = render.func_147778_a(render.field_147883_ah, render.field_147836_Z, render.field_147878_ac, i1); + render.field_147874_am = render.func_147778_a(render.field_147878_ac, render.field_147866_ai, render.field_147879_ad, i1); + render.field_147876_an = render.func_147778_a(render.field_147825_U, render.field_147827_W, render.field_147866_ai, i1); + render.field_147870_ao = render.func_147778_a(render.field_147832_R, render.field_147883_ah, render.field_147825_U, i1); if (flag1) { @@ -395,7 +395,7 @@ public class BlockSkinRenderHelper render.field_147848_as *= f6; render.field_147856_aw *= f6; render.field_147833_aA *= f6; - icon = block.getIcon(2, metadata); + icon = block.func_149691_a(2, metadata); render.func_147761_c(block, (double) xPos, (double) yPos, (double) zPos, icon); flag = true; @@ -403,7 +403,7 @@ public class BlockSkinRenderHelper if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos, zPos + 1, 3)) { - if (render.renderMaxZ >= 1.0D) + if (render.field_147853_m >= 1.0D) { ++zPos; } @@ -465,14 +465,14 @@ public class BlockSkinRenderHelper render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos + 1, yPos + 1, zPos); } - if (render.renderMaxZ >= 1.0D) + if (render.field_147853_m >= 1.0D) { --zPos; } i1 = l; - if (render.renderMaxZ >= 1.0D || !render.field_147845_a.isBlockOpaqueCube(xPos, yPos, zPos + 1)) + if (render.field_147853_m >= 1.0D || !render.field_147845_a.func_147439_a(xPos, yPos, zPos + 1).func_149662_c()) { i1 = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); } @@ -482,10 +482,10 @@ public class BlockSkinRenderHelper f6 = (f7 + render.field_147817_L + render.field_147829_Q + render.field_147819_N) / 4.0F; f5 = (render.field_147815_B + f7 + render.field_147811_E + render.field_147829_Q) / 4.0F; f4 = (render.field_147884_z + render.field_147830_P + render.field_147815_B + f7) / 4.0F; - render.field_147864_al = render.getAoBrightness(render.field_147868_aj, render.field_147881_ab, render.field_147887_af, i1); - render.field_147870_ao = render.getAoBrightness(render.field_147887_af, render.field_147862_ak, render.field_147882_ag, i1); - render.field_147876_an = render.getAoBrightness(render.field_147828_V, render.field_147834_Y, render.field_147862_ak, i1); - render.field_147874_am = render.getAoBrightness(render.field_147826_T, render.field_147868_aj, render.field_147828_V, i1); + render.field_147864_al = render.func_147778_a(render.field_147868_aj, render.field_147881_ab, render.field_147887_af, i1); + render.field_147870_ao = render.func_147778_a(render.field_147887_af, render.field_147862_ak, render.field_147882_ag, i1); + render.field_147876_an = render.func_147778_a(render.field_147828_V, render.field_147834_Y, render.field_147862_ak, i1); + render.field_147874_am = render.func_147778_a(render.field_147826_T, render.field_147868_aj, render.field_147828_V, i1); if (flag1) { @@ -512,7 +512,7 @@ public class BlockSkinRenderHelper render.field_147848_as *= f6; render.field_147856_aw *= f6; render.field_147833_aA *= f6; - icon = block.getIcon(3, metadata); + icon = block.func_149691_a(3, metadata); render.func_147734_d(block, (double) xPos, (double) yPos, (double) zPos, icon); flag = true; @@ -520,7 +520,7 @@ public class BlockSkinRenderHelper if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos - 1, yPos, zPos, 4)) { - if (render.renderMinX <= 0.0D) + if (render.field_147859_h <= 0.0D) { --xPos; } @@ -582,14 +582,14 @@ public class BlockSkinRenderHelper render.field_147881_ab = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos + 1); } - if (render.renderMinX <= 0.0D) + if (render.field_147859_h <= 0.0D) { ++xPos; } i1 = l; - if (render.renderMinX <= 0.0D || !render.field_147845_a.isBlockOpaqueCube(xPos - 1, yPos, zPos)) + if (render.field_147859_h <= 0.0D || !render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos).func_149662_c()) { i1 = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); } @@ -599,10 +599,10 @@ public class BlockSkinRenderHelper f3 = (f7 + render.field_147830_P + render.field_147813_G + render.field_147821_H) / 4.0F; f4 = (render.field_147820_O + f7 + render.field_147812_F + render.field_147813_G) / 4.0F; f5 = (render.field_147888_x + render.field_147886_y + render.field_147820_O + f7) / 4.0F; - render.field_147870_ao = render.getAoBrightness(render.field_147831_S, render.field_147826_T, render.field_147868_aj, i1); - render.field_147864_al = render.getAoBrightness(render.field_147868_aj, render.field_147880_aa, render.field_147881_ab, i1); - render.field_147874_am = render.getAoBrightness(render.field_147883_ah, render.field_147836_Z, render.field_147880_aa, i1); - render.field_147876_an = render.getAoBrightness(render.field_147832_R, render.field_147831_S, render.field_147883_ah, i1); + render.field_147870_ao = render.func_147778_a(render.field_147831_S, render.field_147826_T, render.field_147868_aj, i1); + render.field_147864_al = render.func_147778_a(render.field_147868_aj, render.field_147880_aa, render.field_147881_ab, i1); + render.field_147874_am = render.func_147778_a(render.field_147883_ah, render.field_147836_Z, render.field_147880_aa, i1); + render.field_147876_an = render.func_147778_a(render.field_147832_R, render.field_147831_S, render.field_147883_ah, i1); if (flag1) { @@ -629,7 +629,7 @@ public class BlockSkinRenderHelper render.field_147848_as *= f6; render.field_147856_aw *= f6; render.field_147833_aA *= f6; - icon = block.getIcon(4, metadata); + icon = block.func_149691_a(4, metadata); render.func_147798_e(block, (double) xPos, (double) yPos, (double) zPos, icon); flag = true; @@ -637,7 +637,7 @@ public class BlockSkinRenderHelper if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos + 1, yPos, zPos, 5)) { - if (render.renderMaxX >= 1.0D) + if (render.field_147861_i >= 1.0D) { ++xPos; } @@ -699,14 +699,14 @@ public class BlockSkinRenderHelper render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos + 1); } - if (render.renderMaxX >= 1.0D) + if (render.field_147861_i >= 1.0D) { --xPos; } i1 = l; - if (render.renderMaxX >= 1.0D || !render.field_147845_a.isBlockOpaqueCube(xPos + 1, yPos, zPos)) + if (render.field_147861_i >= 1.0D || !render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos).func_149662_c()) { i1 = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); } @@ -716,10 +716,10 @@ public class BlockSkinRenderHelper f4 = (render.field_147816_C + render.field_147810_D + render.field_147820_O + f7) / 4.0F; f5 = (render.field_147820_O + f7 + render.field_147823_J + render.field_147824_K) / 4.0F; f6 = (f7 + render.field_147829_Q + render.field_147824_K + render.field_147819_N) / 4.0F; - render.field_147864_al = render.getAoBrightness(render.field_147835_X, render.field_147834_Y, render.field_147862_ak, i1); - render.field_147870_ao = render.getAoBrightness(render.field_147862_ak, render.field_147885_ae, render.field_147882_ag, i1); - render.field_147876_an = render.getAoBrightness(render.field_147866_ai, render.field_147879_ad, render.field_147885_ae, i1); - render.field_147874_am = render.getAoBrightness(render.field_147827_W, render.field_147835_X, render.field_147866_ai, i1); + render.field_147864_al = render.func_147778_a(render.field_147835_X, render.field_147834_Y, render.field_147862_ak, i1); + render.field_147870_ao = render.func_147778_a(render.field_147862_ak, render.field_147885_ae, render.field_147882_ag, i1); + render.field_147876_an = render.func_147778_a(render.field_147866_ai, render.field_147879_ad, render.field_147885_ae, i1); + render.field_147874_am = render.func_147778_a(render.field_147827_W, render.field_147835_X, render.field_147866_ai, i1); if (flag1) { @@ -746,7 +746,7 @@ public class BlockSkinRenderHelper render.field_147848_as *= f6; render.field_147856_aw *= f6; render.field_147833_aA *= f6; - icon = block.getIcon(5, metadata); + icon = block.func_149691_a(5, metadata); render.func_147764_f(block, (double) xPos, (double) yPos, (double) zPos, icon); flag = true; @@ -796,17 +796,17 @@ public class BlockSkinRenderHelper if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos - 1, zPos, 0)) { - tessellator.setBrightness(render.renderMinY > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos)); + tessellator.setBrightness(render.field_147855_j > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos)); tessellator.setColorOpaque_F(f10, f13, f16); - render.func_147768_a(block, (double) xPos, (double) yPos, (double) zPos, block.getIcon(0, metadata)); + render.func_147768_a(block, (double) xPos, (double) yPos, (double) zPos, block.func_149691_a(0, metadata)); flag = true; } if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos + 1, zPos, 1)) { - tessellator.setBrightness(render.renderMaxY < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos)); + tessellator.setBrightness(render.field_147857_k < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos)); tessellator.setColorOpaque_F(f7, f8, f9); - render.renderFaceYPos(block, (double) xPos, (double) yPos, (double) zPos, block.getIcon(1, metadata)); + render.func_147806_b(block, (double) xPos, (double) yPos, (double) zPos, block.func_149691_a(1, metadata)); flag = true; } @@ -814,36 +814,36 @@ public class BlockSkinRenderHelper if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos, zPos - 1, 2)) { - tessellator.setBrightness(render.renderMinZ > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1)); + tessellator.setBrightness(render.field_147851_l > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1)); tessellator.setColorOpaque_F(f11, f14, f17); - render.func_147761_c(block, (double) xPos, (double) yPos, (double) zPos, block.getIcon(2, metadata)); + render.func_147761_c(block, (double) xPos, (double) yPos, (double) zPos, block.func_149691_a(2, metadata)); flag = true; } if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos, zPos + 1, 3)) { - tessellator.setBrightness(render.renderMaxZ < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1)); + tessellator.setBrightness(render.field_147853_m < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1)); tessellator.setColorOpaque_F(f11, f14, f17); - render.func_147734_d(block, (double) xPos, (double) yPos, (double) zPos, block.getIcon(3, metadata)); + render.func_147734_d(block, (double) xPos, (double) yPos, (double) zPos, block.func_149691_a(3, metadata)); flag = true; } if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos - 1, yPos, zPos, 4)) { - tessellator.setBrightness(render.renderMinX > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos)); + tessellator.setBrightness(render.field_147859_h > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos)); tessellator.setColorOpaque_F(f12, f15, f18); - render.func_147798_e(block, (double) xPos, (double) yPos, (double) zPos, block.getIcon(4, metadata)); + render.func_147798_e(block, (double) xPos, (double) yPos, (double) zPos, block.func_149691_a(4, metadata)); flag = true; } if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos + 1, yPos, zPos, 5)) { - tessellator.setBrightness(render.renderMaxX < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos)); + tessellator.setBrightness(render.field_147861_i < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos)); tessellator.setColorOpaque_F(f12, f15, f18); - render.func_147764_f(block, (double) xPos, (double) yPos, (double) zPos, block.getIcon(5, metadata)); + render.func_147764_f(block, (double) xPos, (double) yPos, (double) zPos, block.func_149691_a(5, metadata)); flag = true; } @@ -888,11 +888,11 @@ public class BlockSkinRenderHelper Tessellator tessellator = Tessellator.instance; tessellator.setBrightness(983055); - if (render.getBlockIcon(block).getIconName().equals("grass_top")) + if (render.func_147745_b(block).getIconName().equals("grass_top")) { flag1 = false; } - else if (render.hasOverrideBlockTexture()) + else if (render.func_147744_b()) { flag1 = false; } @@ -906,7 +906,7 @@ public class BlockSkinRenderHelper if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos - 1, zPos, 0)) { - if (render.renderMinY <= 0.0D) + if (render.field_147855_j <= 0.0D) { --yPos; } @@ -968,14 +968,14 @@ public class BlockSkinRenderHelper render.field_147834_Y = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos + 1); } - if (render.renderMinY <= 0.0D) + if (render.field_147855_j <= 0.0D) { ++yPos; } i1 = l; - if (render.renderMinY <= 0.0D || !render.field_147845_a.isBlockOpaqueCube(xPos, yPos - 1, zPos)) + if (render.field_147855_j <= 0.0D || !render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos).func_149662_c()) { i1 = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); } @@ -985,10 +985,10 @@ public class BlockSkinRenderHelper f6 = (render.field_147815_B + f7 + render.field_147811_E + render.field_147810_D) / 4.0F; f5 = (f7 + render.field_147814_A + render.field_147810_D + render.field_147816_C) / 4.0F; f4 = (render.field_147886_y + render.field_147888_x + f7 + render.field_147814_A) / 4.0F; - render.field_147864_al = render.getAoBrightness(render.field_147826_T, render.field_147831_S, render.field_147828_V, i1); - render.field_147870_ao = render.getAoBrightness(render.field_147828_V, render.field_147834_Y, render.field_147835_X, i1); - render.field_147876_an = render.getAoBrightness(render.field_147825_U, render.field_147835_X, render.field_147827_W, i1); - render.field_147874_am = render.getAoBrightness(render.field_147831_S, render.field_147832_R, render.field_147825_U, i1); + render.field_147864_al = render.func_147778_a(render.field_147826_T, render.field_147831_S, render.field_147828_V, i1); + render.field_147870_ao = render.func_147778_a(render.field_147828_V, render.field_147834_Y, render.field_147835_X, i1); + render.field_147876_an = render.func_147778_a(render.field_147825_U, render.field_147835_X, render.field_147827_W, i1); + render.field_147874_am = render.func_147778_a(render.field_147831_S, render.field_147832_R, render.field_147825_U, i1); if (flag1) { @@ -1021,7 +1021,7 @@ public class BlockSkinRenderHelper if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos + 1, zPos, 1)) { - if (render.renderMaxY >= 1.0D) + if (render.field_147857_k >= 1.0D) { ++yPos; } @@ -1083,14 +1083,14 @@ public class BlockSkinRenderHelper render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos + 1); } - if (render.renderMaxY >= 1.0D) + if (render.field_147857_k >= 1.0D) { --yPos; } i1 = l; - if (render.renderMaxY >= 1.0D || !render.field_147845_a.isBlockOpaqueCube(xPos, yPos + 1, zPos)) + if (render.field_147857_k >= 1.0D || !render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos).func_149662_c()) { i1 = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); } @@ -1100,10 +1100,10 @@ public class BlockSkinRenderHelper f3 = (render.field_147817_L + f7 + render.field_147819_N + render.field_147824_K) / 4.0F; f4 = (f7 + render.field_147822_I + render.field_147824_K + render.field_147823_J) / 4.0F; f5 = (render.field_147813_G + render.field_147812_F + f7 + render.field_147822_I) / 4.0F; - render.field_147870_ao = render.getAoBrightness(render.field_147881_ab, render.field_147880_aa, render.field_147887_af, i1); - render.field_147864_al = render.getAoBrightness(render.field_147887_af, render.field_147882_ag, render.field_147885_ae, i1); - render.field_147874_am = render.getAoBrightness(render.field_147878_ac, render.field_147885_ae, render.field_147879_ad, i1); - render.field_147876_an = render.getAoBrightness(render.field_147880_aa, render.field_147836_Z, render.field_147878_ac, i1); + render.field_147870_ao = render.func_147778_a(render.field_147881_ab, render.field_147880_aa, render.field_147887_af, i1); + render.field_147864_al = render.func_147778_a(render.field_147887_af, render.field_147882_ag, render.field_147885_ae, i1); + render.field_147874_am = render.func_147778_a(render.field_147878_ac, render.field_147885_ae, render.field_147879_ad, i1); + render.field_147876_an = render.func_147778_a(render.field_147880_aa, render.field_147836_Z, render.field_147878_ac, i1); render.field_147872_ap = render.field_147852_aq = render.field_147850_ar = render.field_147848_as = colorRed; render.field_147846_at = render.field_147860_au = render.field_147858_av = render.field_147856_aw = colorGreen; render.field_147854_ax = render.field_147841_ay = render.field_147839_az = render.field_147833_aA = colorBlue; @@ -1119,13 +1119,13 @@ public class BlockSkinRenderHelper render.field_147848_as *= f6; render.field_147856_aw *= f6; render.field_147833_aA *= f6; - render.renderFaceYPos(block, (double) xPos, (double) yPos, (double) zPos, stillIcon); + render.func_147806_b(block, (double) xPos, (double) yPos, (double) zPos, stillIcon); flag = true; } if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos, zPos - 1, 2)) { - if (render.renderMinZ <= 0.0D) + if (render.field_147851_l <= 0.0D) { --zPos; } @@ -1187,14 +1187,14 @@ public class BlockSkinRenderHelper render.field_147879_ad = block.func_149677_c(render.field_147845_a, xPos + 1, yPos + 1, zPos); } - if (render.renderMinZ <= 0.0D) + if (render.field_147851_l <= 0.0D) { ++zPos; } i1 = l; - if (render.renderMinZ <= 0.0D || !render.field_147845_a.isBlockOpaqueCube(xPos, yPos, zPos - 1)) + if (render.field_147851_l <= 0.0D || !render.field_147845_a.func_147439_a(xPos, yPos, zPos - 1).func_149662_c()) { i1 = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); } @@ -1204,10 +1204,10 @@ public class BlockSkinRenderHelper f4 = (f7 + render.field_147822_I + render.field_147820_O + render.field_147823_J) / 4.0F; f5 = (render.field_147814_A + f7 + render.field_147816_C + render.field_147820_O) / 4.0F; f6 = (render.field_147888_x + render.field_147820_O + render.field_147814_A + f7) / 4.0F; - render.field_147864_al = render.getAoBrightness(render.field_147883_ah, render.field_147836_Z, render.field_147878_ac, i1); - render.field_147874_am = render.getAoBrightness(render.field_147878_ac, render.field_147866_ai, render.field_147879_ad, i1); - render.field_147876_an = render.getAoBrightness(render.field_147825_U, render.field_147827_W, render.field_147866_ai, i1); - render.field_147870_ao = render.getAoBrightness(render.field_147832_R, render.field_147883_ah, render.field_147825_U, i1); + render.field_147864_al = render.func_147778_a(render.field_147883_ah, render.field_147836_Z, render.field_147878_ac, i1); + render.field_147874_am = render.func_147778_a(render.field_147878_ac, render.field_147866_ai, render.field_147879_ad, i1); + render.field_147876_an = render.func_147778_a(render.field_147825_U, render.field_147827_W, render.field_147866_ai, i1); + render.field_147870_ao = render.func_147778_a(render.field_147832_R, render.field_147883_ah, render.field_147825_U, i1); if (flag1) { @@ -1241,7 +1241,7 @@ public class BlockSkinRenderHelper if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos, zPos + 1, 3)) { - if (render.renderMaxZ >= 1.0D) + if (render.field_147853_m >= 1.0D) { ++zPos; } @@ -1303,14 +1303,14 @@ public class BlockSkinRenderHelper render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos + 1, yPos + 1, zPos); } - if (render.renderMaxZ >= 1.0D) + if (render.field_147853_m >= 1.0D) { --zPos; } i1 = l; - if (render.renderMaxZ >= 1.0D || !render.field_147845_a.isBlockOpaqueCube(xPos, yPos, zPos + 1)) + if (render.field_147853_m >= 1.0D || !render.field_147845_a.func_147439_a(xPos, yPos, zPos + 1).func_149662_c()) { i1 = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); } @@ -1320,10 +1320,10 @@ public class BlockSkinRenderHelper f6 = (f7 + render.field_147817_L + render.field_147829_Q + render.field_147819_N) / 4.0F; f5 = (render.field_147815_B + f7 + render.field_147811_E + render.field_147829_Q) / 4.0F; f4 = (render.field_147884_z + render.field_147830_P + render.field_147815_B + f7) / 4.0F; - render.field_147864_al = render.getAoBrightness(render.field_147868_aj, render.field_147881_ab, render.field_147887_af, i1); - render.field_147870_ao = render.getAoBrightness(render.field_147887_af, render.field_147862_ak, render.field_147882_ag, i1); - render.field_147876_an = render.getAoBrightness(render.field_147828_V, render.field_147834_Y, render.field_147862_ak, i1); - render.field_147874_am = render.getAoBrightness(render.field_147826_T, render.field_147868_aj, render.field_147828_V, i1); + render.field_147864_al = render.func_147778_a(render.field_147868_aj, render.field_147881_ab, render.field_147887_af, i1); + render.field_147870_ao = render.func_147778_a(render.field_147887_af, render.field_147862_ak, render.field_147882_ag, i1); + render.field_147876_an = render.func_147778_a(render.field_147828_V, render.field_147834_Y, render.field_147862_ak, i1); + render.field_147874_am = render.func_147778_a(render.field_147826_T, render.field_147868_aj, render.field_147828_V, i1); if (flag1) { @@ -1357,7 +1357,7 @@ public class BlockSkinRenderHelper if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos - 1, yPos, zPos, 4)) { - if (render.renderMinX <= 0.0D) + if (render.field_147859_h <= 0.0D) { --xPos; } @@ -1370,7 +1370,7 @@ public class BlockSkinRenderHelper render.field_147883_ah = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); render.field_147868_aj = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); render.field_147880_aa = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); - flag3 = render.field_147845_a.getBlock(xPos - 1, yPos + 1, zPos).func_149751_l(); + flag3 = render.field_147845_a.func_147439_a(xPos - 1, yPos + 1, zPos).func_149751_l(); flag2 = render.field_147845_a.func_147439_a(xPos - 1, yPos - 1, zPos).func_149751_l(); flag5 = render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos - 1).func_149751_l(); flag4 = render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos + 1).func_149751_l(); @@ -1419,14 +1419,14 @@ public class BlockSkinRenderHelper render.field_147881_ab = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos + 1); } - if (render.renderMinX <= 0.0D) + if (render.field_147859_h <= 0.0D) { ++xPos; } i1 = l; - if (render.renderMinX <= 0.0D || !render.field_147845_a.isBlockOpaqueCube(xPos - 1, yPos, zPos)) + if (render.field_147859_h <= 0.0D || !render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos).func_149662_c()) { i1 = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); } @@ -1436,10 +1436,10 @@ public class BlockSkinRenderHelper f3 = (f7 + render.field_147830_P + render.field_147813_G + render.field_147821_H) / 4.0F; f4 = (render.field_147820_O + f7 + render.field_147812_F + render.field_147813_G) / 4.0F; f5 = (render.field_147888_x + render.field_147886_y + render.field_147820_O + f7) / 4.0F; - render.field_147870_ao = render.getAoBrightness(render.field_147831_S, render.field_147826_T, render.field_147868_aj, i1); - render.field_147864_al = render.getAoBrightness(render.field_147868_aj, render.field_147880_aa, render.field_147881_ab, i1); - render.field_147874_am = render.getAoBrightness(render.field_147883_ah, render.field_147836_Z, render.field_147880_aa, i1); - render.field_147876_an = render.getAoBrightness(render.field_147832_R, render.field_147831_S, render.field_147883_ah, i1); + render.field_147870_ao = render.func_147778_a(render.field_147831_S, render.field_147826_T, render.field_147868_aj, i1); + render.field_147864_al = render.func_147778_a(render.field_147868_aj, render.field_147880_aa, render.field_147881_ab, i1); + render.field_147874_am = render.func_147778_a(render.field_147883_ah, render.field_147836_Z, render.field_147880_aa, i1); + render.field_147876_an = render.func_147778_a(render.field_147832_R, render.field_147831_S, render.field_147883_ah, i1); if (flag1) { @@ -1473,7 +1473,7 @@ public class BlockSkinRenderHelper if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos + 1, yPos, zPos, 5)) { - if (render.renderMaxX >= 1.0D) + if (render.field_147861_i >= 1.0D) { ++xPos; } @@ -1535,14 +1535,14 @@ public class BlockSkinRenderHelper render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos + 1); } - if (render.renderMaxX >= 1.0D) + if (render.field_147861_i >= 1.0D) { --xPos; } i1 = l; - if (render.renderMaxX >= 1.0D || !render.field_147845_a.isBlockOpaqueCube(xPos + 1, yPos, zPos)) + if (render.field_147861_i >= 1.0D || !render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos).func_149662_c()) { i1 = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); } @@ -1552,10 +1552,10 @@ public class BlockSkinRenderHelper f4 = (render.field_147816_C + render.field_147810_D + render.field_147820_O + f7) / 4.0F; f5 = (render.field_147820_O + f7 + render.field_147823_J + render.field_147824_K) / 4.0F; f6 = (f7 + render.field_147829_Q + render.field_147824_K + render.field_147819_N) / 4.0F; - render.field_147864_al = render.getAoBrightness(render.field_147835_X, render.field_147834_Y, render.field_147862_ak, i1); - render.field_147870_ao = render.getAoBrightness(render.field_147862_ak, render.field_147885_ae, render.field_147882_ag, i1); - render.field_147876_an = render.getAoBrightness(render.field_147866_ai, render.field_147879_ad, render.field_147885_ae, i1); - render.field_147874_am = render.getAoBrightness(render.field_147827_W, render.field_147835_X, render.field_147866_ai, i1); + render.field_147864_al = render.func_147778_a(render.field_147835_X, render.field_147834_Y, render.field_147862_ak, i1); + render.field_147870_ao = render.func_147778_a(render.field_147862_ak, render.field_147885_ae, render.field_147882_ag, i1); + render.field_147876_an = render.func_147778_a(render.field_147866_ai, render.field_147879_ad, render.field_147885_ae, i1); + render.field_147874_am = render.func_147778_a(render.field_147827_W, render.field_147835_X, render.field_147866_ai, i1); if (flag1) { @@ -1632,7 +1632,7 @@ public class BlockSkinRenderHelper if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos - 1, zPos, 0)) { - tessellator.setBrightness(render.renderMinY > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos)); + tessellator.setBrightness(render.field_147855_j > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos)); tessellator.setColorOpaque_F(f10, f13, f16); render.func_147768_a(block, (double) xPos, (double) yPos, (double) zPos, stillIcon); flag = true; @@ -1640,17 +1640,17 @@ public class BlockSkinRenderHelper if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos + 1, zPos, 1)) { - tessellator.setBrightness(render.renderMaxY < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos)); + tessellator.setBrightness(render.field_147857_k < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos)); tessellator.setColorOpaque_F(f7, f8, f9); - render.renderFaceYPos(block, (double) xPos, (double) yPos, (double) zPos, stillIcon); + render.func_147806_b(block, (double) xPos, (double) yPos, (double) zPos, stillIcon); flag = true; } - Icon icon; + IIcon icon; if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos, zPos - 1, 2)) { - tessellator.setBrightness(render.renderMinZ > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1)); + tessellator.setBrightness(render.field_147851_l > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1)); tessellator.setColorOpaque_F(f11, f14, f17); render.func_147761_c(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); @@ -1659,7 +1659,7 @@ public class BlockSkinRenderHelper if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos, zPos + 1, 3)) { - tessellator.setBrightness(render.renderMaxZ < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1)); + tessellator.setBrightness(render.field_147853_m < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1)); tessellator.setColorOpaque_F(f11, f14, f17); render.func_147734_d(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); @@ -1668,7 +1668,7 @@ public class BlockSkinRenderHelper if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos - 1, yPos, zPos, 4)) { - tessellator.setBrightness(render.renderMinX > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos)); + tessellator.setBrightness(render.field_147859_h > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos)); tessellator.setColorOpaque_F(f12, f15, f18); render.func_147798_e(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); @@ -1677,7 +1677,7 @@ public class BlockSkinRenderHelper if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos + 1, yPos, zPos, 5)) { - tessellator.setBrightness(render.renderMaxX < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos)); + tessellator.setBrightness(render.field_147861_i < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos)); tessellator.setColorOpaque_F(f12, f15, f18); render.func_147764_f(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); diff --git a/src/main/java/tconstruct/client/block/PaneConnectedRender.java b/src/main/java/tconstruct/client/block/PaneConnectedRender.java index f586f5bf..a68e470f 100644 --- a/src/main/java/tconstruct/client/block/PaneConnectedRender.java +++ b/src/main/java/tconstruct/client/block/PaneConnectedRender.java @@ -28,8 +28,8 @@ public class PaneConnectedRender implements ISimpleBlockRenderingHandler @Override public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - boolean temp = renderer.renderAllFaces; - renderer.renderAllFaces = true; + boolean temp = renderer.field_147837_f; + renderer.field_147837_f = true; GlassPaneConnected pane = (GlassPaneConnected) block; @@ -81,7 +81,7 @@ public class PaneConnectedRender implements ISimpleBlockRenderingHandler renderer.clearOverrideBlockTexture(); - renderer.renderAllFaces = false; + renderer.field_147837_f = false; return true; } diff --git a/src/main/java/tconstruct/client/block/RenderLiquid.java b/src/main/java/tconstruct/client/block/RenderLiquid.java index da430110..53d7f713 100644 --- a/src/main/java/tconstruct/client/block/RenderLiquid.java +++ b/src/main/java/tconstruct/client/block/RenderLiquid.java @@ -17,7 +17,7 @@ public class RenderLiquid {//TODO CHECK THIS!!!! public static boolean renderMetadataBlock (Block block, int metadata, int x, int y, int z, RenderBlocks renderer, IBlockAccess world) { - int var5 = block.colorMultiplier(world, x, y, z); + int var5 = block.func_149720_d(world, x, y, z); float var6 = (var5 >> 16 & 0xFF) / 255.0F; float var7 = (var5 >> 8 & 0xFF) / 255.0F; float var8 = (var5 & 0xFF) / 255.0F; @@ -50,18 +50,18 @@ public class RenderLiquid Tessellator tessellator = Tessellator.instance; tessellator.setBrightness(983055); - if (render.getBlockIcon(block).getIconName().equals("grass_top")) + if (render.func_147745_b(block).getIconName().equals("grass_top")) { flag1 = false; } - else if (render.hasOverrideBlockTexture()) + else if (render.func_147744_b()) { flag1 = false; } - if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos, yPos - 1, zPos, 0))) + if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos - 1, zPos, 0))) { - if (render.renderMinY <= 0.0D) + if (render.field_147855_j <= 0.0D) { yPos--; } @@ -123,14 +123,14 @@ public class RenderLiquid render.field_147834_Y = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos + 1); } - if (render.renderMinY <= 0.0D) + if (render.field_147855_j <= 0.0D) { yPos++; } int i1 = l; - if ((render.renderMinY <= 0.0D) || (!render.field_147845_a.isBlockOpaqueCube(xPos, yPos - 1, zPos))) + if ((render.field_147855_j <= 0.0D) || (!render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos).func_149662_c())) { i1 = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); } @@ -140,10 +140,10 @@ public class RenderLiquid f6 = (render.field_147815_B + f7 + render.field_147811_E + render.field_147810_D) / 4.0F; f5 = (f7 + render.field_147814_A + render.field_147810_D + render.field_147816_C) / 4.0F; f4 = (render.field_147886_y + render.field_147888_x + f7 + render.field_147814_A) / 4.0F; - render.field_147864_al = render.getAoBrightness(render.field_147826_T, render.field_147831_S, render.field_147828_V, i1); - render.field_147870_ao = render.getAoBrightness(render.field_147828_V, render.field_147834_Y, render.field_147835_X, i1); - render.field_147876_an = render.getAoBrightness(render.field_147825_U, render.field_147835_X, render.field_147827_W, i1); - render.field_147874_am = render.getAoBrightness(render.field_147831_S, render.field_147832_R, render.field_147825_U, i1); + render.field_147864_al = render.func_147778_a(render.field_147826_T, render.field_147831_S, render.field_147828_V, i1); + render.field_147870_ao = render.func_147778_a(render.field_147828_V, render.field_147834_Y, render.field_147835_X, i1); + render.field_147876_an = render.func_147778_a(render.field_147825_U, render.field_147835_X, render.field_147827_W, i1); + render.field_147874_am = render.func_147778_a(render.field_147831_S, render.field_147832_R, render.field_147825_U, i1); if (flag1) { @@ -170,13 +170,13 @@ public class RenderLiquid render.field_147848_as *= f6; render.field_147856_aw *= f6; render.field_147833_aA *= f6; - render.renderFaceYNeg(block, xPos, yPos, zPos, block.getIcon(0, metadata)); + render.func_147768_a(block, xPos, yPos, zPos, block.func_149691_a(0, metadata)); flag = true; } - if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos, yPos + 1, zPos, 1))) + if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos + 1, zPos, 1))) { - if (render.renderMaxY >= 1.0D) + if (render.field_147857_k >= 1.0D) { yPos++; } @@ -192,7 +192,7 @@ public class RenderLiquid boolean flag3 = render.field_147845_a.func_147439_a(xPos + 1, yPos + 1, zPos).func_149751_l(); boolean flag2 = render.field_147845_a.func_147439_a(xPos - 1, yPos + 1, zPos).func_149751_l(); boolean flag5 = render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos + 1).func_149751_l(); - boolean flag4 = render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos - 1)..func_149751_l(); + boolean flag4 = render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos - 1).func_149751_l(); if ((!flag4) && (!flag2)) { @@ -238,14 +238,14 @@ public class RenderLiquid render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos + 1); } - if (render.renderMaxY >= 1.0D) + if (render.field_147857_k >= 1.0D) { yPos--; } int i1 = l; - if ((render.renderMaxY >= 1.0D) || (!render.field_147845_a.isBlockOpaqueCube(xPos, yPos + 1, zPos))) + if ((render.field_147857_k >= 1.0D) || (!render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos).func_149662_c())) { i1 = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); } @@ -255,10 +255,10 @@ public class RenderLiquid f3 = (render.field_147817_L + f7 + render.field_147819_N + render.field_147824_K) / 4.0F; f4 = (f7 + render.field_147822_I + render.field_147824_K + render.field_147824_K) / 4.0F; f5 = (render.field_147813_G + render.field_147812_F + f7 + render.field_147822_I) / 4.0F; - render.field_147870_ao = render.getAoBrightness(render.field_147881_ab, render.field_147880_aa, render.field_147887_af, i1); - render.field_147864_al = render.getAoBrightness(render.field_147887_af, render.field_147882_ag, render.field_147885_ae, i1); - render.field_147874_am = render.getAoBrightness(render.field_147878_ac, render.field_147885_ae, render.field_147879_ad, i1); - render.field_147876_an = render.getAoBrightness(render.field_147880_aa, render.field_147836_Z, render.field_147878_ac, i1); + render.field_147870_ao = render.func_147778_a(render.field_147881_ab, render.field_147880_aa, render.field_147887_af, i1); + render.field_147864_al = render.func_147778_a(render.field_147887_af, render.field_147882_ag, render.field_147885_ae, i1); + render.field_147874_am = render.func_147778_a(render.field_147878_ac, render.field_147885_ae, render.field_147879_ad, i1); + render.field_147876_an = render.func_147778_a(render.field_147880_aa, render.field_147836_Z, render.field_147878_ac, i1); render.field_147872_ap = (render.field_147852_aq = render.field_147850_ar = render.field_147848_as = colorRed); render.field_147846_at = (render.field_147860_au = render.field_147858_av = render.field_147856_aw = colorGreen); render.field_147854_ax = (render.field_147841_ay = render.field_147839_az = render.field_147833_aA = colorBlue); @@ -274,13 +274,13 @@ public class RenderLiquid render.field_147848_as *= f6; render.field_147856_aw *= f6; render.field_147833_aA *= f6; - render.renderFaceYPos(block, xPos, yPos, zPos, block.getIcon(1, metadata)); + render.func_147806_b(block, xPos, yPos, zPos, block.func_149691_a(1, metadata)); flag = true; } - if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos, yPos, zPos - 1, 2))) + if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos, zPos - 1, 2))) { - if (render.renderMinZ <= 0.0D) + if (render.field_147851_l <= 0.0D) { zPos--; } @@ -342,14 +342,14 @@ public class RenderLiquid render.field_147879_ad = block.func_149677_c(render.field_147845_a, xPos + 1, yPos + 1, zPos); } - if (render.renderMinZ <= 0.0D) + if (render.field_147851_l <= 0.0D) { zPos++; } int i1 = l; - if ((render.renderMinZ <= 0.0D) || (!render.field_147845_a.isBlockOpaqueCube(xPos, yPos, zPos - 1))) + if ((render.field_147851_l <= 0.0D) || (!render.field_147845_a.func_147439_a(xPos, yPos, zPos - 1).func_149662_c())) { i1 = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); } @@ -359,10 +359,10 @@ public class RenderLiquid f4 = (f7 + render.field_147822_I + render.field_147820_O + render.field_147824_K) / 4.0F; f5 = (render.field_147814_A + f7 + render.field_147816_C + render.field_147820_O) / 4.0F; f6 = (render.field_147888_x + render.field_147820_O + render.field_147814_A + f7) / 4.0F; - render.field_147864_al = render.getAoBrightness(render.field_147883_ah, render.field_147836_Z, render.field_147878_ac, i1); - render.field_147874_am = render.getAoBrightness(render.field_147878_ac, render.field_147866_ai, render.field_147879_ad, i1); - render.field_147876_an = render.getAoBrightness(render.field_147825_U, render.field_147827_W, render.field_147866_ai, i1); - render.field_147870_ao = render.getAoBrightness(render.field_147832_R, render.field_147883_ah, render.field_147825_U, i1); + render.field_147864_al = render.func_147778_a(render.field_147883_ah, render.field_147836_Z, render.field_147878_ac, i1); + render.field_147874_am = render.func_147778_a(render.field_147878_ac, render.field_147866_ai, render.field_147879_ad, i1); + render.field_147876_an = render.func_147778_a(render.field_147825_U, render.field_147827_W, render.field_147866_ai, i1); + render.field_147870_ao = render.func_147778_a(render.field_147832_R, render.field_147883_ah, render.field_147825_U, i1); if (flag1) { @@ -389,15 +389,15 @@ public class RenderLiquid render.field_147848_as *= f6; render.field_147856_aw *= f6; render.field_147833_aA *= f6; - IIcon icon = block.getIcon(2, metadata); - render.renderFaceZNeg(block, xPos, yPos, zPos, icon); + IIcon icon = block.func_149691_a(2, metadata); + render.func_147761_c(block, xPos, yPos, zPos, icon); flag = true; } - if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos, yPos, zPos + 1, 3))) + if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos, zPos + 1, 3))) { - if (render.renderMaxZ >= 1.0D) + if (render.field_147853_m >= 1.0D) { zPos++; } @@ -459,14 +459,14 @@ public class RenderLiquid render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos + 1, yPos + 1, zPos); } - if (render.renderMaxZ >= 1.0D) + if (render.field_147853_m >= 1.0D) { zPos--; } int i1 = l; - if ((render.renderMaxZ >= 1.0D) || (!render.field_147845_a.isBlockOpaqueCube(xPos, yPos, zPos + 1))) + if ((render.field_147853_m >= 1.0D) || (!render.field_147845_a.func_147439_a(xPos, yPos, zPos + 1).func_149662_c())) { i1 = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); } @@ -476,10 +476,10 @@ public class RenderLiquid f6 = (f7 + render.field_147817_L + render.field_147829_Q + render.field_147819_N) / 4.0F; f5 = (render.field_147815_B + f7 + render.field_147811_E + render.field_147829_Q) / 4.0F; f4 = (render.field_147884_z + render.field_147830_P + render.field_147815_B + f7) / 4.0F; - render.field_147864_al = render.getAoBrightness(render.field_147868_aj, render.field_147881_ab, render.field_147887_af, i1); - render.field_147870_ao = render.getAoBrightness(render.field_147887_af, render.field_147862_ak, render.field_147882_ag, i1); - render.field_147876_an = render.getAoBrightness(render.field_147828_V, render.field_147834_Y, render.field_147862_ak, i1); - render.field_147874_am = render.getAoBrightness(render.field_147826_T, render.field_147868_aj, render.field_147828_V, i1); + render.field_147864_al = render.func_147778_a(render.field_147868_aj, render.field_147881_ab, render.field_147887_af, i1); + render.field_147870_ao = render.func_147778_a(render.field_147887_af, render.field_147862_ak, render.field_147882_ag, i1); + render.field_147876_an = render.func_147778_a(render.field_147828_V, render.field_147834_Y, render.field_147862_ak, i1); + render.field_147874_am = render.func_147778_a(render.field_147826_T, render.field_147868_aj, render.field_147828_V, i1); if (flag1) { @@ -506,15 +506,15 @@ public class RenderLiquid render.field_147848_as *= f6; render.field_147856_aw *= f6; render.field_147833_aA *= f6; - IIcon icon = block.getIcon(3, metadata); - render.renderFaceZPos(block, xPos, yPos, zPos, icon); + IIcon icon = block.func_149691_a(3, metadata); + render.func_147734_d(block, xPos, yPos, zPos, icon); flag = true; } - if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos - 1, yPos, zPos, 4))) + if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos - 1, yPos, zPos, 4))) { - if (render.renderMinX <= 0.0D) + if (render.field_147859_h <= 0.0D) { xPos--; } @@ -576,14 +576,14 @@ public class RenderLiquid render.field_147881_ab = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos + 1); } - if (render.renderMinX <= 0.0D) + if (render.field_147859_h <= 0.0D) { xPos++; } int i1 = l; - if ((render.renderMinX <= 0.0D) || (!render.field_147845_a.isBlockOpaqueCube(xPos - 1, yPos, zPos))) + if ((render.field_147859_h <= 0.0D) || (!render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos).func_149662_c())) { i1 = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); } @@ -593,10 +593,10 @@ public class RenderLiquid f3 = (f7 + render.field_147830_P + render.field_147813_G + render.field_147821_H) / 4.0F; f4 = (render.field_147820_O + f7 + render.field_147812_F + render.field_147813_G) / 4.0F; f5 = (render.field_147888_x + render.field_147886_y + render.field_147820_O + f7) / 4.0F; - render.field_147870_ao = render.getAoBrightness(render.field_147831_S, render.field_147826_T, render.field_147868_aj, i1); - render.field_147864_al = render.getAoBrightness(render.field_147868_aj, render.field_147880_aa, render.field_147881_ab, i1); - render.field_147874_am = render.getAoBrightness(render.field_147883_ah, render.field_147836_Z, render.field_147880_aa, i1); - render.field_147876_an = render.getAoBrightness(render.field_147832_R, render.field_147831_S, render.field_147883_ah, i1); + render.field_147870_ao = render.func_147778_a(render.field_147831_S, render.field_147826_T, render.field_147868_aj, i1); + render.field_147864_al = render.func_147778_a(render.field_147868_aj, render.field_147880_aa, render.field_147881_ab, i1); + render.field_147874_am = render.func_147778_a(render.field_147883_ah, render.field_147836_Z, render.field_147880_aa, i1); + render.field_147876_an = render.func_147778_a(render.field_147832_R, render.field_147831_S, render.field_147883_ah, i1); if (flag1) { @@ -623,15 +623,15 @@ public class RenderLiquid render.field_147848_as *= f6; render.field_147856_aw *= f6; render.field_147833_aA *= f6; - IIcon icon = block.getIcon(4, metadata); - render.renderFaceXNeg(block, xPos, yPos, zPos, icon); + IIcon icon = block.func_149691_a(4, metadata); + render.func_147798_e(block, xPos, yPos, zPos, icon); flag = true; } - if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos + 1, yPos, zPos, 5))) + if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos + 1, yPos, zPos, 5))) { - if (render.renderMaxX >= 1.0D) + if (render.field_147861_i >= 1.0D) { xPos++; } @@ -693,14 +693,14 @@ public class RenderLiquid render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos + 1); } - if (render.renderMaxX >= 1.0D) + if (render.field_147861_i >= 1.0D) { xPos--; } int i1 = l; - if ((render.renderMaxX >= 1.0D) || (!render.field_147845_a.isBlockOpaqueCube(xPos + 1, yPos, zPos))) + if ((render.field_147861_i >= 1.0D) || (!render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos).func_149662_c())) { i1 = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); } @@ -710,10 +710,10 @@ public class RenderLiquid f4 = (render.field_147816_C + render.field_147810_D + render.field_147820_O + f7) / 4.0F; f5 = (render.field_147820_O + f7 + render.field_147824_K + render.field_147824_K) / 4.0F; f6 = (f7 + render.field_147829_Q + render.field_147824_K + render.field_147819_N) / 4.0F; - render.field_147864_al = render.getAoBrightness(render.field_147835_X, render.field_147834_Y, render.field_147862_ak, i1); - render.field_147870_ao = render.getAoBrightness(render.field_147862_ak, render.field_147885_ae, render.field_147882_ag, i1); - render.field_147876_an = render.getAoBrightness(render.field_147866_ai, render.field_147879_ad, render.field_147885_ae, i1); - render.field_147874_am = render.getAoBrightness(render.field_147827_W, render.field_147835_X, render.field_147866_ai, i1); + render.field_147864_al = render.func_147778_a(render.field_147835_X, render.field_147834_Y, render.field_147862_ak, i1); + render.field_147870_ao = render.func_147778_a(render.field_147862_ak, render.field_147885_ae, render.field_147882_ag, i1); + render.field_147876_an = render.func_147778_a(render.field_147866_ai, render.field_147879_ad, render.field_147885_ae, i1); + render.field_147874_am = render.func_147778_a(render.field_147827_W, render.field_147835_X, render.field_147866_ai, i1); if (flag1) { @@ -740,7 +740,7 @@ public class RenderLiquid render.field_147848_as *= f6; render.field_147856_aw *= f6; render.field_147833_aA *= f6; - IIcon icon = block.getIcon(5, metadata); + IIcon icon = block.func_149691_a(5, metadata); render.func_147764_f(block, xPos, yPos, zPos, icon); flag = true; @@ -793,54 +793,54 @@ public class RenderLiquid int l = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos); - if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos, yPos - 1, zPos, 0))) + if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos - 1, zPos, 0))) { - tessellator.setBrightness(render.renderMinY > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos)); + tessellator.setBrightness(render.field_147855_j > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos)); tessellator.setColorOpaque_F(f10, f13, f16); - render.renderFaceYNeg(block, xPos, yPos, zPos, block.getIcon(0, metadata)); + render.func_147768_a(block, xPos, yPos, zPos, block.func_149691_a(0, metadata)); flag = true; } - if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos, yPos + 1, zPos, 1))) + if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos + 1, zPos, 1))) { - tessellator.setBrightness(render.renderMaxY < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos)); + tessellator.setBrightness(render.field_147857_k < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos)); tessellator.setColorOpaque_F(f7, f8, f9); - render.renderFaceYPos(block, xPos, yPos, zPos, block.getIcon(1, metadata)); + render.func_147806_b(block, xPos, yPos, zPos, block.func_149691_a(1, metadata)); flag = true; } - if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos, yPos, zPos - 1, 2))) + if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos, zPos - 1, 2))) { - tessellator.setBrightness(render.renderMinZ > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1)); + tessellator.setBrightness(render.field_147851_l > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1)); tessellator.setColorOpaque_F(f11, f14, f17); - render.renderFaceZNeg(block, xPos, yPos, zPos, block.getIcon(2, metadata)); + render.func_147761_c(block, xPos, yPos, zPos, block.func_149691_a(2, metadata)); flag = true; } - if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos, yPos, zPos + 1, 3))) + if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos, zPos + 1, 3))) { - tessellator.setBrightness(render.renderMaxZ < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1)); + tessellator.setBrightness(render.field_147853_m < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1)); tessellator.setColorOpaque_F(f11, f14, f17); - render.renderFaceZPos(block, xPos, yPos, zPos, block.getIcon(3, metadata)); + render.func_147734_d(block, xPos, yPos, zPos, block.func_149691_a(3, metadata)); flag = true; } - if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos - 1, yPos, zPos, 4))) + if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos - 1, yPos, zPos, 4))) { - tessellator.setBrightness(render.renderMinX > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos)); + tessellator.setBrightness(render.field_147859_h > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos)); tessellator.setColorOpaque_F(f12, f15, f18); - render.renderFaceXNeg(block, xPos, yPos, zPos, block.getIcon(4, metadata)); + render.func_147798_e(block, xPos, yPos, zPos, block.func_149691_a(4, metadata)); flag = true; } - if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos + 1, yPos, zPos, 5))) + if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos + 1, yPos, zPos, 5))) { - tessellator.setBrightness(render.renderMaxX < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos)); + tessellator.setBrightness(render.field_147861_i < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos)); tessellator.setColorOpaque_F(f12, f15, f18); - render.func_147764_f(block, xPos, yPos, zPos, block.getIcon(5, metadata)); + render.func_147764_f(block, xPos, yPos, zPos, block.func_149691_a(5, metadata)); flag = true; } @@ -851,7 +851,7 @@ public class RenderLiquid public static boolean renderFakeBlock (IIcon texture, int x, int y, int z, RenderBlocks renderer, IBlockAccess world) { Block block = Blocks.stone; - int var5 = block.colorMultiplier(world, x, y, z); + int var5 = block.func_149720_d(world, x, y, z); float var6 = (var5 >> 16 & 0xFF) / 255.0F; float var7 = (var5 >> 8 & 0xFF) / 255.0F; float var8 = (var5 & 0xFF) / 255.0F; @@ -884,18 +884,18 @@ public class RenderLiquid Tessellator tessellator = Tessellator.instance; tessellator.setBrightness(983055); - if (render.getBlockIcon(block).getIconName().equals("grass_top")) + if (render.func_147745_b(block).getIconName().equals("grass_top")) { flag1 = false; } - else if (render.hasOverrideBlockTexture()) + else if (render.func_147744_b()) { flag1 = false; } - if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos, yPos - 1, zPos, 0))) + if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos - 1, zPos, 0))) { - if (render.renderMinY <= 0.0D) + if (render.field_147855_j <= 0.0D) { yPos--; } @@ -957,14 +957,14 @@ public class RenderLiquid render.field_147834_Y = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos + 1); } - if (render.renderMinY <= 0.0D) + if (render.field_147855_j <= 0.0D) { yPos++; } int i1 = l; - if ((render.renderMinY <= 0.0D) || (!render.field_147845_a.isBlockOpaqueCube(xPos, yPos - 1, zPos))) + if ((render.field_147855_j <= 0.0D) || (!render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos).func_149662_c())) { i1 = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); } @@ -974,10 +974,10 @@ public class RenderLiquid f6 = (render.field_147815_B + f7 + render.field_147811_E + render.field_147810_D) / 4.0F; f5 = (f7 + render.field_147814_A + render.field_147810_D + render.field_147816_C) / 4.0F; f4 = (render.field_147886_y + render.field_147888_x + f7 + render.field_147814_A) / 4.0F; - render.field_147864_al = render.getAoBrightness(render.field_147826_T, render.field_147831_S, render.field_147828_V, i1); - render.field_147870_ao = render.getAoBrightness(render.field_147828_V, render.field_147834_Y, render.field_147835_X, i1); - render.field_147876_an = render.getAoBrightness(render.field_147825_U, render.field_147835_X, render.field_147827_W, i1); - render.field_147874_am = render.getAoBrightness(render.field_147831_S, render.field_147832_R, render.field_147825_U, i1); + render.field_147864_al = render.func_147778_a(render.field_147826_T, render.field_147831_S, render.field_147828_V, i1); + render.field_147870_ao = render.func_147778_a(render.field_147828_V, render.field_147834_Y, render.field_147835_X, i1); + render.field_147876_an = render.func_147778_a(render.field_147825_U, render.field_147835_X, render.field_147827_W, i1); + render.field_147874_am = render.func_147778_a(render.field_147831_S, render.field_147832_R, render.field_147825_U, i1); if (flag1) { @@ -1004,13 +1004,13 @@ public class RenderLiquid render.field_147848_as *= f6; render.field_147856_aw *= f6; render.field_147833_aA *= f6; - render.renderFaceYNeg(block, xPos, yPos, zPos, texture); + render.func_147768_a(block, xPos, yPos, zPos, texture); flag = true; } - if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos, yPos + 1, zPos, 1))) + if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos + 1, zPos, 1))) { - if (render.renderMaxY >= 1.0D) + if (render.field_147857_k >= 1.0D) { yPos++; } @@ -1072,14 +1072,14 @@ public class RenderLiquid render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos + 1); } - if (render.renderMaxY >= 1.0D) + if (render.field_147857_k >= 1.0D) { yPos--; } int i1 = l; - if ((render.renderMaxY >= 1.0D) || (!render.field_147845_a.isBlockOpaqueCube(xPos, yPos + 1, zPos))) + if ((render.field_147857_k >= 1.0D) || (!render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos).func_149662_c())) { i1 = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); } @@ -1089,10 +1089,10 @@ public class RenderLiquid f3 = (render.field_147817_L + f7 + render.field_147819_N + render.field_147824_K) / 4.0F; f4 = (f7 + render.field_147822_I + render.field_147824_K + render.field_147824_K) / 4.0F; f5 = (render.field_147813_G + render.field_147812_F + f7 + render.field_147822_I) / 4.0F; - render.field_147870_ao = render.getAoBrightness(render.field_147881_ab, render.field_147880_aa, render.field_147887_af, i1); - render.field_147864_al = render.getAoBrightness(render.field_147887_af, render.field_147882_ag, render.field_147885_ae, i1); - render.field_147874_am = render.getAoBrightness(render.field_147878_ac, render.field_147885_ae, render.field_147879_ad, i1); - render.field_147876_an = render.getAoBrightness(render.field_147880_aa, render.field_147836_Z, render.field_147878_ac, i1); + render.field_147870_ao = render.func_147778_a(render.field_147881_ab, render.field_147880_aa, render.field_147887_af, i1); + render.field_147864_al = render.func_147778_a(render.field_147887_af, render.field_147882_ag, render.field_147885_ae, i1); + render.field_147874_am = render.func_147778_a(render.field_147878_ac, render.field_147885_ae, render.field_147879_ad, i1); + render.field_147876_an = render.func_147778_a(render.field_147880_aa, render.field_147836_Z, render.field_147878_ac, i1); render.field_147872_ap = (render.field_147852_aq = render.field_147850_ar = render.field_147848_as = colorRed); render.field_147846_at = (render.field_147860_au = render.field_147858_av = render.field_147856_aw = colorGreen); render.field_147854_ax = (render.field_147841_ay = render.field_147839_az = render.field_147833_aA = colorBlue); @@ -1108,13 +1108,13 @@ public class RenderLiquid render.field_147848_as *= f6; render.field_147856_aw *= f6; render.field_147833_aA *= f6; - render.renderFaceYPos(block, xPos, yPos, zPos, texture); + render.func_147806_b(block, xPos, yPos, zPos, texture); flag = true; } - if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos, yPos, zPos - 1, 2))) + if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos, zPos - 1, 2))) { - if (render.renderMinZ <= 0.0D) + if (render.field_147851_l <= 0.0D) { zPos--; } @@ -1176,14 +1176,14 @@ public class RenderLiquid render.field_147879_ad = block.func_149677_c(render.field_147845_a, xPos + 1, yPos + 1, zPos); } - if (render.renderMinZ <= 0.0D) + if (render.field_147851_l <= 0.0D) { zPos++; } int i1 = l; - if ((render.renderMinZ <= 0.0D) || (!render.field_147845_a.isBlockOpaqueCube(xPos, yPos, zPos - 1))) + if ((render.field_147851_l <= 0.0D) || (!render.field_147845_a.func_147439_a(xPos, yPos, zPos - 1).func_149662_c())) { i1 = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); } @@ -1193,10 +1193,10 @@ public class RenderLiquid f4 = (f7 + render.field_147822_I + render.field_147820_O + render.field_147824_K) / 4.0F; f5 = (render.field_147814_A + f7 + render.field_147816_C + render.field_147820_O) / 4.0F; f6 = (render.field_147888_x + render.field_147820_O + render.field_147814_A + f7) / 4.0F; - render.field_147864_al = render.getAoBrightness(render.field_147883_ah, render.field_147836_Z, render.field_147878_ac, i1); - render.field_147874_am = render.getAoBrightness(render.field_147878_ac, render.field_147866_ai, render.field_147879_ad, i1); - render.field_147876_an = render.getAoBrightness(render.field_147825_U, render.field_147827_W, render.field_147866_ai, i1); - render.field_147870_ao = render.getAoBrightness(render.field_147832_R, render.field_147883_ah, render.field_147825_U, i1); + render.field_147864_al = render.func_147778_a(render.field_147883_ah, render.field_147836_Z, render.field_147878_ac, i1); + render.field_147874_am = render.func_147778_a(render.field_147878_ac, render.field_147866_ai, render.field_147879_ad, i1); + render.field_147876_an = render.func_147778_a(render.field_147825_U, render.field_147827_W, render.field_147866_ai, i1); + render.field_147870_ao = render.func_147778_a(render.field_147832_R, render.field_147883_ah, render.field_147825_U, i1); if (flag1) { @@ -1223,14 +1223,14 @@ public class RenderLiquid render.field_147848_as *= f6; render.field_147856_aw *= f6; render.field_147833_aA *= f6; - render.renderFaceZNeg(block, xPos, yPos, zPos, texture); + render.func_147761_c(block, xPos, yPos, zPos, texture); flag = true; } - if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos, yPos, zPos + 1, 3))) + if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos, zPos + 1, 3))) { - if (render.renderMaxZ >= 1.0D) + if (render.field_147853_m >= 1.0D) { zPos++; } @@ -1292,14 +1292,14 @@ public class RenderLiquid render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos + 1, yPos + 1, zPos); } - if (render.renderMaxZ >= 1.0D) + if (render.field_147853_m >= 1.0D) { zPos--; } int i1 = l; - if ((render.renderMaxZ >= 1.0D) || (!render.field_147845_a.isBlockOpaqueCube(xPos, yPos, zPos + 1))) + if ((render.field_147853_m >= 1.0D) || (!render.field_147845_a.func_147439_a(xPos, yPos, zPos + 1).func_149662_c())) { i1 = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); } @@ -1309,10 +1309,10 @@ public class RenderLiquid f6 = (f7 + render.field_147817_L + render.field_147829_Q + render.field_147819_N) / 4.0F; f5 = (render.field_147815_B + f7 + render.field_147811_E + render.field_147829_Q) / 4.0F; f4 = (render.field_147884_z + render.field_147830_P + render.field_147815_B + f7) / 4.0F; - render.field_147864_al = render.getAoBrightness(render.field_147868_aj, render.field_147881_ab, render.field_147887_af, i1); - render.field_147870_ao = render.getAoBrightness(render.field_147887_af, render.field_147862_ak, render.field_147882_ag, i1); - render.field_147876_an = render.getAoBrightness(render.field_147828_V, render.field_147834_Y, render.field_147862_ak, i1); - render.field_147874_am = render.getAoBrightness(render.field_147826_T, render.field_147868_aj, render.field_147828_V, i1); + render.field_147864_al = render.func_147778_a(render.field_147868_aj, render.field_147881_ab, render.field_147887_af, i1); + render.field_147870_ao = render.func_147778_a(render.field_147887_af, render.field_147862_ak, render.field_147882_ag, i1); + render.field_147876_an = render.func_147778_a(render.field_147828_V, render.field_147834_Y, render.field_147862_ak, i1); + render.field_147874_am = render.func_147778_a(render.field_147826_T, render.field_147868_aj, render.field_147828_V, i1); if (flag1) { @@ -1339,14 +1339,14 @@ public class RenderLiquid render.field_147848_as *= f6; render.field_147856_aw *= f6; render.field_147833_aA *= f6; - render.renderFaceZPos(block, xPos, yPos, zPos, texture); + render.func_147734_d(block, xPos, yPos, zPos, texture); flag = true; } - if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos - 1, yPos, zPos, 4))) + if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos - 1, yPos, zPos, 4))) { - if (render.renderMinX <= 0.0D) + if (render.field_147859_h <= 0.0D) { xPos--; } @@ -1408,14 +1408,14 @@ public class RenderLiquid render.field_147881_ab = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos + 1); } - if (render.renderMinX <= 0.0D) + if (render.field_147859_h <= 0.0D) { xPos++; } int i1 = l; - if ((render.renderMinX <= 0.0D) || (!render.field_147845_a.isBlockOpaqueCube(xPos - 1, yPos, zPos))) + if ((render.field_147859_h <= 0.0D) || (!render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos).func_149662_c())) { i1 = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); } @@ -1425,10 +1425,10 @@ public class RenderLiquid f3 = (f7 + render.field_147830_P + render.field_147813_G + render.field_147821_H) / 4.0F; f4 = (render.field_147820_O + f7 + render.field_147812_F + render.field_147813_G) / 4.0F; f5 = (render.field_147888_x + render.field_147886_y + render.field_147820_O + f7) / 4.0F; - render.field_147870_ao = render.getAoBrightness(render.field_147831_S, render.field_147826_T, render.field_147868_aj, i1); - render.field_147864_al = render.getAoBrightness(render.field_147868_aj, render.field_147880_aa, render.field_147881_ab, i1); - render.field_147874_am = render.getAoBrightness(render.field_147883_ah, render.field_147836_Z, render.field_147880_aa, i1); - render.field_147876_an = render.getAoBrightness(render.field_147832_R, render.field_147831_S, render.field_147883_ah, i1); + render.field_147870_ao = render.func_147778_a(render.field_147831_S, render.field_147826_T, render.field_147868_aj, i1); + render.field_147864_al = render.func_147778_a(render.field_147868_aj, render.field_147880_aa, render.field_147881_ab, i1); + render.field_147874_am = render.func_147778_a(render.field_147883_ah, render.field_147836_Z, render.field_147880_aa, i1); + render.field_147876_an = render.func_147778_a(render.field_147832_R, render.field_147831_S, render.field_147883_ah, i1); if (flag1) { @@ -1455,14 +1455,14 @@ public class RenderLiquid render.field_147848_as *= f6; render.field_147856_aw *= f6; render.field_147833_aA *= f6; - render.renderFaceXNeg(block, xPos, yPos, zPos, texture); + render.func_147798_e(block, xPos, yPos, zPos, texture); flag = true; } - if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos + 1, yPos, zPos, 5))) + if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos + 1, yPos, zPos, 5))) { - if (render.renderMaxX >= 1.0D) + if (render.field_147861_i >= 1.0D) { xPos++; } @@ -1524,14 +1524,14 @@ public class RenderLiquid render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos + 1); } - if (render.renderMaxX >= 1.0D) + if (render.field_147861_i >= 1.0D) { xPos--; } int i1 = l; - if ((render.renderMaxX >= 1.0D) || (!render.field_147845_a.isBlockOpaqueCube(xPos + 1, yPos, zPos))) + if ((render.field_147861_i >= 1.0D) || (!render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos).func_149662_c())) { i1 = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); } @@ -1541,10 +1541,10 @@ public class RenderLiquid f4 = (render.field_147816_C + render.field_147810_D + render.field_147820_O + f7) / 4.0F; f5 = (render.field_147820_O + f7 + render.field_147824_K + render.field_147824_K) / 4.0F; f6 = (f7 + render.field_147829_Q + render.field_147824_K + render.field_147819_N) / 4.0F; - render.field_147864_al = render.getAoBrightness(render.field_147835_X, render.field_147834_Y, render.field_147862_ak, i1); - render.field_147870_ao = render.getAoBrightness(render.field_147862_ak, render.field_147885_ae, render.field_147882_ag, i1); - render.field_147876_an = render.getAoBrightness(render.field_147866_ai, render.field_147879_ad, render.field_147885_ae, i1); - render.field_147874_am = render.getAoBrightness(render.field_147827_W, render.field_147835_X, render.field_147866_ai, i1); + render.field_147864_al = render.func_147778_a(render.field_147835_X, render.field_147834_Y, render.field_147862_ak, i1); + render.field_147870_ao = render.func_147778_a(render.field_147862_ak, render.field_147885_ae, render.field_147882_ag, i1); + render.field_147876_an = render.func_147778_a(render.field_147866_ai, render.field_147879_ad, render.field_147885_ae, i1); + render.field_147874_am = render.func_147778_a(render.field_147827_W, render.field_147835_X, render.field_147866_ai, i1); if (flag1) { @@ -1618,52 +1618,52 @@ public class RenderLiquid int l = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos); - if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos, yPos - 1, zPos, 0))) + if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos - 1, zPos, 0))) { - tessellator.setBrightness(render.renderMinY > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos)); + tessellator.setBrightness(render.field_147855_j > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos)); tessellator.setColorOpaque_F(f10, f13, f16); - render.renderFaceYNeg(block, xPos, yPos, zPos, texture); + render.func_147768_a(block, xPos, yPos, zPos, texture); flag = true; } - if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos, yPos + 1, zPos, 1))) + if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos + 1, zPos, 1))) { - tessellator.setBrightness(render.renderMaxY < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos)); + tessellator.setBrightness(render.field_147857_k < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos)); tessellator.setColorOpaque_F(f7, f8, f9); - render.renderFaceYPos(block, xPos, yPos, zPos, texture); + render.func_147806_b(block, xPos, yPos, zPos, texture); flag = true; } - if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos, yPos, zPos - 1, 2))) + if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos, zPos - 1, 2))) { - tessellator.setBrightness(render.renderMinZ > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1)); + tessellator.setBrightness(render.field_147851_l > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1)); tessellator.setColorOpaque_F(f11, f14, f17); - render.renderFaceZNeg(block, xPos, yPos, zPos, texture); + render.func_147761_c(block, xPos, yPos, zPos, texture); flag = true; } - if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos, yPos, zPos + 1, 3))) + if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos, zPos + 1, 3))) { - tessellator.setBrightness(render.renderMaxZ < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1)); + tessellator.setBrightness(render.field_147853_m < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1)); tessellator.setColorOpaque_F(f11, f14, f17); - render.renderFaceZPos(block, xPos, yPos, zPos, texture); + render.func_147734_d(block, xPos, yPos, zPos, texture); flag = true; } - if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos - 1, yPos, zPos, 4))) + if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos - 1, yPos, zPos, 4))) { - tessellator.setBrightness(render.renderMinX > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos)); + tessellator.setBrightness(render.field_147859_h > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos)); tessellator.setColorOpaque_F(f12, f15, f18); - render.renderFaceXNeg(block, xPos, yPos, zPos, texture); + render.func_147798_e(block, xPos, yPos, zPos, texture); flag = true; } - if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos + 1, yPos, zPos, 5))) + if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos + 1, yPos, zPos, 5))) { - tessellator.setBrightness(render.renderMaxX < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos)); + tessellator.setBrightness(render.field_147861_i < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos)); tessellator.setColorOpaque_F(f12, f15, f18); render.func_147764_f(block, xPos, yPos, zPos, texture); diff --git a/src/main/java/tconstruct/common/TRecipes.java b/src/main/java/tconstruct/common/TRecipes.java index 78b08107..a7687e79 100644 --- a/src/main/java/tconstruct/common/TRecipes.java +++ b/src/main/java/tconstruct/common/TRecipes.java @@ -636,9 +636,9 @@ public class TRecipes // ItemStack aluBrass = new ItemStack(TRepo.materials, 1, 14); // Clock Recipe - Vanilla alternativ - GameRegistry.addRecipe(new ItemStack(Items.pocketSundial), " i ", "iri", " i ", 'i', aluBrass, 'r', new ItemStack(Items.redstone)); + GameRegistry.addRecipe(new ItemStack(Items.clock), " i ", "iri", " i ", 'i', aluBrass, 'r', new ItemStack(Items.redstone)); // Gold Pressure Plate - Vanilla alternativ - GameRegistry.addRecipe(new ItemStack(Blocks.pressurePlateGold), "ii", 'i', aluBrass); + GameRegistry.addRecipe(new ItemStack(Blocks.light_weighted_pressure_plate), "ii", 'i', aluBrass); //Accessories GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.heartCanister, 1, 0), "##", "##", '#', "ingotAluminum")); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.heartCanister, 1, 0), "##", "##", '#', "ingotAluminium")); @@ -1144,7 +1144,6 @@ public class TRecipes Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.bucket), 0, TConstruct.ingotLiquidValue * 3); Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.minecart), 0, TConstruct.ingotLiquidValue * 5); Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.chest_minecart), 0, TConstruct.ingotLiquidValue * 5); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.powered_minecart), 0, TConstruct.ingotLiquidValue * 5); Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.hopper_minecart), 50, TConstruct.ingotLiquidValue * 10); Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.iron_door), 0, TConstruct.ingotLiquidValue * 6); Smeltery.addMelting(FluidType.Iron, new ItemStack(Items.cauldron), 0, TConstruct.ingotLiquidValue * 7); @@ -1193,8 +1192,8 @@ public class TRecipes //Vanilla blocks Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.iron_bars), 0, TConstruct.ingotLiquidValue * 6 / 16); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.iron_pressure_plate), 0, TConstruct.oreLiquidValue); - Smeltery.addMelting(FluidType.Gold, new ItemStack(Blocks.pressurePlateGold, 4), 0, TConstruct.oreLiquidValue); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.heavy_weighted_pressure_plate), 0, TConstruct.oreLiquidValue); + Smeltery.addMelting(FluidType.Gold, new ItemStack(Blocks.light_weighted_pressure_plate, 4), 0, TConstruct.oreLiquidValue); Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.rail), 0, TConstruct.ingotLiquidValue * 6 / 16); Smeltery.addMelting(FluidType.Gold, new ItemStack(Blocks.rail_powered), 0, TConstruct.ingotLiquidValue); Smeltery.addMelting(FluidType.Iron, new ItemStack(Blocks.railDetector), 0, TConstruct.ingotLiquidValue); @@ -1245,7 +1244,7 @@ public class TRecipes Block taintedSoil = GameRegistry.findBlock("Natura", "soil.tainted"); Block heatSand = GameRegistry.findBlock("Natura", "heatsand"); if (taintedSoil != null && heatSand != null) - GameRegistry.addShapelessRecipe(new ItemStack(TRepo.craftedSoil, 2, 6), Items.netherStalkSeeds, taintedSoil, heatSand); + GameRegistry.addShapelessRecipe(new ItemStack(TRepo.craftedSoil, 2, 6), Items.nether_wart, taintedSoil, heatSand); ItemStack ironpick = ToolBuilder.instance.buildTool(new ItemStack(TRepo.pickaxeHead, 1, 6), new ItemStack(TRepo.toolRod, 1, 2), new ItemStack(TRepo.binding, 1, 6), ""); /*TE3 Flux*/ diff --git a/src/main/java/tconstruct/items/tools/Mattock.java b/src/main/java/tconstruct/items/tools/Mattock.java index b598ba5d..2ee40b1f 100644 --- a/src/main/java/tconstruct/items/tools/Mattock.java +++ b/src/main/java/tconstruct/items/tools/Mattock.java @@ -47,7 +47,7 @@ public class Mattock extends DualHarvestTool return "shovel"; } - static Material[] axeMaterials = { Material.field_151575_d, Material.field_151570_A, Material.pumpkin, Material.plants, Material.field_151582_l }; + static Material[] axeMaterials = { Material.field_151575_d, Material.field_151570_A, Material.pumpkin, Material.field_151585_k, Material.field_151582_l }; static Material[] shovelMaterials = { Material.field_151577_b, Material.field_151578_c, Material.field_151571_B }; @Override diff --git a/src/main/java/tconstruct/items/tools/Scythe.java b/src/main/java/tconstruct/items/tools/Scythe.java index bb605943..335deac2 100644 --- a/src/main/java/tconstruct/items/tools/Scythe.java +++ b/src/main/java/tconstruct/items/tools/Scythe.java @@ -40,7 +40,7 @@ public class Scythe extends Weapon return materials; } - static Material[] materials = new Material[] { Material.web, Material.field_151570_A, Material.pumpkin, Material.plants, Material.field_151582_l, Material.field_151584_j }; + static Material[] materials = new Material[] { Material.field_151569_G, Material.field_151570_A, Material.pumpkin, Material.field_151585_k, Material.field_151582_l, Material.field_151584_j }; @Override public Item getHeadItem () diff --git a/src/main/java/tconstruct/library/crafting/Smeltery.java b/src/main/java/tconstruct/library/crafting/Smeltery.java index e4926d16..2011cb3d 100644 --- a/src/main/java/tconstruct/library/crafting/Smeltery.java +++ b/src/main/java/tconstruct/library/crafting/Smeltery.java @@ -197,7 +197,7 @@ public class Smeltery if (temp <= 20) temp = type.baseTemperature; - addMelting(input, type.renderBlockID, type.renderMeta, type.baseTemperature + temperatureDifference, new FluidStack(type.fluid, fluidAmount)); + addMelting(input, new ItemStack(type.renderBlock).getItem(), type.renderMeta, type.baseTemperature + temperatureDifference, new FluidStack(type.fluid, fluidAmount)); } /** diff --git a/src/main/java/tconstruct/library/tools/Weapon.java b/src/main/java/tconstruct/library/tools/Weapon.java index 35d5247a..934b46a0 100644 --- a/src/main/java/tconstruct/library/tools/Weapon.java +++ b/src/main/java/tconstruct/library/tools/Weapon.java @@ -123,7 +123,7 @@ public abstract class Weapon extends ToolCore return new String[] { "weapon", "melee" }; } - public static Material[] web = new Material[] { Material.web }; + public static Material[] web = new Material[] { Material.field_151569_G }; public static Material[] none = new Material[0]; }