From fbf4a8084657723fa2ad70fa2c9c8e92cb0d3d0a Mon Sep 17 00:00:00 2001 From: mDiyo Date: Mon, 22 Apr 2013 19:16:25 -0700 Subject: [PATCH] Armor Start --- mods/tinker/tconstruct/PHConstruct.java | 46 ++++---- mods/tinker/tconstruct/TConstruct.java | 10 +- mods/tinker/tconstruct/TContent.java | 6 +- mods/tinker/tconstruct/TGuiHandler.java | 27 ++++- mods/tinker/tconstruct/TPacketHandler.java | 11 +- .../tconstruct/blocks/OreberryBush.java | 4 +- mods/tinker/tconstruct/client/TControls.java | 34 +++++- .../client/gui/ArmorExtendedGui.java | 105 ++++++++++++++++++ .../projectilerender/DaggerRender.java | 2 +- .../projectilerender/RangedRenderBase.java | 2 +- .../tconstruct/container/ArmorExtended.java | 90 --------------- .../container/ArmorExtendedContainer.java | 60 ++++++++++ .../tconstruct/container/SlotArmorCopy.java | 59 ++++++++++ .../tconstruct/player/TPlayerHandler.java | 2 +- .../tconstruct/player/TPlayerStats.java | 57 ++++++---- mods/tinker/tconstruct/tools/Axe.java | 2 +- .../worldgen/TBaseWorldGenerator.java | 24 ++-- .../village/ComponentSmeltery.java | 2 +- .../village/ComponentToolWorkshop.java | 3 +- .../village/TVillageTrades.java | 2 +- .../village/VillageSmelteryHandler.java | 4 +- .../village/VillageToolStationHandler.java | 2 +- mods/tinker/textures/GGE/ItemLBInnerSide.png | Bin 739 -> 0 bytes mods/tinker/textures/GGE/ItemLBOuterSide.png | Bin 477 -> 0 bytes mods/tinker/textures/GGE/ItemLBPoleSide.png | Bin 772 -> 0 bytes mods/tinker/textures/GGE/achievementsbg.png | Bin 395 -> 0 bytes mods/tinker/textures/GGE/b.png | Bin 163 -> 0 bytes mods/tinker/textures/GGE/core.png | Bin 3130 -> 0 bytes mods/tinker/textures/GGE/corestone.png | Bin 2985 -> 0 bytes mods/tinker/textures/GGE/face.png | Bin 3258 -> 0 bytes mods/tinker/textures/GGE/glowlogside.png | Bin 3357 -> 0 bytes mods/tinker/textures/GGE/glowlogtop.png | Bin 3327 -> 0 bytes mods/tinker/textures/GGE/glowsapling.png | Bin 338 -> 0 bytes mods/tinker/textures/GGE/lifebench top.png | Bin 3104 -> 0 bytes mods/tinker/textures/GGE/lifebenchside.png | Bin 511 -> 0 bytes mods/tinker/textures/GGE/lifebenchtop.png | Bin 894 -> 0 bytes mods/tinker/textures/GGE/notebook.png | Bin 441 -> 0 bytes mods/tinker/textures/GGE/recharger.png | Bin 3237 -> 0 bytes mods/tinker/textures/GGE/transparency.png | Bin 182 -> 0 bytes mods/tinker/textures/GGE/wand.png | Bin 3298 -> 0 bytes .../berry_aluminum_fancy.png | Bin .../berry_aluminum_fast.png | Bin .../berry_aluminum_ripe_fancy.png | Bin .../berry_aluminum_ripe_fast.png | Bin .../{berries => crops}/berry_copper_fancy.png | Bin .../{berries => crops}/berry_copper_fast.png | Bin .../berry_copper_ripe_fancy.png | Bin .../berry_copper_ripe_fast.png | Bin .../{berries => crops}/berry_gold_fancy.png | Bin .../{berries => crops}/berry_gold_fast.png | Bin .../berry_gold_ripe_fancy.png | Bin .../berry_gold_ripe_fast.png | Bin .../{berries => crops}/berry_iron_fancy.png | Bin .../{berries => crops}/berry_iron_fast.png | Bin .../berry_iron_ripe_fancy.png | Bin .../berry_iron_ripe_fast.png | Bin .../berry_redstone_fancy.png | Bin .../berry_redstone_fast.png | Bin .../berry_redstone_ripe_fancy.png | Bin .../berry_redstone_ripe_fast.png | Bin .../{berries => crops}/berry_silver_fancy.png | Bin .../{berries => crops}/berry_silver_fast.png | Bin .../berry_silver_ripe_fancy.png | Bin .../berry_silver_ripe_fast.png | Bin .../{berries => crops}/berry_tin_fancy.png | Bin .../{berries => crops}/berry_tin_fast.png | Bin .../berry_tin_ripe_fancy.png | Bin .../berry_tin_ripe_fast.png | Bin .../textures/blocks/crops/herb_base_1.png | Bin 0 -> 95 bytes .../textures/blocks/crops/herb_base_2.png | Bin 0 -> 149 bytes .../textures/blocks/crops/herb_base_3.png | Bin 0 -> 209 bytes .../textures/blocks/crops/herb_base_4.png | Bin 0 -> 285 bytes .../textures/blocks/crops/herb_bloody_1.png | Bin 0 -> 95 bytes .../textures/blocks/crops/herb_bloody_2.png | Bin 0 -> 150 bytes .../textures/blocks/crops/herb_bloody_3.png | Bin 0 -> 213 bytes .../textures/blocks/crops/herb_bloody_4.png | Bin 0 -> 293 bytes .../textures/blocks/crops/herb_mana_1.png | Bin 0 -> 95 bytes .../textures/blocks/crops/herb_mana_2.png | Bin 0 -> 149 bytes .../textures/blocks/crops/herb_mana_3.png | Bin 0 -> 209 bytes .../textures/blocks/crops/herb_mana_4.png | Bin 0 -> 289 bytes .../textures/blocks/crops/herb_mandrake_1.png | Bin 0 -> 104 bytes .../textures/blocks/crops/herb_mandrake_2.png | Bin 0 -> 178 bytes .../textures/blocks/crops/herb_mandrake_3.png | Bin 0 -> 363 bytes .../blocks/crops/herb_mandrake_3_1.png | Bin 0 -> 103 bytes .../textures/blocks/crops/herb_mandrake_4.png | Bin 0 -> 473 bytes .../blocks/crops/herb_mandrake_4_1.png | Bin 0 -> 280 bytes .../textures/blocks/crops/herb_poison_1.png | Bin 0 -> 87 bytes .../textures/blocks/crops/herb_poison_2.png | Bin 0 -> 130 bytes .../textures/blocks/crops/herb_poison_3.png | Bin 0 -> 158 bytes .../textures/blocks/crops/herb_poison_4.png | Bin 0 -> 235 bytes .../textures/blocks/crops/herb_spring_1.png | Bin 0 -> 82 bytes .../textures/blocks/crops/herb_spring_2.png | Bin 0 -> 121 bytes .../textures/blocks/crops/herb_spring_3.png | Bin 0 -> 237 bytes .../textures/blocks/crops/herb_spring_4.png | Bin 0 -> 210 bytes .../textures/blocks/crops/herb_white_1.png | Bin 0 -> 95 bytes .../textures/blocks/crops/herb_white_2.png | Bin 0 -> 151 bytes .../textures/blocks/crops/herb_white_3.png | Bin 0 -> 214 bytes .../textures/blocks/crops/herb_white_4.png | Bin 0 -> 298 bytes .../blocks/infiblocks/ancient_ice.png | Bin 563 -> 0 bytes .../textures/blocks/infiblocks/brick_bone.png | Bin 926 -> 0 bytes .../blocks/infiblocks/brick_diamond.png | Bin 527 -> 0 bytes .../textures/blocks/infiblocks/brick_gold.png | Bin 519 -> 0 bytes .../textures/blocks/infiblocks/brick_ice.png | Bin 174 -> 0 bytes .../textures/blocks/infiblocks/brick_iron.png | Bin 335 -> 0 bytes .../blocks/infiblocks/brick_lapis.png | Bin 791 -> 0 bytes .../blocks/infiblocks/brick_largeclay.png | Bin 833 -> 0 bytes .../blocks/infiblocks/brick_netherrack.png | Bin 729 -> 0 bytes .../blocks/infiblocks/brick_obsidian.png | Bin 461 -> 0 bytes .../blocks/infiblocks/brick_redstone.png | Bin 446 -> 0 bytes .../blocks/infiblocks/brick_sandstone.png | Bin 729 -> 0 bytes .../blocks/infiblocks/brick_slime.png | Bin 588 -> 0 bytes .../textures/blocks/infiblocks/brick_snow.png | Bin 473 -> 0 bytes .../blocks/infiblocks/brick_stone_refined.png | Bin 281 -> 0 bytes .../infiblocks/brownstone_road_rough.png | Bin 846 -> 0 bytes .../blocks/infiblocks/brownstone_rough.png | Bin 746 -> 0 bytes .../blocks/infiblocks/brownstone_smooth.png | Bin 236 -> 0 bytes .../infiblocks/brownstone_smooth_brick.png | Bin 401 -> 0 bytes .../brownstone_smooth_fancybrick.png | Bin 364 -> 0 bytes .../infiblocks/brownstone_smooth_road.png | Bin 429 -> 0 bytes .../brownstone_smooth_squarebrick.png | Bin 413 -> 0 bytes .../blocks/infiblocks/fancybrick_diamond.png | Bin 411 -> 0 bytes .../blocks/infiblocks/fancybrick_gold.png | Bin 388 -> 0 bytes .../blocks/infiblocks/fancybrick_ice.png | Bin 197 -> 0 bytes .../blocks/infiblocks/fancybrick_iron.png | Bin 421 -> 0 bytes .../blocks/infiblocks/fancybrick_lapis.png | Bin 733 -> 0 bytes .../infiblocks/fancybrick_largeclay.png | Bin 876 -> 0 bytes .../infiblocks/fancybrick_netherrack.png | Bin 693 -> 0 bytes .../blocks/infiblocks/fancybrick_obsidian.png | Bin 743 -> 0 bytes .../blocks/infiblocks/fancybrick_redstone.png | Bin 314 -> 0 bytes .../infiblocks/fancybrick_sandstone.png | Bin 694 -> 0 bytes .../blocks/infiblocks/fancybrick_slime.png | Bin 392 -> 0 bytes .../blocks/infiblocks/fancybrick_snow.png | Bin 616 -> 0 bytes .../blocks/infiblocks/fancybrick_stone.png | Bin 350 -> 0 bytes .../infiblocks/fancybrick_stone_refined.png | Bin 373 -> 0 bytes .../blocks/infiblocks/glass_black.png | Bin 98 -> 0 bytes .../blocks/infiblocks/glass_black_pane.png | Bin 93 -> 0 bytes .../textures/blocks/infiblocks/glass_blue.png | Bin 98 -> 0 bytes .../blocks/infiblocks/glass_blue_pane.png | Bin 96 -> 0 bytes .../blocks/infiblocks/glass_brown.png | Bin 97 -> 0 bytes .../blocks/infiblocks/glass_brown_pane.png | Bin 96 -> 0 bytes .../textures/blocks/infiblocks/glass_cyan.png | Bin 98 -> 0 bytes .../blocks/infiblocks/glass_cyan_pane.png | Bin 96 -> 0 bytes .../textures/blocks/infiblocks/glass_gray.png | Bin 98 -> 0 bytes .../blocks/infiblocks/glass_gray_pane.png | Bin 96 -> 0 bytes .../blocks/infiblocks/glass_green.png | Bin 98 -> 0 bytes .../blocks/infiblocks/glass_green_pane.png | Bin 96 -> 0 bytes .../blocks/infiblocks/glass_lightblue.png | Bin 98 -> 0 bytes .../infiblocks/glass_lightblue_pane.png | Bin 96 -> 0 bytes .../blocks/infiblocks/glass_lightgray.png | Bin 98 -> 0 bytes .../infiblocks/glass_lightgray_pane.png | Bin 97 -> 0 bytes .../textures/blocks/infiblocks/glass_lime.png | Bin 98 -> 0 bytes .../blocks/infiblocks/glass_lime_pane.png | Bin 96 -> 0 bytes .../blocks/infiblocks/glass_magenta.png | Bin 98 -> 0 bytes .../blocks/infiblocks/glass_magenta_pane.png | Bin 96 -> 0 bytes .../blocks/infiblocks/glass_orange.png | Bin 98 -> 0 bytes .../blocks/infiblocks/glass_orange_pane.png | Bin 96 -> 0 bytes .../textures/blocks/infiblocks/glass_pink.png | Bin 98 -> 0 bytes .../blocks/infiblocks/glass_pink_pane.png | Bin 96 -> 0 bytes .../textures/blocks/infiblocks/glass_pure.png | Bin 108 -> 0 bytes .../blocks/infiblocks/glass_pure_pane.png | Bin 102 -> 0 bytes .../blocks/infiblocks/glass_purple.png | Bin 98 -> 0 bytes .../blocks/infiblocks/glass_purple_pane.png | Bin 96 -> 0 bytes .../textures/blocks/infiblocks/glass_red.png | Bin 98 -> 0 bytes .../blocks/infiblocks/glass_red_pane.png | Bin 96 -> 0 bytes .../textures/blocks/infiblocks/glass_soul.png | Bin 353 -> 0 bytes .../blocks/infiblocks/glass_soul_pane.png | Bin 116 -> 0 bytes .../blocks/infiblocks/glass_soul_pure.png | Bin 292 -> 0 bytes .../infiblocks/glass_soul_pure_pane.png | Bin 103 -> 0 bytes .../blocks/infiblocks/glass_white.png | Bin 98 -> 0 bytes .../blocks/infiblocks/glass_white_pane.png | Bin 97 -> 0 bytes .../blocks/infiblocks/glass_yellow.png | Bin 98 -> 0 bytes .../blocks/infiblocks/glass_yellow_pane.png | Bin 96 -> 0 bytes .../blocks/infiblocks/paver_largeclay.png | Bin 833 -> 0 bytes .../blocks/infiblocks/refined_largeclay.png | Bin 710 -> 0 bytes .../blocks/infiblocks/refined_netherrack.png | Bin 907 -> 0 bytes .../blocks/infiblocks/refined_sandstone.png | Bin 735 -> 0 bytes .../blocks/infiblocks/refined_stone.png | Bin 252 -> 0 bytes .../textures/blocks/infiblocks/road_stone.png | Bin 426 -> 0 bytes .../blocks/infiblocks/road_stone_refined.png | Bin 432 -> 0 bytes .../blocks/infiblocks/smallbrick_ice.png | Bin 180 -> 0 bytes .../infiblocks/smallbrick_largeclay.png | Bin 647 -> 0 bytes .../blocks/infiblocks/squarebrick_iron.png | Bin 364 -> 0 bytes .../infiblocks/squarebrick_stone_refined.png | Bin 415 -> 0 bytes .../blocks/infiblocks/storage_bone.png | Bin 898 -> 0 bytes .../blocks/infiblocks/storage_charcoal.png | Bin 447 -> 0 bytes .../blocks/infiblocks/storage_coal.png | Bin 447 -> 0 bytes .../infiblocks/storage_inert_redstone.png | Bin 463 -> 0 bytes .../blocks/infiblocks/storage_slime.png | Bin 353 -> 0 bytes .../blocks/infiblocks/storage_wheat.png | Bin 554 -> 0 bytes .../blocks/infiblocks/storage_wheat_dark.png | Bin 493 -> 0 bytes .../{inventoryarmor.png => armorextended.png} | Bin 1911 -> 1911 bytes 191 files changed, 381 insertions(+), 173 deletions(-) create mode 100644 mods/tinker/tconstruct/client/gui/ArmorExtendedGui.java rename mods/tinker/tconstruct/{ => client}/projectilerender/DaggerRender.java (97%) rename mods/tinker/tconstruct/{ => client}/projectilerender/RangedRenderBase.java (98%) delete mode 100644 mods/tinker/tconstruct/container/ArmorExtended.java create mode 100644 mods/tinker/tconstruct/container/ArmorExtendedContainer.java create mode 100644 mods/tinker/tconstruct/container/SlotArmorCopy.java rename mods/tinker/tconstruct/{ => worldgen}/village/ComponentSmeltery.java (99%) rename mods/tinker/tconstruct/{ => worldgen}/village/ComponentToolWorkshop.java (98%) rename mods/tinker/tconstruct/{ => worldgen}/village/TVillageTrades.java (93%) rename mods/tinker/tconstruct/{ => worldgen}/village/VillageSmelteryHandler.java (93%) rename mods/tinker/tconstruct/{ => worldgen}/village/VillageToolStationHandler.java (95%) delete mode 100644 mods/tinker/textures/GGE/ItemLBInnerSide.png delete mode 100644 mods/tinker/textures/GGE/ItemLBOuterSide.png delete mode 100644 mods/tinker/textures/GGE/ItemLBPoleSide.png delete mode 100644 mods/tinker/textures/GGE/achievementsbg.png delete mode 100644 mods/tinker/textures/GGE/b.png delete mode 100644 mods/tinker/textures/GGE/core.png delete mode 100644 mods/tinker/textures/GGE/corestone.png delete mode 100644 mods/tinker/textures/GGE/face.png delete mode 100644 mods/tinker/textures/GGE/glowlogside.png delete mode 100644 mods/tinker/textures/GGE/glowlogtop.png delete mode 100644 mods/tinker/textures/GGE/glowsapling.png delete mode 100644 mods/tinker/textures/GGE/lifebench top.png delete mode 100644 mods/tinker/textures/GGE/lifebenchside.png delete mode 100644 mods/tinker/textures/GGE/lifebenchtop.png delete mode 100644 mods/tinker/textures/GGE/notebook.png delete mode 100644 mods/tinker/textures/GGE/recharger.png delete mode 100644 mods/tinker/textures/GGE/transparency.png delete mode 100644 mods/tinker/textures/GGE/wand.png rename mods/tinker/textures/blocks/{berries => crops}/berry_aluminum_fancy.png (100%) rename mods/tinker/textures/blocks/{berries => crops}/berry_aluminum_fast.png (100%) rename mods/tinker/textures/blocks/{berries => crops}/berry_aluminum_ripe_fancy.png (100%) rename mods/tinker/textures/blocks/{berries => crops}/berry_aluminum_ripe_fast.png (100%) rename mods/tinker/textures/blocks/{berries => crops}/berry_copper_fancy.png (100%) rename mods/tinker/textures/blocks/{berries => crops}/berry_copper_fast.png (100%) rename mods/tinker/textures/blocks/{berries => crops}/berry_copper_ripe_fancy.png (100%) rename mods/tinker/textures/blocks/{berries => crops}/berry_copper_ripe_fast.png (100%) rename mods/tinker/textures/blocks/{berries => crops}/berry_gold_fancy.png (100%) rename mods/tinker/textures/blocks/{berries => crops}/berry_gold_fast.png (100%) rename mods/tinker/textures/blocks/{berries => crops}/berry_gold_ripe_fancy.png (100%) rename mods/tinker/textures/blocks/{berries => crops}/berry_gold_ripe_fast.png (100%) rename mods/tinker/textures/blocks/{berries => crops}/berry_iron_fancy.png (100%) rename mods/tinker/textures/blocks/{berries => crops}/berry_iron_fast.png (100%) rename mods/tinker/textures/blocks/{berries => crops}/berry_iron_ripe_fancy.png (100%) rename mods/tinker/textures/blocks/{berries => crops}/berry_iron_ripe_fast.png (100%) rename mods/tinker/textures/blocks/{berries => crops}/berry_redstone_fancy.png (100%) rename mods/tinker/textures/blocks/{berries => crops}/berry_redstone_fast.png (100%) rename mods/tinker/textures/blocks/{berries => crops}/berry_redstone_ripe_fancy.png (100%) rename mods/tinker/textures/blocks/{berries => crops}/berry_redstone_ripe_fast.png (100%) rename mods/tinker/textures/blocks/{berries => crops}/berry_silver_fancy.png (100%) rename mods/tinker/textures/blocks/{berries => crops}/berry_silver_fast.png (100%) rename mods/tinker/textures/blocks/{berries => crops}/berry_silver_ripe_fancy.png (100%) rename mods/tinker/textures/blocks/{berries => crops}/berry_silver_ripe_fast.png (100%) rename mods/tinker/textures/blocks/{berries => crops}/berry_tin_fancy.png (100%) rename mods/tinker/textures/blocks/{berries => crops}/berry_tin_fast.png (100%) rename mods/tinker/textures/blocks/{berries => crops}/berry_tin_ripe_fancy.png (100%) rename mods/tinker/textures/blocks/{berries => crops}/berry_tin_ripe_fast.png (100%) create mode 100644 mods/tinker/textures/blocks/crops/herb_base_1.png create mode 100644 mods/tinker/textures/blocks/crops/herb_base_2.png create mode 100644 mods/tinker/textures/blocks/crops/herb_base_3.png create mode 100644 mods/tinker/textures/blocks/crops/herb_base_4.png create mode 100644 mods/tinker/textures/blocks/crops/herb_bloody_1.png create mode 100644 mods/tinker/textures/blocks/crops/herb_bloody_2.png create mode 100644 mods/tinker/textures/blocks/crops/herb_bloody_3.png create mode 100644 mods/tinker/textures/blocks/crops/herb_bloody_4.png create mode 100644 mods/tinker/textures/blocks/crops/herb_mana_1.png create mode 100644 mods/tinker/textures/blocks/crops/herb_mana_2.png create mode 100644 mods/tinker/textures/blocks/crops/herb_mana_3.png create mode 100644 mods/tinker/textures/blocks/crops/herb_mana_4.png create mode 100644 mods/tinker/textures/blocks/crops/herb_mandrake_1.png create mode 100644 mods/tinker/textures/blocks/crops/herb_mandrake_2.png create mode 100644 mods/tinker/textures/blocks/crops/herb_mandrake_3.png create mode 100644 mods/tinker/textures/blocks/crops/herb_mandrake_3_1.png create mode 100644 mods/tinker/textures/blocks/crops/herb_mandrake_4.png create mode 100644 mods/tinker/textures/blocks/crops/herb_mandrake_4_1.png create mode 100644 mods/tinker/textures/blocks/crops/herb_poison_1.png create mode 100644 mods/tinker/textures/blocks/crops/herb_poison_2.png create mode 100644 mods/tinker/textures/blocks/crops/herb_poison_3.png create mode 100644 mods/tinker/textures/blocks/crops/herb_poison_4.png create mode 100644 mods/tinker/textures/blocks/crops/herb_spring_1.png create mode 100644 mods/tinker/textures/blocks/crops/herb_spring_2.png create mode 100644 mods/tinker/textures/blocks/crops/herb_spring_3.png create mode 100644 mods/tinker/textures/blocks/crops/herb_spring_4.png create mode 100644 mods/tinker/textures/blocks/crops/herb_white_1.png create mode 100644 mods/tinker/textures/blocks/crops/herb_white_2.png create mode 100644 mods/tinker/textures/blocks/crops/herb_white_3.png create mode 100644 mods/tinker/textures/blocks/crops/herb_white_4.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/ancient_ice.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/brick_bone.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/brick_diamond.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/brick_gold.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/brick_ice.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/brick_iron.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/brick_lapis.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/brick_largeclay.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/brick_netherrack.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/brick_obsidian.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/brick_redstone.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/brick_sandstone.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/brick_slime.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/brick_snow.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/brick_stone_refined.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/brownstone_road_rough.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/brownstone_rough.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/brownstone_smooth.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/brownstone_smooth_brick.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/brownstone_smooth_fancybrick.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/brownstone_smooth_road.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/brownstone_smooth_squarebrick.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/fancybrick_diamond.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/fancybrick_gold.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/fancybrick_ice.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/fancybrick_iron.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/fancybrick_lapis.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/fancybrick_largeclay.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/fancybrick_netherrack.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/fancybrick_obsidian.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/fancybrick_redstone.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/fancybrick_sandstone.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/fancybrick_slime.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/fancybrick_snow.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/fancybrick_stone.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/fancybrick_stone_refined.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_black.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_black_pane.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_blue.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_blue_pane.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_brown.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_brown_pane.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_cyan.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_cyan_pane.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_gray.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_gray_pane.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_green.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_green_pane.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_lightblue.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_lightblue_pane.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_lightgray.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_lightgray_pane.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_lime.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_lime_pane.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_magenta.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_magenta_pane.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_orange.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_orange_pane.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_pink.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_pink_pane.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_pure.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_pure_pane.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_purple.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_purple_pane.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_red.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_red_pane.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_soul.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_soul_pane.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_soul_pure.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_soul_pure_pane.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_white.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_white_pane.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_yellow.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/glass_yellow_pane.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/paver_largeclay.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/refined_largeclay.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/refined_netherrack.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/refined_sandstone.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/refined_stone.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/road_stone.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/road_stone_refined.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/smallbrick_ice.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/smallbrick_largeclay.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/squarebrick_iron.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/squarebrick_stone_refined.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/storage_bone.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/storage_charcoal.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/storage_coal.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/storage_inert_redstone.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/storage_slime.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/storage_wheat.png delete mode 100644 mods/tinker/textures/blocks/infiblocks/storage_wheat_dark.png rename mods/tinker/textures/gui/{inventoryarmor.png => armorextended.png} (93%) diff --git a/mods/tinker/tconstruct/PHConstruct.java b/mods/tinker/tconstruct/PHConstruct.java index 4d7a59da..866828cc 100644 --- a/mods/tinker/tconstruct/PHConstruct.java +++ b/mods/tinker/tconstruct/PHConstruct.java @@ -178,13 +178,6 @@ public class PHConstruct aluminumuMinY = config.get("Worldgen", "Aluminum Underground Min Y", 0).getInt(0); aluminumuMaxY = config.get("Worldgen", "Aluminum Underground Max Y", 64).getInt(64); - copperbMinY = config.get("Worldgen", "Copper Bush Min Y", 20).getInt(20); - copperbMaxY = config.get("Worldgen", "Copper Bush Max Y", 60).getInt(60); - tinbMinY = config.get("Worldgen", "Tin Bush Min Y", 0).getInt(0); - tinbMaxY = config.get("Worldgen", "Tin Bush Max Y", 40).getInt(40); - aluminumbMinY = config.get("Worldgen", "Aluminum Bush Min Y", 0).getInt(0); - aluminumbMaxY = config.get("Worldgen", "Aluminum Bush Max Y", 64).getInt(64); - ironsRarity = config.get("Worldgen", "Iron Surface Rarity", 50).getInt(50); goldsRarity = config.get("Worldgen", "Gold Surface Rarity", 150).getInt(150); coppersRarity = config.get("Worldgen", "Copper Surface Rarity", 32).getInt(32); @@ -192,12 +185,19 @@ public class PHConstruct aluminumsRarity = config.get("Worldgen", "Aluminum Surface Rarity", 32).getInt(32); cobaltsRarity = config.get("Worldgen", "Cobalt Surface Rarity", 400).getInt(400); - ironbDensity = config.get("Worldgen", "Iron Bush Density", 1).getInt(1); - goldbDensity = config.get("Worldgen", "Gold Bush Density", 1).getInt(1); - copperbDensity = config.get("Worldgen", "Copper Bush Density", 2).getInt(2); - tinbDensity = config.get("Worldgen", "Tin Bush Density", 2).getInt(2); + ironBushDensity = config.get("Worldgen", "Iron Bush Density", 1).getInt(1); + goldBushDensity = config.get("Worldgen", "Gold Bush Density", 1).getInt(1); + copperBushDensity = config.get("Worldgen", "Copper Bush Density", 2).getInt(2); + tinBushDensity = config.get("Worldgen", "Tin Bush Density", 2).getInt(2); aluminumbDensity = config.get("Worldgen", "Aluminum Bush Density", 2).getInt(2); - silverbDensity = config.get("Worldgen", "Silver Bush Density", 1).getInt(1); + silverBushDensity = config.get("Worldgen", "Silver Bush Density", 1).getInt(1); + + copperBushMinY = config.get("Worldgen", "Copper Bush Min Y", 20).getInt(20); + copperBushMaxY = config.get("Worldgen", "Copper Bush Max Y", 60).getInt(60); + tinBushMinY = config.get("Worldgen", "Tin Bush Min Y", 0).getInt(0); + tinBushMaxY = config.get("Worldgen", "Tin Bush Max Y", 40).getInt(40); + aluminumBushMinY = config.get("Worldgen", "Aluminum Bush Min Y", 0).getInt(0); + aluminumBushMaxY = config.get("Worldgen", "Aluminum Bush Max Y", 64).getInt(64); seaLevel = config.get("general", "Sea level", 64).getInt(64); @@ -323,12 +323,12 @@ public class PHConstruct public static int aluminumsRarity; public static int cobaltsRarity; - public static int ironbDensity; - public static int goldbDensity; - public static int copperbDensity; - public static int tinbDensity; + public static int ironBushDensity; + public static int goldBushDensity; + public static int copperBushDensity; + public static int tinBushDensity; public static int aluminumbDensity; - public static int silverbDensity; + public static int silverBushDensity; public static int copperuMinY; public static int copperuMaxY; @@ -337,12 +337,12 @@ public class PHConstruct public static int aluminumuMinY; public static int aluminumuMaxY; - public static int copperbMinY; - public static int copperbMaxY; - public static int tinbMinY; - public static int tinbMaxY; - public static int aluminumbMinY; - public static int aluminumbMaxY; + public static int copperBushMinY; + public static int copperBushMaxY; + public static int tinBushMinY; + public static int tinBushMaxY; + public static int aluminumBushMinY; + public static int aluminumBushMaxY; public static int seaLevel; diff --git a/mods/tinker/tconstruct/TConstruct.java b/mods/tinker/tconstruct/TConstruct.java index fa25c555..ca5fccd7 100644 --- a/mods/tinker/tconstruct/TConstruct.java +++ b/mods/tinker/tconstruct/TConstruct.java @@ -3,10 +3,10 @@ package mods.tinker.tconstruct; import mods.tinker.tconstruct.library.TConstructRegistry; import mods.tinker.tconstruct.library.TabTools; import mods.tinker.tconstruct.player.TPlayerHandler; -import mods.tinker.tconstruct.village.TVillageTrades; -import mods.tinker.tconstruct.village.VillageSmelteryHandler; -import mods.tinker.tconstruct.village.VillageToolStationHandler; import mods.tinker.tconstruct.worldgen.TBaseWorldGenerator; +import mods.tinker.tconstruct.worldgen.village.TVillageTrades; +import mods.tinker.tconstruct.worldgen.village.VillageSmelteryHandler; +import mods.tinker.tconstruct.worldgen.village.VillageToolStationHandler; import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.Instance; @@ -26,7 +26,7 @@ import cpw.mods.fml.common.registry.VillagerRegistry; * @dependencies: IC2 API, EBXL API */ -@Mod(modid = "TConstruct", name = "TConstruct", version = "1.5.1_1.3dev.16", dependencies = "required-after:Forge@[7.7.1.659,)") +@Mod(modid = "TConstruct", name = "TConstruct", version = "1.5.1_1.3dev.19", dependencies = "required-after:Forge@[7.7.1.659,)") @NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = mods.tinker.tconstruct.TPacketHandler.class) public class TConstruct { @@ -59,7 +59,7 @@ public class TConstruct proxy.registerTickHandler(); proxy.addNames(); proxy.readManuals(); - //proxy.registerKeys(); + proxy.registerKeys(); GameRegistry.registerWorldGenerator(new TBaseWorldGenerator()); GameRegistry.registerFuelHandler(content); diff --git a/mods/tinker/tconstruct/TContent.java b/mods/tinker/tconstruct/TContent.java index be28a61a..102ae013 100644 --- a/mods/tinker/tconstruct/TContent.java +++ b/mods/tinker/tconstruct/TContent.java @@ -718,9 +718,9 @@ public class TContent implements IFuelHandler GameRegistry.addRecipe(new ItemStack(materials, 9, 16), "m", 'm', new ItemStack(metalBlock, 1, 9)); //Steel GameRegistry.addRecipe(new ItemStack(Item.ingotIron), "mmm", "mmm", "mmm", 'm', new ItemStack(materials, 1, 19)); //Iron - GameRegistry.addRecipe(new ItemStack(materials, 9, 9), "mmm", "mmm", "mmm", 'm', new ItemStack(materials, 1, 20)); //Copper - GameRegistry.addRecipe(new ItemStack(materials, 9, 10), "mmm", "mmm", "mmm", 'm', new ItemStack(materials, 1, 21)); //Tin - GameRegistry.addRecipe(new ItemStack(materials, 9, 12), "mmm", "mmm", "mmm", 'm', new ItemStack(materials, 1, 22)); //Aluminum + GameRegistry.addRecipe(new ItemStack(materials, 1, 9), "mmm", "mmm", "mmm", 'm', new ItemStack(materials, 1, 20)); //Copper + GameRegistry.addRecipe(new ItemStack(materials, 1, 10), "mmm", "mmm", "mmm", 'm', new ItemStack(materials, 1, 21)); //Tin + GameRegistry.addRecipe(new ItemStack(materials, 1, 12), "mmm", "mmm", "mmm", 'm', new ItemStack(materials, 1, 22)); //Aluminum LiquidBlockCasting lbc = LiquidBlockCasting.instance; lbc.addBlockCastingRecipe(new ItemStack(Block.blockIron), new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 9, 0), null, true, 100); //Iron diff --git a/mods/tinker/tconstruct/TGuiHandler.java b/mods/tinker/tconstruct/TGuiHandler.java index 5f521fdf..e6ad85b8 100644 --- a/mods/tinker/tconstruct/TGuiHandler.java +++ b/mods/tinker/tconstruct/TGuiHandler.java @@ -3,7 +3,9 @@ package mods.tinker.tconstruct; import mods.tinker.common.InventoryLogic; import mods.tinker.tconstruct.client.*; import mods.tinker.tconstruct.client.gui.*; +import mods.tinker.tconstruct.container.*; import mods.tinker.tconstruct.logic.*; +import mods.tinker.tconstruct.player.TPlayerStats; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -19,6 +21,7 @@ public class TGuiHandler implements IGuiHandler public static int frypanID = 4; public static int smeltery = 7; + public static int armor = 101; public static int manualGui = -1; @Override @@ -27,10 +30,22 @@ public class TGuiHandler implements IGuiHandler if (ID < 0) return null; - TileEntity tile = world.getBlockTileEntity(x, y, z); - if (tile != null && tile instanceof InventoryLogic) + else if (ID <= 100) { - return ((InventoryLogic) tile).getGuiContainer(player.inventory, world, x, y, z); + TileEntity tile = world.getBlockTileEntity(x, y, z); + if (tile != null && tile instanceof InventoryLogic) + { + return ((InventoryLogic) tile).getGuiContainer(player.inventory, world, x, y, z); + } + } + else + { + if (ID == armor) + { + System.out.println("Server Armor Gui: "+player.username); + TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.username); + return new ArmorExtendedContainer(player.inventory, stats); + } } return null; } @@ -55,6 +70,12 @@ public class TGuiHandler implements IGuiHandler ItemStack stack = player.getCurrentEquippedItem(); return new GuiManual(stack, TProxyClient.getManualFromStack(stack)); } + if (ID == armor) + { + System.out.println("Client Armor Gui: "+player.username); + TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.username); + return new ArmorExtendedGui(player.inventory, stats); + } return null; } diff --git a/mods/tinker/tconstruct/TPacketHandler.java b/mods/tinker/tconstruct/TPacketHandler.java index 3901d858..476baad3 100644 --- a/mods/tinker/tconstruct/TPacketHandler.java +++ b/mods/tinker/tconstruct/TPacketHandler.java @@ -101,18 +101,25 @@ public class TPacketHandler implements IPacketHandler } } + else if (packetID == 3) //Armor + { + String user = inputStream.readUTF(); + EntityPlayer player = TConstruct.playerTracker.getEntityPlayer(user); + player.openGui(TConstruct.instance, TGuiHandler.armor, player.worldObj, (int)player.posX, (int)player.posY, (int)player.posZ); + } + else if (packetID == 10) //Double jump { String user = inputStream.readUTF(); EntityPlayer player = TConstruct.playerTracker.getEntityPlayer(user); player.fallDistance = 0; } - else if (packetID == 11) + /*else if (packetID == 11) { String user = inputStream.readUTF(); float size = inputStream.readFloat(); TConstruct.playerTracker.updateSize(user, size); - } + }*/ } catch (IOException e) { diff --git a/mods/tinker/tconstruct/blocks/OreberryBush.java b/mods/tinker/tconstruct/blocks/OreberryBush.java index ebf12db4..4fb2326f 100644 --- a/mods/tinker/tconstruct/blocks/OreberryBush.java +++ b/mods/tinker/tconstruct/blocks/OreberryBush.java @@ -61,8 +61,8 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable 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"); + this.fastIcons[i] = iconRegister.registerIcon("tinker:crops/" + textureNames[i] + "_fast"); + this.fancyIcons[i] = iconRegister.registerIcon("tinker:crops/" + textureNames[i] + "_fancy"); } } diff --git a/mods/tinker/tconstruct/client/TControls.java b/mods/tinker/tconstruct/client/TControls.java index 24b975e8..dac02461 100644 --- a/mods/tinker/tconstruct/client/TControls.java +++ b/mods/tinker/tconstruct/client/TControls.java @@ -5,6 +5,7 @@ import java.io.DataOutputStream; import java.util.EnumSet; import mods.tinker.tconstruct.TConstruct; +import mods.tinker.tconstruct.TGuiHandler; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.client.settings.KeyBinding; @@ -15,8 +16,9 @@ import cpw.mods.fml.common.network.PacketDispatcher; public class TControls extends TKeyHandler { - static KeyBinding grabKey = new KeyBinding("key.grab", 29); + //static KeyBinding grabKey = new KeyBinding("key.grab", 29); //static KeyBinding stiltsKey = new KeyBinding("key.stilts", 46); + static KeyBinding armorKey = new KeyBinding("key.armor", 23); static KeyBinding jumpKey; static Minecraft mc; boolean jumping; @@ -24,11 +26,13 @@ public class TControls extends TKeyHandler boolean climbing = false; boolean onGround = false; boolean onStilts = false; + + boolean armorGuiOpen = false; //boolean onStilts = false; public TControls() { - super(new KeyBinding[] { grabKey }, new boolean[] { false }, getVanillaKeyBindings(), new boolean[] { false }); + super(new KeyBinding[] { armorKey }, new boolean[] { false }, getVanillaKeyBindings(), new boolean[] { false }); //System.out.println("Controls registered"); } @@ -50,7 +54,12 @@ public class TControls extends TKeyHandler { if (tickEnd && mc.theWorld != null) { - if (kb == jumpKey) //Double jump + if (kb == armorKey && !armorGuiOpen) //Extended Armor + { + //mc.thePlayer.openGui(TConstruct.instance, TGuiHandler.armor, mc.theWorld, (int)mc.thePlayer.posX, (int)mc.thePlayer.posY, (int)mc.thePlayer.posZ); + openArmorGui(mc.thePlayer.username); + } + /*if (kb == jumpKey) //Double jump { if (jumping && !doubleJump) { @@ -71,7 +80,7 @@ public class TControls extends TKeyHandler if (!jumping) jumping = mc.thePlayer.isAirBorne; - } + }*/ } /*else if (kb == stiltsKey) //Stilts { @@ -154,6 +163,23 @@ public class TControls extends TKeyHandler updateServer(bos); } + void openArmorGui(String username) + { + ByteArrayOutputStream bos = new ByteArrayOutputStream(8); + DataOutputStream outputStream = new DataOutputStream(bos); + try + { + outputStream.writeByte(3); + outputStream.writeUTF(username); + } + catch (Exception ex) + { + ex.printStackTrace(); + } + + updateServer(bos); + } + void updateServer(ByteArrayOutputStream bos) { Packet250CustomPayload packet = new Packet250CustomPayload(); diff --git a/mods/tinker/tconstruct/client/gui/ArmorExtendedGui.java b/mods/tinker/tconstruct/client/gui/ArmorExtendedGui.java new file mode 100644 index 00000000..9c40a1df --- /dev/null +++ b/mods/tinker/tconstruct/client/gui/ArmorExtendedGui.java @@ -0,0 +1,105 @@ +package mods.tinker.tconstruct.client.gui; + +import mods.tinker.tconstruct.container.ArmorExtendedContainer; +import mods.tinker.tconstruct.player.TPlayerStats; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.InventoryEffectRenderer; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.entity.player.InventoryPlayer; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +public class ArmorExtendedGui extends InventoryEffectRenderer +{ + public InventoryPlayer inv; + public TPlayerStats stats; + + private float xSize_lo; + private float ySize_lo; + + + public ArmorExtendedGui(InventoryPlayer inventoryplayer, TPlayerStats holder) + { + super(new ArmorExtendedContainer(inventoryplayer, holder)); + inv = inventoryplayer; + stats = holder; + } + + protected void drawGuiContainerForegroundLayer(int par1, int par2) + { + //fontRenderer.drawString("This Gui is broken :D", 8, -10, 0x404040); + //fontRenderer.drawString(StatCollector.translateToLocal("inventory.armorextended"), 60, 6, 0x404040); + //fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 17, (ySize - 96) + 2, 0x404040); + } + + public void drawScreen(int par1, int par2, float par3) + { + super.drawScreen(par1, par2, par3); + this.xSize_lo = (float)par1; + this.ySize_lo = (float)par2; + } + + protected void drawGuiContainerBackgroundLayer(float f, int i, int j) + { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + mc.renderEngine.bindTexture("/mods/tinker/textures/gui/armorextended.png"); + int cornerX = (width - xSize) / 2; + int cornerY = (height - ySize) / 2; + drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); + + if (!stats.isStackInSlot(0)) + drawTexturedModalRect(cornerX+79, cornerY+16, 176, 9, 18, 18); + if (!stats.isStackInSlot(1)) + drawTexturedModalRect(cornerX+79, cornerY+34, 176, 27, 18, 18); + if (!stats.isStackInSlot(2)) + drawTexturedModalRect(cornerX+115, cornerY+16, 212, 9, 18, 18); + if (!stats.isStackInSlot(3)) + drawTexturedModalRect(cornerX+115, cornerY+34, 212, 27, 18, 18); + if (!stats.isStackInSlot(4)) + drawTexturedModalRect(cornerX+151, cornerY+16, 230, 0, 18, 18); + if (!stats.isStackInSlot(5)) + drawTexturedModalRect(cornerX+151, cornerY+34, 230, 18, 18, 18); + if (!stats.isStackInSlot(6)) + drawTexturedModalRect(cornerX+151, cornerY+52, 230, 36, 18, 18); + + cornerX = this.guiLeft; + cornerY = this.guiTop; + drawPlayerOnGui(this.mc, cornerX + 33, cornerY + 75, 30, (float)(cornerX + 51) - this.xSize_lo, (float)(cornerY + 75 - 50) - this.ySize_lo); + } + + public static void drawPlayerOnGui(Minecraft par0Minecraft, int par1, int par2, int par3, float par4, float par5) + { + GL11.glEnable(GL11.GL_COLOR_MATERIAL); + GL11.glPushMatrix(); + GL11.glTranslatef((float)par1, (float)par2, 50.0F); + GL11.glScalef((float)(-par3), (float)par3, (float)par3); + GL11.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); + float f2 = par0Minecraft.thePlayer.renderYawOffset; + float f3 = par0Minecraft.thePlayer.rotationYaw; + float f4 = par0Minecraft.thePlayer.rotationPitch; + par4 -= 19; + GL11.glRotatef(135.0F, 0.0F, 1.0F, 0.0F); + RenderHelper.enableStandardItemLighting(); + GL11.glRotatef(-135.0F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(-((float)Math.atan((double)(par5 / 40.0F))) * 20.0F, 1.0F, 0.0F, 0.0F); + par0Minecraft.thePlayer.renderYawOffset = (float)Math.atan((double)(par4 / 40.0F)) * 20.0F; + par0Minecraft.thePlayer.rotationYaw = (float)Math.atan((double)(par4 / 40.0F)) * 40.0F; + par0Minecraft.thePlayer.rotationPitch = -((float)Math.atan((double)(par5 / 40.0F))) * 20.0F; + par0Minecraft.thePlayer.rotationYawHead = par0Minecraft.thePlayer.rotationYaw; + GL11.glTranslatef(0.0F, par0Minecraft.thePlayer.yOffset, 0.0F); + RenderManager.instance.playerViewY = 180.0F; + RenderManager.instance.renderEntityWithPosYaw(par0Minecraft.thePlayer, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F); + par0Minecraft.thePlayer.renderYawOffset = f2; + par0Minecraft.thePlayer.rotationYaw = f3; + par0Minecraft.thePlayer.rotationPitch = f4; + GL11.glPopMatrix(); + RenderHelper.disableStandardItemLighting(); + GL11.glDisable(GL12.GL_RESCALE_NORMAL); + OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit); + GL11.glDisable(GL11.GL_TEXTURE_2D); + OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit); + } +} diff --git a/mods/tinker/tconstruct/projectilerender/DaggerRender.java b/mods/tinker/tconstruct/client/projectilerender/DaggerRender.java similarity index 97% rename from mods/tinker/tconstruct/projectilerender/DaggerRender.java rename to mods/tinker/tconstruct/client/projectilerender/DaggerRender.java index 1f81ccaa..b5786be8 100644 --- a/mods/tinker/tconstruct/projectilerender/DaggerRender.java +++ b/mods/tinker/tconstruct/client/projectilerender/DaggerRender.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.projectilerender; +package mods.tinker.tconstruct.client.projectilerender; import java.util.Random; import mods.tinker.tconstruct.entity.projectile.DaggerEntity; diff --git a/mods/tinker/tconstruct/projectilerender/RangedRenderBase.java b/mods/tinker/tconstruct/client/projectilerender/RangedRenderBase.java similarity index 98% rename from mods/tinker/tconstruct/projectilerender/RangedRenderBase.java rename to mods/tinker/tconstruct/client/projectilerender/RangedRenderBase.java index b62c10b3..dc42a0a9 100644 --- a/mods/tinker/tconstruct/projectilerender/RangedRenderBase.java +++ b/mods/tinker/tconstruct/client/projectilerender/RangedRenderBase.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.projectilerender; +package mods.tinker.tconstruct.client.projectilerender; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; diff --git a/mods/tinker/tconstruct/container/ArmorExtended.java b/mods/tinker/tconstruct/container/ArmorExtended.java deleted file mode 100644 index 05b7313e..00000000 --- a/mods/tinker/tconstruct/container/ArmorExtended.java +++ /dev/null @@ -1,90 +0,0 @@ -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/ArmorExtendedContainer.java b/mods/tinker/tconstruct/container/ArmorExtendedContainer.java new file mode 100644 index 00000000..1d777251 --- /dev/null +++ b/mods/tinker/tconstruct/container/ArmorExtendedContainer.java @@ -0,0 +1,60 @@ +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 ArmorExtendedContainer extends ActiveContainer +{ + public InventoryPlayer invPlayer; + public TPlayerStats armor; + + public ArmorExtendedContainer(InventoryPlayer inventoryplayer, TPlayerStats stats) + { + invPlayer = inventoryplayer; + armor = stats; + + this.addSlotToContainer(new Slot(stats, 0, 80, 17)); + this.addSlotToContainer(new Slot(stats, 1, 80, 35)); + this.addSlotToContainer(new Slot(stats, 2, 116, 17)); + this.addSlotToContainer(new Slot(stats, 3, 116, 35)); + this.addSlotToContainer(new Slot(stats, 4, 152, 17)); + this.addSlotToContainer(new Slot(stats, 5, 152, 35)); + this.addSlotToContainer(new Slot(stats, 6, 152, 53)); + + /* Player inventory */ + for (int armor = 0; armor < 4; ++armor) + { + this.addSlotToContainer(new SlotArmorCopy(this, inventoryplayer, inventoryplayer.getSizeInventory() - 1 - armor, 98, 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) + { + return null; + } +} diff --git a/mods/tinker/tconstruct/container/SlotArmorCopy.java b/mods/tinker/tconstruct/container/SlotArmorCopy.java new file mode 100644 index 00000000..35aa3c10 --- /dev/null +++ b/mods/tinker/tconstruct/container/SlotArmorCopy.java @@ -0,0 +1,59 @@ +package mods.tinker.tconstruct.container; + +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class SlotArmorCopy extends Slot +{ + /** + * The armor type that can be placed on that slot, it uses the same values of armorType field on ItemArmor. + */ + final int armorType; + + /** + * The parent class of this clot, ContainerPlayer, SlotArmor is a Anon inner class. + */ + final Container parent; + + public SlotArmorCopy(Container container, IInventory par2IInventory, int par3, int par4, int par5, int par6) + { + super(par2IInventory, par3, par4, par5); + this.parent = container; + this.armorType = par6; + } + + /** + * Returns the maximum stack size for a given slot (usually the same as getInventoryStackLimit(), but 1 in the case + * of armor slots) + */ + public int getSlotStackLimit() + { + return 1; + } + + /** + * Check if the stack is a valid item for this slot. Always true beside for the armor slots. + */ + public boolean isItemValid(ItemStack par1ItemStack) + { + Item item = (par1ItemStack == null ? null : par1ItemStack.getItem()); + return item != null && item.isValidArmor(par1ItemStack, armorType); + } + + @SideOnly(Side.CLIENT) + + /** + * Returns the icon index on items.png that is used as background image of the slot. + */ + public Icon getBackgroundIconIndex() + { + return ItemArmor.func_94602_b(this.armorType); + } +} diff --git a/mods/tinker/tconstruct/player/TPlayerHandler.java b/mods/tinker/tconstruct/player/TPlayerHandler.java index 8794d92e..9ea1fcba 100644 --- a/mods/tinker/tconstruct/player/TPlayerHandler.java +++ b/mods/tinker/tconstruct/player/TPlayerHandler.java @@ -164,7 +164,7 @@ public class TPlayerHandler implements IPlayerTracker } /* Find the right player */ - TPlayerStats getPlayerStats (String username) + public TPlayerStats getPlayerStats (String username) { TPlayerStats stats = playerStats.get(username); if (stats == null) diff --git a/mods/tinker/tconstruct/player/TPlayerStats.java b/mods/tinker/tconstruct/player/TPlayerStats.java index 191e1b57..f11bf133 100644 --- a/mods/tinker/tconstruct/player/TPlayerStats.java +++ b/mods/tinker/tconstruct/player/TPlayerStats.java @@ -16,24 +16,48 @@ public class TPlayerStats implements IInventory public boolean materialManual; public boolean smelteryManual; - public ItemStack[] armor = new ItemStack[7]; + public ItemStack[] inventory = new ItemStack[7]; @Override public int getSizeInventory () { - return armor.length; + return inventory.length; + } + + public boolean isStackInSlot (int slot) + { + return inventory[slot] != null; } @Override public ItemStack getStackInSlot (int slot) { - return null; + return inventory[slot]; } @Override public ItemStack decrStackSize (int slot, int quantity) { - return null; + if (inventory[slot] != null) + { + System.out.println("Took something from slot "+slot); + if (inventory[slot].stackSize <= quantity) + { + ItemStack stack = inventory[slot]; + inventory[slot] = null; + return stack; + } + ItemStack split = inventory[slot].splitStack(quantity); + if (inventory[slot].stackSize == 0) + { + inventory[slot] = null; + } + return split; + } + else + { + return null; + } } @Override @@ -45,13 +69,18 @@ public class TPlayerStats implements IInventory @Override public void setInventorySlotContents (int slot, ItemStack itemstack) { - + inventory[slot] = itemstack; + //System.out.println("Changed slot "+slot); + if (itemstack != null && itemstack.stackSize > getInventoryStackLimit()) + { + itemstack.stackSize = getInventoryStackLimit(); + } } @Override public String getInvName () { - return null; + return ""; } @Override @@ -63,13 +92,12 @@ public class TPlayerStats implements IInventory @Override public int getInventoryStackLimit () { - return 0; + return 64; } @Override public void onInventoryChanged () { - } @Override @@ -78,17 +106,8 @@ public class TPlayerStats implements IInventory return true; } - @Override - public void openChest () - { - - } - - @Override - public void closeChest () - { - - } + public void openChest () {} + public void closeChest () {} @Override public boolean isStackValidForSlot (int slot, ItemStack itemstack) diff --git a/mods/tinker/tconstruct/tools/Axe.java b/mods/tinker/tconstruct/tools/Axe.java index 8d747cde..d1e98220 100644 --- a/mods/tinker/tconstruct/tools/Axe.java +++ b/mods/tinker/tconstruct/tools/Axe.java @@ -48,7 +48,7 @@ public class Axe extends HarvestTool return AbilityHelper.onBlockChanged(itemstack, world, bID, x, y, z, player, random); } - static Material[] materials = { Material.wood, Material.leaves, Material.circuits, Material.cactus, Material.pumpkin }; + static Material[] materials = { Material.wood, Material.leaves, Material.circuits, Material.cactus, Material.pumpkin }; @Override protected Item getHeadItem () diff --git a/mods/tinker/tconstruct/worldgen/TBaseWorldGenerator.java b/mods/tinker/tconstruct/worldgen/TBaseWorldGenerator.java index 92f4429a..e9fb814b 100644 --- a/mods/tinker/tconstruct/worldgen/TBaseWorldGenerator.java +++ b/mods/tinker/tconstruct/worldgen/TBaseWorldGenerator.java @@ -149,7 +149,7 @@ public class TBaseWorldGenerator implements IWorldGenerator int xPos, yPos, zPos; if (PHConstruct.generateIronBush) { - for (int i = 0; i < PHConstruct.ironbDensity; i++) + for (int i = 0; i < PHConstruct.ironBushDensity; i++) { xPos = xChunk + random.nextInt(16); yPos = PHConstruct.seaLevel - 32; @@ -165,7 +165,7 @@ public class TBaseWorldGenerator implements IWorldGenerator } if (PHConstruct.generateGoldBush) { - for (int i = 0; i < PHConstruct.goldbDensity; i++) + for (int i = 0; i < PHConstruct.goldBushDensity; i++) { xPos = xChunk + random.nextInt(16); yPos = 16; @@ -181,12 +181,12 @@ public class TBaseWorldGenerator implements IWorldGenerator } if (PHConstruct.generateCopperBush)// && random.nextInt(PHConstruct.copperbRarity) == 0) { - for (int i = 0; i < PHConstruct.copperbDensity; i++) + for (int i = 0; i < PHConstruct.copperBushDensity; i++) { xPos = xChunk + random.nextInt(16); - yPos = (PHConstruct.copperbMaxY + PHConstruct.copperbMinY) / 2; + yPos = (PHConstruct.copperBushMaxY + PHConstruct.copperBushMinY) / 2; zPos = zChunk + random.nextInt(16); - yPos = findAdequateLocation(world, xPos, yPos, zPos, PHConstruct.copperbMaxY, PHConstruct.copperbMinY); + yPos = findAdequateLocation(world, xPos, yPos, zPos, PHConstruct.copperBushMaxY, PHConstruct.copperBushMinY); if (yPos != -1) { /*CoordTuple coord = new CoordTuple(xPos, yPos, zPos); @@ -197,12 +197,12 @@ public class TBaseWorldGenerator implements IWorldGenerator } if (PHConstruct.generateTinBush)// && random.nextInt(PHConstruct.tinbRarity) == 0) { - for (int i = 0; i < PHConstruct.tinbDensity; i++) + for (int i = 0; i < PHConstruct.tinBushDensity; i++) { xPos = xChunk + random.nextInt(16); - yPos = (PHConstruct.tinuMaxY + PHConstruct.tinbMinY) / 2; + yPos = (PHConstruct.tinBushMaxY + PHConstruct.tinBushMinY) / 2; zPos = zChunk + random.nextInt(16); - yPos = findAdequateLocation(world, xPos, yPos, zPos, PHConstruct.tinbMaxY, PHConstruct.tinbMinY); + yPos = findAdequateLocation(world, xPos, yPos, zPos, PHConstruct.tinBushMaxY, PHConstruct.tinBushMinY); if (yPos != -1) { /*CoordTuple coord = new CoordTuple(xPos, yPos, zPos); @@ -216,9 +216,9 @@ public class TBaseWorldGenerator implements IWorldGenerator for (int i = 0; i < PHConstruct.aluminumbDensity; i++) { xPos = xChunk + random.nextInt(16); - yPos = (PHConstruct.aluminumuMaxY + PHConstruct.aluminumbMinY) / 2; + yPos = (PHConstruct.aluminumBushMaxY + PHConstruct.aluminumBushMinY) / 2; zPos = zChunk + random.nextInt(16); - yPos = findAdequateLocation(world, xPos, yPos, zPos, PHConstruct.aluminumbMaxY, PHConstruct.aluminumbMinY); + yPos = findAdequateLocation(world, xPos, yPos, zPos, PHConstruct.aluminumBushMaxY, PHConstruct.aluminumBushMinY); if (yPos != -1) { /*CoordTuple coord = new CoordTuple(xPos, yPos, zPos); @@ -227,9 +227,9 @@ public class TBaseWorldGenerator implements IWorldGenerator } } } - if (PHConstruct.generateSilverBush && random.nextInt(PHConstruct.silverbDensity) == 0) + if (PHConstruct.generateSilverBush && random.nextInt(PHConstruct.silverBushDensity) == 0) { - for (int i = 0; i < PHConstruct.silverbDensity; i++) + for (int i = 0; i < PHConstruct.silverBushDensity; i++) { xPos = xChunk + random.nextInt(16); yPos = PHConstruct.seaLevel - 16; diff --git a/mods/tinker/tconstruct/village/ComponentSmeltery.java b/mods/tinker/tconstruct/worldgen/village/ComponentSmeltery.java similarity index 99% rename from mods/tinker/tconstruct/village/ComponentSmeltery.java rename to mods/tinker/tconstruct/worldgen/village/ComponentSmeltery.java index 89faedc1..88317cd0 100644 --- a/mods/tinker/tconstruct/village/ComponentSmeltery.java +++ b/mods/tinker/tconstruct/worldgen/village/ComponentSmeltery.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.village; +package mods.tinker.tconstruct.worldgen.village; import java.util.List; import java.util.Random; diff --git a/mods/tinker/tconstruct/village/ComponentToolWorkshop.java b/mods/tinker/tconstruct/worldgen/village/ComponentToolWorkshop.java similarity index 98% rename from mods/tinker/tconstruct/village/ComponentToolWorkshop.java rename to mods/tinker/tconstruct/worldgen/village/ComponentToolWorkshop.java index 363ebaa1..971523d0 100644 --- a/mods/tinker/tconstruct/village/ComponentToolWorkshop.java +++ b/mods/tinker/tconstruct/worldgen/village/ComponentToolWorkshop.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.village; +package mods.tinker.tconstruct.worldgen.village; import java.util.List; import java.util.Random; @@ -130,6 +130,7 @@ public class ComponentToolWorkshop extends ComponentVillage this.fillCurrentPositionBlocksDownwards(world, Block.cobblestone.blockID, 0, i1, -1, l, sbb); } } + this.spawnVillagers(world, sbb, 3, 1, 3, 1); return true; } diff --git a/mods/tinker/tconstruct/village/TVillageTrades.java b/mods/tinker/tconstruct/worldgen/village/TVillageTrades.java similarity index 93% rename from mods/tinker/tconstruct/village/TVillageTrades.java rename to mods/tinker/tconstruct/worldgen/village/TVillageTrades.java index 1301afcf..2958e422 100644 --- a/mods/tinker/tconstruct/village/TVillageTrades.java +++ b/mods/tinker/tconstruct/worldgen/village/TVillageTrades.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.village; +package mods.tinker.tconstruct.worldgen.village; import java.util.List; import java.util.Random; diff --git a/mods/tinker/tconstruct/village/VillageSmelteryHandler.java b/mods/tinker/tconstruct/worldgen/village/VillageSmelteryHandler.java similarity index 93% rename from mods/tinker/tconstruct/village/VillageSmelteryHandler.java rename to mods/tinker/tconstruct/worldgen/village/VillageSmelteryHandler.java index 01d5d203..ce461ff4 100644 --- a/mods/tinker/tconstruct/village/VillageSmelteryHandler.java +++ b/mods/tinker/tconstruct/worldgen/village/VillageSmelteryHandler.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.village; +package mods.tinker.tconstruct.worldgen.village; import java.util.List; import java.util.Random; @@ -13,7 +13,7 @@ public class VillageSmelteryHandler implements IVillageCreationHandler @Override public StructureVillagePieceWeight getVillagePieceWeight (Random random, int i) { - return new StructureVillagePieceWeight(ComponentSmeltery.class, 20, i+2); + return new StructureVillagePieceWeight(ComponentSmeltery.class, 18, i); } @Override diff --git a/mods/tinker/tconstruct/village/VillageToolStationHandler.java b/mods/tinker/tconstruct/worldgen/village/VillageToolStationHandler.java similarity index 95% rename from mods/tinker/tconstruct/village/VillageToolStationHandler.java rename to mods/tinker/tconstruct/worldgen/village/VillageToolStationHandler.java index 89cc0adb..20b88f30 100644 --- a/mods/tinker/tconstruct/village/VillageToolStationHandler.java +++ b/mods/tinker/tconstruct/worldgen/village/VillageToolStationHandler.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.village; +package mods.tinker.tconstruct.worldgen.village; import java.util.List; import java.util.Random; diff --git a/mods/tinker/textures/GGE/ItemLBInnerSide.png b/mods/tinker/textures/GGE/ItemLBInnerSide.png deleted file mode 100644 index 4f86b2ee2a427796c979aef4fc351a5dc287a04f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 739 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 UNcK!JXaE2J07*qoM6N<$f-+3jlK=n! diff --git a/mods/tinker/textures/GGE/corestone.png b/mods/tinker/textures/GGE/corestone.png deleted file mode 100644 index 9435d96102b19b2ea00be30d5da09ccda7e442c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2985 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 diff --git a/mods/tinker/textures/GGE/face.png b/mods/tinker/textures/GGE/face.png deleted file mode 100644 index db168b011cfc82cb5f641b46ba42cc7811e301ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3258 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 diff --git a/mods/tinker/textures/GGE/glowlogtop.png b/mods/tinker/textures/GGE/glowlogtop.png deleted file mode 100644 index a1e3fe27d1d261cb9b432214a2a7037d69408bdb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3327 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 JPDHLkV1g)JH9`OY diff --git a/mods/tinker/textures/GGE/glowsapling.png b/mods/tinker/textures/GGE/glowsapling.png deleted file mode 100644 index 7c3db18992da950ea4c3317e7b5fe5be959f28e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 338 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 B-QNHJ diff --git a/mods/tinker/textures/GGE/lifebenchtop.png b/mods/tinker/textures/GGE/lifebenchtop.png deleted file mode 100644 index 00fe69ffd16771a73469c18b65e33c7ffde75f52..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 894 zcmV-^1A+XBP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01l=A01l=Bhuo=e00007bV*G`2ipr9 z2s9oG(>U({00RC=L_t(I%Y~B5Y8z(&g}=E-vaXhF2|4m@bU{Y09a$ik7_#WfWZ8uY z_yxT1!u$3G+P*?peT0&1nm|IKo8r>6F%c-WA_osr$D_(cgq?x~q2CoV|4{$i& z;ggPzjzkayn5IcM9447e;`=_!%gacT#OdiN&1RFqV1Q*=L?RJ<-^cSjHa9nsP1D42 z9BQ>1<#L%^E=Tg^OFYlRwrwVp3FGmYxo6KPl}enQopF7AO{G$y-|r(GA0G?DFu1+F zMSK04=g}yOi;JkLitD;)nuf0H#N%;du^5$Bi`z$!2!epwY=(4rcqlTN4APS)0EAVQ z|I1`H$+H$#l`*mgjJRIjRwE0tdLG7`6-*_=X>{|p4gvVO)8U(U?*RDj!v~&5A^>zc9eTYUtE;Q1K@d-?N*wF!mq_50Qr2L#ETcWu8Z7m zw`tdE3_o(G(`hD?2|@@K78cms+hgYYj7B4D+XkRsuM>Iv7+u$q4h{~)a5$vi?f$1U zk|ZI70AT9-2qBpIK9}`6sZ{FU51P#;zbOi}w{Ll>DCBZEWLYK@3L%6*mSqgXpin6A zNvFg6?QN=+3W-Dlbvm8W@AoN}%XC5^s=iOD)#74ni`i^OCX*o^kF(wFGObqmBNW0N zj~NUGj7B4*lamu++cu8lpsFf2H#amI4HQMeG);sMghC-CNy4^mJkKNgQ8a*m0J2_N UJ-?qa9RL6T07*qoM6N<$f}V_!hyVZp diff --git a/mods/tinker/textures/GGE/notebook.png b/mods/tinker/textures/GGE/notebook.png deleted file mode 100644 index 3836208a9a290cb8e2590f4120642f3bc65ab4f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 441 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85sChfiPptYBdR_`6}}N;)s> zU(h^#GN=CG#KQl-{)D_-B4DDb)u^Sa<$WaM!pg>~SBjkyyjDNIo@M_0bI-JxX)jD? zpY2#YVe#b0*A~mfB}lMEP7~#~tJ=HwLDtqorLoiEXWtdkIjzLe6s4Xja9~^Rk||3v zcga3}Uc}sxIjdKQb=NxYS<6`8{I)9;$y%a zg9TT4w@K_8*ZsH8G0Gf2xM|HI=BcZiFCUExF$N?_yIK hR4rNLME)$@$Czci-z&2>8W_k744$rjF6*2UngI4|v6%n> diff --git a/mods/tinker/textures/GGE/recharger.png b/mods/tinker/textures/GGE/recharger.png deleted file mode 100644 index 9051f69b774e8f08e2634c5f4fe496ba75ff7a0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3237 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 XwGz<~#G(_a00000NkvXXu0mjfRO}Fi diff --git a/mods/tinker/textures/GGE/transparency.png b/mods/tinker/textures/GGE/transparency.png deleted file mode 100644 index 1c65debf45c7f4dfae489e94e77356d8923093de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaOClDyqr82*Fc zg1yTp14TFsJR*x37`TN&n2}-D90{Nxdx@v7EBkF82@!R!qy8YGO%hib8p2Nrr;Er*A-tUMf3KoY&LEF@)oK@{j-j?U@-k{xJQEnScHk ONQbAZpUXO@geCyHyD#Se diff --git a/mods/tinker/textures/GGE/wand.png b/mods/tinker/textures/GGE/wand.png deleted file mode 100644 index d8e63b7ddacfa4d3a7f53465b4a77faffd7204f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3298 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 gtf_}1CrGfGu=Vl$KY5+w z2%ERazr_+xQyLvyxq?~#S?8IuNHdtTX!%W2R5+{9oY2;oafppU^n}1CoIq`Ncq8kOeMSN z5}UWk25Eto(*X;TS~Z#eCz>_$I2f`lG34k!sNnc7je||{$&RZ6J z<|YugXu%)(G>(gHjUs-60{`}3y}**ga7JK)#L2b>lfyhr7gZ`bm;6|`{lDW-j(l35vh9k$8@-g@^m>;~d?1L51A_h-aKbLh*2~7Z_U^O@Z literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/crops/herb_bloody_3.png b/mods/tinker/textures/blocks/crops/herb_bloody_3.png new file mode 100644 index 0000000000000000000000000000000000000000..d70f596ced34e4e4ced388e6f88155d61fda5ba1 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`b39!fLn>}1CrGevVfD-5`G4{n z$02W#DgTwFou)J@xCXPd{LeQvVU%VtW>NE-q^NLKp*f+gF{6pCL1c@8!Tqwzul0TMzxl?FD~t?pAC=AtcGW)!bSHzS LtDnm{r-UW|SMg1c literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/crops/herb_bloody_4.png b/mods/tinker/textures/blocks/crops/herb_bloody_4.png new file mode 100644 index 0000000000000000000000000000000000000000..903fd7f7189a8bb4ce9bf4ec20640c9d9b9c1d84 GIT binary patch literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Z#-QbLn>}1CoE7cNJ{>}e@G>} z>7uvDl#NmXM;Z?YOn9Wpbm)JgSu>A=8OsvEmO@D$vjwex=EHqTdGdMMYej5F@6!R17@12GJT6r2w>7^I%Ilb=;-}*5z%zlx$FPIz#5ttxxvaP}7Fb~tkC6$~jZfyLgamVyYE4zu# x2|l0v^tb=7seO8qxy@+OFMeZ&BgdBVF(gc~{}1CrGfGus!nofATuV z5w1e-e~TrYrZhUZGSvnDlYW-ZD$QWdqUAS9QQ@pYb3$8V#v!%_ksDk8_(y$svp@N7 zph$DaC7vLjOC06<(l}@MPkPHWG5CPQ5=j}kNbiF=25QFy3KAMcn0c9{If^(td`q@C zIm@~ld$K7=FPX#A?>6a+7pLK$?`7Bi<>xB>mp^iBDIdeqrw#Mh?(F&wbR&bOtDnm{ Hr-UW|=G04t literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/crops/herb_mana_4.png b/mods/tinker/textures/blocks/crops/herb_mana_4.png new file mode 100644 index 0000000000000000000000000000000000000000..55ec7f768ef4e0eb6f26fa43913e562879fd4538 GIT binary patch literal 289 zcmV++0p9+JP)cq_nk!(ogER$AxCS-^#>Z_t)Y(Z3p22NKb_rh1FwrAVXj-fLe4B zyCIPfg`hBi`xnH{S_&42y8vGRf;C1$oDH%WW;-}`G)o|Xtek{o2#5icfGGwm0%EZ3 zP#WeESnR-~8Y9Ia8HQpgl4dZQP&C2}0xJFo(tz#?;*vKkQGxsm(?oLK04YWZFcN^2 n5W|0OXYK#iCi4G5Y+UL94)*-_)OdOv00000NkvXXu0mjfMXYQF literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/crops/herb_mandrake_1.png b/mods/tinker/textures/blocks/crops/herb_mandrake_1.png new file mode 100644 index 0000000000000000000000000000000000000000..18af14933d71d5ea0144b2dfae49c3150206bd34 GIT binary patch literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%``kpS1Ar-fh6C_v{Cx~2-%b2bP0l+XkK DN`)n1 literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/crops/herb_mandrake_2.png b/mods/tinker/textures/blocks/crops/herb_mandrake_2.png new file mode 100644 index 0000000000000000000000000000000000000000..4ef2fe9821cf87463c6dec8e58c36fff59d42b5d GIT binary patch literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`m7Xq+Ar-fh6C_v{H*f?bp8POh z>8$;<%75y&1zal||8LKh_}`qdiMQg<8>>pTjF~I{>@WTO=70TvyZ`@xygFDfFkj_t zblLj<|Ns1D-odC~cd@NQi}NqP*N6Z1g<;SCM`|x`EKI4<$Xv%Dne;yS>;7G9ztk7i c82FuK=vDA@Z(Vz)2IvR|Pgg&ebxsLQ0R0p=Bu?}F#j*c?&Q|+>J(c1AlMWUz-WAJ0STnLAm&+8uwm<5S0&4~t_PC0VG($kn zKAy$^Hvr_STdmr}d1F(g^?z7coGapmvq1q#bRfd`hl82_iz*5IM;9jwfHaJ0J>P?Q(=Keey=|Kn%Z|Nr>*>i@0VXGt?e%S;8V z31mA6e|+_TcmqJ1L4JS!{sCAs$Q2+1Kw?B00#dYa{X8&!|L-+eGsra)XLS;9Kv04| zSi`K9)4(=oWrY5Zj1MK=8z6=DK34y$+e-iE7KHy#jt|DE836M#^&n&1>5l*a002ov JPDHLkV1gw?rn~?E literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/crops/herb_mandrake_3_1.png b/mods/tinker/textures/blocks/crops/herb_mandrake_3_1.png new file mode 100644 index 0000000000000000000000000000000000000000..c12e3502cae0447f64eaa284e362ba64dd865d58 GIT binary patch literal 103 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`dY&$hAr-fh6C_v{Cy4MAO~^U* zbAHZQVP}_r`T5^|$0wd-FiY{(cw9e0qNksSK_Y;+^0tA-W}r?6Pgg&ebxsLQ0BxTi AA^-pY literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/crops/herb_mandrake_4.png b/mods/tinker/textures/blocks/crops/herb_mandrake_4.png new file mode 100644 index 0000000000000000000000000000000000000000..0ec8febb983d5769d6a4522a13922cf809ab8e03 GIT binary patch literal 473 zcmV;~0Ve*5P)#Rj^&SN!@Y@#-+73|iziFqx@8Hd%r0^xwi(F7T|(31HHuofXR8YfA^xJ2z-M+t#%ISs z-CC~1%rwT~PWu7;fHVwG56a|Hy$1O@jbm#hWyHbIR)g}&JQV73{xrV=FHKYy#1XN6 P00000NkvXXu0mjfM5oHq literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/crops/herb_mandrake_4_1.png b/mods/tinker/textures/blocks/crops/herb_mandrake_4_1.png new file mode 100644 index 0000000000000000000000000000000000000000..88925b336c37b719bc8afb5acfc688dc27d73e72 GIT binary patch literal 280 zcmV+z0q6dSP)W}5#0#g+d5ae5JCz>j5~|KClM_& z2C%}F1)Be_cUu0xJ<}P#_f}@;{eL%E^Z)G{#{b`EbNxSE%`+xG< zn^l6p_v>tWZ{MMIyW!iapHn0^?8&zOxvpU+Lr#P1yL!>G+5c63+n-&`_lUQMr{N|a zH~S=BAhpP|jB%6VLWi?zOLj4&F?c9z7*1Rxc~ih?7Nde#gw^j=OVofCGI+ZBxvX<|{Ln>}1Cmdk*Ia2%2cmj8f zY104cuHXK$Urfo)TR+QxCu62u>3`2}Tpou%t^1pBR)NPTp!M!Ed(Ul$c^X=qSG(#J zwl#<}ndrE371z1A T-$2O`XcmK~tDnm{r-UW|z@a5& literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/crops/herb_spring_3.png b/mods/tinker/textures/blocks/crops/herb_spring_3.png new file mode 100644 index 0000000000000000000000000000000000000000..510a1b916a01e24aa3d0c6a3a58513d75ac0f66d GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`TRdGHLn>}1CrGevVLhXH=D*{N zlDS8DY7}~7tSt}DFr4_&{-jy6$*FnMS&{|hb39}Y*SBS`@h;+-V6FW%{^=~Hh|P~& zcmBV$T=k$t27}}1CrGfiIGP-;Z;Mjs zb30Tas;upBZI2jdvINuB71i;=JrCI!O;698&XPRAEye7RfJ(0hmxEdK;!_7>7{b|& zSezfntaujH!ky685ZnGxH0A$6lXb4b-EO8F&$vYL6@H5!KL284gQ;1TWI&EXVVUlg z>a&F_Kbb^Jdj4&fWJr1(#Lm#h5K?Qj|GgQ|CI(MeKbLh*2~7Y;busJ! literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/crops/herb_white_3.png b/mods/tinker/textures/blocks/crops/herb_white_3.png new file mode 100644 index 0000000000000000000000000000000000000000..5b754322742edca67eec00462b8a79478b7bc63e GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`b3I)gLn>}1CrGevVa+^g_y6QI zjzjI=&iw1o;Rs}F63LCb{_+2znO_r_6WR_O@ibytBAFs^#z4UL0>gwR*J7=I`>X06 z{{L&;9>AmIW$a<-p?v12aP_8xHIs7g@7u}W<2cJv&!Q|ta0c%o7fGf|EI~X*JS~oT zj2B(pwRNscG@YEnu*uQ)Yv+dy70=C61P<5dr@#GwP3_Zv$DEi~3|fkNX8V>d@drAT N!PC{xWt~$(698U9QvUz| literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/crops/herb_white_4.png b/mods/tinker/textures/blocks/crops/herb_white_4.png new file mode 100644 index 0000000000000000000000000000000000000000..200983b96280c7bdcaf7075428b3435688572972 GIT binary patch literal 298 zcmV+_0oDGAP)uX>`V0@gm!<_x<`31Pm$S%RF8D=`n0GJCv7-R^{ z1yGAFVl`y@=031OP#C}r1F?@CS_Bq{xd3kff)s%a0?{CwVYY+li9Ok1HBI%22tz;& zkOWLIhz-IZ+hH`!C9v3mMKwkMA{&NmD6(b{O)wf^1_2fS18G2a1yRWx7A7G7!ZeYb wH$aL}0*n+OCB*RG+gba+wTb+H5F3{|0P)Lo&dqX{5C8xG07*qoM6N<$g7(pOCjbBd literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/infiblocks/ancient_ice.png b/mods/tinker/textures/blocks/infiblocks/ancient_ice.png deleted file mode 100644 index dbf2bf7b19b7fe5af47cc7f405928315b1766d86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/brick_diamond.png b/mods/tinker/textures/blocks/infiblocks/brick_diamond.png deleted file mode 100644 index 4f7bb0c7e6e37328afe9ad60ad4a81e617cf533d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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+ diff --git a/mods/tinker/textures/blocks/infiblocks/brick_gold.png b/mods/tinker/textures/blocks/infiblocks/brick_gold.png deleted file mode 100644 index 31cec3d40435d8199971bc1242e27c8bb419b59f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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( diff --git a/mods/tinker/textures/blocks/infiblocks/brick_ice.png b/mods/tinker/textures/blocks/infiblocks/brick_ice.png deleted file mode 100644 index 267cf6fc95c3f4e827bd7c925894c7d1562ccf06..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/brick_largeclay.png b/mods/tinker/textures/blocks/infiblocks/brick_largeclay.png deleted file mode 100644 index 05302802639e078ea572a1d5bb7d22d9e4eb1bae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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} diff --git a/mods/tinker/textures/blocks/infiblocks/brick_netherrack.png b/mods/tinker/textures/blocks/infiblocks/brick_netherrack.png deleted file mode 100644 index b83edb8a9bc2f712a71998a690ad1b9a72dcc658..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/brick_sandstone.png b/mods/tinker/textures/blocks/infiblocks/brick_sandstone.png deleted file mode 100644 index 5b4b96d4293c9eaf09ddeae84d5759c3c61b09f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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*` diff --git a/mods/tinker/textures/blocks/infiblocks/brick_slime.png b/mods/tinker/textures/blocks/infiblocks/brick_slime.png deleted file mode 100644 index 2680734a5beb670556ad5c58b138db8c85d07572..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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= diff --git a/mods/tinker/textures/blocks/infiblocks/brownstone_road_rough.png b/mods/tinker/textures/blocks/infiblocks/brownstone_road_rough.png deleted file mode 100644 index df1a8aa2cfc3f8717524b2cfd39c3c0695e966a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/brownstone_smooth_road.png b/mods/tinker/textures/blocks/infiblocks/brownstone_smooth_road.png deleted file mode 100644 index 1b92dda488b85547ea380fe1cc602314a175c878..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/brownstone_smooth_squarebrick.png b/mods/tinker/textures/blocks/infiblocks/brownstone_smooth_squarebrick.png deleted file mode 100644 index b59bc1f4121b21ffece71219ee039b0238b1f2d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/fancybrick_gold.png b/mods/tinker/textures/blocks/infiblocks/fancybrick_gold.png deleted file mode 100644 index 3439f6e25c4ad80a482e53a048bd7d44f197e067..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/fancybrick_iron.png b/mods/tinker/textures/blocks/infiblocks/fancybrick_iron.png deleted file mode 100644 index 24cc45e5a63dd199eb7f09c72e00b282dab89cfe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/fancybrick_lapis.png b/mods/tinker/textures/blocks/infiblocks/fancybrick_lapis.png deleted file mode 100644 index 19afd0ef6418ed333abc0c96ea0d17b0b5c2a63f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/fancybrick_largeclay.png b/mods/tinker/textures/blocks/infiblocks/fancybrick_largeclay.png deleted file mode 100644 index 2925dc3fa2eb8d33d81cbff85775933223a29b45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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} diff --git a/mods/tinker/textures/blocks/infiblocks/fancybrick_redstone.png b/mods/tinker/textures/blocks/infiblocks/fancybrick_redstone.png deleted file mode 100644 index 968739b3a60e14999a301641adb7d83e0c1e86a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/fancybrick_sandstone.png b/mods/tinker/textures/blocks/infiblocks/fancybrick_sandstone.png deleted file mode 100644 index a226947430e4f4fd80cb647f8875187c70f10d04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_black.png b/mods/tinker/textures/blocks/infiblocks/glass_black.png deleted file mode 100644 index dec24b76412ba69d83dc843cab74b3f846896e01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_black_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_black_pane.png deleted file mode 100644 index 2f87e863daaa2d3b1bcaba079c8b592efc71d810..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_blue.png b/mods/tinker/textures/blocks/infiblocks/glass_blue.png deleted file mode 100644 index 3c5a8a6517aa7d35742f173d168e4ad5f4bce658..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_blue_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_blue_pane.png deleted file mode 100644 index c2c5da2808b52a1d0c720c5a056c798aae44575d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_brown.png b/mods/tinker/textures/blocks/infiblocks/glass_brown.png deleted file mode 100644 index aff14855606238d0629426b330d1fc32289c958c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 97 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`8lEnWAr-fhZ^$SWwZ+IJYt^O6XR9e%GZ}KAFBoGVeoYIb6Mw<&;$T)tsFQ2 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_brown_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_brown_pane.png deleted file mode 100644 index 14cf009a5b8a493ce5adf0deb5aa3372c96a46c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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! diff --git a/mods/tinker/textures/blocks/infiblocks/glass_cyan.png b/mods/tinker/textures/blocks/infiblocks/glass_cyan.png deleted file mode 100644 index 2951471cd630a95b03d7502d6f78246427c168be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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_ diff --git a/mods/tinker/textures/blocks/infiblocks/glass_gray.png b/mods/tinker/textures/blocks/infiblocks/glass_gray.png deleted file mode 100644 index 51e5275e4447aedb979566e9091d23f6108aefa8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_gray_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_gray_pane.png deleted file mode 100644 index 2cafcacd660a9f845fc5761991df9cd94beba039..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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** diff --git a/mods/tinker/textures/blocks/infiblocks/glass_lightblue.png b/mods/tinker/textures/blocks/infiblocks/glass_lightblue.png deleted file mode 100644 index 895ed4c2711ff326a962259decdbe7e9744a1b03..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 98 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`nw~C>Ar-fhcNDz;FIiMr^R&;H vN8#8a+xl524lZWvkuu0)Fy&aZOL diff --git a/mods/tinker/textures/blocks/infiblocks/glass_lightblue_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_lightblue_pane.png deleted file mode 100644 index b35ff0168af3fb29e4bd16b4e89d4b706c746f4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_lightgray.png b/mods/tinker/textures/blocks/infiblocks/glass_lightgray.png deleted file mode 100644 index bf8a4dc8d6e798da9de35f088dd6e441dd5331ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_lime.png b/mods/tinker/textures/blocks/infiblocks/glass_lime.png deleted file mode 100644 index 820fc7fb65191a2f2c8935ca8eb9975bf447d358..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_magenta.png b/mods/tinker/textures/blocks/infiblocks/glass_magenta.png deleted file mode 100644 index b32c9247b5a8346c25dfc4753cac474611a27370..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_magenta_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_magenta_pane.png deleted file mode 100644 index 9082586661228d44879056e3b672359728a43638..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_orange_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_orange_pane.png deleted file mode 100644 index bd484ec11348c8862e9c105f35e786e8e474e525..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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-| diff --git a/mods/tinker/textures/blocks/infiblocks/glass_pink.png b/mods/tinker/textures/blocks/infiblocks/glass_pink.png deleted file mode 100644 index 6f567d2a8f8beda8cadb39dc5965c5ac31e278da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_pure.png b/mods/tinker/textures/blocks/infiblocks/glass_pure.png deleted file mode 100644 index ff258cd873e9b8f1dda84a6a26ec065151e3a740..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`#-1*YAr-fhe|&#`zrN^W diff --git a/mods/tinker/textures/blocks/infiblocks/glass_pure_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_pure_pane.png deleted file mode 100644 index 04b03a180f7d3806f9c485756a531d3e4afae678..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_purple.png b/mods/tinker/textures/blocks/infiblocks/glass_purple.png deleted file mode 100644 index 43627b68c63b2f35a0b37af35f542b46dffa4017..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_purple_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_purple_pane.png deleted file mode 100644 index 717f1829ff7333c8dad1ef3032e338b303af7960..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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% diff --git a/mods/tinker/textures/blocks/infiblocks/glass_red.png b/mods/tinker/textures/blocks/infiblocks/glass_red.png deleted file mode 100644 index 0a1ae8964ee1f90865d1548b6c3088f7f42bf343..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_red_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_red_pane.png deleted file mode 100644 index 85e7c64e7805d29e629e0a1beafc06a8164d011d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_soul.png b/mods/tinker/textures/blocks/infiblocks/glass_soul.png deleted file mode 100644 index eb9c37949598e34a11e590340629ba945d5624eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_soul_pane.png b/mods/tinker/textures/blocks/infiblocks/glass_soul_pane.png deleted file mode 100644 index 57a4c7216a808ebb4584205dc57d009a69b6c438..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/glass_white.png b/mods/tinker/textures/blocks/infiblocks/glass_white.png deleted file mode 100644 index a6bdb276881f585c07e33b573821e23182ad1254..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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_ diff --git a/mods/tinker/textures/blocks/infiblocks/paver_largeclay.png b/mods/tinker/textures/blocks/infiblocks/paver_largeclay.png deleted file mode 100644 index 64cc9c368e224c06992ce60dbf39510e4b286874..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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( diff --git a/mods/tinker/textures/blocks/infiblocks/refined_largeclay.png b/mods/tinker/textures/blocks/infiblocks/refined_largeclay.png deleted file mode 100644 index f23fe9fd2a8fbc9339fd3032ed43637ac1648f63..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/refined_stone.png b/mods/tinker/textures/blocks/infiblocks/refined_stone.png deleted file mode 100644 index 090657d35ab2345c4c0c10b69fc3646bf5278d85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/smallbrick_largeclay.png b/mods/tinker/textures/blocks/infiblocks/smallbrick_largeclay.png deleted file mode 100644 index bd11bf6aa1b167bc44a45cc32043c65038d003fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/squarebrick_iron.png b/mods/tinker/textures/blocks/infiblocks/squarebrick_iron.png deleted file mode 100644 index df7eb514959b2b07ba439fb62863008d02b1170d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/squarebrick_stone_refined.png b/mods/tinker/textures/blocks/infiblocks/squarebrick_stone_refined.png deleted file mode 100644 index a0db5780f7d50806ab7d5f85b02539a5c75d4086..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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~ diff --git a/mods/tinker/textures/blocks/infiblocks/storage_bone.png b/mods/tinker/textures/blocks/infiblocks/storage_bone.png deleted file mode 100644 index 6e29bf19d80523c9337e41c69c7b7bf6930a4707..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/storage_charcoal.png b/mods/tinker/textures/blocks/infiblocks/storage_charcoal.png deleted file mode 100644 index 8e2c5a3a02504f81c0c27a63e514460c38a4757e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/storage_coal.png b/mods/tinker/textures/blocks/infiblocks/storage_coal.png deleted file mode 100644 index 8e2c5a3a02504f81c0c27a63e514460c38a4757e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/storage_inert_redstone.png b/mods/tinker/textures/blocks/infiblocks/storage_inert_redstone.png deleted file mode 100644 index 198eb0099fb8699528c9e43e56902e3acd6ee517..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/storage_wheat.png b/mods/tinker/textures/blocks/infiblocks/storage_wheat.png deleted file mode 100644 index caf8b9b7f4d64a8487021038027a9aed5f430ff1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/blocks/infiblocks/storage_wheat_dark.png b/mods/tinker/textures/blocks/infiblocks/storage_wheat_dark.png deleted file mode 100644 index 66a35b38df9f442483f759c789d477de72e96d55..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/mods/tinker/textures/gui/inventoryarmor.png b/mods/tinker/textures/gui/armorextended.png similarity index 93% rename from mods/tinker/textures/gui/inventoryarmor.png rename to mods/tinker/textures/gui/armorextended.png index 4229229afc33d324bd8f1426b275e78c90a2ec71..c01b15a62e0bf5d406d4de85f0e908a6cc53b90c 100644 GIT binary patch delta 60 zcmey)_nmKomf?Q}AY8C_`D6wL2F?PH$YKTtzC$3)D5~Mr02E{|@$_|Nzsn*fY9XCE LQ9f>Cvh4z**oCS?n