From ace5f7b54d68cd5bc55ea26c7ce16fa6d61a6932 Mon Sep 17 00:00:00 2001 From: mDiyo Date: Wed, 13 Mar 2013 21:36:17 -0700 Subject: [PATCH] Mostly working --- mods/tinker/armory/content/DisplayBlock.java | 2 +- mods/tinker/common/BlockSkinRenderHelper.java | 1460 +++++++++-------- mods/tinker/common/InventoryBlock.java | 13 +- mods/tinker/tconstruct/TConstruct.java | 2 +- mods/tinker/tconstruct/TContent.java | 18 +- mods/tinker/tconstruct/ai/CoreAI.java | 56 + mods/tinker/tconstruct/blocks/EquipBlock.java | 13 +- .../tinker/tconstruct/blocks/SearedBlock.java | 2 +- .../tconstruct/blocks/SmelteryBlock.java | 2 +- .../tconstruct/blocks/ToolStationBlock.java | 3 +- .../tconstruct/client/SmelteryRender.java | 21 +- .../tconstruct/client/TProxyClient.java | 10 +- .../tconstruct/client/gui/FrypanGui.java | 2 +- .../tconstruct/client/gui/GuiManual.java | 6 +- .../tconstruct/client/gui/PartCrafterGui.java | 10 +- .../client/gui/PatternChestGui.java | 2 +- .../client/gui/PatternShaperGui.java | 2 +- .../tconstruct/client/gui/SmelteryGui.java | 25 +- .../tconstruct/client/gui/ToolGuiElement.java | 2 +- .../tconstruct/client/gui/ToolStationGui.java | 12 +- mods/tinker/tconstruct/entity/GolemBase.java | 212 +++ .../tinker/tconstruct/items/CraftingItem.java | 6 +- .../tinker/tconstruct/items/FilledBucket.java | 6 +- .../tinker/tconstruct/items/MetalPattern.java | 4 +- mods/tinker/tconstruct/items/Pattern.java | 23 +- .../tconstruct/items/PatternManual.java | 7 +- mods/tinker/tconstruct/items/TitleIcon.java | 2 +- mods/tinker/tconstruct/items/ToolPart.java | 15 +- mods/tinker/tconstruct/tools/ToolCore.java | 2 +- mods/tinker/tconstruct/util/SortedList.java | 34 - .../{resources => textures}/armor/wood_1.png | Bin .../{resources => textures}/armor/wood_2.png | Bin .../entity/pullcart.png | Bin .../{resources => textures}/entity/wagon.png | Bin .../entity/wagontexture.png | Bin .../{resources => textures}/gui/book.png | Bin .../{resources => textures}/gui/bookleft.png | Bin .../{resources => textures}/gui/bookright.png | Bin .../gui/description.png | Bin .../{resources => textures}/gui/display.png | Bin .../{resources => textures}/gui/frypan.png | Bin .../{resources => textures}/gui/icons.png | Bin .../gui/patternchest.png | Bin .../gui/patternchestmini.png | Bin .../gui/patternshaper.png | Bin .../{resources => textures}/gui/smeltery.png | Bin .../gui/smelteryside.png | Bin .../{resources => textures}/gui/toolparts.png | Bin .../gui/toolstation.png | Bin .../items/frypan/glowstone_frypan_effect.png | Bin 0 -> 101 bytes .../items}/materials.png | Bin .../textures/items/materials/blank_cast.png | Bin 0 -> 633 bytes .../items/materials/blank_pattern.png | Bin 0 -> 283 bytes .../textures/items/materials/bone_chunk.png | Bin 0 -> 366 bytes .../items/materials/bucket_alubrass.png | Bin 0 -> 432 bytes .../items/materials/bucket_aluminum.png | Bin 0 -> 431 bytes .../items/materials/bucket_alumite.png | Bin 0 -> 276 bytes .../items/materials/bucket_ardite.png | Bin 0 -> 425 bytes .../items/materials/bucket_bronze.png | Bin 0 -> 437 bytes .../items/materials/bucket_cobalt.png | Bin 0 -> 414 bytes .../items/materials/bucket_copper.png | Bin 0 -> 280 bytes .../textures/items/materials/bucket_gold.png | Bin 0 -> 278 bytes .../textures/items/materials/bucket_iron.png | Bin 0 -> 286 bytes .../items/materials/bucket_manyullyn.png | Bin 0 -> 283 bytes .../items/materials/bucket_obsidian.png | Bin 0 -> 281 bytes .../textures/items/materials/bucket_steel.png | Bin 0 -> 277 bytes .../textures/items/materials/bucket_tin.png | Bin 0 -> 430 bytes .../textures/items/materials/cast_axe.png | Bin 0 -> 546 bytes .../textures/items/materials/cast_binding.png | Bin 0 -> 544 bytes .../items/materials/cast_broadaxe.png | Bin 0 -> 541 bytes .../items/materials/cast_crossbar.png | Bin 0 -> 547 bytes .../textures/items/materials/cast_frypan.png | Bin 0 -> 555 bytes .../textures/items/materials/cast_ingot.png | Bin 0 -> 551 bytes .../items/materials/cast_largeguard.png | Bin 0 -> 546 bytes .../items/materials/cast_largerod.png | Bin 0 -> 553 bytes .../items/materials/cast_mediumguard.png | Bin 0 -> 545 bytes .../textures/items/materials/cast_pickaxe.png | Bin 0 -> 549 bytes .../textures/items/materials/cast_rod.png | Bin 0 -> 542 bytes .../textures/items/materials/cast_shovel.png | Bin 0 -> 562 bytes .../textures/items/materials/cast_sign.png | Bin 0 -> 545 bytes .../textures/items/materials/cast_spike.png | Bin 0 -> 541 bytes .../items/materials/cast_swordblade.png | Bin 0 -> 562 bytes .../tinker/textures/items/materials/grout.png | Bin 0 -> 579 bytes .../materials/material_alubrassingot.png | Bin 0 -> 248 bytes .../materials/material_aluminumingot.png | Bin 0 -> 213 bytes .../items/materials/material_aluminumraw.png | Bin 0 -> 197 bytes .../items/materials/material_alumiteingot.png | Bin 0 -> 235 bytes .../items/materials/material_arditeingot.png | Bin 0 -> 227 bytes .../items/materials/material_bronzeingot.png | Bin 0 -> 242 bytes .../items/materials/material_cobaltingot.png | Bin 0 -> 251 bytes .../items/materials/material_copperingot.png | Bin 0 -> 235 bytes .../items/materials/material_lavacrystal.png | Bin 0 -> 233 bytes .../materials/material_manyullyningot.png | Bin 0 -> 249 bytes .../items/materials/material_mossball.png | Bin 0 -> 259 bytes .../items/materials/material_necroticbone.png | Bin 0 -> 175 bytes .../items/materials/material_paperstack.png | Bin 0 -> 231 bytes .../items/materials/material_searedbrick.png | Bin 0 -> 221 bytes .../items/materials/material_slimecrystal.png | Bin 0 -> 352 bytes .../items/materials/material_steelingot.png | Bin 0 -> 253 bytes .../items/materials/material_tiningot.png | Bin 0 -> 232 bytes .../textures/items/materials/paper_chunk.png | Bin 0 -> 299 bytes .../textures/items/materials/pattern_axe.png | Bin 0 -> 241 bytes .../items/materials/pattern_binding.png | Bin 0 -> 248 bytes .../items/materials/pattern_broadaxe.png | Bin 0 -> 262 bytes .../items/materials/pattern_crossbar.png | Bin 0 -> 243 bytes .../items/materials/pattern_frypan.png | Bin 0 -> 260 bytes .../items/materials/pattern_largeguard.png | Bin 0 -> 246 bytes .../items/materials/pattern_largerod.png | Bin 0 -> 265 bytes .../items/materials/pattern_mediumguard.png | Bin 0 -> 244 bytes .../items/materials/pattern_pickaxe.png | Bin 0 -> 249 bytes .../textures/items/materials/pattern_rod.png | Bin 0 -> 242 bytes .../items/materials/pattern_shovel.png | Bin 0 -> 246 bytes .../textures/items/materials/pattern_sign.png | Bin 0 -> 256 bytes .../items/materials/pattern_spike.png | Bin 0 -> 257 bytes .../items/materials/pattern_swordblade.png | Bin 0 -> 240 bytes .../items/materials/tinkerbook_diary.png | Bin 0 -> 298 bytes .../textures/items/parts/alubrass_chunk.png | Bin 0 -> 208 bytes .../textures/items/parts/aluminum_chunk.png | Bin 0 -> 199 bytes .../textures/items/parts/alumite_chunk.png | Bin 0 -> 218 bytes .../textures/items/parts/alumite_rod.png | Bin 0 -> 158 bytes .../textures/items/parts/ardite_chunk.png | Bin 0 -> 197 bytes .../textures/items/parts/ardite_rod.png | Bin 0 -> 147 bytes mods/tinker/textures/items/parts/bone_rod.png | Bin 0 -> 154 bytes .../textures/items/parts/bronze_chunk.png | Bin 0 -> 208 bytes .../textures/items/parts/bronze_rod.png | Bin 0 -> 139 bytes .../textures/items/parts/cactus_chunk.png | Bin 0 -> 348 bytes .../textures/items/parts/cactus_rod.png | Bin 0 -> 235 bytes .../textures/items/parts/cobalt_axe_head.png | Bin 224 -> 517 bytes .../textures/items/parts/cobalt_chunk.png | Bin 0 -> 202 bytes .../textures/items/parts/cobalt_rod.png | Bin 0 -> 155 bytes .../items/parts/cobalt_shovel_head.png | Bin 0 -> 293 bytes .../textures/items/parts/copper_chunk.png | Bin 0 -> 201 bytes .../textures/items/parts/copper_rod.png | Bin 0 -> 138 bytes .../textures/items/parts/flint_chunk.png | Bin 0 -> 167 bytes .../tinker/textures/items/parts/flint_rod.png | Bin 0 -> 145 bytes .../textures/items/parts/iron_chunk.png | Bin 0 -> 191 bytes mods/tinker/textures/items/parts/iron_rod.png | Bin 0 -> 147 bytes .../textures/items/parts/manyullyn_chunk.png | Bin 0 -> 202 bytes .../textures/items/parts/manyullyn_rod.png | Bin 0 -> 154 bytes .../textures/items/parts/netherrack_chunk.png | Bin 0 -> 291 bytes .../textures/items/parts/netherrack_rod.png | Bin 0 -> 235 bytes .../textures/items/parts/obsidian_chunk.png | Bin 0 -> 232 bytes .../textures/items/parts/obsidian_rod.png | Bin 0 -> 139 bytes .../tinker/textures/items/parts/paper_rod.png | Bin 0 -> 151 bytes .../textures/items/parts/slime_chunk.png | Bin 0 -> 187 bytes .../tinker/textures/items/parts/slime_rod.png | Bin 0 -> 151 bytes .../textures/items/parts/steel_chunk.png | Bin 0 -> 213 bytes .../tinker/textures/items/parts/steel_rod.png | Bin 0 -> 177 bytes .../textures/items/parts/stone_chunk.png | Bin 0 -> 198 bytes .../tinker/textures/items/parts/stone_rod.png | Bin 0 -> 147 bytes .../tinker/textures/items/parts/tin_chunk.png | Bin 0 -> 217 bytes .../textures/items/parts/wood_chunk.png | Bin 0 -> 220 bytes mods/tinker/textures/items/parts/wood_rod.png | Bin 0 -> 154 bytes .../items}/patterns.png | Bin .../items}/stonearmorstand.png | Bin .../mob/armorstandtexture.png | Bin .../mob/crystalwater.png | Bin .../{resources => textures}/mob/skyla.png | Bin 158 files changed, 1166 insertions(+), 808 deletions(-) create mode 100644 mods/tinker/tconstruct/ai/CoreAI.java create mode 100644 mods/tinker/tconstruct/entity/GolemBase.java delete mode 100644 mods/tinker/tconstruct/util/SortedList.java rename mods/tinker/{resources => textures}/armor/wood_1.png (100%) rename mods/tinker/{resources => textures}/armor/wood_2.png (100%) rename mods/tinker/{resources => textures}/entity/pullcart.png (100%) rename mods/tinker/{resources => textures}/entity/wagon.png (100%) rename mods/tinker/{resources => textures}/entity/wagontexture.png (100%) rename mods/tinker/{resources => textures}/gui/book.png (100%) rename mods/tinker/{resources => textures}/gui/bookleft.png (100%) rename mods/tinker/{resources => textures}/gui/bookright.png (100%) rename mods/tinker/{resources => textures}/gui/description.png (100%) rename mods/tinker/{resources => textures}/gui/display.png (100%) rename mods/tinker/{resources => textures}/gui/frypan.png (100%) rename mods/tinker/{resources => textures}/gui/icons.png (100%) rename mods/tinker/{resources => textures}/gui/patternchest.png (100%) rename mods/tinker/{resources => textures}/gui/patternchestmini.png (100%) rename mods/tinker/{resources => textures}/gui/patternshaper.png (100%) rename mods/tinker/{resources => textures}/gui/smeltery.png (100%) rename mods/tinker/{resources => textures}/gui/smelteryside.png (100%) rename mods/tinker/{resources => textures}/gui/toolparts.png (100%) rename mods/tinker/{resources => textures}/gui/toolstation.png (100%) create mode 100644 mods/tinker/textures/items/frypan/glowstone_frypan_effect.png rename mods/tinker/{resources => textures/items}/materials.png (100%) create mode 100644 mods/tinker/textures/items/materials/blank_cast.png create mode 100644 mods/tinker/textures/items/materials/blank_pattern.png create mode 100644 mods/tinker/textures/items/materials/bone_chunk.png create mode 100644 mods/tinker/textures/items/materials/bucket_alubrass.png create mode 100644 mods/tinker/textures/items/materials/bucket_aluminum.png create mode 100644 mods/tinker/textures/items/materials/bucket_alumite.png create mode 100644 mods/tinker/textures/items/materials/bucket_ardite.png create mode 100644 mods/tinker/textures/items/materials/bucket_bronze.png create mode 100644 mods/tinker/textures/items/materials/bucket_cobalt.png create mode 100644 mods/tinker/textures/items/materials/bucket_copper.png create mode 100644 mods/tinker/textures/items/materials/bucket_gold.png create mode 100644 mods/tinker/textures/items/materials/bucket_iron.png create mode 100644 mods/tinker/textures/items/materials/bucket_manyullyn.png create mode 100644 mods/tinker/textures/items/materials/bucket_obsidian.png create mode 100644 mods/tinker/textures/items/materials/bucket_steel.png create mode 100644 mods/tinker/textures/items/materials/bucket_tin.png create mode 100644 mods/tinker/textures/items/materials/cast_axe.png create mode 100644 mods/tinker/textures/items/materials/cast_binding.png create mode 100644 mods/tinker/textures/items/materials/cast_broadaxe.png create mode 100644 mods/tinker/textures/items/materials/cast_crossbar.png create mode 100644 mods/tinker/textures/items/materials/cast_frypan.png create mode 100644 mods/tinker/textures/items/materials/cast_ingot.png create mode 100644 mods/tinker/textures/items/materials/cast_largeguard.png create mode 100644 mods/tinker/textures/items/materials/cast_largerod.png create mode 100644 mods/tinker/textures/items/materials/cast_mediumguard.png create mode 100644 mods/tinker/textures/items/materials/cast_pickaxe.png create mode 100644 mods/tinker/textures/items/materials/cast_rod.png create mode 100644 mods/tinker/textures/items/materials/cast_shovel.png create mode 100644 mods/tinker/textures/items/materials/cast_sign.png create mode 100644 mods/tinker/textures/items/materials/cast_spike.png create mode 100644 mods/tinker/textures/items/materials/cast_swordblade.png create mode 100644 mods/tinker/textures/items/materials/grout.png create mode 100644 mods/tinker/textures/items/materials/material_alubrassingot.png create mode 100644 mods/tinker/textures/items/materials/material_aluminumingot.png create mode 100644 mods/tinker/textures/items/materials/material_aluminumraw.png create mode 100644 mods/tinker/textures/items/materials/material_alumiteingot.png create mode 100644 mods/tinker/textures/items/materials/material_arditeingot.png create mode 100644 mods/tinker/textures/items/materials/material_bronzeingot.png create mode 100644 mods/tinker/textures/items/materials/material_cobaltingot.png create mode 100644 mods/tinker/textures/items/materials/material_copperingot.png create mode 100644 mods/tinker/textures/items/materials/material_lavacrystal.png create mode 100644 mods/tinker/textures/items/materials/material_manyullyningot.png create mode 100644 mods/tinker/textures/items/materials/material_mossball.png create mode 100644 mods/tinker/textures/items/materials/material_necroticbone.png create mode 100644 mods/tinker/textures/items/materials/material_paperstack.png create mode 100644 mods/tinker/textures/items/materials/material_searedbrick.png create mode 100644 mods/tinker/textures/items/materials/material_slimecrystal.png create mode 100644 mods/tinker/textures/items/materials/material_steelingot.png create mode 100644 mods/tinker/textures/items/materials/material_tiningot.png create mode 100644 mods/tinker/textures/items/materials/paper_chunk.png create mode 100644 mods/tinker/textures/items/materials/pattern_axe.png create mode 100644 mods/tinker/textures/items/materials/pattern_binding.png create mode 100644 mods/tinker/textures/items/materials/pattern_broadaxe.png create mode 100644 mods/tinker/textures/items/materials/pattern_crossbar.png create mode 100644 mods/tinker/textures/items/materials/pattern_frypan.png create mode 100644 mods/tinker/textures/items/materials/pattern_largeguard.png create mode 100644 mods/tinker/textures/items/materials/pattern_largerod.png create mode 100644 mods/tinker/textures/items/materials/pattern_mediumguard.png create mode 100644 mods/tinker/textures/items/materials/pattern_pickaxe.png create mode 100644 mods/tinker/textures/items/materials/pattern_rod.png create mode 100644 mods/tinker/textures/items/materials/pattern_shovel.png create mode 100644 mods/tinker/textures/items/materials/pattern_sign.png create mode 100644 mods/tinker/textures/items/materials/pattern_spike.png create mode 100644 mods/tinker/textures/items/materials/pattern_swordblade.png create mode 100644 mods/tinker/textures/items/materials/tinkerbook_diary.png create mode 100644 mods/tinker/textures/items/parts/alubrass_chunk.png create mode 100644 mods/tinker/textures/items/parts/aluminum_chunk.png create mode 100644 mods/tinker/textures/items/parts/alumite_chunk.png create mode 100644 mods/tinker/textures/items/parts/alumite_rod.png create mode 100644 mods/tinker/textures/items/parts/ardite_chunk.png create mode 100644 mods/tinker/textures/items/parts/ardite_rod.png create mode 100644 mods/tinker/textures/items/parts/bone_rod.png create mode 100644 mods/tinker/textures/items/parts/bronze_chunk.png create mode 100644 mods/tinker/textures/items/parts/bronze_rod.png create mode 100644 mods/tinker/textures/items/parts/cactus_chunk.png create mode 100644 mods/tinker/textures/items/parts/cactus_rod.png create mode 100644 mods/tinker/textures/items/parts/cobalt_chunk.png create mode 100644 mods/tinker/textures/items/parts/cobalt_rod.png create mode 100644 mods/tinker/textures/items/parts/cobalt_shovel_head.png create mode 100644 mods/tinker/textures/items/parts/copper_chunk.png create mode 100644 mods/tinker/textures/items/parts/copper_rod.png create mode 100644 mods/tinker/textures/items/parts/flint_chunk.png create mode 100644 mods/tinker/textures/items/parts/flint_rod.png create mode 100644 mods/tinker/textures/items/parts/iron_chunk.png create mode 100644 mods/tinker/textures/items/parts/iron_rod.png create mode 100644 mods/tinker/textures/items/parts/manyullyn_chunk.png create mode 100644 mods/tinker/textures/items/parts/manyullyn_rod.png create mode 100644 mods/tinker/textures/items/parts/netherrack_chunk.png create mode 100644 mods/tinker/textures/items/parts/netherrack_rod.png create mode 100644 mods/tinker/textures/items/parts/obsidian_chunk.png create mode 100644 mods/tinker/textures/items/parts/obsidian_rod.png create mode 100644 mods/tinker/textures/items/parts/paper_rod.png create mode 100644 mods/tinker/textures/items/parts/slime_chunk.png create mode 100644 mods/tinker/textures/items/parts/slime_rod.png create mode 100644 mods/tinker/textures/items/parts/steel_chunk.png create mode 100644 mods/tinker/textures/items/parts/steel_rod.png create mode 100644 mods/tinker/textures/items/parts/stone_chunk.png create mode 100644 mods/tinker/textures/items/parts/stone_rod.png create mode 100644 mods/tinker/textures/items/parts/tin_chunk.png create mode 100644 mods/tinker/textures/items/parts/wood_chunk.png create mode 100644 mods/tinker/textures/items/parts/wood_rod.png rename mods/tinker/{resources => textures/items}/patterns.png (100%) rename mods/tinker/{resources => textures/items}/stonearmorstand.png (100%) rename mods/tinker/{resources => textures}/mob/armorstandtexture.png (100%) rename mods/tinker/{resources => textures}/mob/crystalwater.png (100%) rename mods/tinker/{resources => textures}/mob/skyla.png (100%) diff --git a/mods/tinker/armory/content/DisplayBlock.java b/mods/tinker/armory/content/DisplayBlock.java index b15d97d..0edc6a1 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 b965168..2fe5847 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 3d4731f..2e4a71d 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 846284c..654f72a 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 06ec00a..f4ce2f6 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 0000000..c03d98a --- /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 d366571..5c62e5f 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 ef7e15d..41cf5aa 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 aa9c368..2246917 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 9368414..bc4b59d 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 dbb1b51..71a296d 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 d815032..1ee0a4c 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 270afe1..dd511b2 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 1a0a9e8..9f5f005 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 2e4848f..fc3ed7c 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 c2cff2d..4df31bd 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 2408acd..97edcc0 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 f9be8ab..2197453 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 f2f2990..81e69e8 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 f421ccd..d202c8a 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 0000000..64d46cf --- /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 332f9a9..f16c8d8 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 7ad02ba..c0f29e0 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 e77caa8..91504fa 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 836dbc1..0476858 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 6041ea7..8d141f6 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 6c2e020..17204ea 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 c36b672..ff11c8f 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 fd8e229..70ffae4 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 2257bf4..0000000 --- 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 0000000000000000000000000000000000000000..6a7e9dd24ba4ce3b368396a772cd69c4e2fec39d GIT binary patch literal 101 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`I-V|$Ar-fh6C_w&7-QMm{)=R? yz53@rP0`?Nbj#C!;((Lr6Ix>{|s;AA_f>pUXO@geCy#K^-3e literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5b4134e90994f4ac24a7fa46a50913c2442279bc GIT binary patch literal 633 zcmV-<0*3vGP)%)?SCbS2sbu0Bqn|IT+Nk;MH?5dQ*UL^EM3Yzj(C*IA#`ldK$V~ zDuCCkrOTjRfWzGlUvjK8boB&usxjCv-wGItK_$=5gDVD?93vAjkPjn_L|Ccu@&>3E zfW_1^lE5J0r5HByu>U#=2bBac0E2Nr;&p55I;a=G|6KGX78#3<12c$gXJFF21LMXL za4Gtt&?E-yl;hB?CP5PgsGU}XXC7eMUh$>AnF20FPfNf-B?g^x6!?RjdIn)I;u0{R z`QjR=7l2#r?*ZcA7%A}VER5=Tn7vzuNplH?wH&ZL`x75TD@8!P0MnLup$PLj_Vr`{ zgZ{1U%|%czz~RoCFAb~=xMmtSrH{{kdde*49-}FTm06x-YSq$g?vr zklXSJ;eZUnVDro^!ZQyrYp?oJc*@BYo6|{?dI7%F@-VWpFf=pZ8EF{ksQ|Nd3DgTP zZHcW|=xK52ijNS9=PW+zZbzY4j)7B6fU6|~`jt4aUHRcTP%pqtyojXmKw(@GPBEvP zOE9)`r{aD4`4vzv0RJ%P&mw<>#bi8x`eHYc@WzHJ;RQ$lz zo;gA2h*ZzJfG-QwEVLoq zW52h&Pu&M=hUsoGos$Bl@XE3aoN7BFcJ_swleqjIJ_V7MC1O`y#9f+?F}7@yUARbm zdUHqK1fChp7rK*@X2&g2I|nqoXmxUz^irUb4H_#vH!&xF;bYxpv5>E;f31|n;??ps ed=eWO7`E;S-M8T;|4g8789ZJ6T-G@yGywoT!fUDk literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..10839517550fa52b3cf49b0435f2d6c4dd023314 GIT binary patch literal 366 zcmV-!0g?WRP)4I|CCiM0e;4+&ct=bqr`CS+ZPWKRby)vV@S6_r*V8hT(U8r|BRY zI$wWU{6TMsORcMi9Ae);N3tH`DgZ&W0I)PHhin9b0+F974pN2yU~vRu9LH?S^2}BO za-ZA_fdGWXkqww&wt0SJt3J6Wge8D#aSo8etZle$?`#C1`SJ+401ya7+yx*(ECEZL zB2@(tfuMD609obK|LGnTPwS;HoC*y9fuQxx0cb-Dfc#{eHUU6WPz4|tpeMK5j}8(7 zsA)qtfJ_0BZ_P)3yj*RFh@%iifOUNx$z%$=MP@;`03vOML;^~IwSg2Q<3-kG8j^1` z4WRiv$cvMNN;6_;G(#LC01$*XRB{-#`rCx?7E1&`gSh|a^zPsD6Pot5@xeA24lMV5@G#w zudjyj3xhFT=dP!Px5sx}Xm4v@oot_~$K5A}#`^ihhE8bZ=Blguy#Yhx^RtUmglf$M znb89(ZWhLPQ2`W|66lgupePD+|0;#vM-R;B*Pw#DkGT{=-ZV|!0(qXZ#8hOZ0@MZS zKomvu1!Tdu*GuMObin+4cbM_`z5?#!Jt>5|P66W_)GFXC4gq7&7$kHR^odvwZi5A; z5-gw(A|n%^klYd=-`A&}!QA_A*cbu*i(nw)67mV^Q_r+l03eV!%Q7q2ia3s$_6fK| z5SS-PV&%`RZ@hp{1T9~>^{p3J`xdNBz$fC{f~5;LP5_CefGoUu0>*d4WD)B4TwAZe a#>Ou_?4y`}cn6ID0000bf@fuM;#oKVcrGvV%R2ds`?;60V!)xnH2FDwbG?Y*YZNAf;R`U(M$Rlpk#0W29Npr9|%H-0_YV;l!}zyb>i7SIQg zu?rvw0SE;4`}))~xDWmt4n{!#A{dDHgnWY7I(_Py@d^O6_D~ju6KqAArp)*Rd?IML z&$7(PpO=2{0wEDB`PxfAdV#HP!NvqaBB3omOE*3)Dm~^39_cFL3w@{w7cpsjXmhaB~7^%msMx`2=d81p=5JmSKZgK?ULJ&x2w}GI>Ie?24t|D-o6QoN}lM6@(Nh4S3R0ZM`YSO1MI5UI4 zSWR}lIJU54vheUq*3LX;#s(SlzZ@%yqMA64Yg#{#L-*4w^ZGOsuzy+H1Owsx+w#tQ ztR4jH`E%!aKFCRKCqpwI56t8A!hAoE1m4s48y6JN$=Bz#S+8dT@86e~wFu|>wb+cm z;N*5#vr z021kz0R22oy@2cBzhP$t=ocYC#3vLIq^TGBD*&(%xF`xIXhoW)LjMGOB3QW2vdqb! zOW%2ckO)eCaOrz5aPk%$O&}x^YQe#YJ12m^T0kd0KLP8#VY3fyysn*A;B40qD zQ1AQfKP2Z}kJ^SN#e*NYOM2h`$K9n6A^w}8`MzHg1VKsT^D*h^EEccV69#>{x(Z?b z^kph$Uo!@Mx~`m$;K+-_{lSBHJ{pPl(+`IF>iNQiDriIwrI>%t8S000LBlvrQzL&~`qm4$M6l!=FMa0)cD@B$6L5*RwqWDn)(N1nE}#eRpFriiVX+QP fe6HPSA=pO@;mm_(U*po@JSnKbOAq0wEEU{OZ#8 zUf}L6xS2pmB-Dbd6L(Gkfwh26{CEP^cf(-Oh5tBNx#U+mJvpYFUm=;h~?aW zx@(fITWhT^ODXkEp|wsTUw{W)Pdnm1>__l(JXZ_NCcpzPhb{3qD&l$G5U-mVfpgsB zLg?GR07ixv&@dNR65*?qBM@UGcmo9Sl>mOf?|VX?KnQ_=NKU9EXpAA`3IG%ud+(EA z71mlpoMK9(*6`Y@x{nc;H3uh}(8WJoanib=vg6 zKF)EW&dYo=3Kl@C@Bl811*Sv-A8sWA-g|;yfFM2+z|UK2iTVVba|A?ULMcI|6j84L zK;h!HZG&JGT5F;{ftUyiYhz51zgu6tKuQEH&u)G70+WwmG=Y>zY6RKA#R=eIF2IB5 kCy@FrA7Gr|VgzPeA6GQ}T?B1aIsgCw07*qoM6N<$f)R6ap#T5? literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..604968ee53639780b1ef6e718e27a1d7e78f7e49 GIT binary patch literal 283 zcmV+$0p$LPP)7-xeWXlMn#Ex>(D`GkK zpYEEZ>y}#T%MwDoV@N5Zv@gJe&U;1N503%-9M8oIBf33-I9i3FJP@ hQ;hasFq*(@>jNf<%kk7vVU_>@002ovPDHLkV1l@xd;3fyV&pq+jG@>kvkX9p$7~#B%OG z-8D(qEw$8_rIdQ7&{`*HUw{W4Hb>&BZUgu^o{NPh6F}ho^dQi1x7riu^@VtDUjuNC zdt3;8>leVt@B$j<0woc?%60@|j0A6hAifg7?>py+_5?x*1VnN|lAtk$XjcHB5a7K} zf>rc=PqZhH6G7qGTASqO(N`}ZiD2Z#qi9ah? fX#WMH3Cy-WS?P%hvI0{l00000NkvXXu0mjfpe%9) literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8a65d801113ae79008d4e06cd51198f26932e55b GIT binary patch literal 277 zcmV+w0qXvVP)leVt@B$j<0woc?%60@|j0A6hAifg7?~mh1v?mZkARv+xk_3%0M7sh2g#hn;60E{n zOSC7D6G7qGIhW+;(N`}ZiD2Z#qi9ah?Z2twb b39Pn0i9OUEIV*XU00000NkvXXu0mjfz%6cX literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..62dacb916340c35adc808c93571be1b6b266caa2 GIT binary patch literal 430 zcmV;f0a5;mP)_ff%aSElB6}5}S)dt+ z<9NFO0%gOg9#4&6S@>Pvhd$`*6fpL|K?R)Q5HQw^K|@!dPsFluTP(1WU;(`m8QB0O zry4|2#Nd9t>lvJT{|#Fspx+1vA}%49AcXX;XSyo@P^00H$@AO_f|Dd+x+mZgLE$`2 zQ!ChEgIgzn#!^5ApPqp6-LTk&Lwv3sSKwr8 Y3CcnRP4vLN+W-In07*qoM6N<$f?e*pr2qf` literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..188a7421d73a80adf3ab51da3ff3d9e578e65cec GIT binary patch literal 546 zcmV+-0^R+IP)o;s3Jv%EYZmK3#Tc207QBie~ zkWAnNEVSQ0iai2#oDPsVg`0{6Z~SsF2Aar5C{Vi zrwh3C2$R-ISeY46Lzz*dgzxnte1~46orhN=v6U6sj%9Z0YoxOQ<^(6WR z{TIxP(5t3oPT#l}Pf!jI1#l9s$dx(4m8*sDz58x167Yv%y-oZF$E>|cz}&tMV{01K k%_+I^z4iJ5?&M4U3v1;>u~+golmGw#07*qoM6N<$g3m<#tN;K2 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1e2c8c037a245d285129627a4f3d0a3ce37c59a4 GIT binary patch literal 544 zcmV+*0^j|KP)>yD(;rjxFLXTBt#wBs88VP;Y$y|Hd{taAR3Wby=od)$07VKMg=g5 zb1{RhgJlnZUpcYN);Wn<35@DAi`rWZs&6FL*5eYpE=15&V-j-#qed2OQxO*}Eeanz?x%Ljc9>T8b{+qz?s zT}+(t27aCFO#8mV`36llLBop6PEOBJw*`vJGdr8eI#~1o4;Py>*_23zXgLLbAUTs5 zJABf@xUnvYw&7TJiWLki8T=`y(YKOryrU~3Ge75_0h4(KVY!oiQS&5(Rv`>qrGG(- ziQ2`8#0uL}eg|2%Xd-sgHR9-*32`terCjlQX@9{3@WIgcf=|RYjn6@7pJt%$yg>2e iwA}e!-<`#?oaFz!xkw3wpchgA0000rK`S0EdqBdb2}8^OGP6yIu}#Y_i~u*-NU%GqA7Y3o3fKy5*;HAGrEPdb{Rbd}|aja^*ETlE4o-%V7#R>-z3>P>s$ZcyHS+8`29TDrfGMResng-J1#RXgz@J!^1iOi+|5~q{+#d7 z?{5{Fb+_p3!!rs57#Lawx^CpjZ5C+!sYH|ZGL4$cV)i!ZkMZ>`q;@Q}HNO$rj{{vb8#H^BKilQrfM5L1_~7D1Ao9<9p95u6+zM#goH{GJC37} zKw&d8$gvTxwX|jXoY`yk8Oust#`WW52h;8rzIQe;`B*1C5+%nEG5N3|dlzR7{QmqH zzdkiE>u%%h?LEu^yb$>YhOHXnwt?i`3dTpP7`0asw^k5(HT0b-dbTFwXKU|92Kafp zgV3h}r;Kx}h_B{-(TL1(u#AWRp{t9A)F>hF;hVb|fMfREia^p7Hg(90VQggav%h~Q z1K>+TB6IZA90j_X96eCu!!<=I6t8`2QbMzYo>h^WIbhnYW8i6$;%{M5otsOF3Khi{ z2*akGx+LIZd9QEhjzAM91CdJth=ZC++RJM8ew~bKYSc1R=xPGsn!a78xow=FIxgi;{sXUTG>s~-heQAX002ovPDHLkV1k!r1QGxM literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6a90939b8909bac3556dd15f186880c066596373 GIT binary patch literal 551 zcmV+?0@(eDP)Aj4~6){1I#{c$k^F&1Ao3g z!tXB)%=_CoesdRzfI9-Wf=Q>0uvYq z4t$p;SQ-Xq4kyMvA)?~Yt0EwQZ z1ukS*?C#x81^CvG$Q+%ES+Xc%D1{nZMaAubk;l+1P=96%r~Nv{j()CaV5}&bs3^Xg z_SV#F|GvNn&D(Nb-O6l%PMnK|W?uQWu0pS@;%-&VKdw{JnuF05VB|JY(aIldG zMs1Da76eZ5KUnZ?cPVoVhg%{DoT9Ac+bqx$8TU`zk|bkT;O^Z_1!qUwBH*Z@SE9*9 zVIgD*%eauC_W3Q$`&cS*^RxBrDlX(p{tMI-BFv1o*Y5xT002ovPDHLkV1i1a2+RNg literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6ce33ea09f3b53238a8fa6f908a774aa798a43a8 GIT binary patch literal 546 zcmV+-0^R+IP){#qFem@R2vFNYkdv6W%{fh8d@jpJod~a3f&W@`1{rL%g zeX8QLzk#E7_Ynv^MpmLT0D}Vw|Z`JY-i4; zAS@7NXKN{P3J2@5yLpM5(@L(iGPeJ=BC?o_tH^5=0-WvJq2TOrLt_%J#iPn86jDMY znM#=OLJOz;wV*PY$cB=6r;Kmy5@yYOAe!1)rCGZX-2+zO9whb3_++?~z{p6#HRWBf zGRnA~(lO)dm1u%Wu;@Qb;x%$w-FM_DTg3oAw_e{01^h7VSMdulX5(cX*7IvHx2~f8 kY)P+twqIPwrF_YM0IdK{Sn85%x&QzG07*qoM6N<$f~qC_zyJUM literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c1a6223b7493e2c30e03be39722401f8a0fac65e GIT binary patch literal 553 zcmV+^0@nSBP);qYYklkAYh^3-6wj~YRq9ul>1Sn$dOtF(52DV|d+L2(l)d}YEd4!S zqd#X^8dO*4bpJK^04%iJ6x|e))Gno{^EFM~@;u#^=BZswQ`1RO-Ad5485iN($h`;v zzfV@F>2iRjQO$_brT#`_auC#FK+~QT-Eg4}gAey!1pwHr+cAL*T_ExDU|L<}HPx?V z=$4%z5yH2-I~4%vA}f|*9m#+I&?~=F-NUy6Xs~UDQB9wrYa=H6KA>Oa04FXk>ZZnl zQ3>Ec#r6fjFcBQI3v=Xro(vsXkhQSjRquB4#cUa!^@( zwArvciwso|04NaFmyMCo6pojMm3d^jfZ=H3g|&p-VI9= zVO<(%Xw))eqDG$kq(@2r_$=%o<0lOTC#Z4HTKeo8TB00000NkvXXu0mjf>a6_n literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8ce28266e955c534492353e1d5c2a6c52f4bd301 GIT binary patch literal 545 zcmV++0^a?JP)E}-Z7+NSuj~Lb3{Z)QLR*bVgTPRrj#OKJ z*T2jh8gEPTWoGX^`&<8B!x+Y8{C@3kV9{U0&)zEh&lTZ`GXMA({-+gPJ3Fl6&)26o z|5C+ie;tSK?jsa%V&a-OZWl4_n3#Vk@Mgu#r=EU*EbJ34R}J zz;opRJA*+zg(K^MGLy~IRtXakcuqk%mO^t8@4dYj2^e$aWK|NRnC+Et^gfC2wTucV z<3_@Jcjs;-z_+SKW^`_*q#+Rlm|`rkDH~X64C`5)4+V>U1>9NSri z(jW~590%-fF2&x${+e{RAkE5a0?(l!6COwARlsBc?#}H)Dlff=ak4fJs=9m6_nAWrlFvdUGoh@WZfQC;o#momUAoUR*-h ze%4w#heR%!jAv zHXK`nPQmLmB!FXPL?bFRA#m&6!w|qW`({cYvrds+sBtT=zI}+R^J-H0Ail^NlPi1w zK?uOtl2~Tz+yX;@Li&=l{#S60xgr34rNX5AtNR$5&2^(4-#2}+Dhq7U)f zj|IRE2ng%#{YVQm@xK>VsLwPdWGOL^`Qa0I?KP=JaYg3>;UaoD7IDy7m&+_Z92hAP zLwzxX)_-lpaj>%x`3fhSG~EnMTN4M4$$(@4<2VDznE=?Ky}uj+E>5>-vN@4k=TD`H zd>}&@K)~x;n0GgV%B&#`l;t%G_|eE?VrMb7G6G@1$VkH~FGXj-RGvXXR<_UT9mLVE zB;eGN80smJ-{>{na9B nJGW7Nxgaa=jomxAkw5tg0c1vpRCW%b00000NkvXXu0mjfR&V@O literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9d95b015f7d599722c6fa95554fef48e9ae05f06 GIT binary patch literal 542 zcmV+(0^$9MP);Qxj5Ees$rj!9YU<8hzNdSQ$;Uy#l#145VBosJ3 z{|T{8JH^s3+xOn{-OuOBq0oC=kEcu2E-%nSX`Wgq3TIZ*IGmx@@tn*(ooDFfa+#hl zGSn$A()spR@&Fj9+9|p(Oi-CJ3S%6vz8t50e{Yx z$hCQa5u+O|Lf7i3MCV1d{5PsHz%|Du_q|M?Tl2pp>hhvv;Z15AEU(vCYu-uiIp7;_CR4OdJvJjW5gsfu13h!VpP@R z5+@gxF?Hob&_MBudVvXc#Lh5i=2Kqqp5OT71Mp)Qzrz0on&!_i>1!WJTkWUZk3PBM g-B=%>clne50%LwnK|C6$MgRZ+07*qoM6N<$f+@7}&;S4c literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0a833ea157ae5b804e519178ab08007a963b56b5 GIT binary patch literal 562 zcmV-20?qx2P)nph5u|x86R83^?YXo)wctigBxiv-e4y*D_+j zW-Mg*+1bAz8Q^P0B6D;Wv&qOUz@(T9h7_C4dU_gtBP(N}!K_=x(9TJUftjI&DOo@Z z6;)T0)|#4isJZP&l7P2mzquFN0(HEnCrOZ|eda_QG)roJ^jJ;XYiiuk#DM1+E@D;_ zu>_rsaPn{5tYXMCgbldJf`h%K*eM)uQFjZ}tbCYYXk`>t5+fG#yzdr6oc+6z!R5&| zbygF6myaqB7LlQd$wXqu`DY9B?xs}s_$Y}HHI!lTw?+wpL&s=Sf;t_ul@sjht#}X0 zATnB3Cf{p0Vm;#T$vM0TrGs(-Pd;_1O73r zSBd}NnDv(ln9py(*t?F}vn9FnyY=EGuH;Yt13CFcoiw;M1&07*qoM6N<$g8J1G A@c;k- literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ea9e1535a3aa6ac545ddcd85def7954665c0c249 GIT binary patch literal 545 zcmV++0^a?JP)rJe}UR)6xwP`Oa*pIjhg5|H+i%Bec#M8@66^SI*aGq!4{^S4Sa2{WAeVjx~GcX+{NVGnx35;Rq^xV zef;=P#jLZ5qgOW(17sug%NR6E7`DoYUN2+3zk*R~1;get0z2jUr9rK`S0EdqBdb2}8^OGP6yIu}#Y_i~u*-NU%GqA7Y3o3fKy5*;HAGrEPdb{Rbd}|aja^*ETlE4NwM>Kmq{~ zw7T4Tw~(l}&CHr4=bW|nw|6E=UBva{U>noUCcd{fF!@*{JrIrF-N)p^y6l}EmGJxX zL;U(w!mP7}qt|z^2;halGcjo7Fl?F_y)9t8zk;y2f?=Zo-_4=tWYDz@5kFhyi15|8wW=sg%#6=%xi4?VTA+!up=+h#*907*qoM6N<$f-U|G A8vpB~i)lpTSv0r1(eDZ2uY(vCKo`Ul``AbwVK@5``kgPHVR}9V z1yvCDU>Gl&o%rJ*h6T_cbi>l|XUr^YBYSX)g{3`c3dSZ^F(2E7&cAHwg95Z!2XSW* z(*)3>%H&U=sZcO&Lk+dsWo11N-{>^#-9ESmCSm>nJDCqi?;S(iPK#`FyM*so*El)< zf{|bxYG2zdpw|_+#e4yDqHuHpU8wCg5lJAnl7j+jD*SP;F--t%BXy|7B-&o;KtapfC096u&EZ97j~^ZOVVEy~7LSHhi!hNaqFB0wwyCB_ z1xlqkGLwWJ&w4n8A~ATpQ!rnE(~GY-|MU$iG`gX-VKV(5Dm2LX~?^sW4N~x8W!NLAmu}- zhfG)R2oz8q4Ef)o-8KZ>=fQ78h6T9q14IR@p~(R)Dow?seXtlF;Gg+6{0Txv?ki*W R%boxL002ovPDHLkV1jD=1cU$p literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c6832fdee9304b107da9188b7001340d88ca9f0d GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ{hlt4Ar-fh6C_v{H=If+UHhdz z#imBKAy1IU-ug{%Q|2>)U6u_KTeDFC#33GvELrnJtLpMj01U`i)0y7*#Hg^Q10yzhs3Y4%1 poL%JjnxUlq!W|&p5NMFZz+e*H`Q=UTc97o~JYD@<);T3K0RY;MT8IDu literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..39625369652e2570362872334ea8f36439522d03 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJIi4<#Ar-gYPCdJVP4@9pgS2n MUHx3vIVCg!03&EjA^-pY literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b2ba44ed866f629dbcca45aa1102c895a17ec620 GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ9#0p?kcwMxFJ9z4puod&VcjdC zcMk>n9$B2baOuEbnU;iwsv9kL^mD24SIf-wNi*Df?en|;3=uZRCOn$$xSsJY!?QU- z4iYJhj~Ocj+?fqkhYMNVBvSYqYB(j)f)4UvlnbVYLou+{%*!C*OoLy xEI7`6m(hfydCT(q><1>C7u&_0Vs!gCQ}8|`sjpFKw}9?q@O1TaS?83{1OV;XPF?^2 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..77e739360115f37b80d43a20c270bbc221fac231 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJO`a}}Ar-gYPPOG~F%WRGUAz58 zHOIU}{S8YKw)aM@T^go0jeC&-S0kfr?_;%#JhS-Y{>Dv|KVMvIyyv{K+_D&RhVF*@ zyXO@~oXBLHvf_P}W3>6|jP^NV8^T>Ur#i1;4NwYAluVnwwzzSX2itxIfy9M658?&WJ_DLVP3d h0mb(28*Dr7rYSd{RM_=R&lco*22WQ%mvv4FO#m9jRgwSz literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..73a61d75bd429c6eccace28d81e7d93bea091720 GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJRh}-6Ar-gYPCY2-U?AYSomcn8 z5m!O4fHo$X&_!HPh5gQIZT>o*C-{CEzkjvYkkchIvoTzFrRjZMhlz=6w%Le%iegX? znwyr@_mQts_raUQmdKI;Vst0MN!=fB*mh literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..35e498cd7e5eaafb18c476a7090f63d3d6c87235 GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJL!K^rH+fnI82HLGon3BH%%Iq<6uy@|`RS(J5r(dOipQ3R6fGv$S@s#62)?4N$Bn?WehjJ y+Uv0gya|r7Y)H$soAq-_40}(RjT_@uMuvy86|z3q+d4TGnvpUXO@geCx2nppP$ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..45e1f147c91c2ea65b70d80b56a3f875fbdd7cd6 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJO`a}}Ar-gYPCdx$U?9@AyW_~! zvj;DpkRa zZ57C8oRT3sY3@?d?Gf!2+!sUxogPm}V4QLygthc58-xn&WBjq$ zP&9GjH*F5F1y*LsnioY^wm3}p{=xcyeFc+`>x|Q`B03FRjST5ZuhK j7o2#lw2iTF|4p{N*WT?4oxgJf(De+Su6{1-oD!MgMPF_4#>V)Zeek!Q=a3)Tt8*9a|Z z@i1kSza!kia8FwHrpqc$mV*);*Dp-66I-d)@LGh$cq#Y3Ho;xGO703`1;GY8r(9+I zkhCV}j@3TB#S)DB+hP=K(@(X>U&!367~df3S@Y@m!6cSN*^yQeJq+5DR_DwYT<~;> h2)~%}g=giP8O~jcT&5fHau3k$44$rjF6*2UngE#OS6u)A literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..399519fd8145b288cc49d9c05f0511d1c7275d31 GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ1D-C9Ar-fh6C_v{H=H`)Z1&yW zNNyjW!*-4~^;B86gC@lscV!$-EZRHSuIb~cTkH{rNBI`cX71S9F`+fZI^}>2gK$RQ z9lm2P#3p7ZE=gh!i^`Z3i}hIZbw-2ci?U9u zTwjPCTT#03!NKPYF*n(!Wpr%inBLlapV6Q@L1H@diLD&6$s#Vy&lsHe8WUGVx~wpg uGGG@d;<&0SwS~{2oZ~ErmS9x|dPKGKsOR$)Cmn!(VeoYIb6Mw<&;$UqDOyhe literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7ab0f599fac5bfc55b7233dd4af7f34994a9f245 GIT binary patch literal 259 zcmV+e0sQ`nP)))Mt$9S+GYc`g8q`cH3( zH4NA=)S_q*Hvl$PLR<$3>I@p)ifjP*TB(7N5nlEHaRX37x4&|;11Rw~@dIMS{@a1m-&p_v002ov JPDHLkV1kY!X*K`= literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..db1a1cb57b548d4e3cfb4aa1729927215872075b GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJGEW!BkcwMxryb-x;K0GMUYL8w z`rI2ncAnqan45l_(3iT>TKQh*PGh#O9UsGn3;qm(kqV30l^2PKUvLr)Son)+-wlyx zI{d;FntgxYKV;fmGwuAR$T Zoh@PibvFgtP64`r!PC{xWt~$(6966sLmU7A literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d72d37cef0b725135439de7d665f16bab4445004 GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJb)GJcAr-gYUi0QUpuoctu>QqU z+m`7YN))#+Cq7c|yufuc^!Y`NS(oh1dZV(duaz@Myy4?yP6*I^8v0D2yg@{RahvlU z#y8^GjF*92vjWkkQa**}ci!C+RjIvRTs4>Zg>aeUhNYKwJ!km9%yyA!N$E?u0`?7@ zx01UUPgft{JrJd!+t8R+eL&`b!j1)EEuUZLO7Kb8PP-+>v%ldGBgf3#gP)R3WDcy$ e-t3@%fVD6CfZwXg9}fUs&fw|l=d#Wzp$Pzz1zJD= literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a3fb11947b034a915cee0a9ffe8165404d9e984c GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJC7v#hAr-gYPW9z#P!MqY%$FBa z$*?`{@NfC$Nl6M@GK2oiJjH)cZP9muRjD&)ueMowrRv#k#*G{w?=dT~EQs{j-mqM$ z@6m)j#;q<#6%R9gXe#Dgp?WFm{-)LZM_3*NK5q+P%GPZ--#t;

;~vJ?Vx83qnMa zdl;XvKHv>;Sf^2WH)x%`%U$Lj0(uITL4HU6_O!7EC`tsxs+cM8W$Fn@8+@Og+Y|Ot UKDtcZ21x%LdEjoq!<}3%~%8cHkDWF7|cir;H3G(i@x; zQC9-P-R8%~xz6;kXoM3{Rl+_*!SBz4gmWUG3c0uv@bnxUk71}9QLh3Egy0g1WC08x zWs^oI36%hxcUXQOJXXRhLJ7Fd{zt&gZ>j*kxTFFf67WPZO$Y_-cjc#132+j=F|>`# zojy1XA%W0EzO2qe5EpEQpN=TwAJy!`QA_XU( y+$U0PPC{D;BLNr|DxUY2g-qxF3%*L=XVx3Rk`%SX!)!=jygZEp|#{WR6fQ(@T}nlIhVNq{0Gei;7wC1!b1FAdjZt3k%}l``vG_XDxg?2C%=f) z0=N)PAQn-h9zcb>EBe@DR6PKPP@=Ctztscw`J1@`pz#xN?)>C000000NkvXXu0mjf DXe(uc literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..24de68b01eb6b45b82731db326325e92a3f67659 GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ^`0({Ar-fh6C_v{H=I(q>-x^# zNNyjW!*-4~|8shd2Th7O?#eivSoB~1edEW=dy6+Fb;&xJvkPPkDsrDJJJDd-Fv0an z)Q$N$J>u*yikm+^C}cRJG{aeAD~GN1qQ?hcGkkGzUg>JEXUP#kR(?D72dB(lODP?k z5z}4p@ZfWX8LltHgo+q8iY-j;Y05YNv`Epw$F!Rx)Q$NWgA?DvU9Qd77+>%$+zFx= dCmdm55M7}+fpy7@zd)xmc)I$ztaD0e0sy8mSa1LU literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4b505c7aa1432e628bd779251a1a08896a30f53b GIT binary patch literal 299 zcmV+`0o4A9P)6P^%LjTMNL($yL*PA?M^lT}2&3#1V*IEa&_%x1dHLLc|#eL|n=a zHwZ+W0+7ylBrvkucUC7L01HI*g8{UtMuSWeADIaNfk4DXfSChQWTfn?9; z6F{9}1CoEvo=-d2fzGTuL zd6&nB6e>%4k`DY4i?_IEtjx*Wd}O;%N7H9R9tO`t83Jx*0&R(p6r_$a2(ZT*o|$<< z@6b!866Oi26Q53q?MP(s5prenl)IZPk;qW2WX7D(rogV{!QaMs;@{z?LUY&_xGSGA zeesa7JBWulq0XhR{EI~6%7Y)Yc8MpfJ1|vjgPZa$#S?6a-Z2%I8Fw+VOg1{hYU){5 p@c+<_7m}xrhw~qovba?>>%J`>8mHu z%AwA|*V=JlVX|^@gNMv?ha&SJ-KteH`BruF=vqpiI8=J-#O{;TFJJ^3`<4df#RPgg&ebxsLQ0DyL8c>n+a literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..935a40a529fc88de6e95993b3f749e9ef13333d1 GIT binary patch literal 262 zcmV+h0r~!kP)3xfSSJ<2`+aL5%>AVoXY3V_X;GaVt^+RVTM=&%G@wi$b* z;0oXm8JPF8VAIk<4>UyuP}#>=3WS&dU@)8!1PG*AGy$5L25A-qz%Kw;zcx^VwGW|* zS^{rSkN~So!dF}1CoEvo=-d2fzGTuL zd6&nB6e>%4k`DY4i?_IEtjx*Wd}O;%N7H9R9tO`t83Jx*0&R(p6r_$a2(Zsinz7Iz zx^Nf6U4|L*iT4^im3IpqX2_Xj(46q-MBHHx<{H12$Of4e3U+ObCnmjMI}p=wnc+)D zOC{?~YlH5DhmC^0C(IJKL!N9nAjNiK)HAIAWF!QkoY=d#Wzp$Pzi%UeqT literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..64ff84a0ac30ade77cf5073e3ef3eebb27f9b5eb GIT binary patch literal 260 zcmV+f0sH=mP)-dTms46mi`%DCYw+&yEA{1w#mN?z!PkXAhgcyJ0`_Gm1X|?aELT;#3Npbb!J2PadW6D4 zz@hwRJyAZ0g-Q>QNOcH6i!rVuD5nr`Hw7bKhzhy{`TitD6%Z({5YQY{#6*&bDNT%5 zphEtQaTdP*#!Lbc&CSF0a}F}W-%&=vW!Si6{QRJ{>xJ*n@{-?`W2w1^aYQBn0000< KMNUMnLSTZVy=vwF literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0944a7f3884706768831033ffb2fe92ecbeba080 GIT binary patch literal 246 zcmV73t*eOWXC!LgMVM%X&nIA;r9OpZ{$nDEJO-lFGS1sMoVj{##!158fTP@*G2LxBvhE07*qoM6N<$g0V+qf&c&j literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fb496abbe3b962cc6531a7348173bf490cf5c314 GIT binary patch literal 265 zcmV+k0rvihP)65E{5=Om>wzVX@Y zukN~Itr_Ch3V>yLh;5(28T{+q%h>@S$Q6bkSc$;&V=Vx55)Hnb2=HGVRjUjv02A^) z<-No;LkFOPOaK5_9BiZoGAuNRC;|Y+0$Nm@9e@rVeM<{uPz8uI0DUr`1{|pauoY|z zS|2B(ZGj?b0DTw2F}1CoEvo=-d2fzGTuL zd6&nB6e>%4k`DY4i?_IEtjx*Wd}O;%N7H9R9tO`t83Jx*0&R(p6r_$a2(Zsinz7Iz zx^Nf6U4|J<5^bHzy9Ew2%$XEWS+YK{h0#o1Nt}Fcd_#(04 zo$L(r#K5jZ1|R04J<7ku)%s26T-eJ{%v$t9*+#Rf{&dhN2+3tT#wi}y(-eB-_^>bP0l+XkK?Mzna literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..403e62a2f8cf91a4a2f0f8754371568d07e65446 GIT binary patch literal 249 zcmVDXA6QrpC z8w9?6V^^t)Rp1f?i0Pfx8w*cuUMhmE*7=?7E*~SQQ zklVq+&vOs~e~&T>ZsV@V7rDtF%+jM*x>EQZ00000NkvXXu0mjfmv?6l literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c31f12053d4d3be9c0e4d1d87de6b27dfde1031a GIT binary patch literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`J3U<-Ln>}1CoEvo=-d2fzGTuL zd6&nB6e>%4k`DY4i?_IEtjx*Wd}O;%N7H9R9tO`t83JsX44O`65^8*l0(l(5IWF@| zZob)dne_#mg0{mn=Q71M#uJlHa5-<*w~;edmzRsB&coY0=1KT p^8yoczVJLvUd<-H+{=%RVd2JY&2Lktg#tan;OXk;vd$@?2>^VaR}BCF literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a9127d0758c73aec6305df509ccf0dc85683459f GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`dp%toLn>}1CoEvo=-d2fzGTuL zd6&nB6e>%4k`DY4i?_IEtjx*Wd}O;%N7H9R9tO`t83Jx*0&R(p6r_$a2(Zsin!z?> ztwn4@9>XRj3ARq<-2#UhQapKB158iE9p+$8QD2nZCfOjfLcvyo?ZKs9N zmfN^rWP4EDqat|E=YsERY9RmTc`5sbKtZfv2?2iDia;9$BAF2y1(qP&ln<<6Eh}V& z>)B8Njmp6!aFIQ*$*LY8i|jTt+2x}I-RTnOur0+a2nl=-xZqV#LPJ1fBKfu#VH0f$ zfB!~E{Pf92!xhefA7#Jpjxq`!)3L~8?H|9>=wOXBt@Gr)5^R(U^$B(8tmPj#OFZe(>)AcEf48NfHK!$7%pF@gvnN76yB5hg%1 z7DoewUQ8YPOa6u2oQ0b(0T#hrOCxqozQfIBOkJ5n~Ek zeQwtFHrp5>3Th44&pC*IzoSe9w_#t0i2wMY4!cd&ukw;Vh5*3V?3I(r00000NkvXX Hu0mjfMIU9| literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b5064f6a80c7466356e5ab158ab6b069ab4b5f58 GIT binary patch literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`+dW+zLn>}1CoEvo=-d2fzGTuL zd6&nB6e>%4k`DY4i?_IEtjx*Wd}O;%N7H9R9tO`t83Jx*0xc7B*-kE&V0g43+rf+@ z(y*iVAyWzSgt@(o1XhWy=AJN@|FgE)*%NV2oXiv0<}|iEDUo1%dC-7iep<@(L{o;< zmoLoW-OO?9SchB9tci!&opsNoe0kxtP4cF~nu{Gd96ARQ0=skz1?Td0c%3p3zoK&U oU@SxO;&cu9Xww}Qp+!avKfg@4zsz~H6VM9`p00i_>zopr0G&izEC2ui literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ecfdbad2cda23df85ab932924900bacc96b3a984 GIT binary patch literal 298 zcmV+_0oDGAP)u!YgOEV`QncL#p43Cw@Y zOtNX3DW>=_+U4x=N&gD~gKfJoh0Fd;xAV?47)W*iWq7|HO{c@!!~ng4WC!43f)NXb z0D!O$0DN}_$qt|lk$_9fC08Ka3JFpTfEp$)xdP!9sC-y|fm8#)i4*`Q7Fi*Ar-fh6C_v{Cx{3ztj=Eg z|M7vtcNh)2*X4X+c%0t8H_+g$tVxCp!{!f%r{%lI3oaMEws723g@Qp;hjTcV#y$c4q8JFVdQ&MBb@0IuFnV*mgE literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7d3c03cde2e4a58020940b5a971262eb0f5e7e4b GIT binary patch literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJR8JSjkcwN$2@gwfZGSHIbSJR)MA>EiT=8`A ww0;!EgDo;F4q|*Wo}TEFFgWdg(1C&Bxz5~c_MI1>11)6mboFyt=akR{0GVSzZ2$lO literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ddcd9f0189afb167f205d76bbbc9d74425c8f490 GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ9#0p?kcwN$2@Uenm z7bZ-&V^GF$W>I87%}HU=%Xb``k1-l>?=M-HG|M{UfQ-Y5NB=(u7z*+!omFhU$GF6* zBc+{3iv7*Sri3KfraZ$Q`x=>sK2Fz@ilrQKyZC0X9W`hdc&)HWSI&g*z*B)3zNW-k uS6P{#F(^r?e92tEvxC{~poYXZ28QFoo$TcYC)@?&t;ucLK6TDnnQK~ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..aceed51804dbbbe6f0033c72923d84b3230cb576 GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJC{Gv1kcwMx&u`>CpuppDQM#i^ za7MeV5kqszLY}=FPs~{gT2+J-2&6%NRUe{an^LB{Ts5 D>^C~1 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f7165bd9f0998907dd1ee5db805ec978410dede3 GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ>7Fi*Ar-fh6C_v{Cx{3ztlM?z ze__IeI|gM8XBHhxP&SAQeAU#H`EG&ZV}=>6%hTExCd@dTFyj@UlmWZIrXL^g@rdvQ zw;y+0VwrNmx*>#p;+qLTm0#YtpHO_!DePS)`-sosc*~-eSAh=Y>`!)OH5gWXQ+lGX zD)lg9F@s+FgCc>mubY5OL0+L>CIM`B7=f)#>IB_rp7!y>}Q^rlpn~L(|_zI65*Zp!-660VZ+w@>~|O! cCmdm9@GCRXsdQcU3TQfmr>mdKI;Vst0FQ?;e*gdg literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7bfcb3e3c6d8f6ae38654609b0d9399a6ea13c2a GIT binary patch literal 348 zcmV-i0i*tjP)FCm6;;+1Vge8Et)lm%4p?Y)rO7JcDx4EhIf5O4k9w+#9Ra6q9S zhtYQx@-H#C{cM7?5M=>8VQF^-<4qZcKQ*u(O{jY}pl<*NyORrG(DN(1o&ObhHcK2^KKuO3XAJv%R{mG$k$YlLD8|cY zuxzG3`yIv?j&;x9)fgjI#Rt$68T|H+eKSHX2rKld{TdRStXYh3Ob6Mw<&;$Uknpxfe literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/parts/cobalt_axe_head.png b/mods/tinker/textures/items/parts/cobalt_axe_head.png index 667ab9f6f0c65cf709001775c20eefd45649bcdd..1b8b9e8010ada16487cc6d832b588c96e9d1c890 100644 GIT binary patch delta 491 zcmVbneG@ z&Ufy2ueOle#>Q!Cm2R+XgcR@XMrfKQ0G4I3Y=lTnj&Sk#%Gq7BWzb2S&*uS%#bTra z-&{PtGBG&7* zs+aT)kMmZ uokI{KyA)7uiL>F-4?J$A2oi|hDnhh)mc{tK=NoGA_}H2_MD7lPrq z1gPJfwDq?=W2x~1Kq8{^^zqrM{UdZWaGE$5>#Y4Uu%GX5gPXvKh1_;4K_a5NiaHtf h0%~F1!sGEM{sS3*n$1340)_wp002ovPDHLkV1iX#++hF! delta 196 zcmV;#06YJM1mFRXB!8z#L_t(|+GFrsIE4X*i3Jhb@^DO)Mi&g{yEG`7%2j!uFG5Ir5*_zXc06Os)<4imBr yK@V7>qmNj5a5g~pGpPV>0I31S&dv_TAOip%$Z^i`>2ALO0000-ong!`Ho}rF-8OKsi)s9N|mdKI;Vst0FVnv AdH?_b literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0d97d5a0d83367d5cd8a43fcf20b5fdfaf55f194 GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJBu^K|kcwN$2@z! z7)x#E?O^`rzOL$j{LVM;>I+%d|1bG&d8X*z3g?n?hPJ0AolSxB`+wD3dA`_A{_D>b z=iO`VUVRRn&u=?l**d|YhL2g{ev{6!-RIp8cCa$|UX<=X^(wInXd8p4tDnm{r-UW| D;!Qi6 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9701d054c498f88763110cf8ba15334611401447 GIT binary patch literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP)Gas{%kPm}+0Z?d@r;B5V#p&b(iHrjtT}g$k`WC;R zHs|tyfXM z*Z)7UtuAuv?|7XYBjt^L|KxYR`dj~W)9(M3i~0Wc$9(-~AHt)mGvmX}8lYiq;r{cC zI!<~Ve)?^y>tSYre4P&MiogHULJumaDW6S9Q#!I?z0RygAP|f+zIe}p&tnp!>nwN1 bLI#G{2R#0*PO0AlbUlNotDnm{r-UW|Yng6! literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7e814192723cfc525824aee8b6f339ff83744f12 GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ37#&FAr-fh6C_v{Cx{3z%-qHE zzc69K9fLB4GmARS1ZtE-L@(cQY(BPCWW=yGdgP2m8cl6CB?& z1j)K=a%SsgzOY$dv3)@_&trah_65mKflgmF7VKu0@==g@CXgh{66{`RCS$<Hx{~axy zgqz&^m=nbIXI*A~Jn?Zu;QaZXf((xtKU?0FHIRC~xX=zk+?ph5$JY>Pk?{6AWBCCM ci9!Yj|5RZa(JxurK*Je4UHx3vIVCg!0B!JkM30L`%&j}}_S literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d3657219829a0c9808bbb84eb43025d1844e6255 GIT binary patch literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ2u~NskcwMxryb;EFyLVRyR%Dp zXP>iGfH!M+K!(tca-kE-N>?VFd1Di@^#JFEWAEY~uw*>$(6~0MpFQL8866OvP`qw# r_VZi+bP0l+XkKZ&f#) literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..44e4d9f63b8815440e6c4301d0c96960847de198 GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJHcuDFkcwMxuU+JHP~>2}(3U;> zTcP~+jLx(QekOaKLrrG{^zZcVvk{o6>8d2CX!$%p=sANF3&Y-y6RY^D*c_O%*RFY` zVBBD`W9zY93`J}=SaY4{G4`DIZ|Z4&`G(yfY}cg6;RUh*UN2QoXuY^$Y{Gm-!B`;l ot-b-Xj*d#Xm`JgM$|F1bs=D=B@ltj_fi7b3boFyt=akR{02U`gC;$Ke literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..53da908a1062ddaab70496179883539374602a4c GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJC{Gv1kcwMxuOH-OFywH#D3b22 zIQK^X)SWyk8#a`yzLEd%#>U2yP4m>O;K@?P*_so)Tvj+tJAJ;WTwnh~WLy!`lM@q_ v-TP!Li=KQxd7m}viTb6y((}xYb<^1m3k!W`X$YtTZDH_q^>bP0l+XkKJ@+#> literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ef65e9a6a068ac4e9c88ba66a670aaf5b01d2a7c GIT binary patch literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJiJmTwAr-fh6C_v{Cx{3zEVFs| zzc69K9fLB4Gm9j)>KW*5i|A^~e7C^yF~f}3$(#5VC(N?WI3VM2;?dNt`~e1nd`f2( zo9{6$vFb=^=aFJxkZ$k9=eS+sn7kdI!||3yEw2I{%GoPUJZmyMqjho+|q^>bP0l+XkK DfG;}| literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e566229a3fa70d4d2040e552c86fc5817a636c9a GIT binary patch literal 291 zcmV+;0o?wHP)4G##~%n zV0^Qw35==fkO6l9ibM7{rGat0nHd-d038FumuqXm7#1bN*8x=y4qz<9$qB|u=H_7R zr>+jhMZjnP;o<85O+i60HUecyAl{Ro55_PD*Z{>qcvw0By&(d|up+tG#s-Y(RwoRk p1F$-Xmf3I6J7BbxJPL+3002aUSV+`NGtB@1002ovPDHLkV1gv~aftu` literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..465c67ed4ffaecd67bf95c73e12844c8fed08dd9 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJO`a}}Ar-fh6C_wmnEt(aqwq(* zh5Zzx!Rf>q`|Rp>t>W!rKg9TdqeVlV-FyuVj$_QvicQ!r$UTXOX!!8|tLwxBpYr+5 zI>#R|{QCJPpwLi)f5!QXG7k3h%YXcC{@CzS<}Blv)6bd3o^Pn}`)<+xbI;7_;yvtV zo@ekah|k&|6U}{$dD^XuG6qreFW-BXF$XDOqneWRha)-^5k{q%Wd)* fr`->pU}E@KeRk!k8&Ro1*E4v!`njxgN@xNAz|&{a literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0b0983fad9bf6c3080be497df1c28dfa9f937ecc GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ^`0({Ar-fh6BZa<2rmA?e~5>f zmF*0pLHBRrbq$7hWsMT}9JX7iCx}V#*RvncX^5Qh$c(oq@sCY5$FiBuK$Sam+8!GG zmNF>Y>cRH-;cJG7Mb7+HGng~vzL%6Utb4!5L|R1_^uzQVrJ~F|Uzrn0F&1 z@8g0(hJ{QW&&2qn*cY(d-d%m4v6$hk_a4XR3^A;Ncbn@D$U1CiO21&qa98ogjCZ#4 e8H*2WU}cyS(XyPk_LV8n=?tE(elF{r5}E*Tyj6Gr literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1ab37ce8b5a9648dfcbdfa36329c55b72b102116 GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJAWs*^kcwN$2@{&$S< zKg-zT-p8CE_FX-O@$tmR4T1BYvz%di%=p>zuB?I7^TmaB2;$ZxNjtuVNQ;EG-xq`cSqWFuOPG4rs zu+ClncFWvtm%r6*d;BzY`gFzwgW4aG49|AUXc=GKqFB~c0wnsaG4U8N#>PBwYR6 jU>@LhP(y2tDnm{r-UW|&sIR~ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d93ddf41a7bc9d62911ff7b9a94aa15510abd9b4 GIT binary patch literal 151 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJI8PVHkcwN$2@- ziI8t$Kf?Hbwx7s<|5y?3GM2lwe4Ay&xR@Um?{Yi1;=FsU-K)=m^ZS3*TzS6OPX6o9 z73bUMolj&)dD!qn<|HFeKs>(>dy+_x1p~wHg^Cm6zRZ6Lw28sf)z4*}Q$iB}v}`rN literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6ad835dbf8a071bcb6127eafd54bbc070b9baddb GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJIi4<#Ar-gYUfsyspdiqixGh0I zEs>RLdjX@{Ci5?4e$7rrtSm(tD(z3=K8dTTeK&Petgw+Y(p;)vx^6eeS?&hssMj+L z)mB<(NHEB3xu#aiK9O<5;d47xc)mzD@$Go-Y|8evP9*UCDYAEZyYMyE^)YSkl6IpgqL*&v%|E* zA5LtLxyiU7VfpT-FE|SvbllHnEuPjNWta7H#Zx$AN)zK&nRgwHTWUlu$TBbl7rY9O TQt)8{x`Dyd)z4*}Q$iB}dYeST literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..289c53e11a58350746584d8cb3fa277e47d26133 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJUQZXtkcwMxuR3xyC3m$BG^ w|DxU5wEryT2kt(N;XklLl%M&==i8Qy-ftMLyY5{!2k0;cPgg&ebxsLQ0Hn=G>;M1& literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..decfa4dca01962e9f58902324c9230cd1515667c GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJC{Gv1kcwMxuOH-OFywH#7?P6u zEkWMQx?3PoJ7C&h=6Q3c&#`IeIeIrcBsoo+b;``H4y^@+mHPYj7l>Bs%l~A0a$=&g vd!LMD(Ubd=_j9i~VZC(ktGUcgfAsiw=4eh?=pkzkw1vUb)z4*}Q$iB}B!4sF literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..10c3dba65693d74681c08f412a6cee341257a182 GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ1)eUBAr-fh6C_v{Cx{3zywofD zUzjlAjzJm2nMI|%6BBBR$~d`}?QCZ2Wlj*YyK61Zdijnc^D_n~vH$-o_*sP?DqNB= zdcenV;rT!QLpx*~RyBK+omf!FQ1wmui9ktr;-80)8A^OKyjIAumXsfuB;;<;X4w+K z9;hqLH-ovrl4W{xg2Xa8&gL@;`}HIW*cVv0aQMh_v(IIAJE$S?je%jCa^WI{DO;m~ PZe{Rv^>bP0l+XkK-d{yX9hoO96h2aut(xT;LXfPF&Lfdf|pZO^@Y#xSGx z37hTJraABU4ouyfacz@i3D7L2SyNv!zhg+!T~=*sogvdO&(?h&bDJ&$!^w`42`Y*X R@<8V@c)I$ztaD0e0ssffPnG}x literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..85f7d7733c65604f9ad9cdd705b994e71386117c GIT binary patch literal 154 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJL{AsTkcwN$2@&sXFr~f$FDDz?dJG=HsxtBVgu*LI{mz{Nw2Z;i)z4*}Q$iB} D9LPL# literal 0 HcmV?d00001 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