diff --git a/build.properties b/build.properties index d2108f7c..970ba086 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ minecraft_version=1.7.2 -forge_version=LATEST -mantle_version=c676c6 +forge_version=10.12.0.1024 +mantle_version=e2c89a FMP_version=1.0.0.211 CCLIB_version=1.0.0.44 NEI_version=1.6.1.8 diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java index 0e7d4f0a..8b9f8c2c 100644 --- a/src/main/java/tconstruct/TConstruct.java +++ b/src/main/java/tconstruct/TConstruct.java @@ -58,7 +58,7 @@ public class TConstruct public static TProxyCommon proxy; //The name of the enum is accompanied by numbers because I have no idea what will happen if another mod will try to add the same enum, just to be safe - //public static EnumCreatureType creatureTypePlayer = EnumHelper.addCreatureType("PLAYER_5821443", EntityPlayer.class, 0, Material.field_151579_a, true); + //public static EnumCreatureType creatureTypePlayer = EnumHelper.addCreatureType("PLAYER_5821443", EntityPlayer.class, 0, Material.air, true); //The packet pipeline public static final PacketPipeline packetPipeline = new PacketPipeline(); diff --git a/src/main/java/tconstruct/blocks/BlockFalling.java b/src/main/java/tconstruct/blocks/BlockFalling.java index 8f1b99e2..50060b8e 100644 --- a/src/main/java/tconstruct/blocks/BlockFalling.java +++ b/src/main/java/tconstruct/blocks/BlockFalling.java @@ -11,12 +11,12 @@ import net.minecraft.world.World; public class BlockFalling extends Block { - public static boolean field_149832_M; + public static boolean fallInstantly; public BlockFalling() { - super(Material.field_151596_z); - this.func_149647_a(CreativeTabs.tabBlock); + super(Material.craftedSnow); + this.setCreativeTab(CreativeTabs.tabBlock); } public BlockFalling(Material p_i45405_1_) @@ -24,17 +24,17 @@ public class BlockFalling extends Block super(p_i45405_1_); } - public void func_149726_b(World p_149726_1_, int p_149726_2_, int p_149726_3_, int p_149726_4_) + public void onBlockAdded(World p_149726_1_, int p_149726_2_, int p_149726_3_, int p_149726_4_) { - p_149726_1_.func_147464_a(p_149726_2_, p_149726_3_, p_149726_4_, this, this.func_149738_a(p_149726_1_)); + p_149726_1_.scheduleBlockUpdate(p_149726_2_, p_149726_3_, p_149726_4_, this, this.tickRate(p_149726_1_)); } - public void func_149695_a(World p_149695_1_, int p_149695_2_, int p_149695_3_, int p_149695_4_, Block p_149695_5_) + public void onNeighborBlockChange(World p_149695_1_, int p_149695_2_, int p_149695_3_, int p_149695_4_, Block p_149695_5_) { - p_149695_1_.func_147464_a(p_149695_2_, p_149695_3_, p_149695_4_, this, this.func_149738_a(p_149695_1_)); + p_149695_1_.scheduleBlockUpdate(p_149695_2_, p_149695_3_, p_149695_4_, this, this.tickRate(p_149695_1_)); } - public void func_149674_a(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_) + public void updateTick(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_) { if (!p_149674_1_.isRemote) { @@ -48,7 +48,7 @@ public class BlockFalling extends Block { byte b0 = 32; - if (!field_149832_M && p_149830_1_.checkChunksExist(p_149830_2_ - b0, p_149830_3_ - b0, p_149830_4_ - b0, p_149830_2_ + b0, p_149830_3_ + b0, p_149830_4_ + b0)) + if (!fallInstantly && p_149830_1_.checkChunksExist(p_149830_2_ - b0, p_149830_3_ - b0, p_149830_4_ - b0, p_149830_2_ + b0, p_149830_3_ + b0, p_149830_4_ + b0)) { if (!p_149830_1_.isRemote) { @@ -59,7 +59,7 @@ public class BlockFalling extends Block } else { - p_149830_1_.func_147468_f(p_149830_2_, p_149830_3_, p_149830_4_); + p_149830_1_.setBlockToAir(p_149830_2_, p_149830_3_, p_149830_4_); while (func_149831_e(p_149830_1_, p_149830_2_, p_149830_3_ - 1, p_149830_4_) && p_149830_3_ > 0) { @@ -68,7 +68,7 @@ public class BlockFalling extends Block if (p_149830_3_ > 0) { - p_149830_1_.func_147449_b(p_149830_2_, p_149830_3_, p_149830_4_, this); + p_149830_1_.setBlock(p_149830_2_, p_149830_3_, p_149830_4_, this); } } } @@ -76,14 +76,14 @@ public class BlockFalling extends Block protected void func_149829_a(EntityFallingBlock p_149829_1_) {} - public int func_149738_a(World p_149738_1_) + public int tickRate(World p_149738_1_) { return 2; } public static boolean func_149831_e(World p_149831_0_, int p_149831_1_, int p_149831_2_, int p_149831_3_) { - Block block = p_149831_0_.func_147439_a(p_149831_1_, p_149831_2_, p_149831_3_); + Block block = p_149831_0_.getBlock(p_149831_1_, p_149831_2_, p_149831_3_); if (block.isAir(p_149831_0_, p_149831_1_, p_149831_2_, p_149831_3_)) { @@ -96,8 +96,8 @@ public class BlockFalling extends Block else { //TODO: King, take a look here when doing liquids! - //Material material = block.field_149764_J; - //return material == Material.field_151586_h ? true : material == Material.field_151587_i; + //Material material = block.blockMaterial; + //return material == Material.water ? true : material == Material.lava; return false; } } diff --git a/src/main/java/tconstruct/blocks/BlockLandmine.java b/src/main/java/tconstruct/blocks/BlockLandmine.java index 4ac8f556..13fea6b0 100644 --- a/src/main/java/tconstruct/blocks/BlockLandmine.java +++ b/src/main/java/tconstruct/blocks/BlockLandmine.java @@ -57,23 +57,23 @@ public class BlockLandmine extends BlockContainer public BlockLandmine() { - super(Material.field_151590_u); - this.func_149675_a(true); - this.func_149676_a(0.0625F, 0.0F, 0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F); + super(Material.tnt); + this.setTickRandomly(true); + this.setBlockBounds(0.0625F, 0.0F, 0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F); } @Override public int getLightValue (IBlockAccess world, int x, int y, int z) { - if (world.func_147439_a(x, y, z) == (Block) this && world.func_147438_o(x, y, z) instanceof TileEntityLandmine) + if (world.getBlock(x, y, z) == (Block) this && world.getTileEntity(x, y, z) instanceof TileEntityLandmine) { - TileEntityLandmine te = (TileEntityLandmine) world.func_147438_o(x, y, z); + TileEntityLandmine te = (TileEntityLandmine) world.getTileEntity(x, y, z); if (te != null) { if (te.getStackInSlot(3) != null && te.getStackInSlot(3).getItem() instanceof ItemBlock) { - return (BlockUtils.getBlockFromItem(te.getStackInSlot(3).getItem())).func_149750_m(); + return (BlockUtils.getBlockFromItem(te.getStackInSlot(3).getItem())).getLightValue(); } } } @@ -81,49 +81,49 @@ public class BlockLandmine extends BlockContainer } @Override - public int func_149738_a (World par1World) + public int tickRate (World par1World) { return 20; } @Override - public IIcon func_149673_e (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + public IIcon getIcon (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { - TileEntityLandmine te = (TileEntityLandmine) par1IBlockAccess.func_147438_o(par2, par3, par4); + TileEntityLandmine te = (TileEntityLandmine) par1IBlockAccess.getTileEntity(par2, par3, par4); ItemStack camo = te.getStackInSlot(3); if (camo != null) { - return BlockUtils.getBlockFromItem(camo.getItem()).func_149691_a(par5, camo.getItemDamage()); + return BlockUtils.getBlockFromItem(camo.getItem()).getIcon(par5, camo.getItemDamage()); } else { - return this.func_149691_a(par5, par1IBlockAccess.getBlockMetadata(par2, par3, par4)); + return this.getIcon(par5, par1IBlockAccess.getBlockMetadata(par2, par3, par4)); } } @Override - public boolean func_149662_c () + public boolean isOpaqueCube () { return false; } @Override - public boolean func_149686_d () + public boolean renderAsNormalBlock () { return false; } @Override - public int func_149645_b () + public int getRenderType () { return RenderLandmine.model; } @Override - public void func_149699_a (World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer) + public void onBlockClicked (World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer) { - super.func_149699_a(par1World, par2, par3, par4, par5EntityPlayer); + super.onBlockClicked(par1World, par2, par3, par4, par5EntityPlayer); if (this.explodeOnBroken) { @@ -132,22 +132,22 @@ public class BlockLandmine extends BlockContainer } @Override - public void func_149651_a (IIconRegister par1IconRegister) + public void registerBlockIcons (IIconRegister par1IconRegister) { - this.field_149761_L = par1IconRegister.registerIcon("tinker:Landmine"); + this.blockIcon = par1IconRegister.registerIcon("tinker:Landmine"); } @Override - public boolean func_149727_a (World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) + public boolean onBlockActivated (World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { par5EntityPlayer.openGui(TConstruct.instance, TProxyCommon.landmineID, par1World, par2, par3, par4); return true; } @Override - public void func_149749_a (World par1World, int par2, int par3, int par4, Block par5Block, int par6) + public void breakBlock (World par1World, int par2, int par3, int par4, Block par5Block, int par6) { - TileEntityLandmine tileentity = (TileEntityLandmine) par1World.func_147438_o(par2, par3, par4); + TileEntityLandmine tileentity = (TileEntityLandmine) par1World.getTileEntity(par2, par3, par4); int metadata = par1World.getBlockMetadata(par2, par3, par4); @@ -155,12 +155,12 @@ public class BlockLandmine extends BlockContainer { if (this != null) { - ItemStack is = new ItemStack(this, 1, func_149692_a(tileentity.triggerType)); - if (tileentity.func_145818_k_()) + ItemStack is = new ItemStack(this, 1, damageDropped(tileentity.triggerType)); + if (tileentity.hasCustomInventoryName()) { - is.func_151001_c(tileentity.func_145825_b()); + is.setStackDisplayName(tileentity.getInventoryName()); } - func_149642_a(par1World, par2, par3, par4, new ItemStack(this, 1, func_149692_a(tileentity.triggerType))); + dropBlockAsItem(par1World, par2, par3, par4, new ItemStack(this, 1, damageDropped(tileentity.triggerType))); } for (int j1 = 0; j1 < tileentity.getSizeInventory(); ++j1) @@ -191,18 +191,18 @@ public class BlockLandmine extends BlockContainer } } - par1World.func_147449_b(par2, par3, par4, par5Block); + par1World.setBlock(par2, par3, par4, par5Block); } else if (explodeOnBroken) { checkExplosion(par1World, par2, par3, par4, true); } - super.func_149749_a(par1World, par2, par3, par4, par5Block, par6); + super.breakBlock(par1World, par2, par3, par4, par5Block, par6); } @Override - public void func_149666_a (Item par1, CreativeTabs par2CreativeTabs, List par3List) + public void getSubBlocks (Item par1, CreativeTabs par2CreativeTabs, List par3List) { par3List.add(new ItemStack(par1, 1, 0)); par3List.add(new ItemStack(par1, 1, 1)); @@ -211,13 +211,13 @@ public class BlockLandmine extends BlockContainer } @Override - public boolean func_149655_b (IBlockAccess par1IBlockAccess, int par2, int par3, int par4) + public boolean getBlocksMovement (IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { return true; } @Override - public boolean func_149707_d (World par1World, int par2, int par3, int par4, int par5) + public boolean canPlaceBlockOnSide (World par1World, int par2, int par3, int par4, int par5) { ForgeDirection dir = ForgeDirection.getOrientation(par5); return (dir == DOWN && par1World.isSideSolid(par2, par3 + 1, par4, DOWN)) || (dir == UP && par1World.isSideSolid(par2, par3 - 1, par4, UP)) @@ -226,14 +226,14 @@ public class BlockLandmine extends BlockContainer } @Override - public boolean func_149742_c (World par1World, int par2, int par3, int par4) + public boolean canPlaceBlockAt (World par1World, int par2, int par3, int par4) { return par1World.isSideSolid(par2 - 1, par3, par4, EAST) || par1World.isSideSolid(par2 + 1, par3, par4, WEST) || par1World.isSideSolid(par2, par3, par4 - 1, SOUTH) || par1World.isSideSolid(par2, par3, par4 + 1, NORTH) || par1World.isSideSolid(par2, par3 - 1, par4, UP) || par1World.isSideSolid(par2, par3 + 1, par4, DOWN); } @Override - public int func_149660_a (World par1World, int par2, int par3, int par4, int par5, float par6, float par7, float par8, int par9) + public int onBlockPlaced (World par1World, int par2, int par3, int par4, int par5, float par6, float par7, float par8, int par9) { int j1 = par9 & 8; int k1 = par9 & 7; @@ -273,7 +273,7 @@ public class BlockLandmine extends BlockContainer } @Override - public void func_149689_a (World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) + public void onBlockPlacedBy (World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { int l = par1World.getBlockMetadata(par2, par3, par4); int i1 = l & 7; @@ -304,7 +304,7 @@ public class BlockLandmine extends BlockContainer if (par6ItemStack.hasDisplayName()) { - ((TileEntityLandmine) par1World.func_147438_o(par2, par3, par4)).setGuiDisplayName(par6ItemStack.getDisplayName()); + ((TileEntityLandmine) par1World.getTileEntity(par2, par3, par4)).setGuiDisplayName(par6ItemStack.getDisplayName()); } } @@ -330,7 +330,7 @@ public class BlockLandmine extends BlockContainer } @Override - public void func_149695_a (World par1World, int par2, int par3, int par4, Block par5Block) + public void onNeighborBlockChange (World par1World, int par2, int par3, int par4, Block par5Block) { checkPlacement(par1World, par2, par3, par4, par5Block); @@ -386,7 +386,7 @@ public class BlockLandmine extends BlockContainer if (flag) { - this.func_149697_b(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); + this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); WorldHelper.setBlockToAir(par1World, par2, par3, par4); } } @@ -394,9 +394,9 @@ public class BlockLandmine extends BlockContainer private boolean checkIfAttachedToBlock (World par1World, int par2, int par3, int par4) { - if (!this.func_149742_c(par1World, par2, par3, par4)) + if (!this.canPlaceBlockAt(par1World, par2, par3, par4)) { - this.func_149697_b(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); + this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); WorldHelper.setBlockToAir(par1World, par2, par3, par4); return false; } @@ -407,7 +407,7 @@ public class BlockLandmine extends BlockContainer } @Override - public void func_149674_a (World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick (World par1World, int par2, int par3, int par4, Random par5Random) { if (!par1World.isRemote) { @@ -429,7 +429,7 @@ public class BlockLandmine extends BlockContainer { if (hasItems(par1World, par2, par3, par4)) { - TileEntityLandmine te = (TileEntityLandmine) par1World.func_147438_o(par2, par3, par4); + TileEntityLandmine te = (TileEntityLandmine) par1World.getTileEntity(par2, par3, par4); if (te.soundcountything <= 0) { par1World.playSoundEffect((double) par2 + 0.5D, (double) par3 + 0.1D, (double) par4 + 0.5D, "random.click", 0.3F, 0.6F); @@ -441,14 +441,14 @@ public class BlockLandmine extends BlockContainer } @Override - public AxisAlignedBB func_149668_a (World par1World, int par2, int par3, int par4) + public AxisAlignedBB getCollisionBoundingBoxFromPool (World par1World, int par2, int par3, int par4) { return null; } private boolean hasItems (World par1World, int par2, int par3, int par4) { - TileEntityLandmine te = (TileEntityLandmine) par1World.func_147438_o(par2, par3, par4); + TileEntityLandmine te = (TileEntityLandmine) par1World.getTileEntity(par2, par3, par4); if (te != null && te.getStackInSlot(0) != null || te.getStackInSlot(1) != null || te.getStackInSlot(2) != null) { return true; @@ -466,7 +466,7 @@ public class BlockLandmine extends BlockContainer protected int getMineState (World par1World, int par2, int par3, int par4) { - TileEntityLandmine te = (TileEntityLandmine) par1World.func_147438_o(par2, par3, par4); + TileEntityLandmine te = (TileEntityLandmine) par1World.getTileEntity(par2, par3, par4); // Change to return 1 if you want the landmine to blow up when the block // holding it is broken @@ -517,7 +517,7 @@ public class BlockLandmine extends BlockContainer { Entity entity = (Entity) iterator.next(); - if (!entity.func_145773_az()) + if (!entity.doesEntityNotTriggerPressurePlate()) { return 1; } @@ -562,7 +562,7 @@ public class BlockLandmine extends BlockContainer public Entity getMineTriggerer (World par1World, int par2, int par3, int par4) { - TileEntityLandmine te = (TileEntityLandmine) par1World.func_147438_o(par2, par3, par4); + TileEntityLandmine te = (TileEntityLandmine) par1World.getTileEntity(par2, par3, par4); // Change to return 1 if you want the landmine to blow up when the // block holding it is broken @@ -613,7 +613,7 @@ public class BlockLandmine extends BlockContainer { Entity entity = (Entity) iterator.next(); - if (!entity.func_145773_az()) + if (!entity.doesEntityNotTriggerPressurePlate()) { return entity; } @@ -625,14 +625,14 @@ public class BlockLandmine extends BlockContainer } @Override - public boolean func_149659_a (Explosion par1Explosion) + public boolean canDropFromExplosion (Explosion par1Explosion) { return false; } @SuppressWarnings("incomplete-switch") @Override - public void func_149719_a (IBlockAccess par1IBlockAccess, int par2, int par3, int par4) + public void setBlockBoundsBasedOnState (IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { int l = par1IBlockAccess.getBlockMetadata(par2, par3, par4); int i1 = l & 7; @@ -642,34 +642,34 @@ public class BlockLandmine extends BlockContainer switch (dir) { case DOWN: - this.func_149676_a(0.0625F, 0.0F, 0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F); + this.setBlockBounds(0.0625F, 0.0F, 0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F); break; case UP: - this.func_149676_a(0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F, 1.0F - 0.0625F); + this.setBlockBounds(0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F, 1.0F - 0.0625F); break; case NORTH: - this.func_149676_a(0.0625F, 0.0625F, 0.0F, 1.0F - 0.0625F, 1.0F - 0.0625F, 0.0625F); + this.setBlockBounds(0.0625F, 0.0625F, 0.0F, 1.0F - 0.0625F, 1.0F - 0.0625F, 0.0625F); break; case SOUTH: - this.func_149676_a(0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F, 1.0F); + this.setBlockBounds(0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F, 1.0F); break; case EAST: - this.func_149676_a(1.0F - 0.0625F, 0.0625F, 0.0625F, 1.0F, 1.0F - 0.0625F, 1.0F - 0.0625F); + this.setBlockBounds(1.0F - 0.0625F, 0.0625F, 0.0625F, 1.0F, 1.0F - 0.0625F, 1.0F - 0.0625F); break; case WEST: - this.func_149676_a(0.0F, 0.0625F, 0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F); + this.setBlockBounds(0.0F, 0.0625F, 0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F); break; } } @Override - public Item func_149650_a (int par1, Random par2Random, int par3) + public Item getItemDropped (int par1, Random par2Random, int par3) { return null; } @Override - public TileEntity func_149915_a (World world, int meta) + public TileEntity createNewTileEntity (World world, int meta) { return new TileEntityLandmine(); } diff --git a/src/main/java/tconstruct/blocks/CastingChannelBlock.java b/src/main/java/tconstruct/blocks/CastingChannelBlock.java index c5708995..b1a0f3cf 100644 --- a/src/main/java/tconstruct/blocks/CastingChannelBlock.java +++ b/src/main/java/tconstruct/blocks/CastingChannelBlock.java @@ -23,19 +23,19 @@ public class CastingChannelBlock extends BlockContainer public CastingChannelBlock() { - super(Material.field_151576_e); - this.func_149711_c(1F); - this.func_149752_b(10); - this.field_149762_H = field_149769_e; - func_149647_a(TConstructRegistry.blockTab); + super(Material.rock); + this.setHardness(1F); + this.setResistance(10); + this.stepSound = soundTypeStone; + setCreativeTab(TConstructRegistry.blockTab); } @Override - public boolean func_149727_a (World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) + public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { if (!world.isRemote) { - CastingChannelLogic tile = (CastingChannelLogic) world.func_147438_o(x, y, z); + CastingChannelLogic tile = (CastingChannelLogic) world.getTileEntity(x, y, z); if (player.isSneaking()) { } @@ -56,9 +56,9 @@ public class CastingChannelBlock extends BlockContainer } @Override - public void func_149719_a (IBlockAccess world, int x, int y, int z) + public void setBlockBoundsBasedOnState (IBlockAccess world, int x, int y, int z) { - CastingChannelLogic tile = (CastingChannelLogic) world.func_147438_o(x, y, z); + CastingChannelLogic tile = (CastingChannelLogic) world.getTileEntity(x, y, z); float minX = 0.3125F; float maxX = 0.6875F; float minZ = 0.3125F; @@ -72,35 +72,35 @@ public class CastingChannelBlock extends BlockContainer if (tile.hasTankConnected(ForgeDirection.EAST)) maxX = 1F; - this.func_149676_a(minX, 0.375F, minZ, maxX, 0.625F, maxZ); + this.setBlockBounds(minX, 0.375F, minZ, maxX, 0.625F, maxZ); } @Override - public boolean func_149686_d () + public boolean renderAsNormalBlock () { return false; } @Override - public boolean func_149662_c () + public boolean isOpaqueCube () { return false; } @Override - public int func_149645_b () + public int getRenderType () { return BlockRenderCastingChannel.renderID; } @Override - public void func_149651_a (IIconRegister iconRegister) + public void registerBlockIcons (IIconRegister iconRegister) { - this.field_149761_L = iconRegister.registerIcon("tinker:searedstone"); + this.blockIcon = iconRegister.registerIcon("tinker:searedstone"); } @Override - public TileEntity func_149915_a (World var1, int var2) + public TileEntity createNewTileEntity (World var1, int var2) { return new CastingChannelLogic(); } diff --git a/src/main/java/tconstruct/blocks/ConveyorBase.java b/src/main/java/tconstruct/blocks/ConveyorBase.java index f0825d23..c2a0702b 100644 --- a/src/main/java/tconstruct/blocks/ConveyorBase.java +++ b/src/main/java/tconstruct/blocks/ConveyorBase.java @@ -25,8 +25,8 @@ public class ConveyorBase extends MantleBlock public ConveyorBase(Material material, String name) { super(material); - this.func_149647_a(TConstructRegistry.blockTab); - func_149676_a(0f, 0f, 0f, 1f, 0.5f, 1f); + this.setCreativeTab(TConstructRegistry.blockTab); + setBlockBounds(0f, 0f, 0f, 1f, 0.5f, 1f); texturename = name; } @@ -36,13 +36,13 @@ public class ConveyorBase extends MantleBlock } @Override - public AxisAlignedBB func_149668_a (World world, int x, int y, int z) + public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z) { return null; } @Override - public void func_149670_a (World world, int x, int y, int z, Entity entity) + public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity) { if (!world.isBlockIndirectlyGettingPowered(x, y, z)) { @@ -94,49 +94,49 @@ public class ConveyorBase extends MantleBlock } @Override - public void func_149689_a (World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) + public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) { int face = MathHelper.floor_double((double) (entity.rotationYaw * 8.0F / 360.0F) + 0.5D) + (entity.isSneaking() ? 4 : 0) & 7; int meta = world.getBlockMetadata(x, y, z) & 8; world.setBlockMetadataWithNotify(x, y, z, face | meta, 2); } - public boolean func_149646_a (IBlockAccess world, int x, int y, int z, int side) + public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side) { if (side == 1) return false; - return super. func_149646_a(world, x, y, z, side); + return super. shouldSideBeRendered(world, x, y, z, side); } public IIcon[] icons; /* Rendering */ @Override - public boolean func_149686_d () + public boolean renderAsNormalBlock () { return false; } @Override - public boolean func_149662_c () + public boolean isOpaqueCube () { return false; } @Override - public int func_149701_w () + public int getRenderBlockPass () { return 1; } @Override - public int func_149645_b () + public int getRenderType () { return SlimeChannelRender.model; } @Override - public void func_149651_a (IIconRegister iconRegister) + public void registerBlockIcons (IIconRegister iconRegister) { String[] textureNames = new String[] { texturename, texturename + "_flow" }; this.icons = new IIcon[textureNames.length]; @@ -149,7 +149,7 @@ public class ConveyorBase extends MantleBlock @Override @SideOnly(Side.CLIENT) - public IIcon func_149691_a (int side, int meta) + public IIcon getIcon (int side, int meta) { if (meta >= 8) return icons[0]; diff --git a/src/main/java/tconstruct/blocks/CraftingSlab.java b/src/main/java/tconstruct/blocks/CraftingSlab.java index d6a336ea..779044ef 100644 --- a/src/main/java/tconstruct/blocks/CraftingSlab.java +++ b/src/main/java/tconstruct/blocks/CraftingSlab.java @@ -31,9 +31,9 @@ public class CraftingSlab extends InventorySlab public CraftingSlab(Material material) { super(material); - this.func_149647_a(TConstructRegistry.blockTab); - this.func_149711_c(2f); - this.field_149762_H = Block.field_149766_f; + this.setCreativeTab(TConstructRegistry.blockTab); + this.setHardness(2f); + this.stepSound = Block.soundTypeWood; } /* Rendering */ @@ -48,7 +48,7 @@ public class CraftingSlab extends InventorySlab } @Override - public IIcon func_149691_a (int side, int meta) + public IIcon getIcon (int side, int meta) { return icons[(meta % 8) * 3 + getTextureIndex(side)]; } @@ -67,9 +67,9 @@ public class CraftingSlab extends InventorySlab { int metadata = world.getBlockMetadata(x, y, z); if (metadata == 5) - return AxisAlignedBB.getAABBPool().getAABB((double) x + this.field_149759_B, (double) y + this.field_149760_C, (double) z + this.field_149754_D, (double) x + this.field_149755_E, (double) y + this.field_149756_F - 0.125, - (double) z + this.field_149757_G); - return AxisAlignedBB.getAABBPool().getAABB((double) x + this.field_149759_B, (double) y + this.field_149760_C, (double) z + this.field_149754_D, (double) x + this.field_149755_E, (double) y + this.field_149756_F, (double) z + this.field_149757_G); + return AxisAlignedBB.getAABBPool().getAABB((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY - 0.125, + (double) z + this.maxZ); + return AxisAlignedBB.getAABBPool().getAABB((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY, (double) z + this.maxZ); } @Override @@ -124,7 +124,7 @@ public class CraftingSlab extends InventorySlab } @Override - public void func_149666_a (Item b, CreativeTabs tab, List list) + public void getSubBlocks (Item b, CreativeTabs tab, List list) { for (int iter = 0; iter < 6; iter++) { @@ -133,14 +133,14 @@ public class CraftingSlab extends InventorySlab } @Override - public void func_149689_a (World world, int x, int y, int z, EntityLivingBase entityliving, ItemStack stack) + public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase entityliving, ItemStack stack) { if (PHConstruct.freePatterns) { int meta = world.getBlockMetadata(x, y, z); if (meta == 4) { - PatternChestLogic logic = (PatternChestLogic) world.func_147438_o(x, y, z); + PatternChestLogic logic = (PatternChestLogic) world.getTileEntity(x, y, z); for (int i = 1; i <= 13; i++) { logic.setInventorySlotContents(i - 1, new ItemStack(TRepo.woodPattern, 1, i)); @@ -148,11 +148,11 @@ public class CraftingSlab extends InventorySlab logic.setInventorySlotContents(13, new ItemStack(TRepo.woodPattern, 1, 22)); } } - super.func_149689_a(world, x, y, z, entityliving, stack); + super.onBlockPlacedBy(world, x, y, z, entityliving, stack); } @Override - public TileEntity func_149915_a (World var1, int metadata) + public TileEntity createNewTileEntity (World var1, int metadata) { switch (metadata % 8) { diff --git a/src/main/java/tconstruct/blocks/CraftingStationBlock.java b/src/main/java/tconstruct/blocks/CraftingStationBlock.java index 75dfb9ae..495bcd17 100644 --- a/src/main/java/tconstruct/blocks/CraftingStationBlock.java +++ b/src/main/java/tconstruct/blocks/CraftingStationBlock.java @@ -24,9 +24,9 @@ public class CraftingStationBlock extends InventoryBlock public CraftingStationBlock(Material material) { super(material); - this.func_149647_a(TConstructRegistry.blockTab); - this.func_149711_c(2f); - this.field_149762_H = Block.field_149766_f; + this.setCreativeTab(TConstructRegistry.blockTab); + this.setHardness(2f); + this.stepSound = Block.soundTypeWood; } //Block.hasComparatorInputOverride and Block.getComparatorInputOverride @@ -41,7 +41,7 @@ public class CraftingStationBlock extends InventoryBlock } @Override - public IIcon func_149691_a (int side, int meta) + public IIcon getIcon (int side, int meta) { return icons[meta * 3 + getTextureIndex(side)]; } @@ -57,25 +57,25 @@ public class CraftingStationBlock extends InventoryBlock } @Override - public boolean func_149686_d () + public boolean renderAsNormalBlock () { return false; } @Override - public boolean func_149662_c () + public boolean isOpaqueCube () { return false; } @Override - public int func_149645_b () + public int getRenderType () { return TableRender.tabelModelID; } @Override - public boolean func_149646_a (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { return true; } @@ -93,7 +93,7 @@ public class CraftingStationBlock extends InventoryBlock } @Override - public void func_149666_a (Item id, CreativeTabs tab, List list) + public void getSubBlocks (Item id, CreativeTabs tab, List list) { for (int iter = 0; iter < 1; iter++) { @@ -102,7 +102,7 @@ public class CraftingStationBlock extends InventoryBlock } @Override - public TileEntity func_149915_a(World arg0, int arg1) { + public TileEntity createNewTileEntity(World arg0, int arg1) { return new CraftingStationLogic(); } } diff --git a/src/main/java/tconstruct/blocks/DryingRack.java b/src/main/java/tconstruct/blocks/DryingRack.java index a773395e..b502c8fe 100644 --- a/src/main/java/tconstruct/blocks/DryingRack.java +++ b/src/main/java/tconstruct/blocks/DryingRack.java @@ -26,20 +26,20 @@ public class DryingRack extends InventoryBlock public DryingRack() { - super(Material.field_151575_d); - this.func_149647_a(TConstructRegistry.blockTab); - func_149711_c(2.0f); - field_149762_H = field_149777_j; + super(Material.wood); + this.setCreativeTab(TConstructRegistry.blockTab); + setHardness(2.0f); + stepSound = soundTypeMetal; } @Override - public TileEntity func_149915_a (World world, int metadata) + public TileEntity createNewTileEntity (World world, int metadata) { return new DryingRackLogic(); } @Override - public int func_149701_w () + public int getRenderBlockPass () { return 1; } @@ -77,7 +77,7 @@ public class DryingRack extends InventoryBlock /* Activation */ @Override - public boolean func_149727_a (World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ) + public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ) { return activateDryingRack(world, x, y, z, player); } @@ -86,7 +86,7 @@ public class DryingRack extends InventoryBlock { if (!world.isRemote) { - DryingRackLogic logic = (DryingRackLogic) world.func_147438_o(x, y, z); + DryingRackLogic logic = (DryingRackLogic) world.getTileEntity(x, y, z); if (!logic.isStackInSlot(0)) { @@ -107,7 +107,7 @@ public class DryingRack extends InventoryBlock } } - world.func_147471_g(x, y, z); + world.markBlockForUpdate(x, y, z); } return true; } @@ -196,18 +196,18 @@ public class DryingRack extends InventoryBlock yMin = 0.75F; break; } - this.func_149676_a(xMin, yMin, zMin, xMax, yMax, zMax); + this.setBlockBounds(xMin, yMin, zMin, xMax, yMax, zMax); } public void addCollisionBoxesToList (World world, int x, int y, int z, AxisAlignedBB aabb, List list, Entity entity) { this.setBlockBoundsBasedOnState(world, x, y, z); - super.func_149743_a(world, x, y, z, aabb, list, entity); + super.addCollisionBoxesToList(world, x, y, z, aabb, list, entity); } /* Rendering */ @Override - public int func_149645_b () + public int getRenderType () { return DryingRackRender.model; } @@ -221,9 +221,9 @@ public class DryingRack extends InventoryBlock } @Override - public IIcon func_149691_a (int side, int meta) + public IIcon getIcon (int side, int meta) { - return Blocks.planks.func_149691_a(side, 0); + return Blocks.planks.getIcon(side, 0); } public int getTextureIndex (int side) @@ -237,13 +237,13 @@ public class DryingRack extends InventoryBlock } @Override - public boolean func_149686_d () + public boolean renderAsNormalBlock () { return false; } @Override - public boolean func_149662_c () + public boolean isOpaqueCube () { return false; } diff --git a/src/main/java/tconstruct/blocks/EquipBlock.java b/src/main/java/tconstruct/blocks/EquipBlock.java index 383a5632..c4d2d963 100644 --- a/src/main/java/tconstruct/blocks/EquipBlock.java +++ b/src/main/java/tconstruct/blocks/EquipBlock.java @@ -30,8 +30,8 @@ public class EquipBlock extends InventoryBlock public EquipBlock(Material material) { super(material); - this.func_149711_c(0.3f); - this.func_149676_a(0, 0, 0, 1, 0.25f, 1); + this.setHardness(0.3f); + this.setBlockBounds(0, 0, 0, 1, 0.25f, 1); //this.setCreativeTab(ToolConstruct.materialTab); } @@ -41,43 +41,43 @@ public class EquipBlock extends InventoryBlock return new String[] { "toolstation_top" }; } - public IIcon func_149691_a (int side, int meta) + public IIcon getIcon (int side, int meta) { - return Blocks.iron_block.func_149691_a(side, meta); + return Blocks.iron_block.getIcon(side, meta); } @SideOnly(Side.CLIENT) - public void func_149651_a (IIconRegister par1IconRegister) + public void registerBlockIcons (IIconRegister par1IconRegister) { //this.blockIcon = par1iconRegister.registerIcon(Block.blockIron.getUnlocalizedName()); } @Override - public boolean func_149686_d () + public boolean renderAsNormalBlock () { return false; } @Override - public boolean func_149662_c () + public boolean isOpaqueCube () { return false; } @Override - public int func_149645_b () + public int getRenderType () { return FrypanRender.frypanModelID; } @Override - public Item func_149650_a (int par1, Random par2Random, int par3) + public Item getItemDropped (int par1, Random par2Random, int par3) { return null; } @Override - public TileEntity func_149915_a (World world, int metadata) + public TileEntity createNewTileEntity (World world, int metadata) { return new FrypanLogic(); } @@ -95,9 +95,9 @@ public class EquipBlock extends InventoryBlock } } - public void func_149689_a (World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) + public void onBlockPlacedBy (World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { - super.func_149689_a(par1World, par2, par3, par4, par5EntityLivingBase, par6ItemStack); + super.onBlockPlacedBy(par1World, par2, par3, par4, par5EntityLivingBase, par6ItemStack); int i3 = MathHelper.floor_double((par5EntityLivingBase.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; int newMeta = 0; @@ -121,9 +121,9 @@ public class EquipBlock extends InventoryBlock } @Override - public void func_149749_a (World par1World, int x, int y, int z, Block par5, int meta) + public void breakBlock (World par1World, int x, int y, int z, Block par5, int meta) { - TileEntity te = par1World.func_147438_o(x, y, z); + TileEntity te = par1World.getTileEntity(x, y, z); if (te != null && te instanceof EquipLogic) { @@ -166,7 +166,7 @@ public class EquipBlock extends InventoryBlock } } - super.func_149749_a(par1World, x, y, z, par5, meta); + super.breakBlock(par1World, x, y, z, par5, meta); } public int getLightValue (IBlockAccess world, int x, int y, int z) diff --git a/src/main/java/tconstruct/blocks/FurnaceSlab.java b/src/main/java/tconstruct/blocks/FurnaceSlab.java index 76167c1c..109531f0 100644 --- a/src/main/java/tconstruct/blocks/FurnaceSlab.java +++ b/src/main/java/tconstruct/blocks/FurnaceSlab.java @@ -21,8 +21,8 @@ public class FurnaceSlab extends InventorySlab public FurnaceSlab(Material material) { super(material); - this.func_149647_a(TConstructRegistry.blockTab); - this.func_149711_c(3.5f); + this.setCreativeTab(TConstructRegistry.blockTab); + this.setHardness(3.5f); } @Override @@ -57,14 +57,14 @@ public class FurnaceSlab extends InventorySlab } @Override - public IIcon func_149691_a (int side, int meta) + public IIcon getIcon (int side, int meta) { return icons[(meta % 8) * 3 + getTextureIndex(side)]; } - public IIcon func_149673_e (IBlockAccess world, int x, int y, int z, int side) + public IIcon getIcon (IBlockAccess world, int x, int y, int z, int side) { - TileEntity logic = world.func_147438_o(x, y, z); + TileEntity logic = world.getTileEntity(x, y, z); short direction = (logic instanceof IFacingLogic) ? ((IFacingLogic) logic).getRenderDirection() : 0; int meta = world.getBlockMetadata(x, y, z) % 8; @@ -97,7 +97,7 @@ public class FurnaceSlab extends InventorySlab } @Override - public void func_149651_a (IIconRegister iconRegister) + public void registerBlockIcons (IIconRegister iconRegister) { String[] textureNames = getTextureNames(); this.icons = new IIcon[textureNames.length]; @@ -112,7 +112,7 @@ public class FurnaceSlab extends InventorySlab } @Override - public TileEntity func_149915_a (World var1, int metadata) + public TileEntity createNewTileEntity (World var1, int metadata) { switch (metadata % 8) { diff --git a/src/main/java/tconstruct/blocks/GlassBlock.java b/src/main/java/tconstruct/blocks/GlassBlock.java index 29011cf1..d23cdedd 100644 --- a/src/main/java/tconstruct/blocks/GlassBlock.java +++ b/src/main/java/tconstruct/blocks/GlassBlock.java @@ -14,7 +14,7 @@ public class GlassBlock extends TConstructBlock public GlassBlock() { - super(Material.field_151592_s, 3f, blockTextures); + super(Material.glass, 3f, blockTextures); } public boolean isOpaqueCube () @@ -23,14 +23,14 @@ public class GlassBlock extends TConstructBlock } @SideOnly(Side.CLIENT) - public boolean func_149646_a (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { - Block i1 = par1IBlockAccess.func_147439_a(par2, par3, par4); - return i1 == (Block) this ? false : super.func_149646_a(par1IBlockAccess, par2, par3, par4, par5); + Block i1 = par1IBlockAccess.getBlock(par2, par3, par4); + return i1 == (Block) this ? false : super.shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, par5); } @Override - public float func_149712_f (World world, int x, int y, int z) + public float getBlockHardness (World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); switch (meta) @@ -42,7 +42,7 @@ public class GlassBlock extends TConstructBlock case 2: return 50.0F; default: - return field_149782_v; + return blockHardness; } } @@ -58,13 +58,13 @@ public class GlassBlock extends TConstructBlock case 2: return 2000F; default: - return func_149638_a(entity); + return getExplosionResistance(entity); } } @Override @SideOnly(Side.CLIENT) - public void func_149651_a (IIconRegister iconRegister) + public void registerBlockIcons (IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; diff --git a/src/main/java/tconstruct/blocks/GlassBlockConnected.java b/src/main/java/tconstruct/blocks/GlassBlockConnected.java index a3f561ea..bf83a7ab 100644 --- a/src/main/java/tconstruct/blocks/GlassBlockConnected.java +++ b/src/main/java/tconstruct/blocks/GlassBlockConnected.java @@ -24,12 +24,12 @@ public class GlassBlockConnected extends MantleBlock public GlassBlockConnected(String location, boolean hasAlpha) { - super(Material.field_151592_s); - this.field_149762_H = field_149778_k; + super(Material.glass); + this.stepSound = soundTypeGlass; folder = location; renderPass = hasAlpha ? 1 : 0; - func_149711_c(0.3F); - this.func_149647_a(TConstructRegistry.blockTab); + setHardness(0.3F); + this.setCreativeTab(TConstructRegistry.blockTab); } //For FMP support @@ -39,19 +39,19 @@ public class GlassBlockConnected extends MantleBlock } @Override - public boolean func_149662_c () + public boolean isOpaqueCube () { return false; } @Override - public boolean func_149686_d () + public boolean renderAsNormalBlock () { return false; } @Override - public int func_149701_w () + public int getRenderBlockPass () { return renderPass; } @@ -71,7 +71,7 @@ public class GlassBlockConnected extends MantleBlock } @Override - public IIcon func_149673_e (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + public IIcon getIcon (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { return par1IBlockAccess.getBlockMetadata(par2, par3, par4) == 15 ? icons[0] : getConnectedBlockTexture(par1IBlockAccess, par2, par3, par4, par5, icons); } @@ -88,22 +88,22 @@ public class GlassBlockConnected extends MantleBlock switch (par5) { case 0: - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) { isOpenDown = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) { isOpenUp = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) { isOpenLeft = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) { isOpenRight = true; } @@ -170,22 +170,22 @@ public class GlassBlockConnected extends MantleBlock } break; case 1: - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) { isOpenDown = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) { isOpenUp = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) { isOpenLeft = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) { isOpenRight = true; } @@ -252,22 +252,22 @@ public class GlassBlockConnected extends MantleBlock } break; case 2: - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) { isOpenDown = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) { isOpenUp = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) { isOpenLeft = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) { isOpenRight = true; } @@ -334,22 +334,22 @@ public class GlassBlockConnected extends MantleBlock } break; case 3: - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) { isOpenDown = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) { isOpenUp = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) { isOpenLeft = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) { isOpenRight = true; } @@ -416,22 +416,22 @@ public class GlassBlockConnected extends MantleBlock } break; case 4: - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) { isOpenDown = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) { isOpenUp = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) { isOpenLeft = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) { isOpenRight = true; } @@ -498,22 +498,22 @@ public class GlassBlockConnected extends MantleBlock } break; case 5: - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) { isOpenDown = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) { isOpenUp = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) { isOpenLeft = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) { isOpenRight = true; } @@ -585,24 +585,24 @@ public class GlassBlockConnected extends MantleBlock } @Override - public boolean func_149646_a (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { - Block b = par1IBlockAccess.func_147439_a(par2, par3, par4); - return b == (Block) this ? false : super. func_149646_a(par1IBlockAccess, par2, par3, par4, par5); + Block b = par1IBlockAccess.getBlock(par2, par3, par4); + return b == (Block) this ? false : super. shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, par5); } @Override - public IIcon func_149691_a (int par1, int par2) + public IIcon getIcon (int par1, int par2) { return icons[0]; } @Override - public AxisAlignedBB func_149633_g (World par1World, int par2, int par3, int par4) + public AxisAlignedBB getSelectedBoundingBoxFromPool (World par1World, int par2, int par3, int par4) { if (shouldRenderSelectionBox) { - return super.func_149633_g(par1World, par2, par3, par4); + return super.getSelectedBoundingBoxFromPool(par1World, par2, par3, par4); } else { @@ -611,7 +611,7 @@ public class GlassBlockConnected extends MantleBlock } @Override - public void func_149651_a (IIconRegister par1IconRegister) + public void registerBlockIcons (IIconRegister par1IconRegister) { icons[0] = par1IconRegister.registerIcon("tinker:glass/" + folder + "/glass"); icons[1] = par1IconRegister.registerIcon("tinker:glass/" + folder + "/glass_1_d"); diff --git a/src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java b/src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java index b42a75b8..0a71a37f 100644 --- a/src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java +++ b/src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java @@ -30,7 +30,7 @@ public class GlassBlockConnectedMeta extends GlassBlockConnected } @Override - public IIcon func_149673_e (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + public IIcon getIcon (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { int meta = par1IBlockAccess.getBlockMetadata(par2, par3, par4); if (meta < icons.length) @@ -50,13 +50,13 @@ public class GlassBlockConnectedMeta extends GlassBlockConnected } @Override - public IIcon func_149691_a (int par1, int par2) + public IIcon getIcon (int par1, int par2) { return icons[par2][0]; } @Override - public void func_149666_a (Item b, CreativeTabs par2CreativeTabs, List par3List) + public void getSubBlocks (Item b, CreativeTabs par2CreativeTabs, List par3List) { for (int i = 0; i < textures.length; i++) { @@ -65,7 +65,7 @@ public class GlassBlockConnectedMeta extends GlassBlockConnected } @Override - public void func_149651_a (IIconRegister par1IconRegister) + public void registerBlockIcons (IIconRegister par1IconRegister) { for (int i = 0; i < textures.length; i++) { @@ -89,7 +89,7 @@ public class GlassBlockConnectedMeta extends GlassBlockConnected } @Override - public int func_149692_a (int par1) + public int damageDropped (int par1) { return par1; } diff --git a/src/main/java/tconstruct/blocks/GlassBlockStained.java b/src/main/java/tconstruct/blocks/GlassBlockStained.java index 328bb63e..155f01d7 100644 --- a/src/main/java/tconstruct/blocks/GlassBlockStained.java +++ b/src/main/java/tconstruct/blocks/GlassBlockStained.java @@ -15,12 +15,12 @@ public class GlassBlockStained extends TConstructBlock public GlassBlockStained(String tex) { - super(Material.field_151592_s, 3f, blockTextures); + super(Material.glass, 3f, blockTextures); this.textureName = tex; } @Override - public int func_149701_w () + public int getRenderBlockPass () { return 1; } @@ -31,15 +31,15 @@ public class GlassBlockStained extends TConstructBlock } @SideOnly(Side.CLIENT) - public boolean func_149646_a (IBlockAccess world, int x, int y, int z, int side) + public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side) { - Block block = world.func_147439_a(x, y, z); - return block == this ? false : super. func_149646_a(world, x, y, z, side); + Block block = world.getBlock(x, y, z); + return block == this ? false : super. shouldSideBeRendered(world, x, y, z, side); } @Override @SideOnly(Side.CLIENT) - public void func_149651_a (IIconRegister iconRegister) + public void registerBlockIcons (IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; diff --git a/src/main/java/tconstruct/blocks/GlassPane.java b/src/main/java/tconstruct/blocks/GlassPane.java index 8f5731c8..48105174 100644 --- a/src/main/java/tconstruct/blocks/GlassPane.java +++ b/src/main/java/tconstruct/blocks/GlassPane.java @@ -9,10 +9,10 @@ public class GlassPane extends PaneBase public GlassPane() { - super(Material.field_151592_s, "glass/", blockTextures); - this.func_149711_c(0.3F); - this.field_149762_H = field_149778_k; - this.func_149663_c("tconstruct.glasspane"); - this.func_149647_a(TConstructRegistry.blockTab); + super(Material.glass, "glass/", blockTextures); + this.setHardness(0.3F); + this.stepSound = soundTypeGlass; + this.setBlockName("tconstruct.glasspane"); + this.setCreativeTab(TConstructRegistry.blockTab); } } diff --git a/src/main/java/tconstruct/blocks/GlassPaneConnected.java b/src/main/java/tconstruct/blocks/GlassPaneConnected.java index 584733e4..0c170761 100644 --- a/src/main/java/tconstruct/blocks/GlassPaneConnected.java +++ b/src/main/java/tconstruct/blocks/GlassPaneConnected.java @@ -26,23 +26,23 @@ public class GlassPaneConnected extends GlassBlockConnected } @Override - public int func_149645_b () + public int getRenderType () { return PaneConnectedRender.model; // return 0; } @Override - public IIcon func_149673_e (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + public IIcon getIcon (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { if (par5 == 0 || par5 == 1) { - return par1IBlockAccess.func_147439_a(par2, par3 - 1, par4) == this && par5 == 0 ? icons[15] - : par1IBlockAccess.func_147439_a(par2, par3 + 1, par4) == this && par5 == 1 ? icons[15] : getSideTextureIndex(); + return par1IBlockAccess.getBlock(par2, par3 - 1, par4) == this && par5 == 0 ? icons[15] + : par1IBlockAccess.getBlock(par2, par3 + 1, par4) == this && par5 == 1 ? icons[15] : getSideTextureIndex(); } else { - return super.func_149673_e(par1IBlockAccess, par2, par3, par4, par5); + return super.getIcon(par1IBlockAccess, par2, par3, par4, par5); } } @@ -64,22 +64,22 @@ public class GlassPaneConnected extends GlassBlockConnected switch (par5) { case 0: - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) { isOpenDown = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) { isOpenUp = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) { isOpenLeft = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) { isOpenRight = true; } @@ -146,22 +146,22 @@ public class GlassPaneConnected extends GlassBlockConnected } break; case 1: - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) { isOpenDown = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) { isOpenUp = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) { isOpenLeft = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) { isOpenRight = true; } @@ -228,22 +228,22 @@ public class GlassPaneConnected extends GlassBlockConnected } break; case 2: - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) { isOpenDown = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) { isOpenUp = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) { isOpenLeft = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) { isOpenRight = true; } @@ -310,22 +310,22 @@ public class GlassPaneConnected extends GlassBlockConnected } break; case 3: - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) { isOpenDown = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) { isOpenUp = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) { isOpenLeft = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) { isOpenRight = true; } @@ -392,22 +392,22 @@ public class GlassPaneConnected extends GlassBlockConnected } break; case 4: - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) { isOpenDown = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) { isOpenUp = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) { isOpenLeft = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) { isOpenRight = true; } @@ -474,22 +474,22 @@ public class GlassPaneConnected extends GlassBlockConnected } break; case 5: - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) { isOpenDown = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) { isOpenUp = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) { isOpenLeft = true; } - if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.func_147439_a(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlock(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) { isOpenRight = true; } @@ -561,7 +561,7 @@ public class GlassPaneConnected extends GlassBlockConnected } @Override - public void func_149743_a (World par1World, int par2, int par3, int par4, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) + public void addCollisionBoxesToList (World par1World, int par2, int par3, int par4, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { boolean flag = this.canPaneConnectTo(par1World, par2, par3, par4, ForgeDirection.NORTH); boolean flag1 = this.canPaneConnectTo(par1World, par2, par3, par4, ForgeDirection.SOUTH); @@ -572,49 +572,49 @@ public class GlassPaneConnected extends GlassBlockConnected { if (flag2 && !flag3) { - this.func_149676_a(0.0F, 0.0F, 0.4375F, 0.5F, 1.0F, 0.5625F); - super.func_149743_a(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); + this.setBlockBounds(0.0F, 0.0F, 0.4375F, 0.5F, 1.0F, 0.5625F); + super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); } else if (!flag2 && flag3) { - this.func_149676_a(0.5F, 0.0F, 0.4375F, 1.0F, 1.0F, 0.5625F); - super.func_149743_a(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); + this.setBlockBounds(0.5F, 0.0F, 0.4375F, 1.0F, 1.0F, 0.5625F); + super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); } } else { - this.func_149676_a(0.0F, 0.0F, 0.4375F, 1.0F, 1.0F, 0.5625F); - super.func_149743_a(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); + this.setBlockBounds(0.0F, 0.0F, 0.4375F, 1.0F, 1.0F, 0.5625F); + super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); } if ((!flag || !flag1) && (flag2 || flag3 || flag || flag1)) { if (flag && !flag1) { - this.func_149676_a(0.4375F, 0.0F, 0.0F, 0.5625F, 1.0F, 0.5F); - super.func_149743_a(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); + this.setBlockBounds(0.4375F, 0.0F, 0.0F, 0.5625F, 1.0F, 0.5F); + super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); } else if (!flag && flag1) { - this.func_149676_a(0.4375F, 0.0F, 0.5F, 0.5625F, 1.0F, 1.0F); - super.func_149743_a(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); + this.setBlockBounds(0.4375F, 0.0F, 0.5F, 0.5625F, 1.0F, 1.0F); + super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); } } else { - this.func_149676_a(0.4375F, 0.0F, 0.0F, 0.5625F, 1.0F, 1.0F); - super.func_149743_a(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); + this.setBlockBounds(0.4375F, 0.0F, 0.0F, 0.5625F, 1.0F, 1.0F); + super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); } } @Override - public void func_149683_g () + public void setBlockBoundsForItemRender () { - this.func_149676_a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); } @Override - public void func_149719_a (IBlockAccess par1IBlockAccess, int par2, int par3, int par4) + public void setBlockBoundsBasedOnState (IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { float f = 0.4375F; float f1 = 0.5625F; @@ -659,7 +659,7 @@ public class GlassPaneConnected extends GlassBlockConnected f3 = 1.0F; } - this.func_149676_a(f, 0.0F, f2, f1, 1.0F, f3); + this.setBlockBounds(f, 0.0F, f2, f1, 1.0F, f3); } public IIcon getSideTextureIndex () @@ -669,26 +669,26 @@ public class GlassPaneConnected extends GlassBlockConnected public final boolean canThisPaneConnectToThisBlock (Block b) { - return b.func_149662_c() || b == (Block) this || b == Blocks.glass; + return b.isOpaqueCube() || b == (Block) this || b == Blocks.glass; } - public void func_149651_a (IIconRegister par1IconRegister) + public void registerBlockIcons (IIconRegister par1IconRegister) { - super.func_149651_a(par1IconRegister); + super.registerBlockIcons(par1IconRegister); this.theIcon = par1IconRegister.registerIcon("tinker:glass/" + folder + "/glass_side"); } public boolean canPaneConnectTo (IBlockAccess access, int x, int y, int z, ForgeDirection dir) { - return canThisPaneConnectToThisBlock(access.func_147439_a(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ)) + return canThisPaneConnectToThisBlock(access.getBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ)) || access.isSideSolid(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, dir.getOpposite(), false); } @Override - public boolean func_149646_a (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { // if(par5 == 0 || par5 == 1){ - // return par1IBlockAccess.func_147439_a(par2, par3, par4) != this.blockID; + // return par1IBlockAccess.getBlock(par2, par3, par4) != this.blockID; // }else{ // return true; // } diff --git a/src/main/java/tconstruct/blocks/GlassPaneStained.java b/src/main/java/tconstruct/blocks/GlassPaneStained.java index c3e68818..6e68b854 100644 --- a/src/main/java/tconstruct/blocks/GlassPaneStained.java +++ b/src/main/java/tconstruct/blocks/GlassPaneStained.java @@ -9,12 +9,12 @@ public class GlassPaneStained extends PaneBase public GlassPaneStained() { - super(Material.field_151592_s, "glass/", assembleBlockTextures()); + super(Material.glass, "glass/", assembleBlockTextures()); //TODO setHardness - this.func_149711_c(0.3F); - this.field_149762_H = field_149778_k; - this.func_149663_c("tconstruct.glasspanestained"); - this.func_149647_a(TConstructRegistry.blockTab); + this.setHardness(0.3F); + this.stepSound = soundTypeGlass; + this.setBlockName("tconstruct.glasspanestained"); + this.setCreativeTab(TConstructRegistry.blockTab); } private static String[] assembleBlockTextures () @@ -28,13 +28,13 @@ public class GlassPaneStained extends PaneBase } @Override - public int func_149701_w () + public int getRenderBlockPass () { return 1; } @Override - public int func_149692_a (int par1) + public int damageDropped (int par1) { return par1; } diff --git a/src/main/java/tconstruct/blocks/GlueBlock.java b/src/main/java/tconstruct/blocks/GlueBlock.java index 2b5b61c8..b047cc6c 100644 --- a/src/main/java/tconstruct/blocks/GlueBlock.java +++ b/src/main/java/tconstruct/blocks/GlueBlock.java @@ -14,11 +14,11 @@ public class GlueBlock extends TConstructBlock { public GlueBlock() { - super(Material.field_151578_c, 4.0f, new String[]{"glue"}); + super(Material.ground, 4.0f, new String[]{"glue"}); } @Override - public void func_149670_a (World world, int x, int y, int z, Entity entity) + public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity) { entity.motionX *= 0.1; entity.motionZ *= 0.1; @@ -43,7 +43,7 @@ public class GlueBlock extends TConstructBlock { public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z) { - return Blocks.soul_sand.func_149668_a(world, x, y, z); + return Blocks.soul_sand.getCollisionBoundingBoxFromPool(world, x, y, z); } } diff --git a/src/main/java/tconstruct/blocks/GlueFluid.java b/src/main/java/tconstruct/blocks/GlueFluid.java index 6b6d1504..e7db488d 100644 --- a/src/main/java/tconstruct/blocks/GlueFluid.java +++ b/src/main/java/tconstruct/blocks/GlueFluid.java @@ -25,7 +25,7 @@ public class GlueFluid extends BlockFluidFinite { @Override @SideOnly(Side.CLIENT) - public void func_149651_a (IIconRegister iconRegister) + public void registerBlockIcons (IIconRegister iconRegister) { stillIcon = iconRegister.registerIcon("tinker:liquid_glue"); flowIcon = iconRegister.registerIcon("tinker:liquid_glue_flow"); @@ -33,7 +33,7 @@ public class GlueFluid extends BlockFluidFinite { @Override @SideOnly(Side.CLIENT) - public IIcon func_149691_a (int side, int meta) + public IIcon getIcon (int side, int meta) { if (side == 0 || side == 1) return stillIcon; @@ -41,7 +41,7 @@ public class GlueFluid extends BlockFluidFinite { } @Override - public void func_149670_a(World world, int x, int y, int z, Entity entity) { + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { entity.motionX *= 0.1; entity.motionZ *= 0.1; diff --git a/src/main/java/tconstruct/blocks/GravelOre.java b/src/main/java/tconstruct/blocks/GravelOre.java index e834ace7..7f15d852 100644 --- a/src/main/java/tconstruct/blocks/GravelOre.java +++ b/src/main/java/tconstruct/blocks/GravelOre.java @@ -22,13 +22,13 @@ public class GravelOre extends BlockFalling public GravelOre() { super(); - this.func_149647_a(TConstructRegistry.blockTab); - this.field_149762_H = field_149767_g; - //this.field_149764_J = Material.field_151596_z; + this.setCreativeTab(TConstructRegistry.blockTab); + this.stepSound = soundTypeGravel; + //this.blockMaterial = Material.craftedSnow; } @Override - public void func_149651_a (IIconRegister iconRegister) + public void registerBlockIcons (IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; @@ -39,7 +39,7 @@ public class GravelOre extends BlockFalling } @Override - public IIcon func_149691_a (int side, int meta) + public IIcon getIcon (int side, int meta) { return icons[meta]; } @@ -54,7 +54,7 @@ public class GravelOre extends BlockFalling } @Override - public int func_149692_a (int meta) + public int damageDropped (int meta) { /*if (meta == 1) return 0;*/ @@ -69,7 +69,7 @@ public class GravelOre extends BlockFalling } @Override - public void func_149666_a (Item b, CreativeTabs tab, List list) + public void getSubBlocks (Item b, CreativeTabs tab, List list) { for (int iter = 0; iter < 6; iter++) { diff --git a/src/main/java/tconstruct/blocks/LavaTankBlock.java b/src/main/java/tconstruct/blocks/LavaTankBlock.java index 9f04bd4f..b4f51bfd 100644 --- a/src/main/java/tconstruct/blocks/LavaTankBlock.java +++ b/src/main/java/tconstruct/blocks/LavaTankBlock.java @@ -35,12 +35,12 @@ public class LavaTankBlock extends BlockContainer public LavaTankBlock() { - super(Material.field_151576_e); - func_149711_c(3F); - func_149752_b(20F); - func_149647_a(TConstructRegistry.blockTab); - func_149663_c("TConstruct.LavaTank"); - field_149762_H = Block.field_149778_k; + super(Material.rock); + setHardness(3F); + setResistance(20F); + setCreativeTab(TConstructRegistry.blockTab); + setBlockName("TConstruct.LavaTank"); + stepSound = Block.soundTypeGlass; } public LavaTankBlock(String prefix) @@ -60,7 +60,7 @@ public class LavaTankBlock extends BlockContainer return textureNames; } - public void func_149651_a (IIconRegister iconRegister) + public void registerBlockIcons (IIconRegister iconRegister) { String[] textureNames = getTextureNames(); this.icons = new IIcon[textureNames.length]; @@ -72,37 +72,37 @@ public class LavaTankBlock extends BlockContainer } @Override - public int func_149701_w () + public int getRenderBlockPass () { return 1; } @Override - public boolean func_149662_c () + public boolean isOpaqueCube () { return false; } @Override - public boolean func_149686_d () + public boolean renderAsNormalBlock () { return false; } @Override - public boolean func_149646_a (IBlockAccess world, int x, int y, int z, int side) + public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side) { //if (side == 0 && world.getBlockMetadata(x, y, z) == 0) - //return super. func_149646_a(world, x, y, z, side); - Block b = world.func_147439_a(x, y, z); - return b == (Block)this ? false : super. func_149646_a(world, x, y, z, side); + //return super. shouldSideBeRendered(world, x, y, z, side); + Block b = world.getBlock(x, y, z); + return b == (Block)this ? false : super. shouldSideBeRendered(world, x, y, z, side); //return true; } @Override public int getLightValue (IBlockAccess world, int x, int y, int z) { - TileEntity logic = world.func_147438_o(x, y, z); + TileEntity logic = world.getTileEntity(x, y, z); if (logic != null && logic instanceof LavaTankLogic) return ((LavaTankLogic) logic).getBrightness(); return 0; @@ -115,12 +115,12 @@ public class LavaTankBlock extends BlockContainer }*/ @Override - public int func_149645_b () + public int getRenderType () { return TankRender.tankModelID; } - public IIcon func_149691_a (int side, int meta) + public IIcon getIcon (int side, int meta) { if (meta >= 3) meta = 0; @@ -152,19 +152,19 @@ public class LavaTankBlock extends BlockContainer } @Override - public TileEntity func_149915_a (World world, int metadata) + public TileEntity createNewTileEntity (World world, int metadata) { return new LavaTankLogic(); } @Override - public boolean func_149727_a (World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ) + public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ) { ItemStack heldItem = player.inventory.getCurrentItem(); if (heldItem != null) { FluidStack liquid = FluidContainerRegistry.getFluidForFilledItem(player.getCurrentEquippedItem()); - LavaTankLogic logic = (LavaTankLogic) world.func_147438_o(x, y, z); + LavaTankLogic logic = (LavaTankLogic) world.getTileEntity(x, y, z); if (liquid != null) { int amount = logic.fill(ForgeDirection.UNKNOWN, liquid, false); @@ -232,7 +232,7 @@ public class LavaTankBlock extends BlockContainer } @Override - public void func_149666_a (Item i, CreativeTabs tab, List list) + public void getSubBlocks (Item i, CreativeTabs tab, List list) { for (int iter = 0; iter < 3; iter++) { @@ -249,7 +249,7 @@ public class LavaTankBlock extends BlockContainer /* Updates */ public void onNeighborBlockChange (World world, int x, int y, int z, int nBlockID) { - TileEntity logic = world.func_147438_o(x, y, z); + TileEntity logic = world.getTileEntity(x, y, z); if (logic instanceof IServantLogic) { ((IServantLogic) logic).notifyMasterOfChange(); @@ -262,7 +262,7 @@ public class LavaTankBlock extends BlockContainer player.addExhaustion(0.025F); int meta = world.getBlockMetadata(x, y, z); ItemStack stack = new ItemStack(this, 1, meta); - LavaTankLogic logic = (LavaTankLogic) world.func_147438_o(x, y, z); + LavaTankLogic logic = (LavaTankLogic) world.getTileEntity(x, y, z); FluidStack liquid = logic.tank.getFluid(); if (liquid != null) { @@ -287,7 +287,7 @@ public class LavaTankBlock extends BlockContainer double d1 = (double) (world.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; double d2 = (double) (world.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; EntityItem entityitem = new EntityItem(world, (double) x + d0, (double) y + d1, (double) z + d2, stack); - entityitem.field_145804_b = 10; + entityitem.delayBeforeCanPickup = 10; world.spawnEntityInWorld(entityitem); } } @@ -298,7 +298,7 @@ public class LavaTankBlock extends BlockContainer } @Override - public void func_149689_a (World world, int x, int y, int z, EntityLivingBase living, ItemStack stack) + public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase living, ItemStack stack) { if (stack.hasTagCompound()) { @@ -306,7 +306,7 @@ public class LavaTankBlock extends BlockContainer if (liquidTag != null) { FluidStack liquid = FluidStack.loadFluidStackFromNBT(liquidTag); - LavaTankLogic logic = (LavaTankLogic) world.func_147438_o(x, y, z); + LavaTankLogic logic = (LavaTankLogic) world.getTileEntity(x, y, z); logic.tank.setFluid(liquid); } } diff --git a/src/main/java/tconstruct/blocks/LiquidMetalFinite.java b/src/main/java/tconstruct/blocks/LiquidMetalFinite.java index 87e6fe6b..500f24bf 100644 --- a/src/main/java/tconstruct/blocks/LiquidMetalFinite.java +++ b/src/main/java/tconstruct/blocks/LiquidMetalFinite.java @@ -25,17 +25,17 @@ public class LiquidMetalFinite extends BlockFluidFinite { super(fluid, TRepo.liquidMetal); this.texture = texture; - this.func_149647_a(TConstructRegistry.blockTab); + this.setCreativeTab(TConstructRegistry.blockTab); } @Override - public int func_149701_w () + public int getRenderBlockPass () { return 0; } @Override - public void func_149651_a (IIconRegister iconRegister) + public void registerBlockIcons (IIconRegister iconRegister) { stillIcon = iconRegister.registerIcon("tinker:" + texture); flowIcon = iconRegister.registerIcon("tinker:" + texture + "_flow"); @@ -43,7 +43,7 @@ public class LiquidMetalFinite extends BlockFluidFinite @Override @SideOnly(Side.CLIENT) - public IIcon func_149691_a (int side, int meta) + public IIcon getIcon (int side, int meta) { if (side == 0 || side == 1) return stillIcon; @@ -51,7 +51,7 @@ public class LiquidMetalFinite extends BlockFluidFinite } @Override - public void func_149670_a (World par1World, int x, int y, int z, Entity entity) + public void onEntityCollidedWithBlock (World par1World, int x, int y, int z, Entity entity) { if (entity instanceof EntityLivingBase) { diff --git a/src/main/java/tconstruct/blocks/MeatBlock.java b/src/main/java/tconstruct/blocks/MeatBlock.java index 51b3e904..c57d3d0a 100644 --- a/src/main/java/tconstruct/blocks/MeatBlock.java +++ b/src/main/java/tconstruct/blocks/MeatBlock.java @@ -23,15 +23,15 @@ public class MeatBlock extends BlockWood public MeatBlock() { - this.func_149711_c(1.0F); - this.func_149672_a(Block.field_149766_f); + this.setHardness(1.0F); + this.setStepSound(Block.soundTypeWood); //setBurnProperties(this.blockID, 5, 20); - this.func_149647_a(TConstructRegistry.blockTab); + this.setCreativeTab(TConstructRegistry.blockTab); } @Override @SideOnly(Side.CLIENT) - public IIcon func_149691_a (int side, int metadata) + public IIcon getIcon (int side, int metadata) { int tex = (metadata % 4) * 2; int orientation = metadata / 4; @@ -58,7 +58,7 @@ public class MeatBlock extends BlockWood @Override @SideOnly(Side.CLIENT) - public void func_149651_a (IIconRegister iconRegister) + public void registerBlockIcons (IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; @@ -68,7 +68,7 @@ public class MeatBlock extends BlockWood } } - public Item func_149650_a (int par1, Random par2Random, int par3) + public Item getItemDropped (int par1, Random par2Random, int par3) { return new ItemStack(this).getItem(); } @@ -89,7 +89,7 @@ public class MeatBlock extends BlockWood { for (int i2 = -b0; i2 <= b0; ++i2) { - Block j2 = par1World.func_147439_a(par2 + k1, par3 + l1, par4 + i2); + Block j2 = par1World.getBlock(par2 + k1, par3 + l1, par4 + i2); if (j2 != null) { @@ -166,7 +166,7 @@ public class MeatBlock extends BlockWood @SideOnly(Side.CLIENT) @Override - public void func_149666_a (Item b, CreativeTabs par2CreativeTabs, List par3List) + public void getSubBlocks (Item b, CreativeTabs par2CreativeTabs, List par3List) { for (int i = 0; i < icons.length / 2; i++) par3List.add(new ItemStack(b, 1, i)); diff --git a/src/main/java/tconstruct/blocks/MetalOre.java b/src/main/java/tconstruct/blocks/MetalOre.java index 86ee535d..48b4f7e3 100644 --- a/src/main/java/tconstruct/blocks/MetalOre.java +++ b/src/main/java/tconstruct/blocks/MetalOre.java @@ -26,7 +26,7 @@ public class MetalOre extends TConstructBlock } @Override - public void func_149666_a (Item b, CreativeTabs tab, List list) + public void getSubBlocks (Item b, CreativeTabs tab, List list) { for (int iter = 1; iter < 6; iter++) { diff --git a/src/main/java/tconstruct/blocks/MultiBrick.java b/src/main/java/tconstruct/blocks/MultiBrick.java index a631d7cf..3610ed41 100644 --- a/src/main/java/tconstruct/blocks/MultiBrick.java +++ b/src/main/java/tconstruct/blocks/MultiBrick.java @@ -19,33 +19,33 @@ public class MultiBrick extends TConstructBlock public MultiBrick() { - super(Material.field_151576_e, 3f, blockTextures); + super(Material.rock, 3f, blockTextures); } @Override - public float func_149712_f (World world, int x, int y, int z) + public float getBlockHardness (World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); switch (meta) { case 0: - return Blocks.obsidian.func_149712_f(world, x, y, z); + return Blocks.obsidian.getBlockHardness(world, x, y, z); case 1: - return Blocks.sandstone.func_149712_f(world, x, y, z); + return Blocks.sandstone.getBlockHardness(world, x, y, z); case 2: - return Blocks.netherrack.func_149712_f(world, x, y, z); + return Blocks.netherrack.getBlockHardness(world, x, y, z); case 3: - return Blocks.stone.func_149712_f(world, x, y, z); + return Blocks.stone.getBlockHardness(world, x, y, z); case 4: - return Blocks.iron_block.func_149712_f(world, x, y, z); + return Blocks.iron_block.getBlockHardness(world, x, y, z); case 5: - return Blocks.gold_block.func_149712_f(world, x, y, z); + return Blocks.gold_block.getBlockHardness(world, x, y, z); case 6: - return Blocks.lapis_block.func_149712_f(world, x, y, z); + return Blocks.lapis_block.getBlockHardness(world, x, y, z); case 7: - return Blocks.diamond_block.func_149712_f(world, x, y, z); + return Blocks.diamond_block.getBlockHardness(world, x, y, z); case 8: - return Blocks.redstone_block.func_149712_f(world, x, y, z); + return Blocks.redstone_block.getBlockHardness(world, x, y, z); case 9: return 1.0F; case 10: @@ -53,11 +53,11 @@ public class MultiBrick extends TConstructBlock case 11: return 1.5F; case 12: - return Blocks.end_stone.func_149712_f(world, x, y, z); + return Blocks.end_stone.getBlockHardness(world, x, y, z); case 13: - return Blocks.obsidian.func_149712_f(world, x, y, z); + return Blocks.obsidian.getBlockHardness(world, x, y, z); default: - return field_149782_v; + return blockHardness; } } @@ -100,7 +100,7 @@ public class MultiBrick extends TConstructBlock } @Override - public void func_149670_a (World world, int x, int y, int z, Entity entity) + public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity) { int meta = world.getBlockMetadata(x, y, z); if (meta == 10 || meta == 11) @@ -112,12 +112,12 @@ public class MultiBrick extends TConstructBlock } //TODO getCollisionBoundingBoxFromPool @Override - public AxisAlignedBB func_149668_a (World world, int x, int y, int z) + public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); if (meta == 10 || meta == 11) return AxisAlignedBB.getBoundingBox(x, y, z, (double) x + 1.0D, (double) y + 0.625D, (double) z + 1.0D); - return super.func_149668_a(world, x, y, z); + return super.getCollisionBoundingBoxFromPool(world, x, y, z); } /*@Override @@ -133,7 +133,7 @@ public class MultiBrick extends TConstructBlock } @Override - public int func_149709_b (IBlockAccess world, int x, int y, int z, int side) + public int isProvidingWeakPower (IBlockAccess world, int x, int y, int z, int side) { if (world.getBlockMetadata(x, y, z) == 8) return 4; @@ -142,7 +142,7 @@ public class MultiBrick extends TConstructBlock @Override @SideOnly(Side.CLIENT) - public void func_149651_a (IIconRegister iconRegister) + public void registerBlockIcons (IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; diff --git a/src/main/java/tconstruct/blocks/MultiBrickFancy.java b/src/main/java/tconstruct/blocks/MultiBrickFancy.java index 4fa30aa5..c09b69c5 100644 --- a/src/main/java/tconstruct/blocks/MultiBrickFancy.java +++ b/src/main/java/tconstruct/blocks/MultiBrickFancy.java @@ -20,31 +20,31 @@ public class MultiBrickFancy extends TConstructBlock public MultiBrickFancy() { - super(Material.field_151576_e, 3f, blockTextures); + super(Material.rock, 3f, blockTextures); } - //TODO func_149712_f + //TODO getBlockHardness @Override - public float func_149712_f (World world, int x, int y, int z) + public float getBlockHardness (World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); switch (meta) { case 0: - return Blocks.obsidian.func_149712_f(world, x, y, z); + return Blocks.obsidian.getBlockHardness(world, x, y, z); case 1: - return Blocks.sandstone.func_149712_f(world, x, y, z); + return Blocks.sandstone.getBlockHardness(world, x, y, z); case 2: - return Blocks.netherrack.func_149712_f(world, x, y, z); + return Blocks.netherrack.getBlockHardness(world, x, y, z); case 4: - return Blocks.iron_block.func_149712_f(world, x, y, z); + return Blocks.iron_block.getBlockHardness(world, x, y, z); case 5: - return Blocks.gold_block.func_149712_f(world, x, y, z); + return Blocks.gold_block.getBlockHardness(world, x, y, z); case 6: - return Blocks.lapis_block.func_149712_f(world, x, y, z); + return Blocks.lapis_block.getBlockHardness(world, x, y, z); case 7: - return Blocks.diamond_block.func_149712_f(world, x, y, z); + return Blocks.diamond_block.getBlockHardness(world, x, y, z); case 8: - return Blocks.redstone_block.func_149712_f(world, x, y, z); + return Blocks.redstone_block.getBlockHardness(world, x, y, z); case 9: return 1.0F; case 10: @@ -52,15 +52,15 @@ public class MultiBrickFancy extends TConstructBlock case 11: return 1.5F; case 12: - return Blocks.end_stone.func_149712_f(world, x, y, z); + return Blocks.end_stone.getBlockHardness(world, x, y, z); case 13: - return Blocks.obsidian.func_149712_f(world, x, y, z); + return Blocks.obsidian.getBlockHardness(world, x, y, z); case 3: case 14: case 15: - return Blocks.stone.func_149712_f(world, x, y, z); + return Blocks.stone.getBlockHardness(world, x, y, z); default: - return field_149782_v; + return blockHardness; } } @@ -106,7 +106,7 @@ public class MultiBrickFancy extends TConstructBlock //TODO onEntityCollidedWithBlock @Override - public void func_149670_a (World world, int x, int y, int z, Entity entity) + public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity) { int meta = world.getBlockMetadata(x, y, z); if (meta == 10 || meta == 11) @@ -118,12 +118,12 @@ public class MultiBrickFancy extends TConstructBlock } @Override - public AxisAlignedBB func_149668_a (World world, int x, int y, int z) + public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); if (meta == 10 || meta == 11) return AxisAlignedBB.getBoundingBox(x, y, z, (double) x + 1.0D, (double) y + 0.625D, (double) z + 1.0D); - return super.func_149668_a(world, x, y, z); + return super.getCollisionBoundingBoxFromPool(world, x, y, z); } /*@Override @@ -140,14 +140,14 @@ public class MultiBrickFancy extends TConstructBlock //TODO canProvidePower @Override - public boolean func_149744_f () + public boolean canProvidePower () { return false; } //TODO isProvindingWeakPower @Override - public int func_149709_b (IBlockAccess world, int x, int y, int z, int side) + public int isProvidingWeakPower (IBlockAccess world, int x, int y, int z, int side) { if (world.getBlockMetadata(x, y, z) == 8) return 4; @@ -156,7 +156,7 @@ public class MultiBrickFancy extends TConstructBlock @Override @SideOnly(Side.CLIENT) - public void func_149651_a (IIconRegister iconRegister) + public void registerBlockIcons (IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; diff --git a/src/main/java/tconstruct/blocks/OreberryBush.java b/src/main/java/tconstruct/blocks/OreberryBush.java index 50da0350..812ec756 100644 --- a/src/main/java/tconstruct/blocks/OreberryBush.java +++ b/src/main/java/tconstruct/blocks/OreberryBush.java @@ -42,23 +42,23 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable public OreberryBush(String[] textureNames, int meta, int sub, String[] oreTypes) { - super(Material.field_151584_j, false); + super(Material.leaves, false); this.textureNames = textureNames; this.itemMeat = meta; this.subitems = sub; this.oreTypes = oreTypes; - this.func_149675_a(true); + this.setTickRandomly(true); random = new Random(); - this.func_149711_c(0.3F); - this.func_149672_a(field_149777_j); - this.func_149647_a(TConstructRegistry.blockTab); + this.setHardness(0.3F); + this.setStepSound(soundTypeMetal); + this.setCreativeTab(TConstructRegistry.blockTab); } /* Berries show up at meta 12-15 */ @SideOnly(Side.CLIENT) @Override - public void func_149651_a (IIconRegister iconRegister) + public void registerBlockIcons (IIconRegister iconRegister) { this.fastIcons = new IIcon[textureNames.length]; this.fancyIcons = new IIcon[textureNames.length]; @@ -75,7 +75,7 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable @Override @SideOnly(Side.CLIENT) - public IIcon func_149691_a (int side, int metadata) + public IIcon getIcon (int side, int metadata) { if (net.minecraft.client.Minecraft.getMinecraft().gameSettings.fancyGraphics) { @@ -103,14 +103,14 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable /* Bushes are stored by size then type */ @Override - public int func_149692_a (int metadata) + public int damageDropped (int metadata) { return metadata % 4; } /* The following methods define a berry bush's size depending on metadata */ @Override - public AxisAlignedBB func_149668_a (World world, int x, int y, int z) + public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z) { int l = world.getBlockMetadata(x, y, z); if (l < 4) @@ -145,7 +145,7 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable } @Override - public void func_149719_a (IBlockAccess iblockaccess, int x, int y, int z) + public void setBlockBoundsBasedOnState (IBlockAccess iblockaccess, int x, int y, int z) { int md = iblockaccess.getBlockMetadata(x, y, z); @@ -177,19 +177,19 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable maxX = maxZ = 1.0F; maxY = 1.0F; } - func_149676_a(minX, minY, minZ, maxX, maxY, maxZ); + setBlockBounds(minX, minY, minZ, maxX, maxY, maxZ); } /* Left-click harvests berries */ @Override - public void func_149699_a (World world, int x, int y, int z, EntityPlayer player) + public void onBlockClicked (World world, int x, int y, int z, EntityPlayer player) { if (!world.isRemote) { int meta = world.getBlockMetadata(x, y, z); if (meta >= 12) { - world.func_147465_d(x, y, z, this, meta - 4, 3); + world.setBlock(x, y, z, this, meta - 4, 3); AbilityHelper.spawnItemAtPlayer(player, new ItemStack(TRepo.oreBerries, 1, meta % 4 + itemMeat)); } } @@ -197,7 +197,7 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable /* Right-click harvests berries */ @Override - public boolean func_149727_a (World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) + public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { /*if (world.isRemote) return false;*/ @@ -208,7 +208,7 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable if (world.isRemote) return true; - world.func_147465_d(x, y, z, this, meta - 4, 3); + world.setBlock(x, y, z, this, meta - 4, 3); AbilityHelper.spawnItemAtPlayer(player, new ItemStack(TRepo.oreBerries, random.nextInt(3) + 1, meta % 4 + itemMeat)); return true; } @@ -219,13 +219,13 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable /* Render logic */ @Override - public boolean func_149662_c () + public boolean isOpaqueCube () { return false; } @Override - public boolean func_149686_d () + public boolean renderAsNormalBlock () { return false; } @@ -236,11 +236,11 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable } @SideOnly(Side.CLIENT) - public boolean func_149646_a (IBlockAccess iblockaccess, int x, int y, int z, int meta) + public boolean shouldSideBeRendered (IBlockAccess iblockaccess, int x, int y, int z, int meta) { if (meta > 7 || net.minecraft.client.Minecraft.getMinecraft().gameSettings.fancyGraphics) { - return super.func_149646_a(iblockaccess, x, y, z, meta); + return super.shouldSideBeRendered(iblockaccess, x, y, z, meta); } else { @@ -251,7 +251,7 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable /* Bush growth */ @Override - public void func_149674_a (World world, int x, int y, int z, Random random1) + public void updateTick (World world, int x, int y, int z, Random random1) { if (world.isRemote) { @@ -265,12 +265,12 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable int meta = world.getBlockMetadata(x, y, z); if (meta < 12) { - world.func_147465_d(x, y, z, this, meta + 4, 3); + world.setBlock(x, y, z, this, meta + 4, 3); } } /*else if (meta < 8) { - world.func_147465_d(x, y, z, blockID, meta + 4, 3); + world.setBlock(x, y, z, blockID, meta + 4, 3); }*/ } } @@ -285,7 +285,7 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable public boolean canPlaceBlockAt (World world, int x, int y, int z) { if (world.getFullBlockLightValue(x, y, z) < 13) - return super.func_149742_c(world, x, y, z); + return super.canPlaceBlockAt(world, x, y, z); return false; } @@ -294,7 +294,7 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable */ @SideOnly(Side.CLIENT) @Override - public void func_149666_a (Item b, CreativeTabs par2CreativeTabs, List par3List) + public void getSubBlocks (Item b, CreativeTabs par2CreativeTabs, List par3List) { for (int var4 = 8; var4 < 8 + subitems; ++var4) { @@ -315,7 +315,7 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable } @Override - public void func_149670_a (World world, int x, int y, int z, Entity entity) + public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity) { if (!(entity instanceof EntityItem)) entity.attackEntityFrom(DamageSource.cactus, 1); @@ -328,7 +328,7 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable } @SideOnly(Side.CLIENT) - public void func_150122_b(boolean p_150122_1_) + public void setGraphicsLevel(boolean p_150122_1_) { this.field_150121_P = p_150122_1_; this.field_150127_b = (p_150122_1_ ? 0 : 1); diff --git a/src/main/java/tconstruct/blocks/OreberryBushEssence.java b/src/main/java/tconstruct/blocks/OreberryBushEssence.java index d60811dc..3d212bde 100644 --- a/src/main/java/tconstruct/blocks/OreberryBushEssence.java +++ b/src/main/java/tconstruct/blocks/OreberryBushEssence.java @@ -16,7 +16,7 @@ public class OreberryBushEssence extends OreberryBush implements IPlantable /* Bush growth */ @Override - public void func_149674_a (World world, int x, int y, int z, Random random1) + public void updateTick (World world, int x, int y, int z, Random random1) { if (world.isRemote) { @@ -30,12 +30,12 @@ public class OreberryBushEssence extends OreberryBush implements IPlantable { if (meta < 12) { - world.func_147465_d(x, y, z,(Block) this, meta + 4, 3); + world.setBlock(x, y, z,(Block) this, meta + 4, 3); } } /*else if (meta < 8) { - world.func_147465_d(x, y, z, blockID, meta + 4, 3); + world.setBlock(x, y, z, blockID, meta + 4, 3); }*/ } } diff --git a/src/main/java/tconstruct/blocks/PaneBase.java b/src/main/java/tconstruct/blocks/PaneBase.java index 91dff2cb..f3d598a8 100644 --- a/src/main/java/tconstruct/blocks/PaneBase.java +++ b/src/main/java/tconstruct/blocks/PaneBase.java @@ -34,14 +34,14 @@ public class PaneBase extends Block this.folder = folder; } - public final boolean func_150098_a(Block p_150098_1_) + public final boolean canPaneConnectToBlock(Block p_150098_1_) { return p_150098_1_.func_149730_j() || p_150098_1_ == this || p_150098_1_ == Blocks.glass || p_150098_1_ == Blocks.stained_glass || p_150098_1_ == Blocks.stained_glass_pane || p_150098_1_ instanceof BlockPane; } public boolean canConnectTo(IBlockAccess world, int x, int y, int z, ForgeDirection dir) { - return func_150098_a(world.func_147439_a(x, y, z)) || world.isSideSolid(x, y, z, dir.getOpposite(), false); + return canPaneConnectToBlock(world.getBlock(x, y, z)) || world.isSideSolid(x, y, z, dir.getOpposite(), false); } public IIcon getSideTextureIndex (int meta) @@ -51,7 +51,7 @@ public class PaneBase extends Block @Override @SideOnly(Side.CLIENT) - public void func_149651_a (IIconRegister iconRegister) + public void registerBlockIcons (IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; this.sideIcons = new IIcon[textureNames.length]; @@ -65,13 +65,13 @@ public class PaneBase extends Block @Override @SideOnly(Side.CLIENT) - public IIcon func_149691_a (int side, int meta) + public IIcon getIcon (int side, int meta) { return icons[meta]; } @Override - public void func_149666_a (Item b, CreativeTabs tab, List list) + public void getSubBlocks (Item b, CreativeTabs tab, List list) { for (int iter = 0; iter < textureNames.length; iter++) { @@ -94,21 +94,21 @@ public class PaneBase extends Block return PaneRender.model; } - public boolean func_149646_a (IBlockAccess iblockaccess, int i, int j, int k, int l) + public boolean shouldSideBeRendered (IBlockAccess iblockaccess, int i, int j, int k, int l) { - Block b = iblockaccess.func_147439_a(i, j, k); + Block b = iblockaccess.getBlock(i, j, k); if (b instanceof PaneBase || b instanceof BlockPane) { return false; } else { - return super. func_149646_a(iblockaccess, i, j, k, l); + return super. shouldSideBeRendered(iblockaccess, i, j, k, l); } } @Override - public void func_149743_a (World world, int x, int y, int z, AxisAlignedBB axisalignedbb, List arraylist, Entity entity) + public void addCollisionBoxesToList (World world, int x, int y, int z, AxisAlignedBB axisalignedbb, List arraylist, Entity entity) { boolean south = canConnectTo(world, x, y, z - 1, ForgeDirection.NORTH); boolean north = canConnectTo(world, x, y, z + 1, ForgeDirection.SOUTH); @@ -116,39 +116,39 @@ public class PaneBase extends Block boolean west = canConnectTo(world, x + 1, y, z, ForgeDirection.WEST); if (east && west || !east && !west && !south && !north) { - func_149676_a(0.0F, 0.0F, 0.4375F, 1.0F, 1.0F, 0.5625F); - super.func_149743_a(world, x, y, z, axisalignedbb, arraylist, entity); + setBlockBounds(0.0F, 0.0F, 0.4375F, 1.0F, 1.0F, 0.5625F); + super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, entity); } else if (east && !west) { - func_149676_a(0.0F, 0.0F, 0.4375F, 0.5F, 1.0F, 0.5625F); - super.func_149743_a(world, x, y, z, axisalignedbb, arraylist, entity); + setBlockBounds(0.0F, 0.0F, 0.4375F, 0.5F, 1.0F, 0.5625F); + super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, entity); } else if (!east && west) { - func_149676_a(0.5F, 0.0F, 0.4375F, 1.0F, 1.0F, 0.5625F); - super.func_149743_a(world, x, y, z, axisalignedbb, arraylist, entity); + setBlockBounds(0.5F, 0.0F, 0.4375F, 1.0F, 1.0F, 0.5625F); + super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, entity); } if (south && north || !east && !west && !south && !north) { - func_149676_a(0.4375F, 0.0F, 0.0F, 0.5625F, 1.0F, 1.0F); - super.func_149743_a(world, x, y, z, axisalignedbb, arraylist, entity); + setBlockBounds(0.4375F, 0.0F, 0.0F, 0.5625F, 1.0F, 1.0F); + super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, entity); } else if (south && !north) { - func_149676_a(0.4375F, 0.0F, 0.0F, 0.5625F, 1.0F, 0.5F); - super.func_149743_a(world, x, y, z, axisalignedbb, arraylist, entity); + setBlockBounds(0.4375F, 0.0F, 0.0F, 0.5625F, 1.0F, 0.5F); + super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, entity); } else if (!south && north) { - func_149676_a(0.4375F, 0.0F, 0.5F, 0.5625F, 1.0F, 1.0F); - super.func_149743_a(world, x, y, z, axisalignedbb, arraylist, entity); + setBlockBounds(0.4375F, 0.0F, 0.5F, 0.5625F, 1.0F, 1.0F); + super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, entity); } } public void setBlockBoundsForItemRender () { - func_149676_a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); } public void setBlockBoundsBasedOnState (IBlockAccess iblockaccess, int i, int j, int k) @@ -187,7 +187,7 @@ public class PaneBase extends Block { f3 = 1.0F; } - func_149676_a(f, 0.0F, f2, f1, 1.0F, f3); + setBlockBounds(f, 0.0F, f2, f1, 1.0F, f3); } } diff --git a/src/main/java/tconstruct/blocks/SearedBlock.java b/src/main/java/tconstruct/blocks/SearedBlock.java index 71930ced..5f22082d 100644 --- a/src/main/java/tconstruct/blocks/SearedBlock.java +++ b/src/main/java/tconstruct/blocks/SearedBlock.java @@ -30,11 +30,11 @@ public class SearedBlock extends InventoryBlock public SearedBlock() { - super(Material.field_151576_e); - this.func_149647_a(TConstructRegistry.blockTab); - func_149711_c(3F); - func_149752_b(20F); - func_149672_a(field_149777_j); + super(Material.rock); + this.setCreativeTab(TConstructRegistry.blockTab); + setHardness(3F); + setResistance(20F); + setStepSound(soundTypeMetal); } public SearedBlock(String texture) @@ -61,7 +61,7 @@ public class SearedBlock extends InventoryBlock } @Override - public int func_149701_w () + public int getRenderBlockPass () { return 1; } @@ -80,7 +80,7 @@ public class SearedBlock extends InventoryBlock /* Activation */ @Override - public boolean func_149727_a (World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ) + public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ) { int md = world.getBlockMetadata(x, y, z); if (md == 0) @@ -96,19 +96,19 @@ public class SearedBlock extends InventoryBlock if (player.isSneaking()) return false; - FaucetLogic logic = (FaucetLogic) world.func_147438_o(x, y, z); + FaucetLogic logic = (FaucetLogic) world.getTileEntity(x, y, z); logic.setActive(true); return true; } else - return super.func_149727_a(world, x, y, z, player, side, clickX, clickY, clickZ); + return super.onBlockActivated(world, x, y, z, player, side, clickX, clickY, clickZ); } boolean activateCastingTable (World world, int x, int y, int z, EntityPlayer player) { if (!world.isRemote) { - CastingTableLogic logic = (CastingTableLogic) world.func_147438_o(x, y, z); + CastingTableLogic logic = (CastingTableLogic) world.getTileEntity(x, y, z); if (logic.liquid != null) return true; @@ -137,7 +137,7 @@ public class SearedBlock extends InventoryBlock } } - world.func_147471_g(x, y, z); + world.markBlockForUpdate(x, y, z); } return true; } @@ -146,7 +146,7 @@ public class SearedBlock extends InventoryBlock { if (!world.isRemote) { - CastingBasinLogic logic = (CastingBasinLogic) world.func_147438_o(x, y, z); + CastingBasinLogic logic = (CastingBasinLogic) world.getTileEntity(x, y, z); if (logic.liquid != null) return true; @@ -175,7 +175,7 @@ public class SearedBlock extends InventoryBlock } } - world.func_147471_g(x, y, z); + world.markBlockForUpdate(x, y, z); } return true; } @@ -193,7 +193,7 @@ public class SearedBlock extends InventoryBlock /* Rendering */ @Override - public int func_149645_b () + public int getRenderType () { return SearedRender.searedModel; } @@ -212,10 +212,10 @@ public class SearedBlock extends InventoryBlock return textureNames; } - //TODO func_149691_a + //TODO getIcon @Override @SideOnly(Side.CLIENT) - public IIcon func_149691_a (int side, int meta) + public IIcon getIcon (int side, int meta) { if (meta == 0) return icons[getTextureIndex(side)]; @@ -236,25 +236,25 @@ public class SearedBlock extends InventoryBlock } @Override - public boolean func_149686_d () + public boolean renderAsNormalBlock () { return false; } @Override - public boolean func_149662_c () + public boolean isOpaqueCube () { return false; } @Override - public boolean func_149646_a (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { return true; } @Override - public void func_149666_a (Item b, CreativeTabs tab, List list) + public void getSubBlocks (Item b, CreativeTabs tab, List list) { for (int iter = 0; iter < 3; iter++) { @@ -263,16 +263,16 @@ public class SearedBlock extends InventoryBlock } @Override - public void func_149719_a (IBlockAccess world, int x, int y, int z) + public void setBlockBoundsBasedOnState (IBlockAccess world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); if (meta != 1) { - this.func_149676_a(0, 0, 0, 1, 1, 1); + this.setBlockBounds(0, 0, 0, 1, 1, 1); } else { - FaucetLogic logic = (FaucetLogic) world.func_147438_o(x, y, z); + FaucetLogic logic = (FaucetLogic) world.getTileEntity(x, y, z); float xMin = 0.25F; float xMax = 0.75F; float zMin = 0.25F; @@ -298,12 +298,12 @@ public class SearedBlock extends InventoryBlock break; } - this.func_149676_a(xMin, 0.25F, zMin, xMax, 0.625F, zMax); + this.setBlockBounds(xMin, 0.25F, zMin, xMax, 0.625F, zMax); } } @Override - public AxisAlignedBB func_149668_a (World world, int x, int y, int z) + public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); if (meta != 1) @@ -312,7 +312,7 @@ public class SearedBlock extends InventoryBlock } else { - FaucetLogic logic = (FaucetLogic) world.func_147438_o(x, y, z); + FaucetLogic logic = (FaucetLogic) world.getTileEntity(x, y, z); if (logic != null) { float xMin = 0.25F; @@ -345,7 +345,7 @@ public class SearedBlock extends InventoryBlock } } - return super.func_149668_a(world, x, y, z); + return super.getCollisionBoundingBoxFromPool(world, x, y, z); } /* Redstone */ @@ -358,13 +358,13 @@ public class SearedBlock extends InventoryBlock { if (world.isBlockIndirectlyGettingPowered(x, y, z) && world.getBlockMetadata(x, y, z) == 1) { - FaucetLogic logic = (FaucetLogic) world.func_147438_o(x, y, z); + FaucetLogic logic = (FaucetLogic) world.getTileEntity(x, y, z); logic.setActive(true); } } @Override - public TileEntity func_149915_a (World var1, int metadata) + public TileEntity createNewTileEntity (World var1, int metadata) { switch (metadata) { diff --git a/src/main/java/tconstruct/blocks/SearedSlab.java b/src/main/java/tconstruct/blocks/SearedSlab.java index 043bc257..f3f305b6 100644 --- a/src/main/java/tconstruct/blocks/SearedSlab.java +++ b/src/main/java/tconstruct/blocks/SearedSlab.java @@ -18,32 +18,32 @@ public class SearedSlab extends SlabBase public SearedSlab() { //TODO material.rock - super(Material.field_151576_e); - this.func_149647_a(TConstructRegistry.blockTab); - func_149711_c(12F); + super(Material.rock); + this.setCreativeTab(TConstructRegistry.blockTab); + setHardness(12F); } @Override @SideOnly(Side.CLIENT) - public void func_149651_a (IIconRegister iconRegister) + public void registerBlockIcons (IIconRegister iconRegister) { } @Override @SideOnly(Side.CLIENT) - public IIcon func_149691_a (int side, int meta) + public IIcon getIcon (int side, int meta) { meta = meta % 8; if (meta == 0) - return TRepo.smeltery.func_149691_a(side, 2); + return TRepo.smeltery.getIcon(side, 2); if (meta <= 3) - return TRepo.smeltery.func_149691_a(side, meta + 3); + return TRepo.smeltery.getIcon(side, meta + 3); - return TRepo.smeltery.func_149691_a(side, meta + 4); + return TRepo.smeltery.getIcon(side, meta + 4); } @Override - public void func_149666_a (Item b, CreativeTabs tab, List list) + public void getSubBlocks (Item b, CreativeTabs tab, List list) { for (int iter = 0; iter < 8; iter++) { diff --git a/src/main/java/tconstruct/blocks/SlabBase.java b/src/main/java/tconstruct/blocks/SlabBase.java index a511d67b..9b297e7f 100644 --- a/src/main/java/tconstruct/blocks/SlabBase.java +++ b/src/main/java/tconstruct/blocks/SlabBase.java @@ -27,28 +27,28 @@ public class SlabBase extends MantleBlock public SlabBase(Material material) { super(material); - this.func_149647_a(TConstructRegistry.blockTab); + this.setCreativeTab(TConstructRegistry.blockTab); } public SlabBase(Material material, Block model, int meta, int totalSize) { super(material); - this.func_149647_a(TConstructRegistry.blockTab); + this.setCreativeTab(TConstructRegistry.blockTab); this.modelBlock = model; this.startingMeta = meta; this.totalSize = totalSize; } @Override - public void func_149743_a (World world, int x, int y, int z, AxisAlignedBB axisalignedbb, List arraylist, Entity entity) + public void addCollisionBoxesToList (World world, int x, int y, int z, AxisAlignedBB axisalignedbb, List arraylist, Entity entity) { setBlockBoundsBasedOnState(world, x, y, z); - super.func_149743_a(world, x, y, z, axisalignedbb, arraylist, entity); + super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, entity); } public void setBlockBoundsForItemRender () { - func_149676_a(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F); + setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F); } public void setBlockBoundsBasedOnState (IBlockAccess world, int x, int y, int z) @@ -56,7 +56,7 @@ public class SlabBase extends MantleBlock int meta = world.getBlockMetadata(x, y, z) / 8; float minY = meta == 1 ? 0.5F : 0.0F; float maxY = meta == 1 ? 1.0F : 0.5F; - func_149676_a(0.0F, minY, 0F, 1.0F, maxY, 1.0F); + setBlockBounds(0.0F, minY, 0F, 1.0F, maxY, 1.0F); } public int onBlockPlaced (World par1World, int blockX, int blockY, int blockZ, int side, float clickX, float clickY, float clickZ, int metadata) @@ -81,20 +81,20 @@ public class SlabBase extends MantleBlock @Override @SideOnly(Side.CLIENT) - public void func_149651_a (IIconRegister iconRegister) + public void registerBlockIcons (IIconRegister iconRegister) { } @Override @SideOnly(Side.CLIENT) - public IIcon func_149691_a (int side, int meta) + public IIcon getIcon (int side, int meta) { meta = meta % 8 + startingMeta; - return modelBlock.func_149691_a(side, meta); + return modelBlock.getIcon(side, meta); } @Override - public void func_149666_a (Item b, CreativeTabs tab, List list) + public void getSubBlocks (Item b, CreativeTabs tab, List list) { for (int iter = 0; iter < totalSize; iter++) { diff --git a/src/main/java/tconstruct/blocks/SlimeExplosive.java b/src/main/java/tconstruct/blocks/SlimeExplosive.java index 9e4fc867..efdfdec1 100644 --- a/src/main/java/tconstruct/blocks/SlimeExplosive.java +++ b/src/main/java/tconstruct/blocks/SlimeExplosive.java @@ -25,7 +25,7 @@ public class SlimeExplosive extends TConstructBlock public SlimeExplosive() { - super(Material.field_151590_u, 0f, getTextureNames()); + super(Material.tnt, 0f, getTextureNames()); } static String[] getTextureNames () @@ -43,13 +43,13 @@ public class SlimeExplosive extends TConstructBlock @Override @SideOnly(Side.CLIENT) - public IIcon func_149691_a (int side, int meta) + public IIcon getIcon (int side, int meta) { return icons[(meta / 2) * 3 + getSideTextureIndex(side)]; } @Override - public void func_149666_a (Item b, CreativeTabs tab, List list) + public void getSubBlocks (Item b, CreativeTabs tab, List list) { for (int iter = 0; iter < 2; iter++) { @@ -58,29 +58,29 @@ public class SlimeExplosive extends TConstructBlock } @Override - public void func_149726_b (World par1World, int par2, int par3, int par4) + public void onBlockAdded (World par1World, int par2, int par3, int par4) { - super.func_149726_b(par1World, par2, par3, par4); + super.onBlockAdded(par1World, par2, par3, par4); if (par1World.isBlockIndirectlyGettingPowered(par2, par3, par4)) { - this.func_149664_b(par1World, par2, par3, par4, 1); + this.onBlockDestroyedByPlayer(par1World, par2, par3, par4, 1); WorldHelper.setBlockToAir(par1World, par2, par3, par4); } } @Override - public void func_149695_a (World par1World, int par2, int par3, int par4, Block par5Block) + public void onNeighborBlockChange (World par1World, int par2, int par3, int par4, Block par5Block) { if (par1World.isBlockIndirectlyGettingPowered(par2, par3, par4)) { - this.func_149664_b(par1World, par2, par3, par4, 1); + this.onBlockDestroyedByPlayer(par1World, par2, par3, par4, 1); WorldHelper.setBlockToAir(par1World, par2, par3, par4); } } @Override - public void func_149723_a (World par1World, int par2, int par3, int par4, Explosion par5Explosion) + public void onBlockDestroyedByExplosion (World par1World, int par2, int par3, int par4, Explosion par5Explosion) { if (!par1World.isRemote) { @@ -92,7 +92,7 @@ public class SlimeExplosive extends TConstructBlock } @Override - public void func_149664_b (World par1World, int par2, int par3, int par4, int par5) + public void onBlockDestroyedByPlayer (World par1World, int par2, int par3, int par4, int par5) { this.primeTnt(par1World, par2, par3, par4, par5, (EntityLivingBase) null); } @@ -111,7 +111,7 @@ public class SlimeExplosive extends TConstructBlock } @Override - public boolean func_149727_a (World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) + public boolean onBlockActivated (World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { if (par5EntityPlayer.getCurrentEquippedItem() != null && par5EntityPlayer.getCurrentEquippedItem().getItem() == Items.flint_and_steel) { @@ -122,12 +122,12 @@ public class SlimeExplosive extends TConstructBlock } else { - return super.func_149727_a(par1World, par2, par3, par4, par5EntityPlayer, par6, par7, par8, par9); + return super.onBlockActivated(par1World, par2, par3, par4, par5EntityPlayer, par6, par7, par8, par9); } } @Override - public void func_149670_a (World par1World, int par2, int par3, int par4, Entity par5Entity) + public void onEntityCollidedWithBlock (World par1World, int par2, int par3, int par4, Entity par5Entity) { if (par5Entity instanceof EntityArrow && !par1World.isRemote) { @@ -142,7 +142,7 @@ public class SlimeExplosive extends TConstructBlock } @Override - public boolean func_149659_a (Explosion par1Explosion) + public boolean canDropFromExplosion (Explosion par1Explosion) { return false; } diff --git a/src/main/java/tconstruct/blocks/SlimePad.java b/src/main/java/tconstruct/blocks/SlimePad.java index 0b137426..2dac0b03 100644 --- a/src/main/java/tconstruct/blocks/SlimePad.java +++ b/src/main/java/tconstruct/blocks/SlimePad.java @@ -25,18 +25,18 @@ public class SlimePad extends MantleBlock public SlimePad(Material par2Material) { super(par2Material); - func_149676_a(0.125F, 0.0F, 0.125F, 0.875F, 0.625F, 0.875F); - this.func_149647_a(TConstructRegistry.blockTab); + setBlockBounds(0.125F, 0.0F, 0.125F, 0.875F, 0.625F, 0.875F); + this.setCreativeTab(TConstructRegistry.blockTab); } @Override - public AxisAlignedBB func_149668_a (World world, int x, int y, int z) + public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z) { return null; } @Override - public void func_149670_a (World world, int x, int y, int z, Entity entity) + public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity) { if (!world.isBlockIndirectlyGettingPowered(x, y, z)) { @@ -83,7 +83,7 @@ public class SlimePad extends MantleBlock entity.posY += 1; } entity.addVelocity(moveX, speed * 2, moveZ); - world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, this.field_149762_H.func_150498_e(), (this.field_149762_H.func_150497_c()) / 2.0F, this.field_149762_H.func_150494_d() * 0.65F); + world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, this.stepSound.getStepResourcePath(), (this.stepSound.getVolume()) / 2.0F, this.stepSound.getPitch() * 0.65F); } } @@ -93,7 +93,7 @@ public class SlimePad extends MantleBlock } @Override - public void func_149689_a (World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) + public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) { int face = MathHelper.floor_double((double) (entity.rotationYaw * 8.0F / 360.0F) + 0.5D) + (entity.isSneaking() ? 4 : 0) & 7; int meta = world.getBlockMetadata(x, y, z) & 8; @@ -101,50 +101,50 @@ public class SlimePad extends MantleBlock } @Override - public boolean func_149686_d () + public boolean renderAsNormalBlock () { return false; } @Override - public boolean func_149662_c () + public boolean isOpaqueCube () { return false; } @Override - public int func_149701_w () + public int getRenderBlockPass () { return 1; } @Override - public int func_149645_b () + public int getRenderType () { return SlimePadRender.model; } @Override - public void func_149651_a (IIconRegister iconRegister) + public void registerBlockIcons (IIconRegister iconRegister) { } @Override @SideOnly(Side.CLIENT) - public IIcon func_149691_a (int side, int meta) + public IIcon getIcon (int side, int meta) { - return TRepo.slimeGel.func_149691_a(side, 1); + return TRepo.slimeGel.getIcon(side, 1); } @SideOnly(Side.CLIENT) public IIcon getFluidIcon (int meta) { - return TRepo.slimeChannel.func_149691_a(2, 0); + return TRepo.slimeChannel.getIcon(2, 0); } @SideOnly(Side.CLIENT) public IIcon getNubIcon (int meta) { - return TRepo.slimeGel.func_149691_a(0, 0); + return TRepo.slimeGel.getIcon(0, 0); } } diff --git a/src/main/java/tconstruct/blocks/SmelteryBlock.java b/src/main/java/tconstruct/blocks/SmelteryBlock.java index 1b24a1d4..49eb6a8b 100644 --- a/src/main/java/tconstruct/blocks/SmelteryBlock.java +++ b/src/main/java/tconstruct/blocks/SmelteryBlock.java @@ -35,13 +35,13 @@ public class SmelteryBlock extends InventoryBlock public SmelteryBlock() { - super(Material.field_151576_e); - func_149711_c(3F); - func_149752_b(20F); - func_149672_a(field_149777_j); + super(Material.rock); + setHardness(3F); + setResistance(20F); + setStepSound(soundTypeMetal); rand = new Random(); - this.func_149647_a(TConstructRegistry.blockTab); - this.func_149663_c("tconstruct.Smeltery"); + this.setCreativeTab(TConstructRegistry.blockTab); + this.setBlockName("tconstruct.Smeltery"); } public SmelteryBlock(String prefix) @@ -52,7 +52,7 @@ public class SmelteryBlock extends InventoryBlock /* Rendering */ @Override - public int func_149645_b () + public int getRenderType () { return PHConstruct.newSmeltery ? 0 : SmelteryRender.smelteryModel; } @@ -70,7 +70,7 @@ public class SmelteryBlock extends InventoryBlock return textureNames; } - public IIcon func_149691_a (int side, int meta) + public IIcon getIcon (int side, int meta) { if (meta < 2) { @@ -90,9 +90,9 @@ public class SmelteryBlock extends InventoryBlock return icons[3 + meta]; } - public IIcon func_149673_e (IBlockAccess world, int x, int y, int z, int side) + public IIcon getIcon (IBlockAccess world, int x, int y, int z, int side) { - TileEntity logic = world.func_147438_o(x, y, z); + TileEntity logic = world.getTileEntity(x, y, z); short direction = (logic instanceof IFacingLogic) ? ((IFacingLogic) logic).getRenderDirection() : 0; int meta = world.getBlockMetadata(x, y, z); if (meta == 0) //Smeltery @@ -162,7 +162,7 @@ public class SmelteryBlock extends InventoryBlock { if (isActive(world, x, y, z)) { - TileEntity logic = world.func_147438_o(x, y, z); + TileEntity logic = world.getTileEntity(x, y, z); byte face = 0; if (logic instanceof IFacingLogic) face = ((IFacingLogic) logic).getRenderDirection(); @@ -208,7 +208,7 @@ public class SmelteryBlock extends InventoryBlock } @Override - public boolean func_149727_a (World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ) + public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ) { if (player.isSneaking() || world.getBlockMetadata(x, y, z) != 0) return false; @@ -220,14 +220,14 @@ public class SmelteryBlock extends InventoryBlock } else { - //world.func_147471_g(x, y, z); + //world.markBlockForUpdate(x, y, z); player.openGui(getModInstance(), integer, world, x, y, z); return true; } } @Override - public TileEntity func_149915_a (World world, int metadata) + public TileEntity createNewTileEntity (World world, int metadata) { switch (metadata) { @@ -249,16 +249,16 @@ public class SmelteryBlock extends InventoryBlock } @Override - public void func_149689_a (World world, int x, int y, int z, EntityLivingBase entityliving, ItemStack stack) + public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase entityliving, ItemStack stack) { - super.func_149689_a(world, x, y, z, entityliving, stack); + super.onBlockPlacedBy(world, x, y, z, entityliving, stack); if (world.getBlockMetadata(x, y, z) == 0 && !PHConstruct.newSmeltery) onBlockPlacedElsewhere(world, x, y, z, entityliving); } public void onBlockPlacedElsewhere (World world, int x, int y, int z, EntityLivingBase entityliving) { - SmelteryLogic logic = (SmelteryLogic) world.func_147438_o(x, y, z); + SmelteryLogic logic = (SmelteryLogic) world.getTileEntity(x, y, z); logic.checkValidPlacement(); } @@ -269,7 +269,7 @@ public class SmelteryBlock extends InventoryBlock }*/ @Override - public void func_149666_a (Item b, CreativeTabs tab, List list) + public void getSubBlocks (Item b, CreativeTabs tab, List list) { for (int iter = 0; iter < 12; iter++) { @@ -280,10 +280,10 @@ public class SmelteryBlock extends InventoryBlock /* Updating */ @Override - public void func_149695_a (World world, int x, int y, int z, Block block) + public void onNeighborBlockChange (World world, int x, int y, int z, Block block) { //System.out.println("Neighbor changed"); - TileEntity logic = world.func_147438_o(x, y, z); + TileEntity logic = world.getTileEntity(x, y, z); if (logic instanceof IServantLogic) { ((IServantLogic) logic).notifyMasterOfChange(); @@ -295,14 +295,14 @@ public class SmelteryBlock extends InventoryBlock } @Override - public void func_149749_a (World world, int x, int y, int z, Block block, int meta) + public void breakBlock (World world, int x, int y, int z, Block block, int meta) { - TileEntity logic = world.func_147438_o(x, y, z); + TileEntity logic = world.getTileEntity(x, y, z); if (logic instanceof IServantLogic) { ((IServantLogic) logic).notifyMasterOfChange(); } - super.func_149749_a(world, x, y, z, block, meta); + super.breakBlock(world, x, y, z, block, meta); } } diff --git a/src/main/java/tconstruct/blocks/SoilBlock.java b/src/main/java/tconstruct/blocks/SoilBlock.java index 76666f48..ef56940d 100644 --- a/src/main/java/tconstruct/blocks/SoilBlock.java +++ b/src/main/java/tconstruct/blocks/SoilBlock.java @@ -18,11 +18,11 @@ public class SoilBlock extends TConstructBlock public SoilBlock() { - super(Material.field_151578_c, 3.0F, soilTypes); + super(Material.ground, 3.0F, soilTypes); } @Override - public void func_149724_b (World world, int x, int y, int z, Entity entity) + public void onEntityWalking (World world, int x, int y, int z, Entity entity) { if (entity instanceof EntityLivingBase){ if (((EntityLivingBase) entity).getCreatureAttribute() == EnumCreatureAttribute.UNDEAD) @@ -56,9 +56,9 @@ public class SoilBlock extends TConstructBlock } } - public AxisAlignedBB func_149668_a (World world, int x, int y, int z) + public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z) { - return Blocks.soul_sand.func_149668_a(world, x, y, z); + return Blocks.soul_sand.getCollisionBoundingBoxFromPool(world, x, y, z); } /*public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) diff --git a/src/main/java/tconstruct/blocks/SoilSlab.java b/src/main/java/tconstruct/blocks/SoilSlab.java index c97a9374..aaba1ece 100644 --- a/src/main/java/tconstruct/blocks/SoilSlab.java +++ b/src/main/java/tconstruct/blocks/SoilSlab.java @@ -20,36 +20,36 @@ public class SoilSlab extends SlabBase { public SoilSlab() { - super(Material.field_151578_c); - this.func_149647_a(TConstructRegistry.blockTab); + super(Material.ground); + this.setCreativeTab(TConstructRegistry.blockTab); } @Override @SideOnly(Side.CLIENT) - public void func_149651_a (IIconRegister iconRegister) + public void registerBlockIcons (IIconRegister iconRegister) { - this.field_149761_L = iconRegister.registerIcon("tinker:grass_top"); + this.blockIcon = iconRegister.registerIcon("tinker:grass_top"); } @Override @SideOnly(Side.CLIENT) - public IIcon func_149691_a (int side, int meta) + public IIcon getIcon (int side, int meta) { switch (meta % 8) { case 0: - return this.field_149761_L;//Block.grass.func_149691_a(1, 0); + return this.blockIcon;//Block.grass.getIcon(1, 0); case 1: - return Blocks.dirt.func_149691_a(side, 0); + return Blocks.dirt.getIcon(side, 0); case 2: - return Blocks.mycelium.func_149691_a(1, 0); + return Blocks.mycelium.getIcon(1, 0); default: - return TRepo.craftedSoil.func_149691_a(side, meta - 3); + return TRepo.craftedSoil.getIcon(side, meta - 3); } } @Override - public void func_149666_a (Item b, CreativeTabs tab, List list) + public void getSubBlocks (Item b, CreativeTabs tab, List list) { for (int iter = 0; iter < 8; iter++) { @@ -59,7 +59,7 @@ public class SoilSlab extends SlabBase @Override @SideOnly(Side.CLIENT) - public int func_149635_D () + public int getBlockColor () { double d0 = 0.5D; double d1 = 1.0D; @@ -68,16 +68,16 @@ public class SoilSlab extends SlabBase @Override @SideOnly(Side.CLIENT) - public int func_149741_i (int par1) + public int getRenderColor (int par1) { //if (par1 % 8 == 0) - return this.func_149635_D(); + return this.getBlockColor(); //return 0xFFFFFF; } @Override @SideOnly(Side.CLIENT) - public int func_149720_d (IBlockAccess world, int x, int y, int z) + public int colorMultiplier (IBlockAccess world, int x, int y, int z) { int l = 0; int i1 = 0; @@ -87,7 +87,7 @@ public class SoilSlab extends SlabBase { for (int l1 = -1; l1 <= 1; ++l1) { - int i2 = world.getBiomeGenForCoords(x + l1, z + k1).func_150558_b(x, y, z); + int i2 = world.getBiomeGenForCoords(x + l1, z + k1).getBiomeGrassColor(x, y, z); l += (i2 & 16711680) >> 16; i1 += (i2 & 65280) >> 8; j1 += i2 & 255; diff --git a/src/main/java/tconstruct/blocks/SpeedBlock.java b/src/main/java/tconstruct/blocks/SpeedBlock.java index 852576fd..8fb38cdf 100644 --- a/src/main/java/tconstruct/blocks/SpeedBlock.java +++ b/src/main/java/tconstruct/blocks/SpeedBlock.java @@ -18,12 +18,12 @@ public class SpeedBlock extends TConstructBlock public SpeedBlock() { - super(Material.field_151576_e, 3.0f, textureNames); + super(Material.rock, 3.0f, textureNames); //this.setBlockBounds(0f, 0f, 0f, 1.0f, 0.5f, 1.0f); } @Override - public void func_149724_b (World world, int x, int y, int z, Entity entity) + public void onEntityWalking (World world, int x, int y, int z, Entity entity) { double boost = 2.2D; int metadata = world.getBlockMetadata(x, y, z); @@ -43,14 +43,14 @@ public class SpeedBlock extends TConstructBlock } @Override - public int func_149692_a (int meta) + public int damageDropped (int meta) { return meta; } @Override @SideOnly(Side.CLIENT) - public void func_149666_a (Item b, CreativeTabs tab, List list) + public void getSubBlocks (Item b, CreativeTabs tab, List list) { for (int iter = 0; iter < textureNames.length; iter++) { diff --git a/src/main/java/tconstruct/blocks/SpeedSlab.java b/src/main/java/tconstruct/blocks/SpeedSlab.java index 9e4f3f02..d50679b0 100644 --- a/src/main/java/tconstruct/blocks/SpeedSlab.java +++ b/src/main/java/tconstruct/blocks/SpeedSlab.java @@ -19,27 +19,27 @@ public class SpeedSlab extends SlabBase { public SpeedSlab() { - super(Material.field_151576_e); - this.func_149647_a(TConstructRegistry.blockTab); - func_149711_c(3F); + super(Material.rock); + this.setCreativeTab(TConstructRegistry.blockTab); + setHardness(3F); } @Override @SideOnly(Side.CLIENT) - public void func_149651_a (IIconRegister iconRegister) + public void registerBlockIcons (IIconRegister iconRegister) { } @Override @SideOnly(Side.CLIENT) - public IIcon func_149691_a (int side, int meta) + public IIcon getIcon (int side, int meta) { meta = meta % 8; - return TRepo.speedBlock.func_149691_a(side, meta); + return TRepo.speedBlock.getIcon(side, meta); } @Override - public void func_149666_a (Item b, CreativeTabs tab, List list) + public void getSubBlocks (Item b, CreativeTabs tab, List list) { for (int iter = 0; iter < 7; iter++) { @@ -48,7 +48,7 @@ public class SpeedSlab extends SlabBase } @Override - public void func_149724_b (World world, int x, int y, int z, Entity entity) + public void onEntityWalking (World world, int x, int y, int z, Entity entity) { double boost = 2.2D; int metadata = world.getBlockMetadata(x, y, z) % 8; diff --git a/src/main/java/tconstruct/blocks/StoneLadder.java b/src/main/java/tconstruct/blocks/StoneLadder.java index 12406255..a9bd7044 100644 --- a/src/main/java/tconstruct/blocks/StoneLadder.java +++ b/src/main/java/tconstruct/blocks/StoneLadder.java @@ -12,7 +12,7 @@ public class StoneLadder extends BlockLadder { // Override ladder material - public final Material blockMaterial = Material.field_151576_e; + public final Material blockMaterial = Material.rock; private IIcon icon; @@ -20,19 +20,19 @@ public class StoneLadder extends BlockLadder public StoneLadder() { super(); - this.func_149663_c("decoration.stoneladder"); - this.func_149647_a(CreativeTabs.tabDecorations); + this.setBlockName("decoration.stoneladder"); + this.setCreativeTab(CreativeTabs.tabDecorations); } @Override - public void func_149651_a (IIconRegister register) + public void registerBlockIcons (IIconRegister register) { icon = register.registerIcon("tinker:ladder_stone"); } @Override @SideOnly(Side.CLIENT) - public IIcon func_149691_a (int meta, int side) + public IIcon getIcon (int meta, int side) { return icon; } diff --git a/src/main/java/tconstruct/blocks/StoneTorch.java b/src/main/java/tconstruct/blocks/StoneTorch.java index 2e597c1f..b089b3c5 100644 --- a/src/main/java/tconstruct/blocks/StoneTorch.java +++ b/src/main/java/tconstruct/blocks/StoneTorch.java @@ -24,9 +24,9 @@ public class StoneTorch extends MantleBlock { public StoneTorch() { - super(Material.field_151594_q); - this.func_149647_a(CreativeTabs.tabDecorations); - func_149715_a(0.9375F); + super(Material.circuits); + this.setCreativeTab(CreativeTabs.tabDecorations); + setLightLevel(0.9375F); } /** @@ -68,13 +68,13 @@ public class StoneTorch extends MantleBlock */ private boolean canPlaceTorchOn (World par1World, int par2, int par3, int par4) { - if (par1World.func_147466_a(par1World, par2, par3, par4)) + if (par1World.doesBlockHaveSolidTopSurface(par1World, par2, par3, par4)) { return true; } else { - Block b = par1World.func_147439_a(par2, par3, par4); + Block b = par1World.getBlock(par2, par3, par4); return (b != null && b.canPlaceTorchOnTop(par1World, par2, par3, par4)); } } @@ -149,9 +149,9 @@ public class StoneTorch extends MantleBlock } @SideOnly(Side.CLIENT) - public void func_149651_a (IIconRegister par1IconRegister) + public void registerBlockIcons (IIconRegister par1IconRegister) { - this.field_149761_L = par1IconRegister.registerIcon("tinker:torch_stone"); + this.blockIcon = par1IconRegister.registerIcon("tinker:torch_stone"); } /** @@ -197,7 +197,7 @@ public class StoneTorch extends MantleBlock if (flag) { - this.func_149697_b(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); + this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); return true; } else @@ -219,9 +219,9 @@ public class StoneTorch extends MantleBlock { if (!this.canPlaceBlockAt(par1World, par2, par3, par4)) { - if (par1World.func_147439_a(par2, par3, par4) == (Block) this) + if (par1World.getBlock(par2, par3, par4) == (Block) this) { - this.func_149697_b(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); + this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); WorldHelper.setBlockToAir(par1World, par2, par3, par4); } @@ -244,27 +244,27 @@ public class StoneTorch extends MantleBlock if (l == 1) { - this.func_149676_a(0.0F, 0.2F, 0.5F - f, f * 2.0F, 0.8F, 0.5F + f); + this.setBlockBounds(0.0F, 0.2F, 0.5F - f, f * 2.0F, 0.8F, 0.5F + f); } else if (l == 2) { - this.func_149676_a(1.0F - f * 2.0F, 0.2F, 0.5F - f, 1.0F, 0.8F, 0.5F + f); + this.setBlockBounds(1.0F - f * 2.0F, 0.2F, 0.5F - f, 1.0F, 0.8F, 0.5F + f); } else if (l == 3) { - this.func_149676_a(0.5F - f, 0.2F, 0.0F, 0.5F + f, 0.8F, f * 2.0F); + this.setBlockBounds(0.5F - f, 0.2F, 0.0F, 0.5F + f, 0.8F, f * 2.0F); } else if (l == 4) { - this.func_149676_a(0.5F - f, 0.2F, 1.0F - f * 2.0F, 0.5F + f, 0.8F, 1.0F); + this.setBlockBounds(0.5F - f, 0.2F, 1.0F - f * 2.0F, 0.5F + f, 0.8F, 1.0F); } else { f = 0.1F; - this.func_149676_a(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.6F, 0.5F + f); + this.setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.6F, 0.5F + f); } - return super.func_149731_a(par1World, par2, par3, par4, par5Vec3, par6Vec3); + return super.collisionRayTrace(par1World, par2, par3, par4, par5Vec3, par6Vec3); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/tconstruct/blocks/TConstructBlock.java b/src/main/java/tconstruct/blocks/TConstructBlock.java index 6dd6b6b9..70a543b8 100644 --- a/src/main/java/tconstruct/blocks/TConstructBlock.java +++ b/src/main/java/tconstruct/blocks/TConstructBlock.java @@ -22,20 +22,20 @@ public class TConstructBlock extends MantleBlock public TConstructBlock( Material material, float hardness, String[] tex) { super( material); - func_149711_c(hardness); - this.func_149647_a(TConstructRegistry.blockTab); + setHardness(hardness); + this.setCreativeTab(TConstructRegistry.blockTab); textureNames = tex; } @Override - public int func_149692_a (int meta) + public int damageDropped (int meta) { return meta; } @Override @SideOnly(Side.CLIENT) - public void func_149651_a (IIconRegister iconRegister) + public void registerBlockIcons (IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; @@ -47,7 +47,7 @@ public class TConstructBlock extends MantleBlock @Override @SideOnly(Side.CLIENT) - public IIcon func_149691_a (int side, int meta) + public IIcon getIcon (int side, int meta) { return meta < icons.length ? icons[meta] : icons[0]; } @@ -65,7 +65,7 @@ public class TConstructBlock extends MantleBlock //TODO getSubBlocks @Override - public void func_149666_a (Item block, CreativeTabs tab, List list) + public void getSubBlocks (Item block, CreativeTabs tab, List list) { for (int iter = 0; iter < icons.length; iter++) { diff --git a/src/main/java/tconstruct/blocks/TConstructFluid.java b/src/main/java/tconstruct/blocks/TConstructFluid.java index cc85c3b5..88f6b289 100644 --- a/src/main/java/tconstruct/blocks/TConstructFluid.java +++ b/src/main/java/tconstruct/blocks/TConstructFluid.java @@ -19,7 +19,7 @@ public class TConstructFluid extends BlockFluidClassic super(fluid, material); this.texture = texture; //TODO setCreativeTab() - this.func_149647_a(TConstructRegistry.blockTab); + this.setCreativeTab(TConstructRegistry.blockTab); } public TConstructFluid(Fluid fluid, Material material, String texture, boolean alpha) @@ -29,21 +29,21 @@ public class TConstructFluid extends BlockFluidClassic } @Override - public int func_149701_w () + public int getRenderBlockPass () { return alpha ? 1 : 0; } - //TODO func_149651_a + //TODO registerBlockIcons @Override - public void func_149651_a (IIconRegister iconRegister) + public void registerBlockIcons (IIconRegister iconRegister) { stillIcon = iconRegister.registerIcon("tinker:" + texture); flowIcon = iconRegister.registerIcon("tinker:" + texture + "_flow"); } - //TODO func_149691_a() + //TODO getIcon() @Override - public IIcon func_149691_a (int side, int meta) + public IIcon getIcon (int side, int meta) { if (side == 0 || side == 1) return stillIcon; diff --git a/src/main/java/tconstruct/blocks/TMetalBlock.java b/src/main/java/tconstruct/blocks/TMetalBlock.java index 5cec6685..53c52a21 100644 --- a/src/main/java/tconstruct/blocks/TMetalBlock.java +++ b/src/main/java/tconstruct/blocks/TMetalBlock.java @@ -13,7 +13,7 @@ public class TMetalBlock extends TConstructBlock public TMetalBlock(Material material, float hardness) { super(material, hardness, metalTypes); - this.func_149672_a(Block.field_149777_j); + this.setStepSound(Block.soundTypeMetal); } public boolean isBeaconBase (World worldObj, int x, int y, int z, int beaconX, int beaconY, int beaconZ) diff --git a/src/main/java/tconstruct/blocks/TankAirBlock.java b/src/main/java/tconstruct/blocks/TankAirBlock.java index efade639..6c8d38ff 100644 --- a/src/main/java/tconstruct/blocks/TankAirBlock.java +++ b/src/main/java/tconstruct/blocks/TankAirBlock.java @@ -29,50 +29,50 @@ public class TankAirBlock extends BlockContainer } @Override - public TileEntity func_149915_a (World world, int i) + public TileEntity createNewTileEntity (World world, int i) { return new TankAirLogic(); } @Override - public int func_149645_b () + public int getRenderType () { return TankAirRender.model; } @SideOnly(Side.CLIENT) - public void func_149651_a (IIconRegister par1IconRegister) + public void registerBlockIcons (IIconRegister par1IconRegister) { } @Override - public boolean func_149662_c () + public boolean isOpaqueCube () { return false; } @Override - public boolean func_149686_d () + public boolean renderAsNormalBlock () { return false; } @Override - public AxisAlignedBB func_149668_a (World world, int x, int y, int z) + public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z) { - TankAirLogic tank = (TankAirLogic) world.func_147438_o(x, y, z); + TankAirLogic tank = (TankAirLogic) world.getTileEntity(x, y, z); if (tank != null && tank.hasItem()) - return super.func_149668_a(world, x, y, z); + return super.getCollisionBoundingBoxFromPool(world, x, y, z); return null; } - public MovingObjectPosition func_149731_a (World world, int x, int y, int z, Vec3 par5Vec3, Vec3 par6Vec3) + public MovingObjectPosition collisionRayTrace (World world, int x, int y, int z, Vec3 par5Vec3, Vec3 par6Vec3) { - TankAirLogic tank = (TankAirLogic) world.func_147438_o(x, y, z); + TankAirLogic tank = (TankAirLogic) world.getTileEntity(x, y, z); if (tank.hasItem()) - return super.func_149731_a(world, x, y, z, par5Vec3, par6Vec3); + return super.collisionRayTrace(world, x, y, z, par5Vec3, par6Vec3); return null; } @@ -102,7 +102,7 @@ public class TankAirBlock extends BlockContainer } @Override - public void func_149666_a (Item i, CreativeTabs tab, List list) + public void getSubBlocks (Item i, CreativeTabs tab, List list) { } diff --git a/src/main/java/tconstruct/blocks/ToolForgeBlock.java b/src/main/java/tconstruct/blocks/ToolForgeBlock.java index 365d966c..0d7ee1e2 100644 --- a/src/main/java/tconstruct/blocks/ToolForgeBlock.java +++ b/src/main/java/tconstruct/blocks/ToolForgeBlock.java @@ -29,9 +29,9 @@ public class ToolForgeBlock extends InventoryBlock public ToolForgeBlock(Material material) { super(material); - this.func_149647_a(TConstructRegistry.blockTab); - this.func_149711_c(2f); - this.func_149672_a(Block.field_149777_j); + this.setCreativeTab(TConstructRegistry.blockTab); + this.setHardness(2f); + this.setStepSound(Block.soundTypeMetal); } String[] textureNames = { "toolforge_iron", "toolforge_gold", "toolforge_diamond", "toolforge_emerald", "toolforge_cobalt", "toolforge_ardite", "toolforge_manyullyn", "toolforge_copper", @@ -47,14 +47,14 @@ public class ToolForgeBlock extends InventoryBlock IIcon textureTop; @Override - public void func_149651_a (IIconRegister iconRegister) + public void registerBlockIcons (IIconRegister iconRegister) { - super.func_149651_a(iconRegister); + super.registerBlockIcons(iconRegister); textureTop = iconRegister.registerIcon("tinker:toolforge_top"); } @Override - public IIcon func_149691_a (int side, int meta) + public IIcon getIcon (int side, int meta) { if (side == 1) { @@ -65,15 +65,15 @@ public class ToolForgeBlock extends InventoryBlock switch (meta) { case 0: - return Blocks.iron_block.func_149691_a(side, 0); + return Blocks.iron_block.getIcon(side, 0); case 1: - return Blocks.gold_block.func_149691_a(side, 0); + return Blocks.gold_block.getIcon(side, 0); case 2: - return Blocks.diamond_block.func_149691_a(side, 0); + return Blocks.diamond_block.getIcon(side, 0); case 3: - return Blocks.emerald_block.func_149691_a(side, 0); + return Blocks.emerald_block.getIcon(side, 0); default: - return TRepo.metalBlock.func_149691_a(side, meta - 4); + return TRepo.metalBlock.getIcon(side, meta - 4); } } @@ -81,13 +81,13 @@ public class ToolForgeBlock extends InventoryBlock } @Override - public boolean func_149686_d () + public boolean renderAsNormalBlock () { return false; } @Override - public boolean func_149662_c () + public boolean isOpaqueCube () { return false; } @@ -99,19 +99,19 @@ public class ToolForgeBlock extends InventoryBlock } @Override - public int func_149645_b () + public int getRenderType () { return TableForgeRender.model; } @Override - public boolean func_149646_a (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { return true; } @Override - public TileEntity func_149915_a (World world, int metadata) + public TileEntity createNewTileEntity (World world, int metadata) { return new ToolForgeLogic(); } @@ -130,7 +130,7 @@ public class ToolForgeBlock extends InventoryBlock } @Override - public void func_149666_a (Item b, CreativeTabs tab, List list) + public void getSubBlocks (Item b, CreativeTabs tab, List list) { for (int iter = 0; iter < textureNames.length; iter++) { diff --git a/src/main/java/tconstruct/blocks/ToolStationBlock.java b/src/main/java/tconstruct/blocks/ToolStationBlock.java index ed1f1ce9..b188e504 100644 --- a/src/main/java/tconstruct/blocks/ToolStationBlock.java +++ b/src/main/java/tconstruct/blocks/ToolStationBlock.java @@ -34,9 +34,9 @@ public class ToolStationBlock extends InventoryBlock public ToolStationBlock(Material material) { super(material); - this.func_149647_a(TConstructRegistry.blockTab); - this.func_149711_c(2f); - this.func_149672_a(Block.field_149766_f); + this.setCreativeTab(TConstructRegistry.blockTab); + this.setHardness(2f); + this.setStepSound(Block.soundTypeWood); } //Block.hasComparatorInputOverride and Block.getComparatorInputOverride @@ -56,7 +56,7 @@ public class ToolStationBlock extends InventoryBlock @Override @SideOnly(Side.CLIENT) - public IIcon func_149691_a (int side, int meta) + public IIcon getIcon (int side, int meta) { if (meta <= 4) { @@ -83,13 +83,13 @@ public class ToolStationBlock extends InventoryBlock } @Override - public boolean func_149686_d () + public boolean renderAsNormalBlock () { return false; } @Override - public boolean func_149662_c () + public boolean isOpaqueCube () { return false; } @@ -101,13 +101,13 @@ public class ToolStationBlock extends InventoryBlock } @Override - public int func_149645_b () + public int getRenderType () { return TableRender.tabelModelID; } @Override - public boolean func_149646_a (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { return true; } @@ -116,8 +116,8 @@ public class ToolStationBlock extends InventoryBlock { int metadata = world.getBlockMetadata(x, y, z); if (metadata == 5) - return AxisAlignedBB.getAABBPool().getAABB((double) x + this.field_149759_B, (double) y + this.field_149760_C, (double) z + this.field_149754_D, (double) x + this.field_149755_E, (double) y + this.field_149756_F - 0.125, (double) z + this.field_149757_G); - return AxisAlignedBB.getAABBPool().getAABB((double) x + this.field_149759_B, (double) y + this.field_149760_C, (double) z + this.field_149754_D, (double) x + this.field_149755_E, (double) y + this.field_149756_F, (double) z + this.field_149757_G); + return AxisAlignedBB.getAABBPool().getAABB((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY - 0.125, (double) z + this.maxZ); + return AxisAlignedBB.getAABBPool().getAABB((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY, (double) z + this.maxZ); } @Override @@ -183,7 +183,7 @@ public class ToolStationBlock extends InventoryBlock } @Override - public void func_149666_a (Item b, CreativeTabs tab, List list) + public void getSubBlocks (Item b, CreativeTabs tab, List list) { for (int iter = 0; iter < 6; iter++) { @@ -197,14 +197,14 @@ public class ToolStationBlock extends InventoryBlock } @Override - public void func_149689_a (World world, int x, int y, int z, EntityLivingBase par5EntityLiving, ItemStack par6ItemStack) + public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase par5EntityLiving, ItemStack par6ItemStack) { if (PHConstruct.freePatterns) { int meta = world.getBlockMetadata(x, y, z); if (meta == 5) { - PatternChestLogic logic = (PatternChestLogic) world.func_147438_o(x, y, z); + PatternChestLogic logic = (PatternChestLogic) world.getTileEntity(x, y, z); for (int i = 1; i <= 13; i++) { logic.setInventorySlotContents(i - 1, new ItemStack(TRepo.woodPattern, 1, i)); @@ -212,11 +212,11 @@ public class ToolStationBlock extends InventoryBlock logic.setInventorySlotContents(13, new ItemStack(TRepo.woodPattern, 1, 22)); } } - super.func_149689_a(world, x, y, z, par5EntityLiving, par6ItemStack); + super.onBlockPlacedBy(world, x, y, z, par5EntityLiving, par6ItemStack); } @Override - public TileEntity func_149915_a (World var1, int var2) + public TileEntity createNewTileEntity (World var1, int var2) { return createTileEntity(var1,var2); } diff --git a/src/main/java/tconstruct/blocks/WoodRail.java b/src/main/java/tconstruct/blocks/WoodRail.java index e7643c7b..bdb7529a 100644 --- a/src/main/java/tconstruct/blocks/WoodRail.java +++ b/src/main/java/tconstruct/blocks/WoodRail.java @@ -24,9 +24,9 @@ public class WoodRail extends BlockRailBase /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public IIcon func_149691_a (int par1, int par2) + public IIcon getIcon (int par1, int par2) { - return par2 >= 6 ? this.theIcon : this.field_149761_L; + return par2 >= 6 ? this.theIcon : this.blockIcon; } @SideOnly(Side.CLIENT) @@ -34,15 +34,15 @@ public class WoodRail extends BlockRailBase * When this method is called, your block should register all the icons it needs with the given IconRegister. This * is the only chance you get to register icons. */ - public void func_149651_a (IIconRegister par1IconRegister) + public void registerBlockIcons (IIconRegister par1IconRegister) { - this.field_149761_L = par1IconRegister.registerIcon("tinker:woodrail"); + this.blockIcon = par1IconRegister.registerIcon("tinker:woodrail"); this.theIcon = par1IconRegister.registerIcon("tinker:woodrail_turn"); } protected void func_94358_a (World par1World, int par2, int par3, int par4, int par5, int par6, Block par7) { - if (par7 != Blocks.air && par7.func_149744_f() && (new Rail(par1World, par2, par3, par4)).func_150650_a() == 3) + if (par7 != Blocks.air && par7.canProvidePower() && (new Rail(par1World, par2, par3, par4)).func_150650_a() == 3) { this.func_150052_a(par1World, par2, par3, par4, false); } diff --git a/src/main/java/tconstruct/blocks/component/SmelteryComponent.java b/src/main/java/tconstruct/blocks/component/SmelteryComponent.java index 82c2565d..4711803f 100644 --- a/src/main/java/tconstruct/blocks/component/SmelteryComponent.java +++ b/src/main/java/tconstruct/blocks/component/SmelteryComponent.java @@ -146,7 +146,7 @@ public class SmelteryComponent extends LogicComponent return; } - TileEntity tankContainer = world.func_147438_o(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z); + TileEntity tankContainer = world.getTileEntity(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z); if (tankContainer == null) { fuelAmount = 0; @@ -183,7 +183,7 @@ public class SmelteryComponent extends LogicComponent while (!foundTank) { CoordTuple possibleTank = structure.lavaTanks.get(iter); - TileEntity newTankContainer = world.func_147438_o(possibleTank.x, possibleTank.y, possibleTank.z); + TileEntity newTankContainer = world.getTileEntity(possibleTank.x, possibleTank.y, possibleTank.z); if (newTankContainer instanceof IFluidHandler) { FluidStack newliquid = ((IFluidHandler) newTankContainer).drain(ForgeDirection.UNKNOWN, drainFuelAmount(), false); diff --git a/src/main/java/tconstruct/blocks/component/SmelteryScan.java b/src/main/java/tconstruct/blocks/component/SmelteryScan.java index 0c749974..3d6c6ab1 100644 --- a/src/main/java/tconstruct/blocks/component/SmelteryScan.java +++ b/src/main/java/tconstruct/blocks/component/SmelteryScan.java @@ -33,7 +33,7 @@ public class SmelteryScan extends TankLayerScan protected boolean checkAir (int x, int y, int z) { - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block == null || block == Blocks.air || block == TRepo.tankAir) return true; @@ -43,14 +43,14 @@ public class SmelteryScan extends TankLayerScan @Override protected boolean checkServant (int x, int y, int 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)) + Block block = world.getBlock(x, y, z); + if (block == null || world.getBlock( x, y, z) == Blocks.air || !isValidBlock(x, y, z)) return false; if (!block.hasTileEntity(world.getBlockMetadata(x, y, z))) return false; - TileEntity be = world.func_147438_o(x, y, z); + TileEntity be = world.getTileEntity(x, y, z); if (be instanceof IServantLogic) { boolean ret = ((IServantLogic) be).setPotentialMaster(this.imaster, this.world, x, y, z); @@ -72,11 +72,11 @@ public class SmelteryScan extends TankLayerScan { for (CoordTuple coord : airCoords) { - if (world.func_147439_a(coord.x, coord.y, coord.z) != TRepo.tankAir) + if (world.getBlock(coord.x, coord.y, coord.z) != TRepo.tankAir) { - world.func_147449_b(coord.x, coord.y, coord.z, TRepo.tankAir); - IServantLogic servant = (IServantLogic) world.func_147438_o(coord.x, coord.y, coord.z); - servant.verifyMaster(imaster, world, master.field_145851_c, master.field_145848_d, master.field_145849_e); + world.setBlock(coord.x, coord.y, coord.z, TRepo.tankAir); + IServantLogic servant = (IServantLogic) world.getTileEntity(coord.x, coord.y, coord.z); + servant.verifyMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); } } } @@ -88,9 +88,9 @@ public class SmelteryScan extends TankLayerScan super.invalidateStructure(); for (CoordTuple coord : airCoords) { - TileEntity servant = world.func_147438_o(coord.x, coord.y, coord.z); + TileEntity servant = world.getTileEntity(coord.x, coord.y, coord.z); if (servant instanceof IServantLogic) - ((IServantLogic) servant).invalidateMaster(imaster, world, master.field_145851_c, master.field_145848_d, master.field_145849_e); + ((IServantLogic) servant).invalidateMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); } } @@ -102,9 +102,9 @@ public class SmelteryScan extends TankLayerScan if (coord.y < height) continue; - TileEntity servant = world.func_147438_o(coord.x, coord.y, coord.z); + TileEntity servant = world.getTileEntity(coord.x, coord.y, coord.z); if (servant instanceof IServantLogic) - ((IServantLogic) servant).invalidateMaster(imaster, world, master.field_145851_c, master.field_145848_d, master.field_145849_e); + ((IServantLogic) servant).invalidateMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); } } @@ -116,10 +116,10 @@ public class SmelteryScan extends TankLayerScan while (i.hasNext()) { CoordTuple coord = (CoordTuple) i.next(); - TileEntity te = world.func_147438_o(coord.x, coord.y, coord.z); + TileEntity te = world.getTileEntity(coord.x, coord.y, coord.z); if (te != null && te instanceof IServantLogic) { - ((IServantLogic) te).invalidateMaster(imaster, world, master.field_145851_c, master.field_145848_d, master.field_145849_e); + ((IServantLogic) te).invalidateMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); } } } @@ -130,7 +130,7 @@ public class SmelteryScan extends TankLayerScan { super.readNetworkNBT(tags); - NBTTagList tanks = tags.func_150295_c("Tanks",11); + NBTTagList tanks = tags.getTagList("Tanks",11); if (tanks != null) { lavaTanks.clear(); diff --git a/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java b/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java index c8b01844..027889da 100644 --- a/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java +++ b/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java @@ -32,7 +32,7 @@ public class AdaptiveDrainLogic extends MultiServantLogic implements IFluidHandl { if (hasValidMaster() && canDrain(from, null)) { - AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) field_145850_b.func_147438_o(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); + AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); return smeltery.fill(from, resource, doFill); } return 0; @@ -44,7 +44,7 @@ public class AdaptiveDrainLogic extends MultiServantLogic implements IFluidHandl // TConstruct.logger.info("Attempting drain " + hasValidMaster()); if (hasValidMaster() && canDrain(from, null)) { - AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) field_145850_b.func_147438_o(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); + AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); // TConstruct.logger.info("Found master"); return smeltery.drain(from, maxDrain, doDrain); } @@ -56,7 +56,7 @@ public class AdaptiveDrainLogic extends MultiServantLogic implements IFluidHandl { if (hasValidMaster() && canDrain(from, null)) { - AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) field_145850_b.func_147438_o(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); + AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); return smeltery.drain(from, resource, doDrain); } return null; @@ -67,7 +67,7 @@ public class AdaptiveDrainLogic extends MultiServantLogic implements IFluidHandl { if (hasValidMaster()) { - AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) field_145850_b.func_147438_o(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); + AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); return smeltery.getFillState() < 2; } return false; @@ -78,7 +78,7 @@ public class AdaptiveDrainLogic extends MultiServantLogic implements IFluidHandl { if (hasValidMaster()) { - AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) field_145850_b.func_147438_o(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); + AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); return smeltery.getFillState() > 0; } return false; @@ -89,7 +89,7 @@ public class AdaptiveDrainLogic extends MultiServantLogic implements IFluidHandl { if (hasValidMaster() && (from == getForgeDirection() || from == getForgeDirection().getOpposite() || from == ForgeDirection.UNKNOWN)) { - AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) field_145850_b.func_147438_o(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); + AdaptiveSmelteryLogic smeltery = (AdaptiveSmelteryLogic) worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); return smeltery.getTankInfo(ForgeDirection.UNKNOWN); } return null; @@ -144,32 +144,32 @@ public class AdaptiveDrainLogic extends MultiServantLogic implements IFluidHandl } } - public void func_145839_a (NBTTagCompound tags) + public void readFromNBT (NBTTagCompound tags) { - super.func_145839_a(tags); + super.readFromNBT(tags); direction = tags.getByte("Direction"); } @Override - public void func_145841_b (NBTTagCompound tags) + public void writeToNBT (NBTTagCompound tags) { - super.func_145841_b(tags); + super.writeToNBT(tags); tags.setByte("Direction", direction); } /* Packets */ @Override - public Packet func_145844_m () + public Packet getDescriptionPacket () { NBTTagCompound tag = new NBTTagCompound(); - func_145841_b(tag); - return new S35PacketUpdateTileEntity(field_145851_c, field_145848_d, field_145849_e, 1, tag); + writeToNBT(tag); + return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag); } @Override public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) { - func_145839_a(packet.func_148857_g()); - field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e); + readFromNBT(packet.func_148857_g()); + worldObj.func_147479_m(xCoord, yCoord, zCoord); } } diff --git a/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java b/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java index d35ca58d..c2ef2807 100644 --- a/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java +++ b/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java @@ -51,7 +51,7 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc if (tick % 4 == 0) smeltery.heatItems(); - if (!field_145850_b.isRemote) + if (!worldObj.isRemote) { if (tick % 20 == 0) { @@ -113,9 +113,9 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc /* Structure */ @Override - public void func_145834_a (World world) + public void setWorldObj (World world) { - super.func_145834_a(world); + super.setWorldObj(world); structure.setWorld(world); smeltery.setWorld(world); } @@ -123,7 +123,7 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc @Override public void notifyChange (IServantLogic servant, int x, int y, int z) { - if (!field_145850_b.isRemote) + if (!worldObj.isRemote) { //System.out.println("Notifying of change from "+new CoordTuple(x, y, z)); recheckStructure = true; @@ -146,7 +146,7 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc smeltery.adjustSize(structure.getAirSize(), true); multitank.setCapacity(structure.getAirSize() * (TConstruct.ingotLiquidValue * 18)); smeltery.setActiveLavaTank(structure.lavaTanks.get(0)); - field_145850_b.func_147471_g(field_145851_c, field_145848_d, field_145849_e); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } @Override @@ -271,7 +271,7 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc CoordTuple air = structure.getAirByIndex(slot); if (air != null) { - TileEntity te = field_145850_b.func_147438_o(air.x, air.y, air.z); + TileEntity te = worldObj.getTileEntity(air.x, air.y, air.z); if (te != null && te instanceof TankAirLogic) { ((TankAirLogic) te).setInventorySlotContents(0, itemstack); @@ -393,7 +393,7 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc { Map.Entry pairs = (Map.Entry) iter.next(); CoordTuple coord = (CoordTuple) pairs.getKey(); - TileEntity te = field_145850_b.func_147438_o(coord.x, coord.y, coord.z); + TileEntity te = worldObj.getTileEntity(coord.x, coord.y, coord.z); if (te instanceof TankAirLogic) { ((TankAirLogic) te).overrideFluids(((LiquidDataInstance) pairs.getValue()).fluids); @@ -406,7 +406,7 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc public void updateAir () { for (CoordTuple loc : structure.airCoords) - field_145850_b.func_147471_g(loc.x, loc.y, loc.z); + worldObj.markBlockForUpdate(loc.x, loc.y, loc.z); } class LiquidData @@ -513,9 +513,9 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc /* NBT */ @Override - public void func_145839_a (NBTTagCompound tags) + public void readFromNBT (NBTTagCompound tags) { - super.func_145839_a(tags); + super.readFromNBT(tags); readNetworkNBT(tags); structure.readFromNBT(tags); @@ -535,9 +535,9 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc } @Override - public void func_145841_b (NBTTagCompound tags) + public void writeToNBT (NBTTagCompound tags) { - super.func_145841_b(tags); + super.writeToNBT(tags); writeNetworkNBT(tags); structure.writeToNBT(tags); @@ -560,26 +560,26 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) { readNetworkNBT(packet.func_148857_g()); - field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e); + worldObj.func_147479_m(xCoord, yCoord, zCoord); } @Override - public Packet func_145844_m () + public Packet getDescriptionPacket () { NBTTagCompound tag = new NBTTagCompound(); writeNetworkNBT(tag); - return new S35PacketUpdateTileEntity(field_145851_c, field_145848_d, field_145849_e, 1, tag); + return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag); } @Override - public String func_145825_b () + public String getInventoryName () { // TODO Auto-generated method stub return getDefaultName(); } @Override - public boolean func_145818_k_ () + public boolean hasCustomInventoryName () { return true; } diff --git a/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java b/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java index 594745fe..4f771936 100644 --- a/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java +++ b/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java @@ -135,7 +135,7 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl castingDelay = recipe.coolTime; } renderOffset = copyLiquid.amount; - field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e); + worldObj.func_147479_m(xCoord, yCoord, zCoord); this.liquid = copyLiquid; needsUpdate = true; } @@ -157,7 +157,7 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl renderOffset = roomInTank; castingDelay = TConstruct.basinCasting.getCastingDelay(this.liquid, inventory[0]); this.liquid.amount = this.capacity; - field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e); + worldObj.func_147479_m(xCoord, yCoord, zCoord); needsUpdate = true; } return roomInTank; @@ -168,7 +168,7 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl if (doFill) { this.liquid.amount += resource.amount; - field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e); + worldObj.func_147479_m(xCoord, yCoord, zCoord); needsUpdate = true; } return resource.amount; @@ -185,14 +185,14 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl public void onInventoryChanged () //Isn't actually called? { super.onInventoryChanged(); - field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e); + worldObj.func_147479_m(xCoord, yCoord, zCoord); needsUpdate = true; } public ItemStack decrStackSize (int slot, int quantity) { ItemStack stack = super.decrStackSize(slot, quantity); - field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e); + worldObj.func_147479_m(xCoord, yCoord, zCoord); return stack; } @@ -221,7 +221,7 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl liquid = null; if (doDrain) - FluidEvent.fireEvent(new FluidEvent.FluidDrainingEvent(drained, this.field_145850_b, this.field_145851_c, this.field_145848_d, this.field_145849_e, this)); + FluidEvent.fireEvent(new FluidEvent.FluidDrainingEvent(drained, this.worldObj, this.xCoord, this.yCoord, this.zCoord, this)); return drained; } @@ -292,7 +292,7 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl /* Updating */ @Override - public void func_145845_h () + public void updateEntity () { if (castingDelay > 0) { @@ -304,7 +304,7 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl if (renderOffset > 0) { renderOffset -= 6; - field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e); + worldObj.func_147479_m(xCoord, yCoord, zCoord); } tick++; @@ -312,7 +312,7 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl { tick = 0; if (needsUpdate) - field_145850_b.func_147471_g(field_145851_c, field_145848_d, field_145849_e); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } } @@ -325,16 +325,16 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl if (recipe.consumeCast) inventory[0] = null; liquid = null; - field_145850_b.func_147471_g(field_145851_c, field_145848_d, field_145849_e); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } } /* NBT */ @Override - public void func_145839_a (NBTTagCompound tags) + public void readFromNBT (NBTTagCompound tags) { - super.func_145839_a(tags); + super.readFromNBT(tags); readCustomNBT(tags); } @@ -357,9 +357,9 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl } @Override - public void func_145841_b (NBTTagCompound tags) + public void writeToNBT (NBTTagCompound tags) { - super.func_145841_b(tags); + super.writeToNBT(tags); writeCustomNBT(tags); } @@ -379,18 +379,18 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl /* Packets */ @Override - public Packet func_145844_m () + public Packet getDescriptionPacket () { NBTTagCompound tag = new NBTTagCompound(); - func_145841_b(tag); - return new S35PacketUpdateTileEntity(field_145851_c, field_145848_d, field_145849_e, 1, tag); + writeToNBT(tag); + return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag); } @Override public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) { - func_145839_a(packet.func_148857_g()); - field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e); + readFromNBT(packet.func_148857_g()); + worldObj.func_147479_m(xCoord, yCoord, zCoord); } @Override @@ -421,13 +421,13 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl } @Override - public String func_145825_b () + public String getInventoryName () { return null; } @Override - public boolean func_145818_k_ () + public boolean hasCustomInventoryName () { return false; } diff --git a/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java b/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java index b5c25411..69114b8f 100644 --- a/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java +++ b/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java @@ -33,18 +33,18 @@ public class CastingChannelLogic extends TileEntity implements IFluidTank, IFlui } @Override - public void func_145845_h () + public void updateEntity () { - if (this.field_145850_b.isRemote) + if (this.worldObj.isRemote) return; ticks++; ticksLPReset++; - if (!field_145850_b.isRemote) + if (!worldObj.isRemote) { if (this.pullingLiquids) pullLiquids(); } - //this.field_145850_b.func_147471_g(this.field_145851_c, this.field_145848_d, this.field_145849_e); + //this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); if (ticks == 20) { if (recentlyFilledDelay != 0) @@ -62,8 +62,8 @@ public class CastingChannelLogic extends TileEntity implements IFluidTank, IFlui void pullLiquids () { - if (pullLiquid(field_145851_c + 1, field_145848_d, field_145849_e, ForgeDirection.EAST) || pullLiquid(field_145851_c - 1, field_145848_d, field_145849_e, ForgeDirection.WEST) || pullLiquid(field_145851_c, field_145848_d, field_145849_e + 1, ForgeDirection.NORTH) - || pullLiquid(field_145851_c, field_145848_d, field_145849_e - 1, ForgeDirection.SOUTH)) + if (pullLiquid(xCoord + 1, yCoord, zCoord, ForgeDirection.EAST) || pullLiquid(xCoord - 1, yCoord, zCoord, ForgeDirection.WEST) || pullLiquid(xCoord, yCoord, zCoord + 1, ForgeDirection.NORTH) + || pullLiquid(xCoord, yCoord, zCoord - 1, ForgeDirection.SOUTH)) { } @@ -75,7 +75,7 @@ public class CastingChannelLogic extends TileEntity implements IFluidTank, IFlui boolean pullLiquid (int x, int y, int z, ForgeDirection direction) { - TileEntity tank = field_145850_b.func_147438_o(x, y, z); + TileEntity tank = worldObj.getTileEntity(x, y, z); if (tank instanceof IFluidHandler && !(tank instanceof CastingChannelLogic)) { FluidStack templiquid = ((IFluidHandler) tank).drain(direction, 3, false); @@ -283,7 +283,7 @@ public class CastingChannelLogic extends TileEntity implements IFluidTank, IFlui @SideOnly(Side.CLIENT) public float tankBelow () { - TileEntity te = this.field_145850_b.func_147438_o(this.field_145851_c, this.field_145848_d - 1, this.field_145849_e); + TileEntity te = this.worldObj.getTileEntity(this.xCoord, this.yCoord - 1, this.zCoord); if (te instanceof CastingChannelLogic) return -0.5f; if (te instanceof LavaTankLogic) @@ -303,15 +303,15 @@ public class CastingChannelLogic extends TileEntity implements IFluidTank, IFlui switch (dir) { case DOWN: - return (this.field_145850_b.func_147438_o(this.field_145851_c, this.field_145848_d - 1, this.field_145849_e) instanceof CastingChannelLogic); + return (this.worldObj.getTileEntity(this.xCoord, this.yCoord - 1, this.zCoord) instanceof CastingChannelLogic); case NORTH: - return (this.field_145850_b.func_147438_o(this.field_145851_c, this.field_145848_d, this.field_145849_e - 1) instanceof CastingChannelLogic); + return (this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord - 1) instanceof CastingChannelLogic); case SOUTH: - return (this.field_145850_b.func_147438_o(this.field_145851_c, this.field_145848_d, this.field_145849_e + 1) instanceof CastingChannelLogic); + return (this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord + 1) instanceof CastingChannelLogic); case WEST: - return (this.field_145850_b.func_147438_o(this.field_145851_c - 1, this.field_145848_d, this.field_145849_e) instanceof CastingChannelLogic); + return (this.worldObj.getTileEntity(this.xCoord - 1, this.yCoord, this.zCoord) instanceof CastingChannelLogic); case EAST: - return (this.field_145850_b.func_147438_o(this.field_145851_c + 1, this.field_145848_d, this.field_145849_e) instanceof CastingChannelLogic); + return (this.worldObj.getTileEntity(this.xCoord + 1, this.yCoord, this.zCoord) instanceof CastingChannelLogic); default: return false; } @@ -322,15 +322,15 @@ public class CastingChannelLogic extends TileEntity implements IFluidTank, IFlui switch (dir) { case DOWN: - return (this.field_145850_b.func_147438_o(this.field_145851_c, this.field_145848_d - 1, this.field_145849_e) instanceof IFluidHandler); + return (this.worldObj.getTileEntity(this.xCoord, this.yCoord - 1, this.zCoord) instanceof IFluidHandler); case NORTH: - return (this.field_145850_b.func_147438_o(this.field_145851_c, this.field_145848_d, this.field_145849_e - 1) instanceof IFluidHandler); + return (this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord - 1) instanceof IFluidHandler); case SOUTH: - return (this.field_145850_b.func_147438_o(this.field_145851_c, this.field_145848_d, this.field_145849_e + 1) instanceof IFluidHandler); + return (this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord + 1) instanceof IFluidHandler); case WEST: - return (this.field_145850_b.func_147438_o(this.field_145851_c - 1, this.field_145848_d, this.field_145849_e) instanceof IFluidHandler); + return (this.worldObj.getTileEntity(this.xCoord - 1, this.yCoord, this.zCoord) instanceof IFluidHandler); case EAST: - return (this.field_145850_b.func_147438_o(this.field_145851_c + 1, this.field_145848_d, this.field_145849_e) instanceof IFluidHandler); + return (this.worldObj.getTileEntity(this.xCoord + 1, this.yCoord, this.zCoord) instanceof IFluidHandler); default: return false; } @@ -339,11 +339,11 @@ public class CastingChannelLogic extends TileEntity implements IFluidTank, IFlui private HashMap getOutputs () { HashMap map = new HashMap(); - TileEntity tankXplus = this.field_145850_b.func_147438_o(this.field_145851_c + 1, this.field_145848_d, this.field_145849_e); - TileEntity tankXminus = this.field_145850_b.func_147438_o(this.field_145851_c - 1, this.field_145848_d, this.field_145849_e); - TileEntity tankZplus = this.field_145850_b.func_147438_o(this.field_145851_c, this.field_145848_d, this.field_145849_e + 1); - TileEntity tankZminus = this.field_145850_b.func_147438_o(this.field_145851_c, this.field_145848_d, this.field_145849_e - 1); - TileEntity tankYminus = this.field_145850_b.func_147438_o(this.field_145851_c, this.field_145848_d - 1, this.field_145849_e); + TileEntity tankXplus = this.worldObj.getTileEntity(this.xCoord + 1, this.yCoord, this.zCoord); + TileEntity tankXminus = this.worldObj.getTileEntity(this.xCoord - 1, this.yCoord, this.zCoord); + TileEntity tankZplus = this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord + 1); + TileEntity tankZminus = this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord - 1); + TileEntity tankYminus = this.worldObj.getTileEntity(this.xCoord, this.yCoord - 1, this.zCoord); if (this.pullingLiquids) { @@ -412,7 +412,7 @@ public class CastingChannelLogic extends TileEntity implements IFluidTank, IFlui if (doFill) { - this.field_145850_b.func_147471_g(this.field_145851_c, this.field_145848_d, this.field_145849_e); + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); this.liquid = transfered; } recentlyFilledDelay = 2; @@ -429,7 +429,7 @@ public class CastingChannelLogic extends TileEntity implements IFluidTank, IFlui if ((doFill) && (spaceInTank > 0)) { this.liquid.amount = this.fillMax; - this.field_145850_b.func_147471_g(this.field_145851_c, this.field_145848_d, this.field_145849_e); + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); } return spaceInTank; } @@ -437,7 +437,7 @@ public class CastingChannelLogic extends TileEntity implements IFluidTank, IFlui if (doFill) { this.liquid.amount += stack.amount; - this.field_145850_b.func_147471_g(this.field_145851_c, this.field_145848_d, this.field_145849_e); + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); } return stack.amount; } @@ -484,8 +484,8 @@ public class CastingChannelLogic extends TileEntity implements IFluidTank, IFlui } if (doDrain) { - this.field_145850_b.func_147471_g(this.field_145851_c, this.field_145848_d, this.field_145849_e); - FluidEvent.fireEvent(new FluidEvent.FluidDrainingEvent(drained, this.field_145850_b, this.field_145851_c, this.field_145848_d, this.field_145849_e, this)); + this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); + FluidEvent.fireEvent(new FluidEvent.FluidDrainingEvent(drained, this.worldObj, this.xCoord, this.yCoord, this.zCoord, this)); } return drained; } @@ -514,9 +514,9 @@ public class CastingChannelLogic extends TileEntity implements IFluidTank, IFlui } @Override - public void func_145839_a (NBTTagCompound tags) + public void readFromNBT (NBTTagCompound tags) { - super.func_145839_a(tags); + super.readFromNBT(tags); readCustomNBT(tags); pullingLiquids = tags.getBoolean("PullingLiquids"); } @@ -534,9 +534,9 @@ public class CastingChannelLogic extends TileEntity implements IFluidTank, IFlui } @Override - public void func_145841_b (NBTTagCompound tags) + public void writeToNBT (NBTTagCompound tags) { - super.func_145841_b(tags); + super.writeToNBT(tags); writeCustomNBT(tags); tags.setBoolean("PullingLiquids", pullingLiquids); } @@ -555,18 +555,18 @@ public class CastingChannelLogic extends TileEntity implements IFluidTank, IFlui } @Override - public Packet func_145844_m () + public Packet getDescriptionPacket () { NBTTagCompound tag = new NBTTagCompound(); writeCustomNBT(tag); - return new S35PacketUpdateTileEntity(this.field_145851_c, this.field_145848_d, this.field_145849_e, 1, tag); + return new S35PacketUpdateTileEntity(this.xCoord, this.yCoord, this.zCoord, 1, tag); } @Override public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) { readCustomNBT(packet.func_148857_g()); - this.field_145850_b.func_147479_m(this.field_145851_c, this.field_145848_d, this.field_145849_e); + this.worldObj.func_147479_m(this.xCoord, this.yCoord, this.zCoord); } public int convertFDToInt (ForgeDirection dir) diff --git a/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java b/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java index 96617c7c..2876750a 100644 --- a/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java +++ b/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java @@ -135,7 +135,7 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl castingDelay = recipe.coolTime; } renderOffset = copyLiquid.amount; - getWorld().func_147479_m(field_145851_c, field_145848_d, field_145849_e); + getWorld().func_147479_m(xCoord, yCoord, zCoord); this.liquid = copyLiquid; needsUpdate = true; } @@ -157,7 +157,7 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl renderOffset = roomInTank; castingDelay = TConstruct.tableCasting.getCastingDelay(this.liquid, inventory[0]); this.liquid.amount = this.capacity; - getWorld().func_147479_m(field_145851_c, field_145848_d, field_145849_e); + getWorld().func_147479_m(xCoord, yCoord, zCoord); needsUpdate = true; } return roomInTank; @@ -168,7 +168,7 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl if (doFill) { this.liquid.amount += resource.amount; - getWorld().func_147479_m(field_145851_c, field_145848_d, field_145849_e); + getWorld().func_147479_m(xCoord, yCoord, zCoord); needsUpdate = true; } return resource.amount; @@ -185,14 +185,14 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl public void onInventoryChanged () //Isn't actually called? { super.onInventoryChanged(); - getWorld().func_147479_m(field_145851_c, field_145848_d, field_145849_e); + getWorld().func_147479_m(xCoord, yCoord, zCoord); needsUpdate = true; } public ItemStack decrStackSize (int slot, int quantity) { ItemStack stack = super.decrStackSize(slot, quantity); - getWorld().func_147479_m(field_145851_c, field_145848_d, field_145849_e); + getWorld().func_147479_m(xCoord, yCoord, zCoord); return stack; } @@ -221,7 +221,7 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl liquid = null; if (doDrain) - FluidEvent.fireEvent(new FluidEvent.FluidDrainingEvent(drained, this.getWorld(), this.field_145851_c, this.field_145848_d, this.field_145849_e, this)); + FluidEvent.fireEvent(new FluidEvent.FluidDrainingEvent(drained, this.getWorld(), this.xCoord, this.yCoord, this.zCoord, this)); return drained; } @@ -292,7 +292,7 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl /* Updating */ @Override - public void func_145845_h () + public void updateEntity () { if (castingDelay > 0) { @@ -304,7 +304,7 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl if (renderOffset > 0) { renderOffset -= 6; - getWorld().func_147479_m(field_145851_c, field_145848_d, field_145849_e); + getWorld().func_147479_m(xCoord, yCoord, zCoord); } tick++; @@ -312,7 +312,7 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl { tick = 0; if (needsUpdate) - getWorld().func_147471_g(field_145851_c, field_145848_d, field_145849_e); + getWorld().markBlockForUpdate(xCoord, yCoord, zCoord); } } @@ -325,16 +325,16 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl if (recipe.consumeCast) inventory[0] = null; liquid = null; - getWorld().func_147471_g(field_145851_c, field_145848_d, field_145849_e); + getWorld().markBlockForUpdate(xCoord, yCoord, zCoord); } } /* NBT */ @Override - public void func_145839_a (NBTTagCompound tags) + public void readFromNBT (NBTTagCompound tags) { - super.func_145839_a(tags); + super.readFromNBT(tags); readCustomNBT(tags); } @@ -355,9 +355,9 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl } @Override - public void func_145841_b (NBTTagCompound tags) + public void writeToNBT (NBTTagCompound tags) { - super.func_145841_b(tags); + super.writeToNBT(tags); writeCustomNBT(tags); } @@ -377,18 +377,18 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl /* Packets */ @Override - public Packet func_145844_m () + public Packet getDescriptionPacket () { NBTTagCompound tag = new NBTTagCompound(); - func_145839_a(tag); - return new S35PacketUpdateTileEntity(field_145851_c, field_145848_d, field_145849_e, 1, tag); + readFromNBT(tag); + return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag); } @Override public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) { - func_145839_a(packet.func_148857_g()); - getWorld().func_147479_m(field_145851_c, field_145848_d, field_145849_e); + readFromNBT(packet.func_148857_g()); + getWorld().func_147479_m(xCoord, yCoord, zCoord); } @Override @@ -419,13 +419,13 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl } @Override - public String func_145825_b () + public String getInventoryName () { return null; } @Override - public boolean func_145818_k_ () + public boolean hasCustomInventoryName () { return false; } diff --git a/src/main/java/tconstruct/blocks/logic/CraftingStationLogic.java b/src/main/java/tconstruct/blocks/logic/CraftingStationLogic.java index e5fd09cb..cffd46f4 100644 --- a/src/main/java/tconstruct/blocks/logic/CraftingStationLogic.java +++ b/src/main/java/tconstruct/blocks/logic/CraftingStationLogic.java @@ -45,7 +45,7 @@ public class CraftingStationLogic extends InventoryLogic implements ISidedInvent { for (int zPos = z - 1; zPos <= z + 1; zPos++) { - TileEntity tile = world.func_147438_o(xPos, yPos, zPos); + TileEntity tile = world.getTileEntity(xPos, yPos, zPos); if (chest == null && tile instanceof TileEntityChest) { chest = new WeakReference(tile); @@ -68,7 +68,7 @@ public class CraftingStationLogic extends InventoryLogic implements ISidedInvent void checkForChest (World world, int x, int y, int z) { - TileEntity tile = world.func_147438_o(x, y, z); + TileEntity tile = world.getTileEntity(x, y, z); if (tile instanceof TileEntityChest) doubleChest = new WeakReference(tile); } @@ -105,13 +105,13 @@ public class CraftingStationLogic extends InventoryLogic implements ISidedInvent } @Override - public String func_145825_b () + public String getInventoryName () { return getDefaultName(); } @Override - public boolean func_145818_k_ () + public boolean hasCustomInventoryName () { return true; } diff --git a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java index 927f6a27..8c66f081 100644 --- a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java +++ b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java @@ -35,9 +35,9 @@ public class DryingRackLogic extends InventoryLogic } @Override - public void func_145845_h () + public void updateEntity () { - if (!field_145850_b.isRemote && maxTime > 0 && currentTime < maxTime) + if (!worldObj.isRemote && maxTime > 0 && currentTime < maxTime) { currentTime++; if (currentTime >= maxTime) @@ -71,11 +71,11 @@ public class DryingRackLogic extends InventoryLogic maxTime = DryingRackRecipes.getDryingTime(inventory[0]); else maxTime = 0; - field_145850_b.func_147471_g(field_145851_c, field_145848_d, field_145849_e); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } @Override - public void func_145839_a (NBTTagCompound tags) + public void readFromNBT (NBTTagCompound tags) { currentTime = tags.getInteger("Time"); maxTime = tags.getInteger("MaxTime"); @@ -83,7 +83,7 @@ public class DryingRackLogic extends InventoryLogic } @Override - public void func_145841_b (NBTTagCompound tags) + public void writeToNBT (NBTTagCompound tags) { tags.setInteger("Time", currentTime); tags.setInteger("MaxTime", maxTime); @@ -92,45 +92,45 @@ public class DryingRackLogic extends InventoryLogic public void readCustomNBT (NBTTagCompound tags) { - super.func_145839_a(tags); + super.readFromNBT(tags); } public void writeCustomNBT (NBTTagCompound tags) { - super.func_145841_b(tags); + super.writeToNBT(tags); } /* Packets */ @Override - public Packet func_145844_m () + public Packet getDescriptionPacket () { NBTTagCompound tag = new NBTTagCompound(); writeCustomNBT(tag); - return new S35PacketUpdateTileEntity(field_145851_c, field_145848_d, field_145849_e, 1, tag); + return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag); } @Override public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) { readCustomNBT(packet.func_148857_g()); - field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e); + worldObj.func_147479_m(xCoord, yCoord, zCoord); } @SideOnly(Side.CLIENT) public AxisAlignedBB getRenderBoundingBox () { - AxisAlignedBB cbb = AxisAlignedBB.getAABBPool().getAABB(field_145851_c, field_145848_d - 1, field_145849_e, field_145851_c + 1, field_145848_d + 1, field_145849_e + 1); + AxisAlignedBB cbb = AxisAlignedBB.getAABBPool().getAABB(xCoord, yCoord - 1, zCoord, xCoord + 1, yCoord + 1, zCoord + 1); return cbb; } @Override - public String func_145825_b () + public String getInventoryName () { return null; } @Override - public boolean func_145818_k_ () + public boolean hasCustomInventoryName () { return false; } diff --git a/src/main/java/tconstruct/blocks/logic/FaucetLogic.java b/src/main/java/tconstruct/blocks/logic/FaucetLogic.java index ea31911a..a0e129c8 100644 --- a/src/main/java/tconstruct/blocks/logic/FaucetLogic.java +++ b/src/main/java/tconstruct/blocks/logic/FaucetLogic.java @@ -21,7 +21,7 @@ public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogi { if (liquid == null && active) { - int x = field_145851_c, z = field_145849_e; + int x = xCoord, z = zCoord; switch (getRenderDirection()) { case 2: @@ -38,8 +38,8 @@ public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogi break; } - TileEntity drainte = field_145850_b.func_147438_o(x, field_145848_d, z); - TileEntity tankte = field_145850_b.func_147438_o(field_145851_c, field_145848_d - 1, field_145849_e); + TileEntity drainte = worldObj.getTileEntity(x, yCoord, z); + TileEntity tankte = worldObj.getTileEntity(xCoord, yCoord - 1, zCoord); if (drainte != null && drainte instanceof IFluidHandler && tankte != null && tankte instanceof IFluidHandler) { @@ -51,7 +51,7 @@ public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogi { liquid = ((IFluidHandler) drainte).drain(getForgeDirection(), drained, true); ((IFluidHandler) tankte).fill(ForgeDirection.UP, liquid, true); - field_145850_b.func_147471_g(field_145851_c, field_145848_d, field_145849_e); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); return true; } else @@ -66,7 +66,7 @@ public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogi } @Override - public void func_145845_h () + public void updateEntity () { if (liquid != null) { @@ -77,7 +77,7 @@ public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogi if (!activateFaucet()) { active = false; - field_145850_b.func_147471_g(field_145851_c, field_145848_d, field_145849_e); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } } } @@ -126,9 +126,9 @@ public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogi } @Override - public void func_145839_a (NBTTagCompound tags) + public void readFromNBT (NBTTagCompound tags) { - super.func_145839_a(tags); + super.readFromNBT(tags); readCustomNBT(tags); } @@ -144,9 +144,9 @@ public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogi } @Override - public void func_145841_b (NBTTagCompound tags) + public void writeToNBT (NBTTagCompound tags) { - super.func_145841_b(tags); + super.writeToNBT(tags); writeCustomNBT(tags); } @@ -164,18 +164,18 @@ public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogi /* Packets */ @Override - public Packet func_145844_m () + public Packet getDescriptionPacket () { NBTTagCompound tag = new NBTTagCompound(); writeCustomNBT(tag); - return new S35PacketUpdateTileEntity(field_145851_c, field_145848_d, field_145849_e, 1, tag); + return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag); } @Override public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) { readCustomNBT(packet.func_148857_g()); - field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e); + worldObj.func_147479_m(xCoord, yCoord, zCoord); } @Override diff --git a/src/main/java/tconstruct/blocks/logic/FrypanLogic.java b/src/main/java/tconstruct/blocks/logic/FrypanLogic.java index e2b7f879..2b54c3d8 100644 --- a/src/main/java/tconstruct/blocks/logic/FrypanLogic.java +++ b/src/main/java/tconstruct/blocks/logic/FrypanLogic.java @@ -56,7 +56,7 @@ public class FrypanLogic extends EquipLogic implements IActiveLogic public void setActive (boolean flag) { active = flag; - field_145850_b.func_147471_g(field_145851_c, field_145848_d, field_145849_e); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } /* Fuel gauge */ @@ -213,7 +213,7 @@ public class FrypanLogic extends EquipLogic implements IActiveLogic public ItemStack getResultFor (ItemStack stack) { - ItemStack result = FurnaceRecipes.smelting().func_151395_a(stack); + ItemStack result = FurnaceRecipes.smelting().getSmeltingResult(stack); if (result != null && result.getItem() instanceof ItemFood) //Only valid for food return result.copy(); @@ -244,14 +244,14 @@ public class FrypanLogic extends EquipLogic implements IActiveLogic return 2400; } - if (block.func_149688_o() == Material.field_151575_d) + if (block.getMaterial() == Material.wood) { return 300; } } if (item instanceof ItemTool && ((ItemTool) item).getToolMaterialName().equals("WOOD")) return 200; - if (item instanceof ItemSword && ((ItemSword) item).func_150932_j().equals("WOOD")) + if (item instanceof ItemSword && ((ItemSword) item).getToolMaterialName().equals("WOOD")) return 200; if (item instanceof ItemHoe && ((ItemHoe) item).getMaterialName().equals("WOOD")) return 200; @@ -270,17 +270,17 @@ public class FrypanLogic extends EquipLogic implements IActiveLogic } /* NBT */ - public void func_145839_a (NBTTagCompound tags) + public void readFromNBT (NBTTagCompound tags) { - super.func_145839_a(tags); + super.readFromNBT(tags); active = tags.getBoolean("Active"); fuel = tags.getInteger("Fuel"); fuelGague = tags.getInteger("FuelGague"); } - public void func_145841_b (NBTTagCompound tags) + public void writeToNBT (NBTTagCompound tags) { - super.func_145841_b(tags); + super.writeToNBT(tags); tags.setBoolean("Active", active); tags.setInteger("Fuel", fuel); tags.setInteger("FuelGague", fuelGague); @@ -293,13 +293,13 @@ public class FrypanLogic extends EquipLogic implements IActiveLogic } @Override - public String func_145825_b () + public String getInventoryName () { return getDefaultName(); } @Override - public boolean func_145818_k_ () + public boolean hasCustomInventoryName () { return true; } diff --git a/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java b/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java index 7c27ac92..f263e609 100644 --- a/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java +++ b/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java @@ -58,7 +58,7 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin public void setActive (boolean flag) { active = flag; - field_145850_b.func_147471_g(field_145851_c, field_145848_d, field_145849_e); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } /* Fuel gauge */ @@ -138,7 +138,7 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin { if (this.canSmelt()) { - ItemStack itemstack = FurnaceRecipes.smelting().func_151395_a(this.inventory[0]); + ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(this.inventory[0]); if (this.inventory[2] == null) { @@ -165,7 +165,7 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin return false; else { - ItemStack itemstack = FurnaceRecipes.smelting().func_151395_a(this.inventory[0]); + ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(this.inventory[0]); if (itemstack == null) return false; if (this.inventory[2] == null) @@ -184,7 +184,7 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin public ItemStack getResultFor (ItemStack stack) { - ItemStack result = FurnaceRecipes.smelting().func_151395_a(stack); + ItemStack result = FurnaceRecipes.smelting().getSmeltingResult(stack); if (result != null) //Only valid for food return result.copy(); @@ -215,7 +215,7 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin return 1200; } - if (block.func_149688_o() == Material.field_151575_d) + if (block.getMaterial() == Material.wood) { return 300; } @@ -228,7 +228,7 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin if (item instanceof ItemTool && ((ItemTool) item).getToolMaterialName().equals("WOOD")) return 200; - if (item instanceof ItemSword && ((ItemSword) item).func_150932_j().equals("WOOD")) + if (item instanceof ItemSword && ((ItemSword) item).getToolMaterialName().equals("WOOD")) return 200; if (item instanceof ItemHoe && ((ItemHoe) item).getMaterialName().equals("WOOD")) return 200; @@ -247,18 +247,18 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin } /* NBT */ - public void func_145839_a (NBTTagCompound tags) + public void readFromNBT (NBTTagCompound tags) { - super.func_145839_a(tags); + super.readFromNBT(tags); active = tags.getBoolean("Active"); fuel = tags.getInteger("Fuel"); fuelGague = tags.getInteger("FuelGague"); readNetworkNBT(tags); } - public void func_145841_b (NBTTagCompound tags) + public void writeToNBT (NBTTagCompound tags) { - super.func_145841_b(tags); + super.writeToNBT(tags); tags.setBoolean("Active", active); tags.setInteger("Fuel", fuel); tags.setInteger("FuelGague", fuelGague); @@ -277,18 +277,18 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin /* Packets */ @Override - public Packet func_145844_m () + public Packet getDescriptionPacket () { NBTTagCompound tag = new NBTTagCompound(); writeNetworkNBT(tag); - return new S35PacketUpdateTileEntity(field_145851_c, field_145848_d, field_145849_e, 1, tag); + return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag); } @Override public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) { readNetworkNBT(packet.func_148857_g()); - field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e); + worldObj.func_147479_m(xCoord, yCoord, zCoord); } @Override @@ -342,13 +342,13 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin } @Override - public String func_145825_b () + public String getInventoryName () { return getDefaultName(); } @Override - public boolean func_145818_k_ () + public boolean hasCustomInventoryName () { return false; } diff --git a/src/main/java/tconstruct/blocks/logic/LandmineExplodeLogic.java b/src/main/java/tconstruct/blocks/logic/LandmineExplodeLogic.java index 85fed008..98aa3068 100644 --- a/src/main/java/tconstruct/blocks/logic/LandmineExplodeLogic.java +++ b/src/main/java/tconstruct/blocks/logic/LandmineExplodeLogic.java @@ -28,7 +28,7 @@ public class LandmineExplodeLogic public LandmineExplodeLogic(World par1World, int par2, int par3, int par4, Entity entity) { worldObj = par1World; - this.tileEntity = (TileEntityLandmine) par1World.func_147438_o(par2, par3, par4); + this.tileEntity = (TileEntityLandmine) par1World.getTileEntity(par2, par3, par4); this.x = par2; this.y = par3; this.z = par4; @@ -146,7 +146,7 @@ public class LandmineExplodeLogic if (hasExploded || defBeh != null && !preventExplode) { - worldObj.func_147475_p(x, y, z); + worldObj.removeTileEntity(x, y, z); WorldHelper.setBlockToAir(worldObj, x, y, z); } else diff --git a/src/main/java/tconstruct/blocks/logic/LandmineSpecialStackLogic.java b/src/main/java/tconstruct/blocks/logic/LandmineSpecialStackLogic.java index 4edcba0f..fc52a990 100644 --- a/src/main/java/tconstruct/blocks/logic/LandmineSpecialStackLogic.java +++ b/src/main/java/tconstruct/blocks/logic/LandmineSpecialStackLogic.java @@ -22,7 +22,7 @@ public class LandmineSpecialStackLogic public LandmineSpecialStackLogic(World par1World, int par2, int par3, int par4, Entity entity, boolean mayHurtPlayer, ArrayList items) { worldObj = par1World; - this.tileEntity = (TileEntityLandmine) par1World.func_147438_o(par2, par3, par4); + this.tileEntity = (TileEntityLandmine) par1World.getTileEntity(par2, par3, par4); this.x = par2; this.y = par3; this.z = par4; diff --git a/src/main/java/tconstruct/blocks/logic/LavaTankLogic.java b/src/main/java/tconstruct/blocks/logic/LavaTankLogic.java index f49f4398..ee2317f6 100644 --- a/src/main/java/tconstruct/blocks/logic/LavaTankLogic.java +++ b/src/main/java/tconstruct/blocks/logic/LavaTankLogic.java @@ -25,7 +25,7 @@ public class LavaTankLogic extends MultiServantLogic implements IFluidHandler if (amount > 0 && doFill) { renderOffset = resource.amount; - field_145850_b.func_147471_g(field_145851_c, field_145848_d, field_145849_e); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } return amount; @@ -38,7 +38,7 @@ public class LavaTankLogic extends MultiServantLogic implements IFluidHandler if (amount != null && doDrain) { renderOffset = -maxDrain; - field_145850_b.func_147471_g(field_145851_c, field_145848_d, field_145849_e); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } return amount; } @@ -102,24 +102,24 @@ public class LavaTankLogic extends MultiServantLogic implements IFluidHandler if (id < 4096) { //TODO check this!! - Block block = Block.func_149729_e(id); - return block.func_149750_m(); + Block block = Block.getBlockById(id); + return block.getLightValue(); } } return 0; } @Override - public void func_145839_a (NBTTagCompound tags) + public void readFromNBT (NBTTagCompound tags) { - super.func_145839_a(tags); + super.readFromNBT(tags); readCustomNBT(tags); } @Override - public void func_145841_b (NBTTagCompound tags) + public void writeToNBT (NBTTagCompound tags) { - super.func_145841_b(tags); + super.writeToNBT(tags); writeCustomNBT(tags); } @@ -144,18 +144,18 @@ public class LavaTankLogic extends MultiServantLogic implements IFluidHandler /* Packets */ @Override - public Packet func_145844_m () + public Packet getDescriptionPacket () { NBTTagCompound tag = new NBTTagCompound(); writeCustomNBT(tag); - return new S35PacketUpdateTileEntity(field_145851_c, field_145848_d, field_145849_e, 1, tag); + return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag); } @Override public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) { readCustomNBT(packet.func_148857_g()); - field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e); + worldObj.func_147479_m(xCoord, yCoord, zCoord); } /* Updating */ @@ -165,12 +165,12 @@ public class LavaTankLogic extends MultiServantLogic implements IFluidHandler } @Override - public void func_145845_h () + public void updateEntity () { if (renderOffset > 0) { renderOffset -= 6; - field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e); + worldObj.func_147479_m(xCoord, yCoord, zCoord); } } } diff --git a/src/main/java/tconstruct/blocks/logic/LiquidTextureLogic.java b/src/main/java/tconstruct/blocks/logic/LiquidTextureLogic.java index bcf646dd..6ff6a111 100644 --- a/src/main/java/tconstruct/blocks/logic/LiquidTextureLogic.java +++ b/src/main/java/tconstruct/blocks/logic/LiquidTextureLogic.java @@ -17,7 +17,7 @@ public class LiquidTextureLogic extends TileEntity public void setLiquidType (int tex) { texturePos = tex; - field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e); + worldObj.func_147479_m(xCoord, yCoord, zCoord); } public int getLiquidType () @@ -25,9 +25,9 @@ public class LiquidTextureLogic extends TileEntity return texturePos; } - public void func_145839_a (NBTTagCompound tags) + public void readFromNBT (NBTTagCompound tags) { - super.func_145839_a(tags); + super.readFromNBT(tags); readCustomNBT(tags); } @@ -36,9 +36,9 @@ public class LiquidTextureLogic extends TileEntity texturePos = tags.getInteger("Texture"); } - public void func_145841_b (NBTTagCompound tags) + public void writeToNBT (NBTTagCompound tags) { - super.func_145841_b(tags); + super.writeToNBT(tags); writeCustomNBT(tags); } @@ -48,17 +48,17 @@ public class LiquidTextureLogic extends TileEntity } @Override - public Packet func_145844_m () + public Packet getDescriptionPacket () { NBTTagCompound tag = new NBTTagCompound(); writeCustomNBT(tag); - return new S35PacketUpdateTileEntity(field_145851_c, field_145848_d, field_145849_e, 1, tag); + return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag); } @Override public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) { readCustomNBT(packet.func_148857_g()); - field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e); + worldObj.func_147479_m(xCoord, yCoord, zCoord); } } diff --git a/src/main/java/tconstruct/blocks/logic/PartBuilderLogic.java b/src/main/java/tconstruct/blocks/logic/PartBuilderLogic.java index dc447cbb..90b7a936 100644 --- a/src/main/java/tconstruct/blocks/logic/PartBuilderLogic.java +++ b/src/main/java/tconstruct/blocks/logic/PartBuilderLogic.java @@ -38,7 +38,7 @@ public class PartBuilderLogic extends InventoryLogic implements ISidedInventory { for (int zPos = z - 1; zPos <= z + 1; zPos++) { - TileEntity tile = world.func_147438_o(xPos, y, zPos); + TileEntity tile = world.getTileEntity(xPos, y, zPos); if (tile != null && tile instanceof PatternChestLogic) return new PartCrafterChestContainer(inventoryplayer, this, (PatternChestLogic) tile); } @@ -146,16 +146,16 @@ public class PartBuilderLogic extends InventoryLogic implements ISidedInventory } /* NBT */ - public void func_145839_a (NBTTagCompound tags) + public void readFromNBT (NBTTagCompound tags) { - super.func_145839_a(tags); + super.readFromNBT(tags); craftedTop = tags.getBoolean("CraftedTop"); craftedBottom = tags.getBoolean("CraftedBottom"); } - public void func_145841_b (NBTTagCompound tags) + public void writeToNBT (NBTTagCompound tags) { - super.func_145841_b(tags); + super.writeToNBT(tags); tags.setBoolean("CraftedTop", craftedTop); tags.setBoolean("CraftedBottom", craftedBottom); } @@ -179,13 +179,13 @@ public class PartBuilderLogic extends InventoryLogic implements ISidedInventory } @Override - public String func_145825_b () + public String getInventoryName () { return getDefaultName(); } @Override - public boolean func_145818_k_ () + public boolean hasCustomInventoryName () { return false; } diff --git a/src/main/java/tconstruct/blocks/logic/PatternChestLogic.java b/src/main/java/tconstruct/blocks/logic/PatternChestLogic.java index 8fc1345b..4718bbd2 100644 --- a/src/main/java/tconstruct/blocks/logic/PatternChestLogic.java +++ b/src/main/java/tconstruct/blocks/logic/PatternChestLogic.java @@ -31,13 +31,13 @@ public class PatternChestLogic extends InventoryLogic } @Override - public String func_145825_b () + public String getInventoryName () { return getDefaultName(); } @Override - public boolean func_145818_k_ () + public boolean hasCustomInventoryName () { return true; } diff --git a/src/main/java/tconstruct/blocks/logic/RedwireLogic.java b/src/main/java/tconstruct/blocks/logic/RedwireLogic.java index 6ce760b3..e42486b8 100644 --- a/src/main/java/tconstruct/blocks/logic/RedwireLogic.java +++ b/src/main/java/tconstruct/blocks/logic/RedwireLogic.java @@ -40,32 +40,32 @@ public class RedwireLogic extends TileEntity } @Override - public void func_145839_a (NBTTagCompound tags) + public void readFromNBT (NBTTagCompound tags) { - super.func_145839_a(tags); + super.readFromNBT(tags); readCustomNBT(tags); } @Override - public void func_145841_b (NBTTagCompound tags) + public void writeToNBT (NBTTagCompound tags) { - super.func_145841_b(tags); + super.writeToNBT(tags); writeCustomNBT(tags); } /* Packets */ @Override - public Packet func_145844_m () + public Packet getDescriptionPacket () { NBTTagCompound tag = new NBTTagCompound(); writeCustomNBT(tag); - return new S35PacketUpdateTileEntity(field_145851_c, field_145848_d, field_145849_e, 1, tag); + return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag); } @Override public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) { readCustomNBT(packet.func_148857_g()); - field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e); + worldObj.func_147479_m(xCoord, yCoord, zCoord); } } diff --git a/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java b/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java index e70f9c25..9c5f8565 100644 --- a/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java +++ b/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java @@ -26,7 +26,7 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl { if (doFill) { - SmelteryLogic smeltery = (SmelteryLogic) field_145850_b.func_147438_o(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); + SmelteryLogic smeltery = (SmelteryLogic) worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); return smeltery.fill(resource, doFill); } else @@ -45,7 +45,7 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl { if (hasValidMaster() && canDrain(from, null)) { - SmelteryLogic smeltery = (SmelteryLogic) field_145850_b.func_147438_o(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); + SmelteryLogic smeltery = (SmelteryLogic) worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); return smeltery.drain(maxDrain, doDrain); } else @@ -76,7 +76,7 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl boolean containsFluid = fluid == null; if (fluid != null) { - SmelteryLogic smeltery = (SmelteryLogic) field_145850_b.func_147438_o(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); + SmelteryLogic smeltery = (SmelteryLogic) worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); for (FluidStack fstack : smeltery.moltenMetal) { if (fstack.fluidID == fluid.getID()) @@ -95,7 +95,7 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl { if (hasValidMaster() && (from == getForgeDirection() || from == getForgeDirection().getOpposite() || from == ForgeDirection.UNKNOWN)) { - SmelteryLogic smeltery = (SmelteryLogic) field_145850_b.func_147438_o(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); + SmelteryLogic smeltery = (SmelteryLogic) worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); return smeltery.getMultiTankInfo(); //return new FluidTankInfo[] { smeltery.getInfo() }; } @@ -151,32 +151,32 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl } } - public void func_145839_a (NBTTagCompound tags) + public void readFromNBT (NBTTagCompound tags) { - super.func_145839_a(tags); + super.readFromNBT(tags); direction = tags.getByte("Direction"); } @Override - public void func_145841_b (NBTTagCompound tags) + public void writeToNBT (NBTTagCompound tags) { - super.func_145841_b(tags); + super.writeToNBT(tags); tags.setByte("Direction", direction); } /* Packets */ @Override - public Packet func_145844_m () + public Packet getDescriptionPacket () { NBTTagCompound tag = new NBTTagCompound(); - func_145841_b(tag); - return new S35PacketUpdateTileEntity(field_145851_c, field_145848_d, field_145849_e, 1, tag); + writeToNBT(tag); + return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag); } @Override public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) { - func_145839_a(packet.func_148857_g()); - field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e); + readFromNBT(packet.func_148857_g()); + worldObj.func_147479_m(xCoord, yCoord, zCoord); } } diff --git a/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java b/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java index 9461f83b..f5343c6f 100644 --- a/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java @@ -142,8 +142,8 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci } stack.stackSize -= itemSize; - EntityItem entityitem = new EntityItem(field_145850_b, (double) ((float) field_145851_c + jumpX + offsetX), (double) ((float) field_145848_d + jumpY), - (double) ((float) field_145849_e + jumpZ + offsetZ), new ItemStack(stack.getItem(), itemSize, stack.getItemDamage())); + EntityItem entityitem = new EntityItem(worldObj, (double) ((float) xCoord + jumpX + offsetX), (double) ((float) yCoord + jumpY), + (double) ((float) zCoord + jumpZ + offsetZ), new ItemStack(stack.getItem(), itemSize, stack.getItemDamage())); if (stack.hasTagCompound()) { @@ -154,7 +154,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci entityitem.motionX = (double) ((float) rand.nextGaussian() * offset); entityitem.motionY = (double) ((float) rand.nextGaussian() * offset + 0.2F); entityitem.motionZ = (double) ((float) rand.nextGaussian() * offset); - field_145850_b.spawnEntityInWorld(entityitem); + worldObj.spawnEntityInWorld(entityitem); } } } @@ -227,7 +227,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci public void setActive (boolean flag) { needsUpdate = true; - field_145850_b.func_147471_g(field_145851_c, field_145848_d, field_145849_e); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } public int getScaledFuelGague (int scale) @@ -256,7 +256,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci /* Updating */ public void updateEntity () { - /*if (field_145850_b.isRemote) + /*if (worldObj.isRemote) return;*/ tick++; @@ -279,7 +279,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci if (needsUpdate) { needsUpdate = false; - field_145850_b.func_147471_g(field_145851_c, field_145848_d, field_145849_e); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } } @@ -295,7 +295,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci { AxisAlignedBB box = AxisAlignedBB.getAABBPool().getAABB(centerPos.x, centerPos.y, centerPos.z, centerPos.x + 1.0D, centerPos.y + 1.0D, centerPos.z + 1.0D).expand(1.0D, 0.0D, 1.0D); - List list = field_145850_b.getEntitiesWithinAABB(Entity.class, box); + List list = worldObj.getEntitiesWithinAABB(Entity.class, box); for (Object o : list) { if (moltenMetal.size() >= 1) @@ -368,7 +368,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci private void handleItemEntity (EntityItem item) { // Clients like to play merry hell with this and cause breakage (we update their inv on syncs) - if (field_145850_b.isRemote) + if (worldObj.isRemote) return; item.age = 0; @@ -403,8 +403,8 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci { this.needsUpdate = true; //TODO check if the below method functions as intended - //Old code: PacketDispatcher.sendPacketToAllInDimension(func_145844_m(), field_145850_b.provider.dimensionId); - FMLCommonHandler.instance().getClientToServerNetworkManager().func_150725_a(func_145844_m()); + //Old code: PacketDispatcher.sendPacketToAllInDimension(getDescriptionPacket(), worldObj.provider.dimensionId); + FMLCommonHandler.instance().getClientToServerNetworkManager().scheduleOutboundPacket(getDescriptionPacket()); } } @@ -424,7 +424,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci } else if (activeTemps[i] >= meltingTemps[i]) { - if (!field_145850_b.isRemote) + if (!worldObj.isRemote) { FluidStack result = getResultFor(inventory[i]); if (result != null) @@ -511,14 +511,14 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci if (activeLavaTank == null || useTime > 0) return; - if (!field_145850_b.blockExists(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z)) + if (!worldObj.blockExists(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z)) { fuelAmount = 0; fuelGague = 0; return; } - TileEntity tankContainer = field_145850_b.func_147438_o(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z); + TileEntity tankContainer = worldObj.getTileEntity(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z); if (tankContainer == null) { fuelAmount = 0; @@ -552,14 +552,14 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci if (activeLavaTank == null || useTime > 0) return; - if (!field_145850_b.blockExists(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z)) + if (!worldObj.blockExists(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z)) { fuelAmount = 0; fuelGague = 0; return; } - TileEntity tankContainer = field_145850_b.func_147438_o(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z); + TileEntity tankContainer = worldObj.getTileEntity(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z); if (tankContainer == null) { fuelAmount = 0; @@ -596,7 +596,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci while (!foundTank) { CoordTuple possibleTank = lavaTanks.get(iter); - TileEntity newTankContainer = field_145850_b.func_147438_o(possibleTank.x, possibleTank.y, possibleTank.z); + TileEntity newTankContainer = worldObj.getTileEntity(possibleTank.x, possibleTank.y, possibleTank.z); if (newTankContainer instanceof IFluidHandler) { //TConstruct.logger.info("Tank: "+possibleTank.toString()); @@ -660,8 +660,8 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci updateEntity(); super.onInventoryChanged(); needsUpdate = true; - //field_145850_b.func_147471_g(field_145851_c, field_145848_d, field_145849_e); - //field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e); + //worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + //worldObj.func_147479_m(xCoord, yCoord, zCoord); } /*@Override @@ -682,26 +682,26 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci switch (getRenderDirection()) { case 2: // +z - alignInitialPlacement(field_145851_c, field_145848_d, field_145849_e + 2); + alignInitialPlacement(xCoord, yCoord, zCoord + 2); break; case 3: // -z - alignInitialPlacement(field_145851_c, field_145848_d, field_145849_e - 2); + alignInitialPlacement(xCoord, yCoord, zCoord - 2); break; case 4: // +x - alignInitialPlacement(field_145851_c + 2, field_145848_d, field_145849_e); + alignInitialPlacement(xCoord + 2, yCoord, zCoord); break; case 5: // -x - alignInitialPlacement(field_145851_c - 2, field_145848_d, field_145849_e); + alignInitialPlacement(xCoord - 2, yCoord, zCoord); break; } } public void alignInitialPlacement (int x, int y, int z) { - Block northBlock = field_145850_b.func_147439_a(x, y, z + 1); - Block southBlock = field_145850_b.func_147439_a(x, y, z - 1); - Block eastBlock = field_145850_b.func_147439_a(x + 1, y, z); - Block westBlock = field_145850_b.func_147439_a(x - 1, y, z); + Block northBlock = worldObj.getBlock(x, y, z + 1); + Block southBlock = worldObj.getBlock(x, y, z - 1); + Block eastBlock = worldObj.getBlock(x + 1, y, z); + Block westBlock = worldObj.getBlock(x - 1, y, z); if ((northBlock == null || northBlock == Blocks.air) && (southBlock == null || southBlock == Blocks.air) && (eastBlock == null || eastBlock == Blocks.air) && (westBlock == null || westBlock == Blocks.air)) @@ -756,7 +756,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci internalTemp = 800; activeLavaTank = lavaTanks.get(0); adjustLayers(checkLayers, false); - field_145850_b.func_147471_g(field_145851_c, field_145848_d, field_145849_e); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); validStructure = true; } else @@ -778,7 +778,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci { for (int zPos = z - 1; zPos <= z + 1; zPos++) { - block = field_145850_b.func_147439_a(xPos, y, zPos); + block = worldObj.getBlock(xPos, y, zPos); if (block != null && block != Blocks.air) return false; } @@ -811,7 +811,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci { for (int zPos = z - 1; zPos <= z + 1; zPos++) { - Block block = field_145850_b.func_147439_a(xPos, y, zPos); + Block block = worldObj.getBlock(xPos, y, zPos); if (block != null && !(block == Blocks.air)) return count; } @@ -845,7 +845,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci { for (int zPos = z - 1; zPos <= z + 1; zPos++) { - Block block = field_145850_b.func_147439_a(xPos, y, zPos); + Block block = worldObj.getBlock(xPos, y, zPos); if (block != null && block != Blocks.air) { if (validBlock(block)) @@ -883,7 +883,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci { for (int zPos = z - 1; zPos <= z + 1; zPos++) { - if (validBlock(field_145850_b.func_147439_a(xPos, y, zPos)) && (field_145850_b.getBlockMetadata(xPos, y, zPos) >= 2)) + if (validBlock(worldObj.getBlock(xPos, y, zPos)) && (worldObj.getBlockMetadata(xPos, y, zPos) >= 2)) bottomBricks++; } } @@ -902,10 +902,10 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci int checkBricks (int x, int y, int z) { int tempBricks = 0; - Block block = field_145850_b.func_147439_a(x, y, z); + Block block = worldObj.getBlock(x, y, z); if (validBlock(block) || validTank(block)) { - TileEntity te = field_145850_b.func_147438_o(x, y, z); + TileEntity te = worldObj.getTileEntity(x, y, z); if (te == this) { tempBricks++; @@ -915,11 +915,11 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci MultiServantLogic servant = (MultiServantLogic) te; if (servant.hasValidMaster()) { - if (servant.verifyMaster(this, field_145850_b, this.field_145851_c, this.field_145848_d, this.field_145849_e)) + if (servant.verifyMaster(this, worldObj, this.xCoord, this.yCoord, this.zCoord)) tempBricks++; } // Temp comment out - /*else if (servant.setMaster(this.field_145851_c, this.field_145848_d, this.field_145849_e)) + /*else if (servant.setMaster(this.xCoord, this.yCoord, this.zCoord)) { tempBricks++; }*/ @@ -969,7 +969,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci { //liquid = null; moltenMetal.remove(liquid); - field_145850_b.func_147471_g(field_145851_c, field_145848_d, field_145849_e); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); currentLiquid = 0; needsUpdate = true; } @@ -980,7 +980,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci if (doDrain && maxDrain > 0) { liquid.amount -= maxDrain; - field_145850_b.func_147471_g(field_145851_c, field_145848_d, field_145849_e); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); currentLiquid -= maxDrain; needsUpdate = true; } @@ -1014,7 +1014,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci } } needsUpdate = true; - field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e); + worldObj.func_147479_m(xCoord, yCoord, zCoord); } return amount; } @@ -1057,11 +1057,11 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci /* NBT */ @Override - public void func_145839_a (NBTTagCompound tags) + public void readFromNBT (NBTTagCompound tags) { layers = tags.getInteger("Layers"); inventory = new ItemStack[layers * 9]; - super.func_145839_a(tags); + super.readFromNBT(tags); //validStructure = tags.getBoolean("ValidStructure"); internalTemp = tags.getInteger("InternalTemp"); @@ -1071,7 +1071,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci if (center.length > 2) centerPos = new CoordTuple(center[0], center[1], center[2]); else - centerPos = new CoordTuple(field_145851_c, field_145848_d, field_145849_e); + centerPos = new CoordTuple(xCoord, yCoord, zCoord); direction = tags.getByte("Direction"); useTime = tags.getInteger("UseTime"); @@ -1080,12 +1080,12 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci meltingTemps = tags.getIntArray("MeltingTemps"); activeTemps = tags.getIntArray("ActiveTemps"); - NBTTagList liquidTag = tags.func_150295_c("Liquids", 9); + NBTTagList liquidTag = tags.getTagList("Liquids", 9); moltenMetal.clear(); for (int iter = 0; iter < liquidTag.tagCount(); iter++) { - NBTTagCompound nbt = (NBTTagCompound) liquidTag.func_150305_b(iter); + NBTTagCompound nbt = (NBTTagCompound) liquidTag.getCompoundTagAt(iter); FluidStack fluid = FluidStack.loadFluidStackFromNBT(nbt); if (fluid != null) moltenMetal.add(fluid); @@ -1095,9 +1095,9 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci } @Override - public void func_145841_b (NBTTagCompound tags) + public void writeToNBT (NBTTagCompound tags) { - super.func_145841_b(tags); + super.writeToNBT(tags); //tags.setBoolean("ValidStructure", validStructure); tags.setInteger("InternalTemp", internalTemp); @@ -1105,7 +1105,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci int[] center = new int[3];// { centerPos.x, centerPos.y, centerPos.z }; if (centerPos == null) - center = new int[] { field_145851_c, field_145848_d, field_145849_e }; + center = new int[] { xCoord, yCoord, zCoord }; else center = new int[] { centerPos.x, centerPos.y, centerPos.z }; tags.setIntArray("CenterPos", center); @@ -1131,19 +1131,19 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci /* Packets */ @Override - public Packet func_145844_m () + public Packet getDescriptionPacket () { NBTTagCompound tag = new NBTTagCompound(); - func_145839_a(tag); - return new S35PacketUpdateTileEntity(field_145851_c, field_145848_d, field_145849_e, 1, tag); + readFromNBT(tag); + return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag); } @Override public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) { - func_145839_a(packet.func_148857_g()); + readFromNBT(packet.func_148857_g()); onInventoryChanged(); - field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e); + worldObj.func_147479_m(xCoord, yCoord, zCoord); this.needsUpdate = true; } @@ -1158,13 +1158,13 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci } @Override - public String func_145825_b () + public String getInventoryName () { return getDefaultName(); } @Override - public boolean func_145818_k_ () + public boolean hasCustomInventoryName () { return true; } diff --git a/src/main/java/tconstruct/blocks/logic/StencilTableLogic.java b/src/main/java/tconstruct/blocks/logic/StencilTableLogic.java index b8cff66f..d7f0459d 100644 --- a/src/main/java/tconstruct/blocks/logic/StencilTableLogic.java +++ b/src/main/java/tconstruct/blocks/logic/StencilTableLogic.java @@ -123,13 +123,13 @@ public class StencilTableLogic extends InventoryLogic implements ISidedInventory } @Override - public String func_145825_b () + public String getInventoryName () { return StatCollector.translateToLocal("toolstation.PatternShaper"); } @Override - public boolean func_145818_k_ () + public boolean hasCustomInventoryName () { return true; } diff --git a/src/main/java/tconstruct/blocks/logic/TankAirLogic.java b/src/main/java/tconstruct/blocks/logic/TankAirLogic.java index 67b02cb3..c34d2af0 100644 --- a/src/main/java/tconstruct/blocks/logic/TankAirLogic.java +++ b/src/main/java/tconstruct/blocks/logic/TankAirLogic.java @@ -28,7 +28,7 @@ public class TankAirLogic extends InventoryLogic implements IServantLogic, ISide public void overrideFluids (ArrayList fluids) { /*multitank.overrideFluids(fluids); - field_145850_b.func_147471_g(field_145851_c, field_145848_d, field_145849_e);*/ + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);*/ } public boolean hasItem () @@ -53,8 +53,8 @@ public class TankAirLogic extends InventoryLogic implements IServantLogic, ISide if (itemstack != null && itemstack.stackSize > getInventoryStackLimit()) { itemstack.stackSize = getInventoryStackLimit(); - field_145850_b.setBlockMetadataWithNotify(field_145851_c, field_145848_d, field_145849_e, itemstack.getItemDamage(), 3); - field_145850_b.func_147471_g(field_145851_c, field_145848_d, field_145849_e); + worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, itemstack.getItemDamage(), 3); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); }*/ } @@ -101,7 +101,7 @@ public class TankAirLogic extends InventoryLogic implements IServantLogic, ISide @Override public void invalidateMaster (IMasterLogic master, World world, int xMaster, int yMaster, int zMaster) { - WorldHelper.setBlockToAir(world, field_145851_c, field_145848_d, field_145849_e); + WorldHelper.setBlockToAir(world, xCoord, yCoord, zCoord); } @Override @@ -131,7 +131,7 @@ public class TankAirLogic extends InventoryLogic implements IServantLogic, ISide //DELETE public void updateEntity () { - WorldHelper.setBlockToAir(field_145850_b,field_145851_c, field_145848_d, field_145849_e); + WorldHelper.setBlockToAir(worldObj,xCoord, yCoord, zCoord); } //Keep TE regardless of metadata @@ -143,9 +143,9 @@ public class TankAirLogic extends InventoryLogic implements IServantLogic, ISide /* NBT */ @Override - public void func_145839_a (NBTTagCompound tags) + public void readFromNBT (NBTTagCompound tags) { - super.func_145839_a(tags); + super.readFromNBT(tags); readNetworkNBT(tags); multitank.readFromNBT(tags); } @@ -157,9 +157,9 @@ public class TankAirLogic extends InventoryLogic implements IServantLogic, ISide } @Override - public void func_145841_b (NBTTagCompound tags) + public void writeToNBT (NBTTagCompound tags) { - super.func_145839_a(tags); + super.readFromNBT(tags); writeNetworkNBT(tags); multitank.writeToNBT(tags); } @@ -174,26 +174,26 @@ public class TankAirLogic extends InventoryLogic implements IServantLogic, ISide public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) { readNetworkNBT(packet.func_148857_g()); - field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e); - field_145850_b.func_147471_g(field_145851_c, field_145848_d, field_145849_e); + worldObj.func_147479_m(xCoord, yCoord, zCoord); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } @Override - public Packet func_145844_m () + public Packet getDescriptionPacket () { NBTTagCompound tag = new NBTTagCompound(); writeNetworkNBT(tag); - return new S35PacketUpdateTileEntity(field_145851_c, field_145848_d, field_145849_e, 1, tag); + return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag); } @Override - public String func_145825_b () + public String getInventoryName () { - return this.func_145825_b(); + return this.getInventoryName(); } @Override - public boolean func_145818_k_ () + public boolean hasCustomInventoryName () { return false; } diff --git a/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java b/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java index 0d1bb26a..832c0970 100644 --- a/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java +++ b/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java @@ -39,9 +39,9 @@ public class TileEntityLandmine extends TileEntity implements IInventory } @Override - public void func_145841_b (NBTTagCompound par1NBTTagCompound) + public void writeToNBT (NBTTagCompound par1NBTTagCompound) { - super.func_145841_b(par1NBTTagCompound); + super.writeToNBT(par1NBTTagCompound); NBTTagList nbttaglist = new NBTTagList(); for (int i = 0; i < this.inventory.length; ++i) @@ -59,22 +59,22 @@ public class TileEntityLandmine extends TileEntity implements IInventory par1NBTTagCompound.setInteger("triggerType", triggerType); - if (this.func_145818_k_()) + if (this.hasCustomInventoryName()) { par1NBTTagCompound.setString("CustomName", this.containerName); } } @Override - public void func_145839_a (NBTTagCompound par1NBTTagCompound) + public void readFromNBT (NBTTagCompound par1NBTTagCompound) { - super.func_145839_a(par1NBTTagCompound); - NBTTagList nbttaglist = par1NBTTagCompound.func_150295_c("Items",9); + super.readFromNBT(par1NBTTagCompound); + NBTTagList nbttaglist = par1NBTTagCompound.getTagList("Items",9); this.inventory = new ItemStack[this.getSizeInventory()]; for (int i = 0; i < nbttaglist.tagCount(); ++i) { - NBTTagCompound nbttagcompound1 = (NBTTagCompound) nbttaglist.func_150305_b(i); + NBTTagCompound nbttagcompound1 = (NBTTagCompound) nbttaglist.getCompoundTagAt(i); byte b0 = nbttagcompound1.getByte("Slot"); if (b0 >= 0 && b0 < this.inventory.length) @@ -92,17 +92,17 @@ public class TileEntityLandmine extends TileEntity implements IInventory } @Override - public Packet func_145844_m () + public Packet getDescriptionPacket () { NBTTagCompound nbt = new NBTTagCompound(); - func_145841_b(nbt); - return new S35PacketUpdateTileEntity(field_145851_c, field_145848_d, field_145849_e, 0, nbt); + writeToNBT(nbt); + return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 0, nbt); } @Override public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) { - func_145839_a(packet.func_148857_g()); + readFromNBT(packet.func_148857_g()); } @Override @@ -181,13 +181,13 @@ public class TileEntityLandmine extends TileEntity implements IInventory } @Override - public String func_145825_b () + public String getInventoryName () { - return this.func_145818_k_() ? this.containerName : "Landmine"; + return this.hasCustomInventoryName() ? this.containerName : "Landmine"; } @Override - public boolean func_145818_k_ () + public boolean hasCustomInventoryName () { return containerName != null && containerName.length() > 0; } @@ -206,8 +206,8 @@ public class TileEntityLandmine extends TileEntity implements IInventory @Override public boolean isUseableByPlayer (EntityPlayer par1EntityPlayer) { - return this.field_145850_b.func_147438_o(this.field_145851_c, this.field_145848_d, this.field_145849_e) != this ? false : par1EntityPlayer.getDistanceSq((double) this.field_145851_c + 0.5D, (double) this.field_145848_d + 0.5D, - (double) this.field_145849_e + 0.5D) <= 64.0D; + return this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false : par1EntityPlayer.getDistanceSq((double) this.xCoord + 0.5D, (double) this.yCoord + 0.5D, + (double) this.zCoord + 0.5D) <= 64.0D; } @Override @@ -224,7 +224,7 @@ public class TileEntityLandmine extends TileEntity implements IInventory public void onInventoryChanged () { super.onInventoryChanged(); - this.field_145850_b.func_147471_g(field_145851_c, field_145848_d, field_145849_e); + this.worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } @Override @@ -250,11 +250,11 @@ public class TileEntityLandmine extends TileEntity implements IInventory } @Override - public void func_145845_h () + public void updateEntity () { if (shouldUpdateLogic) { - field_145850_b.func_147479_m(field_145851_c, field_145848_d, field_145849_e); + worldObj.func_147479_m(xCoord, yCoord, zCoord); shouldUpdateLogic = false; } if (soundcountything > 0) diff --git a/src/main/java/tconstruct/blocks/logic/ToolStationLogic.java b/src/main/java/tconstruct/blocks/logic/ToolStationLogic.java index b63e68f6..ebb12485 100644 --- a/src/main/java/tconstruct/blocks/logic/ToolStationLogic.java +++ b/src/main/java/tconstruct/blocks/logic/ToolStationLogic.java @@ -60,8 +60,8 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory buildTool(toolName); if (this.getWorld() != null) { - this.field_145847_g = this.getWorld().getBlockMetadata(this.field_145851_c, this.field_145848_d, this.field_145849_e); - this.getWorld().func_147476_b(this.field_145851_c, this.field_145848_d, this.field_145849_e, this); + this.blockMetadata = this.getWorld().getBlockMetadata(this.xCoord, this.yCoord, this.zCoord); + this.getWorld().markTileEntityChunkModified(this.xCoord, this.yCoord, this.zCoord, this); } } @@ -111,13 +111,13 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory } @Override - public String func_145825_b () + public String getInventoryName () { return getDefaultName(); } @Override - public boolean func_145818_k_ () + public boolean hasCustomInventoryName () { return true; } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeFluid.java b/src/main/java/tconstruct/blocks/slime/SlimeFluid.java index 2df13a5b..710a37bf 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeFluid.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeFluid.java @@ -27,7 +27,7 @@ public class SlimeFluid extends BlockFluidClassic @Override @SideOnly(Side.CLIENT) - public void func_149651_a (IIconRegister iconRegister) + public void registerBlockIcons (IIconRegister iconRegister) { stillIcon = iconRegister.registerIcon("tinker:slime_blue"); flowIcon = iconRegister.registerIcon("tinker:slime_blue_flow"); @@ -35,16 +35,16 @@ public class SlimeFluid extends BlockFluidClassic @Override @SideOnly(Side.CLIENT) - public IIcon func_149691_a (int side, int meta) + public IIcon getIcon (int side, int meta) { if (side == 0 || side == 1) return stillIcon; return flowIcon; } - public void func_149674_a (World world, int x, int y, int z, Random rand) + public void updateTick (World world, int x, int y, int z, Random rand) { - super.func_149674_a(world, x, y, z, rand); + super.updateTick(world, x, y, z, rand); if (rand.nextInt(100) == 0 && world.getBlockMetadata(x, y, z) == 0 && world.checkNoEntityCollision(AxisAlignedBB.getBoundingBox(x - 1, y - 1, z - 1, x + 2, y + 2, z + 2))) { BlueSlime entityslime = new BlueSlime(world); diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGel.java b/src/main/java/tconstruct/blocks/slime/SlimeGel.java index ad4372dc..5010aff8 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGel.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGel.java @@ -21,8 +21,8 @@ public class SlimeGel extends TConstructBlock { public SlimeGel() { - super(Material.field_151583_m, 0.5f, new String[] { "slimeblock_blue", "slimeblock_green", "slimeblock_purple" }); - func_149647_a(TConstructRegistry.blockTab); + super(Material.sponge, 0.5f, new String[] { "slimeblock_blue", "slimeblock_green", "slimeblock_purple" }); + setCreativeTab(TConstructRegistry.blockTab); } public boolean getEnableStats () @@ -41,14 +41,14 @@ public class SlimeGel extends TConstructBlock } @Override - public void func_149670_a (World world, int x, int y, int z, Entity entity) + public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity) { if (entity.motionY < 0) { if (entity.motionY < -0.08F) { Block var9 = (Block) this; - world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, var9.field_149762_H.field_150501_a, (var9.field_149762_H.func_150497_c()) / 2.0F, var9.field_149762_H.func_150494_d() * 0.65F); + world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, var9.stepSound.soundName, (var9.stepSound.getVolume()) / 2.0F, var9.stepSound.getPitch() * 0.65F); } entity.motionY *= -1.2F; if (entity instanceof EntityLivingBase) @@ -60,7 +60,7 @@ public class SlimeGel extends TConstructBlock } @Override - public AxisAlignedBB func_149668_a (World world, int x, int y, int z) + public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z) { return AxisAlignedBB.getBoundingBox(x, y, z, (double) x + 1.0D, (double) y + 0.625D, (double) z + 1.0D); } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java index 245f777d..fb1173a5 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java @@ -30,14 +30,14 @@ public class SlimeGrass extends MantleBlock public SlimeGrass() { - super(Material.field_151577_b); - func_149711_c(0.6f); - this.func_149675_a(true); - this.func_149647_a(TConstructRegistry.blockTab); + super(Material.grass); + setHardness(0.6f); + this.setTickRandomly(true); + this.setCreativeTab(TConstructRegistry.blockTab); } @Override - public int func_149692_a (int meta) + public int damageDropped (int meta) { if (meta == 1) //dirt return 0; @@ -49,7 +49,7 @@ public class SlimeGrass extends MantleBlock @Override @SideOnly(Side.CLIENT) - public void func_149651_a (IIconRegister iconRegister) + public void registerBlockIcons (IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; @@ -61,14 +61,14 @@ public class SlimeGrass extends MantleBlock @Override @SideOnly(Side.CLIENT) - public IIcon func_149691_a (int side, int meta) + public IIcon getIcon (int side, int meta) { if (meta >= 2) meta = 0; if (side == 0) { - return meta % 2 == 1 ? Blocks.dirt.func_149691_a(0, 0) : icons[1]; + return meta % 2 == 1 ? Blocks.dirt.getIcon(0, 0) : icons[1]; } else if (side == 1) { @@ -81,7 +81,7 @@ public class SlimeGrass extends MantleBlock } @Override - public void func_149666_a (Item b, CreativeTabs tab, List list) + public void getSubBlocks (Item b, CreativeTabs tab, List list) { for (int iter = 0; iter < 1; iter++) { @@ -98,7 +98,7 @@ public class SlimeGrass extends MantleBlock public void onPlantGrow (World world, int x, int y, int z, int sourceX, int sourceY, int sourceZ) { - world.func_147465_d(x, y, z, TRepo.craftedSoil, 5, 3); + world.setBlock(x, y, z, TRepo.craftedSoil, 5, 3); } public void updateTick (World par1World, int par2, int par3, int par4, Random par5Random) @@ -107,7 +107,7 @@ public class SlimeGrass extends MantleBlock { if (par1World.getBlockLightValue(par2, par3 + 1, par4) < 4 && par1World.getBlockLightOpacity(par2, par3 + 1, par4) > 2) { - par1World.func_147465_d(par2, par3, par4, TRepo.craftedSoil, 5, 3); + par1World.setBlock(par2, par3, par4, TRepo.craftedSoil, 5, 3); } else if (par1World.getBlockLightValue(par2, par3 + 1, par4) >= 9) { @@ -116,21 +116,21 @@ public class SlimeGrass extends MantleBlock int posX = par2 + par5Random.nextInt(3) - 1; int posY = par3 + par5Random.nextInt(5) - 3; int posZ = par4 + par5Random.nextInt(3) - 1; - Block l1 = par1World.func_147439_a(posX, posY + 1, posZ); + Block l1 = par1World.getBlock(posX, posY + 1, posZ); if (par1World.getBlockLightValue(posX, posY + 1, posZ) >= 4 && par1World.getBlockLightOpacity(posX, posY + 1, posZ) <= 2) { - Block block = par1World.func_147439_a(posX, posY, posZ); + Block block = par1World.getBlock(posX, posY, posZ); if (block == Blocks.dirt) { - par1World.func_147465_d(posX, posY, posZ,(Block) this, 1, 3); + par1World.setBlock(posX, posY, posZ,(Block) this, 1, 3); return; } int blockMeta = par1World.getBlockMetadata(posX, posY, posZ); if (block == TRepo.craftedSoil) { if (blockMeta == 5) - par1World.func_147465_d(posX, posY, posZ, (Block) this, 0, 3); + par1World.setBlock(posX, posY, posZ, (Block) this, 0, 3); } } } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java b/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java index 6b99ca12..68694226 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java @@ -28,9 +28,9 @@ public class SlimeLeaves extends BlockLeaves public SlimeLeaves() { super(); - func_149647_a(TConstructRegistry.blockTab); - func_149713_g(1); - this.func_149711_c(0.3f); + setCreativeTab(TConstructRegistry.blockTab); + setLightOpacity(1); + this.setHardness(0.3f); } @SideOnly(Side.CLIENT) @@ -53,7 +53,7 @@ public class SlimeLeaves extends BlockLeaves @SideOnly(Side.CLIENT) @Override - public void func_149651_a (IIconRegister iconRegister) + public void registerBlockIcons (IIconRegister iconRegister) { this.fastIcons = new IIcon[fastLeaves.length]; this.fancyIcons = new IIcon[fancyLeaves.length]; @@ -67,7 +67,7 @@ public class SlimeLeaves extends BlockLeaves @Override @SideOnly(Side.CLIENT) - public IIcon func_149691_a (int side, int meta) + public IIcon getIcon (int side, int meta) { int tex = meta % 4; @@ -78,7 +78,7 @@ public class SlimeLeaves extends BlockLeaves } @Override - public void func_149666_a (Item b, CreativeTabs tab, List list) + public void getSubBlocks (Item b, CreativeTabs tab, List list) { for (int iter = 0; iter < fastIcons.length; iter++) { @@ -97,7 +97,7 @@ public class SlimeLeaves extends BlockLeaves /** * Returns the ID of the items to drop on destruction. */ - public Item func_149650_a (int par1, Random par2Random, int par3) + public Item getItemDropped (int par1, Random par2Random, int par3) { return new ItemStack(TRepo.slimeSapling).getItem(); } @@ -128,8 +128,8 @@ public class SlimeLeaves extends BlockLeaves if (world.rand.nextInt(dropChance) == 0) { - Item k1 = this.func_149650_a(meta, world.rand, fortune); - this.func_149642_a(world, x, y, z, new ItemStack(k1, 1, this.func_149692_a(meta))); + Item k1 = this.getItemDropped(meta, world.rand, fortune); + this.dropBlockAsItem(world, x, y, z, new ItemStack(k1, 1, this.damageDropped(meta))); } dropChance = 80; @@ -146,7 +146,7 @@ public class SlimeLeaves extends BlockLeaves if ((meta & 3) == 0 && world.rand.nextInt(dropChance) == 0) { - this.func_149642_a(world, x, y, z, new ItemStack(TRepo.strangeFood, 1, 0)); + this.dropBlockAsItem(world, x, y, z, new ItemStack(TRepo.strangeFood, 1, 0)); } } } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java index 83c5d73c..c21de5c4 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java @@ -30,15 +30,15 @@ public class SlimeSapling extends BlockSapling { super(); float f = 0.4F; - func_149676_a(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, f * 2.0F, 0.5F + f); - this.func_149711_c(0.0F); - this.field_149762_H = Block.field_149779_h; - this.func_149647_a(TConstructRegistry.blockTab); + setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, f * 2.0F, 0.5F + f); + this.setHardness(0.0F); + this.stepSound = Block.soundTypeGrass; + this.setCreativeTab(TConstructRegistry.blockTab); } @Override @SideOnly(Side.CLIENT) - public void func_149651_a (IIconRegister iconRegister) + public void registerBlockIcons (IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; @@ -53,13 +53,13 @@ public class SlimeSapling extends BlockSapling return b == Blocks.grass || b == Blocks.dirt || b == TRepo.slimeGrass || b == TRepo.craftedSoil; } - public void func_149674_a (World world, int x, int y, int z, Random random) + public void updateTick (World world, int x, int y, int z, Random random) { if (world.isRemote) { return; } - super.func_149674_a(world, x, y, z, random); + super.updateTick(world, x, y, z, random); int md = world.getBlockMetadata(x, y, z); if (random.nextInt(10) == 0 && world.getBlockLightValue(x, y + 1, z) >= 9) { @@ -73,7 +73,7 @@ public class SlimeSapling extends BlockSapling @Override @SideOnly(Side.CLIENT) - public IIcon func_149691_a (int side, int meta) + public IIcon getIcon (int side, int meta) { return icons[meta % 8]; } @@ -106,13 +106,13 @@ public class SlimeSapling extends BlockSapling public void growTree (World world, int x, int y, int z, Random random) { int md = world.getBlockMetadata(x, y, z) % 8; - world.func_147449_b(x, y, z, Blocks.air); + world.setBlock(x, y, z, Blocks.air); WorldGenerator obj = null; obj = new SlimeTreeGen(true, 5, 4, 1, 0); if (!(obj.generate(world, random, x, y, z))) - world.func_147465_d(x, y, z, Blocks.air, md + 8, 3); + world.setBlock(x, y, z, Blocks.air, md + 8, 3); } public int damageDropped (int i) @@ -122,7 +122,7 @@ public class SlimeSapling extends BlockSapling @SideOnly(Side.CLIENT) @Override - public void func_149666_a (Item 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/slime/SlimeTallGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java index e9242cf8..d2a5c6a8 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java @@ -28,17 +28,17 @@ public class SlimeTallGrass extends BlockBush implements IShearable public SlimeTallGrass() { - super(Material.field_151582_l); + super(Material.vine); float f = 0.4F; - this.func_149676_a(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.8F, 0.5F + f); - func_149647_a(TConstructRegistry.blockTab); + this.setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.8F, 0.5F + f); + setCreativeTab(TConstructRegistry.blockTab); } @SideOnly(Side.CLIENT) /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public IIcon func_149691_a (int side, int meta) + public IIcon getIcon (int side, int meta) { /*if (meta >= this.iconArray.length) { @@ -89,7 +89,7 @@ public class SlimeTallGrass extends BlockBush implements IShearable * When this method is called, your block should register all the icons it needs with the given IconRegister. This * is the only chance you get to register icons. */ - public void func_149651_a (IIconRegister par1IconRegister) + public void registerBlockIcons (IIconRegister par1IconRegister) { this.iconArray = new IIcon[grassTypes.length]; diff --git a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java index fdef7104..73171988 100644 --- a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java +++ b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java @@ -25,20 +25,20 @@ public class BarricadeBlock extends MantleBlock public BarricadeBlock(Block model, int meta) { - super(Material.field_151575_d); + super(Material.wood); this.modelBlock = model; this.modelMeta = meta; - func_149711_c(4.0F); - this.func_149647_a(TConstructRegistry.blockTab); + setHardness(4.0F); + this.setCreativeTab(TConstructRegistry.blockTab); } - public IIcon func_149691_a (int side, int meta) + public IIcon getIcon (int side, int meta) { - return modelBlock.func_149691_a(2, modelMeta); + return modelBlock.getIcon(2, modelMeta); } @Override - public void func_149651_a (IIconRegister par1IconRegister) + public void registerBlockIcons (IIconRegister par1IconRegister) { } @@ -63,26 +63,26 @@ public class BarricadeBlock extends MantleBlock return AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1); } - public void func_147465_dBoundsBasedOnState (IBlockAccess par1IBlockAccess, int x, int y, int z) + public void setBlockBoundsBasedOnState (IBlockAccess par1IBlockAccess, int x, int y, int z) { - func_149676_a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); } public void harvestBlock (World world, EntityPlayer player, int x, int y, int z, int meta) { if (meta % 4 > 0) { - world.func_147465_d(x, y, z, this, meta - 1, 3); - func_149642_a(world, x, y, z, new ItemStack(this)); + world.setBlock(x, y, z, this, meta - 1, 3); + dropBlockAsItem(world, x, y, z, new ItemStack(this)); } else { - func_149642_a(world, x, y, z, new ItemStack(this)); + dropBlockAsItem(world, x, y, z, new ItemStack(this)); } } @Override - public boolean func_149727_a (World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) + public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { ItemStack stack = player.getCurrentEquippedItem(); if ((stack != null) && (ComparisonHelper.areEquivalent(stack.getItem(), this)) && (!player.isSneaking())) @@ -90,12 +90,12 @@ public class BarricadeBlock extends MantleBlock int meta = world.getBlockMetadata(x, y, z); if (meta % 4 != 3) { - world.func_147465_d(x, y, z, this, meta + 1, 3); - this.func_149689_a(world, x, y, z, player, stack); - this.func_149714_e(world, x, y, z, meta); + world.setBlock(x, y, z, this, meta + 1, 3); + this.onBlockPlacedBy(world, x, y, z, player, stack); + this.onPostBlockPlaced(world, x, y, z, meta); Block var9 = this; - world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, var9.field_149762_H.field_150501_a, (var9.field_149762_H.func_150497_c() + 1.0F) / 2.0F, var9.field_149762_H.func_150494_d() * 0.8F); + world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, var9.stepSound.soundName, (var9.stepSound.getVolume() + 1.0F) / 2.0F, var9.stepSound.getPitch() * 0.8F); player.swingItem(); if (!player.capabilities.isCreativeMode) stack.stackSize -= 1; @@ -116,15 +116,15 @@ public class BarricadeBlock extends MantleBlock int trueMeta = meta % 4; trueMeta -= power; if (trueMeta < 0) - world.func_147465_d(x, y, z, Blocks.air, 0, 0); + world.setBlock(x, y, z, Blocks.air, 0, 0); else world.setBlockMetadataWithNotify(x, y, z, (int) (meta - power), 3); - func_149723_a(world, x, y, z, explosion); + onBlockDestroyedByExplosion(world, x, y, z, explosion); } @Override @SideOnly(Side.CLIENT) - public boolean func_149646_a (IBlockAccess world, int x, int y, int z, int side) + public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side) { return true; } diff --git a/src/main/java/tconstruct/blocks/traps/Landmine.java b/src/main/java/tconstruct/blocks/traps/Landmine.java index 8ba2bc0e..522bf3e4 100644 --- a/src/main/java/tconstruct/blocks/traps/Landmine.java +++ b/src/main/java/tconstruct/blocks/traps/Landmine.java @@ -30,28 +30,28 @@ public class Landmine extends MantleBlock { super(par4Material); this.triggerMobType = EnumCreatureType.monster; - this.func_149647_a(TConstructRegistry.blockTab); - this.func_149675_a(true); + this.setCreativeTab(TConstructRegistry.blockTab); + this.setTickRandomly(true); float var5 = 0.0625F; - this.func_149676_a(var5, 0.0F, var5, 1.0F - var5, 0.03125F, 1.0F - var5); + this.setBlockBounds(var5, 0.0F, var5, 1.0F - var5, 0.03125F, 1.0F - var5); } - public IIcon func_149673_e (IBlockAccess world, int x, int y, int z, int side) + public IIcon getIcon (IBlockAccess world, int x, int y, int z, int side) { - Block block = world.func_147439_a(x, y - 1, z); + Block block = world.getBlock(x, y - 1, z); if (block != null) { - return block.func_149673_e(world, x, y - 1, z, side); + return block.getIcon(world, x, y - 1, z, side); } - return Blocks.sponge.func_149691_a(side, world.getBlockMetadata(x, y, z)); + return Blocks.sponge.getIcon(side, world.getBlockMetadata(x, y, z)); } - public IIcon func_149691_a (int side, int meta) + public IIcon getIcon (int side, int meta) { - return Blocks.sponge.func_149691_a(1, meta); + return Blocks.sponge.getIcon(1, meta); } - public void func_149651_a (IIconRegister par1IconRegister) + public void registerBlockIcons (IIconRegister par1IconRegister) { } @@ -100,7 +100,7 @@ public class Landmine extends MantleBlock */ public boolean canPlaceBlockAt (World par1World, int par2, int par3, int par4) { - return par1World.func_147466_a(par1World, par2, par3 - 1, par4) || BlockFence.func_149825_a(par1World.func_147439_a(par2, par3 - 1, par4)); + return par1World.doesBlockHaveSolidTopSurface(par1World, par2, par3 - 1, par4) || BlockFence.func_149825_a(par1World.getBlock(par2, par3 - 1, par4)); } /** @@ -111,14 +111,14 @@ public class Landmine extends MantleBlock { boolean var6 = false; - if (!par1World.func_147466_a(par1World, par2, par3 - 1, par4) && !BlockFence.func_149825_a(par1World.func_147439_a(par2, par3 - 1, par4))) + if (!par1World.doesBlockHaveSolidTopSurface(par1World, par2, par3 - 1, par4) && !BlockFence.func_149825_a(par1World.getBlock(par2, par3 - 1, par4))) { var6 = true; } if (var6) { - this.func_149697_b(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); + this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); //par1World.setBlock(par2, par3, par4, 0); } } @@ -193,7 +193,7 @@ public class Landmine extends MantleBlock { Entity var10 = (Entity) var9.next(); - if (!var10.func_145773_az()) + if (!var10.doesEntityNotTriggerPressurePlate()) { var6 = true; break; @@ -234,11 +234,11 @@ public class Landmine extends MantleBlock { if (par6 > 0) { - par1World.func_147459_d(par2, par3, par4, this); - par1World.func_147459_d(par2, par3 - 1, par4, this); + par1World.notifyBlocksOfNeighborChange(par2, par3, par4, this); + par1World.notifyBlocksOfNeighborChange(par2, par3 - 1, par4, this); } - super.func_149749_a(par1World, par2, par3, par4, par5, par6); + super.breakBlock(par1World, par2, par3, par4, par5, par6); } /** @@ -251,11 +251,11 @@ public class Landmine extends MantleBlock if (var5) { - this.func_149676_a(var6, 0.0F, var6, 1.0F - var6, 0.03125F, 1.0F - var6); + this.setBlockBounds(var6, 0.0F, var6, 1.0F - var6, 0.03125F, 1.0F - var6); } else { - this.func_149676_a(var6, 0.0F, var6, 1.0F - var6, 0.0625F, 1.0F - var6); + this.setBlockBounds(var6, 0.0F, var6, 1.0F - var6, 0.0625F, 1.0F - var6); } } @@ -267,7 +267,7 @@ public class Landmine extends MantleBlock float var1 = 0.5F; float var2 = 0.125F; float var3 = 0.5F; - this.func_149676_a(0.5F - var1, 0.5F - var2, 0.5F - var3, 0.5F + var1, 0.5F + var2, 0.5F + var3); + this.setBlockBounds(0.5F - var1, 0.5F - var2, 0.5F - var3, 0.5F + var1, 0.5F + var2, 0.5F + var3); } /** diff --git a/src/main/java/tconstruct/blocks/traps/Punji.java b/src/main/java/tconstruct/blocks/traps/Punji.java index 9dc7582d..d2e64f00 100644 --- a/src/main/java/tconstruct/blocks/traps/Punji.java +++ b/src/main/java/tconstruct/blocks/traps/Punji.java @@ -26,15 +26,15 @@ public class Punji extends MantleBlock public Punji() { - super(Material.field_151585_k); - this.func_149676_a(0.125f, 0, 0.125f, 0.875f, 0.375f, 0.875f); - this.field_149762_H = Block.field_149779_h; - this.func_149647_a(TConstructRegistry.blockTab); - this.func_149711_c(3.0f); + super(Material.plants); + this.setBlockBounds(0.125f, 0, 0.125f, 0.875f, 0.375f, 0.875f); + this.stepSound = Block.soundTypeGrass; + this.setCreativeTab(TConstructRegistry.blockTab); + this.setHardness(3.0f); } @Override - public void func_149670_a (World world, int x, int y, int z, Entity entity) + public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity) { if (entity instanceof EntityLivingBase) { @@ -48,7 +48,7 @@ public class Punji extends MantleBlock /* Right-click adds sticks */ @Override - public boolean func_149727_a (World world, int x, int y, int z, EntityPlayer player, int par6, float hitX, float hitY, float hitZ) + public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int par6, float hitX, float hitY, float hitZ) { /*if (world.isRemote) return false;*/ @@ -60,8 +60,8 @@ public class Punji extends MantleBlock 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.field_149762_H.field_150501_a, - (this.field_149762_H.func_150497_c() + 1.0F) / 2.0F, this.field_149762_H.func_150494_d() * 0.8F); + world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.stepSound.soundName, + (this.stepSound.getVolume() + 1.0F) / 2.0F, this.stepSound.getPitch() * 0.8F); player.swingItem(); if (!player.capabilities.isCreativeMode) { @@ -104,14 +104,14 @@ public class Punji extends MantleBlock @Override @SideOnly(Side.CLIENT) - public void func_149651_a (IIconRegister iconRegister) + public void registerBlockIcons (IIconRegister iconRegister) { - this.field_149761_L = iconRegister.registerIcon("tinker:punji"); + this.blockIcon = iconRegister.registerIcon("tinker:punji"); } @Override @SideOnly(Side.CLIENT) - public boolean func_149646_a (IBlockAccess world, int x, int y, int z, int side) + public boolean shouldSideBeRendered (IBlockAccess world, int x, int y, int z, int side) { return true; } diff --git a/src/main/java/tconstruct/client/StepSoundSlime.java b/src/main/java/tconstruct/client/StepSoundSlime.java index a9597321..44593916 100644 --- a/src/main/java/tconstruct/client/StepSoundSlime.java +++ b/src/main/java/tconstruct/client/StepSoundSlime.java @@ -16,7 +16,7 @@ public class StepSoundSlime extends SoundType */ public String getBreakSound () { - return this.field_150501_a + ".big"; + return this.soundName + ".big"; } /** @@ -24,7 +24,7 @@ public class StepSoundSlime extends SoundType */ public String getStepSound () { - return this.field_150501_a + ".small"; + return this.soundName + ".small"; } } diff --git a/src/main/java/tconstruct/client/TClientEvents.java b/src/main/java/tconstruct/client/TClientEvents.java index 42a6c6f5..31a61ab6 100644 --- a/src/main/java/tconstruct/client/TClientEvents.java +++ b/src/main/java/tconstruct/client/TClientEvents.java @@ -86,7 +86,7 @@ public class TClientEvents { for (int i = 0; i < TRepo.fluidBlocks.length; i++) { - TRepo.fluids[i].setIcons(TRepo.fluidBlocks[i].func_149691_a(0, 0), TRepo.fluidBlocks[i].func_149691_a(2, 0)); + TRepo.fluids[i].setIcons(TRepo.fluidBlocks[i].getIcon(0, 0), TRepo.fluidBlocks[i].getIcon(2, 0)); } TRepo.pigIronFluid.setIcons(stillIcons[0], flowIcons[0]); } diff --git a/src/main/java/tconstruct/client/TClientTickHandler.java b/src/main/java/tconstruct/client/TClientTickHandler.java index 28f154fd..c7b3e845 100644 --- a/src/main/java/tconstruct/client/TClientTickHandler.java +++ b/src/main/java/tconstruct/client/TClientTickHandler.java @@ -30,9 +30,9 @@ public class TClientTickHandler if (event.phase.equals(Phase.END) && event.type.equals(Type.RENDER)) { - TRepo.oreBerry.func_150122_b(Blocks.leaves.field_150121_P); - TRepo.oreBerrySecond.func_150122_b(Blocks.leaves.field_150121_P); - TRepo.slimeLeaves.func_150122_b(Blocks.leaves.field_150121_P); + TRepo.oreBerry.setGraphicsLevel(Blocks.leaves.field_150121_P); + TRepo.oreBerrySecond.setGraphicsLevel(Blocks.leaves.field_150121_P); + TRepo.slimeLeaves.setGraphicsLevel(Blocks.leaves.field_150121_P); /*if (mc.thePlayer != null && !mc.thePlayer.isAirBorne) controlInstance.landOnGround();*/ } diff --git a/src/main/java/tconstruct/client/TControls.java b/src/main/java/tconstruct/client/TControls.java index 5f46d1b3..b50c1aac 100644 --- a/src/main/java/tconstruct/client/TControls.java +++ b/src/main/java/tconstruct/client/TControls.java @@ -42,7 +42,7 @@ public class TControls extends TKeyHandler { mc = Minecraft.getMinecraft(); jumpKey = mc.gameSettings.keyBindJump; - invKey = mc.gameSettings.field_151445_Q; + invKey = mc.gameSettings.keyBindInventory; return new KeyBinding[] { jumpKey, invKey }; } diff --git a/src/main/java/tconstruct/client/TKeyHandler.java b/src/main/java/tconstruct/client/TKeyHandler.java index 7d2d5a16..9ea091de 100644 --- a/src/main/java/tconstruct/client/TKeyHandler.java +++ b/src/main/java/tconstruct/client/TKeyHandler.java @@ -74,7 +74,7 @@ public abstract class TKeyHandler for (int i = 0; i < keyBindings.length; i++) { KeyBinding keyBinding = keyBindings[i]; - int keyCode = keyBinding.func_151463_i(); + int keyCode = keyBinding.getKeyCode(); boolean state = (keyCode < 0 ? Mouse.isButtonDown(keyCode + 100) : Keyboard.isKeyDown(keyCode)); if (state != keyDown[i] || (state && repeatings[i])) { @@ -95,7 +95,7 @@ public abstract class TKeyHandler for (int i = 0; i < vKeyBindings.length; i++) { KeyBinding keyBinding = vKeyBindings[i]; - int keyCode = keyBinding.func_151463_i(); + int keyCode = keyBinding.getKeyCode(); boolean state = (keyCode < 0 ? Mouse.isButtonDown(keyCode + 100) : Keyboard.isKeyDown(keyCode)); if (state != keyDown[i + keyBindings.length] || (state && vRepeatings[i])) { diff --git a/src/main/java/tconstruct/client/TProxyClient.java b/src/main/java/tconstruct/client/TProxyClient.java index bbbf92a2..1b30ca6a 100644 --- a/src/main/java/tconstruct/client/TProxyClient.java +++ b/src/main/java/tconstruct/client/TProxyClient.java @@ -75,31 +75,31 @@ public class TProxyClient extends TProxyCommon public Object getClientGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z) { if (ID == toolStationID) - return new ToolStationGui(player.inventory, (ToolStationLogic) world.func_147438_o(x, y, z), world, x, y, z); + return new ToolStationGui(player.inventory, (ToolStationLogic) world.getTileEntity(x, y, z), world, x, y, z); if (ID == partBuilderID) - return new PartCrafterGui(player.inventory, (PartBuilderLogic) world.func_147438_o(x, y, z), world, x, y, z); + return new PartCrafterGui(player.inventory, (PartBuilderLogic) world.getTileEntity(x, y, z), world, x, y, z); if (ID == patternChestID) - return new PatternChestGui(player.inventory, (PatternChestLogic) world.func_147438_o(x, y, z), world, x, y, z); + return new PatternChestGui(player.inventory, (PatternChestLogic) world.getTileEntity(x, y, z), world, x, y, z); if (ID == frypanGuiID) - return new FrypanGui(player.inventory, (FrypanLogic) world.func_147438_o(x, y, z), world, x, y, z); + return new FrypanGui(player.inventory, (FrypanLogic) world.getTileEntity(x, y, z), world, x, y, z); if (ID == smelteryGuiID) { if (PHConstruct.newSmeltery) - return new AdaptiveSmelteryGui(player.inventory, (AdaptiveSmelteryLogic) world.func_147438_o(x, y, z), world, x, y, z); + return new AdaptiveSmelteryGui(player.inventory, (AdaptiveSmelteryLogic) world.getTileEntity(x, y, z), world, x, y, z); else - return new SmelteryGui(player.inventory, (SmelteryLogic) world.func_147438_o(x, y, z), world, x, y, z); + return new SmelteryGui(player.inventory, (SmelteryLogic) world.getTileEntity(x, y, z), world, x, y, z); } if (ID == stencilTableID) - return new StencilTableGui(player.inventory, (StencilTableLogic) world.func_147438_o(x, y, z), world, x, y, z); + return new StencilTableGui(player.inventory, (StencilTableLogic) world.getTileEntity(x, y, z), world, x, y, z); if (ID == toolForgeID) - return new ToolForgeGui(player.inventory, (ToolForgeLogic) world.func_147438_o(x, y, z), world, x, y, z); + return new ToolForgeGui(player.inventory, (ToolForgeLogic) world.getTileEntity(x, y, z), world, x, y, z); if (ID == landmineID) - return new GuiLandmine(new ContainerLandmine(player, (TileEntityLandmine) world.func_147438_o(x, y, z))); + return new GuiLandmine(new ContainerLandmine(player, (TileEntityLandmine) world.getTileEntity(x, y, z))); if (ID == craftingStationID) - return new CraftingStationGui(player.inventory, (CraftingStationLogic) world.func_147438_o(x, y, z), world, x, y, z); + return new CraftingStationGui(player.inventory, (CraftingStationLogic) world.getTileEntity(x, y, z), world, x, y, z); if (ID == furnaceID) - return new FurnaceGui(player.inventory, (FurnaceLogic) world.func_147438_o(x, y, z)); + return new FurnaceGui(player.inventory, (FurnaceLogic) world.getTileEntity(x, y, z)); if (ID == inventoryGui) { @@ -126,27 +126,27 @@ public class TProxyClient extends TProxyCommon GL11.glTranslatef(-0.5F, -0.5F, -0.5F); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, -1F, 0.0F); - renderblocks.func_147768_a(block, 0.0D, 0.0D, 0.0D, getIcon(block.func_149691_a(0, meta))); + renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, getIcon(block.getIcon(0, meta))); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderblocks.func_147806_b(block, 0.0D, 0.0D, 0.0D, getIcon(block.func_149691_a(1, meta)));//block.func_149691_a(1, meta)); + renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, getIcon(block.getIcon(1, meta)));//block.getIcon(1, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1F); - renderblocks.func_147761_c(block, 0.0D, 0.0D, 0.0D, getIcon(block.func_149691_a(2, meta))); + renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, getIcon(block.getIcon(2, meta))); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderblocks.func_147734_d(block, 0.0D, 0.0D, 0.0D, getIcon(block.func_149691_a(3, meta))); + renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, getIcon(block.getIcon(3, meta))); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1F, 0.0F, 0.0F); - renderblocks.func_147798_e(block, 0.0D, 0.0D, 0.0D, getIcon(block.func_149691_a(4, meta))); + renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, getIcon(block.getIcon(4, meta))); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderblocks.func_147764_f(block, 0.0D, 0.0D, 0.0D, getIcon(block.func_149691_a(5, meta))); + renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, getIcon(block.getIcon(5, meta))); tessellator.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } @@ -160,27 +160,27 @@ public class TProxyClient extends TProxyCommon GL11.glRotatef(60, 1, 0, 0); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, -1F, 0.0F); - renderblocks.func_147768_a(block, 0.0D, 0.0D, 0.0D, getIcon(block.func_149691_a(0, meta))); + renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, getIcon(block.getIcon(0, meta))); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderblocks.func_147806_b(block, 0.0D, 0.0D, 0.0D, getIcon(block.func_149691_a(1, meta))); + renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, getIcon(block.getIcon(1, meta))); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1F); - renderblocks.func_147761_c(block, 0.0D, 0.0D, 0.0D, getIcon(block.func_149691_a(2, meta))); + renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, getIcon(block.getIcon(2, meta))); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderblocks.func_147734_d(block, 0.0D, 0.0D, 0.0D, getIcon(block.func_149691_a(3, meta))); + renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, getIcon(block.getIcon(3, meta))); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1F, 0.0F, 0.0F); - renderblocks.func_147798_e(block, 0.0D, 0.0D, 0.0D, getIcon(block.func_149691_a(4, meta))); + renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, getIcon(block.getIcon(4, meta))); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderblocks.func_147764_f(block, 0.0D, 0.0D, 0.0D, getIcon(block.func_149691_a(5, meta))); + renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, getIcon(block.getIcon(5, meta))); tessellator.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } @@ -896,11 +896,11 @@ public class TProxyClient extends TProxyCommon } else if (par1Str.equals("dripWater")) { - entityfx = new EntityDropParticleFX(mc.theWorld, par2, par4, par6, Material.field_151586_h); + entityfx = new EntityDropParticleFX(mc.theWorld, par2, par4, par6, Material.water); } else if (par1Str.equals("dripLava")) { - entityfx = new EntityDropParticleFX(mc.theWorld, par2, par4, par6, Material.field_151587_i); + entityfx = new EntityDropParticleFX(mc.theWorld, par2, par4, par6, Material.lava); } else if (par1Str.equals("snowshovel")) { diff --git a/src/main/java/tconstruct/client/armor/RenderArmorCast.java b/src/main/java/tconstruct/client/armor/RenderArmorCast.java index 5d6f886c..7d34b1cd 100644 --- a/src/main/java/tconstruct/client/armor/RenderArmorCast.java +++ b/src/main/java/tconstruct/client/armor/RenderArmorCast.java @@ -47,7 +47,7 @@ public class RenderArmorCast implements IItemRenderer @Override public void renderItem (ItemRenderType type, ItemStack item, Object... data) { - RenderBlocks renderer = Minecraft.getMinecraft().renderGlobal.field_147592_B; + RenderBlocks renderer = Minecraft.getMinecraft().renderGlobal.renderBlocksRg; Tessellator tessellator = Tessellator.instance; IIcon baseIcon = item.getItem() instanceof ArmorPattern ? ((ArmorPattern) item.getItem()).getBaseIcon() : item.getIconIndex(); GL11.glPushMatrix(); @@ -70,9 +70,9 @@ public class RenderArmorCast implements IItemRenderer default: break; } - renderer.func_147782_a(0.1F, 0.1F, 0.1F, 0.9F, 0.83F, 0.9F); + renderer.setRenderBounds(0.1F, 0.1F, 0.1F, 0.9F, 0.83F, 0.9F); renderCube(tessellator, renderer, baseIcon); - renderer.func_147782_a(0.1F, 0.1F, 0.1F, 0.9F, 1.0F, 0.9F); + renderer.setRenderBounds(0.1F, 0.1F, 0.1F, 0.9F, 1.0F, 0.9F); ArrayList sides = new ArrayList(); sides.add(ForgeDirection.NORTH); sides.add(ForgeDirection.SOUTH); @@ -88,17 +88,17 @@ public class RenderArmorCast implements IItemRenderer { tessellator.startDrawingQuads(); tessellator.setNormal(-1F, 0F, 0F); - renderer.func_147798_e((Block) null, 0F, 0F, 0F, icon); + renderer.renderFaceXNeg((Block) null, 0F, 0F, 0F, icon); tessellator.setNormal(1F, 0F, 0F); - renderer.func_147764_f((Block) null, 0F, 0F, 0F, icon); + renderer.renderFaceXPos((Block) null, 0F, 0F, 0F, icon); tessellator.setNormal(0F, -1F, 0F); - renderer.func_147768_a((Block) null, 0F, 0F, 0F, icon); + renderer.renderFaceYNeg((Block) null, 0F, 0F, 0F, icon); tessellator.setNormal(0F, 1F, 0F); - renderer.func_147806_b((Block) null, 0F, 0F, 0F, icon); + renderer.renderFaceYPos((Block) null, 0F, 0F, 0F, icon); tessellator.setNormal(0F, 0F, -1F); - renderer.func_147761_c((Block) null, 0F, 0F, 0F, icon); + renderer.renderFaceZNeg((Block) null, 0F, 0F, 0F, icon); tessellator.setNormal(0F, 0F, 1F); - renderer.func_147734_d((Block) null, 0F, 0F, 0F, icon); + renderer.renderFaceZPos((Block) null, 0F, 0F, 0F, icon); tessellator.draw(); } @@ -107,22 +107,22 @@ public class RenderArmorCast implements IItemRenderer tessellator.startDrawingQuads(); tessellator.setNormal(-1F, 0F, 0F); if (sidesToRender.contains(ForgeDirection.WEST)) - renderer.func_147798_e((Block) null, 0F, 0F, 0F, icon); + renderer.renderFaceXNeg((Block) null, 0F, 0F, 0F, icon); tessellator.setNormal(1F, 0F, 0F); if (sidesToRender.contains(ForgeDirection.EAST)) - renderer.func_147764_f((Block) null, 0F, 0F, 0F, icon); + renderer.renderFaceXPos((Block) null, 0F, 0F, 0F, icon); tessellator.setNormal(0F, -1F, 0F); if (sidesToRender.contains(ForgeDirection.DOWN)) - renderer.func_147768_a((Block) null, 0F, 0F, 0F, icon); + renderer.renderFaceYNeg((Block) null, 0F, 0F, 0F, icon); tessellator.setNormal(0F, 1F, 0F); if (sidesToRender.contains(ForgeDirection.UP)) - renderer.func_147806_b((Block) null, 0F, 0F, 0F, icon); + renderer.renderFaceYPos((Block) null, 0F, 0F, 0F, icon); tessellator.setNormal(0F, 0F, -1F); if (sidesToRender.contains(ForgeDirection.SOUTH)) - renderer.func_147761_c((Block) null, 0F, 0F, 0F, icon); + renderer.renderFaceZNeg((Block) null, 0F, 0F, 0F, icon); tessellator.setNormal(0F, 0F, 1F); if (sidesToRender.contains(ForgeDirection.NORTH)) - renderer.func_147734_d((Block) null, 0F, 0F, 0F, icon); + renderer.renderFaceZPos((Block) null, 0F, 0F, 0F, icon); tessellator.draw(); } diff --git a/src/main/java/tconstruct/client/block/BarricadeRender.java b/src/main/java/tconstruct/client/block/BarricadeRender.java index 3f9e0a67..3dd1fb73 100644 --- a/src/main/java/tconstruct/client/block/BarricadeRender.java +++ b/src/main/java/tconstruct/client/block/BarricadeRender.java @@ -27,101 +27,101 @@ public class BarricadeRender implements ISimpleBlockRenderingHandler if (meta / 4 == 0) { //if (type >= 0) - //TODO func_147782_a - renderer.func_147782_a(0.125, 0.0, 0.5, 0.375, 1.0, 0.75); - renderer.func_147784_q(barricade, x, y, z); + //TODO setRenderBounds + renderer.setRenderBounds(0.125, 0.0, 0.5, 0.375, 1.0, 0.75); + renderer.renderStandardBlock(barricade, x, y, z); if (type >= 1) { - renderer.func_147782_a(0.625, 0.0, 0.5, 0.875, 1.0, 0.75); - renderer.func_147784_q(barricade, x, y, z); + renderer.setRenderBounds(0.625, 0.0, 0.5, 0.875, 1.0, 0.75); + renderer.renderStandardBlock(barricade, x, y, z); } if (type >= 2) { - renderer.func_147782_a(0.0, 0.125, 0.25, 1.0, 0.375, 0.5); - renderer.func_147784_q(barricade, x, y, z); + renderer.setRenderBounds(0.0, 0.125, 0.25, 1.0, 0.375, 0.5); + renderer.renderStandardBlock(barricade, x, y, z); } if (type >= 3) { - renderer.func_147782_a(0.0, 0.625, 0.25, 1.0, 0.875, 0.5); - renderer.func_147784_q(barricade, x, y, z); + renderer.setRenderBounds(0.0, 0.625, 0.25, 1.0, 0.875, 0.5); + renderer.renderStandardBlock(barricade, x, y, z); } } if (meta / 4 == 1) { //if (type >= 0) - renderer.func_147782_a(0.25, 0.0, 0.125, 0.5, 1.0, 0.375); - renderer.func_147784_q(barricade, x, y, z); + renderer.setRenderBounds(0.25, 0.0, 0.125, 0.5, 1.0, 0.375); + renderer.renderStandardBlock(barricade, x, y, z); if (type >= 1) { - renderer.func_147782_a(0.25, 0.0, 0.625, 0.5, 1.0, 0.875); - renderer.func_147784_q(barricade, x, y, z); + renderer.setRenderBounds(0.25, 0.0, 0.625, 0.5, 1.0, 0.875); + renderer.renderStandardBlock(barricade, x, y, z); } if (type >= 2) { - renderer.func_147782_a(0.5, 0.125, 0.0, 0.75, 0.375, 1.0); - renderer.func_147784_q(barricade, x, y, z); + renderer.setRenderBounds(0.5, 0.125, 0.0, 0.75, 0.375, 1.0); + renderer.renderStandardBlock(barricade, x, y, z); } if (type >= 3) { - renderer.func_147782_a(0.5, 0.625, 0.0, 0.75, 0.875, 1.0); - renderer.func_147784_q(barricade, x, y, z); + renderer.setRenderBounds(0.5, 0.625, 0.0, 0.75, 0.875, 1.0); + renderer.renderStandardBlock(barricade, x, y, z); } } if (meta / 4 == 2) { //if (type >= 0) - renderer.func_147782_a(0.125, 0.0, 0.25, 0.375, 1.0, 0.5); - renderer.func_147784_q(barricade, x, y, z); + renderer.setRenderBounds(0.125, 0.0, 0.25, 0.375, 1.0, 0.5); + renderer.renderStandardBlock(barricade, x, y, z); if (type >= 1) { - renderer.func_147782_a(0.625, 0.0, 0.25, 0.875, 1.0, 0.5); - renderer.func_147784_q(barricade, x, y, z); + renderer.setRenderBounds(0.625, 0.0, 0.25, 0.875, 1.0, 0.5); + renderer.renderStandardBlock(barricade, x, y, z); } if (type >= 2) { - renderer.func_147782_a(0.0, 0.125, 0.5, 1.0, 0.375, 0.75); - renderer.func_147784_q(barricade, x, y, z); + renderer.setRenderBounds(0.0, 0.125, 0.5, 1.0, 0.375, 0.75); + renderer.renderStandardBlock(barricade, x, y, z); } if (type >= 3) { - renderer.func_147782_a(0.0, 0.625, 0.5, 1.0, 0.875, 0.75); - renderer.func_147784_q(barricade, x, y, z); + renderer.setRenderBounds(0.0, 0.625, 0.5, 1.0, 0.875, 0.75); + renderer.renderStandardBlock(barricade, x, y, z); } } if (meta / 4 == 3) { //if (type >= 0) - renderer.func_147782_a(0.5, 0.0, 0.125, 0.75, 1.0, 0.375); - renderer.func_147784_q(barricade, x, y, z); + renderer.setRenderBounds(0.5, 0.0, 0.125, 0.75, 1.0, 0.375); + renderer.renderStandardBlock(barricade, x, y, z); if (type >= 1) { - renderer.func_147782_a(0.5, 0.0, 0.625, 0.75, 1.0, 0.875); - renderer.func_147784_q(barricade, x, y, z); + renderer.setRenderBounds(0.5, 0.0, 0.625, 0.75, 1.0, 0.875); + renderer.renderStandardBlock(barricade, x, y, z); } if (type >= 2) { - renderer.func_147782_a(0.25, 0.125, 0.0, 0.5, 0.375, 1.0); - renderer.func_147784_q(barricade, x, y, z); + renderer.setRenderBounds(0.25, 0.125, 0.0, 0.5, 0.375, 1.0); + renderer.renderStandardBlock(barricade, x, y, z); } if (type >= 3) { - renderer.func_147782_a(0.25, 0.625, 0.0, 0.5, 0.875, 1.0); - renderer.func_147784_q(barricade, x, y, z); + renderer.setRenderBounds(0.25, 0.625, 0.0, 0.5, 0.875, 1.0); + renderer.renderStandardBlock(barricade, x, y, z); } } @@ -135,9 +135,9 @@ public class BarricadeRender implements ISimpleBlockRenderingHandler { if (modelID == model) { - renderer.func_147782_a(0.375F, 0.0F, 0.375F, 0.625F, 1.0F, 0.625F); + renderer.setRenderBounds(0.375F, 0.0F, 0.375F, 0.625F, 1.0F, 0.625F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.375F, 0.375F, 0.0F, 0.625F, 0.625F, 1.0F); + renderer.setRenderBounds(0.375F, 0.375F, 0.0F, 0.625F, 0.625F, 1.0F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); } } diff --git a/src/main/java/tconstruct/client/block/BlockRenderCastingChannel.java b/src/main/java/tconstruct/client/block/BlockRenderCastingChannel.java index e2360c6b..b9199af0 100644 --- a/src/main/java/tconstruct/client/block/BlockRenderCastingChannel.java +++ b/src/main/java/tconstruct/client/block/BlockRenderCastingChannel.java @@ -28,28 +28,28 @@ public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer) { //Floor - renderer.func_147782_a(0.3125D, 0.375D, 0.3125D, 0.6875D, 0.5D, 0.6875D); - this.func_147784_q(block, metadata, renderer); + renderer.setRenderBounds(0.3125D, 0.375D, 0.3125D, 0.6875D, 0.5D, 0.6875D); + this.renderStandardBlock(block, metadata, renderer); //Channel Z- - renderer.func_147782_a(0.3125D, 0.375D, 0D, 0.6875D, 0.5D, 0.3125D); - this.func_147784_q(block, metadata, renderer); - renderer.func_147782_a(0.3125D, 0.5D, 0D, 0.375D, 0.625D, 0.3125D); - this.func_147784_q(block, metadata, renderer); - renderer.func_147782_a(0.625D, 0.5D, 0D, 0.6875D, 0.625D, 0.3125D); - this.func_147784_q(block, metadata, renderer); + renderer.setRenderBounds(0.3125D, 0.375D, 0D, 0.6875D, 0.5D, 0.3125D); + this.renderStandardBlock(block, metadata, renderer); + renderer.setRenderBounds(0.3125D, 0.5D, 0D, 0.375D, 0.625D, 0.3125D); + this.renderStandardBlock(block, metadata, renderer); + renderer.setRenderBounds(0.625D, 0.5D, 0D, 0.6875D, 0.625D, 0.3125D); + this.renderStandardBlock(block, metadata, renderer); //Channel Z+ - renderer.func_147782_a(0.3125D, 0.375D, 0.6875D, 0.6875D, 0.5D, 1D); - this.func_147784_q(block, metadata, renderer); - renderer.func_147782_a(0.3125D, 0.5D, 0.6875D, 0.375D, 0.625D, 1D); - this.func_147784_q(block, metadata, renderer); - renderer.func_147782_a(0.625D, 0.5D, 0.6875D, 0.6875D, 0.625D, 1D); - this.func_147784_q(block, metadata, renderer); + renderer.setRenderBounds(0.3125D, 0.375D, 0.6875D, 0.6875D, 0.5D, 1D); + this.renderStandardBlock(block, metadata, renderer); + renderer.setRenderBounds(0.3125D, 0.5D, 0.6875D, 0.375D, 0.625D, 1D); + this.renderStandardBlock(block, metadata, renderer); + renderer.setRenderBounds(0.625D, 0.5D, 0.6875D, 0.6875D, 0.625D, 1D); + this.renderStandardBlock(block, metadata, renderer); //Wall X- - renderer.func_147782_a(0.3125D, 0.375D, 0.3125D, 0.375D, 0.625D, 0.6875D); - this.func_147784_q(block, metadata, renderer); + renderer.setRenderBounds(0.3125D, 0.375D, 0.3125D, 0.375D, 0.625D, 0.6875D); + this.renderStandardBlock(block, metadata, renderer); //Wall X+ - renderer.func_147782_a(0.625D, 0.375D, 0.3125D, 0.6875D, 0.625D, 0.6875D); - this.func_147784_q(block, metadata, renderer); + renderer.setRenderBounds(0.625D, 0.375D, 0.3125D, 0.6875D, 0.625D, 0.6875D); + this.renderStandardBlock(block, metadata, renderer); } @Override @@ -57,95 +57,95 @@ public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler { if (modelID == renderID) { - CastingChannelLogic tile = (CastingChannelLogic) world.func_147438_o(x, y, z); + CastingChannelLogic tile = (CastingChannelLogic) world.getTileEntity(x, y, z); if (!tile.hasTankConnected(ForgeDirection.DOWN))//CentrePiece, floor is removed if tank below is found { - renderer.func_147782_a(0.3125D, 0.375D, 0.3125D, 0.6875D, 0.5D, 0.6875D); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.3125D, 0.375D, 0.3125D, 0.6875D, 0.5D, 0.6875D); + renderer.renderStandardBlock(block, x, y, z); } else //"Guiding Borders" when tank below is found { - renderer.func_147782_a(0.375D, 0.125D, 0.3125D, 0.625D, 0.5D, 0.375D); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.375D, 0.125D, 0.625D, 0.625D, 0.5D, 0.6875D); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.3125D, 0.125D, 0.3125D, 0.375D, 0.5D, 0.6875D); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.625D, 0.125D, 0.3125D, 0.6875D, 0.5D, 0.6875D); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.375D, 0.125D, 0.3125D, 0.625D, 0.5D, 0.375D); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.375D, 0.125D, 0.625D, 0.625D, 0.5D, 0.6875D); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.3125D, 0.125D, 0.3125D, 0.375D, 0.5D, 0.6875D); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.625D, 0.125D, 0.3125D, 0.6875D, 0.5D, 0.6875D); + renderer.renderStandardBlock(block, x, y, z); } - /*renderer.func_147782_a(0.3125D, 0.375D, 0.3125D, 0.375D, 0.625D, 0.375D); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.3125D, 0.375D, 0.625D, 0.375D, 0.625D, 0.6875D); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.625D, 0.375D, 0.3125D, 0.6875D, 0.625D, 0.375D); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.625D, 0.375D, 0.625D, 0.6875D, 0.625D, 0.6875D); - renderer.func_147784_q(block, x, y, z);*/ + /*renderer.setRenderBounds(0.3125D, 0.375D, 0.3125D, 0.375D, 0.625D, 0.375D); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.3125D, 0.375D, 0.625D, 0.375D, 0.625D, 0.6875D); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.625D, 0.375D, 0.3125D, 0.6875D, 0.625D, 0.375D); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.625D, 0.375D, 0.625D, 0.6875D, 0.625D, 0.6875D); + renderer.renderStandardBlock(block, x, y, z);*/ if (tile.hasTankConnected(ForgeDirection.NORTH))//Channel to Z- { - renderer.func_147782_a(0.3125D, 0.375D, 0D, 0.6875D, 0.5D, 0.3125D); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.3125D, 0.5D, 0D, 0.375D, 0.625D, 0.3125D); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.625D, 0.5D, 0D, 0.6875D, 0.625D, 0.3125D); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.3125D, 0.375D, 0D, 0.6875D, 0.5D, 0.3125D); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.3125D, 0.5D, 0D, 0.375D, 0.625D, 0.3125D); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.625D, 0.5D, 0D, 0.6875D, 0.625D, 0.3125D); + renderer.renderStandardBlock(block, x, y, z); } else //Wall to Z- { - renderer.func_147782_a(0.375D, 0.5D, 0.3125D, 0.625D, 0.625D, 0.375D); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.375D, 0.5D, 0.3125D, 0.625D, 0.625D, 0.375D); + renderer.renderStandardBlock(block, x, y, z); } if (tile.hasTankConnected(ForgeDirection.SOUTH))//Channel to Z+ { - renderer.func_147782_a(0.3125D, 0.375D, 0.6875D, 0.6875D, 0.5D, 1D); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.3125D, 0.5D, 0.6875D, 0.375D, 0.625D, 1D); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.625D, 0.5D, 0.6875D, 0.6875D, 0.625D, 1D); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.3125D, 0.375D, 0.6875D, 0.6875D, 0.5D, 1D); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.3125D, 0.5D, 0.6875D, 0.375D, 0.625D, 1D); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.625D, 0.5D, 0.6875D, 0.6875D, 0.625D, 1D); + renderer.renderStandardBlock(block, x, y, z); } else //Wall to Z+ { - renderer.func_147782_a(0.375D, 0.5D, 0.625D, 0.625D, 0.625D, 0.6875D); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.375D, 0.5D, 0.625D, 0.625D, 0.625D, 0.6875D); + renderer.renderStandardBlock(block, x, y, z); } if (tile.hasTankConnected(ForgeDirection.WEST))//Channel to X- { - renderer.func_147782_a(0D, 0.375D, 0.3125D, 0.3125D, 0.5D, 0.6875D); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0D, 0.5D, 0.3125D, 0.375D, 0.625D, 0.375D); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0D, 0.5D, 0.625D, 0.375D, 0.625D, 0.6875D); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0D, 0.375D, 0.3125D, 0.3125D, 0.5D, 0.6875D); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0D, 0.5D, 0.3125D, 0.375D, 0.625D, 0.375D); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0D, 0.5D, 0.625D, 0.375D, 0.625D, 0.6875D); + renderer.renderStandardBlock(block, x, y, z); } else //Wall to X- { - renderer.func_147782_a(0.3125D, 0.5D, 0.3125D, 0.375D, 0.625D, 0.6875D); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.3125D, 0.5D, 0.3125D, 0.375D, 0.625D, 0.6875D); + renderer.renderStandardBlock(block, x, y, z); } if (tile.hasTankConnected(ForgeDirection.EAST))//Channel to X+ { - renderer.func_147782_a(0.6875D, 0.375D, 0.3125D, 1D, 0.5D, 0.6875D); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.625D, 0.5D, 0.3125D, 1D, 0.625D, 0.375D); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.625D, 0.5D, 0.625D, 1D, 0.625D, 0.6875D); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.6875D, 0.375D, 0.3125D, 1D, 0.5D, 0.6875D); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.625D, 0.5D, 0.3125D, 1D, 0.625D, 0.375D); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.625D, 0.5D, 0.625D, 1D, 0.625D, 0.6875D); + renderer.renderStandardBlock(block, x, y, z); } else //Wall to X+ { - renderer.func_147782_a(0.625D, 0.5D, 0.3125D, 0.6875D, 0.625D, 0.6875D); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.625D, 0.5D, 0.3125D, 0.6875D, 0.625D, 0.6875D); + renderer.renderStandardBlock(block, x, y, z); } if (tile.liquid != null) @@ -156,7 +156,7 @@ public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler //if(tile.nearbyChannel(ForgeDirection.DOWN))startY = -0.5D; //else if(tile.hasTankConnected(ForgeDirection.DOWN))startY = 0D; float liquidAmount = tile.liquid.amount / 288f * 0.125f; - renderer.func_147782_a(0.375D, startY, 0.375D, 0.625D, 0.5 + liquidAmount, 0.625D); //Center + renderer.setRenderBounds(0.375D, startY, 0.375D, 0.625D, 0.5 + liquidAmount, 0.625D); //Center renderLiquidPart(world, x, y, z, block, renderer, tile); //TConstruct.logger.info(tile.recentlyFilledDelay); @@ -164,14 +164,14 @@ public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler { if (tile.lastProvider == ForgeDirection.NORTH) { - renderer.func_147782_a(0.375D, 0.5D, 0D, 0.625D, 0.5 + liquidAmount, 0.375D); + renderer.setRenderBounds(0.375D, 0.5D, 0D, 0.625D, 0.5 + liquidAmount, 0.375D); renderLiquidPart(world, x, y, z, block, renderer, tile); } else { if (tile.recentlyFilledDelay == 0) { - renderer.func_147782_a(0.375D, 0.5D, 0D, 0.625D, 0.5 + liquidAmount, 0.375D); + renderer.setRenderBounds(0.375D, 0.5D, 0D, 0.625D, 0.5 + liquidAmount, 0.375D); renderLiquidPart(world, x, y, z, block, renderer, tile); } } @@ -180,14 +180,14 @@ public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler { if (tile.lastProvider == ForgeDirection.SOUTH) { - renderer.func_147782_a(0.375D, 0.5D, 0.625D, 0.625D, 0.5 + liquidAmount, 1D); + renderer.setRenderBounds(0.375D, 0.5D, 0.625D, 0.625D, 0.5 + liquidAmount, 1D); renderLiquidPart(world, x, y, z, block, renderer, tile); } else { if (tile.recentlyFilledDelay == 0) { - renderer.func_147782_a(0.375D, 0.5D, 0.625D, 0.625D, 0.5 + liquidAmount, 1D); + renderer.setRenderBounds(0.375D, 0.5D, 0.625D, 0.625D, 0.5 + liquidAmount, 1D); renderLiquidPart(world, x, y, z, block, renderer, tile); } } @@ -196,14 +196,14 @@ public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler { if (tile.lastProvider == ForgeDirection.WEST) { - renderer.func_147782_a(0D, 0.5D, 0.375D, 0.375D, 0.5 + liquidAmount, 0.625D); + renderer.setRenderBounds(0D, 0.5D, 0.375D, 0.375D, 0.5 + liquidAmount, 0.625D); renderLiquidPart(world, x, y, z, block, renderer, tile); } else { if (tile.recentlyFilledDelay == 0) { - renderer.func_147782_a(0D, 0.5D, 0.375D, 0.375D, 0.5 + liquidAmount, 0.625D); + renderer.setRenderBounds(0D, 0.5D, 0.375D, 0.375D, 0.5 + liquidAmount, 0.625D); renderLiquidPart(world, x, y, z, block, renderer, tile); } } @@ -212,14 +212,14 @@ public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler { if (tile.lastProvider == ForgeDirection.EAST) { - renderer.func_147782_a(0.625D, 0.5D, 0.375D, 1D, 0.5 + liquidAmount, 0.625D); + renderer.setRenderBounds(0.625D, 0.5D, 0.375D, 1D, 0.5 + liquidAmount, 0.625D); renderLiquidPart(world, x, y, z, block, renderer, tile); } else { if (tile.recentlyFilledDelay == 0) { - renderer.func_147782_a(0.625D, 0.5D, 0.375D, 1D, 0.5 + liquidAmount, 0.625D); + renderer.setRenderBounds(0.625D, 0.5D, 0.375D, 1D, 0.5 + liquidAmount, 0.625D); renderLiquidPart(world, x, y, z, block, renderer, tile); } } @@ -227,7 +227,7 @@ public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler } /*if(tile.lastProvider==ForgeDirection.UP && tile.recentlyFilledDelay != 0) { - renderer.func_147782_a(0.375D, 0.5D, 0.375D, 0.625D, 1D, 0.625D); + renderer.setRenderBounds(0.375D, 0.5D, 0.375D, 0.625D, 1D, 0.625D); renderLiquidPart(world, x, y, z, block, renderer, tile); }*/ @@ -235,12 +235,12 @@ public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler { if(tile.recentlyFilledDelay == 0 || tile.lastProvider == ForgeDirection.UP) { - renderer.func_147782_a(0.375D, 0.5D, 0D, 0.625D, 0.625D, 0.375D); + renderer.setRenderBounds(0.375D, 0.5D, 0D, 0.625D, 0.625D, 0.375D); renderLiquidPart(world, x, y, z, block, renderer, tile); } if(tile.recentlyFilledDelay != 0 && tile.lastProvider == ForgeDirection.UP) { - renderer.func_147782_a(0.375D, 0.375D, 0.375D, 0.625D, 1D, 0.625D); + renderer.setRenderBounds(0.375D, 0.375D, 0.375D, 0.625D, 1D, 0.625D); renderLiquidPart(world, x, y, z, block, renderer, tile); } } @@ -248,12 +248,12 @@ public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler { if(tile.recentlyFilledDelay == 0 || tile.lastProvider == ForgeDirection.UP) { - renderer.func_147782_a(0.375D, 0.5D, 0.625D, 0.625D, 0.625D, 1D); + renderer.setRenderBounds(0.375D, 0.5D, 0.625D, 0.625D, 0.625D, 1D); renderLiquidPart(world, x, y, z, block, renderer, tile); } if(tile.recentlyFilledDelay != 0 && tile.lastProvider == ForgeDirection.UP) { - renderer.func_147782_a(0.375D, 0.375D, 0.375D, 0.625D, 1D, 0.625D); + renderer.setRenderBounds(0.375D, 0.375D, 0.375D, 0.625D, 1D, 0.625D); renderLiquidPart(world, x, y, z, block, renderer, tile); } } @@ -261,12 +261,12 @@ public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler { if(tile.recentlyFilledDelay == 0 || tile.lastProvider == ForgeDirection.UP) { - renderer.func_147782_a(0D, 0.5D, 0.375D, 0.375D, 0.625D, 0.625D); + renderer.setRenderBounds(0D, 0.5D, 0.375D, 0.375D, 0.625D, 0.625D); renderLiquidPart(world, x, y, z, block, renderer, tile); } if(tile.recentlyFilledDelay != 0 && tile.lastProvider == ForgeDirection.UP) { - renderer.func_147782_a(0.375D, 0.375D, 0.375D, 0.625D, 1D, 0.625D); + renderer.setRenderBounds(0.375D, 0.375D, 0.375D, 0.625D, 1D, 0.625D); renderLiquidPart(world, x, y, z, block, renderer, tile); } } @@ -274,33 +274,33 @@ public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler { if(tile.recentlyFilledDelay == 0 || tile.lastProvider == ForgeDirection.UP) { - renderer.func_147782_a(0.625D, 0.5D, 0.375D, 1D, 0.625D, 0.625D); + renderer.setRenderBounds(0.625D, 0.5D, 0.375D, 1D, 0.625D, 0.625D); renderLiquidPart(world, x, y, z, block, renderer, tile); } if(tile.recentlyFilledDelay != 0 && tile.lastProvider == ForgeDirection.UP) { - renderer.func_147782_a(0.375D, 0.375D, 0.375D, 0.625D, 1D, 0.625D); + renderer.setRenderBounds(0.375D, 0.375D, 0.375D, 0.625D, 1D, 0.625D); renderLiquidPart(world, x, y, z, block, renderer, tile); } } if(tile.lastProvider==ForgeDirection.NORTH && tile.recentlyFilledDelay != 0) { - renderer.func_147782_a(0.375D, 0.5D, 0.625D, 0.625D, 0.625D, 1D); + renderer.setRenderBounds(0.375D, 0.5D, 0.625D, 0.625D, 0.625D, 1D); renderLiquidPart(world, x, y, z, block, renderer, tile); } if(tile.lastProvider==ForgeDirection.SOUTH && tile.recentlyFilledDelay != 0) { - renderer.func_147782_a(0.375D, 0.5D, 0D, 0.625D, 0.625D, 0.375D); + renderer.setRenderBounds(0.375D, 0.5D, 0D, 0.625D, 0.625D, 0.375D); renderLiquidPart(world, x, y, z, block, renderer, tile); } if(tile.lastProvider==ForgeDirection.WEST && tile.recentlyFilledDelay != 0) { - renderer.func_147782_a(0.625D, 0.5D, 0.375D, 1D, 0.625D, 0.625D); + renderer.setRenderBounds(0.625D, 0.5D, 0.375D, 1D, 0.625D, 0.625D); renderLiquidPart(world, x, y, z, block, renderer, tile); } if(tile.lastProvider==ForgeDirection.EAST && tile.recentlyFilledDelay != 0) { - renderer.func_147782_a(0D, 0.5D, 0.375D, 0.375D, 0.625D, 0.625D); + renderer.setRenderBounds(0D, 0.5D, 0.375D, 0.375D, 0.625D, 0.625D); renderLiquidPart(world, x, y, z, block, renderer, tile); }*/ } @@ -312,7 +312,7 @@ public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler private void renderLiquidPart (IBlockAccess world, int x, int y, int z, Block block, RenderBlocks renderer, CastingChannelLogic logic) { FluidStack liquid = logic.liquid; - int color = block.func_149720_d(world, x, y, z); + int color = block.colorMultiplier(world, x, y, z); float red = (color >> 16 & 0xFF) / 255.0F; float green = (color >> 8 & 0xFF) / 255.0F; float blue = (color & 0xFF) / 255.0F; @@ -323,33 +323,33 @@ public class BlockRenderCastingChannel implements ISimpleBlockRenderingHandler BlockSkinRenderHelper.renderLiquidBlock(fluid.getStillIcon(), fluid.getFlowingIcon(), x, y, z, renderer, world); } - private void func_147784_q (Block block, int meta, RenderBlocks renderer) + private void renderStandardBlock (Block block, int meta, RenderBlocks renderer) { Tessellator tessellator = Tessellator.instance; GL11.glTranslatef(-0.5F, -0.5F, -0.5F); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, -1.0F, 0.0F); - renderer.func_147768_a(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(0, meta)); + renderer.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderer.func_147806_b(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(1, meta)); + renderer.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1.0F); - renderer.func_147761_c(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(2, meta)); + renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderer.func_147734_d(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(3, meta)); + renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderer.func_147798_e(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(4, meta)); + renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderer.func_147764_f(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(5, meta)); + renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta)); tessellator.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } diff --git a/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java b/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java index 4a4e7619..c3392ee4 100644 --- a/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java +++ b/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java @@ -14,7 +14,7 @@ public class BlockSkinRenderHelper public static boolean renderMetadataBlock (Block block, int metadata, int x, int y, int z, RenderBlocks renderer, IBlockAccess world) { //TODO CHECK THESE!!!! - int var5 = block.func_149720_d(world, x, y, z); + int var5 = block.colorMultiplier(world, x, y, z); float var6 = (float) (var5 >> 16 & 255) / 255.0F; float var7 = (float) (var5 >> 8 & 255) / 255.0F; float var8 = (float) (var5 & 255) / 255.0F; @@ -29,29 +29,29 @@ public class BlockSkinRenderHelper var8 = var11; } - return Minecraft.isAmbientOcclusionEnabled() && block.func_149750_m() == 0 ? renderMetadataBlockWithAmbientOcclusion(block, metadata, x, y, z, var6, var7, var8, renderer, world) + return Minecraft.isAmbientOcclusionEnabled() && block.getLightValue() == 0 ? renderMetadataBlockWithAmbientOcclusion(block, metadata, x, y, z, var6, var7, var8, renderer, world) : renderMetadataBlockWithColorMultiplier(block, metadata, x, y, z, var6, var7, var8, renderer, world); } static boolean renderMetadataBlockWithAmbientOcclusion (Block block, int metadata, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) { - render.field_147863_w = true; + render.enableAO = true; boolean flag = false; float f3 = 0.0F; float f4 = 0.0F; float f5 = 0.0F; float f6 = 0.0F; boolean flag1 = true; - int l = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos); + int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos); Tessellator tessellator = Tessellator.instance; tessellator.setBrightness(983055); - if (render.func_147745_b(block).getIconName().equals("grass_top")) + if (render.getBlockIcon(block).getIconName().equals("grass_top")) { flag1 = false; } - else if (render.func_147744_b()) + else if (render.hasOverrideBlockTexture()) { flag1 = false; } @@ -63,703 +63,703 @@ public class BlockSkinRenderHelper float f7; int i1; - if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos - 1, zPos, 0)) + if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)) { - if (render.field_147855_j <= 0.0D) + if (render.renderMinY <= 0.0D) { --yPos; } - render.field_147831_S = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147825_U = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147828_V = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147835_X = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147886_y = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147814_A = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147815_B = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147810_D = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - flag3 = render.field_147845_a.func_147439_a(xPos + 1, yPos - 1, zPos).func_149751_l(); - flag2 = render.field_147845_a.func_147439_a(xPos - 1, yPos - 1, zPos).func_149751_l(); - flag5 = render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos + 1).func_149751_l(); - flag4 = render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos - 1).func_149751_l(); + render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); + render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); + render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); + render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); + render.aoLightValueScratchXYNN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); + render.aoLightValueScratchYZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + render.aoLightValueScratchYZNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); + render.aoLightValueScratchXYPN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); + flag3 = render.blockAccess.getBlock(xPos + 1, yPos - 1, zPos).getCanBlockGrass(); + flag2 = render.blockAccess.getBlock(xPos - 1, yPos - 1, zPos).getCanBlockGrass(); + flag5 = render.blockAccess.getBlock(xPos, yPos - 1, zPos + 1).getCanBlockGrass(); + flag4 = render.blockAccess.getBlock(xPos, yPos - 1, zPos - 1).getCanBlockGrass(); if (!flag4 && !flag2) { - render.field_147888_x = render.field_147886_y; - render.field_147832_R = render.field_147831_S; + render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXYNN; + render.aoBrightnessXYZNNN = render.aoBrightnessXYNN; } else { - render.field_147888_x = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); - render.field_147832_R = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos - 1); + render.aoLightValueScratchXYZNNN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1); + render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); } if (!flag5 && !flag2) { - render.field_147884_z = render.field_147886_y; - render.field_147826_T = render.field_147831_S; + render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXYNN; + render.aoBrightnessXYZNNP = render.aoBrightnessXYNN; } else { - render.field_147884_z = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); - render.field_147826_T = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos + 1); + render.aoLightValueScratchXYZNNP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1); + render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); } if (!flag4 && !flag3) { - render.field_147816_C = render.field_147810_D; - render.field_147827_W = render.field_147835_X; + render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXYPN; + render.aoBrightnessXYZPNN = render.aoBrightnessXYPN; } else { - render.field_147816_C = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); - render.field_147827_W = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos - 1); + render.aoLightValueScratchXYZPNN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1); + render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); } if (!flag5 && !flag3) { - render.field_147811_E = render.field_147810_D; - render.field_147834_Y = render.field_147835_X; + render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXYPN; + render.aoBrightnessXYZPNP = render.aoBrightnessXYPN; } else { - render.field_147811_E = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); - render.field_147834_Y = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos + 1); + render.aoLightValueScratchXYZPNP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); + render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); } - if (render.field_147855_j <= 0.0D) + if (render.renderMinY <= 0.0D) { ++yPos; } i1 = l; - if (render.field_147855_j <= 0.0D || !render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos).func_149662_c()) + if (render.renderMinY <= 0.0D || !render.blockAccess.getBlock(xPos, yPos - 1, zPos).isOpaqueCube()) { - i1 = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); } - f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - f3 = (render.field_147884_z + render.field_147886_y + render.field_147815_B + f7) / 4.0F; - f6 = (render.field_147815_B + f7 + render.field_147811_E + render.field_147810_D) / 4.0F; - f5 = (f7 + render.field_147814_A + render.field_147810_D + render.field_147816_C) / 4.0F; - f4 = (render.field_147886_y + render.field_147888_x + f7 + render.field_147814_A) / 4.0F; - render.field_147864_al = render.func_147778_a(render.field_147826_T, render.field_147831_S, render.field_147828_V, i1); - render.field_147870_ao = render.func_147778_a(render.field_147828_V, render.field_147834_Y, render.field_147835_X, i1); - render.field_147876_an = render.func_147778_a(render.field_147825_U, render.field_147835_X, render.field_147827_W, i1); - render.field_147874_am = render.func_147778_a(render.field_147831_S, render.field_147832_R, render.field_147825_U, i1); + f7 = getAmbientOcclusionLightValue(render.blockAccess, 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); if (flag1) { - render.field_147872_ap = render.field_147852_aq = render.field_147850_ar = render.field_147848_as = colorRed * 0.5F; - render.field_147846_at = render.field_147860_au = render.field_147858_av = render.field_147856_aw = colorGreen * 0.5F; - render.field_147854_ax = render.field_147841_ay = render.field_147839_az = render.field_147833_aA = colorBlue * 0.5F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.5F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.5F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.5F; } else { - render.field_147872_ap = render.field_147852_aq = render.field_147850_ar = render.field_147848_as = 0.5F; - render.field_147846_at = render.field_147860_au = render.field_147858_av = render.field_147856_aw = 0.5F; - render.field_147854_ax = render.field_147841_ay = render.field_147839_az = render.field_147833_aA = 0.5F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.5F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.5F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.5F; } - render.field_147872_ap *= f3; - render.field_147846_at *= f3; - render.field_147854_ax *= f3; - render.field_147852_aq *= f4; - render.field_147860_au *= f4; - render.field_147841_ay *= f4; - render.field_147850_ar *= f5; - render.field_147858_av *= f5; - render.field_147839_az *= f5; - render.field_147848_as *= f6; - render.field_147856_aw *= f6; - render.field_147833_aA *= f6; - render.func_147768_a(block, (double) xPos, (double) yPos, (double) zPos, block.func_149691_a(0, metadata)); + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + render.renderFaceYNeg(block, (double) xPos, (double) yPos, (double) zPos, block.getIcon(0, metadata)); flag = true; } - if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos + 1, zPos, 1)) + if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)) { - if (render.field_147857_k >= 1.0D) + if (render.renderMaxY >= 1.0D) { ++yPos; } - render.field_147880_aa = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147885_ae = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147878_ac = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147887_af = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147813_G = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147824_K = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147822_I = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147817_L = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - flag3 = render.field_147845_a.func_147439_a(xPos + 1, yPos + 1, zPos).func_149751_l(); - flag2 = render.field_147845_a.func_147439_a(xPos - 1, yPos + 1, zPos).func_149751_l(); - flag5 = render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos + 1).func_149751_l(); - flag4 = render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos - 1).func_149751_l(); + render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); + render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); + render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); + render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); + render.aoLightValueScratchXYNP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); + render.aoLightValueScratchXYPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); + render.aoLightValueScratchYZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + render.aoLightValueScratchYZPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); + flag3 = render.blockAccess.getBlock(xPos + 1, yPos + 1, zPos).getCanBlockGrass(); + flag2 = render.blockAccess.getBlock(xPos - 1, yPos + 1, zPos).getCanBlockGrass(); + flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getCanBlockGrass(); + flag4 = render.blockAccess.getBlock(xPos, yPos + 1, zPos - 1).getCanBlockGrass(); if (!flag4 && !flag2) { - render.field_147812_F = render.field_147813_G; - render.field_147836_Z = render.field_147880_aa; + render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXYNP; + render.aoBrightnessXYZNPN = render.aoBrightnessXYNP; } else { - render.field_147812_F = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); - render.field_147836_Z = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos - 1); + render.aoLightValueScratchXYZNPN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1); + render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); } if (!flag4 && !flag3) { - render.field_147823_J = render.field_147824_K; - render.field_147879_ad = render.field_147885_ae; + render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXYPP; + render.aoBrightnessXYZPPN = render.aoBrightnessXYPP; } else { - render.field_147823_J = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); - render.field_147879_ad = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos - 1); + render.aoLightValueScratchXYZPPN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1); + render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); } if (!flag5 && !flag2) { - render.field_147821_H = render.field_147813_G; - render.field_147881_ab = render.field_147880_aa; + render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXYNP; + render.aoBrightnessXYZNPP = render.aoBrightnessXYNP; } else { - render.field_147821_H = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); - render.field_147881_ab = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos + 1); + render.aoLightValueScratchXYZNPP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1); + render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); } if (!flag5 && !flag3) { - render.field_147819_N = render.field_147824_K; - render.field_147882_ag = render.field_147885_ae; + render.aoLightValueScratchXZNN = render.aoLightValueScratchXYPP; + render.aoBrightnessXYZPPP = render.aoBrightnessXYPP; } else { - render.field_147819_N = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); - render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos + 1); + render.aoLightValueScratchXZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); + render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); } - if (render.field_147857_k >= 1.0D) + if (render.renderMaxY >= 1.0D) { --yPos; } i1 = l; - if (render.field_147857_k >= 1.0D || !render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos).func_149662_c()) + if (render.renderMaxY >= 1.0D || !render.blockAccess.getBlock(xPos, yPos + 1, zPos).isOpaqueCube()) { - i1 = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); } - f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - f6 = (render.field_147821_H + render.field_147813_G + render.field_147817_L + f7) / 4.0F; - f3 = (render.field_147817_L + f7 + render.field_147819_N + render.field_147824_K) / 4.0F; - f4 = (f7 + render.field_147822_I + render.field_147824_K + render.field_147823_J) / 4.0F; - f5 = (render.field_147813_G + render.field_147812_F + f7 + render.field_147822_I) / 4.0F; - render.field_147870_ao = render.func_147778_a(render.field_147881_ab, render.field_147880_aa, render.field_147887_af, i1); - render.field_147864_al = render.func_147778_a(render.field_147887_af, render.field_147882_ag, render.field_147885_ae, i1); - render.field_147874_am = render.func_147778_a(render.field_147878_ac, render.field_147885_ae, render.field_147879_ad, i1); - render.field_147876_an = render.func_147778_a(render.field_147880_aa, render.field_147836_Z, render.field_147878_ac, i1); - render.field_147872_ap = render.field_147852_aq = render.field_147850_ar = render.field_147848_as = colorRed; - render.field_147846_at = render.field_147860_au = render.field_147858_av = render.field_147856_aw = colorGreen; - render.field_147854_ax = render.field_147841_ay = render.field_147839_az = render.field_147833_aA = colorBlue; - render.field_147872_ap *= f3; - render.field_147846_at *= f3; - render.field_147854_ax *= f3; - render.field_147852_aq *= f4; - render.field_147860_au *= f4; - render.field_147841_ay *= f4; - render.field_147850_ar *= f5; - render.field_147858_av *= f5; - render.field_147839_az *= f5; - render.field_147848_as *= f6; - render.field_147856_aw *= f6; - render.field_147833_aA *= f6; - render.func_147806_b(block, (double) xPos, (double) yPos, (double) zPos, block.func_149691_a(1, metadata)); + f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); + f6 = (render.aoLightValueScratchXYZNPP + render.aoLightValueScratchXYNP + render.aoLightValueScratchYZPP + f7) / 4.0F; + f3 = (render.aoLightValueScratchYZPP + f7 + render.aoLightValueScratchXZNN + 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); + 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; + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + render.renderFaceYPos(block, (double) xPos, (double) yPos, (double) zPos, block.getIcon(1, metadata)); flag = true; } IIcon icon; - if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos, zPos - 1, 2)) + if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)) { - if (render.field_147851_l <= 0.0D) + if (render.renderMinZ <= 0.0D) { --zPos; } - render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147814_A = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147822_I = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147883_ah = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147825_U = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147878_ac = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); - render.field_147866_ai = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); - flag3 = render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos - 1).func_149751_l(); - flag2 = render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos - 1).func_149751_l(); - flag5 = render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos - 1).func_149751_l(); - flag4 = render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos - 1).func_149751_l(); + render.aoLightValueScratchXZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); + render.aoLightValueScratchYZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); + render.aoLightValueScratchYZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); + render.aoLightValueScratchXZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); + render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); + render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); + render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); + render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); + flag3 = render.blockAccess.getBlock(xPos + 1, yPos, zPos - 1).getCanBlockGrass(); + flag2 = render.blockAccess.getBlock(xPos - 1, yPos, zPos - 1).getCanBlockGrass(); + flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos - 1).getCanBlockGrass(); + flag4 = render.blockAccess.getBlock(xPos, yPos - 1, zPos - 1).getCanBlockGrass(); if (!flag2 && !flag4) { - render.field_147888_x = render.field_147820_O; - render.field_147832_R = render.field_147883_ah; + render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; } else { - render.field_147888_x = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); - render.field_147832_R = block.func_149677_c(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.aoLightValueScratchXYZNNN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos); + render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); } if (!flag2 && !flag5) { - render.field_147812_F = render.field_147820_O; - render.field_147836_Z = render.field_147883_ah; + render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; } else { - render.field_147812_F = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos + 1, zPos); - render.field_147836_Z = block.func_149677_c(render.field_147845_a, xPos - 1, yPos + 1, zPos); + render.aoLightValueScratchXYZNPN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos); + render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); } if (!flag3 && !flag4) { - render.field_147816_C = render.field_147820_O; - render.field_147827_W = render.field_147866_ai; + render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; } else { - render.field_147816_C = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); - render.field_147827_W = block.func_149677_c(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.aoLightValueScratchXYZPNN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos); + render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); } if (!flag3 && !flag5) { - render.field_147823_J = render.field_147820_O; - render.field_147879_ad = render.field_147866_ai; + render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; } else { - render.field_147823_J = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos + 1, zPos); - render.field_147879_ad = block.func_149677_c(render.field_147845_a, xPos + 1, yPos + 1, zPos); + render.aoLightValueScratchXYZPPN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); + render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); } - if (render.field_147851_l <= 0.0D) + if (render.renderMinZ <= 0.0D) { ++zPos; } i1 = l; - if (render.field_147851_l <= 0.0D || !render.field_147845_a.func_147439_a(xPos, yPos, zPos - 1).func_149662_c()) + if (render.renderMinZ <= 0.0D || !render.blockAccess.getBlock(xPos, yPos, zPos - 1).isOpaqueCube()) { - i1 = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); } - f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - f3 = (render.field_147820_O + render.field_147812_F + f7 + render.field_147822_I) / 4.0F; - f4 = (f7 + render.field_147822_I + render.field_147820_O + render.field_147823_J) / 4.0F; - f5 = (render.field_147814_A + f7 + render.field_147816_C + render.field_147820_O) / 4.0F; - f6 = (render.field_147888_x + render.field_147820_O + render.field_147814_A + f7) / 4.0F; - render.field_147864_al = render.func_147778_a(render.field_147883_ah, render.field_147836_Z, render.field_147878_ac, i1); - render.field_147874_am = render.func_147778_a(render.field_147878_ac, render.field_147866_ai, render.field_147879_ad, i1); - render.field_147876_an = render.func_147778_a(render.field_147825_U, render.field_147827_W, render.field_147866_ai, i1); - render.field_147870_ao = render.func_147778_a(render.field_147832_R, render.field_147883_ah, render.field_147825_U, i1); + f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + f3 = (render.aoLightValueScratchXZPN + 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.aoLightValueScratchXZPN + 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); if (flag1) { - render.field_147872_ap = render.field_147852_aq = render.field_147850_ar = render.field_147848_as = colorRed * 0.8F; - render.field_147846_at = render.field_147860_au = render.field_147858_av = render.field_147856_aw = colorGreen * 0.8F; - render.field_147854_ax = render.field_147841_ay = render.field_147839_az = render.field_147833_aA = colorBlue * 0.8F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F; } else { - render.field_147872_ap = render.field_147852_aq = render.field_147850_ar = render.field_147848_as = 0.8F; - render.field_147846_at = render.field_147860_au = render.field_147858_av = render.field_147856_aw = 0.8F; - render.field_147854_ax = render.field_147841_ay = render.field_147839_az = render.field_147833_aA = 0.8F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F; } - render.field_147872_ap *= f3; - render.field_147846_at *= f3; - render.field_147854_ax *= f3; - render.field_147852_aq *= f4; - render.field_147860_au *= f4; - render.field_147841_ay *= f4; - render.field_147850_ar *= f5; - render.field_147858_av *= f5; - render.field_147839_az *= f5; - render.field_147848_as *= f6; - render.field_147856_aw *= f6; - render.field_147833_aA *= f6; - icon = block.func_149691_a(2, metadata); - render.func_147761_c(block, (double) xPos, (double) yPos, (double) zPos, icon); + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + icon = block.getIcon(2, metadata); + render.renderFaceZNeg(block, (double) xPos, (double) yPos, (double) zPos, icon); flag = true; } - if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos, zPos + 1, 3)) + if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)) { - if (render.field_147853_m >= 1.0D) + if (render.renderMaxZ >= 1.0D) { ++zPos; } - render.field_147830_P = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147829_Q = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147815_B = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147817_L = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - render.field_147868_aj = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147862_ak = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147828_V = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147887_af = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); - flag3 = render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos + 1).func_149751_l(); - flag2 = render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos + 1).func_149751_l(); - flag5 = render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos + 1).func_149751_l(); - flag4 = render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos + 1).func_149751_l(); + render.aoLightValueScratchXZNP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); + render.aoLightValueScratchXZPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); + render.aoLightValueScratchYZNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); + render.aoLightValueScratchYZPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); + render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); + render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); + render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); + render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); + flag3 = render.blockAccess.getBlock(xPos + 1, yPos, zPos + 1).getCanBlockGrass(); + flag2 = render.blockAccess.getBlock(xPos - 1, yPos, zPos + 1).getCanBlockGrass(); + flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getCanBlockGrass(); + flag4 = render.blockAccess.getBlock(xPos, yPos - 1, zPos + 1).getCanBlockGrass(); if (!flag2 && !flag4) { - render.field_147884_z = render.field_147830_P; - render.field_147826_T = render.field_147868_aj; + render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; } else { - render.field_147884_z = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); - render.field_147826_T = block.func_149677_c(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.aoLightValueScratchXYZNNP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos); + render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); } if (!flag2 && !flag5) { - render.field_147821_H = render.field_147830_P; - render.field_147881_ab = render.field_147868_aj; + render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; } else { - render.field_147821_H = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos + 1, zPos); - render.field_147881_ab = block.func_149677_c(render.field_147845_a, xPos - 1, yPos + 1, zPos); + render.aoLightValueScratchXYZNPP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos); + render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); } if (!flag3 && !flag4) { - render.field_147811_E = render.field_147829_Q; - render.field_147834_Y = render.field_147862_ak; + render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; } else { - render.field_147811_E = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); - render.field_147834_Y = block.func_149677_c(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.aoLightValueScratchXYZPNP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos); + render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); } if (!flag3 && !flag5) { - render.field_147819_N = render.field_147829_Q; - render.field_147882_ag = render.field_147862_ak; + render.aoLightValueScratchXZNN = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; } else { - render.field_147819_N = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos + 1, zPos); - render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos + 1, yPos + 1, zPos); + render.aoLightValueScratchXZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); + render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); } - if (render.field_147853_m >= 1.0D) + if (render.renderMaxZ >= 1.0D) { --zPos; } i1 = l; - if (render.field_147853_m >= 1.0D || !render.field_147845_a.func_147439_a(xPos, yPos, zPos + 1).func_149662_c()) + if (render.renderMaxZ >= 1.0D || !render.blockAccess.getBlock(xPos, yPos, zPos + 1).isOpaqueCube()) { - i1 = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); } - f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - f3 = (render.field_147830_P + render.field_147821_H + f7 + render.field_147817_L) / 4.0F; - f6 = (f7 + render.field_147817_L + render.field_147829_Q + render.field_147819_N) / 4.0F; - f5 = (render.field_147815_B + f7 + render.field_147811_E + render.field_147829_Q) / 4.0F; - f4 = (render.field_147884_z + render.field_147830_P + render.field_147815_B + f7) / 4.0F; - render.field_147864_al = render.func_147778_a(render.field_147868_aj, render.field_147881_ab, render.field_147887_af, i1); - render.field_147870_ao = render.func_147778_a(render.field_147887_af, render.field_147862_ak, render.field_147882_ag, i1); - render.field_147876_an = render.func_147778_a(render.field_147828_V, render.field_147834_Y, render.field_147862_ak, i1); - render.field_147874_am = render.func_147778_a(render.field_147826_T, render.field_147868_aj, render.field_147828_V, i1); + f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); + f3 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + f7 + render.aoLightValueScratchYZPP) / 4.0F; + f6 = (f7 + render.aoLightValueScratchYZPP + render.aoLightValueScratchXZPP + render.aoLightValueScratchXZNN) / 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); if (flag1) { - render.field_147872_ap = render.field_147852_aq = render.field_147850_ar = render.field_147848_as = colorRed * 0.8F; - render.field_147846_at = render.field_147860_au = render.field_147858_av = render.field_147856_aw = colorGreen * 0.8F; - render.field_147854_ax = render.field_147841_ay = render.field_147839_az = render.field_147833_aA = colorBlue * 0.8F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F; } else { - render.field_147872_ap = render.field_147852_aq = render.field_147850_ar = render.field_147848_as = 0.8F; - render.field_147846_at = render.field_147860_au = render.field_147858_av = render.field_147856_aw = 0.8F; - render.field_147854_ax = render.field_147841_ay = render.field_147839_az = render.field_147833_aA = 0.8F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F; } - render.field_147872_ap *= f3; - render.field_147846_at *= f3; - render.field_147854_ax *= f3; - render.field_147852_aq *= f4; - render.field_147860_au *= f4; - render.field_147841_ay *= f4; - render.field_147850_ar *= f5; - render.field_147858_av *= f5; - render.field_147839_az *= f5; - render.field_147848_as *= f6; - render.field_147856_aw *= f6; - render.field_147833_aA *= f6; - icon = block.func_149691_a(3, metadata); - render.func_147734_d(block, (double) xPos, (double) yPos, (double) zPos, icon); + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + icon = block.getIcon(3, metadata); + render.renderFaceZPos(block, (double) xPos, (double) yPos, (double) zPos, icon); flag = true; } - if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos - 1, yPos, zPos, 4)) + if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)) { - if (render.field_147859_h <= 0.0D) + if (render.renderMinX <= 0.0D) { --xPos; } - render.field_147886_y = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147830_P = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147813_G = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - render.field_147831_S = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147883_ah = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147868_aj = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147880_aa = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); - flag3 = render.field_147845_a.func_147439_a(xPos - 1, yPos + 1, zPos).func_149751_l(); - flag2 = render.field_147845_a.func_147439_a(xPos - 1, yPos - 1, zPos).func_149751_l(); - flag5 = render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos - 1).func_149751_l(); - flag4 = render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos + 1).func_149751_l(); + render.aoLightValueScratchXYNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); + render.aoLightValueScratchXZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + render.aoLightValueScratchXZNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); + render.aoLightValueScratchXYNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); + render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); + render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); + render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); + render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); + flag3 = render.blockAccess.getBlock(xPos - 1, yPos + 1, zPos).getCanBlockGrass(); + flag2 = render.blockAccess.getBlock(xPos - 1, yPos - 1, zPos).getCanBlockGrass(); + flag5 = render.blockAccess.getBlock(xPos - 1, yPos, zPos - 1).getCanBlockGrass(); + flag4 = render.blockAccess.getBlock(xPos - 1, yPos, zPos + 1).getCanBlockGrass(); if (!flag5 && !flag2) { - render.field_147888_x = render.field_147820_O; - render.field_147832_R = render.field_147883_ah; + render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; } else { - render.field_147888_x = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); - render.field_147832_R = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.aoLightValueScratchXYZNNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1); + render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); } if (!flag4 && !flag2) { - render.field_147884_z = render.field_147830_P; - render.field_147826_T = render.field_147868_aj; + render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; } else { - render.field_147884_z = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); - render.field_147826_T = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.aoLightValueScratchXYZNNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1); + render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); } if (!flag5 && !flag3) { - render.field_147812_F = render.field_147820_O; - render.field_147836_Z = render.field_147883_ah; + render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; } else { - render.field_147812_F = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos - 1); - render.field_147836_Z = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos - 1); + render.aoLightValueScratchXYZNPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1); + render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); } if (!flag4 && !flag3) { - render.field_147821_H = render.field_147830_P; - render.field_147881_ab = render.field_147868_aj; + render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; } else { - render.field_147821_H = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos + 1); - render.field_147881_ab = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos + 1); + render.aoLightValueScratchXYZNPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); + render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); } - if (render.field_147859_h <= 0.0D) + if (render.renderMinX <= 0.0D) { ++xPos; } i1 = l; - if (render.field_147859_h <= 0.0D || !render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos).func_149662_c()) + if (render.renderMinX <= 0.0D || !render.blockAccess.getBlock(xPos - 1, yPos, zPos).isOpaqueCube()) { - i1 = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); } - f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - f6 = (render.field_147886_y + render.field_147884_z + f7 + render.field_147830_P) / 4.0F; - f3 = (f7 + render.field_147830_P + render.field_147813_G + render.field_147821_H) / 4.0F; - f4 = (render.field_147820_O + f7 + render.field_147812_F + render.field_147813_G) / 4.0F; - f5 = (render.field_147888_x + render.field_147886_y + render.field_147820_O + f7) / 4.0F; - render.field_147870_ao = render.func_147778_a(render.field_147831_S, render.field_147826_T, render.field_147868_aj, i1); - render.field_147864_al = render.func_147778_a(render.field_147868_aj, render.field_147880_aa, render.field_147881_ab, i1); - render.field_147874_am = render.func_147778_a(render.field_147883_ah, render.field_147836_Z, render.field_147880_aa, i1); - render.field_147876_an = render.func_147778_a(render.field_147832_R, render.field_147831_S, render.field_147883_ah, i1); + f7 = getAmbientOcclusionLightValue(render.blockAccess, 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.aoLightValueScratchXZPN + f7 + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F; + f5 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZPN + 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); if (flag1) { - render.field_147872_ap = render.field_147852_aq = render.field_147850_ar = render.field_147848_as = colorRed * 0.6F; - render.field_147846_at = render.field_147860_au = render.field_147858_av = render.field_147856_aw = colorGreen * 0.6F; - render.field_147854_ax = render.field_147841_ay = render.field_147839_az = render.field_147833_aA = colorBlue * 0.6F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F; } else { - render.field_147872_ap = render.field_147852_aq = render.field_147850_ar = render.field_147848_as = 0.6F; - render.field_147846_at = render.field_147860_au = render.field_147858_av = render.field_147856_aw = 0.6F; - render.field_147854_ax = render.field_147841_ay = render.field_147839_az = render.field_147833_aA = 0.6F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F; } - render.field_147872_ap *= f3; - render.field_147846_at *= f3; - render.field_147854_ax *= f3; - render.field_147852_aq *= f4; - render.field_147860_au *= f4; - render.field_147841_ay *= f4; - render.field_147850_ar *= f5; - render.field_147858_av *= f5; - render.field_147839_az *= f5; - render.field_147848_as *= f6; - render.field_147856_aw *= f6; - render.field_147833_aA *= f6; - icon = block.func_149691_a(4, metadata); - render.func_147798_e(block, (double) xPos, (double) yPos, (double) zPos, icon); + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + icon = block.getIcon(4, metadata); + render.renderFaceXNeg(block, (double) xPos, (double) yPos, (double) zPos, icon); flag = true; } - if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos + 1, yPos, zPos, 5)) + if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)) { - if (render.field_147861_i >= 1.0D) + if (render.renderMaxX >= 1.0D) { ++xPos; } - render.field_147810_D = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147829_Q = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147824_K = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - render.field_147835_X = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147866_ai = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147862_ak = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147885_ae = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); - flag3 = render.field_147845_a.func_147439_a(xPos + 1, yPos + 1, zPos).func_149751_l(); - flag2 = render.field_147845_a.func_147439_a(xPos + 1, yPos - 1, zPos).func_149751_l(); - flag5 = render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos + 1).func_149751_l(); - flag4 = render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos - 1).func_149751_l(); + render.aoLightValueScratchXYPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); + render.aoLightValueScratchXZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + render.aoLightValueScratchXZPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); + render.aoLightValueScratchXYPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); + render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); + render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); + render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); + render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); + flag3 = render.blockAccess.getBlock(xPos + 1, yPos + 1, zPos).getCanBlockGrass(); + flag2 = render.blockAccess.getBlock(xPos + 1, yPos - 1, zPos).getCanBlockGrass(); + flag5 = render.blockAccess.getBlock(xPos + 1, yPos, zPos + 1).getCanBlockGrass(); + flag4 = render.blockAccess.getBlock(xPos + 1, yPos, zPos - 1).getCanBlockGrass(); if (!flag2 && !flag4) { - render.field_147816_C = render.field_147820_O; - render.field_147827_W = render.field_147866_ai; + render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; } else { - render.field_147816_C = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); - render.field_147827_W = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.aoLightValueScratchXYZPNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1); + render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); } if (!flag2 && !flag5) { - render.field_147811_E = render.field_147829_Q; - render.field_147834_Y = render.field_147862_ak; + render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; } else { - render.field_147811_E = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); - render.field_147834_Y = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.aoLightValueScratchXYZPNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1); + render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); } if (!flag3 && !flag4) { - render.field_147823_J = render.field_147820_O; - render.field_147879_ad = render.field_147866_ai; + render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; } else { - render.field_147823_J = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos - 1); - render.field_147879_ad = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos - 1); + render.aoLightValueScratchXYZPPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1); + render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); } if (!flag3 && !flag5) { - render.field_147819_N = render.field_147829_Q; - render.field_147882_ag = render.field_147862_ak; + render.aoLightValueScratchXZNN = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; } else { - render.field_147819_N = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos + 1); - render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos + 1); + render.aoLightValueScratchXZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); + render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); } - if (render.field_147861_i >= 1.0D) + if (render.renderMaxX >= 1.0D) { --xPos; } i1 = l; - if (render.field_147861_i >= 1.0D || !render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos).func_149662_c()) + if (render.renderMaxX >= 1.0D || !render.blockAccess.getBlock(xPos + 1, yPos, zPos).isOpaqueCube()) { - i1 = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); } - f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - f3 = (render.field_147810_D + render.field_147811_E + f7 + render.field_147829_Q) / 4.0F; - f4 = (render.field_147816_C + render.field_147810_D + render.field_147820_O + f7) / 4.0F; - f5 = (render.field_147820_O + f7 + render.field_147823_J + render.field_147824_K) / 4.0F; - f6 = (f7 + render.field_147829_Q + render.field_147824_K + render.field_147819_N) / 4.0F; - render.field_147864_al = render.func_147778_a(render.field_147835_X, render.field_147834_Y, render.field_147862_ak, i1); - render.field_147870_ao = render.func_147778_a(render.field_147862_ak, render.field_147885_ae, render.field_147882_ag, i1); - render.field_147876_an = render.func_147778_a(render.field_147866_ai, render.field_147879_ad, render.field_147885_ae, i1); - render.field_147874_am = render.func_147778_a(render.field_147827_W, render.field_147835_X, render.field_147866_ai, i1); + f7 = getAmbientOcclusionLightValue(render.blockAccess, 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.aoLightValueScratchXZNN) / 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); if (flag1) { - render.field_147872_ap = render.field_147852_aq = render.field_147850_ar = render.field_147848_as = colorRed * 0.6F; - render.field_147846_at = render.field_147860_au = render.field_147858_av = render.field_147856_aw = colorGreen * 0.6F; - render.field_147854_ax = render.field_147841_ay = render.field_147839_az = render.field_147833_aA = colorBlue * 0.6F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F; } else { - render.field_147872_ap = render.field_147852_aq = render.field_147850_ar = render.field_147848_as = 0.6F; - render.field_147846_at = render.field_147860_au = render.field_147858_av = render.field_147856_aw = 0.6F; - render.field_147854_ax = render.field_147841_ay = render.field_147839_az = render.field_147833_aA = 0.6F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F; } - render.field_147872_ap *= f3; - render.field_147846_at *= f3; - render.field_147854_ax *= f3; - render.field_147852_aq *= f4; - render.field_147860_au *= f4; - render.field_147841_ay *= f4; - render.field_147850_ar *= f5; - render.field_147858_av *= f5; - render.field_147839_az *= f5; - render.field_147848_as *= f6; - render.field_147856_aw *= f6; - render.field_147833_aA *= f6; - icon = block.func_149691_a(5, metadata); - render.func_147764_f(block, (double) xPos, (double) yPos, (double) zPos, icon); + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + icon = block.getIcon(5, metadata); + render.renderFaceXPos(block, (double) xPos, (double) yPos, (double) zPos, icon); flag = true; } - render.field_147863_w = false; + render.enableAO = 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.field_147863_w = false; + render.enableAO = false; Tessellator tessellator = Tessellator.instance; boolean flag = false; float f3 = 0.5F; @@ -792,58 +792,58 @@ public class BlockSkinRenderHelper f18 = f6 * colorBlue; } - int l = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos); + int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos); - if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos - 1, zPos, 0)) + if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)) { - tessellator.setBrightness(render.field_147855_j > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos)); + tessellator.setBrightness(render.renderMinY > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos)); tessellator.setColorOpaque_F(f10, f13, f16); - render.func_147768_a(block, (double) xPos, (double) yPos, (double) zPos, block.func_149691_a(0, metadata)); + render.renderFaceYNeg(block, (double) xPos, (double) yPos, (double) zPos, block.getIcon(0, metadata)); flag = true; } - if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos + 1, zPos, 1)) + if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)) { - tessellator.setBrightness(render.field_147857_k < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos)); + tessellator.setBrightness(render.renderMaxY < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos)); tessellator.setColorOpaque_F(f7, f8, f9); - render.func_147806_b(block, (double) xPos, (double) yPos, (double) zPos, block.func_149691_a(1, metadata)); + render.renderFaceYPos(block, (double) xPos, (double) yPos, (double) zPos, block.getIcon(1, metadata)); flag = true; } IIcon icon; - if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos, zPos - 1, 2)) + if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)) { - tessellator.setBrightness(render.field_147851_l > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1)); + tessellator.setBrightness(render.renderMinZ > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1)); tessellator.setColorOpaque_F(f11, f14, f17); - render.func_147761_c(block, (double) xPos, (double) yPos, (double) zPos, block.func_149691_a(2, metadata)); + render.renderFaceZNeg(block, (double) xPos, (double) yPos, (double) zPos, block.getIcon(2, metadata)); flag = true; } - if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos, zPos + 1, 3)) + if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)) { - tessellator.setBrightness(render.field_147853_m < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1)); + tessellator.setBrightness(render.renderMaxZ < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1)); tessellator.setColorOpaque_F(f11, f14, f17); - render.func_147734_d(block, (double) xPos, (double) yPos, (double) zPos, block.func_149691_a(3, metadata)); + render.renderFaceZPos(block, (double) xPos, (double) yPos, (double) zPos, block.getIcon(3, metadata)); flag = true; } - if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos - 1, yPos, zPos, 4)) + if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)) { - tessellator.setBrightness(render.field_147859_h > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos)); + tessellator.setBrightness(render.renderMinX > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos)); tessellator.setColorOpaque_F(f12, f15, f18); - render.func_147798_e(block, (double) xPos, (double) yPos, (double) zPos, block.func_149691_a(4, metadata)); + render.renderFaceXNeg(block, (double) xPos, (double) yPos, (double) zPos, block.getIcon(4, metadata)); flag = true; } - if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos + 1, yPos, zPos, 5)) + if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)) { - tessellator.setBrightness(render.field_147861_i < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos)); + tessellator.setBrightness(render.renderMaxX < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos)); tessellator.setColorOpaque_F(f12, f15, f18); - render.func_147764_f(block, (double) xPos, (double) yPos, (double) zPos, block.func_149691_a(5, metadata)); + render.renderFaceXPos(block, (double) xPos, (double) yPos, (double) zPos, block.getIcon(5, metadata)); flag = true; } @@ -854,7 +854,7 @@ public class BlockSkinRenderHelper public static boolean renderLiquidBlock (IIcon stillIcon, IIcon flowingIcon, int x, int y, int z, RenderBlocks renderer, IBlockAccess world) { Block block = Blocks.stone; - int var5 = block.func_149720_d(world, x, y, z); + int var5 = block.colorMultiplier(world, x, y, z); float var6 = (float) (var5 >> 16 & 255) / 255.0F; float var7 = (float) (var5 >> 8 & 255) / 255.0F; float var8 = (float) (var5 & 255) / 255.0F; @@ -877,22 +877,22 @@ public class BlockSkinRenderHelper IBlockAccess world) { Block block = Blocks.stone; - render.field_147863_w = true; + render.enableAO = true; boolean flag = false; float f3 = 0.0F; float f4 = 0.0F; float f5 = 0.0F; float f6 = 0.0F; boolean flag1 = true; - int l = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos); + int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos); Tessellator tessellator = Tessellator.instance; tessellator.setBrightness(983055); - if (render.func_147745_b(block).getIconName().equals("grass_top")) + if (render.getBlockIcon(block).getIconName().equals("grass_top")) { flag1 = false; } - else if (render.func_147744_b()) + else if (render.hasOverrideBlockTexture()) { flag1 = false; } @@ -904,690 +904,690 @@ public class BlockSkinRenderHelper float f7; int i1; - if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos - 1, zPos, 0)) + if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)) { - if (render.field_147855_j <= 0.0D) + if (render.renderMinY <= 0.0D) { --yPos; } - render.field_147831_S = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147825_U = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147828_V = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147835_X = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147886_y = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147814_A = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147815_B = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147810_D = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - flag3 = render.field_147845_a.func_147439_a(xPos + 1, yPos - 1, zPos).func_149751_l(); - flag2 = render.field_147845_a.func_147439_a(xPos - 1, yPos - 1, zPos).func_149751_l(); - flag5 = render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos + 1).func_149751_l(); - flag4 = render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos - 1).func_149751_l(); + render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); + render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); + render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); + render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); + render.aoLightValueScratchXYNN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); + render.aoLightValueScratchYZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + render.aoLightValueScratchYZNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); + render.aoLightValueScratchXYPN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); + flag3 = render.blockAccess.getBlock(xPos + 1, yPos - 1, zPos).getCanBlockGrass(); + flag2 = render.blockAccess.getBlock(xPos - 1, yPos - 1, zPos).getCanBlockGrass(); + flag5 = render.blockAccess.getBlock(xPos, yPos - 1, zPos + 1).getCanBlockGrass(); + flag4 = render.blockAccess.getBlock(xPos, yPos - 1, zPos - 1).getCanBlockGrass(); if (!flag4 && !flag2) { - render.field_147888_x = render.field_147886_y; - render.field_147832_R = render.field_147831_S; + render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXYNN; + render.aoBrightnessXYZNNN = render.aoBrightnessXYNN; } else { - render.field_147888_x = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); - render.field_147832_R = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos - 1); + render.aoLightValueScratchXYZNNN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1); + render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); } if (!flag5 && !flag2) { - render.field_147884_z = render.field_147886_y; - render.field_147826_T = render.field_147831_S; + render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXYNN; + render.aoBrightnessXYZNNP = render.aoBrightnessXYNN; } else { - render.field_147884_z = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); - render.field_147826_T = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos + 1); + render.aoLightValueScratchXYZNNP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1); + render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); } if (!flag4 && !flag3) { - render.field_147816_C = render.field_147810_D; - render.field_147827_W = render.field_147835_X; + render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXYPN; + render.aoBrightnessXYZPNN = render.aoBrightnessXYPN; } else { - render.field_147816_C = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); - render.field_147827_W = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos - 1); + render.aoLightValueScratchXYZPNN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1); + render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); } if (!flag5 && !flag3) { - render.field_147811_E = render.field_147810_D; - render.field_147834_Y = render.field_147835_X; + render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXYPN; + render.aoBrightnessXYZPNP = render.aoBrightnessXYPN; } else { - render.field_147811_E = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); - render.field_147834_Y = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos + 1); + render.aoLightValueScratchXYZPNP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); + render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); } - if (render.field_147855_j <= 0.0D) + if (render.renderMinY <= 0.0D) { ++yPos; } i1 = l; - if (render.field_147855_j <= 0.0D || !render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos).func_149662_c()) + if (render.renderMinY <= 0.0D || !render.blockAccess.getBlock(xPos, yPos - 1, zPos).isOpaqueCube()) { - i1 = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); } - f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - f3 = (render.field_147884_z + render.field_147886_y + render.field_147815_B + f7) / 4.0F; - f6 = (render.field_147815_B + f7 + render.field_147811_E + render.field_147810_D) / 4.0F; - f5 = (f7 + render.field_147814_A + render.field_147810_D + render.field_147816_C) / 4.0F; - f4 = (render.field_147886_y + render.field_147888_x + f7 + render.field_147814_A) / 4.0F; - render.field_147864_al = render.func_147778_a(render.field_147826_T, render.field_147831_S, render.field_147828_V, i1); - render.field_147870_ao = render.func_147778_a(render.field_147828_V, render.field_147834_Y, render.field_147835_X, i1); - render.field_147876_an = render.func_147778_a(render.field_147825_U, render.field_147835_X, render.field_147827_W, i1); - render.field_147874_am = render.func_147778_a(render.field_147831_S, render.field_147832_R, render.field_147825_U, i1); + f7 = getAmbientOcclusionLightValue(render.blockAccess, 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); if (flag1) { - render.field_147872_ap = render.field_147852_aq = render.field_147850_ar = render.field_147848_as = colorRed * 0.5F; - render.field_147846_at = render.field_147860_au = render.field_147858_av = render.field_147856_aw = colorGreen * 0.5F; - render.field_147854_ax = render.field_147841_ay = render.field_147839_az = render.field_147833_aA = colorBlue * 0.5F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.5F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.5F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.5F; } else { - render.field_147872_ap = render.field_147852_aq = render.field_147850_ar = render.field_147848_as = 0.5F; - render.field_147846_at = render.field_147860_au = render.field_147858_av = render.field_147856_aw = 0.5F; - render.field_147854_ax = render.field_147841_ay = render.field_147839_az = render.field_147833_aA = 0.5F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.5F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.5F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.5F; } - render.field_147872_ap *= f3; - render.field_147846_at *= f3; - render.field_147854_ax *= f3; - render.field_147852_aq *= f4; - render.field_147860_au *= f4; - render.field_147841_ay *= f4; - render.field_147850_ar *= f5; - render.field_147858_av *= f5; - render.field_147839_az *= f5; - render.field_147848_as *= f6; - render.field_147856_aw *= f6; - render.field_147833_aA *= f6; - render.func_147768_a(block, (double) xPos, (double) yPos, (double) zPos, stillIcon); + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + render.renderFaceYNeg(block, (double) xPos, (double) yPos, (double) zPos, stillIcon); flag = true; } - if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos + 1, zPos, 1)) + if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)) { - if (render.field_147857_k >= 1.0D) + if (render.renderMaxY >= 1.0D) { ++yPos; } - render.field_147880_aa = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147885_ae = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147878_ac = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147887_af = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147813_G = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147824_K = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147822_I = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147817_L = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - flag3 = render.field_147845_a.func_147439_a(xPos + 1, yPos + 1, zPos).func_149751_l(); - flag2 = render.field_147845_a.func_147439_a(xPos - 1, yPos + 1, zPos).func_149751_l(); - flag5 = render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos + 1).func_149751_l(); - flag4 = render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos - 1).func_149751_l(); + render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); + render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); + render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); + render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); + render.aoLightValueScratchXYNP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); + render.aoLightValueScratchXYPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); + render.aoLightValueScratchYZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + render.aoLightValueScratchYZPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); + flag3 = render.blockAccess.getBlock(xPos + 1, yPos + 1, zPos).getCanBlockGrass(); + flag2 = render.blockAccess.getBlock(xPos - 1, yPos + 1, zPos).getCanBlockGrass(); + flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getCanBlockGrass(); + flag4 = render.blockAccess.getBlock(xPos, yPos + 1, zPos - 1).getCanBlockGrass(); if (!flag4 && !flag2) { - render.field_147812_F = render.field_147813_G; - render.field_147836_Z = render.field_147880_aa; + render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXYNP; + render.aoBrightnessXYZNPN = render.aoBrightnessXYNP; } else { - render.field_147812_F = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); - render.field_147836_Z = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos - 1); + render.aoLightValueScratchXYZNPN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1); + render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); } if (!flag4 && !flag3) { - render.field_147823_J = render.field_147824_K; - render.field_147879_ad = render.field_147885_ae; + render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXYPP; + render.aoBrightnessXYZPPN = render.aoBrightnessXYPP; } else { - render.field_147823_J = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); - render.field_147879_ad = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos - 1); + render.aoLightValueScratchXYZPPN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1); + render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); } if (!flag5 && !flag2) { - render.field_147821_H = render.field_147813_G; - render.field_147881_ab = render.field_147880_aa; + render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXYNP; + render.aoBrightnessXYZNPP = render.aoBrightnessXYNP; } else { - render.field_147821_H = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); - render.field_147881_ab = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos + 1); + render.aoLightValueScratchXYZNPP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1); + render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); } if (!flag5 && !flag3) { - render.field_147819_N = render.field_147824_K; - render.field_147882_ag = render.field_147885_ae; + render.aoLightValueScratchXZNN = render.aoLightValueScratchXYPP; + render.aoBrightnessXYZPPP = render.aoBrightnessXYPP; } else { - render.field_147819_N = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); - render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos + 1); + render.aoLightValueScratchXZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); + render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); } - if (render.field_147857_k >= 1.0D) + if (render.renderMaxY >= 1.0D) { --yPos; } i1 = l; - if (render.field_147857_k >= 1.0D || !render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos).func_149662_c()) + if (render.renderMaxY >= 1.0D || !render.blockAccess.getBlock(xPos, yPos + 1, zPos).isOpaqueCube()) { - i1 = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); } - f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - f6 = (render.field_147821_H + render.field_147813_G + render.field_147817_L + f7) / 4.0F; - f3 = (render.field_147817_L + f7 + render.field_147819_N + render.field_147824_K) / 4.0F; - f4 = (f7 + render.field_147822_I + render.field_147824_K + render.field_147823_J) / 4.0F; - f5 = (render.field_147813_G + render.field_147812_F + f7 + render.field_147822_I) / 4.0F; - render.field_147870_ao = render.func_147778_a(render.field_147881_ab, render.field_147880_aa, render.field_147887_af, i1); - render.field_147864_al = render.func_147778_a(render.field_147887_af, render.field_147882_ag, render.field_147885_ae, i1); - render.field_147874_am = render.func_147778_a(render.field_147878_ac, render.field_147885_ae, render.field_147879_ad, i1); - render.field_147876_an = render.func_147778_a(render.field_147880_aa, render.field_147836_Z, render.field_147878_ac, i1); - render.field_147872_ap = render.field_147852_aq = render.field_147850_ar = render.field_147848_as = colorRed; - render.field_147846_at = render.field_147860_au = render.field_147858_av = render.field_147856_aw = colorGreen; - render.field_147854_ax = render.field_147841_ay = render.field_147839_az = render.field_147833_aA = colorBlue; - render.field_147872_ap *= f3; - render.field_147846_at *= f3; - render.field_147854_ax *= f3; - render.field_147852_aq *= f4; - render.field_147860_au *= f4; - render.field_147841_ay *= f4; - render.field_147850_ar *= f5; - render.field_147858_av *= f5; - render.field_147839_az *= f5; - render.field_147848_as *= f6; - render.field_147856_aw *= f6; - render.field_147833_aA *= f6; - render.func_147806_b(block, (double) xPos, (double) yPos, (double) zPos, stillIcon); + f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); + f6 = (render.aoLightValueScratchXYZNPP + render.aoLightValueScratchXYNP + render.aoLightValueScratchYZPP + f7) / 4.0F; + f3 = (render.aoLightValueScratchYZPP + f7 + render.aoLightValueScratchXZNN + 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); + 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; + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + render.renderFaceYPos(block, (double) xPos, (double) yPos, (double) zPos, stillIcon); flag = true; } - if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos, zPos - 1, 2)) + if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)) { - if (render.field_147851_l <= 0.0D) + if (render.renderMinZ <= 0.0D) { --zPos; } - render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147814_A = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147822_I = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147883_ah = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147825_U = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147878_ac = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); - render.field_147866_ai = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); - flag3 = render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos - 1).func_149751_l(); - flag2 = render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos - 1).func_149751_l(); - flag5 = render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos - 1).func_149751_l(); - flag4 = render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos - 1).func_149751_l(); + render.aoLightValueScratchXZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); + render.aoLightValueScratchYZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); + render.aoLightValueScratchYZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); + render.aoLightValueScratchXZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); + render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); + render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); + render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); + render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); + flag3 = render.blockAccess.getBlock(xPos + 1, yPos, zPos - 1).getCanBlockGrass(); + flag2 = render.blockAccess.getBlock(xPos - 1, yPos, zPos - 1).getCanBlockGrass(); + flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos - 1).getCanBlockGrass(); + flag4 = render.blockAccess.getBlock(xPos, yPos - 1, zPos - 1).getCanBlockGrass(); if (!flag2 && !flag4) { - render.field_147888_x = render.field_147820_O; - render.field_147832_R = render.field_147883_ah; + render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; } else { - render.field_147888_x = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); - render.field_147832_R = block.func_149677_c(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.aoLightValueScratchXYZNNN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos); + render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); } if (!flag2 && !flag5) { - render.field_147812_F = render.field_147820_O; - render.field_147836_Z = render.field_147883_ah; + render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; } else { - render.field_147812_F = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos + 1, zPos); - render.field_147836_Z = block.func_149677_c(render.field_147845_a, xPos - 1, yPos + 1, zPos); + render.aoLightValueScratchXYZNPN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos); + render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); } if (!flag3 && !flag4) { - render.field_147816_C = render.field_147820_O; - render.field_147827_W = render.field_147866_ai; + render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; } else { - render.field_147816_C = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); - render.field_147827_W = block.func_149677_c(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.aoLightValueScratchXYZPNN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos); + render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); } if (!flag3 && !flag5) { - render.field_147823_J = render.field_147820_O; - render.field_147879_ad = render.field_147866_ai; + render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; } else { - render.field_147823_J = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos + 1, zPos); - render.field_147879_ad = block.func_149677_c(render.field_147845_a, xPos + 1, yPos + 1, zPos); + render.aoLightValueScratchXYZPPN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); + render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); } - if (render.field_147851_l <= 0.0D) + if (render.renderMinZ <= 0.0D) { ++zPos; } i1 = l; - if (render.field_147851_l <= 0.0D || !render.field_147845_a.func_147439_a(xPos, yPos, zPos - 1).func_149662_c()) + if (render.renderMinZ <= 0.0D || !render.blockAccess.getBlock(xPos, yPos, zPos - 1).isOpaqueCube()) { - i1 = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); } - f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - f3 = (render.field_147820_O + render.field_147812_F + f7 + render.field_147822_I) / 4.0F; - f4 = (f7 + render.field_147822_I + render.field_147820_O + render.field_147823_J) / 4.0F; - f5 = (render.field_147814_A + f7 + render.field_147816_C + render.field_147820_O) / 4.0F; - f6 = (render.field_147888_x + render.field_147820_O + render.field_147814_A + f7) / 4.0F; - render.field_147864_al = render.func_147778_a(render.field_147883_ah, render.field_147836_Z, render.field_147878_ac, i1); - render.field_147874_am = render.func_147778_a(render.field_147878_ac, render.field_147866_ai, render.field_147879_ad, i1); - render.field_147876_an = render.func_147778_a(render.field_147825_U, render.field_147827_W, render.field_147866_ai, i1); - render.field_147870_ao = render.func_147778_a(render.field_147832_R, render.field_147883_ah, render.field_147825_U, i1); + f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + f3 = (render.aoLightValueScratchXZPN + 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.aoLightValueScratchXZPN + 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); if (flag1) { - render.field_147872_ap = render.field_147852_aq = render.field_147850_ar = render.field_147848_as = colorRed * 0.8F; - render.field_147846_at = render.field_147860_au = render.field_147858_av = render.field_147856_aw = colorGreen * 0.8F; - render.field_147854_ax = render.field_147841_ay = render.field_147839_az = render.field_147833_aA = colorBlue * 0.8F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F; } else { - render.field_147872_ap = render.field_147852_aq = render.field_147850_ar = render.field_147848_as = 0.8F; - render.field_147846_at = render.field_147860_au = render.field_147858_av = render.field_147856_aw = 0.8F; - render.field_147854_ax = render.field_147841_ay = render.field_147839_az = render.field_147833_aA = 0.8F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F; } - render.field_147872_ap *= f3; - render.field_147846_at *= f3; - render.field_147854_ax *= f3; - render.field_147852_aq *= f4; - render.field_147860_au *= f4; - render.field_147841_ay *= f4; - render.field_147850_ar *= f5; - render.field_147858_av *= f5; - render.field_147839_az *= f5; - render.field_147848_as *= f6; - render.field_147856_aw *= f6; - render.field_147833_aA *= f6; - render.func_147761_c(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + render.renderFaceZNeg(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); flag = true; } - if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos, zPos + 1, 3)) + if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)) { - if (render.field_147853_m >= 1.0D) + if (render.renderMaxZ >= 1.0D) { ++zPos; } - render.field_147830_P = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147829_Q = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147815_B = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147817_L = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - render.field_147868_aj = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147862_ak = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147828_V = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147887_af = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); - flag3 = render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos + 1).func_149751_l(); - flag2 = render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos + 1).func_149751_l(); - flag5 = render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos + 1).func_149751_l(); - flag4 = render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos + 1).func_149751_l(); + render.aoLightValueScratchXZNP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); + render.aoLightValueScratchXZPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); + render.aoLightValueScratchYZNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); + render.aoLightValueScratchYZPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); + render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); + render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); + render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); + render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); + flag3 = render.blockAccess.getBlock(xPos + 1, yPos, zPos + 1).getCanBlockGrass(); + flag2 = render.blockAccess.getBlock(xPos - 1, yPos, zPos + 1).getCanBlockGrass(); + flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getCanBlockGrass(); + flag4 = render.blockAccess.getBlock(xPos, yPos - 1, zPos + 1).getCanBlockGrass(); if (!flag2 && !flag4) { - render.field_147884_z = render.field_147830_P; - render.field_147826_T = render.field_147868_aj; + render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; } else { - render.field_147884_z = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); - render.field_147826_T = block.func_149677_c(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.aoLightValueScratchXYZNNP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos); + render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); } if (!flag2 && !flag5) { - render.field_147821_H = render.field_147830_P; - render.field_147881_ab = render.field_147868_aj; + render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; } else { - render.field_147821_H = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos + 1, zPos); - render.field_147881_ab = block.func_149677_c(render.field_147845_a, xPos - 1, yPos + 1, zPos); + render.aoLightValueScratchXYZNPP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos); + render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); } if (!flag3 && !flag4) { - render.field_147811_E = render.field_147829_Q; - render.field_147834_Y = render.field_147862_ak; + render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; } else { - render.field_147811_E = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); - render.field_147834_Y = block.func_149677_c(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.aoLightValueScratchXYZPNP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos); + render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); } if (!flag3 && !flag5) { - render.field_147819_N = render.field_147829_Q; - render.field_147882_ag = render.field_147862_ak; + render.aoLightValueScratchXZNN = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; } else { - render.field_147819_N = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos + 1, zPos); - render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos + 1, yPos + 1, zPos); + render.aoLightValueScratchXZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); + render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); } - if (render.field_147853_m >= 1.0D) + if (render.renderMaxZ >= 1.0D) { --zPos; } i1 = l; - if (render.field_147853_m >= 1.0D || !render.field_147845_a.func_147439_a(xPos, yPos, zPos + 1).func_149662_c()) + if (render.renderMaxZ >= 1.0D || !render.blockAccess.getBlock(xPos, yPos, zPos + 1).isOpaqueCube()) { - i1 = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); } - f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - f3 = (render.field_147830_P + render.field_147821_H + f7 + render.field_147817_L) / 4.0F; - f6 = (f7 + render.field_147817_L + render.field_147829_Q + render.field_147819_N) / 4.0F; - f5 = (render.field_147815_B + f7 + render.field_147811_E + render.field_147829_Q) / 4.0F; - f4 = (render.field_147884_z + render.field_147830_P + render.field_147815_B + f7) / 4.0F; - render.field_147864_al = render.func_147778_a(render.field_147868_aj, render.field_147881_ab, render.field_147887_af, i1); - render.field_147870_ao = render.func_147778_a(render.field_147887_af, render.field_147862_ak, render.field_147882_ag, i1); - render.field_147876_an = render.func_147778_a(render.field_147828_V, render.field_147834_Y, render.field_147862_ak, i1); - render.field_147874_am = render.func_147778_a(render.field_147826_T, render.field_147868_aj, render.field_147828_V, i1); + f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); + f3 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + f7 + render.aoLightValueScratchYZPP) / 4.0F; + f6 = (f7 + render.aoLightValueScratchYZPP + render.aoLightValueScratchXZPP + render.aoLightValueScratchXZNN) / 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); if (flag1) { - render.field_147872_ap = render.field_147852_aq = render.field_147850_ar = render.field_147848_as = colorRed * 0.8F; - render.field_147846_at = render.field_147860_au = render.field_147858_av = render.field_147856_aw = colorGreen * 0.8F; - render.field_147854_ax = render.field_147841_ay = render.field_147839_az = render.field_147833_aA = colorBlue * 0.8F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F; } else { - render.field_147872_ap = render.field_147852_aq = render.field_147850_ar = render.field_147848_as = 0.8F; - render.field_147846_at = render.field_147860_au = render.field_147858_av = render.field_147856_aw = 0.8F; - render.field_147854_ax = render.field_147841_ay = render.field_147839_az = render.field_147833_aA = 0.8F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F; } - render.field_147872_ap *= f3; - render.field_147846_at *= f3; - render.field_147854_ax *= f3; - render.field_147852_aq *= f4; - render.field_147860_au *= f4; - render.field_147841_ay *= f4; - render.field_147850_ar *= f5; - render.field_147858_av *= f5; - render.field_147839_az *= f5; - render.field_147848_as *= f6; - render.field_147856_aw *= f6; - render.field_147833_aA *= f6; - render.func_147734_d(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + render.renderFaceZPos(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); flag = true; } - if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos - 1, yPos, zPos, 4)) + if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)) { - if (render.field_147859_h <= 0.0D) + if (render.renderMinX <= 0.0D) { --xPos; } - render.field_147886_y = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147830_P = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147813_G = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - render.field_147831_S = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147883_ah = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147868_aj = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147880_aa = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); - flag3 = render.field_147845_a.func_147439_a(xPos - 1, yPos + 1, zPos).func_149751_l(); - flag2 = render.field_147845_a.func_147439_a(xPos - 1, yPos - 1, zPos).func_149751_l(); - flag5 = render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos - 1).func_149751_l(); - flag4 = render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos + 1).func_149751_l(); + render.aoLightValueScratchXYNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); + render.aoLightValueScratchXZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + render.aoLightValueScratchXZNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); + render.aoLightValueScratchXYNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); + render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); + render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); + render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); + render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); + flag3 = render.blockAccess.getBlock(xPos - 1, yPos + 1, zPos).getCanBlockGrass(); + flag2 = render.blockAccess.getBlock(xPos - 1, yPos - 1, zPos).getCanBlockGrass(); + flag5 = render.blockAccess.getBlock(xPos - 1, yPos, zPos - 1).getCanBlockGrass(); + flag4 = render.blockAccess.getBlock(xPos - 1, yPos, zPos + 1).getCanBlockGrass(); if (!flag5 && !flag2) { - render.field_147888_x = render.field_147820_O; - render.field_147832_R = render.field_147883_ah; + render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; } else { - render.field_147888_x = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); - render.field_147832_R = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.aoLightValueScratchXYZNNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1); + render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); } if (!flag4 && !flag2) { - render.field_147884_z = render.field_147830_P; - render.field_147826_T = render.field_147868_aj; + render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; } else { - render.field_147884_z = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); - render.field_147826_T = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.aoLightValueScratchXYZNNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1); + render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); } if (!flag5 && !flag3) { - render.field_147812_F = render.field_147820_O; - render.field_147836_Z = render.field_147883_ah; + render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; } else { - render.field_147812_F = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos - 1); - render.field_147836_Z = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos - 1); + render.aoLightValueScratchXYZNPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1); + render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); } if (!flag4 && !flag3) { - render.field_147821_H = render.field_147830_P; - render.field_147881_ab = render.field_147868_aj; + render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; } else { - render.field_147821_H = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos + 1); - render.field_147881_ab = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos + 1); + render.aoLightValueScratchXYZNPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); + render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); } - if (render.field_147859_h <= 0.0D) + if (render.renderMinX <= 0.0D) { ++xPos; } i1 = l; - if (render.field_147859_h <= 0.0D || !render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos).func_149662_c()) + if (render.renderMinX <= 0.0D || !render.blockAccess.getBlock(xPos - 1, yPos, zPos).isOpaqueCube()) { - i1 = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); } - f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - f6 = (render.field_147886_y + render.field_147884_z + f7 + render.field_147830_P) / 4.0F; - f3 = (f7 + render.field_147830_P + render.field_147813_G + render.field_147821_H) / 4.0F; - f4 = (render.field_147820_O + f7 + render.field_147812_F + render.field_147813_G) / 4.0F; - f5 = (render.field_147888_x + render.field_147886_y + render.field_147820_O + f7) / 4.0F; - render.field_147870_ao = render.func_147778_a(render.field_147831_S, render.field_147826_T, render.field_147868_aj, i1); - render.field_147864_al = render.func_147778_a(render.field_147868_aj, render.field_147880_aa, render.field_147881_ab, i1); - render.field_147874_am = render.func_147778_a(render.field_147883_ah, render.field_147836_Z, render.field_147880_aa, i1); - render.field_147876_an = render.func_147778_a(render.field_147832_R, render.field_147831_S, render.field_147883_ah, i1); + f7 = getAmbientOcclusionLightValue(render.blockAccess, 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.aoLightValueScratchXZPN + f7 + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F; + f5 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZPN + 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); if (flag1) { - render.field_147872_ap = render.field_147852_aq = render.field_147850_ar = render.field_147848_as = colorRed * 0.6F; - render.field_147846_at = render.field_147860_au = render.field_147858_av = render.field_147856_aw = colorGreen * 0.6F; - render.field_147854_ax = render.field_147841_ay = render.field_147839_az = render.field_147833_aA = colorBlue * 0.6F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F; } else { - render.field_147872_ap = render.field_147852_aq = render.field_147850_ar = render.field_147848_as = 0.6F; - render.field_147846_at = render.field_147860_au = render.field_147858_av = render.field_147856_aw = 0.6F; - render.field_147854_ax = render.field_147841_ay = render.field_147839_az = render.field_147833_aA = 0.6F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F; } - render.field_147872_ap *= f3; - render.field_147846_at *= f3; - render.field_147854_ax *= f3; - render.field_147852_aq *= f4; - render.field_147860_au *= f4; - render.field_147841_ay *= f4; - render.field_147850_ar *= f5; - render.field_147858_av *= f5; - render.field_147839_az *= f5; - render.field_147848_as *= f6; - render.field_147856_aw *= f6; - render.field_147833_aA *= f6; - render.func_147798_e(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + render.renderFaceXNeg(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); flag = true; } - if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos + 1, yPos, zPos, 5)) + if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)) { - if (render.field_147861_i >= 1.0D) + if (render.renderMaxX >= 1.0D) { ++xPos; } - render.field_147810_D = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147829_Q = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147824_K = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - render.field_147835_X = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147866_ai = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147862_ak = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147885_ae = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); - flag3 = render.field_147845_a.func_147439_a(xPos + 1, yPos + 1, zPos).func_149751_l(); - flag2 = render.field_147845_a.func_147439_a(xPos + 1, yPos - 1, zPos).func_149751_l(); - flag5 = render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos + 1).func_149751_l(); - flag4 = render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos - 1).func_149751_l(); + render.aoLightValueScratchXYPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); + render.aoLightValueScratchXZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + render.aoLightValueScratchXZPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); + render.aoLightValueScratchXYPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); + render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); + render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); + render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); + render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); + flag3 = render.blockAccess.getBlock(xPos + 1, yPos + 1, zPos).getCanBlockGrass(); + flag2 = render.blockAccess.getBlock(xPos + 1, yPos - 1, zPos).getCanBlockGrass(); + flag5 = render.blockAccess.getBlock(xPos + 1, yPos, zPos + 1).getCanBlockGrass(); + flag4 = render.blockAccess.getBlock(xPos + 1, yPos, zPos - 1).getCanBlockGrass(); if (!flag2 && !flag4) { - render.field_147816_C = render.field_147820_O; - render.field_147827_W = render.field_147866_ai; + render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; } else { - render.field_147816_C = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); - render.field_147827_W = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.aoLightValueScratchXYZPNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1); + render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); } if (!flag2 && !flag5) { - render.field_147811_E = render.field_147829_Q; - render.field_147834_Y = render.field_147862_ak; + render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; } else { - render.field_147811_E = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); - render.field_147834_Y = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.aoLightValueScratchXYZPNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1); + render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); } if (!flag3 && !flag4) { - render.field_147823_J = render.field_147820_O; - render.field_147879_ad = render.field_147866_ai; + render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; } else { - render.field_147823_J = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos - 1); - render.field_147879_ad = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos - 1); + render.aoLightValueScratchXYZPPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1); + render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); } if (!flag3 && !flag5) { - render.field_147819_N = render.field_147829_Q; - render.field_147882_ag = render.field_147862_ak; + render.aoLightValueScratchXZNN = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; } else { - render.field_147819_N = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos + 1); - render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos + 1); + render.aoLightValueScratchXZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); + render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); } - if (render.field_147861_i >= 1.0D) + if (render.renderMaxX >= 1.0D) { --xPos; } i1 = l; - if (render.field_147861_i >= 1.0D || !render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos).func_149662_c()) + if (render.renderMaxX >= 1.0D || !render.blockAccess.getBlock(xPos + 1, yPos, zPos).isOpaqueCube()) { - i1 = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); } - f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - f3 = (render.field_147810_D + render.field_147811_E + f7 + render.field_147829_Q) / 4.0F; - f4 = (render.field_147816_C + render.field_147810_D + render.field_147820_O + f7) / 4.0F; - f5 = (render.field_147820_O + f7 + render.field_147823_J + render.field_147824_K) / 4.0F; - f6 = (f7 + render.field_147829_Q + render.field_147824_K + render.field_147819_N) / 4.0F; - render.field_147864_al = render.func_147778_a(render.field_147835_X, render.field_147834_Y, render.field_147862_ak, i1); - render.field_147870_ao = render.func_147778_a(render.field_147862_ak, render.field_147885_ae, render.field_147882_ag, i1); - render.field_147876_an = render.func_147778_a(render.field_147866_ai, render.field_147879_ad, render.field_147885_ae, i1); - render.field_147874_am = render.func_147778_a(render.field_147827_W, render.field_147835_X, render.field_147866_ai, i1); + f7 = getAmbientOcclusionLightValue(render.blockAccess, 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.aoLightValueScratchXZNN) / 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); if (flag1) { - render.field_147872_ap = render.field_147852_aq = render.field_147850_ar = render.field_147848_as = colorRed * 0.6F; - render.field_147846_at = render.field_147860_au = render.field_147858_av = render.field_147856_aw = colorGreen * 0.6F; - render.field_147854_ax = render.field_147841_ay = render.field_147839_az = render.field_147833_aA = colorBlue * 0.6F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F; } else { - render.field_147872_ap = render.field_147852_aq = render.field_147850_ar = render.field_147848_as = 0.6F; - render.field_147846_at = render.field_147860_au = render.field_147858_av = render.field_147856_aw = 0.6F; - render.field_147854_ax = render.field_147841_ay = render.field_147839_az = render.field_147833_aA = 0.6F; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F; } - render.field_147872_ap *= f3; - render.field_147846_at *= f3; - render.field_147854_ax *= f3; - render.field_147852_aq *= f4; - render.field_147860_au *= f4; - render.field_147841_ay *= f4; - render.field_147850_ar *= f5; - render.field_147858_av *= f5; - render.field_147839_az *= f5; - render.field_147848_as *= f6; - render.field_147856_aw *= f6; - render.field_147833_aA *= f6; - render.func_147764_f(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + render.renderFaceXPos(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); flag = true; } - render.field_147863_w = false; + render.enableAO = false; return flag; } @@ -1595,7 +1595,7 @@ public class BlockSkinRenderHelper IBlockAccess world) { Block block = Blocks.stone; - render.field_147863_w = false; + render.enableAO = false; Tessellator tessellator = Tessellator.instance; boolean flag = false; float f3 = 0.5F; @@ -1628,58 +1628,58 @@ public class BlockSkinRenderHelper f18 = f6 * colorBlue; } - int l = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos); + int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos); - if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos - 1, zPos, 0)) + if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0)) { - tessellator.setBrightness(render.field_147855_j > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos)); + tessellator.setBrightness(render.renderMinY > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos)); tessellator.setColorOpaque_F(f10, f13, f16); - render.func_147768_a(block, (double) xPos, (double) yPos, (double) zPos, stillIcon); + render.renderFaceYNeg(block, (double) xPos, (double) yPos, (double) zPos, stillIcon); flag = true; } - if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos + 1, zPos, 1)) + if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1)) { - tessellator.setBrightness(render.field_147857_k < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos)); + tessellator.setBrightness(render.renderMaxY < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos)); tessellator.setColorOpaque_F(f7, f8, f9); - render.func_147806_b(block, (double) xPos, (double) yPos, (double) zPos, stillIcon); + render.renderFaceYPos(block, (double) xPos, (double) yPos, (double) zPos, stillIcon); flag = true; } IIcon icon; - if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos, zPos - 1, 2)) + if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2)) { - tessellator.setBrightness(render.field_147851_l > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1)); + tessellator.setBrightness(render.renderMinZ > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1)); tessellator.setColorOpaque_F(f11, f14, f17); - render.func_147761_c(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); + render.renderFaceZNeg(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); flag = true; } - if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos, yPos, zPos + 1, 3)) + if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3)) { - tessellator.setBrightness(render.field_147853_m < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1)); + tessellator.setBrightness(render.renderMaxZ < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1)); tessellator.setColorOpaque_F(f11, f14, f17); - render.func_147734_d(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); + render.renderFaceZPos(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); flag = true; } - if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos - 1, yPos, zPos, 4)) + if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4)) { - tessellator.setBrightness(render.field_147859_h > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos)); + tessellator.setBrightness(render.renderMinX > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos)); tessellator.setColorOpaque_F(f12, f15, f18); - render.func_147798_e(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); + render.renderFaceXNeg(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); flag = true; } - if (render.field_147837_f || block. func_149646_a(render.field_147845_a, xPos + 1, yPos, zPos, 5)) + if (render.renderAllFaces || block. shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5)) { - tessellator.setBrightness(render.field_147861_i < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos)); + tessellator.setBrightness(render.renderMaxX < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos)); tessellator.setColorOpaque_F(f12, f15, f18); - render.func_147764_f(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); + render.renderFaceXPos(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); flag = true; } @@ -1687,6 +1687,6 @@ public class BlockSkinRenderHelper return flag; } public static float getAmbientOcclusionLightValue(IBlockAccess access, int x, int y, int z){ - return access.func_147439_a(x, y, z).func_149685_I(); + return access.getBlock(x, y, z).getAmbientOcclusionLightValue(); } } diff --git a/src/main/java/tconstruct/client/block/BreakingFX.java b/src/main/java/tconstruct/client/block/BreakingFX.java index d526f74b..ecf3b7e4 100644 --- a/src/main/java/tconstruct/client/block/BreakingFX.java +++ b/src/main/java/tconstruct/client/block/BreakingFX.java @@ -22,7 +22,7 @@ public class BreakingFX extends EntityFX super(par1World, par2, par4, par6, 0.0D, 0.0D, 0.0D); this.setParticleIcon(par8Item.getIconFromDamage(par9)); this.particleRed = this.particleGreen = this.particleBlue = 1.0F; - this.particleGravity = Blocks.snow.field_149763_I; + this.particleGravity = Blocks.snow.blockParticleGravity; this.particleScale /= 2.0F; } diff --git a/src/main/java/tconstruct/client/block/CastingBasinSpecialRender.java b/src/main/java/tconstruct/client/block/CastingBasinSpecialRender.java index 4c46669e..af07007f 100644 --- a/src/main/java/tconstruct/client/block/CastingBasinSpecialRender.java +++ b/src/main/java/tconstruct/client/block/CastingBasinSpecialRender.java @@ -16,7 +16,7 @@ import tconstruct.library.ItemBlocklike; public class CastingBasinSpecialRender extends TileEntitySpecialRenderer { @Override - public void func_147500_a (TileEntity logic, double var2, double var4, double var6, float var8) + public void renderTileEntityAt (TileEntity logic, double var2, double var4, double var6, float var8) { this.render((CastingBasinLogic) logic, var2, var4, var6, var8); } @@ -63,7 +63,7 @@ public class CastingBasinSpecialRender extends TileEntitySpecialRenderer } RenderItem.renderInFrame = true; - RenderManager.instance.func_147940_a(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F); + RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F); RenderItem.renderInFrame = false; GL11.glPopMatrix(); diff --git a/src/main/java/tconstruct/client/block/CastingTableSpecialRenderer.java b/src/main/java/tconstruct/client/block/CastingTableSpecialRenderer.java index 5fa5e46e..5c54e342 100644 --- a/src/main/java/tconstruct/client/block/CastingTableSpecialRenderer.java +++ b/src/main/java/tconstruct/client/block/CastingTableSpecialRenderer.java @@ -16,7 +16,7 @@ import tconstruct.library.ItemBlocklike; public class CastingTableSpecialRenderer extends TileEntitySpecialRenderer { @Override - public void func_147500_a (TileEntity logic, double var2, double var4, double var6, float var8) + public void renderTileEntityAt (TileEntity logic, double var2, double var4, double var6, float var8) { //TConstruct.logger.info("Render!!!"); this.render((CastingTableLogic) logic, var2, var4, var6, var8); @@ -62,7 +62,7 @@ public class CastingTableSpecialRenderer extends TileEntitySpecialRenderer } RenderItem.renderInFrame = true; - RenderManager.instance.func_147940_a(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F); + RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F); RenderItem.renderInFrame = false; GL11.glPopMatrix(); diff --git a/src/main/java/tconstruct/client/block/DryingRackRender.java b/src/main/java/tconstruct/client/block/DryingRackRender.java index 9cfbec00..b0ec3687 100644 --- a/src/main/java/tconstruct/client/block/DryingRackRender.java +++ b/src/main/java/tconstruct/client/block/DryingRackRender.java @@ -21,7 +21,7 @@ public class DryingRackRender implements ISimpleBlockRenderingHandler { if (modelID == model) { - renderer.func_147782_a(0.375F, 0.375F, 0.0F, 0.625F, 0.625F, 1.0F); + renderer.setRenderBounds(0.375F, 0.375F, 0.0F, 0.625F, 0.625F, 1.0F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); } } @@ -34,30 +34,30 @@ public class DryingRackRender implements ISimpleBlockRenderingHandler int metadata = world.getBlockMetadata(x, y, z); if (metadata == 0) { - renderer.func_147782_a(0.0F, 0.0, 0.375F, 1.0F, 0.25F, 0.625F); + renderer.setRenderBounds(0.0F, 0.0, 0.375F, 1.0F, 0.25F, 0.625F); } if (metadata == 1) { - renderer.func_147782_a(0.375F, 0.0, 0.0f, 0.625F, 0.25F, 1F); + renderer.setRenderBounds(0.375F, 0.0, 0.0f, 0.625F, 0.25F, 1F); } if (metadata == 2) { - renderer.func_147782_a(0.0F, 0.75F, 0.75F, 1F, 1.0F, 1F); + renderer.setRenderBounds(0.0F, 0.75F, 0.75F, 1F, 1.0F, 1F); } if (metadata == 3) { - renderer.func_147782_a(0.0F, 0.75F, 0F, 1F, 1.0F, 0.25F); + renderer.setRenderBounds(0.0F, 0.75F, 0F, 1F, 1.0F, 0.25F); } if (metadata == 4) { - renderer.func_147782_a(0.75F, 0.75F, 0.0f, 1F, 1.0F, 1F); + renderer.setRenderBounds(0.75F, 0.75F, 0.0f, 1F, 1.0F, 1F); } if (metadata == 5) { - renderer.func_147782_a(0F, 0.75F, 0.0f, 0.25F, 1.0F, 1F); + renderer.setRenderBounds(0F, 0.75F, 0.0f, 0.25F, 1.0F, 1F); } - renderer.func_147784_q(block, x, y, z); + renderer.renderStandardBlock(block, x, y, z); } return true; } @@ -80,27 +80,27 @@ public class DryingRackRender implements ISimpleBlockRenderingHandler GL11.glTranslatef(-0.5F, -0.5F, -0.5F); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, -1F, 0.0F); - renderblocks.func_147768_a(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(0, meta)); + renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderblocks.func_147806_b(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(1, meta)); + renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1F); - renderblocks.func_147761_c(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(2, meta)); + renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderblocks.func_147734_d(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(3, meta)); + renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1F, 0.0F, 0.0F); - renderblocks.func_147798_e(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(4, meta)); + renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderblocks.func_147764_f(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(5, meta)); + renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta)); tessellator.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } diff --git a/src/main/java/tconstruct/client/block/DryingRackSpecialRender.java b/src/main/java/tconstruct/client/block/DryingRackSpecialRender.java index 0902d30e..4734e225 100644 --- a/src/main/java/tconstruct/client/block/DryingRackSpecialRender.java +++ b/src/main/java/tconstruct/client/block/DryingRackSpecialRender.java @@ -46,7 +46,7 @@ public class DryingRackSpecialRender extends TileEntitySpecialRenderer entityitem.getEntityItem().stackSize = 1; entityitem.hoverStart = 0.0F; GL11.glPushMatrix(); - int meta = logic.getWorld().getBlockMetadata(logic.field_145851_c, logic.field_145848_d, logic.field_145849_e); + int meta = logic.getWorld().getBlockMetadata(logic.xCoord, logic.yCoord, logic.zCoord); if (meta <= 1) GL11.glTranslatef(1F, -0.375F, 0.905F); else @@ -75,14 +75,14 @@ public class DryingRackSpecialRender extends TileEntitySpecialRenderer } RenderItem.renderInFrame = true; - RenderManager.instance.func_147940_a(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F); + RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F); RenderItem.renderInFrame = false; GL11.glPopMatrix(); } @Override - public void func_147500_a (TileEntity logic, double var2, double var4, double var6, float var8) + public void renderTileEntityAt (TileEntity logic, double var2, double var4, double var6, float var8) { this.render((DryingRackLogic) logic, var2, var4, var6, var8); } diff --git a/src/main/java/tconstruct/client/block/FrypanRender.java b/src/main/java/tconstruct/client/block/FrypanRender.java index 8bce6e26..28c66131 100644 --- a/src/main/java/tconstruct/client/block/FrypanRender.java +++ b/src/main/java/tconstruct/client/block/FrypanRender.java @@ -19,18 +19,18 @@ public class FrypanRender implements ISimpleBlockRenderingHandler @Override public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { - renderer.func_147782_a(0.0F, 0.0F, 0.0F, 1.0F, 0.125F, 1.0F); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.0F, 0.125F, 0.0F, 0.125F, 0.25F, 1.0F); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.125F, 0.125F, 0.875F, 0.875F, 0.25F, 1.0F); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.875F, 0.125F, 0.0F, 1.0F, 0.25F, 1.0F); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.125F, 0.125F, 0.0F, 0.875F, 0.25F, 0.125F); - renderer.func_147784_q(block, x, y, z); - // renderer.func_147782_a(1F, 0.0F, 0.4375F, 2F, 0.125F, 0.5625F); - // renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.125F, 1.0F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.0F, 0.125F, 0.0F, 0.125F, 0.25F, 1.0F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.125F, 0.125F, 0.875F, 0.875F, 0.25F, 1.0F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.875F, 0.125F, 0.0F, 1.0F, 0.25F, 1.0F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.125F, 0.125F, 0.0F, 0.875F, 0.25F, 0.125F); + renderer.renderStandardBlock(block, x, y, z); + // renderer.setRenderBounds(1F, 0.0F, 0.4375F, 2F, 0.125F, 0.5625F); + // renderer.renderStandardBlock(block, x, y, z); renderHandle(world, x, y, z, block, renderer); return true; } @@ -40,20 +40,20 @@ public class FrypanRender implements ISimpleBlockRenderingHandler switch (world.getBlockMetadata(x, y, z)) { case 0: - renderer.func_147782_a(1F, 0.0F, 0.4375F, 2F, 0.125F, 0.5625F); + renderer.setRenderBounds(1F, 0.0F, 0.4375F, 2F, 0.125F, 0.5625F); break; case 1: - renderer.func_147782_a(-1F, 0.0F, 0.4375F, 0F, 0.125F, 0.5625F); + renderer.setRenderBounds(-1F, 0.0F, 0.4375F, 0F, 0.125F, 0.5625F); break; case 2: - renderer.func_147782_a(0.4375F, 0.0F, -1F, 0.5625F, 0.125F, 0F); + renderer.setRenderBounds(0.4375F, 0.0F, -1F, 0.5625F, 0.125F, 0F); break; case 3: - renderer.func_147782_a(0.4375F, 0.0F, 1F, 0.5625F, 0.125F, 2F); + renderer.setRenderBounds(0.4375F, 0.0F, 1F, 0.5625F, 0.125F, 2F); break; } - renderer.func_147784_q(block, x, y, z); + renderer.renderStandardBlock(block, x, y, z); } @Override diff --git a/src/main/java/tconstruct/client/block/OreberryRender.java b/src/main/java/tconstruct/client/block/OreberryRender.java index b52a1158..b5695d25 100644 --- a/src/main/java/tconstruct/client/block/OreberryRender.java +++ b/src/main/java/tconstruct/client/block/OreberryRender.java @@ -20,18 +20,18 @@ public class OreberryRender implements ISimpleBlockRenderingHandler int md = world.getBlockMetadata(x, y, z); if (md < 4) { - renderer.func_147782_a(0.25F, 0.0F, 0.25F, 0.75F, 0.5F, 0.75F); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.25F, 0.0F, 0.25F, 0.75F, 0.5F, 0.75F); + renderer.renderStandardBlock(block, x, y, z); } else if (md < 8) { - renderer.func_147782_a(0.125F, 0.0F, 0.125F, 0.875F, 0.75F, 0.875F); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.125F, 0.0F, 0.125F, 0.875F, 0.75F, 0.875F); + renderer.renderStandardBlock(block, x, y, z); } else { - renderer.func_147782_a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + renderer.renderStandardBlock(block, x, y, z); } } return true; @@ -42,7 +42,7 @@ public class OreberryRender implements ISimpleBlockRenderingHandler { if (modelID == model) { - renderer.func_147782_a(0.125F, 0.0F, 0.125F, 0.875F, 0.75F, 0.875F); + renderer.setRenderBounds(0.125F, 0.0F, 0.125F, 0.875F, 0.75F, 0.875F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); } } diff --git a/src/main/java/tconstruct/client/block/PaneConnectedRender.java b/src/main/java/tconstruct/client/block/PaneConnectedRender.java index 7760598a..e6d56f2c 100644 --- a/src/main/java/tconstruct/client/block/PaneConnectedRender.java +++ b/src/main/java/tconstruct/client/block/PaneConnectedRender.java @@ -28,8 +28,8 @@ public class PaneConnectedRender implements ISimpleBlockRenderingHandler @Override public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - boolean temp = renderer.field_147837_f; - renderer.field_147837_f = true; + boolean temp = renderer.renderAllFaces; + renderer.renderAllFaces = true; GlassPaneConnected pane = (GlassPaneConnected) block; @@ -42,46 +42,46 @@ public class PaneConnectedRender implements ISimpleBlockRenderingHandler if (!flag && !flag1 && !flag2 && !flag3) { - renderer.func_147782_a(0D, 0D, 0.45D, 1D, 1D, 0.55D); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.45D, 0D, 0D, 0.55D, 1D, 1D); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0D, 0D, 0.45D, 1D, 1D, 0.55D); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.45D, 0D, 0D, 0.55D, 1D, 1D); + renderer.renderStandardBlock(block, x, y, z); } else { - // renderer.func_147782_a(0.45D, 0D, 0.45D, 0.55D, 1D, 0.55D); - // renderer.func_147784_q(block, x, y, z); + // renderer.setRenderBounds(0.45D, 0D, 0.45D, 0.55D, 1D, 0.55D); + // renderer.renderStandardBlock(block, x, y, z); } // renderer.setOverrideBlockTexture(sideTexture); if (flag) { - renderer.func_147782_a(0.45D, 0D, 0.45D, 1D, 1D, 0.55D); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.45D, 0D, 0.45D, 1D, 1D, 0.55D); + renderer.renderStandardBlock(block, x, y, z); } if (flag1) { - renderer.func_147782_a(0D, 0D, 0.45D, 0.45D, 1D, 0.55D); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0D, 0D, 0.45D, 0.45D, 1D, 0.55D); + renderer.renderStandardBlock(block, x, y, z); } if (flag2) { - renderer.func_147782_a(0.45D, 0D, 0.45D, 0.55D, 1D, 1D); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.45D, 0D, 0.45D, 0.55D, 1D, 1D); + renderer.renderStandardBlock(block, x, y, z); } if (flag3) { - renderer.func_147782_a(0.45D, 0D, 0D, 0.55D, 1D, 0.45D); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.45D, 0D, 0D, 0.55D, 1D, 0.45D); + renderer.renderStandardBlock(block, x, y, z); } - renderer.func_147771_a(); + renderer.clearOverrideBlockTexture(); - renderer.field_147837_f = false; + renderer.renderAllFaces = false; return true; } diff --git a/src/main/java/tconstruct/client/block/PaneRender.java b/src/main/java/tconstruct/client/block/PaneRender.java index 6a8ee44d..af817c5d 100644 --- a/src/main/java/tconstruct/client/block/PaneRender.java +++ b/src/main/java/tconstruct/client/block/PaneRender.java @@ -22,7 +22,7 @@ public class PaneRender implements ISimpleBlockRenderingHandler { if (modelID == model) { - renderer.func_147782_a(0.0F, 0.0F, 0.4375F, 1.0F, 1.0F, 0.5625F); + renderer.setRenderBounds(0.0F, 0.0F, 0.4375F, 1.0F, 1.0F, 0.5625F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); } } @@ -57,9 +57,9 @@ public class PaneRender implements ISimpleBlockRenderingHandler { int l = iblockaccess.getHeight(); Tessellator tessellator = Tessellator.instance; - tessellator.setBrightness(pane.func_149677_c(iblockaccess, x, y, z)); + tessellator.setBrightness(pane.getMixedBrightnessForBlock(iblockaccess, x, y, z)); float f = 1.0F; - int i1 = pane.func_149720_d(iblockaccess, x, y, z); + int i1 = pane.colorMultiplier(iblockaccess, x, y, z); float f1 = (float) (i1 >> 16 & 0xff) / 255F; float f2 = (float) (i1 >> 8 & 0xff) / 255F; float f3 = (float) (i1 & 0xff) / 255F; @@ -78,7 +78,7 @@ public class PaneRender implements ISimpleBlockRenderingHandler IIcon icon; IIcon icon1; int meta = iblockaccess.getBlockMetadata(x, y, z); - icon = renderblocks.func_147787_a(pane, 0, meta); + icon = renderblocks.getBlockIconFromSideAndMetadata(pane, 0, meta); icon1 = pane.getSideTextureIndex(meta); meta = icon.getIconWidth(); @@ -99,8 +99,8 @@ public class PaneRender implements ISimpleBlockRenderingHandler /*int blockTextureIndex; int blockSideIndex; - int j1 = iblockaccess.func_147439_aMetadata(x, y, z); - blockTextureIndex = pane.func_147439_aTextureFromSideAndMetadata(0, j1); + int j1 = iblockaccess.getBlockMetadata(x, y, z); + blockTextureIndex = pane.getBlockTextureFromSideAndMetadata(0, j1); blockSideIndex = pane.getSideTextureIndex(j1); int k1 = (blockTextureIndex & 0xf) << 4; @@ -133,8 +133,8 @@ public class PaneRender implements ISimpleBlockRenderingHandler boolean south = pane.canConnectTo(iblockaccess, x - 1, y, z, ForgeDirection.EAST); boolean north = pane.canConnectTo(iblockaccess, x + 1, y, z, ForgeDirection.WEST); - boolean renderAbove = pane.func_149646_a(iblockaccess, x, y + 1, z, 1); - boolean renderBelow = pane.func_149646_a(iblockaccess, x, y - 1, z, 0); + boolean renderAbove = pane.shouldSideBeRendered(iblockaccess, x, y + 1, z, 1); + boolean renderBelow = pane.shouldSideBeRendered(iblockaccess, x, y - 1, z, 0); if ((!south || !north) && (south || north || west || east)) { if (south && !north) diff --git a/src/main/java/tconstruct/client/block/PunjiRender.java b/src/main/java/tconstruct/client/block/PunjiRender.java index 15b3b2d6..2e06535b 100644 --- a/src/main/java/tconstruct/client/block/PunjiRender.java +++ b/src/main/java/tconstruct/client/block/PunjiRender.java @@ -19,7 +19,7 @@ public class PunjiRender implements ISimpleBlockRenderingHandler { if (modelID == model) { - renderer.func_147782_a(0.4375, 0.0, 0.4375, 0.5625, 1.0f, 0.5625); + renderer.setRenderBounds(0.4375, 0.0, 0.4375, 0.5625, 1.0f, 0.5625); renderStandardInvBlock(renderer, block, metadata); } } @@ -30,45 +30,45 @@ public class PunjiRender implements ISimpleBlockRenderingHandler if (modelID == model) { int metadata = world.getBlockMetadata(x, y, z); - renderer.func_147782_a(0.4375, 0.0, 0.4375, 0.5625, 0.375f, 0.5625); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.4375, 0.0, 0.4375, 0.5625, 0.375f, 0.5625); + renderer.renderStandardBlock(block, x, y, z); if (metadata >= 1) { - renderer.func_147782_a(0.125, 0.0, 0.125, 0.25, 0.375f, 0.25); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.125, 0.0, 0.125, 0.25, 0.375f, 0.25); + renderer.renderStandardBlock(block, x, y, z); } if (metadata >= 2) { - renderer.func_147782_a(0.75, 0.0, 0.75, 0.875, 0.375f, 0.875); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.75, 0.0, 0.75, 0.875, 0.375f, 0.875); + renderer.renderStandardBlock(block, x, y, z); } if (metadata >= 3) { - renderer.func_147782_a(0.125, 0.0, 0.75, 0.25, 0.375f, 0.875); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.125, 0.0, 0.75, 0.25, 0.375f, 0.875); + renderer.renderStandardBlock(block, x, y, z); } if (metadata >= 4) { - renderer.func_147782_a(0.75, 0.0, 0.125, 0.875, 0.375f, 0.25); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.75, 0.0, 0.125, 0.875, 0.375f, 0.25); + renderer.renderStandardBlock(block, x, y, z); } /*if (metadata == 5) { - renderer.func_147782_a(0.0F, 0.0, 0.0F, 1.0F, 0.875F, 1.0F); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.0F, 0.0, 0.0F, 1.0F, 0.875F, 1.0F); + renderer.renderStandardBlock(block, x, y, z); } else { - renderer.func_147782_a(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.0F, 0.0F, 0.0F, 0.25F, 0.75F, 0.25F); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.75F, 0.0F, 0.0F, 1.0F, 0.75F, 0.25F); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.0F, 0.0F, 0.75F, 0.25F, 0.75F, 1.0F); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.75F, 0.0F, 0.75F, 1.0F, 0.75F, 1.0F); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 0.25F, 0.75F, 0.25F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.75F, 0.0F, 0.0F, 1.0F, 0.75F, 0.25F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.0F, 0.0F, 0.75F, 0.25F, 0.75F, 1.0F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.75F, 0.0F, 0.75F, 1.0F, 0.75F, 1.0F); + renderer.renderStandardBlock(block, x, y, z); }*/ } return true; @@ -92,27 +92,27 @@ public class PunjiRender implements ISimpleBlockRenderingHandler GL11.glTranslatef(-0.5F, -0.5F, -0.5F); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, -1F, 0.0F); - renderblocks.func_147768_a(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(0, meta)); + renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderblocks.func_147806_b(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(1, meta)); + renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1F); - renderblocks.func_147761_c(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(2, meta)); + renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderblocks.func_147734_d(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(3, meta)); + renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1F, 0.0F, 0.0F); - renderblocks.func_147798_e(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(4, meta)); + renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderblocks.func_147764_f(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(5, meta)); + renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta)); tessellator.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } diff --git a/src/main/java/tconstruct/client/block/RenderLandmine.java b/src/main/java/tconstruct/client/block/RenderLandmine.java index 2cc6b502..e965bce9 100644 --- a/src/main/java/tconstruct/client/block/RenderLandmine.java +++ b/src/main/java/tconstruct/client/block/RenderLandmine.java @@ -27,7 +27,7 @@ public class RenderLandmine implements ISimpleBlockRenderingHandler GL11.glPushMatrix(); GL11.glTranslatef(-0.5F, 0F, -0.5F); - renderer.func_147782_a(0.0625F, 0.0F, 0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F); + renderer.setRenderBounds(0.0625F, 0.0F, 0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F); Helper.renderInventoryCube(block, metadata, modelID, renderer); GL11.glPopMatrix(); @@ -61,26 +61,26 @@ public class RenderLandmine implements ISimpleBlockRenderingHandler switch (dir) { case DOWN: - renderer.func_147782_a(0.0625F, 0.0F, 0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F); + renderer.setRenderBounds(0.0625F, 0.0F, 0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F); break; case UP: - renderer.func_147782_a(0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F, 1.0F - 0.0625F); + renderer.setRenderBounds(0.0625F, 1.0F - 0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F, 1.0F - 0.0625F); break; case NORTH: - renderer.func_147782_a(0.0625F, 0.0625F, 0.0F, 1.0F - 0.0625F, 1.0F - 0.0625F, 0.0625F); + renderer.setRenderBounds(0.0625F, 0.0625F, 0.0F, 1.0F - 0.0625F, 1.0F - 0.0625F, 0.0625F); break; case SOUTH: - renderer.func_147782_a(0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F, 1.0F); + renderer.setRenderBounds(0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F, 1.0F); break; case EAST: - renderer.func_147782_a(1.0F - 0.0625F, 0.0625F, 0.0625F, 1.0F, 1.0F - 0.0625F, 1.0F - 0.0625F); + renderer.setRenderBounds(1.0F - 0.0625F, 0.0625F, 0.0625F, 1.0F, 1.0F - 0.0625F, 1.0F - 0.0625F); break; case WEST: - renderer.func_147782_a(0.0F, 0.0625F, 0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F); + renderer.setRenderBounds(0.0F, 0.0625F, 0.0625F, 0.0625F, 1.0F - 0.0625F, 1.0F - 0.0625F); break; } - renderer.func_147784_q(block, x, y, z); + renderer.renderStandardBlock(block, x, y, z); } @Override diff --git a/src/main/java/tconstruct/client/block/RenderLiquid.java b/src/main/java/tconstruct/client/block/RenderLiquid.java index 34533702..6de33d4f 100644 --- a/src/main/java/tconstruct/client/block/RenderLiquid.java +++ b/src/main/java/tconstruct/client/block/RenderLiquid.java @@ -17,7 +17,7 @@ public class RenderLiquid {//TODO CHECK THIS!!!! public static boolean renderMetadataBlock (Block block, int metadata, int x, int y, int z, RenderBlocks renderer, IBlockAccess world) { - int var5 = block.func_149720_d(world, x, y, z); + int var5 = block.colorMultiplier(world, x, y, z); float var6 = (var5 >> 16 & 0xFF) / 255.0F; float var7 = (var5 >> 8 & 0xFF) / 255.0F; float var8 = (var5 & 0xFF) / 255.0F; @@ -32,733 +32,733 @@ public class RenderLiquid var8 = var11; } - return (Minecraft.isAmbientOcclusionEnabled()) && (block.func_149750_m() == 0) ? renderMetadataBlockWithAmbientOcclusion(block, metadata, x, y, z, var6, var7, var8, renderer, world) + return (Minecraft.isAmbientOcclusionEnabled()) && (block.getLightValue() == 0) ? renderMetadataBlockWithAmbientOcclusion(block, metadata, x, y, z, var6, var7, var8, renderer, world) : renderMetadataBlockWithColorMultiplier(block, metadata, x, y, z, var6, var7, var8, renderer, world); } static boolean renderMetadataBlockWithAmbientOcclusion (Block block, int metadata, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) { - render.field_147863_w = true; + render.enableAO = true; boolean flag = false; float f3 = 0.0F; float f4 = 0.0F; float f5 = 0.0F; float f6 = 0.0F; boolean flag1 = true; - int l = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos); + int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos); Tessellator tessellator = Tessellator.instance; tessellator.setBrightness(983055); - if (render.func_147745_b(block).getIconName().equals("grass_top")) + if (render.getBlockIcon(block).getIconName().equals("grass_top")) { flag1 = false; } - else if (render.func_147744_b()) + else if (render.hasOverrideBlockTexture()) { flag1 = false; } - if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos - 1, zPos, 0))) + if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))) { - if (render.field_147855_j <= 0.0D) + if (render.renderMinY <= 0.0D) { yPos--; } - render.field_147831_S = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147825_U = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147828_V = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147835_X = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147886_y = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147814_A = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147815_B = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147810_D = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - boolean flag3 = render.field_147845_a.func_147439_a(xPos + 1, yPos - 1, zPos).func_149751_l(); - boolean flag2 = render.field_147845_a.func_147439_a(xPos - 1, yPos - 1, zPos).func_149751_l(); - boolean flag5 = render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos + 1).func_149751_l(); - boolean flag4 = render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos - 1).func_149751_l(); + render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); + render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); + render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); + render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); + render.aoLightValueScratchXYNN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); + render.aoLightValueScratchYZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + render.aoLightValueScratchYZNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); + render.aoLightValueScratchXYPN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); + boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos - 1, zPos).getCanBlockGrass(); + boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos - 1, zPos).getCanBlockGrass(); + boolean flag5 = render.blockAccess.getBlock(xPos, yPos - 1, zPos + 1).getCanBlockGrass(); + boolean flag4 = render.blockAccess.getBlock(xPos, yPos - 1, zPos - 1).getCanBlockGrass(); if ((!flag4) && (!flag2)) { - render.field_147888_x = render.field_147886_y; - render.field_147832_R = render.field_147831_S; + render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXYNN; + render.aoBrightnessXYZNNN = render.aoBrightnessXYNN; } else { - render.field_147888_x = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); - render.field_147832_R = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos - 1); + render.aoLightValueScratchXYZNNN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1); + render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); } if ((!flag5) && (!flag2)) { - render.field_147884_z = render.field_147886_y; - render.field_147826_T = render.field_147831_S; + render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXYNN; + render.aoBrightnessXYZNNP = render.aoBrightnessXYNN; } else { - render.field_147884_z = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); - render.field_147826_T = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos + 1); + render.aoLightValueScratchXYZNNP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1); + render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); } if ((!flag4) && (!flag3)) { - render.field_147816_C = render.field_147810_D; - render.field_147827_W = render.field_147835_X; + render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXYPN; + render.aoBrightnessXYZPNN = render.aoBrightnessXYPN; } else { - render.field_147816_C = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); - render.field_147827_W = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos - 1); + render.aoLightValueScratchXYZPNN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1); + render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); } if ((!flag5) && (!flag3)) { - render.field_147811_E = render.field_147810_D; - render.field_147834_Y = render.field_147835_X; + render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXYPN; + render.aoBrightnessXYZPNP = render.aoBrightnessXYPN; } else { - render.field_147811_E = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); - render.field_147834_Y = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos + 1); + render.aoLightValueScratchXYZPNP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); + render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); } - if (render.field_147855_j <= 0.0D) + if (render.renderMinY <= 0.0D) { yPos++; } int i1 = l; - if ((render.field_147855_j <= 0.0D) || (!render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos).func_149662_c())) + if ((render.renderMinY <= 0.0D) || (!render.blockAccess.getBlock(xPos, yPos - 1, zPos).isOpaqueCube())) { - i1 = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); } - float f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - f3 = (render.field_147884_z + render.field_147886_y + render.field_147815_B + f7) / 4.0F; - f6 = (render.field_147815_B + f7 + render.field_147811_E + render.field_147810_D) / 4.0F; - f5 = (f7 + render.field_147814_A + render.field_147810_D + render.field_147816_C) / 4.0F; - f4 = (render.field_147886_y + render.field_147888_x + f7 + render.field_147814_A) / 4.0F; - render.field_147864_al = render.func_147778_a(render.field_147826_T, render.field_147831_S, render.field_147828_V, i1); - render.field_147870_ao = render.func_147778_a(render.field_147828_V, render.field_147834_Y, render.field_147835_X, i1); - render.field_147876_an = render.func_147778_a(render.field_147825_U, render.field_147835_X, render.field_147827_W, i1); - render.field_147874_am = render.func_147778_a(render.field_147831_S, render.field_147832_R, render.field_147825_U, i1); + float f7 = getAmbientOcclusionLightValue(render.blockAccess, 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); if (flag1) { - render.field_147872_ap = (render.field_147852_aq = render.field_147850_ar = render.field_147848_as = colorRed * 0.5F); - render.field_147846_at = (render.field_147860_au = render.field_147858_av = render.field_147856_aw = colorGreen * 0.5F); - render.field_147854_ax = (render.field_147841_ay = render.field_147839_az = render.field_147833_aA = colorBlue * 0.5F); + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.5F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.5F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.5F); } else { - render.field_147872_ap = (render.field_147852_aq = render.field_147850_ar = render.field_147848_as = 0.5F); - render.field_147846_at = (render.field_147860_au = render.field_147858_av = render.field_147856_aw = 0.5F); - render.field_147854_ax = (render.field_147841_ay = render.field_147839_az = render.field_147833_aA = 0.5F); + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.5F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.5F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.5F); } - render.field_147872_ap *= f3; - render.field_147846_at *= f3; - render.field_147854_ax *= f3; - render.field_147852_aq *= f4; - render.field_147860_au *= f4; - render.field_147841_ay *= f4; - render.field_147850_ar *= f5; - render.field_147858_av *= f5; - render.field_147839_az *= f5; - render.field_147848_as *= f6; - render.field_147856_aw *= f6; - render.field_147833_aA *= f6; - render.func_147768_a(block, xPos, yPos, zPos, block.func_149691_a(0, metadata)); + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + render.renderFaceYNeg(block, xPos, yPos, zPos, block.getIcon(0, metadata)); flag = true; } - if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos + 1, zPos, 1))) + if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))) { - if (render.field_147857_k >= 1.0D) + if (render.renderMaxY >= 1.0D) { yPos++; } - render.field_147880_aa = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147885_ae = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147878_ac = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147887_af = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147813_G = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147824_K = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147822_I = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147817_L = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - boolean flag3 = render.field_147845_a.func_147439_a(xPos + 1, yPos + 1, zPos).func_149751_l(); - boolean flag2 = render.field_147845_a.func_147439_a(xPos - 1, yPos + 1, zPos).func_149751_l(); - boolean flag5 = render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos + 1).func_149751_l(); - boolean flag4 = render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos - 1).func_149751_l(); + render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); + render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); + render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); + render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); + render.aoLightValueScratchXYNP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); + render.aoLightValueScratchXYPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); + render.aoLightValueScratchYZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + render.aoLightValueScratchYZPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); + boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos + 1, zPos).getCanBlockGrass(); + boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos + 1, zPos).getCanBlockGrass(); + boolean flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getCanBlockGrass(); + boolean flag4 = render.blockAccess.getBlock(xPos, yPos + 1, zPos - 1).getCanBlockGrass(); if ((!flag4) && (!flag2)) { - render.field_147812_F = render.field_147813_G; - render.field_147836_Z = render.field_147880_aa; + render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXYNP; + render.aoBrightnessXYZNPN = render.aoBrightnessXYNP; } else { - render.field_147812_F = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); - render.field_147836_Z = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos - 1); + render.aoLightValueScratchXYZNPN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1); + render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); } if ((!flag4) && (!flag3)) { - render.field_147824_K = render.field_147824_K; - render.field_147879_ad = render.field_147885_ae; + render.aoLightValueScratchXYPP = render.aoLightValueScratchXYPP; + render.aoBrightnessXYZPPN = render.aoBrightnessXYPP; } else { - render.field_147824_K = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); - render.field_147879_ad = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos - 1); + render.aoLightValueScratchXYPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1); + render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); } if ((!flag5) && (!flag2)) { - render.field_147821_H = render.field_147813_G; - render.field_147881_ab = render.field_147880_aa; + render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXYNP; + render.aoBrightnessXYZNPP = render.aoBrightnessXYNP; } else { - render.field_147821_H = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); - render.field_147881_ab = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos + 1); + render.aoLightValueScratchXYZNPP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1); + render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); } if ((!flag5) && (!flag3)) { - render.field_147819_N = render.field_147824_K; - render.field_147882_ag = render.field_147885_ae; + render.aoLightValueScratchXZNN = render.aoLightValueScratchXYPP; + render.aoBrightnessXYZPPP = render.aoBrightnessXYPP; } else { - render.field_147819_N = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); - render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos + 1); + render.aoLightValueScratchXZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); + render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); } - if (render.field_147857_k >= 1.0D) + if (render.renderMaxY >= 1.0D) { yPos--; } int i1 = l; - if ((render.field_147857_k >= 1.0D) || (!render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos).func_149662_c())) + if ((render.renderMaxY >= 1.0D) || (!render.blockAccess.getBlock(xPos, yPos + 1, zPos).isOpaqueCube())) { - i1 = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); } - float f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - f6 = (render.field_147821_H + render.field_147813_G + render.field_147817_L + f7) / 4.0F; - f3 = (render.field_147817_L + f7 + render.field_147819_N + render.field_147824_K) / 4.0F; - f4 = (f7 + render.field_147822_I + render.field_147824_K + render.field_147824_K) / 4.0F; - f5 = (render.field_147813_G + render.field_147812_F + f7 + render.field_147822_I) / 4.0F; - render.field_147870_ao = render.func_147778_a(render.field_147881_ab, render.field_147880_aa, render.field_147887_af, i1); - render.field_147864_al = render.func_147778_a(render.field_147887_af, render.field_147882_ag, render.field_147885_ae, i1); - render.field_147874_am = render.func_147778_a(render.field_147878_ac, render.field_147885_ae, render.field_147879_ad, i1); - render.field_147876_an = render.func_147778_a(render.field_147880_aa, render.field_147836_Z, render.field_147878_ac, i1); - render.field_147872_ap = (render.field_147852_aq = render.field_147850_ar = render.field_147848_as = colorRed); - render.field_147846_at = (render.field_147860_au = render.field_147858_av = render.field_147856_aw = colorGreen); - render.field_147854_ax = (render.field_147841_ay = render.field_147839_az = render.field_147833_aA = colorBlue); - render.field_147872_ap *= f3; - render.field_147846_at *= f3; - render.field_147854_ax *= f3; - render.field_147852_aq *= f4; - render.field_147860_au *= f4; - render.field_147841_ay *= f4; - render.field_147850_ar *= f5; - render.field_147858_av *= f5; - render.field_147839_az *= f5; - render.field_147848_as *= f6; - render.field_147856_aw *= f6; - render.field_147833_aA *= f6; - render.func_147806_b(block, xPos, yPos, zPos, block.func_149691_a(1, metadata)); + float f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); + f6 = (render.aoLightValueScratchXYZNPP + render.aoLightValueScratchXYNP + render.aoLightValueScratchYZPP + f7) / 4.0F; + f3 = (render.aoLightValueScratchYZPP + f7 + render.aoLightValueScratchXZNN + render.aoLightValueScratchXYPP) / 4.0F; + f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYPP) / 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); + 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); + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + render.renderFaceYPos(block, xPos, yPos, zPos, block.getIcon(1, metadata)); flag = true; } - if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos, zPos - 1, 2))) + if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))) { - if (render.field_147851_l <= 0.0D) + if (render.renderMinZ <= 0.0D) { zPos--; } - render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147814_A = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147822_I = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147883_ah = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147825_U = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147878_ac = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); - render.field_147866_ai = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); - boolean flag3 = render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos - 1).func_149751_l(); - boolean flag2 = render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos - 1).func_149751_l(); - boolean flag5 = render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos - 1).func_149751_l(); - boolean flag4 = render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos - 1).func_149751_l(); + render.aoLightValueScratchXZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); + render.aoLightValueScratchYZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); + render.aoLightValueScratchYZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); + render.aoLightValueScratchXZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); + render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); + render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); + render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); + render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); + boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos, zPos - 1).getCanBlockGrass(); + boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos, zPos - 1).getCanBlockGrass(); + boolean flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos - 1).getCanBlockGrass(); + boolean flag4 = render.blockAccess.getBlock(xPos, yPos - 1, zPos - 1).getCanBlockGrass(); if ((!flag2) && (!flag4)) { - render.field_147888_x = render.field_147820_O; - render.field_147832_R = render.field_147883_ah; + render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; } else { - render.field_147888_x = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); - render.field_147832_R = block.func_149677_c(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.aoLightValueScratchXYZNNN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos); + render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); } if ((!flag2) && (!flag5)) { - render.field_147812_F = render.field_147820_O; - render.field_147836_Z = render.field_147883_ah; + render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; } else { - render.field_147812_F = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos + 1, zPos); - render.field_147836_Z = block.func_149677_c(render.field_147845_a, xPos - 1, yPos + 1, zPos); + render.aoLightValueScratchXYZNPN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos); + render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); } if ((!flag3) && (!flag4)) { - render.field_147816_C = render.field_147820_O; - render.field_147827_W = render.field_147866_ai; + render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; } else { - render.field_147816_C = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); - render.field_147827_W = block.func_149677_c(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.aoLightValueScratchXYZPNN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos); + render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); } if ((!flag3) && (!flag5)) { - render.field_147824_K = render.field_147820_O; - render.field_147879_ad = render.field_147866_ai; + render.aoLightValueScratchXYPP = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; } else { - render.field_147824_K = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos + 1, zPos); - render.field_147879_ad = block.func_149677_c(render.field_147845_a, xPos + 1, yPos + 1, zPos); + render.aoLightValueScratchXYPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); + render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); } - if (render.field_147851_l <= 0.0D) + if (render.renderMinZ <= 0.0D) { zPos++; } int i1 = l; - if ((render.field_147851_l <= 0.0D) || (!render.field_147845_a.func_147439_a(xPos, yPos, zPos - 1).func_149662_c())) + if ((render.renderMinZ <= 0.0D) || (!render.blockAccess.getBlock(xPos, yPos, zPos - 1).isOpaqueCube())) { - i1 = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); } - float f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - f3 = (render.field_147820_O + render.field_147812_F + f7 + render.field_147822_I) / 4.0F; - f4 = (f7 + render.field_147822_I + render.field_147820_O + render.field_147824_K) / 4.0F; - f5 = (render.field_147814_A + f7 + render.field_147816_C + render.field_147820_O) / 4.0F; - f6 = (render.field_147888_x + render.field_147820_O + render.field_147814_A + f7) / 4.0F; - render.field_147864_al = render.func_147778_a(render.field_147883_ah, render.field_147836_Z, render.field_147878_ac, i1); - render.field_147874_am = render.func_147778_a(render.field_147878_ac, render.field_147866_ai, render.field_147879_ad, i1); - render.field_147876_an = render.func_147778_a(render.field_147825_U, render.field_147827_W, render.field_147866_ai, i1); - render.field_147870_ao = render.func_147778_a(render.field_147832_R, render.field_147883_ah, render.field_147825_U, i1); + float f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + f3 = (render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; + f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYPP) / 4.0F; + f5 = (render.aoLightValueScratchYZNN + f7 + render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXZPN) / 4.0F; + f6 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZPN + 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); if (flag1) { - render.field_147872_ap = (render.field_147852_aq = render.field_147850_ar = render.field_147848_as = colorRed * 0.8F); - render.field_147846_at = (render.field_147860_au = render.field_147858_av = render.field_147856_aw = colorGreen * 0.8F); - render.field_147854_ax = (render.field_147841_ay = render.field_147839_az = render.field_147833_aA = colorBlue * 0.8F); + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F); } else { - render.field_147872_ap = (render.field_147852_aq = render.field_147850_ar = render.field_147848_as = 0.8F); - render.field_147846_at = (render.field_147860_au = render.field_147858_av = render.field_147856_aw = 0.8F); - render.field_147854_ax = (render.field_147841_ay = render.field_147839_az = render.field_147833_aA = 0.8F); + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F); } - render.field_147872_ap *= f3; - render.field_147846_at *= f3; - render.field_147854_ax *= f3; - render.field_147852_aq *= f4; - render.field_147860_au *= f4; - render.field_147841_ay *= f4; - render.field_147850_ar *= f5; - render.field_147858_av *= f5; - render.field_147839_az *= f5; - render.field_147848_as *= f6; - render.field_147856_aw *= f6; - render.field_147833_aA *= f6; - IIcon icon = block.func_149691_a(2, metadata); - render.func_147761_c(block, xPos, yPos, zPos, icon); + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + IIcon icon = block.getIcon(2, metadata); + render.renderFaceZNeg(block, xPos, yPos, zPos, icon); flag = true; } - if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos, zPos + 1, 3))) + if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))) { - if (render.field_147853_m >= 1.0D) + if (render.renderMaxZ >= 1.0D) { zPos++; } - render.field_147830_P = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147829_Q = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147815_B = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147817_L = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - render.field_147868_aj = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147862_ak = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147828_V = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147887_af = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); - boolean flag3 = render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos + 1).func_149751_l(); - boolean flag2 = render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos + 1).func_149751_l(); - boolean flag5 = render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos + 1).func_149751_l(); - boolean flag4 = render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos + 1).func_149751_l(); + render.aoLightValueScratchXZNP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); + render.aoLightValueScratchXZPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); + render.aoLightValueScratchYZNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); + render.aoLightValueScratchYZPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); + render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); + render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); + render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); + render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); + boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos, zPos + 1).getCanBlockGrass(); + boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos, zPos + 1).getCanBlockGrass(); + boolean flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getCanBlockGrass(); + boolean flag4 = render.blockAccess.getBlock(xPos, yPos - 1, zPos + 1).getCanBlockGrass(); if ((!flag2) && (!flag4)) { - render.field_147884_z = render.field_147830_P; - render.field_147826_T = render.field_147868_aj; + render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; } else { - render.field_147884_z = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); - render.field_147826_T = block.func_149677_c(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.aoLightValueScratchXYZNNP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos); + render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); } if ((!flag2) && (!flag5)) { - render.field_147821_H = render.field_147830_P; - render.field_147881_ab = render.field_147868_aj; + render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; } else { - render.field_147821_H = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos + 1, zPos); - render.field_147881_ab = block.func_149677_c(render.field_147845_a, xPos - 1, yPos + 1, zPos); + render.aoLightValueScratchXYZNPP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos); + render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); } if ((!flag3) && (!flag4)) { - render.field_147811_E = render.field_147829_Q; - render.field_147834_Y = render.field_147862_ak; + render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; } else { - render.field_147811_E = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); - render.field_147834_Y = block.func_149677_c(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.aoLightValueScratchXYZPNP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos); + render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); } if ((!flag3) && (!flag5)) { - render.field_147819_N = render.field_147829_Q; - render.field_147882_ag = render.field_147862_ak; + render.aoLightValueScratchXZNN = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; } else { - render.field_147819_N = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos + 1, zPos); - render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos + 1, yPos + 1, zPos); + render.aoLightValueScratchXZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); + render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); } - if (render.field_147853_m >= 1.0D) + if (render.renderMaxZ >= 1.0D) { zPos--; } int i1 = l; - if ((render.field_147853_m >= 1.0D) || (!render.field_147845_a.func_147439_a(xPos, yPos, zPos + 1).func_149662_c())) + if ((render.renderMaxZ >= 1.0D) || (!render.blockAccess.getBlock(xPos, yPos, zPos + 1).isOpaqueCube())) { - i1 = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); } - float f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - f3 = (render.field_147830_P + render.field_147821_H + f7 + render.field_147817_L) / 4.0F; - f6 = (f7 + render.field_147817_L + render.field_147829_Q + render.field_147819_N) / 4.0F; - f5 = (render.field_147815_B + f7 + render.field_147811_E + render.field_147829_Q) / 4.0F; - f4 = (render.field_147884_z + render.field_147830_P + render.field_147815_B + f7) / 4.0F; - render.field_147864_al = render.func_147778_a(render.field_147868_aj, render.field_147881_ab, render.field_147887_af, i1); - render.field_147870_ao = render.func_147778_a(render.field_147887_af, render.field_147862_ak, render.field_147882_ag, i1); - render.field_147876_an = render.func_147778_a(render.field_147828_V, render.field_147834_Y, render.field_147862_ak, i1); - render.field_147874_am = render.func_147778_a(render.field_147826_T, render.field_147868_aj, render.field_147828_V, i1); + float f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); + f3 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + f7 + render.aoLightValueScratchYZPP) / 4.0F; + f6 = (f7 + render.aoLightValueScratchYZPP + render.aoLightValueScratchXZPP + render.aoLightValueScratchXZNN) / 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); if (flag1) { - render.field_147872_ap = (render.field_147852_aq = render.field_147850_ar = render.field_147848_as = colorRed * 0.8F); - render.field_147846_at = (render.field_147860_au = render.field_147858_av = render.field_147856_aw = colorGreen * 0.8F); - render.field_147854_ax = (render.field_147841_ay = render.field_147839_az = render.field_147833_aA = colorBlue * 0.8F); + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F); } else { - render.field_147872_ap = (render.field_147852_aq = render.field_147850_ar = render.field_147848_as = 0.8F); - render.field_147846_at = (render.field_147860_au = render.field_147858_av = render.field_147856_aw = 0.8F); - render.field_147854_ax = (render.field_147841_ay = render.field_147839_az = render.field_147833_aA = 0.8F); + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F); } - render.field_147872_ap *= f3; - render.field_147846_at *= f3; - render.field_147854_ax *= f3; - render.field_147852_aq *= f4; - render.field_147860_au *= f4; - render.field_147841_ay *= f4; - render.field_147850_ar *= f5; - render.field_147858_av *= f5; - render.field_147839_az *= f5; - render.field_147848_as *= f6; - render.field_147856_aw *= f6; - render.field_147833_aA *= f6; - IIcon icon = block.func_149691_a(3, metadata); - render.func_147734_d(block, xPos, yPos, zPos, icon); + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + IIcon icon = block.getIcon(3, metadata); + render.renderFaceZPos(block, xPos, yPos, zPos, icon); flag = true; } - if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos - 1, yPos, zPos, 4))) + if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))) { - if (render.field_147859_h <= 0.0D) + if (render.renderMinX <= 0.0D) { xPos--; } - render.field_147886_y = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147830_P = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147813_G = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - render.field_147831_S = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147883_ah = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147868_aj = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147880_aa = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); - boolean flag3 = render.field_147845_a.func_147439_a(xPos - 1, yPos + 1, zPos).func_149751_l(); - boolean flag2 = render.field_147845_a.func_147439_a(xPos - 1, yPos - 1, zPos).func_149751_l(); - boolean flag5 = render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos - 1).func_149751_l(); - boolean flag4 = render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos + 1).func_149751_l(); + render.aoLightValueScratchXYNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); + render.aoLightValueScratchXZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + render.aoLightValueScratchXZNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); + render.aoLightValueScratchXYNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); + render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); + render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); + render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); + render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); + boolean flag3 = render.blockAccess.getBlock(xPos - 1, yPos + 1, zPos).getCanBlockGrass(); + boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos - 1, zPos).getCanBlockGrass(); + boolean flag5 = render.blockAccess.getBlock(xPos - 1, yPos, zPos - 1).getCanBlockGrass(); + boolean flag4 = render.blockAccess.getBlock(xPos - 1, yPos, zPos + 1).getCanBlockGrass(); if ((!flag5) && (!flag2)) { - render.field_147888_x = render.field_147820_O; - render.field_147832_R = render.field_147883_ah; + render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; } else { - render.field_147888_x = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); - render.field_147832_R = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.aoLightValueScratchXYZNNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1); + render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); } if ((!flag4) && (!flag2)) { - render.field_147884_z = render.field_147830_P; - render.field_147826_T = render.field_147868_aj; + render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; } else { - render.field_147884_z = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); - render.field_147826_T = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.aoLightValueScratchXYZNNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1); + render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); } if ((!flag5) && (!flag3)) { - render.field_147812_F = render.field_147820_O; - render.field_147836_Z = render.field_147883_ah; + render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; } else { - render.field_147812_F = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos - 1); - render.field_147836_Z = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos - 1); + render.aoLightValueScratchXYZNPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1); + render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); } if ((!flag4) && (!flag3)) { - render.field_147821_H = render.field_147830_P; - render.field_147881_ab = render.field_147868_aj; + render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; } else { - render.field_147821_H = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos + 1); - render.field_147881_ab = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos + 1); + render.aoLightValueScratchXYZNPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); + render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); } - if (render.field_147859_h <= 0.0D) + if (render.renderMinX <= 0.0D) { xPos++; } int i1 = l; - if ((render.field_147859_h <= 0.0D) || (!render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos).func_149662_c())) + if ((render.renderMinX <= 0.0D) || (!render.blockAccess.getBlock(xPos - 1, yPos, zPos).isOpaqueCube())) { - i1 = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); } - float f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - f6 = (render.field_147886_y + render.field_147884_z + f7 + render.field_147830_P) / 4.0F; - f3 = (f7 + render.field_147830_P + render.field_147813_G + render.field_147821_H) / 4.0F; - f4 = (render.field_147820_O + f7 + render.field_147812_F + render.field_147813_G) / 4.0F; - f5 = (render.field_147888_x + render.field_147886_y + render.field_147820_O + f7) / 4.0F; - render.field_147870_ao = render.func_147778_a(render.field_147831_S, render.field_147826_T, render.field_147868_aj, i1); - render.field_147864_al = render.func_147778_a(render.field_147868_aj, render.field_147880_aa, render.field_147881_ab, i1); - render.field_147874_am = render.func_147778_a(render.field_147883_ah, render.field_147836_Z, render.field_147880_aa, i1); - render.field_147876_an = render.func_147778_a(render.field_147832_R, render.field_147831_S, render.field_147883_ah, i1); + float f7 = getAmbientOcclusionLightValue(render.blockAccess, 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.aoLightValueScratchXZPN + f7 + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F; + f5 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZPN + 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); if (flag1) { - render.field_147872_ap = (render.field_147852_aq = render.field_147850_ar = render.field_147848_as = colorRed * 0.6F); - render.field_147846_at = (render.field_147860_au = render.field_147858_av = render.field_147856_aw = colorGreen * 0.6F); - render.field_147854_ax = (render.field_147841_ay = render.field_147839_az = render.field_147833_aA = colorBlue * 0.6F); + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F); } else { - render.field_147872_ap = (render.field_147852_aq = render.field_147850_ar = render.field_147848_as = 0.6F); - render.field_147846_at = (render.field_147860_au = render.field_147858_av = render.field_147856_aw = 0.6F); - render.field_147854_ax = (render.field_147841_ay = render.field_147839_az = render.field_147833_aA = 0.6F); + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F); } - render.field_147872_ap *= f3; - render.field_147846_at *= f3; - render.field_147854_ax *= f3; - render.field_147852_aq *= f4; - render.field_147860_au *= f4; - render.field_147841_ay *= f4; - render.field_147850_ar *= f5; - render.field_147858_av *= f5; - render.field_147839_az *= f5; - render.field_147848_as *= f6; - render.field_147856_aw *= f6; - render.field_147833_aA *= f6; - IIcon icon = block.func_149691_a(4, metadata); - render.func_147798_e(block, xPos, yPos, zPos, icon); + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + IIcon icon = block.getIcon(4, metadata); + render.renderFaceXNeg(block, xPos, yPos, zPos, icon); flag = true; } - if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos + 1, yPos, zPos, 5))) + if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))) { - if (render.field_147861_i >= 1.0D) + if (render.renderMaxX >= 1.0D) { xPos++; } - render.field_147810_D = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147829_Q = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147824_K = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - render.field_147835_X = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147866_ai = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147862_ak = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147885_ae = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); - boolean flag3 = render.field_147845_a.func_147439_a(xPos + 1, yPos + 1, zPos).func_149751_l(); - boolean flag2 = render.field_147845_a.func_147439_a(xPos + 1, yPos - 1, zPos).func_149751_l(); - boolean flag5 = render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos + 1).func_149751_l(); - boolean flag4 = render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos - 1).func_149751_l(); + render.aoLightValueScratchXYPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); + render.aoLightValueScratchXZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + render.aoLightValueScratchXZPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); + render.aoLightValueScratchXYPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); + render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); + render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); + render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); + render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); + boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos + 1, zPos).getCanBlockGrass(); + boolean flag2 = render.blockAccess.getBlock(xPos + 1, yPos - 1, zPos).getCanBlockGrass(); + boolean flag5 = render.blockAccess.getBlock(xPos + 1, yPos, zPos + 1).getCanBlockGrass(); + boolean flag4 = render.blockAccess.getBlock(xPos + 1, yPos, zPos - 1).getCanBlockGrass(); if ((!flag2) && (!flag4)) { - render.field_147816_C = render.field_147820_O; - render.field_147827_W = render.field_147866_ai; + render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; } else { - render.field_147816_C = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); - render.field_147827_W = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.aoLightValueScratchXYZPNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1); + render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); } if ((!flag2) && (!flag5)) { - render.field_147811_E = render.field_147829_Q; - render.field_147834_Y = render.field_147862_ak; + render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; } else { - render.field_147811_E = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); - render.field_147834_Y = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.aoLightValueScratchXYZPNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1); + render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); } if ((!flag3) && (!flag4)) { - render.field_147824_K = render.field_147820_O; - render.field_147879_ad = render.field_147866_ai; + render.aoLightValueScratchXYPP = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; } else { - render.field_147824_K = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos - 1); - render.field_147879_ad = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos - 1); + render.aoLightValueScratchXYPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1); + render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); } if ((!flag3) && (!flag5)) { - render.field_147819_N = render.field_147829_Q; - render.field_147882_ag = render.field_147862_ak; + render.aoLightValueScratchXZNN = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; } else { - render.field_147819_N = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos + 1); - render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos + 1); + render.aoLightValueScratchXZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); + render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); } - if (render.field_147861_i >= 1.0D) + if (render.renderMaxX >= 1.0D) { xPos--; } int i1 = l; - if ((render.field_147861_i >= 1.0D) || (!render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos).func_149662_c())) + if ((render.renderMaxX >= 1.0D) || (!render.blockAccess.getBlock(xPos + 1, yPos, zPos).isOpaqueCube())) { - i1 = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); } - float f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - f3 = (render.field_147810_D + render.field_147811_E + f7 + render.field_147829_Q) / 4.0F; - f4 = (render.field_147816_C + render.field_147810_D + render.field_147820_O + f7) / 4.0F; - f5 = (render.field_147820_O + f7 + render.field_147824_K + render.field_147824_K) / 4.0F; - f6 = (f7 + render.field_147829_Q + render.field_147824_K + render.field_147819_N) / 4.0F; - render.field_147864_al = render.func_147778_a(render.field_147835_X, render.field_147834_Y, render.field_147862_ak, i1); - render.field_147870_ao = render.func_147778_a(render.field_147862_ak, render.field_147885_ae, render.field_147882_ag, i1); - render.field_147876_an = render.func_147778_a(render.field_147866_ai, render.field_147879_ad, render.field_147885_ae, i1); - render.field_147874_am = render.func_147778_a(render.field_147827_W, render.field_147835_X, render.field_147866_ai, i1); + float f7 = getAmbientOcclusionLightValue(render.blockAccess, 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.aoLightValueScratchXYPP + render.aoLightValueScratchXYPP) / 4.0F; + f6 = (f7 + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYPP + render.aoLightValueScratchXZNN) / 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); if (flag1) { - render.field_147872_ap = (render.field_147852_aq = render.field_147850_ar = render.field_147848_as = colorRed * 0.6F); - render.field_147846_at = (render.field_147860_au = render.field_147858_av = render.field_147856_aw = colorGreen * 0.6F); - render.field_147854_ax = (render.field_147841_ay = render.field_147839_az = render.field_147833_aA = colorBlue * 0.6F); + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F); } else { - render.field_147872_ap = (render.field_147852_aq = render.field_147850_ar = render.field_147848_as = 0.6F); - render.field_147846_at = (render.field_147860_au = render.field_147858_av = render.field_147856_aw = 0.6F); - render.field_147854_ax = (render.field_147841_ay = render.field_147839_az = render.field_147833_aA = 0.6F); + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F); } - render.field_147872_ap *= f3; - render.field_147846_at *= f3; - render.field_147854_ax *= f3; - render.field_147852_aq *= f4; - render.field_147860_au *= f4; - render.field_147841_ay *= f4; - render.field_147850_ar *= f5; - render.field_147858_av *= f5; - render.field_147839_az *= f5; - render.field_147848_as *= f6; - render.field_147856_aw *= f6; - render.field_147833_aA *= f6; - IIcon icon = block.func_149691_a(5, metadata); - render.func_147764_f(block, xPos, yPos, zPos, icon); + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + IIcon icon = block.getIcon(5, metadata); + render.renderFaceXPos(block, xPos, yPos, zPos, icon); flag = true; } - render.field_147863_w = false; + render.enableAO = false; return flag; } private static float getAmbientOcclusionLightValue (IBlockAccess access, int x, int y, int z) { - return access.func_147439_a(x, y, z).func_149685_I(); + return access.getBlock(x, y, z).getAmbientOcclusionLightValue(); } static boolean renderMetadataBlockWithColorMultiplier (Block block, int metadata, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) { - render.field_147863_w = false; + render.enableAO = false; Tessellator tessellator = Tessellator.instance; boolean flag = false; float f3 = 0.5F; @@ -791,56 +791,56 @@ public class RenderLiquid f18 = f6 * colorBlue; } - int l = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos); + int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos); - if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos - 1, zPos, 0))) + if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))) { - tessellator.setBrightness(render.field_147855_j > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos)); + tessellator.setBrightness(render.renderMinY > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos)); tessellator.setColorOpaque_F(f10, f13, f16); - render.func_147768_a(block, xPos, yPos, zPos, block.func_149691_a(0, metadata)); + render.renderFaceYNeg(block, xPos, yPos, zPos, block.getIcon(0, metadata)); flag = true; } - if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos + 1, zPos, 1))) + if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))) { - tessellator.setBrightness(render.field_147857_k < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos)); + tessellator.setBrightness(render.renderMaxY < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos)); tessellator.setColorOpaque_F(f7, f8, f9); - render.func_147806_b(block, xPos, yPos, zPos, block.func_149691_a(1, metadata)); + render.renderFaceYPos(block, xPos, yPos, zPos, block.getIcon(1, metadata)); flag = true; } - if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos, zPos - 1, 2))) + if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))) { - tessellator.setBrightness(render.field_147851_l > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1)); + tessellator.setBrightness(render.renderMinZ > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1)); tessellator.setColorOpaque_F(f11, f14, f17); - render.func_147761_c(block, xPos, yPos, zPos, block.func_149691_a(2, metadata)); + render.renderFaceZNeg(block, xPos, yPos, zPos, block.getIcon(2, metadata)); flag = true; } - if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos, zPos + 1, 3))) + if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))) { - tessellator.setBrightness(render.field_147853_m < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1)); + tessellator.setBrightness(render.renderMaxZ < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1)); tessellator.setColorOpaque_F(f11, f14, f17); - render.func_147734_d(block, xPos, yPos, zPos, block.func_149691_a(3, metadata)); + render.renderFaceZPos(block, xPos, yPos, zPos, block.getIcon(3, metadata)); flag = true; } - if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos - 1, yPos, zPos, 4))) + if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))) { - tessellator.setBrightness(render.field_147859_h > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos)); + tessellator.setBrightness(render.renderMinX > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos)); tessellator.setColorOpaque_F(f12, f15, f18); - render.func_147798_e(block, xPos, yPos, zPos, block.func_149691_a(4, metadata)); + render.renderFaceXNeg(block, xPos, yPos, zPos, block.getIcon(4, metadata)); flag = true; } - if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos + 1, yPos, zPos, 5))) + if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))) { - tessellator.setBrightness(render.field_147861_i < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos)); + tessellator.setBrightness(render.renderMaxX < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos)); tessellator.setColorOpaque_F(f12, f15, f18); - render.func_147764_f(block, xPos, yPos, zPos, block.func_149691_a(5, metadata)); + render.renderFaceXPos(block, xPos, yPos, zPos, block.getIcon(5, metadata)); flag = true; } @@ -851,7 +851,7 @@ public class RenderLiquid public static boolean renderFakeBlock (IIcon texture, int x, int y, int z, RenderBlocks renderer, IBlockAccess world) { Block block = Blocks.stone; - int var5 = block.func_149720_d(world, x, y, z); + int var5 = block.colorMultiplier(world, x, y, z); float var6 = (var5 >> 16 & 0xFF) / 255.0F; float var7 = (var5 >> 8 & 0xFF) / 255.0F; float var8 = (var5 & 0xFF) / 255.0F; @@ -873,717 +873,717 @@ public class RenderLiquid 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.field_147863_w = true; + render.enableAO = true; boolean flag = false; float f3 = 0.0F; float f4 = 0.0F; float f5 = 0.0F; float f6 = 0.0F; boolean flag1 = true; - int l = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos); + int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos); Tessellator tessellator = Tessellator.instance; tessellator.setBrightness(983055); - if (render.func_147745_b(block).getIconName().equals("grass_top")) + if (render.getBlockIcon(block).getIconName().equals("grass_top")) { flag1 = false; } - else if (render.func_147744_b()) + else if (render.hasOverrideBlockTexture()) { flag1 = false; } - if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos - 1, zPos, 0))) + if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))) { - if (render.field_147855_j <= 0.0D) + if (render.renderMinY <= 0.0D) { yPos--; } - render.field_147831_S = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147825_U = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147828_V = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147835_X = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147886_y = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147814_A = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147815_B = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147810_D = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - boolean flag3 = render.field_147845_a.func_147439_a(xPos + 1, yPos - 1, zPos).func_149751_l(); - boolean flag2 = render.field_147845_a.func_147439_a(xPos - 1, yPos - 1, zPos).func_149751_l(); - boolean flag5 = render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos + 1).func_149751_l(); - boolean flag4 = render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos - 1).func_149751_l(); + render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); + render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); + render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); + render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); + render.aoLightValueScratchXYNN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); + render.aoLightValueScratchYZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + render.aoLightValueScratchYZNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); + render.aoLightValueScratchXYPN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); + boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos - 1, zPos).getCanBlockGrass(); + boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos - 1, zPos).getCanBlockGrass(); + boolean flag5 = render.blockAccess.getBlock(xPos, yPos - 1, zPos + 1).getCanBlockGrass(); + boolean flag4 = render.blockAccess.getBlock(xPos, yPos - 1, zPos - 1).getCanBlockGrass(); if ((!flag4) && (!flag2)) { - render.field_147888_x = render.field_147886_y; - render.field_147832_R = render.field_147831_S; + render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXYNN; + render.aoBrightnessXYZNNN = render.aoBrightnessXYNN; } else { - render.field_147888_x = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); - render.field_147832_R = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos - 1); + render.aoLightValueScratchXYZNNN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1); + render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); } if ((!flag5) && (!flag2)) { - render.field_147884_z = render.field_147886_y; - render.field_147826_T = render.field_147831_S; + render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXYNN; + render.aoBrightnessXYZNNP = render.aoBrightnessXYNN; } else { - render.field_147884_z = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); - render.field_147826_T = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos + 1); + render.aoLightValueScratchXYZNNP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1); + render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); } if ((!flag4) && (!flag3)) { - render.field_147816_C = render.field_147810_D; - render.field_147827_W = render.field_147835_X; + render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXYPN; + render.aoBrightnessXYZPNN = render.aoBrightnessXYPN; } else { - render.field_147816_C = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); - render.field_147827_W = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos - 1); + render.aoLightValueScratchXYZPNN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1); + render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); } if ((!flag5) && (!flag3)) { - render.field_147811_E = render.field_147810_D; - render.field_147834_Y = render.field_147835_X; + render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXYPN; + render.aoBrightnessXYZPNP = render.aoBrightnessXYPN; } else { - render.field_147811_E = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); - render.field_147834_Y = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos + 1); + render.aoLightValueScratchXYZPNP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); + render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); } - if (render.field_147855_j <= 0.0D) + if (render.renderMinY <= 0.0D) { yPos++; } int i1 = l; - if ((render.field_147855_j <= 0.0D) || (!render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos).func_149662_c())) + if ((render.renderMinY <= 0.0D) || (!render.blockAccess.getBlock(xPos, yPos - 1, zPos).isOpaqueCube())) { - i1 = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); } - float f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - f3 = (render.field_147884_z + render.field_147886_y + render.field_147815_B + f7) / 4.0F; - f6 = (render.field_147815_B + f7 + render.field_147811_E + render.field_147810_D) / 4.0F; - f5 = (f7 + render.field_147814_A + render.field_147810_D + render.field_147816_C) / 4.0F; - f4 = (render.field_147886_y + render.field_147888_x + f7 + render.field_147814_A) / 4.0F; - render.field_147864_al = render.func_147778_a(render.field_147826_T, render.field_147831_S, render.field_147828_V, i1); - render.field_147870_ao = render.func_147778_a(render.field_147828_V, render.field_147834_Y, render.field_147835_X, i1); - render.field_147876_an = render.func_147778_a(render.field_147825_U, render.field_147835_X, render.field_147827_W, i1); - render.field_147874_am = render.func_147778_a(render.field_147831_S, render.field_147832_R, render.field_147825_U, i1); + float f7 = getAmbientOcclusionLightValue(render.blockAccess, 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); if (flag1) { - render.field_147872_ap = (render.field_147852_aq = render.field_147850_ar = render.field_147848_as = colorRed * 0.5F); - render.field_147846_at = (render.field_147860_au = render.field_147858_av = render.field_147856_aw = colorGreen * 0.5F); - render.field_147854_ax = (render.field_147841_ay = render.field_147839_az = render.field_147833_aA = colorBlue * 0.5F); + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.5F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.5F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.5F); } else { - render.field_147872_ap = (render.field_147852_aq = render.field_147850_ar = render.field_147848_as = 0.5F); - render.field_147846_at = (render.field_147860_au = render.field_147858_av = render.field_147856_aw = 0.5F); - render.field_147854_ax = (render.field_147841_ay = render.field_147839_az = render.field_147833_aA = 0.5F); + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.5F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.5F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.5F); } - render.field_147872_ap *= f3; - render.field_147846_at *= f3; - render.field_147854_ax *= f3; - render.field_147852_aq *= f4; - render.field_147860_au *= f4; - render.field_147841_ay *= f4; - render.field_147850_ar *= f5; - render.field_147858_av *= f5; - render.field_147839_az *= f5; - render.field_147848_as *= f6; - render.field_147856_aw *= f6; - render.field_147833_aA *= f6; - render.func_147768_a(block, xPos, yPos, zPos, texture); + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + render.renderFaceYNeg(block, xPos, yPos, zPos, texture); flag = true; } - if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos + 1, zPos, 1))) + if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))) { - if (render.field_147857_k >= 1.0D) + if (render.renderMaxY >= 1.0D) { yPos++; } - render.field_147880_aa = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147885_ae = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147878_ac = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147887_af = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147813_G = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147824_K = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147822_I = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147817_L = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - boolean flag3 = render.field_147845_a.func_147439_a(xPos + 1, yPos + 1, zPos).func_149688_o().getCanBlockGrass(); - boolean flag2 = render.field_147845_a.func_147439_a(xPos - 1, yPos + 1, zPos).func_149688_o().getCanBlockGrass(); - boolean flag5 = render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos + 1).func_149688_o().getCanBlockGrass(); - boolean flag4 = render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos - 1).func_149688_o().getCanBlockGrass(); + render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); + render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); + render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); + render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); + render.aoLightValueScratchXYNP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); + render.aoLightValueScratchXYPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); + render.aoLightValueScratchYZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + render.aoLightValueScratchYZPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); + boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos + 1, zPos).getMaterial().getCanBlockGrass(); + boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos + 1, zPos).getMaterial().getCanBlockGrass(); + boolean flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getMaterial().getCanBlockGrass(); + boolean flag4 = render.blockAccess.getBlock(xPos, yPos + 1, zPos - 1).getMaterial().getCanBlockGrass(); if ((!flag4) && (!flag2)) { - render.field_147812_F = render.field_147813_G; - render.field_147836_Z = render.field_147880_aa; + render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXYNP; + render.aoBrightnessXYZNPN = render.aoBrightnessXYNP; } else { - render.field_147812_F = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos - 1); - render.field_147836_Z = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos - 1); + render.aoLightValueScratchXYZNPN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos - 1); + render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos - 1); } if ((!flag4) && (!flag3)) { - render.field_147824_K = render.field_147824_K; - render.field_147879_ad = render.field_147885_ae; + render.aoLightValueScratchXYPP = render.aoLightValueScratchXYPP; + render.aoBrightnessXYZPPN = render.aoBrightnessXYPP; } else { - render.field_147824_K = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos - 1); - render.field_147879_ad = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos - 1); + render.aoLightValueScratchXYPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos - 1); + render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos - 1); } if ((!flag5) && (!flag2)) { - render.field_147821_H = render.field_147813_G; - render.field_147881_ab = render.field_147880_aa; + render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXYNP; + render.aoBrightnessXYZNPP = render.aoBrightnessXYNP; } else { - render.field_147821_H = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos + 1); - render.field_147881_ab = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos + 1); + render.aoLightValueScratchXYZNPP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos + 1); + render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos + 1); } if ((!flag5) && (!flag3)) { - render.field_147819_N = render.field_147824_K; - render.field_147882_ag = render.field_147885_ae; + render.aoLightValueScratchXZNN = render.aoLightValueScratchXYPP; + render.aoBrightnessXYZPPP = render.aoBrightnessXYPP; } else { - render.field_147819_N = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos + 1); - render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos + 1); + render.aoLightValueScratchXZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); + render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); } - if (render.field_147857_k >= 1.0D) + if (render.renderMaxY >= 1.0D) { yPos--; } int i1 = l; - if ((render.field_147857_k >= 1.0D) || (!render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos).func_149662_c())) + if ((render.renderMaxY >= 1.0D) || (!render.blockAccess.getBlock(xPos, yPos + 1, zPos).isOpaqueCube())) { - i1 = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); } - float f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - f6 = (render.field_147821_H + render.field_147813_G + render.field_147817_L + f7) / 4.0F; - f3 = (render.field_147817_L + f7 + render.field_147819_N + render.field_147824_K) / 4.0F; - f4 = (f7 + render.field_147822_I + render.field_147824_K + render.field_147824_K) / 4.0F; - f5 = (render.field_147813_G + render.field_147812_F + f7 + render.field_147822_I) / 4.0F; - render.field_147870_ao = render.func_147778_a(render.field_147881_ab, render.field_147880_aa, render.field_147887_af, i1); - render.field_147864_al = render.func_147778_a(render.field_147887_af, render.field_147882_ag, render.field_147885_ae, i1); - render.field_147874_am = render.func_147778_a(render.field_147878_ac, render.field_147885_ae, render.field_147879_ad, i1); - render.field_147876_an = render.func_147778_a(render.field_147880_aa, render.field_147836_Z, render.field_147878_ac, i1); - render.field_147872_ap = (render.field_147852_aq = render.field_147850_ar = render.field_147848_as = colorRed); - render.field_147846_at = (render.field_147860_au = render.field_147858_av = render.field_147856_aw = colorGreen); - render.field_147854_ax = (render.field_147841_ay = render.field_147839_az = render.field_147833_aA = colorBlue); - render.field_147872_ap *= f3; - render.field_147846_at *= f3; - render.field_147854_ax *= f3; - render.field_147852_aq *= f4; - render.field_147860_au *= f4; - render.field_147841_ay *= f4; - render.field_147850_ar *= f5; - render.field_147858_av *= f5; - render.field_147839_az *= f5; - render.field_147848_as *= f6; - render.field_147856_aw *= f6; - render.field_147833_aA *= f6; - render.func_147806_b(block, xPos, yPos, zPos, texture); + float f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); + f6 = (render.aoLightValueScratchXYZNPP + render.aoLightValueScratchXYNP + render.aoLightValueScratchYZPP + f7) / 4.0F; + f3 = (render.aoLightValueScratchYZPP + f7 + render.aoLightValueScratchXZNN + render.aoLightValueScratchXYPP) / 4.0F; + f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYPP) / 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); + 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); + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + render.renderFaceYPos(block, xPos, yPos, zPos, texture); flag = true; } - if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos, zPos - 1, 2))) + if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))) { - if (render.field_147851_l <= 0.0D) + if (render.renderMinZ <= 0.0D) { zPos--; } - render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147814_A = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147822_I = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147883_ah = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147825_U = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147878_ac = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); - render.field_147866_ai = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); - boolean flag3 = render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos - 1).func_149688_o().getCanBlockGrass(); - boolean flag2 = render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos - 1).func_149688_o().getCanBlockGrass(); - boolean flag5 = render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos - 1).func_149688_o().getCanBlockGrass(); - boolean flag4 = render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos - 1).func_149688_o().getCanBlockGrass(); + render.aoLightValueScratchXZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); + render.aoLightValueScratchYZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); + render.aoLightValueScratchYZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); + render.aoLightValueScratchXZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); + render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); + render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); + render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); + render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); + boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos, zPos - 1).getMaterial().getCanBlockGrass(); + boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos, zPos - 1).getMaterial().getCanBlockGrass(); + boolean flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos - 1).getMaterial().getCanBlockGrass(); + boolean flag4 = render.blockAccess.getBlock(xPos, yPos - 1, zPos - 1).getMaterial().getCanBlockGrass(); if ((!flag2) && (!flag4)) { - render.field_147888_x = render.field_147820_O; - render.field_147832_R = render.field_147883_ah; + render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; } else { - render.field_147888_x = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); - render.field_147832_R = block.func_149677_c(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.aoLightValueScratchXYZNNN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos); + render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); } if ((!flag2) && (!flag5)) { - render.field_147812_F = render.field_147820_O; - render.field_147836_Z = render.field_147883_ah; + render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; } else { - render.field_147812_F = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos + 1, zPos); - render.field_147836_Z = block.func_149677_c(render.field_147845_a, xPos - 1, yPos + 1, zPos); + render.aoLightValueScratchXYZNPN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos); + render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); } if ((!flag3) && (!flag4)) { - render.field_147816_C = render.field_147820_O; - render.field_147827_W = render.field_147866_ai; + render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; } else { - render.field_147816_C = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); - render.field_147827_W = block.func_149677_c(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.aoLightValueScratchXYZPNN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos); + render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); } if ((!flag3) && (!flag5)) { - render.field_147824_K = render.field_147820_O; - render.field_147879_ad = render.field_147866_ai; + render.aoLightValueScratchXYPP = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; } else { - render.field_147824_K = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos + 1, zPos); - render.field_147879_ad = block.func_149677_c(render.field_147845_a, xPos + 1, yPos + 1, zPos); + render.aoLightValueScratchXYPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); + render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); } - if (render.field_147851_l <= 0.0D) + if (render.renderMinZ <= 0.0D) { zPos++; } int i1 = l; - if ((render.field_147851_l <= 0.0D) || (!render.field_147845_a.func_147439_a(xPos, yPos, zPos - 1).func_149662_c())) + if ((render.renderMinZ <= 0.0D) || (!render.blockAccess.getBlock(xPos, yPos, zPos - 1).isOpaqueCube())) { - i1 = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); } - float f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - f3 = (render.field_147820_O + render.field_147812_F + f7 + render.field_147822_I) / 4.0F; - f4 = (f7 + render.field_147822_I + render.field_147820_O + render.field_147824_K) / 4.0F; - f5 = (render.field_147814_A + f7 + render.field_147816_C + render.field_147820_O) / 4.0F; - f6 = (render.field_147888_x + render.field_147820_O + render.field_147814_A + f7) / 4.0F; - render.field_147864_al = render.func_147778_a(render.field_147883_ah, render.field_147836_Z, render.field_147878_ac, i1); - render.field_147874_am = render.func_147778_a(render.field_147878_ac, render.field_147866_ai, render.field_147879_ad, i1); - render.field_147876_an = render.func_147778_a(render.field_147825_U, render.field_147827_W, render.field_147866_ai, i1); - render.field_147870_ao = render.func_147778_a(render.field_147832_R, render.field_147883_ah, render.field_147825_U, i1); + float f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + f3 = (render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; + f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYPP) / 4.0F; + f5 = (render.aoLightValueScratchYZNN + f7 + render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXZPN) / 4.0F; + f6 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZPN + 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); if (flag1) { - render.field_147872_ap = (render.field_147852_aq = render.field_147850_ar = render.field_147848_as = colorRed * 0.8F); - render.field_147846_at = (render.field_147860_au = render.field_147858_av = render.field_147856_aw = colorGreen * 0.8F); - render.field_147854_ax = (render.field_147841_ay = render.field_147839_az = render.field_147833_aA = colorBlue * 0.8F); + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F); } else { - render.field_147872_ap = (render.field_147852_aq = render.field_147850_ar = render.field_147848_as = 0.8F); - render.field_147846_at = (render.field_147860_au = render.field_147858_av = render.field_147856_aw = 0.8F); - render.field_147854_ax = (render.field_147841_ay = render.field_147839_az = render.field_147833_aA = 0.8F); + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F); } - render.field_147872_ap *= f3; - render.field_147846_at *= f3; - render.field_147854_ax *= f3; - render.field_147852_aq *= f4; - render.field_147860_au *= f4; - render.field_147841_ay *= f4; - render.field_147850_ar *= f5; - render.field_147858_av *= f5; - render.field_147839_az *= f5; - render.field_147848_as *= f6; - render.field_147856_aw *= f6; - render.field_147833_aA *= f6; - render.func_147761_c(block, xPos, yPos, zPos, texture); + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + render.renderFaceZNeg(block, xPos, yPos, zPos, texture); flag = true; } - if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos, zPos + 1, 3))) + if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))) { - if (render.field_147853_m >= 1.0D) + if (render.renderMaxZ >= 1.0D) { zPos++; } - render.field_147830_P = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147829_Q = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147815_B = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147817_L = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - render.field_147868_aj = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); - render.field_147862_ak = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); - render.field_147828_V = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147887_af = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); - boolean flag3 = render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos + 1).func_149688_o().getCanBlockGrass(); - boolean flag2 = render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos + 1).func_149688_o().getCanBlockGrass(); - boolean flag5 = render.field_147845_a.func_147439_a(xPos, yPos + 1, zPos + 1).func_149688_o().getCanBlockGrass(); - boolean flag4 = render.field_147845_a.func_147439_a(xPos, yPos - 1, zPos + 1).func_149688_o().getCanBlockGrass(); + render.aoLightValueScratchXZNP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); + render.aoLightValueScratchXZPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos); + render.aoLightValueScratchYZNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); + render.aoLightValueScratchYZPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); + render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); + render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); + render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); + render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); + boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos, zPos + 1).getMaterial().getCanBlockGrass(); + boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos, zPos + 1).getMaterial().getCanBlockGrass(); + boolean flag5 = render.blockAccess.getBlock(xPos, yPos + 1, zPos + 1).getMaterial().getCanBlockGrass(); + boolean flag4 = render.blockAccess.getBlock(xPos, yPos - 1, zPos + 1).getMaterial().getCanBlockGrass(); if ((!flag2) && (!flag4)) { - render.field_147884_z = render.field_147830_P; - render.field_147826_T = render.field_147868_aj; + render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; } else { - render.field_147884_z = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos - 1, zPos); - render.field_147826_T = block.func_149677_c(render.field_147845_a, xPos - 1, yPos - 1, zPos); + render.aoLightValueScratchXYZNNP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos - 1, zPos); + render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos - 1, zPos); } if ((!flag2) && (!flag5)) { - render.field_147821_H = render.field_147830_P; - render.field_147881_ab = render.field_147868_aj; + render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; } else { - render.field_147821_H = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos + 1, zPos); - render.field_147881_ab = block.func_149677_c(render.field_147845_a, xPos - 1, yPos + 1, zPos); + render.aoLightValueScratchXYZNPP = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos + 1, zPos); + render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos + 1, zPos); } if ((!flag3) && (!flag4)) { - render.field_147811_E = render.field_147829_Q; - render.field_147834_Y = render.field_147862_ak; + render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; } else { - render.field_147811_E = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos - 1, zPos); - render.field_147834_Y = block.func_149677_c(render.field_147845_a, xPos + 1, yPos - 1, zPos); + render.aoLightValueScratchXYZPNP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos - 1, zPos); + render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos - 1, zPos); } if ((!flag3) && (!flag5)) { - render.field_147819_N = render.field_147829_Q; - render.field_147882_ag = render.field_147862_ak; + render.aoLightValueScratchXZNN = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; } else { - render.field_147819_N = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos + 1, zPos); - render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos + 1, yPos + 1, zPos); + render.aoLightValueScratchXZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); + render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); } - if (render.field_147853_m >= 1.0D) + if (render.renderMaxZ >= 1.0D) { zPos--; } int i1 = l; - if ((render.field_147853_m >= 1.0D) || (!render.field_147845_a.func_147439_a(xPos, yPos, zPos + 1).func_149662_c())) + if ((render.renderMaxZ >= 1.0D) || (!render.blockAccess.getBlock(xPos, yPos, zPos + 1).isOpaqueCube())) { - i1 = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); } - float f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - f3 = (render.field_147830_P + render.field_147821_H + f7 + render.field_147817_L) / 4.0F; - f6 = (f7 + render.field_147817_L + render.field_147829_Q + render.field_147819_N) / 4.0F; - f5 = (render.field_147815_B + f7 + render.field_147811_E + render.field_147829_Q) / 4.0F; - f4 = (render.field_147884_z + render.field_147830_P + render.field_147815_B + f7) / 4.0F; - render.field_147864_al = render.func_147778_a(render.field_147868_aj, render.field_147881_ab, render.field_147887_af, i1); - render.field_147870_ao = render.func_147778_a(render.field_147887_af, render.field_147862_ak, render.field_147882_ag, i1); - render.field_147876_an = render.func_147778_a(render.field_147828_V, render.field_147834_Y, render.field_147862_ak, i1); - render.field_147874_am = render.func_147778_a(render.field_147826_T, render.field_147868_aj, render.field_147828_V, i1); + float f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); + f3 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + f7 + render.aoLightValueScratchYZPP) / 4.0F; + f6 = (f7 + render.aoLightValueScratchYZPP + render.aoLightValueScratchXZPP + render.aoLightValueScratchXZNN) / 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); if (flag1) { - render.field_147872_ap = (render.field_147852_aq = render.field_147850_ar = render.field_147848_as = colorRed * 0.8F); - render.field_147846_at = (render.field_147860_au = render.field_147858_av = render.field_147856_aw = colorGreen * 0.8F); - render.field_147854_ax = (render.field_147841_ay = render.field_147839_az = render.field_147833_aA = colorBlue * 0.8F); + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.8F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.8F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.8F); } else { - render.field_147872_ap = (render.field_147852_aq = render.field_147850_ar = render.field_147848_as = 0.8F); - render.field_147846_at = (render.field_147860_au = render.field_147858_av = render.field_147856_aw = 0.8F); - render.field_147854_ax = (render.field_147841_ay = render.field_147839_az = render.field_147833_aA = 0.8F); + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.8F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.8F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.8F); } - render.field_147872_ap *= f3; - render.field_147846_at *= f3; - render.field_147854_ax *= f3; - render.field_147852_aq *= f4; - render.field_147860_au *= f4; - render.field_147841_ay *= f4; - render.field_147850_ar *= f5; - render.field_147858_av *= f5; - render.field_147839_az *= f5; - render.field_147848_as *= f6; - render.field_147856_aw *= f6; - render.field_147833_aA *= f6; - render.func_147734_d(block, xPos, yPos, zPos, texture); + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + render.renderFaceZPos(block, xPos, yPos, zPos, texture); flag = true; } - if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos - 1, yPos, zPos, 4))) + if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))) { - if (render.field_147859_h <= 0.0D) + if (render.renderMinX <= 0.0D) { xPos--; } - render.field_147886_y = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147830_P = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147813_G = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - render.field_147831_S = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147883_ah = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147868_aj = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147880_aa = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); - boolean flag3 = render.field_147845_a.func_147439_a(xPos - 1, yPos + 1, zPos).func_149688_o().getCanBlockGrass(); - boolean flag2 = render.field_147845_a.func_147439_a(xPos - 1, yPos - 1, zPos).func_149688_o().getCanBlockGrass(); - boolean flag5 = render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos - 1).func_149688_o().getCanBlockGrass(); - boolean flag4 = render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos + 1).func_149688_o().getCanBlockGrass(); + render.aoLightValueScratchXYNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); + render.aoLightValueScratchXZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + render.aoLightValueScratchXZNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); + render.aoLightValueScratchXYNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); + render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); + render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); + render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); + render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); + boolean flag3 = render.blockAccess.getBlock(xPos - 1, yPos + 1, zPos).getMaterial().getCanBlockGrass(); + boolean flag2 = render.blockAccess.getBlock(xPos - 1, yPos - 1, zPos).getMaterial().getCanBlockGrass(); + boolean flag5 = render.blockAccess.getBlock(xPos - 1, yPos, zPos - 1).getMaterial().getCanBlockGrass(); + boolean flag4 = render.blockAccess.getBlock(xPos - 1, yPos, zPos + 1).getMaterial().getCanBlockGrass(); if ((!flag5) && (!flag2)) { - render.field_147888_x = render.field_147820_O; - render.field_147832_R = render.field_147883_ah; + render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; } else { - render.field_147888_x = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); - render.field_147832_R = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.aoLightValueScratchXYZNNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1); + render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); } if ((!flag4) && (!flag2)) { - render.field_147884_z = render.field_147830_P; - render.field_147826_T = render.field_147868_aj; + render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; } else { - render.field_147884_z = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); - render.field_147826_T = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.aoLightValueScratchXYZNNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1); + render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); } if ((!flag5) && (!flag3)) { - render.field_147812_F = render.field_147820_O; - render.field_147836_Z = render.field_147883_ah; + render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; } else { - render.field_147812_F = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos - 1); - render.field_147836_Z = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos - 1); + render.aoLightValueScratchXYZNPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1); + render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); } if ((!flag4) && (!flag3)) { - render.field_147821_H = render.field_147830_P; - render.field_147881_ab = render.field_147868_aj; + render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; } else { - render.field_147821_H = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos + 1); - render.field_147881_ab = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos + 1); + render.aoLightValueScratchXYZNPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); + render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); } - if (render.field_147859_h <= 0.0D) + if (render.renderMinX <= 0.0D) { xPos++; } int i1 = l; - if ((render.field_147859_h <= 0.0D) || (!render.field_147845_a.func_147439_a(xPos - 1, yPos, zPos).func_149662_c())) + if ((render.renderMinX <= 0.0D) || (!render.blockAccess.getBlock(xPos - 1, yPos, zPos).isOpaqueCube())) { - i1 = block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos); + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); } - float f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos - 1, yPos, zPos); - f6 = (render.field_147886_y + render.field_147884_z + f7 + render.field_147830_P) / 4.0F; - f3 = (f7 + render.field_147830_P + render.field_147813_G + render.field_147821_H) / 4.0F; - f4 = (render.field_147820_O + f7 + render.field_147812_F + render.field_147813_G) / 4.0F; - f5 = (render.field_147888_x + render.field_147886_y + render.field_147820_O + f7) / 4.0F; - render.field_147870_ao = render.func_147778_a(render.field_147831_S, render.field_147826_T, render.field_147868_aj, i1); - render.field_147864_al = render.func_147778_a(render.field_147868_aj, render.field_147880_aa, render.field_147881_ab, i1); - render.field_147874_am = render.func_147778_a(render.field_147883_ah, render.field_147836_Z, render.field_147880_aa, i1); - render.field_147876_an = render.func_147778_a(render.field_147832_R, render.field_147831_S, render.field_147883_ah, i1); + float f7 = getAmbientOcclusionLightValue(render.blockAccess, 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.aoLightValueScratchXZPN + f7 + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F; + f5 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZPN + 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); if (flag1) { - render.field_147872_ap = (render.field_147852_aq = render.field_147850_ar = render.field_147848_as = colorRed * 0.6F); - render.field_147846_at = (render.field_147860_au = render.field_147858_av = render.field_147856_aw = colorGreen * 0.6F); - render.field_147854_ax = (render.field_147841_ay = render.field_147839_az = render.field_147833_aA = colorBlue * 0.6F); + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F); } else { - render.field_147872_ap = (render.field_147852_aq = render.field_147850_ar = render.field_147848_as = 0.6F); - render.field_147846_at = (render.field_147860_au = render.field_147858_av = render.field_147856_aw = 0.6F); - render.field_147854_ax = (render.field_147841_ay = render.field_147839_az = render.field_147833_aA = 0.6F); + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F); } - render.field_147872_ap *= f3; - render.field_147846_at *= f3; - render.field_147854_ax *= f3; - render.field_147852_aq *= f4; - render.field_147860_au *= f4; - render.field_147841_ay *= f4; - render.field_147850_ar *= f5; - render.field_147858_av *= f5; - render.field_147839_az *= f5; - render.field_147848_as *= f6; - render.field_147856_aw *= f6; - render.field_147833_aA *= f6; - render.func_147798_e(block, xPos, yPos, zPos, texture); + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + render.renderFaceXNeg(block, xPos, yPos, zPos, texture); flag = true; } - if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos + 1, yPos, zPos, 5))) + if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))) { - if (render.field_147861_i >= 1.0D) + if (render.renderMaxX >= 1.0D) { xPos++; } - render.field_147810_D = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147820_O = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147829_Q = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147824_K = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos); - render.field_147835_X = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos); - render.field_147866_ai = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1); - render.field_147862_ak = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1); - render.field_147885_ae = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos); - boolean flag3 = render.field_147845_a.func_147439_a(xPos + 1, yPos + 1, zPos).func_149688_o().getCanBlockGrass(); - boolean flag2 = render.field_147845_a.func_147439_a(xPos + 1, yPos - 1, zPos).func_149688_o().getCanBlockGrass(); - boolean flag5 = render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos + 1).func_149688_o().getCanBlockGrass(); - boolean flag4 = render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos - 1).func_149688_o().getCanBlockGrass(); + render.aoLightValueScratchXYPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); + render.aoLightValueScratchXZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + render.aoLightValueScratchXZPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos + 1); + render.aoLightValueScratchXYPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); + render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); + render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); + render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); + render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); + boolean flag3 = render.blockAccess.getBlock(xPos + 1, yPos + 1, zPos).getMaterial().getCanBlockGrass(); + boolean flag2 = render.blockAccess.getBlock(xPos + 1, yPos - 1, zPos).getMaterial().getCanBlockGrass(); + boolean flag5 = render.blockAccess.getBlock(xPos + 1, yPos, zPos + 1).getMaterial().getCanBlockGrass(); + boolean flag4 = render.blockAccess.getBlock(xPos + 1, yPos, zPos - 1).getMaterial().getCanBlockGrass(); if ((!flag2) && (!flag4)) { - render.field_147816_C = render.field_147820_O; - render.field_147827_W = render.field_147866_ai; + render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; } else { - render.field_147816_C = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos - 1); - render.field_147827_W = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos - 1); + render.aoLightValueScratchXYZPNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos - 1); + render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos - 1); } if ((!flag2) && (!flag5)) { - render.field_147811_E = render.field_147829_Q; - render.field_147834_Y = render.field_147862_ak; + render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; } else { - render.field_147811_E = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos - 1, zPos + 1); - render.field_147834_Y = block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos + 1); + render.aoLightValueScratchXYZPNP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos + 1); + render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos + 1); } if ((!flag3) && (!flag4)) { - render.field_147824_K = render.field_147820_O; - render.field_147879_ad = render.field_147866_ai; + render.aoLightValueScratchXYPP = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; } else { - render.field_147824_K = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos - 1); - render.field_147879_ad = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos - 1); + render.aoLightValueScratchXYPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos - 1); + render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos - 1); } if ((!flag3) && (!flag5)) { - render.field_147819_N = render.field_147829_Q; - render.field_147882_ag = render.field_147862_ak; + render.aoLightValueScratchXZNN = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; } else { - render.field_147819_N = getAmbientOcclusionLightValue(render.field_147845_a, xPos, yPos + 1, zPos + 1); - render.field_147882_ag = block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos + 1); + render.aoLightValueScratchXZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); + render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); } - if (render.field_147861_i >= 1.0D) + if (render.renderMaxX >= 1.0D) { xPos--; } int i1 = l; - if ((render.field_147861_i >= 1.0D) || (!render.field_147845_a.func_147439_a(xPos + 1, yPos, zPos).func_149662_c())) + if ((render.renderMaxX >= 1.0D) || (!render.blockAccess.getBlock(xPos + 1, yPos, zPos).isOpaqueCube())) { - i1 = block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos); + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); } - float f7 = getAmbientOcclusionLightValue(render.field_147845_a, xPos + 1, yPos, zPos); - f3 = (render.field_147810_D + render.field_147811_E + f7 + render.field_147829_Q) / 4.0F; - f4 = (render.field_147816_C + render.field_147810_D + render.field_147820_O + f7) / 4.0F; - f5 = (render.field_147820_O + f7 + render.field_147824_K + render.field_147824_K) / 4.0F; - f6 = (f7 + render.field_147829_Q + render.field_147824_K + render.field_147819_N) / 4.0F; - render.field_147864_al = render.func_147778_a(render.field_147835_X, render.field_147834_Y, render.field_147862_ak, i1); - render.field_147870_ao = render.func_147778_a(render.field_147862_ak, render.field_147885_ae, render.field_147882_ag, i1); - render.field_147876_an = render.func_147778_a(render.field_147866_ai, render.field_147879_ad, render.field_147885_ae, i1); - render.field_147874_am = render.func_147778_a(render.field_147827_W, render.field_147835_X, render.field_147866_ai, i1); + float f7 = getAmbientOcclusionLightValue(render.blockAccess, 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.aoLightValueScratchXYPP + render.aoLightValueScratchXYPP) / 4.0F; + f6 = (f7 + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYPP + render.aoLightValueScratchXZNN) / 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); if (flag1) { - render.field_147872_ap = (render.field_147852_aq = render.field_147850_ar = render.field_147848_as = colorRed * 0.6F); - render.field_147846_at = (render.field_147860_au = render.field_147858_av = render.field_147856_aw = colorGreen * 0.6F); - render.field_147854_ax = (render.field_147841_ay = render.field_147839_az = render.field_147833_aA = colorBlue * 0.6F); + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = colorRed * 0.6F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = colorGreen * 0.6F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = colorBlue * 0.6F); } else { - render.field_147872_ap = (render.field_147852_aq = render.field_147850_ar = render.field_147848_as = 0.6F); - render.field_147846_at = (render.field_147860_au = render.field_147858_av = render.field_147856_aw = 0.6F); - render.field_147854_ax = (render.field_147841_ay = render.field_147839_az = render.field_147833_aA = 0.6F); + render.colorRedTopLeft = (render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = 0.6F); + render.colorGreenTopLeft = (render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = 0.6F); + render.colorBlueTopLeft = (render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = 0.6F); } - render.field_147872_ap *= f3; - render.field_147846_at *= f3; - render.field_147854_ax *= f3; - render.field_147852_aq *= f4; - render.field_147860_au *= f4; - render.field_147841_ay *= f4; - render.field_147850_ar *= f5; - render.field_147858_av *= f5; - render.field_147839_az *= f5; - render.field_147848_as *= f6; - render.field_147856_aw *= f6; - render.field_147833_aA *= f6; - render.func_147764_f(block, xPos, yPos, zPos, texture); + render.colorRedTopLeft *= f3; + render.colorGreenTopLeft *= f3; + render.colorBlueTopLeft *= f3; + render.colorRedBottomLeft *= f4; + render.colorGreenBottomLeft *= f4; + render.colorBlueBottomLeft *= f4; + render.colorRedBottomRight *= f5; + render.colorGreenBottomRight *= f5; + render.colorBlueBottomRight *= f5; + render.colorRedTopRight *= f6; + render.colorGreenTopRight *= f6; + render.colorBlueTopRight *= f6; + render.renderFaceXPos(block, xPos, yPos, zPos, texture); flag = true; } - render.field_147863_w = false; + render.enableAO = 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.field_147863_w = false; + render.enableAO = false; Tessellator tessellator = Tessellator.instance; boolean flag = false; float f3 = 0.5F; @@ -1616,56 +1616,56 @@ public class RenderLiquid f18 = f6 * colorBlue; } - int l = block.func_149677_c(render.field_147845_a, xPos, yPos, zPos); + int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos); - if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos - 1, zPos, 0))) + if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))) { - tessellator.setBrightness(render.field_147855_j > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos - 1, zPos)); + tessellator.setBrightness(render.renderMinY > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos)); tessellator.setColorOpaque_F(f10, f13, f16); - render.func_147768_a(block, xPos, yPos, zPos, texture); + render.renderFaceYNeg(block, xPos, yPos, zPos, texture); flag = true; } - if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos + 1, zPos, 1))) + if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))) { - tessellator.setBrightness(render.field_147857_k < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos + 1, zPos)); + tessellator.setBrightness(render.renderMaxY < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos)); tessellator.setColorOpaque_F(f7, f8, f9); - render.func_147806_b(block, xPos, yPos, zPos, texture); + render.renderFaceYPos(block, xPos, yPos, zPos, texture); flag = true; } - if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos, zPos - 1, 2))) + if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))) { - tessellator.setBrightness(render.field_147851_l > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos, zPos - 1)); + tessellator.setBrightness(render.renderMinZ > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1)); tessellator.setColorOpaque_F(f11, f14, f17); - render.func_147761_c(block, xPos, yPos, zPos, texture); + render.renderFaceZNeg(block, xPos, yPos, zPos, texture); flag = true; } - if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos, yPos, zPos + 1, 3))) + if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))) { - tessellator.setBrightness(render.field_147853_m < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos, yPos, zPos + 1)); + tessellator.setBrightness(render.renderMaxZ < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1)); tessellator.setColorOpaque_F(f11, f14, f17); - render.func_147734_d(block, xPos, yPos, zPos, texture); + render.renderFaceZPos(block, xPos, yPos, zPos, texture); flag = true; } - if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos - 1, yPos, zPos, 4))) + if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))) { - tessellator.setBrightness(render.field_147859_h > 0.0D ? l : block.func_149677_c(render.field_147845_a, xPos - 1, yPos, zPos)); + tessellator.setBrightness(render.renderMinX > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos)); tessellator.setColorOpaque_F(f12, f15, f18); - render.func_147798_e(block, xPos, yPos, zPos, texture); + render.renderFaceXNeg(block, xPos, yPos, zPos, texture); flag = true; } - if ((render.field_147837_f) || (block. func_149646_a(render.field_147845_a, xPos + 1, yPos, zPos, 5))) + if ((render.renderAllFaces) || (block. shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))) { - tessellator.setBrightness(render.field_147861_i < 1.0D ? l : block.func_149677_c(render.field_147845_a, xPos + 1, yPos, zPos)); + tessellator.setBrightness(render.renderMaxX < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos)); tessellator.setColorOpaque_F(f12, f15, f18); - render.func_147764_f(block, xPos, yPos, zPos, texture); + render.renderFaceXPos(block, xPos, yPos, zPos, texture); flag = true; } diff --git a/src/main/java/tconstruct/client/block/SearedRender.java b/src/main/java/tconstruct/client/block/SearedRender.java index 3faf72c1..9b557cea 100644 --- a/src/main/java/tconstruct/client/block/SearedRender.java +++ b/src/main/java/tconstruct/client/block/SearedRender.java @@ -24,104 +24,104 @@ public class SearedRender implements ISimpleBlockRenderingHandler if (metadata == 0) { //Top - renderer.func_147782_a(0.0F, 0.625F, 0.0F, 1.0F, 0.9375F, 1.0F); + renderer.setRenderBounds(0.0F, 0.625F, 0.0F, 1.0F, 0.9375F, 1.0F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); //Lip - renderer.func_147782_a(0.0F, 0.9375, 0.0F, 0.0625, 1.0, 1.0F); + renderer.setRenderBounds(0.0F, 0.9375, 0.0F, 0.0625, 1.0, 1.0F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.0625, 0.9375, 0.9375, 0.9375, 1.0, 1.0F); + renderer.setRenderBounds(0.0625, 0.9375, 0.9375, 0.9375, 1.0, 1.0F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.9375, 0.9375, 0.0F, 1.0F, 1.0, 1.0F); + renderer.setRenderBounds(0.9375, 0.9375, 0.0F, 1.0F, 1.0, 1.0F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.0625, 0.9375, 0.0F, 0.9375, 1.0, 0.0625); + renderer.setRenderBounds(0.0625, 0.9375, 0.0F, 0.9375, 1.0, 0.0625); TProxyClient.renderStandardInvBlock(renderer, block, metadata); //Legs - renderer.func_147782_a(0.0F, 0.0F, 0.0F, 0.3125F, 0.625F, 0.3125F); + renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 0.3125F, 0.625F, 0.3125F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.6875, 0.0F, 0.0F, 1.0F, 0.625F, 0.25F); + renderer.setRenderBounds(0.6875, 0.0F, 0.0F, 1.0F, 0.625F, 0.25F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.0F, 0.0F, 0.6875, 0.3125F, 0.625F, 1.0F); + renderer.setRenderBounds(0.0F, 0.0F, 0.6875, 0.3125F, 0.625F, 1.0F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.6875, 0.0F, 0.6875, 1.0F, 0.625F, 1.0F); + renderer.setRenderBounds(0.6875, 0.0F, 0.6875, 1.0F, 0.625F, 1.0F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); } else if (metadata == 1) { - renderer.func_147782_a(0.25, 0.25, 0.625, 0.75, 0.375, 1); + renderer.setRenderBounds(0.25, 0.25, 0.625, 0.75, 0.375, 1); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.25, 0.25, 0.625, 0.375, 0.625, 1); + renderer.setRenderBounds(0.25, 0.25, 0.625, 0.375, 0.625, 1); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.625, 0.25, 0.625, 0.75, 0.625, 1); + renderer.setRenderBounds(0.625, 0.25, 0.625, 0.75, 0.625, 1); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.375, 0.375, 0.625, 0.625, 0.625, 1); + renderer.setRenderBounds(0.375, 0.375, 0.625, 0.625, 0.625, 1); } else if (metadata == 2) { - renderer.func_147782_a(0.125F, 0.125f, 0.125F, 0.875F, 0.25F, 0.875F); + renderer.setRenderBounds(0.125F, 0.125f, 0.125F, 0.875F, 0.25F, 0.875F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); //Details - renderer.func_147782_a(0.001f, 0.1245f, 0.001f, 0.1245f, 0.999f, 0.4375f); + renderer.setRenderBounds(0.001f, 0.1245f, 0.001f, 0.1245f, 0.999f, 0.4375f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.001f, 0.1245f, 0.5625f, 0.1245f, 0.999f, 0.999f); + renderer.setRenderBounds(0.001f, 0.1245f, 0.5625f, 0.1245f, 0.999f, 0.999f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.001f, 0.8755f, 0.4375f, 0.1245f, 0.999f, 0.5625f); + renderer.setRenderBounds(0.001f, 0.8755f, 0.4375f, 0.1245f, 0.999f, 0.5625f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.001f, 0.1245f, 0.4375f, 0.1245f, 0.25F, 0.5625f); + renderer.setRenderBounds(0.001f, 0.1245f, 0.4375f, 0.1245f, 0.25F, 0.5625f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.8755f, 0.1245f, 0f, 0.999f, 0.999f, 0.4375f); + renderer.setRenderBounds(0.8755f, 0.1245f, 0f, 0.999f, 0.999f, 0.4375f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.8755f, 0.1245f, 0.5625f, 0.999f, 0.999f, 0.999f); + renderer.setRenderBounds(0.8755f, 0.1245f, 0.5625f, 0.999f, 0.999f, 0.999f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.8755f, 0.8755f, 0.4375f, 0.999f, 0.999f, 0.5625f); + renderer.setRenderBounds(0.8755f, 0.8755f, 0.4375f, 0.999f, 0.999f, 0.5625f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.8755f, 0.1245f, 0.4375f, 0.999f, 0.25F, 0.5625f); + renderer.setRenderBounds(0.8755f, 0.1245f, 0.4375f, 0.999f, 0.25F, 0.5625f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.1245f, 0.1245f, 0.8755f, 0.4375f, 0.999f, 0.999f); + renderer.setRenderBounds(0.1245f, 0.1245f, 0.8755f, 0.4375f, 0.999f, 0.999f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.5625f, 0.1245f, 0.8755f, 0.8755f, 0.999f, 0.999f); + renderer.setRenderBounds(0.5625f, 0.1245f, 0.8755f, 0.8755f, 0.999f, 0.999f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.4375f, 0.8755f, 0.8755f, 0.5625f, 0.999f, 0.999f); + renderer.setRenderBounds(0.4375f, 0.8755f, 0.8755f, 0.5625f, 0.999f, 0.999f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.4375f, 0.1245f, 0.8755f, 0.5625f, 0.2495F, 0.999f); + renderer.setRenderBounds(0.4375f, 0.1245f, 0.8755f, 0.5625f, 0.2495F, 0.999f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.1245f, 0.1245f, 0.001f, 0.4375f, 0.999f, 0.1245f); + renderer.setRenderBounds(0.1245f, 0.1245f, 0.001f, 0.4375f, 0.999f, 0.1245f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.5625f, 0.1245f, 0.001f, 0.8755f, 0.999f, 0.1245f); + renderer.setRenderBounds(0.5625f, 0.1245f, 0.001f, 0.8755f, 0.999f, 0.1245f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.4375f, 0.8755f, 0.001f, 0.5625f, 0.999f, 0.1245f); + renderer.setRenderBounds(0.4375f, 0.8755f, 0.001f, 0.5625f, 0.999f, 0.1245f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.4375f, 0.1245f, 0.001f, 0.5625f, 0.25F, 0.1245f); + renderer.setRenderBounds(0.4375f, 0.1245f, 0.001f, 0.5625f, 0.25F, 0.1245f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); //Legs - renderer.func_147782_a(0.0F, 0.0F, 0.0F, 0.3125F, 0.125, 0.3125F); + renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 0.3125F, 0.125, 0.3125F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.6875F, 0.0F, 0.0F, 1.0F, 0.125, 0.3125F); + renderer.setRenderBounds(0.6875F, 0.0F, 0.0F, 1.0F, 0.125, 0.3125F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.0F, 0.0F, 0.6875F, 0.3125F, 0.125, 1.0F); + renderer.setRenderBounds(0.0F, 0.0F, 0.6875F, 0.3125F, 0.125, 1.0F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.6875F, 0.0F, 0.6875F, 1.0F, 0.125, 1.0F); + renderer.setRenderBounds(0.6875F, 0.0F, 0.6875F, 1.0F, 0.125, 1.0F); TProxyClient.renderStandardInvBlock(renderer, block, metadata); //Outside - renderer.func_147782_a(0.0f, 0.125, 0f, 0.125, 1.0F, 1); + renderer.setRenderBounds(0.0f, 0.125, 0f, 0.125, 1.0F, 1); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.875f, 0.125, 0f, 1, 1.0F, 1); + renderer.setRenderBounds(0.875f, 0.125, 0f, 1, 1.0F, 1); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.125f, 0.125, 0f, 0.875f, 1.0F, 0.125f); + renderer.setRenderBounds(0.125f, 0.125, 0f, 0.875f, 1.0F, 0.125f); TProxyClient.renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.125f, 0.125, 0.875f, 0.875f, 1.0F, 1); + renderer.setRenderBounds(0.125f, 0.125, 0.875f, 0.875f, 1.0F, 1); TProxyClient.renderStandardInvBlock(renderer, block, metadata); } else { - renderer.func_147782_a(0, 0, 0, 1, 1, 1); + renderer.setRenderBounds(0, 0, 0, 1, 1, 1); TProxyClient.renderStandardInvBlock(renderer, block, metadata); } } @@ -136,32 +136,32 @@ public class SearedRender implements ISimpleBlockRenderingHandler if (metadata == 0) { //Top - renderer.func_147782_a(0.0F, 0.625F, 0.0F, 1.0F, 0.9375F, 1.0F); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.0F, 0.625F, 0.0F, 1.0F, 0.9375F, 1.0F); + renderer.renderStandardBlock(block, x, y, z); //Lip - renderer.func_147782_a(0.0F, 0.9375, 0.0F, 0.0625, 1.0, 1.0F); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.0625, 0.9375, 0.9375, 0.9375, 1.0, 1.0F); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.9375, 0.9375, 0.0F, 1.0F, 1.0, 1.0F); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.0625, 0.9375, 0.0F, 0.9375, 1.0, 0.0625); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.0F, 0.9375, 0.0F, 0.0625, 1.0, 1.0F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.0625, 0.9375, 0.9375, 0.9375, 1.0, 1.0F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.9375, 0.9375, 0.0F, 1.0F, 1.0, 1.0F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.0625, 0.9375, 0.0F, 0.9375, 1.0, 0.0625); + renderer.renderStandardBlock(block, x, y, z); //Legs - renderer.func_147782_a(0.0F, 0.0F, 0.0F, 0.3125F, 0.625F, 0.3125F); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.6875, 0.0F, 0.0F, 1.0F, 0.625F, 0.25F); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.0F, 0.0F, 0.6875, 0.3125F, 0.625F, 1.0F); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.6875, 0.0F, 0.6875, 1.0F, 0.625F, 1.0F); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 0.3125F, 0.625F, 0.3125F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.6875, 0.0F, 0.0F, 1.0F, 0.625F, 0.25F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.0F, 0.0F, 0.6875, 0.3125F, 0.625F, 1.0F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.6875, 0.0F, 0.6875, 1.0F, 0.625F, 1.0F); + renderer.renderStandardBlock(block, x, y, z); - if (world.func_147438_o(x, y, z) instanceof CastingTableLogic) + if (world.getTileEntity(x, y, z) instanceof CastingTableLogic) { - CastingTableLogic logic = (CastingTableLogic) world.func_147438_o(x, y, z); + CastingTableLogic logic = (CastingTableLogic) world.getTileEntity(x, y, z); if (logic.liquid != null) { float minHeight = 0.9375F; @@ -191,7 +191,7 @@ public class SearedRender implements ISimpleBlockRenderingHandler float percent = (float) logic.getLiquidAmount() / (float) logic.getCapacity(); float height = percent * (maxHeight - minHeight); //float height = logic.getLiquidAmount() / (logic.getCapacity() * 1.03F) / 16F; - renderer.func_147782_a(minX, minHeight, minZ, maxX, minHeight + height, maxZ); + renderer.setRenderBounds(minX, minHeight, minZ, maxX, minHeight + height, maxZ); Fluid fluid = logic.liquid.getFluid(); BlockSkinRenderHelper.renderLiquidBlock(fluid.getStillIcon(), fluid.getFlowingIcon(), x, y, z, renderer, world); @@ -200,57 +200,57 @@ public class SearedRender implements ISimpleBlockRenderingHandler } else if (metadata == 1) { - if (world.func_147438_o(x, y, z) instanceof FaucetLogic) + if (world.getTileEntity(x, y, z) instanceof FaucetLogic) { - FaucetLogic logic = (FaucetLogic) world.func_147438_o(x, y, z); + FaucetLogic logic = (FaucetLogic) world.getTileEntity(x, y, z); float xMin = 0.375F, zMin = 0.375F, xMax = 0.625F, zMax = 0.625F; switch (logic.getRenderDirection()) { case 2: - renderer.func_147782_a(0.25, 0.25, 0.625, 0.75, 0.375, 1); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.25, 0.375, 0.625, 0.375, 0.625, 1); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.625, 0.375, 0.625, 0.75, 0.625, 1); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.375, 0.375, 0.625, 0.625, 0.625, 1); + renderer.setRenderBounds(0.25, 0.25, 0.625, 0.75, 0.375, 1); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.25, 0.375, 0.625, 0.375, 0.625, 1); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.625, 0.375, 0.625, 0.75, 0.625, 1); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.375, 0.375, 0.625, 0.625, 0.625, 1); zMin = 0.5F; //zMin = 0.625F; break; case 3: - renderer.func_147782_a(0.25, 0.25, 0, 0.75, 0.375, 0.375); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.25, 0.375, 0, 0.375, 0.625, 0.375); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.625, 0.375, 0, 0.75, 0.625, 0.375); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.375, 0.375, 0, 0.625, 0.625, 0.375); + renderer.setRenderBounds(0.25, 0.25, 0, 0.75, 0.375, 0.375); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.25, 0.375, 0, 0.375, 0.625, 0.375); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.625, 0.375, 0, 0.75, 0.625, 0.375); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.375, 0.375, 0, 0.625, 0.625, 0.375); zMax = 0.5F; break; case 4: - renderer.func_147782_a(0.625, 0.25, 0.25, 1, 0.375, 0.75); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.625, 0.375, 0.25, 1, 0.625, 0.375); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.625, 0.375, 0.625, 1, 0.625, 0.75); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.625, 0.375, 0.375, 1, 0.625, 0.625); + renderer.setRenderBounds(0.625, 0.25, 0.25, 1, 0.375, 0.75); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.625, 0.375, 0.25, 1, 0.625, 0.375); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.625, 0.375, 0.625, 1, 0.625, 0.75); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.625, 0.375, 0.375, 1, 0.625, 0.625); xMin = 0.5F; break; case 5: - renderer.func_147782_a(0, 0.25, 0.25, 0.375, 0.375, 0.75); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0, 0.375, 0.25, 0.375, 0.625, 0.375); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0, 0.375, 0.625, 0.375, 0.625, 0.75); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0, 0.375, 0.375, 0.375, 0.625, 0.625); + renderer.setRenderBounds(0, 0.25, 0.25, 0.375, 0.375, 0.75); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0, 0.375, 0.25, 0.375, 0.625, 0.375); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0, 0.375, 0.625, 0.375, 0.625, 0.75); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0, 0.375, 0.375, 0.375, 0.625, 0.625); xMax = 0.5F; break; } float yMin = 0F; - Block uBlock= world.func_147439_a(x, y - 1, z); + Block uBlock= world.getBlock(x, y - 1, z); int uMeta = world.getBlockMetadata(x, y - 1, z); if (uBlock== TRepo.searedBlock && uMeta == 0) { @@ -272,7 +272,7 @@ public class SearedRender implements ISimpleBlockRenderingHandler if (logic.liquid != null) { Fluid fluid = logic.liquid.getFluid(); - renderer.func_147782_a(xMin, yMin, zMin, xMax, 0.625, zMax); + renderer.setRenderBounds(xMin, yMin, zMin, xMax, 0.625, zMax); BlockSkinRenderHelper.renderLiquidBlock(fluid.getStillIcon(), fluid.getFlowingIcon(), x, y, z, renderer, world); //float xMin = 0.375F, zMin = 0.375F, xMax = 0.625F, zMax = 0.625F; @@ -295,78 +295,78 @@ public class SearedRender implements ISimpleBlockRenderingHandler xMax = 1.0F; break; } - renderer.func_147782_a(xMin, 0.5F, zMin, xMax, 0.625F, zMax); + renderer.setRenderBounds(xMin, 0.5F, zMin, xMax, 0.625F, zMax); BlockSkinRenderHelper.renderLiquidBlock(fluid.getStillIcon(), fluid.getFlowingIcon(), x, y, z, renderer, world); } } } else if (metadata == 2) { - renderer.func_147782_a(0.125F, 0.125f, 0.125F, 0.875F, 0.25F, 0.875F); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.125F, 0.125f, 0.125F, 0.875F, 0.25F, 0.875F); + renderer.renderStandardBlock(block, x, y, z); //Outside - renderer.func_147782_a(0.0f, 0.125, 0f, 0.125, 1.0F, 1); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.875f, 0.125, 0f, 1, 1.0F, 1); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.125f, 0.125, 0f, 0.875f, 1.0F, 0.125f); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.125f, 0.125, 0.875f, 0.875f, 1.0F, 1); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.0f, 0.125, 0f, 0.125, 1.0F, 1); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.875f, 0.125, 0f, 1, 1.0F, 1); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.125f, 0.125, 0f, 0.875f, 1.0F, 0.125f); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.125f, 0.125, 0.875f, 0.875f, 1.0F, 1); + renderer.renderStandardBlock(block, x, y, z); //Details - renderer.func_147782_a(0.001f, 0.1245f, 0.001f, 0.1245f, 0.999f, 0.4375f); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.001f, 0.1245f, 0.5625f, 0.1245f, 0.999f, 0.999f); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.001f, 0.8755f, 0.4375f, 0.1245f, 0.999f, 0.5625f); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.001f, 0.1245f, 0.4375f, 0.1245f, 0.25F, 0.5625f); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.001f, 0.1245f, 0.001f, 0.1245f, 0.999f, 0.4375f); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.001f, 0.1245f, 0.5625f, 0.1245f, 0.999f, 0.999f); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.001f, 0.8755f, 0.4375f, 0.1245f, 0.999f, 0.5625f); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.001f, 0.1245f, 0.4375f, 0.1245f, 0.25F, 0.5625f); + renderer.renderStandardBlock(block, x, y, z); - renderer.func_147782_a(0.8755f, 0.1245f, 0f, 0.999f, 0.999f, 0.4375f); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.8755f, 0.1245f, 0.5625f, 0.999f, 0.999f, 0.999f); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.8755f, 0.8755f, 0.4375f, 0.999f, 0.999f, 0.5625f); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.8755f, 0.1245f, 0.4375f, 0.999f, 0.25F, 0.5625f); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.8755f, 0.1245f, 0f, 0.999f, 0.999f, 0.4375f); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.8755f, 0.1245f, 0.5625f, 0.999f, 0.999f, 0.999f); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.8755f, 0.8755f, 0.4375f, 0.999f, 0.999f, 0.5625f); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.8755f, 0.1245f, 0.4375f, 0.999f, 0.25F, 0.5625f); + renderer.renderStandardBlock(block, x, y, z); - renderer.func_147782_a(0.1245f, 0.1245f, 0.8755f, 0.4375f, 0.999f, 0.999f); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.5625f, 0.1245f, 0.8755f, 0.8755f, 0.999f, 0.999f); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.4375f, 0.8755f, 0.8755f, 0.5625f, 0.999f, 0.999f); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.4375f, 0.1245f, 0.8755f, 0.5625f, 0.2495F, 0.999f); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.1245f, 0.1245f, 0.8755f, 0.4375f, 0.999f, 0.999f); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.5625f, 0.1245f, 0.8755f, 0.8755f, 0.999f, 0.999f); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.4375f, 0.8755f, 0.8755f, 0.5625f, 0.999f, 0.999f); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.4375f, 0.1245f, 0.8755f, 0.5625f, 0.2495F, 0.999f); + renderer.renderStandardBlock(block, x, y, z); - renderer.func_147782_a(0.1245f, 0.1245f, 0.001f, 0.4375f, 0.999f, 0.1245f); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.5625f, 0.1245f, 0.001f, 0.8755f, 0.999f, 0.1245f); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.4375f, 0.8755f, 0.001f, 0.5625f, 0.999f, 0.1245f); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.4375f, 0.1245f, 0.001f, 0.5625f, 0.25F, 0.1245f); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.1245f, 0.1245f, 0.001f, 0.4375f, 0.999f, 0.1245f); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.5625f, 0.1245f, 0.001f, 0.8755f, 0.999f, 0.1245f); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.4375f, 0.8755f, 0.001f, 0.5625f, 0.999f, 0.1245f); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.4375f, 0.1245f, 0.001f, 0.5625f, 0.25F, 0.1245f); + renderer.renderStandardBlock(block, x, y, z); //Legs - renderer.func_147782_a(0.0F, 0.0F, 0.0F, 0.3125F, 0.125, 0.3125F); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.6875F, 0.0F, 0.0F, 1.0F, 0.125, 0.3125F); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.0F, 0.0F, 0.6875F, 0.3125F, 0.125, 1.0F); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.6875F, 0.0F, 0.6875F, 1.0F, 0.125, 1.0F); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 0.3125F, 0.125, 0.3125F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.6875F, 0.0F, 0.0F, 1.0F, 0.125, 0.3125F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.0F, 0.0F, 0.6875F, 0.3125F, 0.125, 1.0F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.6875F, 0.0F, 0.6875F, 1.0F, 0.125, 1.0F); + renderer.renderStandardBlock(block, x, y, z); //Liquids - if (world.func_147438_o(x, y, z) instanceof CastingBasinLogic) + if (world.getTileEntity(x, y, z) instanceof CastingBasinLogic) { - CastingBasinLogic logic = (CastingBasinLogic) world.func_147438_o(x, y, z); + CastingBasinLogic logic = (CastingBasinLogic) world.getTileEntity(x, y, z); if (logic.liquid != null) { float minHeight = 0.25F; @@ -396,7 +396,7 @@ public class SearedRender implements ISimpleBlockRenderingHandler float height = percent * (maxHeight - minHeight); //float height = (logic.getLiquidAmount() / (logic.getCapacity() * 1.05F) * 0.6875F) / maxHeight; - renderer.func_147782_a(minX, minHeight, minZ, maxX, minHeight + height, maxZ); + renderer.setRenderBounds(minX, minHeight, minZ, maxX, minHeight + height, maxZ); Fluid fluid = logic.liquid.getFluid(); BlockSkinRenderHelper.renderLiquidBlock(fluid.getStillIcon(), fluid.getFlowingIcon(), x, y, z, renderer, world); @@ -405,16 +405,16 @@ public class SearedRender implements ISimpleBlockRenderingHandler } else { - renderer.func_147782_a(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.0F, 0.0F, 0.0F, 0.25F, 0.75F, 0.25F); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.75F, 0.0F, 0.0F, 1.0F, 0.75F, 0.25F); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.0F, 0.0F, 0.75F, 0.25F, 0.75F, 1.0F); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.75F, 0.0F, 0.75F, 1.0F, 0.75F, 1.0F); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 0.25F, 0.75F, 0.25F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.75F, 0.0F, 0.0F, 1.0F, 0.75F, 0.25F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.0F, 0.0F, 0.75F, 0.25F, 0.75F, 1.0F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.75F, 0.0F, 0.75F, 1.0F, 0.75F, 1.0F); + renderer.renderStandardBlock(block, x, y, z); } } return true; diff --git a/src/main/java/tconstruct/client/block/SlimeChannelRender.java b/src/main/java/tconstruct/client/block/SlimeChannelRender.java index fea18d85..da6f92c9 100644 --- a/src/main/java/tconstruct/client/block/SlimeChannelRender.java +++ b/src/main/java/tconstruct/client/block/SlimeChannelRender.java @@ -45,7 +45,7 @@ public class SlimeChannelRender implements ISimpleBlockRenderingHandler { Tessellator tessellator = Tessellator.instance; int bMeta = world.getBlockMetadata(x, y, z); - IIcon iconStill = block.func_149691_a(1, bMeta); + IIcon iconStill = block.getIcon(1, bMeta); float flowDir = (float) (bMeta / 8f * 2 * Math.PI); //Tau, radians double u1, u2, u3, u4, v1, v2, v3, v4; @@ -74,11 +74,11 @@ public class SlimeChannelRender implements ISimpleBlockRenderingHandler u3 = iconStill.getInterpolatedU(8.0F + (zFlow - xFlow) * 16.0F); v3 = iconStill.getInterpolatedV(8.0F + (-zFlow - xFlow) * 16.0F); } - int color = block.func_149720_d(world, x, y, z); + int color = block.colorMultiplier(world, x, y, z); float red = (color >> 16 & 255) / 255.0F; float green = (color >> 8 & 255) / 255.0F; float blue = (color & 255) / 255.0F; - tessellator.setBrightness(block.func_149677_c(world, x, y, z)); + tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z)); tessellator.setColorOpaque_F(LIGHT_Y_POS * red, LIGHT_Y_POS * green, LIGHT_Y_POS * blue); tessellator.addVertexWithUV(x + 0, y + 0.5, z + 0, u2, v2); @@ -86,7 +86,7 @@ public class SlimeChannelRender implements ISimpleBlockRenderingHandler tessellator.addVertexWithUV(x + 1, y + 0.5, z + 1, u4, v4); tessellator.addVertexWithUV(x + 1, y + 0.5, z + 0, u3, v3); } - renderer.func_147784_q(block, x, y, z); + renderer.renderStandardBlock(block, x, y, z); /*int direction = world.getBlockMetadata(x, y, z) % 4; if (direction == 0) renderer.uvRotateTop = 2; @@ -97,7 +97,7 @@ public class SlimeChannelRender implements ISimpleBlockRenderingHandler if (direction == 3) renderer.uvRotateTop = 3; - boolean flag = renderer.func_147784_q(block, x, y, z); + boolean flag = renderer.renderStandardBlock(block, x, y, z); renderer.uvRotateTop = 0; return flag;*/ return true; diff --git a/src/main/java/tconstruct/client/block/SlimePadRender.java b/src/main/java/tconstruct/client/block/SlimePadRender.java index b31124f0..b33341f1 100644 --- a/src/main/java/tconstruct/client/block/SlimePadRender.java +++ b/src/main/java/tconstruct/client/block/SlimePadRender.java @@ -27,13 +27,13 @@ public class SlimePadRender implements ISimpleBlockRenderingHandler { if (modelID == model) { - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0f, 0f, 0f, 1f, 0.5f, 1f); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0f, 0f, 0f, 1f, 0.5f, 1f); int metadata = world.getBlockMetadata(x, y, z); BlockSkinRenderHelper.renderLiquidBlock(((SlimePad) block).getFluidIcon(metadata), ((SlimePad) block).getFluidIcon(metadata), x, y, z, renderer, world); float[] size = size(metadata % 8); - renderer.func_147782_a(size[0], 0.5f, size[1], size[2], 0.6875f, size[3]); + renderer.setRenderBounds(size[0], 0.5f, size[1], size[2], 0.6875f, size[3]); BlockSkinRenderHelper.renderLiquidBlock(((SlimePad) block).getNubIcon(metadata), ((SlimePad) block).getNubIcon(metadata), x, y, z, renderer, world); } return true; diff --git a/src/main/java/tconstruct/client/block/SmelteryRender.java b/src/main/java/tconstruct/client/block/SmelteryRender.java index e3677b6c..98b7fb68 100644 --- a/src/main/java/tconstruct/client/block/SmelteryRender.java +++ b/src/main/java/tconstruct/client/block/SmelteryRender.java @@ -36,15 +36,15 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler if (world.getBlockMetadata(x, y, z) == 0) return renderSmeltery(world, x, y, z, block, modelID, renderer); else - renderer.func_147784_q(block, x, y, z); + renderer.renderStandardBlock(block, x, y, z); } return true; } public boolean renderSmeltery (IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { - renderer.func_147784_q(block, x, y, z); - SmelteryLogic logic = (SmelteryLogic) world.func_147438_o(x, y, z); + renderer.renderStandardBlock(block, x, y, z); + SmelteryLogic logic = (SmelteryLogic) world.getTileEntity(x, y, z); if (logic.validStructure) { int posX = logic.centerPos.x - 1, posY = logic.centerPos.y, posZ = logic.centerPos.z - 1; @@ -71,7 +71,7 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler liquidSize -= countSize; float height = countSize > 20000 ? 1.0F : countSize / 20000F; - //renderer.func_147782_a(0, base, 0, 1, height + base, 1); + //renderer.setRenderBounds(0, base, 0, 1, height + base, 1); float renderBase = base; float renderHeight = height + base; base += height; @@ -84,7 +84,7 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler float minZ = i / 3 == 0 ? -0.001F : 0F; float maxX = i % 3 == 2 ? 1.001F : 1F; float maxZ = i / 3 == 2 ? 1.001F : 1F; - renderer.func_147782_a(minX, renderBase, minZ, maxX, renderHeight, maxZ); + renderer.setRenderBounds(minX, renderBase, minZ, maxX, renderHeight, maxZ); if (fluid.canBePlacedInWorld()) BlockSkinRenderHelper.renderMetadataBlock(fluid.getBlock(), 0, posX + i % 3, posY + yBase, posZ + i / 3, renderer, world); else @@ -99,7 +99,7 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler float minZ = i / 3 == 0 ? -0.001F : 0F; float maxX = i % 3 == 2 ? 1.001F : 1F; float maxZ = i / 3 == 2 ? 1.001F : 1F; - renderer.func_147782_a(minX, renderBase, minZ, maxX, renderHeight, maxZ); + renderer.setRenderBounds(minX, renderBase, minZ, maxX, renderHeight, maxZ); BlockSkinRenderHelper.renderMetadataBlock(liquidBlock, liquid.itemMeta, posX + i % 3, posY + yBase, posZ + i / 3, renderer, world); } } @@ -113,7 +113,7 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler float minZ = i / 3 == 0 ? -0.001F : 0F; float maxX = i % 3 == 2 ? 1.001F : 1F; float maxZ = i / 3 == 2 ? 1.001F : 1F; - renderer.func_147782_a(minX, renderBase, minZ, maxX, renderHeight, maxZ); + renderer.setRenderBounds(minX, renderBase, minZ, maxX, renderHeight, maxZ); BlockSkinRenderHelper.renderFakeBlock(liquidItem.getIconFromDamage(liquid.itemMeta), posX, posY + yBase, posZ, renderer, world); } }*/ @@ -132,7 +132,7 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler void renderLayer (SmelteryLogic logic, int start, int posX, int posY, int posZ, RenderBlocks renderer, IBlockAccess world) { - renderer.func_147782_a(-0.001F, -0.001F, -0.001F, 1.001F, 1.001F, 1.001F); + renderer.setRenderBounds(-0.001F, -0.001F, -0.001F, 1.001F, 1.001F, 1.001F); for (int i = 0; i < 9; i++) { ItemStack input = logic.getStackInSlot(i + start); @@ -142,7 +142,7 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler if (blockToRender != null) { float blockHeight = input.stackSize / (float) blockToRender.stackSize; - renderer.func_147782_a(0.0F, 0.0F, 0.0F, 1.0F, MathHelper.clamp_float(blockHeight, 0.01F, 1.0F), 1.0F); + renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, MathHelper.clamp_float(blockHeight, 0.01F, 1.0F), 1.0F); //TODO is this needed??? //if (blockToRender.itemID < 4096) //Block diff --git a/src/main/java/tconstruct/client/block/TableForgeRender.java b/src/main/java/tconstruct/client/block/TableForgeRender.java index 23b1aebb..ded1370a 100644 --- a/src/main/java/tconstruct/client/block/TableForgeRender.java +++ b/src/main/java/tconstruct/client/block/TableForgeRender.java @@ -19,15 +19,15 @@ public class TableForgeRender implements ISimpleBlockRenderingHandler { if (modelID == model) { - renderer.func_147782_a(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F); + renderer.setRenderBounds(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F); renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.0F, 0.0F, 0.0F, 0.25F, 0.75F, 0.25F); + renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 0.25F, 0.75F, 0.25F); renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.75F, 0.0F, 0.0F, 1.0F, 0.75F, 0.25F); + renderer.setRenderBounds(0.75F, 0.0F, 0.0F, 1.0F, 0.75F, 0.25F); renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.0F, 0.0F, 0.75F, 0.25F, 0.75F, 1.0F); + renderer.setRenderBounds(0.0F, 0.0F, 0.75F, 0.25F, 0.75F, 1.0F); renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.75F, 0.0F, 0.75F, 1.0F, 0.75F, 1.0F); + renderer.setRenderBounds(0.75F, 0.0F, 0.75F, 1.0F, 0.75F, 1.0F); renderStandardInvBlock(renderer, block, metadata); } } @@ -37,16 +37,16 @@ public class TableForgeRender implements ISimpleBlockRenderingHandler { if (modelID == model) { - renderer.func_147782_a(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.0F, 0.0F, 0.0F, 0.25F, 0.75F, 0.25F); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.75F, 0.0F, 0.0F, 1.0F, 0.75F, 0.25F); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.0F, 0.0F, 0.75F, 0.25F, 0.75F, 1.0F); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.75F, 0.0F, 0.75F, 1.0F, 0.75F, 1.0F); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 0.25F, 0.75F, 0.25F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.75F, 0.0F, 0.0F, 1.0F, 0.75F, 0.25F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.0F, 0.0F, 0.75F, 0.25F, 0.75F, 1.0F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.75F, 0.0F, 0.75F, 1.0F, 0.75F, 1.0F); + renderer.renderStandardBlock(block, x, y, z); } return true; } @@ -69,27 +69,27 @@ public class TableForgeRender implements ISimpleBlockRenderingHandler GL11.glTranslatef(-0.5F, -0.5F, -0.5F); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, -1F, 0.0F); - renderblocks.func_147768_a(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(0, meta)); + renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderblocks.func_147806_b(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(1, meta)); + renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1F); - renderblocks.func_147761_c(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(2, meta)); + renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderblocks.func_147734_d(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(3, meta)); + renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1F, 0.0F, 0.0F); - renderblocks.func_147798_e(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(4, meta)); + renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderblocks.func_147764_f(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(5, meta)); + renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta)); tessellator.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } diff --git a/src/main/java/tconstruct/client/block/TableRender.java b/src/main/java/tconstruct/client/block/TableRender.java index dce2f4a5..03d656a3 100644 --- a/src/main/java/tconstruct/client/block/TableRender.java +++ b/src/main/java/tconstruct/client/block/TableRender.java @@ -21,20 +21,20 @@ public class TableRender implements ISimpleBlockRenderingHandler { if (metadata == 5) { - renderer.func_147782_a(0.0F, 0.0, 0.0F, 1.0F, 0.875F, 1.0F); + renderer.setRenderBounds(0.0F, 0.0, 0.0F, 1.0F, 0.875F, 1.0F); renderStandardInvBlock(renderer, block, metadata); } else { - renderer.func_147782_a(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F); + renderer.setRenderBounds(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F); renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.0F, 0.0F, 0.0F, 0.25F, 0.75F, 0.25F); + renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 0.25F, 0.75F, 0.25F); renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.75F, 0.0F, 0.0F, 1.0F, 0.75F, 0.25F); + renderer.setRenderBounds(0.75F, 0.0F, 0.0F, 1.0F, 0.75F, 0.25F); renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.0F, 0.0F, 0.75F, 0.25F, 0.75F, 1.0F); + renderer.setRenderBounds(0.0F, 0.0F, 0.75F, 0.25F, 0.75F, 1.0F); renderStandardInvBlock(renderer, block, metadata); - renderer.func_147782_a(0.75F, 0.0F, 0.75F, 1.0F, 0.75F, 1.0F); + renderer.setRenderBounds(0.75F, 0.0F, 0.75F, 1.0F, 0.75F, 1.0F); renderStandardInvBlock(renderer, block, metadata); } } @@ -48,21 +48,21 @@ public class TableRender implements ISimpleBlockRenderingHandler int metadata = world.getBlockMetadata(x, y, z); if (metadata == 5) { - renderer.func_147782_a(0.0F, 0.0, 0.0F, 1.0F, 0.875F, 1.0F); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.0F, 0.0, 0.0F, 1.0F, 0.875F, 1.0F); + renderer.renderStandardBlock(block, x, y, z); } else { - renderer.func_147782_a(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.0F, 0.0F, 0.0F, 0.25F, 0.75F, 0.25F); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.75F, 0.0F, 0.0F, 1.0F, 0.75F, 0.25F); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.0F, 0.0F, 0.75F, 0.25F, 0.75F, 1.0F); - renderer.func_147784_q(block, x, y, z); - renderer.func_147782_a(0.75F, 0.0F, 0.75F, 1.0F, 0.75F, 1.0F); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 0.25F, 0.75F, 0.25F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.75F, 0.0F, 0.0F, 1.0F, 0.75F, 0.25F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.0F, 0.0F, 0.75F, 0.25F, 0.75F, 1.0F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.75F, 0.0F, 0.75F, 1.0F, 0.75F, 1.0F); + renderer.renderStandardBlock(block, x, y, z); } } return true; @@ -86,27 +86,27 @@ public class TableRender implements ISimpleBlockRenderingHandler GL11.glTranslatef(-0.5F, -0.5F, -0.5F); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, -1F, 0.0F); - renderblocks.func_147768_a(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(0, meta)); + renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderblocks.func_147806_b(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(1, meta)); + renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1F); - renderblocks.func_147761_c(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(2, meta)); + renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderblocks.func_147734_d(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(3, meta)); + renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1F, 0.0F, 0.0F); - renderblocks.func_147798_e(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(4, meta)); + renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderblocks.func_147764_f(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(5, meta)); + renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta)); tessellator.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } diff --git a/src/main/java/tconstruct/client/block/TankAirRender.java b/src/main/java/tconstruct/client/block/TankAirRender.java index 89e15cb2..c4b429ac 100644 --- a/src/main/java/tconstruct/client/block/TankAirRender.java +++ b/src/main/java/tconstruct/client/block/TankAirRender.java @@ -29,16 +29,16 @@ public class TankAirRender implements ISimpleBlockRenderingHandler { if (modelID == model) { - TankAirLogic logic = (TankAirLogic) world.func_147438_o(x, y, z); + TankAirLogic logic = (TankAirLogic) world.getTileEntity(x, y, z); if (logic.hasItem()) { ItemStack item = logic.getStackInSlot(0); if (item.getItem() instanceof ItemBlock) { Block inv = BlockUtils.getBlockFromItemStack(item); - renderer.func_147757_a(inv.func_149691_a(1, item.getItemDamage())); - renderer.func_147805_b(inv, x, y, z); - renderer.func_147771_a(); + renderer.setOverrideBlockTexture(inv.getIcon(1, item.getItemDamage())); + renderer.renderBlockByRenderType(inv, x, y, z); + renderer.clearOverrideBlockTexture(); } } else if (logic.hasFluids()) @@ -48,7 +48,7 @@ public class TankAirRender implements ISimpleBlockRenderingHandler { Fluid fluid = fluidstack.getFluid(); //System.out.println("Base: "+getBaseAmount(base)+", Height: "+getHeightAmount(base, fluidstack.amount)+", fluid amount: "+fluidstack.amount); - renderer.func_147782_a(0.0, getBaseAmount(base), 0.0, 1.0, getHeightAmount(base, fluidstack.amount), 1.0); + renderer.setRenderBounds(0.0, getBaseAmount(base), 0.0, 1.0, getHeightAmount(base, fluidstack.amount), 1.0); if (fluid.canBePlacedInWorld()) BlockSkinRenderHelper.renderMetadataBlock(fluid.getBlock(), 0, x, y, z, renderer, world); else diff --git a/src/main/java/tconstruct/client/block/TankRender.java b/src/main/java/tconstruct/client/block/TankRender.java index d0429d58..66d0f24b 100644 --- a/src/main/java/tconstruct/client/block/TankRender.java +++ b/src/main/java/tconstruct/client/block/TankRender.java @@ -28,7 +28,7 @@ public class TankRender implements ISimpleBlockRenderingHandler TProxyClient.renderStandardInvBlock(renderer, block, metadata); if (metadata == 0) { - renderer.func_147782_a(0.1875, 0, 0.1875, 0.8125, 0.125, 0.8125); + renderer.setRenderBounds(0.1875, 0, 0.1875, 0.8125, 0.125, 0.8125); renderDoRe(renderer, block, metadata); } } @@ -40,29 +40,29 @@ public class TankRender implements ISimpleBlockRenderingHandler if (modelID == tankModelID) { //Liquid - LavaTankLogic logic = (LavaTankLogic) world.func_147438_o(x, y, z); + LavaTankLogic logic = (LavaTankLogic) world.getTileEntity(x, y, z); if (logic.containsFluid()) { FluidStack liquid = logic.tank.getFluid(); - renderer.func_147782_a(0.001, 0.001, 0.001, 0.999, logic.getFluidAmountScaled(), 0.999); + renderer.setRenderBounds(0.001, 0.001, 0.001, 0.999, logic.getFluidAmountScaled(), 0.999); Fluid fluid = liquid.getFluid(); if (fluid.canBePlacedInWorld()) BlockSkinRenderHelper.renderMetadataBlock(fluid.getBlock(), 0, x, y, z, renderer, world); else BlockSkinRenderHelper.renderLiquidBlock(fluid.getStillIcon(), fluid.getFlowingIcon(), x, y, z, renderer, world); - renderer.func_147782_a(00, 0.001, 0.001, 0.999, logic.getFluidAmountScaled(), 0.999); + renderer.setRenderBounds(00, 0.001, 0.001, 0.999, logic.getFluidAmountScaled(), 0.999); } //Block int meta = world.getBlockMetadata(x, y, z); - if (meta == 0 && world.func_147439_a(x, y + 1, z) == Blocks.air) + if (meta == 0 && world.getBlock(x, y + 1, z) == Blocks.air) { - renderer.func_147782_a(0.1875, 0, 0.1875, 0.8125, 0.125, 0.8125); - renderer.func_147784_q(block, x, y + 1, z); + renderer.setRenderBounds(0.1875, 0, 0.1875, 0.8125, 0.125, 0.8125); + renderer.renderStandardBlock(block, x, y + 1, z); } - renderer.func_147782_a(0, 0, 0, 1, 1, 1); - renderer.func_147784_q(block, x, y, z); + renderer.setRenderBounds(0, 0, 0, 1, 1, 1); + renderer.renderStandardBlock(block, x, y, z); } return true; } @@ -85,27 +85,27 @@ public class TankRender implements ISimpleBlockRenderingHandler GL11.glTranslatef(-0.5F, 0.5F, -0.5F); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, -1F, 0.0F); - renderblocks.func_147768_a(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(0, meta)); + renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderblocks.func_147806_b(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(1, meta)); + renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1F); - renderblocks.func_147761_c(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(2, meta)); + renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderblocks.func_147734_d(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(3, meta)); + renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1F, 0.0F, 0.0F); - renderblocks.func_147798_e(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(4, meta)); + renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderblocks.func_147764_f(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(5, meta)); + renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta)); tessellator.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } diff --git a/src/main/java/tconstruct/client/entity/CartRender.java b/src/main/java/tconstruct/client/entity/CartRender.java index b09f3c96..5496f37f 100644 --- a/src/main/java/tconstruct/client/entity/CartRender.java +++ b/src/main/java/tconstruct/client/entity/CartRender.java @@ -32,7 +32,7 @@ public class CartRender extends Render public void renderPullcart (CartEntity cart, double posX, double posY, double posZ, float par8, float par9) { GL11.glPushMatrix(); - long var10 = (long) cart.field_145783_c * 493286711L; + long var10 = (long) cart.entityId * 493286711L; var10 = var10 * var10 * 4392167121L + var10 * 98761L; float var12 = (((float) (var10 >> 16 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F; float var13 = (((float) (var10 >> 20 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F; @@ -76,7 +76,7 @@ public class CartRender extends Render GL11.glTranslatef((float) posX, (float) posY + 0.3125f, (float) posZ); GL11.glRotatef(180.0F - par8, 0.0F, 1.0F, 0.0F); GL11.glRotatef(-var24, 0.0F, 0.0F, 1.0F); - float var28 = (float) cart.func_70496_j() - par9; + float var28 = (float) cart.getRollingAmplitude() - par9; float var30 = (float) cart.getDamage() - par9; if (var30 < 0.0F) @@ -86,7 +86,7 @@ public class CartRender extends Render if (var28 > 0.0F) { - GL11.glRotatef(MathHelper.sin(var28) * var28 * var30 / 10.0F * (float) cart.func_70493_k(), 1.0F, 0.0F, 0.0F); + GL11.glRotatef(MathHelper.sin(var28) * var28 * var30 / 10.0F * (float) cart.getRollingDirection(), 1.0F, 0.0F, 0.0F); } if (cart.getCartType() != 0) @@ -98,7 +98,7 @@ public class CartRender extends Render if (cart.getCartType() == 1) { GL11.glTranslatef(0.0F, 0.5F, 0.0F); - renderblocks.func_147800_a(Blocks.chest, 0, cart.getBrightness(par9)); + renderblocks.renderBlockAsItem(Blocks.chest, 0, cart.getBrightness(par9)); GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.5F, 0.0F, -0.5F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); @@ -106,7 +106,7 @@ public class CartRender extends Render else if (cart.getCartType() == 2) { GL11.glTranslatef(0.0F, 0.3125F, 0.0F); - renderblocks.func_147800_a(Blocks.furnace, 0, cart.getBrightness(par9)); + renderblocks.renderBlockAsItem(Blocks.furnace, 0, cart.getBrightness(par9)); GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.0F, -0.3125F, 0.0F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); diff --git a/src/main/java/tconstruct/client/entity/FancyItemRender.java b/src/main/java/tconstruct/client/entity/FancyItemRender.java index 169fb205..c53fde9f 100644 --- a/src/main/java/tconstruct/client/entity/FancyItemRender.java +++ b/src/main/java/tconstruct/client/entity/FancyItemRender.java @@ -30,7 +30,7 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class FancyItemRender extends Render { - private static final ResourceLocation field_110798_h = new ResourceLocation("textures/misc/enchanted_item_glint.png"); + private static final ResourceLocation RES_ITEM_GLINT = new ResourceLocation("textures/misc/enchanted_item_glint.png"); private RenderBlocks itemRenderBlocks = new RenderBlocks(); /** The RNG used in RenderItem (for bobbing itemstacks on the ground) */ @@ -78,7 +78,7 @@ public class FancyItemRender extends Render { ; } - else if (itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.func_147739_a(BlockUtils.getBlockFromItem(itemstack.getItem()).func_149645_b())) + else if (itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(BlockUtils.getBlockFromItem(itemstack.getItem()).getRenderType())) { GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F); @@ -90,7 +90,7 @@ public class FancyItemRender extends Render } float f7 = 0.25F; - int j = block.func_149645_b(); + int j = block.getRenderType(); if (j == 1 || j == 19 || j == 12 || j == 2) { @@ -112,7 +112,7 @@ public class FancyItemRender extends Render } f5 = 1.0F; - this.itemRenderBlocks.func_147800_a(block, itemstack.getItemDamage(), f5); + this.itemRenderBlocks.renderBlockAsItem(block, itemstack.getItemDamage(), f5); GL11.glPopMatrix(); } } @@ -271,7 +271,7 @@ public class FancyItemRender extends Render { GL11.glDepthFunc(GL11.GL_EQUAL); GL11.glDisable(GL11.GL_LIGHTING); - this.renderManager.renderEngine.bindTexture(field_110798_h); + this.renderManager.renderEngine.bindTexture(RES_ITEM_GLINT); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); float f13 = 0.76F; @@ -322,7 +322,7 @@ public class FancyItemRender extends Render float f2; //TODO make this be the block equivalent to k Block block = BlockUtils.getBlockFromItem(k); - if (par3ItemStack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.func_147739_a(block.func_149645_b())) + if (par3ItemStack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(block.getRenderType())) { par2TextureManager.bindTexture(TextureMap.locationBlocksTexture); GL11.glPushMatrix(); @@ -343,9 +343,9 @@ public class FancyItemRender extends Render } GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); - this.itemRenderBlocks.field_147844_c = this.renderWithColor; - this.itemRenderBlocks.func_147800_a(block, l, 1.0F); - this.itemRenderBlocks.field_147844_c = true; + this.itemRenderBlocks.useInventoryTint = this.renderWithColor; + this.itemRenderBlocks.renderBlockAsItem(block, l, 1.0F); + this.itemRenderBlocks.useInventoryTint = true; GL11.glPopMatrix(); } else if (k.requiresMultipleRenderPasses()) @@ -414,7 +414,7 @@ public class FancyItemRender extends Render GL11.glDepthFunc(GL11.GL_GREATER); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDepthMask(false); - manager.bindTexture(field_110798_h); + manager.bindTexture(RES_ITEM_GLINT); this.zLevel -= 50.0F; GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR); @@ -445,7 +445,7 @@ public class FancyItemRender extends Render GL11.glDepthFunc(GL11.GL_GREATER); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDepthMask(false); - par2TextureManager.bindTexture(field_110798_h); + par2TextureManager.bindTexture(RES_ITEM_GLINT); this.zLevel -= 50.0F; GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR); diff --git a/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java b/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java index 96f6fdff..d5d1177b 100644 --- a/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java +++ b/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java @@ -54,7 +54,7 @@ public class ExplosiveRender extends Render f2 = (1.0F - ((float) par1EntityTNTPrimed.fuse - par9 + 1.0F) / 100.0F) * 0.8F; this.bindEntityTexture(par1EntityTNTPrimed); - this.blockRenderer.func_147800_a(TRepo.slimeExplosive, 0, par1EntityTNTPrimed.getBrightness(par9)); + this.blockRenderer.renderBlockAsItem(TRepo.slimeExplosive, 0, par1EntityTNTPrimed.getBrightness(par9)); if (par1EntityTNTPrimed.fuse / 5 % 2 == 0) { @@ -63,7 +63,7 @@ public class ExplosiveRender extends Render GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_DST_ALPHA); GL11.glColor4f(1.0F, 1.0F, 1.0F, f2); - this.blockRenderer.func_147800_a(Blocks.tnt, 0, 1.0F); + this.blockRenderer.renderBlockAsItem(Blocks.tnt, 0, 1.0F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glDisable(GL11.GL_BLEND); GL11.glEnable(GL11.GL_LIGHTING); diff --git a/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java b/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java index e0679908..c85817ef 100644 --- a/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java +++ b/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java @@ -30,7 +30,7 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ArrowRender extends Render { - private static final ResourceLocation field_110798_h = new ResourceLocation("textures/misc/enchanted_item_glint.png"); + private static final ResourceLocation RES_ITEM_GLINT = new ResourceLocation("textures/misc/enchanted_item_glint.png"); private RenderBlocks itemRenderBlocks = new RenderBlocks(); /** The RNG used in RenderItem (for bobbing itemstacks on the ground) */ @@ -73,12 +73,12 @@ public class ArrowRender extends Render Block block = null; block = BlockUtils.getBlockFromItem(itemstack.getItem()); - if (itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.func_147739_a(BlockUtils.getBlockFromItem(itemstack.getItem()).func_149645_b())) + if (itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(BlockUtils.getBlockFromItem(itemstack.getItem()).getRenderType())) { GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F); float f7 = 0.25F; - int j = block.func_149645_b(); + int j = block.getRenderType(); if (j == 1 || j == 19 || j == 12 || j == 2) { @@ -100,7 +100,7 @@ public class ArrowRender extends Render } f5 = 1.0F; - this.itemRenderBlocks.func_147800_a(block, itemstack.getItemDamage(), f5); + this.itemRenderBlocks.renderBlockAsItem(block, itemstack.getItemDamage(), f5); GL11.glPopMatrix(); } } @@ -239,7 +239,7 @@ public class ArrowRender extends Render { GL11.glDepthFunc(GL11.GL_EQUAL); GL11.glDisable(GL11.GL_LIGHTING); - this.renderManager.renderEngine.bindTexture(field_110798_h); + this.renderManager.renderEngine.bindTexture(RES_ITEM_GLINT); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); float f13 = 0.76F; diff --git a/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java b/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java index fe768150..28f1df39 100644 --- a/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java +++ b/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java @@ -30,7 +30,7 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class DaggerRender extends Render { - private static final ResourceLocation field_110798_h = new ResourceLocation("textures/misc/enchanted_item_glint.png"); + private static final ResourceLocation RES_ITEM_GLINT = new ResourceLocation("textures/misc/enchanted_item_glint.png"); private RenderBlocks itemRenderBlocks = new RenderBlocks(); /** The RNG used in RenderItem (for bobbing itemstacks on the ground) */ @@ -72,7 +72,7 @@ public class DaggerRender extends Render Block block = BlockUtils.getBlockFromItem(itemstack.getItem()); - if (itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.func_147739_a(BlockUtils.getBlockFromItem(itemstack.getItem()).func_149645_b())) + if (itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(BlockUtils.getBlockFromItem(itemstack.getItem()).getRenderType())) { GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F); @@ -84,7 +84,7 @@ public class DaggerRender extends Render } float f7 = 0.25F; - int j = block.func_149645_b(); + int j = block.getRenderType(); if (j == 1 || j == 19 || j == 12 || j == 2) { @@ -106,7 +106,7 @@ public class DaggerRender extends Render } f5 = 1.0F; - this.itemRenderBlocks.func_147800_a(block, itemstack.getItemDamage(), f5); + this.itemRenderBlocks.renderBlockAsItem(block, itemstack.getItemDamage(), f5); GL11.glPopMatrix(); } } @@ -261,7 +261,7 @@ public class DaggerRender extends Render { GL11.glDepthFunc(GL11.GL_EQUAL); GL11.glDisable(GL11.GL_LIGHTING); - this.renderManager.renderEngine.bindTexture(field_110798_h); + this.renderManager.renderEngine.bindTexture(RES_ITEM_GLINT); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); float f13 = 0.76F; @@ -311,7 +311,7 @@ public class DaggerRender extends Render float f2; Block block = BlockUtils.getBlockFromItem(k); - if (par3ItemStack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.func_147739_a(BlockUtils.getBlockFromItem(k).func_149645_b())) + if (par3ItemStack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(BlockUtils.getBlockFromItem(k).getRenderType())) { par2TextureManager.bindTexture(TextureMap.locationBlocksTexture); GL11.glPushMatrix(); @@ -332,9 +332,9 @@ public class DaggerRender extends Render } GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); - this.itemRenderBlocks.field_147844_c = this.renderWithColor; - this.itemRenderBlocks.func_147800_a(block, l, 1.0F); - this.itemRenderBlocks.field_147844_c = true; + this.itemRenderBlocks.useInventoryTint = this.renderWithColor; + this.itemRenderBlocks.renderBlockAsItem(block, l, 1.0F); + this.itemRenderBlocks.useInventoryTint = true; GL11.glPopMatrix(); } else if (k.requiresMultipleRenderPasses()) @@ -403,7 +403,7 @@ public class DaggerRender extends Render GL11.glDepthFunc(GL11.GL_GREATER); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDepthMask(false); - manager.bindTexture(field_110798_h); + manager.bindTexture(RES_ITEM_GLINT); this.zLevel -= 50.0F; GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR); @@ -434,7 +434,7 @@ public class DaggerRender extends Render GL11.glDepthFunc(GL11.GL_GREATER); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDepthMask(false); - par2TextureManager.bindTexture(field_110798_h); + par2TextureManager.bindTexture(RES_ITEM_GLINT); this.zLevel -= 50.0F; GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR); diff --git a/src/main/java/tconstruct/client/gui/AdaptiveSmelteryGui.java b/src/main/java/tconstruct/client/gui/AdaptiveSmelteryGui.java index 8d9a9bbb..179586cb 100644 --- a/src/main/java/tconstruct/client/gui/AdaptiveSmelteryGui.java +++ b/src/main/java/tconstruct/client/gui/AdaptiveSmelteryGui.java @@ -62,10 +62,10 @@ public class AdaptiveSmelteryGui extends NewContainerGui int topo = this.guiTop; int xScroll = lefto + 67; int yScroll = topo + 8; - int scrollfield_146294_l = xScroll + 14; - int scrollfield_146295_m = yScroll + 144; + int scrollwidth = xScroll + 14; + int scrollheight = yScroll + 144; - if (!this.wasClicking && mouseDown && mouseX >= xScroll && mouseY >= yScroll && mouseX < scrollfield_146294_l && mouseY < scrollfield_146295_m) + if (!this.wasClicking && mouseDown && mouseX >= xScroll && mouseY >= yScroll && mouseX < scrollwidth && mouseY < scrollheight) { this.isScrolling = true; } @@ -84,7 +84,7 @@ public class AdaptiveSmelteryGui extends NewContainerGui if (this.isScrolling) { - this.currentScroll = (mouseY - yScroll - 7.5F) / (scrollfield_146295_m - yScroll - 15.0F); + this.currentScroll = (mouseY - yScroll - 7.5F) / (scrollheight - yScroll - 15.0F); if (this.currentScroll < 0.0F) { @@ -106,12 +106,12 @@ public class AdaptiveSmelteryGui extends NewContainerGui @Override protected void drawGuiContainerForegroundLayer (int mouseX, int mouseY) { - field_146289_q.drawString(StatCollector.translateToLocal("crafters.Smeltery"), 86, 5, 0x404040); - field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 90, (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString(StatCollector.translateToLocal("crafters.Smeltery"), 86, 5, 0x404040); + fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 90, (ySize - 96) + 2, 0x404040); int base = 0; - int cornerX = (field_146294_l - xSize) / 2 + 36; - int cornerY = (field_146295_m - ySize) / 2; + int cornerX = (width - xSize) / 2 + 36; + int cornerY = (height - ySize) / 2; FluidTankInfo[] info = logic.getTankInfo(ForgeDirection.UNKNOWN); int capacity = 0; @@ -169,16 +169,16 @@ public class AdaptiveSmelteryGui extends NewContainerGui protected void drawGuiContainerBackgroundLayer (float f, int mouseX, int mouseY) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.field_146297_k.getTextureManager().bindTexture(background); - int cornerX = (field_146294_l - xSize) / 2 + 36; - int cornerY = (field_146295_m - ySize) / 2; + this.mc.getTextureManager().bindTexture(background); + int cornerX = (width - xSize) / 2 + 36; + int cornerY = (height - ySize) / 2; drawTexturedModalRect(cornerX + 46, cornerY, 0, 0, 176, ySize); //Fuel - Lava - this.field_146297_k.getTextureManager().bindTexture(TextureMap.locationBlocksTexture); + this.mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture); if (scomp.fuelGague > 0) { - IIcon lavaIcon = Blocks.lava.func_149691_a(0, 0); + IIcon lavaIcon = Blocks.lava.getIcon(0, 0); int fuel = scomp.getScaledFuelGague(52); int count = 0; while (fuel > 0) @@ -229,12 +229,12 @@ public class AdaptiveSmelteryGui extends NewContainerGui //Liquid gague GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.field_146297_k.getTextureManager().bindTexture(background); + this.mc.getTextureManager().bindTexture(background); drawTexturedModalRect(cornerX + 54, cornerY + 16, 176, 76, 52, 52); //Side inventory GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.field_146297_k.getTextureManager().bindTexture(backgroundSide); + this.mc.getTextureManager().bindTexture(backgroundSide); //if (logic.layers > 0) { /*if (logic.layers == 1) @@ -273,7 +273,7 @@ public class AdaptiveSmelteryGui extends NewContainerGui protected void drawFluidStackTooltip (FluidStack par1ItemStack, int par2, int par3) { this.zLevel = 100; - List list = getLiquidTooltip(par1ItemStack, this.field_146297_k.gameSettings.advancedItemTooltips); + List list = getLiquidTooltip(par1ItemStack, this.mc.gameSettings.advancedItemTooltips); for (int k = 0; k < list.size(); ++k) { @@ -359,7 +359,7 @@ public class AdaptiveSmelteryGui extends NewContainerGui while (iterator.hasNext()) { String s = (String) iterator.next(); - int l = this.field_146289_q.getStringWidth(s); + int l = this.fontRendererObj.getStringWidth(s); if (l > k) { @@ -376,14 +376,14 @@ public class AdaptiveSmelteryGui extends NewContainerGui k1 += 2 + (par1List.size() - 1) * 10; } - if (i1 + k > this.field_146294_l) + if (i1 + k > this.width) { i1 -= 28 + k; } - if (j1 + k1 + 6 > this.field_146295_m) + if (j1 + k1 + 6 > this.height) { - j1 = this.field_146295_m - k1 - 6; + j1 = this.height - k1 - 6; } this.zLevel = 300.0F; @@ -404,7 +404,7 @@ public class AdaptiveSmelteryGui extends NewContainerGui for (int k2 = 0; k2 < par1List.size(); ++k2) { String s1 = (String) par1List.get(k2); - this.field_146289_q.drawStringWithShadow(s1, i1, j1, -1); + this.fontRendererObj.drawStringWithShadow(s1, i1, j1, -1); if (k2 == 0) { @@ -436,8 +436,8 @@ public class AdaptiveSmelteryGui extends NewContainerGui super.mouseClicked(mouseX, mouseY, mouseButton); int base = 0; - int cornerX = (field_146294_l - xSize) / 2 + 36; - int cornerY = (field_146295_m - ySize) / 2; + int cornerX = (width - xSize) / 2 + 36; + int cornerY = (height - ySize) / 2; int fluidToBeBroughtUp = -1; for (FluidStack liquid : multitank.getAllFluids()) @@ -476,9 +476,9 @@ public class AdaptiveSmelteryGui extends NewContainerGui dos.write(11); dos.writeInt(logic.getWorld().provider.dimensionId); - dos.writeInt(logic.field_145851_c); - dos.writeInt(logic.field_145848_d); - dos.writeInt(logic.field_145849_e); + dos.writeInt(logic.xCoord); + dos.writeInt(logic.yCoord); + dos.writeInt(logic.zCoord); dos.writeBoolean(this.isShiftKeyDown()); @@ -502,6 +502,6 @@ public class AdaptiveSmelteryGui extends NewContainerGui public void onGuiClosed () { super.onGuiClosed(); - logic.getWorld().func_147471_g(logic.field_145851_c, logic.field_145848_d, logic.field_145849_e); + logic.getWorld().markBlockForUpdate(logic.xCoord, logic.yCoord, logic.zCoord); } } diff --git a/src/main/java/tconstruct/client/gui/ArmorExtendedGui.java b/src/main/java/tconstruct/client/gui/ArmorExtendedGui.java index 2d5b84ef..8aff7d82 100644 --- a/src/main/java/tconstruct/client/gui/ArmorExtendedGui.java +++ b/src/main/java/tconstruct/client/gui/ArmorExtendedGui.java @@ -21,8 +21,8 @@ public class ArmorExtendedGui extends InventoryEffectRenderer public InventoryPlayer inv; public ArmorExtended stats; - private float field_146999_f_lo; - private float field_147000_g_lo; + private float xSize_lo; + private float ySize_lo; public ArmorExtendedGui(InventoryPlayer inventoryplayer, ArmorExtended holder) { @@ -35,60 +35,60 @@ public class ArmorExtendedGui extends InventoryEffectRenderer { super.initGui(); - int cornerX = field_147003_i; - int cornerY = (this.field_146294_l - this.field_147000_g) / 2; - this.field_146292_n.clear(); + int cornerX = guiLeft; + int cornerY = (this.width - this.ySize) / 2; + this.buttonList.clear(); // InventoryTab tab = new InventoryTab(2, cornerX, cornerY - 28, new ItemStack(Block.workbench), 0); - // this.field_146292_n.add(tab); + // this.buttonList.add(tab); // tab = new InventoryTab(3, cornerX + 28, cornerY - 28, new ItemStack(Item.plateDiamond), 1); // tab.enabled = false; - // this.field_146292_n.add(tab); + // this.buttonList.add(tab); TabRegistry.updateTabValues(cornerX, cornerY, InventoryTabArmorExtended.class); - TabRegistry.addTabsToList(this.field_146292_n); + TabRegistry.addTabsToList(this.buttonList); } protected void drawGuiContainerForegroundLayer (int par1, int par2) { //fontRenderer.drawString(StatCollector.translateToLocal("inventory.armorextended"), 60, 6, 0x404040); - //fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 17, (field_147000_g - 96) + 2, 0x404040); + //fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 17, (ySize - 96) + 2, 0x404040); } public void drawScreen (int par1, int par2, float par3) { super.drawScreen(par1, par2, par3); - this.field_146999_f_lo = (float) par1; - this.field_147000_g_lo = (float) par2; + this.xSize_lo = (float) par1; + this.ySize_lo = (float) par2; // if (stats.inventory[2] != null && stats.inventory[2].getItem() == TContent.knapsack) // { - // if (this.field_146292_n.size() < 3) + // if (this.buttonList.size() < 3) // { - // int cornerX = field_147003_i; - // int cornerY = (this.height - this.field_147000_g) / 2; + // int cornerX = guiLeft; + // int cornerY = (this.height - this.ySize) / 2; // InventoryTab tab = new InventoryTab(4, cornerX + 56, cornerY - 28, new ItemStack(TContent.knapsack), 1); - // this.field_146292_n.add(tab); + // this.buttonList.add(tab); // } // } // else // { - // if (this.field_146292_n.size() >= 3) + // if (this.buttonList.size() >= 3) // { - // field_146292_n.remove(2); + // buttonList.remove(2); // } // } } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/armorextended.png"); - protected void func_146976_a (float f, int i, int j) + protected void drawGuiContainerBackgroundLayer (float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); //mc.renderEngine.bindTexture("/mods/tinker/textures/gui/armorextended.png"); - this.field_146297_k.getTextureManager().bindTexture(background); - int cornerX = field_147003_i; - int cornerY = (field_146294_l - field_147000_g) / 2; - drawTexturedModalRect(cornerX, cornerY, 0, 0, field_146999_f, field_147000_g); + this.mc.getTextureManager().bindTexture(background); + int cornerX = guiLeft; + int cornerY = (width - ySize) / 2; + drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); if (!stats.isStackInSlot(0)) drawTexturedModalRect(cornerX + 79, cornerY + 16, 176, 9, 18, 18); @@ -105,9 +105,9 @@ public class ArmorExtendedGui extends InventoryEffectRenderer if (!stats.isStackInSlot(6)) drawTexturedModalRect(cornerX + 151, cornerY + 52, 230, 36, 18, 18); - cornerX = this.field_147003_i; - cornerY = this.field_147009_r; - drawPlayerOnGui(this.field_146297_k, cornerX + 33, cornerY + 75, 30, (float) (cornerX + 51) - this.field_146999_f_lo, (float) (cornerY + 75 - 50) - this.field_147000_g_lo); + cornerX = this.guiLeft; + cornerY = this.guiTop; + drawPlayerOnGui(this.mc, cornerX + 33, cornerY + 75, 30, (float) (cornerX + 51) - this.xSize_lo, (float) (cornerY + 75 - 50) - this.ySize_lo); } public static void drawPlayerOnGui (Minecraft par0Minecraft, int par1, int par2, int par3, float par4, float par5) @@ -131,7 +131,7 @@ public class ArmorExtendedGui extends InventoryEffectRenderer par0Minecraft.thePlayer.rotationYawHead = par0Minecraft.thePlayer.rotationYaw; GL11.glTranslatef(0.0F, par0Minecraft.thePlayer.yOffset, 0.0F); RenderManager.instance.playerViewY = 180.0F; - RenderManager.instance.func_147940_a(par0Minecraft.thePlayer, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F); + RenderManager.instance.renderEntityWithPosYaw(par0Minecraft.thePlayer, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F); par0Minecraft.thePlayer.renderYawOffset = f2; par0Minecraft.thePlayer.rotationYaw = f3; par0Minecraft.thePlayer.rotationPitch = f4; diff --git a/src/main/java/tconstruct/client/gui/CraftingStationGui.java b/src/main/java/tconstruct/client/gui/CraftingStationGui.java index 37f0e9e6..039bf861 100644 --- a/src/main/java/tconstruct/client/gui/CraftingStationGui.java +++ b/src/main/java/tconstruct/client/gui/CraftingStationGui.java @@ -32,7 +32,7 @@ public class CraftingStationGui extends GuiContainer { super(logic.getGuiContainer(inventory, world, x, y, z)); this.logic = logic; - //text = new GuiTextField(this.field_146289_q, this.field_146999_f / 2 - 5, 8, 30, 12); + //text = new GuiTextField(this.fontRendererObj, this.xSize / 2 - 5, 8, 30, 12); //this.text.setText(""); title = "\u00A7n" + StatCollector.translateToLocal("gui.toolforge1"); body = StatCollector.translateToLocal("gui.toolforge2"); @@ -40,13 +40,13 @@ public class CraftingStationGui extends GuiContainer } @Override - protected void func_146979_b (int par1, int par2) + protected void drawGuiContainerForegroundLayer (int par1, int par2) { - this.field_146289_q.drawString(StatCollector.translateToLocal(logic.tinkerTable ? "crafters.TinkerTable" : logic.getInvName()), 8, 6, 0x202020); - this.field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.field_147000_g - 96 + 2, 0x202020); + this.fontRendererObj.drawString(StatCollector.translateToLocal(logic.tinkerTable ? "crafters.TinkerTable" : logic.getInvName()), 8, 6, 0x202020); + this.fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.ySize - 96 + 2, 0x202020); if (logic.chest != null) - this.field_146289_q.drawString(StatCollector.translateToLocal(logic.chest.get().func_145825_b()), -108, this.field_147000_g - 160, 0x202020); - //this.field_146289_q.drawString(toolName + "_", this.field_146999_f / 2 - 18, 8, 0xffffff); + this.fontRendererObj.drawString(StatCollector.translateToLocal(logic.chest.get().getInventoryName()), -108, this.ySize - 160, 0x202020); + //this.fontRendererObj.drawString(toolName + "_", this.xSize / 2 - 18, 8, 0xffffff); if (logic.tinkerTable) { @@ -64,7 +64,7 @@ public class CraftingStationGui extends GuiContainer { ToolCore tool = (ToolCore) stack.getItem(); NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); - this.drawCenteredString(field_146289_q, "\u00A7n" + tool.getToolName(), field_146999_f + 63, 8, 0xffffff); + this.drawCenteredString(fontRendererObj, "\u00A7n" + tool.getToolName(), xSize + 63, 8, 0xffffff); drawModularToolStats(stack, tool, tags); } @@ -72,7 +72,7 @@ public class CraftingStationGui extends GuiContainer { ArmorCore armor = (ArmorCore) stack.getItem(); NBTTagCompound tags = stack.getTagCompound().getCompoundTag("TinkerArmor"); - this.drawCenteredString(field_146289_q, "\u00A7n" + armor.getClass().getSimpleName(), field_146999_f + 63, 8, 0xffffff); + this.drawCenteredString(fontRendererObj, "\u00A7n" + armor.getClass().getSimpleName(), xSize + 63, 8, 0xffffff); drawModularArmorStats(stack, armor, tags); } @@ -85,7 +85,7 @@ public class CraftingStationGui extends GuiContainer int offset = 0; if (modifiers > 0) { - field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation18") + tags.getInteger("Modifiers"), field_146999_f + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation18") + tags.getInteger("Modifiers"), xSize + 8, base + offset * 10, 0xffffff); offset++; } } @@ -104,14 +104,14 @@ public class CraftingStationGui extends GuiContainer { if (maxDur >= 10000) { - field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation1"), field_146999_f + 8, base + offset * 11, 0xffffff); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation1"), xSize + 8, base + offset * 11, 0xffffff); offset++; - field_146289_q.drawString("- " + availableDurability + "/" + maxDur, field_146999_f + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString("- " + availableDurability + "/" + maxDur, xSize + 8, base + offset * 10, 0xffffff); offset++; } else { - field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation2") + availableDurability + "/" + maxDur, field_146999_f + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation2") + availableDurability + "/" + maxDur, xSize + 8, base + offset * 10, 0xffffff); offset++; } } @@ -129,16 +129,16 @@ public class CraftingStationGui extends GuiContainer String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter9") : StatCollector.translateToLocal("gui.partcrafter10"); if (attack % 2 == 0) - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation3") + attack / 2 + heart, field_146999_f + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation3") + attack / 2 + heart, xSize + 8, base + offset * 10, 0xffffff); else - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation3") + attack / 2f + heart, field_146999_f + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation3") + attack / 2f + heart, xSize + 8, base + offset * 10, 0xffffff); offset++; if (stoneboundDamage != 0) { heart = stoneboundDamage == 2 ? StatCollector.translateToLocal("gui.partcrafter9") : StatCollector.translateToLocal("gui.partcrafter10"); String bloss = stoneboundDamage > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5"); - this.field_146289_q.drawString(bloss + (int) stoneboundDamage / 2 + heart, field_146999_f + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString(bloss + (int) stoneboundDamage / 2 + heart, xSize + 8, base + offset * 10, 0xffffff); offset++; } offset++; @@ -151,9 +151,9 @@ public class CraftingStationGui extends GuiContainer int drawSpeed = tags.getInteger("DrawSpeed"); float flightSpeed = tags.getFloat("FlightSpeed"); float trueDraw = drawSpeed / 20f * flightSpeed; - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation6") + df.format(trueDraw) + "s", field_146999_f + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation6") + df.format(trueDraw) + "s", xSize + 8, base + offset * 10, 0xffffff); offset++; - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation7") + df.format(flightSpeed) + "x", field_146999_f + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation7") + df.format(flightSpeed) + "x", xSize + 8, base + offset * 10, 0xffffff); offset++; offset++; } @@ -167,28 +167,28 @@ public class CraftingStationGui extends GuiContainer float shatter = tags.getFloat("BreakChance"); float accuracy = tags.getFloat("Accuracy"); - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation10"), field_146999_f + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation10"), xSize + 8, base + offset * 10, 0xffffff); offset++; String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter9") : StatCollector.translateToLocal("gui.partcrafter10"); if (attack % 2 == 0) - this.field_146289_q.drawString("- " + attack / 2 + heart, field_146999_f + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString("- " + attack / 2 + heart, xSize + 8, base + offset * 10, 0xffffff); else - this.field_146289_q.drawString("- " + attack / 2f + heart, field_146999_f + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString("- " + attack / 2f + heart, xSize + 8, base + offset * 10, 0xffffff); offset++; int minAttack = attack; int maxAttack = attack * 2; heart = StatCollector.translateToLocal("gui.partcrafter10"); - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation11"), field_146999_f + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation11"), xSize + 8, base + offset * 10, 0xffffff); offset++; - this.field_146289_q.drawString(df.format(minAttack / 2f) + "-" + df.format(maxAttack / 2f) + heart, field_146999_f + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString(df.format(minAttack / 2f) + "-" + df.format(maxAttack / 2f) + heart, xSize + 8, base + offset * 10, 0xffffff); offset++; offset++; - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation8") + df.format(mass), field_146999_f + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation8") + df.format(mass), xSize + 8, base + offset * 10, 0xffffff); offset++; - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation9") + df.format(accuracy - 4) + "%", field_146999_f + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation9") + df.format(accuracy - 4) + "%", xSize + 8, base + offset * 10, 0xffffff); offset++; - /*this.field_146289_q.drawString("Chance to break: " + df.format(shatter)+"%", field_146999_f + 8, base + offset * 10, 0xffffff); + /*this.fontRendererObj.drawString("Chance to break: " + df.format(shatter)+"%", xSize + 8, base + offset * 10, 0xffffff); offset++;*/ offset++; } @@ -204,20 +204,20 @@ public class CraftingStationGui extends GuiContainer float trueSpeed = mineSpeed + stoneboundSpeed; float trueSpeed2 = mineSpeed + stoneboundSpeed; - field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation12"), field_146999_f + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation12"), xSize + 8, base + offset * 10, 0xffffff); offset++; - field_146289_q.drawString("- " + df.format(trueSpeed) + ", " + df.format(trueSpeed2), field_146999_f + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString("- " + df.format(trueSpeed) + ", " + df.format(trueSpeed2), xSize + 8, base + offset * 10, 0xffffff); offset++; if (stoneboundSpeed != 0) { String bloss = stoneboundSpeed > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5"); - field_146289_q.drawString(bloss + df.format(stoneboundSpeed), field_146999_f + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(bloss + df.format(stoneboundSpeed), xSize + 8, base + offset * 10, 0xffffff); offset++; } offset++; - field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation13"), field_146999_f + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation13"), xSize + 8, base + offset * 10, 0xffffff); offset++; - field_146289_q.drawString("- " + getHarvestLevelName(tags.getInteger("HarvestLevel")) + ", " + getHarvestLevelName(tags.getInteger("HarvestLevel2")), field_146999_f + 8, base + offset + fontRendererObj.drawString("- " + getHarvestLevelName(tags.getInteger("HarvestLevel")) + ", " + getHarvestLevelName(tags.getInteger("HarvestLevel2")), xSize + 8, base + offset * 10, 0xffffff); offset++; offset++; @@ -253,15 +253,15 @@ public class CraftingStationGui extends GuiContainer trueSpeed += stoneboundSpeed; if (trueSpeed < 0) trueSpeed = 0; - field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation14") + df.format(trueSpeed), field_146999_f + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation14") + df.format(trueSpeed), xSize + 8, base + offset * 10, 0xffffff); offset++; if (stoneboundSpeed != 0) { String bloss = stoneboundSpeed > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5"); - field_146289_q.drawString(bloss + df.format(stoneboundSpeed), field_146999_f + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(bloss + df.format(stoneboundSpeed), xSize + 8, base + offset * 10, 0xffffff); offset++; } - field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation15") + getHarvestLevelName(tags.getInteger("HarvestLevel")), field_146999_f + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation15") + getHarvestLevelName(tags.getInteger("HarvestLevel")), xSize + 8, base + offset * 10, 0xffffff); offset++; offset++; } @@ -269,7 +269,7 @@ public class CraftingStationGui extends GuiContainer { float mineSpeed = tags.getInteger("MiningSpeed"); float trueSpeed = mineSpeed / (100f); - field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation16") + trueSpeed, field_146999_f + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation16") + trueSpeed, xSize + 8, base + offset * 10, 0xffffff); offset++; offset++; } @@ -277,12 +277,12 @@ public class CraftingStationGui extends GuiContainer int modifiers = tags.getInteger("Modifiers"); if (modifiers > 0) { - field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation18") + tags.getInteger("Modifiers"), field_146999_f + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation18") + tags.getInteger("Modifiers"), xSize + 8, base + offset * 10, 0xffffff); offset++; } if (tags.hasKey("Tooltip1")) { - field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation17"), field_146999_f + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation17"), xSize + 8, base + offset * 10, 0xffffff); } boolean displayToolTips = true; @@ -294,7 +294,7 @@ public class CraftingStationGui extends GuiContainer if (tags.hasKey(tooltip)) { String tipName = tags.getString(tooltip); - field_146289_q.drawString("- " + tipName, field_146999_f + 8, base + (offset + tipNum) * 10, 0xffffff); + fontRendererObj.drawString("- " + tipName, xSize + 8, base + (offset + tipNum) * 10, 0xffffff); } else displayToolTips = false; @@ -324,8 +324,8 @@ public class CraftingStationGui extends GuiContainer void drawToolInformation () { - this.drawCenteredString(field_146289_q, title, field_146999_f + 63, 8, 0xffffff); - field_146289_q.drawSplitString(body, field_146999_f + 8, 24, 115, 0xffffff); + this.drawCenteredString(fontRendererObj, title, xSize + 63, 8, 0xffffff); + fontRendererObj.drawSplitString(body, xSize + 8, 24, 115, 0xffffff); } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/tinkertable.png"); @@ -334,48 +334,48 @@ public class CraftingStationGui extends GuiContainer private static final ResourceLocation chest = new ResourceLocation("tinker", "textures/gui/chestside.png"); @Override - protected void func_146976_a (float par1, int par2, int par3) + protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) { // Draw the background GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.field_146297_k.getTextureManager().bindTexture(background); - int cornerX = (this.field_146294_l - this.field_146999_f) / 2; - int cornerY = (this.field_146295_m - this.field_147000_g) / 2; - this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.field_146999_f, this.field_147000_g); + this.mc.getTextureManager().bindTexture(background); + int cornerX = (this.width - this.xSize) / 2; + int cornerY = (this.height - this.ySize) / 2; + this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.xSize, this.ySize); if (active) { - this.drawTexturedModalRect(cornerX + 62, cornerY, 0, this.field_147000_g, 112, 22); + this.drawTexturedModalRect(cornerX + 62, cornerY, 0, this.ySize, 112, 22); } - this.field_146297_k.getTextureManager().bindTexture(icons); + this.mc.getTextureManager().bindTexture(icons); // Draw the slots if (logic.tinkerTable && !logic.isStackInSlot(5)) this.drawTexturedModalRect(cornerX + 47, cornerY + 33, 0, 233, 18, 18); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.field_146297_k.getTextureManager().bindTexture(icons); + this.mc.getTextureManager().bindTexture(icons); //Draw chest side if (logic.chest != null) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.field_146297_k.getTextureManager().bindTexture(chest); + this.mc.getTextureManager().bindTexture(chest); if (logic.doubleChest == null) - this.drawTexturedModalRect(cornerX - 116, cornerY, 0, 0, 121, this.field_147000_g); + this.drawTexturedModalRect(cornerX - 116, cornerY, 0, 0, 121, this.ySize); else - this.drawTexturedModalRect(cornerX - 116, cornerY, 125, 0, 122, this.field_147000_g + 21); + this.drawTexturedModalRect(cornerX - 116, cornerY, 125, 0, 122, this.ySize + 21); } // Draw description if (logic.tinkerTable) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.field_146297_k.getTextureManager().bindTexture(description); - cornerX = (this.field_146294_l + this.field_146999_f) / 2; - cornerY = (this.field_146295_m - this.field_147000_g) / 2; - this.drawTexturedModalRect(cornerX, cornerY, 0, 0, 126, this.field_147000_g + 30); + this.mc.getTextureManager().bindTexture(description); + cornerX = (this.width + this.xSize) / 2; + cornerY = (this.height - this.ySize) / 2; + this.drawTexturedModalRect(cornerX, cornerY, 0, 0, 126, this.ySize + 30); } } diff --git a/src/main/java/tconstruct/client/gui/FrypanGui.java b/src/main/java/tconstruct/client/gui/FrypanGui.java index 38ff10a6..dfbad6ed 100644 --- a/src/main/java/tconstruct/client/gui/FrypanGui.java +++ b/src/main/java/tconstruct/client/gui/FrypanGui.java @@ -22,19 +22,19 @@ public class FrypanGui extends GuiContainer protected void drawGuiContainerForegroundLayer (int par1, int par2) { - field_146289_q.drawString(StatCollector.translateToLocal("crafters.Frypan"), 60, 6, 0x404040); - field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, (field_147000_g - 96) + 2, 0x404040); + fontRendererObj.drawString(StatCollector.translateToLocal("crafters.Frypan"), 60, 6, 0x404040); + fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 2, 0x404040); } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/frypan.png"); - protected void func_146976_a (float f, int i, int j) + protected void drawGuiContainerBackgroundLayer (float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.field_146297_k.getTextureManager().bindTexture(background); - int cornerX = (field_146294_l - field_146999_f) / 2; - int cornerY = (field_146295_m - field_147000_g) / 2; - drawTexturedModalRect(cornerX, cornerY, 0, 0, field_146999_f, field_147000_g); + this.mc.getTextureManager().bindTexture(background); + int cornerX = (width - xSize) / 2; + int cornerY = (height - ySize) / 2; + drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); if (logic.fuel > 0) { int fuel = logic.gaugeFuelScaled(12); diff --git a/src/main/java/tconstruct/client/gui/FurnaceGui.java b/src/main/java/tconstruct/client/gui/FurnaceGui.java index 62ebdf30..663a96b5 100644 --- a/src/main/java/tconstruct/client/gui/FurnaceGui.java +++ b/src/main/java/tconstruct/client/gui/FurnaceGui.java @@ -30,20 +30,20 @@ public class FurnaceGui extends GuiContainer protected void drawGuiContainerForegroundLayer (int par1, int par2) { String s = this.logic.isInvNameLocalized() ? this.logic.getInvName() : I18n.getStringParams(this.logic.getInvName()); - this.field_146289_q.drawString(s, this.field_146999_f / 2 - this.field_146289_q.getStringWidth(s) / 2, 6, 4210752); - this.field_146289_q.drawString(I18n.getStringParams("container.inventory"), 8, this.field_147000_g - 96 + 2, 4210752); + this.fontRendererObj.drawString(s, this.xSize / 2 - this.fontRendererObj.getStringWidth(s) / 2, 6, 4210752); + this.fontRendererObj.drawString(I18n.getStringParams("container.inventory"), 8, this.ySize - 96 + 2, 4210752); } /** * Draw the background layer for the GuiContainer (everything behind the items) */ - protected void func_146976_a (float par1, int par2, int par3) + protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.field_146297_k.getTextureManager().bindTexture(furnaceGuiTextures); - int k = (this.field_146294_l - this.field_146999_f) / 2; - int l = (this.field_146295_m - this.field_147000_g) / 2; - this.drawTexturedModalRect(k, l, 0, 0, this.field_146999_f, this.field_147000_g); + this.mc.getTextureManager().bindTexture(furnaceGuiTextures); + int k = (this.width - this.xSize) / 2; + int l = (this.height - this.ySize) / 2; + this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); int i1; if (this.logic.isBurning()) diff --git a/src/main/java/tconstruct/client/gui/GuiButtonTool.java b/src/main/java/tconstruct/client/gui/GuiButtonTool.java index bcdfb82b..05ac10d4 100644 --- a/src/main/java/tconstruct/client/gui/GuiButtonTool.java +++ b/src/main/java/tconstruct/client/gui/GuiButtonTool.java @@ -38,17 +38,17 @@ public class GuiButtonTool extends GuiButton */ public void drawButton (Minecraft mc, int mouseX, int mouseY) { - if (this.field_146125_m) + if (this.visible) { - boolean var4 = mouseX >= this.field_146128_h && mouseY >= this.field_146129_i && mouseX < this.field_146128_h + this.field_146120_f && mouseY < this.field_146129_i + this.field_146121_g; + boolean var4 = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height; GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); mc.getTextureManager().bindTexture(background); - this.field_146123_n = mouseX >= this.field_146128_h && mouseY >= this.field_146129_i && mouseX < this.field_146128_h + this.field_146120_f && mouseY < this.field_146129_i + this.field_146121_g; - int var5 = this.func_146114_a(this.field_146123_n); - int index = 18 * func_146114_a(field_146123_n); - this.drawTexturedModalRect(this.field_146128_h, this.field_146129_i, 144 + index * 2, 216, 18, 18); - this.drawTexturedModalRect(this.field_146128_h, this.field_146129_i, textureX * 18, textureY * 18, 18, 18); + this.field_146123_n = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height; + int var5 = this.getHoverState(this.field_146123_n); + int index = 18 * getHoverState(field_146123_n); + this.drawTexturedModalRect(this.xPosition, this.yPosition, 144 + index * 2, 216, 18, 18); + this.drawTexturedModalRect(this.xPosition, this.yPosition, textureX * 18, textureY * 18, 18, 18); } } } diff --git a/src/main/java/tconstruct/client/gui/GuiLandmine.java b/src/main/java/tconstruct/client/gui/GuiLandmine.java index a682eeaf..96abeb4f 100644 --- a/src/main/java/tconstruct/client/gui/GuiLandmine.java +++ b/src/main/java/tconstruct/client/gui/GuiLandmine.java @@ -33,9 +33,9 @@ public class GuiLandmine extends GuiContainer } @Override - protected void func_146285_a (ItemStack par1ItemStack, int par2, int par3) + protected void renderToolTip (ItemStack par1ItemStack, int par2, int par3) { - List list = par1ItemStack.getTooltip(this.field_146297_k.thePlayer, this.field_146297_k.gameSettings.advancedItemTooltips); + List list = par1ItemStack.getTooltip(this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips); Behavior b = Behavior.getBehaviorFromStack(par1ItemStack); if (b != null) @@ -47,7 +47,7 @@ public class GuiLandmine extends GuiContainer { if (k == 0) { - list.set(k, "\u00a7" + Integer.toHexString(par1ItemStack.getRarity().rarityColor.func_96298_a()) + (String) list.get(k)); + list.set(k, "\u00a7" + Integer.toHexString(par1ItemStack.getRarity().rarityColor.getFormattingCode()) + (String) list.get(k)); } else { @@ -56,31 +56,31 @@ public class GuiLandmine extends GuiContainer } FontRenderer font = par1ItemStack.getItem().getFontRenderer(par1ItemStack); - drawHoveringText(list, par2, par3, (font == null ? field_146289_q : font)); + drawHoveringText(list, par2, par3, (font == null ? fontRendererObj : font)); } @Override - protected void func_146979_b (int i, int j) + protected void drawGuiContainerForegroundLayer (int i, int j) { if (container.te != null) { - field_146289_q.drawString(container.te.func_145825_b(), 8, 5, 4210752); + fontRendererObj.drawString(container.te.getInventoryName(), 8, 5, 4210752); } else { - field_146289_q.drawString("Landmine", 8, 5, 4210752); + fontRendererObj.drawString("Landmine", 8, 5, 4210752); } - field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, field_147000_g - 96 + 3, 4210752); + fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 3, 4210752); } @Override - protected void func_146976_a (float f, int i, int j) + protected void drawGuiContainerBackgroundLayer (float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - field_146297_k.renderEngine.bindTexture(background); - int x = (field_146294_l - field_146999_f) / 2; - int y = (field_146295_m - field_147000_g) / 2; - this.drawTexturedModalRect(x, y, 0, 0, field_146999_f, field_147000_g); + mc.renderEngine.bindTexture(background); + int x = (width - xSize) / 2; + int y = (height - ySize) / 2; + this.drawTexturedModalRect(x, y, 0, 0, xSize, ySize); } } diff --git a/src/main/java/tconstruct/client/gui/KnapsackGui.java b/src/main/java/tconstruct/client/gui/KnapsackGui.java index de2df0db..1dde002c 100644 --- a/src/main/java/tconstruct/client/gui/KnapsackGui.java +++ b/src/main/java/tconstruct/client/gui/KnapsackGui.java @@ -26,37 +26,37 @@ public class KnapsackGui extends GuiContainer { super.initGui(); - int cornerX = field_147003_i; - int cornerY = (this.field_146294_l - this.field_147000_g) / 2; - this.field_146292_n.clear(); + int cornerX = guiLeft; + int cornerY = (this.width - this.ySize) / 2; + this.buttonList.clear(); TabRegistry.updateTabValues(cornerX, cornerY, InventoryTabKnapsack.class); - TabRegistry.addTabsToList(this.field_146292_n); + TabRegistry.addTabsToList(this.buttonList); // InventoryTab tab = new InventoryTab(2, cornerX, cornerY - 28, new ItemStack(Block.workbench), 0); - // this.field_146292_n.add(tab); + // this.buttonList.add(tab); // tab = new InventoryTab(3, cornerX + 28, cornerY - 28, new ItemStack(Item.plateDiamond), 1); - // this.field_146292_n.add(tab); + // this.buttonList.add(tab); // tab = new InventoryTab(4, cornerX + 56, cornerY - 28, new ItemStack(TContent.knapsack), 1); // tab.enabled = false; - // this.field_146292_n.add(tab); + // this.buttonList.add(tab); } protected void drawGuiContainerForegroundLayer (int par1, int par2) { - field_146289_q.drawString(StatCollector.translateToLocal("inventory.knapsack"), 8, 6, 0x404040); - field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, (field_147000_g - 96) + 4, 0x404040); + fontRendererObj.drawString(StatCollector.translateToLocal("inventory.knapsack"), 8, 6, 0x404040); + fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 4, 0x404040); } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/knapsack.png"); - protected void func_146976_a (float f, int i, int j) + protected void drawGuiContainerBackgroundLayer (float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.field_146297_k.getTextureManager().bindTexture(background); - int cornerX = field_147003_i; - int cornerY = (field_146294_l - field_147000_g) / 2; - drawTexturedModalRect(cornerX, cornerY, 0, 0, field_146999_f, field_147000_g); + this.mc.getTextureManager().bindTexture(background); + int cornerX = guiLeft; + int cornerY = (width - ySize) / 2; + drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); } /*protected void keyTyped(char par1, int par2) diff --git a/src/main/java/tconstruct/client/gui/NewContainerGui.java b/src/main/java/tconstruct/client/gui/NewContainerGui.java index b4cc19d5..06a2b64f 100644 --- a/src/main/java/tconstruct/client/gui/NewContainerGui.java +++ b/src/main/java/tconstruct/client/gui/NewContainerGui.java @@ -89,9 +89,9 @@ public abstract class NewContainerGui extends GuiScreen public void initGui () { super.initGui(); - this.field_146297_k.thePlayer.openContainer = this.container; - this.guiLeft = (this.field_146294_l - this.xSize) / 2; - this.guiTop = (this.field_146295_m - this.ySize) / 2; + this.mc.thePlayer.openContainer = this.container; + this.guiLeft = (this.width - this.xSize) / 2; + this.guiTop = (this.height - this.ySize) / 2; } /** @@ -99,7 +99,7 @@ public abstract class NewContainerGui extends GuiScreen */ public void drawScreen (int mouseX, int mouseY, float par3) { - this.func_146276_q_(); + this.drawDefaultBackground(); int gLeft = this.guiLeft; int gTop = this.guiTop; this.drawGuiContainerBackgroundLayer(par3, mouseX, mouseY); @@ -168,7 +168,7 @@ public abstract class NewContainerGui extends GuiScreen }*/ this.drawGuiContainerForegroundLayer(mouseX, mouseY); - InventoryPlayer inventoryplayer = this.field_146297_k.thePlayer.inventory; + InventoryPlayer inventoryplayer = this.mc.thePlayer.inventory; ItemStack itemstack = this.draggedStack == null ? inventoryplayer.getItemStack() : this.draggedStack; if (itemstack != null) @@ -218,7 +218,7 @@ public abstract class NewContainerGui extends GuiScreen if (inventoryplayer.getItemStack() == null && this.mainSlot != null && this.mainSlot.getHasStack()) { ItemStack itemstack1 = this.mainSlot.getStack(); - this.func_146285_a(itemstack1, mouseX, mouseY); + this.renderToolTip(itemstack1, mouseX, mouseY); } GL11.glEnable(GL11.GL_LIGHTING); @@ -231,15 +231,15 @@ public abstract class NewContainerGui extends GuiScreen GL11.glTranslatef(0.0F, 0.0F, 32.0F); this.zLevel = 200.0F; itemRenderer.zLevel = 200.0F; - itemRenderer.renderItemAndEffectIntoGUI(this.field_146289_q, this.field_146297_k.renderEngine, par1ItemStack, par2, par3); - itemRenderer.renderItemOverlayIntoGUI(this.field_146289_q, this.field_146297_k.renderEngine, par1ItemStack, par2, par3 - (this.draggedStack == null ? 0 : 8), par4Str); + itemRenderer.renderItemAndEffectIntoGUI(this.fontRendererObj, this.mc.renderEngine, par1ItemStack, par2, par3); + itemRenderer.renderItemOverlayIntoGUI(this.fontRendererObj, this.mc.renderEngine, par1ItemStack, par2, par3 - (this.draggedStack == null ? 0 : 8), par4Str); this.zLevel = 0.0F; itemRenderer.zLevel = 0.0F; } - protected void func_146285_a (ItemStack par1ItemStack, int par2, int par3) + protected void renderToolTip (ItemStack par1ItemStack, int par2, int par3) { - List list = par1ItemStack.getTooltip(this.field_146297_k.thePlayer, this.field_146297_k.gameSettings.advancedItemTooltips); + List list = par1ItemStack.getTooltip(this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips); for (int k = 0; k < list.size(); ++k) { @@ -279,7 +279,7 @@ public abstract class NewContainerGui extends GuiScreen while (iterator.hasNext()) { String s = (String) iterator.next(); - int l = this.field_146289_q.getStringWidth(s); + int l = this.fontRendererObj.getStringWidth(s); if (l > k) { @@ -296,14 +296,14 @@ public abstract class NewContainerGui extends GuiScreen k1 += 2 + (par1List.size() - 1) * 10; } - if (i1 + k > this.field_146294_l) + if (i1 + k > this.width) { i1 -= 28 + k; } - if (j1 + k1 + 6 > this.field_146295_m) + if (j1 + k1 + 6 > this.height) { - j1 = this.field_146295_m - k1 - 6; + j1 = this.height - k1 - 6; } this.zLevel = 300.0F; @@ -324,7 +324,7 @@ public abstract class NewContainerGui extends GuiScreen for (int k2 = 0; k2 < par1List.size(); ++k2) { String s1 = (String) par1List.get(k2); - this.field_146289_q.drawStringWithShadow(s1, i1, j1, -1); + this.fontRendererObj.drawStringWithShadow(s1, i1, j1, -1); if (k2 == 0) { @@ -365,7 +365,7 @@ public abstract class NewContainerGui extends GuiScreen ItemStack itemstack = par1Slot.getStack(); boolean flag = false; boolean flag1 = par1Slot == this.clickedSlot && this.draggedStack != null && !this.isRightMouseClick; - ItemStack itemstack1 = this.field_146297_k.thePlayer.inventory.getItemStack(); + ItemStack itemstack1 = this.mc.thePlayer.inventory.getItemStack(); String s = null; if (par1Slot == this.clickedSlot && this.draggedStack != null && this.isRightMouseClick && itemstack != null) @@ -415,7 +415,7 @@ public abstract class NewContainerGui extends GuiScreen if (icon != null) { GL11.glDisable(GL11.GL_LIGHTING); - this.field_146297_k.getTextureManager().bindTexture(TextureMap.locationItemsTexture); + this.mc.getTextureManager().bindTexture(TextureMap.locationItemsTexture); this.drawTexturedModelRectFromIcon(i, j, icon, 16, 16); GL11.glEnable(GL11.GL_LIGHTING); flag1 = true; @@ -430,8 +430,8 @@ public abstract class NewContainerGui extends GuiScreen } GL11.glEnable(GL11.GL_DEPTH_TEST); - itemRenderer.renderItemAndEffectIntoGUI(this.field_146289_q, this.field_146297_k.renderEngine, itemstack, i, j); - itemRenderer.renderItemOverlayIntoGUI(this.field_146289_q, this.field_146297_k.renderEngine, itemstack, i, j, s); + itemRenderer.renderItemAndEffectIntoGUI(this.fontRendererObj, this.mc.renderEngine, itemstack, i, j); + itemRenderer.renderItemOverlayIntoGUI(this.fontRendererObj, this.mc.renderEngine, itemstack, i, j, s); } itemRenderer.zLevel = 0.0F; @@ -440,7 +440,7 @@ public abstract class NewContainerGui extends GuiScreen protected void func_94066_g () { - ItemStack itemstack = this.field_146297_k.thePlayer.inventory.getItemStack(); + ItemStack itemstack = this.mc.thePlayer.inventory.getItemStack(); if (itemstack != null && this.field_94076_q) { @@ -492,7 +492,7 @@ public abstract class NewContainerGui extends GuiScreen protected void mouseClicked (int mouseX, int mouseY, int mouseButton) { super.mouseClicked(mouseX, mouseY, mouseButton); - boolean flag = mouseButton == this.field_146297_k.gameSettings.keyBindPickBlock.func_151463_i() + 100; + boolean flag = mouseButton == this.mc.gameSettings.keyBindPickBlock.getKeyCode() + 100; Slot slot = this.getSlotAtPosition(mouseX, mouseY); long l = Minecraft.getSystemTime(); this.field_94074_J = this.field_94072_H == slot && l - this.field_94070_G < 250L && this.field_94073_I == mouseButton; @@ -515,15 +515,15 @@ public abstract class NewContainerGui extends GuiScreen k1 = -999; } - if (this.field_146297_k.gameSettings.touchscreen && flag1 && this.field_146297_k.thePlayer.inventory.getItemStack() == null) + if (this.mc.gameSettings.touchscreen && flag1 && this.mc.thePlayer.inventory.getItemStack() == null) { - this.field_146297_k.func_147108_a((GuiScreen) null); + this.mc.displayGuiScreen((GuiScreen) null); return; } if (k1 != -1) { - if (this.field_146297_k.gameSettings.touchscreen) + if (this.mc.gameSettings.touchscreen) { if (slot != null && slot.getHasStack()) { @@ -538,9 +538,9 @@ public abstract class NewContainerGui extends GuiScreen } else if (!this.field_94076_q) { - if (this.field_146297_k.thePlayer.inventory.getItemStack() == null) + if (this.mc.thePlayer.inventory.getItemStack() == null) { - if (mouseButton == this.field_146297_k.gameSettings.keyBindPickBlock.func_151463_i() + 100) + if (mouseButton == this.mc.gameSettings.keyBindPickBlock.getKeyCode() + 100) { this.handleMouseClick(slot, k1, mouseButton, 3); } @@ -591,9 +591,9 @@ public abstract class NewContainerGui extends GuiScreen protected void func_85041_a (int par1, int par2, int par3, long par4) { Slot slot = this.getSlotAtPosition(par1, par2); - ItemStack itemstack = this.field_146297_k.thePlayer.inventory.getItemStack(); + ItemStack itemstack = this.mc.thePlayer.inventory.getItemStack(); - if (this.clickedSlot != null && this.field_146297_k.gameSettings.touchscreen) + if (this.clickedSlot != null && this.mc.gameSettings.touchscreen) { if (par3 == 0 || par3 == 1) { @@ -662,7 +662,7 @@ public abstract class NewContainerGui extends GuiScreen if (this.field_94074_J && slot != null && par3 == 0 && this.container.func_94530_a((ItemStack) null, slot)) { - if (func_146272_n()) + if (isShiftKeyDown()) { if (slot != null && slot.inventory != null && this.field_94075_K != null) { @@ -672,7 +672,7 @@ public abstract class NewContainerGui extends GuiScreen { slot1 = (Slot) iterator.next(); - if (slot1 != null && slot1.canTakeStack(this.field_146297_k.thePlayer) && slot1.getHasStack() && slot1.inventory == slot.inventory + if (slot1 != null && slot1.canTakeStack(this.mc.thePlayer) && slot1.getHasStack() && slot1.inventory == slot.inventory && Container.func_94527_a(slot1, this.field_94075_K, true)) { this.handleMouseClick(slot1, slot1.slotNumber, par3, 1); @@ -706,7 +706,7 @@ public abstract class NewContainerGui extends GuiScreen boolean flag1; - if (this.clickedSlot != null && this.field_146297_k.gameSettings.touchscreen) + if (this.clickedSlot != null && this.mc.gameSettings.touchscreen) { if (par3 == 0 || par3 == 1) { @@ -722,7 +722,7 @@ public abstract class NewContainerGui extends GuiScreen this.handleMouseClick(this.clickedSlot, this.clickedSlot.slotNumber, par3, 0); this.handleMouseClick(slot, j1, 0, 0); - if (this.field_146297_k.thePlayer.inventory.getItemStack() != null) + if (this.mc.thePlayer.inventory.getItemStack() != null) { this.handleMouseClick(this.clickedSlot, this.clickedSlot.slotNumber, par3, 0); this.field_85049_r = par1 - l; @@ -762,9 +762,9 @@ public abstract class NewContainerGui extends GuiScreen this.handleMouseClick((Slot) null, -999, Container.func_94534_d(2, this.field_94071_C), 5); } - else if (this.field_146297_k.thePlayer.inventory.getItemStack() != null) + else if (this.mc.thePlayer.inventory.getItemStack() != null) { - if (par3 == this.field_146297_k.gameSettings.keyBindPickBlock.func_151463_i() + 100) + if (par3 == this.mc.gameSettings.keyBindPickBlock.getKeyCode() + 100) { this.handleMouseClick(slot, j1, par3, 3); } @@ -782,7 +782,7 @@ public abstract class NewContainerGui extends GuiScreen } } - if (this.field_146297_k.thePlayer.inventory.getItemStack() == null) + if (this.mc.thePlayer.inventory.getItemStack() == null) { this.field_94070_G = 0L; } @@ -803,7 +803,7 @@ public abstract class NewContainerGui extends GuiScreen } /** - * Args: left, top, field_146294_l, field_146295_m, pointX, pointY. Note: left, top are local to Gui, pointX, pointY are local to + * Args: left, top, width, height, pointX, pointY. Note: left, top are local to Gui, pointX, pointY are local to * screen */ protected boolean isPointInRegion (int par1, int par2, int par3, int par4, int par5, int par6) @@ -822,7 +822,7 @@ public abstract class NewContainerGui extends GuiScreen par2 = par1Slot.slotNumber; } - this.field_146297_k.playerController.windowClick(this.container.windowId, par2, par3, par4, this.field_146297_k.thePlayer); + this.mc.playerController.windowClick(this.container.windowId, par2, par3, par4, this.mc.thePlayer); } /** @@ -830,22 +830,22 @@ public abstract class NewContainerGui extends GuiScreen */ protected void keyTyped (char par1, int par2) { - if (par2 == 1 || par2 == this.field_146297_k.gameSettings.field_151445_Q.func_151463_i()) + if (par2 == 1 || par2 == this.mc.gameSettings.keyBindInventory.getKeyCode()) { - this.field_146297_k.thePlayer.closeScreen(); + this.mc.thePlayer.closeScreen(); } this.checkHotbarKeys(par2); if (this.mainSlot != null && this.mainSlot.getHasStack()) { - if (par2 == this.field_146297_k.gameSettings.keyBindPickBlock.func_151463_i()) + if (par2 == this.mc.gameSettings.keyBindPickBlock.getKeyCode()) { this.handleMouseClick(this.mainSlot, this.mainSlot.slotNumber, 0, 3); } - else if (par2 == this.field_146297_k.gameSettings.keyBindDrop.func_151463_i()) + else if (par2 == this.mc.gameSettings.keyBindDrop.getKeyCode()) { - this.handleMouseClick(this.mainSlot, this.mainSlot.slotNumber, func_146271_m() ? 1 : 0, 4); + this.handleMouseClick(this.mainSlot, this.mainSlot.slotNumber, isCtrlKeyDown() ? 1 : 0, 4); } } } @@ -855,7 +855,7 @@ public abstract class NewContainerGui extends GuiScreen */ protected boolean checkHotbarKeys (int par1) { - if (this.field_146297_k.thePlayer.inventory.getItemStack() == null && this.mainSlot != null) + if (this.mc.thePlayer.inventory.getItemStack() == null && this.mainSlot != null) { for (int j = 0; j < 9; ++j) { @@ -875,9 +875,9 @@ public abstract class NewContainerGui extends GuiScreen */ public void onGuiClosed () { - if (this.field_146297_k.thePlayer != null) + if (this.mc.thePlayer != null) { - this.container.onContainerClosed(this.field_146297_k.thePlayer); + this.container.onContainerClosed(this.mc.thePlayer); } } @@ -896,9 +896,9 @@ public abstract class NewContainerGui extends GuiScreen { super.updateScreen(); - if (!this.field_146297_k.thePlayer.isEntityAlive() || this.field_146297_k.thePlayer.isDead) + if (!this.mc.thePlayer.isEntityAlive() || this.mc.thePlayer.isDead) { - this.field_146297_k.thePlayer.closeScreen(); + this.mc.thePlayer.closeScreen(); } } } diff --git a/src/main/java/tconstruct/client/gui/PartCrafterGui.java b/src/main/java/tconstruct/client/gui/PartCrafterGui.java index e1c365a9..4678ed70 100644 --- a/src/main/java/tconstruct/client/gui/PartCrafterGui.java +++ b/src/main/java/tconstruct/client/gui/PartCrafterGui.java @@ -39,10 +39,10 @@ public class PartCrafterGui extends NewContainerGui protected void drawGuiContainerForegroundLayer (int par1, int par2) { - this.field_146289_q.drawString(StatCollector.translateToLocal("crafters.PartBuilder"), 6, 6, 4210752); - this.field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.ySize - 96 + 2, 4210752); + this.fontRendererObj.drawString(StatCollector.translateToLocal("crafters.PartBuilder"), 6, 6, 4210752); + this.fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.ySize - 96 + 2, 4210752); if (drawChestPart) - this.field_146289_q.drawString(StatCollector.translateToLocal("inventory.PatternChest"), -108, this.ySize - 148, 4210752); + this.fontRendererObj.drawString(StatCollector.translateToLocal("inventory.PatternChest"), -108, this.ySize - 148, 4210752); drawMaterialInformation(); } @@ -50,8 +50,8 @@ public class PartCrafterGui extends NewContainerGui void drawDefaultInformation () { title = "\u00A7n" + StatCollector.translateToLocal("gui.partcrafter2"); - this.drawCenteredString(field_146289_q, title, xSize + 63, 8, 16777215); - field_146289_q.drawSplitString(StatCollector.translateToLocal("gui.partcrafter3"), xSize + 8, 24, 115, 16777215); + this.drawCenteredString(fontRendererObj, title, xSize + 63, 8, 16777215); + fontRendererObj.drawSplitString(StatCollector.translateToLocal("gui.partcrafter3"), xSize + 8, 24, 115, 16777215); } void drawMaterialInformation () @@ -93,34 +93,34 @@ public class PartCrafterGui extends NewContainerGui int offset = 8; if (hasTop) { - this.drawCenteredString(field_146289_q, title, xSize + 63, offset, 16777215); - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.partcrafter4") + topEnum.durability(), xSize + 8, offset + 16, 16777215); - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.partcrafter5") + topEnum.handleDurability() + "x", xSize + 8, offset + 27, 16777215); - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.partcrafter6") + topEnum.toolSpeed() / 100f, xSize + 8, offset + 38, 16777215); - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.partcrafter7") + getHarvestLevelName(topEnum.harvestLevel()), xSize + 8, offset + 49, 16777215); + this.drawCenteredString(fontRendererObj, title, xSize + 63, offset, 16777215); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter4") + topEnum.durability(), xSize + 8, offset + 16, 16777215); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter5") + topEnum.handleDurability() + "x", xSize + 8, offset + 27, 16777215); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter6") + topEnum.toolSpeed() / 100f, xSize + 8, offset + 38, 16777215); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter7") + getHarvestLevelName(topEnum.harvestLevel()), xSize + 8, offset + 49, 16777215); int attack = topEnum.attack(); String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter8") : StatCollector.translateToLocal("gui.partcrafter9"); if (attack % 2 == 0) - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.partcrafter10") + attack / 2 + heart, xSize + 8, offset + 60, 0xffffff); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter10") + attack / 2 + heart, xSize + 8, offset + 60, 0xffffff); else - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.partcrafter10") + attack / 2f + heart, xSize + 8, offset + 60, 0xffffff); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter10") + attack / 2f + heart, xSize + 8, offset + 60, 0xffffff); } offset = 90; if (hasBottom) { - this.drawCenteredString(field_146289_q, otherTitle, xSize + 63, offset, 16777215); - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.partcrafter4") + bottomEnum.durability(), xSize + 8, offset + 16, 16777215); - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.partcrafter5") + bottomEnum.handleDurability() + "x", xSize + 8, offset + 27, 16777215); - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.partcrafter6") + bottomEnum.toolSpeed() / 100f, xSize + 8, offset + 38, 16777215); - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.partcrafter7") + getHarvestLevelName(bottomEnum.harvestLevel()), xSize + 8, offset + 49, 16777215); + this.drawCenteredString(fontRendererObj, otherTitle, xSize + 63, offset, 16777215); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter4") + bottomEnum.durability(), xSize + 8, offset + 16, 16777215); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter5") + bottomEnum.handleDurability() + "x", xSize + 8, offset + 27, 16777215); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter6") + bottomEnum.toolSpeed() / 100f, xSize + 8, offset + 38, 16777215); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter7") + getHarvestLevelName(bottomEnum.harvestLevel()), xSize + 8, offset + 49, 16777215); int attack = bottomEnum.attack(); String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter8") : StatCollector.translateToLocal("gui.partcrafter9"); if (attack % 2 == 0) - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.partcrafter10") + attack / 2 + heart, xSize + 8, offset + 60, 0xffffff); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter10") + attack / 2 + heart, xSize + 8, offset + 60, 0xffffff); else - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.partcrafter10") + attack / 2f + heart, xSize + 8, offset + 60, 0xffffff); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.partcrafter10") + attack / 2f + heart, xSize + 8, offset + 60, 0xffffff); } if (!hasTop && !hasBottom) @@ -156,9 +156,9 @@ public class PartCrafterGui extends NewContainerGui { // Draw the background GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.field_146297_k.getTextureManager().bindTexture(background); - int cornerX = (this.field_146294_l - this.xSize) / 2; - int cornerY = (this.field_146295_m - this.ySize) / 2; + this.mc.getTextureManager().bindTexture(background); + int cornerX = (this.width - this.xSize) / 2; + int cornerY = (this.height - this.ySize) / 2; this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.xSize, this.ySize); // Draw Slots @@ -184,22 +184,22 @@ public class PartCrafterGui extends NewContainerGui if (drawChestPart) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.field_146297_k.getTextureManager().bindTexture(minichest); + this.mc.getTextureManager().bindTexture(minichest); this.drawTexturedModalRect(cornerX - 116, cornerY + 11, 0, 0, this.xSize, this.ySize); } // Draw description GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.field_146297_k.getTextureManager().bindTexture(description); - cornerX = (this.field_146294_l + this.xSize) / 2; - cornerY = (this.field_146295_m - this.ySize) / 2; + this.mc.getTextureManager().bindTexture(description); + cornerX = (this.width + this.xSize) / 2; + cornerY = (this.height - this.ySize) / 2; this.drawTexturedModalRect(cornerX, cornerY, 126, 0, 126, this.ySize); } @Override protected void mouseClicked (int mouseX, int mouseY, int clickNum) { - boolean flag = clickNum == this.field_146297_k.gameSettings.keyBindPickBlock.func_151463_i() + 100; + boolean flag = clickNum == this.mc.gameSettings.keyBindPickBlock.getKeyCode() + 100; Slot slot = this.getSlotAtPosition(mouseX, mouseY); long l = Minecraft.getSystemTime(); this.field_94074_J = this.field_94072_H == slot && l - this.field_94070_G < 250L && this.field_94073_I == clickNum; @@ -224,15 +224,15 @@ public class PartCrafterGui extends NewContainerGui k1 = -999; } - if (this.field_146297_k.gameSettings.touchscreen && flag1 && this.field_146297_k.thePlayer.inventory.getItemStack() == null) + if (this.mc.gameSettings.touchscreen && flag1 && this.mc.thePlayer.inventory.getItemStack() == null) { - this.field_146297_k.func_147108_a((GuiScreen) null); + this.mc.displayGuiScreen((GuiScreen) null); return; } if (k1 != -1) { - if (this.field_146297_k.gameSettings.touchscreen) + if (this.mc.gameSettings.touchscreen) { if (slot != null && slot.getHasStack()) { @@ -247,9 +247,9 @@ public class PartCrafterGui extends NewContainerGui } else if (!this.field_94076_q) { - if (this.field_146297_k.thePlayer.inventory.getItemStack() == null) + if (this.mc.thePlayer.inventory.getItemStack() == null) { - if (clickNum == this.field_146297_k.gameSettings.keyBindPickBlock.func_151463_i() + 100) + if (clickNum == this.mc.gameSettings.keyBindPickBlock.getKeyCode() + 100) { this.handleMouseClick(slot, k1, clickNum, 3); } diff --git a/src/main/java/tconstruct/client/gui/PatternChestGui.java b/src/main/java/tconstruct/client/gui/PatternChestGui.java index 96a75b6e..12c015bc 100644 --- a/src/main/java/tconstruct/client/gui/PatternChestGui.java +++ b/src/main/java/tconstruct/client/gui/PatternChestGui.java @@ -18,24 +18,24 @@ public class PatternChestGui extends GuiContainer { super(holder.getGuiContainer(inventoryplayer, world, x, y, z)); logic = holder; - field_146999_f = 194; - field_147000_g = 168; + xSize = 194; + ySize = 168; } protected void drawGuiContainerForegroundLayer (int par1, int par2) { - field_146289_q.drawString(StatCollector.translateToLocal("inventory.PatternChest"), 60, 6, 0x404040); - field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 17, (field_147000_g - 96) + 2, 0x404040); + fontRendererObj.drawString(StatCollector.translateToLocal("inventory.PatternChest"), 60, 6, 0x404040); + fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 17, (ySize - 96) + 2, 0x404040); } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/patternchest.png"); - protected void func_146976_a (float f, int i, int j) + protected void drawGuiContainerBackgroundLayer (float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.field_146297_k.getTextureManager().bindTexture(background); - int cornerX = (field_146294_l - field_146999_f) / 2; - int cornerY = (field_146295_m - field_147000_g) / 2; - drawTexturedModalRect(cornerX, cornerY, 0, 0, field_146999_f, field_147000_g); + this.mc.getTextureManager().bindTexture(background); + int cornerX = (width - xSize) / 2; + int cornerY = (height - ySize) / 2; + drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); } } diff --git a/src/main/java/tconstruct/client/gui/SmelteryGui.java b/src/main/java/tconstruct/client/gui/SmelteryGui.java index 0db4a5db..b10f85d8 100644 --- a/src/main/java/tconstruct/client/gui/SmelteryGui.java +++ b/src/main/java/tconstruct/client/gui/SmelteryGui.java @@ -50,10 +50,10 @@ public class SmelteryGui extends NewContainerGui int topo = this.guiTop; int xScroll = lefto + 67; int yScroll = topo + 8; - int scrollfield_146294_l = xScroll + 14; - int scrollfield_146295_m = yScroll + 144; + int scrollwidth = xScroll + 14; + int scrollheight = yScroll + 144; - if (!this.wasClicking && mouseDown && mouseX >= xScroll && mouseY >= yScroll && mouseX < scrollfield_146294_l && mouseY < scrollfield_146295_m) + if (!this.wasClicking && mouseDown && mouseX >= xScroll && mouseY >= yScroll && mouseX < scrollwidth && mouseY < scrollheight) { this.isScrolling = true; } @@ -72,7 +72,7 @@ public class SmelteryGui extends NewContainerGui if (this.isScrolling) { - this.currentScroll = (mouseY - yScroll - 7.5F) / (scrollfield_146295_m - yScroll - 15.0F); + this.currentScroll = (mouseY - yScroll - 7.5F) / (scrollheight - yScroll - 15.0F); if (this.currentScroll < 0.0F) { @@ -94,12 +94,12 @@ public class SmelteryGui extends NewContainerGui @Override protected void drawGuiContainerForegroundLayer (int mouseX, int mouseY) { - field_146289_q.drawString(StatCollector.translateToLocal("crafters.Smeltery"), 86, 5, 0x404040); - field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 90, (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString(StatCollector.translateToLocal("crafters.Smeltery"), 86, 5, 0x404040); + fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 90, (ySize - 96) + 2, 0x404040); int base = 0; - int cornerX = (field_146294_l - xSize) / 2 + 36; - int cornerY = (field_146295_m - ySize) / 2; + int cornerX = (width - xSize) / 2 + 36; + int cornerY = (height - ySize) / 2; for (FluidStack liquid : logic.moltenMetal) { @@ -150,16 +150,16 @@ public class SmelteryGui extends NewContainerGui protected void drawGuiContainerBackgroundLayer (float f, int mouseX, int mouseY) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.field_146297_k.getTextureManager().bindTexture(background); - int cornerX = (field_146294_l - xSize) / 2 + 36; - int cornerY = (field_146295_m - ySize) / 2; + this.mc.getTextureManager().bindTexture(background); + int cornerX = (width - xSize) / 2 + 36; + int cornerY = (height - ySize) / 2; drawTexturedModalRect(cornerX + 46, cornerY, 0, 0, 176, ySize); //Fuel - Lava - this.field_146297_k.getTextureManager().bindTexture(TextureMap.locationBlocksTexture); + this.mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture); if (logic.fuelGague > 0) { - IIcon lavaIcon = Blocks.lava.func_149691_a(0, 0); + IIcon lavaIcon = Blocks.lava.getIcon(0, 0); int fuel = logic.getScaledFuelGague(52); int count = 0; while (fuel > 0) @@ -206,12 +206,12 @@ public class SmelteryGui extends NewContainerGui //Liquid gague GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.field_146297_k.getTextureManager().bindTexture(background); + this.mc.getTextureManager().bindTexture(background); drawTexturedModalRect(cornerX + 54, cornerY + 16, 176, 76, 52, 52); //Side inventory GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.field_146297_k.getTextureManager().bindTexture(backgroundSide); + this.mc.getTextureManager().bindTexture(backgroundSide); if (logic.layers > 0) { if (logic.layers == 1) @@ -250,7 +250,7 @@ public class SmelteryGui extends NewContainerGui protected void drawFluidStackTooltip (FluidStack par1ItemStack, int par2, int par3) { this.zLevel = 100; - List list = getLiquidTooltip(par1ItemStack, this.field_146297_k.gameSettings.advancedItemTooltips); + List list = getLiquidTooltip(par1ItemStack, this.mc.gameSettings.advancedItemTooltips); for (int k = 0; k < list.size(); ++k) { @@ -336,7 +336,7 @@ public class SmelteryGui extends NewContainerGui while (iterator.hasNext()) { String s = (String) iterator.next(); - int l = this.field_146289_q.getStringWidth(s); + int l = this.fontRendererObj.getStringWidth(s); if (l > k) { @@ -353,14 +353,14 @@ public class SmelteryGui extends NewContainerGui k1 += 2 + (par1List.size() - 1) * 10; } - if (i1 + k > this.field_146294_l) + if (i1 + k > this.width) { i1 -= 28 + k; } - if (j1 + k1 + 6 > this.field_146295_m) + if (j1 + k1 + 6 > this.height) { - j1 = this.field_146295_m - k1 - 6; + j1 = this.height - k1 - 6; } this.zLevel = 300.0F; @@ -381,7 +381,7 @@ public class SmelteryGui extends NewContainerGui for (int k2 = 0; k2 < par1List.size(); ++k2) { String s1 = (String) par1List.get(k2); - this.field_146289_q.drawStringWithShadow(s1, i1, j1, -1); + this.fontRendererObj.drawStringWithShadow(s1, i1, j1, -1); if (k2 == 0) { @@ -413,8 +413,8 @@ public class SmelteryGui extends NewContainerGui super.mouseClicked(mouseX, mouseY, mouseButton); int base = 0; - int cornerX = (field_146294_l - xSize) / 2 + 36; - int cornerY = (field_146295_m - ySize) / 2; + int cornerX = (width - xSize) / 2 + 36; + int cornerY = (height - ySize) / 2; int fluidToBeBroughtUp = -1; for (FluidStack liquid : logic.moltenMetal) @@ -454,9 +454,9 @@ public class SmelteryGui extends NewContainerGui dos.write(11); dos.writeInt(logic.getWorld().provider.dimensionId); - dos.writeInt(logic.field_145851_c); - dos.writeInt(logic.field_145848_d); - dos.writeInt(logic.field_145849_e); + dos.writeInt(logic.xCoord); + dos.writeInt(logic.yCoord); + dos.writeInt(logic.zCoord); dos.writeBoolean(this.isShiftKeyDown()); @@ -473,7 +473,7 @@ public class SmelteryGui extends NewContainerGui PacketDispatcher.sendPacketToServer(packet);*/ - TConstruct.packetPipeline.sendToServer(new PacketSmeltery(logic.getWorld().provider.dimensionId, logic.field_145851_c, logic.field_145848_d, logic.field_145849_e, this.func_146272_n(), fluidToBeBroughtUp)); + TConstruct.packetPipeline.sendToServer(new PacketSmeltery(logic.getWorld().provider.dimensionId, logic.xCoord, logic.yCoord, logic.zCoord, this.isShiftKeyDown(), fluidToBeBroughtUp)); } } } diff --git a/src/main/java/tconstruct/client/gui/StencilTableGui.java b/src/main/java/tconstruct/client/gui/StencilTableGui.java index 6d061089..a0d5d6f9 100644 --- a/src/main/java/tconstruct/client/gui/StencilTableGui.java +++ b/src/main/java/tconstruct/client/gui/StencilTableGui.java @@ -25,27 +25,27 @@ public class StencilTableGui extends GuiContainer patternIndex = 0; } - public void func_146281_b () + public void onGuiClosed () { - super.func_146281_b(); + super.onGuiClosed(); } @Override - protected void func_146979_b (int par1, int par2) + protected void drawGuiContainerForegroundLayer (int par1, int par2) { - field_146289_q.drawString(StatCollector.translateToLocal("crafters.PatternShaper"), 50, 6, 0x404040); - field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, (field_147000_g - 96) + 2, 0x404040); + fontRendererObj.drawString(StatCollector.translateToLocal("crafters.PatternShaper"), 50, 6, 0x404040); + fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 2, 0x404040); } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/patternshaper.png"); - protected void func_146976_a (float par1, int par2, int par3) + protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.field_146297_k.getTextureManager().bindTexture(background); - int cornerX = (this.field_146294_l - this.field_146999_f) / 2; - int cornerY = (this.field_146295_m - this.field_147000_g) / 2; - this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.field_146999_f, this.field_147000_g); + this.mc.getTextureManager().bindTexture(background); + int cornerX = (this.width - this.xSize) / 2; + int cornerY = (this.height - this.ySize) / 2; + this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.xSize, this.ySize); if (!logic.isStackInSlot(0)) { this.drawTexturedModalRect(cornerX + 47, cornerY + 34, 176, 0, 18, 18); @@ -55,23 +55,23 @@ public class StencilTableGui extends GuiContainer public void initGui () { super.initGui(); - int cornerX = (this.field_146294_l - this.field_146999_f) / 2; - int cornerY = (this.field_146295_m - this.field_147000_g) / 2; + int cornerX = (this.width - this.xSize) / 2; + int cornerY = (this.height - this.ySize) / 2; - this.field_146292_n.clear(); + this.buttonList.clear(); /*ToolGuiElement repair = TConstruct.toolButtons.get(0); GuiButtonTool repairButton = new GuiButtonTool(0, cornerX - 110, cornerY, repair.buttonIconX, repair.buttonIconY, repair.texture); // Repair repairButton.enabled = false; - this.field_146292_n.add(repairButton);*/ - this.field_146292_n.add(new GuiButton(0, cornerX - 120, cornerY, 120, 20, StatCollector.translateToLocal("gui.stenciltable1"))); - this.field_146292_n.add(new GuiButton(1, cornerX - 120, cornerY + 20, 120, 20, StatCollector.translateToLocal("gui.stenciltable1"))); + this.buttonList.add(repairButton);*/ + this.buttonList.add(new GuiButton(0, cornerX - 120, cornerY, 120, 20, StatCollector.translateToLocal("gui.stenciltable1"))); + this.buttonList.add(new GuiButton(1, cornerX - 120, cornerY + 20, 120, 20, StatCollector.translateToLocal("gui.stenciltable1"))); //for (int iter = 0; iter < TConstructContent.patternOutputs.length; iter++) //{ /*ToolGuiElement element = TConstruct.toolButtons.get(iter); GuiButtonTool button = new GuiButtonTool(iter, cornerX - 110 + 22 * (iter % 5), cornerY + 22 * (iter / 5), element.buttonIconX, element.buttonIconY, element.texture); // Repair - this.field_146292_n.add(button);*/ + this.buttonList.add(button);*/ //} } @@ -83,7 +83,7 @@ public class StencilTableGui extends GuiContainer int meta = pattern.getItemDamage(); if (meta == 0) { - if (button.field_146127_k == 0) + if (button.id == 0) { patternIndex++; if (patternIndex == 21) @@ -91,7 +91,7 @@ public class StencilTableGui extends GuiContainer if (patternIndex >= TRepo.patternOutputs.length - 1) patternIndex = 0; } - else if (button.field_146127_k == 1) + else if (button.id == 1) { patternIndex--; if (patternIndex < 0) @@ -120,9 +120,9 @@ public class StencilTableGui extends GuiContainer { outputStream.writeByte(2); outputStream.writeInt(logic.getWorld().provider.dimensionId); - outputStream.writeInt(logic.field_145851_c); - outputStream.writeInt(logic.field_145848_d); - outputStream.writeInt(logic.field_145849_e); + outputStream.writeInt(logic.xCoord); + outputStream.writeInt(logic.yCoord); + outputStream.writeInt(logic.zCoord); outputStream.writeShort(stack.itemID); outputStream.writeShort(stack.getItemDamage()); } @@ -138,6 +138,6 @@ public class StencilTableGui extends GuiContainer PacketDispatcher.sendPacketToServer(packet);*/ - TConstruct.packetPipeline.sendToServer(new PacketStencilTable(logic.field_145851_c, logic.field_145848_d, logic.field_145849_e, stack)); + TConstruct.packetPipeline.sendToServer(new PacketStencilTable(logic.xCoord, logic.yCoord, logic.zCoord, stack)); } } diff --git a/src/main/java/tconstruct/client/gui/ToolForgeGui.java b/src/main/java/tconstruct/client/gui/ToolForgeGui.java index 659f1002..1390c7a8 100644 --- a/src/main/java/tconstruct/client/gui/ToolForgeGui.java +++ b/src/main/java/tconstruct/client/gui/ToolForgeGui.java @@ -27,23 +27,23 @@ public class ToolForgeGui extends ToolStationGui { int gLeft = this.guiLeft + 68; int gTop = this.guiTop + 6; - int gfield_146294_l = 102; - int gfield_146295_m = 12; - active = mouseX > gLeft && mouseX < gLeft + gfield_146294_l && mouseY > gTop && mouseY < gTop + gfield_146295_m; + int gwidth = 102; + int gheight = 12; + active = mouseX > gLeft && mouseX < gLeft + gwidth && mouseY > gTop && mouseY < gTop + gheight; } } public void initGui () { super.initGui(); - int cornerX = (this.field_146294_l - this.xSize) / 2; - int cornerY = (this.field_146295_m - this.ySize) / 2; + int cornerX = (this.width - this.xSize) / 2; + int cornerY = (this.height - this.ySize) / 2; - this.field_146292_n.clear(); + this.buttonList.clear(); ToolGuiElement repair = TConstructClientRegistry.toolButtons.get(0); GuiButtonTool repairButton = new GuiButtonTool(0, cornerX - 110, cornerY, repair.buttonIconX, repair.buttonIconY, repair.domain, repair.texture, repair); // Repair - repairButton.field_146124_l = false; - this.field_146292_n.add(repairButton); + repairButton.enabled = false; + this.buttonList.add(repairButton); int offset = TConstructClientRegistry.tierTwoButtons.size(); for (int iter = 0; iter < TConstructClientRegistry.tierTwoButtons.size(); iter++) @@ -51,7 +51,7 @@ public class ToolForgeGui extends ToolStationGui ToolGuiElement element = TConstructClientRegistry.tierTwoButtons.get(iter); GuiButtonTool button = new GuiButtonTool(iter + 1, cornerX - 110 + 22 * ((iter + 1) % 5), cornerY + 22 * ((iter + 1) / 5), element.buttonIconX, element.buttonIconY, repair.domain, element.texture, element); - this.field_146292_n.add(button); + this.buttonList.add(button); } for (int iter = 1; iter < TConstructClientRegistry.toolButtons.size(); iter++) @@ -59,16 +59,16 @@ public class ToolForgeGui extends ToolStationGui ToolGuiElement element = TConstructClientRegistry.toolButtons.get(iter); GuiButtonTool button = new GuiButtonTool(iter + offset, cornerX - 110 + 22 * ((iter + offset) % 5), cornerY + 22 * ((iter + offset) / 5), element.buttonIconX, element.buttonIconY, repair.domain, element.texture, element); - this.field_146292_n.add(button); + this.buttonList.add(button); } } protected void actionPerformed (GuiButton button) { GuiButtonTool b = (GuiButtonTool) button; - ((GuiButton) this.field_146292_n.get(selectedButton)).field_146124_l = true; - selectedButton = button.field_146127_k; - button.field_146124_l = false; + ((GuiButton) this.buttonList.get(selectedButton)).enabled = true; + selectedButton = button.id; + button.enabled = false; setSlotType(b.element.slotType); iconX = b.element.iconsX; @@ -80,7 +80,7 @@ public class ToolForgeGui extends ToolStationGui @Override void resetGui () { - this.text.func_146180_a(""); + this.text.setText(""); selectedButton = 0; setSlotType(0); iconX = new int[] { 0, 1, 2, 13 }; diff --git a/src/main/java/tconstruct/client/gui/ToolStationGui.java b/src/main/java/tconstruct/client/gui/ToolStationGui.java index fcc8d0b8..08cc1ccf 100644 --- a/src/main/java/tconstruct/client/gui/ToolStationGui.java +++ b/src/main/java/tconstruct/client/gui/ToolStationGui.java @@ -36,13 +36,13 @@ public class ToolStationGui extends NewContainerGui super((ActiveContainer) stationlogic.getGuiContainer(inventoryplayer, world, x, y, z)); this.logic = stationlogic; toolSlots = (ToolStationContainer) container; - text = new GuiTextField(this.field_146289_q, this.xSize / 2 - 5, 8, 30, 12); - this.text.func_146203_f(40); - this.text.func_146185_a(false); - this.text.func_146189_e(true); - this.text.func_146205_d(false); - this.text.func_146195_b(true); - this.text.func_146193_g(0xffffff); + text = new GuiTextField(this.fontRendererObj, this.xSize / 2 - 5, 8, 30, 12); + this.text.setMaxStringLength(40); + this.text.setEnableBackgroundDrawing(false); + this.text.setVisible(true); + this.text.setCanLoseFocus(false); + this.text.setFocused(true); + this.text.setTextColor(0xffffff); toolName = ""; resetGui(); Keyboard.enableRepeatEvents(true); @@ -55,15 +55,15 @@ public class ToolStationGui extends NewContainerGui { int gLeft = this.guiLeft + 68; int gTop = this.guiTop + 6; - int gfield_146294_l = 102; - int gfield_146295_m = 12; - active = mouseX > gLeft && mouseX < gLeft + gfield_146294_l && mouseY > gTop && mouseY < gTop + gfield_146295_m; + int gwidth = 102; + int gheight = 12; + active = mouseX > gLeft && mouseX < gLeft + gwidth && mouseY > gTop && mouseY < gTop + gheight; } } void resetGui () { - this.text.func_146180_a(""); + this.text.setText(""); guiType = 0; setSlotType(0); iconX = new int[] { 0, 1, 2 }; @@ -75,29 +75,29 @@ public class ToolStationGui extends NewContainerGui public void initGui () { super.initGui(); - int cornerX = (this.field_146294_l - this.xSize) / 2; - int cornerY = (this.field_146295_m - this.ySize) / 2; + int cornerX = (this.width - this.xSize) / 2; + int cornerY = (this.height - this.ySize) / 2; - this.field_146292_n.clear(); + this.buttonList.clear(); ToolGuiElement repair = TConstructClientRegistry.toolButtons.get(0); GuiButtonTool repairButton = new GuiButtonTool(0, cornerX - 110, cornerY, repair.buttonIconX, repair.buttonIconY, repair.domain, repair.texture, repair); // Repair - repairButton.field_146124_l = false; - this.field_146292_n.add(repairButton); + repairButton.enabled = false; + this.buttonList.add(repairButton); for (int iter = 1; iter < TConstructClientRegistry.toolButtons.size(); iter++) { ToolGuiElement element = TConstructClientRegistry.toolButtons.get(iter); GuiButtonTool button = new GuiButtonTool(iter, cornerX - 110 + 22 * (iter % 5), cornerY + 22 * (iter / 5), element.buttonIconX, element.buttonIconY, repair.domain, element.texture, element); - this.field_146292_n.add(button); + this.buttonList.add(button); } } protected void actionPerformed (GuiButton button) { - ((GuiButton) this.field_146292_n.get(guiType)).field_146124_l = true; - guiType = button.field_146127_k; - button.field_146124_l = false; + ((GuiButton) this.buttonList.get(guiType)).enabled = true; + guiType = button.id; + button.enabled = false; ToolGuiElement element = TConstructClientRegistry.toolButtons.get(guiType); setSlotType(element.slotType); @@ -138,7 +138,7 @@ public class ToolStationGui extends NewContainerGui public void updateScreen () { super.updateScreen(); - this.text.func_146178_a(); + this.text.updateCursorCounter(); } /** @@ -146,9 +146,9 @@ public class ToolStationGui extends NewContainerGui */ protected void drawGuiContainerForegroundLayer (int par1, int par2) { - this.field_146289_q.drawString(StatCollector.translateToLocal(logic.getInvName()), 6, 8, 0x000000); - this.field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.ySize - 96 + 2, 0x000000); - this.field_146289_q.drawString(toolName + "_", this.xSize / 2 - 18, 8, 0xffffff); + this.fontRendererObj.drawString(StatCollector.translateToLocal(logic.getInvName()), 6, 8, 0x000000); + this.fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.ySize - 96 + 2, 0x000000); + this.fontRendererObj.drawString(toolName + "_", this.xSize / 2 - 18, 8, 0xffffff); if (logic.isStackInSlot(0)) drawToolStats(); @@ -163,7 +163,7 @@ public class ToolStationGui extends NewContainerGui { ToolCore tool = (ToolCore) stack.getItem(); NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); - this.drawCenteredString(field_146289_q, "\u00A7n" + tool.getToolName(), xSize + 63, 8, 0xffffff); + this.drawCenteredString(fontRendererObj, "\u00A7n" + tool.getToolName(), xSize + 63, 8, 0xffffff); drawModularToolStats(stack, tool, tags); } @@ -183,14 +183,14 @@ public class ToolStationGui extends NewContainerGui { if (maxDur >= 10000) { - field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation1"), xSize + 8, base + offset * 11, 0xffffff); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation1"), xSize + 8, base + offset * 11, 0xffffff); offset++; - field_146289_q.drawString("- " + availableDurability + "/" + maxDur, xSize + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString("- " + availableDurability + "/" + maxDur, xSize + 8, base + offset * 10, 0xffffff); offset++; } else { - field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation2") + availableDurability + "/" + maxDur, xSize + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation2") + availableDurability + "/" + maxDur, xSize + 8, base + offset * 10, 0xffffff); offset++; } } @@ -208,16 +208,16 @@ public class ToolStationGui extends NewContainerGui String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter9") : StatCollector.translateToLocal("gui.partcrafter10"); if (attack % 2 == 0) - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation3") + attack / 2 + heart, xSize + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation3") + attack / 2 + heart, xSize + 8, base + offset * 10, 0xffffff); else - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation3") + attack / 2f + heart, xSize + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation3") + attack / 2f + heart, xSize + 8, base + offset * 10, 0xffffff); offset++; if (stoneboundDamage != 0) { heart = stoneboundDamage == 2 ? StatCollector.translateToLocal("gui.partcrafter9") : StatCollector.translateToLocal("gui.partcrafter10"); String bloss = stoneboundDamage > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5"); - this.field_146289_q.drawString(bloss + (int) stoneboundDamage / 2 + heart, xSize + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString(bloss + (int) stoneboundDamage / 2 + heart, xSize + 8, base + offset * 10, 0xffffff); offset++; } offset++; @@ -230,9 +230,9 @@ public class ToolStationGui extends NewContainerGui int drawSpeed = tags.getInteger("DrawSpeed"); float flightSpeed = tags.getFloat("FlightSpeed"); float trueDraw = drawSpeed / 20f * flightSpeed; - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation6") + df.format(trueDraw) + "s", xSize + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation6") + df.format(trueDraw) + "s", xSize + 8, base + offset * 10, 0xffffff); offset++; - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation7") + df.format(flightSpeed) + "x", xSize + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation7") + df.format(flightSpeed) + "x", xSize + 8, base + offset * 10, 0xffffff); offset++; offset++; } @@ -246,28 +246,28 @@ public class ToolStationGui extends NewContainerGui float shatter = tags.getFloat("BreakChance"); float accuracy = tags.getFloat("Accuracy"); - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation10"), xSize + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation10"), xSize + 8, base + offset * 10, 0xffffff); offset++; String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter9") : StatCollector.translateToLocal("gui.partcrafter10"); if (attack % 2 == 0) - this.field_146289_q.drawString("- " + attack / 2 + heart, xSize + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString("- " + attack / 2 + heart, xSize + 8, base + offset * 10, 0xffffff); else - this.field_146289_q.drawString("- " + attack / 2f + heart, xSize + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString("- " + attack / 2f + heart, xSize + 8, base + offset * 10, 0xffffff); offset++; int minAttack = attack; int maxAttack = attack * 2; heart = StatCollector.translateToLocal("gui.partcrafter10"); - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation11"), xSize + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation11"), xSize + 8, base + offset * 10, 0xffffff); offset++; - this.field_146289_q.drawString(df.format(minAttack / 2f) + "-" + df.format(maxAttack / 2f) + heart, xSize + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString(df.format(minAttack / 2f) + "-" + df.format(maxAttack / 2f) + heart, xSize + 8, base + offset * 10, 0xffffff); offset++; offset++; - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation8") + df.format(mass), xSize + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation8") + df.format(mass), xSize + 8, base + offset * 10, 0xffffff); offset++; - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation9") + df.format(accuracy - 4) + "%", xSize + 8, base + offset * 10, 0xffffff); + this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation9") + df.format(accuracy - 4) + "%", xSize + 8, base + offset * 10, 0xffffff); offset++; - /*this.field_146289_q.drawString("Chance to break: " + df.format(shatter)+"%", xSize + 8, base + offset * 10, 0xffffff); + /*this.fontRendererObj.drawString("Chance to break: " + df.format(shatter)+"%", xSize + 8, base + offset * 10, 0xffffff); offset++;*/ offset++; } @@ -283,20 +283,20 @@ public class ToolStationGui extends NewContainerGui float trueSpeed = mineSpeed + stoneboundSpeed; float trueSpeed2 = mineSpeed + stoneboundSpeed; - field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation12"), xSize + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation12"), xSize + 8, base + offset * 10, 0xffffff); offset++; - field_146289_q.drawString("- " + df.format(trueSpeed) + ", " + df.format(trueSpeed2), xSize + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString("- " + df.format(trueSpeed) + ", " + df.format(trueSpeed2), xSize + 8, base + offset * 10, 0xffffff); offset++; if (stoneboundSpeed != 0) { String bloss = stoneboundSpeed > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5"); - field_146289_q.drawString(bloss + df.format(stoneboundSpeed), xSize + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(bloss + df.format(stoneboundSpeed), xSize + 8, base + offset * 10, 0xffffff); offset++; } offset++; - field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation13"), xSize + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation13"), xSize + 8, base + offset * 10, 0xffffff); offset++; - field_146289_q + fontRendererObj .drawString("- " + getHarvestLevelName(tags.getInteger("HarvestLevel")) + ", " + getHarvestLevelName(tags.getInteger("HarvestLevel2")), xSize + 8, base + offset * 10, 0xffffff); offset++; offset++; @@ -332,15 +332,15 @@ public class ToolStationGui extends NewContainerGui trueSpeed += stoneboundSpeed; if (trueSpeed < 0) trueSpeed = 0; - field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation14") + df.format(trueSpeed), xSize + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation14") + df.format(trueSpeed), xSize + 8, base + offset * 10, 0xffffff); offset++; if (stoneboundSpeed != 0) { String bloss = stoneboundSpeed > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5"); - field_146289_q.drawString(bloss + df.format(stoneboundSpeed), xSize + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(bloss + df.format(stoneboundSpeed), xSize + 8, base + offset * 10, 0xffffff); offset++; } - field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation15") + getHarvestLevelName(tags.getInteger("HarvestLevel")), xSize + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation15") + getHarvestLevelName(tags.getInteger("HarvestLevel")), xSize + 8, base + offset * 10, 0xffffff); offset++; offset++; } @@ -348,7 +348,7 @@ public class ToolStationGui extends NewContainerGui { float mineSpeed = tags.getInteger("MiningSpeed"); float trueSpeed = mineSpeed / (100f); - field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation16") + trueSpeed, xSize + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation16") + trueSpeed, xSize + 8, base + offset * 10, 0xffffff); offset++; offset++; } @@ -356,12 +356,12 @@ public class ToolStationGui extends NewContainerGui int modifiers = tags.getInteger("Modifiers"); if (modifiers > 0) { - field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation18") + tags.getInteger("Modifiers"), xSize + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation18") + tags.getInteger("Modifiers"), xSize + 8, base + offset * 10, 0xffffff); offset++; } if (tags.hasKey("Tooltip1")) { - field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation17"), xSize + 8, base + offset * 10, 0xffffff); + fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation17"), xSize + 8, base + offset * 10, 0xffffff); } boolean displayToolTips = true; @@ -373,7 +373,7 @@ public class ToolStationGui extends NewContainerGui if (tags.hasKey(tooltip)) { String tipName = tags.getString(tooltip); - field_146289_q.drawString("- " + tipName, xSize + 8, base + (offset + tipNum) * 10, 0xffffff); + fontRendererObj.drawString("- " + tipName, xSize + 8, base + (offset + tipNum) * 10, 0xffffff); } else displayToolTips = false; @@ -382,8 +382,8 @@ public class ToolStationGui extends NewContainerGui void drawToolInformation () { - this.drawCenteredString(field_146289_q, title, xSize + 63, 8, 0xffffff); - field_146289_q.drawSplitString(body, xSize + 8, 24, 115, 0xffffff); + this.drawCenteredString(fontRendererObj, title, xSize + 63, 8, 0xffffff); + fontRendererObj.drawSplitString(body, xSize + 8, 24, 115, 0xffffff); } protected String getHarvestLevelName (int num) @@ -418,9 +418,9 @@ public class ToolStationGui extends NewContainerGui { // Draw the background GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.field_146297_k.getTextureManager().bindTexture(background); - int cornerX = (this.field_146294_l - this.xSize) / 2; - int cornerY = (this.field_146295_m - this.ySize) / 2; + this.mc.getTextureManager().bindTexture(background); + int cornerX = (this.width - this.xSize) / 2; + int cornerY = (this.height - this.ySize) / 2; this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.xSize, this.ySize); if (active) @@ -429,7 +429,7 @@ public class ToolStationGui extends NewContainerGui } GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.field_146297_k.getTextureManager().bindTexture(icons); + this.mc.getTextureManager().bindTexture(icons); // Draw the slots for (int i = 0; i < slotX.length; i++) @@ -443,26 +443,26 @@ public class ToolStationGui extends NewContainerGui // Draw description GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.field_146297_k.getTextureManager().bindTexture(description); - cornerX = (this.field_146294_l + this.xSize) / 2; - cornerY = (this.field_146295_m - this.ySize) / 2; + this.mc.getTextureManager().bindTexture(description); + cornerX = (this.width + this.xSize) / 2; + cornerY = (this.height - this.ySize) / 2; this.drawTexturedModalRect(cornerX, cornerY, 0, 0, 126, this.ySize + 30); } protected void keyTyped (char par1, int keyCode) { - if (keyCode == 1 || (!active && keyCode == this.field_146297_k.gameSettings.field_151445_Q.func_151463_i())) + if (keyCode == 1 || (!active && keyCode == this.mc.gameSettings.keyBindInventory.getKeyCode())) { logic.setToolname(""); updateServer(""); Keyboard.enableRepeatEvents(false); - this.field_146297_k.thePlayer.closeScreen(); + this.mc.thePlayer.closeScreen(); } else if (active) { - text.func_146201_a(par1, keyCode); - toolName = text.func_146179_b().trim(); + text.textboxKeyTyped(par1, keyCode); + toolName = text.getText().trim(); logic.setToolname(toolName); updateServer(toolName); } @@ -476,9 +476,9 @@ public class ToolStationGui extends NewContainerGui { outputStream.writeByte(1); outputStream.writeInt(logic.getWorld().provider.dimensionId); - outputStream.writeInt(logic.field_145851_c); - outputStream.writeInt(logic.field_145848_d); - outputStream.writeInt(logic.field_145849_e); + outputStream.writeInt(logic.xCoord); + outputStream.writeInt(logic.yCoord); + outputStream.writeInt(logic.zCoord); outputStream.writeUTF(name); } catch (Exception ex) @@ -493,7 +493,7 @@ public class ToolStationGui extends NewContainerGui PacketDispatcher.sendPacketToServer(packet);*/ - TConstruct.packetPipeline.sendToServer(new PacketToolStation(logic.field_145851_c, logic.field_145848_d, logic.field_145849_e, name)); + TConstruct.packetPipeline.sendToServer(new PacketToolStation(logic.xCoord, logic.yCoord, logic.zCoord, name)); } /*protected void mouseClicked(int par1, int par2, int par3) diff --git a/src/main/java/tconstruct/client/tabs/AbstractTab.java b/src/main/java/tconstruct/client/tabs/AbstractTab.java index bf5d4875..3e938a28 100644 --- a/src/main/java/tconstruct/client/tabs/AbstractTab.java +++ b/src/main/java/tconstruct/client/tabs/AbstractTab.java @@ -22,26 +22,26 @@ public abstract class AbstractTab extends GuiButton } @Override - public void func_146112_a (Minecraft mc, int mouseX, int mouseY) + public void drawButton (Minecraft mc, int mouseX, int mouseY) { - if (this.field_146125_m) + if (this.visible) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - int yTexPos = this.field_146124_l ? 0 : 32; - int ySize = this.field_146124_l ? 28 : 32; - int xOffset = this.field_146127_k == 2 ? 0 : 1; + int yTexPos = this.enabled ? 0 : 32; + int ySize = this.enabled ? 28 : 32; + int xOffset = this.id == 2 ? 0 : 1; mc.renderEngine.bindTexture(this.texture); - this.drawTexturedModalRect(this.field_146128_h, this.field_146129_i, xOffset * 28, yTexPos, 28, ySize); + this.drawTexturedModalRect(this.xPosition, this.yPosition, xOffset * 28, yTexPos, 28, ySize); RenderHelper.enableGUIStandardItemLighting(); this.zLevel = 100.0F; this.itemRenderer.zLevel = 100.0F; GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL12.GL_RESCALE_NORMAL); - this.itemRenderer.renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, renderStack, field_146128_h + 6, field_146129_i + 8); - this.itemRenderer.renderItemOverlayIntoGUI(mc.fontRenderer, mc.renderEngine, renderStack, field_146128_h + 6, field_146129_i + 8); + this.itemRenderer.renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, renderStack, xPosition + 6, yPosition + 8); + this.itemRenderer.renderItemOverlayIntoGUI(mc.fontRenderer, mc.renderEngine, renderStack, xPosition + 6, yPosition + 8); GL11.glDisable(GL11.GL_LIGHTING); this.itemRenderer.zLevel = 0.0F; this.zLevel = 0.0F; @@ -50,9 +50,9 @@ public abstract class AbstractTab extends GuiButton } @Override - public boolean func_146116_c (Minecraft mc, int mouseX, int mouseY) + public boolean mousePressed (Minecraft mc, int mouseX, int mouseY) { - boolean inWindow = this.field_146124_l && this.field_146125_m && mouseX >= this.field_146128_h && mouseY >= this.field_146129_i && mouseX < this.field_146128_h + this.field_146120_f && mouseY < this.field_146129_i + this.field_146121_g; + boolean inWindow = this.enabled && this.visible && mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height; if (inWindow) { diff --git a/src/main/java/tconstruct/client/tabs/TabRegistry.java b/src/main/java/tconstruct/client/tabs/TabRegistry.java index 1a8967ef..e0c03465 100644 --- a/src/main/java/tconstruct/client/tabs/TabRegistry.java +++ b/src/main/java/tconstruct/client/tabs/TabRegistry.java @@ -28,12 +28,12 @@ public class TabRegistry if (gui.getClass() == GuiInventory.class) { //Values are public at runtime. - int cornerX = gui.field_146999_f; - int cornerY = gui.field_147009_r; - gui.field_146292_n.clear(); + int cornerX = gui.xSize; + int cornerY = gui.guiTop; + gui.buttonList.clear(); updateTabValues(cornerX, cornerY, InventoryTabVanilla.class); - addTabsToList(gui.field_146292_n); + addTabsToList(gui.buttonList); } } @@ -42,7 +42,7 @@ public class TabRegistry public static void openInventoryGui () { GuiInventory inventory = new GuiInventory(mc.thePlayer); - mc.func_147108_a(inventory); + mc.displayGuiScreen(inventory); TabRegistry.addTabsToInventory(inventory); } @@ -55,22 +55,22 @@ public class TabRegistry if (t.shouldAddToList()) { - t.field_146127_k = count; - t.field_146128_h = cornerX + (count - 2) * 28; - t.field_146129_i = cornerY - 28; - t.field_146124_l = !t.getClass().equals(selectedButton); + t.id = count; + t.xPosition = cornerX + (count - 2) * 28; + t.yPosition = cornerY - 28; + t.enabled = !t.getClass().equals(selectedButton); count++; } } } - public static void addTabsToList (List field_146292_n) + public static void addTabsToList (List buttonList) { for (AbstractTab tab : tabList) { if (tab.shouldAddToList()) { - field_146292_n.add(tab); + buttonList.add(tab); } } } diff --git a/src/main/java/tconstruct/common/TContent.java b/src/main/java/tconstruct/common/TContent.java index bdcbd265..da253de3 100644 --- a/src/main/java/tconstruct/common/TContent.java +++ b/src/main/java/tconstruct/common/TContent.java @@ -56,7 +56,7 @@ import tconstruct.util.config.*; public class TContent implements IFuelHandler { //Temporary items - //public static Item armorTest = new ArmorStandard(2445, 4, EnumArmorPart.HELMET).func_149647_a(CreativeTabs.tabAllSearch); + //public static Item armorTest = new ArmorStandard(2445, 4, EnumArmorPart.HELMET).setCreativeTab(CreativeTabs.tabAllSearch); public TContent() { @@ -92,66 +92,66 @@ public class TContent implements IFuelHandler void registerBlocks () { //Tool Station - TRepo.toolStationWood = new ToolStationBlock(Material.field_151575_d).func_149663_c("ToolStation"); - TRepo.toolForge = new ToolForgeBlock(Material.field_151573_f).func_149663_c("ToolForge"); - TRepo.craftingStationWood = new CraftingStationBlock(Material.field_151575_d).func_149663_c("CraftingStation"); - TRepo.craftingSlabWood = new CraftingSlab(Material.field_151575_d).func_149663_c("CraftingSlab"); - TRepo.furnaceSlab = new FurnaceSlab(Material.field_151576_e).func_149663_c("FurnaceSlab"); + TRepo.toolStationWood = new ToolStationBlock(Material.wood).setBlockName("ToolStation"); + TRepo.toolForge = new ToolForgeBlock(Material.iron).setBlockName("ToolForge"); + TRepo.craftingStationWood = new CraftingStationBlock(Material.wood).setBlockName("CraftingStation"); + TRepo.craftingSlabWood = new CraftingSlab(Material.wood).setBlockName("CraftingSlab"); + TRepo.furnaceSlab = new FurnaceSlab(Material.rock).setBlockName("FurnaceSlab"); - TRepo.heldItemBlock = new EquipBlock(Material.field_151575_d).func_149663_c("Frypan"); + TRepo.heldItemBlock = new EquipBlock(Material.wood).setBlockName("Frypan"); - TRepo.craftedSoil = new SoilBlock().func_149713_g(0).func_149663_c("TConstruct.Soil"); - TRepo.craftedSoil.field_149762_H = Block.field_149767_g; + TRepo.craftedSoil = new SoilBlock().setLightOpacity(0).setBlockName("TConstruct.Soil"); + TRepo.craftedSoil.stepSound = Block.soundTypeGravel; - TRepo.searedSlab = new SearedSlab().func_149663_c("SearedSlab"); - TRepo.searedSlab.field_149762_H = Block.field_149769_e; + TRepo.searedSlab = new SearedSlab().setBlockName("SearedSlab"); + TRepo.searedSlab.stepSound = Block.soundTypeStone; - TRepo.speedSlab = new SpeedSlab().func_149663_c("SpeedSlab"); - TRepo.speedSlab.field_149762_H = Block.field_149769_e; + TRepo.speedSlab = new SpeedSlab().setBlockName("SpeedSlab"); + TRepo.speedSlab.stepSound = Block.soundTypeStone; - TRepo.metalBlock = new TMetalBlock(Material.field_151573_f, 10.0F).func_149663_c("tconstruct.metalblock"); - TRepo.metalBlock.field_149762_H = Block.field_149777_j; + TRepo.metalBlock = new TMetalBlock(Material.iron, 10.0F).setBlockName("tconstruct.metalblock"); + TRepo.metalBlock.stepSound = Block.soundTypeMetal; - TRepo.meatBlock = new MeatBlock().func_149663_c("tconstruct.meatblock"); - TRepo.glueBlock = new GlueBlock().func_149663_c("GlueBlock").func_149647_a(TConstructRegistry.blockTab); + TRepo.meatBlock = new MeatBlock().setBlockName("tconstruct.meatblock"); + TRepo.glueBlock = new GlueBlock().setBlockName("GlueBlock").setCreativeTab(TConstructRegistry.blockTab); - TRepo.woolSlab1 = new SlabBase(Material.field_151580_n, Blocks.wool, 0, 8).func_149663_c("cloth"); - TRepo.woolSlab1.func_149672_a(Block.field_149775_l).func_149647_a(CreativeTabs.tabDecorations); - TRepo.woolSlab2 = new SlabBase(Material.field_151580_n, Blocks.wool, 8, 8).func_149663_c("cloth"); - TRepo.woolSlab2.func_149672_a(Block.field_149775_l).func_149647_a(CreativeTabs.tabDecorations); + TRepo.woolSlab1 = new SlabBase(Material.cloth, Blocks.wool, 0, 8).setBlockName("cloth"); + TRepo.woolSlab1.setStepSound(Block.soundTypeCloth).setCreativeTab(CreativeTabs.tabDecorations); + TRepo.woolSlab2 = new SlabBase(Material.cloth, Blocks.wool, 8, 8).setBlockName("cloth"); + TRepo.woolSlab2.setStepSound(Block.soundTypeCloth).setCreativeTab(CreativeTabs.tabDecorations); //Smeltery - TRepo.smeltery = new SmelteryBlock().func_149663_c("Smeltery"); - TRepo.smelteryNether = new SmelteryBlock("nether").func_149663_c("Smeltery"); - TRepo.lavaTank = new LavaTankBlock().func_149663_c("LavaTank"); - TRepo.lavaTank.func_149672_a(Block.field_149778_k); - TRepo.lavaTankNether = new LavaTankBlock("nether").func_149672_a(Block.field_149778_k).func_149663_c("LavaTank"); + TRepo.smeltery = new SmelteryBlock().setBlockName("Smeltery"); + TRepo.smelteryNether = new SmelteryBlock("nether").setBlockName("Smeltery"); + TRepo.lavaTank = new LavaTankBlock().setBlockName("LavaTank"); + TRepo.lavaTank.setStepSound(Block.soundTypeGlass); + TRepo.lavaTankNether = new LavaTankBlock("nether").setStepSound(Block.soundTypeGlass).setBlockName("LavaTank"); - TRepo.searedBlock = new SearedBlock().func_149663_c("SearedBlock"); - TRepo.searedBlockNether = new SearedBlock("nether").func_149663_c("SearedBlock"); + TRepo.searedBlock = new SearedBlock().setBlockName("SearedBlock"); + TRepo.searedBlockNether = new SearedBlock("nether").setBlockName("SearedBlock"); - TRepo.castingChannel = (new CastingChannelBlock()).func_149663_c("CastingChannel"); + TRepo.castingChannel = (new CastingChannelBlock()).setBlockName("CastingChannel"); - TRepo.tankAir = new TankAirBlock(Material.field_151584_j).func_149722_s().func_149663_c("tconstruct.tank.air"); + TRepo.tankAir = new TankAirBlock(Material.leaves).setBlockUnbreakable().setBlockName("tconstruct.tank.air"); //Traps - TRepo.landmine = new BlockLandmine().func_149711_c(0.5F).func_149752_b(0F).func_149672_a(Block.field_149777_j).func_149647_a(CreativeTabs.tabRedstone).func_149663_c("landmine"); - TRepo.punji = new Punji().func_149663_c("trap.punji"); - TRepo.barricadeOak = new BarricadeBlock(Blocks.log, 0).func_149663_c("trap.barricade.oak"); - TRepo.barricadeSpruce = new BarricadeBlock(Blocks.log, 1).func_149663_c("trap.barricade.spruce"); - TRepo.barricadeBirch = new BarricadeBlock(Blocks.log, 2).func_149663_c("trap.barricade.birch"); - TRepo.barricadeJungle = new BarricadeBlock(Blocks.log, 3).func_149663_c("trap.barricade.jungle"); - TRepo.slimeExplosive = new SlimeExplosive().func_149711_c(0.0F).func_149672_a(Block.field_149779_h).func_149663_c("explosive.slime"); + TRepo.landmine = new BlockLandmine().setHardness(0.5F).setResistance(0F).setStepSound(Block.soundTypeMetal).setCreativeTab(CreativeTabs.tabRedstone).setBlockName("landmine"); + TRepo.punji = new Punji().setBlockName("trap.punji"); + TRepo.barricadeOak = new BarricadeBlock(Blocks.log, 0).setBlockName("trap.barricade.oak"); + TRepo.barricadeSpruce = new BarricadeBlock(Blocks.log, 1).setBlockName("trap.barricade.spruce"); + TRepo.barricadeBirch = new BarricadeBlock(Blocks.log, 2).setBlockName("trap.barricade.birch"); + TRepo.barricadeJungle = new BarricadeBlock(Blocks.log, 3).setBlockName("trap.barricade.jungle"); + TRepo.slimeExplosive = new SlimeExplosive().setHardness(0.0F).setStepSound(Block.soundTypeGrass).setBlockName("explosive.slime"); - TRepo.dryingRack = new DryingRack().func_149663_c("Armor.DryingRack"); + TRepo.dryingRack = new DryingRack().setBlockName("Armor.DryingRack"); //Liquids - TRepo.liquidMetal = new MaterialLiquid(MapColor.field_151656_f); + TRepo.liquidMetal = new MaterialLiquid(MapColor.tntColor); TRepo.moltenIronFluid = new Fluid("iron.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenIronFluid)) TRepo.moltenIronFluid = FluidRegistry.getFluid("iron.molten"); - TRepo.moltenIron = new TConstructFluid(TRepo.moltenIronFluid, Material.field_151587_i, "liquid_iron").func_149663_c("fluid.molten.iron"); + TRepo.moltenIron = new TConstructFluid(TRepo.moltenIronFluid, Material.lava, "liquid_iron").setBlockName("fluid.molten.iron"); GameRegistry.registerBlock(TRepo.moltenIron, "fluid.molten.iron"); TRepo.moltenIronFluid.setBlock(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))); @@ -159,7 +159,7 @@ public class TContent implements IFuelHandler TRepo.moltenGoldFluid = new Fluid("gold.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenGoldFluid)) TRepo.moltenGoldFluid = FluidRegistry.getFluid("gold.molten"); - TRepo.moltenGold = new TConstructFluid(TRepo.moltenGoldFluid, Material.field_151587_i, "liquid_gold").func_149663_c("fluid.molten.gold"); + TRepo.moltenGold = new TConstructFluid(TRepo.moltenGoldFluid, Material.lava, "liquid_gold").setBlockName("fluid.molten.gold"); GameRegistry.registerBlock(TRepo.moltenGold, "fluid.molten.gold"); TRepo.moltenGoldFluid.setBlock(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))); @@ -167,7 +167,7 @@ public class TContent implements IFuelHandler TRepo.moltenCopperFluid = new Fluid("copper.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenCopperFluid)) TRepo.moltenCopperFluid = FluidRegistry.getFluid("copper.molten"); - TRepo.moltenCopper = new TConstructFluid(TRepo.moltenCopperFluid, Material.field_151587_i, "liquid_copper").func_149663_c("fluid.molten.copper"); + TRepo.moltenCopper = new TConstructFluid(TRepo.moltenCopperFluid, Material.lava, "liquid_copper").setBlockName("fluid.molten.copper"); GameRegistry.registerBlock(TRepo.moltenCopper, "fluid.molten.copper"); TRepo.moltenCopperFluid.setBlock(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))); @@ -175,7 +175,7 @@ public class TContent implements IFuelHandler TRepo.moltenTinFluid = new Fluid("tin.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenTinFluid)) TRepo.moltenTinFluid = FluidRegistry.getFluid("tin.molten"); - TRepo.moltenTin = new TConstructFluid(TRepo.moltenTinFluid, Material.field_151587_i, "liquid_tin").func_149663_c("fluid.molten.tin"); + TRepo.moltenTin = new TConstructFluid(TRepo.moltenTinFluid, Material.lava, "liquid_tin").setBlockName("fluid.molten.tin"); GameRegistry.registerBlock(TRepo.moltenTin, "fluid.molten.tin"); TRepo.moltenTinFluid.setBlock(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(Items.bucket))); @@ -183,7 +183,7 @@ public class TContent implements IFuelHandler TRepo.moltenAluminumFluid = new Fluid("aluminum.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenAluminumFluid)) TRepo.moltenAluminumFluid = FluidRegistry.getFluid("aluminum.molten"); - TRepo.moltenAluminum = new TConstructFluid(TRepo.moltenAluminumFluid, Material.field_151587_i, "liquid_aluminum").func_149663_c("fluid.molten.aluminum"); + TRepo.moltenAluminum = new TConstructFluid(TRepo.moltenAluminumFluid, Material.lava, "liquid_aluminum").setBlockName("fluid.molten.aluminum"); GameRegistry.registerBlock(TRepo.moltenAluminum, "fluid.molten.aluminum"); TRepo.moltenAluminumFluid.setBlock(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(Items.bucket))); @@ -191,7 +191,7 @@ public class TContent implements IFuelHandler TRepo.moltenCobaltFluid = new Fluid("cobalt.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenCobaltFluid)) TRepo.moltenCobaltFluid = FluidRegistry.getFluid("cobalt.molten"); - TRepo.moltenCobalt = new TConstructFluid(TRepo.moltenCobaltFluid, Material.field_151587_i, "liquid_cobalt").func_149663_c("fluid.molten.cobalt"); + TRepo.moltenCobalt = new TConstructFluid(TRepo.moltenCobaltFluid, Material.lava, "liquid_cobalt").setBlockName("fluid.molten.cobalt"); GameRegistry.registerBlock(TRepo.moltenCobalt, "fluid.molten.cobalt"); TRepo.moltenCobaltFluid.setBlock(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(Items.bucket))); @@ -199,7 +199,7 @@ public class TContent implements IFuelHandler TRepo.moltenArditeFluid = new Fluid("ardite.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenArditeFluid)) TRepo.moltenArditeFluid = FluidRegistry.getFluid("ardite.molten"); - TRepo.moltenArdite = new TConstructFluid(TRepo.moltenArditeFluid, Material.field_151587_i, "liquid_ardite").func_149663_c("fluid.molten.ardite"); + TRepo.moltenArdite = new TConstructFluid(TRepo.moltenArditeFluid, Material.lava, "liquid_ardite").setBlockName("fluid.molten.ardite"); GameRegistry.registerBlock(TRepo.moltenArdite, "fluid.molten.ardite"); TRepo.moltenArditeFluid.setBlock(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(Items.bucket))); @@ -207,7 +207,7 @@ public class TContent implements IFuelHandler TRepo.moltenBronzeFluid = new Fluid("bronze.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenBronzeFluid)) TRepo.moltenBronzeFluid = FluidRegistry.getFluid("bronze.molten"); - TRepo.moltenBronze = new TConstructFluid(TRepo.moltenBronzeFluid, Material.field_151587_i, "liquid_bronze").func_149663_c("fluid.molten.bronze"); + TRepo.moltenBronze = new TConstructFluid(TRepo.moltenBronzeFluid, Material.lava, "liquid_bronze").setBlockName("fluid.molten.bronze"); GameRegistry.registerBlock(TRepo.moltenBronze, "fluid.molten.bronze"); TRepo.moltenBronzeFluid.setBlock(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(Items.bucket))); @@ -215,7 +215,7 @@ public class TContent implements IFuelHandler TRepo.moltenAlubrassFluid = new Fluid("aluminumbrass.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenAlubrassFluid)) TRepo.moltenAlubrassFluid = FluidRegistry.getFluid("aluminumbrass.molten"); - TRepo.moltenAlubrass = new TConstructFluid(TRepo.moltenAlubrassFluid, Material.field_151587_i, "liquid_alubrass").func_149663_c("fluid.molten.alubrass"); + TRepo.moltenAlubrass = new TConstructFluid(TRepo.moltenAlubrassFluid, Material.lava, "liquid_alubrass").setBlockName("fluid.molten.alubrass"); GameRegistry.registerBlock(TRepo.moltenAlubrass, "fluid.molten.alubrass"); TRepo.moltenAlubrassFluid.setBlock(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(Items.bucket))); @@ -223,7 +223,7 @@ public class TContent implements IFuelHandler TRepo.moltenManyullynFluid = new Fluid("manyullyn.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenManyullynFluid)) TRepo.moltenManyullynFluid = FluidRegistry.getFluid("manyullyn.molten"); - TRepo.moltenManyullyn = new TConstructFluid(TRepo.moltenManyullynFluid, Material.field_151587_i, "liquid_manyullyn").func_149663_c("fluid.molten.manyullyn"); + TRepo.moltenManyullyn = new TConstructFluid(TRepo.moltenManyullynFluid, Material.lava, "liquid_manyullyn").setBlockName("fluid.molten.manyullyn"); GameRegistry.registerBlock(TRepo.moltenManyullyn, "fluid.molten.manyullyn"); TRepo.moltenManyullynFluid.setBlock(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(Items.bucket))); @@ -231,7 +231,7 @@ public class TContent implements IFuelHandler TRepo.moltenAlumiteFluid = new Fluid("alumite.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenAlumiteFluid)) TRepo.moltenAlumiteFluid = FluidRegistry.getFluid("alumite.molten"); - TRepo.moltenAlumite = new TConstructFluid(TRepo.moltenAlumiteFluid, Material.field_151587_i, "liquid_alumite").func_149663_c("fluid.molten.alumite"); + TRepo.moltenAlumite = new TConstructFluid(TRepo.moltenAlumiteFluid, Material.lava, "liquid_alumite").setBlockName("fluid.molten.alumite"); GameRegistry.registerBlock(TRepo.moltenAlumite, "fluid.molten.alumite"); TRepo.moltenAlumiteFluid.setBlock(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(Items.bucket))); @@ -239,7 +239,7 @@ public class TContent implements IFuelHandler TRepo.moltenObsidianFluid = new Fluid("obsidian.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenObsidianFluid)) TRepo.moltenObsidianFluid = FluidRegistry.getFluid("obsidian.molten"); - TRepo.moltenObsidian = new TConstructFluid(TRepo.moltenObsidianFluid, Material.field_151587_i, "liquid_obsidian").func_149663_c("fluid.molten.obsidian"); + TRepo.moltenObsidian = new TConstructFluid(TRepo.moltenObsidianFluid, Material.lava, "liquid_obsidian").setBlockName("fluid.molten.obsidian"); GameRegistry.registerBlock(TRepo.moltenObsidian, "fluid.molten.obsidian"); TRepo.moltenObsidianFluid.setBlock(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(Items.bucket))); @@ -247,7 +247,7 @@ public class TContent implements IFuelHandler TRepo.moltenSteelFluid = new Fluid("steel.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenSteelFluid)) TRepo.moltenSteelFluid = FluidRegistry.getFluid("steel.molten"); - TRepo.moltenSteel = new TConstructFluid(TRepo.moltenSteelFluid, Material.field_151587_i, "liquid_steel").func_149663_c("fluid.molten.steel"); + TRepo.moltenSteel = new TConstructFluid(TRepo.moltenSteelFluid, Material.lava, "liquid_steel").setBlockName("fluid.molten.steel"); GameRegistry.registerBlock(TRepo.moltenSteel, "fluid.molten.steel"); TRepo.moltenSteelFluid.setBlock(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(Items.bucket))); @@ -255,7 +255,7 @@ public class TContent implements IFuelHandler TRepo.moltenGlassFluid = new Fluid("glass.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenGlassFluid)) TRepo.moltenGlassFluid = FluidRegistry.getFluid("glass.molten"); - TRepo.moltenGlass = new TConstructFluid(TRepo.moltenGlassFluid, Material.field_151587_i, "liquid_glass", true).func_149663_c("fluid.molten.glass"); + TRepo.moltenGlass = new TConstructFluid(TRepo.moltenGlassFluid, Material.lava, "liquid_glass", true).setBlockName("fluid.molten.glass"); GameRegistry.registerBlock(TRepo.moltenGlass, "fluid.molten.glass"); TRepo.moltenGlassFluid.setBlock(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(Items.bucket))); @@ -263,7 +263,7 @@ public class TContent implements IFuelHandler TRepo.moltenStoneFluid = new Fluid("stone.seared"); if (!FluidRegistry.registerFluid(TRepo.moltenStoneFluid)) TRepo.moltenStoneFluid = FluidRegistry.getFluid("stone.seared"); - TRepo.moltenStone = new TConstructFluid(TRepo.moltenStoneFluid, Material.field_151587_i, "liquid_stone").func_149663_c("molten.stone"); + TRepo.moltenStone = new TConstructFluid(TRepo.moltenStoneFluid, Material.lava, "liquid_stone").setBlockName("molten.stone"); GameRegistry.registerBlock(TRepo.moltenStone, "molten.stone"); TRepo.moltenStoneFluid.setBlock(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(Items.bucket))); @@ -271,7 +271,7 @@ public class TContent implements IFuelHandler TRepo.moltenEmeraldFluid = new Fluid("emerald.liquid"); if (!FluidRegistry.registerFluid(TRepo.moltenEmeraldFluid)) TRepo.moltenEmeraldFluid = FluidRegistry.getFluid("emerald.liquid"); - TRepo.moltenEmerald = new TConstructFluid(TRepo.moltenEmeraldFluid, Material.field_151586_h, "liquid_villager").func_149663_c("molten.emerald"); + TRepo.moltenEmerald = new TConstructFluid(TRepo.moltenEmeraldFluid, Material.water, "liquid_villager").setBlockName("molten.emerald"); GameRegistry.registerBlock(TRepo.moltenEmerald, "molten.emerald"); TRepo.moltenEmeraldFluid.setBlock(TRepo.moltenEmerald).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenEmeraldFluid, 1000), new ItemStack(TRepo.buckets, 1, 15), new ItemStack(Items.bucket))); @@ -279,7 +279,7 @@ public class TContent implements IFuelHandler TRepo.bloodFluid = new Fluid("blood"); if (!FluidRegistry.registerFluid(TRepo.bloodFluid)) TRepo.bloodFluid = FluidRegistry.getFluid("blood"); - TRepo.blood = new BloodBlock(TRepo.bloodFluid, Material.field_151586_h, "liquid_cow").func_149663_c("liquid.blood"); + TRepo.blood = new BloodBlock(TRepo.bloodFluid, Material.water, "liquid_cow").setBlockName("liquid.blood"); GameRegistry.registerBlock(TRepo.blood, "liquid.blood"); TRepo.bloodFluid.setBlock(TRepo.blood).setDensity(3000).setViscosity(6000).setTemperature(1300); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.bloodFluid, 1000), new ItemStack(TRepo.buckets, 1, 16), new ItemStack(Items.bucket))); @@ -287,7 +287,7 @@ public class TContent implements IFuelHandler TRepo.moltenNickelFluid = new Fluid("nickel.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenNickelFluid)) TRepo.moltenNickelFluid = FluidRegistry.getFluid("nickel.molten"); - TRepo.moltenNickel = new TConstructFluid(TRepo.moltenNickelFluid, Material.field_151587_i, "liquid_ferrous").func_149663_c("fluid.molten.nickel"); + TRepo.moltenNickel = new TConstructFluid(TRepo.moltenNickelFluid, Material.lava, "liquid_ferrous").setBlockName("fluid.molten.nickel"); GameRegistry.registerBlock(TRepo.moltenNickel, "fluid.molten.nickel"); TRepo.moltenNickelFluid.setBlock(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(Items.bucket))); @@ -295,7 +295,7 @@ public class TContent implements IFuelHandler TRepo.moltenLeadFluid = new Fluid("lead.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenLeadFluid)) TRepo.moltenLeadFluid = FluidRegistry.getFluid("lead.molten"); - TRepo.moltenLead = new TConstructFluid(TRepo.moltenLeadFluid, Material.field_151587_i, "liquid_lead").func_149663_c("fluid.molten.lead"); + TRepo.moltenLead = new TConstructFluid(TRepo.moltenLeadFluid, Material.lava, "liquid_lead").setBlockName("fluid.molten.lead"); GameRegistry.registerBlock(TRepo.moltenLead, "fluid.molten.lead"); TRepo.moltenLeadFluid.setBlock(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(Items.bucket))); @@ -303,7 +303,7 @@ public class TContent implements IFuelHandler TRepo.moltenSilverFluid = new Fluid("silver.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenSilverFluid)) TRepo.moltenSilverFluid = FluidRegistry.getFluid("silver.molten"); - TRepo.moltenSilver = new TConstructFluid(TRepo.moltenSilverFluid, Material.field_151587_i, "liquid_silver").func_149663_c("fluid.molten.silver"); + TRepo.moltenSilver = new TConstructFluid(TRepo.moltenSilverFluid, Material.lava, "liquid_silver").setBlockName("fluid.molten.silver"); GameRegistry.registerBlock(TRepo.moltenSilver, "fluid.molten.silver"); TRepo.moltenSilverFluid.setBlock(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(Items.bucket))); @@ -311,7 +311,7 @@ public class TContent implements IFuelHandler TRepo.moltenShinyFluid = new Fluid("platinum.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenShinyFluid)) TRepo.moltenShinyFluid = FluidRegistry.getFluid("platinum.molten"); - TRepo.moltenShiny = new TConstructFluid(TRepo.moltenShinyFluid, Material.field_151587_i, "liquid_shiny").func_149663_c("fluid.molten.shiny"); + TRepo.moltenShiny = new TConstructFluid(TRepo.moltenShinyFluid, Material.lava, "liquid_shiny").setBlockName("fluid.molten.shiny"); GameRegistry.registerBlock(TRepo.moltenShiny, "fluid.molten.shiny"); TRepo.moltenShinyFluid.setBlock(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(Items.bucket))); @@ -319,7 +319,7 @@ public class TContent implements IFuelHandler TRepo.moltenInvarFluid = new Fluid("invar.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenInvarFluid)) TRepo.moltenInvarFluid = FluidRegistry.getFluid("invar.molten"); - TRepo.moltenInvar = new TConstructFluid(TRepo.moltenInvarFluid, Material.field_151587_i, "liquid_invar").func_149663_c("fluid.molten.invar"); + TRepo.moltenInvar = new TConstructFluid(TRepo.moltenInvarFluid, Material.lava, "liquid_invar").setBlockName("fluid.molten.invar"); GameRegistry.registerBlock(TRepo.moltenInvar, "fluid.molten.invar"); TRepo.moltenInvarFluid.setBlock(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(Items.bucket))); @@ -327,7 +327,7 @@ public class TContent implements IFuelHandler TRepo.moltenElectrumFluid = new Fluid("electrum.molten"); if (!FluidRegistry.registerFluid(TRepo.moltenElectrumFluid)) TRepo.moltenElectrumFluid = FluidRegistry.getFluid("electrum.molten"); - TRepo.moltenElectrum = new TConstructFluid(TRepo.moltenElectrumFluid, Material.field_151587_i, "liquid_electrum").func_149663_c("fluid.molten.electrum"); + TRepo.moltenElectrum = new TConstructFluid(TRepo.moltenElectrumFluid, Material.lava, "liquid_electrum").setBlockName("fluid.molten.electrum"); GameRegistry.registerBlock(TRepo.moltenElectrum, "fluid.molten.electrum"); TRepo.moltenElectrumFluid.setBlock(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(Items.bucket))); @@ -342,7 +342,7 @@ public class TContent implements IFuelHandler } else { - TRepo.moltenEnder = new TConstructFluid(TRepo.moltenEnderFluid, Material.field_151586_h, "liquid_ender").func_149663_c("fluid.ender"); + TRepo.moltenEnder = new TConstructFluid(TRepo.moltenEnderFluid, Material.water, "liquid_ender").setBlockName("fluid.ender"); GameRegistry.registerBlock(TRepo.moltenEnder, "fluid.ender"); TRepo.moltenEnderFluid.setBlock(TRepo.moltenEnder).setDensity(3000).setViscosity(6000); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenEnderFluid, 1000), new ItemStack(TRepo.buckets, 1, 23), new ItemStack(Items.bucket))); @@ -354,7 +354,7 @@ public class TContent implements IFuelHandler TRepo.blueSlimeFluid = new Fluid("slime.blue"); if (!FluidRegistry.registerFluid(TRepo.blueSlimeFluid)) TRepo.blueSlimeFluid = FluidRegistry.getFluid("slime.blue"); - TRepo.slimePool = new SlimeFluid(TRepo.blueSlimeFluid, Material.field_151586_h).func_149647_a(TConstructRegistry.blockTab).func_149672_a(TRepo.slimeStep).func_149663_c("liquid.slime"); + TRepo.slimePool = new SlimeFluid(TRepo.blueSlimeFluid, Material.water).setCreativeTab(TConstructRegistry.blockTab).setStepSound(TRepo.slimeStep).setBlockName("liquid.slime"); GameRegistry.registerBlock(TRepo.slimePool, "liquid.slime"); TRepo.blueSlimeFluid.setBlock(TRepo.slimePool); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.blueSlimeFluid, 1000), new ItemStack(TRepo.buckets, 1, 24), new ItemStack(Items.bucket))); @@ -363,7 +363,7 @@ public class TContent implements IFuelHandler TRepo.glueFluid = new Fluid("glue").setDensity(6000).setViscosity(6000).setTemperature(200); if (!FluidRegistry.registerFluid(TRepo.glueFluid)) TRepo.glueFluid = FluidRegistry.getFluid("glue"); - TRepo.glueFluidBlock = new GlueFluid(TRepo.glueFluid, Material.field_151586_h).func_149647_a(TConstructRegistry.blockTab).func_149672_a(TRepo.slimeStep).func_149663_c("liquid.glue"); + TRepo.glueFluidBlock = new GlueFluid(TRepo.glueFluid, Material.water).setCreativeTab(TConstructRegistry.blockTab).setStepSound(TRepo.slimeStep).setBlockName("liquid.glue"); GameRegistry.registerBlock(TRepo.glueFluidBlock, "liquid.glue"); TRepo.glueFluid.setBlock(TRepo.glueFluidBlock); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.glueFluid, 1000), new ItemStack(TRepo.buckets, 1, 26), new ItemStack(Items.bucket))); @@ -381,36 +381,36 @@ public class TContent implements IFuelHandler TRepo.moltenAlubrass, TRepo.moltenManyullyn, TRepo.moltenAlumite, TRepo.moltenObsidian, TRepo.moltenSteel, TRepo.moltenGlass, TRepo.moltenStone, TRepo.moltenEmerald, TRepo.blood, TRepo.moltenNickel, TRepo.moltenLead, TRepo.moltenSilver, TRepo.moltenShiny, TRepo.moltenInvar, TRepo.moltenElectrum, TRepo.moltenEnder, TRepo.slimePool, TRepo.glueFluidBlock }; //Slime Islands - TRepo.slimeGel = new SlimeGel().func_149672_a(TRepo.slimeStep).func_149713_g(0).func_149663_c("slime.gel"); - TRepo.slimeGrass = new SlimeGrass().func_149672_a(Block.field_149779_h).func_149713_g(0).func_149663_c("slime.grass"); - TRepo.slimeTallGrass = new SlimeTallGrass().func_149672_a(Block.field_149779_h).func_149663_c("slime.grass.tall"); - TRepo.slimeLeaves = (SlimeLeaves) new SlimeLeaves().func_149672_a(TRepo.slimeStep).func_149713_g(0).func_149663_c("slime.leaves"); - TRepo.slimeSapling = (SlimeSapling) new SlimeSapling().func_149672_a(TRepo.slimeStep).func_149663_c("slime.sapling"); - TRepo.slimeChannel = new ConveyorBase(Material.field_151586_h, "greencurrent").func_149711_c(0.3f).func_149672_a(TRepo.slimeStep).func_149663_c("slime.channel"); - TRepo.bloodChannel = new ConveyorBase(Material.field_151586_h, "liquid_cow").func_149711_c(0.3f).func_149672_a(TRepo.slimeStep).func_149663_c("blood.channel"); - TRepo.slimePad = new SlimePad(Material.field_151580_n).func_149672_a(TRepo.slimeStep).func_149711_c(0.3f).func_149663_c("slime.pad"); + TRepo.slimeGel = new SlimeGel().setStepSound(TRepo.slimeStep).setLightOpacity(0).setBlockName("slime.gel"); + TRepo.slimeGrass = new SlimeGrass().setStepSound(Block.soundTypeGrass).setLightOpacity(0).setBlockName("slime.grass"); + TRepo.slimeTallGrass = new SlimeTallGrass().setStepSound(Block.soundTypeGrass).setBlockName("slime.grass.tall"); + TRepo.slimeLeaves = (SlimeLeaves) new SlimeLeaves().setStepSound(TRepo.slimeStep).setLightOpacity(0).setBlockName("slime.leaves"); + TRepo.slimeSapling = (SlimeSapling) new SlimeSapling().setStepSound(TRepo.slimeStep).setBlockName("slime.sapling"); + TRepo.slimeChannel = new ConveyorBase(Material.water, "greencurrent").setHardness(0.3f).setStepSound(TRepo.slimeStep).setBlockName("slime.channel"); + TRepo.bloodChannel = new ConveyorBase(Material.water, "liquid_cow").setHardness(0.3f).setStepSound(TRepo.slimeStep).setBlockName("blood.channel"); + TRepo.slimePad = new SlimePad(Material.cloth).setStepSound(TRepo.slimeStep).setHardness(0.3f).setBlockName("slime.pad"); //Decoration - TRepo.stoneTorch = new StoneTorch().func_149663_c("decoration.stonetorch"); - TRepo.stoneLadder = new StoneLadder().func_149663_c("decoration.stoneladder"); - TRepo.multiBrick = new MultiBrick().func_149663_c("Decoration.Brick"); - TRepo.multiBrickFancy = new MultiBrickFancy().func_149663_c("Decoration.BrickFancy"); + TRepo.stoneTorch = new StoneTorch().setBlockName("decoration.stonetorch"); + TRepo.stoneLadder = new StoneLadder().setBlockName("decoration.stoneladder"); + TRepo.multiBrick = new MultiBrick().setBlockName("Decoration.Brick"); + TRepo.multiBrickFancy = new MultiBrickFancy().setBlockName("Decoration.BrickFancy"); //Ores String[] berryOres = new String[] { "berry_iron", "berry_gold", "berry_copper", "berry_tin", "berry_iron_ripe", "berry_gold_ripe", "berry_copper_ripe", "berry_tin_ripe" }; - TRepo.oreBerry = (OreberryBush) new OreberryBush(berryOres, 0, 4, new String[] { "oreIron", "oreGold", "oreCopper", "oreTin" }).func_149663_c("ore.berries.one"); + TRepo.oreBerry = (OreberryBush) new OreberryBush(berryOres, 0, 4, new String[] { "oreIron", "oreGold", "oreCopper", "oreTin" }).setBlockName("ore.berries.one"); String[] berryOresTwo = new String[] { "berry_aluminum", "berry_essence", "", "", "berry_aluminum_ripe", "berry_essence_ripe", "", "" }; - TRepo.oreBerrySecond = (OreberryBush) new OreberryBushEssence(berryOresTwo, 4, 2, new String[] { "oreAluminum", "oreSilver" }).func_149663_c("ore.berries.two"); + TRepo.oreBerrySecond = (OreberryBush) new OreberryBushEssence(berryOresTwo, 4, 2, new String[] { "oreAluminum", "oreSilver" }).setBlockName("ore.berries.two"); String[] oreTypes = new String[] { "nether_slag", "nether_cobalt", "nether_ardite", "ore_copper", "ore_tin", "ore_aluminum", "ore_slag" }; - TRepo.oreSlag = new MetalOre(Material.field_151576_e, 10.0F, oreTypes).func_149663_c("tconstruct.stoneore"); + TRepo.oreSlag = new MetalOre(Material.rock, 10.0F, oreTypes).setBlockName("tconstruct.stoneore"); TRepo.oreSlag.setHarvestLevel("pickaxe", 4, 1); TRepo.oreSlag.setHarvestLevel("pickaxe", 4, 2); TRepo.oreSlag.setHarvestLevel("pickaxe", 1, 3); TRepo.oreSlag.setHarvestLevel("pickaxe", 1, 4); TRepo.oreSlag.setHarvestLevel("pickaxe", 1, 5); - TRepo.oreGravel = new GravelOre().func_149663_c("GravelOre").func_149663_c("tconstruct.gravelore"); + TRepo.oreGravel = new GravelOre().setBlockName("GravelOre").setBlockName("tconstruct.gravelore"); TRepo.oreGravel.setHarvestLevel("shovel", 1, 0); TRepo.oreGravel.setHarvestLevel("shovel", 2, 1); TRepo.oreGravel.setHarvestLevel("shovel", 1, 2); @@ -418,19 +418,19 @@ public class TContent implements IFuelHandler TRepo.oreGravel.setHarvestLevel("shovel", 1, 4); TRepo.oreGravel.setHarvestLevel("shovel", 4, 5); - TRepo.speedBlock = new SpeedBlock().func_149663_c("SpeedBlock"); + TRepo.speedBlock = new SpeedBlock().setBlockName("SpeedBlock"); //Glass - TRepo.clearGlass = new GlassBlockConnected("clear", false).func_149663_c("GlassBlock"); - TRepo.clearGlass.field_149762_H = Block.field_149778_k; + TRepo.clearGlass = new GlassBlockConnected("clear", false).setBlockName("GlassBlock"); + TRepo.clearGlass.stepSound = Block.soundTypeGlass; TRepo.glassPane = new GlassPaneConnected("clear", false); TRepo.stainedGlassClear = new GlassBlockConnectedMeta("stained", true, "white", "orange", "magenta", "light_blue", "yellow", "lime", "pink", "gray", "light_gray", "cyan", "purple", "blue", - "brown", "green", "red", "black").func_149663_c("GlassBlock.StainedClear"); - TRepo.stainedGlassClear.field_149762_H = Block.field_149778_k; + "brown", "green", "red", "black").setBlockName("GlassBlock.StainedClear"); + TRepo.stainedGlassClear.stepSound = Block.soundTypeGlass; TRepo.stainedGlassClearPane = new GlassPaneStained(); //Rail - TRepo.woodenRail = new WoodRail().func_149672_a(Block.field_149766_f).func_149647_a(TConstructRegistry.blockTab).func_149663_c("rail.wood"); + TRepo.woodenRail = new WoodRail().setStepSound(Block.soundTypeWood).setCreativeTab(TConstructRegistry.blockTab).setBlockName("rail.wood"); } diff --git a/src/main/java/tconstruct/common/TProxyCommon.java b/src/main/java/tconstruct/common/TProxyCommon.java index 9259f3d7..81509f9c 100644 --- a/src/main/java/tconstruct/common/TProxyCommon.java +++ b/src/main/java/tconstruct/common/TProxyCommon.java @@ -44,12 +44,12 @@ public class TProxyCommon implements IGuiHandler if (ID == landmineID) { - return new ContainerLandmine(player, (TileEntityLandmine) world.func_147438_o(x, y, z)); + return new ContainerLandmine(player, (TileEntityLandmine) world.getTileEntity(x, y, z)); } else if (ID < 100) { - TileEntity tile = world.func_147438_o(x, y, z); + TileEntity tile = world.getTileEntity(x, y, z); if (tile != null && tile instanceof InventoryLogic) { return ((InventoryLogic) tile).getGuiContainer(player.inventory, world, x, y, z); diff --git a/src/main/java/tconstruct/common/TRecipes.java b/src/main/java/tconstruct/common/TRecipes.java index 27b1cfcf..dcccac16 100644 --- a/src/main/java/tconstruct/common/TRecipes.java +++ b/src/main/java/tconstruct/common/TRecipes.java @@ -949,9 +949,9 @@ public class TRecipes OreDictionary.registerOre(glassTypes[15 - i], new ItemStack(TRepo.stainedGlassClear, 1, i)); } - BlockDispenser.field_149943_a.putObject(TRepo.titleIcon, new TDispenserBehaviorSpawnEgg()); + BlockDispenser.dispenseBehaviorRegistry.putObject(TRepo.titleIcon, new TDispenserBehaviorSpawnEgg()); - BlockDispenser.field_149943_a.putObject(TRepo.arrow, new TDispenserBehaviorArrow()); + BlockDispenser.dispenseBehaviorRegistry.putObject(TRepo.arrow, new TDispenserBehaviorArrow()); //Vanilla stuff OreDictionary.registerOre("slimeball", new ItemStack(Items.slime_ball)); diff --git a/src/main/java/tconstruct/entity/BlueSlime.java b/src/main/java/tconstruct/entity/BlueSlime.java index d8b69b33..d148ad04 100644 --- a/src/main/java/tconstruct/entity/BlueSlime.java +++ b/src/main/java/tconstruct/entity/BlueSlime.java @@ -78,7 +78,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData return StatCollector.translateToLocal("entity." + s + ".name"); } - public IEntityLivingData func_110161_a (IEntityLivingData par1EntityLivingData) + public IEntityLivingData onSpawnWithEgg (IEntityLivingData par1EntityLivingData) { Object par1EntityLivingData1 = super.onSpawnWithEgg(par1EntityLivingData); @@ -104,7 +104,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData { BlueSlime slime = new BlueSlime(this.worldObj); slime.setLocationAndAngles(this.posX, this.posY, this.posZ, this.rotationYaw, 0.0F); - slime.func_110161_a(par1EntityLivingData); + slime.onSpawnWithEgg(par1EntityLivingData); this.worldObj.spawnEntityInWorld(slime); } @@ -315,7 +315,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData this.sizeOffset = 1.0F; } - this.func_70808_l(); + this.alterSquishAmount(); if (this.worldObj.isRemote) { @@ -378,7 +378,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData return false; } - protected void func_70808_l () + protected void alterSquishAmount () { this.sizeOffset *= 0.6F; } diff --git a/src/main/java/tconstruct/entity/CartEntity.java b/src/main/java/tconstruct/entity/CartEntity.java index e2e029d6..d984065b 100644 --- a/src/main/java/tconstruct/entity/CartEntity.java +++ b/src/main/java/tconstruct/entity/CartEntity.java @@ -38,7 +38,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS /** Array of item stacks stored in minecart (for storage minecarts). */ protected ItemStack[] cargoItems; protected int fuel; - protected boolean field_70499_f; + protected boolean isInReverse; /** The type of minecart, 2 for powered, 1 for storage. */ private int pullcartType; @@ -89,7 +89,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS super(par1World); this.cargoItems = new ItemStack[36]; this.fuel = 0; - this.field_70499_f = false; + this.isInReverse = false; this.field_82345_h = true; this.preventEntitySpawning = true; this.setSize(0.98F, 0.7F); @@ -186,8 +186,8 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS } else { - this.func_70494_i(-this.func_70493_k()); - this.func_70497_h(10); + this.setRollingDirection(-this.getRollingDirection()); + this.setRollingAmplitude(10); this.setBeenAttacked(); this.setDamage(this.getDamage() + par2 * 10); @@ -222,8 +222,8 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS */ public void performHurtAnimation () { - this.func_70494_i(-this.func_70493_k()); - this.func_70497_h(10); + this.setRollingDirection(-this.getRollingDirection()); + this.setRollingAmplitude(10); this.setDamage(this.getDamage() + this.getDamage() * 10); } @@ -297,9 +297,9 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS */ public void onUpdate () { - if (this.func_70496_j() > 0) + if (this.getRollingAmplitude() > 0) { - this.func_70497_h(this.func_70496_j() - 1); + this.setRollingAmplitude(this.getRollingAmplitude() - 1); } if (this.getDamage() > 0) @@ -409,7 +409,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS double var4 = 0.4D; double var6 = 0.0078125D; - Block var8 = this.worldObj.func_147439_a(var45, var2, var47); + Block var8 = this.worldObj.getBlock(var45, var2, var47); moveMinecartOffRail(var45, var2, var47); if (entityFollowing != null) @@ -424,7 +424,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS { this.rotationYaw = (float) (Math.atan2(var50, var49) * 180.0D / Math.PI); - if (this.field_70499_f) + if (this.isInReverse) { this.rotationYaw += 180.0F; } @@ -435,7 +435,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS if (var51 < -170.0D || var51 >= 170.0D) { this.rotationYaw += 180.0F; - this.field_70499_f = !this.field_70499_f; + this.isInReverse = !this.isInReverse; } this.setRotation(this.rotationYaw, this.rotationPitch); @@ -572,7 +572,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS --var10; } - Block var12 = this.worldObj.func_147439_a(var9, var10, var11); + Block var12 = this.worldObj.getBlock(var9, var10, var11); return null; } @@ -588,7 +588,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS --var8; } - Block var10 = this.worldObj.func_147439_a(var7, var8, var9); + Block var10 = this.worldObj.getBlock(var7, var8, var9); if (BlockRail.func_150051_a(var10)) { @@ -709,12 +709,12 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS if (getSizeInventory() > 0) { - NBTTagList var2 = par1NBTTagCompound.func_150295_c("Items",9); + NBTTagList var2 = par1NBTTagCompound.getTagList("Items",9); this.cargoItems = new ItemStack[this.getSizeInventory()]; for (int var3 = 0; var3 < var2.tagCount(); ++var3) { - NBTTagCompound var4 = (NBTTagCompound) var2.func_150305_b(var3); + NBTTagCompound var4 = (NBTTagCompound) var2.getCompoundTagAt(var3); int var5 = var4.getByte("Slot") & 255; if (var5 >= 0 && var5 < this.cargoItems.length) @@ -1079,22 +1079,22 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS return this.dataWatcher.getWatchableObjectInt(19); } - public void func_70497_h (int par1) + public void setRollingAmplitude (int par1) { this.dataWatcher.updateObject(17, Integer.valueOf(par1)); } - public int func_70496_j () + public int getRollingAmplitude () { return this.dataWatcher.getWatchableObjectInt(17); } - public void func_70494_i (int par1) + public void setRollingDirection (int par1) { this.dataWatcher.updateObject(18, Integer.valueOf(par1)); } - public int func_70493_k () + public int getRollingDirection () { return this.dataWatcher.getWatchableObjectInt(18); } @@ -1451,14 +1451,14 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS } @Override - public String func_145825_b () + public String getInventoryName () { //TODO get inventory name return null; } @Override - public boolean func_145818_k_ () + public boolean hasCustomInventoryName () { return false; } diff --git a/src/main/java/tconstruct/entity/item/EntityLandmineFirework.java b/src/main/java/tconstruct/entity/item/EntityLandmineFirework.java index e6b3ddc8..58b64f29 100644 --- a/src/main/java/tconstruct/entity/item/EntityLandmineFirework.java +++ b/src/main/java/tconstruct/entity/item/EntityLandmineFirework.java @@ -173,7 +173,7 @@ public class EntityLandmineFirework extends Entity nbttagcompound = itemstack.getTagCompound().getCompoundTag("Fireworks"); } - this.worldObj.func_92088_a(this.posX, this.posY, this.posZ, this.motionX, this.motionY, this.motionZ, nbttagcompound); + this.worldObj.makeFireworks(this.posX, this.posY, this.posZ, this.motionX, this.motionY, this.motionZ, nbttagcompound); } super.handleHealthUpdate(par1); diff --git a/src/main/java/tconstruct/entity/projectile/ArrowEntity.java b/src/main/java/tconstruct/entity/projectile/ArrowEntity.java index 7ee0d6f4..c6e3a877 100644 --- a/src/main/java/tconstruct/entity/projectile/ArrowEntity.java +++ b/src/main/java/tconstruct/entity/projectile/ArrowEntity.java @@ -105,10 +105,10 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(this.motionY, (double) f) * 180.0D / Math.PI); } - Block i = this.worldObj.func_147439_a(this.field_145791_d, this.field_145792_e, this.field_145789_f); + Block i = this.worldObj.getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f); - i.func_149719_a(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); - AxisAlignedBB axisalignedbb = i.func_149668_a(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); + i.setBlockBoundsBasedOnState(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); + AxisAlignedBB axisalignedbb = i.getCollisionBoundingBoxFromPool(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); if (axisalignedbb != null && axisalignedbb.isVecInside(this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX, this.posY, this.posZ))) { @@ -124,7 +124,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa { if (!worldObj.isRemote) { - Block j = this.worldObj.func_147439_a(this.field_145791_d, this.field_145792_e, this.field_145789_f); + Block j = this.worldObj.getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f); int k = this.worldObj.getBlockMetadata(this.field_145791_d, this.field_145792_e, this.field_145789_f); if (j == this.field_145790_g && k == this.inData) @@ -297,7 +297,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa if (this.shootingEntity != null && movingobjectposition.entityHit != this.shootingEntity && movingobjectposition.entityHit instanceof EntityPlayer && this.shootingEntity instanceof EntityPlayerMP) { - ((EntityPlayerMP) this.shootingEntity).playerNetServerHandler.func_147359_a(new S2BPacketChangeGameState(6, 0)); + ((EntityPlayerMP) this.shootingEntity).playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(6, 0)); //TConstruct.packetPipeline.sendTo(new S2BPacketChangeGameState(6, 0), (EntityPlayerMP) this.shootingEntity); } } @@ -337,7 +337,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa this.field_145791_d = movingobjectposition.blockX; this.field_145792_e = movingobjectposition.blockY; this.field_145789_f = movingobjectposition.blockZ; - this.field_145790_g = this.worldObj.func_147439_a(this.field_145791_d, this.field_145792_e, this.field_145789_f); + this.field_145790_g = this.worldObj.getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f); this.inData = this.worldObj.getBlockMetadata(this.field_145791_d, this.field_145792_e, this.field_145789_f); this.motionX = (double) ((float) (movingobjectposition.hitVec.xCoord - this.posX)); this.motionY = (double) ((float) (movingobjectposition.hitVec.yCoord - this.posY)); @@ -353,7 +353,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa if (this.field_145790_g != Blocks.air) { - this.field_145790_g.func_149670_a(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f, this); + this.field_145790_g.onEntityCollidedWithBlock(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f, this); } } } @@ -439,7 +439,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa if (slotID >= 0) { living.setCurrentItemOrArmor(slotID, par1ItemStack); - living.func_96120_a(slotID, 2.0f); + living.setEquipmentDropChance(slotID, 2.0f); par1ItemStack.stackSize = 0; return true; } diff --git a/src/main/java/tconstruct/entity/projectile/DaggerEntity.java b/src/main/java/tconstruct/entity/projectile/DaggerEntity.java index e0ef6910..89af1f02 100644 --- a/src/main/java/tconstruct/entity/projectile/DaggerEntity.java +++ b/src/main/java/tconstruct/entity/projectile/DaggerEntity.java @@ -64,7 +64,7 @@ public class DaggerEntity extends RotatingBase xTile = movingobjectposition.blockX; yTile = movingobjectposition.blockY; zTile = movingobjectposition.blockZ; - inTile = worldObj.func_147439_a(xTile, yTile, zTile); + inTile = worldObj.getBlock(xTile, yTile, zTile); motionX = (float) (movingobjectposition.hitVec.xCoord - posX); motionY = (float) (movingobjectposition.hitVec.yCoord - posY); motionZ = (float) (movingobjectposition.hitVec.zCoord - posZ); diff --git a/src/main/java/tconstruct/entity/projectile/RotatingBase.java b/src/main/java/tconstruct/entity/projectile/RotatingBase.java index 384eb318..84bd8b3e 100644 --- a/src/main/java/tconstruct/entity/projectile/RotatingBase.java +++ b/src/main/java/tconstruct/entity/projectile/RotatingBase.java @@ -182,7 +182,7 @@ public class RotatingBase extends Entity implements IEntityAdditionalSpawnData } if (onGround) { - Block i = worldObj.func_147439_a(xTile, yTile, zTile); + Block i = worldObj.getBlock(xTile, yTile, zTile); if (i != inTile) { onGround = false; @@ -342,7 +342,7 @@ public class RotatingBase extends Entity implements IEntityAdditionalSpawnData tags.setShort("xTile", (short) xTile); tags.setShort("yTile", (short) yTile); tags.setShort("zTile", (short) zTile); - tags.setString("inTile", (String) inTile.func_149739_a()); + tags.setString("inTile", (String) inTile.getUnlocalizedName()); tags.setByte("shake", (byte) arrowShake); tags.setByte("onGround", (byte) (onGround ? 1 : 0)); tags.setBoolean("Retrieval", doNotRetrieve); diff --git a/src/main/java/tconstruct/inventory/CraftingStationContainer.java b/src/main/java/tconstruct/inventory/CraftingStationContainer.java index a0cb034a..b5560758 100644 --- a/src/main/java/tconstruct/inventory/CraftingStationContainer.java +++ b/src/main/java/tconstruct/inventory/CraftingStationContainer.java @@ -22,14 +22,14 @@ public class CraftingStationContainer extends Container public InventoryCrafting craftMatrix;// = new InventoryCrafting(this, 3, 3); public IInventory craftResult;// = new InventoryCraftResult(); private CraftingStationLogic logic; - private World field_145850_b; + private World worldObj; private int posX; private int posY; private int posZ; public CraftingStationContainer(InventoryPlayer inventorplayer, CraftingStationLogic logic, int x, int y, int z) { - this.field_145850_b = logic.getWorld(); + this.worldObj = logic.getWorld(); this.posX = x; this.posY = y; this.posZ = z; @@ -94,7 +94,7 @@ public class CraftingStationContainer extends Container if (tool != null) this.craftResult.setInventorySlotContents(0, tool); else - this.craftResult.setInventorySlotContents(0, CraftingManager.getInstance().findMatchingRecipe(this.craftMatrix, this.field_145850_b)); + this.craftResult.setInventorySlotContents(0, CraftingManager.getInstance().findMatchingRecipe(this.craftMatrix, this.worldObj)); } public ItemStack modifyTool () @@ -135,7 +135,7 @@ public class CraftingStationContainer extends Container { super.onContainerClosed(par1EntityPlayer); - if (!this.field_145850_b.isRemote) + if (!this.worldObj.isRemote) { for (int i = 0; i < 9; ++i) { diff --git a/src/main/java/tconstruct/inventory/FurnaceContainer.java b/src/main/java/tconstruct/inventory/FurnaceContainer.java index e384ca73..9099ae75 100644 --- a/src/main/java/tconstruct/inventory/FurnaceContainer.java +++ b/src/main/java/tconstruct/inventory/FurnaceContainer.java @@ -130,14 +130,14 @@ public class FurnaceContainer extends Container } else if (par2 != 1 && par2 != 0) { - if (FurnaceRecipes.smelting().func_151395_a(itemstack1) != null) + if (FurnaceRecipes.smelting().getSmeltingResult(itemstack1) != null) { if (!this.mergeItemStack(itemstack1, 0, 1, false)) { return null; } } - else if (TileEntityFurnace.func_145954_b(itemstack1)) + else if (TileEntityFurnace.isItemFuel(itemstack1)) { if (!this.mergeItemStack(itemstack1, 1, 2, false)) { diff --git a/src/main/java/tconstruct/inventory/SlotOpaqueBlocksOnly.java b/src/main/java/tconstruct/inventory/SlotOpaqueBlocksOnly.java index a7dc935e..09a9fc5c 100644 --- a/src/main/java/tconstruct/inventory/SlotOpaqueBlocksOnly.java +++ b/src/main/java/tconstruct/inventory/SlotOpaqueBlocksOnly.java @@ -23,7 +23,7 @@ public class SlotOpaqueBlocksOnly extends SlotBlocksOnly if (super.isItemValid(par1ItemStack)) { Block b = BlockUtils.getBlockFromItemStack(par1ItemStack); - return b.func_149662_c() && b.func_149686_d(); + return b.isOpaqueCube() && b.renderAsNormalBlock(); } return false; diff --git a/src/main/java/tconstruct/inventory/ToolForgeContainer.java b/src/main/java/tconstruct/inventory/ToolForgeContainer.java index 1dc69abd..3040801b 100644 --- a/src/main/java/tconstruct/inventory/ToolForgeContainer.java +++ b/src/main/java/tconstruct/inventory/ToolForgeContainer.java @@ -82,7 +82,7 @@ public class ToolForgeContainer extends ToolStationContainer int amount = logic.getStackInSlot(1).getItem() instanceof ToolCore ? stack.stackSize : 1; logic.decrStackSize(1, amount); if (!logic.getWorld().isRemote) - logic.getWorld().playAuxSFX(1021, (int) logic.field_145851_c, (int) logic.field_145848_d, (int) logic.field_145849_e, 0); + logic.getWorld().playAuxSFX(1021, (int) logic.xCoord, (int) logic.yCoord, (int) logic.zCoord, 0); } } } diff --git a/src/main/java/tconstruct/inventory/ToolStationContainer.java b/src/main/java/tconstruct/inventory/ToolStationContainer.java index 4b4c55c6..693b52dc 100644 --- a/src/main/java/tconstruct/inventory/ToolStationContainer.java +++ b/src/main/java/tconstruct/inventory/ToolStationContainer.java @@ -138,7 +138,7 @@ public class ToolStationContainer extends ActiveContainer int amount = logic.getStackInSlot(1).getItem() instanceof ToolCore ? stack.stackSize : 1; logic.decrStackSize(1, amount); - logic.func_145831_w().playSoundEffect(logic.field_145851_c, logic.field_145848_d, logic.field_145849_e, "tinker:little_saw", 1.0F, (random.nextFloat() - random.nextFloat()) * 0.2F + 1.0F); + logic.getWorldObj().playSoundEffect(logic.xCoord, logic.yCoord, logic.zCoord, "tinker:little_saw", 1.0F, (random.nextFloat() - random.nextFloat()) * 0.2F + 1.0F); } } diff --git a/src/main/java/tconstruct/items/FilledBucket.java b/src/main/java/tconstruct/items/FilledBucket.java index 9e7e4791..a405eeed 100644 --- a/src/main/java/tconstruct/items/FilledBucket.java +++ b/src/main/java/tconstruct/items/FilledBucket.java @@ -134,7 +134,7 @@ public class FilledBucket extends ItemBucket public boolean tryPlaceContainedLiquid (World world, int clickX, int clickY, int clickZ, int type) { - if (!WorldHelper.isAirBlock(world, clickX, clickY, clickZ) && world.func_147439_a(clickX, clickY, clickZ).func_149688_o().isSolid()) + if (!WorldHelper.isAirBlock(world, clickX, clickY, clickZ) && world.getBlock(clickX, clickY, clickZ).getMaterial().isSolid()) { return false; } @@ -145,7 +145,7 @@ public class FilledBucket extends ItemBucket if (TRepo.fluidBlocks[type] instanceof BlockFluidFinite) metadata = 7; - world.func_147465_d(clickX, clickY, clickZ, TRepo.fluidBlocks[type], metadata, 3); //TODO: Merge liquids + world.setBlock(clickX, clickY, clickZ, TRepo.fluidBlocks[type], metadata, 3); //TODO: Merge liquids } catch (ArrayIndexOutOfBoundsException ex) { TConstruct.logger.warn("AIOBE occured when placing bucket into world; " + ex); return false; @@ -156,7 +156,7 @@ public class FilledBucket extends ItemBucket } @Override - public void func_150895_a (Item b, CreativeTabs tab, List list) + public void getSubItems (Item b, CreativeTabs tab, List list) { for (int i = 0; i < icons.length; i++) list.add(new ItemStack(b, 1, i)); diff --git a/src/main/java/tconstruct/items/MetalPattern.java b/src/main/java/tconstruct/items/MetalPattern.java index f7299e3f..a2d01db0 100644 --- a/src/main/java/tconstruct/items/MetalPattern.java +++ b/src/main/java/tconstruct/items/MetalPattern.java @@ -29,7 +29,7 @@ public class MetalPattern extends Pattern private static final String[] patternName = new String[] { "ingot", "rod", "pickaxe", "shovel", "axe", "swordblade", "largeguard", "mediumguard", "crossbar", "binding", "frypan", "sign", "knifeblade", "chisel", "largerod", "toughbinding", "largeplate", "broadaxe", "scythe", "excavator", "largeblade", "hammerhead", "fullguard", "", "", "arrowhead", "gem" }; - public void func_150895_a(Item p_150895_1_, CreativeTabs p_150895_2_, List p_150895_3_) + public void getSubItems(Item p_150895_1_, CreativeTabs p_150895_2_, List p_150895_3_) { for (int i = 0; i < patternName.length; i++) if (!(patternName[i].equals(""))) diff --git a/src/main/java/tconstruct/items/TitleIcon.java b/src/main/java/tconstruct/items/TitleIcon.java index 4b9ae227..355be06a 100644 --- a/src/main/java/tconstruct/items/TitleIcon.java +++ b/src/main/java/tconstruct/items/TitleIcon.java @@ -85,7 +85,7 @@ public class TitleIcon extends Item } @Override - public String func_150896_i (ItemStack par1ItemStack) + public String getPotionEffect (ItemStack par1ItemStack) { String s = ("" + StatCollector.translateToLocal(this.getUnlocalizedName() + ".name")).trim(); String s1 = mobNames[par1ItemStack.getItemDamage()]; @@ -99,7 +99,7 @@ public class TitleIcon extends Item } @Override - public void func_150895_a (Item b, CreativeTabs tab, List list) + public void getSubItems (Item b, CreativeTabs tab, List list) { for (int i = 0; i < mobNames.length; i++) list.add(new ItemStack(b, 1, i)); @@ -120,13 +120,13 @@ public class TitleIcon extends Item { if (!world.isRemote) { - Block b = world.func_147439_a(posX, posY, posZ); + Block b = world.getBlock(posX, posY, posZ); posX += Facing.offsetsXForSide[par7]; posY += Facing.offsetsYForSide[par7]; posZ += Facing.offsetsZForSide[par7]; double d0 = 0.0D; - if (par7 == 1 && b != null && b.func_149645_b() == 11) + if (par7 == 1 && b != null && b.getRenderType() == 11) { d0 = 0.5D; } @@ -151,13 +151,13 @@ public class TitleIcon extends Item public static EntityLiving activateSpawnEgg (ItemStack stack, World world, double posX, double posY, double posZ, int par7) { - Block b = world.func_147439_a((int) posX, (int) posY, (int) posZ); + Block b = world.getBlock((int) posX, (int) posY, (int) posZ); posX += Facing.offsetsXForSide[par7]; posY += Facing.offsetsYForSide[par7]; posZ += Facing.offsetsZForSide[par7]; double d0 = 0.0D; - if (par7 == 1 && b != null && b.func_149645_b() == 11) + if (par7 == 1 && b != null && b.getRenderType() == 11) { d0 = 0.5D; } @@ -206,7 +206,7 @@ public class TitleIcon extends Item { entity.setPosition(x, y, z); entity.setSlimeSize(8); - entity.func_110161_a((IEntityLivingData) null); + entity.onSpawnWithEgg((IEntityLivingData) null); world.spawnEntityInWorld(entity); } } @@ -217,7 +217,7 @@ public class TitleIcon extends Item { entity.setPosition(x, y, z); entity.setSlimeSize(8); - entity.func_110161_a((IEntityLivingData) null); + entity.onSpawnWithEgg((IEntityLivingData) null); world.spawnEntityInWorld(entity); } } diff --git a/src/main/java/tconstruct/items/ToolPart.java b/src/main/java/tconstruct/items/ToolPart.java index 0f76b81f..6eae9864 100644 --- a/src/main/java/tconstruct/items/ToolPart.java +++ b/src/main/java/tconstruct/items/ToolPart.java @@ -25,7 +25,7 @@ public class ToolPart extends CraftingItem implements IToolPart } @Override - public String func_150896_i (ItemStack par1ItemStack) + public String getPotionEffect (ItemStack par1ItemStack) { String material = StatCollector.translateToLocal("parttype." + toolTextureNames[par1ItemStack.getItemDamage()]); String name = StatCollector.translateToLocal("toolpart." + partName); diff --git a/src/main/java/tconstruct/items/blocks/BarricadeItem.java b/src/main/java/tconstruct/items/blocks/BarricadeItem.java index 2d272ff9..78bca643 100644 --- a/src/main/java/tconstruct/items/blocks/BarricadeItem.java +++ b/src/main/java/tconstruct/items/blocks/BarricadeItem.java @@ -32,14 +32,14 @@ public class BarricadeItem extends ItemBlock public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { - Block b = world.func_147439_a(x, y, z); + Block b = world.getBlock(x, y, z); if (b == Blocks.snow && (world.getBlockMetadata(x, y, z) & 7) < 1) { side = 1; } else if (b != Blocks.vine && b != Blocks.tallgrass && b != Blocks.deadbush - && (b == null || !b.func_149742_c(world, x, y, z))) + && (b == null || !b.canPlaceBlockAt(world, x, y, z))) { if (side == 0) { @@ -80,22 +80,22 @@ public class BarricadeItem extends ItemBlock { return false; } - else if (y == 255 && this.b.func_149688_o().isSolid()) + else if (y == 255 && this.b.getMaterial().isSolid()) { return false; } - else if (world.func_147472_a(this.b, x, y, z, false, side, player, stack)) + else if (world.canPlaceEntityOnSide(this.b, x, y, z, false, side, player, stack)) { Block block = this.b; //int meta = this.getMetadata(stack.getItemDamage()); int rotation = MathHelper.floor_double((double) (player.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; int meta = rotation * 4; - int metadata = this.b.func_149660_a(world, x, y, z, side, hitX, hitY, hitZ, meta); + int metadata = this.b.onBlockPlaced(world, x, y, z, side, hitX, hitY, hitZ, meta); if (placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata)) { - world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), block.field_149762_H.field_150501_a, - (block.field_149762_H.func_150497_c() + 1.0F) / 2.0F, block.field_149762_H.func_150494_d() * 0.8F); + world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), block.stepSound.soundName, + (block.stepSound.getVolume() + 1.0F) / 2.0F, block.stepSound.getPitch() * 0.8F); --stack.stackSize; } diff --git a/src/main/java/tconstruct/items/blocks/ItemBlockLandmine.java b/src/main/java/tconstruct/items/blocks/ItemBlockLandmine.java index 0d44580d..1b1238a7 100644 --- a/src/main/java/tconstruct/items/blocks/ItemBlockLandmine.java +++ b/src/main/java/tconstruct/items/blocks/ItemBlockLandmine.java @@ -59,25 +59,25 @@ public class ItemBlockLandmine extends ItemBlock @Override public boolean placeBlockAt (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) { - if (!world.func_147465_d(x, y, z, TRepo.landmine, metadata, 3)) + if (!world.setBlock(x, y, z, TRepo.landmine, metadata, 3)) { return false; } - if (world.func_147439_a(x, y, z) == TRepo.landmine) + if (world.getBlock(x, y, z) == TRepo.landmine) { - TRepo.landmine.func_149689_a(world, x, y, z, player, stack); + TRepo.landmine.onBlockPlacedBy(world, x, y, z, player, stack); - TileEntityLandmine te = (TileEntityLandmine) world.func_147438_o(x, y, z); + TileEntityLandmine te = (TileEntityLandmine) world.getTileEntity(x, y, z); if (te == null) { te = (TileEntityLandmine) TRepo.landmine.createTileEntity(world, metadata); } te.triggerType = stack.getItemDamage(); - world.func_147455_a(x, y, z, te); + world.setTileEntity(x, y, z, te); - TRepo.landmine.func_149714_e(world, x, y, z, metadata); + TRepo.landmine.onPostBlockPlaced(world, x, y, z, metadata); } return true; diff --git a/src/main/java/tconstruct/items/blocks/OreberryBushItem.java b/src/main/java/tconstruct/items/blocks/OreberryBushItem.java index 7ae1f313..6ba275b3 100644 --- a/src/main/java/tconstruct/items/blocks/OreberryBushItem.java +++ b/src/main/java/tconstruct/items/blocks/OreberryBushItem.java @@ -42,15 +42,15 @@ public class OreberryBushItem extends MultiItemBlock else if (player.canPlayerEdit(x, y, z, side, stack) && player.canPlayerEdit(x, y + 1, z, side, stack)) { - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TRepo.oreBerry) && WorldHelper.isAirBlock(world, x, y + 1, z)) { - world.func_147465_d(x, y + 1, z, blockB, stack.getItemDamage() % 4, 3); + world.setBlock(x, y + 1, z, blockB, stack.getItemDamage() % 4, 3); if (!player.capabilities.isCreativeMode) stack.stackSize--; if (!world.isRemote) - world.playAuxSFX(2001, x, y, z, Block.func_149682_b(block)); + world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block)); return true; } else diff --git a/src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java b/src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java index 509e6a95..206a8a05 100644 --- a/src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java +++ b/src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java @@ -48,15 +48,15 @@ public class OreberryBushSecondItem extends MultiItemBlock else if (player.canPlayerEdit(x, y, z, side, stack) && player.canPlayerEdit(x, y + 1, z, side, stack)) { - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TRepo.oreBerrySecond) && WorldHelper.isAirBlock(world, x, y + 1, z)) { - world.func_147465_d(x, y + 1, z, blockB, stack.getItemDamage() % 4, 3); + world.setBlock(x, y + 1, z, blockB, stack.getItemDamage() % 4, 3); if (!player.capabilities.isCreativeMode) stack.stackSize--; if (!world.isRemote) - world.playAuxSFX(2001, x, y, z, Block.func_149682_b(block)); + world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block)); return true; } else diff --git a/src/main/java/tconstruct/items/blocks/SlimeTallGrassItem.java b/src/main/java/tconstruct/items/blocks/SlimeTallGrassItem.java index 807dca1f..45bf4074 100644 --- a/src/main/java/tconstruct/items/blocks/SlimeTallGrassItem.java +++ b/src/main/java/tconstruct/items/blocks/SlimeTallGrassItem.java @@ -24,7 +24,7 @@ public class SlimeTallGrassItem extends MultiItemBlock public IIcon getIconFromDamage (int meta) { int arr = MathHelper.clamp_int(meta, 0, this.blockType.length); - return TRepo.slimeTallGrass.func_149691_a(0, arr); + return TRepo.slimeTallGrass.getIcon(0, arr); } } diff --git a/src/main/java/tconstruct/items/blocks/WoolSlab1Item.java b/src/main/java/tconstruct/items/blocks/WoolSlab1Item.java index 79c23101..628163f4 100644 --- a/src/main/java/tconstruct/items/blocks/WoolSlab1Item.java +++ b/src/main/java/tconstruct/items/blocks/WoolSlab1Item.java @@ -24,17 +24,17 @@ public class WoolSlab1Item extends MultiItemBlock @Override public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { - Block b = world.func_147439_a(x, y, z); + Block b = world.getBlock(x, y, z); int meta = world.getBlockMetadata(x, y, z); int trueMeta = meta % 8; boolean flag = (b) != null; if ((side == 1 && flag || side == 0 && !flag) && b == this.block && trueMeta == stack.getItemDamage()) { - if (world.func_147465_d(x, y, z, Blocks.wool, trueMeta, 3)) + if (world.setBlock(x, y, z, Blocks.wool, trueMeta, 3)) { - world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.block.field_149762_H.field_150501_a, - (this.block.field_149762_H.func_150497_c() + 1.0F) / 2.0F, this.block.field_149762_H.func_150494_d() * 0.8F); + world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.block.stepSound.soundName, + (this.block.stepSound.getVolume() + 1.0F) / 2.0F, this.block.stepSound.getPitch() * 0.8F); --stack.stackSize; return true; } diff --git a/src/main/java/tconstruct/items/blocks/WoolSlab2Item.java b/src/main/java/tconstruct/items/blocks/WoolSlab2Item.java index 910d3cd4..de7513e6 100644 --- a/src/main/java/tconstruct/items/blocks/WoolSlab2Item.java +++ b/src/main/java/tconstruct/items/blocks/WoolSlab2Item.java @@ -24,17 +24,17 @@ public class WoolSlab2Item extends MultiItemBlock @Override public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); int meta = world.getBlockMetadata(x, y, z); int trueMeta = meta % 8; boolean flag = (block) != null; if ((side == 1 && flag || side == 0 && !flag) && block == this.block && trueMeta == stack.getItemDamage()) { - if (world.func_147465_d(x, y, z, Blocks.wool, trueMeta + 8, 3)) + if (world.setBlock(x, y, z, Blocks.wool, trueMeta + 8, 3)) { - world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.block.field_149762_H.field_150501_a, - (this.block.field_149762_H.func_150497_c() + 1.0F) / 2.0F, this.block.field_149762_H.func_150494_d() * 0.8F); + world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.block.stepSound.soundName, + (this.block.stepSound.getVolume() + 1.0F) / 2.0F, this.block.stepSound.getPitch() * 0.8F); --stack.stackSize; return true; } diff --git a/src/main/java/tconstruct/items/tools/Battleaxe.java b/src/main/java/tconstruct/items/tools/Battleaxe.java index 196b1c6a..28a3c885 100644 --- a/src/main/java/tconstruct/items/tools/Battleaxe.java +++ b/src/main/java/tconstruct/items/tools/Battleaxe.java @@ -45,15 +45,15 @@ public class Battleaxe extends HarvestTool } @Override - public boolean func_150894_a (ItemStack itemstack, World world, Block b, 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) { - if (b != null && b.func_149688_o() == Material.field_151584_j) + if (b != null && b.getMaterial() == Material.leaves) return false; return AbilityHelper.onBlockChanged(itemstack, world, b, x, y, z, player, random); } - static Material[] materials = { Material.field_151575_d, Material.field_151582_l, Material.field_151594_q, Material.field_151570_A, Material.field_151572_C }; + static Material[] materials = { Material.wood, Material.vine, Material.circuits, Material.cactus, Material.gourd }; @Override public Item getHeadItem () @@ -247,15 +247,15 @@ public class Battleaxe extends HarvestTool return false; World world = player.worldObj; - final Block wood = world.func_147439_a(x,y,z); + final Block wood = world.getBlock(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++) { - Block block = world.func_147439_a(x, yPos, z); - if (!(tags.getBoolean("Broken")) && block != null && block.func_149688_o() == Material.field_151575_d) + Block block = world.getBlock(x, yPos, z); + if (!(tags.getBoolean("Broken")) && block != null && block.getMaterial() == Material.wood) { - Block localblock = world.func_147439_a(x, yPos, z); + Block localblock = world.getBlock(x, yPos, z); int localMeta = world.getBlockMetadata(x, yPos, z); int hlvl = block.getHarvestLevel(meta); @@ -270,18 +270,18 @@ public class Battleaxe extends HarvestTool if (!cancelHarvest) { - if (block != null && block.func_149688_o() == Material.field_151575_d) + if (block != null && block.getMaterial() == Material.wood) { localMeta = world.getBlockMetadata(x, yPos, z); if (!player.capabilities.isCreativeMode) { if (block.removedByPlayer(world, player, x, yPos, z)) { - block.func_149664_b(world, x, yPos, z, localMeta); + block.onBlockDestroyedByPlayer(world, x, yPos, z, localMeta); } - block.func_149636_a(world, player, x, yPos, z, localMeta); - block.func_149681_a(world, x, yPos, z, localMeta, player); - func_150894_a(stack, world, block, x, yPos, z, player); + block.harvestBlock(world, player, x, yPos, z, localMeta); + block.onBlockHarvested(world, x, yPos, z, localMeta, player); + onBlockDestroyed(stack, world, block, x, yPos, z, player); } else { @@ -295,7 +295,7 @@ public class Battleaxe extends HarvestTool break; } if (!world.isRemote) - world.playAuxSFX(2001, x, y, z, Block.func_149682_b(wood) + (meta << 12)); + world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(wood) + (meta << 12)); return super.onBlockStartBreak(stack, x, y, z, player); } diff --git a/src/main/java/tconstruct/items/tools/BowBase.java b/src/main/java/tconstruct/items/tools/BowBase.java index b1e7bfb3..786d66e6 100644 --- a/src/main/java/tconstruct/items/tools/BowBase.java +++ b/src/main/java/tconstruct/items/tools/BowBase.java @@ -149,11 +149,11 @@ public abstract class BowBase extends ToolCore //if (tinkerArrow != null) if (slotID != -1 && (arrowID == -1 || slotID < arrowID)) { - player.inventory.func_146026_a(TRepo.arrow); + player.inventory.consumeInventoryItem(TRepo.arrow); } else { - player.inventory.func_146026_a(Items.arrow); + player.inventory.consumeInventoryItem(Items.arrow); } } diff --git a/src/main/java/tconstruct/items/tools/Chisel.java b/src/main/java/tconstruct/items/tools/Chisel.java index f3588498..71aa396a 100644 --- a/src/main/java/tconstruct/items/tools/Chisel.java +++ b/src/main/java/tconstruct/items/tools/Chisel.java @@ -96,13 +96,13 @@ public class Chisel extends ToolCore int x = movingobjectposition.blockX; int y = movingobjectposition.blockY; int z = movingobjectposition.blockZ; - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); int meta = world.getBlockMetadata(x, y, z); DetailInput details = TConstruct.chiselDetailing.getDetailing(block, meta); if (details != null) { - world.func_147465_d(x, y, z, BlockUtils.getBlockFromItemStack(details.output), details.outputMeta, 3); + world.setBlock(x, y, z, BlockUtils.getBlockFromItemStack(details.output), details.outputMeta, 3); if (!(entityplayer.capabilities.isCreativeMode)) { int reinforced = 0; @@ -116,7 +116,7 @@ public class Chisel extends ToolCore AbilityHelper.damageTool(itemstack, 1, null, false); } } - world.playAuxSFX(2001, x, y, z, Block.func_149682_b(block) + (meta << 12)); + world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12)); entityplayer.swingItem(); } } diff --git a/src/main/java/tconstruct/items/tools/Excavator.java b/src/main/java/tconstruct/items/tools/Excavator.java index 7314829a..e076a5fc 100644 --- a/src/main/java/tconstruct/items/tools/Excavator.java +++ b/src/main/java/tconstruct/items/tools/Excavator.java @@ -38,7 +38,7 @@ public class Excavator extends HarvestTool return "shovel"; } - static Material[] materials = { Material.field_151577_b, Material.field_151578_c, Material.field_151595_p, Material.field_151597_y, Material.field_151596_z, Material.field_151571_B }; + static Material[] materials = { Material.grass, Material.ground, Material.sand, Material.snow, Material.craftedSnow, Material.clay }; @Override public Item getHeadItem () @@ -142,19 +142,19 @@ public class Excavator extends HarvestTool World world = player.worldObj; final int meta = world.getBlockMetadata(x, y, z); - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (!stack.hasTagCompound()) return false; if (block == null) return super.onBlockStartBreak(stack, x, y, z, player); - float blockHardness = block.func_149712_f(world, x, y, z); + float blockHardness = block.getBlockHardness(world, x, y, z); boolean validStart = false; for (int iter = 0; iter < materials.length; iter++) { - if (materials[iter] == block.func_149688_o()) + if (materials[iter] == block.getMaterial()) { validStart = true; break; @@ -192,11 +192,11 @@ public class Excavator extends HarvestTool { if (!(tags.getBoolean("Broken"))) { - Block localblock = world.func_147439_a(xPos, yPos, zPos); + Block localblock = world.getBlock(xPos, yPos, zPos); block = localblock; int localMeta = world.getBlockMetadata(xPos, yPos, zPos); int hlvl = block.getHarvestLevel(meta); - float localHardness = block == null ? Float.MAX_VALUE : block.func_149712_f(world, xPos, yPos, zPos); + float localHardness = block == null ? Float.MAX_VALUE : block.getBlockHardness(world, xPos, yPos, zPos); if (hlvl <= tags.getInteger("HarvestLevel") && localHardness - 1.5 <= blockHardness) { @@ -213,18 +213,18 @@ public class Excavator extends HarvestTool { for (int iter = 0; iter < materials.length; iter++) { - if (materials[iter] == block.func_149688_o()) + if (materials[iter] == block.getMaterial()) { if (!player.capabilities.isCreativeMode) { if (block.removedByPlayer(world, player, xPos, yPos, zPos)) { - block.func_149664_b(world, xPos, yPos, zPos, localMeta); + block.onBlockDestroyedByPlayer(world, xPos, yPos, zPos, localMeta); } - block.func_149636_a(world, player, xPos, yPos, zPos, localMeta); - block.func_149681_a(world, xPos, yPos, zPos, localMeta, player); + block.harvestBlock(world, player, xPos, yPos, zPos, localMeta); + block.onBlockHarvested(world, xPos, yPos, zPos, localMeta, player); if (blockHardness > 0f) - func_150894_a(stack, world, localblock, xPos, yPos, zPos, player); + onBlockDestroyed(stack, world, localblock, xPos, yPos, zPos, player); } else { @@ -240,7 +240,7 @@ public class Excavator extends HarvestTool } } if (!world.isRemote) - world.playAuxSFX(2001, x, y, z, Block.func_149682_b(block) + (meta << 12)); + world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12)); return true; } @@ -257,7 +257,7 @@ public class Excavator extends HarvestTool Material[] materials = getEffectiveMaterials(); for (int i = 0; i < materials.length; i++) { - if (materials[i] == block.func_149688_o()) + if (materials[i] == block.getMaterial()) { float mineSpeed = tags.getInteger("MiningSpeed"); int heads = 1; diff --git a/src/main/java/tconstruct/items/tools/FryingPan.java b/src/main/java/tconstruct/items/tools/FryingPan.java index 8ea74735..c6bd6aed 100644 --- a/src/main/java/tconstruct/items/tools/FryingPan.java +++ b/src/main/java/tconstruct/items/tools/FryingPan.java @@ -86,7 +86,7 @@ public class FryingPan extends Weapon { return false; } - else if (!world.func_147439_a(x, y, z).func_149688_o().isSolid()) + else if (!world.getBlock(x, y, z).getMaterial().isSolid()) { return false; } @@ -121,17 +121,17 @@ public class FryingPan extends Weapon { return false; } - else if (!TRepo.heldItemBlock.func_149742_c(world, x, y, z)) + else if (!TRepo.heldItemBlock.canPlaceBlockAt(world, x, y, z)) { return false; } else { - world.func_147465_d(x, y, z, TRepo.heldItemBlock, 0, 3); - TRepo.heldItemBlock.func_149689_a(world, x, y, z, player, stack); + world.setBlock(x, y, z, TRepo.heldItemBlock, 0, 3); + TRepo.heldItemBlock.onBlockPlacedBy(world, x, y, z, player, stack); world.playSoundEffect(x, y, z, "tinker:frypan_hit", 1.0F, (random.nextFloat() - random.nextFloat()) * 0.2F + 0.65F); - EquipLogic logic = (EquipLogic) world.func_147438_o(x, y, z); + EquipLogic logic = (EquipLogic) world.getTileEntity(x, y, z); logic.setEquipmentItem(stack); --stack.stackSize; diff --git a/src/main/java/tconstruct/items/tools/Hammer.java b/src/main/java/tconstruct/items/tools/Hammer.java index 58abda47..82da22e6 100644 --- a/src/main/java/tconstruct/items/tools/Hammer.java +++ b/src/main/java/tconstruct/items/tools/Hammer.java @@ -68,7 +68,7 @@ public class Hammer extends HarvestTool return materials; } - static Material[] materials = new Material[] { Material.field_151576_e, Material.field_151573_f, Material.field_151588_w, Material.field_151592_s, Material.piston, Material. field_151574_g }; + static Material[] materials = new Material[] { Material.rock, Material.iron, Material.ice, Material.glass, Material.piston, Material. anvil }; @Override public Item getHeadItem () @@ -234,7 +234,7 @@ public class Hammer extends HarvestTool return false; World world = player.worldObj; - final Block block = world.func_147439_a(x, y, z); + final Block block = world.getBlock(x, y, z); final int meta = world.getBlockMetadata(x, y, z); if (!stack.hasTagCompound()) return false; @@ -242,12 +242,12 @@ public class Hammer extends HarvestTool if (block == null) return super.onBlockStartBreak(stack, x, y, z, player); - float blockHardness = block.func_149712_f(world, x, y, z); + float blockHardness = block.getBlockHardness(world, x, y, z); boolean validStart = false; for (int iter = 0; iter < materials.length; iter++) { - if (materials[iter] == block.func_149688_o()) + if (materials[iter] == block.getMaterial()) { validStart = true; break; @@ -290,10 +290,10 @@ public class Hammer extends HarvestTool { if (!(tags.getBoolean("Broken"))) { - Block localBlock = world.func_147439_a(xPos, yPos, zPos); + Block localBlock = world.getBlock(xPos, yPos, zPos); int localMeta = world.getBlockMetadata(xPos, yPos, zPos); int hlvl = block.getHarvestLevel(meta); - float localHardness = localBlock == null ? Float.MAX_VALUE : localBlock.func_149712_f(world, xPos, yPos, zPos); + float localHardness = localBlock == null ? Float.MAX_VALUE : localBlock.getBlockHardness(world, xPos, yPos, zPos); if (hlvl <= toolLevel && localHardness - 1.5 <= blockHardness) { @@ -310,18 +310,18 @@ public class Hammer extends HarvestTool { for (int iter = 0; iter < materials.length; iter++) { - if (materials[iter] == localBlock.func_149688_o() || localBlock == Blocks.monster_egg) + if (materials[iter] == localBlock.getMaterial() || localBlock == Blocks.monster_egg) { if (!player.capabilities.isCreativeMode) { if (localBlock.removedByPlayer(world, player, xPos, yPos, zPos)) { - localBlock.func_149664_b(world, xPos, yPos, zPos, localMeta); + localBlock.onBlockDestroyedByPlayer(world, xPos, yPos, zPos, localMeta); } - localBlock.func_149636_a(world, player, xPos, yPos, zPos, localMeta); - localBlock.func_149681_a(world, xPos, yPos, zPos, localMeta, player); + localBlock.harvestBlock(world, player, xPos, yPos, zPos, localMeta); + localBlock.onBlockHarvested(world, xPos, yPos, zPos, localMeta, player); if (blockHardness > 0f) - func_150894_a(stack, world, localBlock, xPos, yPos, zPos, player); + onBlockDestroyed(stack, world, localBlock, xPos, yPos, zPos, player); } else { @@ -337,7 +337,7 @@ public class Hammer extends HarvestTool } } if (!world.isRemote) - world.playAuxSFX(2001, x, y, z, Block.func_149682_b(block) + (meta << 12)); + world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12)); return true; } @@ -354,7 +354,7 @@ public class Hammer extends HarvestTool Material[] materials = getEffectiveMaterials(); for (int i = 0; i < materials.length; i++) { - if (materials[i] == block.func_149688_o()) + if (materials[i] == block.getMaterial()) { return getblockSpeed(tags, block, meta); } diff --git a/src/main/java/tconstruct/items/tools/Hatchet.java b/src/main/java/tconstruct/items/tools/Hatchet.java index 4a589fd8..3b83b53f 100644 --- a/src/main/java/tconstruct/items/tools/Hatchet.java +++ b/src/main/java/tconstruct/items/tools/Hatchet.java @@ -34,15 +34,15 @@ public class Hatchet extends HarvestTool } @Override - public boolean func_150894_a (ItemStack itemstack, World world, Block block, int x, int y, int z, EntityLivingBase player) + public boolean onBlockDestroyed (ItemStack itemstack, World world, Block block, int x, int y, int z, EntityLivingBase player) { - if (block != null && block.func_149688_o() == Material.field_151584_j) + if (block != null && block.getMaterial() == Material.leaves) return false; return AbilityHelper.onBlockChanged(itemstack, world, block, x, y, z, player, random); } - static Material[] materials = { Material.field_151575_d, Material.field_151584_j, Material.field_151582_l, Material.field_151594_q, Material.field_151570_A};//TODO find this//, Material.pumpkin }; + static Material[] materials = { Material.wood, Material.leaves, Material.vine, Material.circuits, Material.cactus};//TODO find this//, Material.pumpkin }; @Override public Item getHeadItem () diff --git a/src/main/java/tconstruct/items/tools/LumberAxe.java b/src/main/java/tconstruct/items/tools/LumberAxe.java index 222d8b7f..220f8489 100644 --- a/src/main/java/tconstruct/items/tools/LumberAxe.java +++ b/src/main/java/tconstruct/items/tools/LumberAxe.java @@ -55,15 +55,15 @@ public class LumberAxe extends HarvestTool } @Override - public boolean func_150894_a (ItemStack itemstack, World world, Block block, int x, int y, int z, EntityLivingBase player) + public boolean onBlockDestroyed (ItemStack itemstack, World world, Block block, int x, int y, int z, EntityLivingBase player) { - if (block != null && block.func_149688_o() == Material.field_151584_j) + if (block != null && block.getMaterial() == Material.leaves) return false; return AbilityHelper.onBlockChanged(itemstack, world, block, x, y, z, player, random); } - static Material[] materials = { Material.field_151575_d, Material.field_151582_l, Material.field_151594_q, Material.field_151570_A};//TODO find this//, Material.pumpkin }; + static Material[] materials = { Material.wood, Material.vine, Material.circuits, Material.cactus};//TODO find this//, Material.pumpkin }; /* Lumber axe specific */ @@ -95,7 +95,7 @@ public class LumberAxe extends HarvestTool Material[] materials = getEffectiveMaterials(); for (int i = 0; i < materials.length; i++) { - if (materials[i] == block.func_149688_o()) + if (materials[i] == block.getMaterial()) { float mineSpeed = tags.getInteger("MiningSpeed"); int heads = 1; @@ -139,19 +139,19 @@ public class LumberAxe extends HarvestTool return false; World world = player.worldObj; - final Block wood = world.func_147439_a(x, y, z);; + final Block wood = world.getBlock(x, y, z);; if (wood == null) { return super.onBlockStartBreak(stack, x, y, z, player); } - if (wood.isWood(world, x, y, z) || wood.func_149688_o() == Material.field_151583_m) + if (wood.isWood(world, x, y, z) || wood.getMaterial() == Material.sponge) { int height = y; boolean foundTop = false; do { height++; - Block block = world.func_147439_a(x, height, z); + Block block = world.getBlock(x, height, z); if (block != wood) { height--; @@ -168,7 +168,7 @@ public class LumberAxe extends HarvestTool { for (int zPos = z - 1; zPos <= z + 1; zPos++) { - Block leaves = world.func_147439_a(xPos, yPos, zPos); + Block leaves = world.getBlock(xPos, yPos, zPos); if (leaves != null && leaves.isLeaves(world, xPos, yPos, zPos)) numLeaves++; } @@ -184,15 +184,15 @@ public class LumberAxe extends HarvestTool destroyWood(world, x, y, z, stack, tags, player); if (!world.isRemote) - world.playAuxSFX(2001, x, y, z, Block.func_149682_b(wood) + (meta << 12)); + world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(wood) + (meta << 12)); } - else if (wood.func_149688_o() == Material.field_151575_d) + else if (wood.getMaterial() == Material.wood) { NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); int meta = world.getBlockMetadata(x, y, z); destroyWood(world, x, y, z, stack, tags, player); if (!world.isRemote) - world.playAuxSFX(2001, x, y, z, Block.func_149682_b(wood) + (meta << 12)); + world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(wood) + (meta << 12)); } return super.onBlockStartBreak(stack, x, y, z, player); } @@ -208,7 +208,7 @@ public class LumberAxe extends HarvestTool { if (!(tags.getBoolean("Broken"))) { - Block localblock = world.func_147439_a(xPos, yPos, zPos); + Block localblock = world.getBlock(xPos, yPos, zPos); if (bID == localblock) { block = localblock; @@ -242,11 +242,11 @@ public class LumberAxe extends HarvestTool { if (block.removedByPlayer(world, player, xPos, yPos, zPos)) { - block.func_149664_b(world, xPos, yPos, zPos, meta); + block.onBlockDestroyedByPlayer(world, xPos, yPos, zPos, meta); } - block.func_149636_a(world, player, xPos, yPos, zPos, meta); - block.func_149681_a(world, xPos, yPos, zPos, meta, player); - func_150894_a(stack, world, localblock, xPos, yPos, zPos, player); + block.harvestBlock(world, player, xPos, yPos, zPos, meta); + block.onBlockHarvested(world, xPos, yPos, zPos, meta, player); + onBlockDestroyed(stack, world, localblock, xPos, yPos, zPos, player); } else { @@ -286,11 +286,11 @@ public class LumberAxe extends HarvestTool { if (!(tags.getBoolean("Broken"))) { - Block block = world.func_147439_a(xPos, yPos, zPos); + Block block = world.getBlock(xPos, yPos, zPos); int meta = world.getBlockMetadata(xPos, yPos, zPos); int hlvl = block.getHarvestLevel(meta); - if (block != null && block.func_149688_o() == Material.field_151575_d) + if (block != null && block.getMaterial() == Material.wood) { if (hlvl <= tags.getInteger("HarvestLevel")) { @@ -307,8 +307,8 @@ public class LumberAxe extends HarvestTool if (!player.capabilities.isCreativeMode) { //TODO harvestBlock - block.func_149636_a(world, player, xPos, yPos, zPos, meta); - func_150894_a(stack, world, block, xPos, yPos, zPos, player); + block.harvestBlock(world, player, xPos, yPos, zPos, meta); + onBlockDestroyed(stack, world, block, xPos, yPos, zPos, player); } } } diff --git a/src/main/java/tconstruct/items/tools/Mattock.java b/src/main/java/tconstruct/items/tools/Mattock.java index f46c0a9a..80cf800e 100644 --- a/src/main/java/tconstruct/items/tools/Mattock.java +++ b/src/main/java/tconstruct/items/tools/Mattock.java @@ -47,8 +47,8 @@ public class Mattock extends DualHarvestTool return "shovel"; } - static Material[] axeMaterials = { Material.field_151575_d, Material.field_151570_A};//TODO find this//, Material.pumpkin, Material.field_151585_k, Material.field_151582_l }; - static Material[] shovelMaterials = { Material.field_151577_b, Material.field_151578_c, Material.field_151571_B }; + static Material[] axeMaterials = { Material.wood, Material.cactus};//TODO find this//, Material.pumpkin, Material.plants, Material.vine }; + static Material[] shovelMaterials = { Material.grass, Material.ground, Material.clay }; @Override public Item getHeadItem () diff --git a/src/main/java/tconstruct/items/tools/Pickaxe.java b/src/main/java/tconstruct/items/tools/Pickaxe.java index 62773c89..6064f0a2 100644 --- a/src/main/java/tconstruct/items/tools/Pickaxe.java +++ b/src/main/java/tconstruct/items/tools/Pickaxe.java @@ -25,7 +25,7 @@ public class Pickaxe extends HarvestTool return materials; } - static Material[] materials = new Material[] { Material.field_151576_e, Material.field_151573_f, Material.field_151588_w, Material.field_151592_s, Material.piston, Material.field_151574_g, Material.field_151594_q }; + static Material[] materials = new Material[] { Material.rock, Material.iron, Material.ice, Material.glass, Material.piston, Material.anvil, Material.circuits }; @Override public Item getHeadItem () diff --git a/src/main/java/tconstruct/items/tools/PotionLauncher.java b/src/main/java/tconstruct/items/tools/PotionLauncher.java index ff079fbf..78c7d4b1 100644 --- a/src/main/java/tconstruct/items/tools/PotionLauncher.java +++ b/src/main/java/tconstruct/items/tools/PotionLauncher.java @@ -111,7 +111,7 @@ public class PotionLauncher extends Item } @Override - public void func_150895_a (Item b, CreativeTabs tabs, List list) + public void getSubItems (Item b, CreativeTabs tabs, List list) { ItemStack stack = new ItemStack(b, 1, 0); NBTTagCompound compound = new NBTTagCompound(); diff --git a/src/main/java/tconstruct/items/tools/Scythe.java b/src/main/java/tconstruct/items/tools/Scythe.java index 46903987..f54ab0b0 100644 --- a/src/main/java/tconstruct/items/tools/Scythe.java +++ b/src/main/java/tconstruct/items/tools/Scythe.java @@ -40,7 +40,7 @@ public class Scythe extends Weapon return materials; } - static Material[] materials = new Material[] { Material.field_151569_G, Material.field_151570_A};//TODO find this//, Material.pumpkin, Material.field_151585_k, Material.field_151582_l, Material.field_151584_j }; + static Material[] materials = new Material[] { Material.web, Material.cactus};//TODO find this//, Material.pumpkin, Material.plants, Material.vine, Material.leaves }; @Override public Item getHeadItem () @@ -155,7 +155,7 @@ public class Scythe extends Weapon return false; World world = player.worldObj; - final Block blockB = world.func_147439_a(x, y, z); + final Block blockB = world.getBlock(x, y, z); final int meta = world.getBlockMetadata(x, y, z); if (!stack.hasTagCompound()) return false; @@ -177,21 +177,21 @@ public class Scythe extends Weapon if (!cancelHarvest) { - Block block = world.func_147439_a(xPos, yPos, zPos); - if (block != null)// && (block.func_149688_o() == Material.field_151584_j || block.isLeaves(world, xPos, yPos, zPos))) + Block block = world.getBlock(xPos, yPos, zPos); + if (block != null)// && (block.getMaterial() == Material.leaves || block.isLeaves(world, xPos, yPos, zPos))) { for (int iter = 0; iter < materials.length; iter++) { - if (materials[iter] == block.func_149688_o()) + if (materials[iter] == block.getMaterial()) { int localMeta = world.getBlockMetadata(xPos, yPos, zPos); WorldHelper.setBlockToAir(world, xPos, yPos, zPos); if (!player.capabilities.isCreativeMode) { - block.func_149664_b(world, x, y, z, meta); - block.func_149636_a(world, player, xPos, yPos, zPos, localMeta); - block.func_149681_a(world, x, y, z, localMeta, player); - func_150894_a(stack, world, blockB, xPos, yPos, zPos, player); + block.onBlockDestroyedByPlayer(world, x, y, z, meta); + block.harvestBlock(world, player, xPos, yPos, zPos, localMeta); + block.onBlockHarvested(world, x, y, z, localMeta, player); + onBlockDestroyed(stack, world, blockB, xPos, yPos, zPos, player); } } } @@ -202,7 +202,7 @@ public class Scythe extends Weapon } } if (!world.isRemote) - world.playAuxSFX(2001, x, y, z, Block.func_149682_b(blockB) + (meta << 12)); + world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(blockB) + (meta << 12)); return super.onBlockStartBreak(stack, x, y, z, player); } diff --git a/src/main/java/tconstruct/items/tools/Shovel.java b/src/main/java/tconstruct/items/tools/Shovel.java index 7d0efea8..a5dfb255 100644 --- a/src/main/java/tconstruct/items/tools/Shovel.java +++ b/src/main/java/tconstruct/items/tools/Shovel.java @@ -27,7 +27,7 @@ public class Shovel extends HarvestTool return "shovel"; } - static Material[] materials = { Material.field_151577_b, Material.field_151578_c, Material.field_151595_p, Material.field_151597_y, Material.field_151596_z, Material.field_151571_B }; + static Material[] materials = { Material.grass, Material.ground, Material.sand, Material.snow, Material.craftedSnow, Material.clay }; @Override public Item getHeadItem () diff --git a/src/main/java/tconstruct/library/armor/ArmorCore.java b/src/main/java/tconstruct/library/armor/ArmorCore.java index fcce7a94..eeb59fd0 100644 --- a/src/main/java/tconstruct/library/armor/ArmorCore.java +++ b/src/main/java/tconstruct/library/armor/ArmorCore.java @@ -36,7 +36,7 @@ public abstract class ArmorCore extends ItemArmor implements IEnergyContainerIte this.setUnlocalizedName(SET_NAME); this.armorPart = part; this.baseProtection = baseProtection; - BlockDispenser.field_149943_a.putObject(this, dispenserBehavior); + BlockDispenser.dispenseBehaviorRegistry.putObject(this, dispenserBehavior); } public String getArmorName () diff --git a/src/main/java/tconstruct/library/component/MultiFluidTank.java b/src/main/java/tconstruct/library/component/MultiFluidTank.java index 05438535..a2e9d7c4 100644 --- a/src/main/java/tconstruct/library/component/MultiFluidTank.java +++ b/src/main/java/tconstruct/library/component/MultiFluidTank.java @@ -180,12 +180,12 @@ public class MultiFluidTank extends LogicComponent implements IFluidTank @Override public void readNetworkNBT (NBTTagCompound tags) { - NBTTagList liquidTag = tags.func_150295_c("Liquids",9); + NBTTagList liquidTag = tags.getTagList("Liquids",9); fluidlist.clear(); for (int iter = 0; iter < liquidTag.tagCount(); iter++) { - NBTTagCompound nbt = (NBTTagCompound) liquidTag.func_150305_b(iter); + NBTTagCompound nbt = (NBTTagCompound) liquidTag.getCompoundTagAt(iter); FluidStack fluid = FluidStack.loadFluidStackFromNBT(nbt); if (fluid != null) fluidlist.add(fluid); diff --git a/src/main/java/tconstruct/library/component/TankLayerScan.java b/src/main/java/tconstruct/library/component/TankLayerScan.java index 39ad1cd9..da32e9df 100644 --- a/src/main/java/tconstruct/library/component/TankLayerScan.java +++ b/src/main/java/tconstruct/library/component/TankLayerScan.java @@ -43,7 +43,7 @@ public class TankLayerScan extends LogicComponent master = te; imaster = (IMasterLogic) te; scanBlocks = ids; - masterCoord = new CoordTuple(te.field_145851_c, te.field_145848_d, te.field_145849_e); + masterCoord = new CoordTuple(te.xCoord, te.yCoord, te.zCoord); validAirCoords.add(new int[] { 1, 0 }); validAirCoords.add(new int[] { -1, 0 }); validAirCoords.add(new int[] { 0, 1 }); @@ -68,12 +68,12 @@ public class TankLayerScan extends LogicComponent { case 2: // +z case 3: // -z - if (checkAir(master.field_145851_c, master.field_145848_d, master.field_145849_e - 1) && checkAir(master.field_145851_c, master.field_145848_d, master.field_145849_e + 1)) + if (checkAir(master.xCoord, master.yCoord, master.zCoord - 1) && checkAir(master.xCoord, master.yCoord, master.zCoord + 1)) validAir = true; break; case 4: // +x case 5: // -x - if (checkAir(master.field_145851_c - 1, master.field_145848_d, master.field_145849_e) && checkAir(master.field_145851_c + 1, master.field_145848_d, master.field_145849_e)) + if (checkAir(master.xCoord - 1, master.yCoord, master.zCoord) && checkAir(master.xCoord + 1, master.yCoord, master.zCoord)) validAir = true; break; } @@ -91,8 +91,8 @@ public class TankLayerScan extends LogicComponent if (dir == 5) zPos = 1; - returnStone = new CoordTuple(master.field_145851_c - xPos, master.field_145848_d, master.field_145849_e - zPos); - if (initialRecurseLayer(master.field_145851_c + xPos, master.field_145848_d, master.field_145849_e + zPos)) + returnStone = new CoordTuple(master.xCoord - xPos, master.yCoord, master.zCoord - zPos); + if (initialRecurseLayer(master.xCoord + xPos, master.yCoord, master.zCoord + zPos)) { xPos = 0; zPos = 0; @@ -117,7 +117,7 @@ public class TankLayerScan extends LogicComponent bricks = 0; //Does the actual adding of blocks in the ring - boolean sealed = floodTest(master.field_145851_c + xPos, master.field_145848_d, master.field_145849_e + zPos); + boolean sealed = floodTest(master.xCoord + xPos, master.yCoord, master.zCoord + zPos); if (!world.isRemote && debug) { TConstruct.logger.info("Air in ring: " + airBlocks); @@ -126,15 +126,15 @@ public class TankLayerScan extends LogicComponent if (sealed) { - blockCoords.add(new CoordTuple(master.field_145851_c, master.field_145848_d, master.field_145849_e)); //Don't forget me! + blockCoords.add(new CoordTuple(master.xCoord, master.yCoord, master.zCoord)); //Don't forget me! layerAirCoords = new HashSet(airCoords); layerBlockCoords = new HashSet(blockCoords); - int lowY = recurseStructureDown(master.field_145848_d - 1); + int lowY = recurseStructureDown(master.yCoord - 1); if (lowY != -1) { completeStructure = true; - structureTop = recurseStructureUp(master.field_145848_d + 1); + structureTop = recurseStructureUp(master.yCoord + 1); finalizeStructure(); if (!world.isRemote && debug) @@ -155,9 +155,9 @@ public class TankLayerScan extends LogicComponent for (CoordTuple coord : blockCoords) { - TileEntity servant = world.func_147438_o(coord.x, coord.y, coord.z); + TileEntity servant = world.getTileEntity(coord.x, coord.y, coord.z); if (servant instanceof IServantLogic) - ((IServantLogic) servant).verifyMaster(imaster, world, master.field_145851_c, master.field_145848_d, master.field_145849_e); + ((IServantLogic) servant).verifyMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); } } @@ -193,7 +193,7 @@ public class TankLayerScan extends LogicComponent protected boolean checkAir (int x, int y, int z) { - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block == null || block == Blocks.air)// || block == TContent.tankAir) return true; @@ -202,14 +202,14 @@ public class TankLayerScan extends LogicComponent protected boolean checkServant (int x, int y, int z) { - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block == null || block == Blocks.air || !isValidBlock(x, y, z)) return false; if (!block.hasTileEntity(world.getBlockMetadata(x, y, z))) return false; - TileEntity be = world.func_147438_o(x, y, z); + TileEntity be = world.getTileEntity(x, y, z); if (be instanceof IServantLogic) return ((IServantLogic) be).setPotentialMaster(this.imaster, this.world, x, y, z); @@ -247,7 +247,7 @@ public class TankLayerScan extends LogicComponent protected boolean isValidBlock (int x, int y, int z) { - Block block = world.func_147439_a(x, y, z); + Block block = world.getBlock(x, y, z); if (block != null) { for (int i = 0; i < scanBlocks.length; i++) @@ -417,11 +417,11 @@ public class TankLayerScan extends LogicComponent int height = -1; for (CoordTuple coord : blockCoords) { - TileEntity servant = world.func_147438_o(coord.x, coord.y, coord.z); + TileEntity servant = world.getTileEntity(coord.x, coord.y, coord.z); boolean canPass = false; if (servant instanceof IServantLogic) { - canPass = ((IServantLogic) servant).verifyMaster(imaster, world, master.field_145851_c, master.field_145848_d, master.field_145849_e); + canPass = ((IServantLogic) servant).verifyMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); if (canPass) continue; } @@ -435,7 +435,7 @@ public class TankLayerScan extends LogicComponent if (height != -1) { - if (height <= master.field_145848_d) + if (height <= master.yCoord) invalidateStructure(); else invalidateBlocksAbove(height); @@ -457,11 +457,11 @@ public class TankLayerScan extends LogicComponent completeStructure = false; for (CoordTuple coord : blockCoords) { - TileEntity servant = world.func_147438_o(coord.x, coord.y, coord.z); + TileEntity servant = world.getTileEntity(coord.x, coord.y, coord.z); if (servant instanceof IServantLogic) - ((IServantLogic) servant).invalidateMaster(imaster, world, master.field_145851_c, master.field_145848_d, master.field_145849_e); + ((IServantLogic) servant).invalidateMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); } - master.func_145831_w().func_147471_g(master.field_145851_c, master.field_145848_d, master.field_145849_e); + master.getWorldObj().markBlockForUpdate(master.xCoord, master.yCoord, master.zCoord); } protected void invalidateBlocksAbove (int height) @@ -471,9 +471,9 @@ public class TankLayerScan extends LogicComponent if (coord.y < height) continue; - TileEntity servant = world.func_147438_o(coord.x, coord.y, coord.z); + TileEntity servant = world.getTileEntity(coord.x, coord.y, coord.z); if (servant instanceof IServantLogic) - ((IServantLogic) servant).invalidateMaster(imaster, world, master.field_145851_c, master.field_145848_d, master.field_145849_e); + ((IServantLogic) servant).invalidateMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); } } @@ -484,10 +484,10 @@ public class TankLayerScan extends LogicComponent while (i.hasNext()) { CoordTuple coord = (CoordTuple) i.next(); - TileEntity te = world.func_147438_o(coord.x, coord.y, coord.z); + TileEntity te = world.getTileEntity(coord.x, coord.y, coord.z); if (te != null && te instanceof IServantLogic) { - ((IServantLogic) te).invalidateMaster(imaster, world, master.field_145851_c, master.field_145848_d, master.field_145849_e); + ((IServantLogic) te).invalidateMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord); } } } @@ -497,7 +497,7 @@ public class TankLayerScan extends LogicComponent public void readFromNBT (NBTTagCompound tags) { super.readFromNBT(tags); - NBTTagList layerAir = tags.func_150295_c("AirLayer",11); + NBTTagList layerAir = tags.getTagList("AirLayer",11); if (layerAir != null) { layerAirCoords.clear(); @@ -509,7 +509,7 @@ public class TankLayerScan extends LogicComponent } } - NBTTagList blocks = tags.func_150295_c("Blocks", 11); + NBTTagList blocks = tags.getTagList("Blocks", 11); if (blocks != null) { blockCoords.clear(); @@ -521,7 +521,7 @@ public class TankLayerScan extends LogicComponent } } - NBTTagList air = tags.func_150295_c("Air", 11); + NBTTagList air = tags.getTagList("Air", 11); if (air != null) { airCoords.clear(); diff --git a/src/main/java/tconstruct/library/tools/AbilityHelper.java b/src/main/java/tconstruct/library/tools/AbilityHelper.java index e68288ec..347323ec 100644 --- a/src/main/java/tconstruct/library/tools/AbilityHelper.java +++ b/src/main/java/tconstruct/library/tools/AbilityHelper.java @@ -496,8 +496,8 @@ public class AbilityHelper return true; } - Block b = world.func_147439_a(x, y, z); - Block babove = world.func_147439_a(x, y + 1, z); + Block b = world.getBlock(x, y, z); + Block babove = world.getBlock(x, y + 1, z); if ((side == 0 || babove != Blocks.air || b != Blocks.grass) && b != Blocks.dirt) { @@ -506,8 +506,8 @@ public class AbilityHelper else { Block block = Blocks.farmland; - world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), block.field_149762_H.field_150501_a, - (block.field_149762_H.func_150497_c() + 1.0F) / 2.0F, block.field_149762_H.func_150494_d() * 0.8F); + world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), block.stepSound.soundName, + (block.stepSound.getVolume() + 1.0F) / 2.0F, block.stepSound.getPitch() * 0.8F); if (world.isRemote) { @@ -515,7 +515,7 @@ public class AbilityHelper } else { - world.func_147449_b(x, y, z, block); + world.setBlock(x, y, z, block); onBlockChanged(stack, world, Blocks.air, x, y, z, player, random); return true; } @@ -605,7 +605,7 @@ public class AbilityHelper float f6 = random.nextFloat() * f3 + (1.0F - f3) * 0.5F; entityitem = new EntityItem(world, f + f4, f1 + f5, f2 + f6, itemstack); } - entityitem.field_145804_b = 10; + entityitem.delayBeforeCanPickup = 10; world.spawnEntityInWorld(entityitem); return entityitem; } diff --git a/src/main/java/tconstruct/library/tools/DualHarvestTool.java b/src/main/java/tconstruct/library/tools/DualHarvestTool.java index 5c6ea9f3..70904ef0 100644 --- a/src/main/java/tconstruct/library/tools/DualHarvestTool.java +++ b/src/main/java/tconstruct/library/tools/DualHarvestTool.java @@ -27,7 +27,7 @@ public abstract class DualHarvestTool extends HarvestTool NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); World world = player.worldObj; int meta = world.getBlockMetadata(x, y, z); - Block block = player.worldObj.func_147439_a(x, y, z); + Block block = player.worldObj.getBlock(x, y, z); if (block == null || block == Blocks.air) return false; int hlvl = block.getHarvestLevel(meta); @@ -47,10 +47,10 @@ public abstract class DualHarvestTool extends HarvestTool else { if (!player.capabilities.isCreativeMode) - func_150894_a(stack, world, block, x, y, z, player); + onBlockDestroyed(stack, world, block, x, y, z, player); WorldHelper.setBlockToAir(world, x, y, z); if (!world.isRemote) - world.playAuxSFX(2001, x, y, z, Block.func_149682_b(block) + (meta << 12)); + world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12)); return true; } } @@ -66,7 +66,7 @@ public abstract class DualHarvestTool extends HarvestTool Material[] materials = getEffectiveMaterials(); for (int i = 0; i < materials.length; i++) { - if (materials[i] == block.func_149688_o()) + if (materials[i] == block.getMaterial()) { float speed = tags.getInteger("MiningSpeed"); speed /= 100f; @@ -84,7 +84,7 @@ public abstract class DualHarvestTool extends HarvestTool materials = getEffectiveSecondaryMaterials(); for (int i = 0; i < materials.length; i++) { - if (materials[i] == block.func_149688_o()) + if (materials[i] == block.getMaterial()) { float speed = tags.getInteger("MiningSpeed2"); speed /= 100f; @@ -104,18 +104,18 @@ public abstract class DualHarvestTool extends HarvestTool public boolean canHarvestBlock (Block block) { - if (block.func_149688_o().isToolNotRequired()) + if (block.getMaterial().isToolNotRequired()) { return true; } for (Material m : getEffectiveMaterials()) { - if (m == block.func_149688_o()) + if (m == block.getMaterial()) return true; } for (Material m : getEffectiveSecondaryMaterials()) { - if (m == block.func_149688_o()) + if (m == block.getMaterial()) return true; } return false; diff --git a/src/main/java/tconstruct/library/tools/HarvestTool.java b/src/main/java/tconstruct/library/tools/HarvestTool.java index 3a0edf91..62ae7c08 100644 --- a/src/main/java/tconstruct/library/tools/HarvestTool.java +++ b/src/main/java/tconstruct/library/tools/HarvestTool.java @@ -29,7 +29,7 @@ public abstract class HarvestTool extends ToolCore NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); World world = player.worldObj; - Block block = player.worldObj.func_147439_a(x, y, z); + Block block = player.worldObj.getBlock(x, y, z); int meta = world.getBlockMetadata(x, y, z); //Block block = Block.blocksList[bID]; if (block == null || block == Blocks.air) @@ -50,9 +50,9 @@ public abstract class HarvestTool extends ToolCore { WorldHelper.setBlockToAir(world, x, y, z); if (!player.capabilities.isCreativeMode) - func_150894_a(stack, world, block, x, y, z, player); + onBlockDestroyed(stack, world, block, x, y, z, player); if (!world.isRemote) - world.playAuxSFX(2001, x, y, z, Block.func_149682_b(block) + (meta << 12)); + world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12)); return true; } } @@ -70,7 +70,7 @@ public abstract class HarvestTool extends ToolCore Material[] materials = getEffectiveMaterials(); for (int i = 0; i < materials.length; i++) { - if (materials[i] == block.func_149688_o()) + if (materials[i] == block.getMaterial()) { return calculateStrength(tags, block, meta); } @@ -118,13 +118,13 @@ public abstract class HarvestTool extends ToolCore public boolean canHarvestBlock (Block block) { - if (block.func_149688_o().isToolNotRequired()) + if (block.getMaterial().isToolNotRequired()) { return true; } for (Material m : getEffectiveMaterials()) { - if (m == block.func_149688_o()) + if (m == block.getMaterial()) return true; } return false; diff --git a/src/main/java/tconstruct/library/tools/ToolCore.java b/src/main/java/tconstruct/library/tools/ToolCore.java index 2ad7039a..1623ff57 100644 --- a/src/main/java/tconstruct/library/tools/ToolCore.java +++ b/src/main/java/tconstruct/library/tools/ToolCore.java @@ -613,9 +613,9 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IBa } @Override - public boolean func_150894_a (ItemStack itemstack, World world, Block block, int x, int y, int z, EntityLivingBase player) + public boolean onBlockDestroyed (ItemStack itemstack, World world, Block block, int x, int y, int z, EntityLivingBase player) { - if (block != null && (double) block.func_149712_f(world, x, y, z) != 0.0D) + if (block != null && (double) block.getBlockHardness(world, x, y, z) != 0.0D) { return AbilityHelper.onBlockChanged(itemstack, world, block, x, y, z, player, random); } diff --git a/src/main/java/tconstruct/library/tools/Weapon.java b/src/main/java/tconstruct/library/tools/Weapon.java index 48bb7049..ce1942ca 100644 --- a/src/main/java/tconstruct/library/tools/Weapon.java +++ b/src/main/java/tconstruct/library/tools/Weapon.java @@ -37,7 +37,7 @@ public abstract class Weapon extends ToolCore for (int i = 0; i < web.length; i++) { - if (web[i] == block.func_149688_o()) + if (web[i] == block.getMaterial()) { return effectiveSpeed(); } @@ -82,7 +82,7 @@ public abstract class Weapon extends ToolCore { for (int i = 0; i < web.length; i++) { - if (block.func_149688_o() == web[i]) + if (block.getMaterial() == web[i]) return true; } return super.canHarvestBlock(block, is); @@ -123,7 +123,7 @@ public abstract class Weapon extends ToolCore return new String[] { "weapon", "melee" }; } - public static Material[] web = new Material[] { Material.field_151569_G }; + public static Material[] web = new Material[] { Material.web }; public static Material[] none = new Material[0]; } diff --git a/src/main/java/tconstruct/modifiers/armor/AModDamageBoost.java b/src/main/java/tconstruct/modifiers/armor/AModDamageBoost.java index 60ad4e1c..15b5e823 100644 --- a/src/main/java/tconstruct/modifiers/armor/AModDamageBoost.java +++ b/src/main/java/tconstruct/modifiers/armor/AModDamageBoost.java @@ -52,10 +52,10 @@ public class AModDamageBoost extends ArmorModTypeFilter NBTTagList attributes; if (baseTag.hasKey("AttributeModifiers")) { - attributes = baseTag.func_150295_c("AttributeModifiers", 9); + attributes = baseTag.getTagList("AttributeModifiers", 9); for (int iter = 0; iter < attributes.tagCount(); iter++) { - NBTTagCompound tag = (NBTTagCompound) attributes.func_150305_b(iter); + NBTTagCompound tag = (NBTTagCompound) attributes.getCompoundTagAt(iter); if (tag.getString("AttributeName").equals("generic.attackDamage")) { attributes.removeTag(iter); diff --git a/src/main/java/tconstruct/modifiers/armor/AModHealthBoost.java b/src/main/java/tconstruct/modifiers/armor/AModHealthBoost.java index 9d0f235f..83112db2 100644 --- a/src/main/java/tconstruct/modifiers/armor/AModHealthBoost.java +++ b/src/main/java/tconstruct/modifiers/armor/AModHealthBoost.java @@ -49,10 +49,10 @@ public class AModHealthBoost extends ArmorModTypeFilter NBTTagList attributes; if (baseTag.hasKey("AttributeModifiers")) { - attributes = baseTag.func_150295_c("AttributeModifiers",9); + attributes = baseTag.getTagList("AttributeModifiers",9); for (int iter = 0; iter < attributes.tagCount(); iter++) { - NBTTagCompound tag = (NBTTagCompound) attributes.func_150305_b(iter); + NBTTagCompound tag = (NBTTagCompound) attributes.getCompoundTagAt(iter); if (tag.getString("AttributeName").equals("generic.maxHealth")) attributes.removeTag(iter); } diff --git a/src/main/java/tconstruct/modifiers/armor/AModKnockbackResistance.java b/src/main/java/tconstruct/modifiers/armor/AModKnockbackResistance.java index 7deab89f..37c40abc 100644 --- a/src/main/java/tconstruct/modifiers/armor/AModKnockbackResistance.java +++ b/src/main/java/tconstruct/modifiers/armor/AModKnockbackResistance.java @@ -49,10 +49,10 @@ public class AModKnockbackResistance extends ArmorModTypeFilter NBTTagList attributes; if (baseTag.hasKey("AttributeModifiers")) { - attributes = baseTag.func_150295_c("AttributeModifiers", 9); + attributes = baseTag.getTagList("AttributeModifiers", 9); for (int iter = 0; iter < attributes.tagCount(); iter++) { - NBTTagCompound tag = (NBTTagCompound) attributes.func_150305_b(iter); + NBTTagCompound tag = (NBTTagCompound) attributes.getCompoundTagAt(iter); if (tag.getString("AttributeName").equals("generic.knockbackResistance")) attributes.removeTag(iter); } diff --git a/src/main/java/tconstruct/modifiers/armor/AModMoveSpeed.java b/src/main/java/tconstruct/modifiers/armor/AModMoveSpeed.java index 7b7b70ee..5e398543 100644 --- a/src/main/java/tconstruct/modifiers/armor/AModMoveSpeed.java +++ b/src/main/java/tconstruct/modifiers/armor/AModMoveSpeed.java @@ -47,10 +47,10 @@ public class AModMoveSpeed extends ArmorModTypeFilter NBTTagList attributes; if (baseTag.hasKey("AttributeModifiers")) { - attributes = baseTag.func_150295_c("AttributeModifiers",9); + attributes = baseTag.getTagList("AttributeModifiers",9); for (int iter = 0; iter < attributes.tagCount(); iter++) { - NBTTagCompound tag = (NBTTagCompound) attributes.func_150305_b(iter); + NBTTagCompound tag = (NBTTagCompound) attributes.getCompoundTagAt(iter); if (tag.getString("AttributeName").equals(key)) attributes.removeTag(iter); } diff --git a/src/main/java/tconstruct/modifiers/tools/TActiveOmniMod.java b/src/main/java/tconstruct/modifiers/tools/TActiveOmniMod.java index 70a5182f..337e42bb 100644 --- a/src/main/java/tconstruct/modifiers/tools/TActiveOmniMod.java +++ b/src/main/java/tconstruct/modifiers/tools/TActiveOmniMod.java @@ -59,7 +59,7 @@ public class TActiveOmniMod extends ActiveToolMod NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); World world = entity.worldObj; - Block block = entity.worldObj.func_147439_a(x, y, z); + Block block = entity.worldObj.getBlock(x, y, z); int meta = world.getBlockMetadata(x, y, z); //TODO do we need the next to lines???????? if (block == null) @@ -67,15 +67,15 @@ public class TActiveOmniMod extends ActiveToolMod if (tags.getBoolean("Lava") && block.quantityDropped(meta, 0, random) != 0) { - ItemStack smeltStack = new ItemStack(block.func_149650_a(meta, random, 0), block.quantityDropped(meta, 0, random), block.func_149692_a(meta)); + ItemStack smeltStack = new ItemStack(block.getItemDropped(meta, random, 0), block.quantityDropped(meta, 0, random), block.damageDropped(meta)); if (smeltStack.getItem() == null) return false; - ItemStack result = FurnaceRecipes.smelting().func_151395_a(smeltStack); + ItemStack result = FurnaceRecipes.smelting().getSmeltingResult(smeltStack); if (result != null) { WorldHelper.setBlockToAir(world, x, y, z); if (entity instanceof EntityPlayer && !((EntityPlayer) entity).capabilities.isCreativeMode) - tool.func_150894_a(stack, world, block, x, y, z, entity); + tool.onBlockDestroyed(stack, world, block, x, y, z, entity); if (!world.isRemote) { ItemStack spawnme = result.copy(); @@ -89,9 +89,9 @@ public class TActiveOmniMod extends ActiveToolMod } EntityItem entityitem = new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, spawnme); - entityitem.field_145804_b = 10; + entityitem.delayBeforeCanPickup = 10; world.spawnEntityInWorld(entityitem); - world.playAuxSFX(2001, x, y, z, Block.func_149682_b(block) + (meta << 12)); + world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12)); int i = spawnme.stackSize; float f = FurnaceRecipes.smelting().func_151398_b(spawnme); diff --git a/src/main/java/tconstruct/util/MiningExplosion.java b/src/main/java/tconstruct/util/MiningExplosion.java index 55f7337e..067b4131 100644 --- a/src/main/java/tconstruct/util/MiningExplosion.java +++ b/src/main/java/tconstruct/util/MiningExplosion.java @@ -70,7 +70,7 @@ public class MiningExplosion extends Explosion int l = MathHelper.floor_double(d0); int i1 = MathHelper.floor_double(d1); int j1 = MathHelper.floor_double(d2); - Block k1 = this.world.func_147439_a(l, i1, j1); + Block k1 = this.world.getBlock(l, i1, j1); if (k1 != Blocks.air) { @@ -169,10 +169,10 @@ public class MiningExplosion extends Explosion while (iterator.hasNext()) { chunkposition = (ChunkPosition) iterator.next(); - i = chunkposition.field_151329_a; - j = chunkposition.field_151327_b; - k = chunkposition.field_151328_c; - l = this.world.func_147439_a(i, j, k); + i = chunkposition.chunkPosX; + j = chunkposition.chunkPosY; + k = chunkposition.chunkPosZ; + l = this.world.getBlock(i, j, k); if (par1) { @@ -199,9 +199,9 @@ public class MiningExplosion extends Explosion { Block block = l; - if (block.func_149659_a(this)) + if (block.canDropFromExplosion(this)) { - block.func_149690_a(this.world, i, j, k, this.world.getBlockMetadata(i, j, k), 1.0F, 0); + block.dropBlockAsItemWithChance(this.world, i, j, k, this.world.getBlockMetadata(i, j, k), 1.0F, 0); } block.onBlockExploded(this.world, i, j, k, this); @@ -216,15 +216,15 @@ public class MiningExplosion extends Explosion while (iterator.hasNext()) { chunkposition = (ChunkPosition) iterator.next(); - i = chunkposition.field_151329_a; - j = chunkposition.field_151327_b; - k = chunkposition.field_151328_c; - l = this.world.func_147439_a(i, j, k); - Block i1 = this.world.func_147439_a(i, j - 1, k); + i = chunkposition.chunkPosX; + j = chunkposition.chunkPosY; + k = chunkposition.chunkPosZ; + l = this.world.getBlock(i, j, k); + Block i1 = this.world.getBlock(i, j - 1, k); - if (l == Blocks.air && i1.func_149662_c() && this.random.nextInt(3) == 0) + if (l == Blocks.air && i1.isOpaqueCube() && this.random.nextInt(3) == 0) { - this.world.func_147449_b(i, j, k, Blocks.fire); + this.world.setBlock(i, j, k, Blocks.fire); } } } diff --git a/src/main/java/tconstruct/util/SmelteryDamageSource.java b/src/main/java/tconstruct/util/SmelteryDamageSource.java index f25c9b2f..4f720e30 100644 --- a/src/main/java/tconstruct/util/SmelteryDamageSource.java +++ b/src/main/java/tconstruct/util/SmelteryDamageSource.java @@ -35,6 +35,6 @@ public class SmelteryDamageSource extends DamageSource EntityLivingBase entityliving1 = par1EntityLiving.func_94060_bK(); String s = "death." + type + this.damageType; String s1 = s + ".player"; - return entityliving1 != null && StatCollector.func_94522_b(s1) ? new ChatComponentTranslation(s1, new Object[] {par1EntityLiving.func_145748_c_(), entityliving1.func_145748_c_()}): new ChatComponentTranslation(s, new Object[] {par1EntityLiving.func_145748_c_()}); + return entityliving1 != null && StatCollector.canTranslate(s1) ? new ChatComponentTranslation(s1, new Object[] {par1EntityLiving.func_145748_c_(), entityliving1.func_145748_c_()}): new ChatComponentTranslation(s, new Object[] {par1EntityLiving.func_145748_c_()}); } } diff --git a/src/main/java/tconstruct/util/TEventHandler.java b/src/main/java/tconstruct/util/TEventHandler.java index ffd51464..9b273d02 100644 --- a/src/main/java/tconstruct/util/TEventHandler.java +++ b/src/main/java/tconstruct/util/TEventHandler.java @@ -264,7 +264,7 @@ public class TEventHandler for (int i = 0; i < event.drops.size(); i++) { ItemStack is = event.drops.get(i).getEntityItem(); - if (FurnaceRecipes.smelting().func_151395_a(is) != null && FurnaceRecipes.smelting().func_151395_a(is).getItem() instanceof ItemFood) + if (FurnaceRecipes.smelting().getSmeltingResult(is) != null && FurnaceRecipes.smelting().getSmeltingResult(is).getItem() instanceof ItemFood) { NBTTagCompound stackCompound = is.getTagCompound(); if (stackCompound == null) @@ -282,7 +282,7 @@ public class TEventHandler { ItemStack dropStack = new ItemStack(TRepo.heartCanister, 1, 1); EntityItem entityitem = new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, dropStack); - entityitem.field_145804_b = 10; + entityitem.delayBeforeCanPickup = 10; event.drops.add(entityitem); } @@ -290,7 +290,7 @@ public class TEventHandler { ItemStack dropStack = new ItemStack(TRepo.heartCanister, 1, 1); EntityItem entityitem = new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, dropStack); - entityitem.field_145804_b = 10; + entityitem.delayBeforeCanPickup = 10; event.drops.add(entityitem); } @@ -477,7 +477,7 @@ public class TEventHandler void addDrops (LivingDropsEvent event, ItemStack dropStack) { EntityItem entityitem = new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, dropStack); - entityitem.field_145804_b = 10; + entityitem.delayBeforeCanPickup = 10; event.drops.add(entityitem); } @@ -563,7 +563,7 @@ public class TEventHandler return; } - Block bID = evt.world.func_147439_a(hitX, hitY, hitZ); + Block bID = evt.world.getBlock(hitX, hitY, hitZ); for (int id = 0; id < TRepo.fluidBlocks.length; id++) { if (bID == TRepo.fluidBlocks[id]) @@ -651,7 +651,7 @@ public class TEventHandler { if (event.action == Action.LEFT_CLICK_BLOCK) { - Block block = event.entity.worldObj.func_147439_a(event.x, event.y, event.z); + Block block = event.entity.worldObj.getBlock(event.x, event.y, event.z); if (block instanceof TankAirBlock) { event.setCanceled(true); diff --git a/src/main/java/tconstruct/util/landmine/Helper.java b/src/main/java/tconstruct/util/landmine/Helper.java index 5a0fdb4e..47b5eb1f 100644 --- a/src/main/java/tconstruct/util/landmine/Helper.java +++ b/src/main/java/tconstruct/util/landmine/Helper.java @@ -44,32 +44,32 @@ public class Helper tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderer.func_147806_b(block, 0, 0, 0, renderer.func_147787_a(block, 1, metadata)); + renderer.renderFaceYPos(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 1, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, -1.0F, 0.0F); - renderer.func_147768_a(block, 0, 0, 0, renderer.func_147787_a(block, 0, metadata)); + renderer.renderFaceYNeg(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 0, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderer.func_147764_f(block, 0, 0, 0, renderer.func_147787_a(block, 2, metadata)); + renderer.renderFaceXPos(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 2, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderer.func_147798_e(block, 0, 0, 0, renderer.func_147787_a(block, 3, metadata)); + renderer.renderFaceXNeg(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 3, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderer.func_147734_d(block, 0, 0, 0, renderer.func_147787_a(block, 4, metadata)); + renderer.renderFaceZPos(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 4, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1.0F); - renderer.func_147761_c(block, 0, 0, 0, renderer.func_147787_a(block, 5, metadata)); + renderer.renderFaceZNeg(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 5, metadata)); tessellator.draw(); } diff --git a/src/main/java/tconstruct/util/landmine/behavior/Behavior.java b/src/main/java/tconstruct/util/landmine/behavior/Behavior.java index 1002c3de..9095a777 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/Behavior.java +++ b/src/main/java/tconstruct/util/landmine/behavior/Behavior.java @@ -60,12 +60,12 @@ public abstract class Behavior addBehavior(new ItemStack(Items.shears), shear); //Make sure the part below this comment is executed last(to avoid conflicts) - Iterator i1 = Block.field_149771_c.iterator(); + Iterator i1 = Block.blockRegistry.iterator(); while(i1.hasNext()){ Object ob = i1.next(); if(ob != null && ob instanceof Block){ Block b = (Block) ob; - if(b.func_149688_o().isOpaque() && b.func_149686_d() && !b.func_149744_f() && !(b instanceof ITileEntityProvider) && !behaviorsListBlocks.containsKey(new ItemStack(b))){ + if(b.getMaterial().isOpaque() && b.renderAsNormalBlock() && !b.canProvidePower() && !(b instanceof ITileEntityProvider) && !behaviorsListBlocks.containsKey(new ItemStack(b))){ addBehavior(new ItemStack(b), blockThrow); } } diff --git a/src/main/java/tconstruct/util/landmine/behavior/BehaviorFirecharge.java b/src/main/java/tconstruct/util/landmine/behavior/BehaviorFirecharge.java index 2dc77190..debf4fa1 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/BehaviorFirecharge.java +++ b/src/main/java/tconstruct/util/landmine/behavior/BehaviorFirecharge.java @@ -43,10 +43,10 @@ public class BehaviorFirecharge extends Behavior { for (int j = par4 - 2; j <= (par4 + 2); j++) { - if ((par1World.func_147439_a(i, par3, j) == null || (par1World.func_147439_a(i, par3, j) != null && par1World.func_147439_a(i, par3, j).isReplaceable( - par1World, i, par3, j))) && ItemBlockLandmine.getRandom().nextInt(5) == 0 && Blocks.fire.func_149742_c(par1World, i, par3, j)) + if ((par1World.getBlock(i, par3, j) == null || (par1World.getBlock(i, par3, j) != null && par1World.getBlock(i, par3, j).isReplaceable( + par1World, i, par3, j))) && ItemBlockLandmine.getRandom().nextInt(5) == 0 && Blocks.fire.canPlaceBlockAt(par1World, i, par3, j)) { - par1World.func_147449_b(i, par3, j, Blocks.fire); + par1World.setBlock(i, par3, j, Blocks.fire); } } } diff --git a/src/main/java/tconstruct/util/landmine/behavior/BehaviorShears.java b/src/main/java/tconstruct/util/landmine/behavior/BehaviorShears.java index 53f82129..ef402864 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/BehaviorShears.java +++ b/src/main/java/tconstruct/util/landmine/behavior/BehaviorShears.java @@ -83,7 +83,7 @@ public class BehaviorShears extends Behavior double d1 = (double) (par1World.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; double d2 = (double) (par1World.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; EntityItem entityitem = new EntityItem(par1World, (double) par2 + d0, (double) par3 + d1, (double) par4 + d2, par5ItemStack); - entityitem.field_145804_b = 10; + entityitem.delayBeforeCanPickup = 10; par1World.spawnEntityInWorld(entityitem); } } diff --git a/src/main/java/tconstruct/util/landmine/behavior/stackCombo/SpecialStackHandler.java b/src/main/java/tconstruct/util/landmine/behavior/stackCombo/SpecialStackHandler.java index 74e48929..7679324a 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/stackCombo/SpecialStackHandler.java +++ b/src/main/java/tconstruct/util/landmine/behavior/stackCombo/SpecialStackHandler.java @@ -68,7 +68,7 @@ public abstract class SpecialStackHandler return; } - TileEntityLandmine tileEntity = (TileEntityLandmine) par1World.func_147438_o(x, y, z); + TileEntityLandmine tileEntity = (TileEntityLandmine) par1World.getTileEntity(x, y, z); while (item.stackSize > 0) { diff --git a/src/main/java/tconstruct/util/network/packet/PacketPipeline.java b/src/main/java/tconstruct/util/network/packet/PacketPipeline.java index 3eb27d4d..3a9bfa41 100644 --- a/src/main/java/tconstruct/util/network/packet/PacketPipeline.java +++ b/src/main/java/tconstruct/util/network/packet/PacketPipeline.java @@ -89,7 +89,7 @@ public class PacketPipeline extends MessageToMessageCodec randomness) + if (world.getBlock(xPos - 1, yPos + 1, zPos) == base && world.getBlock(xPos + 1, yPos + 1, zPos) == base && world.getBlock(xPos, yPos + 1, zPos - 1) == base + && world.getBlock(xPos - 1, yPos + 1, zPos + 1) == base && random.nextInt(100) > randomness) { ; } else { - world.func_147465_d(xPos, yPos, zPos, Blocks.air, 0, 0); + world.setBlock(xPos, yPos, zPos, Blocks.air, 0, 0); } } @@ -108,14 +108,14 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator int xPos = x + xChunk; int yPos = y + yCenter + initialHeight - height + 1; int zPos = z + zChunk; - if (world.func_147439_a(xPos - 1, yPos - 1, zPos) == base && world.func_147439_a(xPos + 1, yPos - 1, zPos) == base && world.func_147439_a(xPos, yPos - 1, zPos - 1) == base - && world.func_147439_a(xPos - 1, yPos - 1, zPos + 1) == base) + if (world.getBlock(xPos - 1, yPos - 1, zPos) == base && world.getBlock(xPos + 1, yPos - 1, zPos) == base && world.getBlock(xPos, yPos - 1, zPos - 1) == base + && world.getBlock(xPos - 1, yPos - 1, zPos + 1) == base) { ; } else { - world.func_147465_d(xPos, yPos, zPos, Blocks.air, 0, 0); + world.setBlock(xPos, yPos, zPos, Blocks.air, 0, 0); } } } @@ -131,11 +131,11 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator int xPos = x + xChunk; int yPos = y + yCenter + initialHeight - height; int zPos = z + zChunk; - if (world.func_147439_a(xPos, yPos, zPos) == base) + if (world.getBlock(xPos, yPos, zPos) == base) { - Block block = world.func_147439_a(xPos, yPos + 1, zPos); + Block block = world.getBlock(xPos, yPos + 1, zPos); if (block == null || block == Blocks.air) - world.func_147465_d(xPos, yPos, zPos, top, 0, 0); + world.setBlock(xPos, yPos, zPos, top, 0, 0); } } } @@ -226,14 +226,14 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator if (var33) { - Material var12 = world.func_147439_a(x + xPos, y + yPos, z + zPos).func_149688_o(); + Material var12 = world.getBlock(x + xPos, y + yPos, z + zPos).getMaterial(); if (yPos >= 4 && var12.isLiquid()) { return false; } - if (yPos < 4 && !var12.isSolid() && world.func_147439_a(x + xPos, y + yPos, z + zPos) != this.liquidBlock) + if (yPos < 4 && !var12.isSolid() && world.getBlock(x + xPos, y + yPos, z + zPos) != this.liquidBlock) { return false; } @@ -250,7 +250,7 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator { if (validLocations[(xPos * 16 + zPos) * 8 + yPos]) { - world.func_147449_b(x + xPos, y + yPos, z + zPos, yPos >= 4 ? Blocks.air : this.liquidBlock); + world.setBlock(x + xPos, y + yPos, z + zPos, yPos >= 4 ? Blocks.air : this.liquidBlock); } } } @@ -262,17 +262,17 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator { for (yPos = 4; yPos < 8; ++yPos) { - if (validLocations[(xPos * 16 + zPos) * 8 + yPos] && world.func_147439_a(x + xPos, y + yPos - 1, z + zPos) == base + if (validLocations[(xPos * 16 + zPos) * 8 + yPos] && world.getBlock(x + xPos, y + yPos - 1, z + zPos) == base && world.getSavedLightValue(EnumSkyBlock.Sky, x + xPos, y + yPos, z + zPos) > 0) { - world.func_147465_d(x + xPos, y + yPos - 1, z + zPos, top, 0, 0); + world.setBlock(x + xPos, y + yPos - 1, z + zPos, top, 0, 0); } } } } //Generate blocks around - if (this.liquidBlock.func_149688_o() == Material.field_151586_h) + if (this.liquidBlock.getMaterial() == Material.water) { for (xPos = 0; xPos < 16; ++xPos) { @@ -285,10 +285,10 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator && validLocations[(xPos * 16 + zPos + 1) * 8 + yPos] || zPos > 0 && validLocations[(xPos * 16 + (zPos - 1)) * 8 + yPos] || yPos < 7 && validLocations[(xPos * 16 + zPos) * 8 + yPos + 1] || yPos > 0 && validLocations[(xPos * 16 + zPos) * 8 + (yPos - 1)]); - if (var33 && (yPos < 4 || rand.nextInt(2) != 0) && world.func_147439_a(x + xPos, y + yPos, z + zPos).func_149688_o().isSolid() - && world.func_147439_a(x + xPos, y + yPos + 1, z + zPos).func_149688_o() != Material.field_151586_h) + if (var33 && (yPos < 4 || rand.nextInt(2) != 0) && world.getBlock(x + xPos, y + yPos, z + zPos).getMaterial().isSolid() + && world.getBlock(x + xPos, y + yPos + 1, z + zPos).getMaterial() != Material.water) { - world.func_147465_d(x + xPos, y + yPos, z + zPos, TRepo.slimeGel, gelMeta, 2); + world.setBlock(x + xPos, y + yPos, z + zPos, TRepo.slimeGel, gelMeta, 2); } } } diff --git a/src/main/java/tconstruct/worldgen/SlimeTreeGen.java b/src/main/java/tconstruct/worldgen/SlimeTreeGen.java index c7cc2415..cdd8c112 100644 --- a/src/main/java/tconstruct/worldgen/SlimeTreeGen.java +++ b/src/main/java/tconstruct/worldgen/SlimeTreeGen.java @@ -42,7 +42,7 @@ public class SlimeTreeGen extends WorldGenerator if (yPos >= 1 && yPos + height + 1 <= 256) { - Block soil = world.func_147439_a(xPos, yPos - 1, zPos); + Block soil = world.getBlock(xPos, yPos - 1, zPos); boolean isSoil = (soil != null && soil.canSustainPlant(world, xPos, yPos - 1, zPos, ForgeDirection.UP, TRepo.slimeSapling)); if (isSoil) @@ -74,7 +74,7 @@ public class SlimeTreeGen extends WorldGenerator { for (int zPos = range; zPos <= range; zPos++) { - Block block = world.func_147439_a(x + xPos, y + yPos, z + zPos); + Block block = world.getBlock(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 @@ public class SlimeTreeGen extends WorldGenerator int height = y; do { - Block heightBL = world.func_147439_a(x, height, z); - if ((heightBL == TRepo.craftedSoil || heightBL == TRepo.slimeGrass) && !world.func_147439_a(x, height + 1, z).func_149662_c()) + Block heightBL = world.getBlock(x, height, z); + if ((heightBL == TRepo.craftedSoil || heightBL == TRepo.slimeGrass) && !world.getBlock(x, height + 1, z).isOpaqueCube()) { ret = height + 1; break; @@ -154,7 +154,7 @@ public class SlimeTreeGen extends WorldGenerator { for (int localHeight = 0; localHeight < height; ++localHeight) { - Block block = world.func_147439_a(xPos, yPos + localHeight, zPos); + Block block = world.getBlock(xPos, yPos + localHeight, zPos); if (block == null || block == Blocks.air || block.isLeaves(world, xPos, yPos + localHeight, zPos)) @@ -166,16 +166,16 @@ public class SlimeTreeGen extends WorldGenerator protected void setBlockAndMetadata (World world, int x, int y, int z, Block block, int blockMeta) { - Block blockWorld = world.func_147439_a(x, y, z); - if (blockWorld == null || blockWorld == Blocks.air || blockWorld.func_149742_c(world, x, y, z)) + Block blockWorld = world.getBlock(x, y, z); + if (blockWorld == null || blockWorld == Blocks.air || blockWorld.canPlaceBlockAt(world, x, y, z)) { if (this.notify) { - world.func_147465_d(x, y, z, block, blockMeta, 3); + world.setBlock(x, y, z, block, blockMeta, 3); } else { - world.func_147465_d(x, y, z, block, blockMeta, 2); + world.setBlock(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 379ed8d7..f21208b7 100644 --- a/src/main/java/tconstruct/worldgen/SurfaceOreGen.java +++ b/src/main/java/tconstruct/worldgen/SurfaceOreGen.java @@ -37,8 +37,8 @@ public class SurfaceOreGen extends WorldGenerator int findGround (World world, int x, int y, int z) { int returnHeight = -1; - Block block = world.func_147439_a(x, y - 1, z); - if (!world.func_147439_a(x, y, z).func_149662_c() && (block == Blocks.dirt || block == Blocks.grass)) + Block block = world.getBlock(x, y - 1, z); + if (!world.getBlock(x, y, z).isOpaqueCube() && (block == Blocks.dirt || block == Blocks.grass)) { return y; } @@ -49,10 +49,10 @@ public class SurfaceOreGen extends WorldGenerator { break; } - Block b = world.func_147439_a(x, height, z); + Block b = world.getBlock(x, height, z); if (b == Blocks.dirt || b == Blocks.grass) { - if (!world.func_147439_a(x, height + 1, z).func_149662_c()) + if (!world.getBlock(x, height + 1, z).isOpaqueCube()) { returnHeight = height + 1; } @@ -114,18 +114,18 @@ public class SurfaceOreGen extends WorldGenerator { double d14 = ((double) i3 + 0.5D - d8) / (d10 / 2.0D); - Block block = world.func_147439_a(k2, l2, i3); + Block block = world.getBlock(k2, l2, i3); if (d12 * d12 + d13 * d13 + d14 * d14 < 1.0D) { - if (block == null || !world.func_147439_a(k2, l2, i3).func_149662_c()) - world.func_147465_d(k2, l2, i3, this.minableBlock, minableBlockMeta, 2); + if (block == null || !world.getBlock(k2, l2, i3).isOpaqueCube()) + world.setBlock(k2, l2, i3, this.minableBlock, minableBlockMeta, 2); else { for (int iter = 0; iter < replaceBlocks.length; iter++) { - if (world.func_147439_a(k2, l2, i3).isReplaceableOreGen(world, k2, l2, i3, replaceBlocks[iter])) + if (world.getBlock(k2, l2, i3).isReplaceableOreGen(world, k2, l2, i3, replaceBlocks[iter])) { - world.func_147465_d(k2, l2, i3, this.minableBlock, minableBlockMeta, 2); + world.setBlock(k2, l2, i3, this.minableBlock, minableBlockMeta, 2); break; } } diff --git a/src/main/java/tconstruct/worldgen/TBaseWorldGenerator.java b/src/main/java/tconstruct/worldgen/TBaseWorldGenerator.java index efa77b51..ec00616f 100644 --- a/src/main/java/tconstruct/worldgen/TBaseWorldGenerator.java +++ b/src/main/java/tconstruct/worldgen/TBaseWorldGenerator.java @@ -243,7 +243,7 @@ public class TBaseWorldGenerator implements IWorldGenerator int height = y; do { - if (world.func_147439_a(x, height, z) == Blocks.air && world.func_147439_a(x, height + 1, z) != Blocks.air) + if (world.getBlock(x, height, z) == Blocks.air && world.getBlock(x, height + 1, z) != Blocks.air) return height + 1; height++; } while (height < heightLimit); @@ -251,7 +251,7 @@ public class TBaseWorldGenerator implements IWorldGenerator height = y; do { - if (world.func_147439_a(x, height, z) == Blocks.air && world.func_147439_a(x, height - 1, z) != Blocks.air) + if (world.getBlock(x, height, z) == Blocks.air && world.getBlock(x, height - 1, z) != Blocks.air) return height - 1; height--; } while (height > depthLimit); @@ -263,7 +263,7 @@ public class TBaseWorldGenerator implements IWorldGenerator { /*for (int x = 0; x < 16; x++) for (int z = 0; z < 16; z++) - world.func_147465_d(x+chunkX, 192, z+chunkZ, Block.glowStone);*/ + world.setBlock(x+chunkX, 192, z+chunkZ, Block.glowStone);*/ for (int x = 0; x < 16; x++) { @@ -271,19 +271,19 @@ public class TBaseWorldGenerator implements IWorldGenerator { for (int y = 0; y < 128; y++) { - Block block = world.func_147439_a(x + chunkX, y, z + chunkZ); + Block block = world.getBlock(x + chunkX, y, z + chunkZ); if (block != null) { - if (block.func_149688_o() == Material.field_151584_j) - world.func_147465_d(x + chunkX, y, z + chunkZ, Blocks.lava, 0, 0); - if (block.func_149688_o() == Material.field_151575_d) - world.func_147465_d(x + chunkX, y, z + chunkZ, Blocks.netherrack, 0, 0); + if (block.getMaterial() == Material.leaves) + world.setBlock(x + chunkX, y, z + chunkZ, Blocks.lava, 0, 0); + if (block.getMaterial() == Material.wood) + world.setBlock(x + chunkX, y, z + chunkZ, Blocks.netherrack, 0, 0); if (block == Blocks.stone) - world.func_147465_d(x + chunkX, y, z + chunkZ, Blocks.end_stone, 0, 0); - if (y > 40 && (block.func_149688_o() == Material.field_151578_c || block.func_149688_o() == Material.field_151577_b)) - world.func_147465_d(x + chunkX, y, z + chunkZ, Blocks.soul_sand, 0, 0); - if (block.func_149688_o() == Material.field_151595_p) - world.func_147465_d(x + chunkX, y, z + chunkZ, Blocks.monster_egg, 0, 0); + world.setBlock(x + chunkX, y, z + chunkZ, Blocks.end_stone, 0, 0); + if (y > 40 && (block.getMaterial() == Material.ground || block.getMaterial() == Material.grass)) + world.setBlock(x + chunkX, y, z + chunkZ, Blocks.soul_sand, 0, 0); + if (block.getMaterial() == Material.sand) + world.setBlock(x + chunkX, y, z + chunkZ, Blocks.monster_egg, 0, 0); } } } @@ -300,7 +300,7 @@ public class TBaseWorldGenerator implements IWorldGenerator { for (int y = 0; y < 256; y++) { - world.func_147465_d(x + chunkX, y, z + chunkZ, Blocks.bedrock, 0, 0); + world.setBlock(x + chunkX, y, z + chunkZ, Blocks.bedrock, 0, 0); } } } diff --git a/src/main/java/tconstruct/worldgen/village/ComponentSmeltery.java b/src/main/java/tconstruct/worldgen/village/ComponentSmeltery.java index 9d51f146..39052d12 100644 --- a/src/main/java/tconstruct/worldgen/village/ComponentSmeltery.java +++ b/src/main/java/tconstruct/worldgen/village/ComponentSmeltery.java @@ -61,18 +61,18 @@ public class ComponentSmeltery extends StructureVillagePieces.House1 * maxZ, int placeBlockId, int replaceBlockId, boolean alwaysreplace) */ - this.func_151549_a(world, sbb, 1, 0, 0, 7, 0, 6, Blocks.stonebrick, Blocks.stonebrick, false); //Base - this.func_151549_a(world, sbb, 0, 0, 1, 0, 0, 5, Blocks.stonebrick, Blocks.stonebrick, false); - this.func_151549_a(world, sbb, 8, 0, 1, 8, 0, 5, Blocks.stonebrick, Blocks.stonebrick, false); - this.func_151549_a(world, sbb, 0, 1, 0, 9, 3, 7, Blocks.air, Blocks.air, false); + this.fillWithBlocks(world, sbb, 1, 0, 0, 7, 0, 6, Blocks.stonebrick, Blocks.stonebrick, false); //Base + this.fillWithBlocks(world, sbb, 0, 0, 1, 0, 0, 5, Blocks.stonebrick, Blocks.stonebrick, false); + this.fillWithBlocks(world, sbb, 8, 0, 1, 8, 0, 5, Blocks.stonebrick, Blocks.stonebrick, false); + this.fillWithBlocks(world, sbb, 0, 1, 0, 9, 3, 7, Blocks.air, Blocks.air, false); this.fillWithMetaBlocks(world, sbb, 2, 0, 1, 6, 2, 5, TRepo.smeltery, 2, TRepo.smeltery, 2, false); //Basin - this.func_151549_a(world, sbb, 3, 1, 2, 5, 2, 4, Blocks.air, Blocks.air, false); + this.fillWithBlocks(world, sbb, 3, 1, 2, 5, 2, 4, Blocks.air, Blocks.air, false); - this.func_151550_a(world, TRepo.searedBlock, 0, 1, 1, 2, sbb); - this.func_151550_a(world, TRepo.searedBlock, 2, 1, 1, 4, sbb); - this.func_151550_a(world, TRepo.searedBlock, 0, 7, 1, 2, sbb); - this.func_151550_a(world, TRepo.searedBlock, 2, 7, 1, 4, sbb); + this.placeBlockAtCurrentPosition(world, TRepo.searedBlock, 0, 1, 1, 2, sbb); + this.placeBlockAtCurrentPosition(world, TRepo.searedBlock, 2, 1, 1, 4, sbb); + this.placeBlockAtCurrentPosition(world, TRepo.searedBlock, 0, 7, 1, 2, sbb); + this.placeBlockAtCurrentPosition(world, TRepo.searedBlock, 2, 7, 1, 4, sbb); for (int l = 1; l < 6; ++l) { @@ -120,7 +120,7 @@ public class ComponentSmeltery extends StructureVillagePieces.House1 int j2 = this.func_151557_c(placeBlockID, placeBlockMeta); Block k2 = this.func_151558_b(replaceBlockID, replaceBlockMeta); int l2 = this.func_151557_c(replaceBlockID, replaceBlockMeta); - super.func_151556_a(par1World, par2StructureBoundingBox, minX, minY, minZ, maxX, maxY, maxZ, i2, j2, k2, l2, alwaysReplace); + super.fillWithMetadataBlocks(par1World, par2StructureBoundingBox, minX, minY, minZ, maxX, maxY, maxZ, i2, j2, k2, l2, alwaysReplace); } @Override diff --git a/src/main/java/tconstruct/worldgen/village/ComponentToolWorkshop.java b/src/main/java/tconstruct/worldgen/village/ComponentToolWorkshop.java index f053f589..f1f643e4 100644 --- a/src/main/java/tconstruct/worldgen/village/ComponentToolWorkshop.java +++ b/src/main/java/tconstruct/worldgen/village/ComponentToolWorkshop.java @@ -63,81 +63,81 @@ public class ComponentToolWorkshop extends StructureVillagePieces.House1 * maxZ, int placeBlockId, int replaceBlockId, boolean alwaysreplace) */ - this.func_151549_a(world, sbb, 0, 0, 0, 6, 0, 6, Blocks.cobblestone, Blocks.cobblestone, false); //Base - this.func_151549_a(world, sbb, 0, 5, 0, 6, 5, 6, Blocks.fence, Blocks.fence, false); - this.func_151549_a(world, sbb, 1, 0, 1, 5, 0, 5, Blocks.planks, Blocks.planks, false); - this.func_151549_a(world, sbb, 2, 0, 2, 4, 0, 4, Blocks.wool, Blocks.wool, false); + this.fillWithBlocks(world, sbb, 0, 0, 0, 6, 0, 6, Blocks.cobblestone, Blocks.cobblestone, false); //Base + this.fillWithBlocks(world, sbb, 0, 5, 0, 6, 5, 6, Blocks.fence, Blocks.fence, false); + this.fillWithBlocks(world, sbb, 1, 0, 1, 5, 0, 5, Blocks.planks, Blocks.planks, false); + this.fillWithBlocks(world, sbb, 2, 0, 2, 4, 0, 4, Blocks.wool, Blocks.wool, false); - //this.func_151549_a(world, sbb, 0, 5, 0, 6, 5, 6, Blocks.log, Blocks.log, false); + //this.fillWithBlocks(world, sbb, 0, 5, 0, 6, 5, 6, Blocks.log, Blocks.log, false); - this.func_151549_a(world, sbb, 0, 1, 0, 0, 4, 0, Blocks.log, Blocks.log, false); //Edges - this.func_151549_a(world, sbb, 0, 1, 6, 0, 4, 6, Blocks.log, Blocks.log, false); - this.func_151549_a(world, sbb, 6, 1, 0, 6, 4, 0, Blocks.log, Blocks.log, false); - this.func_151549_a(world, sbb, 6, 1, 6, 6, 4, 6, Blocks.log, Blocks.log, false); + this.fillWithBlocks(world, sbb, 0, 1, 0, 0, 4, 0, Blocks.log, Blocks.log, false); //Edges + this.fillWithBlocks(world, sbb, 0, 1, 6, 0, 4, 6, Blocks.log, Blocks.log, false); + this.fillWithBlocks(world, sbb, 6, 1, 0, 6, 4, 0, Blocks.log, Blocks.log, false); + this.fillWithBlocks(world, sbb, 6, 1, 6, 6, 4, 6, Blocks.log, Blocks.log, false); - this.func_151549_a(world, sbb, 0, 1, 1, 0, 1, 5, Blocks.planks, Blocks.planks, false); //Walls - this.func_151549_a(world, sbb, 1, 1, 0, 5, 1, 0, Blocks.planks, Blocks.planks, false); - this.func_151549_a(world, sbb, 6, 1, 1, 6, 1, 5, Blocks.planks, Blocks.planks, false); - this.func_151549_a(world, sbb, 1, 1, 6, 5, 1, 6, Blocks.planks, Blocks.planks, false); + this.fillWithBlocks(world, sbb, 0, 1, 1, 0, 1, 5, Blocks.planks, Blocks.planks, false); //Walls + this.fillWithBlocks(world, sbb, 1, 1, 0, 5, 1, 0, Blocks.planks, Blocks.planks, false); + this.fillWithBlocks(world, sbb, 6, 1, 1, 6, 1, 5, Blocks.planks, Blocks.planks, false); + this.fillWithBlocks(world, sbb, 1, 1, 6, 5, 1, 6, Blocks.planks, Blocks.planks, false); - this.func_151549_a(world, sbb, 0, 3, 1, 0, 3, 5, Blocks.planks, Blocks.planks, false); - this.func_151549_a(world, sbb, 1, 3, 0, 5, 3, 0, Blocks.planks, Blocks.planks, false); - this.func_151549_a(world, sbb, 6, 3, 1, 6, 3, 5, Blocks.planks, Blocks.planks, false); - this.func_151549_a(world, sbb, 1, 3, 6, 5, 3, 6, Blocks.planks, Blocks.planks, false); + this.fillWithBlocks(world, sbb, 0, 3, 1, 0, 3, 5, Blocks.planks, Blocks.planks, false); + this.fillWithBlocks(world, sbb, 1, 3, 0, 5, 3, 0, Blocks.planks, Blocks.planks, false); + this.fillWithBlocks(world, sbb, 6, 3, 1, 6, 3, 5, Blocks.planks, Blocks.planks, false); + this.fillWithBlocks(world, sbb, 1, 3, 6, 5, 3, 6, Blocks.planks, Blocks.planks, false); - this.func_151549_a(world, sbb, 0, 4, 1, 0, 4, 5, Blocks.log, Blocks.log, false); - this.func_151549_a(world, sbb, 1, 4, 0, 5, 4, 0, Blocks.log, Blocks.log, false); - this.func_151549_a(world, sbb, 6, 4, 1, 6, 4, 5, Blocks.log, Blocks.log, false); - this.func_151549_a(world, sbb, 1, 4, 6, 5, 4, 6, Blocks.log, Blocks.log, false); + this.fillWithBlocks(world, sbb, 0, 4, 1, 0, 4, 5, Blocks.log, Blocks.log, false); + this.fillWithBlocks(world, sbb, 1, 4, 0, 5, 4, 0, Blocks.log, Blocks.log, false); + this.fillWithBlocks(world, sbb, 6, 4, 1, 6, 4, 5, Blocks.log, Blocks.log, false); + this.fillWithBlocks(world, sbb, 1, 4, 6, 5, 4, 6, Blocks.log, Blocks.log, false); - this.func_151549_a(world, sbb, 1, 1, 1, 5, 5, 5, Blocks.air, Blocks.air, false); - this.func_151549_a(world, sbb, 1, 4, 1, 5, 4, 5, Blocks.planks, Blocks.planks, false); + this.fillWithBlocks(world, sbb, 1, 1, 1, 5, 5, 5, Blocks.air, Blocks.air, false); + this.fillWithBlocks(world, sbb, 1, 4, 1, 5, 4, 5, Blocks.planks, Blocks.planks, false); //world, blockID, metadata, x, y, z, bounds - this.func_151550_a(world, Blocks.glass_pane, 0, 1, 2, 0, sbb);//Glass and door - this.func_151550_a(world, Blocks.planks, 0, 2, 2, 0, sbb); - this.placeDoorAtCurrentPosition(world, sbb, random, 3, 1, 0, this.func_151555_a(Blocks.wooden_door, 1)); - this.func_151550_a(world, Blocks.planks, 0, 4, 2, 0, sbb); - this.func_151550_a(world, Blocks.glass_pane, 0, 5, 2, 0, sbb); + this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 1, 2, 0, sbb);//Glass and door + this.placeBlockAtCurrentPosition(world, Blocks.planks, 0, 2, 2, 0, sbb); + this.placeDoorAtCurrentPosition(world, sbb, random, 3, 1, 0, this.getMetadataWithOffset(Blocks.wooden_door, 1)); + this.placeBlockAtCurrentPosition(world, Blocks.planks, 0, 4, 2, 0, sbb); + this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 5, 2, 0, sbb); - this.func_151550_a(world, Blocks.glass_pane, 0, 1, 2, 6, sbb); - this.func_151550_a(world, Blocks.glass_pane, 0, 2, 2, 6, sbb); - this.func_151550_a(world, Blocks.planks, 0, 3, 2, 6, sbb); - this.func_151550_a(world, Blocks.glass_pane, 0, 4, 2, 6, sbb); - this.func_151550_a(world, Blocks.glass_pane, 0, 5, 2, 6, sbb); + this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 1, 2, 6, sbb); + this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 2, 2, 6, sbb); + this.placeBlockAtCurrentPosition(world, Blocks.planks, 0, 3, 2, 6, sbb); + this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 4, 2, 6, sbb); + this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 5, 2, 6, sbb); - this.func_151550_a(world, Blocks.glass_pane, 0, 0, 2, 1, sbb); - this.func_151550_a(world, Blocks.glass_pane, 0, 0, 2, 2, sbb); - this.func_151550_a(world, Blocks.planks, 0, 0, 2, 3, sbb); - this.func_151550_a(world, Blocks.glass_pane, 0, 0, 2, 4, sbb); - this.func_151550_a(world, Blocks.glass_pane, 0, 0, 2, 5, sbb); + this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 0, 2, 1, sbb); + this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 0, 2, 2, sbb); + this.placeBlockAtCurrentPosition(world, Blocks.planks, 0, 0, 2, 3, sbb); + this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 0, 2, 4, sbb); + this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 0, 2, 5, sbb); - this.func_151550_a(world, Blocks.glass_pane, 0, 6, 2, 1, sbb); - this.func_151550_a(world, Blocks.glass_pane, 0, 6, 2, 2, sbb); - this.func_151550_a(world, Blocks.planks, 0, 6, 2, 3, sbb); - this.func_151550_a(world, Blocks.glass_pane, 0, 6, 2, 4, sbb); - this.func_151550_a(world, Blocks.glass_pane, 0, 6, 2, 5, sbb); + this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 6, 2, 1, sbb); + this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 6, 2, 2, sbb); + this.placeBlockAtCurrentPosition(world, Blocks.planks, 0, 6, 2, 3, sbb); + this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 6, 2, 4, sbb); + this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 6, 2, 5, sbb); - int i = this.func_151555_a(Blocks.ladder, 3); //Ladders - this.func_151550_a(world, Blocks.ladder, i, 3, 1, 5, sbb); - this.func_151550_a(world, Blocks.ladder, i, 3, 2, 5, sbb); - this.func_151550_a(world, Blocks.ladder, i, 3, 3, 5, sbb); - this.func_151550_a(world, Blocks.ladder, i, 3, 4, 5, sbb); + int i = this.getMetadataWithOffset(Blocks.ladder, 3); //Ladders + this.placeBlockAtCurrentPosition(world, Blocks.ladder, i, 3, 1, 5, sbb); + this.placeBlockAtCurrentPosition(world, Blocks.ladder, i, 3, 2, 5, sbb); + this.placeBlockAtCurrentPosition(world, Blocks.ladder, i, 3, 3, 5, sbb); + this.placeBlockAtCurrentPosition(world, Blocks.ladder, i, 3, 4, 5, sbb); - this.func_151550_a(world, TRepo.toolStationWood, 0, 1, 1, 1, sbb); //Inside + this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood, 0, 1, 1, 1, sbb); //Inside this.generateStructurePatternChestContents(world, sbb, random, 1, 1, 2, TRepo.tinkerHousePatterns.getItems(random), TRepo.tinkerHousePatterns.getCount(random)); - //this.func_151550_a(world, TRepo.toolStationWood, 5, 1, 1, 2, sbb); - this.func_151550_a(world, TRepo.toolStationWood, 1, 1, 1, 3, sbb); + //this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood, 5, 1, 1, 2, sbb); + this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood, 1, 1, 1, 3, sbb); this.generateStructureCraftingStationContents(world, sbb, random, 1, 1, 4, TRepo.tinkerHouseChest.getItems(random), TRepo.tinkerHouseChest.getCount(random)); - // this.func_151550_a(world, TRepo.craftingStationWood, 0, 1, 1, 4, sbb); - this.func_151550_a(world, TRepo.toolStationWood, 10, 1, 1, 5, sbb); + // this.placeBlockAtCurrentPosition(world, TRepo.craftingStationWood, 0, 1, 1, 4, sbb); + this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood, 10, 1, 1, 5, sbb); //ChestGenHooks info = ChestGenHooks.getInfo("TinkerHouse"); this.generateStructureChestContents(world, sbb, random, 4, 1, 5, TRepo.tinkerHouseChest.getItems(random), TRepo.tinkerHouseChest.getCount(random)); - //this.func_151550_a(world, Block.chest, i, 4, 1, 5, sbb); - i = this.func_151555_a(Blocks.piston, 3); - this.func_151550_a(world, Blocks.piston, i, 5, 1, 5, sbb); + //this.placeBlockAtCurrentPosition(world, Block.chest, i, 4, 1, 5, sbb); + i = this.getMetadataWithOffset(Blocks.piston, 3); + this.placeBlockAtCurrentPosition(world, Blocks.piston, i, 5, 1, 5, sbb); for (int l = 0; l < 6; ++l) { @@ -159,10 +159,10 @@ public class ComponentToolWorkshop extends StructureVillagePieces.House1 int posY = this.getYWithOffset(y); int posZ = this.getZWithOffset(x, z); - if (par2StructureBoundingBox.isVecInside(posX, posY, posZ) && world.func_147439_a(posX, posY, posZ) != Blocks.chest) + if (par2StructureBoundingBox.isVecInside(posX, posY, posZ) && world.getBlock(posX, posY, posZ) != Blocks.chest) { - world.func_147465_d(posX, posY, posZ, TRepo.craftingStationWood, 5, 2); - CraftingStationLogic logic = (CraftingStationLogic) world.func_147438_o(posX, posY, posZ); + world.setBlock(posX, posY, posZ, TRepo.craftingStationWood, 5, 2); + CraftingStationLogic logic = (CraftingStationLogic) world.getTileEntity(posX, posY, posZ); if (logic != null) { @@ -183,10 +183,10 @@ public class ComponentToolWorkshop extends StructureVillagePieces.House1 int posY = this.getYWithOffset(y); int posZ = this.getZWithOffset(x, z); - if (par2StructureBoundingBox.isVecInside(posX, posY, posZ) && world.func_147439_a(posX, posY, posZ) != Blocks.chest) + if (par2StructureBoundingBox.isVecInside(posX, posY, posZ) && world.getBlock(posX, posY, posZ) != Blocks.chest) { - world.func_147465_d(posX, posY, posZ, TRepo.toolStationWood, 5, 2); - PatternChestLogic logic = (PatternChestLogic) world.func_147438_o(posX, posY, posZ); + world.setBlock(posX, posY, posZ, TRepo.toolStationWood, 5, 2); + PatternChestLogic logic = (PatternChestLogic) world.getTileEntity(posX, posY, posZ); if (logic != null) {