diff --git a/src/main/java/tconstruct/blocks/GlassBlock.java b/src/main/java/tconstruct/blocks/GlassBlock.java index 07be6dc84f5..cbc835a9551 100644 --- a/src/main/java/tconstruct/blocks/GlassBlock.java +++ b/src/main/java/tconstruct/blocks/GlassBlock.java @@ -1,6 +1,7 @@ package tconstruct.blocks; import cpw.mods.fml.relauncher.*; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -24,8 +25,8 @@ public boolean isOpaqueCube () @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { - int i1 = par1IBlockAccess.getBlockId(par2, par3, par4); - return i1 == this.blockID ? false : super.shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, par5); + Block i1 = par1IBlockAccess.func_147439_a(par2, par3, par4); + return i1 == (Block) this ? false : super.shouldSideBeRendered(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 a1b6a4cd9c6..1676ec94974 100644 --- a/src/main/java/tconstruct/blocks/GlassBlockConnected.java +++ b/src/main/java/tconstruct/blocks/GlassBlockConnected.java @@ -65,9 +65,9 @@ public int getRenderBlockPass () * @param par6 Metadata of the block this block is trying to connect to * @return true if should connect */ - public boolean shouldConnectToBlock (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5, int par6) + public boolean shouldConnectToBlock (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, Block par5, int par6) { - return par5 == this.blockID; + return par5 == (Block) this; } @Override diff --git a/src/main/java/tconstruct/blocks/GlassPaneConnected.java b/src/main/java/tconstruct/blocks/GlassPaneConnected.java index 653b6dbb121..e80f494293e 100644 --- a/src/main/java/tconstruct/blocks/GlassPaneConnected.java +++ b/src/main/java/tconstruct/blocks/GlassPaneConnected.java @@ -667,9 +667,9 @@ public IIcon getSideTextureIndex () return this.theIcon; } - public final boolean canThisPaneConnectToThisBlockID (int par1) + public final boolean canThisPaneConnectToThisBlock (Block b) { - return Block.opaqueCubeLookup[par1] || par1 == this.blockID || par1 == Blocks.glass.blockID; + return Block.opaqueCubeLookup[b] || b == (Block) this || b == Blocks.glass; } public void registerIcons (IIconRegister par1IconRegister) diff --git a/src/main/java/tconstruct/blocks/LavaTankBlock.java b/src/main/java/tconstruct/blocks/LavaTankBlock.java index 3c388e6ecdd..1ce27a99a69 100644 --- a/src/main/java/tconstruct/blocks/LavaTankBlock.java +++ b/src/main/java/tconstruct/blocks/LavaTankBlock.java @@ -92,8 +92,8 @@ public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, in { //if (side == 0 && world.getBlockMetadata(x, y, z) == 0) //return super.shouldSideBeRendered(world, x, y, z, side); - int bID = world.getBlockId(x, y, z); - return bID == this.blockID ? false : super.shouldSideBeRendered(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 true; } @@ -265,7 +265,7 @@ public boolean removeBlockByPlayer (World world, EntityPlayer player, int x, int { player.addExhaustion(0.025F); int meta = world.getBlockMetadata(x, y, z); - ItemStack stack = new ItemStack(this.blockID, 1, meta); + ItemStack stack = new ItemStack(this, 1, meta); LavaTankLogic logic = (LavaTankLogic) world.getBlockTileEntity(x, y, z); FluidStack liquid = logic.tank.getFluid(); if (liquid != null) diff --git a/src/main/java/tconstruct/blocks/SearedBlock.java b/src/main/java/tconstruct/blocks/SearedBlock.java index 570ba5146ea..6879ffbc279 100644 --- a/src/main/java/tconstruct/blocks/SearedBlock.java +++ b/src/main/java/tconstruct/blocks/SearedBlock.java @@ -7,6 +7,7 @@ import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; @@ -206,8 +207,9 @@ public String[] getTextureNames () return textureNames; } + //TODO getIcon @Override - public IIcon getIcon (int side, int meta) + public IIcon func_149691_a (int side, int meta) { if (meta == 0) return icons[getTextureIndex(side)]; @@ -246,7 +248,7 @@ public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, in } @Override - public void getSubBlocks (Block b, CreativeTabs tab, List list) + public void func_149666_a (Item b, CreativeTabs tab, List list) { for (int iter = 0; iter < 3; iter++) { diff --git a/src/main/java/tconstruct/blocks/StoneLadder.java b/src/main/java/tconstruct/blocks/StoneLadder.java index 84ddb52b490..24b4d36e507 100644 --- a/src/main/java/tconstruct/blocks/StoneLadder.java +++ b/src/main/java/tconstruct/blocks/StoneLadder.java @@ -19,7 +19,7 @@ public StoneLadder() { super(); this.setUnlocalizedName("decoration.stoneladder"); - this.setCreativeTab(CreativeTabs.tabDecorations); + this.func_149647_a(CreativeTabs.tabDecorations); } @Override diff --git a/src/main/java/tconstruct/blocks/component/SmelteryScan.java b/src/main/java/tconstruct/blocks/component/SmelteryScan.java index 94ebf9ff3d1..b800b462df3 100644 --- a/src/main/java/tconstruct/blocks/component/SmelteryScan.java +++ b/src/main/java/tconstruct/blocks/component/SmelteryScan.java @@ -6,6 +6,7 @@ import mantle.blocks.iface.IServantLogic; import mantle.world.CoordTuple; import net.minecraft.block.Block; +import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagIntArray; import net.minecraft.nbt.NBTTagList; @@ -32,8 +33,8 @@ public void checkValidStructure () protected boolean checkAir (int x, int y, int z) { - Block block = Block.blocksList[world.getBlockId(x, y, z)]; - if (block == null || block.isAirBlock(world, x, y, z) || block == TRepo.tankAir) + Block block = world.func_147439_a(x, y, z); + if (block == null || block == Blocks.air || block == TRepo.tankAir) return true; return false; @@ -42,8 +43,8 @@ protected boolean checkAir (int x, int y, int z) @Override protected boolean checkServant (int x, int y, int z) { - Block block = Block.blocksList[world.getBlockId(x, y, z)]; - if (block == null || block.isAirBlock(world, x, y, z) || !isValidBlock(x, y, z)) + Block block = world.func_147439_a(x, y, z)]; + if (block == null || world.func_147439_a( x, y, z) == Blocks.air || !isValidBlock(x, y, z)) return false; if (!block.hasTileEntity(world.getBlockMetadata(x, y, z))) @@ -71,9 +72,9 @@ protected void finalizeStructure () { for (CoordTuple coord : airCoords) { - if (world.getBlockId(coord.x, coord.y, coord.z) != TRepo.tankAir.blockID) + if (world.func_147439_a(coord.x, coord.y, coord.z) != TRepo.tankAir) { - world.setBlock(coord.x, coord.y, coord.z, TRepo.tankAir.blockID); + world.setBlock(coord.x, coord.y, coord.z, TRepo.tankAir); IServantLogic servant = (IServantLogic) world.getBlockTileEntity(coord.x, coord.y, coord.z); servant.verifyMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); } diff --git a/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java b/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java index 2871a10bc26..a9f5cf3a15f 100644 --- a/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java +++ b/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java @@ -206,7 +206,6 @@ public static int getItemBurnTime (ItemStack stack) } else { - int i = stack.getItem().itemID; Item item = stack.getItem(); if (stack.getItem() instanceof ItemBlock && Block.blocksList[i] != null) @@ -240,15 +239,15 @@ public static int getItemBurnTime (ItemStack stack) return 200; if (item instanceof ItemHoe && ((ItemHoe) item).getMaterialName().equals("WOOD")) return 200; - if (i == Items.stick.itemID) + if (item == Items.stick) return 100; - if (i == Items.coal.itemID) + if (item == Items.coal) return 1600; - if (i == Items.bucketLava.itemID) + if (item == Items.lava_bucket) return 20000; - if (i == Blocks.sapling.blockID) + if (item == new ItemStack(Blocks.sapling).getItem()) return 100; - if (i == Items.blaze_rod.itemID) + if (item == Items.blaze_rod) return 2400; return GameRegistry.getFuelValue(stack); } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java index c678056e7fe..48fa722faf0 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java @@ -9,6 +9,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; @@ -79,7 +80,7 @@ else if (side == 1) } @Override - public void getSubBlocks (Block b, CreativeTabs tab, List list) + public void getSubBlocks (Item b, CreativeTabs tab, List list) { for (int iter = 0; iter < 1; iter++) { @@ -96,7 +97,7 @@ public boolean canSustainPlant (World world, int x, int y, int z, ForgeDirection public void onPlantGrow (World world, int x, int y, int z, int sourceX, int sourceY, int sourceZ) { - world.setBlock(x, y, z, TRepo.craftedSoil.blockID, 5, 3); + world.setBlock(x, y, z, TRepo.craftedSoil, 5, 3); } public void updateTick (World par1World, int par2, int par3, int par4, Random par5Random) @@ -105,7 +106,7 @@ public void updateTick (World par1World, int par2, int par3, int par4, Random pa { if (par1World.getBlockLightValue(par2, par3 + 1, par4) < 4 && par1World.getBlockLightOpacity(par2, par3 + 1, par4) > 2) { - par1World.setBlock(par2, par3, par4, TRepo.craftedSoil.blockID, 5, 3); + par1World.setBlock(par2, par3, par4, TRepo.craftedSoil, 5, 3); } else if (par1World.getBlockLightValue(par2, par3 + 1, par4) >= 9) { @@ -114,21 +115,21 @@ else if (par1World.getBlockLightValue(par2, par3 + 1, par4) >= 9) int posX = par2 + par5Random.nextInt(3) - 1; int posY = par3 + par5Random.nextInt(5) - 3; int posZ = par4 + par5Random.nextInt(3) - 1; - int l1 = par1World.getBlockId(posX, posY + 1, posZ); + Block l1 = par1World.func_147439_a(posX, posY + 1, posZ); if (par1World.getBlockLightValue(posX, posY + 1, posZ) >= 4 && par1World.getBlockLightOpacity(posX, posY + 1, posZ) <= 2) { - int blockID = par1World.getBlockId(posX, posY, posZ); - if (blockID == Blocks.dirt.blockID) + Block block = par1World.func_147439_a(posX, posY, posZ); + if (block == Blocks.dirt) { - par1World.setBlock(posX, posY, posZ, this.blockID, 1, 3); + par1World.setBlock(posX, posY, posZ,(Block) this, 1, 3); return; } int blockMeta = par1World.getBlockMetadata(posX, posY, posZ); - if (blockID == TRepo.craftedSoil.blockID) + if (block == TRepo.craftedSoil) { if (blockMeta == 5) - par1World.setBlock(posX, posY, posZ, this.blockID, 0, 3); + par1World.setBlock(posX, posY, posZ, (Block) this, 0, 3); } } } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java index af80f41e424..b6fe8249099 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java @@ -9,6 +9,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; @@ -47,9 +48,9 @@ public void registerIcons (IIconRegister iconRegister) } } - public boolean canThisPlantGrowOnThisBlockID (int id) + public boolean canThisPlantGrowOnThisBlockID (Block b) { - return id == Blocks.grass.blockID || id == Blocks.dirt.blockID || id == TRepo.slimeGrass.blockID || id == TRepo.craftedSoil.blockID; + 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) @@ -121,7 +122,7 @@ public int damageDropped (int i) @SideOnly(Side.CLIENT) @Override - public void getSubBlocks (Block b, CreativeTabs par2CreativeTabs, List par3List) + public void getSubBlocks (Item b, CreativeTabs par2CreativeTabs, List par3List) { for (int i = 0; i < 1; i++) par3List.add(new ItemStack(b, 1, i)); diff --git a/src/main/java/tconstruct/blocks/traps/Punji.java b/src/main/java/tconstruct/blocks/traps/Punji.java index 6cf92e13368..75da813def6 100644 --- a/src/main/java/tconstruct/blocks/traps/Punji.java +++ b/src/main/java/tconstruct/blocks/traps/Punji.java @@ -57,7 +57,7 @@ public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer if (meta < 4) { ItemStack stack = player.getCurrentEquippedItem(); - if (stack != null && stack.itemID == TRepo.punji.blockID) + if (stack != null && stack == new ItemStack(TRepo.punji)) { world.setBlockMetadataWithNotify(x, y, z, meta + 1, 3); world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.stepSound.getPlaceSound(), diff --git a/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java b/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java index 9377717821e..36d152237d6 100644 --- a/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java +++ b/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java @@ -35,7 +35,7 @@ public static boolean renderMetadataBlock (Block block, int metadata, int x, int static boolean renderMetadataBlockWithAmbientOcclusion (Block block, int metadata, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) { - render.enableAO = true; + render.field_147863_w = true; boolean flag = false; float f3 = 0.0F; float f4 = 0.0F; @@ -69,14 +69,14 @@ else if (render.hasOverrideBlockTexture()) --yPos; } - render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos); - render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos - 1); - render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos + 1); - render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos); - render.aoLightValueScratchXYNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.aoLightValueScratchYZNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.aoLightValueScratchYZNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.aoLightValueScratchXYPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); + render.field_147831_S = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos); + render.field_147825_U = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos - 1); + render.field_147828_V = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos + 1); + render.field_147835_X = block.getMixedBrightnessForBlock(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.getBlockId(xPos + 1, yPos - 1, zPos)]; flag2 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos - 1, yPos - 1, zPos)]; flag5 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos, yPos - 1, zPos + 1)]; @@ -84,46 +84,46 @@ else if (render.hasOverrideBlockTexture()) if (!flag4 && !flag2) { - render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXYNN; - render.aoBrightnessXYZNNN = render.aoBrightnessXYNN; + render.field_147888_x = render.field_147886_y; + render.field_147832_R = render.field_147831_S; } else { - render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); - render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos - 1); + render.field_147888_x = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); + render.field_147832_R = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos - 1); } if (!flag5 && !flag2) { - render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXYNN; - render.aoBrightnessXYZNNP = render.aoBrightnessXYNN; + render.field_147884_z = render.field_147886_y; + render.field_147826_T = render.field_147831_S; } else { - render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); - render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos + 1); + render.field_147884_z = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); + render.field_147826_T = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos + 1); } if (!flag4 && !flag3) { - render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXYPN; - render.aoBrightnessXYZPNN = render.aoBrightnessXYPN; + render.field_147816_C = render.field_147810_D; + render.field_147827_W = render.field_147835_X; } else { - render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); - render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos - 1); + render.field_147816_C = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); + render.field_147827_W = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos - 1); } if (!flag5 && !flag3) { - render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXYPN; - render.aoBrightnessXYZPNP = render.aoBrightnessXYPN; + render.field_147811_E = render.field_147810_D; + render.field_147834_Y = render.field_147835_X; } else { - render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); - render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos + 1); + render.field_147811_E = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); + render.field_147834_Y = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos + 1); } if (render.renderMinY <= 0.0D) @@ -139,14 +139,14 @@ else if (render.hasOverrideBlockTexture()) } f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - f3 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXYNN + render.aoLightValueScratchYZNP + f7) / 4.0F; - f6 = (render.aoLightValueScratchYZNP + f7 + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXYPN) / 4.0F; - f5 = (f7 + render.aoLightValueScratchYZNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNN) / 4.0F; - f4 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNN + f7 + render.aoLightValueScratchYZNN) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXYNN, render.aoBrightnessYZNP, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXYPN, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYPN, render.aoBrightnessXYZPNN, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNN, render.aoBrightnessYZNN, i1); + 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; + f4 = (render.field_147886_y + render.field_147888_x + f7 + render.field_147814_A) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.field_147826_T, render.field_147831_S, render.field_147828_V, i1); + render.brightnessTopRight = render.getAoBrightness(render.field_147828_V, render.field_147834_Y, render.field_147835_X, i1); + render.brightnessBottomRight = render.getAoBrightness(render.field_147825_U, render.field_147835_X, render.field_147827_W, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.field_147831_S, render.field_147832_R, render.field_147825_U, i1); if (flag1) { @@ -184,14 +184,14 @@ else if (render.hasOverrideBlockTexture()) ++yPos; } - render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos); - render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos); - render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos - 1); - render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos + 1); - render.aoLightValueScratchXYNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.aoLightValueScratchXYPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - render.aoLightValueScratchYZPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.aoLightValueScratchYZPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); + render.field_147880_aa = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos); + render.field_147885_ae = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos); + render.field_147878_ac = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos - 1); + render.field_147887_af = block.getMixedBrightnessForBlock(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.getBlockId(xPos + 1, yPos + 1, zPos)]; flag2 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos - 1, yPos + 1, zPos)]; flag5 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos, yPos + 1, zPos + 1)]; @@ -199,8 +199,8 @@ else if (render.hasOverrideBlockTexture()) if (!flag4 && !flag2) { - render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXYNP; - render.aoBrightnessXYZNPN = render.aoBrightnessXYNP; + render.aoLightValueScratchXYZNPN = render.field_147813_G; + render.aoBrightnessXYZNPN = render.field_147880_aa; } else { @@ -210,8 +210,8 @@ else if (render.hasOverrideBlockTexture()) if (!flag4 && !flag3) { - render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXYPP; - render.aoBrightnessXYZPPN = render.aoBrightnessXYPP; + render.aoLightValueScratchXYZPPN = render.field_147824_K; + render.aoBrightnessXYZPPN = render.field_147885_ae; } else { @@ -221,8 +221,8 @@ else if (render.hasOverrideBlockTexture()) if (!flag5 && !flag2) { - render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXYNP; - render.aoBrightnessXYZNPP = render.aoBrightnessXYNP; + render.aoLightValueScratchXYZNPP = render.field_147813_G; + render.aoBrightnessXYZNPP = render.field_147880_aa; } else { @@ -232,8 +232,8 @@ else if (render.hasOverrideBlockTexture()) if (!flag5 && !flag3) { - render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXYPP; - render.aoBrightnessXYZPPP = render.aoBrightnessXYPP; + render.aoLightValueScratchXYZPPP = render.field_147824_K; + render.aoBrightnessXYZPPP = render.field_147885_ae; } else { @@ -254,14 +254,14 @@ else if (render.hasOverrideBlockTexture()) } f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - f6 = (render.aoLightValueScratchXYZNPP + render.aoLightValueScratchXYNP + render.aoLightValueScratchYZPP + f7) / 4.0F; - f3 = (render.aoLightValueScratchYZPP + f7 + render.aoLightValueScratchXYZPPP + render.aoLightValueScratchXYPP) / 4.0F; - f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPN) / 4.0F; - f5 = (render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNPP, render.aoBrightnessXYNP, render.aoBrightnessYZPP, i1); - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXYZPPP, render.aoBrightnessXYPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXYPP, render.aoBrightnessXYZPPN, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYNP, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); + f6 = (render.aoLightValueScratchXYZNPP + render.field_147813_G + render.field_147817_L + f7) / 4.0F; + f3 = (render.field_147817_L + f7 + render.aoLightValueScratchXYZPPP + 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; + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNPP, render.field_147880_aa, render.field_147887_af, i1); + render.brightnessTopLeft = render.getAoBrightness(render.field_147887_af, render.aoBrightnessXYZPPP, render.field_147885_ae, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.field_147878_ac, render.field_147885_ae, render.aoBrightnessXYZPPN, i1); + render.brightnessBottomRight = render.getAoBrightness(render.field_147880_aa, render.aoBrightnessXYZNPN, render.field_147878_ac, i1); render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed; render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen; render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue; @@ -291,12 +291,12 @@ else if (render.hasOverrideBlockTexture()) } render.aoLightValueScratchXZNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.aoLightValueScratchYZNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.aoLightValueScratchYZPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, 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.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos); - render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); - render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147825_U = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147878_ac = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos); flag3 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos + 1, yPos, zPos - 1)]; flag2 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos - 1, yPos, zPos - 1)]; @@ -305,13 +305,13 @@ else if (render.hasOverrideBlockTexture()) if (!flag2 && !flag4) { - render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; - render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; + render.field_147888_x = render.aoLightValueScratchXZNN; + render.field_147832_R = render.aoBrightnessXZNN; } else { - render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); - render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.field_147888_x = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.field_147832_R = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos - 1, zPos); } if (!flag2 && !flag5) @@ -327,13 +327,13 @@ else if (render.hasOverrideBlockTexture()) if (!flag3 && !flag4) { - render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; - render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; + render.field_147816_C = render.aoLightValueScratchXZPN; + render.field_147827_W = render.aoBrightnessXZPN; } else { - render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); - render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.field_147816_C = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.field_147827_W = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos - 1, zPos); } if (!flag3 && !flag5) @@ -360,14 +360,14 @@ else if (render.hasOverrideBlockTexture()) } f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - f3 = (render.aoLightValueScratchXZNN + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; - f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZPPN) / 4.0F; - f5 = (render.aoLightValueScratchYZNN + f7 + render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXZPN) / 4.0F; - f6 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZNN + render.aoLightValueScratchYZNN + f7) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXZNN, render.aoBrightnessYZNN, i1); + f3 = (render.aoLightValueScratchXZNN + 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; + f6 = (render.field_147888_x + render.aoLightValueScratchXZNN + render.field_147814_A + f7) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.field_147878_ac, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.field_147878_ac, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, i1); + render.brightnessBottomRight = render.getAoBrightness(render.field_147825_U, render.field_147827_W, render.aoBrightnessXZPN, i1); + render.brightnessTopRight = render.getAoBrightness(render.field_147832_R, render.aoBrightnessXZNN, render.field_147825_U, i1); if (flag1) { @@ -409,12 +409,12 @@ else if (render.hasOverrideBlockTexture()) render.aoLightValueScratchXZNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); render.aoLightValueScratchXZPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - render.aoLightValueScratchYZNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.aoLightValueScratchYZPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, 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.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos); render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos); - render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); - render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147828_V = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147887_af = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); flag3 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos + 1, yPos, zPos + 1)]; flag2 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos - 1, yPos, zPos + 1)]; flag5 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos, yPos + 1, zPos + 1)]; @@ -422,13 +422,13 @@ else if (render.hasOverrideBlockTexture()) if (!flag2 && !flag4) { - render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; - render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; + render.field_147884_z = render.aoLightValueScratchXZNP; + render.field_147826_T = render.aoBrightnessXZNP; } else { - render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); - render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.field_147884_z = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.field_147826_T = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos - 1, zPos); } if (!flag2 && !flag5) @@ -444,13 +444,13 @@ else if (render.hasOverrideBlockTexture()) if (!flag3 && !flag4) { - render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; - render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; + render.field_147811_E = render.aoLightValueScratchXZPP; + render.field_147834_Y = render.aoBrightnessXZPP; } else { - render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); - render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.field_147811_E = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.field_147834_Y = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos - 1, zPos); } if (!flag3 && !flag5) @@ -477,14 +477,14 @@ else if (render.hasOverrideBlockTexture()) } f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - f3 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + f7 + render.aoLightValueScratchYZPP) / 4.0F; - f6 = (f7 + render.aoLightValueScratchYZPP + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYZPPP) / 4.0F; - f5 = (render.aoLightValueScratchYZNP + f7 + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXZPP) / 4.0F; - f4 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXZNP + render.aoLightValueScratchYZNP + f7) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, render.aoBrightnessYZNP, i1); + f3 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + f7 + render.field_147817_L) / 4.0F; + f6 = (f7 + render.field_147817_L + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYZPPP) / 4.0F; + f5 = (render.field_147815_B + f7 + render.field_147811_E + render.aoLightValueScratchXZPP) / 4.0F; + f4 = (render.field_147884_z + render.aoLightValueScratchXZNP + render.field_147815_B + f7) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.field_147887_af, i1); + render.brightnessTopRight = render.getAoBrightness(render.field_147887_af, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, i1); + render.brightnessBottomRight = render.getAoBrightness(render.field_147828_V, render.field_147834_Y, render.aoBrightnessXZPP, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.field_147826_T, render.aoBrightnessXZNP, render.field_147828_V, i1); if (flag1) { @@ -524,14 +524,14 @@ else if (render.hasOverrideBlockTexture()) --xPos; } - render.aoLightValueScratchXYNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147886_y = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); render.aoLightValueScratchXZNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); render.aoLightValueScratchXZNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.aoLightValueScratchXYNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147813_G = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147831_S = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos - 1); render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos + 1); - render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147880_aa = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); flag3 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos - 1, yPos + 1, zPos)]; flag2 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos - 1, yPos - 1, zPos)]; flag5 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos - 1, yPos, zPos - 1)]; @@ -539,24 +539,24 @@ else if (render.hasOverrideBlockTexture()) if (!flag5 && !flag2) { - render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; - render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; + render.field_147888_x = render.aoLightValueScratchXZNN; + render.field_147832_R = render.aoBrightnessXZNN; } else { - render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); - render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.field_147888_x = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.field_147832_R = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos - 1); } if (!flag4 && !flag2) { - render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; - render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; + render.field_147884_z = render.aoLightValueScratchXZNP; + render.field_147826_T = render.aoBrightnessXZNP; } else { - render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); - render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.field_147884_z = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.field_147826_T = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos + 1); } if (!flag5 && !flag3) @@ -594,14 +594,14 @@ else if (render.hasOverrideBlockTexture()) } f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - f6 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNP + f7 + render.aoLightValueScratchXZNP) / 4.0F; - f3 = (f7 + render.aoLightValueScratchXZNP + render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPP) / 4.0F; - f4 = (render.aoLightValueScratchXZNN + f7 + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F; - f5 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZNN + f7) / 4.0F; - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, i1); - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYNP, render.aoBrightnessXYZNPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessXYNP, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXYNN, render.aoBrightnessXZNN, i1); + f6 = (render.field_147886_y + render.field_147884_z + f7 + render.aoLightValueScratchXZNP) / 4.0F; + f3 = (f7 + render.aoLightValueScratchXZNP + render.field_147813_G + render.aoLightValueScratchXYZNPP) / 4.0F; + f4 = (render.aoLightValueScratchXZNN + f7 + render.aoLightValueScratchXYZNPN + render.field_147813_G) / 4.0F; + f5 = (render.field_147888_x + render.field_147886_y + render.aoLightValueScratchXZNN + f7) / 4.0F; + render.brightnessTopRight = render.getAoBrightness(render.field_147831_S, render.field_147826_T, render.aoBrightnessXZNP, i1); + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.field_147880_aa, render.aoBrightnessXYZNPP, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.field_147880_aa, i1); + render.brightnessBottomRight = render.getAoBrightness(render.field_147832_R, render.field_147831_S, render.aoBrightnessXZNN, i1); if (flag1) { @@ -641,14 +641,14 @@ else if (render.hasOverrideBlockTexture()) ++xPos; } - render.aoLightValueScratchXYPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); + 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.aoLightValueScratchXZPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.aoLightValueScratchXYPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147824_K = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147835_X = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos - 1); render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos + 1); - render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147885_ae = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); flag3 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos + 1, yPos + 1, zPos)]; flag2 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos + 1, yPos - 1, zPos)]; flag5 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos + 1, yPos, zPos + 1)]; @@ -656,24 +656,24 @@ else if (render.hasOverrideBlockTexture()) if (!flag2 && !flag4) { - render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; - render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; + render.field_147816_C = render.aoLightValueScratchXZPN; + render.field_147827_W = render.aoBrightnessXZPN; } else { - render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); - render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.field_147816_C = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.field_147827_W = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos - 1); } if (!flag2 && !flag5) { - render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; - render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; + render.field_147811_E = render.aoLightValueScratchXZPP; + render.field_147834_Y = render.aoBrightnessXZPP; } else { - render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); - render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.field_147811_E = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.field_147834_Y = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos + 1); } if (!flag3 && !flag4) @@ -711,14 +711,14 @@ else if (render.hasOverrideBlockTexture()) } f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - f3 = (render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNP + f7 + render.aoLightValueScratchXZPP) / 4.0F; - f4 = (render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXZPN + f7) / 4.0F; - f5 = (render.aoLightValueScratchXZPN + f7 + render.aoLightValueScratchXYZPPN + render.aoLightValueScratchXYPP) / 4.0F; - f6 = (f7 + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPP) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZPNN, render.aoBrightnessXYPN, render.aoBrightnessXZPN, i1); + f3 = (render.field_147810_D + render.field_147811_E + f7 + render.aoLightValueScratchXZPP) / 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; + f6 = (f7 + render.aoLightValueScratchXZPP + render.field_147824_K + render.aoLightValueScratchXYZPPP) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.field_147835_X, render.field_147834_Y, render.aoBrightnessXZPP, i1); + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXZPP, render.field_147885_ae, render.aoBrightnessXYZPPP, i1); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.field_147885_ae, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.field_147827_W, render.field_147835_X, render.aoBrightnessXZPN, i1); if (flag1) { @@ -751,14 +751,14 @@ else if (render.hasOverrideBlockTexture()) flag = true; } - render.enableAO = false; + render.field_147863_w = false; return flag; } static boolean renderMetadataBlockWithColorMultiplier (Block block, int metadata, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) { - render.enableAO = false; + render.field_147863_w = false; Tessellator tessellator = Tessellator.instance; boolean flag = false; float f3 = 0.5F; @@ -876,7 +876,7 @@ static boolean renderFakeBlockWithAmbientOcclusion (IIcon stillIcon, IIcon flowi IBlockAccess world) { Block block = Blocks.stone; - render.enableAO = true; + render.field_147863_w = true; boolean flag = false; float f3 = 0.0F; float f4 = 0.0F; @@ -910,14 +910,14 @@ else if (render.hasOverrideBlockTexture()) --yPos; } - render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos); - render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos - 1); - render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos + 1); - render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos); - render.aoLightValueScratchXYNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.aoLightValueScratchYZNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.aoLightValueScratchYZNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.aoLightValueScratchXYPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); + render.field_147831_S = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos); + render.field_147825_U = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos - 1); + render.field_147828_V = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos + 1); + render.field_147835_X = block.getMixedBrightnessForBlock(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.getBlockId(xPos + 1, yPos - 1, zPos)]; flag2 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos - 1, yPos - 1, zPos)]; flag5 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos, yPos - 1, zPos + 1)]; @@ -925,46 +925,46 @@ else if (render.hasOverrideBlockTexture()) if (!flag4 && !flag2) { - render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXYNN; - render.aoBrightnessXYZNNN = render.aoBrightnessXYNN; + render.field_147888_x = render.field_147886_y; + render.field_147832_R = render.field_147831_S; } else { - render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); - render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos - 1); + render.field_147888_x = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); + render.field_147832_R = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos - 1); } if (!flag5 && !flag2) { - render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXYNN; - render.aoBrightnessXYZNNP = render.aoBrightnessXYNN; + render.field_147884_z = render.field_147886_y; + render.field_147826_T = render.field_147831_S; } else { - render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); - render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos + 1); + render.field_147884_z = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); + render.field_147826_T = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos + 1); } if (!flag4 && !flag3) { - render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXYPN; - render.aoBrightnessXYZPNN = render.aoBrightnessXYPN; + render.field_147816_C = render.field_147810_D; + render.field_147827_W = render.field_147835_X; } else { - render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); - render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos - 1); + render.field_147816_C = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); + render.field_147827_W = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos - 1); } if (!flag5 && !flag3) { - render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXYPN; - render.aoBrightnessXYZPNP = render.aoBrightnessXYPN; + render.field_147811_E = render.field_147810_D; + render.field_147834_Y = render.field_147835_X; } else { - render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); - render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos + 1); + render.field_147811_E = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); + render.field_147834_Y = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos + 1); } if (render.renderMinY <= 0.0D) @@ -980,14 +980,14 @@ else if (render.hasOverrideBlockTexture()) } f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - f3 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXYNN + render.aoLightValueScratchYZNP + f7) / 4.0F; - f6 = (render.aoLightValueScratchYZNP + f7 + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXYPN) / 4.0F; - f5 = (f7 + render.aoLightValueScratchYZNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNN) / 4.0F; - f4 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNN + f7 + render.aoLightValueScratchYZNN) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXYNN, render.aoBrightnessYZNP, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXYPN, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYPN, render.aoBrightnessXYZPNN, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNN, render.aoBrightnessYZNN, i1); + 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; + f4 = (render.field_147886_y + render.field_147888_x + f7 + render.field_147814_A) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.field_147826_T, render.field_147831_S, render.field_147828_V, i1); + render.brightnessTopRight = render.getAoBrightness(render.field_147828_V, render.field_147834_Y, render.field_147835_X, i1); + render.brightnessBottomRight = render.getAoBrightness(render.field_147825_U, render.field_147835_X, render.field_147827_W, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.field_147831_S, render.field_147832_R, render.field_147825_U, i1); if (flag1) { @@ -1025,14 +1025,14 @@ else if (render.hasOverrideBlockTexture()) ++yPos; } - render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos); - render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos); - render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos - 1); - render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos + 1); - render.aoLightValueScratchXYNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.aoLightValueScratchXYPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - render.aoLightValueScratchYZPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.aoLightValueScratchYZPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); + render.field_147880_aa = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos); + render.field_147885_ae = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos); + render.field_147878_ac = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos - 1); + render.field_147887_af = block.getMixedBrightnessForBlock(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.getBlockId(xPos + 1, yPos + 1, zPos)]; flag2 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos - 1, yPos + 1, zPos)]; flag5 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos, yPos + 1, zPos + 1)]; @@ -1040,8 +1040,8 @@ else if (render.hasOverrideBlockTexture()) if (!flag4 && !flag2) { - render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXYNP; - render.aoBrightnessXYZNPN = render.aoBrightnessXYNP; + render.aoLightValueScratchXYZNPN = render.field_147813_G; + render.aoBrightnessXYZNPN = render.field_147880_aa; } else { @@ -1051,8 +1051,8 @@ else if (render.hasOverrideBlockTexture()) if (!flag4 && !flag3) { - render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXYPP; - render.aoBrightnessXYZPPN = render.aoBrightnessXYPP; + render.aoLightValueScratchXYZPPN = render.field_147824_K; + render.aoBrightnessXYZPPN = render.field_147885_ae; } else { @@ -1062,8 +1062,8 @@ else if (render.hasOverrideBlockTexture()) if (!flag5 && !flag2) { - render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXYNP; - render.aoBrightnessXYZNPP = render.aoBrightnessXYNP; + render.aoLightValueScratchXYZNPP = render.field_147813_G; + render.aoBrightnessXYZNPP = render.field_147880_aa; } else { @@ -1073,8 +1073,8 @@ else if (render.hasOverrideBlockTexture()) if (!flag5 && !flag3) { - render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXYPP; - render.aoBrightnessXYZPPP = render.aoBrightnessXYPP; + render.aoLightValueScratchXYZPPP = render.field_147824_K; + render.aoBrightnessXYZPPP = render.field_147885_ae; } else { @@ -1095,14 +1095,14 @@ else if (render.hasOverrideBlockTexture()) } f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - f6 = (render.aoLightValueScratchXYZNPP + render.aoLightValueScratchXYNP + render.aoLightValueScratchYZPP + f7) / 4.0F; - f3 = (render.aoLightValueScratchYZPP + f7 + render.aoLightValueScratchXYZPPP + render.aoLightValueScratchXYPP) / 4.0F; - f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPN) / 4.0F; - f5 = (render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNPP, render.aoBrightnessXYNP, render.aoBrightnessYZPP, i1); - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXYZPPP, render.aoBrightnessXYPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXYPP, render.aoBrightnessXYZPPN, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYNP, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); + f6 = (render.aoLightValueScratchXYZNPP + render.field_147813_G + render.field_147817_L + f7) / 4.0F; + f3 = (render.field_147817_L + f7 + render.aoLightValueScratchXYZPPP + 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; + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNPP, render.field_147880_aa, render.field_147887_af, i1); + render.brightnessTopLeft = render.getAoBrightness(render.field_147887_af, render.aoBrightnessXYZPPP, render.field_147885_ae, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.field_147878_ac, render.field_147885_ae, render.aoBrightnessXYZPPN, i1); + render.brightnessBottomRight = render.getAoBrightness(render.field_147880_aa, render.aoBrightnessXYZNPN, render.field_147878_ac, i1); render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed; render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen; render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue; @@ -1130,12 +1130,12 @@ else if (render.hasOverrideBlockTexture()) } render.aoLightValueScratchXZNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.aoLightValueScratchYZNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.aoLightValueScratchYZPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, 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.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos); - render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); - render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147825_U = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147878_ac = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos); flag3 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos + 1, yPos, zPos - 1)]; flag2 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos - 1, yPos, zPos - 1)]; @@ -1144,13 +1144,13 @@ else if (render.hasOverrideBlockTexture()) if (!flag2 && !flag4) { - render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; - render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; + render.field_147888_x = render.aoLightValueScratchXZNN; + render.field_147832_R = render.aoBrightnessXZNN; } else { - render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); - render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.field_147888_x = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.field_147832_R = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos - 1, zPos); } if (!flag2 && !flag5) @@ -1166,13 +1166,13 @@ else if (render.hasOverrideBlockTexture()) if (!flag3 && !flag4) { - render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; - render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; + render.field_147816_C = render.aoLightValueScratchXZPN; + render.field_147827_W = render.aoBrightnessXZPN; } else { - render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); - render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.field_147816_C = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.field_147827_W = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos - 1, zPos); } if (!flag3 && !flag5) @@ -1199,14 +1199,14 @@ else if (render.hasOverrideBlockTexture()) } f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - f3 = (render.aoLightValueScratchXZNN + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; - f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZPPN) / 4.0F; - f5 = (render.aoLightValueScratchYZNN + f7 + render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXZPN) / 4.0F; - f6 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZNN + render.aoLightValueScratchYZNN + f7) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXZNN, render.aoBrightnessYZNN, i1); + f3 = (render.aoLightValueScratchXZNN + 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; + f6 = (render.field_147888_x + render.aoLightValueScratchXZNN + render.field_147814_A + f7) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.field_147878_ac, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.field_147878_ac, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, i1); + render.brightnessBottomRight = render.getAoBrightness(render.field_147825_U, render.field_147827_W, render.aoBrightnessXZPN, i1); + render.brightnessTopRight = render.getAoBrightness(render.field_147832_R, render.aoBrightnessXZNN, render.field_147825_U, i1); if (flag1) { @@ -1247,12 +1247,12 @@ else if (render.hasOverrideBlockTexture()) render.aoLightValueScratchXZNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); render.aoLightValueScratchXZPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - render.aoLightValueScratchYZNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.aoLightValueScratchYZPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, 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.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos); render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos); - render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); - render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147828_V = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147887_af = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); flag3 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos + 1, yPos, zPos + 1)]; flag2 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos - 1, yPos, zPos + 1)]; flag5 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos, yPos + 1, zPos + 1)]; @@ -1260,13 +1260,13 @@ else if (render.hasOverrideBlockTexture()) if (!flag2 && !flag4) { - render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; - render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; + render.field_147884_z = render.aoLightValueScratchXZNP; + render.field_147826_T = render.aoBrightnessXZNP; } else { - render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); - render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.field_147884_z = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.field_147826_T = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos - 1, zPos); } if (!flag2 && !flag5) @@ -1282,13 +1282,13 @@ else if (render.hasOverrideBlockTexture()) if (!flag3 && !flag4) { - render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; - render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; + render.field_147811_E = render.aoLightValueScratchXZPP; + render.field_147834_Y = render.aoBrightnessXZPP; } else { - render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); - render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.field_147811_E = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.field_147834_Y = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos - 1, zPos); } if (!flag3 && !flag5) @@ -1315,14 +1315,14 @@ else if (render.hasOverrideBlockTexture()) } f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - f3 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + f7 + render.aoLightValueScratchYZPP) / 4.0F; - f6 = (f7 + render.aoLightValueScratchYZPP + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYZPPP) / 4.0F; - f5 = (render.aoLightValueScratchYZNP + f7 + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXZPP) / 4.0F; - f4 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXZNP + render.aoLightValueScratchYZNP + f7) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, render.aoBrightnessYZNP, i1); + f3 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + f7 + render.field_147817_L) / 4.0F; + f6 = (f7 + render.field_147817_L + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYZPPP) / 4.0F; + f5 = (render.field_147815_B + f7 + render.field_147811_E + render.aoLightValueScratchXZPP) / 4.0F; + f4 = (render.field_147884_z + render.aoLightValueScratchXZNP + render.field_147815_B + f7) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.field_147887_af, i1); + render.brightnessTopRight = render.getAoBrightness(render.field_147887_af, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, i1); + render.brightnessBottomRight = render.getAoBrightness(render.field_147828_V, render.field_147834_Y, render.aoBrightnessXZPP, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.field_147826_T, render.aoBrightnessXZNP, render.field_147828_V, i1); if (flag1) { @@ -1361,14 +1361,14 @@ else if (render.hasOverrideBlockTexture()) --xPos; } - render.aoLightValueScratchXYNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147886_y = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); render.aoLightValueScratchXZNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); render.aoLightValueScratchXZNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.aoLightValueScratchXYNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147813_G = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147831_S = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos - 1); render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos + 1); - render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147880_aa = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); flag3 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos - 1, yPos + 1, zPos)]; flag2 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos - 1, yPos - 1, zPos)]; flag5 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos - 1, yPos, zPos - 1)]; @@ -1376,24 +1376,24 @@ else if (render.hasOverrideBlockTexture()) if (!flag5 && !flag2) { - render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; - render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; + render.field_147888_x = render.aoLightValueScratchXZNN; + render.field_147832_R = render.aoBrightnessXZNN; } else { - render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); - render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.field_147888_x = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.field_147832_R = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos - 1); } if (!flag4 && !flag2) { - render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; - render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; + render.field_147884_z = render.aoLightValueScratchXZNP; + render.field_147826_T = render.aoBrightnessXZNP; } else { - render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); - render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.field_147884_z = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.field_147826_T = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos + 1); } if (!flag5 && !flag3) @@ -1431,14 +1431,14 @@ else if (render.hasOverrideBlockTexture()) } f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - f6 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNP + f7 + render.aoLightValueScratchXZNP) / 4.0F; - f3 = (f7 + render.aoLightValueScratchXZNP + render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPP) / 4.0F; - f4 = (render.aoLightValueScratchXZNN + f7 + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F; - f5 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZNN + f7) / 4.0F; - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, i1); - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYNP, render.aoBrightnessXYZNPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessXYNP, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXYNN, render.aoBrightnessXZNN, i1); + f6 = (render.field_147886_y + render.field_147884_z + f7 + render.aoLightValueScratchXZNP) / 4.0F; + f3 = (f7 + render.aoLightValueScratchXZNP + render.field_147813_G + render.aoLightValueScratchXYZNPP) / 4.0F; + f4 = (render.aoLightValueScratchXZNN + f7 + render.aoLightValueScratchXYZNPN + render.field_147813_G) / 4.0F; + f5 = (render.field_147888_x + render.field_147886_y + render.aoLightValueScratchXZNN + f7) / 4.0F; + render.brightnessTopRight = render.getAoBrightness(render.field_147831_S, render.field_147826_T, render.aoBrightnessXZNP, i1); + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.field_147880_aa, render.aoBrightnessXYZNPP, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.field_147880_aa, i1); + render.brightnessBottomRight = render.getAoBrightness(render.field_147832_R, render.field_147831_S, render.aoBrightnessXZNN, i1); if (flag1) { @@ -1477,14 +1477,14 @@ else if (render.hasOverrideBlockTexture()) ++xPos; } - render.aoLightValueScratchXYPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); + 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.aoLightValueScratchXZPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.aoLightValueScratchXYPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147824_K = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147835_X = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos - 1); render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos + 1); - render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147885_ae = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); flag3 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos + 1, yPos + 1, zPos)]; flag2 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos + 1, yPos - 1, zPos)]; flag5 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos + 1, yPos, zPos + 1)]; @@ -1492,24 +1492,24 @@ else if (render.hasOverrideBlockTexture()) if (!flag2 && !flag4) { - render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; - render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; + render.field_147816_C = render.aoLightValueScratchXZPN; + render.field_147827_W = render.aoBrightnessXZPN; } else { - render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); - render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.field_147816_C = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.field_147827_W = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos - 1); } if (!flag2 && !flag5) { - render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; - render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; + render.field_147811_E = render.aoLightValueScratchXZPP; + render.field_147834_Y = render.aoBrightnessXZPP; } else { - render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); - render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.field_147811_E = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.field_147834_Y = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos + 1); } if (!flag3 && !flag4) @@ -1547,14 +1547,14 @@ else if (render.hasOverrideBlockTexture()) } f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - f3 = (render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNP + f7 + render.aoLightValueScratchXZPP) / 4.0F; - f4 = (render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXZPN + f7) / 4.0F; - f5 = (render.aoLightValueScratchXZPN + f7 + render.aoLightValueScratchXYZPPN + render.aoLightValueScratchXYPP) / 4.0F; - f6 = (f7 + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPP) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZPNN, render.aoBrightnessXYPN, render.aoBrightnessXZPN, i1); + f3 = (render.field_147810_D + render.field_147811_E + f7 + render.aoLightValueScratchXZPP) / 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; + f6 = (f7 + render.aoLightValueScratchXZPP + render.field_147824_K + render.aoLightValueScratchXYZPPP) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.field_147835_X, render.field_147834_Y, render.aoBrightnessXZPP, i1); + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXZPP, render.field_147885_ae, render.aoBrightnessXYZPPP, i1); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.field_147885_ae, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.field_147827_W, render.field_147835_X, render.aoBrightnessXZPN, i1); if (flag1) { @@ -1586,7 +1586,7 @@ else if (render.hasOverrideBlockTexture()) flag = true; } - render.enableAO = false; + render.field_147863_w = false; return flag; } @@ -1594,7 +1594,7 @@ static boolean renderFakeBlockWithColorMultiplier (IIcon stillIcon, IIcon flowin IBlockAccess world) { Block block = Blocks.stone; - render.enableAO = false; + render.field_147863_w = false; Tessellator tessellator = Tessellator.instance; boolean flag = false; float f3 = 0.5F; diff --git a/src/main/java/tconstruct/client/block/RenderLiquid.java b/src/main/java/tconstruct/client/block/RenderLiquid.java index 3136e1aefeb..e012ca30edb 100644 --- a/src/main/java/tconstruct/client/block/RenderLiquid.java +++ b/src/main/java/tconstruct/client/block/RenderLiquid.java @@ -39,7 +39,7 @@ public static boolean renderMetadataBlock (Block block, int metadata, int x, int static boolean renderMetadataBlockWithAmbientOcclusion (Block block, int metadata, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) { - render.enableAO = true; + render.field_147863_w = true; boolean flag = false; float f3 = 0.0F; float f4 = 0.0F; @@ -66,14 +66,14 @@ else if (render.hasOverrideBlockTexture()) yPos--; } - render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos); - render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos - 1); - render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos + 1); - render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos); - render.aoLightValueScratchXYNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.aoLightValueScratchYZNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.aoLightValueScratchYZNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.aoLightValueScratchXYPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); + render.field_147831_S = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos); + render.field_147825_U = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos - 1); + render.field_147828_V = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos + 1); + render.field_147835_X = block.getMixedBrightnessForBlock(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.getBlockId(xPos + 1, yPos - 1, zPos)]; boolean flag2 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos - 1, yPos - 1, zPos)]; boolean flag5 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos, yPos - 1, zPos + 1)]; @@ -81,46 +81,46 @@ else if (render.hasOverrideBlockTexture()) if ((!flag4) && (!flag2)) { - render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXYNN; - render.aoBrightnessXYZNNN = render.aoBrightnessXYNN; + render.field_147888_x = render.field_147886_y; + render.field_147832_R = render.field_147831_S; } else { - render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); - render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos - 1); + render.field_147888_x = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); + render.field_147832_R = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos - 1); } if ((!flag5) && (!flag2)) { - render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXYNN; - render.aoBrightnessXYZNNP = render.aoBrightnessXYNN; + render.field_147884_z = render.field_147886_y; + render.field_147826_T = render.field_147831_S; } else { - render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); - render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos + 1); + render.field_147884_z = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); + render.field_147826_T = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos + 1); } if ((!flag4) && (!flag3)) { - render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXYPN; - render.aoBrightnessXYZPNN = render.aoBrightnessXYPN; + render.field_147816_C = render.field_147810_D; + render.field_147827_W = render.field_147835_X; } else { - render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); - render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos - 1); + render.field_147816_C = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); + render.field_147827_W = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos - 1); } if ((!flag5) && (!flag3)) { - render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXYPN; - render.aoBrightnessXYZPNP = render.aoBrightnessXYPN; + render.field_147811_E = render.field_147810_D; + render.field_147834_Y = render.field_147835_X; } else { - render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); - render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos + 1); + render.field_147811_E = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); + render.field_147834_Y = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos + 1); } if (render.renderMinY <= 0.0D) @@ -136,14 +136,14 @@ else if (render.hasOverrideBlockTexture()) } float f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - f3 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXYNN + render.aoLightValueScratchYZNP + f7) / 4.0F; - f6 = (render.aoLightValueScratchYZNP + f7 + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXYPN) / 4.0F; - f5 = (f7 + render.aoLightValueScratchYZNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNN) / 4.0F; - f4 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNN + f7 + render.aoLightValueScratchYZNN) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXYNN, render.aoBrightnessYZNP, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXYPN, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYPN, render.aoBrightnessXYZPNN, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNN, render.aoBrightnessYZNN, i1); + 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; + f4 = (render.field_147886_y + render.field_147888_x + f7 + render.field_147814_A) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.field_147826_T, render.field_147831_S, render.field_147828_V, i1); + render.brightnessTopRight = render.getAoBrightness(render.field_147828_V, render.field_147834_Y, render.field_147835_X, i1); + render.brightnessBottomRight = render.getAoBrightness(render.field_147825_U, render.field_147835_X, render.field_147827_W, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.field_147831_S, render.field_147832_R, render.field_147825_U, i1); if (flag1) { @@ -181,14 +181,14 @@ else if (render.hasOverrideBlockTexture()) yPos++; } - render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos); - render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos); - render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos - 1); - render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos + 1); - render.aoLightValueScratchXYNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.aoLightValueScratchXYPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - render.aoLightValueScratchYZPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.aoLightValueScratchYZPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); + render.field_147880_aa = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos); + render.field_147885_ae = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos); + render.field_147878_ac = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos - 1); + render.field_147887_af = block.getMixedBrightnessForBlock(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.getBlockId(xPos + 1, yPos + 1, zPos)]; boolean flag2 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos - 1, yPos + 1, zPos)]; boolean flag5 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos, yPos + 1, zPos + 1)]; @@ -196,8 +196,8 @@ else if (render.hasOverrideBlockTexture()) if ((!flag4) && (!flag2)) { - render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXYNP; - render.aoBrightnessXYZNPN = render.aoBrightnessXYNP; + render.aoLightValueScratchXYZNPN = render.field_147813_G; + render.aoBrightnessXYZNPN = render.field_147880_aa; } else { @@ -207,8 +207,8 @@ else if (render.hasOverrideBlockTexture()) if ((!flag4) && (!flag3)) { - render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXYPP; - render.aoBrightnessXYZPPN = render.aoBrightnessXYPP; + render.aoLightValueScratchXYZPPN = render.field_147824_K; + render.aoBrightnessXYZPPN = render.field_147885_ae; } else { @@ -218,8 +218,8 @@ else if (render.hasOverrideBlockTexture()) if ((!flag5) && (!flag2)) { - render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXYNP; - render.aoBrightnessXYZNPP = render.aoBrightnessXYNP; + render.aoLightValueScratchXYZNPP = render.field_147813_G; + render.aoBrightnessXYZNPP = render.field_147880_aa; } else { @@ -229,8 +229,8 @@ else if (render.hasOverrideBlockTexture()) if ((!flag5) && (!flag3)) { - render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXYPP; - render.aoBrightnessXYZPPP = render.aoBrightnessXYPP; + render.aoLightValueScratchXYZPPP = render.field_147824_K; + render.aoBrightnessXYZPPP = render.field_147885_ae; } else { @@ -251,14 +251,14 @@ else if (render.hasOverrideBlockTexture()) } float f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - f6 = (render.aoLightValueScratchXYZNPP + render.aoLightValueScratchXYNP + render.aoLightValueScratchYZPP + f7) / 4.0F; - f3 = (render.aoLightValueScratchYZPP + f7 + render.aoLightValueScratchXYZPPP + render.aoLightValueScratchXYPP) / 4.0F; - f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPN) / 4.0F; - f5 = (render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNPP, render.aoBrightnessXYNP, render.aoBrightnessYZPP, i1); - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXYZPPP, render.aoBrightnessXYPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXYPP, render.aoBrightnessXYZPPN, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYNP, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); + f6 = (render.aoLightValueScratchXYZNPP + render.field_147813_G + render.field_147817_L + f7) / 4.0F; + f3 = (render.field_147817_L + f7 + render.aoLightValueScratchXYZPPP + 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; + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNPP, render.field_147880_aa, render.field_147887_af, i1); + render.brightnessTopLeft = render.getAoBrightness(render.field_147887_af, render.aoBrightnessXYZPPP, render.field_147885_ae, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.field_147878_ac, render.field_147885_ae, render.aoBrightnessXYZPPN, i1); + render.brightnessBottomRight = render.getAoBrightness(render.field_147880_aa, render.aoBrightnessXYZNPN, render.field_147878_ac, i1); render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed); render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen); render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue); @@ -286,12 +286,12 @@ else if (render.hasOverrideBlockTexture()) } render.aoLightValueScratchXZNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.aoLightValueScratchYZNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.aoLightValueScratchYZPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, 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.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos); - render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); - render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147825_U = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147878_ac = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos); boolean flag3 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos + 1, yPos, zPos - 1)]; boolean flag2 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos - 1, yPos, zPos - 1)]; @@ -300,13 +300,13 @@ else if (render.hasOverrideBlockTexture()) if ((!flag2) && (!flag4)) { - render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; - render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; + render.field_147888_x = render.aoLightValueScratchXZNN; + render.field_147832_R = render.aoBrightnessXZNN; } else { - render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); - render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.field_147888_x = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.field_147832_R = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos - 1, zPos); } if ((!flag2) && (!flag5)) @@ -322,13 +322,13 @@ else if (render.hasOverrideBlockTexture()) if ((!flag3) && (!flag4)) { - render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; - render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; + render.field_147816_C = render.aoLightValueScratchXZPN; + render.field_147827_W = render.aoBrightnessXZPN; } else { - render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); - render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.field_147816_C = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.field_147827_W = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos - 1, zPos); } if ((!flag3) && (!flag5)) @@ -355,14 +355,14 @@ else if (render.hasOverrideBlockTexture()) } float f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - f3 = (render.aoLightValueScratchXZNN + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; - f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZPPN) / 4.0F; - f5 = (render.aoLightValueScratchYZNN + f7 + render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXZPN) / 4.0F; - f6 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZNN + render.aoLightValueScratchYZNN + f7) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXZNN, render.aoBrightnessYZNN, i1); + f3 = (render.aoLightValueScratchXZNN + 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; + f6 = (render.field_147888_x + render.aoLightValueScratchXZNN + render.field_147814_A + f7) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.field_147878_ac, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.field_147878_ac, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, i1); + render.brightnessBottomRight = render.getAoBrightness(render.field_147825_U, render.field_147827_W, render.aoBrightnessXZPN, i1); + render.brightnessTopRight = render.getAoBrightness(render.field_147832_R, render.aoBrightnessXZNN, render.field_147825_U, i1); if (flag1) { @@ -404,12 +404,12 @@ else if (render.hasOverrideBlockTexture()) render.aoLightValueScratchXZNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); render.aoLightValueScratchXZPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - render.aoLightValueScratchYZNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.aoLightValueScratchYZPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, 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.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos); render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos); - render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); - render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147828_V = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147887_af = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); boolean flag3 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos + 1, yPos, zPos + 1)]; boolean flag2 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos - 1, yPos, zPos + 1)]; boolean flag5 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos, yPos + 1, zPos + 1)]; @@ -417,13 +417,13 @@ else if (render.hasOverrideBlockTexture()) if ((!flag2) && (!flag4)) { - render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; - render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; + render.field_147884_z = render.aoLightValueScratchXZNP; + render.field_147826_T = render.aoBrightnessXZNP; } else { - render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); - render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.field_147884_z = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.field_147826_T = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos - 1, zPos); } if ((!flag2) && (!flag5)) @@ -439,13 +439,13 @@ else if (render.hasOverrideBlockTexture()) if ((!flag3) && (!flag4)) { - render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; - render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; + render.field_147811_E = render.aoLightValueScratchXZPP; + render.field_147834_Y = render.aoBrightnessXZPP; } else { - render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); - render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.field_147811_E = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.field_147834_Y = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos - 1, zPos); } if ((!flag3) && (!flag5)) @@ -472,14 +472,14 @@ else if (render.hasOverrideBlockTexture()) } float f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - f3 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + f7 + render.aoLightValueScratchYZPP) / 4.0F; - f6 = (f7 + render.aoLightValueScratchYZPP + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYZPPP) / 4.0F; - f5 = (render.aoLightValueScratchYZNP + f7 + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXZPP) / 4.0F; - f4 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXZNP + render.aoLightValueScratchYZNP + f7) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, render.aoBrightnessYZNP, i1); + f3 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + f7 + render.field_147817_L) / 4.0F; + f6 = (f7 + render.field_147817_L + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYZPPP) / 4.0F; + f5 = (render.field_147815_B + f7 + render.field_147811_E + render.aoLightValueScratchXZPP) / 4.0F; + f4 = (render.field_147884_z + render.aoLightValueScratchXZNP + render.field_147815_B + f7) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.field_147887_af, i1); + render.brightnessTopRight = render.getAoBrightness(render.field_147887_af, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, i1); + render.brightnessBottomRight = render.getAoBrightness(render.field_147828_V, render.field_147834_Y, render.aoBrightnessXZPP, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.field_147826_T, render.aoBrightnessXZNP, render.field_147828_V, i1); if (flag1) { @@ -519,14 +519,14 @@ else if (render.hasOverrideBlockTexture()) xPos--; } - render.aoLightValueScratchXYNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147886_y = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); render.aoLightValueScratchXZNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); render.aoLightValueScratchXZNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.aoLightValueScratchXYNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147813_G = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147831_S = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos - 1); render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos + 1); - render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147880_aa = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); boolean flag3 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos - 1, yPos + 1, zPos)]; boolean flag2 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos - 1, yPos - 1, zPos)]; boolean flag5 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos - 1, yPos, zPos - 1)]; @@ -534,24 +534,24 @@ else if (render.hasOverrideBlockTexture()) if ((!flag5) && (!flag2)) { - render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; - render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; + render.field_147888_x = render.aoLightValueScratchXZNN; + render.field_147832_R = render.aoBrightnessXZNN; } else { - render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); - render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.field_147888_x = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.field_147832_R = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos - 1); } if ((!flag4) && (!flag2)) { - render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; - render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; + render.field_147884_z = render.aoLightValueScratchXZNP; + render.field_147826_T = render.aoBrightnessXZNP; } else { - render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); - render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.field_147884_z = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.field_147826_T = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos + 1); } if ((!flag5) && (!flag3)) @@ -589,14 +589,14 @@ else if (render.hasOverrideBlockTexture()) } float f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - f6 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNP + f7 + render.aoLightValueScratchXZNP) / 4.0F; - f3 = (f7 + render.aoLightValueScratchXZNP + render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPP) / 4.0F; - f4 = (render.aoLightValueScratchXZNN + f7 + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F; - f5 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZNN + f7) / 4.0F; - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, i1); - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYNP, render.aoBrightnessXYZNPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessXYNP, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXYNN, render.aoBrightnessXZNN, i1); + f6 = (render.field_147886_y + render.field_147884_z + f7 + render.aoLightValueScratchXZNP) / 4.0F; + f3 = (f7 + render.aoLightValueScratchXZNP + render.field_147813_G + render.aoLightValueScratchXYZNPP) / 4.0F; + f4 = (render.aoLightValueScratchXZNN + f7 + render.aoLightValueScratchXYZNPN + render.field_147813_G) / 4.0F; + f5 = (render.field_147888_x + render.field_147886_y + render.aoLightValueScratchXZNN + f7) / 4.0F; + render.brightnessTopRight = render.getAoBrightness(render.field_147831_S, render.field_147826_T, render.aoBrightnessXZNP, i1); + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.field_147880_aa, render.aoBrightnessXYZNPP, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.field_147880_aa, i1); + render.brightnessBottomRight = render.getAoBrightness(render.field_147832_R, render.field_147831_S, render.aoBrightnessXZNN, i1); if (flag1) { @@ -636,14 +636,14 @@ else if (render.hasOverrideBlockTexture()) xPos++; } - render.aoLightValueScratchXYPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); + 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.aoLightValueScratchXZPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.aoLightValueScratchXYPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147824_K = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147835_X = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos - 1); render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos + 1); - render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147885_ae = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); boolean flag3 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos + 1, yPos + 1, zPos)]; boolean flag2 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos + 1, yPos - 1, zPos)]; boolean flag5 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos + 1, yPos, zPos + 1)]; @@ -651,24 +651,24 @@ else if (render.hasOverrideBlockTexture()) if ((!flag2) && (!flag4)) { - render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; - render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; + render.field_147816_C = render.aoLightValueScratchXZPN; + render.field_147827_W = render.aoBrightnessXZPN; } else { - render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); - render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.field_147816_C = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.field_147827_W = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos - 1); } if ((!flag2) && (!flag5)) { - render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; - render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; + render.field_147811_E = render.aoLightValueScratchXZPP; + render.field_147834_Y = render.aoBrightnessXZPP; } else { - render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); - render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.field_147811_E = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.field_147834_Y = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos + 1); } if ((!flag3) && (!flag4)) @@ -706,14 +706,14 @@ else if (render.hasOverrideBlockTexture()) } float f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - f3 = (render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNP + f7 + render.aoLightValueScratchXZPP) / 4.0F; - f4 = (render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXZPN + f7) / 4.0F; - f5 = (render.aoLightValueScratchXZPN + f7 + render.aoLightValueScratchXYZPPN + render.aoLightValueScratchXYPP) / 4.0F; - f6 = (f7 + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPP) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZPNN, render.aoBrightnessXYPN, render.aoBrightnessXZPN, i1); + f3 = (render.field_147810_D + render.field_147811_E + f7 + render.aoLightValueScratchXZPP) / 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; + f6 = (f7 + render.aoLightValueScratchXZPP + render.field_147824_K + render.aoLightValueScratchXYZPPP) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.field_147835_X, render.field_147834_Y, render.aoBrightnessXZPP, i1); + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXZPP, render.field_147885_ae, render.aoBrightnessXYZPPP, i1); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.field_147885_ae, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.field_147827_W, render.field_147835_X, render.aoBrightnessXZPN, i1); if (flag1) { @@ -746,14 +746,14 @@ else if (render.hasOverrideBlockTexture()) flag = true; } - render.enableAO = false; + render.field_147863_w = false; return flag; } static boolean renderMetadataBlockWithColorMultiplier (Block block, int metadata, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) { - render.enableAO = false; + render.field_147863_w = false; Tessellator tessellator = Tessellator.instance; boolean flag = false; float f3 = 0.5F; @@ -773,7 +773,7 @@ static boolean renderMetadataBlockWithColorMultiplier (Block block, int metadata float f17 = f5; float f18 = f6; - if (block != Block.grass) + if (block != Blocks.grass) { f10 = f3 * colorRed; f11 = f5 * colorRed; @@ -868,7 +868,7 @@ public static boolean renderFakeBlock (IIcon texture, int x, int y, int z, Rende static boolean renderFakeBlockWithAmbientOcclusion (IIcon texture, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) { Block block = Blocks.stone; - render.enableAO = true; + render.field_147863_w = true; boolean flag = false; float f3 = 0.0F; float f4 = 0.0F; @@ -895,14 +895,14 @@ else if (render.hasOverrideBlockTexture()) yPos--; } - render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos); - render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos - 1); - render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos + 1); - render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos); - render.aoLightValueScratchXYNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.aoLightValueScratchYZNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.aoLightValueScratchYZNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.aoLightValueScratchXYPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); + render.field_147831_S = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos); + render.field_147825_U = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos - 1); + render.field_147828_V = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos + 1); + render.field_147835_X = block.getMixedBrightnessForBlock(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.getBlockId(xPos + 1, yPos - 1, zPos)]; boolean flag2 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos - 1, yPos - 1, zPos)]; boolean flag5 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos, yPos - 1, zPos + 1)]; @@ -910,46 +910,46 @@ else if (render.hasOverrideBlockTexture()) if ((!flag4) && (!flag2)) { - render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXYNN; - render.aoBrightnessXYZNNN = render.aoBrightnessXYNN; + render.field_147888_x = render.field_147886_y; + render.field_147832_R = render.field_147831_S; } else { - render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); - render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos - 1); + render.field_147888_x = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); + render.field_147832_R = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos - 1); } if ((!flag5) && (!flag2)) { - render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXYNN; - render.aoBrightnessXYZNNP = render.aoBrightnessXYNN; + render.field_147884_z = render.field_147886_y; + render.field_147826_T = render.field_147831_S; } else { - render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); - render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos + 1); + render.field_147884_z = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); + render.field_147826_T = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos + 1); } if ((!flag4) && (!flag3)) { - render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXYPN; - render.aoBrightnessXYZPNN = render.aoBrightnessXYPN; + render.field_147816_C = render.field_147810_D; + render.field_147827_W = render.field_147835_X; } else { - render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); - render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos - 1); + render.field_147816_C = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); + render.field_147827_W = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos - 1); } if ((!flag5) && (!flag3)) { - render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXYPN; - render.aoBrightnessXYZPNP = render.aoBrightnessXYPN; + render.field_147811_E = render.field_147810_D; + render.field_147834_Y = render.field_147835_X; } else { - render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); - render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos + 1); + render.field_147811_E = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); + render.field_147834_Y = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos + 1); } if (render.renderMinY <= 0.0D) @@ -965,14 +965,14 @@ else if (render.hasOverrideBlockTexture()) } float f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - f3 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXYNN + render.aoLightValueScratchYZNP + f7) / 4.0F; - f6 = (render.aoLightValueScratchYZNP + f7 + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXYPN) / 4.0F; - f5 = (f7 + render.aoLightValueScratchYZNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNN) / 4.0F; - f4 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNN + f7 + render.aoLightValueScratchYZNN) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXYNN, render.aoBrightnessYZNP, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXYPN, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYPN, render.aoBrightnessXYZPNN, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNN, render.aoBrightnessYZNN, i1); + 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; + f4 = (render.field_147886_y + render.field_147888_x + f7 + render.field_147814_A) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.field_147826_T, render.field_147831_S, render.field_147828_V, i1); + render.brightnessTopRight = render.getAoBrightness(render.field_147828_V, render.field_147834_Y, render.field_147835_X, i1); + render.brightnessBottomRight = render.getAoBrightness(render.field_147825_U, render.field_147835_X, render.field_147827_W, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.field_147831_S, render.field_147832_R, render.field_147825_U, i1); if (flag1) { @@ -1010,14 +1010,14 @@ else if (render.hasOverrideBlockTexture()) yPos++; } - render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos); - render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos); - render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos - 1); - render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos + 1); - render.aoLightValueScratchXYNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.aoLightValueScratchXYPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - render.aoLightValueScratchYZPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.aoLightValueScratchYZPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); + render.field_147880_aa = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos); + render.field_147885_ae = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos); + render.field_147878_ac = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos - 1); + render.field_147887_af = block.getMixedBrightnessForBlock(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.getBlockId(xPos + 1, yPos + 1, zPos)]; boolean flag2 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos - 1, yPos + 1, zPos)]; boolean flag5 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos, yPos + 1, zPos + 1)]; @@ -1025,8 +1025,8 @@ else if (render.hasOverrideBlockTexture()) if ((!flag4) && (!flag2)) { - render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXYNP; - render.aoBrightnessXYZNPN = render.aoBrightnessXYNP; + render.aoLightValueScratchXYZNPN = render.field_147813_G; + render.aoBrightnessXYZNPN = render.field_147880_aa; } else { @@ -1036,8 +1036,8 @@ else if (render.hasOverrideBlockTexture()) if ((!flag4) && (!flag3)) { - render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXYPP; - render.aoBrightnessXYZPPN = render.aoBrightnessXYPP; + render.aoLightValueScratchXYZPPN = render.field_147824_K; + render.aoBrightnessXYZPPN = render.field_147885_ae; } else { @@ -1047,8 +1047,8 @@ else if (render.hasOverrideBlockTexture()) if ((!flag5) && (!flag2)) { - render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXYNP; - render.aoBrightnessXYZNPP = render.aoBrightnessXYNP; + render.aoLightValueScratchXYZNPP = render.field_147813_G; + render.aoBrightnessXYZNPP = render.field_147880_aa; } else { @@ -1058,8 +1058,8 @@ else if (render.hasOverrideBlockTexture()) if ((!flag5) && (!flag3)) { - render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXYPP; - render.aoBrightnessXYZPPP = render.aoBrightnessXYPP; + render.aoLightValueScratchXYZPPP = render.field_147824_K; + render.aoBrightnessXYZPPP = render.field_147885_ae; } else { @@ -1080,14 +1080,14 @@ else if (render.hasOverrideBlockTexture()) } float f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - f6 = (render.aoLightValueScratchXYZNPP + render.aoLightValueScratchXYNP + render.aoLightValueScratchYZPP + f7) / 4.0F; - f3 = (render.aoLightValueScratchYZPP + f7 + render.aoLightValueScratchXYZPPP + render.aoLightValueScratchXYPP) / 4.0F; - f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPN) / 4.0F; - f5 = (render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNPP, render.aoBrightnessXYNP, render.aoBrightnessYZPP, i1); - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXYZPPP, render.aoBrightnessXYPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXYPP, render.aoBrightnessXYZPPN, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYNP, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); + f6 = (render.aoLightValueScratchXYZNPP + render.field_147813_G + render.field_147817_L + f7) / 4.0F; + f3 = (render.field_147817_L + f7 + render.aoLightValueScratchXYZPPP + 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; + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNPP, render.field_147880_aa, render.field_147887_af, i1); + render.brightnessTopLeft = render.getAoBrightness(render.field_147887_af, render.aoBrightnessXYZPPP, render.field_147885_ae, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.field_147878_ac, render.field_147885_ae, render.aoBrightnessXYZPPN, i1); + render.brightnessBottomRight = render.getAoBrightness(render.field_147880_aa, render.aoBrightnessXYZNPN, render.field_147878_ac, i1); render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed); render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen); render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue); @@ -1115,12 +1115,12 @@ else if (render.hasOverrideBlockTexture()) } render.aoLightValueScratchXZNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.aoLightValueScratchYZNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.aoLightValueScratchYZPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, 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.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos); - render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); - render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147825_U = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147878_ac = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos); boolean flag3 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos + 1, yPos, zPos - 1)]; boolean flag2 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos - 1, yPos, zPos - 1)]; @@ -1129,13 +1129,13 @@ else if (render.hasOverrideBlockTexture()) if ((!flag2) && (!flag4)) { - render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; - render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; + render.field_147888_x = render.aoLightValueScratchXZNN; + render.field_147832_R = render.aoBrightnessXZNN; } else { - render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); - render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.field_147888_x = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.field_147832_R = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos - 1, zPos); } if ((!flag2) && (!flag5)) @@ -1151,13 +1151,13 @@ else if (render.hasOverrideBlockTexture()) if ((!flag3) && (!flag4)) { - render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; - render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; + render.field_147816_C = render.aoLightValueScratchXZPN; + render.field_147827_W = render.aoBrightnessXZPN; } else { - render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); - render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.field_147816_C = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.field_147827_W = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos - 1, zPos); } if ((!flag3) && (!flag5)) @@ -1184,14 +1184,14 @@ else if (render.hasOverrideBlockTexture()) } float f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - f3 = (render.aoLightValueScratchXZNN + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; - f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZPPN) / 4.0F; - f5 = (render.aoLightValueScratchYZNN + f7 + render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXZPN) / 4.0F; - f6 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZNN + render.aoLightValueScratchYZNN + f7) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXZNN, render.aoBrightnessYZNN, i1); + f3 = (render.aoLightValueScratchXZNN + 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; + f6 = (render.field_147888_x + render.aoLightValueScratchXZNN + render.field_147814_A + f7) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.field_147878_ac, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.field_147878_ac, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, i1); + render.brightnessBottomRight = render.getAoBrightness(render.field_147825_U, render.field_147827_W, render.aoBrightnessXZPN, i1); + render.brightnessTopRight = render.getAoBrightness(render.field_147832_R, render.aoBrightnessXZNN, render.field_147825_U, i1); if (flag1) { @@ -1232,12 +1232,12 @@ else if (render.hasOverrideBlockTexture()) render.aoLightValueScratchXZNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); render.aoLightValueScratchXZPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - render.aoLightValueScratchYZNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.aoLightValueScratchYZPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, 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.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos, zPos); render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos, zPos); - render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); - render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147828_V = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147887_af = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); boolean flag3 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos + 1, yPos, zPos + 1)]; boolean flag2 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos - 1, yPos, zPos + 1)]; boolean flag5 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos, yPos + 1, zPos + 1)]; @@ -1245,13 +1245,13 @@ else if (render.hasOverrideBlockTexture()) if ((!flag2) && (!flag4)) { - render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; - render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; + render.field_147884_z = render.aoLightValueScratchXZNP; + render.field_147826_T = render.aoBrightnessXZNP; } else { - render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); - render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.field_147884_z = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.field_147826_T = block.getMixedBrightnessForBlock(render.field_147845_a, xPos - 1, yPos - 1, zPos); } if ((!flag2) && (!flag5)) @@ -1267,13 +1267,13 @@ else if (render.hasOverrideBlockTexture()) if ((!flag3) && (!flag4)) { - render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; - render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; + render.field_147811_E = render.aoLightValueScratchXZPP; + render.field_147834_Y = render.aoBrightnessXZPP; } else { - render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); - render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.field_147811_E = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.field_147834_Y = block.getMixedBrightnessForBlock(render.field_147845_a, xPos + 1, yPos - 1, zPos); } if ((!flag3) && (!flag5)) @@ -1300,14 +1300,14 @@ else if (render.hasOverrideBlockTexture()) } float f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - f3 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + f7 + render.aoLightValueScratchYZPP) / 4.0F; - f6 = (f7 + render.aoLightValueScratchYZPP + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYZPPP) / 4.0F; - f5 = (render.aoLightValueScratchYZNP + f7 + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXZPP) / 4.0F; - f4 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXZNP + render.aoLightValueScratchYZNP + f7) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, render.aoBrightnessYZNP, i1); + f3 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + f7 + render.field_147817_L) / 4.0F; + f6 = (f7 + render.field_147817_L + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYZPPP) / 4.0F; + f5 = (render.field_147815_B + f7 + render.field_147811_E + render.aoLightValueScratchXZPP) / 4.0F; + f4 = (render.field_147884_z + render.aoLightValueScratchXZNP + render.field_147815_B + f7) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.field_147887_af, i1); + render.brightnessTopRight = render.getAoBrightness(render.field_147887_af, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, i1); + render.brightnessBottomRight = render.getAoBrightness(render.field_147828_V, render.field_147834_Y, render.aoBrightnessXZPP, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.field_147826_T, render.aoBrightnessXZNP, render.field_147828_V, i1); if (flag1) { @@ -1346,14 +1346,14 @@ else if (render.hasOverrideBlockTexture()) xPos--; } - render.aoLightValueScratchXYNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147886_y = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); render.aoLightValueScratchXZNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); render.aoLightValueScratchXZNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.aoLightValueScratchXYNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147813_G = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147831_S = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos - 1); render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos + 1); - render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147880_aa = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); boolean flag3 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos - 1, yPos + 1, zPos)]; boolean flag2 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos - 1, yPos - 1, zPos)]; boolean flag5 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos - 1, yPos, zPos - 1)]; @@ -1361,24 +1361,24 @@ else if (render.hasOverrideBlockTexture()) if ((!flag5) && (!flag2)) { - render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; - render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; + render.field_147888_x = render.aoLightValueScratchXZNN; + render.field_147832_R = render.aoBrightnessXZNN; } else { - render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); - render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.field_147888_x = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.field_147832_R = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos - 1); } if ((!flag4) && (!flag2)) { - render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; - render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; + render.field_147884_z = render.aoLightValueScratchXZNP; + render.field_147826_T = render.aoBrightnessXZNP; } else { - render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); - render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.field_147884_z = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.field_147826_T = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos + 1); } if ((!flag5) && (!flag3)) @@ -1416,14 +1416,14 @@ else if (render.hasOverrideBlockTexture()) } float f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - f6 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNP + f7 + render.aoLightValueScratchXZNP) / 4.0F; - f3 = (f7 + render.aoLightValueScratchXZNP + render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPP) / 4.0F; - f4 = (render.aoLightValueScratchXZNN + f7 + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F; - f5 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZNN + f7) / 4.0F; - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, i1); - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYNP, render.aoBrightnessXYZNPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessXYNP, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXYNN, render.aoBrightnessXZNN, i1); + f6 = (render.field_147886_y + render.field_147884_z + f7 + render.aoLightValueScratchXZNP) / 4.0F; + f3 = (f7 + render.aoLightValueScratchXZNP + render.field_147813_G + render.aoLightValueScratchXYZNPP) / 4.0F; + f4 = (render.aoLightValueScratchXZNN + f7 + render.aoLightValueScratchXYZNPN + render.field_147813_G) / 4.0F; + f5 = (render.field_147888_x + render.field_147886_y + render.aoLightValueScratchXZNN + f7) / 4.0F; + render.brightnessTopRight = render.getAoBrightness(render.field_147831_S, render.field_147826_T, render.aoBrightnessXZNP, i1); + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.field_147880_aa, render.aoBrightnessXYZNPP, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.field_147880_aa, i1); + render.brightnessBottomRight = render.getAoBrightness(render.field_147832_R, render.field_147831_S, render.aoBrightnessXZNN, i1); if (flag1) { @@ -1462,14 +1462,14 @@ else if (render.hasOverrideBlockTexture()) xPos++; } - render.aoLightValueScratchXYPN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); + 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.aoLightValueScratchXZPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.aoLightValueScratchXYPP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); + render.field_147824_K = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147835_X = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos); render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos - 1); render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos, zPos + 1); - render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); + render.field_147885_ae = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos + 1, zPos); boolean flag3 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos + 1, yPos + 1, zPos)]; boolean flag2 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos + 1, yPos - 1, zPos)]; boolean flag5 = Block.canBlockGrass[render.field_147845_a.getBlockId(xPos + 1, yPos, zPos + 1)]; @@ -1477,24 +1477,24 @@ else if (render.hasOverrideBlockTexture()) if ((!flag2) && (!flag4)) { - render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; - render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; + render.field_147816_C = render.aoLightValueScratchXZPN; + render.field_147827_W = render.aoBrightnessXZPN; } else { - render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); - render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.field_147816_C = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.field_147827_W = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos - 1); } if ((!flag2) && (!flag5)) { - render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; - render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; + render.field_147811_E = render.aoLightValueScratchXZPP; + render.field_147834_Y = render.aoBrightnessXZPP; } else { - render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); - render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.field_147811_E = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.field_147834_Y = block.getMixedBrightnessForBlock(render.field_147845_a, xPos, yPos - 1, zPos + 1); } if ((!flag3) && (!flag4)) @@ -1532,14 +1532,14 @@ else if (render.hasOverrideBlockTexture()) } float f7 = block.getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - f3 = (render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNP + f7 + render.aoLightValueScratchXZPP) / 4.0F; - f4 = (render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXZPN + f7) / 4.0F; - f5 = (render.aoLightValueScratchXZPN + f7 + render.aoLightValueScratchXYZPPN + render.aoLightValueScratchXYPP) / 4.0F; - f6 = (f7 + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPP) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZPNN, render.aoBrightnessXYPN, render.aoBrightnessXZPN, i1); + f3 = (render.field_147810_D + render.field_147811_E + f7 + render.aoLightValueScratchXZPP) / 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; + f6 = (f7 + render.aoLightValueScratchXZPP + render.field_147824_K + render.aoLightValueScratchXYZPPP) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.field_147835_X, render.field_147834_Y, render.aoBrightnessXZPP, i1); + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXZPP, render.field_147885_ae, render.aoBrightnessXYZPPP, i1); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.field_147885_ae, i1); + render.brightnessBottomLeft = render.getAoBrightness(render.field_147827_W, render.field_147835_X, render.aoBrightnessXZPN, i1); if (flag1) { @@ -1571,14 +1571,14 @@ else if (render.hasOverrideBlockTexture()) flag = true; } - render.enableAO = false; + render.field_147863_w = false; return flag; } static boolean renderFakeBlockWithColorMultiplier (IIcon texture, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) { Block block = Blocks.stone; - render.enableAO = false; + render.field_147863_w = false; Tessellator tessellator = Tessellator.instance; boolean flag = false; float f3 = 0.5F; @@ -1598,7 +1598,7 @@ static boolean renderFakeBlockWithColorMultiplier (IIcon texture, int xPos, int float f17 = f5; float f18 = f6; - if (block != Block.grass) + if (block != Blocks.grass) { f10 = f3 * colorRed; f11 = f5 * colorRed; diff --git a/src/main/java/tconstruct/client/block/SearedRender.java b/src/main/java/tconstruct/client/block/SearedRender.java index 49e64f16085..f9dab41691b 100644 --- a/src/main/java/tconstruct/client/block/SearedRender.java +++ b/src/main/java/tconstruct/client/block/SearedRender.java @@ -250,21 +250,21 @@ else if (metadata == 1) } float yMin = 0F; - int uID = world.getBlockId(x, y - 1, z); + Block uBlock= world.getBlockId(x, y - 1, z); int uMeta = world.getBlockMetadata(x, y - 1, z); - if (uID == TRepo.searedBlock.blockID && uMeta == 0) + if (uBlock== TRepo.searedBlock && uMeta == 0) { yMin = -0.125F; } - else if (uID == TRepo.searedBlock.blockID && uMeta == 2) + else if (uBlock== TRepo.searedBlock && uMeta == 2) { yMin = -0.75F; } - else if (uID == TRepo.lavaTank.blockID) + else if (uBlock== TRepo.lavaTank) { yMin = -1F; } - else if (uID == TRepo.castingChannel.blockID) + else if (uBlock== TRepo.castingChannel) { yMin = -0.5F; } diff --git a/src/main/java/tconstruct/common/TContent.java b/src/main/java/tconstruct/common/TContent.java index e5c1e903adf..014f358ba57 100644 --- a/src/main/java/tconstruct/common/TContent.java +++ b/src/main/java/tconstruct/common/TContent.java @@ -150,7 +150,7 @@ void registerBlocks () TRepo.moltenIronFluid = new Fluid("iron.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenIronFluid)) TRepo.moltenIronFluid = FluidRegistry.getFluid("iron.molten"); - TRepo.moltenIron = new TConstructFluid(PHConstruct.moltenIron, TRepo.moltenIronFluid, Material.lava, "liquid_iron").func_149663_c("fluid.molten.iron"); + TRepo.moltenIron = new TConstructFluid(PHConstruct.moltenIron, TRepo.moltenIronFluid, Material.field_151587_i, "liquid_iron").func_149663_c("fluid.molten.iron"); GameRegistry.registerBlock(TRepo.moltenIron, "fluid.molten.iron"); TRepo.moltenIronFluid.setBlockID(TRepo.moltenIron).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenIronFluid, 1000), new ItemStack(TRepo.buckets, 1, 0), new ItemStack(Items.bucket))); @@ -158,7 +158,7 @@ void registerBlocks () TRepo.moltenGoldFluid = new Fluid("gold.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenGoldFluid)) TRepo.moltenGoldFluid = FluidRegistry.getFluid("gold.molten"); - TRepo.moltenGold = new TConstructFluid(PHConstruct.moltenGold, TRepo.moltenGoldFluid, Material.lava, "liquid_gold").func_149663_c("fluid.molten.gold"); + TRepo.moltenGold = new TConstructFluid(PHConstruct.moltenGold, TRepo.moltenGoldFluid, Material.field_151587_i, "liquid_gold").func_149663_c("fluid.molten.gold"); GameRegistry.registerBlock(TRepo.moltenGold, "fluid.molten.gold"); TRepo.moltenGoldFluid.setBlockID(TRepo.moltenGold).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenGoldFluid, 1000), new ItemStack(TRepo.buckets, 1, 1), new ItemStack(Items.bucket))); @@ -166,7 +166,7 @@ void registerBlocks () TRepo.moltenCopperFluid = new Fluid("copper.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenCopperFluid)) TRepo.moltenCopperFluid = FluidRegistry.getFluid("copper.molten"); - TRepo.moltenCopper = new TConstructFluid(PHConstruct.moltenCopper, TRepo.moltenCopperFluid, Material.lava, "liquid_copper").func_149663_c("fluid.molten.copper"); + TRepo.moltenCopper = new TConstructFluid(PHConstruct.moltenCopper, TRepo.moltenCopperFluid, Material.field_151587_i, "liquid_copper").func_149663_c("fluid.molten.copper"); GameRegistry.registerBlock(TRepo.moltenCopper, "fluid.molten.copper"); TRepo.moltenCopperFluid.setBlockID(TRepo.moltenCopper).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenCopperFluid, 1000), new ItemStack(TRepo.buckets, 1, 2), new ItemStack(Items.bucket))); @@ -174,7 +174,7 @@ void registerBlocks () TRepo.moltenTinFluid = new Fluid("tin.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenTinFluid)) TRepo.moltenTinFluid = FluidRegistry.getFluid("tin.molten"); - TRepo.moltenTin = new TConstructFluid(PHConstruct.moltenTin, TRepo.moltenTinFluid, Material.lava, "liquid_tin").func_149663_c("fluid.molten.tin"); + TRepo.moltenTin = new TConstructFluid(PHConstruct.moltenTin, TRepo.moltenTinFluid, Material.field_151587_i, "liquid_tin").func_149663_c("fluid.molten.tin"); GameRegistry.registerBlock(TRepo.moltenTin, "fluid.molten.tin"); TRepo.moltenTinFluid.setBlockID(TRepo.moltenTin).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenTinFluid, 1000), new ItemStack(TRepo.buckets, 1, 3), new ItemStack(Item.bucketEmpty))); @@ -182,7 +182,7 @@ void registerBlocks () TRepo.moltenAluminumFluid = new Fluid("aluminum.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenAluminumFluid)) TRepo.moltenAluminumFluid = FluidRegistry.getFluid("aluminum.molten"); - TRepo.moltenAluminum = new TConstructFluid(PHConstruct.moltenAluminum, TRepo.moltenAluminumFluid, Material.lava, "liquid_aluminum").func_149663_c("fluid.molten.aluminum"); + TRepo.moltenAluminum = new TConstructFluid(PHConstruct.moltenAluminum, TRepo.moltenAluminumFluid, Material.field_151587_i, "liquid_aluminum").func_149663_c("fluid.molten.aluminum"); GameRegistry.registerBlock(TRepo.moltenAluminum, "fluid.molten.aluminum"); TRepo.moltenAluminumFluid.setBlockID(TRepo.moltenAluminum).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenAluminumFluid, 1000), new ItemStack(TRepo.buckets, 1, 4), new ItemStack(Item.bucketEmpty))); @@ -190,7 +190,7 @@ void registerBlocks () TRepo.moltenCobaltFluid = new Fluid("cobalt.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenCobaltFluid)) TRepo.moltenCobaltFluid = FluidRegistry.getFluid("cobalt.molten"); - TRepo.moltenCobalt = new TConstructFluid(PHConstruct.moltenCobalt, TRepo.moltenCobaltFluid, Material.lava, "liquid_cobalt").func_149663_c("fluid.molten.cobalt"); + TRepo.moltenCobalt = new TConstructFluid(PHConstruct.moltenCobalt, TRepo.moltenCobaltFluid, Material.field_151587_i, "liquid_cobalt").func_149663_c("fluid.molten.cobalt"); GameRegistry.registerBlock(TRepo.moltenCobalt, "fluid.molten.cobalt"); TRepo.moltenCobaltFluid.setBlockID(TRepo.moltenCobalt).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenCobaltFluid, 1000), new ItemStack(TRepo.buckets, 1, 5), new ItemStack(Item.bucketEmpty))); @@ -198,7 +198,7 @@ void registerBlocks () TRepo.moltenArditeFluid = new Fluid("ardite.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenArditeFluid)) TRepo.moltenArditeFluid = FluidRegistry.getFluid("ardite.molten"); - TRepo.moltenArdite = new TConstructFluid(PHConstruct.moltenArdite, TRepo.moltenArditeFluid, Material.lava, "liquid_ardite").func_149663_c("fluid.molten.ardite"); + TRepo.moltenArdite = new TConstructFluid(PHConstruct.moltenArdite, TRepo.moltenArditeFluid, Material.field_151587_i, "liquid_ardite").func_149663_c("fluid.molten.ardite"); GameRegistry.registerBlock(TRepo.moltenArdite, "fluid.molten.ardite"); TRepo.moltenArditeFluid.setBlockID(TRepo.moltenArdite).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenArditeFluid, 1000), new ItemStack(TRepo.buckets, 1, 6), new ItemStack(Item.bucketEmpty))); @@ -206,7 +206,7 @@ void registerBlocks () TRepo.moltenBronzeFluid = new Fluid("bronze.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenBronzeFluid)) TRepo.moltenBronzeFluid = FluidRegistry.getFluid("bronze.molten"); - TRepo.moltenBronze = new TConstructFluid(PHConstruct.moltenBronze, TRepo.moltenBronzeFluid, Material.lava, "liquid_bronze").func_149663_c("fluid.molten.bronze"); + TRepo.moltenBronze = new TConstructFluid(PHConstruct.moltenBronze, TRepo.moltenBronzeFluid, Material.field_151587_i, "liquid_bronze").func_149663_c("fluid.molten.bronze"); GameRegistry.registerBlock(TRepo.moltenBronze, "fluid.molten.bronze"); TRepo.moltenBronzeFluid.setBlockID(TRepo.moltenBronze).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenBronzeFluid, 1000), new ItemStack(TRepo.buckets, 1, 7), new ItemStack(Item.bucketEmpty))); @@ -214,7 +214,7 @@ void registerBlocks () TRepo.moltenAlubrassFluid = new Fluid("aluminumbrass.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenAlubrassFluid)) TRepo.moltenAlubrassFluid = FluidRegistry.getFluid("aluminumbrass.molten"); - TRepo.moltenAlubrass = new TConstructFluid(PHConstruct.moltenAlubrass, TRepo.moltenAlubrassFluid, Material.lava, "liquid_alubrass").func_149663_c("fluid.molten.alubrass"); + TRepo.moltenAlubrass = new TConstructFluid(PHConstruct.moltenAlubrass, TRepo.moltenAlubrassFluid, Material.field_151587_i, "liquid_alubrass").func_149663_c("fluid.molten.alubrass"); GameRegistry.registerBlock(TRepo.moltenAlubrass, "fluid.molten.alubrass"); TRepo.moltenAlubrassFluid.setBlockID(TRepo.moltenAlubrass).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenAlubrassFluid, 1000), new ItemStack(TRepo.buckets, 1, 8), new ItemStack(Item.bucketEmpty))); @@ -222,7 +222,7 @@ void registerBlocks () TRepo.moltenManyullynFluid = new Fluid("manyullyn.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenManyullynFluid)) TRepo.moltenManyullynFluid = FluidRegistry.getFluid("manyullyn.molten"); - TRepo.moltenManyullyn = new TConstructFluid(PHConstruct.moltenManyullyn, TRepo.moltenManyullynFluid, Material.lava, "liquid_manyullyn").func_149663_c("fluid.molten.manyullyn"); + TRepo.moltenManyullyn = new TConstructFluid(PHConstruct.moltenManyullyn, TRepo.moltenManyullynFluid, Material.field_151587_i, "liquid_manyullyn").func_149663_c("fluid.molten.manyullyn"); GameRegistry.registerBlock(TRepo.moltenManyullyn, "fluid.molten.manyullyn"); TRepo.moltenManyullynFluid.setBlockID(TRepo.moltenManyullyn).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenManyullynFluid, 1000), new ItemStack(TRepo.buckets, 1, 9), new ItemStack(Item.bucketEmpty))); @@ -230,7 +230,7 @@ void registerBlocks () TRepo.moltenAlumiteFluid = new Fluid("alumite.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenAlumiteFluid)) TRepo.moltenAlumiteFluid = FluidRegistry.getFluid("alumite.molten"); - TRepo.moltenAlumite = new TConstructFluid(PHConstruct.moltenAlumite, TRepo.moltenAlumiteFluid, Material.lava, "liquid_alumite").func_149663_c("fluid.molten.alumite"); + TRepo.moltenAlumite = new TConstructFluid(PHConstruct.moltenAlumite, TRepo.moltenAlumiteFluid, Material.field_151587_i, "liquid_alumite").func_149663_c("fluid.molten.alumite"); GameRegistry.registerBlock(TRepo.moltenAlumite, "fluid.molten.alumite"); TRepo.moltenAlumiteFluid.setBlockID(TRepo.moltenAlumite).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenAlumiteFluid, 1000), new ItemStack(TRepo.buckets, 1, 10), new ItemStack(Item.bucketEmpty))); @@ -238,7 +238,7 @@ void registerBlocks () TRepo.moltenObsidianFluid = new Fluid("obsidian.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenObsidianFluid)) TRepo.moltenObsidianFluid = FluidRegistry.getFluid("obsidian.molten"); - TRepo.moltenObsidian = new TConstructFluid(PHConstruct.moltenObsidian, TRepo.moltenObsidianFluid, Material.lava, "liquid_obsidian").func_149663_c("fluid.molten.obsidian"); + TRepo.moltenObsidian = new TConstructFluid(PHConstruct.moltenObsidian, TRepo.moltenObsidianFluid, Material.field_151587_i, "liquid_obsidian").func_149663_c("fluid.molten.obsidian"); GameRegistry.registerBlock(TRepo.moltenObsidian, "fluid.molten.obsidian"); TRepo.moltenObsidianFluid.setBlockID(TRepo.moltenObsidian).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenObsidianFluid, 1000), new ItemStack(TRepo.buckets, 1, 11), new ItemStack(Item.bucketEmpty))); @@ -246,7 +246,7 @@ void registerBlocks () TRepo.moltenSteelFluid = new Fluid("steel.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenSteelFluid)) TRepo.moltenSteelFluid = FluidRegistry.getFluid("steel.molten"); - TRepo.moltenSteel = new TConstructFluid(PHConstruct.moltenSteel, TRepo.moltenSteelFluid, Material.lava, "liquid_steel").func_149663_c("fluid.molten.steel"); + TRepo.moltenSteel = new TConstructFluid(PHConstruct.moltenSteel, TRepo.moltenSteelFluid, Material.field_151587_i, "liquid_steel").func_149663_c("fluid.molten.steel"); GameRegistry.registerBlock(TRepo.moltenSteel, "fluid.molten.steel"); TRepo.moltenSteelFluid.setBlockID(TRepo.moltenSteel).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenSteelFluid, 1000), new ItemStack(TRepo.buckets, 1, 12), new ItemStack(Item.bucketEmpty))); @@ -254,7 +254,7 @@ void registerBlocks () TRepo.moltenGlassFluid = new Fluid("glass.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenGlassFluid)) TRepo.moltenGlassFluid = FluidRegistry.getFluid("glass.molten"); - TRepo.moltenGlass = new TConstructFluid(PHConstruct.moltenGlass, TRepo.moltenGlassFluid, Material.lava, "liquid_glass", true).func_149663_c("fluid.molten.glass"); + TRepo.moltenGlass = new TConstructFluid(PHConstruct.moltenGlass, TRepo.moltenGlassFluid, Material.field_151587_i, "liquid_glass", true).func_149663_c("fluid.molten.glass"); GameRegistry.registerBlock(TRepo.moltenGlass, "fluid.molten.glass"); TRepo.moltenGlassFluid.setBlockID(TRepo.moltenGlass).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenGlassFluid, 1000), new ItemStack(TRepo.buckets, 1, 13), new ItemStack(Item.bucketEmpty))); @@ -262,7 +262,7 @@ void registerBlocks () TRepo.moltenStoneFluid = new Fluid("stone.seared"); if (!FluidRegistry.registerFluid(TRepo.moltenStoneFluid)) TRepo.moltenStoneFluid = FluidRegistry.getFluid("stone.seared"); - TRepo.moltenStone = new TConstructFluid(PHConstruct.moltenStone, TRepo.moltenStoneFluid, Material.lava, "liquid_stone").func_149663_c("molten.stone"); + TRepo.moltenStone = new TConstructFluid(PHConstruct.moltenStone, TRepo.moltenStoneFluid, Material.field_151587_i, "liquid_stone").func_149663_c("molten.stone"); GameRegistry.registerBlock(TRepo.moltenStone, "molten.stone"); TRepo.moltenStoneFluid.setBlockID(TRepo.moltenStone).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenStoneFluid, 1000), new ItemStack(TRepo.buckets, 1, 14), new ItemStack(Item.bucketEmpty))); @@ -286,7 +286,7 @@ void registerBlocks () TRepo.moltenNickelFluid = new Fluid("nickel.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenNickelFluid)) TRepo.moltenNickelFluid = FluidRegistry.getFluid("nickel.molten"); - TRepo.moltenNickel = new TConstructFluid(PHConstruct.moltenNickel, TRepo.moltenNickelFluid, Material.lava, "liquid_ferrous").func_149663_c("fluid.molten.nickel"); + TRepo.moltenNickel = new TConstructFluid(PHConstruct.moltenNickel, TRepo.moltenNickelFluid, Material.field_151587_i, "liquid_ferrous").func_149663_c("fluid.molten.nickel"); GameRegistry.registerBlock(TRepo.moltenNickel, "fluid.molten.nickel"); TRepo.moltenNickelFluid.setBlockID(TRepo.moltenNickel).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenNickelFluid, 1000), new ItemStack(TRepo.buckets, 1, 17), new ItemStack(Item.bucketEmpty))); @@ -294,7 +294,7 @@ void registerBlocks () TRepo.moltenLeadFluid = new Fluid("lead.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenLeadFluid)) TRepo.moltenLeadFluid = FluidRegistry.getFluid("lead.molten"); - TRepo.moltenLead = new TConstructFluid(PHConstruct.moltenLead, TRepo.moltenLeadFluid, Material.lava, "liquid_lead").func_149663_c("fluid.molten.lead"); + TRepo.moltenLead = new TConstructFluid(PHConstruct.moltenLead, TRepo.moltenLeadFluid, Material.field_151587_i, "liquid_lead").func_149663_c("fluid.molten.lead"); GameRegistry.registerBlock(TRepo.moltenLead, "fluid.molten.lead"); TRepo.moltenLeadFluid.setBlockID(TRepo.moltenLead).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenLeadFluid, 1000), new ItemStack(TRepo.buckets, 1, 18), new ItemStack(Item.bucketEmpty))); @@ -302,7 +302,7 @@ void registerBlocks () TRepo.moltenSilverFluid = new Fluid("silver.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenSilverFluid)) TRepo.moltenSilverFluid = FluidRegistry.getFluid("silver.molten"); - TRepo.moltenSilver = new TConstructFluid(PHConstruct.moltenSilver, TRepo.moltenSilverFluid, Material.lava, "liquid_silver").func_149663_c("fluid.molten.silver"); + TRepo.moltenSilver = new TConstructFluid(PHConstruct.moltenSilver, TRepo.moltenSilverFluid, Material.field_151587_i, "liquid_silver").func_149663_c("fluid.molten.silver"); GameRegistry.registerBlock(TRepo.moltenSilver, "fluid.molten.silver"); TRepo.moltenSilverFluid.setBlockID(TRepo.moltenSilver).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenSilverFluid, 1000), new ItemStack(TRepo.buckets, 1, 19), new ItemStack(Item.bucketEmpty))); @@ -310,7 +310,7 @@ void registerBlocks () TRepo.moltenShinyFluid = new Fluid("platinum.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenShinyFluid)) TRepo.moltenShinyFluid = FluidRegistry.getFluid("platinum.molten"); - TRepo.moltenShiny = new TConstructFluid(PHConstruct.moltenShiny, TRepo.moltenShinyFluid, Material.lava, "liquid_shiny").func_149663_c("fluid.molten.shiny"); + TRepo.moltenShiny = new TConstructFluid(PHConstruct.moltenShiny, TRepo.moltenShinyFluid, Material.field_151587_i, "liquid_shiny").func_149663_c("fluid.molten.shiny"); GameRegistry.registerBlock(TRepo.moltenShiny, "fluid.molten.shiny"); TRepo.moltenShinyFluid.setBlockID(TRepo.moltenShiny).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenShinyFluid, 1000), new ItemStack(TRepo.buckets, 1, 20), new ItemStack(Item.bucketEmpty))); @@ -318,7 +318,7 @@ void registerBlocks () TRepo.moltenInvarFluid = new Fluid("invar.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenInvarFluid)) TRepo.moltenInvarFluid = FluidRegistry.getFluid("invar.molten"); - TRepo.moltenInvar = new TConstructFluid(PHConstruct.moltenInvar, TRepo.moltenInvarFluid, Material.lava, "liquid_invar").func_149663_c("fluid.molten.invar"); + TRepo.moltenInvar = new TConstructFluid(PHConstruct.moltenInvar, TRepo.moltenInvarFluid, Material.field_151587_i, "liquid_invar").func_149663_c("fluid.molten.invar"); GameRegistry.registerBlock(TRepo.moltenInvar, "fluid.molten.invar"); TRepo.moltenInvarFluid.setBlockID(TRepo.moltenInvar).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenInvarFluid, 1000), new ItemStack(TRepo.buckets, 1, 21), new ItemStack(Item.bucketEmpty))); @@ -326,7 +326,7 @@ void registerBlocks () TRepo.moltenElectrumFluid = new Fluid("electrum.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenElectrumFluid)) TRepo.moltenElectrumFluid = FluidRegistry.getFluid("electrum.molten"); - TRepo.moltenElectrum = new TConstructFluid(PHConstruct.moltenElectrum, TRepo.moltenElectrumFluid, Material.lava, "liquid_electrum").func_149663_c("fluid.molten.electrum"); + TRepo.moltenElectrum = new TConstructFluid(PHConstruct.moltenElectrum, TRepo.moltenElectrumFluid, Material.field_151587_i, "liquid_electrum").func_149663_c("fluid.molten.electrum"); GameRegistry.registerBlock(TRepo.moltenElectrum, "fluid.molten.electrum"); TRepo.moltenElectrumFluid.setBlockID(TRepo.moltenElectrum).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenElectrumFluid, 1000), new ItemStack(TRepo.buckets, 1, 22), new ItemStack(Item.bucketEmpty))); @@ -827,7 +827,7 @@ public void addLoot () @Override public int getBurnTime (ItemStack fuel) { - if (fuel.itemID == TRepo.materials.itemID && fuel.getItemDamage() == 7) + if (fuel.getItem() == TRepo.materials && fuel.getItemDamage() == 7) return 26400; return 0; } diff --git a/src/main/java/tconstruct/items/tools/Battleaxe.java b/src/main/java/tconstruct/items/tools/Battleaxe.java index f2e2bc46add..4acb9a04c6d 100644 --- a/src/main/java/tconstruct/items/tools/Battleaxe.java +++ b/src/main/java/tconstruct/items/tools/Battleaxe.java @@ -44,13 +44,12 @@ protected String getHarvestType () } @Override - public boolean onBlockDestroyed (ItemStack itemstack, World world, int bID, int x, int y, int z, EntityLivingBase player) + public boolean onBlockDestroyed (ItemStack itemstack, World world, Block b, int x, int y, int z, EntityLivingBase player) { - Block block = Block.blocksList[bID]; - if (block != null && block.blockMaterial == Material.leaves) + if (b != null && b.blockMaterial == Material.leaves) return false; - return AbilityHelper.onBlockChanged(itemstack, world, bID, x, y, z, player, random); + return AbilityHelper.onBlockChanged(itemstack, world, b, x, y, z, player, random); } static Material[] materials = { Material.wood, Material.vine, Material.circuits, Material.cactus, Material.pumpkin }; @@ -247,17 +246,15 @@ public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPl return false; World world = player.worldObj; - final int woodID = world.getBlockId(x, y, z); - final Block wood = Block.blocksList[woodID]; + final Block wood = world.func_147439_a(x,y,z); NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); final int meta = world.getBlockMetadata(x, y, z); for (int yPos = y + 1; yPos < y + 9; yPos++) { - int blockID = world.getBlockId(x, yPos, z); - Block block = Block.blocksList[blockID]; + Block block = world.func_147439_a(x, yPos, z); if (!(tags.getBoolean("Broken")) && block != null && block.blockMaterial == Material.wood) { - int localblockID = world.getBlockId(x, yPos, z); + Block localblock = world.func_147439_a(x, yPos, z); int localMeta = world.getBlockMetadata(x, yPos, z); int hlvl = MinecraftForge.getBlockHarvestLevel(block, meta, getHarvestType()); @@ -283,7 +280,7 @@ public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPl } block.harvestBlock(world, player, x, yPos, z, localMeta); block.onBlockHarvested(world, x, yPos, z, localMeta, player); - onBlockDestroyed(stack, world, localblockID, x, yPos, z, player); + onBlockDestroyed(stack, world, func_147439_a, x, yPos, z, player); } else { @@ -297,7 +294,7 @@ public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPl break; } if (!world.isRemote) - world.playAuxSFX(2001, x, y, z, woodID + (meta << 12)); + world.playAuxSFX(2001, x, y, z, wood.getBlockID() + (meta << 12)); return super.onBlockStartBreak(stack, x, y, z, player); } diff --git a/src/main/java/tconstruct/library/crafting/FluidType.java b/src/main/java/tconstruct/library/crafting/FluidType.java index 9855b59e9d2..c4a75bd0b56 100644 --- a/src/main/java/tconstruct/library/crafting/FluidType.java +++ b/src/main/java/tconstruct/library/crafting/FluidType.java @@ -8,71 +8,71 @@ public enum FluidType { /** Vanilla Water Smelting **/ - Water(Blocks.snow.blockID, 0, 20, FluidRegistry.getFluid("water"), false), + Water(Blocks.snow, 0, 20, FluidRegistry.getFluid("water"), false), /** Iron Smelting **/ - Iron(Blocks.iron_block.blockID, 0, 600, TRepo.moltenIronFluid, true), + Iron(Blocks.iron_block, 0, 600, TRepo.moltenIronFluid, true), /** Gold Smelting **/ - Gold(Blocks.gold_block.blockID, 0, 400, TRepo.moltenGoldFluid, false), + Gold(Blocks.gold_block, 0, 400, TRepo.moltenGoldFluid, false), /** Tin Smelting **/ - Tin(TRepo.metalBlock.blockID, 5, 400, TRepo.moltenTinFluid, false), + Tin(TRepo.metalBlock, 5, 400, TRepo.moltenTinFluid, false), /** Copper Smelting **/ - Copper(TRepo.metalBlock.blockID, 3, 550, TRepo.moltenCopperFluid, true), + Copper(TRepo.metalBlock, 3, 550, TRepo.moltenCopperFluid, true), /** Aluminum Smelting **/ - Aluminum(TRepo.metalBlock.blockID, 6, 350, TRepo.moltenAluminumFluid, false), + Aluminum(TRepo.metalBlock, 6, 350, TRepo.moltenAluminumFluid, false), /** Natural Aluminum Smelting **/ - NaturalAluminum(TRepo.oreSlag.blockID, 6, 350, TRepo.moltenAluminumFluid, false), + NaturalAluminum(TRepo.oreSlag, 6, 350, TRepo.moltenAluminumFluid, false), /** Cobalt Smelting **/ - Cobalt(TRepo.metalBlock.blockID, 0, 650, TRepo.moltenCobaltFluid, true), + Cobalt(TRepo.metalBlock, 0, 650, TRepo.moltenCobaltFluid, true), /** Ardite Smelting **/ - Ardite(TRepo.metalBlock.blockID, 1, 650, TRepo.moltenArditeFluid, true), + Ardite(TRepo.metalBlock, 1, 650, TRepo.moltenArditeFluid, true), /** AluminumBrass Smelting **/ - AluminumBrass(TRepo.metalBlock.blockID, 7, 350, TRepo.moltenAlubrassFluid, false), + AluminumBrass(TRepo.metalBlock, 7, 350, TRepo.moltenAlubrassFluid, false), /** Alumite Smelting **/ - Alumite(TRepo.metalBlock.blockID, 8, 800, TRepo.moltenAlumiteFluid, true), + Alumite(TRepo.metalBlock, 8, 800, TRepo.moltenAlumiteFluid, true), /** Manyullyn Smelting **/ - Manyullyn(TRepo.metalBlock.blockID, 2, 750, TRepo.moltenManyullynFluid, true), + Manyullyn(TRepo.metalBlock, 2, 750, TRepo.moltenManyullynFluid, true), /** Bronze Smelting **/ - Bronze(TRepo.metalBlock.blockID, 4, 500, TRepo.moltenBronzeFluid, true), + Bronze(TRepo.metalBlock, 4, 500, TRepo.moltenBronzeFluid, true), /** Steel Smelting **/ - Steel(TRepo.metalBlock.blockID, 9, 700, TRepo.moltenSteelFluid, true), + Steel(TRepo.metalBlock, 9, 700, TRepo.moltenSteelFluid, true), /** Nickel Smelting **/ - Nickel(TRepo.metalBlock.blockID, 0, 400, TRepo.moltenNickelFluid, false), + Nickel(TRepo.metalBlock, 0, 400, TRepo.moltenNickelFluid, false), /** Lead Smelting **/ - Lead(TRepo.metalBlock.blockID, 0, 400, TRepo.moltenLeadFluid, false), + Lead(TRepo.metalBlock, 0, 400, TRepo.moltenLeadFluid, false), /** Silver Smelting **/ - Silver(TRepo.metalBlock.blockID, 0, 400, TRepo.moltenSilverFluid, false), + Silver(TRepo.metalBlock, 0, 400, TRepo.moltenSilverFluid, false), /** Platinum Smelting **/ - Platinum(TRepo.metalBlock.blockID, 0, 400, TRepo.moltenShinyFluid, false), + Platinum(TRepo.metalBlock, 0, 400, TRepo.moltenShinyFluid, false), /** Invar Smelting **/ - Invar(TRepo.metalBlock.blockID, 0, 400, TRepo.moltenInvarFluid, false), + Invar(TRepo.metalBlock, 0, 400, TRepo.moltenInvarFluid, false), /** Electrum Smelting **/ - Electrum(TRepo.metalBlock.blockID, 0, 400, TRepo.moltenElectrumFluid, false), + Electrum(TRepo.metalBlock, 0, 400, TRepo.moltenElectrumFluid, false), /** Obsidian Smelting **/ - Obsidian(Block.obsidian.blockID, 0, 750, TRepo.moltenObsidianFluid, true), + Obsidian(Blocks.obsidian, 0, 750, TRepo.moltenObsidianFluid, true), /** Ender Smelting **/ - Ender(TRepo.metalBlock.blockID, 10, 500, TRepo.moltenEnderFluid, false), + Ender(TRepo.metalBlock, 10, 500, TRepo.moltenEnderFluid, false), /** Glass Smelting **/ - Glass(Block.sand.blockID, 0, 625, TRepo.moltenGlassFluid, false), + Glass(Blocks.sand, 0, 625, TRepo.moltenGlassFluid, false), /** Stone Smelting **/ - Stone(Block.stone.blockID, 0, 800, TRepo.moltenStoneFluid, true), + Stone(Blocks.stone, 0, 800, TRepo.moltenStoneFluid, true), /** Emerald Smelting **/ - Emerald(Block.oreEmerald.blockID, 0, 575, TRepo.moltenEmeraldFluid, false), + Emerald(Blocks.emerald_ore, 0, 575, TRepo.moltenEmeraldFluid, false), /** Slime Smelting **/ - Slime(TRepo.slimeGel.blockID, 0, 250, TRepo.blueSlimeFluid, false), + Slime(TRepo.slimeGel, 0, 250, TRepo.blueSlimeFluid, false), /** Pigiron Smelting **/ - PigIron(TRepo.meatBlock.blockID, 0, 610, TRepo.pigIronFluid, true), + PigIron(TRepo.meatBlock, 0, 610, TRepo.pigIronFluid, true), /** Glue Smelting **/ - Glue(TRepo.glueBlock.blockID, 0, 125, TRepo.glueFluid, false); + Glue(TRepo.glueBlock, 0, 125, TRepo.glueFluid, false); - public final int renderBlockID; + public final Block renderBlock; public final int renderMeta; public final int baseTemperature; public final Fluid fluid; public final boolean isToolpart; - FluidType(int blockID, int meta, int baseTemperature, Fluid fluid, boolean isToolpart) + FluidType(Block b, int meta, int baseTemperature, Fluid fluid, boolean isToolpart) { - this.renderBlockID = blockID; + this.renderBlock = b; this.renderMeta = meta; this.baseTemperature = baseTemperature; this.fluid = fluid; @@ -83,7 +83,7 @@ public static FluidType getFluidType (Fluid searchedFluid) { for (FluidType ft : values()) { - if (ft.fluid.getBlockID() == searchedFluid.getBlockID()) + if (ft.fluid == searchedFluid) return ft; } return null; @@ -93,7 +93,7 @@ public static int getTemperatureByFluid (Fluid searchedFluid) { for (FluidType ft : values()) { - if (ft.fluid.getBlockID() == searchedFluid.getBlockID()) + if (ft.fluid == searchedFluid) return ft.baseTemperature; } return 800; diff --git a/src/main/java/tconstruct/library/tools/AbilityHelper.java b/src/main/java/tconstruct/library/tools/AbilityHelper.java index 3bd12e2ff2d..26c6639d688 100644 --- a/src/main/java/tconstruct/library/tools/AbilityHelper.java +++ b/src/main/java/tconstruct/library/tools/AbilityHelper.java @@ -495,10 +495,10 @@ public static boolean hoeGround (ItemStack stack, EntityPlayer player, World wor return true; } - int bID = world.getBlockId(x, y, z); - int bIDabove = world.getBlockId(x, y + 1, z); + Block b = world.getBlockId(x, y, z); + Block babove = world.getBlockId(x, y + 1, z); - if ((side == 0 || bIDabove != 0 || bID != Blocks.grass.blockID) && bID != Blocks.dirt.blockID) + if ((side == 0 || babove != Blocks.air || b != Blocks.grass) && b != Blocks.dirt) { return false; } @@ -514,7 +514,7 @@ public static boolean hoeGround (ItemStack stack, EntityPlayer player, World wor } else { - world.setBlock(x, y, z, block.blockID); + world.setBlock(x, y, z, block); onBlockChanged(stack, world, 0, x, y, z, player, random); return true; } diff --git a/src/main/java/tconstruct/library/tools/HarvestTool.java b/src/main/java/tconstruct/library/tools/HarvestTool.java index 707accf0978..dd05a08b188 100644 --- a/src/main/java/tconstruct/library/tools/HarvestTool.java +++ b/src/main/java/tconstruct/library/tools/HarvestTool.java @@ -5,6 +5,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; @@ -27,10 +28,10 @@ public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPl NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); World world = player.worldObj; - int bID = player.worldObj.getBlockId(x, y, z); + Block block = player.worldObj.func_147439_a(x, y, z); int meta = world.getBlockMetadata(x, y, z); - Block block = Block.blocksList[bID]; - if (block == null || bID < 1) + //Block block = Block.blocksList[bID]; + if (block == null || block == Blocks.air) return false; int hlvl = MinecraftForge.getBlockHarvestLevel(block, meta, getHarvestType()); @@ -48,9 +49,9 @@ public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPl { world.setBlockToAir(x, y, z); if (!player.capabilities.isCreativeMode) - onBlockDestroyed(stack, world, bID, x, y, z, player); + onBlockDestroyed(stack, world, block, x, y, z, player); if (!world.isRemote) - world.playAuxSFX(2001, x, y, z, bID + (meta << 12)); + world.playAuxSFX(2001, x, y, z, block.getBlockID() + (meta << 12)); return true; } } diff --git a/src/main/java/tconstruct/worldgen/SlimeTreeGen.java b/src/main/java/tconstruct/worldgen/SlimeTreeGen.java index 12a55a5d654..3c326192cda 100644 --- a/src/main/java/tconstruct/worldgen/SlimeTreeGen.java +++ b/src/main/java/tconstruct/worldgen/SlimeTreeGen.java @@ -3,6 +3,7 @@ import java.util.Random; import net.minecraft.block.Block; +import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraftforge.common.util.ForgeDirection; @@ -41,7 +42,7 @@ public boolean generate (World world, Random random, int xPos, int yPos, int zPo if (yPos >= 1 && yPos + height + 1 <= 256) { - Block soil = Block.blocksList[world.getBlockId(xPos, yPos - 1, zPos)]; + Block soil = world.func_147439_a(xPos, yPos - 1, zPos); boolean isSoil = (soil != null && soil.canSustainPlant(world, xPos, yPos - 1, zPos, ForgeDirection.UP, TRepo.slimeSapling)); if (isSoil) @@ -73,9 +74,8 @@ else if (yPos >= treeHeight - 1) { for (int zPos = range; zPos <= range; zPos++) { - int blockID = world.getBlockId(x + xPos, y + yPos, z + zPos); - Block block = Block.blocksList[blockID]; - if (block != null && blockID != TRepo.slimeSapling.blockID && !block.isLeaves(world, x + xPos, y + yPos, z + zPos)) + Block block = world.func_147439_a(x + xPos, y + yPos, z + zPos); + if (block != null && block != TRepo.slimeSapling && !block.isLeaves(world, x + xPos, y + yPos, z + zPos)) return false; } } @@ -89,8 +89,8 @@ int findGround (World world, int x, int y, int z) int height = y; do { - int heightID = world.getBlockId(x, height, z); - if ((heightID == TRepo.craftedSoil.blockID || heightID == TRepo.slimeGrass.blockID) && !Block.opaqueCubeLookup[world.getBlockId(x, height + 1, z)]) + Block heightBL = world.func_147439_a(x, height, z); + if ((heightBL == TRepo.craftedSoil || heightBL == TRepo.slimeGrass) && !Block.opaqueCubeLookup[world.func_147439_a(x, height + 1, z)]) { ret = height + 1; break; @@ -107,33 +107,33 @@ void placeCanopy (World world, Random random, int xPos, int yPos, int zPos, int placeDiamondLayer(world, xPos, yPos + height - i, zPos, i + 1); } - this.setBlockAndMetadata(world, xPos + 4, yPos + height - 3, zPos, 0, 0); - this.setBlockAndMetadata(world, xPos - 4, yPos + height - 3, zPos, 0, 0); - this.setBlockAndMetadata(world, xPos, yPos + height - 3, zPos + 4, 0, 0); - this.setBlockAndMetadata(world, xPos, yPos + height - 3, zPos - 4, 0, 0); - this.setBlockAndMetadata(world, xPos + 1, yPos + height - 3, zPos + 1, 0, 0); - this.setBlockAndMetadata(world, xPos + 1, yPos + height - 3, zPos - 1, 0, 0); - this.setBlockAndMetadata(world, xPos - 1, yPos + height - 3, zPos + 1, 0, 0); - this.setBlockAndMetadata(world, xPos - 1, yPos + height - 3, zPos - 1, 0, 0); + this.setBlockAndMetadata(world, xPos + 4, yPos + height - 3, zPos, Blocks.air, 0); + this.setBlockAndMetadata(world, xPos - 4, yPos + height - 3, zPos, Blocks.air, 0); + this.setBlockAndMetadata(world, xPos, yPos + height - 3, zPos + 4, Blocks.air, 0); + this.setBlockAndMetadata(world, xPos, yPos + height - 3, zPos - 4, Blocks.air, 0); + this.setBlockAndMetadata(world, xPos + 1, yPos + height - 3, zPos + 1, Blocks.air, 0); + this.setBlockAndMetadata(world, xPos + 1, yPos + height - 3, zPos - 1, Blocks.air, 0); + this.setBlockAndMetadata(world, xPos - 1, yPos + height - 3, zPos + 1, Blocks.air, 0); + this.setBlockAndMetadata(world, xPos - 1, yPos + height - 3, zPos - 1, Blocks.air, 0); //Drippers - this.setBlockAndMetadata(world, xPos + 3, yPos + height - 4, zPos, TRepo.slimeLeaves.blockID, this.metaLeaves); - this.setBlockAndMetadata(world, xPos - 3, yPos + height - 4, zPos, TRepo.slimeLeaves.blockID, this.metaLeaves); - this.setBlockAndMetadata(world, xPos, yPos + height - 4, zPos - 3, TRepo.slimeLeaves.blockID, this.metaLeaves); - this.setBlockAndMetadata(world, xPos, yPos + height - 4, zPos + 3, TRepo.slimeLeaves.blockID, this.metaLeaves); - this.setBlockAndMetadata(world, xPos + 2, yPos + height - 4, zPos + 2, TRepo.slimeLeaves.blockID, this.metaLeaves); - this.setBlockAndMetadata(world, xPos + 2, yPos + height - 4, zPos - 2, TRepo.slimeLeaves.blockID, this.metaLeaves); - this.setBlockAndMetadata(world, xPos - 2, yPos + height - 4, zPos + 2, TRepo.slimeLeaves.blockID, this.metaLeaves); - this.setBlockAndMetadata(world, xPos - 2, yPos + height - 4, zPos - 2, TRepo.slimeLeaves.blockID, this.metaLeaves); - - this.setBlockAndMetadata(world, xPos + 3, yPos + height - 5, zPos, TRepo.slimeLeaves.blockID, this.metaLeaves); - this.setBlockAndMetadata(world, xPos - 3, yPos + height - 5, zPos, TRepo.slimeLeaves.blockID, this.metaLeaves); - this.setBlockAndMetadata(world, xPos, yPos + height - 5, zPos - 3, TRepo.slimeLeaves.blockID, this.metaLeaves); - this.setBlockAndMetadata(world, xPos, yPos + height - 5, zPos + 3, TRepo.slimeLeaves.blockID, this.metaLeaves); - this.setBlockAndMetadata(world, xPos + 2, yPos + height - 5, zPos + 2, TRepo.slimeLeaves.blockID, this.metaLeaves); - this.setBlockAndMetadata(world, xPos + 2, yPos + height - 5, zPos - 2, TRepo.slimeLeaves.blockID, this.metaLeaves); - this.setBlockAndMetadata(world, xPos - 2, yPos + height - 5, zPos + 2, TRepo.slimeLeaves.blockID, this.metaLeaves); - this.setBlockAndMetadata(world, xPos - 2, yPos + height - 5, zPos - 2, TRepo.slimeLeaves.blockID, this.metaLeaves); + this.setBlockAndMetadata(world, xPos + 3, yPos + height - 4, zPos, TRepo.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, xPos - 3, yPos + height - 4, zPos, TRepo.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, xPos, yPos + height - 4, zPos - 3, TRepo.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, xPos, yPos + height - 4, zPos + 3, TRepo.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, xPos + 2, yPos + height - 4, zPos + 2, TRepo.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, xPos + 2, yPos + height - 4, zPos - 2, TRepo.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, xPos - 2, yPos + height - 4, zPos + 2, TRepo.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, xPos - 2, yPos + height - 4, zPos - 2, TRepo.slimeLeaves, this.metaLeaves); + + this.setBlockAndMetadata(world, xPos + 3, yPos + height - 5, zPos, TRepo.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, xPos - 3, yPos + height - 5, zPos, TRepo.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, xPos, yPos + height - 5, zPos - 3, TRepo.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, xPos, yPos + height - 5, zPos + 3, TRepo.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, xPos + 2, yPos + height - 5, zPos + 2, TRepo.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, xPos + 2, yPos + height - 5, zPos - 2, TRepo.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, xPos - 2, yPos + height - 5, zPos + 2, TRepo.slimeLeaves, this.metaLeaves); + this.setBlockAndMetadata(world, xPos - 2, yPos + height - 5, zPos - 2, TRepo.slimeLeaves, this.metaLeaves); } void placeDiamondLayer (World world, int xPos, int yPos, int zPos, int range) @@ -144,7 +144,7 @@ void placeDiamondLayer (World world, int xPos, int yPos, int zPos, int range) { if (Math.abs(x) + Math.abs(z) <= range) { - this.setBlockAndMetadata(world, x + xPos, yPos, z + zPos, TRepo.slimeLeaves.blockID, this.metaLeaves); + this.setBlockAndMetadata(world, x + xPos, yPos, z + zPos, TRepo.slimeLeaves, this.metaLeaves); } } } @@ -154,29 +154,28 @@ void placeTrunk (World world, int xPos, int yPos, int zPos, int height) { for (int localHeight = 0; localHeight < height; ++localHeight) { - int blockID = world.getBlockId(xPos, yPos + localHeight, zPos); + Block block = world.func_147439_a(xPos, yPos + localHeight, zPos); - Block block = Block.blocksList[blockID]; - if (blockID == 0 || block == null || block.isLeaves(world, xPos, yPos + localHeight, zPos)) + if (block == null || block == Blocks.air || block.isLeaves(world, xPos, yPos + localHeight, zPos)) { - this.setBlockAndMetadata(world, xPos, yPos + localHeight, zPos, TRepo.slimeGel.blockID, this.metaWood); + this.setBlockAndMetadata(world, xPos, yPos + localHeight, zPos, TRepo.slimeGel, this.metaWood); } } } - protected void setBlockAndMetadata (World world, int x, int y, int z, int blockID, int blockMeta) + protected void setBlockAndMetadata (World world, int x, int y, int z, Block block, int blockMeta) { - Block block = Block.blocksList[world.getBlockId(x, y, z)]; - if (block == null || block.isBlockReplaceable(world, x, y, z)) + Block blockWorld = world.func_147439_a(x, y, z); + if (blockWorld == null || blockWorld == Blocks.air || blockWorld.isBlockReplaceable(world, x, y, z)) { if (this.notify) { - world.setBlock(x, y, z, blockID, blockMeta, 3); + world.func_147465_d(x, y, z, block, blockMeta, 3); } else { - world.setBlock(x, y, z, blockID, blockMeta, 2); + world.func_147465_d(x, y, z, block, blockMeta, 2); } } } diff --git a/src/main/java/tconstruct/worldgen/SurfaceOreGen.java b/src/main/java/tconstruct/worldgen/SurfaceOreGen.java index 431aa881084..a6a1c7ba74a 100644 --- a/src/main/java/tconstruct/worldgen/SurfaceOreGen.java +++ b/src/main/java/tconstruct/worldgen/SurfaceOreGen.java @@ -37,8 +37,8 @@ public SurfaceOreGen(int id, int meta, int number, boolean changeSize, int... ta int findGround (World world, int x, int y, int z) { int returnHeight = -1; - int blockID = world.getBlockId(x, y - 1, z); - if (!Block.opaqueCubeLookup[world.getBlockId(x, y, z)] && (blockID == Blocks.dirt.blockID || blockID == Blocks.grass.blockID)) + Block block = world.func_147439_a(x, y - 1, z); + if (!Block.opaqueCubeLookup[world.func_147439_a(x, y, z)] && (block == Blocks.dirt || block == Blocks.grass)) { return y; } @@ -49,10 +49,10 @@ int findGround (World world, int x, int y, int z) { break; } - int bID = world.getBlockId(x, height, z); - if (bID == Blocks.dirt.blockID || bID == Blocks.grass.blockID) + Block b = world.func_147439_a(x, height, z); + if (b == Blocks.dirt || b == Blocks.grass) { - if (!Block.opaqueCubeLookup[world.getBlockId(x, height + 1, z)]) + if (!Block.opaqueCubeLookup[world.func_147439_a(x, height + 1, z)]) { returnHeight = height + 1; } @@ -114,10 +114,10 @@ public boolean generate (World world, Random random, int startX, int startY, int { double d14 = ((double) i3 + 0.5D - d8) / (d10 / 2.0D); - Block block = Block.blocksList[world.getBlockId(k2, l2, i3)]; + Block block = world.func_147439_a(k2, l2, i3); if (d12 * d12 + d13 * d13 + d14 * d14 < 1.0D) { - if (block == null || !Block.opaqueCubeLookup[world.getBlockId(k2, l2, i3)]) + if (block == null || !Block.opaqueCubeLookup[world.func_147439_a(k2, l2, i3)]) world.setBlock(k2, l2, i3, this.minableBlockId, minableBlockMeta, 2); else {