diff --git a/resources/tinkertextures/materials.png b/resources/tinkertextures/materials.png index 1f23e5e0..ea199cef 100644 Binary files a/resources/tinkertextures/materials.png and b/resources/tinkertextures/materials.png differ diff --git a/tinker/armory/client/RenderDisplay.java b/tinker/armory/client/RenderDisplay.java index 051b3718..59a76de7 100644 --- a/tinker/armory/client/RenderDisplay.java +++ b/tinker/armory/client/RenderDisplay.java @@ -10,6 +10,7 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; import tinker.armory.content.DisplayLogic; +import tinker.common.BlockSkinRenderHelper; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -62,13 +63,13 @@ public class RenderDisplay implements ISimpleBlockRenderingHandler int bottomMeta = bottomStack.getItemDamage(); renderer.setRenderBounds(0.125, 0.125F, 0.0F, 0.375, 0.875F, 0.0625); - BlockSkinRenderHelper.renderStandardMetadataBlock(bottomSkin, bottomMeta, x, y, z, renderer, world); + BlockSkinRenderHelper.renderMetadataBlock(bottomSkin, bottomMeta, x, y, z, renderer, world); renderer.setRenderBounds(0.6125, 0.125F, 0.0F, 0.875, 0.875F, 0.0625); - BlockSkinRenderHelper.renderStandardMetadataBlock(bottomSkin, bottomMeta, x, y, z, renderer, world); + BlockSkinRenderHelper.renderMetadataBlock(bottomSkin, bottomMeta, x, y, z, renderer, world); renderer.setRenderBounds(0.0F, 0.5F, 0.0F, 1.0F, 0.625F, 0.09375); - BlockSkinRenderHelper.renderStandardMetadataBlock(topSkin, topMeta, x, y, z, renderer, world); + BlockSkinRenderHelper.renderMetadataBlock(topSkin, topMeta, x, y, z, renderer, world); renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.125F, 0.125); - BlockSkinRenderHelper.renderStandardMetadataBlock(topSkin, topMeta, x, y, z, renderer, world); + BlockSkinRenderHelper.renderMetadataBlock(topSkin, topMeta, x, y, z, renderer, world); } return false; } diff --git a/tinker/armory/client/BlockSkinRenderHelper.java b/tinker/common/BlockSkinRenderHelper.java similarity index 52% rename from tinker/armory/client/BlockSkinRenderHelper.java rename to tinker/common/BlockSkinRenderHelper.java index 72875519..95d2d6f7 100644 --- a/tinker/armory/client/BlockSkinRenderHelper.java +++ b/tinker/common/BlockSkinRenderHelper.java @@ -1,4 +1,4 @@ -package tinker.armory.client; +package tinker.common; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -9,7 +9,7 @@ import net.minecraft.world.IBlockAccess; public class BlockSkinRenderHelper { - public static boolean renderStandardMetadataBlock (Block block, int metadata, int x, int y, int z, RenderBlocks render, IBlockAccess world) + public static boolean renderMetadataBlock (Block block, int metadata, int x, int y, int z, RenderBlocks renderer, IBlockAccess world) { int var5 = block.colorMultiplier(world, x, y, z); float var6 = (float) (var5 >> 16 & 255) / 255.0F; @@ -27,8 +27,8 @@ public class BlockSkinRenderHelper } return Minecraft.isAmbientOcclusionEnabled() && Block.lightValue[block.blockID] == 0 ? - renderMetadataBlockWithAmbientOcclusion(block, metadata, x, y, z, var6, var7, var8, render, world) - : renderMetadataBlockWithColorMultiplier(block, metadata, x, y, z, var6, var7, var8, render, world); + renderMetadataBlockWithAmbientOcclusion(block, metadata, x, y, z, var6, var7, var8, renderer, world) + : renderMetadataBlockWithColorMultiplier(block, metadata, x, y, z, var6, var7, var8, renderer, world); } static boolean renderMetadataBlockWithAmbientOcclusion(Block block, int metadata, int xMin, int yMin, int zMin, @@ -949,6 +949,849 @@ public class BlockSkinRenderHelper var9 = true; } + return var9; + } + + public static boolean renderFakeBlock (int texturePos, int metadata, int x, int y, int z, RenderBlocks renderer, IBlockAccess world) + { + Block block = Block.stone; + int var5 = block.colorMultiplier(world, x, y, z); + float var6 = (float) (var5 >> 16 & 255) / 255.0F; + float var7 = (float) (var5 >> 8 & 255) / 255.0F; + float var8 = (float) (var5 & 255) / 255.0F; + + if (EntityRenderer.anaglyphEnable) + { + float var9 = (var6 * 30.0F + var7 * 59.0F + var8 * 11.0F) / 100.0F; + float var10 = (var6 * 30.0F + var7 * 70.0F) / 100.0F; + float var11 = (var6 * 30.0F + var8 * 70.0F) / 100.0F; + var6 = var9; + var7 = var10; + var8 = var11; + } + + return Minecraft.isAmbientOcclusionEnabled() ? + renderFakeBlockWithAmbientOcclusion(texturePos, metadata, x, y, z, var6, var7, var8, renderer, world) + : renderFakeBlockWithColorMultiplier(texturePos, metadata, x, y, z, var6, var7, var8, renderer, world); + } + + static boolean renderFakeBlockWithAmbientOcclusion(int texturePos, 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; + 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); + render.aoLightValueZNeg = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin, zMin - 1); + 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; + + if (render.renderMinY <= 0.0D) + { + var21 = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin - 1, zMin); + } + + if (render.renderMaxY >= 1.0D) + { + var24 = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin + 1, zMin); + } + + if (render.renderMinX <= 0.0D) + { + var20 = block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin, zMin); + } + + if (render.renderMaxX >= 1.0D) + { + var23 = block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin, zMin); + } + + if (render.renderMinZ <= 0.0D) + { + var22 = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin - 1); + } + + if (render.renderMaxZ >= 1.0D) + { + var25 = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin + 1); + } + + Tessellator var26 = Tessellator.instance; + var26.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)]; + render.aoGrassXYZPCN = Block.canBlockGrass[render.blockAccess.getBlockId(xMin + 1, yMin, zMin - 1)]; + render.aoGrassXYZNPC = Block.canBlockGrass[render.blockAccess.getBlockId(xMin - 1, yMin + 1, zMin)]; + render.aoGrassXYZNNC = Block.canBlockGrass[render.blockAccess.getBlockId(xMin - 1, yMin - 1, zMin)]; + render.aoGrassXYZNCN = Block.canBlockGrass[render.blockAccess.getBlockId(xMin - 1, yMin, zMin - 1)]; + render.aoGrassXYZNCP = Block.canBlockGrass[render.blockAccess.getBlockId(xMin - 1, yMin, zMin + 1)]; + render.aoGrassXYZCPP = Block.canBlockGrass[render.blockAccess.getBlockId(xMin, yMin + 1, zMin + 1)]; + render.aoGrassXYZCPN = Block.canBlockGrass[render.blockAccess.getBlockId(xMin, yMin + 1, zMin - 1)]; + 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) + { + var18 = false; + var17 = false; + var16 = false; + var15 = false; + var13 = false; + } + + if (render.overrideBlockTexture >= 0) + { + var18 = false; + var17 = false; + var16 = false; + var15 = false; + var13 = false; + } + + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin, yMin - 1, zMin, 0)) + { + if (render.aoType > 0) + { + if (render.renderMinY <= 0.0D) + { + --yMin; + } + + render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin, zMin); + render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin - 1); + render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin + 1); + render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin, zMin); + render.aoLightValueScratchXYNN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin - 1, yMin, zMin); + render.aoLightValueScratchYZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin, zMin - 1); + render.aoLightValueScratchYZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin, zMin + 1); + render.aoLightValueScratchXYPN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin + 1, yMin, zMin); + + if (!render.aoGrassXYZCNN && !render.aoGrassXYZNNC) + { + render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXYNN; + render.aoBrightnessXYZNNN = render.aoBrightnessXYNN; + } + else + { + render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin - 1, yMin, zMin - 1); + render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin, zMin - 1); + } + + if (!render.aoGrassXYZCNP && !render.aoGrassXYZNNC) + { + render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXYNN; + render.aoBrightnessXYZNNP = render.aoBrightnessXYNN; + } + else + { + render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin - 1, yMin, zMin + 1); + render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin, zMin + 1); + } + + if (!render.aoGrassXYZCNN && !render.aoGrassXYZPNC) + { + render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXYPN; + render.aoBrightnessXYZPNN = render.aoBrightnessXYPN; + } + else + { + render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin + 1, yMin, zMin - 1); + render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin, zMin - 1); + } + + if (!render.aoGrassXYZCNP && !render.aoGrassXYZPNC) + { + render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXYPN; + render.aoBrightnessXYZPNP = render.aoBrightnessXYPN; + } + else + { + render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin + 1, yMin, zMin + 1); + render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin, zMin + 1); + } + + if (render.renderMinY <= 0.0D) + { + ++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); + } + else + { + var12 = render.aoLightValueYNeg; + var11 = render.aoLightValueYNeg; + var10 = render.aoLightValueYNeg; + var9 = 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; + } + + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin, yMin + 1, zMin, 1)) + { + if (render.aoType > 0) + { + if (render.renderMaxY >= 1.0D) + { + ++yMin; + } + + render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin, zMin); + render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin, zMin); + render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin - 1); + render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin + 1); + render.aoLightValueScratchXYNP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin - 1, yMin, zMin); + render.aoLightValueScratchXYPP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin + 1, yMin, zMin); + render.aoLightValueScratchYZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin, zMin - 1); + render.aoLightValueScratchYZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin, zMin + 1); + + if (!render.aoGrassXYZCPN && !render.aoGrassXYZNPC) + { + render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXYNP; + render.aoBrightnessXYZNPN = render.aoBrightnessXYNP; + } + else + { + render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin - 1, yMin, zMin - 1); + render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin, zMin - 1); + } + + if (!render.aoGrassXYZCPN && !render.aoGrassXYZPPC) + { + render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXYPP; + render.aoBrightnessXYZPPN = render.aoBrightnessXYPP; + } + else + { + render.aoLightValueScratchXYZPPN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin + 1, yMin, zMin - 1); + render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin, zMin - 1); + } + + if (!render.aoGrassXYZCPP && !render.aoGrassXYZNPC) + { + render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXYNP; + render.aoBrightnessXYZNPP = render.aoBrightnessXYNP; + } + else + { + render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin - 1, yMin, zMin + 1); + render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin, zMin + 1); + } + + if (!render.aoGrassXYZCPP && !render.aoGrassXYZPPC) + { + render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXYPP; + render.aoBrightnessXYZPPP = render.aoBrightnessXYPP; + } + else + { + render.aoLightValueScratchXYZPPP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin + 1, yMin, zMin + 1); + render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin, zMin + 1); + } + + if (render.renderMaxY >= 1.0D) + { + --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); + } + else + { + var12 = render.aoLightValueYPos; + var11 = render.aoLightValueYPos; + var10 = render.aoLightValueYPos; + var9 = render.aoLightValueYPos; + render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = var24; + } + + 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; + } + + int var27; + + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin, yMin, zMin - 1, 2)) + { + if (render.aoType > 0) + { + if (render.renderMinZ <= 0.0D) + { + --zMin; + } + + render.aoLightValueScratchXZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin - 1, yMin, zMin); + render.aoLightValueScratchYZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin - 1, zMin); + render.aoLightValueScratchYZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin + 1, zMin); + render.aoLightValueScratchXZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin + 1, yMin, zMin); + render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin, zMin); + render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin - 1, zMin); + render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin + 1, zMin); + render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin, zMin); + + if (!render.aoGrassXYZNCN && !render.aoGrassXYZCNN) + { + render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; + render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; + } + else + { + render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin - 1, yMin - 1, zMin); + render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin - 1, zMin); + } + + if (!render.aoGrassXYZNCN && !render.aoGrassXYZCPN) + { + render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN; + render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; + } + else + { + render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin - 1, yMin + 1, zMin); + render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin + 1, zMin); + } + + if (!render.aoGrassXYZPCN && !render.aoGrassXYZCNN) + { + render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; + } + else + { + render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin + 1, yMin - 1, zMin); + render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin - 1, zMin); + } + + if (!render.aoGrassXYZPCN && !render.aoGrassXYZCPN) + { + render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; + } + else + { + render.aoLightValueScratchXYZPPN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin + 1, yMin + 1, zMin); + render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin + 1, zMin); + } + + if (render.renderMinZ <= 0.0D) + { + ++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); + } + else + { + var12 = render.aoLightValueZNeg; + var11 = render.aoLightValueZNeg; + var10 = render.aoLightValueZNeg; + var9 = render.aoLightValueZNeg; + render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = var22; + } + + 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; + } + + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin, yMin, zMin + 1, 3)) + { + if (render.aoType > 0) + { + if (render.renderMaxZ >= 1.0D) + { + ++zMin; + } + + render.aoLightValueScratchXZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin - 1, yMin, zMin); + render.aoLightValueScratchXZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin + 1, yMin, zMin); + render.aoLightValueScratchYZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin - 1, zMin); + render.aoLightValueScratchYZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin + 1, zMin); + render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin, zMin); + render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin, zMin); + render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin - 1, zMin); + render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin + 1, zMin); + + if (!render.aoGrassXYZNCP && !render.aoGrassXYZCNP) + { + render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; + } + else + { + render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin - 1, yMin - 1, zMin); + render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin - 1, zMin); + } + + if (!render.aoGrassXYZNCP && !render.aoGrassXYZCPP) + { + render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; + } + else + { + render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin - 1, yMin + 1, zMin); + render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin + 1, zMin); + } + + if (!render.aoGrassXYZPCP && !render.aoGrassXYZCNP) + { + render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; + } + else + { + render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin + 1, yMin - 1, zMin); + render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin - 1, zMin); + } + + if (!render.aoGrassXYZPCP && !render.aoGrassXYZCPP) + { + render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; + } + else + { + render.aoLightValueScratchXYZPPP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin + 1, yMin + 1, zMin); + render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin + 1, zMin); + } + + if (render.renderMaxZ >= 1.0D) + { + --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); + } + else + { + var12 = render.aoLightValueZPos; + var11 = render.aoLightValueZPos; + var10 = render.aoLightValueZPos; + var9 = render.aoLightValueZPos; + render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = var25; + } + + 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); + + var8 = true; + } + + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin - 1, yMin, zMin, 4)) + { + if (render.aoType > 0) + { + if (render.renderMinX <= 0.0D) + { + --xMin; + } + + render.aoLightValueScratchXYNN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin - 1, zMin); + render.aoLightValueScratchXZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin, zMin - 1); + render.aoLightValueScratchXZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin, zMin + 1); + render.aoLightValueScratchXYNP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin + 1, zMin); + render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin - 1, zMin); + render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin - 1); + render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin + 1); + render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin + 1, zMin); + + if (!render.aoGrassXYZNCN && !render.aoGrassXYZNNC) + { + render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; + render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; + } + else + { + render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin - 1, zMin - 1); + render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin - 1, zMin - 1); + } + + if (!render.aoGrassXYZNCP && !render.aoGrassXYZNNC) + { + render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; + } + else + { + render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin - 1, zMin + 1); + render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin - 1, zMin + 1); + } + + if (!render.aoGrassXYZNCN && !render.aoGrassXYZNPC) + { + render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN; + render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; + } + else + { + render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin + 1, zMin - 1); + render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin + 1, zMin - 1); + } + + if (!render.aoGrassXYZNCP && !render.aoGrassXYZNPC) + { + render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; + } + else + { + render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin + 1, zMin + 1); + render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin + 1, zMin + 1); + } + + if (render.renderMinX <= 0.0D) + { + ++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); + } + else + { + var12 = render.aoLightValueXNeg; + var11 = render.aoLightValueXNeg; + var10 = render.aoLightValueXNeg; + var9 = render.aoLightValueXNeg; + render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = var20; + } + + 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); + + var8 = true; + } + + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin + 1, yMin, zMin, 5)) + { + if (render.aoType > 0) + { + if (render.renderMaxX >= 1.0D) + { + ++xMin; + } + + render.aoLightValueScratchXYPN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin - 1, zMin); + render.aoLightValueScratchXZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin, zMin - 1); + render.aoLightValueScratchXZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin, zMin + 1); + render.aoLightValueScratchXYPP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin + 1, zMin); + render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin - 1, zMin); + render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin - 1); + render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin + 1); + render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin + 1, zMin); + + if (!render.aoGrassXYZPNC && !render.aoGrassXYZPCN) + { + render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; + } + else + { + render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin - 1, zMin - 1); + render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin - 1, zMin - 1); + } + + if (!render.aoGrassXYZPNC && !render.aoGrassXYZPCP) + { + render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; + } + else + { + render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin - 1, zMin + 1); + render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin - 1, zMin + 1); + } + + if (!render.aoGrassXYZPPC && !render.aoGrassXYZPCN) + { + render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; + } + else + { + render.aoLightValueScratchXYZPPN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin + 1, zMin - 1); + render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin + 1, zMin - 1); + } + + if (!render.aoGrassXYZPPC && !render.aoGrassXYZPCP) + { + render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; + } + else + { + render.aoLightValueScratchXYZPPP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin + 1, zMin + 1); + render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin + 1, zMin + 1); + } + + if (render.renderMaxX >= 1.0D) + { + --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); + } + else + { + var12 = render.aoLightValueXPos; + var11 = render.aoLightValueXPos; + var10 = render.aoLightValueXPos; + var9 = render.aoLightValueXPos; + render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = var23; + } + + 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); + + var8 = true; + } + + render.enableAO = false; + return var8; + } + + static boolean renderFakeBlockWithColorMultiplier(int texturePos, int metadata, int minX, int minY, int minZ, float maxX, float maxY, float maxZ, 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; + + 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; + } + + int var26 = block.getMixedBrightnessForBlock(render.blockAccess, minX, minY, minZ); + + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, minX, minY - 1, minZ, 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; + } + + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, minX, minY + 1, minZ, 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; + } + + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, minX, minY, minZ - 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); + + var9 = true; + } + + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, minX, minY, minZ + 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); + + var9 = true; + } + + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, minX - 1, minY, minZ, 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); + + var9 = true; + } + + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, minX + 1, minY, minZ, 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); + + var9 = true; + } + return var9; } } diff --git a/tinker/tconstruct/TContent.java b/tinker/tconstruct/TContent.java index 5f385f07..f0bca662 100644 --- a/tinker/tconstruct/TContent.java +++ b/tinker/tconstruct/TContent.java @@ -398,7 +398,16 @@ public class TContent implements IFuelHandler void addSmelteryRecipes() { - Smeltery.instance.addLiquidMelting(Block.oreIron.blockID, 0, 450, new LiquidStack(ironStill.blockID, 250, 0)); + Smeltery.addMelting(Block.oreIron, 0, 450, new LiquidStack(ironStill.blockID, 250, 0)); + Smeltery.addMelting(Block.oreGold, 0, 300, new LiquidStack(goldStill.blockID, 250, 0)); + Smeltery.addMelting(new ItemStack(Item.ingotIron, 8), Block.blockSteel.blockID, 0, 450, new LiquidStack(ironStill.blockID, 250, 0)); + Smeltery.addMelting(new ItemStack(Item.ingotGold, 8), Block.blockGold.blockID, 0, 300, new LiquidStack(goldStill.blockID, 250, 0)); + Smeltery.addMelting(Block.blockSteel, 0, 450, new LiquidStack(ironStill.blockID, 2250, 0)); + Smeltery.addMelting(Block.blockGold, 0, 300, new LiquidStack(goldStill.blockID, 2250, 0)); + Smeltery.addMelting(searedBrick, 3, 300, new LiquidStack(copperStill.blockID, 250, 0)); + Smeltery.addMelting(searedBrick, 4, 300, new LiquidStack(tinStill.blockID, 250, 0)); + + Smeltery.addAlloyMixing(new LiquidStack(bronzeStill.blockID, 4, 0), new LiquidStack(copperStill.blockID, 3, 0), new LiquidStack(tinStill.blockID, 1, 0)); } void addCraftingRecipes () diff --git a/tinker/tconstruct/client/SmelteryRender.java b/tinker/tconstruct/client/SmelteryRender.java index 8960e8d2..56a60361 100644 --- a/tinker/tconstruct/client/SmelteryRender.java +++ b/tinker/tconstruct/client/SmelteryRender.java @@ -3,12 +3,17 @@ package tinker.tconstruct.client; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.liquids.LiquidStack; import org.lwjgl.opengl.GL11; +import tinker.common.BlockSkinRenderHelper; +import tinker.tconstruct.crafting.Smeltery; import tinker.tconstruct.logic.SmelteryLogic; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -38,20 +43,51 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler //Melting for (int i = 0; i < 9; i++) { - if (logic.isStackInSlot(i)) + ItemStack input = logic.getStackInSlot(i); + if (input != null) { - Block invBlock = Block.blocksList[logic.getStackInSlot(i).itemID]; - ForgeHooksClient.bindTexture(invBlock.getTextureFile(), 0); - renderer.renderStandardBlock(invBlock, posX + i % 3, posY, posZ + i / 3); + ItemStack blockToRender = Smeltery.getRenderIndex(input); + float blockHeight = input.stackSize / (float) blockToRender.stackSize; + renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, MathHelper.clamp_float(blockHeight, 0.01F, 1.0F), 1.0F); + + if (blockToRender.itemID < 4096) //Block + { + Block liquidBlock = Block.blocksList[blockToRender.itemID]; + 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); + int metadata = blockToRender.getItemDamage(); + BlockSkinRenderHelper.renderFakeBlock(liquidItem.getIconFromDamage(metadata), metadata, posX, posY, posZ, renderer, world); + } } } //Liquids + float base = 0F; for (LiquidStack liquid : logic.moltenMetal) { - Block invBlock = Block.blocksList[liquid.itemID]; - ForgeHooksClient.bindTexture(invBlock.getTextureFile(), 0); - renderer.renderStandardBlock(invBlock, posX, posY, posZ); + float height = liquid.amount / 10000F; + renderer.setRenderBounds(0.0F, base, 0.0F, 1.0F, height + base, 1.0F); + base += height; + + if (liquid.itemID < 4096) //Block + { + Block liquidBlock = Block.blocksList[liquid.itemID]; + ForgeHooksClient.bindTexture(liquidBlock.getTextureFile(), 0); + for (int i = 0; i < 9; i++) + BlockSkinRenderHelper.renderMetadataBlock(liquidBlock, liquid.itemMeta, posX + i % 3, posY, posZ + i / 3, renderer, world); + } + else //Item + { + Item liquidItem = Item.itemsList[liquid.itemID]; + ForgeHooksClient.bindTexture(liquidItem.getTextureFile(), 0); + for (int i = 0; i < 9; i++) + BlockSkinRenderHelper.renderFakeBlock(liquidItem.getIconFromDamage(liquid.itemMeta), liquid.itemMeta, posX, posY, posZ, renderer, world); + } } } } diff --git a/tinker/tconstruct/client/gui/SmelteryGui.java b/tinker/tconstruct/client/gui/SmelteryGui.java index 018eb162..6836cc4f 100644 --- a/tinker/tconstruct/client/gui/SmelteryGui.java +++ b/tinker/tconstruct/client/gui/SmelteryGui.java @@ -3,12 +3,15 @@ package tinker.tconstruct.client.gui; 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.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.liquids.LiquidStack; import org.lwjgl.opengl.GL11; +import tinker.common.BlockSkinRenderHelper; import tinker.tconstruct.logic.SmelteryLogic; public class SmelteryGui extends GuiContainer @@ -45,24 +48,59 @@ public class SmelteryGui extends GuiContainer int cornerX = (width - xSize) / 2; int cornerY = (height - ySize) / 2; drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); + + //Fuel - Lava if (logic.fuelGague > 0) { ForgeHooksClient.bindTexture(Block.lavaStill.getTextureFile(), 0); - int index = Block.lavaStill.getBlockTextureFromSideAndMetadata(0, 0); - int texX = index % 16 * 16; - int texY = index / 16 * 16; + int renderIndex = 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 + 146, (cornerY + 67) - size - 16*count, texX, texY+16-size, 9, size); + drawTexturedModalRect(cornerX + 146, (cornerY + 67) - size - 16*count, xTex, yTex+16-size, 9, size); count++; } } + + //Liquids - molten metal + int base = 0; + for (LiquidStack liquid : logic.moltenMetal) + { + int renderIndex; + if (liquid.itemID < 4096) //Block + { + Block liquidBlock = Block.blocksList[liquid.itemID]; + ForgeHooksClient.bindTexture(liquidBlock.getTextureFile(), 0); + renderIndex = liquidBlock.getBlockTextureFromSideAndMetadata(0, liquid.itemMeta); + } + else //Item + { + Item liquidItem = Item.itemsList[liquid.itemID]; + ForgeHooksClient.bindTexture(liquidItem.getTextureFile(), 0); + renderIndex = liquidItem.getIconFromDamage(liquid.itemMeta); + } - // Draw description + int xTex = renderIndex % 16 * 16; + int yTex = renderIndex / 16 * 16; + int liquidSize = liquid.amount * 52 / 10000; + while (liquidSize > 0) + { + int size = liquidSize >= 16 ? 16 : liquidSize; + drawTexturedModalRect(cornerX + 13, (cornerY + 68) - size - base, xTex, yTex+16-size, 16, size); + drawTexturedModalRect(cornerX + 29, (cornerY + 68) - size - base, xTex, yTex+16-size, 16, size); + drawTexturedModalRect(cornerX + 45, (cornerY + 68) - size - base, xTex, yTex+16-size, 2, size); + liquidSize -= size; + base += size; + } + //base = liquid.amount / 10000 * 52; + } + + // Draw description - don't use this texID = this.mc.renderEngine.getTexture("/tinkertextures/gui/description.png"); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.mc.renderEngine.bindTexture(texID); diff --git a/tinker/tconstruct/crafting/AlloyMix.java b/tinker/tconstruct/crafting/AlloyMix.java new file mode 100644 index 00000000..ea5d1c9c --- /dev/null +++ b/tinker/tconstruct/crafting/AlloyMix.java @@ -0,0 +1,93 @@ +package tinker.tconstruct.crafting; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import net.minecraftforge.liquids.LiquidStack; + +public class AlloyMix +{ + public final LiquidStack result; + public final List mixers; + + public AlloyMix(LiquidStack output, List inputs) + { + result = output; + mixers = inputs; + } + + /*public boolean matches(List liquids) + { + ArrayList list = new ArrayList(mixers); + return false; + }*/ + + public LiquidStack mix (ArrayList liquids) + { + ArrayList copyMix = new ArrayList(mixers); + ArrayList effectiveAmount = new ArrayList(); + + for (int i = 0; i < liquids.size(); i++) + { + LiquidStack liquid = liquids.get(i); + Iterator iter = copyMix.iterator(); + while (iter.hasNext()) + { + LiquidStack mixer = (LiquidStack) iter.next(); + if (mixer.itemID == liquid.itemID && mixer.itemMeta == liquid.itemMeta) + { + int eAmt = liquid.amount / mixer.amount; + effectiveAmount.add(eAmt); + copyMix.remove(mixer); + //inputs.add(liquid); + break; + } + } + } + //} + + if (copyMix.size() > 0) + return null; + + //Remove old liquids + int low = getLowestAmount(effectiveAmount); + ArrayList copyMix2 = new ArrayList(mixers); + + for (int i = 0; i < liquids.size(); i++) + { + LiquidStack liquid = liquids.get(i); + Iterator iter = copyMix2.iterator(); + while (iter.hasNext()) + { + LiquidStack mixer = (LiquidStack) iter.next(); + if (mixer.itemID == liquid.itemID && mixer.itemMeta == liquid.itemMeta) + { + int eAmt = low * mixer.amount; + liquid.amount -= eAmt; + if (liquid.amount <= 0) + { + liquids.remove(liquid); + i--; + } + copyMix2.remove(mixer); + break; + } + } + } + + return new LiquidStack(result.itemID, result.amount * low, result.itemMeta); + } + + int getLowestAmount (ArrayList list) + { + int frist = (Integer) list.get(0); //FRIST!!! + for (int i = 1; i < list.size(); i++) + { + int compare = (Integer) list.get(i); + if (frist > compare) + frist = compare; + } + return frist; + } +} diff --git a/tinker/tconstruct/crafting/Smeltery.java b/tinker/tconstruct/crafting/Smeltery.java index 98943569..37187bcb 100644 --- a/tinker/tconstruct/crafting/Smeltery.java +++ b/tinker/tconstruct/crafting/Smeltery.java @@ -1,9 +1,11 @@ package tinker.tconstruct.crafting; +import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; +import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraftforge.liquids.LiquidStack; @@ -14,17 +16,43 @@ public class Smeltery private HashMap, LiquidStack> smeltingList = new HashMap, LiquidStack>(); private HashMap, Integer> temperatureList = new HashMap, Integer>(); + private HashMap, ItemStack> renderIndex = new HashMap, ItemStack>(); + private ArrayList alloys = new ArrayList(); - /** Adds a mapping between an input and an itemstack + /** Adds mappings between a block and its liquid * - * @param itemID The block or item's main ID - * @param metadata Damage or use - * @param itemstack + * @param blockID The ID of the block to liquify and render + * @param metadata The metadata of the block to liquify and render + * @param temperature How hot the block should be before liquifying + * @param liquid The result of the process */ - public static void addLiquidMelting(int itemID, int metadata, int temperature, LiquidStack itemstack) + public static void addMelting(Block block, int metadata, int temperature, LiquidStack liquid) { - instance.smeltingList.put(Arrays.asList(itemID, metadata), itemstack); - instance.temperatureList.put(Arrays.asList(itemID, metadata), temperature); + addMelting(new ItemStack(block, 1, metadata), block.blockID, metadata, temperature, liquid); + } + + /** Adds mappings between an input and its liquid + * + * @param input The item to liquify + * @param itemID The ID of the block to render + * @param metadata The metadata of the block to render + * @param temperature How hot the block should be before liquifying + * @param liquid The result of the process + */ + public static void addMelting(ItemStack input, int itemID, int metadata, int temperature, LiquidStack liquid) + { + instance.smeltingList.put(Arrays.asList(input.itemID, input.getItemDamage()), liquid); + instance.temperatureList.put(Arrays.asList(input.itemID, input.getItemDamage()), temperature); + instance.renderIndex.put(Arrays.asList(input.itemID, input.getItemDamage()), new ItemStack(itemID, input.stackSize, metadata)); + } + + public static void addAlloyMixing(LiquidStack result, LiquidStack... mixers) + { + ArrayList inputs = new ArrayList(); + for (LiquidStack liquid : mixers) + inputs.add(liquid); + + instance.alloys.add(new AlloyMix(result, inputs)); } /** @@ -32,7 +60,7 @@ public class Smeltery * @param item The Source ItemStack * @return The result temperature */ - public static Integer getSmeltingTemperature(ItemStack item) + public static Integer getLiquifyTemperature(ItemStack item) { if (item == null) return 20; @@ -42,12 +70,6 @@ public class Smeltery return 20; else return temp; - //return instance.temperatureList.get(Arrays.asList(item.itemID, item.getItemDamage())); - } - - public static Integer getSmeltingTemperature(int blockID) - { - return getSmeltingTemperature(blockID, 0); } /** @@ -55,7 +77,7 @@ public class Smeltery * @param item The Source ItemStack * @return The result ItemStack */ - public static Integer getSmeltingTemperature(int blockID, int metadata) + public static Integer getLiquifyTemperature(int blockID, int metadata) { return instance.temperatureList.get(Arrays.asList(blockID, metadata)); } @@ -65,7 +87,7 @@ public class Smeltery * @param item The Source ItemStack * @return The result ItemStack */ - public static LiquidStack getSmeltingResult(ItemStack item) + public static LiquidStack getSmelteryResult(ItemStack item) { if (item == null) return null; @@ -76,21 +98,33 @@ public class Smeltery return stack.copy(); } - public static LiquidStack getSmeltingResult(int blockID) - { - return getSmeltingResult(blockID, 0); - } - /** * Used to get the resulting ItemStack from a source Block * @param item The Source ItemStack * @return The result ItemStack */ - public static LiquidStack getSmeltingResult(int blockID, int metadata) + public static LiquidStack getSmelteryResult(int blockID, int metadata) { LiquidStack stack = (LiquidStack) instance.smeltingList.get(Arrays.asList(blockID, metadata)); if (stack == null) return null; return stack.copy(); } + + public static ItemStack getRenderIndex(ItemStack input) + { + return instance.renderIndex.get(Arrays.asList(input.itemID, input.getItemDamage())); + } + + public static ArrayList mixMetals(ArrayList moltenMetal) + { + ArrayList liquids = new ArrayList(); + for (AlloyMix alloy : instance.alloys) + { + LiquidStack liquid = alloy.mix(moltenMetal); + if (liquid != null) + liquids.add(liquid); + } + return liquids; + } } diff --git a/tinker/tconstruct/items/Materials.java b/tinker/tconstruct/items/Materials.java index 94d4caba..a619d24d 100644 --- a/tinker/tconstruct/items/Materials.java +++ b/tinker/tconstruct/items/Materials.java @@ -36,7 +36,7 @@ public class Materials extends Item public void getSubItems(int id, CreativeTabs tab, List list) { - for (int i = 0; i < 12; i++) + for (int i = 0; i < 13; i++) list.add(new ItemStack(id, 1, i)); } diff --git a/tinker/tconstruct/logic/SmelteryLogic.java b/tinker/tconstruct/logic/SmelteryLogic.java index 0f5926a0..4c2e9970 100644 --- a/tinker/tconstruct/logic/SmelteryLogic.java +++ b/tinker/tconstruct/logic/SmelteryLogic.java @@ -6,6 +6,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; import net.minecraft.network.INetworkManager; import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.Packet132TileEntityData; @@ -181,6 +182,12 @@ public class SmelteryLogic extends InventoryLogic { inventory[i] = null; addMoltenMetal(result); + ArrayList alloys = Smeltery.mixMetals(moltenMetal); + for (int al = 0; al < alloys.size(); al++) + { + LiquidStack liquid = (LiquidStack) alloys.get(al); + addMoltenMetal(liquid); + } onInventoryChanged(); //setWorldToInventory(); } @@ -207,6 +214,10 @@ public class SmelteryLogic extends InventoryLogic l.amount += liquid.amount; added = true; } + /*if (l.amount <= 0) + { + moltenMetal.remove(l); + }*/ } if (!added) moltenMetal.add(liquid); @@ -217,7 +228,7 @@ public class SmelteryLogic extends InventoryLogic { for (int i = 0; i < 9; i++) { - meltingTemps[i] = Smeltery.instance.getSmeltingTemperature(inventory[i]); + meltingTemps[i] = Smeltery.instance.getLiquifyTemperature(inventory[i]); } } @@ -244,7 +255,7 @@ public class SmelteryLogic extends InventoryLogic public LiquidStack getResultFor (ItemStack stack) { - return Smeltery.instance.getSmeltingResult(stack); + return Smeltery.instance.getSmelteryResult(stack); } /* Inventory */ @@ -343,7 +354,7 @@ public class SmelteryLogic extends InventoryLogic centerPos = new CoordTuple(x, y, z); validStructure = true; } - internalTemp = 550; + internalTemp = 800; } else { @@ -361,6 +372,18 @@ public class SmelteryLogic extends InventoryLogic useTime = tags.getInteger("UseTime"); meltingTemps = tags.getIntArray("MeltingTemps"); activeTemps = tags.getIntArray("ActiveTemps"); + + NBTTagList liquidTag = tags.getTagList("Liquids"); + moltenMetal.clear(); + + for (int iter = 0; iter < liquidTag.tagCount(); iter++) + { + NBTTagCompound tagList = (NBTTagCompound)liquidTag.tagAt(iter); + int id = tagList.getInteger("id"); + int amount = tagList.getInteger("amount"); + int meta = tagList.getInteger("meta"); + moltenMetal.add(new LiquidStack(id, amount, meta)); + } } @Override @@ -371,6 +394,18 @@ public class SmelteryLogic extends InventoryLogic tags.setInteger("UseTime", useTime); tags.setIntArray("MeltingTemps", meltingTemps); tags.setIntArray("ActiveTemps", activeTemps); + + NBTTagList taglist = new NBTTagList(); + for (LiquidStack liquid : moltenMetal) + { + NBTTagCompound liquidTag = new NBTTagCompound(); + liquidTag.setInteger("id", liquid.itemID); + liquidTag.setInteger("amount", liquid.amount); + liquidTag.setInteger("meta", liquid.itemMeta); + taglist.appendTag(liquidTag); + } + + tags.setTag("Liquids", taglist); } /* Packets */