From 3d5cdf6ee691372ebd0884aec8d2ed101cf8e723 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Thu, 16 Jan 2014 01:46:21 -0500 Subject: [PATCH] under 2k errors :D --- .../blocks/CastingChannelBlock.java | 4 +- .../java/tconstruct/blocks/DryingRack.java | 2 +- .../java/tconstruct/blocks/EquipBlock.java | 2 +- .../blocks/GlassBlockConnected.java | 2 +- .../java/tconstruct/blocks/OreberryBush.java | 2 +- .../client/block/BlockSkinRenderHelper.java | 50 +++++++++---------- .../tconstruct/client/block/RenderLiquid.java | 30 +++++------ src/main/java/tconstruct/common/TContent.java | 2 +- 8 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/main/java/tconstruct/blocks/CastingChannelBlock.java b/src/main/java/tconstruct/blocks/CastingChannelBlock.java index 20790925..637daf34 100644 --- a/src/main/java/tconstruct/blocks/CastingChannelBlock.java +++ b/src/main/java/tconstruct/blocks/CastingChannelBlock.java @@ -21,9 +21,9 @@ import tconstruct.library.TConstructRegistry; public class CastingChannelBlock extends BlockContainer { - public CastingChannelBlock(int par1) + public CastingChannelBlock() { - super(par1, Material.rock); + super(Material.rock); this.func_149711_c(1F); this.func_149752_b(10); this.setStepSound(soundStoneFootstep); diff --git a/src/main/java/tconstruct/blocks/DryingRack.java b/src/main/java/tconstruct/blocks/DryingRack.java index 8b483e33..85022f86 100644 --- a/src/main/java/tconstruct/blocks/DryingRack.java +++ b/src/main/java/tconstruct/blocks/DryingRack.java @@ -238,7 +238,7 @@ public class DryingRack extends InventoryBlock } @Override - public boolean renderAsNormalBlock () + public boolean func_149686_d () { return false; } diff --git a/src/main/java/tconstruct/blocks/EquipBlock.java b/src/main/java/tconstruct/blocks/EquipBlock.java index 3436a16b..8bcc8d09 100644 --- a/src/main/java/tconstruct/blocks/EquipBlock.java +++ b/src/main/java/tconstruct/blocks/EquipBlock.java @@ -52,7 +52,7 @@ public class EquipBlock extends InventoryBlock } @Override - public boolean renderAsNormalBlock () + public boolean func_149686_d () { return false; } diff --git a/src/main/java/tconstruct/blocks/GlassBlockConnected.java b/src/main/java/tconstruct/blocks/GlassBlockConnected.java index f009a2ea..0dc0b4c3 100644 --- a/src/main/java/tconstruct/blocks/GlassBlockConnected.java +++ b/src/main/java/tconstruct/blocks/GlassBlockConnected.java @@ -45,7 +45,7 @@ public class GlassBlockConnected extends MantleBlock } @Override - public boolean renderAsNormalBlock () + public boolean func_149686_d () { return false; } diff --git a/src/main/java/tconstruct/blocks/OreberryBush.java b/src/main/java/tconstruct/blocks/OreberryBush.java index fb1e90d4..f9abbb6f 100644 --- a/src/main/java/tconstruct/blocks/OreberryBush.java +++ b/src/main/java/tconstruct/blocks/OreberryBush.java @@ -227,7 +227,7 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable } @Override - public boolean renderAsNormalBlock () + public boolean func_149686_d () { return false; } diff --git a/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java b/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java index e9347fb9..5812d7c6 100644 --- a/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java +++ b/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java @@ -63,7 +63,7 @@ public class BlockSkinRenderHelper float f7; int i1; - 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) { @@ -178,7 +178,7 @@ public class BlockSkinRenderHelper 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) { @@ -284,7 +284,7 @@ public class BlockSkinRenderHelper IIcon icon; - 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) { @@ -401,7 +401,7 @@ public class BlockSkinRenderHelper 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) { @@ -518,7 +518,7 @@ public class BlockSkinRenderHelper 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) { @@ -635,7 +635,7 @@ public class BlockSkinRenderHelper 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) { @@ -794,7 +794,7 @@ public class BlockSkinRenderHelper 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.setColorOpaque_F(f10, f13, f16); @@ -802,7 +802,7 @@ public class BlockSkinRenderHelper 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.setColorOpaque_F(f7, f8, f9); @@ -810,9 +810,9 @@ public class BlockSkinRenderHelper flag = true; } - Icon icon; + IIcon icon; - 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.setColorOpaque_F(f11, f14, f17); @@ -821,7 +821,7 @@ public class BlockSkinRenderHelper 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.setColorOpaque_F(f11, f14, f17); @@ -830,7 +830,7 @@ public class BlockSkinRenderHelper 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.setColorOpaque_F(f12, f15, f18); @@ -839,7 +839,7 @@ public class BlockSkinRenderHelper 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.setColorOpaque_F(f12, f15, f18); @@ -904,7 +904,7 @@ public class BlockSkinRenderHelper float f7; int i1; - 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) { @@ -1019,7 +1019,7 @@ public class BlockSkinRenderHelper 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) { @@ -1123,7 +1123,7 @@ public class BlockSkinRenderHelper 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) { @@ -1239,7 +1239,7 @@ public class BlockSkinRenderHelper 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) { @@ -1355,7 +1355,7 @@ public class BlockSkinRenderHelper 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) { @@ -1471,7 +1471,7 @@ public class BlockSkinRenderHelper 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) { @@ -1630,7 +1630,7 @@ public class BlockSkinRenderHelper 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.setColorOpaque_F(f10, f13, f16); @@ -1638,7 +1638,7 @@ public class BlockSkinRenderHelper 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.setColorOpaque_F(f7, f8, f9); @@ -1648,7 +1648,7 @@ public class BlockSkinRenderHelper Icon icon; - 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.setColorOpaque_F(f11, f14, f17); @@ -1657,7 +1657,7 @@ public class BlockSkinRenderHelper 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.setColorOpaque_F(f11, f14, f17); @@ -1666,7 +1666,7 @@ public class BlockSkinRenderHelper 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.setColorOpaque_F(f12, f15, f18); @@ -1675,7 +1675,7 @@ public class BlockSkinRenderHelper 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.setColorOpaque_F(f12, f15, f18); diff --git a/src/main/java/tconstruct/client/block/RenderLiquid.java b/src/main/java/tconstruct/client/block/RenderLiquid.java index aab17009..7185bdeb 100644 --- a/src/main/java/tconstruct/client/block/RenderLiquid.java +++ b/src/main/java/tconstruct/client/block/RenderLiquid.java @@ -389,7 +389,7 @@ public class RenderLiquid render.field_147848_as *= f6; render.field_147856_aw *= f6; render.field_147833_aA *= f6; - Icon icon = block.getIcon(2, metadata); + IIcon icon = block.getIcon(2, metadata); render.renderFaceZNeg(block, xPos, yPos, zPos, icon); flag = true; @@ -506,7 +506,7 @@ public class RenderLiquid render.field_147848_as *= f6; render.field_147856_aw *= f6; render.field_147833_aA *= f6; - Icon icon = block.getIcon(3, metadata); + IIcon icon = block.getIcon(3, metadata); render.renderFaceZPos(block, xPos, yPos, zPos, icon); flag = true; @@ -527,10 +527,10 @@ public class RenderLiquid 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); - boolean flag3 = Block.canBlockGrass[render.field_147845_a.func_147439_a(xPos - 1, yPos + 1, zPos)]; - boolean flag2 = Block.canBlockGrass[render.field_147845_a.func_147439_a(xPos - 1, yPos - 1, zPos)]; - boolean flag5 = Block.canBlockGrass[render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos - 1)]; - boolean flag4 = Block.canBlockGrass[render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos + 1)]; + 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 - 1, yPos, zPos - 1).func_149751_l(); + boolean flag4 = render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos + 1).func_149751_l(); if ((!flag5) && (!flag2)) { @@ -623,7 +623,7 @@ public class RenderLiquid render.field_147848_as *= f6; render.field_147856_aw *= f6; render.field_147833_aA *= f6; - Icon icon = block.getIcon(4, metadata); + IIcon icon = block.getIcon(4, metadata); render.renderFaceXNeg(block, xPos, yPos, zPos, icon); flag = true; @@ -644,10 +644,10 @@ public class RenderLiquid render.field_147866_ai = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); render.field_147862_ak = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); render.field_147885_ae = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); - boolean flag3 = Block.canBlockGrass[render.field_147845_a.func_147439_a(xPos + 1, yPos + 1, zPos)]; - boolean flag2 = Block.canBlockGrass[render.field_147845_a.func_147439_a(xPos + 1, yPos - 1, zPos)]; - boolean flag5 = Block.canBlockGrass[render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos + 1)]; - boolean flag4 = Block.canBlockGrass[render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos - 1)]; + 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 + 1, yPos, zPos + 1).func_149751_l(); + boolean flag4 = render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos - 1).func_149751_l(); if ((!flag2) && (!flag4)) { @@ -908,10 +908,10 @@ public class RenderLiquid render.field_147814_A = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); render.field_147815_B = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); render.field_147810_D = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - boolean flag3 = Block.canBlockGrass[render.field_147845_a.func_147439_a(xPos + 1, yPos - 1, zPos)]; - boolean flag2 = Block.canBlockGrass[render.field_147845_a.func_147439_a(xPos - 1, yPos - 1, zPos)]; - boolean flag5 = Block.canBlockGrass[render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos + 1)]; - boolean flag4 = Block.canBlockGrass[render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos - 1)]; + 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(); if ((!flag4) && (!flag2)) { diff --git a/src/main/java/tconstruct/common/TContent.java b/src/main/java/tconstruct/common/TContent.java index 539c4593..e4329230 100644 --- a/src/main/java/tconstruct/common/TContent.java +++ b/src/main/java/tconstruct/common/TContent.java @@ -128,7 +128,7 @@ public class TContent implements IFuelHandler TRepo.searedBlock = new SearedBlock().func_149663_c("SearedBlock"); TRepo.searedBlockNether = new SearedBlock("nether").func_149663_c("SearedBlock"); - TRepo.castingChannel = (new CastingChannelBlock(PHConstruct.castingChannel)).func_149663_c("CastingChannel"); + TRepo.castingChannel = (new CastingChannelBlock()).func_149663_c("CastingChannel"); TRepo.tankAir = new TankAirBlock(Material.field_151584_j).setBlockUnbreakable().func_149663_c("tconstruct.tank.air");