diff --git a/src/main/java/tconstruct/blocks/BlockLandmine.java b/src/main/java/tconstruct/blocks/BlockLandmine.java index 64e17707..9a4af186 100644 --- a/src/main/java/tconstruct/blocks/BlockLandmine.java +++ b/src/main/java/tconstruct/blocks/BlockLandmine.java @@ -399,7 +399,7 @@ public class BlockLandmine extends BlockContainer } @Override - public void updateTick (World par1World, int par2, int par3, int par4, Random par5Random) + public void func_149674_a (World par1World, int par2, int par3, int par4, Random par5Random) { if (!par1World.isRemote) { diff --git a/src/main/java/tconstruct/blocks/CastingChannelBlock.java b/src/main/java/tconstruct/blocks/CastingChannelBlock.java index dec820bc..b5e36620 100644 --- a/src/main/java/tconstruct/blocks/CastingChannelBlock.java +++ b/src/main/java/tconstruct/blocks/CastingChannelBlock.java @@ -25,7 +25,7 @@ public class CastingChannelBlock extends BlockContainer { super(par1, Material.rock); this.setHardness(1F); - this.setResistance(10); + this.func_149752_b(10); this.setStepSound(soundStoneFootstep); setCreativeTab(TConstructRegistry.blockTab); } diff --git a/src/main/java/tconstruct/blocks/ConveyorBase.java b/src/main/java/tconstruct/blocks/ConveyorBase.java index 18c9140e..47883e9a 100644 --- a/src/main/java/tconstruct/blocks/ConveyorBase.java +++ b/src/main/java/tconstruct/blocks/ConveyorBase.java @@ -101,11 +101,11 @@ public class ConveyorBase extends MantleBlock world.setBlockMetadataWithNotify(x, y, z, face | meta, 2); } - public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side) + public boolean func_149646_a (IBlockAccess world, int x, int y, int z, int side) { if (side == 1) return false; - return super.shouldSideBeRendered(world, x, y, z, side); + return super. func_149646_a(world, x, y, z, side); } public IIcon[] icons; diff --git a/src/main/java/tconstruct/blocks/CraftingSlab.java b/src/main/java/tconstruct/blocks/CraftingSlab.java index f02fe03a..5435a077 100644 --- a/src/main/java/tconstruct/blocks/CraftingSlab.java +++ b/src/main/java/tconstruct/blocks/CraftingSlab.java @@ -31,7 +31,7 @@ public class CraftingSlab extends InventorySlab { super(material); this.setCreativeTab(TConstructRegistry.blockTab); - this.setHardness(2f); + this.func_149711_c(2f); this.setStepSound(Block.soundWoodFootstep); } @@ -123,7 +123,7 @@ public class CraftingSlab extends InventorySlab } @Override - public void getSubBlocks (Block b, CreativeTabs tab, List list) + public void getSubBlocks (Item b, CreativeTabs tab, List list) { for (int iter = 0; iter < 6; iter++) { diff --git a/src/main/java/tconstruct/blocks/CraftingStationBlock.java b/src/main/java/tconstruct/blocks/CraftingStationBlock.java index 2ca2e844..713dc173 100644 --- a/src/main/java/tconstruct/blocks/CraftingStationBlock.java +++ b/src/main/java/tconstruct/blocks/CraftingStationBlock.java @@ -24,7 +24,7 @@ public class CraftingStationBlock extends InventoryBlock { super(material); this.setCreativeTab(TConstructRegistry.blockTab); - this.setHardness(2f); + this.func_149711_c(2f); this.setStepSound(Block.soundWoodFootstep); } @@ -74,7 +74,7 @@ public class CraftingStationBlock extends InventoryBlock } @Override - public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + public boolean func_149646_a (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { return true; } diff --git a/src/main/java/tconstruct/blocks/DryingRack.java b/src/main/java/tconstruct/blocks/DryingRack.java index cd7f7032..59651b99 100644 --- a/src/main/java/tconstruct/blocks/DryingRack.java +++ b/src/main/java/tconstruct/blocks/DryingRack.java @@ -29,7 +29,7 @@ public class DryingRack extends InventoryBlock { super(Material.field_151575_d); this.setCreativeTab(TConstructRegistry.blockTab); - setHardness(2.0f); + func_149711_c(2.0f); setStepSound(soundMetalFootstep); } @@ -249,6 +249,12 @@ public class DryingRack extends InventoryBlock return false; } + @Override + public TileEntity createTileEntity (World world, int metadata) + { + return new DryingRackLogic(); + } + /*@Override public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { diff --git a/src/main/java/tconstruct/blocks/EquipBlock.java b/src/main/java/tconstruct/blocks/EquipBlock.java index 348d2221..cbc4394b 100644 --- a/src/main/java/tconstruct/blocks/EquipBlock.java +++ b/src/main/java/tconstruct/blocks/EquipBlock.java @@ -29,7 +29,7 @@ public class EquipBlock extends InventoryBlock public EquipBlock(Material material) { super(material); - this.setHardness(0.3f); + this.func_149711_c(0.3f); this.setBlockBounds(0, 0, 0, 1, 0.25f, 1); //this.setCreativeTab(ToolConstruct.materialTab); } @@ -185,4 +185,10 @@ public class EquipBlock extends InventoryBlock return TConstruct.instance; } + @Override + public TileEntity createTileEntity (World world, int metadata) + { + return new FrypanLogic(); + } + } diff --git a/src/main/java/tconstruct/blocks/FurnaceSlab.java b/src/main/java/tconstruct/blocks/FurnaceSlab.java index 0575dd2a..ee8d092a 100644 --- a/src/main/java/tconstruct/blocks/FurnaceSlab.java +++ b/src/main/java/tconstruct/blocks/FurnaceSlab.java @@ -22,11 +22,11 @@ public class FurnaceSlab extends InventorySlab { super(material); this.func_149647_a(TConstructRegistry.blockTab); - this.setHardness(3.5f); + this.func_149711_c(3.5f); } @Override - public TileEntity func_149915_a (World world, int metadata) + public TileEntity createTileEntity (World world, int metadata) { switch (metadata % 8) { @@ -110,4 +110,15 @@ public class FurnaceSlab extends InventorySlab this.icons[i] = iconRegister.registerIcon("tinker:" + textureNames[i]); } } + + @Override + public TileEntity func_149915_a (World var1, int metadata) + { + switch (metadata % 8) + { + case 0: + return new FurnaceLogic(); + } + return null; + } } diff --git a/src/main/java/tconstruct/blocks/GlassBlock.java b/src/main/java/tconstruct/blocks/GlassBlock.java index 6da7f6a2..44a0fb45 100644 --- a/src/main/java/tconstruct/blocks/GlassBlock.java +++ b/src/main/java/tconstruct/blocks/GlassBlock.java @@ -23,10 +23,10 @@ public class GlassBlock extends TConstructBlock } @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + public boolean func_149646_a (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { Block i1 = par1IBlockAccess.func_147439_a(par2, par3, par4); - return i1 == (Block) this ? false : super.shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, par5); + return i1 == (Block) this ? false : super.func_149646_a(par1IBlockAccess, par2, par3, par4, par5); } @Override diff --git a/src/main/java/tconstruct/blocks/GlassBlockConnected.java b/src/main/java/tconstruct/blocks/GlassBlockConnected.java index e7cf3176..d4bf7d13 100644 --- a/src/main/java/tconstruct/blocks/GlassBlockConnected.java +++ b/src/main/java/tconstruct/blocks/GlassBlockConnected.java @@ -28,7 +28,7 @@ public class GlassBlockConnected extends MantleBlock this.setStepSound(soundGlassFootstep); folder = location; renderPass = hasAlpha ? 1 : 0; - setHardness(0.3F); + func_149711_c(0.3F); this.setCreativeTab(TConstructRegistry.blockTab); } @@ -585,10 +585,10 @@ public class GlassBlockConnected extends MantleBlock } @Override - public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + public boolean func_149646_a (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { Block b = par1IBlockAccess.func_147439_a(par2, par3, par4); - return b == (Block) this ? false : super.shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, par5); + return b == (Block) this ? false : super. func_149646_a(par1IBlockAccess, par2, par3, par4, par5); } @Override diff --git a/src/main/java/tconstruct/blocks/GlassBlockStained.java b/src/main/java/tconstruct/blocks/GlassBlockStained.java index 0f453a0c..ee4b1cba 100644 --- a/src/main/java/tconstruct/blocks/GlassBlockStained.java +++ b/src/main/java/tconstruct/blocks/GlassBlockStained.java @@ -31,10 +31,10 @@ public class GlassBlockStained extends TConstructBlock } @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side) + public boolean func_149646_a (IBlockAccess world, int x, int y, int z, int side) { Block block = world.getBlock(x, y, z); - return block == this ? false : super.shouldSideBeRendered(world, x, y, z, side); + return block == this ? false : super. func_149646_a(world, x, y, z, side); } @Override diff --git a/src/main/java/tconstruct/blocks/GlassPane.java b/src/main/java/tconstruct/blocks/GlassPane.java index 0cf88ea6..129fa887 100644 --- a/src/main/java/tconstruct/blocks/GlassPane.java +++ b/src/main/java/tconstruct/blocks/GlassPane.java @@ -12,7 +12,7 @@ public class GlassPane extends PaneBase super(Material.field_151592_s, "glass/", blockTextures); this.func_149711_c(0.3F); this.setStepSound(soundGlassFootstep); - this.setUnlocalizedName("tconstruct.glasspane"); + this.func_149663_c("tconstruct.glasspane"); this.setCreativeTab(TConstructRegistry.blockTab); } } diff --git a/src/main/java/tconstruct/blocks/GlassPaneConnected.java b/src/main/java/tconstruct/blocks/GlassPaneConnected.java index c8445fa1..ae05b547 100644 --- a/src/main/java/tconstruct/blocks/GlassPaneConnected.java +++ b/src/main/java/tconstruct/blocks/GlassPaneConnected.java @@ -681,11 +681,11 @@ public class GlassPaneConnected extends GlassBlockConnected public boolean canPaneConnectTo (IBlockAccess access, int x, int y, int z, ForgeDirection dir) { return canThisPaneConnectToThisBlock(access.func_147439_a(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ)) - || access.isBlockSolidOnSide(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, dir.getOpposite(), false); + || access.isSideSolid(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, dir.getOpposite(), false); } @Override - public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + public boolean func_149646_a (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { // if(par5 == 0 || par5 == 1){ // return par1IBlockAccess.func_147439_a(par2, par3, par4) != this.blockID; diff --git a/src/main/java/tconstruct/blocks/GlassPaneStained.java b/src/main/java/tconstruct/blocks/GlassPaneStained.java index 0acba321..cc864414 100644 --- a/src/main/java/tconstruct/blocks/GlassPaneStained.java +++ b/src/main/java/tconstruct/blocks/GlassPaneStained.java @@ -13,7 +13,7 @@ public class GlassPaneStained extends PaneBase //TODO setHardness this.func_149711_c(0.3F); this.setStepSound(soundGlassFootstep); - this.setUnlocalizedName("tconstruct.glasspanestained"); + this.func_149663_c("tconstruct.glasspanestained"); this.setCreativeTab(TConstructRegistry.blockTab); } diff --git a/src/main/java/tconstruct/blocks/LavaTankBlock.java b/src/main/java/tconstruct/blocks/LavaTankBlock.java index 12e7a514..e417f8b4 100644 --- a/src/main/java/tconstruct/blocks/LavaTankBlock.java +++ b/src/main/java/tconstruct/blocks/LavaTankBlock.java @@ -34,10 +34,10 @@ public class LavaTankBlock extends BlockContainer public LavaTankBlock() { super(Material.rock); - setHardness(3F); - setResistance(20F); + func_149711_c(3F); + func_149752_b(20F); setCreativeTab(TConstructRegistry.blockTab); - setUnlocalizedName("TConstruct.LavaTank"); + func_149663_c("TConstruct.LavaTank"); setStepSound(Block.soundGlassFootstep); } @@ -88,12 +88,12 @@ public class LavaTankBlock extends BlockContainer } @Override - public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side) + public boolean func_149646_a (IBlockAccess world, int x, int y, int z, int side) { //if (side == 0 && world.getBlockMetadata(x, y, z) == 0) - //return super.shouldSideBeRendered(world, x, y, z, side); + //return super. func_149646_a(world, x, y, z, side); Block b = world.func_147439_a(x, y, z); - return b == (Block)this ? false : super.shouldSideBeRendered(world, x, y, z, side); + return b == (Block)this ? false : super. func_149646_a(world, x, y, z, side); //return true; } diff --git a/src/main/java/tconstruct/blocks/LiquidMetalFinite.java b/src/main/java/tconstruct/blocks/LiquidMetalFinite.java index c05d0b4b..f4be97fb 100644 --- a/src/main/java/tconstruct/blocks/LiquidMetalFinite.java +++ b/src/main/java/tconstruct/blocks/LiquidMetalFinite.java @@ -23,7 +23,7 @@ public class LiquidMetalFinite extends BlockFluidFinite { super(id, fluid, TRepo.liquidMetal); this.texture = texture; - this.setCreativeTab(TConstructRegistry.blockTab); + this.func_149647_a(TConstructRegistry.blockTab); } @Override diff --git a/src/main/java/tconstruct/blocks/MeatBlock.java b/src/main/java/tconstruct/blocks/MeatBlock.java index 154eec77..7b194ea2 100644 --- a/src/main/java/tconstruct/blocks/MeatBlock.java +++ b/src/main/java/tconstruct/blocks/MeatBlock.java @@ -23,10 +23,10 @@ public class MeatBlock extends Block public MeatBlock() { super(Material.field_151575_d); - this.setHardness(1.0F); + this.func_149711_c(1.0F); this.setStepSound(Block.soundWoodFootstep); //setBurnProperties(this.blockID, 5, 20); - this.setCreativeTab(TConstructRegistry.blockTab); + this.func_149647_a(TConstructRegistry.blockTab); } @Override diff --git a/src/main/java/tconstruct/blocks/OreberryBush.java b/src/main/java/tconstruct/blocks/OreberryBush.java index 1c91d5a1..4f1b0ac1 100644 --- a/src/main/java/tconstruct/blocks/OreberryBush.java +++ b/src/main/java/tconstruct/blocks/OreberryBush.java @@ -47,9 +47,9 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable this.oreTypes = oreTypes; this.setTickRandomly(true); random = new Random(); - this.setHardness(0.3F); + this.func_149711_c(0.3F); this.setStepSound(Block.soundMetalFootstep); - this.setCreativeTab(TConstructRegistry.blockTab); + this.func_149647_a(TConstructRegistry.blockTab); } /* Berries show up at meta 12-15 */ @@ -237,11 +237,11 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable return OreberryRender.model; } - public boolean shouldSideBeRendered (IBlockAccess iblockaccess, int x, int y, int z, int meta) + public boolean func_149646_a (IBlockAccess iblockaccess, int x, int y, int z, int meta) { if (meta > 7 || graphicsLevel) { - return super.shouldSideBeRendered(iblockaccess, x, y, z, meta); + return super.func_149646_a(iblockaccess, x, y, z, meta); } else { @@ -252,7 +252,7 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable /* Bush growth */ @Override - public void updateTick (World world, int x, int y, int z, Random random1) + public void func_149674_a (World world, int x, int y, int z, Random random1) { if (world.isRemote) { @@ -324,19 +324,13 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable } @Override - public EnumPlantType getPlantType (World world, int x, int y, int z) + public Block getPlant (IBlockAccess world, int x, int y, int z) { - return EnumPlantType.Cave; + return this; } @Override - public int getPlantID (World world, int x, int y, int z) - { - return this.blockID; - } - - @Override - public int getPlantMetadata (World world, int x, int y, int z) + public int getPlantMetadata (IBlockAccess world, int x, int y, int z) { return world.getBlockMetadata(x, y, z) - 4; } @@ -347,4 +341,11 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable if (!(entity instanceof EntityItem)) entity.attackEntityFrom(DamageSource.cactus, 1); } + + @Override + public EnumPlantType getPlantType (IBlockAccess world, int x, int y, int z) + { + return EnumPlantType.Cave; + } + } diff --git a/src/main/java/tconstruct/blocks/OreberryBushEssence.java b/src/main/java/tconstruct/blocks/OreberryBushEssence.java index 3d212bde..73d082a2 100644 --- a/src/main/java/tconstruct/blocks/OreberryBushEssence.java +++ b/src/main/java/tconstruct/blocks/OreberryBushEssence.java @@ -16,7 +16,7 @@ public class OreberryBushEssence extends OreberryBush implements IPlantable /* Bush growth */ @Override - public void updateTick (World world, int x, int y, int z, Random random1) + public void func_149674_a (World world, int x, int y, int z, Random random1) { if (world.isRemote) { diff --git a/src/main/java/tconstruct/blocks/PaneBase.java b/src/main/java/tconstruct/blocks/PaneBase.java index 7eef110b..87231fd4 100644 --- a/src/main/java/tconstruct/blocks/PaneBase.java +++ b/src/main/java/tconstruct/blocks/PaneBase.java @@ -89,7 +89,7 @@ public class PaneBase extends Block return PaneRender.model; } - public boolean shouldSideBeRendered (IBlockAccess iblockaccess, int i, int j, int k, int l) + public boolean func_149646_a (IBlockAccess iblockaccess, int i, int j, int k, int l) { Block b = iblockaccess.func_147439_a(i, j, k); if (b instanceof PaneBase || b instanceof BlockPane) @@ -98,7 +98,7 @@ public class PaneBase extends Block } else { - return super.shouldSideBeRendered(iblockaccess, i, j, k, l); + return super. func_149646_a(iblockaccess, i, j, k, l); } } diff --git a/src/main/java/tconstruct/blocks/SearedBlock.java b/src/main/java/tconstruct/blocks/SearedBlock.java index 6879ffbc..b81c94ad 100644 --- a/src/main/java/tconstruct/blocks/SearedBlock.java +++ b/src/main/java/tconstruct/blocks/SearedBlock.java @@ -27,8 +27,8 @@ public class SearedBlock extends InventoryBlock { super(Material.rock); this.setCreativeTab(TConstructRegistry.blockTab); - setHardness(3F); - setResistance(20F); + func_149711_c(3F); + func_149752_b(20F); setStepSound(soundMetalFootstep); } @@ -242,7 +242,7 @@ public class SearedBlock extends InventoryBlock } @Override - public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + public boolean func_149646_a (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { return true; } @@ -356,4 +356,21 @@ public class SearedBlock extends InventoryBlock logic.setActive(true); } } + + @Override + public TileEntity func_149915_a (World var1, int metadata) + { + switch (metadata) + { + case 0: + return new CastingTableLogic(); + case 1: + return new FaucetLogic(); + case 2: + return new CastingBasinLogic(); + default: + return null; + } + + } } diff --git a/src/main/java/tconstruct/blocks/SearedSlab.java b/src/main/java/tconstruct/blocks/SearedSlab.java index 468defe7..e7da7864 100644 --- a/src/main/java/tconstruct/blocks/SearedSlab.java +++ b/src/main/java/tconstruct/blocks/SearedSlab.java @@ -20,8 +20,8 @@ public class SearedSlab extends SlabBase { //TODO material.rock super(Material.field_151576_e); - this.setCreativeTab(TConstructRegistry.blockTab); - setHardness(12F); + this.func_149647_a(TConstructRegistry.blockTab); + func_149711_c(12F); } @Override diff --git a/src/main/java/tconstruct/blocks/SlabBase.java b/src/main/java/tconstruct/blocks/SlabBase.java index dd755d98..e563f73a 100644 --- a/src/main/java/tconstruct/blocks/SlabBase.java +++ b/src/main/java/tconstruct/blocks/SlabBase.java @@ -26,13 +26,13 @@ public class SlabBase extends MantleBlock public SlabBase(Material material) { super(material); - this.setCreativeTab(TConstructRegistry.blockTab); + this.func_149647_a(TConstructRegistry.blockTab); } public SlabBase(Material material, Block model, int meta, int totalSize) { super(material); - this.setCreativeTab(TConstructRegistry.blockTab); + this.func_149647_a(TConstructRegistry.blockTab); this.modelBlock = model; this.startingMeta = meta; this.totalSize = totalSize; diff --git a/src/main/java/tconstruct/blocks/SlimePad.java b/src/main/java/tconstruct/blocks/SlimePad.java index 606041e2..c7c366b9 100644 --- a/src/main/java/tconstruct/blocks/SlimePad.java +++ b/src/main/java/tconstruct/blocks/SlimePad.java @@ -26,7 +26,7 @@ public class SlimePad extends MantleBlock { super(par2Material); setBlockBounds(0.125F, 0.0F, 0.125F, 0.875F, 0.625F, 0.875F); - this.setCreativeTab(TConstructRegistry.blockTab); + this.func_149647_a(TConstructRegistry.blockTab); } @Override diff --git a/src/main/java/tconstruct/blocks/SmelteryBlock.java b/src/main/java/tconstruct/blocks/SmelteryBlock.java index 67cdfe98..69ed6c55 100644 --- a/src/main/java/tconstruct/blocks/SmelteryBlock.java +++ b/src/main/java/tconstruct/blocks/SmelteryBlock.java @@ -36,12 +36,12 @@ public class SmelteryBlock extends InventoryBlock public SmelteryBlock() { super(Material.rock); - setHardness(3F); - setResistance(20F); + func_149711_c(3F); + func_149752_b(20F); setStepSound(soundMetalFootstep); rand = new Random(); this.func_149647_a(TConstructRegistry.blockTab); - this.setUnlocalizedName("tconstruct.Smeltery"); + this.func_149663_c("tconstruct.Smeltery"); } public SmelteryBlock(String prefix) @@ -93,7 +93,7 @@ public class SmelteryBlock extends InventoryBlock public IIcon getBlockTexture (IBlockAccess world, int x, int y, int z, int side) { - TileEntity logic = world.getBlockTileEntity(x, y, z); + TileEntity logic = world.func_147438_o(x, y, z); short direction = (logic instanceof IFacingLogic) ? ((IFacingLogic) logic).getRenderDirection() : 0; int meta = world.getBlockMetadata(x, y, z); if (meta == 0) //Smeltery @@ -163,7 +163,7 @@ public class SmelteryBlock extends InventoryBlock { if (isActive(world, x, y, z)) { - TileEntity logic = world.getBlockTileEntity(x, y, z); + TileEntity logic = world.func_147438_o(x, y, z); byte face = 0; if (logic instanceof IFacingLogic) face = ((IFacingLogic) logic).getRenderDirection(); @@ -259,7 +259,7 @@ public class SmelteryBlock extends InventoryBlock public void onBlockPlacedElsewhere (World world, int x, int y, int z, EntityLivingBase entityliving) { - SmelteryLogic logic = (SmelteryLogic) world.getBlockTileEntity(x, y, z); + SmelteryLogic logic = (SmelteryLogic) world.func_147438_o(x, y, z); logic.checkValidPlacement(); } @@ -284,7 +284,7 @@ public class SmelteryBlock extends InventoryBlock public void onNeighborBlockChange (World world, int x, int y, int z, int nBlockID) { //System.out.println("Neighbor changed"); - TileEntity logic = world.getBlockTileEntity(x, y, z); + TileEntity logic = world.func_147438_o(x, y, z); if (logic instanceof IServantLogic) { ((IServantLogic) logic).notifyMasterOfChange(); @@ -298,7 +298,7 @@ public class SmelteryBlock extends InventoryBlock @Override public void breakBlock (World world, int x, int y, int z, Block block, int meta) { - TileEntity logic = world.getBlockTileEntity(x, y, z); + TileEntity logic = world.func_147438_o(x, y, z); if (logic instanceof IServantLogic) { ((IServantLogic) logic).notifyMasterOfChange(); diff --git a/src/main/java/tconstruct/blocks/SoilSlab.java b/src/main/java/tconstruct/blocks/SoilSlab.java index 6802a9be..729ccbbd 100644 --- a/src/main/java/tconstruct/blocks/SoilSlab.java +++ b/src/main/java/tconstruct/blocks/SoilSlab.java @@ -22,7 +22,7 @@ public class SoilSlab extends SlabBase public SoilSlab() { super(Material.field_151578_c); - this.setCreativeTab(TConstructRegistry.blockTab); + this.func_149647_a(TConstructRegistry.blockTab); } @Override diff --git a/src/main/java/tconstruct/blocks/SpeedSlab.java b/src/main/java/tconstruct/blocks/SpeedSlab.java index 4b28a381..817acc84 100644 --- a/src/main/java/tconstruct/blocks/SpeedSlab.java +++ b/src/main/java/tconstruct/blocks/SpeedSlab.java @@ -21,8 +21,8 @@ public class SpeedSlab extends SlabBase public SpeedSlab() { super(Material.rock); - this.setCreativeTab(TConstructRegistry.blockTab); - setHardness(3F); + this.func_149647_a(TConstructRegistry.blockTab); + func_149711_c(3F); } @Override diff --git a/src/main/java/tconstruct/blocks/StoneLadder.java b/src/main/java/tconstruct/blocks/StoneLadder.java index 24b4d36e..378200cb 100644 --- a/src/main/java/tconstruct/blocks/StoneLadder.java +++ b/src/main/java/tconstruct/blocks/StoneLadder.java @@ -18,7 +18,7 @@ public class StoneLadder extends BlockLadder public StoneLadder() { super(); - this.setUnlocalizedName("decoration.stoneladder"); + this.func_149663_c("decoration.stoneladder"); this.func_149647_a(CreativeTabs.tabDecorations); } diff --git a/src/main/java/tconstruct/blocks/TConstructBlock.java b/src/main/java/tconstruct/blocks/TConstructBlock.java index bbf4db72..601d3878 100644 --- a/src/main/java/tconstruct/blocks/TConstructBlock.java +++ b/src/main/java/tconstruct/blocks/TConstructBlock.java @@ -22,7 +22,7 @@ public class TConstructBlock extends MantleBlock public TConstructBlock( Material material, float hardness, String[] tex) { super( material); - setHardness(hardness); + func_149711_c(hardness); this.func_149647_a(TConstructRegistry.blockTab); textureNames = tex; } diff --git a/src/main/java/tconstruct/blocks/ToolForgeBlock.java b/src/main/java/tconstruct/blocks/ToolForgeBlock.java index 73e25dcd..64f30ceb 100644 --- a/src/main/java/tconstruct/blocks/ToolForgeBlock.java +++ b/src/main/java/tconstruct/blocks/ToolForgeBlock.java @@ -29,7 +29,7 @@ public class ToolForgeBlock extends InventoryBlock { super(material); this.setCreativeTab(TConstructRegistry.blockTab); - this.setHardness(2f); + this.func_149711_c(2f); this.setStepSound(Block.soundWoodFootstep); } @@ -104,7 +104,7 @@ public class ToolForgeBlock extends InventoryBlock } @Override - public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + public boolean func_149646_a (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { return true; } diff --git a/src/main/java/tconstruct/blocks/ToolStationBlock.java b/src/main/java/tconstruct/blocks/ToolStationBlock.java index 4c23ae33..00e3ebd7 100644 --- a/src/main/java/tconstruct/blocks/ToolStationBlock.java +++ b/src/main/java/tconstruct/blocks/ToolStationBlock.java @@ -31,7 +31,7 @@ public class ToolStationBlock extends InventoryBlock { super(material); this.setCreativeTab(TConstructRegistry.blockTab); - this.setHardness(2f); + this.func_149711_c(2f); this.setStepSound(Block.soundWoodFootstep); } @@ -102,7 +102,7 @@ public class ToolStationBlock extends InventoryBlock } @Override - public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + public boolean func_149646_a (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { return true; } diff --git a/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java b/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java index 625da771..1ce4b17d 100644 --- a/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java +++ b/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java @@ -156,9 +156,9 @@ public class AdaptiveDrainLogic extends MultiServantLogic implements IFluidHandl } @Override - public void writeToNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { - super.writeToNBT(tags); + super.func_145839_a(tags); tags.setByte("Direction", direction); } @@ -167,7 +167,7 @@ public class AdaptiveDrainLogic extends MultiServantLogic implements IFluidHandl public Packet getDescriptionPacket () { NBTTagCompound tag = new NBTTagCompound(); - writeToNBT(tag); + func_145839_a(tag); return new Packet132TileEntityData(field_145851_c, field_145848_d, field_145849_e, 1, tag); } diff --git a/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java b/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java index 1e82c5ab..84af8cb9 100644 --- a/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java +++ b/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java @@ -549,14 +549,14 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc } @Override - public void writeToNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { - super.writeToNBT(tags); + super.func_145839_a(tags); writeNetworkNBT(tags); - structure.writeToNBT(tags); - multitank.writeToNBT(tags); - smeltery.writeToNBT(tags); + structure.func_145839_a(tags); + multitank.func_145839_a(tags); + smeltery.func_145839_a(tags); } public void writeNetworkNBT (NBTTagCompound tags) diff --git a/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java b/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java index 35d7dbd9..99df39e0 100644 --- a/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java +++ b/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java @@ -365,9 +365,9 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl } @Override - public void writeToNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { - super.writeToNBT(tags); + super.func_145839_a(tags); writeCustomNBT(tags); } @@ -377,7 +377,7 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl if (liquid != null) { NBTTagCompound nbt = new NBTTagCompound(); - liquid.writeToNBT(nbt); + liquid.func_145839_a(nbt); tags.setTag("Fluid", nbt); } tags.setBoolean("Initialized", init); @@ -390,7 +390,7 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl public Packet getDescriptionPacket () { NBTTagCompound tag = new NBTTagCompound(); - writeToNBT(tag); + func_145839_a(tag); return new Packet132TileEntityData(field_145851_c, field_145848_d, field_145849_e, 1, tag); } diff --git a/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java b/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java index 57aaa466..edc4f9b7 100644 --- a/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java +++ b/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java @@ -542,9 +542,9 @@ public class CastingChannelLogic extends TileEntity implements IFluidTank, IFlui } @Override - public void writeToNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { - super.writeToNBT(tags); + super.func_145839_a(tags); writeCustomNBT(tags); tags.setBoolean("PullingLiquids", pullingLiquids); } @@ -555,7 +555,7 @@ public class CastingChannelLogic extends TileEntity implements IFluidTank, IFlui if (liquid != null) { NBTTagCompound nbt = new NBTTagCompound(); - liquid.writeToNBT(nbt); + liquid.func_145839_a(nbt); tags.setTag("Fluid", nbt); } tags.setInteger("LastProvider", this.convertFDToInt(this.lastProvider)); diff --git a/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java b/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java index e28c894b..0d3b0447 100644 --- a/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java +++ b/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java @@ -363,9 +363,9 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl } @Override - public void writeToNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { - super.writeToNBT(tags); + super.func_145839_a(tags); writeCustomNBT(tags); } @@ -375,7 +375,7 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl if (liquid != null) { NBTTagCompound nbt = new NBTTagCompound(); - liquid.writeToNBT(nbt); + liquid.func_145839_a(nbt); tags.setTag("Fluid", nbt); } tags.setBoolean("Initialized", init); @@ -388,7 +388,7 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl public Packet getDescriptionPacket () { NBTTagCompound tag = new NBTTagCompound(); - writeToNBT(tag); + func_145839_a(tag); return new Packet132TileEntityData(field_145851_c, field_145848_d, field_145849_e, 1, tag); } diff --git a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java index 2dfb4724..4f955554 100644 --- a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java +++ b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java @@ -85,7 +85,7 @@ public class DryingRackLogic extends InventoryLogic } @Override - public void writeToNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { tags.setInteger("Time", currentTime); tags.setInteger("MaxTime", maxTime); @@ -99,7 +99,7 @@ public class DryingRackLogic extends InventoryLogic public void writeCustomNBT (NBTTagCompound tags) { - super.writeToNBT(tags); + super.func_145839_a(tags); } /* Packets */ diff --git a/src/main/java/tconstruct/blocks/logic/FaucetLogic.java b/src/main/java/tconstruct/blocks/logic/FaucetLogic.java index ccc96fa2..e0b6b391 100644 --- a/src/main/java/tconstruct/blocks/logic/FaucetLogic.java +++ b/src/main/java/tconstruct/blocks/logic/FaucetLogic.java @@ -149,9 +149,9 @@ public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogi } @Override - public void writeToNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { - super.writeToNBT(tags); + super.func_145839_a(tags); writeCustomNBT(tags); } @@ -162,7 +162,7 @@ public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogi if (liquid != null) { NBTTagCompound nbt = new NBTTagCompound(); - liquid.writeToNBT(nbt); + liquid.func_145839_a(nbt); tags.setTag("Fluid", nbt); } } diff --git a/src/main/java/tconstruct/blocks/logic/FrypanLogic.java b/src/main/java/tconstruct/blocks/logic/FrypanLogic.java index dd3edcd6..86fce7f4 100644 --- a/src/main/java/tconstruct/blocks/logic/FrypanLogic.java +++ b/src/main/java/tconstruct/blocks/logic/FrypanLogic.java @@ -278,9 +278,9 @@ public class FrypanLogic extends EquipLogic implements IActiveLogic fuelGague = tags.getInteger("FuelGague"); } - public void writeToNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { - super.writeToNBT(tags); + super.func_145839_a(tags); tags.setBoolean("Active", active); tags.setInteger("Fuel", fuel); tags.setInteger("FuelGague", fuelGague); diff --git a/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java b/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java index 9f28f034..0458a338 100644 --- a/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java +++ b/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java @@ -264,9 +264,9 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin readNetworkNBT(tags); } - public void writeToNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { - super.writeToNBT(tags); + super.func_145839_a(tags); tags.setBoolean("Active", active); tags.setInteger("Fuel", fuel); tags.setInteger("FuelGague", fuelGague); diff --git a/src/main/java/tconstruct/blocks/logic/LavaTankLogic.java b/src/main/java/tconstruct/blocks/logic/LavaTankLogic.java index 32c4ce8a..9a11e9e0 100644 --- a/src/main/java/tconstruct/blocks/logic/LavaTankLogic.java +++ b/src/main/java/tconstruct/blocks/logic/LavaTankLogic.java @@ -121,9 +121,9 @@ public class LavaTankLogic extends MultiServantLogic implements IFluidHandler } @Override - public void writeToNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { - super.writeToNBT(tags); + super.func_145839_a(tags); writeCustomNBT(tags); } diff --git a/src/main/java/tconstruct/blocks/logic/LiquidTextureLogic.java b/src/main/java/tconstruct/blocks/logic/LiquidTextureLogic.java index ed59c510..58f00478 100644 --- a/src/main/java/tconstruct/blocks/logic/LiquidTextureLogic.java +++ b/src/main/java/tconstruct/blocks/logic/LiquidTextureLogic.java @@ -37,9 +37,9 @@ public class LiquidTextureLogic extends TileEntity texturePos = tags.getInteger("Texture"); } - public void writeToNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { - super.writeToNBT(tags); + super.func_145839_a(tags); writeCustomNBT(tags); } diff --git a/src/main/java/tconstruct/blocks/logic/RedwireLogic.java b/src/main/java/tconstruct/blocks/logic/RedwireLogic.java index 05426689..991a2d25 100644 --- a/src/main/java/tconstruct/blocks/logic/RedwireLogic.java +++ b/src/main/java/tconstruct/blocks/logic/RedwireLogic.java @@ -48,9 +48,9 @@ public class RedwireLogic extends TileEntity } @Override - public void writeToNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { - super.writeToNBT(tags); + super.func_145839_a(tags); writeCustomNBT(tags); } diff --git a/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java b/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java index dda1ea77..fcb41435 100644 --- a/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java +++ b/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java @@ -162,9 +162,9 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl } @Override - public void writeToNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { - super.writeToNBT(tags); + super.func_145839_a(tags); tags.setByte("Direction", direction); } @@ -173,7 +173,7 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl public Packet getDescriptionPacket () { NBTTagCompound tag = new NBTTagCompound(); - writeToNBT(tag); + func_145839_a(tag); return new Packet132TileEntityData(field_145851_c, field_145848_d, field_145849_e, 1, tag); } diff --git a/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java b/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java index af5aae70..e03b2940 100644 --- a/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java @@ -929,7 +929,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci MultiServantLogic servant = (MultiServantLogic) te; if (servant.hasValidMaster()) { - if (servant.verifyMaster(this, this.field_145851_c, this.field_145848_d, this.field_145849_e)) + if (servant.verifyMaster(this, field_145850_b, this.field_145851_c, this.field_145848_d, this.field_145849_e)) tempBricks++; } else if (servant.setMaster(this.field_145851_c, this.field_145848_d, this.field_145849_e)) @@ -1108,9 +1108,9 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci } @Override - public void writeToNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { - super.writeToNBT(tags); + super.func_145839_a(tags); //tags.setBoolean("ValidStructure", validStructure); tags.setInteger("InternalTemp", internalTemp); @@ -1135,7 +1135,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci for (FluidStack liquid : moltenMetal) { NBTTagCompound nbt = new NBTTagCompound(); - liquid.writeToNBT(nbt); + liquid.func_145839_a(nbt); taglist.appendTag(nbt); } @@ -1147,7 +1147,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci public Packet getDescriptionPacket () { NBTTagCompound tag = new NBTTagCompound(); - writeToNBT(tag); + func_145839_a(tag); return new Packet132TileEntityData(field_145851_c, field_145848_d, field_145849_e, 1, tag); } diff --git a/src/main/java/tconstruct/blocks/logic/TankAirLogic.java b/src/main/java/tconstruct/blocks/logic/TankAirLogic.java index a3edbade..e8e23f30 100644 --- a/src/main/java/tconstruct/blocks/logic/TankAirLogic.java +++ b/src/main/java/tconstruct/blocks/logic/TankAirLogic.java @@ -18,6 +18,7 @@ import tconstruct.TConstruct; import tconstruct.blocks.component.TankAirComponent; import mantle.blocks.abstracts.InventoryLogic; import mantle.world.CoordTuple; +import mantle.world.WorldHelper; import mantle.blocks.iface.IMasterLogic; import mantle.blocks.iface.IServantLogic; @@ -107,7 +108,7 @@ public class TankAirLogic extends InventoryLogic implements IServantLogic, ISide @Override public void invalidateMaster (IMasterLogic master, World world, int xMaster, int yMaster, int zMaster) { - world.setBlockToAir(field_145851_c, field_145848_d, field_145849_e); + WorldHelper.setBlockToAir(world, field_145851_c, field_145848_d, field_145849_e); } @Override @@ -137,7 +138,7 @@ public class TankAirLogic extends InventoryLogic implements IServantLogic, ISide //DELETE public void updateEntity () { - field_145850_b.setBlockToAir(field_145851_c, field_145848_d, field_145849_e); + WorldHelper.setBlockToAir(field_145850_b,field_145851_c, field_145848_d, field_145849_e); } //Keep TE regardless of metadata @@ -163,11 +164,11 @@ public class TankAirLogic extends InventoryLogic implements IServantLogic, ISide } @Override - public void writeToNBT (NBTTagCompound tags) + public void func_145839_a (NBTTagCompound tags) { - super.writeToNBT(tags); + super.func_145839_a(tags); writeNetworkNBT(tags); - multitank.writeToNBT(tags); + multitank.func_145839_a(tags); } public void writeNetworkNBT (NBTTagCompound tags) diff --git a/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java b/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java index 04ee322b..78789d7b 100644 --- a/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java +++ b/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java @@ -44,9 +44,9 @@ public class TileEntityLandmine extends TileEntity implements IInventory } @Override - public void writeToNBT (NBTTagCompound par1NBTTagCompound) + public void func_145839_a (NBTTagCompound par1NBTTagCompound) { - super.writeToNBT(par1NBTTagCompound); + super.func_145839_a(par1NBTTagCompound); NBTTagList nbttaglist = new NBTTagList(); for (int i = 0; i < this.inventory.length; ++i) @@ -55,7 +55,7 @@ public class TileEntityLandmine extends TileEntity implements IInventory { NBTTagCompound nbttagcompound1 = new NBTTagCompound(); nbttagcompound1.setByte("Slot", (byte) i); - this.inventory[i].writeToNBT(nbttagcompound1); + this.inventory[i].func_145839_a(nbttagcompound1); nbttaglist.appendTag(nbttagcompound1); } } @@ -100,7 +100,7 @@ public class TileEntityLandmine extends TileEntity implements IInventory public Packet getDescriptionPacket () { NBTTagCompound nbt = new NBTTagCompound(); - writeToNBT(nbt); + func_145839_a(nbt); return new Packet132TileEntityData(field_145851_c, field_145848_d, field_145849_e, 0, nbt); } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeFluid.java b/src/main/java/tconstruct/blocks/slime/SlimeFluid.java index a8d09319..7e750812 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeFluid.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeFluid.java @@ -42,9 +42,9 @@ public class SlimeFluid extends BlockFluidClassic return flowIcon; } - public void updateTick (World world, int x, int y, int z, Random rand) + public void func_149674_a (World world, int x, int y, int z, Random rand) { - super.updateTick(world, x, y, z, rand); + super.func_149674_a(world, x, y, z, rand); if (rand.nextInt(100) == 0 && world.getBlockMetadata(x, y, z) == 0 && world.checkNoEntityCollision(AxisAlignedBB.getBoundingBox(x - 1, y - 1, z - 1, x + 2, y + 2, z + 2))) { BlueSlime entityslime = new BlueSlime(world); diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGel.java b/src/main/java/tconstruct/blocks/slime/SlimeGel.java index e87b9ea3..8af02474 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGel.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGel.java @@ -22,7 +22,7 @@ public class SlimeGel extends TConstructBlock public SlimeGel() { super(Material.sponge, 0.5f, new String[] { "slimeblock_blue", "slimeblock_green", "slimeblock_purple" }); - setCreativeTab(TConstructRegistry.blockTab); + func_149647_a(TConstructRegistry.blockTab); } public boolean getEnableStats () diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java index 3728d9fd..19975567 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java @@ -32,7 +32,7 @@ public class SlimeGrass extends MantleBlock super(Material.field_151577_b); func_149711_c(0.6f); this.setTickRandomly(true); - this.setCreativeTab(TConstructRegistry.blockTab); + this.func_149647_a(TConstructRegistry.blockTab); } @Override diff --git a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java index 7a8c6ab9..6ee23931 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java @@ -33,7 +33,7 @@ public class SlimeSapling extends BlockSapling setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, f * 2.0F, 0.5F + f); this.func_149711_c(0.0F); this.setStepSound(Block.soundGrassFootstep); - this.setCreativeTab(TConstructRegistry.blockTab); + this.func_149647_a(TConstructRegistry.blockTab); } @Override @@ -53,13 +53,13 @@ public class SlimeSapling extends BlockSapling return b == Blocks.grass || b == Blocks.dirt || b == TRepo.slimeGrass || b == TRepo.craftedSoil; } - public void updateTick (World world, int x, int y, int z, Random random) + public void func_149674_a (World world, int x, int y, int z, Random random) { if (world.isRemote) { return; } - super.updateTick(world, x, y, z, random); + super.func_149674_a(world, x, y, z, random); int md = world.getBlockMetadata(x, y, z); if (random.nextInt(10) == 0 && world.getBlockLightValue(x, y + 1, z) >= 9) { diff --git a/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java index 56d57f16..e0ccc211 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java @@ -11,6 +11,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.IShearable; @@ -29,7 +30,7 @@ public class SlimeTallGrass extends BlockFlower implements IShearable super(Material.field_151582_l); float f = 0.4F; this.setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.8F, 0.5F + f); - setCreativeTab(TConstructRegistry.blockTab); + func_149647_a(TConstructRegistry.blockTab); } @SideOnly(Side.CLIENT) @@ -114,14 +115,15 @@ public class SlimeTallGrass extends BlockFlower implements IShearable return ret; } + @Override - public boolean isShearable (ItemStack item, World world, int x, int y, int z) + public boolean isShearable (ItemStack item, IBlockAccess world, int x, int y, int z) { return true; } @Override - public ArrayList onSheared (ItemStack item, World world, int x, int y, int z, int fortune) + public ArrayList onSheared (ItemStack item, IBlockAccess world, int x, int y, int z, int fortune) { ArrayList ret = new ArrayList(); ret.add(new ItemStack(this, 1, world.getBlockMetadata(x, y, z))); diff --git a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java index dfee9b1e..ae09c4c1 100644 --- a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java +++ b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java @@ -124,7 +124,7 @@ public class BarricadeBlock extends MantleBlock @Override @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side) + public boolean func_149646_a (IBlockAccess world, int x, int y, int z, int side) { return true; } diff --git a/src/main/java/tconstruct/blocks/traps/Punji.java b/src/main/java/tconstruct/blocks/traps/Punji.java index 75da813d..3a7982c5 100644 --- a/src/main/java/tconstruct/blocks/traps/Punji.java +++ b/src/main/java/tconstruct/blocks/traps/Punji.java @@ -111,7 +111,7 @@ public class Punji extends MantleBlock @Override @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side) + public boolean func_149646_a (IBlockAccess world, int x, int y, int z, int side) { return true; } diff --git a/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java b/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java index 7e89bfe4..0eba4c68 100644 --- a/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java +++ b/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java @@ -14,7 +14,7 @@ public class BlockSkinRenderHelper public static boolean renderMetadataBlock (Block block, int metadata, int x, int y, int z, RenderBlocks renderer, IBlockAccess world) { //TODO CHECK THESE!!!! - int var5 = block.colorMultiplier(world, x, y, z); + int var5 = block.func_149720_d(world, x, y, z); float var6 = (float) (var5 >> 16 & 255) / 255.0F; float var7 = (float) (var5 >> 8 & 255) / 255.0F; float var8 = (float) (var5 & 255) / 255.0F; @@ -63,7 +63,7 @@ public class BlockSkinRenderHelper float f7; int i1; - if (render.renderAllFaces || block.shouldSideBeRendered(render.field_147845_a, xPos, yPos - 1, zPos, 0)) + if (render.renderAllFaces || block. func_149646_a(render.field_147845_a, xPos, yPos - 1, zPos, 0)) { if (render.renderMinY <= 0.0D) { @@ -74,14 +74,14 @@ public class BlockSkinRenderHelper render.field_147825_U = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); render.field_147828_V = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); render.field_147835_X = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147886_y = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147814_A = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147815_B = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147810_D = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - flag3 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos + 1, yPos - 1, zPos)]; - flag2 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos - 1, yPos - 1, zPos)]; - flag5 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos, yPos - 1, zPos + 1)]; - flag4 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos, yPos - 1, zPos - 1)]; + render.field_147886_y = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); + 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); + 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, yPos - 1, zPos + 1).func_149751_l(); + flag4 = render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos - 1).func_149751_l(); if (!flag4 && !flag2) { @@ -90,7 +90,7 @@ public class BlockSkinRenderHelper } else { - render.field_147888_x = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); + render.field_147888_x = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); render.field_147832_R = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos - 1); } @@ -101,7 +101,7 @@ public class BlockSkinRenderHelper } else { - render.field_147884_z = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); + render.field_147884_z = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); render.field_147826_T = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos + 1); } @@ -112,7 +112,7 @@ public class BlockSkinRenderHelper } else { - render.field_147816_C = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); + render.field_147816_C = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); render.field_147827_W = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos - 1); } @@ -123,7 +123,7 @@ public class BlockSkinRenderHelper } else { - render.field_147811_E = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); + render.field_147811_E = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); render.field_147834_Y = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos + 1); } @@ -139,7 +139,7 @@ public class BlockSkinRenderHelper i1 = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); } - f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); + f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); f3 = (render.field_147884_z + render.field_147886_y + render.field_147815_B + f7) / 4.0F; 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; @@ -178,7 +178,7 @@ public class BlockSkinRenderHelper flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.field_147845_a, xPos, yPos + 1, zPos, 1)) + if (render.renderAllFaces || block. func_149646_a(render.field_147845_a, xPos, yPos + 1, zPos, 1)) { if (render.renderMaxY >= 1.0D) { @@ -189,45 +189,45 @@ public class BlockSkinRenderHelper render.field_147885_ae = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); render.field_147878_ac = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); render.field_147887_af = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147813_G = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147824_K = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147822_I = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147817_L = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - flag3 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos + 1, yPos + 1, zPos)]; - flag2 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos - 1, yPos + 1, zPos)]; - flag5 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos, yPos + 1, zPos + 1)]; - flag4 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos, yPos + 1, zPos - 1)]; + render.field_147813_G = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); + render.field_147824_K = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); + render.field_147822_I = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); + render.field_147817_L = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); + 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, yPos + 1, zPos + 1).func_149751_l(); + flag4 = render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos - 1).func_149751_l(); if (!flag4 && !flag2) { - render.aoLightValueScratchXYZNPN = render.field_147813_G; + render.field_147812_F = render.field_147813_G; render.field_147836_Z = render.field_147880_aa; } else { - render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); + render.field_147812_F = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); render.field_147836_Z = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos - 1); } if (!flag4 && !flag3) { - render.aoLightValueScratchXYZPPN = render.field_147824_K; + render.field_147823_J = render.field_147824_K; render.field_147879_ad = render.field_147885_ae; } else { - render.aoLightValueScratchXYZPPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); + render.field_147823_J = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); render.field_147879_ad = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos - 1); } if (!flag5 && !flag2) { - render.aoLightValueScratchXYZNPP = render.field_147813_G; + render.field_147821_H = render.field_147813_G; render.field_147881_ab = render.field_147880_aa; } else { - render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); + render.field_147821_H = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); render.field_147881_ab = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos + 1); } @@ -238,7 +238,7 @@ public class BlockSkinRenderHelper } else { - render.field_147819_N = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); + render.field_147819_N = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos + 1); } @@ -254,11 +254,11 @@ public class BlockSkinRenderHelper i1 = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); } - f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - f6 = (render.aoLightValueScratchXYZNPP + render.field_147813_G + render.field_147817_L + f7) / 4.0F; + f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); + f6 = (render.field_147821_H + render.field_147813_G + render.field_147817_L + f7) / 4.0F; 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.aoLightValueScratchXYZPPN) / 4.0F; - f5 = (render.field_147813_G + render.aoLightValueScratchXYZNPN + f7 + render.field_147822_I) / 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); @@ -284,25 +284,25 @@ public class BlockSkinRenderHelper IIcon icon; - if (render.renderAllFaces || block.shouldSideBeRendered(render.field_147845_a, xPos, yPos, zPos - 1, 2)) + if (render.renderAllFaces || block. func_149646_a(render.field_147845_a, xPos, yPos, zPos - 1, 2)) { if (render.renderMinZ <= 0.0D) { --zPos; } - render.field_147820_O = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147814_A = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147822_I = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - render.aoLightValueScratchXZPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); + render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); + render.field_147814_A = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147822_I = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); render.field_147883_ah = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); render.field_147825_U = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); render.field_147878_ac = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); render.field_147866_ai = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); - flag3 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos + 1, yPos, zPos - 1)]; - flag2 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos - 1, yPos, zPos - 1)]; - flag5 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos, yPos + 1, zPos - 1)]; - flag4 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos, yPos - 1, zPos - 1)]; + flag3 = render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos - 1).func_149751_l(); + flag2 = render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos - 1).func_149751_l(); + flag5 = render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos - 1).func_149751_l(); + flag4 = render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos - 1).func_149751_l(); if (!flag2 && !flag4) { @@ -311,40 +311,40 @@ public class BlockSkinRenderHelper } else { - render.field_147888_x = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.field_147888_x = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); render.field_147832_R = block.func_149677_c(render.field_147845_a, xPos - 1, yPos - 1, zPos); } if (!flag2 && !flag5) { - render.aoLightValueScratchXYZNPN = render.field_147820_O; + render.field_147812_F = render.field_147820_O; render.field_147836_Z = render.field_147883_ah; } else { - render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos + 1, zPos); + render.field_147812_F = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos + 1, zPos); render.field_147836_Z = block.func_149677_c(render.field_147845_a, xPos - 1, yPos + 1, zPos); } if (!flag3 && !flag4) { - render.field_147816_C = render.aoLightValueScratchXZPN; + render.field_147816_C = render.field_147820_O; render.field_147827_W = render.field_147866_ai; } else { - render.field_147816_C = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.field_147816_C = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); render.field_147827_W = block.func_149677_c(render.field_147845_a, xPos + 1, yPos - 1, zPos); } if (!flag3 && !flag5) { - render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; + render.field_147823_J = render.field_147820_O; render.field_147879_ad = render.field_147866_ai; } else { - render.aoLightValueScratchXYZPPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos + 1, zPos); + render.field_147823_J = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos + 1, zPos); render.field_147879_ad = block.func_149677_c(render.field_147845_a, xPos + 1, yPos + 1, zPos); } @@ -360,10 +360,10 @@ public class BlockSkinRenderHelper i1 = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); } - f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - f3 = (render.field_147820_O + render.aoLightValueScratchXYZNPN + f7 + render.field_147822_I) / 4.0F; - f4 = (f7 + render.field_147822_I + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZPPN) / 4.0F; - f5 = (render.field_147814_A + f7 + render.field_147816_C + render.aoLightValueScratchXZPN) / 4.0F; + f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); + f3 = (render.field_147820_O + render.field_147812_F + f7 + render.field_147822_I) / 4.0F; + 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); @@ -401,25 +401,25 @@ public class BlockSkinRenderHelper flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.field_147845_a, xPos, yPos, zPos + 1, 3)) + if (render.renderAllFaces || block. func_149646_a(render.field_147845_a, xPos, yPos, zPos + 1, 3)) { if (render.renderMaxZ >= 1.0D) { ++zPos; } - render.field_147830_P = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147829_Q = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147815_B = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147817_L = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147830_P = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); + render.field_147829_Q = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); + render.field_147815_B = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147817_L = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); render.field_147868_aj = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); render.field_147862_ak = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); render.field_147828_V = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); render.field_147887_af = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); - flag3 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos + 1, yPos, zPos + 1)]; - flag2 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos - 1, yPos, zPos + 1)]; - flag5 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos, yPos + 1, zPos + 1)]; - flag4 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos, yPos - 1, zPos + 1)]; + flag3 = render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos + 1).func_149751_l(); + flag2 = render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos + 1).func_149751_l(); + flag5 = render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos + 1).func_149751_l(); + flag4 = render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos + 1).func_149751_l(); if (!flag2 && !flag4) { @@ -428,18 +428,18 @@ public class BlockSkinRenderHelper } else { - render.field_147884_z = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.field_147884_z = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); render.field_147826_T = block.func_149677_c(render.field_147845_a, xPos - 1, yPos - 1, zPos); } if (!flag2 && !flag5) { - render.aoLightValueScratchXYZNPP = render.field_147830_P; + render.field_147821_H = render.field_147830_P; render.field_147881_ab = render.field_147868_aj; } else { - render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos + 1, zPos); + render.field_147821_H = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos + 1, zPos); render.field_147881_ab = block.func_149677_c(render.field_147845_a, xPos - 1, yPos + 1, zPos); } @@ -450,7 +450,7 @@ public class BlockSkinRenderHelper } else { - render.field_147811_E = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.field_147811_E = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); render.field_147834_Y = block.func_149677_c(render.field_147845_a, xPos + 1, yPos - 1, zPos); } @@ -461,7 +461,7 @@ public class BlockSkinRenderHelper } else { - render.field_147819_N = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos + 1, zPos); + render.field_147819_N = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos + 1, zPos); render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos + 1, yPos + 1, zPos); } @@ -477,8 +477,8 @@ public class BlockSkinRenderHelper i1 = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); } - f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - f3 = (render.field_147830_P + render.aoLightValueScratchXYZNPP + f7 + render.field_147817_L) / 4.0F; + f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); + f3 = (render.field_147830_P + render.field_147821_H + f7 + render.field_147817_L) / 4.0F; 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; @@ -518,25 +518,25 @@ public class BlockSkinRenderHelper flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.field_147845_a, xPos - 1, yPos, zPos, 4)) + if (render.renderAllFaces || block. func_149646_a(render.field_147845_a, xPos - 1, yPos, zPos, 4)) { if (render.renderMinX <= 0.0D) { --xPos; } - render.field_147886_y = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147820_O = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147830_P = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147813_G = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147886_y = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); + render.field_147830_P = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); + render.field_147813_G = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); render.field_147831_S = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); 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 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos - 1, yPos + 1, zPos)]; - flag2 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos - 1, yPos - 1, zPos)]; - flag5 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos - 1, yPos, zPos - 1)]; - flag4 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos - 1, yPos, zPos + 1)]; + 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(); if (!flag5 && !flag2) { @@ -545,7 +545,7 @@ public class BlockSkinRenderHelper } else { - render.field_147888_x = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.field_147888_x = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); render.field_147832_R = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos - 1); } @@ -556,29 +556,29 @@ public class BlockSkinRenderHelper } else { - render.field_147884_z = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.field_147884_z = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); render.field_147826_T = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos + 1); } if (!flag5 && !flag3) { - render.aoLightValueScratchXYZNPN = render.field_147820_O; + render.field_147812_F = render.field_147820_O; render.field_147836_Z = render.field_147883_ah; } else { - render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos - 1); + render.field_147812_F = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos - 1); render.field_147836_Z = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos - 1); } if (!flag4 && !flag3) { - render.aoLightValueScratchXYZNPP = render.field_147830_P; + render.field_147821_H = render.field_147830_P; render.field_147881_ab = render.field_147868_aj; } else { - render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos + 1); + render.field_147821_H = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos + 1); render.field_147881_ab = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos + 1); } @@ -594,10 +594,10 @@ public class BlockSkinRenderHelper i1 = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); } - f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); + f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); f6 = (render.field_147886_y + render.field_147884_z + f7 + render.field_147830_P) / 4.0F; - f3 = (f7 + render.field_147830_P + render.field_147813_G + render.aoLightValueScratchXYZNPP) / 4.0F; - f4 = (render.field_147820_O + f7 + render.aoLightValueScratchXYZNPN + render.field_147813_G) / 4.0F; + 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); @@ -635,34 +635,34 @@ public class BlockSkinRenderHelper flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.field_147845_a, xPos + 1, yPos, zPos, 5)) + if (render.renderAllFaces || block. func_149646_a(render.field_147845_a, xPos + 1, yPos, zPos, 5)) { if (render.renderMaxX >= 1.0D) { ++xPos; } - render.field_147810_D = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.aoLightValueScratchXZPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147829_Q = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147824_K = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147810_D = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); + render.field_147829_Q = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); + render.field_147824_K = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); render.field_147835_X = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); 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); - flag3 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos + 1, yPos + 1, zPos)]; - flag2 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos + 1, yPos - 1, zPos)]; - flag5 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos + 1, yPos, zPos + 1)]; - flag4 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos + 1, yPos, zPos - 1)]; + 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(); if (!flag2 && !flag4) { - render.field_147816_C = render.aoLightValueScratchXZPN; + render.field_147816_C = render.field_147820_O; render.field_147827_W = render.field_147866_ai; } else { - render.field_147816_C = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.field_147816_C = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); render.field_147827_W = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos - 1); } @@ -673,18 +673,18 @@ public class BlockSkinRenderHelper } else { - render.field_147811_E = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.field_147811_E = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); render.field_147834_Y = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos + 1); } if (!flag3 && !flag4) { - render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; + render.field_147823_J = render.field_147820_O; render.field_147879_ad = render.field_147866_ai; } else { - render.aoLightValueScratchXYZPPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos - 1); + render.field_147823_J = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos - 1); render.field_147879_ad = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos - 1); } @@ -695,7 +695,7 @@ public class BlockSkinRenderHelper } else { - render.field_147819_N = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos + 1); + render.field_147819_N = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos + 1); render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos + 1); } @@ -711,10 +711,10 @@ public class BlockSkinRenderHelper i1 = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); } - f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); + f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); f3 = (render.field_147810_D + render.field_147811_E + f7 + render.field_147829_Q) / 4.0F; - f4 = (render.field_147816_C + render.field_147810_D + render.aoLightValueScratchXZPN + f7) / 4.0F; - f5 = (render.aoLightValueScratchXZPN + f7 + render.aoLightValueScratchXYZPPN + render.field_147824_K) / 4.0F; + 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); @@ -794,7 +794,7 @@ public class BlockSkinRenderHelper int l = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos); - if (render.renderAllFaces || block.shouldSideBeRendered(render.field_147845_a, xPos, yPos - 1, zPos, 0)) + if (render.renderAllFaces || 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.shouldSideBeRendered(render.field_147845_a, xPos, yPos + 1, zPos, 1)) + if (render.renderAllFaces || 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); @@ -812,7 +812,7 @@ public class BlockSkinRenderHelper Icon icon; - if (render.renderAllFaces || block.shouldSideBeRendered(render.field_147845_a, xPos, yPos, zPos - 1, 2)) + if (render.renderAllFaces || 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.shouldSideBeRendered(render.field_147845_a, xPos, yPos, zPos + 1, 3)) + if (render.renderAllFaces || 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.shouldSideBeRendered(render.field_147845_a, xPos - 1, yPos, zPos, 4)) + if (render.renderAllFaces || 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.shouldSideBeRendered(render.field_147845_a, xPos + 1, yPos, zPos, 5)) + if (render.renderAllFaces || 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); @@ -854,7 +854,7 @@ public class BlockSkinRenderHelper public static boolean renderLiquidBlock (IIcon stillIcon, IIcon flowingIcon, 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 = (float) (var5 >> 16 & 255) / 255.0F; float var7 = (float) (var5 >> 8 & 255) / 255.0F; float var8 = (float) (var5 & 255) / 255.0F; @@ -904,7 +904,7 @@ public class BlockSkinRenderHelper float f7; int i1; - if (render.renderAllFaces || block.shouldSideBeRendered(render.field_147845_a, xPos, yPos - 1, zPos, 0)) + if (render.renderAllFaces || block. func_149646_a(render.field_147845_a, xPos, yPos - 1, zPos, 0)) { if (render.renderMinY <= 0.0D) { @@ -915,14 +915,14 @@ public class BlockSkinRenderHelper render.field_147825_U = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); render.field_147828_V = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); render.field_147835_X = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147886_y = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147814_A = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147815_B = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147810_D = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - flag3 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos + 1, yPos - 1, zPos)]; - flag2 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos - 1, yPos - 1, zPos)]; - flag5 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos, yPos - 1, zPos + 1)]; - flag4 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos, yPos - 1, zPos - 1)]; + render.field_147886_y = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); + 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); + 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, yPos - 1, zPos + 1).func_149751_l(); + flag4 = render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos - 1).func_149751_l(); if (!flag4 && !flag2) { @@ -931,7 +931,7 @@ public class BlockSkinRenderHelper } else { - render.field_147888_x = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); + render.field_147888_x = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); render.field_147832_R = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos - 1); } @@ -942,7 +942,7 @@ public class BlockSkinRenderHelper } else { - render.field_147884_z = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); + render.field_147884_z = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); render.field_147826_T = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos + 1); } @@ -953,7 +953,7 @@ public class BlockSkinRenderHelper } else { - render.field_147816_C = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); + render.field_147816_C = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); render.field_147827_W = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos - 1); } @@ -964,7 +964,7 @@ public class BlockSkinRenderHelper } else { - render.field_147811_E = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); + render.field_147811_E = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); render.field_147834_Y = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos + 1); } @@ -980,7 +980,7 @@ public class BlockSkinRenderHelper i1 = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); } - f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); + f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); f3 = (render.field_147884_z + render.field_147886_y + render.field_147815_B + f7) / 4.0F; 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; @@ -1019,7 +1019,7 @@ public class BlockSkinRenderHelper flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.field_147845_a, xPos, yPos + 1, zPos, 1)) + if (render.renderAllFaces || block. func_149646_a(render.field_147845_a, xPos, yPos + 1, zPos, 1)) { if (render.renderMaxY >= 1.0D) { @@ -1030,45 +1030,45 @@ public class BlockSkinRenderHelper render.field_147885_ae = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); render.field_147878_ac = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); render.field_147887_af = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147813_G = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147824_K = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147822_I = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147817_L = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - flag3 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos + 1, yPos + 1, zPos)]; - flag2 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos - 1, yPos + 1, zPos)]; - flag5 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos, yPos + 1, zPos + 1)]; - flag4 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos, yPos + 1, zPos - 1)]; + render.field_147813_G = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); + render.field_147824_K = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); + render.field_147822_I = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); + render.field_147817_L = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); + 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, yPos + 1, zPos + 1).func_149751_l(); + flag4 = render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos - 1).func_149751_l(); if (!flag4 && !flag2) { - render.aoLightValueScratchXYZNPN = render.field_147813_G; + render.field_147812_F = render.field_147813_G; render.field_147836_Z = render.field_147880_aa; } else { - render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); + render.field_147812_F = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); render.field_147836_Z = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos - 1); } if (!flag4 && !flag3) { - render.aoLightValueScratchXYZPPN = render.field_147824_K; + render.field_147823_J = render.field_147824_K; render.field_147879_ad = render.field_147885_ae; } else { - render.aoLightValueScratchXYZPPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); + render.field_147823_J = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); render.field_147879_ad = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos - 1); } if (!flag5 && !flag2) { - render.aoLightValueScratchXYZNPP = render.field_147813_G; + render.field_147821_H = render.field_147813_G; render.field_147881_ab = render.field_147880_aa; } else { - render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); + render.field_147821_H = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); render.field_147881_ab = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos + 1); } @@ -1079,7 +1079,7 @@ public class BlockSkinRenderHelper } else { - render.field_147819_N = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); + render.field_147819_N = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos + 1); } @@ -1095,11 +1095,11 @@ public class BlockSkinRenderHelper i1 = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); } - f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - f6 = (render.aoLightValueScratchXYZNPP + render.field_147813_G + render.field_147817_L + f7) / 4.0F; + f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); + f6 = (render.field_147821_H + render.field_147813_G + render.field_147817_L + f7) / 4.0F; 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.aoLightValueScratchXYZPPN) / 4.0F; - f5 = (render.field_147813_G + render.aoLightValueScratchXYZNPN + f7 + render.field_147822_I) / 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); @@ -1123,25 +1123,25 @@ public class BlockSkinRenderHelper flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.field_147845_a, xPos, yPos, zPos - 1, 2)) + if (render.renderAllFaces || block. func_149646_a(render.field_147845_a, xPos, yPos, zPos - 1, 2)) { if (render.renderMinZ <= 0.0D) { --zPos; } - render.field_147820_O = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147814_A = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147822_I = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - render.aoLightValueScratchXZPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); + render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); + render.field_147814_A = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147822_I = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); render.field_147883_ah = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); render.field_147825_U = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); render.field_147878_ac = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); render.field_147866_ai = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); - flag3 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos + 1, yPos, zPos - 1)]; - flag2 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos - 1, yPos, zPos - 1)]; - flag5 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos, yPos + 1, zPos - 1)]; - flag4 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos, yPos - 1, zPos - 1)]; + flag3 = render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos - 1).func_149751_l(); + flag2 = render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos - 1).func_149751_l(); + flag5 = render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos - 1).func_149751_l(); + flag4 = render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos - 1).func_149751_l(); if (!flag2 && !flag4) { @@ -1150,40 +1150,40 @@ public class BlockSkinRenderHelper } else { - render.field_147888_x = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.field_147888_x = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); render.field_147832_R = block.func_149677_c(render.field_147845_a, xPos - 1, yPos - 1, zPos); } if (!flag2 && !flag5) { - render.aoLightValueScratchXYZNPN = render.field_147820_O; + render.field_147812_F = render.field_147820_O; render.field_147836_Z = render.field_147883_ah; } else { - render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos + 1, zPos); + render.field_147812_F = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos + 1, zPos); render.field_147836_Z = block.func_149677_c(render.field_147845_a, xPos - 1, yPos + 1, zPos); } if (!flag3 && !flag4) { - render.field_147816_C = render.aoLightValueScratchXZPN; + render.field_147816_C = render.field_147820_O; render.field_147827_W = render.field_147866_ai; } else { - render.field_147816_C = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.field_147816_C = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); render.field_147827_W = block.func_149677_c(render.field_147845_a, xPos + 1, yPos - 1, zPos); } if (!flag3 && !flag5) { - render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; + render.field_147823_J = render.field_147820_O; render.field_147879_ad = render.field_147866_ai; } else { - render.aoLightValueScratchXYZPPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos + 1, zPos); + render.field_147823_J = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos + 1, zPos); render.field_147879_ad = block.func_149677_c(render.field_147845_a, xPos + 1, yPos + 1, zPos); } @@ -1199,10 +1199,10 @@ public class BlockSkinRenderHelper i1 = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); } - f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - f3 = (render.field_147820_O + render.aoLightValueScratchXYZNPN + f7 + render.field_147822_I) / 4.0F; - f4 = (f7 + render.field_147822_I + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZPPN) / 4.0F; - f5 = (render.field_147814_A + f7 + render.field_147816_C + render.aoLightValueScratchXZPN) / 4.0F; + f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); + f3 = (render.field_147820_O + render.field_147812_F + f7 + render.field_147822_I) / 4.0F; + 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); @@ -1239,25 +1239,25 @@ public class BlockSkinRenderHelper flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.field_147845_a, xPos, yPos, zPos + 1, 3)) + if (render.renderAllFaces || block. func_149646_a(render.field_147845_a, xPos, yPos, zPos + 1, 3)) { if (render.renderMaxZ >= 1.0D) { ++zPos; } - render.field_147830_P = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147829_Q = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147815_B = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147817_L = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147830_P = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); + render.field_147829_Q = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); + render.field_147815_B = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147817_L = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); render.field_147868_aj = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); render.field_147862_ak = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); render.field_147828_V = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); render.field_147887_af = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); - flag3 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos + 1, yPos, zPos + 1)]; - flag2 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos - 1, yPos, zPos + 1)]; - flag5 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos, yPos + 1, zPos + 1)]; - flag4 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos, yPos - 1, zPos + 1)]; + flag3 = render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos + 1).func_149751_l(); + flag2 = render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos + 1).func_149751_l(); + flag5 = render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos + 1).func_149751_l(); + flag4 = render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos + 1).func_149751_l(); if (!flag2 && !flag4) { @@ -1266,18 +1266,18 @@ public class BlockSkinRenderHelper } else { - render.field_147884_z = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.field_147884_z = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); render.field_147826_T = block.func_149677_c(render.field_147845_a, xPos - 1, yPos - 1, zPos); } if (!flag2 && !flag5) { - render.aoLightValueScratchXYZNPP = render.field_147830_P; + render.field_147821_H = render.field_147830_P; render.field_147881_ab = render.field_147868_aj; } else { - render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos + 1, zPos); + render.field_147821_H = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos + 1, zPos); render.field_147881_ab = block.func_149677_c(render.field_147845_a, xPos - 1, yPos + 1, zPos); } @@ -1288,7 +1288,7 @@ public class BlockSkinRenderHelper } else { - render.field_147811_E = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.field_147811_E = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); render.field_147834_Y = block.func_149677_c(render.field_147845_a, xPos + 1, yPos - 1, zPos); } @@ -1299,7 +1299,7 @@ public class BlockSkinRenderHelper } else { - render.field_147819_N = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos + 1, zPos); + render.field_147819_N = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos + 1, zPos); render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos + 1, yPos + 1, zPos); } @@ -1315,8 +1315,8 @@ public class BlockSkinRenderHelper i1 = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); } - f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - f3 = (render.field_147830_P + render.aoLightValueScratchXYZNPP + f7 + render.field_147817_L) / 4.0F; + f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); + f3 = (render.field_147830_P + render.field_147821_H + f7 + render.field_147817_L) / 4.0F; 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; @@ -1355,25 +1355,25 @@ public class BlockSkinRenderHelper flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.field_147845_a, xPos - 1, yPos, zPos, 4)) + if (render.renderAllFaces || block. func_149646_a(render.field_147845_a, xPos - 1, yPos, zPos, 4)) { if (render.renderMinX <= 0.0D) { --xPos; } - render.field_147886_y = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147820_O = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147830_P = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147813_G = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147886_y = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); + render.field_147830_P = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); + render.field_147813_G = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); render.field_147831_S = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); 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 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos - 1, yPos + 1, zPos)]; - flag2 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos - 1, yPos - 1, zPos)]; - flag5 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos - 1, yPos, zPos - 1)]; - flag4 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos - 1, yPos, zPos + 1)]; + flag3 = render.field_147845_a.getBlock(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(); if (!flag5 && !flag2) { @@ -1382,7 +1382,7 @@ public class BlockSkinRenderHelper } else { - render.field_147888_x = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.field_147888_x = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); render.field_147832_R = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos - 1); } @@ -1393,29 +1393,29 @@ public class BlockSkinRenderHelper } else { - render.field_147884_z = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.field_147884_z = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); render.field_147826_T = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos + 1); } if (!flag5 && !flag3) { - render.aoLightValueScratchXYZNPN = render.field_147820_O; + render.field_147812_F = render.field_147820_O; render.field_147836_Z = render.field_147883_ah; } else { - render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos - 1); + render.field_147812_F = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos - 1); render.field_147836_Z = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos - 1); } if (!flag4 && !flag3) { - render.aoLightValueScratchXYZNPP = render.field_147830_P; + render.field_147821_H = render.field_147830_P; render.field_147881_ab = render.field_147868_aj; } else { - render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos + 1); + render.field_147821_H = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos + 1); render.field_147881_ab = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos + 1); } @@ -1431,10 +1431,10 @@ public class BlockSkinRenderHelper i1 = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); } - f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); + f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); f6 = (render.field_147886_y + render.field_147884_z + f7 + render.field_147830_P) / 4.0F; - f3 = (f7 + render.field_147830_P + render.field_147813_G + render.aoLightValueScratchXYZNPP) / 4.0F; - f4 = (render.field_147820_O + f7 + render.aoLightValueScratchXYZNPN + render.field_147813_G) / 4.0F; + 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); @@ -1471,34 +1471,34 @@ public class BlockSkinRenderHelper flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.field_147845_a, xPos + 1, yPos, zPos, 5)) + if (render.renderAllFaces || block. func_149646_a(render.field_147845_a, xPos + 1, yPos, zPos, 5)) { if (render.renderMaxX >= 1.0D) { ++xPos; } - render.field_147810_D = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.aoLightValueScratchXZPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147829_Q = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147824_K = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147810_D = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); + render.field_147829_Q = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); + render.field_147824_K = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); render.field_147835_X = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); 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); - flag3 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos + 1, yPos + 1, zPos)]; - flag2 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos + 1, yPos - 1, zPos)]; - flag5 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos + 1, yPos, zPos + 1)]; - flag4 = Block.canBlockGrass[render.field_147845_a.getBlock(xPos + 1, yPos, zPos - 1)]; + 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(); if (!flag2 && !flag4) { - render.field_147816_C = render.aoLightValueScratchXZPN; + render.field_147816_C = render.field_147820_O; render.field_147827_W = render.field_147866_ai; } else { - render.field_147816_C = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.field_147816_C = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); render.field_147827_W = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos - 1); } @@ -1509,18 +1509,18 @@ public class BlockSkinRenderHelper } else { - render.field_147811_E = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.field_147811_E = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); render.field_147834_Y = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos + 1); } if (!flag3 && !flag4) { - render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; + render.field_147823_J = render.field_147820_O; render.field_147879_ad = render.field_147866_ai; } else { - render.aoLightValueScratchXYZPPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos - 1); + render.field_147823_J = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos - 1); render.field_147879_ad = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos - 1); } @@ -1531,7 +1531,7 @@ public class BlockSkinRenderHelper } else { - render.field_147819_N = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos + 1); + render.field_147819_N = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos + 1); render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos + 1); } @@ -1547,10 +1547,10 @@ public class BlockSkinRenderHelper i1 = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); } - f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); + f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); f3 = (render.field_147810_D + render.field_147811_E + f7 + render.field_147829_Q) / 4.0F; - f4 = (render.field_147816_C + render.field_147810_D + render.aoLightValueScratchXZPN + f7) / 4.0F; - f5 = (render.aoLightValueScratchXZPN + f7 + render.aoLightValueScratchXYZPPN + render.field_147824_K) / 4.0F; + 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); @@ -1630,7 +1630,7 @@ public class BlockSkinRenderHelper int l = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos); - if (render.renderAllFaces || block.shouldSideBeRendered(render.field_147845_a, xPos, yPos - 1, zPos, 0)) + if (render.renderAllFaces || 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.shouldSideBeRendered(render.field_147845_a, xPos, yPos + 1, zPos, 1)) + if (render.renderAllFaces || 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.shouldSideBeRendered(render.field_147845_a, xPos, yPos, zPos - 1, 2)) + if (render.renderAllFaces || 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.shouldSideBeRendered(render.field_147845_a, xPos, yPos, zPos + 1, 3)) + if (render.renderAllFaces || 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.shouldSideBeRendered(render.field_147845_a, xPos - 1, yPos, zPos, 4)) + if (render.renderAllFaces || 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.shouldSideBeRendered(render.field_147845_a, xPos + 1, yPos, zPos, 5)) + if (render.renderAllFaces || 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); @@ -1686,4 +1686,7 @@ public class BlockSkinRenderHelper return flag; } + public static float getAmbientOcclusionLightValue(IBlockAccess access, int x, int y, int z){ + return access.func_147439_a(x, y, z).func_149685_I(); + } } diff --git a/src/main/java/tconstruct/client/block/PaneRender.java b/src/main/java/tconstruct/client/block/PaneRender.java index e24ffeff..075945e5 100644 --- a/src/main/java/tconstruct/client/block/PaneRender.java +++ b/src/main/java/tconstruct/client/block/PaneRender.java @@ -2,6 +2,7 @@ package tconstruct.client.block; import tconstruct.blocks.PaneBase; import tconstruct.client.TProxyClient; +import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.RenderBlocks; @@ -130,8 +131,8 @@ public class PaneRender implements ISimpleBlockRenderingHandler boolean east = pane.canConnectTo(iblockaccess.func_147439_a(x, y, z + 1)); boolean south = pane.canConnectTo(iblockaccess.func_147439_a(x - 1, y, z)); boolean north = pane.canConnectTo(iblockaccess.func_147439_a(x + 1, y, z)); - boolean renderAbove = pane.shouldSideBeRendered(iblockaccess, x, y + 1, z, 1); - boolean renderBelow = pane.shouldSideBeRendered(iblockaccess, x, y - 1, z, 0); + boolean renderAbove = pane.func_149646_a(iblockaccess, x, y + 1, z, 1); + boolean renderBelow = pane.func_149646_a(iblockaccess, x, y - 1, z, 0); if ((!south || !north) && (south || north || west || east)) { if (south && !north) @@ -151,14 +152,14 @@ public class PaneRender implements ISimpleBlockRenderingHandler tessellator.addVertexWithUV(xMid, y + 0, zMidDown, d6, d9); tessellator.addVertexWithUV(xMid, y + 1, zMidDown, d6, d7); } - if (renderAbove || y < l - 1 && iblockaccess.isAirBlock(x - 1, y + 1, z)) + if (renderAbove || y < l - 1 && WorldHelper.isAirBlock(iblockaccess, x - 1, y + 1, z)) { tessellator.addVertexWithUV(xBot, (double) (y + 1) + 0.01D, zMidUp, d6, d8); tessellator.addVertexWithUV(xMid, (double) (y + 1) + 0.01D, zMidUp, d6, d9); tessellator.addVertexWithUV(xMid, (double) (y + 1) + 0.01D, zMidDown, d5, d9); tessellator.addVertexWithUV(xBot, (double) (y + 1) + 0.01D, zMidDown, d5, d8); } - if (renderBelow || y > 1 && iblockaccess.isAirBlock(x - 1, y - 1, z)) + if (renderBelow || y > 1 && WorldHelper.isAirBlock(iblockaccess, x - 1, y - 1, z)) { tessellator.addVertexWithUV(xBot, (double) y - 0.01D, zMidUp, d6, d8); tessellator.addVertexWithUV(xMid, (double) y - 0.01D, zMidUp, d6, d9); diff --git a/src/main/java/tconstruct/client/block/RenderLiquid.java b/src/main/java/tconstruct/client/block/RenderLiquid.java index c62e1bb2..12d88a1b 100644 --- a/src/main/java/tconstruct/client/block/RenderLiquid.java +++ b/src/main/java/tconstruct/client/block/RenderLiquid.java @@ -59,7 +59,7 @@ public class RenderLiquid flag1 = false; } - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.field_147845_a, xPos, yPos - 1, zPos, 0))) + if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos, yPos - 1, zPos, 0))) { if (render.renderMinY <= 0.0D) { @@ -70,14 +70,14 @@ public class RenderLiquid render.field_147825_U = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); render.field_147828_V = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); render.field_147835_X = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147886_y = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147814_A = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147815_B = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147810_D = block.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)]; + render.field_147886_y = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); + 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 = 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)) { @@ -86,7 +86,7 @@ public class RenderLiquid } else { - render.field_147888_x = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); + render.field_147888_x = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); render.field_147832_R = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos - 1); } @@ -97,7 +97,7 @@ public class RenderLiquid } else { - render.field_147884_z = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); + render.field_147884_z = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); render.field_147826_T = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos + 1); } @@ -108,7 +108,7 @@ public class RenderLiquid } else { - render.field_147816_C = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); + render.field_147816_C = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); render.field_147827_W = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos - 1); } @@ -119,7 +119,7 @@ public class RenderLiquid } else { - render.field_147811_E = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); + render.field_147811_E = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); render.field_147834_Y = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos + 1); } @@ -135,7 +135,7 @@ public class RenderLiquid i1 = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); } - float f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); + float f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); f3 = (render.field_147884_z + render.field_147886_y + render.field_147815_B + f7) / 4.0F; 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; @@ -174,7 +174,7 @@ public class RenderLiquid flag = true; } - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.field_147845_a, xPos, yPos + 1, zPos, 1))) + if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos, yPos + 1, zPos, 1))) { if (render.renderMaxY >= 1.0D) { @@ -185,23 +185,23 @@ public class RenderLiquid render.field_147885_ae = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); render.field_147878_ac = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); render.field_147887_af = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147813_G = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147824_K = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147822_I = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147817_L = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - 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)]; + render.field_147813_G = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); + render.field_147824_K = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); + render.field_147822_I = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); + render.field_147817_L = getAmbientOcclusionLightValue(render.field_147845_a, xPos, 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, 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)) { - render.aoLightValueScratchXYZNPN = render.field_147813_G; + render.field_147812_F = render.field_147813_G; render.field_147836_Z = render.field_147880_aa; } else { - render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); + render.field_147812_F = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); render.field_147836_Z = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos - 1); } @@ -212,18 +212,18 @@ public class RenderLiquid } else { - render.field_147824_K = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); + render.field_147824_K = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); render.field_147879_ad = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos - 1); } if ((!flag5) && (!flag2)) { - render.aoLightValueScratchXYZNPP = render.field_147813_G; + render.field_147821_H = render.field_147813_G; render.field_147881_ab = render.field_147880_aa; } else { - render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); + render.field_147821_H = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); render.field_147881_ab = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos + 1); } @@ -234,7 +234,7 @@ public class RenderLiquid } else { - render.field_147819_N = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); + render.field_147819_N = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos + 1); } @@ -250,11 +250,11 @@ public class RenderLiquid i1 = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); } - float f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - f6 = (render.aoLightValueScratchXYZNPP + render.field_147813_G + render.field_147817_L + f7) / 4.0F; + float f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); + f6 = (render.field_147821_H + render.field_147813_G + render.field_147817_L + f7) / 4.0F; 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.aoLightValueScratchXYZNPN + f7 + render.field_147822_I) / 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); @@ -278,25 +278,25 @@ public class RenderLiquid flag = true; } - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.field_147845_a, xPos, yPos, zPos - 1, 2))) + if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos, yPos, zPos - 1, 2))) { if (render.renderMinZ <= 0.0D) { zPos--; } - render.field_147820_O = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147814_A = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147822_I = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - render.aoLightValueScratchXZPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); + render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); + render.field_147814_A = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147822_I = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); render.field_147883_ah = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); render.field_147825_U = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); render.field_147878_ac = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); render.field_147866_ai = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); - boolean flag3 = Block.canBlockGrass[render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos - 1)]; - boolean flag2 = Block.canBlockGrass[render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos - 1)]; - 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, zPos - 1).func_149751_l(); + boolean flag2 = render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos - 1).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 ((!flag2) && (!flag4)) { @@ -305,40 +305,40 @@ public class RenderLiquid } else { - render.field_147888_x = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.field_147888_x = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); render.field_147832_R = block.func_149677_c(render.field_147845_a, xPos - 1, yPos - 1, zPos); } if ((!flag2) && (!flag5)) { - render.aoLightValueScratchXYZNPN = render.field_147820_O; + render.field_147812_F = render.field_147820_O; render.field_147836_Z = render.field_147883_ah; } else { - render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos + 1, zPos); + render.field_147812_F = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos + 1, zPos); render.field_147836_Z = block.func_149677_c(render.field_147845_a, xPos - 1, yPos + 1, zPos); } if ((!flag3) && (!flag4)) { - render.field_147816_C = render.aoLightValueScratchXZPN; + render.field_147816_C = render.field_147820_O; render.field_147827_W = render.field_147866_ai; } else { - render.field_147816_C = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.field_147816_C = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); render.field_147827_W = block.func_149677_c(render.field_147845_a, xPos + 1, yPos - 1, zPos); } if ((!flag3) && (!flag5)) { - render.field_147824_K = render.aoLightValueScratchXZPN; + render.field_147824_K = render.field_147820_O; render.field_147879_ad = render.field_147866_ai; } else { - render.field_147824_K = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos + 1, zPos); + render.field_147824_K = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos + 1, zPos); render.field_147879_ad = block.func_149677_c(render.field_147845_a, xPos + 1, yPos + 1, zPos); } @@ -354,10 +354,10 @@ public class RenderLiquid i1 = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); } - float f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - f3 = (render.field_147820_O + render.aoLightValueScratchXYZNPN + f7 + render.field_147822_I) / 4.0F; - f4 = (f7 + render.field_147822_I + render.aoLightValueScratchXZPN + render.field_147824_K) / 4.0F; - f5 = (render.field_147814_A + f7 + render.field_147816_C + render.aoLightValueScratchXZPN) / 4.0F; + float f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); + f3 = (render.field_147820_O + render.field_147812_F + f7 + render.field_147822_I) / 4.0F; + 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); @@ -395,25 +395,25 @@ public class RenderLiquid flag = true; } - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.field_147845_a, xPos, yPos, zPos + 1, 3))) + if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos, yPos, zPos + 1, 3))) { if (render.renderMaxZ >= 1.0D) { zPos++; } - render.field_147830_P = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147829_Q = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147815_B = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147817_L = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147830_P = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); + render.field_147829_Q = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); + render.field_147815_B = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147817_L = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); render.field_147868_aj = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); render.field_147862_ak = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); render.field_147828_V = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); render.field_147887_af = 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, zPos + 1)]; - boolean flag2 = Block.canBlockGrass[render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos + 1)]; - 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, zPos + 1).func_149751_l(); + boolean flag2 = render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos + 1).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 ((!flag2) && (!flag4)) { @@ -422,18 +422,18 @@ public class RenderLiquid } else { - render.field_147884_z = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.field_147884_z = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); render.field_147826_T = block.func_149677_c(render.field_147845_a, xPos - 1, yPos - 1, zPos); } if ((!flag2) && (!flag5)) { - render.aoLightValueScratchXYZNPP = render.field_147830_P; + render.field_147821_H = render.field_147830_P; render.field_147881_ab = render.field_147868_aj; } else { - render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos + 1, zPos); + render.field_147821_H = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos + 1, zPos); render.field_147881_ab = block.func_149677_c(render.field_147845_a, xPos - 1, yPos + 1, zPos); } @@ -444,7 +444,7 @@ public class RenderLiquid } else { - render.field_147811_E = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.field_147811_E = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); render.field_147834_Y = block.func_149677_c(render.field_147845_a, xPos + 1, yPos - 1, zPos); } @@ -455,7 +455,7 @@ public class RenderLiquid } else { - render.field_147819_N = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos + 1, zPos); + render.field_147819_N = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos + 1, zPos); render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos + 1, yPos + 1, zPos); } @@ -471,8 +471,8 @@ public class RenderLiquid i1 = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); } - float f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - f3 = (render.field_147830_P + render.aoLightValueScratchXYZNPP + f7 + render.field_147817_L) / 4.0F; + float f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); + f3 = (render.field_147830_P + render.field_147821_H + f7 + render.field_147817_L) / 4.0F; 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; @@ -512,17 +512,17 @@ public class RenderLiquid flag = true; } - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.field_147845_a, xPos - 1, yPos, zPos, 4))) + if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos - 1, yPos, zPos, 4))) { if (render.renderMinX <= 0.0D) { xPos--; } - render.field_147886_y = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147820_O = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147830_P = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147813_G = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147886_y = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); + render.field_147830_P = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); + render.field_147813_G = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); render.field_147831_S = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); 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); @@ -539,7 +539,7 @@ public class RenderLiquid } else { - render.field_147888_x = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.field_147888_x = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); render.field_147832_R = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos - 1); } @@ -550,29 +550,29 @@ public class RenderLiquid } else { - render.field_147884_z = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.field_147884_z = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); render.field_147826_T = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos + 1); } if ((!flag5) && (!flag3)) { - render.aoLightValueScratchXYZNPN = render.field_147820_O; + render.field_147812_F = render.field_147820_O; render.field_147836_Z = render.field_147883_ah; } else { - render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos - 1); + render.field_147812_F = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos - 1); render.field_147836_Z = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos - 1); } if ((!flag4) && (!flag3)) { - render.aoLightValueScratchXYZNPP = render.field_147830_P; + render.field_147821_H = render.field_147830_P; render.field_147881_ab = render.field_147868_aj; } else { - render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos + 1); + render.field_147821_H = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos + 1); render.field_147881_ab = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos + 1); } @@ -588,10 +588,10 @@ public class RenderLiquid i1 = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); } - float f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); + float f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); f6 = (render.field_147886_y + render.field_147884_z + f7 + render.field_147830_P) / 4.0F; - f3 = (f7 + render.field_147830_P + render.field_147813_G + render.aoLightValueScratchXYZNPP) / 4.0F; - f4 = (render.field_147820_O + f7 + render.aoLightValueScratchXYZNPN + render.field_147813_G) / 4.0F; + 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); @@ -629,17 +629,17 @@ public class RenderLiquid flag = true; } - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.field_147845_a, xPos + 1, yPos, zPos, 5))) + if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos + 1, yPos, zPos, 5))) { if (render.renderMaxX >= 1.0D) { xPos++; } - render.field_147810_D = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.aoLightValueScratchXZPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147829_Q = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147824_K = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147810_D = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); + render.field_147829_Q = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); + render.field_147824_K = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); render.field_147835_X = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); 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); @@ -651,12 +651,12 @@ public class RenderLiquid if ((!flag2) && (!flag4)) { - render.field_147816_C = render.aoLightValueScratchXZPN; + render.field_147816_C = render.field_147820_O; render.field_147827_W = render.field_147866_ai; } else { - render.field_147816_C = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.field_147816_C = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); render.field_147827_W = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos - 1); } @@ -667,18 +667,18 @@ public class RenderLiquid } else { - render.field_147811_E = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.field_147811_E = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); render.field_147834_Y = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos + 1); } if ((!flag3) && (!flag4)) { - render.field_147824_K = render.aoLightValueScratchXZPN; + render.field_147824_K = render.field_147820_O; render.field_147879_ad = render.field_147866_ai; } else { - render.field_147824_K = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos - 1); + render.field_147824_K = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos - 1); render.field_147879_ad = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos - 1); } @@ -689,7 +689,7 @@ public class RenderLiquid } else { - render.field_147819_N = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos + 1); + render.field_147819_N = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos + 1); render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos + 1); } @@ -705,10 +705,10 @@ public class RenderLiquid i1 = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); } - float f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); + float f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); f3 = (render.field_147810_D + render.field_147811_E + f7 + render.field_147829_Q) / 4.0F; - f4 = (render.field_147816_C + render.field_147810_D + render.aoLightValueScratchXZPN + f7) / 4.0F; - f5 = (render.aoLightValueScratchXZPN + f7 + render.field_147824_K + render.field_147824_K) / 4.0F; + 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); @@ -740,7 +740,7 @@ public class RenderLiquid render.field_147848_as *= f6; render.field_147856_aw *= f6; render.field_147833_aA *= f6; - Icon icon = block.getIcon(5, metadata); + IIcon icon = block.getIcon(5, metadata); render.renderFaceXPos(block, xPos, yPos, zPos, icon); flag = true; @@ -750,6 +750,11 @@ public class RenderLiquid return flag; } + private static float getAmbientOcclusionLightValue (IBlockAccess access, int x, int y, int z) + { + return access.func_147439_a(x, y, z).func_149685_I(); + } + static boolean renderMetadataBlockWithColorMultiplier (Block block, int metadata, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) { @@ -788,7 +793,7 @@ public class RenderLiquid int l = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos); - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.field_147845_a, xPos, yPos - 1, zPos, 0))) + if ((render.renderAllFaces) || (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); @@ -796,7 +801,7 @@ public class RenderLiquid flag = true; } - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.field_147845_a, xPos, yPos + 1, zPos, 1))) + if ((render.renderAllFaces) || (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); @@ -804,7 +809,7 @@ public class RenderLiquid flag = true; } - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.field_147845_a, xPos, yPos, zPos - 1, 2))) + if ((render.renderAllFaces) || (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); @@ -813,7 +818,7 @@ public class RenderLiquid flag = true; } - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.field_147845_a, xPos, yPos, zPos + 1, 3))) + if ((render.renderAllFaces) || (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); @@ -822,7 +827,7 @@ public class RenderLiquid flag = true; } - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.field_147845_a, xPos - 1, yPos, zPos, 4))) + if ((render.renderAllFaces) || (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); @@ -831,7 +836,7 @@ public class RenderLiquid flag = true; } - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.field_147845_a, xPos + 1, yPos, zPos, 5))) + if ((render.renderAllFaces) || (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); @@ -888,7 +893,7 @@ public class RenderLiquid flag1 = false; } - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.field_147845_a, xPos, yPos - 1, zPos, 0))) + if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos, yPos - 1, zPos, 0))) { if (render.renderMinY <= 0.0D) { @@ -899,10 +904,10 @@ public class RenderLiquid render.field_147825_U = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); render.field_147828_V = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); render.field_147835_X = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147886_y = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147814_A = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147815_B = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147810_D = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); + render.field_147886_y = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); + 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)]; @@ -915,7 +920,7 @@ public class RenderLiquid } else { - render.field_147888_x = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); + render.field_147888_x = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); render.field_147832_R = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos - 1); } @@ -926,7 +931,7 @@ public class RenderLiquid } else { - render.field_147884_z = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); + render.field_147884_z = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); render.field_147826_T = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos + 1); } @@ -937,7 +942,7 @@ public class RenderLiquid } else { - render.field_147816_C = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); + render.field_147816_C = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); render.field_147827_W = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos - 1); } @@ -948,7 +953,7 @@ public class RenderLiquid } else { - render.field_147811_E = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); + render.field_147811_E = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); render.field_147834_Y = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos + 1); } @@ -964,7 +969,7 @@ public class RenderLiquid i1 = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); } - float f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); + float f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); f3 = (render.field_147884_z + render.field_147886_y + render.field_147815_B + f7) / 4.0F; 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; @@ -1003,7 +1008,7 @@ public class RenderLiquid flag = true; } - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.field_147845_a, xPos, yPos + 1, zPos, 1))) + if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos, yPos + 1, zPos, 1))) { if (render.renderMaxY >= 1.0D) { @@ -1014,10 +1019,10 @@ public class RenderLiquid render.field_147885_ae = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); render.field_147878_ac = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); render.field_147887_af = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147813_G = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147824_K = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147822_I = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147817_L = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); + render.field_147813_G = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); + render.field_147824_K = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); + render.field_147822_I = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); + render.field_147817_L = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); 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)]; @@ -1025,12 +1030,12 @@ public class RenderLiquid if ((!flag4) && (!flag2)) { - render.aoLightValueScratchXYZNPN = render.field_147813_G; + render.field_147812_F = render.field_147813_G; render.field_147836_Z = render.field_147880_aa; } else { - render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); + render.field_147812_F = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); render.field_147836_Z = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos - 1); } @@ -1041,18 +1046,18 @@ public class RenderLiquid } else { - render.field_147824_K = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); + render.field_147824_K = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); render.field_147879_ad = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos - 1); } if ((!flag5) && (!flag2)) { - render.aoLightValueScratchXYZNPP = render.field_147813_G; + render.field_147821_H = render.field_147813_G; render.field_147881_ab = render.field_147880_aa; } else { - render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); + render.field_147821_H = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); render.field_147881_ab = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos + 1); } @@ -1063,7 +1068,7 @@ public class RenderLiquid } else { - render.field_147819_N = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); + render.field_147819_N = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos + 1); } @@ -1079,11 +1084,11 @@ public class RenderLiquid i1 = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); } - float f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - f6 = (render.aoLightValueScratchXYZNPP + render.field_147813_G + render.field_147817_L + f7) / 4.0F; + float f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); + f6 = (render.field_147821_H + render.field_147813_G + render.field_147817_L + f7) / 4.0F; 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.aoLightValueScratchXYZNPN + f7 + render.field_147822_I) / 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); @@ -1107,17 +1112,17 @@ public class RenderLiquid flag = true; } - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.field_147845_a, xPos, yPos, zPos - 1, 2))) + if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos, yPos, zPos - 1, 2))) { if (render.renderMinZ <= 0.0D) { zPos--; } - render.field_147820_O = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147814_A = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147822_I = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - render.aoLightValueScratchXZPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); + render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); + render.field_147814_A = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147822_I = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); render.field_147883_ah = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); render.field_147825_U = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); render.field_147878_ac = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); @@ -1134,40 +1139,40 @@ public class RenderLiquid } else { - render.field_147888_x = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.field_147888_x = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); render.field_147832_R = block.func_149677_c(render.field_147845_a, xPos - 1, yPos - 1, zPos); } if ((!flag2) && (!flag5)) { - render.aoLightValueScratchXYZNPN = render.field_147820_O; + render.field_147812_F = render.field_147820_O; render.field_147836_Z = render.field_147883_ah; } else { - render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos + 1, zPos); + render.field_147812_F = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos + 1, zPos); render.field_147836_Z = block.func_149677_c(render.field_147845_a, xPos - 1, yPos + 1, zPos); } if ((!flag3) && (!flag4)) { - render.field_147816_C = render.aoLightValueScratchXZPN; + render.field_147816_C = render.field_147820_O; render.field_147827_W = render.field_147866_ai; } else { - render.field_147816_C = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.field_147816_C = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); render.field_147827_W = block.func_149677_c(render.field_147845_a, xPos + 1, yPos - 1, zPos); } if ((!flag3) && (!flag5)) { - render.field_147824_K = render.aoLightValueScratchXZPN; + render.field_147824_K = render.field_147820_O; render.field_147879_ad = render.field_147866_ai; } else { - render.field_147824_K = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos + 1, zPos); + render.field_147824_K = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos + 1, zPos); render.field_147879_ad = block.func_149677_c(render.field_147845_a, xPos + 1, yPos + 1, zPos); } @@ -1183,10 +1188,10 @@ public class RenderLiquid i1 = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); } - float f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - f3 = (render.field_147820_O + render.aoLightValueScratchXYZNPN + f7 + render.field_147822_I) / 4.0F; - f4 = (f7 + render.field_147822_I + render.aoLightValueScratchXZPN + render.field_147824_K) / 4.0F; - f5 = (render.field_147814_A + f7 + render.field_147816_C + render.aoLightValueScratchXZPN) / 4.0F; + float f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); + f3 = (render.field_147820_O + render.field_147812_F + f7 + render.field_147822_I) / 4.0F; + 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); @@ -1223,17 +1228,17 @@ public class RenderLiquid flag = true; } - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.field_147845_a, xPos, yPos, zPos + 1, 3))) + if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos, yPos, zPos + 1, 3))) { if (render.renderMaxZ >= 1.0D) { zPos++; } - render.field_147830_P = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147829_Q = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147815_B = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147817_L = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147830_P = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); + render.field_147829_Q = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); + render.field_147815_B = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147817_L = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); render.field_147868_aj = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); render.field_147862_ak = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); render.field_147828_V = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); @@ -1250,18 +1255,18 @@ public class RenderLiquid } else { - render.field_147884_z = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.field_147884_z = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); render.field_147826_T = block.func_149677_c(render.field_147845_a, xPos - 1, yPos - 1, zPos); } if ((!flag2) && (!flag5)) { - render.aoLightValueScratchXYZNPP = render.field_147830_P; + render.field_147821_H = render.field_147830_P; render.field_147881_ab = render.field_147868_aj; } else { - render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos + 1, zPos); + render.field_147821_H = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos + 1, zPos); render.field_147881_ab = block.func_149677_c(render.field_147845_a, xPos - 1, yPos + 1, zPos); } @@ -1272,7 +1277,7 @@ public class RenderLiquid } else { - render.field_147811_E = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.field_147811_E = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); render.field_147834_Y = block.func_149677_c(render.field_147845_a, xPos + 1, yPos - 1, zPos); } @@ -1283,7 +1288,7 @@ public class RenderLiquid } else { - render.field_147819_N = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos + 1, zPos); + render.field_147819_N = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos + 1, zPos); render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos + 1, yPos + 1, zPos); } @@ -1299,8 +1304,8 @@ public class RenderLiquid i1 = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); } - float f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - f3 = (render.field_147830_P + render.aoLightValueScratchXYZNPP + f7 + render.field_147817_L) / 4.0F; + float f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); + f3 = (render.field_147830_P + render.field_147821_H + f7 + render.field_147817_L) / 4.0F; 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; @@ -1339,17 +1344,17 @@ public class RenderLiquid flag = true; } - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.field_147845_a, xPos - 1, yPos, zPos, 4))) + if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos - 1, yPos, zPos, 4))) { if (render.renderMinX <= 0.0D) { xPos--; } - render.field_147886_y = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147820_O = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147830_P = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147813_G = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147886_y = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); + render.field_147830_P = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); + render.field_147813_G = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); render.field_147831_S = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); 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); @@ -1366,7 +1371,7 @@ public class RenderLiquid } else { - render.field_147888_x = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.field_147888_x = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); render.field_147832_R = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos - 1); } @@ -1377,29 +1382,29 @@ public class RenderLiquid } else { - render.field_147884_z = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.field_147884_z = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); render.field_147826_T = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos + 1); } if ((!flag5) && (!flag3)) { - render.aoLightValueScratchXYZNPN = render.field_147820_O; + render.field_147812_F = render.field_147820_O; render.field_147836_Z = render.field_147883_ah; } else { - render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos - 1); + render.field_147812_F = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos - 1); render.field_147836_Z = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos - 1); } if ((!flag4) && (!flag3)) { - render.aoLightValueScratchXYZNPP = render.field_147830_P; + render.field_147821_H = render.field_147830_P; render.field_147881_ab = render.field_147868_aj; } else { - render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos + 1); + render.field_147821_H = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos + 1); render.field_147881_ab = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos + 1); } @@ -1415,10 +1420,10 @@ public class RenderLiquid i1 = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); } - float f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); + float f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); f6 = (render.field_147886_y + render.field_147884_z + f7 + render.field_147830_P) / 4.0F; - f3 = (f7 + render.field_147830_P + render.field_147813_G + render.aoLightValueScratchXYZNPP) / 4.0F; - f4 = (render.field_147820_O + f7 + render.aoLightValueScratchXYZNPN + render.field_147813_G) / 4.0F; + 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); @@ -1455,17 +1460,17 @@ public class RenderLiquid flag = true; } - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.field_147845_a, xPos + 1, yPos, zPos, 5))) + if ((render.renderAllFaces) || (block. func_149646_a(render.field_147845_a, xPos + 1, yPos, zPos, 5))) { if (render.renderMaxX >= 1.0D) { xPos++; } - render.field_147810_D = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.aoLightValueScratchXZPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147829_Q = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147824_K = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147810_D = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); + render.field_147829_Q = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); + render.field_147824_K = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); render.field_147835_X = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); 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); @@ -1477,12 +1482,12 @@ public class RenderLiquid if ((!flag2) && (!flag4)) { - render.field_147816_C = render.aoLightValueScratchXZPN; + render.field_147816_C = render.field_147820_O; render.field_147827_W = render.field_147866_ai; } else { - render.field_147816_C = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.field_147816_C = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); render.field_147827_W = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos - 1); } @@ -1493,18 +1498,18 @@ public class RenderLiquid } else { - render.field_147811_E = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.field_147811_E = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); render.field_147834_Y = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos + 1); } if ((!flag3) && (!flag4)) { - render.field_147824_K = render.aoLightValueScratchXZPN; + render.field_147824_K = render.field_147820_O; render.field_147879_ad = render.field_147866_ai; } else { - render.field_147824_K = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos - 1); + render.field_147824_K = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos - 1); render.field_147879_ad = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos - 1); } @@ -1515,7 +1520,7 @@ public class RenderLiquid } else { - render.field_147819_N = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos + 1); + render.field_147819_N = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos + 1); render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos + 1); } @@ -1531,10 +1536,10 @@ public class RenderLiquid i1 = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); } - float f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); + float f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); f3 = (render.field_147810_D + render.field_147811_E + f7 + render.field_147829_Q) / 4.0F; - f4 = (render.field_147816_C + render.field_147810_D + render.aoLightValueScratchXZPN + f7) / 4.0F; - f5 = (render.aoLightValueScratchXZPN + f7 + render.field_147824_K + render.field_147824_K) / 4.0F; + 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); @@ -1613,7 +1618,7 @@ public class RenderLiquid int l = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos); - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.field_147845_a, xPos, yPos - 1, zPos, 0))) + if ((render.renderAllFaces) || (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); @@ -1621,7 +1626,7 @@ public class RenderLiquid flag = true; } - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.field_147845_a, xPos, yPos + 1, zPos, 1))) + if ((render.renderAllFaces) || (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); @@ -1629,7 +1634,7 @@ public class RenderLiquid flag = true; } - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.field_147845_a, xPos, yPos, zPos - 1, 2))) + if ((render.renderAllFaces) || (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); @@ -1638,7 +1643,7 @@ public class RenderLiquid flag = true; } - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.field_147845_a, xPos, yPos, zPos + 1, 3))) + if ((render.renderAllFaces) || (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); @@ -1647,7 +1652,7 @@ public class RenderLiquid flag = true; } - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.field_147845_a, xPos - 1, yPos, zPos, 4))) + if ((render.renderAllFaces) || (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); @@ -1656,7 +1661,7 @@ public class RenderLiquid flag = true; } - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.field_147845_a, xPos + 1, yPos, zPos, 5))) + if ((render.renderAllFaces) || (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/common/TContent.java b/src/main/java/tconstruct/common/TContent.java index 3589e0d3..d6a05542 100644 --- a/src/main/java/tconstruct/common/TContent.java +++ b/src/main/java/tconstruct/common/TContent.java @@ -54,7 +54,7 @@ import tconstruct.util.config.*; public class TContent implements IFuelHandler { //Temporary items - //public static Item armorTest = new ArmorStandard(2445, 4, EnumArmorPart.HELMET).setCreativeTab(CreativeTabs.tabAllSearch); + //public static Item armorTest = new ArmorStandard(2445, 4, EnumArmorPart.HELMET).func_149647_a(CreativeTabs.tabAllSearch); public TContent() { @@ -98,7 +98,7 @@ public class TContent implements IFuelHandler TRepo.heldItemBlock = new EquipBlock(Material.field_151575_d).func_149663_c("Frypan"); - TRepo.craftedSoil = new SoilBlock().setLightOpacity(0).func_149663_c("TConstruct.Soil"); + TRepo.craftedSoil = new SoilBlock().func_149713_g(0).func_149663_c("TConstruct.Soil"); TRepo.craftedSoil.field_149762_H = Block.soundGravelFootstep; TRepo.searedSlab = new SearedSlab().func_149663_c("SearedSlab"); @@ -111,19 +111,19 @@ public class TContent implements IFuelHandler TRepo.metalBlock.field_149762_H = Block.soundMetalFootstep; TRepo.meatBlock = new MeatBlock().func_149663_c("tconstruct.meatblock"); - TRepo.glueBlock = new GlueBlock().func_149663_c("GlueBlock").setCreativeTab(TConstructRegistry.blockTab); + TRepo.glueBlock = new GlueBlock().func_149663_c("GlueBlock").func_149647_a(TConstructRegistry.blockTab); TRepo.woolSlab1 = new SlabBase(Material.field_151580_n, Blocks.wool, 0, 8).func_149663_c("cloth"); - TRepo.woolSlab1.setStepSound(Block.soundClothFootstep).setCreativeTab(CreativeTabs.tabDecorations); + TRepo.woolSlab1.func_149672_a(Block.soundClothFootstep).func_149647_a(CreativeTabs.tabDecorations); TRepo.woolSlab2 = new SlabBase(Material.field_151580_n, Blocks.wool, 8, 8).func_149663_c("cloth"); - TRepo.woolSlab2.setStepSound(Block.soundClothFootstep).setCreativeTab(CreativeTabs.tabDecorations); + TRepo.woolSlab2.func_149672_a(Block.soundClothFootstep).func_149647_a(CreativeTabs.tabDecorations); //Smeltery TRepo.smeltery = new SmelteryBlock().func_149663_c("Smeltery"); TRepo.smelteryNether = new SmelteryBlock("nether").func_149663_c("Smeltery"); TRepo.lavaTank = new LavaTankBlock().func_149663_c("LavaTank"); - TRepo.lavaTank.setStepSound(Block.soundGlassFootstep); - TRepo.lavaTankNether = new LavaTankBlock("nether").setStepSound(Block.soundGlassFootstep).func_149663_c("LavaTank"); + TRepo.lavaTank.func_149672_a(Block.soundGlassFootstep); + TRepo.lavaTankNether = new LavaTankBlock("nether").func_149672_a(Block.soundGlassFootstep).func_149663_c("LavaTank"); TRepo.searedBlock = new SearedBlock().func_149663_c("SearedBlock"); TRepo.searedBlockNether = new SearedBlock("nether").func_149663_c("SearedBlock"); @@ -133,14 +133,14 @@ public class TContent implements IFuelHandler TRepo.tankAir = new TankAirBlock(Material.field_151584_j).setBlockUnbreakable().func_149663_c("tconstruct.tank.air"); //Traps - TRepo.landmine = new BlockLandmine().setHardness(0.5F).setResistance(0F).setStepSound(Block.soundMetalFootstep).setCreativeTab(CreativeTabs.tabRedstone) + TRepo.landmine = new BlockLandmine().func_149711_c(0.5F).setResistance(0F).func_149672_a(Block.soundMetalFootstep).func_149647_a(CreativeTabs.tabRedstone) .func_149663_c("landmine"); TRepo.punji = new Punji().func_149663_c("trap.punji"); TRepo.barricadeOak = new BarricadeBlock(Blocks.log, 0).func_149663_c("trap.barricade.oak"); TRepo.barricadeSpruce = new BarricadeBlock(Blocks.log, 1).func_149663_c("trap.barricade.spruce"); TRepo.barricadeBirch = new BarricadeBlock(Blocks.log, 2).func_149663_c("trap.barricade.birch"); TRepo.barricadeJungle = new BarricadeBlock(Blocks.log, 3).func_149663_c("trap.barricade.jungle"); - TRepo.slimeExplosive = new SlimeExplosive().setHardness(0.0F).setStepSound(Block.field_149779_h).func_149663_c("explosive.slime"); + TRepo.slimeExplosive = new SlimeExplosive().func_149711_c(0.0F).func_149672_a(Block.field_149779_h).func_149663_c("explosive.slime"); TRepo.dryingRack = new DryingRack().func_149663_c("Armor.DryingRack"); @@ -353,7 +353,7 @@ public class TContent implements IFuelHandler TRepo.blueSlimeFluid = new Fluid("slime.blue"); if (!FluidRegistry.registerFluid(TRepo.blueSlimeFluid)) TRepo.blueSlimeFluid = FluidRegistry.getFluid("slime.blue"); - TRepo.slimePool = new SlimeFluid(PHConstruct.slimePoolBlue, TRepo.blueSlimeFluid, Material.field_151586_h).setCreativeTab(TConstructRegistry.blockTab).setStepSound(TRepo.slimeStep) + TRepo.slimePool = new SlimeFluid(PHConstruct.slimePoolBlue, TRepo.blueSlimeFluid, Material.field_151586_h).func_149647_a(TConstructRegistry.blockTab).func_149672_a(TRepo.slimeStep) .func_149663_c("liquid.slime"); GameRegistry.registerBlock(TRepo.slimePool, "liquid.slime"); TRepo.blueSlimeFluid.setBlockID(TRepo.slimePool); @@ -363,7 +363,7 @@ public class TContent implements IFuelHandler TRepo.glueFluid = new Fluid("glue").setDensity(6000).setViscosity(6000).setTemperature(200); if (!FluidRegistry.registerFluid(TRepo.glueFluid)) TRepo.glueFluid = FluidRegistry.getFluid("glue"); - TRepo.glueFluidBlock = new GlueFluid(PHConstruct.glueFluidBlock, TRepo.glueFluid, Material.field_151586_h).setCreativeTab(TConstructRegistry.blockTab).setStepSound(TRepo.slimeStep) + TRepo.glueFluidBlock = new GlueFluid(PHConstruct.glueFluidBlock, TRepo.glueFluid, Material.field_151586_h).func_149647_a(TConstructRegistry.blockTab).func_149672_a(TRepo.slimeStep) .func_149663_c("liquid.glue"); GameRegistry.registerBlock(TRepo.glueFluidBlock, "liquid.glue"); TRepo.glueFluid.setBlockID(TRepo.glueFluidBlock); @@ -382,14 +382,14 @@ public class TContent implements IFuelHandler TRepo.moltenAlubrass, TRepo.moltenManyullyn, TRepo.moltenAlumite, TRepo.moltenObsidian, TRepo.moltenSteel, TRepo.moltenGlass, TRepo.moltenStone, TRepo.moltenEmerald, TRepo.blood, TRepo.moltenNickel, TRepo.moltenLead, TRepo.moltenSilver, TRepo.moltenShiny, TRepo.moltenInvar, TRepo.moltenElectrum, TRepo.moltenEnder, TRepo.slimePool, TRepo.glueFluidBlock }; //Slime Islands - TRepo.slimeGel = new SlimeGel().setStepSound(TRepo.slimeStep).setLightOpacity(0).func_149663_c("slime.gel"); - TRepo.slimeGrass = new SlimeGrass().setStepSound(Block.field_149779_h).setLightOpacity(0).func_149663_c("slime.grass"); - TRepo.slimeTallGrass = new SlimeTallGrass().setStepSound(Block.field_149779_h).func_149663_c("slime.grass.tall"); - TRepo.slimeLeaves = (SlimeLeaves) new SlimeLeaves().setStepSound(TRepo.slimeStep).setLightOpacity(0).func_149663_c("slime.leaves"); - TRepo.slimeSapling = (SlimeSapling) new SlimeSapling().setStepSound(TRepo.slimeStep).func_149663_c("slime.sapling"); - TRepo.slimeChannel = new ConveyorBase(Material.field_151586_h, "greencurrent").setHardness(0.3f).setStepSound(TRepo.slimeStep).func_149663_c("slime.channel"); - TRepo.bloodChannel = new ConveyorBase(Material.field_151586_h, "liquid_cow").setHardness(0.3f).setStepSound(TRepo.slimeStep).func_149663_c("blood.channel"); - TRepo.slimePad = new SlimePad(Material.field_151580_n).setStepSound(TRepo.slimeStep).setHardness(0.3f).func_149663_c("slime.pad"); + TRepo.slimeGel = new SlimeGel().func_149672_a(TRepo.slimeStep).func_149713_g(0).func_149663_c("slime.gel"); + TRepo.slimeGrass = new SlimeGrass().func_149672_a(Block.field_149779_h).func_149713_g(0).func_149663_c("slime.grass"); + TRepo.slimeTallGrass = new SlimeTallGrass().func_149672_a(Block.field_149779_h).func_149663_c("slime.grass.tall"); + TRepo.slimeLeaves = (SlimeLeaves) new SlimeLeaves().func_149672_a(TRepo.slimeStep).func_149713_g(0).func_149663_c("slime.leaves"); + TRepo.slimeSapling = (SlimeSapling) new SlimeSapling().func_149672_a(TRepo.slimeStep).func_149663_c("slime.sapling"); + TRepo.slimeChannel = new ConveyorBase(Material.field_151586_h, "greencurrent").func_149711_c(0.3f).func_149672_a(TRepo.slimeStep).func_149663_c("slime.channel"); + TRepo.bloodChannel = new ConveyorBase(Material.field_151586_h, "liquid_cow").func_149711_c(0.3f).func_149672_a(TRepo.slimeStep).func_149663_c("blood.channel"); + TRepo.slimePad = new SlimePad(Material.field_151580_n).func_149672_a(TRepo.slimeStep).func_149711_c(0.3f).func_149663_c("slime.pad"); //Decoration TRepo.stoneTorch = new StoneTorch().func_149663_c("decoration.stonetorch"); @@ -432,7 +432,7 @@ public class TContent implements IFuelHandler TRepo.stainedGlassClearPane = new GlassPaneStained(PHConstruct.stainedGlassClearPane); //Rail - TRepo.woodenRail = new WoodRail().setStepSound(Block.soundWoodFootstep).setCreativeTab(TConstructRegistry.blockTab).func_149663_c("rail.wood"); + TRepo.woodenRail = new WoodRail().func_149672_a(Block.soundWoodFootstep).func_149647_a(TConstructRegistry.blockTab).func_149663_c("rail.wood"); } @@ -477,34 +477,34 @@ public class TContent implements IFuelHandler TConstructRegistry.addItemStackToDirectory(armorPartTypes[i] + "Cast", new ItemStack(armorPattern, 1, i)); }*/ - TRepo.manualBook = new Manual(PHConstruct.manual); + TRepo.manualBook = new Manual(); GameRegistry.registerItem(TRepo.manualBook, "manualBook"); TRepo.buckets = new FilledBucket(PHConstruct.buckets); GameRegistry.registerItem(TRepo.buckets, "buckets"); - TRepo.pickaxe = new Pickaxe(PHConstruct.pickaxe); - TRepo.shovel = new Shovel(PHConstruct.shovel); - TRepo.hatchet = new Hatchet(PHConstruct.axe); - TRepo.broadsword = new Broadsword(PHConstruct.broadsword); - TRepo.longsword = new Longsword(PHConstruct.longsword); - TRepo.rapier = new Rapier(PHConstruct.rapier); - TRepo.dagger = new Dagger(PHConstruct.dagger); - TRepo.cutlass = new Cutlass(PHConstruct.cutlass); + TRepo.pickaxe = new Pickaxe(); + TRepo.shovel = new Shovel(); + TRepo.hatchet = new Hatchet(); + TRepo.broadsword = new Broadsword(); + TRepo.longsword = new Longsword(); + TRepo.rapier = new Rapier(); + TRepo.dagger = new Dagger(); + TRepo.cutlass = new Cutlass(); - TRepo.frypan = new FryingPan(PHConstruct.frypan); - TRepo.battlesign = new BattleSign(PHConstruct.battlesign); - TRepo.mattock = new Mattock(PHConstruct.mattock); - TRepo.chisel = new Chisel(PHConstruct.chisel); + TRepo.frypan = new FryingPan(); + TRepo.battlesign = new BattleSign(); + TRepo.mattock = new Mattock(); + TRepo.chisel = new Chisel(); - TRepo.lumberaxe = new LumberAxe(PHConstruct.lumberaxe); - TRepo.cleaver = new Cleaver(PHConstruct.cleaver); - TRepo.scythe = new Scythe(PHConstruct.scythe); - TRepo.excavator = new Excavator(PHConstruct.excavator); - TRepo.hammer = new Hammer(PHConstruct.hammer); - TRepo.battleaxe = new Battleaxe(PHConstruct.battleaxe); + TRepo.lumberaxe = new LumberAxe(); + TRepo.cleaver = new Cleaver(); + TRepo.scythe = new Scythe(); + TRepo.excavator = new Excavator(); + TRepo.hammer = new Hammer(); + TRepo.battleaxe = new Battleaxe(); - TRepo.shortbow = new Shortbow(PHConstruct.shortbow); - TRepo.arrow = new Arrow(PHConstruct.arrow); + TRepo.shortbow = new Shortbow(); + TRepo.arrow = new Arrow(); Item[] tools = { TRepo.pickaxe, TRepo.shovel, TRepo.hatchet, TRepo.broadsword, TRepo.longsword, TRepo.rapier, TRepo.dagger, TRepo.cutlass, TRepo.frypan, TRepo.battlesign, TRepo.mattock, TRepo.chisel, TRepo.lumberaxe, TRepo.cleaver, TRepo.scythe, TRepo.excavator, TRepo.hammer, TRepo.battleaxe, TRepo.shortbow, TRepo.arrow }; @@ -517,18 +517,18 @@ public class TContent implements IFuelHandler TConstructRegistry.addItemToDirectory(toolStrings[i], tools[i]); } - TRepo.potionLauncher = new PotionLauncher(PHConstruct.potionLauncher).func_149663_c("tconstruct.PotionLauncher"); + TRepo.potionLauncher = new PotionLauncher().func_149663_c("tconstruct.PotionLauncher"); GameRegistry.registerItem(TRepo.potionLauncher, "potionLauncher"); - TRepo.pickaxeHead = new ToolPart(PHConstruct.pickaxeHead, "_pickaxe_head", "PickHead").func_149663_c("tconstruct.PickaxeHead"); - TRepo.shovelHead = new ToolPart(PHConstruct.shovelHead, "_shovel_head", "ShovelHead").func_149663_c("tconstruct.ShovelHead"); - TRepo.hatchetHead = new ToolPart(PHConstruct.axeHead, "_axe_head", "AxeHead").func_149663_c("tconstruct.AxeHead"); - TRepo.binding = new ToolPart(PHConstruct.binding, "_binding", "Binding").func_149663_c("tconstruct.Binding"); - TRepo.toughBinding = new ToolPart(PHConstruct.toughBinding, "_toughbind", "ToughBind").func_149663_c("tconstruct.ThickBinding"); - TRepo.toughRod = new ToolPart(PHConstruct.toughRod, "_toughrod", "ToughRod").func_149663_c("tconstruct.ThickRod"); - TRepo.largePlate = new ToolPart(PHConstruct.largePlate, "_largeplate", "LargePlate").func_149663_c("tconstruct.LargePlate"); + TRepo.pickaxeHead = new ToolPart("_pickaxe_head", "PickHead").func_149663_c("tconstruct.PickaxeHead"); + TRepo.shovelHead = new ToolPart("_shovel_head", "ShovelHead").func_149663_c("tconstruct.ShovelHead"); + TRepo.hatchetHead = new ToolPart( "_axe_head", "AxeHead").func_149663_c("tconstruct.AxeHead"); + TRepo.binding = new ToolPart( "_binding", "Binding").func_149663_c("tconstruct.Binding"); + TRepo.toughBinding = new ToolPart("_toughbind", "ToughBind").func_149663_c("tconstruct.ThickBinding"); + TRepo.toughRod = new ToolPart("_toughrod", "ToughRod").func_149663_c("tconstruct.ThickRod"); + TRepo.largePlate = new ToolPart("_largeplate", "LargePlate").func_149663_c("tconstruct.LargePlate"); - TRepo.swordBlade = new ToolPart(PHConstruct.swordBlade, "_sword_blade", "SwordBlade").func_149663_c("tconstruct.SwordBlade"); + TRepo.swordBlade = new ToolPart("_sword_blade", "SwordBlade").func_149663_c("tconstruct.SwordBlade"); TRepo.wideGuard = new ToolPart(PHConstruct.largeGuard, "_large_guard", "LargeGuard").func_149663_c("tconstruct.LargeGuard"); TRepo.handGuard = new ToolPart(PHConstruct.medGuard, "_medium_guard", "MediumGuard").func_149663_c("tconstruct.MediumGuard"); TRepo.crossbar = new ToolPart(PHConstruct.crossbar, "_crossbar", "Crossbar").func_149663_c("tconstruct.Crossbar"); diff --git a/src/main/java/tconstruct/items/tools/Cutlass.java b/src/main/java/tconstruct/items/tools/Cutlass.java index 7b6b6ea0..0d49653b 100644 --- a/src/main/java/tconstruct/items/tools/Cutlass.java +++ b/src/main/java/tconstruct/items/tools/Cutlass.java @@ -7,7 +7,7 @@ import net.minecraft.item.Item; public class Cutlass extends Weapon { - public Cutlass(int itemID) + public Cutlass() { super(4); this.setUnlocalizedName("InfiTool.Cutlass");