diff --git a/mods/tinker/armory/content/DisplayBlock.java b/mods/tinker/armory/content/DisplayBlock.java index b15d97d3..0edc6a17 100644 --- a/mods/tinker/armory/content/DisplayBlock.java +++ b/mods/tinker/armory/content/DisplayBlock.java @@ -18,7 +18,7 @@ public class DisplayBlock extends InventoryBlock } @Override - public TileEntity createNewTileEntity (World world, int metadata) + public TileEntity createTileEntity (World world, int metadata) { return new ShieldrackLogic(); //return null; diff --git a/mods/tinker/common/BlockSkinRenderHelper.java b/mods/tinker/common/BlockSkinRenderHelper.java index b9651685..2fe58477 100644 --- a/mods/tinker/common/BlockSkinRenderHelper.java +++ b/mods/tinker/common/BlockSkinRenderHelper.java @@ -1,9 +1,12 @@ package mods.tinker.common; import net.minecraft.block.Block; +import net.minecraft.block.BlockGrass; 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.util.Icon; import net.minecraft.world.IBlockAccess; public class BlockSkinRenderHelper @@ -33,18 +36,18 @@ public class BlockSkinRenderHelper static boolean renderMetadataBlockWithAmbientOcclusion(Block block, int metadata, int xMin, int yMin, int zMin, float xMax, float yMax, float zMax, RenderBlocks render, IBlockAccess world) { - /*render.enableAO = true; - boolean var8 = false; - float var9 = render.lightValueOwn; - float var10 = render.lightValueOwn; - float var11 = render.lightValueOwn; - float var12 = render.lightValueOwn; - boolean var13 = true; - boolean var14 = true; - boolean var15 = true; - boolean var16 = true; - boolean var17 = true; - boolean var18 = true; + render.enableAO = true; + boolean flag = false; + float f3 = render.lightValueOwn; + float f4 = render.lightValueOwn; + float f5 = render.lightValueOwn; + float f6 = render.lightValueOwn; + boolean flag1 = true; + boolean flag2 = true; + boolean flag3 = true; + boolean flag4 = true; + boolean flag5 = true; + boolean flag6 = true; render.lightValueOwn = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin, zMin); render.aoLightValueXNeg = block.getAmbientOcclusionLightValue(render.blockAccess, xMin - 1, yMin, zMin); render.aoLightValueYNeg = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin - 1, zMin); @@ -52,46 +55,46 @@ public class BlockSkinRenderHelper render.aoLightValueXPos = block.getAmbientOcclusionLightValue(render.blockAccess, xMin + 1, yMin, zMin); render.aoLightValueYPos = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin + 1, zMin); render.aoLightValueZPos = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin, zMin + 1); - int var19 = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin); - int var20 = var19; - int var21 = var19; - int var22 = var19; - int var23 = var19; - int var24 = var19; - int var25 = var19; + int l = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin); + int i1 = l; + int j1 = l; + int k1 = l; + int l1 = l; + int i2 = l; + int j2 = l; - if (render.renderMinY <= 0.0D) + if (render.renderMinY <= 0.0D || !render.blockAccess.isBlockOpaqueCube(xMin, yMin - 1, zMin)) { - var21 = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin - 1, zMin); + j1 = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin - 1, zMin); } - if (render.renderMaxY >= 1.0D) + if (render.renderMaxY >= 1.0D || !render.blockAccess.isBlockOpaqueCube(xMin, yMin + 1, zMin)) { - var24 = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin + 1, zMin); + i2 = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin + 1, zMin); } - if (render.renderMinX <= 0.0D) + if (render.renderMinX <= 0.0D || !render.blockAccess.isBlockOpaqueCube(xMin - 1, yMin, zMin)) { - var20 = block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin, zMin); + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin, zMin); } - if (render.renderMaxX >= 1.0D) + if (render.renderMaxX >= 1.0D || !render.blockAccess.isBlockOpaqueCube(xMin + 1, yMin, zMin)) { - var23 = block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin, zMin); + l1 = block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin, zMin); } - if (render.renderMinZ <= 0.0D) + if (render.renderMinZ <= 0.0D || !render.blockAccess.isBlockOpaqueCube(xMin, yMin, zMin - 1)) { - var22 = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin - 1); + k1 = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin - 1); } - if (render.renderMaxZ >= 1.0D) + if (render.renderMaxZ >= 1.0D || !render.blockAccess.isBlockOpaqueCube(xMin, yMin, zMin + 1)) { - var25 = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin + 1); + j2 = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin + 1); } - Tessellator var26 = Tessellator.instance; - var26.setBrightness(983055); + Tessellator tessellator = Tessellator.instance; + tessellator.setBrightness(983055); render.aoGrassXYZPPC = Block.canBlockGrass[render.blockAccess.getBlockId(xMin + 1, yMin + 1, zMin)]; render.aoGrassXYZPNC = Block.canBlockGrass[render.blockAccess.getBlockId(xMin + 1, yMin - 1, zMin)]; render.aoGrassXYZPCP = Block.canBlockGrass[render.blockAccess.getBlockId(xMin + 1, yMin, zMin + 1)]; @@ -105,22 +108,22 @@ public class BlockSkinRenderHelper render.aoGrassXYZCNP = Block.canBlockGrass[render.blockAccess.getBlockId(xMin, yMin - 1, zMin + 1)]; render.aoGrassXYZCNN = Block.canBlockGrass[render.blockAccess.getBlockId(xMin, yMin - 1, zMin - 1)]; - if (block.blockIndexInTexture == 3) + if (render.func_94175_b(block).func_94215_i().equals("grass_top")) { - var18 = false; - var17 = false; - var16 = false; - var15 = false; - var13 = false; + flag6 = false; + flag5 = false; + flag4 = false; + flag3 = false; + flag1 = false; } - if (render.overrideBlockTexture >= 0) + if (render.func_94167_b()) { - var18 = false; - var17 = false; - var16 = false; - var15 = false; - var13 = false; + flag6 = false; + flag5 = false; + flag4 = false; + flag3 = false; + flag1 = false; } if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin, yMin - 1, zMin, 0)) @@ -190,41 +193,41 @@ public class BlockSkinRenderHelper ++yMin; } - var9 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXYNN + render.aoLightValueScratchYZNP + render.aoLightValueYNeg) / 4.0F; - var12 = (render.aoLightValueScratchYZNP + render.aoLightValueYNeg + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXYPN) / 4.0F; - var11 = (render.aoLightValueYNeg + render.aoLightValueScratchYZNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNN) / 4.0F; - var10 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNN + render.aoLightValueYNeg + render.aoLightValueScratchYZNN) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXYNN, render.aoBrightnessYZNP, var21); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXYPN, var21); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYPN, render.aoBrightnessXYZPNN, var21); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNN, render.aoBrightnessYZNN, var21); + f3 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXYNN + render.aoLightValueScratchYZNP + render.aoLightValueYNeg) / 4.0F; + f6 = (render.aoLightValueScratchYZNP + render.aoLightValueYNeg + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXYPN) / 4.0F; + f5 = (render.aoLightValueYNeg + render.aoLightValueScratchYZNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNN) / 4.0F; + f4 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNN + render.aoLightValueYNeg + render.aoLightValueScratchYZNN) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXYNN, render.aoBrightnessYZNP, j1); + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXYPN, j1); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYPN, render.aoBrightnessXYZPNN, j1); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNN, render.aoBrightnessYZNN, j1); } else { - var12 = render.aoLightValueYNeg; - var11 = render.aoLightValueYNeg; - var10 = render.aoLightValueYNeg; - var9 = render.aoLightValueYNeg; + f6 = render.aoLightValueYNeg; + f5 = render.aoLightValueYNeg; + f4 = render.aoLightValueYNeg; + f3 = render.aoLightValueYNeg; render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = render.aoBrightnessXYNN; } - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = (var13 ? xMax : 1.0F) * 0.5F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = (var13 ? yMax : 1.0F) * 0.5F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = (var13 ? zMax : 1.0F) * 0.5F; - render.colorRedTopLeft *= var9; - render.colorGreenTopLeft *= var9; - render.colorBlueTopLeft *= var9; - render.colorRedBottomLeft *= var10; - render.colorGreenBottomLeft *= var10; - render.colorBlueBottomLeft *= var10; - render.colorRedBottomRight *= var11; - render.colorGreenBottomRight *= var11; - render.colorBlueBottomRight *= var11; - render.colorRedTopRight *= var12; - render.colorGreenTopRight *= var12; - render.colorBlueTopRight *= var12; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = (flag1 ? xMax : 1.0F) * 0.5F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = (flag1 ? yMax : 1.0F) * 0.5F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = (flag1 ? zMax : 1.0F) * 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.renderBottomFace(block, (double)xMin, (double)yMin, (double)zMin, block.getBlockTextureFromSideAndMetadata(0, metadata)); - var8 = true; + flag = true; } if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin, yMin + 1, zMin, 1)) @@ -294,44 +297,52 @@ public class BlockSkinRenderHelper --yMin; } - var12 = (render.aoLightValueScratchXYZNPP + render.aoLightValueScratchXYNP + render.aoLightValueScratchYZPP + render.aoLightValueYPos) / 4.0F; - var9 = (render.aoLightValueScratchYZPP + render.aoLightValueYPos + render.aoLightValueScratchXYZPPP + render.aoLightValueScratchXYPP) / 4.0F; - var10 = (render.aoLightValueYPos + render.aoLightValueScratchYZPN + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPN) / 4.0F; - var11 = (render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPN + render.aoLightValueYPos + render.aoLightValueScratchYZPN) / 4.0F; - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNPP, render.aoBrightnessXYNP, render.aoBrightnessYZPP, var24); - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXYZPPP, render.aoBrightnessXYPP, var24); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXYPP, render.aoBrightnessXYZPPN, var24); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYNP, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, var24); + f6 = (render.aoLightValueScratchXYZNPP + render.aoLightValueScratchXYNP + render.aoLightValueScratchYZPP + render.aoLightValueYPos) / 4.0F; + f3 = (render.aoLightValueScratchYZPP + render.aoLightValueYPos + render.aoLightValueScratchXYZPPP + render.aoLightValueScratchXYPP) / 4.0F; + f4 = (render.aoLightValueYPos + render.aoLightValueScratchYZPN + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPN) / 4.0F; + f5 = (render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPN + render.aoLightValueYPos + render.aoLightValueScratchYZPN) / 4.0F; + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNPP, render.aoBrightnessXYNP, render.aoBrightnessYZPP, i2); + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXYZPPP, render.aoBrightnessXYPP, i2); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXYPP, render.aoBrightnessXYZPPN, i2); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYNP, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i2); } else { - var12 = render.aoLightValueYPos; - var11 = render.aoLightValueYPos; - var10 = render.aoLightValueYPos; - var9 = render.aoLightValueYPos; - render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = var24; + f6 = render.aoLightValueYPos; + f5 = render.aoLightValueYPos; + f4 = render.aoLightValueYPos; + f3 = render.aoLightValueYPos; + render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = i2; } - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = var14 ? xMax : 1.0F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = var14 ? yMax : 1.0F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = var14 ? zMax : 1.0F; - render.colorRedTopLeft *= var9; - render.colorGreenTopLeft *= var9; - render.colorBlueTopLeft *= var9; - render.colorRedBottomLeft *= var10; - render.colorGreenBottomLeft *= var10; - render.colorBlueBottomLeft *= var10; - render.colorRedBottomRight *= var11; - render.colorGreenBottomRight *= var11; - render.colorBlueBottomRight *= var11; - render.colorRedTopRight *= var12; - render.colorGreenTopRight *= var12; - render.colorBlueTopRight *= var12; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = flag2 ? xMax : 1.0F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = flag2 ? yMax : 1.0F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = flag2 ? zMax : 1.0F; + 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.renderTopFace(block, (double)xMin, (double)yMin, (double)zMin, block.getBlockTextureFromSideAndMetadata(1, metadata)); - var8 = true; + flag = true; } - int var27; + float f7; + float f8; + float f9; + int k2; + float f10; + int l2; + Icon icon; + int i3; + int j3; if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin, yMin, zMin - 1, 2)) { @@ -400,60 +411,64 @@ public class BlockSkinRenderHelper ++zMin; } - var9 = (render.aoLightValueScratchXZNN + render.aoLightValueScratchXYZNPN + render.aoLightValueZNeg + render.aoLightValueScratchYZPN) / 4.0F; - var10 = (render.aoLightValueZNeg + render.aoLightValueScratchYZPN + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZPPN) / 4.0F; - var11 = (render.aoLightValueScratchYZNN + render.aoLightValueZNeg + render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXZPN) / 4.0F; - var12 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZNN + render.aoLightValueScratchYZNN + render.aoLightValueZNeg) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, var22); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, var22); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, var22); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXZNN, render.aoBrightnessYZNN, var22); + if (render.field_98189_n && render.field_94177_n.gameSettings.ambientOcclusion >= 2) + { + f7 = (render.aoLightValueScratchXZNN + render.aoLightValueScratchXYZNPN + render.aoLightValueZNeg + render.aoLightValueScratchYZPN) / 4.0F; + f9 = (render.aoLightValueZNeg + render.aoLightValueScratchYZPN + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZPPN) / 4.0F; + f8 = (render.aoLightValueScratchYZNN + render.aoLightValueZNeg + render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXZPN) / 4.0F; + f10 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZNN + render.aoLightValueScratchYZNN + render.aoLightValueZNeg) / 4.0F; + f3 = (float)((double)f7 * render.renderMaxY * (1.0D - render.renderMinX) + (double)f9 * render.renderMinY * render.renderMinX + (double)f8 * (1.0D - render.renderMaxY) * render.renderMinX + (double)f10 * (1.0D - render.renderMaxY) * (1.0D - render.renderMinX)); + f4 = (float)((double)f7 * render.renderMaxY * (1.0D - render.renderMaxX) + (double)f9 * render.renderMaxY * render.renderMaxX + (double)f8 * (1.0D - render.renderMaxY) * render.renderMaxX + (double)f10 * (1.0D - render.renderMaxY) * (1.0D - render.renderMaxX)); + f5 = (float)((double)f7 * render.renderMinY * (1.0D - render.renderMaxX) + (double)f9 * render.renderMinY * render.renderMaxX + (double)f8 * (1.0D - render.renderMinY) * render.renderMaxX + (double)f10 * (1.0D - render.renderMinY) * (1.0D - render.renderMaxX)); + f6 = (float)((double)f7 * render.renderMinY * (1.0D - render.renderMinX) + (double)f9 * render.renderMinY * render.renderMinX + (double)f8 * (1.0D - render.renderMinY) * render.renderMinX + (double)f10 * (1.0D - render.renderMinY) * (1.0D - render.renderMinX)); + k2 = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, k1); + i3 = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, k1); + j3 = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, k1); + l2 = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXZNN, render.aoBrightnessYZNN, k1); + render.brightnessTopLeft = render.func_96444_a(k2, i3, j3, l2, render.renderMaxY * (1.0D - render.renderMinX), render.renderMaxY * render.renderMinX, (1.0D - render.renderMaxY) * render.renderMinX, (1.0D - render.renderMaxY) * (1.0D - render.renderMinX)); + render.brightnessBottomLeft = render.func_96444_a(k2, i3, j3, l2, render.renderMaxY * (1.0D - render.renderMaxX), render.renderMaxY * render.renderMaxX, (1.0D - render.renderMaxY) * render.renderMaxX, (1.0D - render.renderMaxY) * (1.0D - render.renderMaxX)); + render.brightnessBottomRight = render.func_96444_a(k2, i3, j3, l2, render.renderMinY * (1.0D - render.renderMaxX), render.renderMinY * render.renderMaxX, (1.0D - render.renderMinY) * render.renderMaxX, (1.0D - render.renderMinY) * (1.0D - render.renderMaxX)); + render.brightnessTopRight = render.func_96444_a(k2, i3, j3, l2, render.renderMinY * (1.0D - render.renderMinX), render.renderMinY * render.renderMinX, (1.0D - render.renderMinY) * render.renderMinX, (1.0D - render.renderMinY) * (1.0D - render.renderMinX)); + } + else + { + f3 = (render.aoLightValueScratchXZNN + render.aoLightValueScratchXYZNPN + render.aoLightValueZNeg + render.aoLightValueScratchYZPN) / 4.0F; + f4 = (render.aoLightValueZNeg + render.aoLightValueScratchYZPN + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZPPN) / 4.0F; + f5 = (render.aoLightValueScratchYZNN + render.aoLightValueZNeg + render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXZPN) / 4.0F; + f6 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZNN + render.aoLightValueScratchYZNN + render.aoLightValueZNeg) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, k1); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, k1); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, k1); + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXZNN, render.aoBrightnessYZNN, k1); + } } else { - var12 = render.aoLightValueZNeg; - var11 = render.aoLightValueZNeg; - var10 = render.aoLightValueZNeg; - var9 = render.aoLightValueZNeg; - render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = var22; + f6 = render.aoLightValueZNeg; + f5 = render.aoLightValueZNeg; + f4 = render.aoLightValueZNeg; + f3 = render.aoLightValueZNeg; + render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = k1; } - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = (var15 ? xMax : 1.0F) * 0.8F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = (var15 ? yMax : 1.0F) * 0.8F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = (var15 ? zMax : 1.0F) * 0.8F; - render.colorRedTopLeft *= var9; - render.colorGreenTopLeft *= var9; - render.colorBlueTopLeft *= var9; - render.colorRedBottomLeft *= var10; - render.colorGreenBottomLeft *= var10; - render.colorBlueBottomLeft *= var10; - render.colorRedBottomRight *= var11; - render.colorGreenBottomRight *= var11; - render.colorBlueBottomRight *= var11; - render.colorRedTopRight *= var12; - render.colorGreenTopRight *= var12; - render.colorBlueTopRight *= var12; - var27 = block.getBlockTextureFromSideAndMetadata(2, metadata); - render.renderEastFace(block, (double)xMin, (double)yMin, (double)zMin, var27); + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = (flag3 ? xMax : 1.0F) * 0.8F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = (flag3 ? yMax : 1.0F) * 0.8F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = (flag3 ? zMax : 1.0F) * 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.renderEastFace(block, (double)xMin, (double)yMin, (double)zMin, block.getBlockTextureFromSideAndMetadata(2, metadata)); - if (Tessellator.instance.defaultTexture && render.fancyGrass && var27 == 3 && render.overrideBlockTexture < 0) - { - render.colorRedTopLeft *= xMax; - render.colorRedBottomLeft *= xMax; - render.colorRedBottomRight *= xMax; - render.colorRedTopRight *= xMax; - render.colorGreenTopLeft *= yMax; - render.colorGreenBottomLeft *= yMax; - render.colorGreenBottomRight *= yMax; - render.colorGreenTopRight *= yMax; - render.colorBlueTopLeft *= zMax; - render.colorBlueBottomLeft *= zMax; - render.colorBlueBottomRight *= zMax; - render.colorBlueTopRight *= zMax; - render.renderEastFace(block, (double)xMin, (double)yMin, (double)zMin, 38); - } - - var8 = true; + flag = true; } if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin, yMin, zMin + 1, 3)) @@ -523,60 +538,64 @@ public class BlockSkinRenderHelper --zMin; } - var9 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + render.aoLightValueZPos + render.aoLightValueScratchYZPP) / 4.0F; - var12 = (render.aoLightValueZPos + render.aoLightValueScratchYZPP + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYZPPP) / 4.0F; - var11 = (render.aoLightValueScratchYZNP + render.aoLightValueZPos + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXZPP) / 4.0F; - var10 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXZNP + render.aoLightValueScratchYZNP + render.aoLightValueZPos) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, var25); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, var25); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, var25); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, render.aoBrightnessYZNP, var25); + if (render.field_98189_n && render.field_94177_n.gameSettings.ambientOcclusion >= 2) + { + f7 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + render.aoLightValueZPos + render.aoLightValueScratchYZPP) / 4.0F; + f9 = (render.aoLightValueZPos + render.aoLightValueScratchYZPP + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYZPPP) / 4.0F; + f8 = (render.aoLightValueScratchYZNP + render.aoLightValueZPos + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXZPP) / 4.0F; + f10 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXZNP + render.aoLightValueScratchYZNP + render.aoLightValueZPos) / 4.0F; + f3 = (float)((double)f7 * render.renderMaxY * (1.0D - render.renderMinX) + (double)f9 * render.renderMaxY * render.renderMinX + (double)f8 * (1.0D - render.renderMaxY) * render.renderMinX + (double)f10 * (1.0D - render.renderMaxY) * (1.0D - render.renderMinX)); + f4 = (float)((double)f7 * render.renderMinY * (1.0D - render.renderMinX) + (double)f9 * render.renderMinY * render.renderMinX + (double)f8 * (1.0D - render.renderMinY) * render.renderMinX + (double)f10 * (1.0D - render.renderMinY) * (1.0D - render.renderMinX)); + f5 = (float)((double)f7 * render.renderMinY * (1.0D - render.renderMaxX) + (double)f9 * render.renderMinY * render.renderMaxX + (double)f8 * (1.0D - render.renderMinY) * render.renderMaxX + (double)f10 * (1.0D - render.renderMinY) * (1.0D - render.renderMaxX)); + f6 = (float)((double)f7 * render.renderMaxY * (1.0D - render.renderMaxX) + (double)f9 * render.renderMaxY * render.renderMaxX + (double)f8 * (1.0D - render.renderMaxY) * render.renderMaxX + (double)f10 * (1.0D - render.renderMaxY) * (1.0D - render.renderMaxX)); + k2 = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, j2); + i3 = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, j2); + j3 = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, j2); + l2 = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, render.aoBrightnessYZNP, j2); + render.brightnessTopLeft = render.func_96444_a(k2, l2, j3, i3, render.renderMaxY * (1.0D - render.renderMinX), (1.0D - render.renderMaxY) * (1.0D - render.renderMinX), (1.0D - render.renderMaxY) * render.renderMinX, render.renderMaxY * render.renderMinX); + render.brightnessBottomLeft = render.func_96444_a(k2, l2, j3, i3, render.renderMinY * (1.0D - render.renderMinX), (1.0D - render.renderMinY) * (1.0D - render.renderMinX), (1.0D - render.renderMinY) * render.renderMinX, render.renderMinY * render.renderMinX); + render.brightnessBottomRight = render.func_96444_a(k2, l2, j3, i3, render.renderMinY * (1.0D - render.renderMaxX), (1.0D - render.renderMinY) * (1.0D - render.renderMaxX), (1.0D - render.renderMinY) * render.renderMaxX, render.renderMinY * render.renderMaxX); + render.brightnessTopRight = render.func_96444_a(k2, l2, j3, i3, render.renderMaxY * (1.0D - render.renderMaxX), (1.0D - render.renderMaxY) * (1.0D - render.renderMaxX), (1.0D - render.renderMaxY) * render.renderMaxX, render.renderMaxY * render.renderMaxX); + } + else + { + f3 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + render.aoLightValueZPos + render.aoLightValueScratchYZPP) / 4.0F; + f6 = (render.aoLightValueZPos + render.aoLightValueScratchYZPP + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYZPPP) / 4.0F; + f5 = (render.aoLightValueScratchYZNP + render.aoLightValueZPos + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXZPP) / 4.0F; + f4 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXZNP + render.aoLightValueScratchYZNP + render.aoLightValueZPos) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, j2); + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, j2); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, j2); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, render.aoBrightnessYZNP, j2); + } } else { - var12 = render.aoLightValueZPos; - var11 = render.aoLightValueZPos; - var10 = render.aoLightValueZPos; - var9 = render.aoLightValueZPos; - render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = var25; + f6 = render.aoLightValueZPos; + f5 = render.aoLightValueZPos; + f4 = render.aoLightValueZPos; + f3 = render.aoLightValueZPos; + render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = j2; } - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = (var16 ? xMax : 1.0F) * 0.8F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = (var16 ? yMax : 1.0F) * 0.8F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = (var16 ? zMax : 1.0F) * 0.8F; - render.colorRedTopLeft *= var9; - render.colorGreenTopLeft *= var9; - render.colorBlueTopLeft *= var9; - render.colorRedBottomLeft *= var10; - render.colorGreenBottomLeft *= var10; - render.colorBlueBottomLeft *= var10; - render.colorRedBottomRight *= var11; - render.colorGreenBottomRight *= var11; - render.colorBlueBottomRight *= var11; - render.colorRedTopRight *= var12; - render.colorGreenTopRight *= var12; - render.colorBlueTopRight *= var12; - var27 = block.getBlockTextureFromSideAndMetadata(3, metadata); - render.renderWestFace(block, (double)xMin, (double)yMin, (double)zMin, block.getBlockTexture(render.blockAccess, xMin, yMin, zMin, 3)); + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = (flag4 ? xMax : 1.0F) * 0.8F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = (flag4 ? yMax : 1.0F) * 0.8F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = (flag4 ? zMax : 1.0F) * 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.renderWestFace(block, (double)xMin, (double)yMin, (double)zMin, block.getBlockTextureFromSideAndMetadata(0, metadata)); - if (Tessellator.instance.defaultTexture && render.fancyGrass && var27 == 3 && render.overrideBlockTexture < 0) - { - render.colorRedTopLeft *= xMax; - render.colorRedBottomLeft *= xMax; - render.colorRedBottomRight *= xMax; - render.colorRedTopRight *= xMax; - render.colorGreenTopLeft *= yMax; - render.colorGreenBottomLeft *= yMax; - render.colorGreenBottomRight *= yMax; - render.colorGreenTopRight *= yMax; - render.colorBlueTopLeft *= zMax; - render.colorBlueBottomLeft *= zMax; - render.colorBlueBottomRight *= zMax; - render.colorBlueTopRight *= zMax; - render.renderWestFace(block, (double)xMin, (double)yMin, (double)zMin, 38); - } - - var8 = true; + flag = true; } if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin - 1, yMin, zMin, 4)) @@ -646,60 +665,64 @@ public class BlockSkinRenderHelper ++xMin; } - var12 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNP + render.aoLightValueXNeg + render.aoLightValueScratchXZNP) / 4.0F; - var9 = (render.aoLightValueXNeg + render.aoLightValueScratchXZNP + render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPP) / 4.0F; - var10 = (render.aoLightValueScratchXZNN + render.aoLightValueXNeg + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F; - var11 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZNN + render.aoLightValueXNeg) / 4.0F; - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, var20); - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYNP, render.aoBrightnessXYZNPP, var20); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessXYNP, var20); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXYNN, render.aoBrightnessXZNN, var20); + if (render.field_98189_n && render.field_94177_n.gameSettings.ambientOcclusion >= 2) + { + f7 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNP + render.aoLightValueXNeg + render.aoLightValueScratchXZNP) / 4.0F; + f9 = (render.aoLightValueXNeg + render.aoLightValueScratchXZNP + render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPP) / 4.0F; + f8 = (render.aoLightValueScratchXZNN + render.aoLightValueXNeg + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F; + f10 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZNN + render.aoLightValueXNeg) / 4.0F; + f3 = (float)((double)f9 * render.renderMaxY * render.renderMaxZ + (double)f8 * render.renderMaxY * (1.0D - render.renderMaxZ) + (double)f10 * (1.0D - render.renderMaxY) * (1.0D - render.renderMaxZ) + (double)f7 * (1.0D - render.renderMaxY) * render.renderMaxZ); + f4 = (float)((double)f9 * render.renderMaxY * render.renderMinZ + (double)f8 * render.renderMaxY * (1.0D - render.renderMinZ) + (double)f10 * (1.0D - render.renderMaxY) * (1.0D - render.renderMinZ) + (double)f7 * (1.0D - render.renderMaxY) * render.renderMinZ); + f5 = (float)((double)f9 * render.renderMinY * render.renderMinZ + (double)f8 * render.renderMinY * (1.0D - render.renderMinZ) + (double)f10 * (1.0D - render.renderMinY) * (1.0D - render.renderMinZ) + (double)f7 * (1.0D - render.renderMinY) * render.renderMinZ); + f6 = (float)((double)f9 * render.renderMinY * render.renderMaxZ + (double)f8 * render.renderMinY * (1.0D - render.renderMaxZ) + (double)f10 * (1.0D - render.renderMinY) * (1.0D - render.renderMaxZ) + (double)f7 * (1.0D - render.renderMinY) * render.renderMaxZ); + k2 = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, i1); + i3 = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYNP, render.aoBrightnessXYZNPP, i1); + j3 = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessXYNP, i1); + l2 = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXYNN, render.aoBrightnessXZNN, i1); + render.brightnessTopLeft = render.func_96444_a(i3, j3, l2, k2, render.renderMaxY * render.renderMaxZ, render.renderMaxY * (1.0D - render.renderMaxZ), (1.0D - render.renderMaxY) * (1.0D - render.renderMaxZ), (1.0D - render.renderMaxY) * render.renderMaxZ); + render.brightnessBottomLeft = render.func_96444_a(i3, j3, l2, k2, render.renderMaxY * render.renderMinZ, render.renderMaxY * (1.0D - render.renderMinZ), (1.0D - render.renderMaxY) * (1.0D - render.renderMinZ), (1.0D - render.renderMaxY) * render.renderMinZ); + render.brightnessBottomRight = render.func_96444_a(i3, j3, l2, k2, render.renderMinY * render.renderMinZ, render.renderMinY * (1.0D - render.renderMinZ), (1.0D - render.renderMinY) * (1.0D - render.renderMinZ), (1.0D - render.renderMinY) * render.renderMinZ); + render.brightnessTopRight = render.func_96444_a(i3, j3, l2, k2, render.renderMinY * render.renderMaxZ, render.renderMinY * (1.0D - render.renderMaxZ), (1.0D - render.renderMinY) * (1.0D - render.renderMaxZ), (1.0D - render.renderMinY) * render.renderMaxZ); + } + else + { + f6 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNP + render.aoLightValueXNeg + render.aoLightValueScratchXZNP) / 4.0F; + f3 = (render.aoLightValueXNeg + render.aoLightValueScratchXZNP + render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPP) / 4.0F; + f4 = (render.aoLightValueScratchXZNN + render.aoLightValueXNeg + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F; + f5 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZNN + render.aoLightValueXNeg) / 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); + } } else { - var12 = render.aoLightValueXNeg; - var11 = render.aoLightValueXNeg; - var10 = render.aoLightValueXNeg; - var9 = render.aoLightValueXNeg; - render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = var20; + f6 = render.aoLightValueXNeg; + f5 = render.aoLightValueXNeg; + f4 = render.aoLightValueXNeg; + f3 = render.aoLightValueXNeg; + render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = i1; } - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = (var17 ? xMax : 1.0F) * 0.6F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = (var17 ? yMax : 1.0F) * 0.6F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = (var17 ? zMax : 1.0F) * 0.6F; - render.colorRedTopLeft *= var9; - render.colorGreenTopLeft *= var9; - render.colorBlueTopLeft *= var9; - render.colorRedBottomLeft *= var10; - render.colorGreenBottomLeft *= var10; - render.colorBlueBottomLeft *= var10; - render.colorRedBottomRight *= var11; - render.colorGreenBottomRight *= var11; - render.colorBlueBottomRight *= var11; - render.colorRedTopRight *= var12; - render.colorGreenTopRight *= var12; - render.colorBlueTopRight *= var12; - var27 = block.getBlockTextureFromSideAndMetadata(4, metadata); - render.renderNorthFace(block, (double)xMin, (double)yMin, (double)zMin, var27); + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = (flag5 ? xMax : 1.0F) * 0.6F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = (flag5 ? yMax : 1.0F) * 0.6F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = (flag5 ? zMax : 1.0F) * 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.renderNorthFace(block, (double)xMin, (double)yMin, (double)zMin, block.getBlockTextureFromSideAndMetadata(4, metadata)); - if (Tessellator.instance.defaultTexture && render.fancyGrass && var27 == 3 && render.overrideBlockTexture < 0) - { - render.colorRedTopLeft *= xMax; - render.colorRedBottomLeft *= xMax; - render.colorRedBottomRight *= xMax; - render.colorRedTopRight *= xMax; - render.colorGreenTopLeft *= yMax; - render.colorGreenBottomLeft *= yMax; - render.colorGreenBottomRight *= yMax; - render.colorGreenTopRight *= yMax; - render.colorBlueTopLeft *= zMax; - render.colorBlueBottomLeft *= zMax; - render.colorBlueBottomRight *= zMax; - render.colorBlueTopRight *= zMax; - render.renderNorthFace(block, (double)xMin, (double)yMin, (double)zMin, 38); - } - - var8 = true; + flag = true; } if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin + 1, yMin, zMin, 5)) @@ -769,191 +792,165 @@ public class BlockSkinRenderHelper --xMin; } - var9 = (render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNP + render.aoLightValueXPos + render.aoLightValueScratchXZPP) / 4.0F; - var12 = (render.aoLightValueXPos + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPP) / 4.0F; - var11 = (render.aoLightValueScratchXZPN + render.aoLightValueXPos + render.aoLightValueScratchXYZPPN + render.aoLightValueScratchXYPP) / 4.0F; - var10 = (render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXZPN + render.aoLightValueXPos) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, var23); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, var23); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, var23); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZPNN, render.aoBrightnessXYPN, render.aoBrightnessXZPN, var23); + if (render.field_98189_n && render.field_94177_n.gameSettings.ambientOcclusion >= 2) + { + f7 = (render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNP + render.aoLightValueXPos + render.aoLightValueScratchXZPP) / 4.0F; + f9 = (render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXZPN + render.aoLightValueXPos) / 4.0F; + f8 = (render.aoLightValueScratchXZPN + render.aoLightValueXPos + render.aoLightValueScratchXYZPPN + render.aoLightValueScratchXYPP) / 4.0F; + f10 = (render.aoLightValueXPos + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPP) / 4.0F; + f3 = (float)((double)f7 * (1.0D - render.renderMinY) * render.renderMaxZ + (double)f9 * (1.0D - render.renderMinY) * (1.0D - render.renderMaxZ) + (double)f8 * render.renderMinY * (1.0D - render.renderMaxZ) + (double)f10 * render.renderMinY * render.renderMaxZ); + f4 = (float)((double)f7 * (1.0D - render.renderMinY) * render.renderMinZ + (double)f9 * (1.0D - render.renderMinY) * (1.0D - render.renderMinZ) + (double)f8 * render.renderMinY * (1.0D - render.renderMinZ) + (double)f10 * render.renderMinY * render.renderMinZ); + f5 = (float)((double)f7 * (1.0D - render.renderMaxY) * render.renderMinZ + (double)f9 * (1.0D - render.renderMaxY) * (1.0D - render.renderMinZ) + (double)f8 * render.renderMaxY * (1.0D - render.renderMinZ) + (double)f10 * render.renderMaxY * render.renderMinZ); + f6 = (float)((double)f7 * (1.0D - render.renderMaxY) * render.renderMaxZ + (double)f9 * (1.0D - render.renderMaxY) * (1.0D - render.renderMaxZ) + (double)f8 * render.renderMaxY * (1.0D - render.renderMaxZ) + (double)f10 * render.renderMaxY * render.renderMaxZ); + k2 = render.getAoBrightness(render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, l1); + i3 = render.getAoBrightness(render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, l1); + j3 = render.getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, l1); + l2 = render.getAoBrightness(render.aoBrightnessXYZPNN, render.aoBrightnessXYPN, render.aoBrightnessXZPN, l1); + render.brightnessTopLeft = render.func_96444_a(k2, l2, j3, i3, (1.0D - render.renderMinY) * render.renderMaxZ, (1.0D - render.renderMinY) * (1.0D - render.renderMaxZ), render.renderMinY * (1.0D - render.renderMaxZ), render.renderMinY * render.renderMaxZ); + render.brightnessBottomLeft = render.func_96444_a(k2, l2, j3, i3, (1.0D - render.renderMinY) * render.renderMinZ, (1.0D - render.renderMinY) * (1.0D - render.renderMinZ), render.renderMinY * (1.0D - render.renderMinZ), render.renderMinY * render.renderMinZ); + render.brightnessBottomRight = render.func_96444_a(k2, l2, j3, i3, (1.0D - render.renderMaxY) * render.renderMinZ, (1.0D - render.renderMaxY) * (1.0D - render.renderMinZ), render.renderMaxY * (1.0D - render.renderMinZ), render.renderMaxY * render.renderMinZ); + render.brightnessTopRight = render.func_96444_a(k2, l2, j3, i3, (1.0D - render.renderMaxY) * render.renderMaxZ, (1.0D - render.renderMaxY) * (1.0D - render.renderMaxZ), render.renderMaxY * (1.0D - render.renderMaxZ), render.renderMaxY * render.renderMaxZ); + } + else + { + f3 = (render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNP + render.aoLightValueXPos + render.aoLightValueScratchXZPP) / 4.0F; + f4 = (render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXZPN + render.aoLightValueXPos) / 4.0F; + f5 = (render.aoLightValueScratchXZPN + render.aoLightValueXPos + render.aoLightValueScratchXYZPPN + render.aoLightValueScratchXYPP) / 4.0F; + f6 = (render.aoLightValueXPos + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPP) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, l1); + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, l1); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, l1); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZPNN, render.aoBrightnessXYPN, render.aoBrightnessXZPN, l1); + } } else { - var12 = render.aoLightValueXPos; - var11 = render.aoLightValueXPos; - var10 = render.aoLightValueXPos; - var9 = render.aoLightValueXPos; - render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = var23; + f6 = render.aoLightValueXPos; + f5 = render.aoLightValueXPos; + f4 = render.aoLightValueXPos; + f3 = render.aoLightValueXPos; + render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = l1; } - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = (var18 ? xMax : 1.0F) * 0.6F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = (var18 ? yMax : 1.0F) * 0.6F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = (var18 ? zMax : 1.0F) * 0.6F; - render.colorRedTopLeft *= var9; - render.colorGreenTopLeft *= var9; - render.colorBlueTopLeft *= var9; - render.colorRedBottomLeft *= var10; - render.colorGreenBottomLeft *= var10; - render.colorBlueBottomLeft *= var10; - render.colorRedBottomRight *= var11; - render.colorGreenBottomRight *= var11; - render.colorBlueBottomRight *= var11; - render.colorRedTopRight *= var12; - render.colorGreenTopRight *= var12; - render.colorBlueTopRight *= var12; - var27 = block.getBlockTextureFromSideAndMetadata(5, metadata); - render.renderSouthFace(block, (double)xMin, (double)yMin, (double)zMin, var27); + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = (flag6 ? xMax : 1.0F) * 0.6F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = (flag6 ? yMax : 1.0F) * 0.6F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = (flag6 ? zMax : 1.0F) * 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.renderSouthFace(block, (double)xMin, (double)yMin, (double)zMin, block.getBlockTextureFromSideAndMetadata(5, metadata)); - if (Tessellator.instance.defaultTexture && render.fancyGrass && var27 == 3 && render.overrideBlockTexture < 0) - { - render.colorRedTopLeft *= xMax; - render.colorRedBottomLeft *= xMax; - render.colorRedBottomRight *= xMax; - render.colorRedTopRight *= xMax; - render.colorGreenTopLeft *= yMax; - render.colorGreenBottomLeft *= yMax; - render.colorGreenBottomRight *= yMax; - render.colorGreenTopRight *= yMax; - render.colorBlueTopLeft *= zMax; - render.colorBlueBottomLeft *= zMax; - render.colorBlueBottomRight *= zMax; - render.colorBlueTopRight *= zMax; - render.renderSouthFace(block, (double)xMin, (double)yMin, (double)zMin, 38); - } - - var8 = true; + flag = true; } render.enableAO = false; - return var8;*/ - return false; + return flag; } - static boolean renderMetadataBlockWithColorMultiplier(Block block, int metadata, int minX, int minY, int minZ, float maxX, float maxY, float maxZ, RenderBlocks render, IBlockAccess world) + static boolean renderMetadataBlockWithColorMultiplier(Block block, int metadata, int xMin, int yMin, int zMin, float xMax, float yMax, float zMax, RenderBlocks render, IBlockAccess world) { - /*render.enableAO = false; - Tessellator var8 = Tessellator.instance; - boolean var9 = false; - float var10 = 0.5F; - float var11 = 1.0F; - float var12 = 0.8F; - float var13 = 0.6F; - float var14 = var11 * maxX; - float var15 = var11 * maxY; - float var16 = var11 * maxZ; - float var17 = var10; - float var18 = var12; - float var19 = var13; - float var20 = var10; - float var21 = var12; - float var22 = var13; - float var23 = var10; - float var24 = var12; - float var25 = var13; + 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 * xMax; + float f8 = f4 * yMax; + float f9 = f4 * zMax; + 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 != Block.grass) { - var17 = var10 * maxX; - var18 = var12 * maxX; - var19 = var13 * maxX; - var20 = var10 * maxY; - var21 = var12 * maxY; - var22 = var13 * maxY; - var23 = var10 * maxZ; - var24 = var12 * maxZ; - var25 = var13 * maxZ; + f10 = f3 * xMax; + f11 = f5 * xMax; + f12 = f6 * xMax; + f13 = f3 * yMax; + f14 = f5 * yMax; + f15 = f6 * yMax; + f16 = f3 * zMax; + f17 = f5 * zMax; + f18 = f6 * zMax; } - int var26 = block.getMixedBrightnessForBlock(render.blockAccess, minX, minY, minZ); + int l = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin); - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, minX, minY - 1, minZ, 0)) + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin, yMin - 1, zMin, 0)) { - var8.setBrightness(render.renderMinY > 0.0D ? var26 : block.getMixedBrightnessForBlock(render.blockAccess, minX, minY - 1, minZ)); - var8.setColorOpaque_F(var17, var20, var23); - render.renderBottomFace(block, (double)minX, (double)minY, (double)minZ, block.getBlockTextureFromSideAndMetadata(0, metadata)); - var9 = true; + tessellator.setBrightness(render.renderMinY > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin - 1, zMin)); + tessellator.setColorOpaque_F(f10, f13, f16); + render.renderBottomFace(block, (double)xMin, (double)yMin, (double)zMin, block.getBlockTextureFromSideAndMetadata(0, metadata)); + flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, minX, minY + 1, minZ, 1)) + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin, yMin + 1, zMin, 1)) { - var8.setBrightness(render.renderMaxY < 1.0D ? var26 : block.getMixedBrightnessForBlock(render.blockAccess, minX, minY + 1, minZ)); - var8.setColorOpaque_F(var14, var15, var16); - render.renderTopFace(block, (double)minX, (double)minY, (double)minZ, block.getBlockTextureFromSideAndMetadata(1, metadata)); - var9 = true; + tessellator.setBrightness(render.renderMaxY < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin + 1, zMin)); + tessellator.setColorOpaque_F(f7, f8, f9); + render.renderTopFace(block, (double)xMin, (double)yMin, (double)zMin, block.getBlockTextureFromSideAndMetadata(1, metadata)); + flag = true; } - int var28; + Icon icon; - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, minX, minY, minZ - 1, 2)) + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin, yMin, zMin - 1, 2)) { - var8.setBrightness(render.renderMinZ > 0.0D ? var26 : block.getMixedBrightnessForBlock(render.blockAccess, minX, minY, minZ - 1)); - var8.setColorOpaque_F(var18, var21, var24); - var28 = block.getBlockTextureFromSideAndMetadata(2, metadata); - render.renderEastFace(block, (double)minX, (double)minY, (double)minZ, var28); + tessellator.setBrightness(render.renderMinZ > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin - 1)); + tessellator.setColorOpaque_F(f11, f14, f17); + render.renderEastFace(block, (double)xMin, (double)yMin, (double)zMin, block.getBlockTextureFromSideAndMetadata(2, metadata)); - if (Tessellator.instance.defaultTexture && render.fancyGrass && var28 == 3 && render.overrideBlockTexture < 0) - { - var8.setColorOpaque_F(var18 * maxX, var21 * maxY, var24 * maxZ); - render.renderEastFace(block, (double)minX, (double)minY, (double)minZ, 38); - } - - var9 = true; + flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, minX, minY, minZ + 1, 3)) + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin, yMin, zMin + 1, 3)) { - var8.setBrightness(render.renderMaxZ < 1.0D ? var26 : block.getMixedBrightnessForBlock(render.blockAccess, minX, minY, minZ + 1)); - var8.setColorOpaque_F(var18, var21, var24); - var28 = block.getBlockTextureFromSideAndMetadata(3, metadata); - render.renderWestFace(block, (double)minX, (double)minY, (double)minZ, var28); + tessellator.setBrightness(render.renderMaxZ < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin + 1)); + tessellator.setColorOpaque_F(f11, f14, f17); + render.renderWestFace(block, (double)xMin, (double)yMin, (double)zMin, block.getBlockTextureFromSideAndMetadata(3, metadata)); - if (Tessellator.instance.defaultTexture && render.fancyGrass && var28 == 3 && render.overrideBlockTexture < 0) - { - var8.setColorOpaque_F(var18 * maxX, var21 * maxY, var24 * maxZ); - render.renderWestFace(block, (double)minX, (double)minY, (double)minZ, 38); - } - - var9 = true; + flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, minX - 1, minY, minZ, 4)) + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin - 1, yMin, zMin, 4)) { - var8.setBrightness(render.renderMinX > 0.0D ? var26 : block.getMixedBrightnessForBlock(render.blockAccess, minX - 1, minY, minZ)); - var8.setColorOpaque_F(var19, var22, var25); - var28 = block.getBlockTextureFromSideAndMetadata(4, metadata); - render.renderNorthFace(block, (double)minX, (double)minY, (double)minZ, var28); + tessellator.setBrightness(render.renderMinX > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin, zMin)); + tessellator.setColorOpaque_F(f12, f15, f18); + render.renderNorthFace(block, (double)xMin, (double)yMin, (double)zMin, block.getBlockTextureFromSideAndMetadata(4, metadata)); - if (Tessellator.instance.defaultTexture && render.fancyGrass && var28 == 3 && render.overrideBlockTexture < 0) - { - var8.setColorOpaque_F(var19 * maxX, var22 * maxY, var25 * maxZ); - render.renderNorthFace(block, (double)minX, (double)minY, (double)minZ, 38); - } - - var9 = true; + flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, minX + 1, minY, minZ, 5)) + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin + 1, yMin, zMin, 5)) { - var8.setBrightness(render.renderMaxX < 1.0D ? var26 : block.getMixedBrightnessForBlock(render.blockAccess, minX + 1, minY, minZ)); - var8.setColorOpaque_F(var19, var22, var25); - var28 = block.getBlockTextureFromSideAndMetadata(5, metadata); - render.renderSouthFace(block, (double)minX, (double)minY, (double)minZ, var28); + tessellator.setBrightness(render.renderMaxX < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin, zMin)); + tessellator.setColorOpaque_F(f12, f15, f18); + render.renderSouthFace(block, (double)xMin, (double)yMin, (double)zMin, block.getBlockTextureFromSideAndMetadata(5, metadata)); - if (Tessellator.instance.defaultTexture && render.fancyGrass && var28 == 3 && render.overrideBlockTexture < 0) - { - var8.setColorOpaque_F(var19 * maxX, var22 * maxY, var25 * maxZ); - render.renderSouthFace(block, (double)minX, (double)minY, (double)minZ, 38); - } - - var9 = true; + flag = true; } - return var9;*/ - return false; + return flag; } - public static boolean renderFakeBlock (int texturePos, int metadata, int x, int y, int z, RenderBlocks renderer, IBlockAccess world) + public static boolean renderFakeBlock (Icon texture, int metadata, int x, int y, int z, RenderBlocks renderer, IBlockAccess world) { Block block = Block.stone; int var5 = block.colorMultiplier(world, x, y, z); @@ -972,26 +969,26 @@ public class BlockSkinRenderHelper } return Minecraft.isAmbientOcclusionEnabled() ? - renderFakeBlockWithAmbientOcclusion(texturePos, metadata, x, y, z, var6, var7, var8, renderer, world) - : renderFakeBlockWithColorMultiplier(texturePos, metadata, x, y, z, var6, var7, var8, renderer, world); + renderFakeBlockWithAmbientOcclusion(texture, metadata, x, y, z, var6, var7, var8, renderer, world) + : renderFakeBlockWithColorMultiplier(texture, metadata, x, y, z, var6, var7, var8, renderer, world); } - static boolean renderFakeBlockWithAmbientOcclusion(int texturePos, int metadata, int xMin, int yMin, int zMin, + static boolean renderFakeBlockWithAmbientOcclusion(Icon texture, int metadata, int xMin, int yMin, int zMin, float xMax, float yMax, float zMax, RenderBlocks render, IBlockAccess world) { - /*Block block = Block.stone; - render.enableAO = true; - boolean var8 = false; - float var9 = render.lightValueOwn; - float var10 = render.lightValueOwn; - float var11 = render.lightValueOwn; - float var12 = render.lightValueOwn; - boolean var13 = true; - boolean var14 = true; - boolean var15 = true; - boolean var16 = true; - boolean var17 = true; - boolean var18 = true; + Block block = Block.stone; + render.enableAO = true; + boolean flag = false; + float f3 = render.lightValueOwn; + float f4 = render.lightValueOwn; + float f5 = render.lightValueOwn; + float f6 = render.lightValueOwn; + boolean flag1 = true; + boolean flag2 = true; + boolean flag3 = true; + boolean flag4 = true; + boolean flag5 = true; + boolean flag6 = true; render.lightValueOwn = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin, zMin); render.aoLightValueXNeg = block.getAmbientOcclusionLightValue(render.blockAccess, xMin - 1, yMin, zMin); render.aoLightValueYNeg = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin - 1, zMin); @@ -999,46 +996,46 @@ public class BlockSkinRenderHelper render.aoLightValueXPos = block.getAmbientOcclusionLightValue(render.blockAccess, xMin + 1, yMin, zMin); render.aoLightValueYPos = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin + 1, zMin); render.aoLightValueZPos = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin, zMin + 1); - int var19 = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin); - int var20 = var19; - int var21 = var19; - int var22 = var19; - int var23 = var19; - int var24 = var19; - int var25 = var19; + int l = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin); + int i1 = l; + int j1 = l; + int k1 = l; + int l1 = l; + int i2 = l; + int j2 = l; - if (render.renderMinY <= 0.0D) + if (render.renderMinY <= 0.0D || !render.blockAccess.isBlockOpaqueCube(xMin, yMin - 1, zMin)) { - var21 = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin - 1, zMin); + j1 = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin - 1, zMin); } - if (render.renderMaxY >= 1.0D) + if (render.renderMaxY >= 1.0D || !render.blockAccess.isBlockOpaqueCube(xMin, yMin + 1, zMin)) { - var24 = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin + 1, zMin); + i2 = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin + 1, zMin); } - if (render.renderMinX <= 0.0D) + if (render.renderMinX <= 0.0D || !render.blockAccess.isBlockOpaqueCube(xMin - 1, yMin, zMin)) { - var20 = block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin, zMin); + i1 = block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin, zMin); } - if (render.renderMaxX >= 1.0D) + if (render.renderMaxX >= 1.0D || !render.blockAccess.isBlockOpaqueCube(xMin + 1, yMin, zMin)) { - var23 = block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin, zMin); + l1 = block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin, zMin); } - if (render.renderMinZ <= 0.0D) + if (render.renderMinZ <= 0.0D || !render.blockAccess.isBlockOpaqueCube(xMin, yMin, zMin - 1)) { - var22 = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin - 1); + k1 = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin - 1); } - if (render.renderMaxZ >= 1.0D) + if (render.renderMaxZ >= 1.0D || !render.blockAccess.isBlockOpaqueCube(xMin, yMin, zMin + 1)) { - var25 = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin + 1); + j2 = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin + 1); } - Tessellator var26 = Tessellator.instance; - var26.setBrightness(983055); + Tessellator tessellator = Tessellator.instance; + tessellator.setBrightness(983055); render.aoGrassXYZPPC = Block.canBlockGrass[render.blockAccess.getBlockId(xMin + 1, yMin + 1, zMin)]; render.aoGrassXYZPNC = Block.canBlockGrass[render.blockAccess.getBlockId(xMin + 1, yMin - 1, zMin)]; render.aoGrassXYZPCP = Block.canBlockGrass[render.blockAccess.getBlockId(xMin + 1, yMin, zMin + 1)]; @@ -1052,22 +1049,22 @@ public class BlockSkinRenderHelper render.aoGrassXYZCNP = Block.canBlockGrass[render.blockAccess.getBlockId(xMin, yMin - 1, zMin + 1)]; render.aoGrassXYZCNN = Block.canBlockGrass[render.blockAccess.getBlockId(xMin, yMin - 1, zMin - 1)]; - if (block.blockIndexInTexture == 3) + if (render.func_94175_b(block).func_94215_i().equals("grass_top")) { - var18 = false; - var17 = false; - var16 = false; - var15 = false; - var13 = false; + flag6 = false; + flag5 = false; + flag4 = false; + flag3 = false; + flag1 = false; } - if (render.overrideBlockTexture >= 0) + if (render.func_94167_b()) { - var18 = false; - var17 = false; - var16 = false; - var15 = false; - var13 = false; + flag6 = false; + flag5 = false; + flag4 = false; + flag3 = false; + flag1 = false; } if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin, yMin - 1, zMin, 0)) @@ -1137,41 +1134,41 @@ public class BlockSkinRenderHelper ++yMin; } - var9 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXYNN + render.aoLightValueScratchYZNP + render.aoLightValueYNeg) / 4.0F; - var12 = (render.aoLightValueScratchYZNP + render.aoLightValueYNeg + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXYPN) / 4.0F; - var11 = (render.aoLightValueYNeg + render.aoLightValueScratchYZNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNN) / 4.0F; - var10 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNN + render.aoLightValueYNeg + render.aoLightValueScratchYZNN) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXYNN, render.aoBrightnessYZNP, var21); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXYPN, var21); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYPN, render.aoBrightnessXYZPNN, var21); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNN, render.aoBrightnessYZNN, var21); + f3 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXYNN + render.aoLightValueScratchYZNP + render.aoLightValueYNeg) / 4.0F; + f6 = (render.aoLightValueScratchYZNP + render.aoLightValueYNeg + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXYPN) / 4.0F; + f5 = (render.aoLightValueYNeg + render.aoLightValueScratchYZNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNN) / 4.0F; + f4 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNN + render.aoLightValueYNeg + render.aoLightValueScratchYZNN) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXYNN, render.aoBrightnessYZNP, j1); + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXYPN, j1); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYPN, render.aoBrightnessXYZPNN, j1); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNN, render.aoBrightnessYZNN, j1); } else { - var12 = render.aoLightValueYNeg; - var11 = render.aoLightValueYNeg; - var10 = render.aoLightValueYNeg; - var9 = render.aoLightValueYNeg; + f6 = render.aoLightValueYNeg; + f5 = render.aoLightValueYNeg; + f4 = render.aoLightValueYNeg; + f3 = render.aoLightValueYNeg; render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = render.aoBrightnessXYNN; } - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = (var13 ? xMax : 1.0F) * 0.5F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = (var13 ? yMax : 1.0F) * 0.5F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = (var13 ? zMax : 1.0F) * 0.5F; - render.colorRedTopLeft *= var9; - render.colorGreenTopLeft *= var9; - render.colorBlueTopLeft *= var9; - render.colorRedBottomLeft *= var10; - render.colorGreenBottomLeft *= var10; - render.colorBlueBottomLeft *= var10; - render.colorRedBottomRight *= var11; - render.colorGreenBottomRight *= var11; - render.colorBlueBottomRight *= var11; - render.colorRedTopRight *= var12; - render.colorGreenTopRight *= var12; - render.colorBlueTopRight *= var12; - render.renderBottomFace(block, (double)xMin, (double)yMin, (double)zMin, texturePos); - var8 = true; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = (flag1 ? xMax : 1.0F) * 0.5F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = (flag1 ? yMax : 1.0F) * 0.5F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = (flag1 ? zMax : 1.0F) * 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.renderBottomFace(block, (double)xMin, (double)yMin, (double)zMin, texture); + flag = true; } if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin, yMin + 1, zMin, 1)) @@ -1241,44 +1238,52 @@ public class BlockSkinRenderHelper --yMin; } - var12 = (render.aoLightValueScratchXYZNPP + render.aoLightValueScratchXYNP + render.aoLightValueScratchYZPP + render.aoLightValueYPos) / 4.0F; - var9 = (render.aoLightValueScratchYZPP + render.aoLightValueYPos + render.aoLightValueScratchXYZPPP + render.aoLightValueScratchXYPP) / 4.0F; - var10 = (render.aoLightValueYPos + render.aoLightValueScratchYZPN + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPN) / 4.0F; - var11 = (render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPN + render.aoLightValueYPos + render.aoLightValueScratchYZPN) / 4.0F; - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNPP, render.aoBrightnessXYNP, render.aoBrightnessYZPP, var24); - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXYZPPP, render.aoBrightnessXYPP, var24); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXYPP, render.aoBrightnessXYZPPN, var24); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYNP, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, var24); + f6 = (render.aoLightValueScratchXYZNPP + render.aoLightValueScratchXYNP + render.aoLightValueScratchYZPP + render.aoLightValueYPos) / 4.0F; + f3 = (render.aoLightValueScratchYZPP + render.aoLightValueYPos + render.aoLightValueScratchXYZPPP + render.aoLightValueScratchXYPP) / 4.0F; + f4 = (render.aoLightValueYPos + render.aoLightValueScratchYZPN + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPN) / 4.0F; + f5 = (render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPN + render.aoLightValueYPos + render.aoLightValueScratchYZPN) / 4.0F; + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNPP, render.aoBrightnessXYNP, render.aoBrightnessYZPP, i2); + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXYZPPP, render.aoBrightnessXYPP, i2); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXYPP, render.aoBrightnessXYZPPN, i2); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYNP, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, i2); } else { - var12 = render.aoLightValueYPos; - var11 = render.aoLightValueYPos; - var10 = render.aoLightValueYPos; - var9 = render.aoLightValueYPos; - render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = var24; + f6 = render.aoLightValueYPos; + f5 = render.aoLightValueYPos; + f4 = render.aoLightValueYPos; + f3 = render.aoLightValueYPos; + render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = i2; } - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = var14 ? xMax : 1.0F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = var14 ? yMax : 1.0F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = var14 ? zMax : 1.0F; - render.colorRedTopLeft *= var9; - render.colorGreenTopLeft *= var9; - render.colorBlueTopLeft *= var9; - render.colorRedBottomLeft *= var10; - render.colorGreenBottomLeft *= var10; - render.colorBlueBottomLeft *= var10; - render.colorRedBottomRight *= var11; - render.colorGreenBottomRight *= var11; - render.colorBlueBottomRight *= var11; - render.colorRedTopRight *= var12; - render.colorGreenTopRight *= var12; - render.colorBlueTopRight *= var12; - render.renderTopFace(block, (double)xMin, (double)yMin, (double)zMin, texturePos); - var8 = true; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = flag2 ? xMax : 1.0F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = flag2 ? yMax : 1.0F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = flag2 ? zMax : 1.0F; + 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.renderTopFace(block, (double)xMin, (double)yMin, (double)zMin, texture); + flag = true; } - int var27; + float f7; + float f8; + float f9; + int k2; + float f10; + int l2; + Icon icon; + int i3; + int j3; if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin, yMin, zMin - 1, 2)) { @@ -1347,41 +1352,64 @@ public class BlockSkinRenderHelper ++zMin; } - var9 = (render.aoLightValueScratchXZNN + render.aoLightValueScratchXYZNPN + render.aoLightValueZNeg + render.aoLightValueScratchYZPN) / 4.0F; - var10 = (render.aoLightValueZNeg + render.aoLightValueScratchYZPN + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZPPN) / 4.0F; - var11 = (render.aoLightValueScratchYZNN + render.aoLightValueZNeg + render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXZPN) / 4.0F; - var12 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZNN + render.aoLightValueScratchYZNN + render.aoLightValueZNeg) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, var22); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, var22); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, var22); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXZNN, render.aoBrightnessYZNN, var22); + if (render.field_98189_n && render.field_94177_n.gameSettings.ambientOcclusion >= 2) + { + f7 = (render.aoLightValueScratchXZNN + render.aoLightValueScratchXYZNPN + render.aoLightValueZNeg + render.aoLightValueScratchYZPN) / 4.0F; + f9 = (render.aoLightValueZNeg + render.aoLightValueScratchYZPN + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZPPN) / 4.0F; + f8 = (render.aoLightValueScratchYZNN + render.aoLightValueZNeg + render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXZPN) / 4.0F; + f10 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZNN + render.aoLightValueScratchYZNN + render.aoLightValueZNeg) / 4.0F; + f3 = (float)((double)f7 * render.renderMaxY * (1.0D - render.renderMinX) + (double)f9 * render.renderMinY * render.renderMinX + (double)f8 * (1.0D - render.renderMaxY) * render.renderMinX + (double)f10 * (1.0D - render.renderMaxY) * (1.0D - render.renderMinX)); + f4 = (float)((double)f7 * render.renderMaxY * (1.0D - render.renderMaxX) + (double)f9 * render.renderMaxY * render.renderMaxX + (double)f8 * (1.0D - render.renderMaxY) * render.renderMaxX + (double)f10 * (1.0D - render.renderMaxY) * (1.0D - render.renderMaxX)); + f5 = (float)((double)f7 * render.renderMinY * (1.0D - render.renderMaxX) + (double)f9 * render.renderMinY * render.renderMaxX + (double)f8 * (1.0D - render.renderMinY) * render.renderMaxX + (double)f10 * (1.0D - render.renderMinY) * (1.0D - render.renderMaxX)); + f6 = (float)((double)f7 * render.renderMinY * (1.0D - render.renderMinX) + (double)f9 * render.renderMinY * render.renderMinX + (double)f8 * (1.0D - render.renderMinY) * render.renderMinX + (double)f10 * (1.0D - render.renderMinY) * (1.0D - render.renderMinX)); + k2 = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, k1); + i3 = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, k1); + j3 = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, k1); + l2 = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXZNN, render.aoBrightnessYZNN, k1); + render.brightnessTopLeft = render.func_96444_a(k2, i3, j3, l2, render.renderMaxY * (1.0D - render.renderMinX), render.renderMaxY * render.renderMinX, (1.0D - render.renderMaxY) * render.renderMinX, (1.0D - render.renderMaxY) * (1.0D - render.renderMinX)); + render.brightnessBottomLeft = render.func_96444_a(k2, i3, j3, l2, render.renderMaxY * (1.0D - render.renderMaxX), render.renderMaxY * render.renderMaxX, (1.0D - render.renderMaxY) * render.renderMaxX, (1.0D - render.renderMaxY) * (1.0D - render.renderMaxX)); + render.brightnessBottomRight = render.func_96444_a(k2, i3, j3, l2, render.renderMinY * (1.0D - render.renderMaxX), render.renderMinY * render.renderMaxX, (1.0D - render.renderMinY) * render.renderMaxX, (1.0D - render.renderMinY) * (1.0D - render.renderMaxX)); + render.brightnessTopRight = render.func_96444_a(k2, i3, j3, l2, render.renderMinY * (1.0D - render.renderMinX), render.renderMinY * render.renderMinX, (1.0D - render.renderMinY) * render.renderMinX, (1.0D - render.renderMinY) * (1.0D - render.renderMinX)); + } + else + { + f3 = (render.aoLightValueScratchXZNN + render.aoLightValueScratchXYZNPN + render.aoLightValueZNeg + render.aoLightValueScratchYZPN) / 4.0F; + f4 = (render.aoLightValueZNeg + render.aoLightValueScratchYZPN + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZPPN) / 4.0F; + f5 = (render.aoLightValueScratchYZNN + render.aoLightValueZNeg + render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXZPN) / 4.0F; + f6 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZNN + render.aoLightValueScratchYZNN + render.aoLightValueZNeg) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, k1); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, k1); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, k1); + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXZNN, render.aoBrightnessYZNN, k1); + } } else { - var12 = render.aoLightValueZNeg; - var11 = render.aoLightValueZNeg; - var10 = render.aoLightValueZNeg; - var9 = render.aoLightValueZNeg; - render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = var22; + f6 = render.aoLightValueZNeg; + f5 = render.aoLightValueZNeg; + f4 = render.aoLightValueZNeg; + f3 = render.aoLightValueZNeg; + render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = k1; } - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = (var15 ? xMax : 1.0F) * 0.8F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = (var15 ? yMax : 1.0F) * 0.8F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = (var15 ? zMax : 1.0F) * 0.8F; - render.colorRedTopLeft *= var9; - render.colorGreenTopLeft *= var9; - render.colorBlueTopLeft *= var9; - render.colorRedBottomLeft *= var10; - render.colorGreenBottomLeft *= var10; - render.colorBlueBottomLeft *= var10; - render.colorRedBottomRight *= var11; - render.colorGreenBottomRight *= var11; - render.colorBlueBottomRight *= var11; - render.colorRedTopRight *= var12; - render.colorGreenTopRight *= var12; - render.colorBlueTopRight *= var12; - render.renderEastFace(block, (double)xMin, (double)yMin, (double)zMin, texturePos); - var8 = true; + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = (flag3 ? xMax : 1.0F) * 0.8F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = (flag3 ? yMax : 1.0F) * 0.8F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = (flag3 ? zMax : 1.0F) * 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.renderEastFace(block, (double)xMin, (double)yMin, (double)zMin, texture); + + flag = true; } if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin, yMin, zMin + 1, 3)) @@ -1451,42 +1479,64 @@ public class BlockSkinRenderHelper --zMin; } - var9 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + render.aoLightValueZPos + render.aoLightValueScratchYZPP) / 4.0F; - var12 = (render.aoLightValueZPos + render.aoLightValueScratchYZPP + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYZPPP) / 4.0F; - var11 = (render.aoLightValueScratchYZNP + render.aoLightValueZPos + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXZPP) / 4.0F; - var10 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXZNP + render.aoLightValueScratchYZNP + render.aoLightValueZPos) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, var25); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, var25); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, var25); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, render.aoBrightnessYZNP, var25); + if (render.field_98189_n && render.field_94177_n.gameSettings.ambientOcclusion >= 2) + { + f7 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + render.aoLightValueZPos + render.aoLightValueScratchYZPP) / 4.0F; + f9 = (render.aoLightValueZPos + render.aoLightValueScratchYZPP + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYZPPP) / 4.0F; + f8 = (render.aoLightValueScratchYZNP + render.aoLightValueZPos + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXZPP) / 4.0F; + f10 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXZNP + render.aoLightValueScratchYZNP + render.aoLightValueZPos) / 4.0F; + f3 = (float)((double)f7 * render.renderMaxY * (1.0D - render.renderMinX) + (double)f9 * render.renderMaxY * render.renderMinX + (double)f8 * (1.0D - render.renderMaxY) * render.renderMinX + (double)f10 * (1.0D - render.renderMaxY) * (1.0D - render.renderMinX)); + f4 = (float)((double)f7 * render.renderMinY * (1.0D - render.renderMinX) + (double)f9 * render.renderMinY * render.renderMinX + (double)f8 * (1.0D - render.renderMinY) * render.renderMinX + (double)f10 * (1.0D - render.renderMinY) * (1.0D - render.renderMinX)); + f5 = (float)((double)f7 * render.renderMinY * (1.0D - render.renderMaxX) + (double)f9 * render.renderMinY * render.renderMaxX + (double)f8 * (1.0D - render.renderMinY) * render.renderMaxX + (double)f10 * (1.0D - render.renderMinY) * (1.0D - render.renderMaxX)); + f6 = (float)((double)f7 * render.renderMaxY * (1.0D - render.renderMaxX) + (double)f9 * render.renderMaxY * render.renderMaxX + (double)f8 * (1.0D - render.renderMaxY) * render.renderMaxX + (double)f10 * (1.0D - render.renderMaxY) * (1.0D - render.renderMaxX)); + k2 = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, j2); + i3 = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, j2); + j3 = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, j2); + l2 = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, render.aoBrightnessYZNP, j2); + render.brightnessTopLeft = render.func_96444_a(k2, l2, j3, i3, render.renderMaxY * (1.0D - render.renderMinX), (1.0D - render.renderMaxY) * (1.0D - render.renderMinX), (1.0D - render.renderMaxY) * render.renderMinX, render.renderMaxY * render.renderMinX); + render.brightnessBottomLeft = render.func_96444_a(k2, l2, j3, i3, render.renderMinY * (1.0D - render.renderMinX), (1.0D - render.renderMinY) * (1.0D - render.renderMinX), (1.0D - render.renderMinY) * render.renderMinX, render.renderMinY * render.renderMinX); + render.brightnessBottomRight = render.func_96444_a(k2, l2, j3, i3, render.renderMinY * (1.0D - render.renderMaxX), (1.0D - render.renderMinY) * (1.0D - render.renderMaxX), (1.0D - render.renderMinY) * render.renderMaxX, render.renderMinY * render.renderMaxX); + render.brightnessTopRight = render.func_96444_a(k2, l2, j3, i3, render.renderMaxY * (1.0D - render.renderMaxX), (1.0D - render.renderMaxY) * (1.0D - render.renderMaxX), (1.0D - render.renderMaxY) * render.renderMaxX, render.renderMaxY * render.renderMaxX); + } + else + { + f3 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + render.aoLightValueZPos + render.aoLightValueScratchYZPP) / 4.0F; + f6 = (render.aoLightValueZPos + render.aoLightValueScratchYZPP + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYZPPP) / 4.0F; + f5 = (render.aoLightValueScratchYZNP + render.aoLightValueZPos + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXZPP) / 4.0F; + f4 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXZNP + render.aoLightValueScratchYZNP + render.aoLightValueZPos) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, j2); + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, j2); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, j2); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, render.aoBrightnessYZNP, j2); + } } else { - var12 = render.aoLightValueZPos; - var11 = render.aoLightValueZPos; - var10 = render.aoLightValueZPos; - var9 = render.aoLightValueZPos; - render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = var25; + f6 = render.aoLightValueZPos; + f5 = render.aoLightValueZPos; + f4 = render.aoLightValueZPos; + f3 = render.aoLightValueZPos; + render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = j2; } - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = (var16 ? xMax : 1.0F) * 0.8F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = (var16 ? yMax : 1.0F) * 0.8F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = (var16 ? zMax : 1.0F) * 0.8F; - render.colorRedTopLeft *= var9; - render.colorGreenTopLeft *= var9; - render.colorBlueTopLeft *= var9; - render.colorRedBottomLeft *= var10; - render.colorGreenBottomLeft *= var10; - render.colorBlueBottomLeft *= var10; - render.colorRedBottomRight *= var11; - render.colorGreenBottomRight *= var11; - render.colorBlueBottomRight *= var11; - render.colorRedTopRight *= var12; - render.colorGreenTopRight *= var12; - render.colorBlueTopRight *= var12; - render.renderWestFace(block, (double)xMin, (double)yMin, (double)zMin, texturePos); + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = (flag4 ? xMax : 1.0F) * 0.8F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = (flag4 ? yMax : 1.0F) * 0.8F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = (flag4 ? zMax : 1.0F) * 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.renderWestFace(block, (double)xMin, (double)yMin, (double)zMin, texture); - var8 = true; + flag = true; } if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin - 1, yMin, zMin, 4)) @@ -1556,42 +1606,64 @@ public class BlockSkinRenderHelper ++xMin; } - var12 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNP + render.aoLightValueXNeg + render.aoLightValueScratchXZNP) / 4.0F; - var9 = (render.aoLightValueXNeg + render.aoLightValueScratchXZNP + render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPP) / 4.0F; - var10 = (render.aoLightValueScratchXZNN + render.aoLightValueXNeg + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F; - var11 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZNN + render.aoLightValueXNeg) / 4.0F; - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, var20); - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYNP, render.aoBrightnessXYZNPP, var20); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessXYNP, var20); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXYNN, render.aoBrightnessXZNN, var20); + if (render.field_98189_n && render.field_94177_n.gameSettings.ambientOcclusion >= 2) + { + f7 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNP + render.aoLightValueXNeg + render.aoLightValueScratchXZNP) / 4.0F; + f9 = (render.aoLightValueXNeg + render.aoLightValueScratchXZNP + render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPP) / 4.0F; + f8 = (render.aoLightValueScratchXZNN + render.aoLightValueXNeg + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F; + f10 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZNN + render.aoLightValueXNeg) / 4.0F; + f3 = (float)((double)f9 * render.renderMaxY * render.renderMaxZ + (double)f8 * render.renderMaxY * (1.0D - render.renderMaxZ) + (double)f10 * (1.0D - render.renderMaxY) * (1.0D - render.renderMaxZ) + (double)f7 * (1.0D - render.renderMaxY) * render.renderMaxZ); + f4 = (float)((double)f9 * render.renderMaxY * render.renderMinZ + (double)f8 * render.renderMaxY * (1.0D - render.renderMinZ) + (double)f10 * (1.0D - render.renderMaxY) * (1.0D - render.renderMinZ) + (double)f7 * (1.0D - render.renderMaxY) * render.renderMinZ); + f5 = (float)((double)f9 * render.renderMinY * render.renderMinZ + (double)f8 * render.renderMinY * (1.0D - render.renderMinZ) + (double)f10 * (1.0D - render.renderMinY) * (1.0D - render.renderMinZ) + (double)f7 * (1.0D - render.renderMinY) * render.renderMinZ); + f6 = (float)((double)f9 * render.renderMinY * render.renderMaxZ + (double)f8 * render.renderMinY * (1.0D - render.renderMaxZ) + (double)f10 * (1.0D - render.renderMinY) * (1.0D - render.renderMaxZ) + (double)f7 * (1.0D - render.renderMinY) * render.renderMaxZ); + k2 = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, i1); + i3 = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYNP, render.aoBrightnessXYZNPP, i1); + j3 = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessXYNP, i1); + l2 = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXYNN, render.aoBrightnessXZNN, i1); + render.brightnessTopLeft = render.func_96444_a(i3, j3, l2, k2, render.renderMaxY * render.renderMaxZ, render.renderMaxY * (1.0D - render.renderMaxZ), (1.0D - render.renderMaxY) * (1.0D - render.renderMaxZ), (1.0D - render.renderMaxY) * render.renderMaxZ); + render.brightnessBottomLeft = render.func_96444_a(i3, j3, l2, k2, render.renderMaxY * render.renderMinZ, render.renderMaxY * (1.0D - render.renderMinZ), (1.0D - render.renderMaxY) * (1.0D - render.renderMinZ), (1.0D - render.renderMaxY) * render.renderMinZ); + render.brightnessBottomRight = render.func_96444_a(i3, j3, l2, k2, render.renderMinY * render.renderMinZ, render.renderMinY * (1.0D - render.renderMinZ), (1.0D - render.renderMinY) * (1.0D - render.renderMinZ), (1.0D - render.renderMinY) * render.renderMinZ); + render.brightnessTopRight = render.func_96444_a(i3, j3, l2, k2, render.renderMinY * render.renderMaxZ, render.renderMinY * (1.0D - render.renderMaxZ), (1.0D - render.renderMinY) * (1.0D - render.renderMaxZ), (1.0D - render.renderMinY) * render.renderMaxZ); + } + else + { + f6 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNP + render.aoLightValueXNeg + render.aoLightValueScratchXZNP) / 4.0F; + f3 = (render.aoLightValueXNeg + render.aoLightValueScratchXZNP + render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPP) / 4.0F; + f4 = (render.aoLightValueScratchXZNN + render.aoLightValueXNeg + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F; + f5 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZNN + render.aoLightValueXNeg) / 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); + } } else { - var12 = render.aoLightValueXNeg; - var11 = render.aoLightValueXNeg; - var10 = render.aoLightValueXNeg; - var9 = render.aoLightValueXNeg; - render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = var20; + f6 = render.aoLightValueXNeg; + f5 = render.aoLightValueXNeg; + f4 = render.aoLightValueXNeg; + f3 = render.aoLightValueXNeg; + render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = i1; } - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = (var17 ? xMax : 1.0F) * 0.6F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = (var17 ? yMax : 1.0F) * 0.6F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = (var17 ? zMax : 1.0F) * 0.6F; - render.colorRedTopLeft *= var9; - render.colorGreenTopLeft *= var9; - render.colorBlueTopLeft *= var9; - render.colorRedBottomLeft *= var10; - render.colorGreenBottomLeft *= var10; - render.colorBlueBottomLeft *= var10; - render.colorRedBottomRight *= var11; - render.colorGreenBottomRight *= var11; - render.colorBlueBottomRight *= var11; - render.colorRedTopRight *= var12; - render.colorGreenTopRight *= var12; - render.colorBlueTopRight *= var12; - render.renderNorthFace(block, (double)xMin, (double)yMin, (double)zMin, texturePos); + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = (flag5 ? xMax : 1.0F) * 0.6F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = (flag5 ? yMax : 1.0F) * 0.6F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = (flag5 ? zMax : 1.0F) * 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.renderNorthFace(block, (double)xMin, (double)yMin, (double)zMin, texture); - var8 = true; + flag = true; } if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin + 1, yMin, zMin, 5)) @@ -1661,140 +1733,162 @@ public class BlockSkinRenderHelper --xMin; } - var9 = (render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNP + render.aoLightValueXPos + render.aoLightValueScratchXZPP) / 4.0F; - var12 = (render.aoLightValueXPos + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPP) / 4.0F; - var11 = (render.aoLightValueScratchXZPN + render.aoLightValueXPos + render.aoLightValueScratchXYZPPN + render.aoLightValueScratchXYPP) / 4.0F; - var10 = (render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXZPN + render.aoLightValueXPos) / 4.0F; - render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, var23); - render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, var23); - render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, var23); - render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZPNN, render.aoBrightnessXYPN, render.aoBrightnessXZPN, var23); + if (render.field_98189_n && render.field_94177_n.gameSettings.ambientOcclusion >= 2) + { + f7 = (render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNP + render.aoLightValueXPos + render.aoLightValueScratchXZPP) / 4.0F; + f9 = (render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXZPN + render.aoLightValueXPos) / 4.0F; + f8 = (render.aoLightValueScratchXZPN + render.aoLightValueXPos + render.aoLightValueScratchXYZPPN + render.aoLightValueScratchXYPP) / 4.0F; + f10 = (render.aoLightValueXPos + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPP) / 4.0F; + f3 = (float)((double)f7 * (1.0D - render.renderMinY) * render.renderMaxZ + (double)f9 * (1.0D - render.renderMinY) * (1.0D - render.renderMaxZ) + (double)f8 * render.renderMinY * (1.0D - render.renderMaxZ) + (double)f10 * render.renderMinY * render.renderMaxZ); + f4 = (float)((double)f7 * (1.0D - render.renderMinY) * render.renderMinZ + (double)f9 * (1.0D - render.renderMinY) * (1.0D - render.renderMinZ) + (double)f8 * render.renderMinY * (1.0D - render.renderMinZ) + (double)f10 * render.renderMinY * render.renderMinZ); + f5 = (float)((double)f7 * (1.0D - render.renderMaxY) * render.renderMinZ + (double)f9 * (1.0D - render.renderMaxY) * (1.0D - render.renderMinZ) + (double)f8 * render.renderMaxY * (1.0D - render.renderMinZ) + (double)f10 * render.renderMaxY * render.renderMinZ); + f6 = (float)((double)f7 * (1.0D - render.renderMaxY) * render.renderMaxZ + (double)f9 * (1.0D - render.renderMaxY) * (1.0D - render.renderMaxZ) + (double)f8 * render.renderMaxY * (1.0D - render.renderMaxZ) + (double)f10 * render.renderMaxY * render.renderMaxZ); + k2 = render.getAoBrightness(render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, l1); + i3 = render.getAoBrightness(render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, l1); + j3 = render.getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, l1); + l2 = render.getAoBrightness(render.aoBrightnessXYZPNN, render.aoBrightnessXYPN, render.aoBrightnessXZPN, l1); + render.brightnessTopLeft = render.func_96444_a(k2, l2, j3, i3, (1.0D - render.renderMinY) * render.renderMaxZ, (1.0D - render.renderMinY) * (1.0D - render.renderMaxZ), render.renderMinY * (1.0D - render.renderMaxZ), render.renderMinY * render.renderMaxZ); + render.brightnessBottomLeft = render.func_96444_a(k2, l2, j3, i3, (1.0D - render.renderMinY) * render.renderMinZ, (1.0D - render.renderMinY) * (1.0D - render.renderMinZ), render.renderMinY * (1.0D - render.renderMinZ), render.renderMinY * render.renderMinZ); + render.brightnessBottomRight = render.func_96444_a(k2, l2, j3, i3, (1.0D - render.renderMaxY) * render.renderMinZ, (1.0D - render.renderMaxY) * (1.0D - render.renderMinZ), render.renderMaxY * (1.0D - render.renderMinZ), render.renderMaxY * render.renderMinZ); + render.brightnessTopRight = render.func_96444_a(k2, l2, j3, i3, (1.0D - render.renderMaxY) * render.renderMaxZ, (1.0D - render.renderMaxY) * (1.0D - render.renderMaxZ), render.renderMaxY * (1.0D - render.renderMaxZ), render.renderMaxY * render.renderMaxZ); + } + else + { + f3 = (render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNP + render.aoLightValueXPos + render.aoLightValueScratchXZPP) / 4.0F; + f4 = (render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXZPN + render.aoLightValueXPos) / 4.0F; + f5 = (render.aoLightValueScratchXZPN + render.aoLightValueXPos + render.aoLightValueScratchXYZPPN + render.aoLightValueScratchXYPP) / 4.0F; + f6 = (render.aoLightValueXPos + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPP) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, l1); + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, l1); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, l1); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZPNN, render.aoBrightnessXYPN, render.aoBrightnessXZPN, l1); + } } else { - var12 = render.aoLightValueXPos; - var11 = render.aoLightValueXPos; - var10 = render.aoLightValueXPos; - var9 = render.aoLightValueXPos; - render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = var23; + f6 = render.aoLightValueXPos; + f5 = render.aoLightValueXPos; + f4 = render.aoLightValueXPos; + f3 = render.aoLightValueXPos; + render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = l1; } - render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = (var18 ? xMax : 1.0F) * 0.6F; - render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = (var18 ? yMax : 1.0F) * 0.6F; - render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = (var18 ? zMax : 1.0F) * 0.6F; - render.colorRedTopLeft *= var9; - render.colorGreenTopLeft *= var9; - render.colorBlueTopLeft *= var9; - render.colorRedBottomLeft *= var10; - render.colorGreenBottomLeft *= var10; - render.colorBlueBottomLeft *= var10; - render.colorRedBottomRight *= var11; - render.colorGreenBottomRight *= var11; - render.colorBlueBottomRight *= var11; - render.colorRedTopRight *= var12; - render.colorGreenTopRight *= var12; - render.colorBlueTopRight *= var12; - render.renderSouthFace(block, (double)xMin, (double)yMin, (double)zMin, texturePos); + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = (flag6 ? xMax : 1.0F) * 0.6F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = (flag6 ? yMax : 1.0F) * 0.6F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = (flag6 ? zMax : 1.0F) * 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.renderSouthFace(block, (double)xMin, (double)yMin, (double)zMin, texture); - var8 = true; + flag = true; } render.enableAO = false; - return var8;*/ - return false; + return flag; } - static boolean renderFakeBlockWithColorMultiplier(int texturePos, int metadata, int minX, int minY, int minZ, float maxX, float maxY, float maxZ, RenderBlocks render, IBlockAccess world) + static boolean renderFakeBlockWithColorMultiplier(Icon texture, int metadata, int xMin, int yMin, int zMin, float xMax, float yMax, float zMax, RenderBlocks render, IBlockAccess world) { - /*Block block = Block.stone; - render.enableAO = false; - Tessellator var8 = Tessellator.instance; - boolean var9 = false; - float var10 = 0.5F; - float var11 = 1.0F; - float var12 = 0.8F; - float var13 = 0.6F; - float var14 = var11 * maxX; - float var15 = var11 * maxY; - float var16 = var11 * maxZ; - float var17 = var10; - float var18 = var12; - float var19 = var13; - float var20 = var10; - float var21 = var12; - float var22 = var13; - float var23 = var10; - float var24 = var12; - float var25 = var13; + Block block = Block.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 * xMax; + float f8 = f4 * yMax; + float f9 = f4 * zMax; + 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 != Block.grass) { - var17 = var10 * maxX; - var18 = var12 * maxX; - var19 = var13 * maxX; - var20 = var10 * maxY; - var21 = var12 * maxY; - var22 = var13 * maxY; - var23 = var10 * maxZ; - var24 = var12 * maxZ; - var25 = var13 * maxZ; + f10 = f3 * xMax; + f11 = f5 * xMax; + f12 = f6 * xMax; + f13 = f3 * yMax; + f14 = f5 * yMax; + f15 = f6 * yMax; + f16 = f3 * zMax; + f17 = f5 * zMax; + f18 = f6 * zMax; } - int var26 = block.getMixedBrightnessForBlock(render.blockAccess, minX, minY, minZ); + int l = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin); - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, minX, minY - 1, minZ, 0)) + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin, yMin - 1, zMin, 0)) { - var8.setBrightness(render.renderMinY > 0.0D ? var26 : block.getMixedBrightnessForBlock(render.blockAccess, minX, minY - 1, minZ)); - var8.setColorOpaque_F(var17, var20, var23); - render.renderBottomFace(block, (double)minX, (double)minY, (double)minZ, texturePos); - var9 = true; + tessellator.setBrightness(render.renderMinY > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin - 1, zMin)); + tessellator.setColorOpaque_F(f10, f13, f16); + render.renderBottomFace(block, (double)xMin, (double)yMin, (double)zMin, texture); + flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, minX, minY + 1, minZ, 1)) + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin, yMin + 1, zMin, 1)) { - var8.setBrightness(render.renderMaxY < 1.0D ? var26 : block.getMixedBrightnessForBlock(render.blockAccess, minX, minY + 1, minZ)); - var8.setColorOpaque_F(var14, var15, var16); - render.renderTopFace(block, (double)minX, (double)minY, (double)minZ, texturePos); - var9 = true; + tessellator.setBrightness(render.renderMaxY < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin + 1, zMin)); + tessellator.setColorOpaque_F(f7, f8, f9); + render.renderTopFace(block, (double)xMin, (double)yMin, (double)zMin, texture); + flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, minX, minY, minZ - 1, 2)) + Icon icon; + + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin, yMin, zMin - 1, 2)) { - var8.setBrightness(render.renderMinZ > 0.0D ? var26 : block.getMixedBrightnessForBlock(render.blockAccess, minX, minY, minZ - 1)); - var8.setColorOpaque_F(var18, var21, var24); - render.renderEastFace(block, (double)minX, (double)minY, (double)minZ, texturePos); + tessellator.setBrightness(render.renderMinZ > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin - 1)); + tessellator.setColorOpaque_F(f11, f14, f17); + render.renderEastFace(block, (double)xMin, (double)yMin, (double)zMin, texture); - var9 = true; + flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, minX, minY, minZ + 1, 3)) + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin, yMin, zMin + 1, 3)) { - var8.setBrightness(render.renderMaxZ < 1.0D ? var26 : block.getMixedBrightnessForBlock(render.blockAccess, minX, minY, minZ + 1)); - var8.setColorOpaque_F(var18, var21, var24); - render.renderWestFace(block, (double)minX, (double)minY, (double)minZ, texturePos); + tessellator.setBrightness(render.renderMaxZ < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin + 1)); + tessellator.setColorOpaque_F(f11, f14, f17); + render.renderWestFace(block, (double)xMin, (double)yMin, (double)zMin, texture); - var9 = true; + flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, minX - 1, minY, minZ, 4)) + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin - 1, yMin, zMin, 4)) { - var8.setBrightness(render.renderMinX > 0.0D ? var26 : block.getMixedBrightnessForBlock(render.blockAccess, minX - 1, minY, minZ)); - var8.setColorOpaque_F(var19, var22, var25); - render.renderNorthFace(block, (double)minX, (double)minY, (double)minZ, texturePos); + tessellator.setBrightness(render.renderMinX > 0.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin, zMin)); + tessellator.setColorOpaque_F(f12, f15, f18); + render.renderNorthFace(block, (double)xMin, (double)yMin, (double)zMin, texture); - var9 = true; + flag = true; } - if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, minX + 1, minY, minZ, 5)) + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin + 1, yMin, zMin, 5)) { - var8.setBrightness(render.renderMaxX < 1.0D ? var26 : block.getMixedBrightnessForBlock(render.blockAccess, minX + 1, minY, minZ)); - var8.setColorOpaque_F(var19, var22, var25); - render.renderSouthFace(block, (double)minX, (double)minY, (double)minZ, texturePos); + tessellator.setBrightness(render.renderMaxX < 1.0D ? l : block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin, zMin)); + tessellator.setColorOpaque_F(f12, f15, f18); + render.renderSouthFace(block, (double)xMin, (double)yMin, (double)zMin, texture); - var9 = true; + flag = true; } - return var9;*/ - return false; + return flag; } } diff --git a/mods/tinker/common/InventoryBlock.java b/mods/tinker/common/InventoryBlock.java index 3d4731f2..2e4a71d3 100644 --- a/mods/tinker/common/InventoryBlock.java +++ b/mods/tinker/common/InventoryBlock.java @@ -22,10 +22,19 @@ public abstract class InventoryBlock extends BlockContainer } /* Logic backend */ - public TileEntity createNewTileEntity (World var1) { return null; } - public abstract TileEntity createNewTileEntity(World world, int metadata); + public TileEntity createNewTileEntity (World var1) + { return null; } + public abstract TileEntity createTileEntity(World world, int metadata); public abstract Integer getGui(World world, int x, int y, int z, EntityPlayer entityplayer); public abstract Object getModInstance(); + + /*public void onBlockAdded(World par1World, int x, int y, int z) + { + System.out.println("Added"); + //super.onBlockAdded(par1World, x, y, z); + par1World.setBlockTileEntity(x, y, z, this.createTileEntity(par1World, par1World.getBlockMetadata(x, y, z))); + }*/ + @Override public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ) diff --git a/mods/tinker/tconstruct/TConstruct.java b/mods/tinker/tconstruct/TConstruct.java index 846284c2..654f72a6 100644 --- a/mods/tinker/tconstruct/TConstruct.java +++ b/mods/tinker/tconstruct/TConstruct.java @@ -23,7 +23,7 @@ import cpw.mods.fml.common.registry.GameRegistry; * @author: mDiyo */ -@Mod(modid = "TConstruct", name = "TConstruct", version = "1.4.7_1.1.14", dependencies = "before:*") +@Mod(modid = "TConstruct", name = "TConstruct", version = "1.4.7_1.1.22", dependencies = "before:*") @NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = mods.tinker.tconstruct.TPacketHandler.class) public class TConstruct { diff --git a/mods/tinker/tconstruct/TContent.java b/mods/tinker/tconstruct/TContent.java index 06ec00a9..f4ce2f67 100644 --- a/mods/tinker/tconstruct/TContent.java +++ b/mods/tinker/tconstruct/TContent.java @@ -265,20 +265,20 @@ public class TContent implements IFuelHandler void registerItems () { titleIcon = new TitleIcon(PHConstruct.uselessItem).setUnlocalizedName("tconstruct.titleicon"); - String[] blanks = new String[] {"blankpattern", "blankcast"}; - blankPattern = new CraftingItem(PHConstruct.blankPattern, blanks, blanks).setUnlocalizedName("tconstruct.blankpattern"); + String[] blanks = new String[] {"blank_pattern", "blank_cast"}; + blankPattern = new CraftingItem(PHConstruct.blankPattern, blanks, blanks, "materials/").setUnlocalizedName("tconstruct.Pattern"); String[] craftingMaterials = new String[] { "PaperStack", "SlimeCrystal", "SearedBrick", "CobaltIngot", "ArditeIngot", "ManyullynIngot", "Mossball", "LavaCrystal", "NecroticBone", "CopperIngot", "TinIngot", "AluminumIngot", "RawAluminum", "BronzeIngot", "AlBrassIngot", "AlumiteIngot", "SteelIngot" }; String[] craftingTextures = new String[] { - "material_paper_stack", "material_slime_crystal", "material_seared_brick", "material_cobalt_ingot", "material_ardite_ingot", "material_manyullyn_ingot", - "material_mossball", "material_lava_crystal", "material_necrotic_bone", "material_copper_ingot", "material_tin_ingot", "material_aluminum_ingot", - "material_raw_aluminum", "material_bronze_ingot", "material_alubrass_ingot", "material_alumite_ingot", "material_steel_ingot" }; - materials = new CraftingItem(PHConstruct.materials, craftingMaterials, craftingTextures).setUnlocalizedName("tconstruct.Materials"); + "material_paperstack", "material_slimecrystal", "material_searedbrick", "material_cobaltingot", "material_arditeingot", "material_manyullyningot", + "material_mossball", "material_lavacrystal", "material_necroticbone", "material_copperingot", "material_tiningot", "material_aluminumingot", + "material_aluminumraw", "material_bronzeingot", "material_alubrassingot", "material_alumiteingot", "material_steelingot" }; + materials = new CraftingItem(PHConstruct.materials, craftingMaterials, craftingTextures, "materials/").setUnlocalizedName("tconstruct.Materials"); toolRod = new ToolPart(PHConstruct.toolRod, "ToolRod", "_rod").setUnlocalizedName("tconstruct.ToolRod"); - toolShard = new ToolShard(PHConstruct.toolShard, "ToolShard", "_shard").setUnlocalizedName("tconstruct.ToolShard"); - woodPattern = new Pattern(PHConstruct.woodPattern, "WoodPattern").setUnlocalizedName("tconstruct.Pattern"); - metalPattern = new MetalPattern(PHConstruct.metalPattern, "MetalPattern").setUnlocalizedName("tconstruct.MetalPattern"); + toolShard = new ToolShard(PHConstruct.toolShard, "ToolShard", "_chunk").setUnlocalizedName("tconstruct.ToolShard"); + woodPattern = new Pattern(PHConstruct.woodPattern, "WoodPattern", "pattern_", "materials/").setUnlocalizedName("tconstruct.Pattern"); + metalPattern = new MetalPattern(PHConstruct.metalPattern, "MetalPattern", "cast_", "materials/").setUnlocalizedName("tconstruct.MetalPattern"); //stonePattern = new Pattern(PHTools.stonePattern, 64, patternTexture).setUnlocalizedName("tconstruct.Pattern"); //netherPattern = new Pattern(PHTools.netherPattern, 128, patternTexture).setUnlocalizedName("tconstruct.Pattern"); diff --git a/mods/tinker/tconstruct/ai/CoreAI.java b/mods/tinker/tconstruct/ai/CoreAI.java new file mode 100644 index 00000000..c03d98a5 --- /dev/null +++ b/mods/tinker/tconstruct/ai/CoreAI.java @@ -0,0 +1,56 @@ +package mods.tinker.tconstruct.ai; + +import mods.tinker.tconstruct.entity.GolemBase; +import net.minecraft.entity.Entity; + +public class CoreAI +{ + public void initAI (GolemBase golem, boolean flag) + { + } + + public void idle (GolemBase golem) + { + } + + + public void update (GolemBase golem) + { + } + + public void lateUpdate (GolemBase golem) + { + } + + public void interact (GolemBase golem) + { + } + + public boolean patrol (GolemBase golem) + { + return false; + } + + public boolean follow (GolemBase golem) + { + return false; + } + + public boolean attack (GolemBase golem, Entity entity, float f) + { + return false; + } + + public boolean protect (GolemBase golem) + { + return false; + } + + public void onWork (GolemBase golem) + { + } + + public void undoAI (GolemBase golem, boolean flag) + { + } +} diff --git a/mods/tinker/tconstruct/blocks/EquipBlock.java b/mods/tinker/tconstruct/blocks/EquipBlock.java index d366571c..5c62e5f0 100644 --- a/mods/tinker/tconstruct/blocks/EquipBlock.java +++ b/mods/tinker/tconstruct/blocks/EquipBlock.java @@ -12,6 +12,7 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; @@ -33,12 +34,17 @@ public class EquipBlock extends InventoryBlock { return new String[] { "toolstation_top" }; } + + public Icon getBlockTextureFromSideAndMetadata (int side, int meta) + { + return Block.blockSteel.getBlockTextureFromSideAndMetadata(side, meta); + } - @SideOnly(Side.CLIENT) + /*@SideOnly(Side.CLIENT) public void func_94332_a (IconRegister par1IconRegister) { this.field_94336_cN = par1IconRegister.func_94245_a(Block.blockSteel.getUnlocalizedName()); - } + }*/ @Override public boolean renderAsNormalBlock () @@ -64,7 +70,8 @@ public class EquipBlock extends InventoryBlock return 0; } - public TileEntity createNewTileEntity (World world, int metadata) + @Override + public TileEntity createTileEntity (World world, int metadata) { return new FrypanLogic(); } diff --git a/mods/tinker/tconstruct/blocks/SearedBlock.java b/mods/tinker/tconstruct/blocks/SearedBlock.java index ef7e15d1..41cf5aa6 100644 --- a/mods/tinker/tconstruct/blocks/SearedBlock.java +++ b/mods/tinker/tconstruct/blocks/SearedBlock.java @@ -31,7 +31,7 @@ public class SearedBlock extends InventoryBlock } @Override - public TileEntity createNewTileEntity (World world, int metadata) + public TileEntity createTileEntity (World world, int metadata) { switch (metadata) { diff --git a/mods/tinker/tconstruct/blocks/SmelteryBlock.java b/mods/tinker/tconstruct/blocks/SmelteryBlock.java index aa9c3688..2246917d 100644 --- a/mods/tinker/tconstruct/blocks/SmelteryBlock.java +++ b/mods/tinker/tconstruct/blocks/SmelteryBlock.java @@ -204,7 +204,7 @@ public class SmelteryBlock extends InventoryBlock } @Override - public TileEntity createNewTileEntity (World world, int metadata) + public TileEntity createTileEntity (World world, int metadata) { switch (metadata) { diff --git a/mods/tinker/tconstruct/blocks/ToolStationBlock.java b/mods/tinker/tconstruct/blocks/ToolStationBlock.java index 93684140..bc4b59df 100644 --- a/mods/tinker/tconstruct/blocks/ToolStationBlock.java +++ b/mods/tinker/tconstruct/blocks/ToolStationBlock.java @@ -126,7 +126,8 @@ public class ToolStationBlock extends InventoryBlock return AxisAlignedBB.getAABBPool().getAABB((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY, (double) z + this.maxZ); } - public TileEntity createNewTileEntity (World world, int metadata) + @Override + public TileEntity createTileEntity (World world, int metadata) { switch (metadata) { diff --git a/mods/tinker/tconstruct/client/SmelteryRender.java b/mods/tinker/tconstruct/client/SmelteryRender.java index dbb1b51e..71a296d5 100644 --- a/mods/tinker/tconstruct/client/SmelteryRender.java +++ b/mods/tinker/tconstruct/client/SmelteryRender.java @@ -47,8 +47,7 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler public boolean renderSmeltery (IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { renderer.renderStandardBlock(block, x, y, z); - return true; - /*SmelteryLogic logic = (SmelteryLogic) world.getBlockTileEntity(x, y, z); + SmelteryLogic logic = (SmelteryLogic) world.getBlockTileEntity(x, y, z); if (logic.validStructure) { int posX = logic.centerPos.x - 1, posY = logic.centerPos.y, posZ = logic.centerPos.z - 1; @@ -67,14 +66,14 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler if (blockToRender.itemID < 4096) //Block { Block liquidBlock = Block.blocksList[blockToRender.itemID]; - ForgeHooksClient.bindTexture(liquidBlock.getTextureFile(), 0); + //ForgeHooksClient.bindTexture(liquidBlock.getTextureFile(), 0); BlockSkinRenderHelper.renderMetadataBlock(liquidBlock, blockToRender.getItemDamage(), posX + i % 3, posY + i / 9, posZ + i / 3, renderer, world); } else //Item { Item liquidItem = Item.itemsList[blockToRender.itemID]; - ForgeHooksClient.bindTexture(liquidItem.getTextureFile(), 0); + //ForgeHooksClient.bindTexture(liquidItem.getTextureFile(), 0); int metadata = blockToRender.getItemDamage(); BlockSkinRenderHelper.renderFakeBlock(liquidItem.getIconFromDamage(metadata), metadata, posX, posY + i / 9, posZ, renderer, world); } @@ -103,7 +102,7 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler if (liquid.itemID < 4096) //Block { Block liquidBlock = Block.blocksList[liquid.itemID]; - ForgeHooksClient.bindTexture(liquidBlock.getTextureFile(), 0); + //ForgeHooksClient.bindTexture(liquidBlock.getTextureFile(), 0); for (int i = 0; i < 9; i++) BlockSkinRenderHelper.renderMetadataBlock(liquidBlock, liquid.itemMeta, posX + i % 3, posY+yBase, posZ + i / 3, renderer, world); } @@ -111,7 +110,7 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler //Item { Item liquidItem = Item.itemsList[liquid.itemID]; - ForgeHooksClient.bindTexture(liquidItem.getTextureFile(), 0); + //ForgeHooksClient.bindTexture(liquidItem.getTextureFile(), 0); for (int i = 0; i < 9; i++) BlockSkinRenderHelper.renderFakeBlock(liquidItem.getIconFromDamage(liquid.itemMeta), liquid.itemMeta, posX, posY+yBase, posZ, renderer, world); } @@ -125,10 +124,10 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler } } } - return false;*/ + return false; } - /*void renderLayer(SmelteryLogic logic, int start, int posX, int posY, int posZ, RenderBlocks renderer, IBlockAccess world) + void renderLayer(SmelteryLogic logic, int start, int posX, int posY, int posZ, RenderBlocks renderer, IBlockAccess world) { renderer.setRenderBounds(-0.001F, -0.001F, -0.001F, 1.001F, 1.001F, 1.001F); for (int i = 0; i < 9; i++) @@ -144,20 +143,20 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler if (blockToRender.itemID < 4096) //Block { Block liquidBlock = Block.blocksList[blockToRender.itemID]; - ForgeHooksClient.bindTexture(liquidBlock.getTextureFile(), 0); + //ForgeHooksClient.bindTexture(liquidBlock.getTextureFile(), 0); BlockSkinRenderHelper.renderMetadataBlock(liquidBlock, blockToRender.getItemDamage(), posX + i % 3, posY, posZ + i / 3, renderer, world); } else //Item { Item liquidItem = Item.itemsList[blockToRender.itemID]; - ForgeHooksClient.bindTexture(liquidItem.getTextureFile(), 0); + //ForgeHooksClient.bindTexture(liquidItem.getTextureFile(), 0); int metadata = blockToRender.getItemDamage(); BlockSkinRenderHelper.renderFakeBlock(liquidItem.getIconFromDamage(metadata), metadata, posX + i % 3, posY, posZ + i / 3, renderer, world); } } } - }*/ + } @Override public boolean shouldRender3DInInventory () diff --git a/mods/tinker/tconstruct/client/TProxyClient.java b/mods/tinker/tconstruct/client/TProxyClient.java index d8150322..1ee0a4c2 100644 --- a/mods/tinker/tconstruct/client/TProxyClient.java +++ b/mods/tinker/tconstruct/client/TProxyClient.java @@ -196,8 +196,12 @@ public class TProxyClient extends TProxyCommon LanguageRegistry.instance().addStringLocalization(internalName, "en_US", visibleName); } - LanguageRegistry.addName(TContent.manualBook, "Tinker's Log"); - LanguageRegistry.addName(TContent.blankPattern, "Blank Pattern"); + //LanguageRegistry.addName(TContent.manualBook, "Tinker's Log"); + + LanguageRegistry.instance().addStringLocalization("item.tconstruct.diary.diary.name", "en_US", "Tinker's Log"); + LanguageRegistry.instance().addStringLocalization("item.tconstruct.Pattern.blank_pattern.name", "en_US", "Blank Pattern"); + LanguageRegistry.instance().addStringLocalization("item.tconstruct.Pattern.blank_cast.name", "en_US", "Cast"); + //LanguageRegistry.addName(TContent.blankPattern, "Blank Pattern"); LanguageRegistry.addName(TContent.pickaxe, "Pickaxe"); LanguageRegistry.addName(TContent.shovel, "Shovel"); LanguageRegistry.addName(TContent.axe, "Axe"); @@ -252,7 +256,7 @@ public class TProxyClient extends TProxyCommon public static final String[] materialNames = new String[] { " Rod", " Pickaxe Head", " Shovel Head", " Axe Head", " Sword Blade", " Wide Guard", " Hand Guard", " Crossbar", " Binding", " Pan", " Board", " Broad Axe Head" }; - public static final String[] patterns = new String[] { "ingot", "rod", "pickaxe", "shovel", "axe", "blade", "largeguard", "medguard", "crossbar", "binding", "frypan", "sign", "lumber" }; + public static final String[] patterns = new String[] { "ingot", "rod", "pickaxe", "shovel", "axe", "swordblade", "largeguard", "mediumguard", "crossbar", "binding", "frypan", "sign" }; public static final String[] patternNames = new String[] { "Ingot", "Tool Rod", "Pickaxe Head", "Shovel Head", "Axe Head", "Sword Blade", "Wide Guard", "Hand Guard", "Crossbar", "Tool Binding", "Pan", "Board", "Broad Axe Head" }; diff --git a/mods/tinker/tconstruct/client/gui/FrypanGui.java b/mods/tinker/tconstruct/client/gui/FrypanGui.java index 270afe1f..dd511b2c 100644 --- a/mods/tinker/tconstruct/client/gui/FrypanGui.java +++ b/mods/tinker/tconstruct/client/gui/FrypanGui.java @@ -27,7 +27,7 @@ public class FrypanGui extends GuiContainer protected void drawGuiContainerBackgroundLayer(float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.func_98187_b("/tinkertextures/gui/frypan.png"); + mc.renderEngine.func_98187_b("/mods/tinker/textures/gui/frypan.png"); int cornerX = (width - xSize) / 2; int cornerY = (height - ySize) / 2; drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); diff --git a/mods/tinker/tconstruct/client/gui/GuiManual.java b/mods/tinker/tconstruct/client/gui/GuiManual.java index 1a0a9e83..9f5f005a 100644 --- a/mods/tinker/tconstruct/client/gui/GuiManual.java +++ b/mods/tinker/tconstruct/client/gui/GuiManual.java @@ -130,15 +130,15 @@ public class GuiManual extends GuiScreen //int texID = this.mc.renderEngine.getTexture(); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.renderEngine.func_98187_b("/tinkertextures/gui/bookright.png"); + this.mc.renderEngine.func_98187_b("/mods/tinker/textures/gui/bookright.png"); int localWidth = (this.width) / 2; byte localHeight = 8; this.drawTexturedModalRect(localWidth, localHeight, 0, 0, this.bookImageWidth, this.bookImageHeight); - //texID = this.mc.renderEngine.getTexture("/tinkertextures/gui/bookleft.png"); + //texID = this.mc.renderEngine.getTexture("/mods/tinker/textures/gui/bookleft.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); //this.mc.renderEngine.bindTexture(texID); - this.mc.renderEngine.func_98187_b("/tinkertextures/gui/bookleft.png"); + this.mc.renderEngine.func_98187_b("/mods/tinker/textures/gui/bookleft.png"); localWidth = localWidth - this.bookImageWidth; this.drawTexturedModalRect(localWidth, localHeight, 256 - this.bookImageWidth, 0, this.bookImageWidth, this.bookImageHeight); diff --git a/mods/tinker/tconstruct/client/gui/PartCrafterGui.java b/mods/tinker/tconstruct/client/gui/PartCrafterGui.java index 2e4848f4..fc3ed7ca 100644 --- a/mods/tinker/tconstruct/client/gui/PartCrafterGui.java +++ b/mods/tinker/tconstruct/client/gui/PartCrafterGui.java @@ -133,7 +133,7 @@ public class PartCrafterGui extends GuiContainer { // Draw the background GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.renderEngine.func_98187_b("/tinkertextures/gui/toolparts.png"); + this.mc.renderEngine.func_98187_b("/mods/tinker/textures/gui/toolparts.png"); int cornerX = (this.width - this.xSize) / 2; int cornerY = (this.height - this.ySize) / 2; this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.xSize, this.ySize); @@ -160,18 +160,18 @@ public class PartCrafterGui extends GuiContainer // Draw chest if (drawChestPart) { - //texID = this.mc.renderEngine.getTexture("/tinkertextures/gui/patternchestmini.png"); + //texID = this.mc.renderEngine.getTexture("/mods/tinker/textures/gui/patternchestmini.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); //his.mc.renderEngine.bindTexture(texID); - this.mc.renderEngine.func_98187_b("/tinkertextures/gui/patternchestmini.png"); + this.mc.renderEngine.func_98187_b("/mods/tinker/textures/gui/patternchestmini.png"); this.drawTexturedModalRect(cornerX-116, cornerY+11, 0, 0, this.xSize, this.ySize); } // Draw description - //texID = this.mc.renderEngine.getTexture("/tinkertextures/gui/description.png"); + //texID = this.mc.renderEngine.getTexture("/mods/tinker/textures/gui/description.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); //this.mc.renderEngine.bindTexture(texID); - this.mc.renderEngine.func_98187_b("/tinkertextures/gui/description.png"); + this.mc.renderEngine.func_98187_b("/mods/tinker/textures/gui/description.png"); cornerX = (this.width + this.xSize) / 2; cornerY = (this.height - this.ySize) / 2; this.drawTexturedModalRect(cornerX, cornerY, 126, 0, 126, this.ySize); diff --git a/mods/tinker/tconstruct/client/gui/PatternChestGui.java b/mods/tinker/tconstruct/client/gui/PatternChestGui.java index c2cff2da..4df31bd7 100644 --- a/mods/tinker/tconstruct/client/gui/PatternChestGui.java +++ b/mods/tinker/tconstruct/client/gui/PatternChestGui.java @@ -29,7 +29,7 @@ public class PatternChestGui extends GuiContainer protected void drawGuiContainerBackgroundLayer(float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.func_98187_b("/tinkertextures/gui/patternchest.png"); + mc.renderEngine.func_98187_b("/mods/tinker/textures/gui/patternchest.png"); int cornerX = (width - xSize) / 2; int cornerY = (height - ySize) / 2; drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); diff --git a/mods/tinker/tconstruct/client/gui/PatternShaperGui.java b/mods/tinker/tconstruct/client/gui/PatternShaperGui.java index 2408acd2..97edcc00 100644 --- a/mods/tinker/tconstruct/client/gui/PatternShaperGui.java +++ b/mods/tinker/tconstruct/client/gui/PatternShaperGui.java @@ -45,7 +45,7 @@ public class PatternShaperGui extends GuiContainer protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.renderEngine.func_98187_b("/tinkertextures/gui/patternshaper.png"); + this.mc.renderEngine.func_98187_b("/mods/tinker/textures/gui/patternshaper.png"); int cornerX = (this.width - this.xSize) / 2; int cornerY = (this.height - this.ySize) / 2; this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.xSize, this.ySize); diff --git a/mods/tinker/tconstruct/client/gui/SmelteryGui.java b/mods/tinker/tconstruct/client/gui/SmelteryGui.java index f9be8ab3..21974537 100644 --- a/mods/tinker/tconstruct/client/gui/SmelteryGui.java +++ b/mods/tinker/tconstruct/client/gui/SmelteryGui.java @@ -8,12 +8,10 @@ import mods.tinker.tconstruct.logic.SmelteryLogic; import net.minecraft.block.Block; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.Item; import net.minecraft.network.packet.Packet250CustomPayload; +import net.minecraft.util.Icon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import net.minecraftforge.client.ForgeHooksClient; -import net.minecraftforge.liquids.LiquidStack; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; @@ -121,28 +119,29 @@ public class SmelteryGui extends GuiContainer protected void drawGuiContainerBackgroundLayer (float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.func_98187_b("/tinkertextures/gui/smeltery.png"); + mc.renderEngine.func_98187_b("/mods/tinker/textures/gui/smeltery.png"); int cornerX = (width - xSize) / 2; int cornerY = (height - ySize) / 2; drawTexturedModalRect(cornerX + 46, cornerY, 0, 0, xSize, ySize); //Fuel - Lava - /*if (logic.fuelGague > 0) + if (logic.fuelGague > 0) { - ForgeHooksClient.bindTexture(Block.lavaStill.getTextureFile(), 0); - int renderIndex = Block.lavaStill.getBlockTextureFromSideAndMetadata(0, 0); - int xTex = renderIndex % 16 * 16; - int yTex = renderIndex / 16 * 16; + //ForgeHooksClient.bindTexture(Block.lavaStill.getTextureFile(), 0); + //int renderIndex = Block.lavaStill.getBlockTextureFromSideAndMetadata(0, 0); + Icon inon = Block.lavaStill.getBlockTextureFromSideAndMetadata(0, 0); + //int xTex = renderIndex % 16 * 16; + //int yTex = renderIndex / 16 * 16; int fuel = logic.getScaledFuelGague(52); int count = 0; while (fuel > 0) { int size = fuel >= 16 ? 16 : fuel; fuel -= size; - drawTexturedModalRect(cornerX + 117, (cornerY + 68) - size - 16 * count, xTex, yTex + 16 - size, 12, size); + drawTexturedModalRect(cornerX + 117, (cornerY + 68) - size - 16 * count, 0, 16 - size, 12, size); count++; } - }*/ + } //Liquids - molten metal int base = 0; @@ -186,13 +185,13 @@ public class SmelteryGui extends GuiContainer //Liquid gague GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.func_98187_b("/tinkertextures/gui/smeltery.png"); + mc.renderEngine.func_98187_b("/mods/tinker/textures/gui/smeltery.png"); drawTexturedModalRect(cornerX + 54, cornerY + 16, xSize, 76, 52, 52); //drawTexturedModalRect(cornerX+111, cornerY+16, xSize, 128, 52, 52); //Side inventory GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.func_98187_b("/tinkertextures/gui/smelteryside.png"); + mc.renderEngine.func_98187_b("/mods/tinker/textures/gui/smelteryside.png"); if (logic.layers == 1) { drawTexturedModalRect(cornerX - 46, cornerY, 0, 0, 98, 43); diff --git a/mods/tinker/tconstruct/client/gui/ToolGuiElement.java b/mods/tinker/tconstruct/client/gui/ToolGuiElement.java index f2f2990e..81e69e8f 100644 --- a/mods/tinker/tconstruct/client/gui/ToolGuiElement.java +++ b/mods/tinker/tconstruct/client/gui/ToolGuiElement.java @@ -20,7 +20,7 @@ public class ToolGuiElement iconsY = yi; title = t; body = b; - texture = "/tinkertextures/gui/icons.png"; + texture = "/mods/tinker/textures/gui/icons.png"; } public ToolGuiElement(int st, int bx, int by, int[] xi, int[] yi, String t, String b, String tex) diff --git a/mods/tinker/tconstruct/client/gui/ToolStationGui.java b/mods/tinker/tconstruct/client/gui/ToolStationGui.java index f421ccdc..d202c8aa 100644 --- a/mods/tinker/tconstruct/client/gui/ToolStationGui.java +++ b/mods/tinker/tconstruct/client/gui/ToolStationGui.java @@ -289,17 +289,17 @@ public class ToolStationGui extends GuiContainer protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) { // Draw the background - //int texID = this.mc.renderEngine.getTexture("/tinkertextures/gui/toolstation.png"); + //int texID = this.mc.renderEngine.getTexture("/mods/tinker/textures/gui/toolstation.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.renderEngine.func_98187_b("/tinkertextures/gui/toolstation.png"); + this.mc.renderEngine.func_98187_b("/mods/tinker/textures/gui/toolstation.png"); int cornerX = (this.width - this.xSize) / 2; int cornerY = (this.height - this.ySize) / 2; this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.xSize, this.ySize); - //texID = this.mc.renderEngine.getTexture("/tinkertextures/gui/icons.png"); + //texID = this.mc.renderEngine.getTexture("/mods/tinker/textures/gui/icons.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); //this.mc.renderEngine.bindTexture(texID); - this.mc.renderEngine.func_98187_b("/tinkertextures/gui/icons.png"); + this.mc.renderEngine.func_98187_b("/mods/tinker/textures/gui/icons.png"); // Draw the slots for (int i = 0; i < slotX.length; i++) @@ -312,10 +312,10 @@ public class ToolStationGui extends GuiContainer } // Draw description - //texID = this.mc.renderEngine.getTexture("/tinkertextures/gui/description.png"); + //texID = this.mc.renderEngine.getTexture("/mods/tinker/textures/gui/description.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); //this.mc.renderEngine.bindTexture(texID); - this.mc.renderEngine.func_98187_b("/tinkertextures/gui/description.png"); + this.mc.renderEngine.func_98187_b("/mods/tinker/textures/gui/description.png"); cornerX = (this.width + this.xSize) / 2; cornerY = (this.height - this.ySize) / 2; this.drawTexturedModalRect(cornerX, cornerY, 0, 0, 126, this.ySize + 30); diff --git a/mods/tinker/tconstruct/entity/GolemBase.java b/mods/tinker/tconstruct/entity/GolemBase.java new file mode 100644 index 00000000..64d46cfa --- /dev/null +++ b/mods/tinker/tconstruct/entity/GolemBase.java @@ -0,0 +1,212 @@ +package mods.tinker.tconstruct.entity; + +import java.util.ArrayList; +import java.util.Random; + +import mods.tinker.common.fancyitem.FancyEntityItem; +import mods.tinker.tconstruct.ai.CoreAI; +import net.minecraft.entity.EntityCreature; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public class GolemBase extends EntityCreature +{ + public String creator; + public int maxHealth; + public int baseAttack; + public boolean paused; + float bodyHeight; + float bodyWidth; + int movementType; + + protected ItemStack[] inventory; + protected FancyEntityItem coreItem; + public ArrayList aiList = new ArrayList(); + + public GolemBase(World world) + { + super(world); + setInitialStats(); + } + + @Override + public int getMaxHealth () + { + return maxHealth; + } + + protected void setInitialStats() + { + maxHealth = 20; + baseAttack = 3; + paused = false; + inventory = new ItemStack[0]; + } + + /* AI */ + public void addCoreAI(CoreAI ai, boolean flag) + { + aiList.add(ai); + //tier2key.onInit(this, flag); + } + + protected void updateWanderPath () + { + if (!paused) + super.updateWanderPath(); + } + + protected void coreRoutine() + { + + } + + protected void guardRoutine() + { + + } + + protected void followRoutine() + { + + } + + protected void protectRoutine() + { + + } + + /* Types */ + public void setTraits() + { + + } + + /* Other */ + protected boolean canDespawn () + { + return false; + } + + /* Effects */ + public void sparkle () + { + Random random = worldObj.rand; + double d = (double) ((float) posX + random.nextFloat() * 2.0F) - 1.0D; + double d1 = (float) posY + random.nextFloat() * (float) bodyHeight; + double d2 = (double) ((float) posZ + random.nextFloat() * 2.0F) - 1.0D; + double d3 = (double) ((float) posX + random.nextFloat() * 2.0F) - 1.0D; + double d4 = (float) posY + random.nextFloat() * (float) bodyHeight; + double d5 = (double) ((float) posZ + random.nextFloat() * 2.0F) - 1.0D; + switch (0)//(state) + { + case 0: + worldObj.spawnParticle("reddust", d, d1, d2, 0.0D, 1.0D, 0.0D); + worldObj.spawnParticle("reddust", d3, d4, d5, 0.0D, 1.0D, 0.0D); + break; + + case 1: + worldObj.spawnParticle("reddust", d, d1, d2, -1D, 0.0D, 1.0D); + worldObj.spawnParticle("reddust", d3, d4, d5, -1D, 0.0D, 1.0D); + break; + + case 2: + worldObj.spawnParticle("reddust", d, d1, d2, 1.0D, 0.0D, 0.0D); + worldObj.spawnParticle("reddust", d3, d4, d5, 1.0D, 0.0D, 0.0D); + break; + + case 3: + worldObj.spawnParticle("reddust", d, d1, d2, 1.0D, 1.0D, 1.0D); + worldObj.spawnParticle("reddust", d3, d4, d5, 1.0D, 1.0D, 1.0D); + break; + + case 4: + worldObj.spawnParticle("reddust", d, d1, d2, 0.46000000000000002D, 0.28999999999999998D, 0.19D); + worldObj.spawnParticle("reddust", d3, d4, d5, 0.46000000000000002D, 0.28999999999999998D, 0.19D); + break; + } + } + + public void sparkle (double d, double d1, double d2) + { + Random random = worldObj.rand; + double d3 = (double) ((float) posX + random.nextFloat() * 2.0F) - 1.0D; + double d4 = (float) posY + random.nextFloat() * (float) bodyHeight; + double d5 = (double) ((float) posZ + random.nextFloat() * 2.0F) - 1.0D; + double d6 = (double) ((float) posX + random.nextFloat() * 2.0F) - 1.0D; + double d7 = (float) posY + random.nextFloat() * (float) bodyHeight; + double d8 = (double) ((float) posZ + random.nextFloat() * 2.0F) - 1.0D; + worldObj.spawnParticle("reddust", d3, d4, d5, d, d1, d2); + worldObj.spawnParticle("reddust", d6, d7, d8, d, d1, d2); + } + + public void shineRadius (float f, double d, double d1, double d2) + { + shineRadius(f, d, d1, d2, 2, "reddust"); + } + + public void shineRadius (float f, double d, double d1, double d2, int i, String s) + { + d++; + Random random = new Random(); + float f1 = 0.7F; + float f2 = bodyHeight / 5; + for (int j = 1; j <= 2; j++) + { + float f3 = f / (float) j; + for (double d3 = 0.0D; d3 < 1.5707963D; d3 += 0.10000000000000001D) + { + float f4 = (float) ((double) f3 * Math.cos(d3)); + float f5 = (float) ((double) f3 * Math.sin(d3)); + for (int k = 0; k < i; k++) + { + worldObj.spawnParticle(s, ((float) posX + f4 + random.nextFloat() * f1) - 0.5F, (float) posY + f2, ((float) posZ + f5 + random.nextFloat() * f1) - 0.5F, d, d1, d2); + } + + for (int l = 0; l < i; l++) + { + worldObj.spawnParticle(s, (((float) posX - f4) + random.nextFloat() * f1) - 0.5F, (float) posY + f2, ((float) posZ + f5 + random.nextFloat() * f1) - 0.5F, d, d1, d2); + } + + for (int i1 = 0; i1 < i; i1++) + { + worldObj.spawnParticle(s, ((float) posX + f4 + random.nextFloat() * f1) - 0.5F, (float) posY + f2, (((float) posZ - f5) + random.nextFloat() * f1) - 0.5F, d, d1, d2); + } + + for (int j1 = 0; j1 < i; j1++) + { + worldObj.spawnParticle(s, (((float) posX - f4) + random.nextFloat() * f1) - 0.5F, (float) posY + f2, (((float) posZ - f5) + random.nextFloat() * f1) - 0.5F, d, d1, d2); + } + } + } + } + + public void shineRadius (float f, double d, double d1, double d2, boolean flag) + { + d--; + Random random = new Random(); + float f1 = 0.7F; + float f2 = f; + String s = "reddust"; + float f3 = (float) bodyHeight / 5F; + for (double d3 = 0.0D; d3 < 1.5707963D; d3 += 0.20000000000000001D) + { + float f4 = (float) Math.sin(d3); + float f5 = (float) Math.cos(d3); + float f6 = f2 * f4; + for (double d4 = 0.0D; d4 < 1.5707963D; d4 += 0.20000000000000001D) + { + float f7 = (float) Math.sin(d4); + float f8 = (float) Math.cos(d4); + float f9 = f2 * f8 * f5; + float f10 = f2 * f7 * f5; + worldObj.spawnParticle(s, ((float) posX + f9 + random.nextFloat() * f1) - 0.5F, (float) posY + f3 + f6 + random.nextFloat() * f1, ((float) posZ + f10 + random.nextFloat() * f1) - 0.5F, d, d1, d2); + worldObj.spawnParticle(s, (((float) posX - f9) + random.nextFloat() * f1) - 0.5F, (float) posY + f3 + f6 + random.nextFloat() * f1, ((float) posZ + f10 + random.nextFloat() * f1) - 0.5F, d, d1, d2); + worldObj.spawnParticle(s, ((float) posX + f9 + random.nextFloat() * f1) - 0.5F, (float) posY + f3 + f6 + random.nextFloat() * f1, (((float) posZ - f10) + random.nextFloat() * f1) - 0.5F, d, d1, d2); + worldObj.spawnParticle(s, (((float) posX - f9) + random.nextFloat() * f1) - 0.5F, (float) posY + f3 + f6 + random.nextFloat() * f1, (((float) posZ - f10) + random.nextFloat() * f1) - 0.5F, d, d1, d2); + } + } + } +} diff --git a/mods/tinker/tconstruct/items/CraftingItem.java b/mods/tinker/tconstruct/items/CraftingItem.java index 332f9a95..f16c8d83 100644 --- a/mods/tinker/tconstruct/items/CraftingItem.java +++ b/mods/tinker/tconstruct/items/CraftingItem.java @@ -16,8 +16,9 @@ public class CraftingItem extends Item { public String[] textureNames; public String[] unlocalizedNames; + public String folder; public Icon[] icons; - public CraftingItem(int id, String[] names, String[] tex) + public CraftingItem(int id, String[] names, String[] tex, String f) { super(id); this.setCreativeTab(TConstruct.materialTab); @@ -25,6 +26,7 @@ public class CraftingItem extends Item this.setHasSubtypes(true); textureNames = tex; unlocalizedNames = names; + folder = f; } @SideOnly(Side.CLIENT) @@ -40,7 +42,7 @@ public class CraftingItem extends Item for (int i = 0; i < this.icons.length; ++i) { - this.icons[i] = iconRegister.func_94245_a("tinker:"+textureNames[i]); + this.icons[i] = iconRegister.func_94245_a("tinker:"+folder+textureNames[i]); } } diff --git a/mods/tinker/tconstruct/items/FilledBucket.java b/mods/tinker/tconstruct/items/FilledBucket.java index 7ad02ba8..c0f29e04 100644 --- a/mods/tinker/tconstruct/items/FilledBucket.java +++ b/mods/tinker/tconstruct/items/FilledBucket.java @@ -198,7 +198,7 @@ public class FilledBucket extends ItemBucket for (int i = 0; i < this.icons.length; ++i) { - this.icons[i] = iconRegister.func_94245_a("tinker"+materialNames[i]); + this.icons[i] = iconRegister.func_94245_a("tinker:materials/bucket_"+textureNames[i]); } } @@ -211,4 +211,8 @@ public class FilledBucket extends ItemBucket public static final String[] materialNames = new String[] { "Iron", "Gold", "Copper", "Tin", "Aluminum", "Cobalt", "Ardite", "Bronze", "AlBrass", "Manyullyn", "Alumite", "Obsidian", "Steel", "Manganese", "Heptazion", "DSteel", "Angmallen"}; + + public static final String[] textureNames = new String[] { + "iron", "gold", "copper", "tin", "aluminum", "cobalt", "ardite", "bronze", "alubrass", "manyullyn", "alumite", "obsidian", "steel", + "manganese", "heptazion", "dsteel", "angmallen"}; } diff --git a/mods/tinker/tconstruct/items/MetalPattern.java b/mods/tinker/tconstruct/items/MetalPattern.java index e77caa84..91504fa9 100644 --- a/mods/tinker/tconstruct/items/MetalPattern.java +++ b/mods/tinker/tconstruct/items/MetalPattern.java @@ -8,9 +8,9 @@ import net.minecraft.item.ItemStack; public class MetalPattern extends Pattern { - public MetalPattern(int id, String partType) + public MetalPattern(int id, String partType, String patternType, String folder) { - super(id, partType); + super(id, partType, patternType, folder); } public void getSubItems (int id, CreativeTabs tab, List list) diff --git a/mods/tinker/tconstruct/items/Pattern.java b/mods/tinker/tconstruct/items/Pattern.java index 836dbc1a..04768586 100644 --- a/mods/tinker/tconstruct/items/Pattern.java +++ b/mods/tinker/tconstruct/items/Pattern.java @@ -5,9 +5,11 @@ import java.util.List; import mods.tinker.common.IPattern; import mods.tinker.tconstruct.TContent; import mods.tinker.tconstruct.crafting.PatternBuilder.MaterialSet; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; import net.minecraft.util.MathHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -15,9 +17,9 @@ import cpw.mods.fml.relauncher.SideOnly; public class Pattern extends CraftingItem implements IPattern { - public Pattern(int id, String partType) + public Pattern(int id, String partType, String patternType, String folder) { - super(id, getNames(partType), getNames(partType)); + super(id, patternName, getPatternNames(patternType), folder); this.setHasSubtypes(true); this.setMaxDamage(0); this.setContainerItem(this); @@ -25,16 +27,27 @@ public class Pattern extends CraftingItem } - private static String[] getNames (String partType) + private static String[] getPatternNames (String partType) { String[] names = new String[patternName.length]; for (int i = 0; i < patternName.length; i++) - names[i] = patternName[i]+partType; + names[i] = partType+patternName[i]; return names; } public static final String[] patternName = new String[] { - "ingot", "rod", "pickaxe", "shovel", "axe", "blade", "largeguard", "medguard", "crossbar", "binding", "frypan", "sign" }; + "ingot", "rod", "pickaxe", "shovel", "axe", "swordblade", "largeguard", "mediumguard", "crossbar", "binding", "frypan", "sign" }; + + /*@SideOnly(Side.CLIENT) + public void func_94581_a(IconRegister iconRegister) + { + this.icons = new Icon[textureNames.length]; + + for (int i = 0; i < this.icons.length; ++i) + { + this.icons[i] = iconRegister.func_94245_a("tinker:"+textureNames[i]); + } + }*/ public void getSubItems (int id, CreativeTabs tab, List list) { diff --git a/mods/tinker/tconstruct/items/PatternManual.java b/mods/tinker/tconstruct/items/PatternManual.java index 6041ea77..8d141f62 100644 --- a/mods/tinker/tconstruct/items/PatternManual.java +++ b/mods/tinker/tconstruct/items/PatternManual.java @@ -9,11 +9,12 @@ import net.minecraft.world.World; public class PatternManual extends CraftingItem { - static String[] name = new String[] {"manualDiary"}; + static String[] name = new String[] {"diary"}; + static String[] textureName = new String[] {"tinkerbook_diary"}; public PatternManual(int id) { - super(id, name, name); - setUnlocalizedName("tconstruct.manualDiary"); + super(id, name, textureName, "materials/"); + setUnlocalizedName("tconstruct.diary"); } @Override diff --git a/mods/tinker/tconstruct/items/TitleIcon.java b/mods/tinker/tconstruct/items/TitleIcon.java index 6c2e0206..17204eac 100644 --- a/mods/tinker/tconstruct/items/TitleIcon.java +++ b/mods/tinker/tconstruct/items/TitleIcon.java @@ -16,6 +16,6 @@ public class TitleIcon extends Item public void func_94581_a (IconRegister iconRegister) { TProxyClient.blankSprite = iconRegister.func_94245_a("tinker:blanksprite"); - iconIndex = iconRegister.func_94245_a("tparts"); + iconIndex = iconRegister.func_94245_a("tinker:tparts"); } } diff --git a/mods/tinker/tconstruct/items/ToolPart.java b/mods/tinker/tconstruct/items/ToolPart.java index c36b672f..ff11c8f5 100644 --- a/mods/tinker/tconstruct/items/ToolPart.java +++ b/mods/tinker/tconstruct/items/ToolPart.java @@ -18,20 +18,11 @@ public class ToolPart extends CraftingItem { public ToolPart(int id, String partType, String textureType) { - super(id, getNames(partType), buildTextureNames(textureType)); + super(id, toolMaterialNames, buildTextureNames(textureType), "parts/"); this.setHasSubtypes(true); this.setMaxDamage(0); } - private static String[] getNames (String partType) - { - String[] names = new String[toolMaterialNames.length]; - for (int i = 0; i < toolMaterialNames.length; i++) - names[i] = partType + toolMaterialNames[i]; - return names; - } - - private static String[] buildTextureNames (String textureType) { String[] names = new String[toolMaterialNames.length]; @@ -40,7 +31,7 @@ public class ToolPart extends CraftingItem return names; } - @SideOnly(Side.CLIENT) + /*@SideOnly(Side.CLIENT) public void func_94581_a(IconRegister iconRegister) { this.icons = new Icon[textureNames.length]; @@ -49,7 +40,7 @@ public class ToolPart extends CraftingItem { this.icons[i] = iconRegister.func_94245_a("tinker:parts/"+textureNames[i]); } - } + }*/ public static final String[] toolMaterialNames = new String[] { "Wood", "Stone", "Iron", "Flint", "Cactus", "Bone", "Obsidian", "Netherrack", "Slime", "Paper", "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze", "Alumite", "Steel" }; diff --git a/mods/tinker/tconstruct/tools/ToolCore.java b/mods/tinker/tconstruct/tools/ToolCore.java index fd8e2294..70ffae40 100644 --- a/mods/tinker/tconstruct/tools/ToolCore.java +++ b/mods/tinker/tconstruct/tools/ToolCore.java @@ -221,7 +221,7 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox else if (renderPass == 2) // Accessory { - return (handleIcons.get(tags.getInteger("RenderAccessory"))); + return (accessoryIcons.get(tags.getInteger("RenderAccessory"))); } } diff --git a/mods/tinker/tconstruct/util/SortedList.java b/mods/tinker/tconstruct/util/SortedList.java deleted file mode 100644 index 2257bf4b..00000000 --- a/mods/tinker/tconstruct/util/SortedList.java +++ /dev/null @@ -1,34 +0,0 @@ -package mods.tinker.tconstruct.util; - -import java.util.ArrayList; -import java.util.Comparator; - -/* Sorted List implementation - * Written by RebelKeithy - */ - -public class SortedList extends ArrayList -{ - Comparator comp; - - public SortedList(Comparator comp) - { - this.comp = comp; - } - - @Override - public boolean add(T o) - { - for(int n = 0; n < this.size(); n++) - { - if(comp.compare(this.get(n), o) >= 0) - { - this.add(n+1, o); - return true; - } - } - - this.add(this.size(), o); - return true; - } -} \ No newline at end of file diff --git a/mods/tinker/resources/armor/wood_1.png b/mods/tinker/textures/armor/wood_1.png similarity index 100% rename from mods/tinker/resources/armor/wood_1.png rename to mods/tinker/textures/armor/wood_1.png diff --git a/mods/tinker/resources/armor/wood_2.png b/mods/tinker/textures/armor/wood_2.png similarity index 100% rename from mods/tinker/resources/armor/wood_2.png rename to mods/tinker/textures/armor/wood_2.png diff --git a/mods/tinker/resources/entity/pullcart.png b/mods/tinker/textures/entity/pullcart.png similarity index 100% rename from mods/tinker/resources/entity/pullcart.png rename to mods/tinker/textures/entity/pullcart.png diff --git a/mods/tinker/resources/entity/wagon.png b/mods/tinker/textures/entity/wagon.png similarity index 100% rename from mods/tinker/resources/entity/wagon.png rename to mods/tinker/textures/entity/wagon.png diff --git a/mods/tinker/resources/entity/wagontexture.png b/mods/tinker/textures/entity/wagontexture.png similarity index 100% rename from mods/tinker/resources/entity/wagontexture.png rename to mods/tinker/textures/entity/wagontexture.png diff --git a/mods/tinker/resources/gui/book.png b/mods/tinker/textures/gui/book.png similarity index 100% rename from mods/tinker/resources/gui/book.png rename to mods/tinker/textures/gui/book.png diff --git a/mods/tinker/resources/gui/bookleft.png b/mods/tinker/textures/gui/bookleft.png similarity index 100% rename from mods/tinker/resources/gui/bookleft.png rename to mods/tinker/textures/gui/bookleft.png diff --git a/mods/tinker/resources/gui/bookright.png b/mods/tinker/textures/gui/bookright.png similarity index 100% rename from mods/tinker/resources/gui/bookright.png rename to mods/tinker/textures/gui/bookright.png diff --git a/mods/tinker/resources/gui/description.png b/mods/tinker/textures/gui/description.png similarity index 100% rename from mods/tinker/resources/gui/description.png rename to mods/tinker/textures/gui/description.png diff --git a/mods/tinker/resources/gui/display.png b/mods/tinker/textures/gui/display.png similarity index 100% rename from mods/tinker/resources/gui/display.png rename to mods/tinker/textures/gui/display.png diff --git a/mods/tinker/resources/gui/frypan.png b/mods/tinker/textures/gui/frypan.png similarity index 100% rename from mods/tinker/resources/gui/frypan.png rename to mods/tinker/textures/gui/frypan.png diff --git a/mods/tinker/resources/gui/icons.png b/mods/tinker/textures/gui/icons.png similarity index 100% rename from mods/tinker/resources/gui/icons.png rename to mods/tinker/textures/gui/icons.png diff --git a/mods/tinker/resources/gui/patternchest.png b/mods/tinker/textures/gui/patternchest.png similarity index 100% rename from mods/tinker/resources/gui/patternchest.png rename to mods/tinker/textures/gui/patternchest.png diff --git a/mods/tinker/resources/gui/patternchestmini.png b/mods/tinker/textures/gui/patternchestmini.png similarity index 100% rename from mods/tinker/resources/gui/patternchestmini.png rename to mods/tinker/textures/gui/patternchestmini.png diff --git a/mods/tinker/resources/gui/patternshaper.png b/mods/tinker/textures/gui/patternshaper.png similarity index 100% rename from mods/tinker/resources/gui/patternshaper.png rename to mods/tinker/textures/gui/patternshaper.png diff --git a/mods/tinker/resources/gui/smeltery.png b/mods/tinker/textures/gui/smeltery.png similarity index 100% rename from mods/tinker/resources/gui/smeltery.png rename to mods/tinker/textures/gui/smeltery.png diff --git a/mods/tinker/resources/gui/smelteryside.png b/mods/tinker/textures/gui/smelteryside.png similarity index 100% rename from mods/tinker/resources/gui/smelteryside.png rename to mods/tinker/textures/gui/smelteryside.png diff --git a/mods/tinker/resources/gui/toolparts.png b/mods/tinker/textures/gui/toolparts.png similarity index 100% rename from mods/tinker/resources/gui/toolparts.png rename to mods/tinker/textures/gui/toolparts.png diff --git a/mods/tinker/resources/gui/toolstation.png b/mods/tinker/textures/gui/toolstation.png similarity index 100% rename from mods/tinker/resources/gui/toolstation.png rename to mods/tinker/textures/gui/toolstation.png diff --git a/mods/tinker/textures/items/frypan/glowstone_frypan_effect.png b/mods/tinker/textures/items/frypan/glowstone_frypan_effect.png new file mode 100644 index 00000000..6a7e9dd2 Binary files /dev/null and b/mods/tinker/textures/items/frypan/glowstone_frypan_effect.png differ diff --git a/mods/tinker/resources/materials.png b/mods/tinker/textures/items/materials.png similarity index 100% rename from mods/tinker/resources/materials.png rename to mods/tinker/textures/items/materials.png diff --git a/mods/tinker/textures/items/materials/blank_cast.png b/mods/tinker/textures/items/materials/blank_cast.png new file mode 100644 index 00000000..5b4134e9 Binary files /dev/null and b/mods/tinker/textures/items/materials/blank_cast.png differ diff --git a/mods/tinker/textures/items/materials/blank_pattern.png b/mods/tinker/textures/items/materials/blank_pattern.png new file mode 100644 index 00000000..1bb92356 Binary files /dev/null and b/mods/tinker/textures/items/materials/blank_pattern.png differ diff --git a/mods/tinker/textures/items/materials/bone_chunk.png b/mods/tinker/textures/items/materials/bone_chunk.png new file mode 100644 index 00000000..10839517 Binary files /dev/null and b/mods/tinker/textures/items/materials/bone_chunk.png differ diff --git a/mods/tinker/textures/items/materials/bucket_alubrass.png b/mods/tinker/textures/items/materials/bucket_alubrass.png new file mode 100644 index 00000000..a71eafd3 Binary files /dev/null and b/mods/tinker/textures/items/materials/bucket_alubrass.png differ diff --git a/mods/tinker/textures/items/materials/bucket_aluminum.png b/mods/tinker/textures/items/materials/bucket_aluminum.png new file mode 100644 index 00000000..c881a4d3 Binary files /dev/null and b/mods/tinker/textures/items/materials/bucket_aluminum.png differ diff --git a/mods/tinker/textures/items/materials/bucket_alumite.png b/mods/tinker/textures/items/materials/bucket_alumite.png new file mode 100644 index 00000000..8573ad50 Binary files /dev/null and b/mods/tinker/textures/items/materials/bucket_alumite.png differ diff --git a/mods/tinker/textures/items/materials/bucket_ardite.png b/mods/tinker/textures/items/materials/bucket_ardite.png new file mode 100644 index 00000000..2c4d4b55 Binary files /dev/null and b/mods/tinker/textures/items/materials/bucket_ardite.png differ diff --git a/mods/tinker/textures/items/materials/bucket_bronze.png b/mods/tinker/textures/items/materials/bucket_bronze.png new file mode 100644 index 00000000..7d268eff Binary files /dev/null and b/mods/tinker/textures/items/materials/bucket_bronze.png differ diff --git a/mods/tinker/textures/items/materials/bucket_cobalt.png b/mods/tinker/textures/items/materials/bucket_cobalt.png new file mode 100644 index 00000000..1ce80bb1 Binary files /dev/null and b/mods/tinker/textures/items/materials/bucket_cobalt.png differ diff --git a/mods/tinker/textures/items/materials/bucket_copper.png b/mods/tinker/textures/items/materials/bucket_copper.png new file mode 100644 index 00000000..5fd9df9d Binary files /dev/null and b/mods/tinker/textures/items/materials/bucket_copper.png differ diff --git a/mods/tinker/textures/items/materials/bucket_gold.png b/mods/tinker/textures/items/materials/bucket_gold.png new file mode 100644 index 00000000..16c139e0 Binary files /dev/null and b/mods/tinker/textures/items/materials/bucket_gold.png differ diff --git a/mods/tinker/textures/items/materials/bucket_iron.png b/mods/tinker/textures/items/materials/bucket_iron.png new file mode 100644 index 00000000..2dceaecb Binary files /dev/null and b/mods/tinker/textures/items/materials/bucket_iron.png differ diff --git a/mods/tinker/textures/items/materials/bucket_manyullyn.png b/mods/tinker/textures/items/materials/bucket_manyullyn.png new file mode 100644 index 00000000..604968ee Binary files /dev/null and b/mods/tinker/textures/items/materials/bucket_manyullyn.png differ diff --git a/mods/tinker/textures/items/materials/bucket_obsidian.png b/mods/tinker/textures/items/materials/bucket_obsidian.png new file mode 100644 index 00000000..60339f3b Binary files /dev/null and b/mods/tinker/textures/items/materials/bucket_obsidian.png differ diff --git a/mods/tinker/textures/items/materials/bucket_steel.png b/mods/tinker/textures/items/materials/bucket_steel.png new file mode 100644 index 00000000..8a65d801 Binary files /dev/null and b/mods/tinker/textures/items/materials/bucket_steel.png differ diff --git a/mods/tinker/textures/items/materials/bucket_tin.png b/mods/tinker/textures/items/materials/bucket_tin.png new file mode 100644 index 00000000..62dacb91 Binary files /dev/null and b/mods/tinker/textures/items/materials/bucket_tin.png differ diff --git a/mods/tinker/textures/items/materials/cast_axe.png b/mods/tinker/textures/items/materials/cast_axe.png new file mode 100644 index 00000000..188a7421 Binary files /dev/null and b/mods/tinker/textures/items/materials/cast_axe.png differ diff --git a/mods/tinker/textures/items/materials/cast_binding.png b/mods/tinker/textures/items/materials/cast_binding.png new file mode 100644 index 00000000..1e2c8c03 Binary files /dev/null and b/mods/tinker/textures/items/materials/cast_binding.png differ diff --git a/mods/tinker/textures/items/materials/cast_broadaxe.png b/mods/tinker/textures/items/materials/cast_broadaxe.png new file mode 100644 index 00000000..80a972c3 Binary files /dev/null and b/mods/tinker/textures/items/materials/cast_broadaxe.png differ diff --git a/mods/tinker/textures/items/materials/cast_crossbar.png b/mods/tinker/textures/items/materials/cast_crossbar.png new file mode 100644 index 00000000..fecc9fec Binary files /dev/null and b/mods/tinker/textures/items/materials/cast_crossbar.png differ diff --git a/mods/tinker/textures/items/materials/cast_frypan.png b/mods/tinker/textures/items/materials/cast_frypan.png new file mode 100644 index 00000000..05fd4699 Binary files /dev/null and b/mods/tinker/textures/items/materials/cast_frypan.png differ diff --git a/mods/tinker/textures/items/materials/cast_ingot.png b/mods/tinker/textures/items/materials/cast_ingot.png new file mode 100644 index 00000000..6a90939b Binary files /dev/null and b/mods/tinker/textures/items/materials/cast_ingot.png differ diff --git a/mods/tinker/textures/items/materials/cast_largeguard.png b/mods/tinker/textures/items/materials/cast_largeguard.png new file mode 100644 index 00000000..6ce33ea0 Binary files /dev/null and b/mods/tinker/textures/items/materials/cast_largeguard.png differ diff --git a/mods/tinker/textures/items/materials/cast_largerod.png b/mods/tinker/textures/items/materials/cast_largerod.png new file mode 100644 index 00000000..c1a6223b Binary files /dev/null and b/mods/tinker/textures/items/materials/cast_largerod.png differ diff --git a/mods/tinker/textures/items/materials/cast_mediumguard.png b/mods/tinker/textures/items/materials/cast_mediumguard.png new file mode 100644 index 00000000..8ce28266 Binary files /dev/null and b/mods/tinker/textures/items/materials/cast_mediumguard.png differ diff --git a/mods/tinker/textures/items/materials/cast_pickaxe.png b/mods/tinker/textures/items/materials/cast_pickaxe.png new file mode 100644 index 00000000..283bd196 Binary files /dev/null and b/mods/tinker/textures/items/materials/cast_pickaxe.png differ diff --git a/mods/tinker/textures/items/materials/cast_rod.png b/mods/tinker/textures/items/materials/cast_rod.png new file mode 100644 index 00000000..9d95b015 Binary files /dev/null and b/mods/tinker/textures/items/materials/cast_rod.png differ diff --git a/mods/tinker/textures/items/materials/cast_shovel.png b/mods/tinker/textures/items/materials/cast_shovel.png new file mode 100644 index 00000000..0a833ea1 Binary files /dev/null and b/mods/tinker/textures/items/materials/cast_shovel.png differ diff --git a/mods/tinker/textures/items/materials/cast_sign.png b/mods/tinker/textures/items/materials/cast_sign.png new file mode 100644 index 00000000..ea9e1535 Binary files /dev/null and b/mods/tinker/textures/items/materials/cast_sign.png differ diff --git a/mods/tinker/textures/items/materials/cast_spike.png b/mods/tinker/textures/items/materials/cast_spike.png new file mode 100644 index 00000000..80a972c3 Binary files /dev/null and b/mods/tinker/textures/items/materials/cast_spike.png differ diff --git a/mods/tinker/textures/items/materials/cast_swordblade.png b/mods/tinker/textures/items/materials/cast_swordblade.png new file mode 100644 index 00000000..ca2a4698 Binary files /dev/null and b/mods/tinker/textures/items/materials/cast_swordblade.png differ diff --git a/mods/tinker/textures/items/materials/grout.png b/mods/tinker/textures/items/materials/grout.png new file mode 100644 index 00000000..c7fcafff Binary files /dev/null and b/mods/tinker/textures/items/materials/grout.png differ diff --git a/mods/tinker/textures/items/materials/material_alubrassingot.png b/mods/tinker/textures/items/materials/material_alubrassingot.png new file mode 100644 index 00000000..c6832fde Binary files /dev/null and b/mods/tinker/textures/items/materials/material_alubrassingot.png differ diff --git a/mods/tinker/textures/items/materials/material_aluminumingot.png b/mods/tinker/textures/items/materials/material_aluminumingot.png new file mode 100644 index 00000000..39625369 Binary files /dev/null and b/mods/tinker/textures/items/materials/material_aluminumingot.png differ diff --git a/mods/tinker/textures/items/materials/material_aluminumraw.png b/mods/tinker/textures/items/materials/material_aluminumraw.png new file mode 100644 index 00000000..b2ba44ed Binary files /dev/null and b/mods/tinker/textures/items/materials/material_aluminumraw.png differ diff --git a/mods/tinker/textures/items/materials/material_alumiteingot.png b/mods/tinker/textures/items/materials/material_alumiteingot.png new file mode 100644 index 00000000..77e73936 Binary files /dev/null and b/mods/tinker/textures/items/materials/material_alumiteingot.png differ diff --git a/mods/tinker/textures/items/materials/material_arditeingot.png b/mods/tinker/textures/items/materials/material_arditeingot.png new file mode 100644 index 00000000..73a61d75 Binary files /dev/null and b/mods/tinker/textures/items/materials/material_arditeingot.png differ diff --git a/mods/tinker/textures/items/materials/material_bronzeingot.png b/mods/tinker/textures/items/materials/material_bronzeingot.png new file mode 100644 index 00000000..d366239e Binary files /dev/null and b/mods/tinker/textures/items/materials/material_bronzeingot.png differ diff --git a/mods/tinker/textures/items/materials/material_cobaltingot.png b/mods/tinker/textures/items/materials/material_cobaltingot.png new file mode 100644 index 00000000..35e498cd Binary files /dev/null and b/mods/tinker/textures/items/materials/material_cobaltingot.png differ diff --git a/mods/tinker/textures/items/materials/material_copperingot.png b/mods/tinker/textures/items/materials/material_copperingot.png new file mode 100644 index 00000000..45e1f147 Binary files /dev/null and b/mods/tinker/textures/items/materials/material_copperingot.png differ diff --git a/mods/tinker/textures/items/materials/material_lavacrystal.png b/mods/tinker/textures/items/materials/material_lavacrystal.png new file mode 100644 index 00000000..181af72c Binary files /dev/null and b/mods/tinker/textures/items/materials/material_lavacrystal.png differ diff --git a/mods/tinker/textures/items/materials/material_manyullyningot.png b/mods/tinker/textures/items/materials/material_manyullyningot.png new file mode 100644 index 00000000..399519fd Binary files /dev/null and b/mods/tinker/textures/items/materials/material_manyullyningot.png differ diff --git a/mods/tinker/textures/items/materials/material_mossball.png b/mods/tinker/textures/items/materials/material_mossball.png new file mode 100644 index 00000000..7ab0f599 Binary files /dev/null and b/mods/tinker/textures/items/materials/material_mossball.png differ diff --git a/mods/tinker/textures/items/materials/material_necroticbone.png b/mods/tinker/textures/items/materials/material_necroticbone.png new file mode 100644 index 00000000..db1a1cb5 Binary files /dev/null and b/mods/tinker/textures/items/materials/material_necroticbone.png differ diff --git a/mods/tinker/textures/items/materials/material_paperstack.png b/mods/tinker/textures/items/materials/material_paperstack.png new file mode 100644 index 00000000..d72d37ce Binary files /dev/null and b/mods/tinker/textures/items/materials/material_paperstack.png differ diff --git a/mods/tinker/textures/items/materials/material_searedbrick.png b/mods/tinker/textures/items/materials/material_searedbrick.png new file mode 100644 index 00000000..a3fb1194 Binary files /dev/null and b/mods/tinker/textures/items/materials/material_searedbrick.png differ diff --git a/mods/tinker/textures/items/materials/material_slimecrystal.png b/mods/tinker/textures/items/materials/material_slimecrystal.png new file mode 100644 index 00000000..7b21dad0 Binary files /dev/null and b/mods/tinker/textures/items/materials/material_slimecrystal.png differ diff --git a/mods/tinker/textures/items/materials/material_steelingot.png b/mods/tinker/textures/items/materials/material_steelingot.png new file mode 100644 index 00000000..aa27935d Binary files /dev/null and b/mods/tinker/textures/items/materials/material_steelingot.png differ diff --git a/mods/tinker/textures/items/materials/material_tiningot.png b/mods/tinker/textures/items/materials/material_tiningot.png new file mode 100644 index 00000000..24de68b0 Binary files /dev/null and b/mods/tinker/textures/items/materials/material_tiningot.png differ diff --git a/mods/tinker/textures/items/materials/paper_chunk.png b/mods/tinker/textures/items/materials/paper_chunk.png new file mode 100644 index 00000000..4b505c7a Binary files /dev/null and b/mods/tinker/textures/items/materials/paper_chunk.png differ diff --git a/mods/tinker/textures/items/materials/pattern_axe.png b/mods/tinker/textures/items/materials/pattern_axe.png new file mode 100644 index 00000000..4f43786a Binary files /dev/null and b/mods/tinker/textures/items/materials/pattern_axe.png differ diff --git a/mods/tinker/textures/items/materials/pattern_binding.png b/mods/tinker/textures/items/materials/pattern_binding.png new file mode 100644 index 00000000..1526c0bc Binary files /dev/null and b/mods/tinker/textures/items/materials/pattern_binding.png differ diff --git a/mods/tinker/textures/items/materials/pattern_broadaxe.png b/mods/tinker/textures/items/materials/pattern_broadaxe.png new file mode 100644 index 00000000..935a40a5 Binary files /dev/null and b/mods/tinker/textures/items/materials/pattern_broadaxe.png differ diff --git a/mods/tinker/textures/items/materials/pattern_crossbar.png b/mods/tinker/textures/items/materials/pattern_crossbar.png new file mode 100644 index 00000000..c5719d79 Binary files /dev/null and b/mods/tinker/textures/items/materials/pattern_crossbar.png differ diff --git a/mods/tinker/textures/items/materials/pattern_frypan.png b/mods/tinker/textures/items/materials/pattern_frypan.png new file mode 100644 index 00000000..64ff84a0 Binary files /dev/null and b/mods/tinker/textures/items/materials/pattern_frypan.png differ diff --git a/mods/tinker/textures/items/materials/pattern_largeguard.png b/mods/tinker/textures/items/materials/pattern_largeguard.png new file mode 100644 index 00000000..0944a7f3 Binary files /dev/null and b/mods/tinker/textures/items/materials/pattern_largeguard.png differ diff --git a/mods/tinker/textures/items/materials/pattern_largerod.png b/mods/tinker/textures/items/materials/pattern_largerod.png new file mode 100644 index 00000000..fb496abb Binary files /dev/null and b/mods/tinker/textures/items/materials/pattern_largerod.png differ diff --git a/mods/tinker/textures/items/materials/pattern_mediumguard.png b/mods/tinker/textures/items/materials/pattern_mediumguard.png new file mode 100644 index 00000000..2f59559d Binary files /dev/null and b/mods/tinker/textures/items/materials/pattern_mediumguard.png differ diff --git a/mods/tinker/textures/items/materials/pattern_pickaxe.png b/mods/tinker/textures/items/materials/pattern_pickaxe.png new file mode 100644 index 00000000..403e62a2 Binary files /dev/null and b/mods/tinker/textures/items/materials/pattern_pickaxe.png differ diff --git a/mods/tinker/textures/items/materials/pattern_rod.png b/mods/tinker/textures/items/materials/pattern_rod.png new file mode 100644 index 00000000..c31f1205 Binary files /dev/null and b/mods/tinker/textures/items/materials/pattern_rod.png differ diff --git a/mods/tinker/textures/items/materials/pattern_shovel.png b/mods/tinker/textures/items/materials/pattern_shovel.png new file mode 100644 index 00000000..a9127d07 Binary files /dev/null and b/mods/tinker/textures/items/materials/pattern_shovel.png differ diff --git a/mods/tinker/textures/items/materials/pattern_sign.png b/mods/tinker/textures/items/materials/pattern_sign.png new file mode 100644 index 00000000..0f46c32e Binary files /dev/null and b/mods/tinker/textures/items/materials/pattern_sign.png differ diff --git a/mods/tinker/textures/items/materials/pattern_spike.png b/mods/tinker/textures/items/materials/pattern_spike.png new file mode 100644 index 00000000..7fec5381 Binary files /dev/null and b/mods/tinker/textures/items/materials/pattern_spike.png differ diff --git a/mods/tinker/textures/items/materials/pattern_swordblade.png b/mods/tinker/textures/items/materials/pattern_swordblade.png new file mode 100644 index 00000000..b5064f6a Binary files /dev/null and b/mods/tinker/textures/items/materials/pattern_swordblade.png differ diff --git a/mods/tinker/textures/items/materials/tinkerbook_diary.png b/mods/tinker/textures/items/materials/tinkerbook_diary.png new file mode 100644 index 00000000..ecfdbad2 Binary files /dev/null and b/mods/tinker/textures/items/materials/tinkerbook_diary.png differ diff --git a/mods/tinker/textures/items/parts/alubrass_chunk.png b/mods/tinker/textures/items/parts/alubrass_chunk.png new file mode 100644 index 00000000..e50ed991 Binary files /dev/null and b/mods/tinker/textures/items/parts/alubrass_chunk.png differ diff --git a/mods/tinker/textures/items/parts/aluminum_chunk.png b/mods/tinker/textures/items/parts/aluminum_chunk.png new file mode 100644 index 00000000..26f1b3cb Binary files /dev/null and b/mods/tinker/textures/items/parts/aluminum_chunk.png differ diff --git a/mods/tinker/textures/items/parts/alumite_chunk.png b/mods/tinker/textures/items/parts/alumite_chunk.png new file mode 100644 index 00000000..7bfffb15 Binary files /dev/null and b/mods/tinker/textures/items/parts/alumite_chunk.png differ diff --git a/mods/tinker/textures/items/parts/alumite_rod.png b/mods/tinker/textures/items/parts/alumite_rod.png new file mode 100644 index 00000000..7d3c03cd Binary files /dev/null and b/mods/tinker/textures/items/parts/alumite_rod.png differ diff --git a/mods/tinker/textures/items/parts/ardite_chunk.png b/mods/tinker/textures/items/parts/ardite_chunk.png new file mode 100644 index 00000000..ddcd9f01 Binary files /dev/null and b/mods/tinker/textures/items/parts/ardite_chunk.png differ diff --git a/mods/tinker/textures/items/parts/ardite_rod.png b/mods/tinker/textures/items/parts/ardite_rod.png new file mode 100644 index 00000000..aceed518 Binary files /dev/null and b/mods/tinker/textures/items/parts/ardite_rod.png differ diff --git a/mods/tinker/textures/items/parts/bone_rod.png b/mods/tinker/textures/items/parts/bone_rod.png new file mode 100644 index 00000000..d3b4a66e Binary files /dev/null and b/mods/tinker/textures/items/parts/bone_rod.png differ diff --git a/mods/tinker/textures/items/parts/bronze_chunk.png b/mods/tinker/textures/items/parts/bronze_chunk.png new file mode 100644 index 00000000..f7165bd9 Binary files /dev/null and b/mods/tinker/textures/items/parts/bronze_chunk.png differ diff --git a/mods/tinker/textures/items/parts/bronze_rod.png b/mods/tinker/textures/items/parts/bronze_rod.png new file mode 100644 index 00000000..f575a98d Binary files /dev/null and b/mods/tinker/textures/items/parts/bronze_rod.png differ diff --git a/mods/tinker/textures/items/parts/cactus_chunk.png b/mods/tinker/textures/items/parts/cactus_chunk.png new file mode 100644 index 00000000..7bfcb3e3 Binary files /dev/null and b/mods/tinker/textures/items/parts/cactus_chunk.png differ diff --git a/mods/tinker/textures/items/parts/cactus_rod.png b/mods/tinker/textures/items/parts/cactus_rod.png new file mode 100644 index 00000000..1cd0582d Binary files /dev/null and b/mods/tinker/textures/items/parts/cactus_rod.png differ diff --git a/mods/tinker/textures/items/parts/cobalt_axe_head.png b/mods/tinker/textures/items/parts/cobalt_axe_head.png index 667ab9f6..1b8b9e80 100644 Binary files a/mods/tinker/textures/items/parts/cobalt_axe_head.png and b/mods/tinker/textures/items/parts/cobalt_axe_head.png differ diff --git a/mods/tinker/textures/items/parts/cobalt_chunk.png b/mods/tinker/textures/items/parts/cobalt_chunk.png new file mode 100644 index 00000000..16ad3e88 Binary files /dev/null and b/mods/tinker/textures/items/parts/cobalt_chunk.png differ diff --git a/mods/tinker/textures/items/parts/cobalt_rod.png b/mods/tinker/textures/items/parts/cobalt_rod.png new file mode 100644 index 00000000..0d97d5a0 Binary files /dev/null and b/mods/tinker/textures/items/parts/cobalt_rod.png differ diff --git a/mods/tinker/textures/items/parts/cobalt_shovel_head.png b/mods/tinker/textures/items/parts/cobalt_shovel_head.png new file mode 100644 index 00000000..9701d054 Binary files /dev/null and b/mods/tinker/textures/items/parts/cobalt_shovel_head.png differ diff --git a/mods/tinker/textures/items/parts/copper_chunk.png b/mods/tinker/textures/items/parts/copper_chunk.png new file mode 100644 index 00000000..7e814192 Binary files /dev/null and b/mods/tinker/textures/items/parts/copper_chunk.png differ diff --git a/mods/tinker/textures/items/parts/copper_rod.png b/mods/tinker/textures/items/parts/copper_rod.png new file mode 100644 index 00000000..99d15994 Binary files /dev/null and b/mods/tinker/textures/items/parts/copper_rod.png differ diff --git a/mods/tinker/textures/items/parts/flint_chunk.png b/mods/tinker/textures/items/parts/flint_chunk.png new file mode 100644 index 00000000..2b44359c Binary files /dev/null and b/mods/tinker/textures/items/parts/flint_chunk.png differ diff --git a/mods/tinker/textures/items/parts/flint_rod.png b/mods/tinker/textures/items/parts/flint_rod.png new file mode 100644 index 00000000..d3657219 Binary files /dev/null and b/mods/tinker/textures/items/parts/flint_rod.png differ diff --git a/mods/tinker/textures/items/parts/iron_chunk.png b/mods/tinker/textures/items/parts/iron_chunk.png new file mode 100644 index 00000000..44e4d9f6 Binary files /dev/null and b/mods/tinker/textures/items/parts/iron_chunk.png differ diff --git a/mods/tinker/textures/items/parts/iron_rod.png b/mods/tinker/textures/items/parts/iron_rod.png new file mode 100644 index 00000000..53da908a Binary files /dev/null and b/mods/tinker/textures/items/parts/iron_rod.png differ diff --git a/mods/tinker/textures/items/parts/manyullyn_chunk.png b/mods/tinker/textures/items/parts/manyullyn_chunk.png new file mode 100644 index 00000000..ef65e9a6 Binary files /dev/null and b/mods/tinker/textures/items/parts/manyullyn_chunk.png differ diff --git a/mods/tinker/textures/items/parts/manyullyn_rod.png b/mods/tinker/textures/items/parts/manyullyn_rod.png new file mode 100644 index 00000000..4b57922e Binary files /dev/null and b/mods/tinker/textures/items/parts/manyullyn_rod.png differ diff --git a/mods/tinker/textures/items/parts/netherrack_chunk.png b/mods/tinker/textures/items/parts/netherrack_chunk.png new file mode 100644 index 00000000..e566229a Binary files /dev/null and b/mods/tinker/textures/items/parts/netherrack_chunk.png differ diff --git a/mods/tinker/textures/items/parts/netherrack_rod.png b/mods/tinker/textures/items/parts/netherrack_rod.png new file mode 100644 index 00000000..465c67ed Binary files /dev/null and b/mods/tinker/textures/items/parts/netherrack_rod.png differ diff --git a/mods/tinker/textures/items/parts/obsidian_chunk.png b/mods/tinker/textures/items/parts/obsidian_chunk.png new file mode 100644 index 00000000..0b0983fa Binary files /dev/null and b/mods/tinker/textures/items/parts/obsidian_chunk.png differ diff --git a/mods/tinker/textures/items/parts/obsidian_rod.png b/mods/tinker/textures/items/parts/obsidian_rod.png new file mode 100644 index 00000000..1ab37ce8 Binary files /dev/null and b/mods/tinker/textures/items/parts/obsidian_rod.png differ diff --git a/mods/tinker/textures/items/parts/paper_rod.png b/mods/tinker/textures/items/parts/paper_rod.png new file mode 100644 index 00000000..9403afaf Binary files /dev/null and b/mods/tinker/textures/items/parts/paper_rod.png differ diff --git a/mods/tinker/textures/items/parts/slime_chunk.png b/mods/tinker/textures/items/parts/slime_chunk.png new file mode 100644 index 00000000..973793b0 Binary files /dev/null and b/mods/tinker/textures/items/parts/slime_chunk.png differ diff --git a/mods/tinker/textures/items/parts/slime_rod.png b/mods/tinker/textures/items/parts/slime_rod.png new file mode 100644 index 00000000..d93ddf41 Binary files /dev/null and b/mods/tinker/textures/items/parts/slime_rod.png differ diff --git a/mods/tinker/textures/items/parts/steel_chunk.png b/mods/tinker/textures/items/parts/steel_chunk.png new file mode 100644 index 00000000..6ad835db Binary files /dev/null and b/mods/tinker/textures/items/parts/steel_chunk.png differ diff --git a/mods/tinker/textures/items/parts/steel_rod.png b/mods/tinker/textures/items/parts/steel_rod.png new file mode 100644 index 00000000..cb677f34 Binary files /dev/null and b/mods/tinker/textures/items/parts/steel_rod.png differ diff --git a/mods/tinker/textures/items/parts/stone_chunk.png b/mods/tinker/textures/items/parts/stone_chunk.png new file mode 100644 index 00000000..289c53e1 Binary files /dev/null and b/mods/tinker/textures/items/parts/stone_chunk.png differ diff --git a/mods/tinker/textures/items/parts/stone_rod.png b/mods/tinker/textures/items/parts/stone_rod.png new file mode 100644 index 00000000..decfa4dc Binary files /dev/null and b/mods/tinker/textures/items/parts/stone_rod.png differ diff --git a/mods/tinker/textures/items/parts/tin_chunk.png b/mods/tinker/textures/items/parts/tin_chunk.png new file mode 100644 index 00000000..10c3dba6 Binary files /dev/null and b/mods/tinker/textures/items/parts/tin_chunk.png differ diff --git a/mods/tinker/textures/items/parts/wood_chunk.png b/mods/tinker/textures/items/parts/wood_chunk.png new file mode 100644 index 00000000..6b1a1d2d Binary files /dev/null and b/mods/tinker/textures/items/parts/wood_chunk.png differ diff --git a/mods/tinker/textures/items/parts/wood_rod.png b/mods/tinker/textures/items/parts/wood_rod.png new file mode 100644 index 00000000..85f7d773 Binary files /dev/null and b/mods/tinker/textures/items/parts/wood_rod.png differ diff --git a/mods/tinker/resources/patterns.png b/mods/tinker/textures/items/patterns.png similarity index 100% rename from mods/tinker/resources/patterns.png rename to mods/tinker/textures/items/patterns.png diff --git a/mods/tinker/resources/stonearmorstand.png b/mods/tinker/textures/items/stonearmorstand.png similarity index 100% rename from mods/tinker/resources/stonearmorstand.png rename to mods/tinker/textures/items/stonearmorstand.png diff --git a/mods/tinker/resources/mob/armorstandtexture.png b/mods/tinker/textures/mob/armorstandtexture.png similarity index 100% rename from mods/tinker/resources/mob/armorstandtexture.png rename to mods/tinker/textures/mob/armorstandtexture.png diff --git a/mods/tinker/resources/mob/crystalwater.png b/mods/tinker/textures/mob/crystalwater.png similarity index 100% rename from mods/tinker/resources/mob/crystalwater.png rename to mods/tinker/textures/mob/crystalwater.png diff --git a/mods/tinker/resources/mob/skyla.png b/mods/tinker/textures/mob/skyla.png similarity index 100% rename from mods/tinker/resources/mob/skyla.png rename to mods/tinker/textures/mob/skyla.png