From 76070970fc4de75c2f4ec7ea5dbaa61bbb18d01d Mon Sep 17 00:00:00 2001 From: mDiyo Date: Sat, 20 Apr 2013 11:31:35 -0700 Subject: [PATCH] Worldgen Change --- mods/tinker/resources/lang/en_US.xml | 21 ++ mods/tinker/tconstruct/PHConstruct.java | 129 +++++-- mods/tinker/tconstruct/TConstruct.java | 2 +- mods/tinker/tconstruct/TContent.java | 113 ++++-- mods/tinker/tconstruct/TEventHandler.java | 123 ++++--- mods/tinker/tconstruct/TProxyCommon.java | 6 +- mods/tinker/tconstruct/blocks/GravelOre.java | 66 ++++ mods/tinker/tconstruct/blocks/MetalOre.java | 13 + .../tconstruct/blocks/OreberryBush.java | 328 ++++++++++++++++++ .../tconstruct/client/TProxyClient.java | 1 + .../client/blockrender/OreberryRender.java | 109 ++++++ .../tconstruct/container/ArmorExtended.java | 90 +++++ .../container/PartCrafterContainer.java | 1 - .../tinker/tconstruct/items/CraftingItem.java | 8 +- mods/tinker/tconstruct/items/OreBerries.java | 13 + .../{ => blocks}/CraftedSoilItemBlock.java | 6 +- .../items/blocks/GravelOreItem.java | 31 ++ .../items/{ => blocks}/LavaTankItemBlock.java | 6 +- .../items/{ => blocks}/LiquidItemBlock.java | 6 +- .../items/{ => blocks}/MetalItemBlock.java | 6 +- .../items/{ => blocks}/MetalOreItemBlock.java | 6 +- .../items/blocks/OreberryBushItem.java | 94 +++++ .../items/blocks/OreberryBushSecondItem.java | 88 +++++ .../{ => blocks}/SearedTableItemBlock.java | 6 +- .../items/{ => blocks}/SmelteryItemBlock.java | 6 +- .../{ => blocks}/ToolStationItemBlock.java | 6 +- mods/tinker/tconstruct/logic/FaucetLogic.java | 39 ++- .../tconstruct/logic/SmelteryLogic.java | 6 +- .../tconstruct/player/TClientTickHandler.java | 5 + .../tconstruct/player/TPlayerStats.java | 85 ++++- .../worldgen/NetherOreGenerator.java | 86 ----- .../tconstruct/worldgen/OreberryBushGen.java | 202 +++++++++++ .../tconstruct/worldgen/SurfaceOreGen.java | 133 +++++++ .../worldgen/TBaseWorldGenerator.java | 325 ++++++++++++----- mods/tinker/textures/GGE/GUIPedestal.png | Bin 1250 -> 0 bytes mods/tinker/textures/GGE/elderpork.png | Bin 426 -> 0 bytes .../blocks/berries/berry_aluminum_fancy.png | Bin 0 -> 312 bytes .../blocks/berries/berry_aluminum_fast.png | Bin 0 -> 397 bytes .../berries/berry_aluminum_ripe_fancy.png | Bin 0 -> 347 bytes .../berries/berry_aluminum_ripe_fast.png | Bin 0 -> 395 bytes .../blocks/berries/berry_copper_fancy.png | Bin 0 -> 313 bytes .../blocks/berries/berry_copper_fast.png | Bin 0 -> 394 bytes .../berries/berry_copper_ripe_fancy.png | Bin 0 -> 356 bytes .../blocks/berries/berry_copper_ripe_fast.png | Bin 0 -> 397 bytes .../blocks/berries/berry_gold_fancy.png | Bin 0 -> 315 bytes .../blocks/berries/berry_gold_fast.png | Bin 0 -> 399 bytes .../blocks/berries/berry_gold_ripe_fancy.png | Bin 0 -> 723 bytes .../blocks/berries/berry_gold_ripe_fast.png | Bin 0 -> 775 bytes .../blocks/berries/berry_iron_fancy.png | Bin 0 -> 314 bytes .../blocks/berries/berry_iron_fast.png | Bin 0 -> 397 bytes .../blocks/berries/berry_iron_ripe_fancy.png | Bin 0 -> 356 bytes .../blocks/berries/berry_iron_ripe_fast.png | Bin 0 -> 397 bytes .../blocks/berries/berry_redstone_fancy.png | Bin 0 -> 308 bytes .../blocks/berries/berry_redstone_fast.png | Bin 0 -> 390 bytes .../berries/berry_redstone_ripe_fancy.png | Bin 0 -> 308 bytes .../berries/berry_redstone_ripe_fast.png | Bin 0 -> 390 bytes .../blocks/berries/berry_silver_fancy.png | Bin 0 -> 613 bytes .../blocks/berries/berry_silver_fast.png | Bin 0 -> 850 bytes .../berries/berry_silver_ripe_fancy.png | Bin 0 -> 670 bytes .../blocks/berries/berry_silver_ripe_fast.png | Bin 0 -> 772 bytes .../blocks/berries/berry_tin_fancy.png | Bin 0 -> 311 bytes .../blocks/berries/berry_tin_fast.png | Bin 0 -> 393 bytes .../blocks/berries/berry_tin_ripe_fancy.png | Bin 0 -> 353 bytes .../blocks/berries/berry_tin_ripe_fast.png | Bin 0 -> 392 bytes .../blocks/infiblocks/ancient_ice.png | Bin 0 -> 563 bytes .../textures/blocks/infiblocks/brick_bone.png | Bin 0 -> 926 bytes .../blocks/infiblocks/brick_diamond.png | Bin 0 -> 527 bytes .../textures/blocks/infiblocks/brick_gold.png | Bin 0 -> 519 bytes .../textures/blocks/infiblocks/brick_ice.png | Bin 0 -> 174 bytes .../textures/blocks/infiblocks/brick_iron.png | Bin 0 -> 335 bytes .../blocks/infiblocks/brick_lapis.png | Bin 0 -> 791 bytes .../blocks/infiblocks/brick_largeclay.png | Bin 0 -> 833 bytes .../blocks/infiblocks/brick_netherrack.png | Bin 0 -> 729 bytes .../blocks/infiblocks/brick_obsidian.png | Bin 0 -> 461 bytes .../blocks/infiblocks/brick_redstone.png | Bin 0 -> 446 bytes .../blocks/infiblocks/brick_sandstone.png | Bin 0 -> 729 bytes .../blocks/infiblocks/brick_slime.png | Bin 0 -> 588 bytes .../textures/blocks/infiblocks/brick_snow.png | Bin 0 -> 473 bytes .../blocks/infiblocks/brick_stone_refined.png | Bin 0 -> 281 bytes .../infiblocks/brownstone_road_rough.png | Bin 0 -> 846 bytes .../blocks/infiblocks/brownstone_rough.png | Bin 0 -> 746 bytes .../blocks/infiblocks/brownstone_smooth.png | Bin 0 -> 236 bytes .../infiblocks/brownstone_smooth_brick.png | Bin 0 -> 401 bytes .../brownstone_smooth_fancybrick.png | Bin 0 -> 364 bytes .../infiblocks/brownstone_smooth_road.png | Bin 0 -> 429 bytes .../brownstone_smooth_squarebrick.png | Bin 0 -> 413 bytes .../blocks/infiblocks/fancybrick_diamond.png | Bin 0 -> 411 bytes .../blocks/infiblocks/fancybrick_gold.png | Bin 0 -> 388 bytes .../blocks/infiblocks/fancybrick_ice.png | Bin 0 -> 197 bytes .../blocks/infiblocks/fancybrick_iron.png | Bin 0 -> 421 bytes .../blocks/infiblocks/fancybrick_lapis.png | Bin 0 -> 733 bytes .../infiblocks/fancybrick_largeclay.png | Bin 0 -> 876 bytes .../infiblocks/fancybrick_netherrack.png | Bin 0 -> 693 bytes .../blocks/infiblocks/fancybrick_obsidian.png | Bin 0 -> 743 bytes .../blocks/infiblocks/fancybrick_redstone.png | Bin 0 -> 314 bytes .../infiblocks/fancybrick_sandstone.png | Bin 0 -> 694 bytes .../blocks/infiblocks/fancybrick_slime.png | Bin 0 -> 392 bytes .../blocks/infiblocks/fancybrick_snow.png | Bin 0 -> 616 bytes .../blocks/infiblocks/fancybrick_stone.png | Bin 0 -> 350 bytes .../infiblocks/fancybrick_stone_refined.png | Bin 0 -> 373 bytes .../blocks/infiblocks/glass_black.png | Bin 0 -> 98 bytes .../blocks/infiblocks/glass_black_pane.png | Bin 0 -> 93 bytes .../textures/blocks/infiblocks/glass_blue.png | Bin 0 -> 98 bytes .../blocks/infiblocks/glass_blue_pane.png | Bin 0 -> 96 bytes .../blocks/infiblocks/glass_brown.png | Bin 0 -> 97 bytes .../blocks/infiblocks/glass_brown_pane.png | Bin 0 -> 96 bytes .../textures/blocks/infiblocks/glass_cyan.png | Bin 0 -> 98 bytes .../blocks/infiblocks/glass_cyan_pane.png | Bin 0 -> 96 bytes .../textures/blocks/infiblocks/glass_gray.png | Bin 0 -> 98 bytes .../blocks/infiblocks/glass_gray_pane.png | Bin 0 -> 96 bytes .../blocks/infiblocks/glass_green.png | Bin 0 -> 98 bytes .../blocks/infiblocks/glass_green_pane.png | Bin 0 -> 96 bytes .../blocks/infiblocks/glass_lightblue.png | Bin 0 -> 98 bytes .../infiblocks/glass_lightblue_pane.png | Bin 0 -> 96 bytes .../blocks/infiblocks/glass_lightgray.png | Bin 0 -> 98 bytes .../infiblocks/glass_lightgray_pane.png | Bin 0 -> 97 bytes .../textures/blocks/infiblocks/glass_lime.png | Bin 0 -> 98 bytes .../blocks/infiblocks/glass_lime_pane.png | Bin 0 -> 96 bytes .../blocks/infiblocks/glass_magenta.png | Bin 0 -> 98 bytes .../blocks/infiblocks/glass_magenta_pane.png | Bin 0 -> 96 bytes .../blocks/infiblocks/glass_orange.png | Bin 0 -> 98 bytes .../blocks/infiblocks/glass_orange_pane.png | Bin 0 -> 96 bytes .../textures/blocks/infiblocks/glass_pink.png | Bin 0 -> 98 bytes .../blocks/infiblocks/glass_pink_pane.png | Bin 0 -> 96 bytes .../textures/blocks/infiblocks/glass_pure.png | Bin 0 -> 108 bytes .../blocks/infiblocks/glass_pure_pane.png | Bin 0 -> 102 bytes .../blocks/infiblocks/glass_purple.png | Bin 0 -> 98 bytes .../blocks/infiblocks/glass_purple_pane.png | Bin 0 -> 96 bytes .../textures/blocks/infiblocks/glass_red.png | Bin 0 -> 98 bytes .../blocks/infiblocks/glass_red_pane.png | Bin 0 -> 96 bytes .../textures/blocks/infiblocks/glass_soul.png | Bin 0 -> 353 bytes .../blocks/infiblocks/glass_soul_pane.png | Bin 0 -> 116 bytes .../blocks/infiblocks/glass_soul_pure.png | Bin 0 -> 292 bytes .../infiblocks/glass_soul_pure_pane.png | Bin 0 -> 103 bytes .../blocks/infiblocks/glass_white.png | Bin 0 -> 98 bytes .../blocks/infiblocks/glass_white_pane.png | Bin 0 -> 97 bytes .../blocks/infiblocks/glass_yellow.png | Bin 0 -> 98 bytes .../blocks/infiblocks/glass_yellow_pane.png | Bin 0 -> 96 bytes .../blocks/infiblocks/paver_largeclay.png | Bin 0 -> 833 bytes .../blocks/infiblocks/refined_largeclay.png | Bin 0 -> 710 bytes .../blocks/infiblocks/refined_netherrack.png | Bin 0 -> 907 bytes .../blocks/infiblocks/refined_sandstone.png | Bin 0 -> 735 bytes .../blocks/infiblocks/refined_stone.png | Bin 0 -> 252 bytes .../textures/blocks/infiblocks/road_stone.png | Bin 0 -> 426 bytes .../blocks/infiblocks/road_stone_refined.png | Bin 0 -> 432 bytes .../blocks/infiblocks/smallbrick_ice.png | Bin 0 -> 180 bytes .../infiblocks/smallbrick_largeclay.png | Bin 0 -> 647 bytes .../blocks/infiblocks/squarebrick_iron.png | Bin 0 -> 364 bytes .../infiblocks/squarebrick_stone_refined.png | Bin 0 -> 415 bytes .../blocks/infiblocks/storage_bone.png | Bin 0 -> 898 bytes .../blocks/infiblocks/storage_charcoal.png | Bin 0 -> 447 bytes .../blocks/infiblocks/storage_coal.png | Bin 0 -> 447 bytes .../infiblocks/storage_inert_redstone.png | Bin 0 -> 463 bytes .../blocks/infiblocks/storage_slime.png | Bin 0 -> 353 bytes .../blocks/infiblocks/storage_wheat.png | Bin 0 -> 554 bytes .../blocks/infiblocks/storage_wheat_dark.png | Bin 0 -> 493 bytes .../textures/blocks/ore_aluminum_gravel.png | Bin 0 -> 896 bytes .../textures/blocks/ore_cobalt_gravel.png | Bin 0 -> 805 bytes .../textures/blocks/ore_copper_gravel.png | Bin 0 -> 872 bytes .../textures/blocks/ore_gold_gravel.png | Bin 0 -> 887 bytes .../textures/blocks/ore_iron_gravel.png | Bin 0 -> 877 bytes .../tinker/textures/blocks/ore_tin_gravel.png | Bin 0 -> 872 bytes mods/tinker/textures/gui/backpack.png | Bin 0 -> 6921 bytes mods/tinker/textures/gui/inventoryarmor.png | Bin 0 -> 1911 bytes .../materials/material_alubrassingot.png | Bin 248 -> 342 bytes .../materials/material_aluminumingot.png | Bin 213 -> 282 bytes .../items/materials/material_aluminumraw.png | Bin 197 -> 292 bytes .../items/materials/material_alumiteingot.png | Bin 235 -> 321 bytes .../items/materials/material_arditeingot.png | Bin 227 -> 293 bytes .../items/materials/material_bronzeingot.png | Bin 242 -> 338 bytes .../items/materials/material_cobaltingot.png | Bin 251 -> 319 bytes .../items/materials/material_copperingot.png | Bin 235 -> 300 bytes .../materials/material_manyullyningot.png | Bin 249 -> 338 bytes .../materials/material_nugget_aluminum.png | Bin 0 -> 220 bytes .../materials/material_nugget_copper.png | Bin 0 -> 384 bytes .../items/materials/material_nugget_iron.png | Bin 0 -> 366 bytes .../materials/material_nugget_silver.png | Bin 0 -> 388 bytes .../items/materials/material_nugget_tin.png | Bin 0 -> 213 bytes .../items/materials/material_steelingot.png | Bin 253 -> 343 bytes .../items/materials/material_tiningot.png | Bin 356 -> 312 bytes .../items/oreberries/oreberry_aluminum.png | Bin 0 -> 450 bytes .../items/oreberries/oreberry_copper.png | Bin 0 -> 478 bytes .../items/oreberries/oreberry_gold.png | Bin 0 -> 472 bytes .../items/oreberries/oreberry_iron.png | Bin 0 -> 473 bytes .../items/oreberries/oreberry_silver.png | Bin 0 -> 480 bytes .../items/oreberries/oreberry_tin.png | Bin 0 -> 519 bytes .../textures/items/{ => parts}/bone_chunk.png | Bin .../items/{ => parts}/paper_chunk.png | Bin 188 files changed, 1863 insertions(+), 302 deletions(-) create mode 100644 mods/tinker/tconstruct/blocks/GravelOre.java create mode 100644 mods/tinker/tconstruct/blocks/OreberryBush.java create mode 100644 mods/tinker/tconstruct/client/blockrender/OreberryRender.java create mode 100644 mods/tinker/tconstruct/container/ArmorExtended.java create mode 100644 mods/tinker/tconstruct/items/OreBerries.java rename mods/tinker/tconstruct/items/{ => blocks}/CraftedSoilItemBlock.java (73%) create mode 100644 mods/tinker/tconstruct/items/blocks/GravelOreItem.java rename mods/tinker/tconstruct/items/{ => blocks}/LavaTankItemBlock.java (73%) rename mods/tinker/tconstruct/items/{ => blocks}/LiquidItemBlock.java (75%) rename mods/tinker/tconstruct/items/{ => blocks}/MetalItemBlock.java (75%) rename mods/tinker/tconstruct/items/{ => blocks}/MetalOreItemBlock.java (74%) create mode 100644 mods/tinker/tconstruct/items/blocks/OreberryBushItem.java create mode 100644 mods/tinker/tconstruct/items/blocks/OreberryBushSecondItem.java rename mods/tinker/tconstruct/items/{ => blocks}/SearedTableItemBlock.java (72%) rename mods/tinker/tconstruct/items/{ => blocks}/SmelteryItemBlock.java (74%) rename mods/tinker/tconstruct/items/{ => blocks}/ToolStationItemBlock.java (78%) delete mode 100644 mods/tinker/tconstruct/worldgen/NetherOreGenerator.java create mode 100644 mods/tinker/tconstruct/worldgen/OreberryBushGen.java create mode 100644 mods/tinker/tconstruct/worldgen/SurfaceOreGen.java delete mode 100644 mods/tinker/textures/GGE/GUIPedestal.png delete mode 100644 mods/tinker/textures/GGE/elderpork.png create mode 100644 mods/tinker/textures/blocks/berries/berry_aluminum_fancy.png create mode 100644 mods/tinker/textures/blocks/berries/berry_aluminum_fast.png create mode 100644 mods/tinker/textures/blocks/berries/berry_aluminum_ripe_fancy.png create mode 100644 mods/tinker/textures/blocks/berries/berry_aluminum_ripe_fast.png create mode 100644 mods/tinker/textures/blocks/berries/berry_copper_fancy.png create mode 100644 mods/tinker/textures/blocks/berries/berry_copper_fast.png create mode 100644 mods/tinker/textures/blocks/berries/berry_copper_ripe_fancy.png create mode 100644 mods/tinker/textures/blocks/berries/berry_copper_ripe_fast.png create mode 100644 mods/tinker/textures/blocks/berries/berry_gold_fancy.png create mode 100644 mods/tinker/textures/blocks/berries/berry_gold_fast.png create mode 100644 mods/tinker/textures/blocks/berries/berry_gold_ripe_fancy.png create mode 100644 mods/tinker/textures/blocks/berries/berry_gold_ripe_fast.png create mode 100644 mods/tinker/textures/blocks/berries/berry_iron_fancy.png create mode 100644 mods/tinker/textures/blocks/berries/berry_iron_fast.png create mode 100644 mods/tinker/textures/blocks/berries/berry_iron_ripe_fancy.png create mode 100644 mods/tinker/textures/blocks/berries/berry_iron_ripe_fast.png create mode 100644 mods/tinker/textures/blocks/berries/berry_redstone_fancy.png create mode 100644 mods/tinker/textures/blocks/berries/berry_redstone_fast.png create mode 100644 mods/tinker/textures/blocks/berries/berry_redstone_ripe_fancy.png create mode 100644 mods/tinker/textures/blocks/berries/berry_redstone_ripe_fast.png create mode 100644 mods/tinker/textures/blocks/berries/berry_silver_fancy.png create mode 100644 mods/tinker/textures/blocks/berries/berry_silver_fast.png create mode 100644 mods/tinker/textures/blocks/berries/berry_silver_ripe_fancy.png create mode 100644 mods/tinker/textures/blocks/berries/berry_silver_ripe_fast.png create mode 100644 mods/tinker/textures/blocks/berries/berry_tin_fancy.png create mode 100644 mods/tinker/textures/blocks/berries/berry_tin_fast.png create mode 100644 mods/tinker/textures/blocks/berries/berry_tin_ripe_fancy.png create mode 100644 mods/tinker/textures/blocks/berries/berry_tin_ripe_fast.png create mode 100644 mods/tinker/textures/blocks/infiblocks/ancient_ice.png create mode 100644 mods/tinker/textures/blocks/infiblocks/brick_bone.png create mode 100644 mods/tinker/textures/blocks/infiblocks/brick_diamond.png create mode 100644 mods/tinker/textures/blocks/infiblocks/brick_gold.png create mode 100644 mods/tinker/textures/blocks/infiblocks/brick_ice.png create mode 100644 mods/tinker/textures/blocks/infiblocks/brick_iron.png create mode 100644 mods/tinker/textures/blocks/infiblocks/brick_lapis.png create mode 100644 mods/tinker/textures/blocks/infiblocks/brick_largeclay.png create mode 100644 mods/tinker/textures/blocks/infiblocks/brick_netherrack.png create mode 100644 mods/tinker/textures/blocks/infiblocks/brick_obsidian.png create mode 100644 mods/tinker/textures/blocks/infiblocks/brick_redstone.png create mode 100644 mods/tinker/textures/blocks/infiblocks/brick_sandstone.png create mode 100644 mods/tinker/textures/blocks/infiblocks/brick_slime.png create mode 100644 mods/tinker/textures/blocks/infiblocks/brick_snow.png create mode 100644 mods/tinker/textures/blocks/infiblocks/brick_stone_refined.png create mode 100644 mods/tinker/textures/blocks/infiblocks/brownstone_road_rough.png create mode 100644 mods/tinker/textures/blocks/infiblocks/brownstone_rough.png create mode 100644 mods/tinker/textures/blocks/infiblocks/brownstone_smooth.png create mode 100644 mods/tinker/textures/blocks/infiblocks/brownstone_smooth_brick.png create mode 100644 mods/tinker/textures/blocks/infiblocks/brownstone_smooth_fancybrick.png create mode 100644 mods/tinker/textures/blocks/infiblocks/brownstone_smooth_road.png create mode 100644 mods/tinker/textures/blocks/infiblocks/brownstone_smooth_squarebrick.png create mode 100644 mods/tinker/textures/blocks/infiblocks/fancybrick_diamond.png create mode 100644 mods/tinker/textures/blocks/infiblocks/fancybrick_gold.png create mode 100644 mods/tinker/textures/blocks/infiblocks/fancybrick_ice.png create mode 100644 mods/tinker/textures/blocks/infiblocks/fancybrick_iron.png create mode 100644 mods/tinker/textures/blocks/infiblocks/fancybrick_lapis.png create mode 100644 mods/tinker/textures/blocks/infiblocks/fancybrick_largeclay.png create mode 100644 mods/tinker/textures/blocks/infiblocks/fancybrick_netherrack.png create mode 100644 mods/tinker/textures/blocks/infiblocks/fancybrick_obsidian.png create mode 100644 mods/tinker/textures/blocks/infiblocks/fancybrick_redstone.png create mode 100644 mods/tinker/textures/blocks/infiblocks/fancybrick_sandstone.png create mode 100644 mods/tinker/textures/blocks/infiblocks/fancybrick_slime.png create mode 100644 mods/tinker/textures/blocks/infiblocks/fancybrick_snow.png create mode 100644 mods/tinker/textures/blocks/infiblocks/fancybrick_stone.png create mode 100644 mods/tinker/textures/blocks/infiblocks/fancybrick_stone_refined.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_black.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_black_pane.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_blue.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_blue_pane.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_brown.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_brown_pane.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_cyan.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_cyan_pane.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_gray.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_gray_pane.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_green.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_green_pane.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_lightblue.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_lightblue_pane.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_lightgray.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_lightgray_pane.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_lime.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_lime_pane.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_magenta.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_magenta_pane.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_orange.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_orange_pane.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_pink.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_pink_pane.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_pure.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_pure_pane.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_purple.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_purple_pane.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_red.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_red_pane.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_soul.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_soul_pane.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_soul_pure.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_soul_pure_pane.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_white.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_white_pane.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_yellow.png create mode 100644 mods/tinker/textures/blocks/infiblocks/glass_yellow_pane.png create mode 100644 mods/tinker/textures/blocks/infiblocks/paver_largeclay.png create mode 100644 mods/tinker/textures/blocks/infiblocks/refined_largeclay.png create mode 100644 mods/tinker/textures/blocks/infiblocks/refined_netherrack.png create mode 100644 mods/tinker/textures/blocks/infiblocks/refined_sandstone.png create mode 100644 mods/tinker/textures/blocks/infiblocks/refined_stone.png create mode 100644 mods/tinker/textures/blocks/infiblocks/road_stone.png create mode 100644 mods/tinker/textures/blocks/infiblocks/road_stone_refined.png create mode 100644 mods/tinker/textures/blocks/infiblocks/smallbrick_ice.png create mode 100644 mods/tinker/textures/blocks/infiblocks/smallbrick_largeclay.png create mode 100644 mods/tinker/textures/blocks/infiblocks/squarebrick_iron.png create mode 100644 mods/tinker/textures/blocks/infiblocks/squarebrick_stone_refined.png create mode 100644 mods/tinker/textures/blocks/infiblocks/storage_bone.png create mode 100644 mods/tinker/textures/blocks/infiblocks/storage_charcoal.png create mode 100644 mods/tinker/textures/blocks/infiblocks/storage_coal.png create mode 100644 mods/tinker/textures/blocks/infiblocks/storage_inert_redstone.png create mode 100644 mods/tinker/textures/blocks/infiblocks/storage_slime.png create mode 100644 mods/tinker/textures/blocks/infiblocks/storage_wheat.png create mode 100644 mods/tinker/textures/blocks/infiblocks/storage_wheat_dark.png create mode 100644 mods/tinker/textures/blocks/ore_aluminum_gravel.png create mode 100644 mods/tinker/textures/blocks/ore_cobalt_gravel.png create mode 100644 mods/tinker/textures/blocks/ore_copper_gravel.png create mode 100644 mods/tinker/textures/blocks/ore_gold_gravel.png create mode 100644 mods/tinker/textures/blocks/ore_iron_gravel.png create mode 100644 mods/tinker/textures/blocks/ore_tin_gravel.png create mode 100644 mods/tinker/textures/gui/backpack.png create mode 100644 mods/tinker/textures/gui/inventoryarmor.png create mode 100644 mods/tinker/textures/items/materials/material_nugget_aluminum.png create mode 100644 mods/tinker/textures/items/materials/material_nugget_copper.png create mode 100644 mods/tinker/textures/items/materials/material_nugget_iron.png create mode 100644 mods/tinker/textures/items/materials/material_nugget_silver.png create mode 100644 mods/tinker/textures/items/materials/material_nugget_tin.png create mode 100644 mods/tinker/textures/items/oreberries/oreberry_aluminum.png create mode 100644 mods/tinker/textures/items/oreberries/oreberry_copper.png create mode 100644 mods/tinker/textures/items/oreberries/oreberry_gold.png create mode 100644 mods/tinker/textures/items/oreberries/oreberry_iron.png create mode 100644 mods/tinker/textures/items/oreberries/oreberry_silver.png create mode 100644 mods/tinker/textures/items/oreberries/oreberry_tin.png rename mods/tinker/textures/items/{ => parts}/bone_chunk.png (100%) rename mods/tinker/textures/items/{ => parts}/paper_chunk.png (100%) diff --git a/mods/tinker/resources/lang/en_US.xml b/mods/tinker/resources/lang/en_US.xml index 64ef8dd7..5419115f 100644 --- a/mods/tinker/resources/lang/en_US.xml +++ b/mods/tinker/resources/lang/en_US.xml @@ -30,6 +30,27 @@ Aluminum Ore Stone Slag + Iron Oreberry Bush + Gold Oreberry Bush + Copper Oreberry Bush + Tin Oreberry Bush + Aluminum Oreberry Bush + Silver Oreberry Bush + + Iron Ore + Gold Ore + Copper Ore + Tin Ore + Aluminum Ore + Cobalt Ore + + Iron Oreberry + Gold Oreberry + Copper Oreberry + Tin Oreberry + Aluminum Oreberry + Silver Oreberry + Smeltery Controller Smeltery Drain Seared Bricks diff --git a/mods/tinker/tconstruct/PHConstruct.java b/mods/tinker/tconstruct/PHConstruct.java index 6abb80bb..d5b7e7be 100644 --- a/mods/tinker/tconstruct/PHConstruct.java +++ b/mods/tinker/tconstruct/PHConstruct.java @@ -72,12 +72,16 @@ public class PHConstruct metalStill = config.getBlock("Liquid Metal Still", 1480).getInt(1480); //landmine = config.getBlock("Landmine", 1481).getInt(1481); - golemCore = config.getBlock("Golem Core", 1481).getInt(1481); - golemHead = config.getBlock("Golem Head", 1482).getInt(1482); + /*golemCore = config.getBlock("Golem Core", 1481).getInt(1481); + golemHead = config.getBlock("Golem Head", 1482).getInt(1482);*/ //golemPedestal = config.getBlock("Golem Pedestal", 1483).getInt(1483); //redstoneBallRepeater = config.getBlock("Redstone Ball Repeater", 1483).getInt(1483); stoneTorch = config.getBlock("Stone Torch", 1484).getInt(1484); + oreBerry = config.getBlock("Ore Berry One", 1485).getInt(1485); + oreBerrySecond = config.getBlock("Ore Berry Two", 1486).getInt(1486); + //netherOreBerry = config.getBlock("Ore Berry Nether", 1487).getInt(1487); + oreGravel = config.getBlock("Ores Gravel", 1488).getInt(1488); manual = config.getItem("Patterns and Misc", "Tinker's Manual", 14018).getInt(14018); blankPattern = config.getItem("Patterns and Misc", "Blank Patterns", 14019).getInt(14019); @@ -123,6 +127,7 @@ public class PHConstruct buckets = config.getItem("Patterns and Misc", "Buckets", 14101).getInt(14101); uselessItem = config.getItem("Patterns and Misc", "Title Icon", 14102).getInt(14102); slimefood = config.getItem("Patterns and Misc", "Strange Food", 14103).getInt(14103); + oreChunks = config.getItem("Patterns and Misc", "Ore Chunks", 14104).getInt(14104); boolean ic2 = true; boolean xycraft = true; @@ -143,22 +148,51 @@ public class PHConstruct { } - generateCopper = config.get("Worldgen", "Generate Copper", ic2).getBoolean(ic2); - generateTin = config.get("Worldgen", "Generate Tin", ic2).getBoolean(ic2); - generateAluminum = config.get("Worldgen", "Generate Aluminum", xycraft).getBoolean(xycraft); - generateCobalt = config.get("Worldgen", "Generate Cobalt", true).getBoolean(true); - generateArdite = config.get("Worldgen", "Generate Ardite", true).getBoolean(true); + generateCopper = config.get("Worldgen Disabler", "Generate Copper", ic2).getBoolean(ic2); + generateTin = config.get("Worldgen Disabler", "Generate Tin", ic2).getBoolean(ic2); + generateAluminum = config.get("Worldgen Disabler", "Generate Aluminum", xycraft).getBoolean(xycraft); + generateNetherOres = config.get("Worldgen Disabler", "Generate Cobalt and Ardite", true).getBoolean(true); - copperDensity = config.get("Worldgen", "Copper Density", 8).getInt(8); - copperHeight = config.get("Worldgen", "Copper Height", 20).getInt(20); - copperRange = config.get("Worldgen", "Copper Range", 40).getInt(40); - tinDensity = config.get("Worldgen", "Tin Density", 8).getInt(8); - tinHeight = config.get("Worldgen", "Tin Height", 0).getInt(0); - tinRange = config.get("Worldgen", "Tin Range", 40).getInt(40); - aluminumDensity = config.get("Worldgen", "Aluminum Density", 5).getInt(5); - aluminumHeight = config.get("Worldgen", "Aluminum Height", 0).getInt(0); - aluminumRange = config.get("Worldgen", "Aluminum Range", 64).getInt(64); + generateIronSurface = config.get("Worldgen Disabler", "Generate Surface Iron", true).getBoolean(true); + generateGoldSurface = config.get("Worldgen Disabler", "Generate Surface Gold", true).getBoolean(true); + generateCopperSurface = config.get("Worldgen Disabler", "Generate Surface Copper", true).getBoolean(true); + generateTinSurface = config.get("Worldgen Disabler", "Generate Surface Tin", true).getBoolean(true); + generateAluminumSurface = config.get("Worldgen Disabler", "Generate Surface Aluminum", true).getBoolean(true); + + generateIronBush = config.get("Worldgen Disabler", "Generate Iron Bushes", true).getBoolean(true); + generateGoldBush = config.get("Worldgen Disabler", "Generate Gold Bushes", true).getBoolean(true); + generateCopperBush = config.get("Worldgen Disabler", "Generate Copper Bushes", true).getBoolean(true); + generateTinBush = config.get("Worldgen Disabler", "Generate Tin Bushes", true).getBoolean(true); + generateAluminumBush = config.get("Worldgen Disabler", "Generate Aluminum Bushes", true).getBoolean(true); + generateSilverBush = config.get("Worldgen Disabler", "Generate Silver Bushes", true).getBoolean(true); + + copperuDensity = config.get("Worldgen", "Copper Underground Density", ic2 ? 1 : 0).getInt(ic2 ? 1 : 0); + tinuDensity = config.get("Worldgen", "Tin Underground Density", ic2 ? 1 : 0).getInt(ic2 ? 1 : 0); + aluminumuDensity = config.get("Worldgen", "Aluminum Underground Density", xycraft ? 1 : 0).getInt(xycraft ? 1 : 0); netherDensity = config.get("Worldgen", "Nether Ores Density", 8).getInt(8); + + copperuHeight = config.get("Worldgen", "Copper Underground Min Y", 20).getInt(20); + copperuRange = config.get("Worldgen", "Copper Underground Max Y", 60).getInt(60); + tinuHeight = config.get("Worldgen", "Tin Underground Min Y", 0).getInt(0); + tinuRange = config.get("Worldgen", "Tin Underground Max Y", 40).getInt(40); + aluminumuHeight = config.get("Worldgen", "Aluminum Underground Min Y", 0).getInt(0); + aluminumuRange = config.get("Worldgen", "Aluminum Underground Max Y", 64).getInt(64); + + ironsRarity = config.get("Worldgen", "Iron Surface Rarity", 38).getInt(38); + goldsRarity = config.get("Worldgen", "Gold Surface Rarity", 100).getInt(100); + coppersRarity = config.get("Worldgen", "Copper Surface Rarity", 26).getInt(26); + tinsRarity = config.get("Worldgen", "Tin Surface Rarity", 26).getInt(26); + aluminumsRarity = config.get("Worldgen", "Aluminum Surface Rarity", 32).getInt(32); + cobaltsRarity = config.get("Worldgen", "Aluminum Surface Rarity", 400).getInt(400); + + ironbRarity = config.get("Worldgen", "Iron Bush Rarity", 28).getInt(28); + goldbRarity = config.get("Worldgen", "Gold Bush Rarity", 125).getInt(125); + copperbRarity = config.get("Worldgen", "Copper Bush Rarity", 20).getInt(20); + tinbRarity = config.get("Worldgen", "Tin Bush Rarity", 20).getInt(20); + aluminumbRarity = config.get("Worldgen", "Aluminum Bush Rarity", 20).getInt(20); + silverbRarity = config.get("Worldgen", "Silver Bush Rarity", 100).getInt(100); + + seaLevel = config.get("general", "Sea level", 64).getInt(64); /* Save the configuration file */ config.save(); @@ -173,12 +207,18 @@ public class PHConstruct public static int searedTable; public static int craftedSoil; public static int oreSlag; + public static int oreGravel; public static int metalBlock; //public static int axle; public static int golemCore; public static int golemHead; public static int golemPedestal; + + //Crops + public static int oreBerry; + public static int oreBerrySecond; + public static int netherOreBerry; //Traps //public static int landmine; @@ -202,6 +242,7 @@ public class PHConstruct public static int manual; public static int buckets; public static int uselessItem; + public static int oreChunks; //Food public static int slimefood; @@ -247,19 +288,51 @@ public class PHConstruct public static boolean generateCopper; public static boolean generateTin; public static boolean generateAluminum; - public static boolean generateCobalt; - public static boolean generateArdite; - - public static int copperDensity; - public static int copperHeight; - public static int copperRange; - public static int tinDensity; - public static int tinHeight; - public static int tinRange; - public static int aluminumDensity; - public static int aluminumHeight; - public static int aluminumRange; + public static boolean generateNetherOres; + + public static boolean generateIronSurface; + public static boolean generateGoldSurface; + public static boolean generateCopperSurface; + public static boolean generateTinSurface; + public static boolean generateAluminumSurface; + public static boolean generateCobaltSurface; + + public static boolean generateIronBush; + public static boolean generateGoldBush; + public static boolean generateCopperBush; + public static boolean generateTinBush; + public static boolean generateAluminumBush; + public static boolean generateSilverBush; + + public static int copperuDensity; + public static int tinuDensity; + public static int aluminumuDensity; public static int netherDensity; + + public static int ironsRarity; + public static int goldsRarity; + public static int coppersRarity; + public static int tinsRarity; + public static int aluminumsRarity; + public static int cobaltsRarity; + + public static int ironbRarity; + public static int goldbRarity; + public static int copperbRarity; + public static int tinbRarity; + public static int aluminumbRarity; + public static int silverbRarity; + + public static int copperuHeight; + public static int copperuRange; + + public static int tinuHeight; + public static int tinuRange; + + public static int aluminumuHeight; + public static int aluminumuRange; + + public static int seaLevel; //Mobs public static boolean redCreeper; diff --git a/mods/tinker/tconstruct/TConstruct.java b/mods/tinker/tconstruct/TConstruct.java index 2537706d..8deeaebd 100644 --- a/mods/tinker/tconstruct/TConstruct.java +++ b/mods/tinker/tconstruct/TConstruct.java @@ -25,7 +25,7 @@ import cpw.mods.fml.common.registry.LanguageRegistry; * @dependencies: IC2 API, EBXL API */ -@Mod(modid = "TConstruct", name = "TConstruct", version = "1.5.1_1.2f2.1", dependencies = "required-after:Forge@[7.7.1.659,)") +@Mod(modid = "TConstruct", name = "TConstruct", version = "1.5.1_1.3pre.6", dependencies = "required-after:Forge@[7.7.1.659,)") @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 07473b3a..8cdc1c19 100644 --- a/mods/tinker/tconstruct/TContent.java +++ b/mods/tinker/tconstruct/TContent.java @@ -7,6 +7,7 @@ import mods.tinker.tconstruct.blocks.*; import mods.tinker.tconstruct.crafting.*; import mods.tinker.tconstruct.entity.*; import mods.tinker.tconstruct.items.*; +import mods.tinker.tconstruct.items.blocks.*; import mods.tinker.tconstruct.library.*; import mods.tinker.tconstruct.library.client.*; import mods.tinker.tconstruct.logic.*; @@ -17,6 +18,8 @@ import net.minecraft.block.Block; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.block.material.MaterialLiquid; +import net.minecraft.entity.EntityEggInfo; +import net.minecraft.entity.EntityList; import net.minecraft.entity.EnumCreatureType; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -93,7 +96,6 @@ public class TContent implements IFuelHandler public static Block smeltery; public static Block lavaTank; public static Block searedBlock; - public static Block oreSlag; public static Block metalBlock; //Decoration @@ -106,8 +108,13 @@ public class TContent implements IFuelHandler public static Block liquidMetalFlowing; public static Block liquidMetalStill; public static Material liquidMetal; - - //public static Block axle; + + //Ores + public static Block oreSlag; + public static Block oreGravel; + public static OreberryBush oreBerry; + public static OreberryBush oreBerrySecond; + public static Item oreBerries; //Tool modifiers public static ModElectric modE; @@ -146,8 +153,8 @@ public class TContent implements IFuelHandler void createEntities () { EntityRegistry.registerModEntity(FancyEntityItem.class, "Fancy Item", 0, TConstruct.instance, 32, 5, true); - EntityRegistry.registerModEntity(LaunchedPotion.class, "Launched Potion", 1, TConstruct.instance, 32, 3, true); - EntityRegistry.registerModEntity(GolemBase.class, "Golembase", 2, TConstruct.instance, 32, 5, true); + //EntityRegistry.registerModEntity(LaunchedPotion.class, "Launched Potion", 1, TConstruct.instance, 32, 3, true); + //EntityRegistry.registerModEntity(GolemBase.class, "Golembase", 2, TConstruct.instance, 32, 5, true); //EntityRegistry.registerModEntity(CartEntity.class, "Small Wagon", 1, TConstruct.instance, 32, 5, true); //EntityRegistry.registerModEntity(Crystal.class, "Crystal", 2, TConstruct.instance, 32, 5, true); @@ -156,6 +163,11 @@ public class TContent implements IFuelHandler EntityRegistry.registerModEntity(BlueSlime.class, "EdibleSlime", 12, TConstruct.instance, 64, 5, true); //EntityRegistry.registerModEntity(MetalSlime.class, "MetalSlime", 13, TConstruct.instance, 64, 5, true); + EntityList.IDtoClassMapping.put(7789011, NitroCreeper.class); + EntityList.entityEggs.put(Integer.valueOf(7789011), new EntityEggInfo(7789011, 0xff7050, 0x555555)); + EntityList.IDtoClassMapping.put(7789012, BlueSlime.class); + EntityList.entityEggs.put(Integer.valueOf(7789012), new EntityEggInfo(7789012, 0x9977ff, 0x004499)); + BiomeGenBase[] overworldBiomes = new BiomeGenBase[] { BiomeGenBase.ocean, BiomeGenBase.plains, BiomeGenBase.desert, BiomeGenBase.extremeHills, BiomeGenBase.forest, BiomeGenBase.taiga, BiomeGenBase.swampland, BiomeGenBase.river, BiomeGenBase.frozenOcean, BiomeGenBase.frozenRiver, BiomeGenBase.icePlains, BiomeGenBase.iceMountains, BiomeGenBase.beach, BiomeGenBase.desertHills, BiomeGenBase.forestHills, BiomeGenBase.taigaHills, BiomeGenBase.extremeHillsEdge, BiomeGenBase.jungle, BiomeGenBase.jungleHills }; @@ -208,16 +220,6 @@ public class TContent implements IFuelHandler GameRegistry.registerTileEntity(CastingTableLogic.class, "CastingTable"); GameRegistry.registerTileEntity(FaucetLogic.class, "Faucet"); - String[] oreTypes = new String[] { "nether_slag", "nether_cobalt", "nether_ardite", "ore_copper", "ore_tin", "ore_aluminum", "ore_slag" }; - oreSlag = new MetalOre(PHConstruct.oreSlag, Material.iron, 10.0F, oreTypes); - GameRegistry.registerBlock(oreSlag, MetalOreItemBlock.class, "SearedBrick"); - //MinecraftForge.setBlockHarvestLevel(oreSlag, 0, "pickaxe", 0); - MinecraftForge.setBlockHarvestLevel(oreSlag, 1, "pickaxe", 4); - MinecraftForge.setBlockHarvestLevel(oreSlag, 2, "pickaxe", 4); - MinecraftForge.setBlockHarvestLevel(oreSlag, 3, "pickaxe", 1); - MinecraftForge.setBlockHarvestLevel(oreSlag, 4, "pickaxe", 1); - MinecraftForge.setBlockHarvestLevel(oreSlag, 5, "pickaxe", 1); - //Traps /*landmine = new Landmine(PHConstruct.landmine, 0, EnumMobType.mobs, Material.cactus).setUnlocalizedName("landmine"); GameRegistry.registerBlock(landmine, "landmine");*/ @@ -234,6 +236,33 @@ public class TContent implements IFuelHandler stoneTorch = new StoneTorch(PHConstruct.stoneTorch).setUnlocalizedName("decoration.stonetorch"); GameRegistry.registerBlock(stoneTorch, "decoration.stonetorch"); + //Ores + String[] berryOres = new String[] { "berry_iron", "berry_gold", "berry_copper", "berry_tin", "berry_iron_ripe", "berry_gold_ripe", "berry_copper_ripe", "berry_tin_ripe" }; + oreBerry = (OreberryBush) new OreberryBush(PHConstruct.oreBerry, berryOres, 0, 4).setUnlocalizedName("ore.berries.one"); + GameRegistry.registerBlock(oreBerry, OreberryBushItem.class, "ore.berries.one"); + String[] berryOresTwo = new String[] { "berry_aluminum", "berry_silver", "", "", "berry_aluminum_ripe", "berry_silver_ripe", "", "" }; + oreBerrySecond = (OreberryBush) new OreberryBush(PHConstruct.oreBerrySecond, berryOresTwo, 4, 2).setUnlocalizedName("ore.berries.two"); + GameRegistry.registerBlock(oreBerrySecond, OreberryBushSecondItem.class, "ore.berries.two"); + + String[] oreTypes = new String[] { "nether_slag", "nether_cobalt", "nether_ardite", "ore_copper", "ore_tin", "ore_aluminum", "ore_slag" }; + oreSlag = new MetalOre(PHConstruct.oreSlag, Material.iron, 10.0F, oreTypes); + GameRegistry.registerBlock(oreSlag, MetalOreItemBlock .class, "SearedBrick"); + MinecraftForge.setBlockHarvestLevel(oreSlag, 1, "pickaxe", 4); + MinecraftForge.setBlockHarvestLevel(oreSlag, 2, "pickaxe", 4); + MinecraftForge.setBlockHarvestLevel(oreSlag, 3, "pickaxe", 1); + MinecraftForge.setBlockHarvestLevel(oreSlag, 4, "pickaxe", 1); + MinecraftForge.setBlockHarvestLevel(oreSlag, 5, "pickaxe", 1); + + oreGravel = new GravelOre(PHConstruct.oreGravel); + GameRegistry.registerBlock(oreGravel, GravelOreItem.class, "GravelOre"); + + MinecraftForge.setBlockHarvestLevel(oreGravel, 0, "shovel", 1); + MinecraftForge.setBlockHarvestLevel(oreGravel, 1, "shovel", 2); + MinecraftForge.setBlockHarvestLevel(oreGravel, 2, "shovel", 1); + MinecraftForge.setBlockHarvestLevel(oreGravel, 3, "shovel", 1); + MinecraftForge.setBlockHarvestLevel(oreGravel, 4, "shovel", 1); + MinecraftForge.setBlockHarvestLevel(oreGravel, 5, "shovel", 4); + /*redstoneBallRepeater = new RedstoneBallRepeater(PHConstruct.redstoneBallRepeater, false).setUnlocalizedName("decoration.redstoneballrepeater"); GameRegistry.registerBlock(redstoneBallRepeater, "decoration.redstoneballrepeater"); Item.itemsList[PHConstruct.redstoneBallRepeater] = null; @@ -259,10 +288,12 @@ public class TContent implements IFuelHandler 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", "BlueSlimeCrystal", "ObsidianIngot" }; + "CopperIngot", "TinIngot", "AluminumIngot", "RawAluminum", "BronzeIngot", "AlBrassIngot", "AlumiteIngot", "SteelIngot", "BlueSlimeCrystal", "ObsidianIngot", "IronNugget", + "CopperNugget", "TinNugget", "AluminumNugget", "SilverNugget" }; String[] craftingTextures = new String[] { "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", "material_blueslimecrystal", "material_obsidianingot" }; + "material_bronzeingot", "material_alubrassingot", "material_alumiteingot", "material_steelingot", "material_blueslimecrystal", "material_obsidianingot", + "material_nugget_iron", "material_nugget_copper", "material_nugget_tin", "material_nugget_aluminum", "material_nugget_silver" }; materials = new CraftingItem(PHConstruct.materials, craftingMaterials, craftingTextures, "materials/").setUnlocalizedName("tconstruct.Materials"); toolRod = new ToolPart(PHConstruct.toolRod, "ToolRod", "_rod").setUnlocalizedName("tconstruct.ToolRod"); @@ -302,6 +333,7 @@ public class TContent implements IFuelHandler signHead = new ToolPart(PHConstruct.signHead, "SignHead", "_battlesign_head").setUnlocalizedName("tconstruct.SignHead"); strangeFood = new StrangeFood(PHConstruct.slimefood).setUnlocalizedName("tconstruct.strangefood"); + oreBerries = new OreBerries(PHConstruct.oreChunks).setUnlocalizedName("oreberry"); //lumberHead = new ToolPart(PHConstruct.lumberHead, 0, broadheads).setUnlocalizedName("tconstruct.LumberHead"); Item.doorWood.setMaxStackSize(16); Item.doorIron.setMaxStackSize(16); @@ -578,7 +610,6 @@ public class TContent implements IFuelHandler Smeltery.addMelting(Block.blockIron, 0, 600, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 0)); Smeltery.addMelting(Block.blockGold, 0, 550, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 1)); Smeltery.addMelting(Block.obsidian, 0, 800, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 11)); - Smeltery.addMelting(Block.ice, 0, 75, new LiquidStack(Block.waterStill.blockID, 1000, 0)); //Alloys @@ -587,6 +618,13 @@ public class TContent implements IFuelHandler Smeltery.addAlloyMixing(new LiquidStack(liquidMetalStill.blockID, 1, 9), new LiquidStack(liquidMetalStill.blockID, 2, 5), new LiquidStack(liquidMetalStill.blockID, 2, 6)); //Manyullyn Smeltery.addAlloyMixing(new LiquidStack(liquidMetalStill.blockID, 3, 10), new LiquidStack(liquidMetalStill.blockID, 5, 4), new LiquidStack(liquidMetalStill.blockID, 2, 0), new LiquidStack( liquidMetalStill.blockID, 2, 11)); //Alumite + + //Oreberries + Smeltery.addMelting(new ItemStack(oreBerries, 4, 0), Block.blockIron.blockID, 0, 100, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue/9, 0)); //Iron + Smeltery.addMelting(new ItemStack(oreBerries, 4, 1), Block.blockGold.blockID, 0, 100, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue/9, 0)); //Gold + Smeltery.addMelting(new ItemStack(oreBerries, 4, 2), metalBlock.blockID, 3, 100, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue/9, 0)); //Copper + Smeltery.addMelting(new ItemStack(oreBerries, 4, 3), metalBlock.blockID, 5, 100, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue/9, 0)); //Tin + Smeltery.addMelting(new ItemStack(oreBerries, 4, 4), metalBlock.blockID, 6, 100, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue/9, 0)); //Aluminum } void addCraftingRecipes () @@ -606,6 +644,11 @@ public class TContent implements IFuelHandler GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blankPattern, 1, 0), "ps", "sp", 'p', "plankWood", 's', Item.stick)); GameRegistry.addRecipe(new ItemStack(manualBook), "wp", 'w', new ItemStack(blankPattern, 1, 0), 'p', Item.paper); + GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 2, 0), new ItemStack(manualBook, 1, 0), Item.book); + GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 1, 1), new ItemStack(manualBook, 1, 0)); + GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 2, 1), new ItemStack(manualBook, 1, 1), Item.book); + GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 1, 2), new ItemStack(manualBook, 1, 1)); + GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 2, 2), new ItemStack(manualBook, 1, 2), Item.book); GameRegistry.addRecipe(new ItemStack(materials, 1, 0), "pp", "pp", 'p', Item.paper); //Paper stack OreDictionary.registerOre("mossystone", new ItemStack(Block.stoneBrick, 1, 1)); @@ -625,11 +668,24 @@ public class TContent implements IFuelHandler FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 2, new ItemStack(materials, 1, 17), 2f); //Blue Slime //GameRegistry.addRecipe(new ItemStack(oreSlag, 1, 0), "pp", "pp", 'p', new ItemStack(materials, 1, 2)); //Seared brick block - FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 1, new ItemStack(materials, 1, 3), 3f); - FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 2, new ItemStack(materials, 1, 4), 3f); + //FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 1, new ItemStack(materials, 1, 3), 3f); + //FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 2, new ItemStack(materials, 1, 4), 3f); FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 3, new ItemStack(materials, 1, 9), 0.5f); FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 4, new ItemStack(materials, 1, 10), 0.5f); FurnaceRecipes.smelting().addSmelting(oreSlag.blockID, 5, new ItemStack(materials, 1, 12), 0.5f); + + FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 0, new ItemStack(materials, 1, 19), 0.2f); + FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 1, new ItemStack(Item.goldNugget), 0.2f); + FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 2, new ItemStack(materials, 1, 20), 0.2f); + FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 3, new ItemStack(materials, 1, 21), 0.2f); + FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 4, new ItemStack(materials, 1, 22), 0.2f); + FurnaceRecipes.smelting().addSmelting(oreBerries.itemID, 5, new ItemStack(materials, 1, 23), 0.2f); + + FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 0, new ItemStack(Item.ingotIron), 0.2f); + FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 1, new ItemStack(Item.ingotGold), 0.2f); + FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 2, new ItemStack(materials, 1, 9), 0.2f); + FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 3, new ItemStack(materials, 1, 10), 0.2f); + FurnaceRecipes.smelting().addSmelting(oreGravel.blockID, 4, new ItemStack(materials, 1, 12), 0.2f); //Smeltery ItemStack searedBrick = new ItemStack(materials, 1, 2); @@ -647,6 +703,10 @@ public class TContent implements IFuelHandler GameRegistry.addRecipe(new ItemStack(stoneTorch, 4), "p", "w", 'p', new ItemStack(Item.coal, 1, Short.MAX_VALUE), 'w', new ItemStack(toolRod, 1, 1)); GameRegistry.addRecipe(new ItemStack(toolRod, 4, 1), "c", "c", 'c', new ItemStack(Block.stone)); GameRegistry.addRecipe(new ItemStack(toolRod, 2, 1), "c", "c", 'c', new ItemStack(Block.cobblestone)); + + ItemStack aluBrass = new ItemStack(materials, 1, 14); + GameRegistry.addRecipe(new ItemStack(Item.pocketSundial), " i ", "iri", " i ", 'i', aluBrass, 'r', new ItemStack(Item.redstone)); + GameRegistry.addRecipe(new ItemStack(Block.pressurePlateGold), "ii", 'i', aluBrass); } void setupToolTabs () @@ -676,7 +736,12 @@ public class TContent implements IFuelHandler OreDictionary.registerOre("oreCopper", new ItemStack(oreSlag, 1, 3)); OreDictionary.registerOre("oreTin", new ItemStack(oreSlag, 1, 4)); OreDictionary.registerOre("oreNaturalAluminum", new ItemStack(oreSlag, 1, 5)); - + + OreDictionary.registerOre("oreCobalt", new ItemStack(oreGravel, 1, 5)); + OreDictionary.registerOre("oreCopper", new ItemStack(oreGravel, 1, 2)); + OreDictionary.registerOre("oreTin", new ItemStack(oreGravel, 1, 3)); + OreDictionary.registerOre("oreNaturalAluminum", new ItemStack(oreGravel, 1, 4)); + OreDictionary.registerOre("ingotCobalt", new ItemStack(materials, 1, 3)); OreDictionary.registerOre("ingotArdite", new ItemStack(materials, 1, 4)); OreDictionary.registerOre("ingotManyullyn", new ItemStack(materials, 1, 5)); @@ -699,6 +764,12 @@ public class TContent implements IFuelHandler OreDictionary.registerOre("blockAluminumBrass", new ItemStack(metalBlock, 1, 7)); OreDictionary.registerOre("blockAlumite", new ItemStack(metalBlock, 1, 8)); OreDictionary.registerOre("blockSteel", new ItemStack(metalBlock, 1, 9)); + + OreDictionary.registerOre("nuggetIron", new ItemStack(metalBlock, 1, 19)); + OreDictionary.registerOre("nuggetCopper", new ItemStack(metalBlock, 1, 20)); + OreDictionary.registerOre("nuggetTin", new ItemStack(metalBlock, 1, 21)); + OreDictionary.registerOre("nuggetNaturalAluminum", new ItemStack(metalBlock, 1, 22)); + OreDictionary.registerOre("nuggetSilver", new ItemStack(metalBlock, 1, 23)); String[] names = new String[] { "Iron", "Gold", "Copper", "Tin", "Aluminum", "Cobalt", "Ardite", "Bronze", "Brass", "Manyullyn", "Alumite", "Obsidian", "Steel" }; liquidIcons = new LiquidStack[names.length]; diff --git a/mods/tinker/tconstruct/TEventHandler.java b/mods/tinker/tconstruct/TEventHandler.java index 5ce42d59..7c76e449 100644 --- a/mods/tinker/tconstruct/TEventHandler.java +++ b/mods/tinker/tconstruct/TEventHandler.java @@ -5,8 +5,10 @@ import java.util.Random; import mods.tinker.tconstruct.crafting.PatternBuilder; import mods.tinker.tconstruct.crafting.Smeltery; +import mods.tinker.tconstruct.crafting.ToolBuilder; import mods.tinker.tconstruct.entity.NitroCreeper; import mods.tinker.tconstruct.logic.LiquidTextureLogic; +import mods.tinker.tconstruct.modifiers.ModAttack; import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.passive.EntityCow; import net.minecraft.item.Item; @@ -53,6 +55,7 @@ public class TEventHandler for (int i = 0; i < TContent.liquidIcons.length; i++) { TContent.liquidIcons[i].setRenderingIcon(TContent.liquidMetalStill.getIcon(0, i)); + TContent.liquidIcons[i].canonical().setRenderingIcon(TContent.liquidMetalStill.getIcon(0, i)); } } @@ -106,68 +109,78 @@ public class TEventHandler { PatternBuilder.instance.registerMaterial(evt.Ore, 2, "Wood"); } + + else if (evt.Name == "crystalQuartz") + { + ToolBuilder.instance.registerToolMod(new ModAttack("Quartz", new ItemStack[] { evt.Ore }, 11, 16)); + } + + else if (evt.Name == "crystalCerusQuartz") + { + ToolBuilder.instance.registerToolMod(new ModAttack("Quartz", new ItemStack[] { evt.Ore }, 11, 72)); + } //Ingots else if (evt.Name == "ingotCopper") { PatternBuilder.instance.registerMaterial(evt.Ore, 2, "Copper"); - Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 4, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 3, 450, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 2)); + Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 2, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 3, 450, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 2)); } else if (evt.Name == "ingotTin") { - Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 4, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 5, 175, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 3)); + Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 2, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 5, 175, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 3)); } else if (evt.Name == "ingotBronze") { PatternBuilder.instance.registerMaterial(evt.Ore, 2, "Bronze"); - Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 4, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 4, 500, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 7)); + Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 2, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 4, 500, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 7)); } else if (evt.Name == "ingotCobalt") { PatternBuilder.instance.registerMaterial(evt.Ore, 2, "Cobalt"); - Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 4, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 0, 650, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 5)); + Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 2, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 0, 650, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 5)); } else if (evt.Name == "ingotArdite") { PatternBuilder.instance.registerMaterial(evt.Ore, 2, "Ardite"); - Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 4, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 1, 650, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 6)); + Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 2, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 1, 650, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 6)); } else if (evt.Name == "ingotManyullyn") { PatternBuilder.instance.registerMaterial(evt.Ore, 2, "Manyullyn"); - Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 4, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 2, 750, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 9)); + Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 2, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 2, 750, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 9)); } else if (evt.Name == "ingotNaturalAluminum") { - Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 4, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 6, 250, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 4)); + Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 2, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 6, 250, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 4)); } else if (evt.Name == "naturalAluminum") { - Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 4, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 6, 250, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 4)); + Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 2, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 6, 250, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 4)); } else if (evt.Name == "ingotAluminumBrass") { - Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 4, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 7, 350, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 8)); + Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 2, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 7, 350, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 8)); } else if (evt.Name == "ingotAlumite") { PatternBuilder.instance.registerMaterial(evt.Ore, 2, "Alumite"); - Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 4, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 8, 500, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 10)); + Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 2, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 8, 500, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 10)); } else if (evt.Name == "ingotSteel") { PatternBuilder.instance.registerMaterial(evt.Ore, 2, "Steel"); - Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 4, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 9, 500, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 12)); + Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 2, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 9, 500, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 12)); } //Ores @@ -250,57 +263,57 @@ public class TEventHandler //Dust else if (evt.Name == "dustCopper") { - Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 4, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 3, 450, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 2)); + Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 2, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 3, 450, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 2)); } else if (evt.Name == "dustTin") { - Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 4, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 5, 175, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 3)); + Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 2, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 5, 175, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 3)); } else if (evt.Name == "dustBronze") { - Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 4, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 4, 500, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 7)); + Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 2, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 4, 500, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 7)); } else if (evt.Name == "dustCobalt") { - Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 4, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 0, 650, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 5)); + Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 2, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 0, 650, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 5)); } else if (evt.Name == "dustArdite") { - Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 4, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 1, 650, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 6)); + Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 2, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 1, 650, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 6)); } else if (evt.Name == "dustManyullyn") { - Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 4, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 2, 750, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 9)); + Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 2, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 2, 750, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 9)); } else if (evt.Name == "dustAluminum") { - Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 4, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 6, 250, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 4)); + Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 2, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 6, 250, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 4)); } else if (evt.Name == "dustNaturalAluminum") { - Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 4, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 6, 250, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 4)); + Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 2, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 6, 250, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 4)); } else if (evt.Name == "dustAluminumBrass") { - Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 4, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 7, 350, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 8)); + Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 2, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 7, 350, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 8)); } else if (evt.Name == "dustAlumite") { - Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 4, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 8, 500, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 10)); + Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 2, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 8, 500, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 10)); } else if (evt.Name == "dustSteel") { - Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 4, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 9, 500, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 12)); + Smeltery.addMelting(new ItemStack(evt.Ore.itemID, 2, evt.Ore.getItemDamage()), TContent.metalBlock.blockID, 9, 500, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 12)); } } @@ -310,73 +323,73 @@ public class TEventHandler for (ItemStack ore : ores) { PatternBuilder.instance.registerMaterial(ore, 2, "Copper"); - Smeltery.addMelting(new ItemStack(ore.itemID, 4, ore.getItemDamage()), TContent.metalBlock.blockID, 3, 450, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 2)); + Smeltery.addMelting(new ItemStack(ore.itemID, 2, ore.getItemDamage()), TContent.metalBlock.blockID, 3, 450, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 2)); } ores = OreDictionary.getOres("ingotTin"); for (ItemStack ore : ores) { - Smeltery.addMelting(new ItemStack(ore.itemID, 4, ore.getItemDamage()), TContent.metalBlock.blockID, 5, 175, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 3)); + Smeltery.addMelting(new ItemStack(ore.itemID, 2, ore.getItemDamage()), TContent.metalBlock.blockID, 5, 175, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 3)); } ores = OreDictionary.getOres("ingotBronze"); for (ItemStack ore : ores) { PatternBuilder.instance.registerMaterial(ore, 2, "Bronze"); - Smeltery.addMelting(new ItemStack(ore.itemID, 4, ore.getItemDamage()), TContent.metalBlock.blockID, 4, 500, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 7)); + Smeltery.addMelting(new ItemStack(ore.itemID, 2, ore.getItemDamage()), TContent.metalBlock.blockID, 4, 500, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 7)); } ores = OreDictionary.getOres("ingotCobalt"); for (ItemStack ore : ores) { PatternBuilder.instance.registerMaterial(ore, 2, "Cobalt"); - Smeltery.addMelting(new ItemStack(ore.itemID, 4, ore.getItemDamage()), TContent.metalBlock.blockID, 0, 650, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 5)); + Smeltery.addMelting(new ItemStack(ore.itemID, 2, ore.getItemDamage()), TContent.metalBlock.blockID, 0, 650, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 5)); } ores = OreDictionary.getOres("ingotArdite"); for (ItemStack ore : ores) { PatternBuilder.instance.registerMaterial(ore, 2, "Ardite"); - Smeltery.addMelting(new ItemStack(ore.itemID, 4, ore.getItemDamage()), TContent.metalBlock.blockID, 1, 650, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 6)); + Smeltery.addMelting(new ItemStack(ore.itemID, 2, ore.getItemDamage()), TContent.metalBlock.blockID, 1, 650, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 6)); } ores = OreDictionary.getOres("ingotManyullyn"); for (ItemStack ore : ores) { PatternBuilder.instance.registerMaterial(ore, 2, "Manyullyn"); - Smeltery.addMelting(new ItemStack(ore.itemID, 4, ore.getItemDamage()), TContent.metalBlock.blockID, 2, 750, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 9)); + Smeltery.addMelting(new ItemStack(ore.itemID, 2, ore.getItemDamage()), TContent.metalBlock.blockID, 2, 750, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 9)); } ores = OreDictionary.getOres("naturalAluminum"); for (ItemStack ore : ores) { - Smeltery.addMelting(new ItemStack(ore.itemID, 4, ore.getItemDamage()), TContent.metalBlock.blockID, 6, 250, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 4)); + Smeltery.addMelting(new ItemStack(ore.itemID, 2, ore.getItemDamage()), TContent.metalBlock.blockID, 6, 250, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 4)); } ores = OreDictionary.getOres("ingotNaturalAluminum"); for (ItemStack ore : ores) { - Smeltery.addMelting(new ItemStack(ore.itemID, 4, ore.getItemDamage()), TContent.metalBlock.blockID, 6, 250, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 4)); + Smeltery.addMelting(new ItemStack(ore.itemID, 2, ore.getItemDamage()), TContent.metalBlock.blockID, 6, 250, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 4)); } ores = OreDictionary.getOres("ingotAluminumBrass"); for (ItemStack ore : ores) { - Smeltery.addMelting(new ItemStack(ore.itemID, 4, ore.getItemDamage()), TContent.metalBlock.blockID, 7, 350, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 8)); + Smeltery.addMelting(new ItemStack(ore.itemID, 2, ore.getItemDamage()), TContent.metalBlock.blockID, 7, 350, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 8)); } ores = OreDictionary.getOres("ingotAlumite"); for (ItemStack ore : ores) { PatternBuilder.instance.registerMaterial(ore, 2, "Alumite"); - Smeltery.addMelting(new ItemStack(ore.itemID, 4, ore.getItemDamage()), TContent.metalBlock.blockID, 8, 500, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 10)); + Smeltery.addMelting(new ItemStack(ore.itemID, 2, ore.getItemDamage()), TContent.metalBlock.blockID, 8, 500, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 10)); } ores = OreDictionary.getOres("ingotSteel"); for (ItemStack ore : ores) { PatternBuilder.instance.registerMaterial(ore, 2, "Steel"); - Smeltery.addMelting(new ItemStack(ore.itemID, 4, ore.getItemDamage()), TContent.metalBlock.blockID, 9, 500, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 12)); + Smeltery.addMelting(new ItemStack(ore.itemID, 2, ore.getItemDamage()), TContent.metalBlock.blockID, 9, 500, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 12)); } ores = OreDictionary.getOres("oreCopper"); @@ -472,62 +485,86 @@ public class TEventHandler ores = OreDictionary.getOres("dustCopper"); for (ItemStack ore : ores) { - Smeltery.addMelting(new ItemStack(ore.itemID, 4, ore.getItemDamage()), TContent.metalBlock.blockID, 3, 450, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 2)); + Smeltery.addMelting(new ItemStack(ore.itemID, 2, ore.getItemDamage()), TContent.metalBlock.blockID, 3, 450, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 2)); } ores = OreDictionary.getOres("dustTin"); for (ItemStack ore : ores) { - Smeltery.addMelting(new ItemStack(ore.itemID, 4, ore.getItemDamage()), TContent.metalBlock.blockID, 5, 175, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 3)); + Smeltery.addMelting(new ItemStack(ore.itemID, 2, ore.getItemDamage()), TContent.metalBlock.blockID, 5, 175, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 3)); } ores = OreDictionary.getOres("dustBronze"); for (ItemStack ore : ores) { - Smeltery.addMelting(new ItemStack(ore.itemID, 4, ore.getItemDamage()), TContent.metalBlock.blockID, 4, 500, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 7)); + Smeltery.addMelting(new ItemStack(ore.itemID, 2, ore.getItemDamage()), TContent.metalBlock.blockID, 4, 500, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 7)); } ores = OreDictionary.getOres("dustCobalt"); for (ItemStack ore : ores) { - Smeltery.addMelting(new ItemStack(ore.itemID, 4, ore.getItemDamage()), TContent.metalBlock.blockID, 0, 650, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 5)); + Smeltery.addMelting(new ItemStack(ore.itemID, 2, ore.getItemDamage()), TContent.metalBlock.blockID, 0, 650, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 5)); } ores = OreDictionary.getOres("dustArdite"); for (ItemStack ore : ores) { - Smeltery.addMelting(new ItemStack(ore.itemID, 4, ore.getItemDamage()), TContent.metalBlock.blockID, 1, 650, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 6)); + Smeltery.addMelting(new ItemStack(ore.itemID, 2, ore.getItemDamage()), TContent.metalBlock.blockID, 1, 650, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 6)); } ores = OreDictionary.getOres("dustManyullyn"); for (ItemStack ore : ores) { - Smeltery.addMelting(new ItemStack(ore.itemID, 4, ore.getItemDamage()), TContent.metalBlock.blockID, 2, 750, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 9)); + Smeltery.addMelting(new ItemStack(ore.itemID, 2, ore.getItemDamage()), TContent.metalBlock.blockID, 2, 750, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 9)); } ores = OreDictionary.getOres("dustNaturalAluminum"); for (ItemStack ore : ores) { - Smeltery.addMelting(new ItemStack(ore.itemID, 4, ore.getItemDamage()), TContent.metalBlock.blockID, 6, 250, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 4)); + Smeltery.addMelting(new ItemStack(ore.itemID, 2, ore.getItemDamage()), TContent.metalBlock.blockID, 6, 250, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 4)); } ores = OreDictionary.getOres("dustAluminumBrass"); for (ItemStack ore : ores) { - Smeltery.addMelting(new ItemStack(ore.itemID, 4, ore.getItemDamage()), TContent.metalBlock.blockID, 7, 350, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 8)); + Smeltery.addMelting(new ItemStack(ore.itemID, 2, ore.getItemDamage()), TContent.metalBlock.blockID, 7, 350, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 8)); } ores = OreDictionary.getOres("dustAlumite"); for (ItemStack ore : ores) { - Smeltery.addMelting(new ItemStack(ore.itemID, 4, ore.getItemDamage()), TContent.metalBlock.blockID, 8, 500, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 10)); + Smeltery.addMelting(new ItemStack(ore.itemID, 2, ore.getItemDamage()), TContent.metalBlock.blockID, 8, 500, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 10)); } ores = OreDictionary.getOres("dustSteel"); for (ItemStack ore : ores) { - Smeltery.addMelting(new ItemStack(ore.itemID, 4, ore.getItemDamage()), TContent.metalBlock.blockID, 9, 500, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 12)); + Smeltery.addMelting(new ItemStack(ore.itemID, 2, ore.getItemDamage()), TContent.metalBlock.blockID, 9, 500, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 12)); } + + ores = OreDictionary.getOres("nuggetIron"); + for (ItemStack ore : ores) + { + Smeltery.addMelting(new ItemStack(ore.itemID, 2, ore.getItemDamage()), TContent.metalBlock.blockID, 3, 450, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue/9, 2)); + } + + ores = OreDictionary.getOres("nuggetCopper"); + for (ItemStack ore : ores) + { + Smeltery.addMelting(new ItemStack(ore.itemID, 2, ore.getItemDamage()), TContent.metalBlock.blockID, 3, 450, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue/9, 2)); + } + + ores = OreDictionary.getOres("nuggetTin"); + for (ItemStack ore : ores) + { + Smeltery.addMelting(new ItemStack(ore.itemID, 2, ore.getItemDamage()), TContent.metalBlock.blockID, 5, 175, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue/9, 3)); + } + + ores = OreDictionary.getOres("nuggetNaturalAluminum"); + for (ItemStack ore : ores) + { + Smeltery.addMelting(new ItemStack(ore.itemID, 2, ore.getItemDamage()), TContent.metalBlock.blockID, 6, 250, new LiquidStack(TContent.liquidMetalStill.blockID, TConstruct.ingotLiquidValue/9, 4)); + } } @ForgeSubscribe diff --git a/mods/tinker/tconstruct/TProxyCommon.java b/mods/tinker/tconstruct/TProxyCommon.java index 195e8c2f..65cf6b26 100644 --- a/mods/tinker/tconstruct/TProxyCommon.java +++ b/mods/tinker/tconstruct/TProxyCommon.java @@ -109,10 +109,12 @@ public class TProxyCommon "Slime Crystal Fragment", "Paper", "Cobalt Chunk", "Ardite Chunk", "Manyullyn Chunk", "Copper Chunk", "Bronze Chunk", "Alumite Chunk", "Steel Chunk", "Slime Crystal Fragment" }; public static final String[] materialItemInternalNames = new String[] { "PaperStack", "SlimeCrystal", "SearedBrick", "CobaltIngot", "ArditeIngot", "ManyullynIngot", "Mossball", "LavaCrystal", - "NecroticBone", "CopperIngot", "TinIngot", "AluminumIngot", "RawAluminum", "BronzeIngot", "AlBrassIngot", "AlumiteIngot", "SteelIngot", "BlueSlimeCrystal", "ObsidianIngot" }; + "NecroticBone", "CopperIngot", "TinIngot", "AluminumIngot", "RawAluminum", "BronzeIngot", "AlBrassIngot", "AlumiteIngot", "SteelIngot", "BlueSlimeCrystal", "ObsidianIngot", "IronNugget", + "CopperNugget", "TinNugget", "AluminumNugget", "SilverNugget" }; public static final String[] materialItemNames = new String[] { "Paper Stack", "Slime Crystal", "Seared Brick", "Cobalt Ingot", "Ardite Ingot", "Manyullyn Ingot", "Ball of Moss", "Lava Crystal", - "Necrotic Bone", "Copper Ingot", "Tin Ingot", "Aluminum Ingot", "Raw Aluminum", "Bronze Ingot", "Aluminum Brass Ingot", "Alumite Ingot", "Steel Ingot", "Slime Crystal", "Obsidian Ingot" }; + "Necrotic Bone", "Copper Ingot", "Tin Ingot", "Aluminum Ingot", "Raw Aluminum", "Bronze Ingot", "Aluminum Brass Ingot", "Alumite Ingot", "Steel Ingot", "Slime Crystal", "Obsidian Ingot", "Iron Nugget", + "Copper Nugget", "Tin Nugget", "Aluminum Nugget", "Silver Nugget" }; public static final String[] toolMaterialNames = new String[] { "Wood", "Stone", "Iron", "Flint", "Cactus", "Bone", "Obsidian", "Netherrack", "Slime", "Paper", "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze", "Alumite", "Steel", "Blue Slime" }; diff --git a/mods/tinker/tconstruct/blocks/GravelOre.java b/mods/tinker/tconstruct/blocks/GravelOre.java new file mode 100644 index 00000000..869f3123 --- /dev/null +++ b/mods/tinker/tconstruct/blocks/GravelOre.java @@ -0,0 +1,66 @@ +package mods.tinker.tconstruct.blocks; + +import java.util.List; + +import mods.tinker.tconstruct.library.TConstructRegistry; +import net.minecraft.block.BlockSand; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraft.world.World; + +public class GravelOre extends BlockSand +{ + public String[] textureNames = new String[] { "iron", "gold", "copper", "tin", "aluminum", "cobalt" }; + public Icon[] icons; + + public GravelOre(int id) + { + super(id); + this.setCreativeTab(TConstructRegistry.blockTab); + this.setStepSound(soundGravelFootstep); + } + + public void registerIcons(IconRegister iconRegister) + { + this.icons = new Icon[textureNames.length]; + + for (int i = 0; i < this.icons.length; ++i) + { + this.icons[i] = iconRegister.registerIcon("tinker:ore_"+textureNames[i]+"_gravel"); + } + } + + @Override + public Icon getIcon (int side, int meta) + { + return icons[meta]; + } + + + public float getBlockHardness (World world, int x, int y, int z) + { + int meta = world.getBlockMetadata(x, y, z); + if (meta == 5) + return 12f; + else + return 5f; + } + + @Override + public int damageDropped (int meta) + { + return meta; + } + + @Override + public void getSubBlocks (int id, CreativeTabs tab, List list) + { + for (int iter = 0; iter < 6; iter++) + { + list.add(new ItemStack(id, 1, iter)); + } + } +} diff --git a/mods/tinker/tconstruct/blocks/MetalOre.java b/mods/tinker/tconstruct/blocks/MetalOre.java index d5787e1b..a9ec18d9 100644 --- a/mods/tinker/tconstruct/blocks/MetalOre.java +++ b/mods/tinker/tconstruct/blocks/MetalOre.java @@ -1,6 +1,10 @@ package mods.tinker.tconstruct.blocks; +import java.util.List; + import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; import net.minecraft.world.World; public class MetalOre extends TConstructBlock @@ -19,4 +23,13 @@ public class MetalOre extends TConstructBlock return 3f; //return this.blockHardness; } + + @Override + public void getSubBlocks (int id, CreativeTabs tab, List list) + { + for (int iter = 1; iter < 6; iter++) + { + list.add(new ItemStack(id, 1, iter)); + } + } } diff --git a/mods/tinker/tconstruct/blocks/OreberryBush.java b/mods/tinker/tconstruct/blocks/OreberryBush.java new file mode 100644 index 00000000..0991765a --- /dev/null +++ b/mods/tinker/tconstruct/blocks/OreberryBush.java @@ -0,0 +1,328 @@ +package mods.tinker.tconstruct.blocks; + +import java.util.List; +import java.util.Random; + +import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.client.blockrender.OreberryRender; +import mods.tinker.tconstruct.library.TConstructRegistry; +import net.minecraft.block.Block; +import net.minecraft.block.BlockLeavesBase; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.Icon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.EnumPlantType; +import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.IPlantable; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class OreberryBush extends BlockLeavesBase implements IPlantable +{ + Random random; + public Icon[] fastIcons; + public Icon[] fancyIcons; + public String[] textureNames; + public int itemMeat; + private int subitems; + + public OreberryBush(int id, String[] textureNames, int meta, int sub) + { + super(id, Material.leaves, false); + this.textureNames = textureNames; + this.itemMeat = meta; + this.subitems = sub; + this.setTickRandomly(true); + random = new Random(); + this.setHardness(0.3F); + this.setStepSound(Block.soundMetalFootstep); + this.setCreativeTab(TConstructRegistry.blockTab); + } + + /* Berries show up at meta 12-15 */ + + @SideOnly(Side.CLIENT) + @Override + public void registerIcons (IconRegister iconRegister) + { + this.fastIcons = new Icon[textureNames.length]; + this.fancyIcons = new Icon[textureNames.length]; + + for (int i = 0; i < this.fastIcons.length; i++) + { + this.fastIcons[i] = iconRegister.registerIcon("tinker:berries/" + textureNames[i] + "_fast"); + this.fancyIcons[i] = iconRegister.registerIcon("tinker:berries/" + textureNames[i] + "_fancy"); + } + } + + @Override + public Icon getIcon (int side, int metadata) + { + if (graphicsLevel) + { + if (metadata < 12) + { + return fancyIcons[metadata % 4]; + } + else + { + return fancyIcons[metadata % 4 + 4]; + } + } + else + { + if (metadata < 12) + { + return fastIcons[metadata % 4]; + } + else + { + return fastIcons[metadata % 4 + 4]; + } + } + } + + /* Bushes are stored by size then type */ + @Override + public int damageDropped (int metadata) + { + return metadata % 4; + } + + /* The following methods define a berry bush's size depending on metadata */ + @Override + public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z) + { + int l = world.getBlockMetadata(x, y, z); + if (l < 4) + { + return AxisAlignedBB.getBoundingBox((double) x + 0.25D, y, (double) z + 0.25D, (double) x + 0.75D, (double) y + 0.5D, (double) z + 0.75D); + } + else if (l < 8) + { + return AxisAlignedBB.getBoundingBox((double) x + 0.125D, y, (double) z + 0.125D, (double) x + 0.875D, (double) y + 0.75D, (double) z + 0.875D); + } + else + { + return AxisAlignedBB.getBoundingBox(x, y, z, (double) x + 1.0D, (double) y + 1.0D, (double) z + 1.0D); + } + } + + public AxisAlignedBB getSelectedBoundingBoxFromPool (World world, int x, int y, int z) + { + int l = world.getBlockMetadata(x, y, z); + if (l < 4) + { + return AxisAlignedBB.getBoundingBox((double) x + 0.25D, y, (double) z + 0.25D, (double) x + 0.75D, (double) y + 0.5D, (double) z + 0.75D); + } + else if (l < 8) + { + return AxisAlignedBB.getBoundingBox((double) x + 0.125D, y, (double) z + 0.125D, (double) x + 0.875D, (double) y + 0.75D, (double) z + 0.875D); + } + else + { + return AxisAlignedBB.getBoundingBox(x, y, z, (double) x + 1.0D, (double) y + 1.0D, (double) z + 1.0D); + } + } + + @Override + public void setBlockBoundsBasedOnState (IBlockAccess iblockaccess, int x, int y, int z) + { + int md = iblockaccess.getBlockMetadata(x, y, z); + + float minX; + float minY = 0F; + float minZ; + float maxX; + float maxY; + float maxZ; + + if (md < 4) + { + minX = minZ = 0.25F; + maxX = maxZ = 0.75F; + maxY = 0.5F; + } + else + + if (md < 8) + { + minX = minZ = 0.125F; + maxX = maxZ = 0.875F; + maxY = 0.75F; + } + + else + { + minX = minZ = 0.0F; + maxX = maxZ = 1.0F; + maxY = 1.0F; + } + setBlockBounds(minX, minY, minZ, maxX, maxY, maxZ); + } + + /* Left-click harvests berries */ + @Override + public void onBlockClicked (World world, int x, int y, int z, EntityPlayer player) + { + if (!world.isRemote) + { + int meta = world.getBlockMetadata(x, y, z); + if (meta >= 12) + { + world.setBlock(x, y, z, blockID, meta - 4, 3); + EntityItem entityitem = new EntityItem(world, player.posX, player.posY - 1.0D, player.posZ, new ItemStack(TContent.oreBerries, 1, meta % 4 + itemMeat)); + world.spawnEntityInWorld(entityitem); + entityitem.onCollideWithPlayer(player); + } + } + } + + /* Right-click harvests berries */ + @Override + public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) + { + /*if (world.isRemote) + return false;*/ + + int meta = world.getBlockMetadata(x, y, z); + if (meta >= 12) + { + if (world.isRemote) + return true; + + world.setBlock(x, y, z, blockID, meta - 4, 3); + EntityItem entityitem = new EntityItem(world, player.posX, player.posY - 1.0D, player.posZ, new ItemStack(TContent.oreBerries, 1, meta % 4 + itemMeat)); + world.spawnEntityInWorld(entityitem); + entityitem.onCollideWithPlayer(player); + return true; + } + + return false; + } + + /* Render logic */ + + @Override + public boolean isOpaqueCube () + { + return false; + } + + public void setGraphicsLevel (boolean flag) + { + graphicsLevel = flag; + } + + @Override + public boolean renderAsNormalBlock () + { + return false; + } + + public int getRenderType () + { + return OreberryRender.model; + } + + public boolean shouldSideBeRendered (IBlockAccess iblockaccess, int x, int y, int z, int meta) + { + if (meta > 7 || graphicsLevel) + { + return super.shouldSideBeRendered(iblockaccess, x, y, z, meta); + } + else + { + return true; + } + } + + /* Bush growth */ + + @Override + public void updateTick (World world, int x, int y, int z, Random random1) + { + if (world.isRemote) + { + return; + } + + int height; + + for (height = 1; world.getBlockId(x, y - height, z) == this.blockID; ++height) + { + ; + } + + if (random1.nextInt(20) == 0 && world.getBlockLightValue(x, y, z) >= 8) + { + int md = world.getBlockMetadata(x, y, z); + if (md < 12) + { + world.setBlock(x, y, z, blockID, md + 4, 3); + } + /*if (random1.nextInt(3) == 0 && height < 3 && world.getBlockId(x, y + 1, z) == 0 && md >= 8) + { + world.setBlock(x, y + 1, z, blockID, md % 4, 3); + }*/ + } + } + + /* Resistance to fire */ + + @Override + public int getFlammability (IBlockAccess world, int x, int y, int z, int metadata, ForgeDirection face) + { + return 0; + } + + @Override + public boolean isFlammable (IBlockAccess world, int x, int y, int z, int metadata, ForgeDirection face) + { + return false; + } + + @Override + public int getFireSpreadSpeed (World world, int x, int y, int z, int metadata, ForgeDirection face) + { + return 0; + } + + /** + * returns a list of items with the same ID, but different meta (eg: dye returns 16 items) + */ + @SideOnly(Side.CLIENT) + @Override + public void getSubBlocks (int par1, CreativeTabs par2CreativeTabs, List par3List) + { + for (int var4 = 12; var4 < 12+subitems; ++var4) + { + par3List.add(new ItemStack(par1, 1, var4)); + } + } + + @Override + public EnumPlantType getPlantType (World world, int x, int y, int z) + { + return EnumPlantType.Cave; + } + + @Override + public int getPlantID (World world, int x, int y, int z) + { + return this.blockID; + } + + @Override + public int getPlantMetadata (World world, int x, int y, int z) + { + return world.getBlockMetadata(x, y, z) - 4; + } +} diff --git a/mods/tinker/tconstruct/client/TProxyClient.java b/mods/tinker/tconstruct/client/TProxyClient.java index 810548f7..16ca2ad5 100644 --- a/mods/tinker/tconstruct/client/TProxyClient.java +++ b/mods/tinker/tconstruct/client/TProxyClient.java @@ -65,6 +65,7 @@ public class TProxyClient extends TProxyCommon RenderingRegistry.registerBlockHandler(new SearedRender()); RenderingRegistry.registerBlockHandler(new FluidRender()); RenderingRegistry.registerBlockHandler(new GolemCoreRender()); + RenderingRegistry.registerBlockHandler(new OreberryRender()); //RenderingRegistry.registerBlockHandler(new BallRepeaterRender()); //Tools diff --git a/mods/tinker/tconstruct/client/blockrender/OreberryRender.java b/mods/tinker/tconstruct/client/blockrender/OreberryRender.java new file mode 100644 index 00000000..5bf5dac9 --- /dev/null +++ b/mods/tinker/tconstruct/client/blockrender/OreberryRender.java @@ -0,0 +1,109 @@ +package mods.tinker.tconstruct.client.blockrender; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.world.IBlockAccess; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; + +public class OreberryRender implements ISimpleBlockRenderingHandler +{ + public static int model = RenderingRegistry.getNextAvailableRenderId(); + + @Override + public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) + { + + if (modelId == model) + { + int md = world.getBlockMetadata(x, y, z); + if (md < 4) + { + renderer.setRenderBounds(0.25F, 0.0F, 0.25F, 0.75F, 0.5F, 0.75F); + renderer.renderStandardBlock(block, x, y, z); + } + else if (md < 8) + { + renderer.setRenderBounds(0.125F, 0.0F, 0.125F, 0.875F, 0.75F, 0.875F); + renderer.renderStandardBlock(block, x, y, z); + } + else + { + renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + renderer.renderStandardBlock(block, x, y, z); + } + } + return true; + } + + @Override + public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer) + { + if (modelID == model) + { + Tessellator tessellator = Tessellator.instance; + if (metadata < 4) + { + renderer.setRenderBounds(0.25F, 0.0F, 0.25F, 0.75F, 0.5F, 0.75F); + renderInvBlock(renderer, block, metadata); + } + else if (metadata < 8) + { + renderer.setRenderBounds(0.125F, 0.0F, 0.125F, 0.875F, 0.75F, 0.875F); + renderInvBlock(renderer, block, metadata); + } + else + { + renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + renderInvBlock(renderer, block, metadata); + } + } + } + + @Override + public boolean shouldRender3DInInventory () + { + return true; + } + + @Override + public int getRenderId () + { + return model; + } + + private void renderInvBlock (RenderBlocks renderblocks, Block block, int meta) + { + Tessellator tessellator = Tessellator.instance; + GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, -1F, 0.0F); + renderblocks.renderBottomFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 1.0F, 0.0F); + renderblocks.renderTopFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 0.0F, -1F); + renderblocks.renderEastFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 0.0F, 1.0F); + renderblocks.renderWestFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(-1F, 0.0F, 0.0F); + renderblocks.renderNorthFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(1.0F, 0.0F, 0.0F); + renderblocks.renderSouthFace(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta)); + tessellator.draw(); + GL11.glTranslatef(0.5F, 0.5F, 0.5F); + } +} diff --git a/mods/tinker/tconstruct/container/ArmorExtended.java b/mods/tinker/tconstruct/container/ArmorExtended.java new file mode 100644 index 00000000..05b7313e --- /dev/null +++ b/mods/tinker/tconstruct/container/ArmorExtended.java @@ -0,0 +1,90 @@ +package mods.tinker.tconstruct.container; + +import mods.tinker.common.IPattern; +import mods.tinker.tconstruct.player.TPlayerStats; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public class ArmorExtended extends ActiveContainer +{ + public InventoryPlayer invPlayer; + public TPlayerStats armor; + + public ArmorExtended(InventoryPlayer inventoryplayer, TPlayerStats partLogic) + { + invPlayer = inventoryplayer; + armor = partLogic; + + /*inventory = new Slot[] { new SlotPattern(partLogic, 0, 40, 27), new SlotPattern(partLogic, 1, 40, 45), new Slot(partLogic, 2, 58, 27), new Slot(partLogic, 3, 58, 45), + new SlotOnlyTake(partLogic, 4, 102, 27), new SlotOnlyTake(partLogic, 5, 120, 27), new SlotOnlyTake(partLogic, 6, 102, 45), new SlotOnlyTake(partLogic, 7, 120, 45) }; + for (int iter = 0; iter < inventory.length; iter ++) + this.addSlotToContainer(inventory[iter]);*/ + + /* Player inventory */ + /*for (int armor = 0; armor < 4; ++armor) + { + this.addSlotToContainer(new SlotArmor(this, par1InventoryPlayer, par1InventoryPlayer.getSizeInventory() - 1 - armor, 8, 8 + armor * 18, armor)); + }*/ + + for (int column = 0; column < 3; column++) + { + for (int row = 0; row < 9; row++) + { + this.addSlotToContainer(new Slot(inventoryplayer, row + column * 9 + 9, 8 + row * 18, 84 + column * 18)); + } + } + + for (int column = 0; column < 9; column++) + { + this.addSlotToContainer(new Slot(inventoryplayer, column, 8 + column * 18, 142)); + } + + } + + @Override + public boolean canInteractWith(EntityPlayer var1) + { + return true; + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int slotID) + { + ItemStack stack = null; + Slot slot = (Slot)this.inventorySlots.get(slotID); + + if (slot != null && slot.getHasStack()) + { + ItemStack slotStack = slot.getStack(); + stack = slotStack.copy(); + + if (slotID < armor.getSizeInventory()) + { + if (!this.mergeItemStack(slotStack, armor.getSizeInventory(), this.inventorySlots.size(), true)) + { + return null; + } + } + else + { + if (slotStack.getItem() instanceof IPattern) + { + if (!this.mergeItemStack(slotStack, 0, 2, false)) + return null; + } + else if (!this.mergeItemStack(slotStack, 2, 4, false)) + return null; + } + + /*if (slotStack.stackSize == 0) + { + slot.putStack((ItemStack)null); + armor.tryBuildPart(slotID); + }*/ + slot.onSlotChanged(); + } + return stack; + } +} diff --git a/mods/tinker/tconstruct/container/PartCrafterContainer.java b/mods/tinker/tconstruct/container/PartCrafterContainer.java index bf410ce6..76853a15 100644 --- a/mods/tinker/tconstruct/container/PartCrafterContainer.java +++ b/mods/tinker/tconstruct/container/PartCrafterContainer.java @@ -85,7 +85,6 @@ public class PartCrafterContainer extends ActiveContainer } slot.onSlotChanged(); } - System.out.println("Returning stack"); return stack; } } diff --git a/mods/tinker/tconstruct/items/CraftingItem.java b/mods/tinker/tconstruct/items/CraftingItem.java index 53649cda..a179a6cc 100644 --- a/mods/tinker/tconstruct/items/CraftingItem.java +++ b/mods/tinker/tconstruct/items/CraftingItem.java @@ -18,15 +18,15 @@ public class CraftingItem extends Item public String[] unlocalizedNames; public String folder; public Icon[] icons; - public CraftingItem(int id, String[] names, String[] tex, String f) + public CraftingItem(int id, String[] names, String[] tex, String folder) { super(id); this.setCreativeTab(TConstructRegistry.materialTab); this.setMaxDamage(0); this.setHasSubtypes(true); - textureNames = tex; - unlocalizedNames = names; - folder = f; + this.textureNames = tex; + this.unlocalizedNames = names; + this.folder = folder; } @SideOnly(Side.CLIENT) diff --git a/mods/tinker/tconstruct/items/OreBerries.java b/mods/tinker/tconstruct/items/OreBerries.java new file mode 100644 index 00000000..b779d9dc --- /dev/null +++ b/mods/tinker/tconstruct/items/OreBerries.java @@ -0,0 +1,13 @@ +package mods.tinker.tconstruct.items; + +public class OreBerries extends CraftingItem +{ + static String[] names = new String[] { "iron", "gold", "copper", "tin", "aluminum", "silver" }; + static String[] tex = new String[] { "oreberry_iron", "oreberry_gold", "oreberry_copper", "oreberry_tin", "oreberry_aluminum", "oreberry_silver" }; + + public OreBerries(int id) + { + super(id, names, tex, "oreberries/"); + } + +} diff --git a/mods/tinker/tconstruct/items/CraftedSoilItemBlock.java b/mods/tinker/tconstruct/items/blocks/CraftedSoilItemBlock.java similarity index 73% rename from mods/tinker/tconstruct/items/CraftedSoilItemBlock.java rename to mods/tinker/tconstruct/items/blocks/CraftedSoilItemBlock.java index 261a67e1..68e1d4ba 100644 --- a/mods/tinker/tconstruct/items/CraftedSoilItemBlock.java +++ b/mods/tinker/tconstruct/items/blocks/CraftedSoilItemBlock.java @@ -1,7 +1,8 @@ -package mods.tinker.tconstruct.items; +package mods.tinker.tconstruct.items.blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; public class CraftedSoilItemBlock extends ItemBlock { @@ -24,6 +25,7 @@ public class CraftedSoilItemBlock extends ItemBlock public String getUnlocalizedName(ItemStack itemstack) { - return (new StringBuilder()).append("CraftedSoil.").append(blockType[itemstack.getItemDamage()]).toString(); + int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length-1); + return (new StringBuilder()).append("CraftedSoil.").append(blockType[pos]).toString(); } } diff --git a/mods/tinker/tconstruct/items/blocks/GravelOreItem.java b/mods/tinker/tconstruct/items/blocks/GravelOreItem.java new file mode 100644 index 00000000..57cae413 --- /dev/null +++ b/mods/tinker/tconstruct/items/blocks/GravelOreItem.java @@ -0,0 +1,31 @@ +package mods.tinker.tconstruct.items.blocks; + +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; + +public class GravelOreItem extends ItemBlock +{ + public static final String blockType[] = + { + "iron", "gold", "copper", "tin", "aluminum", "cobalt" + }; + + public GravelOreItem(int id) + { + super(id); + setMaxDamage(0); + setHasSubtypes(true); + } + + public int getMetadata(int meta) + { + return meta; + } + + public String getUnlocalizedName(ItemStack itemstack) + { + int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length-1); + return (new StringBuilder()).append("block.ore.gravel.").append(blockType[pos]).toString(); + } +} diff --git a/mods/tinker/tconstruct/items/LavaTankItemBlock.java b/mods/tinker/tconstruct/items/blocks/LavaTankItemBlock.java similarity index 73% rename from mods/tinker/tconstruct/items/LavaTankItemBlock.java rename to mods/tinker/tconstruct/items/blocks/LavaTankItemBlock.java index 10f97a84..8619f53a 100644 --- a/mods/tinker/tconstruct/items/LavaTankItemBlock.java +++ b/mods/tinker/tconstruct/items/blocks/LavaTankItemBlock.java @@ -1,7 +1,8 @@ -package mods.tinker.tconstruct.items; +package mods.tinker.tconstruct.items.blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; public class LavaTankItemBlock extends ItemBlock { @@ -24,6 +25,7 @@ public class LavaTankItemBlock extends ItemBlock public String getUnlocalizedName(ItemStack itemstack) { - return (new StringBuilder()).append("LavaTank.").append(blockType[itemstack.getItemDamage()]).toString(); + int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length-1); + return (new StringBuilder()).append("LavaTank.").append(blockType[pos]).toString(); } } diff --git a/mods/tinker/tconstruct/items/LiquidItemBlock.java b/mods/tinker/tconstruct/items/blocks/LiquidItemBlock.java similarity index 75% rename from mods/tinker/tconstruct/items/LiquidItemBlock.java rename to mods/tinker/tconstruct/items/blocks/LiquidItemBlock.java index 00a0edb5..19c30872 100644 --- a/mods/tinker/tconstruct/items/LiquidItemBlock.java +++ b/mods/tinker/tconstruct/items/blocks/LiquidItemBlock.java @@ -1,7 +1,8 @@ -package mods.tinker.tconstruct.items; +package mods.tinker.tconstruct.items.blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; public class LiquidItemBlock extends ItemBlock { @@ -22,6 +23,7 @@ public class LiquidItemBlock extends ItemBlock public String getUnlocalizedName(ItemStack itemstack) { - return (new StringBuilder()).append("LiquidMetal.").append(blockType[itemstack.getItemDamage()]).toString(); + int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length-1); + return (new StringBuilder()).append("LiquidMetal.").append(blockType[pos]).toString(); } } diff --git a/mods/tinker/tconstruct/items/MetalItemBlock.java b/mods/tinker/tconstruct/items/blocks/MetalItemBlock.java similarity index 75% rename from mods/tinker/tconstruct/items/MetalItemBlock.java rename to mods/tinker/tconstruct/items/blocks/MetalItemBlock.java index 68d23a48..a484fb25 100644 --- a/mods/tinker/tconstruct/items/MetalItemBlock.java +++ b/mods/tinker/tconstruct/items/blocks/MetalItemBlock.java @@ -1,7 +1,8 @@ -package mods.tinker.tconstruct.items; +package mods.tinker.tconstruct.items.blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; public class MetalItemBlock extends ItemBlock { @@ -24,6 +25,7 @@ public class MetalItemBlock extends ItemBlock public String getUnlocalizedName(ItemStack itemstack) { - return (new StringBuilder()).append("StorageMetals.").append(blockType[itemstack.getItemDamage()]).toString(); + int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length-1); + return (new StringBuilder()).append("StorageMetals.").append(blockType[pos]).toString(); } } diff --git a/mods/tinker/tconstruct/items/MetalOreItemBlock.java b/mods/tinker/tconstruct/items/blocks/MetalOreItemBlock.java similarity index 74% rename from mods/tinker/tconstruct/items/MetalOreItemBlock.java rename to mods/tinker/tconstruct/items/blocks/MetalOreItemBlock.java index c8c7e4fc..19189492 100644 --- a/mods/tinker/tconstruct/items/MetalOreItemBlock.java +++ b/mods/tinker/tconstruct/items/blocks/MetalOreItemBlock.java @@ -1,7 +1,8 @@ -package mods.tinker.tconstruct.items; +package mods.tinker.tconstruct.items.blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; public class MetalOreItemBlock extends ItemBlock { @@ -24,6 +25,7 @@ public class MetalOreItemBlock extends ItemBlock public String getUnlocalizedName(ItemStack itemstack) { - return (new StringBuilder()).append("MetalOre.").append(blockType[itemstack.getItemDamage()]).toString(); + int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length-1); + return (new StringBuilder()).append("MetalOre.").append(blockType[pos]).toString(); } } diff --git a/mods/tinker/tconstruct/items/blocks/OreberryBushItem.java b/mods/tinker/tconstruct/items/blocks/OreberryBushItem.java new file mode 100644 index 00000000..1a75232c --- /dev/null +++ b/mods/tinker/tconstruct/items/blocks/OreberryBushItem.java @@ -0,0 +1,94 @@ +package mods.tinker.tconstruct.items.blocks; + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import mods.natura.common.NaturaContent; +import mods.tinker.tconstruct.TContent; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.IPlantable; + +public class OreberryBushItem extends ItemBlock +{ + public int blockID; + public OreberryBushItem(int id) + { + super(id); + blockID = id+256; + setHasSubtypes(true); + } + + @Override + public int getMetadata(int meta) + { + return meta % 4; + } + + /* Place bushes on dirt, grass, or other bushes only */ + @Override + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float par8, float par9, float par10) + { + if (side != 1) + return false; + + else if (player.canPlayerEdit(x, y, z, side, stack) && player.canPlayerEdit(x, y + 1, z, side, stack)) + { + Block block = Block.blocksList[world.getBlockId(x, y, z)]; + + if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TContent.oreBerry) && world.isAirBlock(x, y + 1, z)) + { + world.setBlock(x, y + 1, z, blockID, stack.getItemDamage() % 4, 3); + if (!player.capabilities.isCreativeMode) + stack.stackSize--; + if (!world.isRemote) + world.playAuxSFX(2001, x, y, z, blockID); + return true; + } + else + return false; + } + else + return false; + } + + /* Block name in inventory */ + @Override + public String getUnlocalizedName(ItemStack itemstack) + { + int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length-1); + return (new StringBuilder()).append("block.oreberry.").append(blockType[pos]).toString(); + } + public static final String blockType[] = + { + "iron", "gold", "copper", "tin", "iron", "gold", "copper", "tin", + "iron", "gold", "copper", "tin", "iron", "gold", "copper", "tin" + }; + + @Override + @SideOnly(Side.CLIENT) + public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) + { + switch (stack.getItemDamage() % 4) + { + case 0: + list.add("Sweet Irony"); + break; + case 1: + list.add("Pure Luster"); + break; + case 2: + list.add("Tastes like metal"); + break; + case 3: + list.add("Tin Man"); + break; + } + } +} diff --git a/mods/tinker/tconstruct/items/blocks/OreberryBushSecondItem.java b/mods/tinker/tconstruct/items/blocks/OreberryBushSecondItem.java new file mode 100644 index 00000000..c5c3d505 --- /dev/null +++ b/mods/tinker/tconstruct/items/blocks/OreberryBushSecondItem.java @@ -0,0 +1,88 @@ +package mods.tinker.tconstruct.items.blocks; + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import mods.natura.common.NaturaContent; +import mods.tinker.tconstruct.TContent; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.IPlantable; + +public class OreberryBushSecondItem extends ItemBlock +{ + public int blockID; + public OreberryBushSecondItem(int id) + { + super(id); + blockID = id+256; + setHasSubtypes(true); + } + + @Override + public int getMetadata(int meta) + { + return meta % 4; + } + + /* Place bushes on dirt, grass, or other bushes only */ + @Override + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float par8, float par9, float par10) + { + if (side != 1) + return false; + + else if (player.canPlayerEdit(x, y, z, side, stack) && player.canPlayerEdit(x, y + 1, z, side, stack)) + { + Block block = Block.blocksList[world.getBlockId(x, y, z)]; + + if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TContent.oreBerrySecond) && world.isAirBlock(x, y + 1, z)) + { + world.setBlock(x, y + 1, z, blockID, stack.getItemDamage() % 4, 3); + if (!player.capabilities.isCreativeMode) + stack.stackSize--; + if (!world.isRemote) + world.playAuxSFX(2001, x, y, z, blockID); + return true; + } + else + return false; + } + else + return false; + } + + /* Block name in inventory */ + @Override + public String getUnlocalizedName(ItemStack itemstack) + { + int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length-1); + return (new StringBuilder()).append("block.oreberry.").append(blockType[pos]).toString(); + } + public static final String blockType[] = + { + "aluminum", "silver", "", "", "aluminum", "silver", "", "", + "aluminum", "silver", "", "", "aluminum", "silver", "", "" + }; + + @Override + @SideOnly(Side.CLIENT) + public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) + { + switch (stack.getItemDamage() % 4) + { + case 0: + list.add("White Chocolate"); + break; + case 1: + list.add("Somewhat precious"); + break; + } + } +} diff --git a/mods/tinker/tconstruct/items/SearedTableItemBlock.java b/mods/tinker/tconstruct/items/blocks/SearedTableItemBlock.java similarity index 72% rename from mods/tinker/tconstruct/items/SearedTableItemBlock.java rename to mods/tinker/tconstruct/items/blocks/SearedTableItemBlock.java index d5949626..feca0c18 100644 --- a/mods/tinker/tconstruct/items/SearedTableItemBlock.java +++ b/mods/tinker/tconstruct/items/blocks/SearedTableItemBlock.java @@ -1,7 +1,8 @@ -package mods.tinker.tconstruct.items; +package mods.tinker.tconstruct.items.blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; public class SearedTableItemBlock extends ItemBlock { @@ -24,6 +25,7 @@ public class SearedTableItemBlock extends ItemBlock public String getUnlocalizedName(ItemStack itemstack) { - return (new StringBuilder()).append("SearedBlock.").append(blockType[itemstack.getItemDamage()]).toString(); + int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length-1); + return (new StringBuilder()).append("SearedBlock.").append(blockType[pos]).toString(); } } diff --git a/mods/tinker/tconstruct/items/SmelteryItemBlock.java b/mods/tinker/tconstruct/items/blocks/SmelteryItemBlock.java similarity index 74% rename from mods/tinker/tconstruct/items/SmelteryItemBlock.java rename to mods/tinker/tconstruct/items/blocks/SmelteryItemBlock.java index a202dc7f..85bf5173 100644 --- a/mods/tinker/tconstruct/items/SmelteryItemBlock.java +++ b/mods/tinker/tconstruct/items/blocks/SmelteryItemBlock.java @@ -1,7 +1,8 @@ -package mods.tinker.tconstruct.items; +package mods.tinker.tconstruct.items.blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; public class SmelteryItemBlock extends ItemBlock { @@ -24,6 +25,7 @@ public class SmelteryItemBlock extends ItemBlock public String getUnlocalizedName(ItemStack itemstack) { - return (new StringBuilder()).append("Smeltery.").append(blockType[itemstack.getItemDamage()]).toString(); + int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length-1); + return (new StringBuilder()).append("Smeltery.").append(blockType[pos]).toString(); } } diff --git a/mods/tinker/tconstruct/items/ToolStationItemBlock.java b/mods/tinker/tconstruct/items/blocks/ToolStationItemBlock.java similarity index 78% rename from mods/tinker/tconstruct/items/ToolStationItemBlock.java rename to mods/tinker/tconstruct/items/blocks/ToolStationItemBlock.java index 8a971c6b..cfaa9ebb 100644 --- a/mods/tinker/tconstruct/items/ToolStationItemBlock.java +++ b/mods/tinker/tconstruct/items/blocks/ToolStationItemBlock.java @@ -1,7 +1,8 @@ -package mods.tinker.tconstruct.items; +package mods.tinker.tconstruct.items.blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; public class ToolStationItemBlock extends ItemBlock { @@ -26,6 +27,7 @@ public class ToolStationItemBlock extends ItemBlock @Override public String getUnlocalizedName(ItemStack itemstack) { - return (new StringBuilder()).append("ToolStation.").append(blockType[itemstack.getItemDamage()]).toString(); + int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length-1); + return (new StringBuilder()).append("ToolStation.").append(blockType[pos]).toString(); } } diff --git a/mods/tinker/tconstruct/logic/FaucetLogic.java b/mods/tinker/tconstruct/logic/FaucetLogic.java index 235bcdbd..e68530e3 100644 --- a/mods/tinker/tconstruct/logic/FaucetLogic.java +++ b/mods/tinker/tconstruct/logic/FaucetLogic.java @@ -11,10 +11,11 @@ import net.minecraft.network.packet.Packet132TileEntityData; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.liquids.ILiquidTank; import net.minecraftforge.liquids.ITankContainer; import net.minecraftforge.liquids.LiquidStack; -public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogic +public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogic, ITankContainer { byte direction; boolean active; @@ -201,4 +202,40 @@ public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogi } } + @Override + public int fill (ForgeDirection from, LiquidStack resource, boolean doFill) + { + return 0; + } + + @Override + public int fill (int tankIndex, LiquidStack resource, boolean doFill) + { + return 0; + } + + @Override + public LiquidStack drain (ForgeDirection from, int maxDrain, boolean doDrain) + { + return null; + } + + @Override + public LiquidStack drain (int tankIndex, int maxDrain, boolean doDrain) + { + return null; + } + + @Override + public ILiquidTank[] getTanks (ForgeDirection direction) + { + return null; + } + + @Override + public ILiquidTank getTank (ForgeDirection direction, LiquidStack type) + { + return null; + } + } diff --git a/mods/tinker/tconstruct/logic/SmelteryLogic.java b/mods/tinker/tconstruct/logic/SmelteryLogic.java index fb30291e..c23ae26d 100644 --- a/mods/tinker/tconstruct/logic/SmelteryLogic.java +++ b/mods/tinker/tconstruct/logic/SmelteryLogic.java @@ -220,7 +220,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci public void setActive (boolean flag) { needsUpdate = true; - //worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } public int getScaledFuelGague (int scale) @@ -446,8 +446,8 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci updateTemperatures(); super.onInventoryChanged(); needsUpdate = true; - //worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - //worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); } /* Multiblock */ diff --git a/mods/tinker/tconstruct/player/TClientTickHandler.java b/mods/tinker/tconstruct/player/TClientTickHandler.java index 4c768cf2..08a45864 100644 --- a/mods/tinker/tconstruct/player/TClientTickHandler.java +++ b/mods/tinker/tconstruct/player/TClientTickHandler.java @@ -2,6 +2,8 @@ package mods.tinker.tconstruct.player; import java.util.EnumSet; +import mods.tinker.tconstruct.TContent; +import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.Tessellator; @@ -19,6 +21,9 @@ public class TClientTickHandler implements ITickHandler @Override public void tickEnd (EnumSet type, Object... tickData) { + TContent.oreBerry.setGraphicsLevel(Block.leaves.graphicsLevel); + TContent.oreBerrySecond.setGraphicsLevel(Block.leaves.graphicsLevel); + player = mc.thePlayer; if (player == null || player.capabilities.isCreativeMode) return; diff --git a/mods/tinker/tconstruct/player/TPlayerStats.java b/mods/tinker/tconstruct/player/TPlayerStats.java index 203d8a70..191e1b57 100644 --- a/mods/tinker/tconstruct/player/TPlayerStats.java +++ b/mods/tinker/tconstruct/player/TPlayerStats.java @@ -3,8 +3,10 @@ package mods.tinker.tconstruct.player; import java.lang.ref.WeakReference; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; -public class TPlayerStats +public class TPlayerStats implements IInventory { public WeakReference player; public int level; @@ -14,6 +16,83 @@ public class TPlayerStats public boolean materialManual; public boolean smelteryManual; - //public boolean prevOnGround; - //public double prevMotionY; + public ItemStack[] armor = new ItemStack[7]; + + @Override + public int getSizeInventory () + { + return armor.length; + } + + @Override + public ItemStack getStackInSlot (int slot) + { + return null; + } + + @Override + public ItemStack decrStackSize (int slot, int quantity) + { + return null; + } + + @Override + public ItemStack getStackInSlotOnClosing (int slot) + { + return null; + } + + @Override + public void setInventorySlotContents (int slot, ItemStack itemstack) + { + + } + + @Override + public String getInvName () + { + return null; + } + + @Override + public boolean isInvNameLocalized () + { + return false; + } + + @Override + public int getInventoryStackLimit () + { + return 0; + } + + @Override + public void onInventoryChanged () + { + + } + + @Override + public boolean isUseableByPlayer (EntityPlayer entityplayer) + { + return true; + } + + @Override + public void openChest () + { + + } + + @Override + public void closeChest () + { + + } + + @Override + public boolean isStackValidForSlot (int slot, ItemStack itemstack) + { + return false; + } } diff --git a/mods/tinker/tconstruct/worldgen/NetherOreGenerator.java b/mods/tinker/tconstruct/worldgen/NetherOreGenerator.java deleted file mode 100644 index e417aab5..00000000 --- a/mods/tinker/tconstruct/worldgen/NetherOreGenerator.java +++ /dev/null @@ -1,86 +0,0 @@ -package mods.tinker.tconstruct.worldgen; - -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; -import net.minecraft.world.gen.feature.WorldGenerator; - -public class NetherOreGenerator extends WorldGenerator -{ - /** The block ID of the ore to be placed using this generator. */ - private int minableBlockId; - private int minableBlockMeta = 0; - - /** The number of blocks to generate. */ - private int numberOfBlocks; - - public NetherOreGenerator(int par1, int par2) - { - this.minableBlockId = par1; - this.numberOfBlocks = par2; - } - - public NetherOreGenerator(int id, int meta, int number) - { - this(id, number); - minableBlockMeta = meta; - } - - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) - { - float var6 = par2Random.nextFloat() * (float)Math.PI; - double var7 = (double)((float)(par3 + 8) + MathHelper.sin(var6) * (float)this.numberOfBlocks / 8.0F); - double var9 = (double)((float)(par3 + 8) - MathHelper.sin(var6) * (float)this.numberOfBlocks / 8.0F); - double var11 = (double)((float)(par5 + 8) + MathHelper.cos(var6) * (float)this.numberOfBlocks / 8.0F); - double var13 = (double)((float)(par5 + 8) - MathHelper.cos(var6) * (float)this.numberOfBlocks / 8.0F); - double var15 = (double)(par4 + par2Random.nextInt(3) - 2); - double var17 = (double)(par4 + par2Random.nextInt(3) - 2); - - for (int var19 = 0; var19 <= this.numberOfBlocks; ++var19) - { - double var20 = var7 + (var9 - var7) * (double)var19 / (double)this.numberOfBlocks; - double var22 = var15 + (var17 - var15) * (double)var19 / (double)this.numberOfBlocks; - double var24 = var11 + (var13 - var11) * (double)var19 / (double)this.numberOfBlocks; - double var26 = par2Random.nextDouble() * (double)this.numberOfBlocks / 16.0D; - double var28 = (double)(MathHelper.sin((float)var19 * (float)Math.PI / (float)this.numberOfBlocks) + 1.0F) * var26 + 1.0D; - double var30 = (double)(MathHelper.sin((float)var19 * (float)Math.PI / (float)this.numberOfBlocks) + 1.0F) * var26 + 1.0D; - int var32 = MathHelper.floor_double(var20 - var28 / 2.0D); - int var33 = MathHelper.floor_double(var22 - var30 / 2.0D); - int var34 = MathHelper.floor_double(var24 - var28 / 2.0D); - int var35 = MathHelper.floor_double(var20 + var28 / 2.0D); - int var36 = MathHelper.floor_double(var22 + var30 / 2.0D); - int var37 = MathHelper.floor_double(var24 + var28 / 2.0D); - - for (int var38 = var32; var38 <= var35; ++var38) - { - double var39 = ((double)var38 + 0.5D - var20) / (var28 / 2.0D); - - if (var39 * var39 < 1.0D) - { - for (int var41 = var33; var41 <= var36; ++var41) - { - double var42 = ((double)var41 + 0.5D - var22) / (var30 / 2.0D); - - if (var39 * var39 + var42 * var42 < 1.0D) - { - for (int var44 = var34; var44 <= var37; ++var44) - { - double var45 = ((double)var44 + 0.5D - var24) / (var28 / 2.0D); - - int genID = par1World.getBlockId(var38, var41, var44); - if (var39 * var39 + var42 * var42 + var45 * var45 < 1.0D && genID == Block.netherrack.blockID) - { - par1World.setBlock(var38, var41, var44, this.minableBlockId, minableBlockMeta, 2); - } - } - } - } - } - } - } - - return true; - } -} diff --git a/mods/tinker/tconstruct/worldgen/OreberryBushGen.java b/mods/tinker/tconstruct/worldgen/OreberryBushGen.java new file mode 100644 index 00000000..096558aa --- /dev/null +++ b/mods/tinker/tconstruct/worldgen/OreberryBushGen.java @@ -0,0 +1,202 @@ +package mods.tinker.tconstruct.worldgen; + +import java.util.Random; + +import mods.tinker.tconstruct.PHConstruct; +import net.minecraft.block.Block; +import net.minecraft.world.World; +import net.minecraft.world.gen.feature.WorldGenerator; + +public class OreberryBushGen extends WorldGenerator +{ + private int blockID; + private int metadata; + private int spawnHeight; + + public OreberryBushGen(Block block, int meta) + { + this(block.blockID, meta); + } + + public OreberryBushGen(int blockID, int meta) + { + this.blockID = blockID; + metadata = meta; + spawnHeight = PHConstruct.seaLevel + 64; + } + + public boolean generate (World world, Random random, int x, int y, int z) + { + int height = findGround(world, x, y, z); + if (height != -1) + { + int type = random.nextInt(10); + if (type == 9) + generateShrub(world, random, x, height, z); + else if (type >= 3) + generateSmallNode(world, random, x, height, z); + else + generateTinyNode(world, random, x, height, z); + } + return true; + } + + int findGround (World world, int x, int y, int z) + { + int returnHeight = -1; + int blockID = world.getBlockId(x, y - 1, z); + if (!Block.opaqueCubeLookup[world.getBlockId(x, y, z)] && (blockID == Block.dirt.blockID || blockID == Block.grass.blockID)) + { + return y; + } + int height = spawnHeight; + do + { + if (height < PHConstruct.seaLevel) + { + break; + } + int j1 = world.getBlockId(x, height, z); + if (j1 == Block.dirt.blockID || j1 == Block.grass.blockID) + { + if (!Block.opaqueCubeLookup[world.getBlockId(x, height + 1, z)]) + { + returnHeight = height + 1; + } + break; + } + height--; + } while (height > 0); + return returnHeight; + } + + /*public void generateLargeNode (World world, Random random, int x, int y, int z) + { + for (int iterX = x - 2; iterX <= x + 2; iterX++) + { + for (int iterZ = z - 1; iterZ <= z + 1; iterZ++) + { + for (int iterY = y - 1; iterY <= y; iterY++) + { + generateBerryBlock(world, iterX, iterY, iterZ, random); + } + } + } + + for (int iterX = x - 1; iterX <= x + 1; iterX++) + { + for (int iterZ = z - 2; iterZ <= z - 2; iterZ++) + { + for (int iterY = y - 1; iterY <= y; iterY++) + { + generateBerryBlock(world, iterX, iterY, iterZ, random); + } + } + } + + for (int iterX = x - 1; iterX <= x + 1; iterX++) + { + for (int iterZ = z + 2; iterZ <= z + 2; iterZ++) + { + for (int iterY = y - 1; iterY <= y; iterY++) + { + generateBerryBlock(world, iterX, iterY, iterZ, random); + } + } + } + + for (int iterX = x - 1; iterX <= x + 1; iterX++) + { + for (int iterZ = z - 1; iterZ <= z + 1; iterZ++) + { + int yPos = y + 1; + generateBerryBlock(world, iterX, yPos, iterZ, random); + yPos = y - 2; + generateBerryBlock(world, iterX, yPos, iterZ, random); + } + } + }*/ + + public void generateShrub (World world, Random random, int x, int y, int z) + { + int l; + + Block block = null; + do + { + block = Block.blocksList[world.getBlockId(x, y, z)]; + if (block != null && !block.isLeaves(world, x, y, z)) + { + break; + } + y--; + } while (y > 0); + + int i1 = world.getBlockId(x, y, z); + + if (i1 == Block.dirt.blockID || i1 == Block.grass.blockID) + { + ++y; + + for (int yPos = y; yPos <= y + 2; ++yPos) + { + int k1 = yPos - y; + int l1 = 2 - k1; + + for (int xPos = x - l1; xPos <= x + l1; ++xPos) + { + int j2 = xPos - x; + + for (int zPos = z - l1; zPos <= z + l1; ++zPos) + { + int l2 = zPos - z; + + block = Block.blocksList[world.getBlockId(xPos, yPos, zPos)]; + + if ((Math.abs(j2) != l1 || Math.abs(l2) != l1 || random.nextInt(2) != 0) && (block == null || block.canBeReplacedByLeaves(world, xPos, yPos, zPos))) + { + //this.setBlockAndMetadata(world, i2, j1, k2, Block.leaves.blockID, this.field_76527_a); + generateBerryBlock(world, xPos, yPos, zPos, random); + } + } + } + } + } + } + + public void generateSmallNode (World world, Random random, int x, int y, int z) + { + generateBerryBlock(world, x, y, z, random); + if (random.nextBoolean()) + generateBerryBush(world, x + 1, y, z, random); + if (random.nextBoolean()) + generateBerryBush(world, x - 1, y, z, random); + if (random.nextBoolean()) + generateBerryBush(world, x, y, z + 1, random); + if (random.nextBoolean()) + generateBerryBush(world, x, y, z - 1, random); + } + + public void generateTinyNode (World world, Random random, int x, int y, int z) + { + generateBerryBush(world, x, y, z, random); + } + + void generateBerryBlock (World world, int x, int y, int z, Random random) + { + if (!Block.opaqueCubeLookup[world.getBlockId(x, y, z)]) + { + int metaOffset = random.nextInt(5) == 0 ? 1 : 0; + setBlockAndMetadata(world, x, y, z, blockID, metadata + 8 + metaOffset * 4); + } + } + + void generateBerryBush (World world, int x, int y, int z, Random random) + { + if (!Block.opaqueCubeLookup[world.getBlockId(x, y, z)]) + { + int metaOffset = random.nextInt(4); + setBlockAndMetadata(world, x, y, z, blockID, metadata + metaOffset * 4); + } + } +} diff --git a/mods/tinker/tconstruct/worldgen/SurfaceOreGen.java b/mods/tinker/tconstruct/worldgen/SurfaceOreGen.java new file mode 100644 index 00000000..1a6f785c --- /dev/null +++ b/mods/tinker/tconstruct/worldgen/SurfaceOreGen.java @@ -0,0 +1,133 @@ +package mods.tinker.tconstruct.worldgen; + +import java.util.Random; + +import mods.tinker.tconstruct.PHConstruct; +import net.minecraft.block.Block; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; +import net.minecraft.world.gen.feature.WorldGenerator; + +public class SurfaceOreGen extends WorldGenerator +{ + /** The block ID of the ore to be placed using this generator. */ + private int minableBlockId; + private int minableBlockMeta = 0; + + /** The number of blocks to generate. */ + private int numberOfBlocks; + private int[] replaceBlocks; + + public SurfaceOreGen(int id, int meta, int number) + { + this(id, meta, number, Block.grass.blockID, Block.dirt.blockID, Block.waterStill.blockID, Block.sand.blockID, Block.gravel.blockID, Block.snow.blockID); + } + + public SurfaceOreGen(int id, int meta, int number, int... target) + { + this.minableBlockId = id; + this.numberOfBlocks = number; + this.replaceBlocks = target; + minableBlockMeta = meta; + } + + int findGround (World world, int x, int y, int z) + { + int returnHeight = -1; + int blockID = world.getBlockId(x, y - 1, z); + if (!Block.opaqueCubeLookup[world.getBlockId(x, y, z)] && (blockID == Block.dirt.blockID || blockID == Block.grass.blockID)) + { + return y; + } + int height = PHConstruct.seaLevel + 64; + do + { + if (height < PHConstruct.seaLevel - 30) + { + break; + } + int j1 = world.getBlockId(x, height, z); + if (j1 == Block.dirt.blockID || j1 == Block.grass.blockID) + { + if (!Block.opaqueCubeLookup[world.getBlockId(x, height + 1, z)]) + { + returnHeight = height + 1; + } + break; + } + height--; + } while (height > 0); + return returnHeight; + } + + public boolean generate(World world, Random random, int startX, int startY, int startZ) + { + startY = findGround(world, startX, startY, startZ); + + float f = random.nextFloat() * (float)Math.PI; + int blockNumber = numberOfBlocks / 2 + random.nextInt(numberOfBlocks/2); + double d0 = (double)((float)(startX + 8) + MathHelper.sin(f) * (float)blockNumber / 8.0F); + double d1 = (double)((float)(startX + 8) - MathHelper.sin(f) * (float)blockNumber / 8.0F); + double d2 = (double)((float)(startZ + 8) + MathHelper.cos(f) * (float)blockNumber / 8.0F); + double d3 = (double)((float)(startZ + 8) - MathHelper.cos(f) * (float)blockNumber / 8.0F); + double d4 = (double)(startY + random.nextInt(3) - 2); + double d5 = (double)(startY + random.nextInt(3) - 2); + + for (int l = 0; l <= blockNumber; ++l) + { + double d6 = d0 + (d1 - d0) * (double)l / (double)blockNumber; + double d7 = d4 + (d5 - d4) * (double)l / (double)blockNumber; + double d8 = d2 + (d3 - d2) * (double)l / (double)blockNumber; + double d9 = random.nextDouble() * (double)blockNumber / 16.0D; + double d10 = (double)(MathHelper.sin((float)l * (float)Math.PI / (float)blockNumber) + 1.0F) * d9 + 1.0D; + double d11 = (double)(MathHelper.sin((float)l * (float)Math.PI / (float)blockNumber) + 1.0F) * d9 + 1.0D; + int i1 = MathHelper.floor_double(d6 - d10 / 2.0D); + int j1 = MathHelper.floor_double(d7 - d11 / 2.0D); + int k1 = MathHelper.floor_double(d8 - d10 / 2.0D); + int l1 = MathHelper.floor_double(d6 + d10 / 2.0D); + int i2 = MathHelper.floor_double(d7 + d11 / 2.0D); + int j2 = MathHelper.floor_double(d8 + d10 / 2.0D); + + for (int k2 = i1; k2 <= l1; ++k2) + { + double d12 = ((double)k2 + 0.5D - d6) / (d10 / 2.0D); + + if (d12 * d12 < 1.0D) + { + for (int l2 = j1; l2 <= i2; ++l2) + { + double d13 = ((double)l2 + 0.5D - d7) / (d11 / 2.0D); + + if (d12 * d12 + d13 * d13 < 1.0D) + { + for (int i3 = k1; i3 <= j2; ++i3) + { + double d14 = ((double)i3 + 0.5D - d8) / (d10 / 2.0D); + + Block block = Block.blocksList[world.getBlockId(k2, l2, i3)]; + if (d12 * d12 + d13 * d13 + d14 * d14 < 1.0D)// && (block != null && block.isGenMineableReplaceable(par1World, k2, l2, i3, replaceBlocks))) + { + if (block == null || !Block.opaqueCubeLookup[world.getBlockId(k2, l2, i3)]) + world.setBlock(k2, l2, i3, this.minableBlockId, minableBlockMeta, 2); + else + { + for (int iter = 0; iter < replaceBlocks.length; iter++) + { + if (block.isGenMineableReplaceable(world, k2, l2, i3, replaceBlocks[iter])) + { + world.setBlock(k2, l2, i3, this.minableBlockId, minableBlockMeta, 2); + break; + } + } + } + } + } + } + } + } + } + } + + return true; + } +} diff --git a/mods/tinker/tconstruct/worldgen/TBaseWorldGenerator.java b/mods/tinker/tconstruct/worldgen/TBaseWorldGenerator.java index 8d654402..c113ff00 100644 --- a/mods/tinker/tconstruct/worldgen/TBaseWorldGenerator.java +++ b/mods/tinker/tconstruct/worldgen/TBaseWorldGenerator.java @@ -2,6 +2,7 @@ package mods.tinker.tconstruct.worldgen; import java.util.Random; +import mods.natura.common.PHNatura; import mods.tinker.tconstruct.PHConstruct; import mods.tinker.tconstruct.TContent; import net.minecraft.block.Block; @@ -10,98 +11,236 @@ import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.feature.WorldGenMinable; import cpw.mods.fml.common.IWorldGenerator; -public class TBaseWorldGenerator - implements IWorldGenerator +public class TBaseWorldGenerator implements IWorldGenerator { - public TBaseWorldGenerator() - { - //copper = new ManhattanOreGenerator(TContent.oreSlag.blockID, 3, 5, 10, 100, true, true); - //tin = new ManhattanOreGenerator(TContent.oreSlag.blockID, 4, 5, 10, 100, true, true); - //aluminum = new ManhattanOreGenerator(TContent.oreSlag.blockID, 5, 8, 20, 100, false, true); - - //cobalt = new ManhattanOreGenerator(TContent.oreSlag.blockID, 1, 2, 4, 100, true, false, Block.netherrack.blockID); - //ardite = new ManhattanOreGenerator(TContent.oreSlag.blockID, 2, 2, 4, 100, true, false, Block.netherrack.blockID); - copper = new WorldGenMinable(TContent.oreSlag.blockID, 3, 9, Block.stone.blockID); - tin = new WorldGenMinable(TContent.oreSlag.blockID, 4, 9, Block.stone.blockID); - aluminum = new WorldGenMinable(TContent.oreSlag.blockID, 5, 16, Block.stone.blockID); - - cobalt = new WorldGenMinable(TContent.oreSlag.blockID, 1, 3, Block.netherrack.blockID); - ardite = new WorldGenMinable(TContent.oreSlag.blockID, 2, 3, Block.netherrack.blockID); - } - - @Override - public void generate (Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) - { - if (world.provider.dimensionId == -1) - generateNether(random, chunkX*16, chunkZ*16, world); - else - generateSurface(random, chunkX*16, chunkZ*16, world); - } - - void generateSurface(Random random, int xChunk, int zChunk, World world) - { - int heightBand; - int xPos, yPos, zPos; - if (PHConstruct.generateCopper) - { - for (int q = 0; q < PHConstruct.copperDensity; q++) - { - xPos = xChunk + random.nextInt(16); yPos = PHConstruct.copperHeight + random.nextInt(PHConstruct.copperRange); zPos = zChunk + random.nextInt(16); - copper.generate(world, random, xPos, yPos, zPos); - } - } - if (PHConstruct.generateTin) - { - for (int q = 0; q < PHConstruct.tinDensity; q++) - { - xPos = xChunk + random.nextInt(16); yPos = PHConstruct.tinHeight + random.nextInt(PHConstruct.tinRange); zPos = zChunk + random.nextInt(16); - tin.generate(world, random, xPos, yPos, zPos); - } - } - if (PHConstruct.generateAluminum) - { - for (int q = 0; q < PHConstruct.aluminumDensity; q++) - { - xPos = xChunk + random.nextInt(16); yPos = PHConstruct.aluminumHeight + random.nextInt(PHConstruct.aluminumRange); zPos = zChunk + random.nextInt(16); - aluminum.generate(world, random, xPos, yPos, zPos); - } - } - } - - void generateNether(Random random, int xChunk, int zChunk, World world) - { - int xPos, yPos, zPos; - for (int i = 0; i < PHConstruct.netherDensity; i++) - { - if (PHConstruct.generateCobalt) - { - xPos = xChunk + random.nextInt(16); yPos = random.nextInt(64)+32; zPos = zChunk + random.nextInt(16); - cobalt.generate(world, random, xPos, yPos, zPos); - } - if (PHConstruct.generateArdite) - { - xPos = xChunk + random.nextInt(16); yPos = random.nextInt(64)+32; zPos = zChunk + random.nextInt(16); - ardite.generate(world, random, xPos, yPos, zPos); - } - } - for (int i = 0; i < PHConstruct.netherDensity; i++) - { - if (PHConstruct.generateCobalt) - { - xPos = xChunk + random.nextInt(16); yPos = random.nextInt(128); zPos = zChunk + random.nextInt(16); - cobalt.generate(world, random, xPos, yPos, zPos); - } - if (PHConstruct.generateArdite) - { - xPos = xChunk + random.nextInt(16); yPos = random.nextInt(128); zPos = zChunk + random.nextInt(16); - ardite.generate(world, random, xPos, yPos, zPos); - } - } - } - - WorldGenMinable copper; - WorldGenMinable tin; - WorldGenMinable aluminum; - WorldGenMinable cobalt; - WorldGenMinable ardite; + public TBaseWorldGenerator() + { + copper = new WorldGenMinable(TContent.oreSlag.blockID, 3, 8, Block.stone.blockID); + tin = new WorldGenMinable(TContent.oreSlag.blockID, 4, 8, Block.stone.blockID); + aluminum = new WorldGenMinable(TContent.oreSlag.blockID, 5, 6, Block.stone.blockID); + + cobalt = new WorldGenMinable(TContent.oreSlag.blockID, 1, 3, Block.netherrack.blockID); + ardite = new WorldGenMinable(TContent.oreSlag.blockID, 2, 3, Block.netherrack.blockID); + + ironSurface = new SurfaceOreGen(TContent.oreGravel.blockID, 0, 12); + goldSurface = new SurfaceOreGen(TContent.oreGravel.blockID, 1, 12); + copperSurface = new SurfaceOreGen(TContent.oreGravel.blockID, 2, 12); + tinSurface = new SurfaceOreGen(TContent.oreGravel.blockID, 3, 12); + aluminumSurface = new SurfaceOreGen(TContent.oreGravel.blockID, 4, 12); + cobaltSurface = new SurfaceOreGen(TContent.oreGravel.blockID, 4, 20); + + ironBush = new OreberryBushGen(TContent.oreBerry, 0); + goldBush = new OreberryBushGen(TContent.oreBerry, 1); + copperBush = new OreberryBushGen(TContent.oreBerry, 2); + tinBush = new OreberryBushGen(TContent.oreBerry, 3); + aluminumBush = new OreberryBushGen(TContent.oreBerrySecond, 0); + silverBush = new OreberryBushGen(TContent.oreBerrySecond, 1); + } + + @Override + public void generate (Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) + { + if (world.provider.isHellWorld) + generateNether(random, chunkX * 16, chunkZ * 16, world); + else + generateSurface(random, chunkX * 16, chunkZ * 16, world); + } + + void generateSurface (Random random, int xChunk, int zChunk, World world) + { + int xPos, yPos, zPos; + String biomeName = world.getWorldChunkManager().getBiomeGenAt(xChunk, zChunk).biomeName; + + generateUndergroundOres(random, xChunk, zChunk, world); + generateSurfaceOres(random, xChunk, zChunk, world); + generateOreBushes(random, xChunk, zChunk, world); + + if (biomeName == "Extreme Hills Edge" || biomeName == "Extreme Hills") + { + generateUndergroundOres(random, xChunk, zChunk, world); + generateSurfaceOres(random, xChunk, zChunk, world); + } + } + + void generateUndergroundOres(Random random, int xChunk, int zChunk, World world) + { + int xPos, yPos, zPos; + if (PHConstruct.generateCopper) + { + for (int q = 0; q <= PHConstruct.copperuDensity; q++) + { + xPos = xChunk + random.nextInt(16); + yPos = PHConstruct.copperuHeight + random.nextInt(PHConstruct.copperuRange - PHConstruct.copperuHeight); + zPos = zChunk + random.nextInt(16); + copper.generate(world, random, xPos, yPos, zPos); + } + } + if (PHConstruct.generateTin) + { + for (int q = 0; q <= PHConstruct.tinuDensity; q++) + { + xPos = xChunk + random.nextInt(16); + yPos = PHConstruct.tinuHeight + random.nextInt(PHConstruct.tinuRange - PHConstruct.tinuHeight); + zPos = zChunk + random.nextInt(16); + tin.generate(world, random, xPos, yPos, zPos); + } + } + if (PHConstruct.generateAluminum) + { + for (int q = 0; q <= PHConstruct.aluminumuDensity; q++) + { + xPos = xChunk + random.nextInt(16); + yPos = PHConstruct.aluminumuHeight + random.nextInt(PHConstruct.aluminumuRange - PHConstruct.aluminumuHeight); + zPos = zChunk + random.nextInt(16); + aluminum.generate(world, random, xPos, yPos, zPos); + } + } + } + + void generateSurfaceOres(Random random, int xChunk, int zChunk, World world) + { + int xPos, yPos, zPos; + if (PHConstruct.generateIronSurface && random.nextInt(PHConstruct.ironsRarity) == 0) + { + xPos = xChunk + random.nextInt(16); + yPos = 64 + PHConstruct.seaLevel; + zPos = zChunk + random.nextInt(16); + ironSurface.generate(world, random, xPos, yPos, zPos); + } + if (PHConstruct.generateGoldSurface && random.nextInt(PHConstruct.goldsRarity) == 0) + { + xPos = xChunk + random.nextInt(16); + yPos = 64 + PHConstruct.seaLevel; + zPos = zChunk + random.nextInt(16); + goldSurface.generate(world, random, xPos, yPos, zPos); + } + if (PHConstruct.generateCopperSurface && random.nextInt(PHConstruct.coppersRarity) == 0) + { + xPos = xChunk + random.nextInt(16); + yPos = 64 + PHConstruct.seaLevel; + zPos = zChunk + random.nextInt(16); + copperSurface.generate(world, random, xPos, yPos, zPos); + } + if (PHConstruct.generateTinSurface && random.nextInt(PHConstruct.tinsRarity) == 0) + { + xPos = xChunk + random.nextInt(16); + yPos = 64 + PHConstruct.seaLevel; + zPos = zChunk + random.nextInt(16); + tinSurface.generate(world, random, xPos, yPos, zPos); + } + if (PHConstruct.generateAluminumSurface && random.nextInt(PHConstruct.aluminumsRarity) == 0) + { + xPos = xChunk + random.nextInt(16); + yPos = 64 + PHConstruct.seaLevel; + zPos = zChunk + random.nextInt(16); + aluminumSurface.generate(world, random, xPos, yPos, zPos); + } + if (PHConstruct.generateCobaltSurface && random.nextInt(PHConstruct.cobaltsRarity) == 0) + { + xPos = xChunk + random.nextInt(16); + yPos = 64 + PHConstruct.seaLevel; + zPos = zChunk + random.nextInt(16); + cobaltSurface.generate(world, random, xPos, yPos, zPos); + } + } + + void generateOreBushes(Random random, int xChunk, int zChunk, World world) + { + int xPos, yPos, zPos; + if (PHConstruct.generateIronBush && random.nextInt(PHConstruct.ironbRarity) == 0) + { + xPos = xChunk + random.nextInt(16); + yPos = 64 + PHConstruct.seaLevel; + zPos = zChunk + random.nextInt(16); + ironBush.generate(world, random, xPos, yPos, zPos); + } + if (PHConstruct.generateGoldBush && random.nextInt(PHConstruct.goldbRarity) == 0) + { + xPos = xChunk + random.nextInt(16); + yPos = 64 + PHConstruct.seaLevel; + zPos = zChunk + random.nextInt(16); + goldBush.generate(world, random, xPos, yPos, zPos); + } + if (PHConstruct.generateCopperBush && random.nextInt(PHConstruct.copperbRarity) == 0) + { + xPos = xChunk + random.nextInt(16); + yPos = 64 + PHConstruct.seaLevel; + zPos = zChunk + random.nextInt(16); + copperBush.generate(world, random, xPos, yPos, zPos); + } + if (PHConstruct.generateTinBush && random.nextInt(PHConstruct.tinbRarity) == 0) + { + xPos = xChunk + random.nextInt(16); + yPos = 64 + PHConstruct.seaLevel; + zPos = zChunk + random.nextInt(16); + tinBush.generate(world, random, xPos, yPos, zPos); + } + if (PHConstruct.generateAluminumBush && random.nextInt(PHConstruct.aluminumbRarity) == 0) + { + xPos = xChunk + random.nextInt(16); + yPos = 64 + PHConstruct.seaLevel; + zPos = zChunk + random.nextInt(16); + aluminumBush.generate(world, random, xPos, yPos, zPos); + } + if (PHConstruct.generateSilverBush && random.nextInt(PHConstruct.silverbRarity) == 0) + { + xPos = xChunk + random.nextInt(16); + yPos = 64 + PHConstruct.seaLevel; + zPos = zChunk + random.nextInt(16); + silverBush.generate(world, random, xPos, yPos, zPos); + } + } + + void generateNether (Random random, int xChunk, int zChunk, World world) + { + int xPos, yPos, zPos; + if (PHConstruct.generateNetherOres) + { + for (int i = 0; i < PHConstruct.netherDensity; i++) + { + xPos = xChunk + random.nextInt(16); + yPos = random.nextInt(64) + 32; + zPos = zChunk + random.nextInt(16); + cobalt.generate(world, random, xPos, yPos, zPos); + + xPos = xChunk + random.nextInt(16); + yPos = random.nextInt(64) + 32; + zPos = zChunk + random.nextInt(16); + ardite.generate(world, random, xPos, yPos, zPos); + + } + for (int i = 0; i < PHConstruct.netherDensity; i++) + { + xPos = xChunk + random.nextInt(16); + yPos = random.nextInt(128); + zPos = zChunk + random.nextInt(16); + cobalt.generate(world, random, xPos, yPos, zPos); + + xPos = xChunk + random.nextInt(16); + yPos = random.nextInt(128); + zPos = zChunk + random.nextInt(16); + ardite.generate(world, random, xPos, yPos, zPos); + } + } + } + + WorldGenMinable copper; + WorldGenMinable tin; + WorldGenMinable aluminum; + WorldGenMinable cobalt; + WorldGenMinable ardite; + + SurfaceOreGen ironSurface; + SurfaceOreGen goldSurface; + SurfaceOreGen copperSurface; + SurfaceOreGen tinSurface; + SurfaceOreGen aluminumSurface; + SurfaceOreGen cobaltSurface; + + OreberryBushGen ironBush; + OreberryBushGen goldBush; + OreberryBushGen copperBush; + OreberryBushGen tinBush; + OreberryBushGen aluminumBush; + OreberryBushGen silverBush; } diff --git a/mods/tinker/textures/GGE/GUIPedestal.png b/mods/tinker/textures/GGE/GUIPedestal.png deleted file mode 100644 index 2de45bac521a067b25c61579f1c312215166330f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1250 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5D>38$lZxy-8q?;3=GT+0X`wF zKtUidH#ZLr4ejpkK6dQb|Ns9Xf}`YU2n_oWNSg9F7wAdGk|4ie28U-i(m u-#^a_W^{P+@OwSyn_!PgDxP@J%Nz3qzy2$_I`L5>$XHKTKbLh*2~7YlFMzuM diff --git a/mods/tinker/textures/GGE/elderpork.png b/mods/tinker/textures/GGE/elderpork.png deleted file mode 100644 index c28c42c39bac4e127d2ffec705678ae67326f344..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 426 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85sChfiPptYBdRW@uAAP%xs~yH!WYIK)_mvm#B?8xoC+@a1INTa=$c*J(0EHi!(~~b zYRZ~4rkk-B3UTWN!4=%wNy``{{c`Sd_>loigbj~$g Sd=bpapD~y(WwcmH+Uoje@pF5=T=4}9+?mbxiYd@wxhzQ3;=!udRYqq){8)UtUCp;Uc3Ri>ULTVD6Mz^0000< KMNUMnLSTY$r-gR_ literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/berries/berry_aluminum_fast.png b/mods/tinker/textures/blocks/berries/berry_aluminum_fast.png new file mode 100644 index 0000000000000000000000000000000000000000..cc3a55b74b4341165ae9c7ec73afb589992174b9 GIT binary patch literal 397 zcmV;80doF{P)3jLL?cLlzzs&w{wS04Ml3RzTN!{7aU5;<>D@HBnppcKx zpWiYSC@$c^%6cAOU6<{QE-HqFrqPV=P7<(U0MLUCH<~{H?D6HTrae48wKn5e<0@l7N77Jz8N0-Bq9N7aDWG?%3v6#(>HBS}f2kr>`3h%r4O?OuQs zmnPlhoiQweNzyKjfOe&c75gBDyoKIk23jeAI-309=ms>z7m86A(oHkw(|j+){rbq& z4x}4I5?x8kLs!@5ODzDNDM5c!+5veQVd0Df68d>Cp)=8U06>>f>nUsV6mdp|b^<%% rGTqewOJo9wu3Z!<&<`d6mw?Ryhbsy6(A1AV00000NkvXXu0mjf7i6yj literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/berries/berry_aluminum_ripe_fancy.png b/mods/tinker/textures/blocks/berries/berry_aluminum_ripe_fancy.png new file mode 100644 index 0000000000000000000000000000000000000000..573f5bfa5a89a10701422b504dc3fb13d8b9b2d9 GIT binary patch literal 347 zcmV-h0i^zkP)?{EG+aZ#NHnef~8oSE|y}EQj6fX|8)Lo^#ZNk2Z-mpR2!en(N6R%$RvYp<{rp`#JYH{`x)_nBDJ4llzVB0SzM$rC zY5{T}vY0yofQ#cewgAkgJ)Tje=KTP6$Fr5O-5+chBrbAs7={Hl)kce)eyJ6J0Kkch zoSKc(ueD0BdUs$`vvB}ymPFT70RTpljWZD1HF_!4OjcoHFilI)RHeasVx;L z?sjyA@$tNMR}{&8kfz%4W&2`yvt(CvlSSH8>4}>+f+^}EEf4>KDGNDsS)}EG@!wVc tw=|q!%#GL!Bb^3_UST}rJ%3}iI6qS&80c0D*slNp002ovPDHLkV1m$KlSTjl literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/berries/berry_aluminum_ripe_fast.png b/mods/tinker/textures/blocks/berries/berry_aluminum_ripe_fast.png new file mode 100644 index 0000000000000000000000000000000000000000..5792bbc46206ed200f87d009e62e43fc7337537f GIT binary patch literal 395 zcmV;60d)R}P)`^^hrRx&OCq~pn(_(~ZHE%EthrGJAXH(NNmKeo<;}VDn@pU*hO$-jeRnoj;RY>_h zmXjtm6}Z6M!m=OAVkE_Qthz*!ULKIoJSW9?IR3TDkksi(OCwNK pg}OyTQJqEvi*XX11HG*h`3AlgX$;5IwP^qV002ovPDHLkV1hzsvBCfV literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/berries/berry_copper_fancy.png b/mods/tinker/textures/blocks/berries/berry_copper_fancy.png new file mode 100644 index 0000000000000000000000000000000000000000..722d360131d67b58646277a9daafe2e64229a211 GIT binary patch literal 313 zcmV-90mlA`P)qvAK>5E*a-g2>Ks{}+q-zMTyl?@ zotaCL&v;(eazBm*bMj|wrKZ~E&b?=HVSm4#9C8))q;nqA5zRXM(7y!#* z(^a0;egL;a-?5!HU128M6-LoZ1vTo_#cT6%n!9gh!W?BQK?42gqKb`W1@7W9A5bX_ z!m_-?R68GllvuRb4-x~DYFFI=wbHn&z}T2}KBy#7L#;8)#=cicV7+()`BFd06-RS*00000 LNkvXXu0mjf{!EEY literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/berries/berry_copper_fast.png b/mods/tinker/textures/blocks/berries/berry_copper_fast.png new file mode 100644 index 0000000000000000000000000000000000000000..850987be80edfe57a26f7dded58773370f6cc8cb GIT binary patch literal 394 zcmV;50d@X~P)EEELMB1*8bv6ckViJfm@X<={a1Nb&JHi9oR@{OEuc8g)| z&d-^1=H88F(956qRerr(mcN+p=l%I8kD7k@oB1%8C&Q#}vl!>&a#AsBIR}M&{C+%@ zsX%c7Pe=WHxH>GmJ8LS2g{IMr?@ki1VgS&C&BuHH0NCgAX-#`u&svjc2GnCn!jKzI z^ZWI-&M;AfPve_L@+|<-gatIOj}NK=uW2qzJ1PL^xki$bLL)J}OAupvLfX9mDK1UA z$vb0M1e2s)8UgJ}6D#&X40*e~oeZ>60ChC^!_f_Bh%XeQE~J}g%%}NYi2L=Cs~t!; zh$Om_l!vaa&zD*NJX3=HsI&v}G{V9e2_*FMU_xi2?*M=Z!vM# z%bG+{B%@Yd2KB55cmlD-+6e$!eE2DO0A(|5(16ZZ^4eV@e1UsK( ztKq*&2H{FbI#0cDi&MzH9ohG`#nDg<&vH5c5SU_`&rj@gUiF7U5!?4*zfpV zekU&S@cnY_&;{N@vbP)ic|NfBhb^nB%Fgyz>}02K4oIp7nG;8Z2426n zFcko=x7!}$>0;fh04|CQq8s8S<XkjXk*#tTXU8e#ed@xhzRlX@z^vmH~?2k^Nv*^ z<@=B~mFDrE_duJKSEX7`n$=X`0%f=DFJ&>3Vmww|B1s<)$Y-9DVmuuGS!GD-^sJ>3 rsH#HEBB7{GBZ9>^3El&JtrGbKK9vOS?@F2N00000NkvXXu0mjf#cj46 literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/berries/berry_gold_fancy.png b/mods/tinker/textures/blocks/berries/berry_gold_fancy.png new file mode 100644 index 0000000000000000000000000000000000000000..b6b6086eb496d9230b4860416792089285800c9a GIT binary patch literal 315 zcmV-B0mS}^P)&`f%w&N9 zFdsKvW!>5j;8F}7Td~iCnQT`WlYT0wyjK^m&BuA?zLg1cl&u5_^rMR^HkK8*i_3gK zr7#G~@)A?+d;n5n(PBSH3{0wBbpzB&-6??e;tlCXf6W}9Nc#W) N002ovPDHLkV1hc$iQoVL literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/berries/berry_gold_fast.png b/mods/tinker/textures/blocks/berries/berry_gold_fast.png new file mode 100644 index 0000000000000000000000000000000000000000..4adf4ed35d288346eceb27b0de9b646ae7a68d7b GIT binary patch literal 399 zcmV;A0dW3_P)Zhm{1k9S8Eqn2|} z$j8s>wM+$y3;67KBkyna%BGh)6~jW)XvViE30N@z=)s1kn|}b<`(j+v7SF@RB$@&B z7?LpLhSU6dd#W=`)Zo+jrjdLDKr~?i&GC7+8t|Itvb3WDfSzk4DJe7(!@C4ArYEG` z3y|W{q?^1mhD9(*+NBZDwluL~AHiT@C1;8^U=#NS}AWtJKoRL66KMy8!Ci)HlXftX&Wo@1!&dAVC tU`Jf0oBDr=OaRffiy{U3!35wEuwPqF7ZkBTh(iDX002ovPDHLkV1nWfv*Q2& literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/berries/berry_gold_ripe_fancy.png b/mods/tinker/textures/blocks/berries/berry_gold_ripe_fancy.png new file mode 100644 index 0000000000000000000000000000000000000000..c33e9ba5084f1e149b0321d4faebdd6c9748b930 GIT binary patch literal 723 zcmV;^0xbQBP)@_C5dr0$@o* zK~y-)U6W5plVKdkKaak{4VhqJunzAlWln-h`y+VC><|v7JW{ zj`-#5mk%VT(g3)iU>PPRCJNY`#$lgAG4v`$x0K93o zvPn#)^ByGTGzztHV4U8BjE{!^XlV~3mR_4|j1h)e{oOGWz3lqTA=Lo~wm&IcRSs6N zZgcV3pf{gFa>OG)ZCbS!8#f-`5CFZM$a{D1pp;dZKqaf|nf#$4j?!F>O{=ni0VGE} zaysIdmoHYCJuwn1xf%Q@ieL2(IOrHw=@?cChr?oZJ%dtKLFD}pd~KTS^4&gU5bSYF zisAye)sms^*aE>Gx7@VdAeO4+{8c~OJ9{_|iWKOsmCAN@pXGN?h(^y~#1#r&B9^K| zt!q zR@XC}Jzl}!{Vp0>trZT3!(uw(mjDf|dHwAzE}582i~m2{K4R#T%e4Ri002ovPDHLk FV1g&uLRSC) literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/berries/berry_gold_ripe_fast.png b/mods/tinker/textures/blocks/berries/berry_gold_ripe_fast.png new file mode 100644 index 0000000000000000000000000000000000000000..f0ef44b33e4d516f34e62db45d22e086208e8d28 GIT binary patch literal 775 zcmV+i1Ni)jP)dPXbZu%nXrVmVNkR%j@(Firy8cZWruKd^*e$-kQr%s-F?%wz1|2+Ty?|p=&a$2(c zZacBD0OqU$Y8zTul#|Nqp$VM!Op43h{HYP&B@Cj#U@*!V&v800pF=bm^#E9GD*;&T z$YL-U1)#Xxjoa-eG44VLeZ%!QAKC0@o=MT{t=o_2v}aPe^C%DRUcj}jf$5n9Tgq}N z%ufeU#ovb`fQ)@jBLJ;!9^MVd5CNR_Oh)=|a_xK#gKu8&tS$|JUj<3B$Axn^n@dIp6A{qvI^%)l=(vHLA_} zFF47lCmfkVw)$y0d?^|^&XDsMSORNfvf2Qs# z8^gXJ$kvSu88uYn^;sw`cQYBEMKbAG>zq%%Y(}Wtz9cyjoh2$bRI#VI1h3Dco;BMz z2P&X^qdyc!w)x0NO98;^+oTaC#=RP-Ka&uSOkuN1i2hIvM?nSvlkr(~>RcuU(8QZ( z(vxD);~SblT$Gc_WPFyxwJR`ZFXLqU?f;m#j!7z1+3Y7ANia2&Kr-o-MOs;yNk#cW zib^)~VdO_I-eUXF4mn1>V%%|S9tdA%CJPLJ z<)rH>&ssl#+rD&c=T$DuWV^zck5WMugSL2WKB|NJRwm3*wi+bRk1m?nSXSUJF7pAE z!XPZmOH8%%0Z55Oi~S%mFsXLc4NxnMy9$hrY3GAV5;fEs!))ve*1h=Z_mZe?1+bFr z{x?32T6J^g>;dopjgm80MmEcK)cBMEz;8e=YXQJ|5onKfrvTQAH=!7CwW~03T>t<8 M07*qoM6N<$f}9V8pa1{> literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/berries/berry_iron_fast.png b/mods/tinker/textures/blocks/berries/berry_iron_fast.png new file mode 100644 index 0000000000000000000000000000000000000000..c651d6a3532f79f6b187ded48970c9de855666b2 GIT binary patch literal 397 zcmV;80doF{P) zem<9FDo|X&(}V52pEqSU7yA{%Lepr*_a_NhF#zbnX3g*q0Q-7wYufwWtTTybKs|;e z47uSn*UOhW!$b`}jc*#scK}2a7SL?ZM%94VG?%3v6#(>HBS}f2kr>`3h%r4O?OuQs zmnPlhoiQweNzyKjfcB+{75gBDywT=H23jeAI-309=ms>z7m86A(oHkw(|j+){rbq& z4x}4I5`9U^Ls!@5ODzDNDM5c!+5veQVd0Df68d>Cp)=8U06?En=P7IR6mdp|b^<%% rGTqewOJo9wu3Z!<&<`d6mw^2OJ}?47b3i7P00000NkvXXu0mjfVAiYg literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/berries/berry_iron_ripe_fancy.png b/mods/tinker/textures/blocks/berries/berry_iron_ripe_fancy.png new file mode 100644 index 0000000000000000000000000000000000000000..8e0c9a30d0e78160ac60f9f57c29a4d25f0e21e4 GIT binary patch literal 356 zcmV-q0h|7bP)6vJx_yRW&17k6{#KcfR{J;g5TyTNhM_OyJ z$F^J>nqhaRtE;Meox8=~ekI@QPr>OZ(liy#QKuqfUzLw~;rT8eF2_wsF8)7#$?t9{ zhxJ^%_cBb%(rXq2z!Qiq)=mJ>;@x5r0F+I?U6NKg_W(FgeUPyov_cmoE^0B7*(9~R zMEzDP00Dp#7d4qp)X!QiShrCK$!sEknq|?MDgeO9vWW&lJELb(y~}!;7))acOw}69 z6U&rfscMs-%`A-WWqdks?usJ257yK$zWcs7-7MP`-E0w?YCVbbMkqxtVtM!%Tvphb z+ai_+#&1{o-O^}+u{KgKoOK!?yux_Kd;O+tab5xMC-e_GrBD3;000015QML^5EUVkpdtj(6pE<~cBzB|No!?mT5Yt7_zQf6Sfma%Hfbys#6MtRV__lw zk(F;{9_M0;;qqQ?W@mQyrOlOj`+U5!xAB>u{Z7M94mNCObfC6e^gXSetkX4nXMzH~@)9u(G%EI8SH8)7iHxo4hRSXXee! zCdp?!r%CR^AefVtac&y9w5{y&+&_z-*F3x83l{iP*Md5frCakr_%btDU;rGe%GD-K ze*m|>cWl?L6K1kqVeE@SP}?jMug%9ex^HE|9A#TT0{!UX9~;XG+{I-+pi&rwWqFCI zc0K?pv1qX$BnBqcuDStgrEyn*u`%s@P)VYOT4R`veZjgH-|}7()vW+llHLEtr%|hJ z&YV5q{naQrb7f?+Y)5~eG647u=w&ScST6$YvF;SWdhrI15oEo1&BfaQ0000O#6{#(bLZg}7fIx!QqrgGiz; zNqOk%`h2Mcz%wQ2k4ifrPa`axkw8K}4<>Xb`VIi-GwM8LZJr{|$k0w;M_i_x`hST` k0MWIJA_e-v1mF^|I|JA8&K&@w7XSbN07*qoM6N<$f;uLl$N&HU literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/berries/berry_redstone_ripe_fancy.png b/mods/tinker/textures/blocks/berries/berry_redstone_ripe_fancy.png new file mode 100644 index 0000000000000000000000000000000000000000..331e3fc1d3fc2450fc85c483ab2233b60c66539f GIT binary patch literal 308 zcmV-40n7f0P)gXSetkX4nXMzH~@)9u(G%EI8SH8)7iHxo4hRSXXee! zCdp?!r%CR^AefVtac&y9w5{y&+&_z-*F3x83l{iP*Md5frCakr_%btDU;rGe%GD-K ze*m|>cWl?L6K1kqVeE@SP}?jMug%9ex^HE|9A#TT0{!UX9~;XG+{I-+pi&rwWqFCI zc0K?pv1qX$BnBqcuDStgrEyn*u`%s@P)VYOT4R`veZjgH-|}7()vW+llHLEtr%|hJ z&YV5q{naQrb7f?+Y)5~eG647u=w&ScST6$YvF;SWdhrI15oEo1&BfaQ0000O#6{#(bLZg}7fIx!QqrgGiz; zNqOk%`h2Mcz%wQ2k4ifrPa`axkw8K}4<>Xb`VIi-GwM8LZJr{|$k0w;M_i_x`hST` k0MWIJA_e-v1mF^|I|JA8&K&@w7XSbN07*qoM6N<$f;uLl$N&HU literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/berries/berry_silver_fancy.png b/mods/tinker/textures/blocks/berries/berry_silver_fancy.png new file mode 100644 index 0000000000000000000000000000000000000000..ec07aca43066d8b6f5eadf6750c0da8fb69e8380 GIT binary patch literal 613 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 JPDHLkV1i%Iii`jN literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/berries/berry_tin_fast.png b/mods/tinker/textures/blocks/berries/berry_tin_fast.png new file mode 100644 index 0000000000000000000000000000000000000000..b9c4f997955add174dae40fb76cb2619968d8126 GIT binary patch literal 393 zcmV;40e1e0P)32#Q>lOn+*2;0I<#SuBNSCC#^{|1L`p(VaN@q z`StNsXPBtLr}0fA`4)g^!UCGp;ZZfq*GN)QXe5Sr31Uo7NV^vx#idC% zd1nlZV3M>;BcNSrV#Pj)A@6Xzmw{FappGVgIJyB1@r7d4g>=)5`83}PalbxtwFBt} zkwjOL^3c`w`BDpjXG+i?m3Ba$Mp!r_frNe@Oz2GX9RSc})OyO=JVl(5p`E~vxJ)5dG$YP>MxVw2L%_IH*etf*nesp{{|rIywo?nVcoFzr?v)x6;AibNY_l*Xv7i zaC{{B?%jLuE+PEKu3XE{+oRwN6jfD;Wqx-d#lxjculvV$@v#5QHM#irBbDvTM81|+ zl4Y4Zr)M(187ROJh%dHI0I=fM$*BSuo5gr2$*^|-_%7~MM!8C~3lbNt7|CpI&rc-k z_gVo60GzmJ$!wy2*6P7#qrN7yi2!DnM`x-403**P8VK!--b%HW)tDGeV+l;v8_W}H zmEfsblg;~+j;=92n>Tkwk>3Yzs*bPTmtdRayP}&fVpF{*aoz}{$VDs<|3YXBKXYHi z^1!%rmAjV45{#{pc@ezR0O1wJGv3=bV~g_-Sm~XI0jL=e00000NkvXXu0mjfa2cWi literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/berries/berry_tin_ripe_fast.png b/mods/tinker/textures/blocks/berries/berry_tin_ripe_fast.png new file mode 100644 index 0000000000000000000000000000000000000000..24f72674473b112dc1cfc6525b48500a8e12bc62 GIT binary patch literal 392 zcmV;30eAk1P)%+~v*e%5#uyKbYSrge&CKdY*$F*#}3^mNb8JB8oncj6)s zU(XYVF7O`G_fy|K?t1nzZd+NFcH7^!;bFr$AgLN;P8_Kc0wUk{wp>7N;B}j;zXITO zI`9~?>#kP;Tof5ZH^fcKpJ&C1M7StKH?=^_nu}fR7mnzr79exX8m%G_-B6fbC9+5L zXqB!@B%c^j6HSW|qSd^?G#v6-d($?S7A!G}|HdT{5#syfm1$yd0Irhe9jijh_aSd8 z&Er4sfi^3zO0}Fcuc^QV4jL=|QWhgA#$(kblJxO_eC9bR#>4TSRfeQa&s!RSswz}3 m5{l|HB3O)*;62dSDv=*l9pik$wu~+S0000#>>u literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/ancient_ice.png b/mods/tinker/textures/blocks/infiblocks/ancient_ice.png new file mode 100644 index 0000000000000000000000000000000000000000..dbf2bf7b19b7fe5af47cc7f405928315b1766d86 GIT binary patch literal 563 zcmV-30?hr1P)h>%B7BsEtO!bpUhrR7>E7hFqn zIp>`3d-YB1;{BfQJ?A~obAFk8&(G-C-34R#^Apv907{%r*f%!Ny0wM+`FS)hETDO9 z4erZJjK993b$c70yE}Lz37Giv*Re&Tn7jDf$H)Kjq7g7_@6!`Ju^4JYAyHxn+ZgTZ z>lk}@!1UJ_f^Tndot}!_b#|r^aO(V%NNCJPoP%y*)Xz)zu`wspsTGf|a4X zp&{u(#n6!W`_9kh&h>L?gSWRD!NB$PPt8UpRYFH3A{hSo5LA6}9v&u_z#Uheo}}Oq z)ynyPrj;8nmC#`58lOSG%;d)a4->NqG1Hau@TBZr$8AfV3|R1PzGdZhRbjn z7z=6Xy`}BxY0o+BIc;g71<}O6=X1@&&e=O>ueH9le!p$Iusob-e{f!%r=l-Y&v#H% zMyO}pG>tjx`jqT%QY*}ICTBA>#NX9PYU-avHon7F*M`YQ9h7oY7@50N3O6z0c9ejd zM%IO%=)%g3pd~$&v+Zc%k5R+@#J8@nvwRs_(~tn=7HWDKU3H^{II!WxbQ8?_z4EGRPdly?RH-Kg6XwhLxsXjp)5=_}Ao#@HyRFeHPj7b!~ zoqWQ9671nv;Q@1e#S1}R;WDdG0Cxs|rrw|+yA}1B)XG-Z_j@4n* zSRY5hKJ@6fEdKH)HZ$XpzUO33kq`fbnfQ{r(uo!Sfl{QM#!NApj zfWrD$?D{0Zan2zDS1Cqh`iXH-;0~3zRLk3`?23uu=|Ag`%mtFd}Xef4P|( ze;b?M|2fgM*NAR@gn!|6Vh>t)ve`~_zm>@5rvz3nvE{wQ(|dm3TRfWokjKBu{p}Z6 zofiTla-C*zi{p})F==T+By;h^_XZcmWvu)PXSD_NNGEFYK3c3(WE>P_#>5BN2{Fnn<%A3Ksn$8S zxUN@bu|anC8=(u*tUSUJA}uvea^Ft+z>d1#K|0ut?ceGuP3?}zHi@PFPB|`*OE7E2 zJxY@FM00VhEXtc0lE6W72c4ut-&06VlZg$8k<@MJ`8OJQFZsx*7|4Tu5WGMm0D zgtl8*nS6#N&#Np?zl_KJBEE^2SQ&Yqdn51gKgAf%4|Ytr-T(jq07*qoM6N<$f*st$ ABLDyZ literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/brick_diamond.png b/mods/tinker/textures/blocks/infiblocks/brick_diamond.png new file mode 100644 index 0000000000000000000000000000000000000000..4f7bb0c7e6e37328afe9ad60ad4a81e617cf533d GIT binary patch literal 527 zcmV+q0`UEbP){A&!sV-zcb6XW;^3cS8wSN%jk^)X zBeLHfVlM`xfxo>V@@aTzr*cSC+Eo2cV&qNeR2e5tH=p6HS6jp8m9r;AjyBO(D`T$t z(y?o1rc8!PM5Vw?quLU%uT^A|RKacTSAfscxePpqVc6H)y%Av^s}?K)D{;1Z4X=3$ zgN9`}l^tmRk%ia#j{sFLOC|CgCJ8UC(ObHNCzHa&k!qorCqybn0*Nq;OcHuJDedVZ zgYe$<+q_&G3ye^#zj*P>VB)|>0{irjV%XQ+_|_F15BZdF{9EeV4tZdE72lAvvYW;= R-P8a8002ovPDHLkV1ngY@u>g+ literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/brick_gold.png b/mods/tinker/textures/blocks/infiblocks/brick_gold.png new file mode 100644 index 0000000000000000000000000000000000000000..31cec3d40435d8199971bc1242e27c8bb419b59f GIT binary patch literal 519 zcmV+i0{H!jP)89(Rqst;hM9MPFMu`eBCn-%WJZ2ur6G1)3 z->f~3jfw|s%EB3M-rJ<+S{Q(?Ob%54 zq*dRM0d#|Uc@u@#bxErzzS@yV*b$4a;rhzV0Fyj%8=}(1*xa)z zo{fzFH2?JT%$UK>J<=G-3?%aPsA$e4ic>PnbIWJ0BM#0(4nO0|+kmyjd{F=Z002ov JPDHLkV1k`x@BIJ( literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/brick_ice.png b/mods/tinker/textures/blocks/infiblocks/brick_ice.png new file mode 100644 index 0000000000000000000000000000000000000000..267cf6fc95c3f4e827bd7c925894c7d1562ccf06 GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`rJgR1Ar-fhZxlWJ?^CqV{q5D6 zJPK|fVdD5XFnj1iX^;rn>6&|kc3QC_ZAt)kxtXZnCF?U z>q@t6V{PbubXE2|@AZ=O03^L-Aj>jgf#=}61F(R*k_DbXZULP+&y(u1!iuQsGuo-k0U%Kn hDRW?1mNp02{{SAtkJRDMrF;MY002ovPDHLkV1l2Pk3U;&_E!iIj4)Itt}W7khRbrP8UmQZK2UB$f6*~CYXlkg-c=rgs=pWu!Iz- z7?A)mMF_ojy!bLRnR%aizeT8c^%?ftbExc^hxg$gl-_MrwY^8E zXA|klPn5Uzqqutoj+Z;Q+4ly{=2OVE({Q(J!(wlP;EWDI@^3?m9HaQz67+X>ks|+w zk|4lE^A~8UmI$EF3q!DXtRWB*+E zW>_r4P;dtV|24z+l^|lx0YOyCDb&scbisZCNFL_Qzepe+Nrv?qFt!UPLNT40JUd}0K5YnAcdyR0IYBZ{}>6g zBg3>>9UTzNwg<4vopdnUnsMoRg!Y`Cr94Kqv-f;Y?<%@rE^A@-8(=DJf)K2kLE!l} zc%r{h@+gL~=sS2jwqOeklCYv@ANINv6gTWcx%V25h8ZZ43CQfN+`a~Z+vlORudo!3 zpl0K8K7_$=~uR(E?Gm?tqB5f%QxzO zFhCr}%87G;h5@-Qw{e)Yk&!ZeqtI5)BGo*H6zddp&S7YZmT1zvFP0&C8?h|Bg?SRC!-%qn-#`UjL4 V2dy_SUV{Jt002ovPDHLkV1ng@ab*Ai literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/brick_largeclay.png b/mods/tinker/textures/blocks/infiblocks/brick_largeclay.png new file mode 100644 index 0000000000000000000000000000000000000000..05302802639e078ea572a1d5bb7d22d9e4eb1bae GIT binary patch literal 833 zcmV-H1HSx;P)K#6n%eA5foWpUS9TnC9!0vWe80L)nPhg8dal}wL(Iw8q0)Ht!gl|{<_oiUVpfA zzvX^+Ip=)B-E0*1sVJUO1NcM#bIOND`qqRWttmfl=r3P*a6RS46JyUuT)3L>;d<1K zB}+GihnXNw;xZ0n7BqQT2$*m(Xv4*b9hXTbazPP|xDEA~73H82jUfjP2OX${MJ!64 z5YEQ@*a=IhL?sk_dK~j{-fuuP?m&Imfqf=EX5xJ&s57P#Hlq|0vF6ZY*4P2zZYIDg z5_Th2d`(EKU_&h?qsoWHkO}3G5xY?t#fX_PW*iRLQIE*j@EY(&?t<`Z(ua~)k0M(t zvT~V0g@7JM{W2~&=lO^i&7=#Bqz46d`i-5OBsdyJUA8=ja5E7=B_bi`(bAhy3(MH@ z7}$kHZ9mVk%25k8oLbZqj{p0h39F7itSA`#81o`))1t_XAAJUFdURNK_F}`O#kyOs zKG-IZIiC@0_FlYq>F|jdDB!M093f+DLt4}zrGJK3T+bQWkygy8p>?Q0%}d?txq4@$ ziCyY?-b@g$#sg^0kazmu<6iuoi{XjZnh0an+JoD49FKDe+)sybK`d@YU0eroJsHFU z^&;#I*ia@l`=qEukPZl*vd%jDFmGzd1Cux6cGUW9I7rwDw2tu-wmEJ!Vu5fv>cJ_+ zQSyt};$ewEHse-m!hi*~eoGY|P-t}~sKzAh5m<%lJyKmDbHWi-rB;oI6pRCx1hp2m zs(>z-J8_%p#~GFQfxMSPW>p{ijIRz@RW<~Lx^hTqU&LwBjqhVl?D&m%=g}iWlz%3@ zDifc1|AieWv3cIrq9#-*G~tjkt+T=o1GY(3i4_X0wrcCavfNEz-4v2d{V&SQ&0&}N z50p=p3mPCOTyOeJ$hr-xJU3l^$dltDxn5!iM?+3z$$wEfQ*^>28|>gMldn+|!XklM zpbpX|jjHVo_ltbE!mpYUJE;kcx_?c3NeyJoU6|IjQ6C!2>f7)Sy3!TtM?_Jd00000 LNkvXXu0mjfFdBQ} literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/brick_netherrack.png b/mods/tinker/textures/blocks/infiblocks/brick_netherrack.png new file mode 100644 index 0000000000000000000000000000000000000000..b83edb8a9bc2f712a71998a690ad1b9a72dcc658 GIT binary patch literal 729 zcmV;~0w(>5P)Qv&;WBB9T+>3iH6Vil8lgcW!5}1$y2tu_*SFVQk1Uo_L+84ta2>t9bu7kKKe1XBh=Mi3E=H zAsnSrD9aAyWeJP@{Sc_=Bpt!qTnampArAIsc^OwTc@9FL)Sc=m4p?W4HJNwWe*#dF zC~d{#sA?e&cC)fvb0h-!HA4389SGEkG&nWVc$rrC{k0Lpirf9yNJN`P+KVeFD;_Kb zgAj;rMb|k%DJnM9B=Ao}FSv+)?5EiKTQbr;jqm}qK3oLtz`qAY5Zx|ba(AG*O)|!c0`;PhGpy18fv)B%;_2p75 z1YpZD;_dP!I?HlsQ41lyXXA73_orMGbu5N2At=Q$pDv|XYa?Ckw(sHxh=#tS(%K`j z6M~*3X+5#11VvFv5)pZOYV-P@tdZP{lRKw@n++`wgbW>FcD#tWameRQqHlZk6ht%@ zhY}1r1Q1oWxbWK4o;bHJ@#b>JYQG==!GQn#LXhq{-8q1SH2&9}D75vnF( zB1Y+SjEI=lD69*HF^#MztP4tm0Dp#265kWCZh>AD}6676>iVLF)_>%ElQe#>Ii!)u*U3I&< zs@%f4aK6IAW4>bh1mJW~j>p3)+$R!Y06px$>>9M8VU(c4`5|N@fm?najK~g*p{*UL zTktjOaWWa^B7vbfMAV_bvVTQTgt9HbpTMg**JH6IftNwwn8AqPE<9nMvt}fqVoYE_ zV3W-jhtJreW5I2h81hlAj{aqUa}D&i3KXptHMoRjk(C{*E~w(8{bdGfMb5}>AhTvK zigAmTzWd}i%!EH1?t_miJ_e=NwRgAdjdJRH#q4`^&;{<@iuhxEgZ5gMq68+^g{g^+ zZK(DoFyQkApP+1JCe*XHE8RC`ND;d>WV*e?Amx1lW$}X3$n1uffu3_m(2cr8U{P(v zcQ>65-P8iq^G6Oe52{DUE28G$LIS!K3aM0h5($)XXo7A~f8}@vr(O{Y{2vgsN6-!e o+t^|YTyDc0M0>S0Gm-b~U;R0_5;f~ArvLx|07*qoM6N<$f|udT{{R30 literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/brick_sandstone.png b/mods/tinker/textures/blocks/infiblocks/brick_sandstone.png new file mode 100644 index 0000000000000000000000000000000000000000..5b4b96d4293c9eaf09ddeae84d5759c3c61b09f0 GIT binary patch literal 729 zcmV;~0w(>5P)Y zaHeAH=(viTl;0wDYB=0`1m%9-g40(K*+rU2(*_znE+X-0Ex!(n9>#VVJ~i~L(%%LZ zK`ae^Uw=km>4-)}^xALG{kDWrPs3%jfnT$IOq?q0ZUMegqCo{jgqE8{!wS0XS5R(} zj{<2-knDbrkQ6ZNu2Hdu@5#0l`h;j2)e#JJ;-rAFP4%P70|)J+XL8_foEaA9udOGN zJI601j$4oA8`qtmJePmcfDtTwa2@X=^*-Px*%h7n!93jq^TcHH`8L~^JI8JI35s>G ziV;aQyjX*4YD8ESmtljTmt_L`#5MEqsAlXmNy_(_cM0-#W-D}OMw{9iCiA- zm<1a|UPIvWcGphu$`tx+fKb3!8f#36adP8ptA7Fi>^F83^GLP>)fGSRq*lveSr3KBx#5L{k? zRbpFv1BP5BWN$HxHwkr>+*pC~zXw=fhRwm#7kYE%n#K3UH_m?m@mNJQjTT?|00000 LNkvXXu0mjfx86*` literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/brick_slime.png b/mods/tinker/textures/blocks/infiblocks/brick_slime.png new file mode 100644 index 0000000000000000000000000000000000000000..2680734a5beb670556ad5c58b138db8c85d07572 GIT binary patch literal 588 zcmV-S0<-;zP)x zURiV}4%s&jxebTHM}Lz12dno>>z<1%5qefF+7~U3-ZC)sdgX1T4@r;PS3&5 z76Y4BjT!91V~fT)almxKgTTOMBvHL_&}Cnz^sn30L9voXy8O;6Avzh|_OSNic3NKN zQ-_90alj9Mr^v{`n9hgAxcDW~rV;jxC3ZZFdl(LCc~+(_Mq+dnru|p2ph-r|uY>p7-|?vj!(cJ~nOq z7)!euO#IBCv?u3&M(0o3lL)2#SaqQnfuTyQr;d?zvj=p>y7_^ro_k_2QH}jFsZmO9 zLrRjKng4AX>uvkvfPGSZ$Y3Xxb&O*_oTP7SE6T@%?;TpC-tk|DRL`i4NEp4A0Uy%= zv!F8_oyfU0TPq=qjyuvPne`+d$~s0Gj8vk3HZoUs+QhNl82K%ykNK~3Ey=&I>>W@x z{Rtn-dan8Ta^}6yJk9qFM!v_owjGZw&P;n+XFcadXO7Pp1ddFl@ZKON%c!4BIef$G a1HS=Zy&S-N9_0Q20000uA2rcnq6ZKD2#p#HqM#6s!C*oGu{3RgLQ^=8`%OAz;qcP!&YRgcGtcdI zI|;F=s{MI;1n%PXM$%0wg~xUCO`Iixzp|3ys?aa^$#Qw0&LsCqkq5D_IMM%fwU)-i ztGJ>pCGi1*AG27KIFn#xiXHqfR`QW#a!vsh@CreaApnX|*oud*qxLh+nfFXr3JYZ+G2gg}Y zQN14P9r>u>fpCpUy>5du6D9Sa%t+t97&3V+^nh)_eB<&usMD`kMgl{m1!S5dQ5e;( zgs%mLfmt8|0{wZW!!w_RNe3-NfzNH{gM6t4m^wZ&WfZV>)l8n}MxF?nFS6UCiOR(n zH|?G**J~O3-OrbW%(BJaC*(Yj#^Ttk!S+kZX`vH)j~KZ3nwVyQ@=9R=32eR<&D2+kl{SXpe_HfS_bkD6JetzxPMZ+15RXY>JM fNQ#~SGXVELy_@t0(|`2400000NkvXXu0mjf@nCk= literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/brownstone_road_rough.png b/mods/tinker/textures/blocks/infiblocks/brownstone_road_rough.png new file mode 100644 index 0000000000000000000000000000000000000000..df1a8aa2cfc3f8717524b2cfd39c3c0695e966a9 GIT binary patch literal 846 zcmV-U1F`&xP)Jh->M5K06_HBd@B(Gc2!4 zuV18DDr1it*j5WA8|V39$70?hoOQXrvWw19K>>f|kd*{C zn-Qzf;r@P25ST3I2FI^gjE3iwYVw8s*2gk5=6;8XXAn-ibenlbMv+YBg#BTHp(hy{ zHNu67ccIhnDil)xP?4|4o*wp6j)fzUy>S(*n?;xM!fBhaQzhEijO+&9q(xgRGI4tN ziyl|&31>-3P*Rf;HH}h9Q&Ue-Y8i65QwnlfuO%reDL#GtowAIqluw|R6J!ggbkEat z+IeET+Z8|Fj(q!mN3?W#I$X2f3KPOd>f|GD4-xG~k#92)gy&v^sUv67!0hJ9Win#06}S0NdN^k-+?&0;kXWOfOQBWb?5-VVu1;TQ zH1(?VV=DjXftXTB(X8i$tPhk6asK+_H%{Vzl1#_Z8d)^u6Qy+GeRWk~MysXXm#@Zz45cDssDy30#C@qN~93fohGT2~je1dIka|8%y)3oZJobKCJ`SA4C*6!@=&OAw1 zzG1sEp|!swvYrumEhJt8yHvx}szB3ne9wb60;dkoEFzxD(0dP1NLXqz{S+JS;O?bvLHmMHB zC^D#Axy0Bk;K#w?vj}C32U$K+=+}_MU7QatUY9!TVHVDi3Y`iUhtoFVpoNgeGWri6 zXGt}yxC2R`9M=X;t08w1iJj&xjKL$bni3;J&A|Q7;P5iUdZFR8cVLZ*kRnfJx}Ncb zb==3qsUnT~@bo8!)uBd>~X>x#zh(GpcGQx)yn&A$=EIqz+zyqGC`2W}m5^^#+MRDf@lITni@ zkc1Pz4%;X}vW)^vy@-*TV?fc38Oam^ zIgS*}!Y*~l^S7AweDG1qeZC&A)?f{C z@X0v3`ap4!Z)QNOgnWThWI(fj4@uA#JJ^woV=cpGN}@Jgy97=7j^kzwlK{6bBdBeW zn_)1KW06wQajmnrr_{Mqzorf(nMiD_@qB8LH|Uo_cPejD8JqU0wD&=8ND)k59S~bmlRrem%6<7J41t(iWEy7N4HOIz^_zYN}T5dkC z+n&U@`tKA}%pBTSRvd2TuIp9AKjz9mEdD$s?KsP4R#q3x02U|TVS5wL%>UFwQkiZN ms^V~r&Pu1i&AfUGTbLZUI z&cuxdO?mGf%J)Z0hH)tU&c2?5UR~Z^YAJla2GV`>l+*82q_R6J4&p0aVV8pEYSufY{0OwG;RUC<&kY0 z*>?D?6=Vaj#B3$JqkU8>jAwwUw!>AqYHuhBrCHz(I1g6DuP(?*eNk<^(Euo8685&H z^aS~!JgnrK!E0R%sn(P2}#_o&zulMHhvSvVnN$NPeKnOquE?etb z0jjb)KoybzSqHOGXKpHoY55u;PkYM57VHxJX(7*nOw^e(U}g4y0ndR*plqCQU@sus v^TUp64;$KZKlsL3U9%b!<`Zq} ze>J;qzlvouZ_D2%k=<`k=3kLM*Rz%^zZ)slZ*yYnqx-x#6i+|zyxzt)srPYQmXG(E zs_|G5TMt8r6VXJ`giR3EXkhD~9xlYeB}*u7Mnx@xFfP`C#;Fv+GKGv`CTKtwoInxC zWEqKI`IFw2Hdq7Hr!pWTbASPJc^Os|4D5*Z zYP-)R-9K!HvS0RPyXdAffPer4oM^8WC@|nYk$eUW3=3dHF@&-4#2%T6=tD#UPdW8X zScRE6FflNgArIbv$egwB&SmD!*g8c3(>cuHzu^rmlhrBa@cjsj6HqfqL$%WY0000< KMNUMnLSTYSxSC%8 literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/brownstone_smooth_road.png b/mods/tinker/textures/blocks/infiblocks/brownstone_smooth_road.png new file mode 100644 index 0000000000000000000000000000000000000000..1b92dda488b85547ea380fe1cc602314a175c878 GIT binary patch literal 429 zcmV;e0aE^nP)k83@iY^a5XyQ?_R5D9M4Jw}`A~L~SX-X3P%ZYDdHlw}tu-IqsnX~qq zy;d|ES7b6M%GabSpYLTEyk>O$=och&x+0@)E@1jrlHN;Nd;0BIvZ+;xXl_3y10EVj z;X9pJQnFU_L_y8Io43c3i`OKAje@~QXyOKxaArS(MrB{F3R`+XL<0vDd?O@`fMg@L z8hw?^9j!;q<`sA)+(6w%@)z-~3Kj`WA}cdm-OjA9l;8Y)10>dO_T;{Ps7**SoM+ah z^OVx_YI#=*XB$#3ZtI?ZlmHq30nHHduz>l)2t1?#+rYS&*QW1jO=hF(kO4AddC?r$ zEBo02lKmrkcK~%AVbr|{-a}vx+|>?34txg81?oD&u#=rD*lp&sB^7e7Fy!F5m6-G1 z)L@g1;6vnXoKxVlz)j|}50a_;lLIyYS*#F{3(EoCv&VbO2zw>)zIyl!#L4B5fyLSn XR;y157@~u@00000NkvXXu0mjfQEkCx literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/brownstone_smooth_squarebrick.png b/mods/tinker/textures/blocks/infiblocks/brownstone_smooth_squarebrick.png new file mode 100644 index 0000000000000000000000000000000000000000..b59bc1f4121b21ffece71219ee039b0238b1f2d9 GIT binary patch literal 413 zcmV;O0b>4%P)spU>EmQNw6^fq7`$n@u*T}X30buP)6cJAl05g3b^RBH|;Fmvg6i<#m)8fF@%ak2|nKgx+(=sgFqgK zbwi9_aS))u6NEjG0ufLn=l6RvEg>ZEC4>r8TXrg01&W(%q7-oXHLUr}ocKcpsAdXt zV^nh>V03)z%o1Gpwx^q@rQkcCUs`oXF>WJIN$H)x7xFW{3ugzoc7iWtVPhd0A|i+&qIeC6Hfa;9eiP5` zWOXfu{dX>B=A4;m`SUd_yeEP0(nmMUb)W5vZ+L6n{IkiU{VT5gc()NEoYS3lX5+1! z>>Y1!hGKlOeVfMt0Ffe@Ku83jERGGWt%hjjt7pkpkRmd+H?qejBl9l`>V#F#kF9|R_@#k3izfh@u6EtD0ya{;Jjnq-pvb&slN0W2V8soPRXY zCVbx1(|w-;h-IAPo%+C9{d#pbk>{%2diyh;7IN13z5#+CgM*6QYl8p)002ovPDHLk FV1k^6xGewx literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/fancybrick_gold.png b/mods/tinker/textures/blocks/infiblocks/fancybrick_gold.png new file mode 100644 index 0000000000000000000000000000000000000000..3439f6e25c4ad80a482e53a048bd7d44f197e067 GIT binary patch literal 388 zcmV-~0ek+5P)+Kv7w$D-zXi*d9M z_obnjj?6r3JAQ8uTtY!W#W*^oKtM&_B?-KHAj7yoBVdBIpB^nuUQ5k%fW-MnRnSOK zl{o+UF6g|;&YXa7541=y)_0zSs9Eol>>m85S)OPT!XZa{V`ys9+`ro&YaFlk#-i4^ i^N0Qyx+9Ub=I#eNv8WUJeakxl0000%b+@5Vki^0>?&t;ucLK6TInoB?c literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/fancybrick_iron.png b/mods/tinker/textures/blocks/infiblocks/fancybrick_iron.png new file mode 100644 index 0000000000000000000000000000000000000000..24cc45e5a63dd199eb7f09c72e00b282dab89cfe GIT binary patch literal 421 zcmV;W0b2fvP)l$gA%6vZ8b1gtM zHbZbB%d(F>d)>|*!G6D&IF6;&YDuTlQMB7_iK0mQ{k~pgB_=UR5}8h?8oSr)CE##4 z$ap+f{lw4bvxdDo91cGi5IYiVg93hn4@>w}fB^ac>P1ngi5TYt)1b^co6YLjQKivn zNVC~g2JiPpz&r!m1rq%(Sl_{Jw^R5MFqzr<1x|Rn=Eh>n{BDADE=@UkK0LXf)DFAoPIQ2t8nC44nS}aPEI9X6NVR P00000NkvXXu0mjfRXN51 literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/fancybrick_lapis.png b/mods/tinker/textures/blocks/infiblocks/fancybrick_lapis.png new file mode 100644 index 0000000000000000000000000000000000000000..19afd0ef6418ed333abc0c96ea0d17b0b5c2a63f GIT binary patch literal 733 zcmV<30wVp1P) z?MqW(7{_hk=>O+6f)w%ECQ2KD6J?HFxe)n}<&m%NG`vUp;J2a;k&~$GX>PP`C zsrQIK+(PArc3kZrgMWApfv4NJHu@S`?{6rba|rbn;F41iw9HFLkpiT|Pxv3Npz`Jp zPAPvOX=||6+<>L+1I(>?oT%R8k|GNbLklPiZNXOC386l-j`H|E1H9=)NXdPO`ZCOc z931}J@WduziLJt{erCYQs;{uLtT2ES3UYd#Uo6o)ORB2B3%4=^cVLj;&s<8B)*kf% zSh1cpYLyiVG_^wi#t>?tO#EGYP;Wg)peqYCF$3j(4$8nMhLB>mVn9ft5F9U{Jha0A zn#>anJ7u9=wnD#TLk#EGGbugJBJi8mysA}jl$LCA%!*#|Aq=}qZFd3EU^tz zE?n#xD*|fgiy;}AcsgbnKq|})TLxemj^-J*Nfs>zkoNIKB9dL7g0*>`&zv$jJaex$ zQd-kA@=g|Q`ZTJ$Cpa^K7T)$bxT3EhCl8L@0cucMAN}{;5t)Qdo#4y_Uviuk*n`t> zMyFu%ZJ^Az$)`XK!O=ySY79%kNt_P9;V@nL3pkp_IWs|u%)+5&`0S|&a#+-$r?weJ z5V}AFuxnEc;SA_eS>1N5=&YS}J={RKSkJ}aywZ)caz9*w0aoT#2Km2#@RS0)#V+K5 P00000NkvXXu0mjf$N@{V literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/fancybrick_largeclay.png b/mods/tinker/textures/blocks/infiblocks/fancybrick_largeclay.png new file mode 100644 index 0000000000000000000000000000000000000000..2925dc3fa2eb8d33d81cbff85775933223a29b45 GIT binary patch literal 876 zcmV-y1C#uTP)@K?tESF{31Uk-W+i^^qC`4mTOk0^m!89>8QPU=q zNv8dLCkOJ^?)&chKKq<=evfd|uyI|n@Y%`Yx}L;k)56EPjjLuF<8lJ8S1i0NTDYv4 zSQcIQ)XL$ak;2Dn4vsPd;ihI`xDdl>R>zBM1dlU8Jhj6(;d)rmv7PYaXMpc7nJ=nE0tWmnqRp!yAwubLJIDQvi z*G>G!KkjE`JYP&;_*Kk zuH>dVcT5r6)U~Pl&`$->XKX!!@^>wT{RD?8t?(Jdp&jCkL?~IB;x4RBIN*?U6wmZR zTjV@Y_cAA~K@TP}e&n}yfceu4N2Et&pi63-eE$mZLI(B>?Wq_50000@j9vEq+G_4k;L!X1}27w zae8k5bG5?z{pl3GWYbWtUxU;s7EzB*VmA@Qy2pbTUOQSLH{PUF27Ft{p`8h1J03?f z6+$zeM$KbI&f~(8%?61AK4=jpZbw24`?0cu<9v<*R1rO*IQl42T_jm_-0cEVqxUf_ zk6_v%!w?l@oK}7~Wwriu_C%~H5lPqy1n~6sEl8Bf)Tj3MvmfU*Q&#f8`yo-ejZ_K;x&~iQ56F|lL;{6zH(v-(uB+aN+@-fOI`CK5iZ-* z`N=R)2?lX2fPY@SeO##2E zRnV*yNA28qTAT3%k-irUYz4g7oD8FtPU55X2y~W_?a&>g98A76Vo@wuEWFH>(k_0W%k=&3O@gv{U|8qok+kCU+X_Okv%UB`P(!~D$~T-}l^?P)q zX;0fg5QhDYqX{Nlfe@%#5YRy4+m0QFgxHQ9=Kv%c+6t*sRiKneErCMA_1E9dZfM#M zqurVH%+CAlSZElxXc`X)txNd&Ijv`?+vnJ~2WVI~2%SCx?E;a03q9|{)4m`uPSG+S z;7acyc=|O`sWc`grnpT`ikP0BhA6Jkx`^@dB+T3a-)ngf_2PhH3Al0>B{HEbeWpYa zPT`0LnN3YCkj?Xg%wJvH#>~tz)a@Et#owctO*w+JRe>P~Fr_;5f)7gyp}ea=->Jb? zn-mY|<^YZs(|0~1^O|?V%#o;rKs`fj-Jw%@hNU!7p^hT^J3Rf281&I95eNMeq0xh* zb`TlYBrih+mXO~lL)dp8UMkMh2QjMZDQ}%=XDd4!$`Lul(7YPO^jriXvVIZ76j>G} zt&JKH|I31zD9%xGlJ8A9MB5pVpP&mwScMRRD;=Y(cCn|Qkc0@Hd4c8mEen+-D`!ZWVOpW$&=A>~J#Up+WL{!V{)X7@Q73oQVnDGQ{-1IA7-yv5pz{NMQ!S%yp03Iwsv3#3OyQmG}rPb6kxD=oz4IWlvb zqXPe4Ce5Exs3<3>N*~}V$H=WY*mz^o>Y}W4NkT+=0~F;$RJD)%-Cex{X}t<%%R`x% Z`~jc6lke*)1!VvL002ovPDHLkV1nm&PXqt} literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/fancybrick_redstone.png b/mods/tinker/textures/blocks/infiblocks/fancybrick_redstone.png new file mode 100644 index 0000000000000000000000000000000000000000..968739b3a60e14999a301641adb7d83e0c1e86a7 GIT binary patch literal 314 zcmV-A0mc4_P)4VGjyvHVK)gyP^RT{CHrRO=qU*?szbO>`NdBO#eh(+4;tKl-L8)>__C) z)-ZG-f5hKG1VM4D%OFU|o1|zSm|+nbYe2`othmwMb=q!4Zv+E%kw2&?eu1Df4;C`a z-@G`@mhXYhgCot6G#6KAcN3-q&1bh(Ua#Fvke%HocN;z*an}0p13oCWlk)UcdH?_b M07*qoM6N<$g3{oCjsO4v literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/fancybrick_sandstone.png b/mods/tinker/textures/blocks/infiblocks/fancybrick_sandstone.png new file mode 100644 index 0000000000000000000000000000000000000000..a226947430e4f4fd80cb647f8875187c70f10d04 GIT binary patch literal 694 zcmV;n0!jUeP)E+zp!|A<31vUBs%b7X0 z=)+|1*)x01npt}XZoOSR^fUM|JitlzIqrLD{2m?R=UoBcx*6QIC_X&K{U8S=KZ9R) zhZDOlzC(aFZasyzxq?!V58I!}wsD%BW`Hcr z@-jR#fy@zvzJZ8c%0pLE_hBv#C)V4o^S>3hw#Qgn^RAvD7*+!kT6bn2Ij^Nam(bQr% zJDLLfS~-kva}(bO8F)q<`c)LRx*`=B$gWa;eNET|7~M5KlKDNcU%y&}aUI6j){Z3F z)fjrsq+F1p>y)pp`7Q7Ts}iFj#)YEzRIPduLXC##nJKb0^xf2ifvd;SvXYM~=;aVm zP5e#BqHV3qMOWiWaWtqs*I1RF8KCEGqwB28%mVy?G?J=bS`>=xcN;09zKUz*JvvSb zW@U+3g(d)=wSlIQM2Tm>FRf`rN$ZF(V87#R5+ef9R-}K=UX`5j4DNehFz~i~fJdEQ zNCnpTyf7=lv*Q_gzJ>iKxX8bx83j>1p2m4@3MU6oQ9hsZXW*N!Gt0<>Pi;pws z%=!P#*wfxZdB*71LhH>!QJ(>4>G)hP(jB<_uwWb>wh6aa4CQ-bGR6TU$2vrf>S#{=ykaY70t1=8`O6X~Wo*#(BjU331z?a1$kV#acq zhZe79aan4aSvBwIFD1~()e;LAAQlGSQAf%doq)y;6o63)lu*Gq!-zVdtCydQ1$7_? z51gSHEW zxSYDDEZ|V?(;LYD1xd^L&7ecO8YsDN1OY|aV% mKOh0~>ObhsBk}S7M0Y1+ttO3|Q{o5!0000kBvoi5eJ7ofR8=Es@bY+evV{*iN)QAP;izV?$2;uXoKK{ zp9evxk6(ZwRb%@nCEz83YAU@qDYr(Lzg_n;ta*32$Q%;aU|j)}*aJcNc_b&y`3XUS z2#V-Wfc0&YB_u{JK?1EYF}^4PE>ay)YE6VCQ~m;D)tyKtq}*L7-+!;A8yJH~*2nyl zfctfCV+d$;>W30!8$Gca1F;?la@QG~IZ$=RQbdg;;E(zsZR;E)YqpsL+GAXzw4yuJ z9{&##csL`zf#3uW4(Xl}@ZmH(t1J?bkZtwF6v2E0JlOD|Ih1?*RjjAJ zAKztJQrC5?D2hn?(a_*V6p5sX6hYXN2HGEn zAsKYh@;r}MnBzER6NGWG4>XyI5j2y_=w^ZfWFZqUf-q@DLD2kpo^!!8O|}92j|_xS zazF#grLJp68HRz1qM)W}7}2~j>hNT`EX%A%>nj7zsGl}T5@-cOsw&GYh&DtN$Sp44o7~I{m?SVXLmu+}F7w;D w0nKP)9w z-}n5TrisRJyveq0()B?QkU??VwwJ1^y8UNaMorVOJkKLt&jz>=heTo`hajwpfv&eK zi;Uwq1i=le>zZT@LQx#YEbIeKy5bHr)06R;iR-$Yg>(SZD+A3a2%0}h67FaihRfh5 z17VaLU?8~^MZpKUuA?+fsVvK{f#wGSTGio6cap&~v!4t!qaJM-h8*a5p0sTnEz837 zw|4*pFycl%TA;uHH{t?8LOo|7fnfoRD2C8>6h)NhIWwaJL6po44#+Kf{?E7YT)Q#= zlLQ7ch5j24AiCZp>Z0Zjjxec!*0Rgd>Fc;nJ~+s8pXYao08vl`jT TRPeTI00000NkvXXu0mjfbC#mJ literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_black.png b/mods/tinker/textures/blocks/infiblocks/glass_black.png new file mode 100644 index 0000000000000000000000000000000000000000..dec24b76412ba69d83dc843cab74b3f846896e01 GIT binary patch literal 98 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`nw~C>Ar-fhXIK;_3GbZI*!Yl# vxkFGyq@+#8ChNco#>H#_ml-r1&DagTe~DWM4fY`_{j literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_black_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_black_pane.png new file mode 100644 index 0000000000000000000000000000000000000000..2f87e863daaa2d3b1bcaba079c8b592efc71d810 GIT binary patch literal 93 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`DxNNmAr-fh6AmypH8q`UFks%v qu&VM(Lm;youS5a!f>|G>7#Oz3Xgo}nlG_4Q&*16m=d#Wzp$PyAY#FBj literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_blue.png b/mods/tinker/textures/blocks/infiblocks/glass_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..3c5a8a6517aa7d35742f173d168e4ad5f4bce658 GIT binary patch literal 98 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`nw~C>Ar-fhZ`6ExFIi+bz3i$a vo513lZ>!acKCEC|%+@32;LGg5qAI~)%UA0ADJa4msENVT)z4*}Q$iB}$2l9L literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_blue_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_blue_pane.png new file mode 100644 index 0000000000000000000000000000000000000000..c2c5da2808b52a1d0c720c5a056c798aae44575d GIT binary patch literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`>Ygr+Ar-fh6Amz+O5bnAe2C`> t(}Xm=x2pn~-FPKT6Ath)WU8ewFtm5L7&a{ZTnE&`;OXk;vd$@?2>?r`8e0GW literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_brown.png b/mods/tinker/textures/blocks/infiblocks/glass_brown.png new file mode 100644 index 0000000000000000000000000000000000000000..aff14855606238d0629426b330d1fc32289c958c GIT binary patch literal 97 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`8lEnWAr-fhZ^$SWwZ+IJYt^O6XR9e%GZ}KAFBoGVeoYIb6Mw<&;$T)tsFQ2 literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_brown_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_brown_pane.png new file mode 100644 index 0000000000000000000000000000000000000000..14cf009a5b8a493ce5adf0deb5aa3372c96a46c0 GIT binary patch literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`>Ygr+Ar-fh6Amy--4Q+CV8FbS tVTt9jkg6*Ufy{2a5(Uf-vp6Lg7=HH}9Xzh9Ee6!W;OXk;vd$@?2>>_68F~N! literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_cyan.png b/mods/tinker/textures/blocks/infiblocks/glass_cyan.png new file mode 100644 index 0000000000000000000000000000000000000000..2951471cd630a95b03d7502d6f78246427c168be GIT binary patch literal 98 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`nw~C>Ar-fhKUn{H%Cj>Ygr+Ar-fh6Amz+Nt3l>KE(5c tX+ql6HQxf6-FPKT6Ath)WU8ewF#Npl!dUuzq9{-cgQu&X%Q~loCICbc8Z`g_ literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_gray.png b/mods/tinker/textures/blocks/infiblocks/glass_gray.png new file mode 100644 index 0000000000000000000000000000000000000000..51e5275e4447aedb979566e9091d23f6108aefa8 GIT binary patch literal 98 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`nw~C>Ar-fhcN9K8CRwy`^5n~s wYy!#m?)>z9@*t4ejaS07VHR5hhnE4v)7S9_gHP~I0cv9KboFyt=akR{01Iy(j{pDw literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_gray_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_gray_pane.png new file mode 100644 index 0000000000000000000000000000000000000000..2cafcacd660a9f845fc5761991df9cd94beba039 GIT binary patch literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`>Ygr+Ar-fh6AmyxJ3F_Ytwr(# ttHN17KflFnJyHf)2O6XqF8Q2bUAr-fhcYLaRDOt2}ljLhj vHUZ_8&igxMY_bllU|h@=aG62Ck&}&~&32F0Z)JWHpe6=SS3j3^P6Ygr+Ar-fh6Amy>vifqq!GL)u t!;;9GJ*8I~0-4=-B?_1wW^qa~Fj(w1_;@ik)f1?N!PC{xWt~$(698z@8r1** literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_lightblue.png b/mods/tinker/textures/blocks/infiblocks/glass_lightblue.png new file mode 100644 index 0000000000000000000000000000000000000000..895ed4c2711ff326a962259decdbe7e9744a1b03 GIT binary patch literal 98 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`nw~C>Ar-fhcNDz;FIiMr^R&;H vN8#8a+xl524lZWvkuu0)Fy&aZOL literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_lightblue_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_lightblue_pane.png new file mode 100644 index 0000000000000000000000000000000000000000..b35ff0168af3fb29e4bd16b4e89d4b706c746f4c GIT binary patch literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`>Ygr+Ar-fh6Amzoz5Q9t)*^X= tRpIQ%sn%}15~c}P8W_zPmdu>M$RNrQq4>AkF(0Uf!PC{xWt~$(6984O8b$yB literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_lightgray.png b/mods/tinker/textures/blocks/infiblocks/glass_lightgray.png new file mode 100644 index 0000000000000000000000000000000000000000..bf8a4dc8d6e798da9de35f088dd6e441dd5331ab GIT binary patch literal 98 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`nw~C>Ar-fhD}H`@Dp~aL%F5vL w1`QI&`{Xi}*!!gnvJR|Zykf%O641oB;o@EA)| tRX7{G+)vgt;YvdwGus`8329D14Hwd*65VRGwSjsVJYD@<);T3K0RS}|85RHl literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_lime.png b/mods/tinker/textures/blocks/infiblocks/glass_lime.png new file mode 100644 index 0000000000000000000000000000000000000000..820fc7fb65191a2f2c8935ca8eb9975bf447d358 GIT binary patch literal 98 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`nw~C>Ar-fhE56jYgr+Ar-fh6Amz^$#hsTAL4n! tG~wA3t>uBtZoCqv2?ux?GSyNT7^YjeO?>Uj8595j literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_magenta.png b/mods/tinker/textures/blocks/infiblocks/glass_magenta.png new file mode 100644 index 0000000000000000000000000000000000000000..b32c9247b5a8346c25dfc4753cac474611a27370 GIT binary patch literal 98 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`nw~C>Ar-fhD|Y_>FIiN$|NS>( w9))8|Z~gau@*t4ejaS07VHR5hhnE3EZ1k1q&Cj-|0W~pry85}Sb4q9e06qpEzW@LL literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_magenta_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_magenta_pane.png new file mode 100644 index 0000000000000000000000000000000000000000..9082586661228d44879056e3b672359728a43638 GIT binary patch literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`>Ygr+Ar-fh6Am!zUHxaze2C`> u(}ZVr_unpN>ya|ZI?y1^aLMNc1H*3H@QJ*tbAJG}FnGH9xvXAr-fhfBa8*Em`zY#eAMI vkHWF(zTbSGJP2fV;bp)eazA%|j@zL{Kurvuu6{1-oD!M<>QNnL literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_orange_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_orange_pane.png new file mode 100644 index 0000000000000000000000000000000000000000..bd484ec11348c8862e9c105f35e786e8e474e525 GIT binary patch literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`>Ygr+Ar-fh6Am!%%h_ble2C`> u(}ZW9c{YpLdZY}p4m3zJT=F@=z~Fz-P4Mcb1;2n=7(8A5T-G@yGywpAw;X-| literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_pink.png b/mods/tinker/textures/blocks/infiblocks/glass_pink.png new file mode 100644 index 0000000000000000000000000000000000000000..6f567d2a8f8beda8cadb39dc5965c5ac31e278da GIT binary patch literal 98 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`nw~C>Ar-fhf7JhbCt37y=7&$l wJPOAyi(1bYgr+Ar-fh6Am!XTX&<9twr(# ttHRmzL#N$&B}@~pG%%VoESWihks&uAym7;HwkDt!22WQ%mvv4FO#pFw8$JL4 literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_pure.png b/mods/tinker/textures/blocks/infiblocks/glass_pure.png new file mode 100644 index 0000000000000000000000000000000000000000..ff258cd873e9b8f1dda84a6a26ec065151e3a740 GIT binary patch literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`#-1*YAr-fhe|&#`zrN^W literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_pure_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_pure_pane.png new file mode 100644 index 0000000000000000000000000000000000000000..04b03a180f7d3806f9c485756a531d3e4afae678 GIT binary patch literal 102 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`x}GkMAr-fh6Am!{`}_O5e2e4> zR)w?d`}(9d{JiycVGhHI|BKmpDw!Q-aY`~UgbS4NWZCOy0yQ#ty85}Sb4q9e0GoLq A0RR91 literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_purple.png b/mods/tinker/textures/blocks/infiblocks/glass_purple.png new file mode 100644 index 0000000000000000000000000000000000000000..43627b68c63b2f35a0b37af35f542b46dffa4017 GIT binary patch literal 98 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`nw~C>Ar-fhcWi&~U$UrhLCHl) vHi2a4Q@v_MA676fX6uo1@MU&jQI%j|{E%<7z3!11P!ofvtDnm{r-UW|$srsY literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_purple_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_purple_pane.png new file mode 100644 index 0000000000000000000000000000000000000000..717f1829ff7333c8dad1ef3032e338b303af7960 GIT binary patch literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`>Ygr+Ar-fh6Amz&ExBXCe2C`> t(}ZUZFBb(eyYWhxCLG{p$W%*VVCeecrZ}(da2ZewgQu&X%Q~loCIDF28qoj% literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_red.png b/mods/tinker/textures/blocks/infiblocks/glass_red.png new file mode 100644 index 0000000000000000000000000000000000000000..0a1ae8964ee1f90865d1548b6c3088f7f42bf343 GIT binary patch literal 98 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`nw~C>Ar-fhf7HLYAX!u>YW-W1 vO(1!Gqoc58#g&FYW;fmi%NP}!gm@TO?jK*zgTe~DWM4fmu4Em literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_red_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_red_pane.png new file mode 100644 index 0000000000000000000000000000000000000000..85e7c64e7805d29e629e0a1beafc06a8164d011d GIT binary patch literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`>Ygr+Ar-fh6Amzcla!dln8;Sd t=us?c{d)!DVzwSBg9mI4Cc;Jx3~ShpA2Jqnl>xOdc)I$ztaD0e0ssq57<2#t literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_soul.png b/mods/tinker/textures/blocks/infiblocks/glass_soul.png new file mode 100644 index 0000000000000000000000000000000000000000..eb9c37949598e34a11e590340629ba945d5624eb GIT binary patch literal 353 zcmV-n0iOPeP)0t`4npq(L3IS}x*Hu%qw9_$8J1hNsv2HCwW!8U& zAX_7_Kk+F}4siaD&C+-u`~M7tG{XWH2C{;jiFc`mx(r^$nIOYbLp=UtGZ{HRae=Zp z|NjhGk-q|&0hnm;DGG5kAm}^7W zMN!^FIWsTX4@F%ND5*Q@DG{Z)F)Io~9VlY~O)(-nkm}OH|1-4a#{G|Uv-}TA2OzIR zyITCOPm4gwRG_R2%YC2#1o4})qW^alCI1Hien)>2UV8fo00000NkvXXu0mjf#7vlD literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_soul_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_soul_pane.png new file mode 100644 index 0000000000000000000000000000000000000000..57a4c7216a808ebb4584205dc57d009a69b6c438 GIT binary patch literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`)}AhoAr-fh6Amyhd*c2l-|NG# z^A36pk`rF$`psk%*~zeEW)ic*I*AKcEG}7aLYeqPjo>-Ffzdp(Te`j{&{}nw||JP5f2g-#))r9_E1r)0T%BT9; z{bvZY)c(&vCWvvf_|H(C989(WK4uz}xd7xfh9nPbvJEJT^8U{dVyj2C0lpwFSgT2p zZ2%}H7%Edj$u^*`AnrdyeO3(F22{oQ{AZY6l|h*odJ1C6HUN|=89>RCTmzyUjVLo9 z$x0@P+$sm(vb&aOI3;g qnIUffLAei<@Id@I^|}8+mIDCi>wY&P!%GtY00003WB`!sXjF8qy4({;yzkzQ-^j%?YSY`>*q#l>K-6fI1mGUHx3vIVCg!0CCVC A=Kufz literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_white.png b/mods/tinker/textures/blocks/infiblocks/glass_white.png new file mode 100644 index 0000000000000000000000000000000000000000..a6bdb276881f585c07e33b573821e23182ad1254 GIT binary patch literal 98 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`nw~C>Ar-fhe|&#`U$W@qv+V8X v4H_iOAr-fhfBY`LFIiL=zwLu0 wo516rpUYgr+Ar-fh6Am!Xvp;Xce2C`> t(}ZXHavlaUyYWhxCLG{p$W%*VU?_a=yHP2F`4&(MgQu&X%Q~loCIDI`8j1h_ literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/paver_largeclay.png b/mods/tinker/textures/blocks/infiblocks/paver_largeclay.png new file mode 100644 index 0000000000000000000000000000000000000000..64cc9c368e224c06992ce60dbf39510e4b286874 GIT binary patch literal 833 zcmV-H1HSx;P)u=If7{>eGn3#phrL?6jEv3*lK-t)s=)6p~7&qp17YAcpTEbwPmqlZY8ZR-L7)|tp z|KH=&?n85W&U@b5?|F~#=VleZZ(8`Z*1)G$8Q-sY_!O+X$u#iTtBw|p?Vb>Dz*i2#Q$k@rJFsuIQN)Z+LpOu-dKm!&zO5VRSt@$f42Crs z_q2HkUz#=!tSt8Q6nf<>dNnED@0e*E(z#-}nAq83nG4PKm+ld5mb=i~{_<*NmN}4HJ(DYsSpcJ}NcvRg75G5i5$; zu9uB%=Y9^oqJjrn62gzwGN!(cql$zfD+rcF1a%YPf{6n=#R^0`UnD%1-;ES7WXxF2 zenG;fMj79>DmXB+=#)jAEE|~I(5OHXeO}x(GnlkYbaE+-=p4FP>{8~SM8JgGCTQV3 zwH+_$q@KWZku2&`OgM}*FUUBrXn5rr=#taOlQD_f^;C4KX|xr}I3}3!fC#M!g=h_dRACFkrMFx+-Bym~tLoH;cHROF($N#Ik*hbQPSflqe@#@N}FyISi~! ztj{;DsVC>W7EWGql8U~ zZ{hu|3IS68g#u>PJf3On*_P2WuEbn+-83dkR?MYelH%byt7&+#X5&!=@vbz7wmOeC zfvhGk;enpOws;xa`aHHM(^I~YHt%fHzM&*&PvH(HaEt#NQUd=0J=y_;n==w|00000 LNkvXXu0mjfMuvb( literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/refined_largeclay.png b/mods/tinker/textures/blocks/infiblocks/refined_largeclay.png new file mode 100644 index 0000000000000000000000000000000000000000..f23fe9fd2a8fbc9339fd3032ed43637ac1648f63 GIT binary patch literal 710 zcmV;%0y+JOP)xg_P7a1XUTK zt7Cd#;zM}{sZ&7gsMvHVsj1-cz{iXZ|30u0Iwrz)9&ty|Sjr)+tC)1M z$^%QrxRJ+&tzzA^#kYheyJ{A&p!ImgAx$eKG}5H1VcRt^rC{3M#n{&|X()d&I4iwC zO6PvfuA zowc96^QiM~3Ct*L=;Al?oLed`2;la$jq7*2NN7y<0>`*ZVC2B8<|G}1o4F*ntp`N zQGj>l7{e)xIfiSJTWQ?TqgxbSq`o-}aNE0ZhB*wSH+ahEMIn)@X> zN78kTtQZ-I3rg(&fNY!krf}Q8?gn?f>Sq#{gwS2*Ad#$yxjcu*(fMx7(F~W|4V3kW~0*XVR0YxQ5 zK~>U=M5R{rp;W2VhyDfq!+srj__Xt_zBy;knHlA6A~#lhr*a-&N8nZJ$YU9Uj7Uj55xRUTqG|FBo$WboL#p4Dat5tSVN&Z+`;!mDO@-3eYf|ZwNO@uyECl>0Ekl=|I)%{@ zsUXCjnDt56e3tvnxy2~y{kh246}DBco!XZ@)P{#y_p2OF#!+VM4@lW8*l*k*dFKws z&6_l2Holi0*EAQe(os&N)rYwpGwwmM)~_g7t<+>@>P{8KdhHti>({SNRsf0}9hjeW zQ0(bpP0BnLpnC6pN_~Bl#rYMHR(B4vDqd|x!YC(`lf0Hk0jZ!W$-mdKRPWv6?NpRG zVYvi+FP(ak9mjt6E~b#Yo1Uh4`!-P_RW?()%)gC-%fVt$BlAT!6_?87U_WYC7rSEG z8v&TI+0Y~@A!q#7Ee>*7z7ttWS#%Xu8}qV#ms^+a?j$3g6s;Cg77KgX5FZwD?8Y?N zK7*w`3rX?me5Jy1K}^g$tSsv)Kg^rFuckSxPs*tJuGV?RV`n?4vh82A|N7~J<4LMm+>=dhF5PI?0p5>L>yC5Ii~_thj&B*ZHWvnzgB*4p1O*NRhlgSWy# z>Q0dz4D{I&Ww1cJ8zb0Wp-wE+v5nN5piM3QpCdiYaI9AN-G7E?;uWf3i7vTD9a>0s z2E4Tn??r?Aa)}}uBlD+--7$`ZjXE{(v%BMSkN55iL>bwtsYz_)2NT}wkc~Rr^(78J zu8_C`q`r>G)o^N-IJb9ba|b<#ovK@iE^|->CN~*;&k*f(WS+@k22m{$dm0gpad_2G z#Rg6_5yx{yE7}eratUv*p^T>7$ZZFm%~SFvEe`kDSVuFZPwJch2P_m~shbEkL*%}J zGMr+!{)Fw*1;U+6k1Xi@}q=QNl5z_XMnuQbK^_>?g!K{Y!v!B3LLO3YN=Oz39B}H4&`fe3z^8}}b!d_W1zWOVuC%El zixeFWpF?E92+?jpsJ1F7$g@jVs!^URT3e7_71R4-MJFDafqT5=D{3-=@HYd5v`T7` zcsd2M7%Um48TQnq&zJl@CaM94$N>*%(rc74-3tu}_xXZ{iJB(uO3AU$Z-|IPLR0Z? zvYD#ctv{m6ukq*j4d>=ob59{fm)q!-$5V8qlKBg?L=Y3Mv^Cs}ly&JrLgvj( z<~Y~4>SjuN#e4U_)H#Y<9h)j~l7HpT)xAiGtd17y3ZJVx@;B518N8B_{s%wfO2*QR R1ULWy002ovPDHLkV1k8lRDb{g literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/refined_stone.png b/mods/tinker/textures/blocks/infiblocks/refined_stone.png new file mode 100644 index 0000000000000000000000000000000000000000..090657d35ab2345c4c0c10b69fc3646bf5278d85 GIT binary patch literal 252 zcmVO}OlM>)nY}zfV&-}Tu(twP=S)8(zAln?Tht$HZ^P7)d!8_z~s!a)cFrlz|U|{@sU$8=O}F0000;7Jg{WpKp>J@`K(U!Gj2%-W?xYI*091gABZhL`@04^Y6AW3Ke$x1GcxNf)Wd`53kK~zEo zc(oJ@jYgxNg2UlZcqoZ{=~2Ay6xV9CeltMgU@)-hbn01=Ce-V7Td&uC-|zRW(P&tw z)A2KJJOMKP1A-7pl zjN1Y5-ooj0O1me4HZUHKlMkW?v;}x?AxkKG7SGjc)r&2c zO9!0J^ZDHQKt~8cMMy#cN{Hzq7>!2OZnvEeBoKf|6DdLhl2u$BdA(lmSAf}41*wus zrQ)+|q_k0%WzL7w=~TEVi5fw?V#;f^T0aFy91e#zoldG0r09R6r<38oR7eaJfy(dz~yrBr0@4@uh+{SkB2`fo{?YT2<6#9zu%8W zDsKnCqdw$$9(PXxZD2eeyF^r_9?%xxUBU5qED-9ZJP;9YS6ykJc aG~o~I_22HCG)oi!0000Qh6V4_2b!lK`t zcNrEPVvt?Dn<3sRQQ?V;Q=H0ah9?op3Qy9VJ|!?G1U75m``F6Kyzye2Zsz0^hI0-o d>VK7!8Jf4Qyeg`C%^m0r22WQ%mvv4FO#tETLf!xX literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/smallbrick_largeclay.png b/mods/tinker/textures/blocks/infiblocks/smallbrick_largeclay.png new file mode 100644 index 0000000000000000000000000000000000000000..bd11bf6aa1b167bc44a45cc32043c65038d003fd GIT binary patch literal 647 zcmV;20(kw2P)rc~Q6vp?Ln5eP1d)IbuU3Y0$U^itBm^g-m#RN10n{4a~#%tymqXd&B^1+ap5dX@@ z_ncDGMETaI=bW79`MvM!`_(Ap@@Wp2&#KspOZc(AjCtM0SuMl*eAN>5CCpYb*i(v zHPXz02Hw~jI>I(>yn4Qd4-Yfwq=Gy^kxr`_jPe?qnjfF5S@Z>uLE*tQ12OO_6~(md zY`l14vmOgjG(ZlIECqv{%$ezwJ{9AFg@*xI-x9fKqnC-B)%)#b!VJ6_X(MGMn{GyO zxUU2-$jA(tB9V)(9&s3aEg2XW6WC2ioT*!oG0v+P7j)JX>7$*(p@>0FCx(n^K92o- z$YC%Ng>g~Ez;rUw_FgW=97w-R2hqwvu+=!KA1$WIC1UVgm1l3+FA=Y)q{L4s_=&P+^jl*)r*2Nym|y z#GW2x$aHUJRReD;ro-S{V_5(U;8eh*Ow`a5m#UNWv);=EF{z}P3u!u)cLm{~Vg7p$ h+{`y|ssHCK`~fCD;QlMnq>}&u002ovPDHLkV1g)!G4=oe literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/squarebrick_iron.png b/mods/tinker/textures/blocks/infiblocks/squarebrick_iron.png new file mode 100644 index 0000000000000000000000000000000000000000..df7eb514959b2b07ba439fb62863008d02b1170d GIT binary patch literal 364 zcmV-y0h9iTP)9|TZqm~>qy%G*$4Ycl1Q!L1c+e5x+sbZ z3=O9~w;%#Il`XKwOPCWre-$`efNccAI?J**0k(iSZUVK0NP85xbHLV^{N)z7$aKlw zE!+ygGH${1JXv^79##pGXA7wFJpal7xUMUzzkz*pfLcR1Z~--ZX#`)MX`12;RxtuP zpc`>;9ET*muB+5!-}f`XSKvT?CQkkXoND-ipalNXf?*gZSpNWM<9W%nfC(P}0000< KMNUMnLSTYdd!6?H literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/squarebrick_stone_refined.png b/mods/tinker/textures/blocks/infiblocks/squarebrick_stone_refined.png new file mode 100644 index 0000000000000000000000000000000000000000..a0db5780f7d50806ab7d5f85b02539a5c75d4086 GIT binary patch literal 415 zcmV;Q0bu@#P)Ezez^=eJiyy5Y9*nYpa$&K$K;f<$3PU4yk0}fE~_)te}iNKsFXutChuZYz}YJ>9i++ zT{2Myhyk*TK&svOeC`!sCrwjZEEYDO&n-z3FBL$@yC{mh5(s?_sHzmu4Ic7w=o@0< zC=kJVz5XQ#Yaj(8z$5GZe(x=W1l~fZKppw)%BKQq0Kr!gr2vA<<>E855)T!inl5~` zQN@9P*0I<6Nl+BUYZAE>0ctdX?13gRwD2|u8ed3w@E1^^q<#+cA7}!@$s?O$y05D0 zH3xNF`$54Il|>qm?+}Wkn75P3#2hk)!=XP=6!l&prg#Y5{{TfAxbZMK8WjKl002ov JPDHLkV1ix9zmxy~ literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/storage_bone.png b/mods/tinker/textures/blocks/infiblocks/storage_bone.png new file mode 100644 index 0000000000000000000000000000000000000000..6e29bf19d80523c9337e41c69c7b7bf6930a4707 GIT binary patch literal 898 zcmV-|1AY97P)qMWt<;MuZCWJ_sDT(TU;_?Nz+jdPx-!0K@oS=LO^`RB4RElBh)ubp3QZKF2!=PyVi=nG@yL(*3Bb!k=!>mpYlC7bMy-*+tep`IS{ahWZW~82^aDEG zTjrm7saICX>pL*e@p~+^d+XdJf5gyYG)0KAw~nZlPf+?Tow3IwXqgp} zz00td#cCa)kp7j5@sorWrPaD(+U*ol7r3UZsIf08>gx=Jl(MumCm4Std-s7x^N6w0 z2b8q8l+u4vFZ|zyJWhv2BvVvj<~H;<$=$9okS^G5 z52Z*2=I3XGNQg?|K-y~H_u8Z%FIjsvf}%<(+=8+qo;sa%T8)@oR&hGVsMfCWxGmJG z@3>5CVODM=gGr3rAEee_vHAKD%JI$$*cR*3YigougDX`y1q@l21=tZxbb2<=V^ zoAnXt%=c2H2#%={LTmR?&W{(VR*odd9YLky^GymylR&^Op}yxX`4 zOR-}^iSI9y%S9!mb6MSS3fd9g=}CIMsvykBFe}mUeIlD*$ci7zz`PKdz+!nw_}v5k Y0~W+b$M}F6H2?qr07*qoM6N<$g3f-xzW@LL literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/storage_charcoal.png b/mods/tinker/textures/blocks/infiblocks/storage_charcoal.png new file mode 100644 index 0000000000000000000000000000000000000000..8e2c5a3a02504f81c0c27a63e514460c38a4757e GIT binary patch literal 447 zcmV;w0YLtVP)3`7h>3`92Y{|9}1CAH^?7ZmgAs;Tat zNs=UqZ>UzQQK?h}=Jk3#n$2dk+wJJ}dNCLbbe1$4jo9z^vE6QCv)ROYy^hst70cyP zBVg}+e?FhbbUOVNIGs)cB7gv6u~>-2IGfF4G#bf4p64&O*s_2{2!voV;6}(`I2s7?@c&uQ61E<2;M59cB{0Q~|B49F^NE9Hznti*VxJj*6(+$2Ie2VyXgY$mB z|4IRY-EJollfR+c?W%YX8EK~k=P1mc{ve77+o&aO5}P z{u}QtRSi0wPCOnD;eNlX8;H5BIP*g@5TQ15Kt9jsvqVu8f5dQy5F)sNNFBIX0u%?r z?RFCZB4BMNq~#)$GWnM^pdbX;o(sxo>sWRth(`pJFVP=_!ub7v{sB^jMBDvK%QhNm pnkoP=Cx|(AA#*!uwOZPP^8-FRnSR>d^E3be002ovPDHLkV1lUt!bAW7 literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/storage_coal.png b/mods/tinker/textures/blocks/infiblocks/storage_coal.png new file mode 100644 index 0000000000000000000000000000000000000000..8e2c5a3a02504f81c0c27a63e514460c38a4757e GIT binary patch literal 447 zcmV;w0YLtVP)3`7h>3`92Y{|9}1CAH^?7ZmgAs;Tat zNs=UqZ>UzQQK?h}=Jk3#n$2dk+wJJ}dNCLbbe1$4jo9z^vE6QCv)ROYy^hst70cyP zBVg}+e?FhbbUOVNIGs)cB7gv6u~>-2IGfF4G#bf4p64&O*s_2{2!voV;6}(`I2s7?@c&uQ61E<2;M59cB{0Q~|B49F^NE9Hznti*VxJj*6(+$2Ie2VyXgY$mB z|4IRY-EJollfR+c?W%YX8EK~k=P1mc{ve77+o&aO5}P z{u}QtRSi0wPCOnD;eNlX8;H5BIP*g@5TQ15Kt9jsvqVu8f5dQy5F)sNNFBIX0u%?r z?RFCZB4BMNq~#)$GWnM^pdbX;o(sxo>sWRth(`pJFVP=_!ub7v{sB^jMBDvK%QhNm pnkoP=Cx|(AA#*!uwOZPP^8-FRnSR>d^E3be002ovPDHLkV1lUt!bAW7 literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/storage_inert_redstone.png b/mods/tinker/textures/blocks/infiblocks/storage_inert_redstone.png new file mode 100644 index 0000000000000000000000000000000000000000..198eb0099fb8699528c9e43e56902e3acd6ee517 GIT binary patch literal 463 zcmV;=0WkiFP)m36 zu!)?djM}m^puo@d2xvrM39(|j(gvf7+rD+#K@~#6t!V>Wd>RaDq_8Kr!JAKv!3Lf^ zgFbkGkjVy;_jtYoZFT}WV@x~)if_YVoos+Ql2<4`L#!hnBf7|2lOY3cp(cbD3Q5&W zgxj+dSuo>u_`}5xOlZ)8@X<$093rPc@mwyazZY%54!XdKZL9BCBfT+)=^5}4mEjwF zG6n(~X~6%CF1G=O48BnCgGhdbDNUYmh%Vaal=dJlrPKcg{F?e^lwBOs8%#b#Cod2- zQFDZrcM=J;o=mD$#Mw|t-yP3@tzE*IBYlR+t1-QRK@Bw(h?ddqJl3-r5QX=**`yM|U?C_LhJZza79v>WF9fVD6jG!~3Lzk*un-GDun@HH$DDk-zT3Gy z#p1EIyYt?>nYndO6PJP7ETB4#XnaRBe~Np-RX)Qd=={0tb>*_RO<45}y32_6A|Mw~ zkVSu22Imk-_VRB8ZUw(@i+k%p?z{l?E4a4~u*C5xVz7_pOTkjSn&t(2ITk3h)B;xy$Z>fJe9h%w{7vgu{N(00000NkvXXu0mjf45pTL literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/storage_wheat.png b/mods/tinker/textures/blocks/infiblocks/storage_wheat.png new file mode 100644 index 0000000000000000000000000000000000000000..caf8b9b7f4d64a8487021038027a9aed5f430ff1 GIT binary patch literal 554 zcmV+_0@eMAP)vQ?S8R<)r=y|M2>6Z?xa@l zXS=1E<4AbCY>~n4WO=#i^qjY$Dox-H;KWe6JYBWQ>}Zzy_Ew8zZ6;6LZKzT{-`sm6fSntpLFGLcy<;9|pXU7=I2b zKyOEqyhr^C0Jus(7eP2~4l87LrBH&y86Fe*K!3247`tft2S5iw9D+39M~VSs>uOF= zyA?nhZ&*7jQ-KE+(M1Jcd!kCfPPdUluO7k;3T#ZAHI0fGIlOz?5_Np$g9+237!0rz z>$uQ7rht<-UwS|ije~{lfw2XIy8{&fq(E&sm?I_&pXmhvKOjaw(4Q)fhG7JRVCWLe zJG@`!Nib%_*n%xi=KM;)@fzvT%GO<~({=hl6PXr%M#)Z)gKP(7+kG^T4WxNX#P=({ zsf+*y02|C;LZ2KJ2u73A`)eA(d<}?|x5mMUaRaOj=!5M5Mh?mLqZv4$Z})==!b)oo s*g)t(i)v^k*d}7XG|4tC;+X*VZ*8WD$vfY+xc~qF07*qoM6N<$f+Vu{4*&oF literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/storage_wheat_dark.png b/mods/tinker/textures/blocks/infiblocks/storage_wheat_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..66a35b38df9f442483f759c789d477de72e96d55 GIT binary patch literal 493 zcmVORfU z`eayZ{qeZ|HW%AVt@w4=jz8xMak4X$>*}}@dn*%h`K9yrefDWKdz#(lR@|L*V`XtH zexJ=}@^o(|K`xHkS!mxJwlc3??s#)54pt|l`Ek&WmzzPX_QvAodp8R;ecqUg^ZnUu z&{#l-r~^PymtQaO>v3_SH<3+&Q+YB&ca44tsX+hkyDf)XmNN~Ua)HNlQ9I_;w z2i=h@tQ;j85Kw?jZKJ^O+=8UD9k3>Yqr&yNg;EP7ZviR*RxnDIExGawK%T9VpAU&A zK_H3^PjQ_|6)R<8>c#gzPW-nZ;c;ND>0&T-te8rfyf>kT?Yu_b0Pwu=VLXQ>hWX$9 zFcoP8AV-B|PEGkLzZ#3Jz%|wVW2VRsI2D*fSrN3vDF9sHKp%cCW}PRUGw=e*d(ZB> jZlr!`&2?Mqsqp;@TS{~JRu>d600000NkvXXu0mjfvI^kt literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/ore_aluminum_gravel.png b/mods/tinker/textures/blocks/ore_aluminum_gravel.png new file mode 100644 index 0000000000000000000000000000000000000000..35fbd54fee6cec31544cb5d429d03c9437200355 GIT binary patch literal 896 zcmV-`1AqL9P)JDHnGZ|0j4XtIK(`26=aMl<)0ic`_!kI9T&%v37+g$@ zi@<~mgC#Po%ae9zq^I{?&Ye9?EPjJ@I*rfg3KKd za0E-ENZ%c$`!5*T|_IF0qBf$0U*mVE|-fRW@izan>`d&h3~(aqP5jWusulE zYsZkY8D^$$bNT8p0J&U_>DxbY$p7?bk|g1Mp$);~Zf5b9d0Jb20GvGa9smsu4KM>v zr;~VWlw+^IL1uT4^*cZD;(>#BJzfAzhYubYsqO1TIy+G{1(RSVm&;KqmH7G23>)iz zP^~^fY_uRfNZ}8Js6DP?FbdeMB8GEkPwSnLF0^u)m0y?slZ2&Fq*Sid`~T;fR^V^9 W!d+j0hjteL0000vr#SI`4Y8(Bt=gKMvLSqfj_>;ryj!A}*xG?d>hSzNErd zu@O%In4X$wJlzODNQ(f1!C4{{4rTYUfSk`CEH5pPYQj*Y^G;5rQmN^w2?Z6>BI97z z);PPpj;MFm+wG?k@eKfZoEWT zynm*YTi?$z&g+I0=^rHl7>ab9*G*IV+1)Gv)rTRsFR-Xs2hjUL11ZwqUH5#P;Q}52 zkRsie4_nL@DYFBB$co$SN>ELx212b0O&hIG-X#@PWmFR?g?2hls;et)@1;9myh186 zj(vePTH9TTGfcslUlLJDmrwxaV%j!`I-8S6zKxL4^>uE+qu5|sHWr;5N^~IsP##E; zhaI+jE~`AbxHwX-?g#gk z1SqYBD%Jy7SqfUr7BZg$FgY{xopS={xq9gMQ3C){O{f^hDOr{mgMr_Z9$_ol+wqdnT@eCQf8;ejbn~hUh+VS@DgaF zwYTF)oafiLP0O(g)!^GVzFD8H$N)f03nr7fti1eQ-!g!9SE8!M&a!NHW#L45rQ)3M z`)3d2JmX*rHHQ!6Jb>}>u@>u0XIoB5b2AyQbGnr7^g4~|_RZ@J^)4}!3Cz#b*48T! jrPU}gCA|44T)|e555dV!3Slm;snWyZ&DCnwNv~DWUm{j4`tYapaFIIpis-& zwObopmaNUq`Xg!6WNUMio1e=XA4)IG^K#&O&i8P>=X->2roZfEb6MVc^KBlNOH^t) zns$KQeu@$A2z#Y60QZ&`IQQB)04g;dfOI;EDVxjE?zDkJdc9|?J$!&@HlfH8cNQ0@ zR;%1wUNDH2nockjWM?N&An+=tNH{_uaE5Ye4}kYi&0~}75&C#tHlo8M&I7etXIHuKxKhFsJeO#n=7T|-?@V>Sr@)OC%i zP@1?SL8(||H@^wM^!aVxJ8=WENifLakRLIbN&_It3e)Ge*;-rW_Iwq9(35N6`vid7 z^E2!`X&?%1KT3Wphu&xyLljv; z`1;C~UbC*DK2n*Oh!{n^R^e0k97~y^fo*uE4E@IgL`^%uHRQr#vtzSbh}Eu>eCcyE z?SPxDNkn(oSUKu}-Cp931WTDB8=k2nkpkRoP2&0GDgX<%%jDJ{;29oe%yaZi z=JCDuBA`wH0000IP)+u^ho0009PNklHZIhc+L#i3I>;a%!(*Ve1W)K(h3m9t#utBS}&RljDt3|{u zIk}pgVs&+u>(f&vv0BrR!!q~p7YK!(MvO&cghKtSluH1Noz`(UUF2`)X>aeqA_(;L zh4FZN03?(+ufF&l&E^_z$%(kMyu@~0y*AC!cWnT)wRezE;+%;7z*=(+0Jr4ib0x_; z!)+M<8UP4Cp8vk}clws8dmC7-X>@ozyu(LzjNiLUT>E0s2piDfz8Qb}D z<3yi|(rOx}U&&O8U@(Fh=n0Wf;=K3fAC!wllkBkD`1#TW_8r*InXw~OYZ~cnmSieL zGL@=wKo0k_v9ZCeOq#bpe3WYC0(OWXJJH4#dRDQWMiQgYU4$0K@2L7%tu3Y|&Z_c~{ z9N0?dG}h;LbBwdRKNrLIcsEwBr;}@cCGq3y!fd{h(uzh!w$QRy52DR|L2-kMY&MNCm(S5^w}1}a?n}0}HW5rloOT;a$pnXo zhpet7`a-#(B8Eiv_KF09lL(Qi2y#Q^pi&0l=Cu&_3SIKg^0-_>0E~}^P?S0V@tBu2 zDa-M38>iidad&^0lUaJa!dDMA0660sA|CT{)uqusZUf-7+xX(QBHuldXdSfxFwFn- zV|Oj{wD0?bC^uAwhKG?PiTz@Mi{m0ryNyEe1)dQPn%)G!*isdwoh&A!0RT-^xcSZ` z@tBuNslSty6^wzCzQ&W(hNrc0Z{zue?%;)chNUU%7v1Q%W_kVIgP?S2J5f5go1FOZ% z%-|8LEjNl%=XRoo&~*ZkOr^LKadE;wH`v1klhJ?}dW}w}!_#brZ~w?6*O!={eiKb^ zQv5rQs_OvUc;gI-^(xCcq%&Enat*=l9^tT|@ZkP0_=KeTmfpWA%d}000000NkvXXu0mjf D8G4^- literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/ore_tin_gravel.png b/mods/tinker/textures/blocks/ore_tin_gravel.png new file mode 100644 index 0000000000000000000000000000000000000000..3e1b312b25201c8be765e5f0102a82fc953049f8 GIT binary patch literal 872 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 HCiZ^-1ocxb literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/gui/inventoryarmor.png b/mods/tinker/textures/gui/inventoryarmor.png new file mode 100644 index 0000000000000000000000000000000000000000..4229229afc33d324bd8f1426b275e78c90a2ec71 GIT binary patch literal 1911 zcmcIkc~p~E7Jms}7WRP1CTkTH%LHm=6M+=Lh+?E+Q4k0SxPTx#R1=aQgA_F|gA1|< zTFRw{V30r+1zJEr2oO@1!xFXzSq$k%+nF=x%*>zj-nr+#_dD<2-@W&}cfWQg z5tS8m6#xLruE(9p03hHc0$|aw@{1|E04wzQlSF55YkQW_?^?o$eAIEDSO8R7wgs_s z{|N>RV&Ys+xnKm4x|X{2^VW|~VFYq@{=zfq{k$NEBs!*z9$RWD$Qsj~guE)NejxJ? zaL{FBHLps0ge|5cK;E>No@*sJ%$nD+3*P){3sD(l6*RJbMb*${tqb3LNTVF{g3Ha= zS~u@F__Tla{E3x8dNg~;N9GnH(Q;YF)pNP;?}h4EwuRLx@Ex=BUQ_XZNiLb3m@x69 zP!`h4pqND2+OJKSj`R&}%aKsY4oXw9WXG|01_lN#^Yal&$;knp*kMNp8hdQkq2CUe zC0`ne_LzTBPTl(TvjY&G$L~&VKUKFfIevq!!!=)&c3x)*wg#p)-;{obtZ!(@6YM&7 zKeV31c@;)74VcoCQEu;2p&iK1egH-rX?cB$l8uer2_8!$lREs;r_JfA?=Suf^7WYJ z;%^UI)DB)@1t@qX4!q24e{?zw$?)-e$M-(nuIU&5m_6uoGp9=^q4nSkKdOVf?~SiL z=9eW`OWXV0-4V?#PBR1FW&j4Wg5l60>&9ew0<)3w*kxMhPyP1S7i!mn@h0SZn@EPs zeSSovRjb&S7vSja`dpc5jAdZURTh7-D)hu;blMl@vt~-l_CSQRG%6HdwO)M0J+5j! zj+RWhAA0tg_bYQ(l_tuAmv%?r5P`+!GQBA)_t9woz2UsKdk?33c*h36h4CTWrP@!s zc)91Q`;m;$G{S?EjPijlR+tjXufjPC_z|wjoiJuBq*o%uloHXp+UJxx^!{= zgZTQvFF{SZ(RA(NklFBe6&Y+cdvTLO@f94W(&?&(4$s3SkBzatbHx#=@&#c^F*CCf z3F7&Lq58GT(aQPpGl-D$Pl*osvPaJS3Zax$!_Bu%Gd3FtH}}ZQq8~-%J*hZ69`Ea= zB1XI^Qb_;XhFUMVvb4%>x*L;}b_sHU*h)dpbICRT;;c<7IZjIxFaX2!us5pp z2ulN42yyB5x5oAwx!FKRP>jE(5fqR{DJn;La!;RW7jr+@MrD7BzzHWOFWkMb)1%-t zOP_f@aez~R*8oZZsMeeqVv#BQ{0KiT*sNaT;YpS&IFRL2cd+frsaLk(tOWuf!P!qf zfU$J0rieDgQUt7@)%JJsDeURWprU<7Kb24e(L2G{6%6fQ{hXkHVF-eI9Vn8#i(XR z$G|Ob?g&N#9GokFfDvHq(KVF2AF2~Tq3}+~^{Azr$u)n$icTtsmWSC008BMvq7oCe zq{^?qzb#G*&kxP~W@zalGEjzYg}+)*?VxtM4X-`=Mz0C%ZMz+B8~q!>pAZ8qs>76; z(;;WZGz4LHg7ua?Q*j9m0(>g2G5kf*?yTq-?b7#Z(?X$fDz0T^Wo7GPj`0D8bQkVu z`z}!{>zmzK*ZòTnuTixpt?DnUvA>g^qN@K(HC z`G4jAAFi;#9DxOa%sA*EX;oyA-^L{XE z)7O>#E{m`@qvA~Ge2@WOJzX3_EKVmUNEjuQuKn`=>efsDFCLBL$ZXoU_AZY?5)aRR z=h^d(9+@!2PTr8la`?NryM#c}iZ+8smyR4b(6C5QvZnff%flDzxOo@afX4JT*y^Doj1Ivln>9+4ONR+ZlSc`LCa6{GrqH z(RH9f 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 diff --git a/mods/tinker/textures/items/materials/material_aluminumingot.png b/mods/tinker/textures/items/materials/material_aluminumingot.png index 39625369652e2570362872334ea8f36439522d03..e40c76b04744eee02da0114e322521fa1313c390 100644 GIT binary patch literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#E{m`@lNi_Kna6-aJ3U<-Lo7~Tow$+rhystReGr?cr?{r7cZxLsMAb{FY-$Uf zG*qn{A{w>*`ZyF9?k!Huxi@(!{~uq$K($3N=iB9u{N1E;=UHj&(ZvherUZFtUcK*k z@&gN_gV#$oZ%ut6N0*%~5;<4*y`R3l_+52l5ZAF8m+rMZtIXs6Ve;N~$&~d13=!Gu zHK(X&uibq?*KMsSLxRk4y$YG*H}h|+u`D<6y}Yx-aG%ptzbQXAs~r2mWy-3bP0l+XkKyz*ti literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJIi4<#Ar-gYPCdJVP4@9pgS2n MUHx3vIVCg!03&EjA^-pY diff --git a/mods/tinker/textures/items/materials/material_aluminumraw.png b/mods/tinker/textures/items/materials/material_aluminumraw.png index b2ba44ed866f629dbcca45aa1102c895a17ec620..90491afde87ef41caf9af7196113e08941b0c340 100644 GIT binary patch literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#E{m`@6Mxro-U3d7N_q{*uA#JK*06$vSzg5v)X2OByK~?982TP79P{Y;$l`msn9$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 diff --git a/mods/tinker/textures/items/materials/material_alumiteingot.png b/mods/tinker/textures/items/materials/material_alumiteingot.png index 77e739360115f37b80d43a20c270bbc221fac231..cc790fa0175a48d7a09b3aa5fae1aeedfba44e0f 100644 GIT binary patch literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#E{m`@6UT=;OO^tK9(cMqhFF}wdeM;Ukbwx>1N#K_lS!iNg&U%`FS6LRyK0f& zy+hs|?gcMYthiX)odj39>Nu@l>m=iqlw%tE)%Rre&wq;iKV}!@w(s0_xa)6}=%eTF zj-073m|-a^cuzfaMc&Jb7$d{|)rQ}=#cf(@oEh#dh$-SI%xypE!P@`%?(M&Ote(_6 zwCf&uEo{=PHPP-x4Icx;*#$eQ4T0RiNh%Btx4-?l z=`6|+?$~T9ExfVSZNDyCW<{t{rQ4IgpC_2?(Ykn?L2eRTq3W--RZKzKs~lWs>{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 diff --git a/mods/tinker/textures/items/materials/material_arditeingot.png b/mods/tinker/textures/items/materials/material_arditeingot.png index 73a61d75bd429c6eccace28d81e7d93bea091720..ded87902b1145d4c14f9c3ac44f3be601470f805 100644 GIT binary patch literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#E{m`@6O#a^?{1*b5lr166f`=G3u=YG~JjBMB z$|7aN;L7G8=rmD7S4BlDD_BLXOuB*Do=o<%R?G@qc*7GB=Qo43|#Uwxy{^{}ErL8dM3^R;;H6H~Vy zQCQ>7eW>n4!}CqWtj3$dCcL$Ge$eFSuyJko$0Phtr`>O?h)p!iZLnU@ws1SAkieAO m4*pH5yXLR>#q>+pmeKjFm#O;1;##187(8A5T-G@yGywoOV`qT? 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_ra{XE z)7O>#E{m`@qj~Q1ThTzFkDe}$Ar_~vPBP>=LNJ>cpa|6t$-Hri!%hrC00I$|~#2(%F7UN46c)b$V~ zIT~2zHCN{t%w5CCuqsNg#qWChlz#DQA>V~@s~H%Y*xSo@K6R4s7CC2PBq)2XX_C@Q hRiUe&7TmwYEpn)aW6xb-V8Adic)I$ztaD0e0swrAdG-JR literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJot`d^Ar-fh6C_v{H=I&9=Jn9t zNNyjW!*-6g@F}|%B+RmG$>UQmdKI;Vst0MN!=fB*mh diff --git a/mods/tinker/textures/items/materials/material_cobaltingot.png b/mods/tinker/textures/items/materials/material_cobaltingot.png index 35e498cd7e5eaafb18c476a7090f63d3d6c87235..628e22f11841ded997487751266c24e9101da235 100644 GIT binary patch literal 319 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#E{m`@qki3QCtje?Jx>?M5R21SCmC`bau9I6FT@$qIl<|O*-MuV8$FYsi>@i! z7V?N!$7gBpBTgY7VIGb}8ev{B+<|4vo>6nNzVp8~-dz7M|5SlZrp3H7ueWNwsLk7* z%n&po@A*k+4R5TVSESc^1spqN z9mDj|bKyFg4oOHx1mzwCIYwebEb_3uiVy^YsYJ%B!C N@O1TaS?83{1OS4Qcpd-% 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$ diff --git a/mods/tinker/textures/items/materials/material_copperingot.png b/mods/tinker/textures/items/materials/material_copperingot.png index 45e1f147c91c2ea65b70d80b56a3f875fbdd7cd6..2e35ca4de758d3419cc4a51f41c7ba55bee1f7eb 100644 GIT binary patch literal 300 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#E{m`@BggHJ-_w9Xr#)R9Lo7}wCrB76_)dOUKTGX!eMzC1)2xIyDzZC1{ExgY zDN!iZukRa 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!M{XE z)7O>#E{m`@GsANk*=s05?uUU^6&3gT9H}6$WZ;X WoY{_d_cEa889ZJ6T-G@yGywq3xPMXr 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 diff --git a/mods/tinker/textures/items/materials/material_nugget_aluminum.png b/mods/tinker/textures/items/materials/material_nugget_aluminum.png new file mode 100644 index 0000000000000000000000000000000000000000..52ea401223643a894e5c0d4ff816b5332ab9a48a GIT binary patch literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#E{m`@w`$5k=b1pEYEKu(5R21qCvN0zHQ;gKT{FSC~3(v;gQw);gpRmL? zldGj=-#+C9&qAm9Tg}g1)PGWl;YH+eiRJF=7^ch&4c&TeRru!kG;a>Yfb8BNuP1xe zPp9mgykbgH*6ICf#`$}{U$t~saf;7F OgTd3)&t;ucLK6U#bW5@T literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/materials/material_nugget_copper.png b/mods/tinker/textures/items/materials/material_nugget_copper.png new file mode 100644 index 0000000000000000000000000000000000000000..4951e9d49c464468bd3f2678a163fb479f061715 GIT binary patch literal 384 zcmV-`0e}99P)pLzFx2+eUly*djloCP+aLz+wx=ZZssUyF90%Z+k3t<2Jy3>!kHKAQ4XyR^59+!Os!Ay^#_$A3_U@jr zc8p3X06-K)gZoevMTpZh1@Tje<2WRYF#v$)n+pp7KL^L8O=^R*=kG;~F)L1+K>ABm eRn;KrZ{Zib!gyttFjuVr0000D50003ENkl~j?rG&K>>$<`igRbkqIX_jRwf?DqF@|v*PxPaVF#rHcDXxGoKS`1V&*#%$ zgA_#((wAjHUDqLfnkG!s^!oPX;zxtpg*mtP}(kR2gXPCH+xo_o3(a z{C(fkdk^?GkWxZQd6A!tksO2&K2DP4wtyoYrqk|l%DpTW9dS^79lQxLa>D2jZ+7y|(K-tRjAu$v9(llmb2{W}q3%!Sh} iknw1)QU-$)T*nok{&O-tK0000{XE z)7O>#E{m`@H{XfcT{nS3C7v#hAr_~T6C_xBcBm|h-SYqN4e#$UsVXP0WQf20zx&y? zKmUI|eEDDcclcj-Gagxkhm$t&`=#ut|EFh$0JHkc6tw4cG#)z4*} HQ$iB}Duqt> literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/materials/material_steelingot.png b/mods/tinker/textures/items/materials/material_steelingot.png index aa27935d2bda522dfb8182d8caaa595299a5f0a1..591b3f2e41fa68f93b8bbab228ecd283112a64b1 100644 GIT binary patch literal 343 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#E{m`@lbPY(oqRx{Z=NoWAr`04PFBo2Vj$o;e`!W$YQW4V3~bY!x|E)>G}=0) zt~7tCSi~f+ut7uN#F_(95@Nb11Y@3P_-(%FrTRA`=jUEYgEo6No2m;EJFgwS{;AqA zS;ha;%F*DN>a-F ziVDozZ+dmTek-*7g5--i(XTh@FeWi3tX=xrYRk3d0imJUdv&<)RdTziC;{!6-R{^H?E^gV#@iPxsQZ6&R)jZCv+yckH(d4;4KpC2*U%buBji nC%80(MM*$fd2{`T`p>*mnra1uw3DQOA;942>gTe~DWM4fBP@Yg literal 253 zcmV=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 diff --git a/mods/tinker/textures/items/materials/material_tiningot.png b/mods/tinker/textures/items/materials/material_tiningot.png index 5aa0ba85a70bf63381131d4baeb73cb91e3444c9..c602754465cae75ccc9f6948c11200c8e374547b 100644 GIT binary patch literal 312 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#E{m`@GathegNs0+>z*!-Ar_~T6C{ijZn^%h-_rf9zNAphX;#9UA16FCvVZdNgV3%7G`E3SnO#%ydHa0ds zeD?M8ij56#o;+^=| z#`#L|gW!U_%O_7% zRH)|{)8|u~aWfw%`_a?IF(l$}a)Jb_vaCVS?E@L&Z~ve8v$T5Mqpi)E3!EETqwHE6 zf1L0znfUbo$JQec_!*t-w(|R>BmlvV`hObC{{#-o3Hdaui3_|AmN@VcJSoL;}4XHyKr=bs0+ewLH~f+th1Xnb0^b?ajR zZbpfQpEA?35^IWTxtPt@&zFBv%D671?$3w1RX<8TTyHa&f2d*07L(ALJ(=GH*F4&- zzfVR*Rk14eK~j2q=)>v$>oq>TeBjUQ@zvzs1cmF%o6T4xIJdUM?X7bbozHhmK!SBK b1H%L1x0(0$?rTc~dY{45)z4*}Q$iB}+JcF~ diff --git a/mods/tinker/textures/items/oreberries/oreberry_aluminum.png b/mods/tinker/textures/items/oreberries/oreberry_aluminum.png new file mode 100644 index 0000000000000000000000000000000000000000..3555483a9b25e3d7c10c975ec83388634dcc8009 GIT binary patch literal 450 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP)i?E=91k1EJOh6&o%#er@=ltB<)VvZPmw~~#C^fMp zHASI3vm`^o-P1Q9MK6_|fq_xY)5S5w;`G|d_Fc^mBJKMlix~0^d=sor&v6ji)0??A zM>oaGTYo~3#Dpu24elE})tfSl8n%a~^ccR`WPSC(p8MbH-k(1p-~a1N#@eaR|5n(n zil4Z4tCEsY-{P3{;hm2o?j5bIZMyTmeAl|iA1fAYJry z`#Q;AGvUpgrPc8Hr;h*&gT?b}-WGHH81CemfBS8ldz;Ha#FcBo``@Yu&S&*79*}6h ze@Ex^l6Bdk*S{7C&p*9r>pauK-FN*yEYjdO9PqSqUyRE0IYs9*lh3S~bDh)XXt&zB oslg&gbx!u%P2T@|{i1r?`*sOm)|xcl-3SUwPgg&ebxsLQ07m7t=>Px# literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/oreberries/oreberry_copper.png b/mods/tinker/textures/items/oreberries/oreberry_copper.png new file mode 100644 index 0000000000000000000000000000000000000000..fb7904dc0bf7e1c03d9fdc1a84de60a20722005f GIT binary patch literal 478 zcmV<40U`d0P)9j@Y?_Y03B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00BZtL_t(I%dL|!OT$1I zhM!aiCn**uhnq@W#6d(vaFRe41y?tJf&Bqa-CS-GCl~t@91cS#ohk@|xWvU2PLbFp z7zdYgs246Kt%%-|z~z0u_xs*2@W0`n^X zz#zIsCn-BLDyZ07*qoM6N<$f)8@PO8@`> literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/oreberries/oreberry_gold.png b/mods/tinker/textures/items/oreberries/oreberry_gold.png new file mode 100644 index 0000000000000000000000000000000000000000..a703a49ce5f12bfc48e6da4821a94374644fae09 GIT binary patch literal 472 zcmV;}0Vn>6P)WFU8GbZ8()Nlj2>E@cM*00BHnL_t(I%dL|!OT$1I zhMy~y5?s2v^a>8?>JJc|0>Lbfg8x8=bncJ%pa_Ak{(%lcFiYv`;N;-g44tGpb<*-V zNa974is&tu$QVftJNeRrtP}4Lu6@Z9n9LMFMi^+f}^MD@KTCR>F2iU83 z;95?SS-Bq1eazyqbki8Ywd}$GqLJs`Y-$0mgBk7qhY&}cWf|kMJ7XT;+PkFN?E;Xd zX>)}5_7E75=Q%+TaI*@OJy^^QZ^3=3GBUHMpXclX2rEJ>Y zE#aq=9-U5Vrqh}?C~7Mr>c-iDN(Bn>H$YPyw*ti_KmJT^?|&8j>v#v9XTDt2n1reT O0000WFU8GbZ8()Nlj2>E@cM*00BKoL_t(I%dL|!O9Md= zg}>D!U__FjSg5ek!b2gTrm(j-xK6OqpAqc*4`C~t`~WM9SRGzUt5iZl5X9y{MFo)% zE-BY4>n6E75S?asnR$=*W@h1!A+nN6DLuZ|YPH1Lxh(L>{yKiyp_1?8`@a4a0l@I< zo#&5F2Jr|fB}yr6tD3Peovh^h4B`<0)q|=btT)>PK_CE}Y02ZF>-#stC;~uA$6NqKO-;%Z9ws z>abPHiOZ{-^i@_$X}|0k(9+_9QPya6%nr<0NV8*4zy@c2CVTg%LH`=xX%f(V0npfl P00000NkvXXu0mjf64Jt| literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/oreberries/oreberry_silver.png b/mods/tinker/textures/items/oreberries/oreberry_silver.png new file mode 100644 index 0000000000000000000000000000000000000000..3169f759ac17cd3a2dcdbc4341520584a7cfd84a GIT binary patch literal 480 zcmV<60U!Q}P)C)LPT}?E60Z6G?T6S-IoK7>{ z_QU`{NJ*}p?=P?}&fNvAHPzZ}TNI2&HW!8=`_VG3?QARh*Z2a1 W7x3>DHKy1A0000YmF literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/oreberries/oreberry_tin.png b/mods/tinker/textures/items/oreberries/oreberry_tin.png new file mode 100644 index 0000000000000000000000000000000000000000..d89c629928dc284b37241a60bdf3fbda2fef957d GIT binary patch literal 519 zcmV+i0{H!jP)WFU8GbZ8()Nlj2>E@cM*00C=BL_t(I%dL|!OT$1E z$NyKNPy&*nlcFJX$Y6RPv>hsfE)PS&$*CYXxpfHr6rJ(~x(R*&sTPVup>)yB(y5bG zQ-p4zbdqz3Ij^QIioWIUxcmR__ujh${upf4rtkYAo_n6her4eMzMz)|!r&df$rN{* z0|4x7ZGg)4NS;frB8bI<=NU}X1QCh1BTrnN?8r0PGGqW!3;Oxoh*GJlg8C{x>tpYgbtX{7t3AQGW z3;=8*5%)YMQaccf69$ck*XT`D=F?F-&}y~VkN!fO&LYvj#s?3o%gfx)j-~(r002ov JPDHLkV1gW4-2(ss literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/bone_chunk.png b/mods/tinker/textures/items/parts/bone_chunk.png similarity index 100% rename from mods/tinker/textures/items/bone_chunk.png rename to mods/tinker/textures/items/parts/bone_chunk.png diff --git a/mods/tinker/textures/items/paper_chunk.png b/mods/tinker/textures/items/parts/paper_chunk.png similarity index 100% rename from mods/tinker/textures/items/paper_chunk.png rename to mods/tinker/textures/items/parts/paper_chunk.png