diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java index 99f72ef1..03de0238 100644 --- a/src/main/java/tconstruct/TConstruct.java +++ b/src/main/java/tconstruct/TConstruct.java @@ -109,7 +109,7 @@ public class TConstruct PHConstruct.initProps(event.getSuggestedConfigurationFile()); TConstructRegistry.materialTab = new TabTools("TConstructMaterials"); TConstructRegistry.toolTab = new TabTools("TConstructTools"); - TConstructRegistry.partTab = new TabTools("TConstructParts"); + TConstructRegistry.partTab = new TabTools("TConstructParts"); TConstructRegistry.blockTab = new TabTools("TConstructBlocks"); tableCasting = new LiquidCasting(); diff --git a/src/main/java/tconstruct/blocks/GravelOre.java b/src/main/java/tconstruct/blocks/GravelOre.java index a96587d4..07f2b80e 100644 --- a/src/main/java/tconstruct/blocks/GravelOre.java +++ b/src/main/java/tconstruct/blocks/GravelOre.java @@ -3,6 +3,8 @@ package tconstruct.blocks; import java.util.List; import java.util.Random; +import tconstruct.common.TRepo; +import tconstruct.library.TConstructRegistry; import net.minecraft.block.BlockSand; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -11,10 +13,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import tconstruct.common.TRepo; -import tconstruct.library.TConstructRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class GravelOre extends BlockSand { @@ -24,12 +22,11 @@ public class GravelOre extends BlockSand public GravelOre() { //super(Material.craftedSnow); - this.blockMaterial = Material.craftedSnow; + //this.blockMaterial = Material.craftedSnow; this.setCreativeTab(TConstructRegistry.blockTab); this.setStepSound(soundTypeGravel); } - @Override public void registerBlockIcons (IIconRegister iconRegister) { this.icons = new IIcon[textureNames.length]; @@ -41,13 +38,11 @@ public class GravelOre extends BlockSand } @Override - @SideOnly(Side.CLIENT) public IIcon getIcon (int side, int meta) { return icons[meta]; } - @Override public float getBlockHardness (World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); @@ -65,8 +60,7 @@ public class GravelOre extends BlockSand return meta; } - @Override - public Item getItemDropped (int p_149650_1_, Random p_149650_2_, int p_149650_3_) + public Item getItemDropped (int par1, Random par2Random, int par3) { /*if (par1 == 1) return Item.goldNugget.itemID;*/ diff --git a/src/main/java/tconstruct/blocks/LiquidMetalFinite.java b/src/main/java/tconstruct/blocks/LiquidMetalFinite.java index 41279fa4..ce503afc 100644 --- a/src/main/java/tconstruct/blocks/LiquidMetalFinite.java +++ b/src/main/java/tconstruct/blocks/LiquidMetalFinite.java @@ -1,5 +1,7 @@ package tconstruct.blocks; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -40,6 +42,7 @@ public class LiquidMetalFinite extends BlockFluidFinite } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon (int side, int meta) { if (side == 0 || side == 1) diff --git a/src/main/java/tconstruct/blocks/SearedSlab.java b/src/main/java/tconstruct/blocks/SearedSlab.java index df62f89f..828d232c 100644 --- a/src/main/java/tconstruct/blocks/SearedSlab.java +++ b/src/main/java/tconstruct/blocks/SearedSlab.java @@ -2,14 +2,14 @@ package tconstruct.blocks; import java.util.List; +import tconstruct.common.TRepo; +import tconstruct.library.TConstructRegistry; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import tconstruct.common.TRepo; -import tconstruct.library.TConstructRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -17,7 +17,6 @@ public class SearedSlab extends SlabBase { public SearedSlab() { - // TODO material.rock super(Material.rock); this.setCreativeTab(TConstructRegistry.blockTab); setHardness(12F); @@ -43,11 +42,11 @@ public class SearedSlab extends SlabBase } @Override - public void getSubBlocks (Item b, CreativeTabs tab, List list) + public void getSubBlocks (Item id, CreativeTabs tab, List list) { for (int iter = 0; iter < 8; iter++) { - list.add(new ItemStack(b, 1, iter)); + list.add(new ItemStack(id, 1, iter)); } } -} +} \ No newline at end of file diff --git a/src/main/java/tconstruct/blocks/SlabBase.java b/src/main/java/tconstruct/blocks/SlabBase.java index e00a3cd0..0727f918 100644 --- a/src/main/java/tconstruct/blocks/SlabBase.java +++ b/src/main/java/tconstruct/blocks/SlabBase.java @@ -46,13 +46,11 @@ public class SlabBase extends MantleBlock super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, entity); } - @Override public void setBlockBoundsForItemRender () { setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F); } - @Override public void setBlockBoundsBasedOnState (IBlockAccess world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z) / 8; @@ -61,7 +59,6 @@ public class SlabBase extends MantleBlock setBlockBounds(0.0F, minY, 0F, 1.0F, maxY, 1.0F); } - @Override public int onBlockPlaced (World par1World, int blockX, int blockY, int blockZ, int side, float clickX, float clickY, float clickZ, int metadata) { if (side == 1) @@ -72,13 +69,11 @@ public class SlabBase extends MantleBlock return metadata; } - @Override public boolean isOpaqueCube () { return false; } - @Override public boolean renderAsNormalBlock () { return false; @@ -99,17 +94,16 @@ public class SlabBase extends MantleBlock } @Override - public void getSubBlocks (Item b, CreativeTabs tab, List list) + public void getSubBlocks (Item id, CreativeTabs tab, List list) { for (int iter = 0; iter < totalSize; iter++) { - list.add(new ItemStack(b, 1, iter)); + list.add(new ItemStack(id, 1, iter)); } } - @Override public int damageDropped (int meta) { return meta % 8; } -} +} \ No newline at end of file diff --git a/src/main/java/tconstruct/blocks/StoneTorch.java b/src/main/java/tconstruct/blocks/StoneTorch.java index ce7a694c..72b16961 100644 --- a/src/main/java/tconstruct/blocks/StoneTorch.java +++ b/src/main/java/tconstruct/blocks/StoneTorch.java @@ -89,14 +89,11 @@ public class StoneTorch extends MantleBlock * Checks to see if its valid to put this block at the specified * coordinates. Args: world, x, y, z */ - @Override - public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) + @Override + public boolean canPlaceBlockAt (World par1World, int par2, int par3, int par4) { - return par1World.isSideSolid(par2 - 1, par3, par4, EAST, true) || - par1World.isSideSolid(par2 + 1, par3, par4, WEST, true) || - par1World.isSideSolid(par2, par3, par4 - 1, SOUTH, true) || - par1World.isSideSolid(par2, par3, par4 + 1, NORTH, true) || - canPlaceTorchOn(par1World, par2, par3 - 1, par4); + return par1World.isSideSolid(par2 - 1, par3, par4, EAST, true) || par1World.isSideSolid(par2 + 1, par3, par4, WEST, true) || par1World.isSideSolid(par2, par3, par4 - 1, SOUTH, true) + || par1World.isSideSolid(par2, par3, par4 + 1, NORTH, true) || canPlaceTorchOn(par1World, par2, par3 - 1, par4); } /** @@ -104,7 +101,7 @@ public class StoneTorch extends MantleBlock * side, hitX, hitY, hitZ, block metadata */ @Override - public int onBlockPlaced(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; @@ -135,8 +132,8 @@ public class StoneTorch extends MantleBlock return j1; } - - public void updateTick(World par1World, int par2, int par3, int par4, Random random) + + public void updateTick (World par1World, int par2, int par3, int par4, Random random) { super.updateTick(par1World, par2, par3, par4, random); @@ -147,7 +144,7 @@ public class StoneTorch extends MantleBlock } // JAVADOC METHOD $$ func_149726_b - public void onBlockAdded(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_) { if (p_149726_1_.getBlockMetadata(p_149726_2_, p_149726_3_, p_149726_4_) == 0) { @@ -193,8 +190,8 @@ public class StoneTorch extends MantleBlock { this.func_94397_d(par1World, par2, par3, par4, par5); } - - protected boolean func_94397_d(World par1World, int par2, int par3, int par4, Block par5) + + protected boolean func_94397_d (World par1World, int par2, int par3, int par4, Block par5) { if (this.dropTorchIfCantStay(par1World, par2, par3, par4)) { diff --git a/src/main/java/tconstruct/blocks/TConstructFluid.java b/src/main/java/tconstruct/blocks/TConstructFluid.java index 2a7487e2..d5ef0fc4 100644 --- a/src/main/java/tconstruct/blocks/TConstructFluid.java +++ b/src/main/java/tconstruct/blocks/TConstructFluid.java @@ -1,5 +1,7 @@ package tconstruct.blocks; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; @@ -41,6 +43,7 @@ public class TConstructFluid extends BlockFluidClassic } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon (int side, int meta) { if (side == 0 || side == 1) diff --git a/src/main/java/tconstruct/blocks/logic/BattlesignLogic.java b/src/main/java/tconstruct/blocks/logic/BattlesignLogic.java index 644be4d1..99e93cfe 100644 --- a/src/main/java/tconstruct/blocks/logic/BattlesignLogic.java +++ b/src/main/java/tconstruct/blocks/logic/BattlesignLogic.java @@ -53,18 +53,18 @@ public class BattlesignLogic extends EquipLogic } @Override - public String getInventoryName() + public String getInventoryName () { return null; } @Override - public void openInventory() + public void openInventory () { } @Override - public void closeInventory() + public void closeInventory () { } } \ No newline at end of file diff --git a/src/main/java/tconstruct/client/TControls.java b/src/main/java/tconstruct/client/TControls.java index b7e6539e..69a54a43 100644 --- a/src/main/java/tconstruct/client/TControls.java +++ b/src/main/java/tconstruct/client/TControls.java @@ -120,7 +120,7 @@ public class TControls extends TKeyHandler onStilts = false; } - void resetFallDamage() + void resetFallDamage () { AbstractPacket packet = new PacketDoubleJump(); updateServer(packet); diff --git a/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java b/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java index 6747937c..e2cac628 100644 --- a/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java +++ b/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java @@ -13,7 +13,6 @@ public class BlockSkinRenderHelper { public static boolean renderMetadataBlock (Block block, int metadata, int x, int y, int z, RenderBlocks renderer, IBlockAccess world) { - // TODO CHECK THESE!!!! int var5 = block.colorMultiplier(world, x, y, z); float var6 = (float) (var5 >> 16 & 255) / 255.0F; float var7 = (float) (var5 >> 8 & 255) / 255.0F; @@ -233,12 +232,12 @@ public class BlockSkinRenderHelper if (!flag5 && !flag3) { - render.aoLightValueScratchXZNN = render.aoLightValueScratchXYPP; + render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXYPP; render.aoBrightnessXYZPPP = render.aoBrightnessXYPP; } else { - render.aoLightValueScratchXZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); + render.aoLightValueScratchXYZPPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); } @@ -256,7 +255,7 @@ public class BlockSkinRenderHelper 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; + f3 = (render.aoLightValueScratchYZPP + f7 + render.aoLightValueScratchXYZPPP + render.aoLightValueScratchXYPP) / 4.0F; f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPN) / 4.0F; f5 = (render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNPP, render.aoBrightnessXYNP, render.aoBrightnessYZPP, i1); @@ -291,7 +290,7 @@ public class BlockSkinRenderHelper --zPos; } - render.aoLightValueScratchXZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); + render.aoLightValueScratchXZNN = 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); @@ -306,7 +305,7 @@ public class BlockSkinRenderHelper if (!flag2 && !flag4) { - render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZPN; + render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; } else @@ -317,7 +316,7 @@ public class BlockSkinRenderHelper if (!flag2 && !flag5) { - render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZPN; + render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN; render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; } else @@ -361,10 +360,10 @@ public class BlockSkinRenderHelper } f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); - f3 = (render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; + f3 = (render.aoLightValueScratchXZNN + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZPPN) / 4.0F; f5 = (render.aoLightValueScratchYZNN + f7 + render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXZPN) / 4.0F; - f6 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZPN + render.aoLightValueScratchYZNN + f7) / 4.0F; + f6 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZNN + render.aoLightValueScratchYZNN + f7) / 4.0F; render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, i1); render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, i1); @@ -456,12 +455,12 @@ public class BlockSkinRenderHelper if (!flag3 && !flag5) { - render.aoLightValueScratchXZNN = render.aoLightValueScratchXZPP; + render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP; render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; } else { - render.aoLightValueScratchXZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); + render.aoLightValueScratchXYZPPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); } @@ -479,7 +478,7 @@ public class BlockSkinRenderHelper 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; + f6 = (f7 + render.aoLightValueScratchYZPP + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYZPPP) / 4.0F; f5 = (render.aoLightValueScratchYZNP + f7 + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXZPP) / 4.0F; f4 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXZNP + render.aoLightValueScratchYZNP + f7) / 4.0F; render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, i1); @@ -526,7 +525,7 @@ public class BlockSkinRenderHelper } render.aoLightValueScratchXYNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); - render.aoLightValueScratchXZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + render.aoLightValueScratchXZNN = 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); @@ -540,7 +539,7 @@ public class BlockSkinRenderHelper if (!flag5 && !flag2) { - render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZPN; + render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; } else @@ -562,7 +561,7 @@ public class BlockSkinRenderHelper if (!flag5 && !flag3) { - render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZPN; + render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN; render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; } else @@ -597,8 +596,8 @@ public class BlockSkinRenderHelper 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; + f4 = (render.aoLightValueScratchXZNN + f7 + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F; + f5 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZNN + f7) / 4.0F; render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, i1); render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYNP, render.aoBrightnessXYZNPP, i1); render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessXYNP, i1); @@ -690,12 +689,12 @@ public class BlockSkinRenderHelper if (!flag3 && !flag5) { - render.aoLightValueScratchXZNN = render.aoLightValueScratchXZPP; + render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP; render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; } else { - render.aoLightValueScratchXZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); + render.aoLightValueScratchXYZPPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); } @@ -715,7 +714,7 @@ public class BlockSkinRenderHelper 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; + f6 = (f7 + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPP) / 4.0F; render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, i1); render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, i1); @@ -1074,12 +1073,12 @@ public class BlockSkinRenderHelper if (!flag5 && !flag3) { - render.aoLightValueScratchXZNN = render.aoLightValueScratchXYPP; + render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXYPP; render.aoBrightnessXYZPPP = render.aoBrightnessXYPP; } else { - render.aoLightValueScratchXZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); + render.aoLightValueScratchXYZPPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); } @@ -1097,7 +1096,7 @@ public class BlockSkinRenderHelper 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; + f3 = (render.aoLightValueScratchYZPP + f7 + render.aoLightValueScratchXYZPPP + render.aoLightValueScratchXYPP) / 4.0F; f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPN) / 4.0F; f5 = (render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNPP, render.aoBrightnessXYNP, render.aoBrightnessYZPP, i1); @@ -1130,7 +1129,7 @@ public class BlockSkinRenderHelper --zPos; } - render.aoLightValueScratchXZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos - 1, yPos, zPos); + render.aoLightValueScratchXZNN = 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); @@ -1145,7 +1144,7 @@ public class BlockSkinRenderHelper if (!flag2 && !flag4) { - render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZPN; + render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; } else @@ -1156,7 +1155,7 @@ public class BlockSkinRenderHelper if (!flag2 && !flag5) { - render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZPN; + render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN; render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; } else @@ -1200,10 +1199,10 @@ public class BlockSkinRenderHelper } f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); - f3 = (render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; + f3 = (render.aoLightValueScratchXZNN + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZPPN) / 4.0F; f5 = (render.aoLightValueScratchYZNN + f7 + render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXZPN) / 4.0F; - f6 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZPN + render.aoLightValueScratchYZNN + f7) / 4.0F; + f6 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZNN + render.aoLightValueScratchYZNN + f7) / 4.0F; render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, i1); render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, i1); @@ -1294,12 +1293,12 @@ public class BlockSkinRenderHelper if (!flag3 && !flag5) { - render.aoLightValueScratchXZNN = render.aoLightValueScratchXZPP; + render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP; render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; } else { - render.aoLightValueScratchXZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); + render.aoLightValueScratchXYZPPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); } @@ -1317,7 +1316,7 @@ public class BlockSkinRenderHelper 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; + f6 = (f7 + render.aoLightValueScratchYZPP + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYZPPP) / 4.0F; f5 = (render.aoLightValueScratchYZNP + f7 + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXZPP) / 4.0F; f4 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXZNP + render.aoLightValueScratchYZNP + f7) / 4.0F; render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, i1); @@ -1363,7 +1362,7 @@ public class BlockSkinRenderHelper } render.aoLightValueScratchXYNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); - render.aoLightValueScratchXZPN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); + render.aoLightValueScratchXZNN = 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); @@ -1377,7 +1376,7 @@ public class BlockSkinRenderHelper if (!flag5 && !flag2) { - render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZPN; + render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; } else @@ -1399,7 +1398,7 @@ public class BlockSkinRenderHelper if (!flag5 && !flag3) { - render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZPN; + render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN; render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; } else @@ -1434,8 +1433,8 @@ public class BlockSkinRenderHelper 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; + f4 = (render.aoLightValueScratchXZNN + f7 + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F; + f5 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZNN + f7) / 4.0F; render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, i1); render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYNP, render.aoBrightnessXYZNPP, i1); render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessXYNP, i1); @@ -1526,12 +1525,12 @@ public class BlockSkinRenderHelper if (!flag3 && !flag5) { - render.aoLightValueScratchXZNN = render.aoLightValueScratchXZPP; + render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP; render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; } else { - render.aoLightValueScratchXZNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); + render.aoLightValueScratchXYZPPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); } @@ -1551,7 +1550,7 @@ public class BlockSkinRenderHelper 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; + f6 = (f7 + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPP) / 4.0F; render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, i1); render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, i1); @@ -1691,4 +1690,4 @@ public class BlockSkinRenderHelper { return access.getBlock(x, y, z).getAmbientOcclusionLightValue(); } -} +} \ No newline at end of file diff --git a/src/main/java/tconstruct/client/block/RenderLiquid.java b/src/main/java/tconstruct/client/block/RenderLiquid.java deleted file mode 100644 index 2463db27..00000000 --- a/src/main/java/tconstruct/client/block/RenderLiquid.java +++ /dev/null @@ -1,1675 +0,0 @@ -package tconstruct.client.block; - -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.EntityRenderer; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.init.Blocks; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; - -/** - * @author BluSunrize - */ - -public class RenderLiquid -{ - public static boolean renderMetadataBlock (Block block, int metadata, int x, int y, int z, RenderBlocks renderer, IBlockAccess world) - { - int var5 = block.colorMultiplier(world, x, y, z); - float var6 = (var5 >> 16 & 0xFF) / 255.0F; - float var7 = (var5 >> 8 & 0xFF) / 255.0F; - float var8 = (var5 & 0xFF) / 255.0F; - - if (EntityRenderer.anaglyphEnable) - { - float var9 = (var6 * 30.0F + var7 * 59.0F + var8 * 11.0F) / 100.0F; - float var10 = (var6 * 30.0F + var7 * 70.0F) / 100.0F; - float var11 = (var6 * 30.0F + var8 * 70.0F) / 100.0F; - var6 = var9; - var7 = var10; - var8 = var11; - } - - 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.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.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos); - Tessellator tessellator = Tessellator.instance; - tessellator.setBrightness(983055); - - if (render.getBlockIcon(block).getIconName().equals("grass_top")) - { - flag1 = false; - } - else if (render.hasOverrideBlockTexture()) - { - flag1 = false; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))) - { - if (render.renderMinY <= 0.0D) - { - yPos--; - } - - 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.aoLightValueScratchXYZNNN = render.aoLightValueScratchXYNN; - render.aoBrightnessXYZNNN = render.aoBrightnessXYNN; - } - else - { - 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.aoLightValueScratchXYZNNP = render.aoLightValueScratchXYNN; - render.aoBrightnessXYZNNP = render.aoBrightnessXYNN; - } - else - { - 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.aoLightValueScratchXYZPNN = render.aoLightValueScratchXYPN; - render.aoBrightnessXYZPNN = render.aoBrightnessXYPN; - } - else - { - 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.aoLightValueScratchXYZPNP = render.aoLightValueScratchXYPN; - render.aoBrightnessXYZPNP = render.aoBrightnessXYPN; - } - else - { - render.aoLightValueScratchXYZPNP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); - render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); - } - - if (render.renderMinY <= 0.0D) - { - yPos++; - } - - int i1 = l; - - if ((render.renderMinY <= 0.0D) || (!render.blockAccess.getBlock(xPos, yPos - 1, zPos).isOpaqueCube())) - { - i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); - } - - 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.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.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.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.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))) - { - if (render.renderMaxY >= 1.0D) - { - yPos++; - } - - 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.aoLightValueScratchXYZNPN = render.aoLightValueScratchXYNP; - render.aoBrightnessXYZNPN = render.aoBrightnessXYNP; - } - else - { - 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.aoLightValueScratchXYZPPN = render.aoLightValueScratchXYPP; - render.aoBrightnessXYZPPN = render.aoBrightnessXYPP; - } - else - { - 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.aoLightValueScratchXYZNPP = render.aoLightValueScratchXYNP; - render.aoBrightnessXYZNPP = render.aoBrightnessXYNP; - } - else - { - 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.aoLightValueScratchXYZPPP = render.aoLightValueScratchXYPP; - render.aoBrightnessXYZPPP = render.aoBrightnessXYPP; - } - else - { - render.aoLightValueScratchXYZPPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); - render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); - } - - if (render.renderMaxY >= 1.0D) - { - yPos--; - } - - int i1 = l; - - if ((render.renderMaxY >= 1.0D) || (!render.blockAccess.getBlock(xPos, yPos + 1, zPos).isOpaqueCube())) - { - i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); - } - - float f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); - f6 = (render.aoLightValueScratchXYZNPP + render.aoLightValueScratchXYNP + render.aoLightValueScratchYZPP + f7) / 4.0F; - f3 = (render.aoLightValueScratchYZPP + f7 + render.aoLightValueScratchXYZPPP + render.aoLightValueScratchXYPP) / 4.0F; - f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPN) / 4.0F; - f5 = (render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNPP, render.aoBrightnessXYNP, render.aoBrightnessYZPP, i1); - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXYZPPP, render.aoBrightnessXYPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXYPP, render.aoBrightnessXYZPPN, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYNP, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); - 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.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))) - { - if (render.renderMinZ <= 0.0D) - { - zPos--; - } - - render.aoLightValueScratchXZNN = 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.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; - render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; - } - else - { - 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.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN; - render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; - } - else - { - 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.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; - render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; - } - else - { - 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.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; - render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; - } - else - { - render.aoLightValueScratchXYZPPN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); - render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); - } - - if (render.renderMinZ <= 0.0D) - { - zPos++; - } - - int i1 = l; - - if ((render.renderMinZ <= 0.0D) || (!render.blockAccess.getBlock(xPos, yPos, zPos - 1).isOpaqueCube())) - { - i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); - } - - float f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); - f3 = (render.aoLightValueScratchXZNN + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; - f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZPPN) / 4.0F; - f5 = (render.aoLightValueScratchYZNN + f7 + render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXZPN) / 4.0F; - f6 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZNN + render.aoLightValueScratchYZNN + f7) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXZNN, render.aoBrightnessYZNN, i1); - - if (flag1) - { - 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.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.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.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))) - { - if (render.renderMaxZ >= 1.0D) - { - zPos++; - } - - 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.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; - render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; - } - else - { - 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.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; - render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; - } - else - { - 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.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; - render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; - } - else - { - 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.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP; - render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; - } - else - { - render.aoLightValueScratchXYZPPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); - render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); - } - - if (render.renderMaxZ >= 1.0D) - { - zPos--; - } - - int i1 = l; - - if ((render.renderMaxZ >= 1.0D) || (!render.blockAccess.getBlock(xPos, yPos, zPos + 1).isOpaqueCube())) - { - i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); - } - - 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.aoLightValueScratchXYZPPP) / 4.0F; - f5 = (render.aoLightValueScratchYZNP + f7 + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXZPP) / 4.0F; - f4 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXZNP + render.aoLightValueScratchYZNP + f7) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, render.aoBrightnessYZNP, i1); - - if (flag1) - { - 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.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.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.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))) - { - if (render.renderMinX <= 0.0D) - { - xPos--; - } - - render.aoLightValueScratchXYNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); - render.aoLightValueScratchXZNN = 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.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; - render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; - } - else - { - 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.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; - render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; - } - else - { - 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.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN; - render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; - } - else - { - 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.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; - render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; - } - else - { - render.aoLightValueScratchXYZNPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); - render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); - } - - if (render.renderMinX <= 0.0D) - { - xPos++; - } - - int i1 = l; - - if ((render.renderMinX <= 0.0D) || (!render.blockAccess.getBlock(xPos - 1, yPos, zPos).isOpaqueCube())) - { - i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); - } - - 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.aoLightValueScratchXZNN + f7 + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F; - f5 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZNN + f7) / 4.0F; - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, i1); - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYNP, render.aoBrightnessXYZNPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessXYNP, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXYNN, render.aoBrightnessXZNN, i1); - - if (flag1) - { - 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.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.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.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))) - { - if (render.renderMaxX >= 1.0D) - { - xPos++; - } - - 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.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; - render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; - } - else - { - 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.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; - render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; - } - else - { - 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.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; - render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; - } - else - { - 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.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP; - render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; - } - else - { - render.aoLightValueScratchXYZPPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); - render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); - } - - if (render.renderMaxX >= 1.0D) - { - xPos--; - } - - int i1 = l; - - if ((render.renderMaxX >= 1.0D) || (!render.blockAccess.getBlock(xPos + 1, yPos, zPos).isOpaqueCube())) - { - i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); - } - - 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.aoLightValueScratchXYZPPN + render.aoLightValueScratchXYPP) / 4.0F; - f6 = (f7 + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPP) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZPNN, render.aoBrightnessXYPN, render.aoBrightnessXZPN, i1); - - if (flag1) - { - 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.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.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.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.enableAO = false; - Tessellator tessellator = Tessellator.instance; - boolean flag = false; - float f3 = 0.5F; - float f4 = 1.0F; - float f5 = 0.8F; - float f6 = 0.6F; - float f7 = f4 * colorRed; - float f8 = f4 * colorGreen; - float f9 = f4 * colorBlue; - float f10 = f3; - float f11 = f5; - float f12 = f6; - float f13 = f3; - float f14 = f5; - float f15 = f6; - float f16 = f3; - float f17 = f5; - float f18 = f6; - - if (block != Blocks.grass) - { - f10 = f3 * colorRed; - f11 = f5 * colorRed; - f12 = f6 * colorRed; - f13 = f3 * colorGreen; - f14 = f5 * colorGreen; - f15 = f6 * colorGreen; - f16 = f3 * colorBlue; - f17 = f5 * colorBlue; - f18 = f6 * colorBlue; - } - - int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos); - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))) - { - tessellator.setBrightness(render.renderMinY > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos)); - tessellator.setColorOpaque_F(f10, f13, f16); - render.renderFaceYNeg(block, xPos, yPos, zPos, block.getIcon(0, metadata)); - flag = true; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))) - { - tessellator.setBrightness(render.renderMaxY < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos)); - tessellator.setColorOpaque_F(f7, f8, f9); - render.renderFaceYPos(block, xPos, yPos, zPos, block.getIcon(1, metadata)); - flag = true; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))) - { - tessellator.setBrightness(render.renderMinZ > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1)); - tessellator.setColorOpaque_F(f11, f14, f17); - render.renderFaceZNeg(block, xPos, yPos, zPos, block.getIcon(2, metadata)); - - flag = true; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))) - { - tessellator.setBrightness(render.renderMaxZ < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1)); - tessellator.setColorOpaque_F(f11, f14, f17); - render.renderFaceZPos(block, xPos, yPos, zPos, block.getIcon(3, metadata)); - - flag = true; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))) - { - tessellator.setBrightness(render.renderMinX > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos)); - tessellator.setColorOpaque_F(f12, f15, f18); - render.renderFaceXNeg(block, xPos, yPos, zPos, block.getIcon(4, metadata)); - - flag = true; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))) - { - tessellator.setBrightness(render.renderMaxX < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos)); - tessellator.setColorOpaque_F(f12, f15, f18); - render.renderFaceXPos(block, xPos, yPos, zPos, block.getIcon(5, metadata)); - - flag = true; - } - - return flag; - } - - public static boolean renderFakeBlock (IIcon texture, int x, int y, int z, RenderBlocks renderer, IBlockAccess world) - { - Block block = Blocks.stone; - int var5 = block.colorMultiplier(world, x, y, z); - float var6 = (var5 >> 16 & 0xFF) / 255.0F; - float var7 = (var5 >> 8 & 0xFF) / 255.0F; - float var8 = (var5 & 0xFF) / 255.0F; - - if (EntityRenderer.anaglyphEnable) - { - float var9 = (var6 * 30.0F + var7 * 59.0F + var8 * 11.0F) / 100.0F; - float var10 = (var6 * 30.0F + var7 * 70.0F) / 100.0F; - float var11 = (var6 * 30.0F + var8 * 70.0F) / 100.0F; - var6 = var9; - var7 = var10; - var8 = var11; - } - - return Minecraft.isAmbientOcclusionEnabled() ? renderFakeBlockWithAmbientOcclusion(texture, x, y, z, var6, var7, var8, renderer, world) : renderFakeBlockWithColorMultiplier(texture, x, y, z, - var6, var7, var8, renderer, world); - } - - static boolean renderFakeBlockWithAmbientOcclusion (IIcon texture, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) - { - Block block = Blocks.stone; - render.enableAO = true; - 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.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos); - Tessellator tessellator = Tessellator.instance; - tessellator.setBrightness(983055); - - if (render.getBlockIcon(block).getIconName().equals("grass_top")) - { - flag1 = false; - } - else if (render.hasOverrideBlockTexture()) - { - flag1 = false; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))) - { - if (render.renderMinY <= 0.0D) - { - yPos--; - } - - 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.aoLightValueScratchXYZNNN = render.aoLightValueScratchXYNN; - render.aoBrightnessXYZNNN = render.aoBrightnessXYNN; - } - else - { - 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.aoLightValueScratchXYZNNP = render.aoLightValueScratchXYNN; - render.aoBrightnessXYZNNP = render.aoBrightnessXYNN; - } - else - { - 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.aoLightValueScratchXYZPNN = render.aoLightValueScratchXYPN; - render.aoBrightnessXYZPNN = render.aoBrightnessXYPN; - } - else - { - 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.aoLightValueScratchXYZPNP = render.aoLightValueScratchXYPN; - render.aoBrightnessXYZPNP = render.aoBrightnessXYPN; - } - else - { - render.aoLightValueScratchXYZPNP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); - render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); - } - - if (render.renderMinY <= 0.0D) - { - yPos++; - } - - int i1 = l; - - if ((render.renderMinY <= 0.0D) || (!render.blockAccess.getBlock(xPos, yPos - 1, zPos).isOpaqueCube())) - { - i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos); - } - - 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.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.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.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.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))) - { - if (render.renderMaxY >= 1.0D) - { - yPos++; - } - - 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.aoLightValueScratchXYZNPN = render.aoLightValueScratchXYNP; - render.aoBrightnessXYZNPN = render.aoBrightnessXYNP; - } - else - { - 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.aoLightValueScratchXYZPPN = render.aoLightValueScratchXYPP; - render.aoBrightnessXYZPPN = render.aoBrightnessXYPP; - } - else - { - 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.aoLightValueScratchXYZNPP = render.aoLightValueScratchXYNP; - render.aoBrightnessXYZNPP = render.aoBrightnessXYNP; - } - else - { - 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.aoLightValueScratchXYZPPP = render.aoLightValueScratchXYPP; - render.aoBrightnessXYZPPP = render.aoBrightnessXYPP; - } - else - { - render.aoLightValueScratchXYZPPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos, zPos + 1); - render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos + 1); - } - - if (render.renderMaxY >= 1.0D) - { - yPos--; - } - - int i1 = l; - - if ((render.renderMaxY >= 1.0D) || (!render.blockAccess.getBlock(xPos, yPos + 1, zPos).isOpaqueCube())) - { - i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos); - } - - float f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos); - f6 = (render.aoLightValueScratchXYZNPP + render.aoLightValueScratchXYNP + render.aoLightValueScratchYZPP + f7) / 4.0F; - f3 = (render.aoLightValueScratchYZPP + f7 + render.aoLightValueScratchXYZPPP + render.aoLightValueScratchXYPP) / 4.0F; - f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPN) / 4.0F; - f5 = (render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNPP, render.aoBrightnessXYNP, render.aoBrightnessYZPP, i1); - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXYZPPP, render.aoBrightnessXYPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXYPP, render.aoBrightnessXYZPPN, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYNP, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); - 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.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))) - { - if (render.renderMinZ <= 0.0D) - { - zPos--; - } - - render.aoLightValueScratchXZNN = 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.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; - render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; - } - else - { - 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.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN; - render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; - } - else - { - 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.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; - render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; - } - else - { - 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.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; - render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; - } - else - { - render.aoLightValueScratchXYZPPN = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); - render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); - } - - if (render.renderMinZ <= 0.0D) - { - zPos++; - } - - int i1 = l; - - if ((render.renderMinZ <= 0.0D) || (!render.blockAccess.getBlock(xPos, yPos, zPos - 1).isOpaqueCube())) - { - i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1); - } - - float f7 = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos, zPos - 1); - f3 = (render.aoLightValueScratchXZNN + render.aoLightValueScratchXYZNPN + f7 + render.aoLightValueScratchYZPN) / 4.0F; - f4 = (f7 + render.aoLightValueScratchYZPN + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZPPN) / 4.0F; - f5 = (render.aoLightValueScratchYZNN + f7 + render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXZPN) / 4.0F; - f6 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZNN + render.aoLightValueScratchYZNN + f7) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXZNN, render.aoBrightnessYZNN, i1); - - if (flag1) - { - 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.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.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.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))) - { - if (render.renderMaxZ >= 1.0D) - { - zPos++; - } - - 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.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; - render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; - } - else - { - 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.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; - render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; - } - else - { - 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.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; - render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; - } - else - { - 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.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP; - render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; - } - else - { - render.aoLightValueScratchXYZPPP = getAmbientOcclusionLightValue(render.blockAccess, xPos + 1, yPos + 1, zPos); - render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos + 1, zPos); - } - - if (render.renderMaxZ >= 1.0D) - { - zPos--; - } - - int i1 = l; - - if ((render.renderMaxZ >= 1.0D) || (!render.blockAccess.getBlock(xPos, yPos, zPos + 1).isOpaqueCube())) - { - i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1); - } - - 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.aoLightValueScratchXYZPPP) / 4.0F; - f5 = (render.aoLightValueScratchYZNP + f7 + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXZPP) / 4.0F; - f4 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXZNP + render.aoLightValueScratchYZNP + f7) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, render.aoBrightnessYZNP, i1); - - if (flag1) - { - 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.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.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.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))) - { - if (render.renderMinX <= 0.0D) - { - xPos--; - } - - render.aoLightValueScratchXYNN = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos - 1, zPos); - render.aoLightValueScratchXZNN = 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.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; - render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; - } - else - { - 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.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; - render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; - } - else - { - 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.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN; - render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; - } - else - { - 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.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; - render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; - } - else - { - render.aoLightValueScratchXYZNPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); - render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); - } - - if (render.renderMinX <= 0.0D) - { - xPos++; - } - - int i1 = l; - - if ((render.renderMinX <= 0.0D) || (!render.blockAccess.getBlock(xPos - 1, yPos, zPos).isOpaqueCube())) - { - i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos); - } - - 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.aoLightValueScratchXZNN + f7 + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F; - f5 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZNN + f7) / 4.0F; - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, i1); - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYNP, render.aoBrightnessXYZNPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessXYNP, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXYNN, render.aoBrightnessXZNN, i1); - - if (flag1) - { - 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.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.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.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))) - { - if (render.renderMaxX >= 1.0D) - { - xPos++; - } - - 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.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; - render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; - } - else - { - 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.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; - render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; - } - else - { - 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.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; - render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; - } - else - { - 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.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP; - render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; - } - else - { - render.aoLightValueScratchXYZPPP = getAmbientOcclusionLightValue(render.blockAccess, xPos, yPos + 1, zPos + 1); - render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos + 1); - } - - if (render.renderMaxX >= 1.0D) - { - xPos--; - } - - int i1 = l; - - if ((render.renderMaxX >= 1.0D) || (!render.blockAccess.getBlock(xPos + 1, yPos, zPos).isOpaqueCube())) - { - i1 = block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos); - } - - 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.aoLightValueScratchXYZPPN + render.aoLightValueScratchXYPP) / 4.0F; - f6 = (f7 + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPP) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, i1); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, i1); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, i1); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZPNN, render.aoBrightnessXYPN, render.aoBrightnessXZPN, i1); - - if (flag1) - { - 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.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.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.enableAO = false; - return flag; - } - - private static float getAmbientOcclusionLightValue (IBlockAccess access, int x, int y, int z) - { - return access.getBlock(x, y, z).getAmbientOcclusionLightValue(); - } - - static boolean renderFakeBlockWithColorMultiplier (IIcon texture, int xPos, int yPos, int zPos, float colorRed, float colorGreen, float colorBlue, RenderBlocks render, IBlockAccess world) - { - Block block = Blocks.stone; - render.enableAO = false; - Tessellator tessellator = Tessellator.instance; - boolean flag = false; - float f3 = 0.5F; - float f4 = 1.0F; - float f5 = 0.8F; - float f6 = 0.6F; - float f7 = f4 * colorRed; - float f8 = f4 * colorGreen; - float f9 = f4 * colorBlue; - float f10 = f3; - float f11 = f5; - float f12 = f6; - float f13 = f3; - float f14 = f5; - float f15 = f6; - float f16 = f3; - float f17 = f5; - float f18 = f6; - - if (block != Blocks.grass) - { - f10 = f3 * colorRed; - f11 = f5 * colorRed; - f12 = f6 * colorRed; - f13 = f3 * colorGreen; - f14 = f5 * colorGreen; - f15 = f6 * colorGreen; - f16 = f3 * colorBlue; - f17 = f5 * colorBlue; - f18 = f6 * colorBlue; - } - - int l = block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos); - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos - 1, zPos, 0))) - { - tessellator.setBrightness(render.renderMinY > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos)); - tessellator.setColorOpaque_F(f10, f13, f16); - render.renderFaceYNeg(block, xPos, yPos, zPos, texture); - flag = true; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos + 1, zPos, 1))) - { - tessellator.setBrightness(render.renderMaxY < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos)); - tessellator.setColorOpaque_F(f7, f8, f9); - render.renderFaceYPos(block, xPos, yPos, zPos, texture); - flag = true; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos - 1, 2))) - { - tessellator.setBrightness(render.renderMinZ > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1)); - tessellator.setColorOpaque_F(f11, f14, f17); - render.renderFaceZNeg(block, xPos, yPos, zPos, texture); - - flag = true; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos, yPos, zPos + 1, 3))) - { - tessellator.setBrightness(render.renderMaxZ < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1)); - tessellator.setColorOpaque_F(f11, f14, f17); - render.renderFaceZPos(block, xPos, yPos, zPos, texture); - - flag = true; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos - 1, yPos, zPos, 4))) - { - tessellator.setBrightness(render.renderMinX > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos)); - tessellator.setColorOpaque_F(f12, f15, f18); - render.renderFaceXNeg(block, xPos, yPos, zPos, texture); - - flag = true; - } - - if ((render.renderAllFaces) || (block.shouldSideBeRendered(render.blockAccess, xPos + 1, yPos, zPos, 5))) - { - tessellator.setBrightness(render.renderMaxX < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos)); - tessellator.setColorOpaque_F(f12, f15, f18); - render.renderFaceXPos(block, xPos, yPos, zPos, texture); - - flag = true; - } - - return flag; - } -} \ No newline at end of file diff --git a/src/main/java/tconstruct/common/TContent.java b/src/main/java/tconstruct/common/TContent.java index 94e28e50..731f75b7 100644 --- a/src/main/java/tconstruct/common/TContent.java +++ b/src/main/java/tconstruct/common/TContent.java @@ -185,7 +185,7 @@ public class TContent implements IFuelHandler TRepo.furnaceSlab = new FurnaceSlab(Material.rock).setBlockName("FurnaceSlab"); TRepo.heldItemBlock = new EquipBlock(Material.wood).setBlockName("Frypan"); - + /* battlesignBlock = new BattlesignBlock(PHConstruct.battlesignBlock).setUnlocalizedName("Battlesign"); GameRegistry.registerBlock(battlesignBlock, "BattlesignBlock"); ameRegistry.registerTileEntity(BattlesignLogic.class, "BattlesignLogic");*/ @@ -205,10 +205,10 @@ public class TContent implements IFuelHandler TRepo.meatBlock = new MeatBlock().setBlockName("tconstruct.meatblock"); TRepo.glueBlock = new GlueBlock().setBlockName("GlueBlock").setCreativeTab(TConstructRegistry.blockTab); - 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); + //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().setBlockName("Smeltery"); @@ -686,7 +686,7 @@ public class TContent implements IFuelHandler // GameRegistry.registerItem(TRepo.glove, "glove"); GameRegistry.registerItem(TRepo.knapsack, "knapsack"); GameRegistry.registerItem(TRepo.goldHead, "goldHead"); - + TRepo.creativeModifier = new CreativeModifier().setUnlocalizedName("tconstruct.modifier.creative"); GameRegistry.registerItem(TRepo.creativeModifier, "creativeModifier"); @@ -945,12 +945,18 @@ public class TContent implements IFuelHandler achievements.put("tconstruct:beginner", new Achievement("tconstruct:beginner", "tconstruct.beginner", 0, 0, TRepo.manualBook, null));// .setIndependent()); achievements.put("tconstruct:pattern", new Achievement("tconstruct:pattern", "tconstruct.pattern", 2, 1, TRepo.blankPattern, achievements.get("tconstruct:beginner"))); achievements.put("tconstruct:tinkerer", new Achievement("tconstruct:tinkerer", "tconstruct.tinkerer", 2, 2, new ItemStack(TRepo.titleIcon, 1, 4096), achievements.get("tconstruct:pattern"))); - achievements.put("tconstruct:preparedFight", new Achievement("tconstruct:preparedFight", "tconstruct.preparedFight", 1, 3, new ItemStack(TRepo.titleIcon, 1, 4097), achievements.get("tconstruct:tinkerer"))); - achievements.put("tconstruct:proTinkerer", new Achievement("tconstruct:proTinkerer", "tconstruct.proTinkerer", 4, 4, new ItemStack(TRepo.titleIcon, 1, 4098), achievements.get("tconstruct:tinkerer")).setSpecial()); + achievements.put("tconstruct:preparedFight", + new Achievement("tconstruct:preparedFight", "tconstruct.preparedFight", 1, 3, new ItemStack(TRepo.titleIcon, 1, 4097), achievements.get("tconstruct:tinkerer"))); + achievements.put("tconstruct:proTinkerer", + new Achievement("tconstruct:proTinkerer", "tconstruct.proTinkerer", 4, 4, new ItemStack(TRepo.titleIcon, 1, 4098), achievements.get("tconstruct:tinkerer")).setSpecial()); achievements.put("tconstruct:smelteryMaker", new Achievement("tconstruct:smelteryMaker", "tconstruct.smelteryMaker", -2, -1, TRepo.smeltery, achievements.get("tconstruct:beginner"))); - achievements.put("tconstruct:enemySlayer", new Achievement("tconstruct:enemySlayer", "tconstruct.enemySlayer", 0, 5, new ItemStack(TRepo.titleIcon, 1, 4099), achievements.get("tconstruct:preparedFight"))); - achievements.put("tconstruct:dualConvenience", new Achievement("tconstruct:dualConvenience", "tconstruct.dualConvenience", 0, 7, new ItemStack(TRepo.titleIcon, 1, 4100), achievements.get("tconstruct:enemySlayer")).setSpecial()); - achievements.put("tconstruct:doingItWrong", new Achievement("tconstruct:doingItWrong", "tconstruct.doingItWrong", -2, -3, new ItemStack(TRepo.manualBook, 1, 2), achievements.get("tconstruct:smelteryMaker"))); - achievements.put("tconstruct:betterCrafting", new Achievement("tconstruct:betterCrafting", "tconstruct.betterCrafting", -2, 2, TRepo.craftingStationWood, achievements.get("tconstruct:beginner"))); + achievements.put("tconstruct:enemySlayer", + new Achievement("tconstruct:enemySlayer", "tconstruct.enemySlayer", 0, 5, new ItemStack(TRepo.titleIcon, 1, 4099), achievements.get("tconstruct:preparedFight"))); + achievements.put("tconstruct:dualConvenience", + new Achievement("tconstruct:dualConvenience", "tconstruct.dualConvenience", 0, 7, new ItemStack(TRepo.titleIcon, 1, 4100), achievements.get("tconstruct:enemySlayer")).setSpecial()); + achievements.put("tconstruct:doingItWrong", + new Achievement("tconstruct:doingItWrong", "tconstruct.doingItWrong", -2, -3, new ItemStack(TRepo.manualBook, 1, 2), achievements.get("tconstruct:smelteryMaker"))); + achievements.put("tconstruct:betterCrafting", + new Achievement("tconstruct:betterCrafting", "tconstruct.betterCrafting", -2, 2, TRepo.craftingStationWood, achievements.get("tconstruct:beginner"))); } } diff --git a/src/main/java/tconstruct/common/TRecipes.java b/src/main/java/tconstruct/common/TRecipes.java index ce0a9e52..793ae416 100644 --- a/src/main/java/tconstruct/common/TRecipes.java +++ b/src/main/java/tconstruct/common/TRecipes.java @@ -152,8 +152,8 @@ public class TRecipes GameRegistry.registerBlock(TRepo.glueBlock, "GlueBlock"); OreDictionary.registerOre("blockRubber", new ItemStack(TRepo.glueBlock)); - GameRegistry.registerBlock(TRepo.woolSlab1, WoolSlab1Item.class, "WoolSlab1"); - GameRegistry.registerBlock(TRepo.woolSlab2, WoolSlab2Item.class, "WoolSlab2"); + //GameRegistry.registerBlock(TRepo.woolSlab1, WoolSlab1Item.class, "WoolSlab1"); + //GameRegistry.registerBlock(TRepo.woolSlab2, WoolSlab2Item.class, "WoolSlab2"); // Smeltery stuff GameRegistry.registerBlock(TRepo.smeltery, SmelteryItemBlock.class, "Smeltery"); @@ -678,7 +678,7 @@ public class TRecipes GameRegistry.addRecipe(new ItemStack(TRepo.metalBlock, 1, 8), patBlock, '#', new ItemStack(TRepo.materials, 1, 15)); // Alumite GameRegistry.addRecipe(new ItemStack(TRepo.metalBlock, 1, 9), patBlock, '#', new ItemStack(TRepo.materials, 1, 16)); // Steel GameRegistry.addRecipe(new ItemStack(TRepo.materials, 1, 11), "#", '#', new ItemStack(TRepo.materials, 1, 12)); // Aluminum raw -> - // ingot + // ingot GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 9), "m", 'm', new ItemStack(TRepo.metalBlock, 1, 3)); // Copper GameRegistry.addRecipe(new ItemStack(TRepo.materials, 9, 10), "m", 'm', new ItemStack(TRepo.metalBlock, 1, 5)); // Tin @@ -796,7 +796,8 @@ public class TRecipes GameRegistry.addRecipe(new ItemStack(TRepo.diamondApple), " d ", "d#d", " d ", 'd', new ItemStack(Items.diamond), '#', new ItemStack(Items.apple)); GameRegistry.addShapelessRecipe(new ItemStack(TRepo.heartCanister, 1, 2), new ItemStack(TRepo.diamondApple), new ItemStack(TRepo.materials, 1, 8), new ItemStack(TRepo.heartCanister, 1, 0), new ItemStack(TRepo.heartCanister, 1, 1)); - GameRegistry.addShapelessRecipe(new ItemStack(TRepo.heartCanister, 1, 4), new ItemStack(TRepo.heartCanister, 1, 2), new ItemStack(TRepo.heartCanister, 1, 3), new ItemStack(Items.golden_apple, 1, 1)); + GameRegistry.addShapelessRecipe(new ItemStack(TRepo.heartCanister, 1, 4), new ItemStack(TRepo.heartCanister, 1, 2), new ItemStack(TRepo.heartCanister, 1, 3), new ItemStack(Items.golden_apple, + 1, 1)); //GameRegistry.addShapelessRecipe(new ItemStack(heartCanister, 1, 6), new ItemStack(heartCanister, 1, 0), new ItemStack(heartCanister, 1, 4), new ItemStack(heartCanister, 1, 5)); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TRepo.knapsack, 1, 0), "###", "rmr", "###", '#', new ItemStack(Items.leather), 'r', new ItemStack(TRepo.toughRod, 1, 2), 'm', @@ -832,7 +833,7 @@ public class TRecipes GameRegistry.addRecipe(new ItemStack(TRepo.searedSlab, 6, 7), "bbb", 'b', new ItemStack(TRepo.smeltery, 1, 11)); // Wool Slab Recipes - for (int sc = 0; sc <= 7; sc++) + /**for (int sc = 0; sc <= 7; sc++) { GameRegistry.addRecipe(new ItemStack(TRepo.woolSlab1, 6, sc), "www", 'w', new ItemStack(Blocks.wool, 1, sc)); GameRegistry.addRecipe(new ItemStack(TRepo.woolSlab2, 6, sc), "www", 'w', new ItemStack(Blocks.wool, 1, sc + 8)); @@ -840,7 +841,7 @@ public class TRecipes GameRegistry.addShapelessRecipe(new ItemStack(Blocks.wool, 1, sc), new ItemStack(TRepo.woolSlab1, 1, sc), new ItemStack(TRepo.woolSlab1, 1, sc)); GameRegistry.addShapelessRecipe(new ItemStack(Blocks.wool, 1, sc + 8), new ItemStack(TRepo.woolSlab2, 1, sc), new ItemStack(TRepo.woolSlab2, 1, sc)); } - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Blocks.wool, 1, 0), "slabCloth", "slabCloth")); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Blocks.wool, 1, 0), "slabCloth", "slabCloth"));*/ // Trap Recipes GameRegistry.addRecipe(new ItemStack(TRepo.punji, 5, 0), "b b", " b ", "b b", 'b', new ItemStack(Items.reeds)); GameRegistry.addRecipe(new ItemStack(TRepo.barricadeSpruce, 1, 0), "b", "b", 'b', new ItemStack(Blocks.log, 1, 1)); @@ -1034,8 +1035,8 @@ public class TRecipes ensureOreIsRegistered("nuggetGold", new ItemStack(Items.gold_nugget)); OreDictionary.registerOre("nuggetPigIron", new ItemStack(TRepo.materials, 1, 35)); - OreDictionary.registerOre("slabCloth", new ItemStack(TRepo.woolSlab1, 1, Short.MAX_VALUE)); - OreDictionary.registerOre("slabCloth", new ItemStack(TRepo.woolSlab2, 1, Short.MAX_VALUE)); + //OreDictionary.registerOre("slabCloth", new ItemStack(TRepo.woolSlab1, 1, Short.MAX_VALUE)); + //OreDictionary.registerOre("slabCloth", new ItemStack(TRepo.woolSlab2, 1, Short.MAX_VALUE)); ensureOreIsRegistered("stoneMossy", new ItemStack(Blocks.stonebrick, 1, 1)); ensureOreIsRegistered("stoneMossy", new ItemStack(Blocks.mossy_cobblestone)); diff --git a/src/main/java/tconstruct/common/TRepo.java b/src/main/java/tconstruct/common/TRepo.java index 739ad54d..7944105e 100644 --- a/src/main/java/tconstruct/common/TRepo.java +++ b/src/main/java/tconstruct/common/TRepo.java @@ -131,8 +131,8 @@ public class TRepo public static Block speedSlab; public static Block meatBlock; - public static Block woolSlab1; - public static Block woolSlab2; + //public static Block woolSlab1; + //public static Block woolSlab2; public static Block glueBlock; // Traps @@ -239,7 +239,7 @@ public class TRepo public static ModFlux modFlux; public static ModLapis modLapis; public static ModAttack modAttack; - + public static Item creativeModifier; // Wearables diff --git a/src/main/java/tconstruct/entity/FancyEntityItem.java b/src/main/java/tconstruct/entity/FancyEntityItem.java index 4dbddee8..ee61320f 100644 --- a/src/main/java/tconstruct/entity/FancyEntityItem.java +++ b/src/main/java/tconstruct/entity/FancyEntityItem.java @@ -28,7 +28,7 @@ public class FancyEntityItem extends EntityItem this.isImmuneToFire = true; this.lifespan = 72000; } - + public FancyEntityItem(World world, Entity original, ItemStack stack) { this(world, original.posX, original.posY, original.posZ); diff --git a/src/main/java/tconstruct/items/armor/ArmorBasic.java b/src/main/java/tconstruct/items/armor/ArmorBasic.java index 9c579eb1..2569fdb2 100644 --- a/src/main/java/tconstruct/items/armor/ArmorBasic.java +++ b/src/main/java/tconstruct/items/armor/ArmorBasic.java @@ -26,7 +26,8 @@ public class ArmorBasic extends ItemArmor @Override public String getArmorTexture (ItemStack stack, Entity entity, int slot, String type) { - return "tinker:textures/armor/" + textureName + "_" + type + ".png"; + int suffix = this.armorType == 2 ? 2 : 1; + return "tinker:textures/armor/" + textureName + "_" + suffix + ".png"; } } diff --git a/src/main/java/tconstruct/items/armor/ArmorStandard.java b/src/main/java/tconstruct/items/armor/ArmorStandard.java index 76e5f9bd..44c7d6d9 100644 --- a/src/main/java/tconstruct/items/armor/ArmorStandard.java +++ b/src/main/java/tconstruct/items/armor/ArmorStandard.java @@ -3,6 +3,7 @@ package tconstruct.items.armor; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; +import tconstruct.common.TRepo; import tconstruct.library.armor.ArmorCore; import tconstruct.library.armor.EnumArmorPart; @@ -23,7 +24,8 @@ public class ArmorStandard extends ArmorCore @Override public String getArmorTexture (ItemStack stack, Entity entity, int slot, String layer) { - return "tinker:textures/armor/wood_" + layer + ".png"; + int suffix = this.armorType == 2 ? 2 : 1; + return "tinker:textures/armor/wood_" + suffix + ".png"; } } \ No newline at end of file diff --git a/src/main/java/tconstruct/items/tools/Mattock.java b/src/main/java/tconstruct/items/tools/Mattock.java index bb006016..4d08c05a 100644 --- a/src/main/java/tconstruct/items/tools/Mattock.java +++ b/src/main/java/tconstruct/items/tools/Mattock.java @@ -48,12 +48,12 @@ public class Mattock extends DualHarvestTool } static Material[] axeMaterials = { Material.wood, Material.cactus, Material.plants, Material.vine };// TODO - // find - // this//, - // Material.pumpkin, - // Material.plants, - // Material.vine - // }; + // find + // this//, + // Material.pumpkin, + // Material.plants, + // Material.vine + // }; static Material[] shovelMaterials = { Material.grass, Material.ground, Material.clay }; @Override diff --git a/src/main/java/tconstruct/library/tools/DualHarvestTool.java b/src/main/java/tconstruct/library/tools/DualHarvestTool.java index ecd341d0..f6c291ed 100644 --- a/src/main/java/tconstruct/library/tools/DualHarvestTool.java +++ b/src/main/java/tconstruct/library/tools/DualHarvestTool.java @@ -126,7 +126,7 @@ public abstract class DualHarvestTool extends HarvestTool } @Override - public boolean canHarvestBlock(Block block, ItemStack itemStack) + public boolean canHarvestBlock (Block block, ItemStack itemStack) { return func_150897_b(block); } diff --git a/src/main/java/tconstruct/library/tools/HarvestTool.java b/src/main/java/tconstruct/library/tools/HarvestTool.java index 12db3093..6b265ef3 100644 --- a/src/main/java/tconstruct/library/tools/HarvestTool.java +++ b/src/main/java/tconstruct/library/tools/HarvestTool.java @@ -189,7 +189,7 @@ public abstract class HarvestTool extends ToolCore } @Override - public boolean canHarvestBlock(Block block, ItemStack itemStack) + public boolean canHarvestBlock (Block block, ItemStack itemStack) { return func_150897_b(block); } diff --git a/src/main/java/tconstruct/library/tools/ToolCore.java b/src/main/java/tconstruct/library/tools/ToolCore.java index f60b57ea..ab0fae9b 100644 --- a/src/main/java/tconstruct/library/tools/ToolCore.java +++ b/src/main/java/tconstruct/library/tools/ToolCore.java @@ -58,8 +58,8 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem { // TE power constants -- TODO grab these from the items added protected int capacity = 400000; - protected int maxReceive = 2000; - protected int maxExtract = 2000; + protected int maxReceive = 80; + protected int maxExtract = 80; protected Random random = new Random(); protected int damageVsEntity; @@ -778,13 +778,13 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem } return tags.getCompoundTag("InfiTool").getInteger("Damage"); } - + /* Prevent tools from dying */ public boolean hasCustomEntity (ItemStack stack) { return true; } - + public Entity createEntity (World world, Entity location, ItemStack itemstack) { return new FancyEntityItem(world, location, itemstack); diff --git a/src/main/java/tconstruct/plugins/imc/BuildcraftTransport.java b/src/main/java/tconstruct/plugins/imc/BuildcraftTransport.java index f1999912..46f6e826 100644 --- a/src/main/java/tconstruct/plugins/imc/BuildcraftTransport.java +++ b/src/main/java/tconstruct/plugins/imc/BuildcraftTransport.java @@ -32,9 +32,9 @@ public class BuildcraftTransport implements ICompatPlugin { addFacade(TRepo.smeltery, sc); } - + addFacade(TRepo.searedBlock, 0); - addFacade(TRepo.searedBlockNether, 0); + addFacade(TRepo.searedBlockNether, 0); } @Override diff --git a/src/main/java/tconstruct/util/TEventHandler.java b/src/main/java/tconstruct/util/TEventHandler.java index 4157b93a..9d383a0d 100644 --- a/src/main/java/tconstruct/util/TEventHandler.java +++ b/src/main/java/tconstruct/util/TEventHandler.java @@ -168,7 +168,7 @@ public class TEventHandler event.overrideResult(arrow); } } - + if (event.tool == TRepo.battlesign) { int modifiers = toolTag.getInteger("Modifiers"); @@ -290,7 +290,7 @@ public class TEventHandler } } } - + @SubscribeEvent public void onAttack (LivingAttackEvent event) { diff --git a/src/main/java/tconstruct/util/network/packet/PacketUpdateTE.java b/src/main/java/tconstruct/util/network/packet/PacketUpdateTE.java index 01cae7bc..78de19ac 100644 --- a/src/main/java/tconstruct/util/network/packet/PacketUpdateTE.java +++ b/src/main/java/tconstruct/util/network/packet/PacketUpdateTE.java @@ -8,58 +8,72 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; -public class PacketUpdateTE extends AbstractPacket { - private int x, y, z; - private NBTTagCompound data; +public class PacketUpdateTE extends AbstractPacket +{ + private int x, y, z; + private NBTTagCompound data; - public PacketUpdateTE() { + public PacketUpdateTE() + { - } - - public PacketUpdateTE(int x, int y, int z, NBTTagCompound data) { - this.x = x; - this.y = y; - this.z = z; - this.data = data; - } + } - @Override - public void encodeInto(ChannelHandlerContext ctx, ByteBuf buffer) { - PacketBuffer pbuff = new PacketBuffer(buffer); - pbuff.writeInt(x); - pbuff.writeShort(y); - pbuff.writeInt(z); - try { - pbuff.writeNBTTagCompoundToBuffer(data); - } catch (Exception e) { - e.printStackTrace(); - } - } + public PacketUpdateTE(int x, int y, int z, NBTTagCompound data) + { + this.x = x; + this.y = y; + this.z = z; + this.data = data; + } - @Override - public void decodeInto(ChannelHandlerContext ctx, ByteBuf buffer) { - PacketBuffer pbuff = new PacketBuffer(buffer); - x = pbuff.readInt(); - y = pbuff.readShort(); - z = pbuff.readInt(); - try { - data = pbuff.readNBTTagCompoundFromBuffer(); - } catch (Exception e) { - e.printStackTrace(); - } - } + @Override + public void encodeInto (ChannelHandlerContext ctx, ByteBuf buffer) + { + PacketBuffer pbuff = new PacketBuffer(buffer); + pbuff.writeInt(x); + pbuff.writeShort(y); + pbuff.writeInt(z); + try + { + pbuff.writeNBTTagCompoundToBuffer(data); + } + catch (Exception e) + { + e.printStackTrace(); + } + } - @Override - public void handleClientSide(EntityPlayer player) { - TileEntity te = player.worldObj.getTileEntity(x, y, z); + @Override + public void decodeInto (ChannelHandlerContext ctx, ByteBuf buffer) + { + PacketBuffer pbuff = new PacketBuffer(buffer); + x = pbuff.readInt(); + y = pbuff.readShort(); + z = pbuff.readInt(); + try + { + data = pbuff.readNBTTagCompoundFromBuffer(); + } + catch (Exception e) + { + e.printStackTrace(); + } + } - if (te != null) { - te.readFromNBT(data); - } - } + @Override + public void handleClientSide (EntityPlayer player) + { + TileEntity te = player.worldObj.getTileEntity(x, y, z); - @Override - public void handleServerSide(EntityPlayer player) { - } + if (te != null) + { + te.readFromNBT(data); + } + } + + @Override + public void handleServerSide (EntityPlayer player) + { + } } diff --git a/src/main/java/tconstruct/util/player/ArmorExtended.java b/src/main/java/tconstruct/util/player/ArmorExtended.java index 113ee215..694e1fd4 100644 --- a/src/main/java/tconstruct/util/player/ArmorExtended.java +++ b/src/main/java/tconstruct/util/player/ArmorExtended.java @@ -145,7 +145,8 @@ public class ArmorExtended implements IInventory { Side side = FMLCommonHandler.instance().getEffectiveSide(); - if (inventory[4] != null || inventory[5] != null || inventory[6] != null) { + if (inventory[4] != null || inventory[5] != null || inventory[6] != null) + { int bonusHP = 0; for (int i = 0; i < 3; i++) { @@ -246,24 +247,24 @@ public class ArmorExtended implements IInventory public void readFromNBT (NBTTagCompound tagCompound) { - if(tagCompound != null) + if (tagCompound != null) { - NBTTagList tagList = tagCompound.getTagList("Inventory", 10); - for (int i = 0; i < tagList.tagCount(); ++i) - { - NBTTagCompound nbttagcompound = (NBTTagCompound) tagList.getCompoundTagAt(i); - int j = nbttagcompound.getByte("Slot") & 255; - ItemStack itemstack = ItemStack.loadItemStackFromNBT(nbttagcompound); - - if (itemstack != null) + NBTTagList tagList = tagCompound.getTagList("Inventory", 10); + for (int i = 0; i < tagList.tagCount(); ++i) { - this.inventory[j] = itemstack; + NBTTagCompound nbttagcompound = (NBTTagCompound) tagList.getCompoundTagAt(i); + int j = nbttagcompound.getByte("Slot") & 255; + ItemStack itemstack = ItemStack.loadItemStackFromNBT(nbttagcompound); + + if (itemstack != null) + { + this.inventory[j] = itemstack; + } } } } - } - public void dropItems(ArrayList drops) + public void dropItems (ArrayList drops) { EntityPlayer player = parent.get(); for (int i = 0; i < 4; ++i) @@ -290,7 +291,7 @@ public class ArmorExtended implements IInventory public void writeInventoryToStream (ByteBuf os) throws IOException { for (int i = 0; i < 7; i++) - ByteBufUtils.writeItemStack(os,inventory[i]); + ByteBufUtils.writeItemStack(os, inventory[i]); } public void readInventoryFromStream (ByteBuf is) throws IOException diff --git a/src/main/java/tconstruct/util/player/KnapsackInventory.java b/src/main/java/tconstruct/util/player/KnapsackInventory.java index 71f13f30..7c1141fa 100644 --- a/src/main/java/tconstruct/util/player/KnapsackInventory.java +++ b/src/main/java/tconstruct/util/player/KnapsackInventory.java @@ -160,7 +160,7 @@ public class KnapsackInventory implements IInventory } } - public void dropItems(ArrayList drops) + public void dropItems (ArrayList drops) { EntityPlayer player = parent.get(); for (int i = 0; i < inventory.length; ++i) diff --git a/src/main/java/tconstruct/util/player/TPlayerHandler.java b/src/main/java/tconstruct/util/player/TPlayerHandler.java index 41909eb4..753ca13b 100644 --- a/src/main/java/tconstruct/util/player/TPlayerHandler.java +++ b/src/main/java/tconstruct/util/player/TPlayerHandler.java @@ -49,7 +49,7 @@ public class TPlayerHandler } @SubscribeEvent - public void onEntityConstructing(EntityEvent.EntityConstructing event) + public void onEntityConstructing (EntityEvent.EntityConstructing event) { if (event.entity instanceof EntityPlayer && TPlayerStats.get((EntityPlayer) event.entity) == null) { @@ -60,7 +60,7 @@ public class TPlayerHandler public void onPlayerLogin (EntityPlayer entityplayer) { TPlayerStats playerData = playerStats.remove(entityplayer.getPersistentID()); - if(playerData != null) + if (playerData != null) { playerData.saveNBTData(entityplayer.getEntityData()); } @@ -71,7 +71,7 @@ public class TPlayerHandler stats.level = entityplayer.experienceLevel; stats.hunger = entityplayer.getFoodStats().getFoodLevel(); - + //stats.battlesignBonus = tags.getCompoundTag("TConstruct").getBoolean("battlesignBonus"); // gamerule naturalRegeneration false @@ -131,7 +131,7 @@ public class TPlayerHandler { stats.battlesignBonus = true; ItemStack modifier = new ItemStack(TRepo.creativeModifier); - + NBTTagCompound compound = new NBTTagCompound(); compound.setTag("display", new NBTTagCompound()); NBTTagList list = new NBTTagList(); @@ -142,7 +142,7 @@ public class TPlayerHandler modifier.setTagCompound(compound); AbilityHelper.spawnItemAtPlayer(entityplayer, modifier); - + if (entityplayer.getDisplayName().toLowerCase().equals("zisteau")) { spawnPigmanModifier(entityplayer); @@ -161,11 +161,11 @@ public class TPlayerHandler } } } - - void spawnPigmanModifier(EntityPlayer entityplayer) + + void spawnPigmanModifier (EntityPlayer entityplayer) { ItemStack modifier = new ItemStack(TRepo.creativeModifier); - + NBTTagCompound compound = new NBTTagCompound(); compound.setTag("display", new NBTTagCompound()); compound.getCompoundTag("display").setString("Name", "Zistonian Bonus Modifier"); @@ -184,7 +184,7 @@ public class TPlayerHandler // Boom! TPlayerStats playerData = playerStats.remove(entityplayer.getPersistentID()); TPlayerStats stats = TPlayerStats.get(entityplayer); - if(playerData != null) + if (playerData != null) { stats = playerData; } @@ -233,7 +233,7 @@ public class TPlayerHandler */ @SubscribeEvent - public void playerDeath(LivingDeathEvent event) + public void playerDeath (LivingDeathEvent event) { if (!event.entity.worldObj.isRemote && event.entity instanceof EntityPlayer) { diff --git a/src/main/java/tconstruct/util/player/TPlayerStats.java b/src/main/java/tconstruct/util/player/TPlayerStats.java index a22b1dd0..b5bf6d15 100644 --- a/src/main/java/tconstruct/util/player/TPlayerStats.java +++ b/src/main/java/tconstruct/util/player/TPlayerStats.java @@ -40,7 +40,7 @@ public class TPlayerStats implements IExtendedEntityProperties } @Override - public void saveNBTData(NBTTagCompound compound) + public void saveNBTData (NBTTagCompound compound) { NBTTagCompound tTag = new NBTTagCompound(); armor.saveToNBT(tTag); @@ -53,9 +53,9 @@ public class TPlayerStats implements IExtendedEntityProperties } @Override - public void loadNBTData(NBTTagCompound compound) + public void loadNBTData (NBTTagCompound compound) { - NBTTagCompound properties = (NBTTagCompound)compound.getTag(PROP_NAME); + NBTTagCompound properties = (NBTTagCompound) compound.getTag(PROP_NAME); this.armor.readFromNBT(properties); this.knapsack.readFromNBT(properties); @@ -66,16 +66,16 @@ public class TPlayerStats implements IExtendedEntityProperties } @Override - public void init(Entity entity, World world) + public void init (Entity entity, World world) { } - public static final void register(EntityPlayer player) + public static final void register (EntityPlayer player) { player.registerExtendedProperties(TPlayerStats.PROP_NAME, new TPlayerStats(player)); } - public static final TPlayerStats get(EntityPlayer player) + public static final TPlayerStats get (EntityPlayer player) { return (TPlayerStats) player.getExtendedProperties(PROP_NAME); }