diff --git a/resources/tinkertextures/blanksprite.png b/resources/tinkertextures/blanksprite.png new file mode 100644 index 00000000..8e808b75 Binary files /dev/null and b/resources/tinkertextures/blanksprite.png differ diff --git a/resources/tinkertextures/tools/axes/axe_handle_11.png b/resources/tinkertextures/tools/axe/ardite_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_handle_11.png rename to resources/tinkertextures/tools/axe/ardite_axe_handle.png diff --git a/resources/tinkertextures/tools/axes/axe_head_11.png b/resources/tinkertextures/tools/axe/ardite_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_11.png rename to resources/tinkertextures/tools/axe/ardite_axe_head.png diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_11.png b/resources/tinkertextures/tools/axe/ardite_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_broken_11.png rename to resources/tinkertextures/tools/axe/ardite_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axes/axe_effect_7.png b/resources/tinkertextures/tools/axe/blaze_axe_effect.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_effect_7.png rename to resources/tinkertextures/tools/axe/blaze_axe_effect.png diff --git a/resources/tinkertextures/tools/axes/axe_handle_5.png b/resources/tinkertextures/tools/axe/bone_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_handle_5.png rename to resources/tinkertextures/tools/axe/bone_axe_handle.png diff --git a/resources/tinkertextures/tools/axes/axe_head_5.png b/resources/tinkertextures/tools/axe/bone_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_5.png rename to resources/tinkertextures/tools/axe/bone_axe_head.png diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_5.png b/resources/tinkertextures/tools/axe/bone_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_broken_5.png rename to resources/tinkertextures/tools/axe/bone_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axes/axe_handle_14.png b/resources/tinkertextures/tools/axe/bronze_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_handle_14.png rename to resources/tinkertextures/tools/axe/bronze_axe_handle.png diff --git a/resources/tinkertextures/tools/axes/axe_head_14.png b/resources/tinkertextures/tools/axe/bronze_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_14.png rename to resources/tinkertextures/tools/axe/bronze_axe_head.png diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_14.png b/resources/tinkertextures/tools/axe/bronze_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_broken_14.png rename to resources/tinkertextures/tools/axe/bronze_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axes/axe_handle_4.png b/resources/tinkertextures/tools/axe/cactus_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_handle_4.png rename to resources/tinkertextures/tools/axe/cactus_axe_handle.png diff --git a/resources/tinkertextures/tools/axes/axe_head_4.png b/resources/tinkertextures/tools/axe/cactus_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_4.png rename to resources/tinkertextures/tools/axe/cactus_axe_head.png diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_4.png b/resources/tinkertextures/tools/axe/cactus_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_broken_4.png rename to resources/tinkertextures/tools/axe/cactus_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axes/axe_handle_10.png b/resources/tinkertextures/tools/axe/cobalt_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_handle_10.png rename to resources/tinkertextures/tools/axe/cobalt_axe_handle.png diff --git a/resources/tinkertextures/tools/axes/axe_head_10.png b/resources/tinkertextures/tools/axe/cobalt_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_10.png rename to resources/tinkertextures/tools/axe/cobalt_axe_head.png diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_10.png b/resources/tinkertextures/tools/axe/cobalt_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_broken_10.png rename to resources/tinkertextures/tools/axe/cobalt_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axes/axe_handle_13.png b/resources/tinkertextures/tools/axe/copper_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_handle_13.png rename to resources/tinkertextures/tools/axe/copper_axe_handle.png diff --git a/resources/tinkertextures/tools/axes/axe_head_13.png b/resources/tinkertextures/tools/axe/copper_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_13.png rename to resources/tinkertextures/tools/axe/copper_axe_head.png diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_13.png b/resources/tinkertextures/tools/axe/copper_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_broken_13.png rename to resources/tinkertextures/tools/axe/copper_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axes/axe_effect_0.png b/resources/tinkertextures/tools/axe/diamond_axe_effect.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_effect_0.png rename to resources/tinkertextures/tools/axe/diamond_axe_effect.png diff --git a/resources/tinkertextures/tools/axes/axe_effect_9.png b/resources/tinkertextures/tools/axe/electric_axe_effect.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_effect_9.png rename to resources/tinkertextures/tools/axe/electric_axe_effect.png diff --git a/resources/tinkertextures/tools/axes/axe_effect_1.png b/resources/tinkertextures/tools/axe/emerald_axe_effect.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_effect_1.png rename to resources/tinkertextures/tools/axe/emerald_axe_effect.png diff --git a/resources/tinkertextures/tools/axes/axe_handle_3.png b/resources/tinkertextures/tools/axe/flint_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_handle_3.png rename to resources/tinkertextures/tools/axe/flint_axe_handle.png diff --git a/resources/tinkertextures/tools/axes/axe_head_3.png b/resources/tinkertextures/tools/axe/flint_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_3.png rename to resources/tinkertextures/tools/axe/flint_axe_head.png diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_3.png b/resources/tinkertextures/tools/axe/flint_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_broken_3.png rename to resources/tinkertextures/tools/axe/flint_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axes/axe_effect_3.png b/resources/tinkertextures/tools/axe/glowstone_axe_effect.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_effect_3.png rename to resources/tinkertextures/tools/axe/glowstone_axe_effect.png diff --git a/resources/tinkertextures/tools/axes/axe_effect_5.png b/resources/tinkertextures/tools/axe/ice_axe_effect.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_effect_5.png rename to resources/tinkertextures/tools/axe/ice_axe_effect.png diff --git a/resources/tinkertextures/tools/axes/axe_handle_2.png b/resources/tinkertextures/tools/axe/iron_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_handle_2.png rename to resources/tinkertextures/tools/axe/iron_axe_handle.png diff --git a/resources/tinkertextures/tools/axes/axe_head_2.png b/resources/tinkertextures/tools/axe/iron_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_2.png rename to resources/tinkertextures/tools/axe/iron_axe_head.png diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_2.png b/resources/tinkertextures/tools/axe/iron_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_broken_2.png rename to resources/tinkertextures/tools/axe/iron_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axes/axe_effect_10.png b/resources/tinkertextures/tools/axe/lapis_axe_effect.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_effect_10.png rename to resources/tinkertextures/tools/axe/lapis_axe_effect.png diff --git a/resources/tinkertextures/tools/axes/axe_effect_6.png b/resources/tinkertextures/tools/axe/lava_axe_effect.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_effect_6.png rename to resources/tinkertextures/tools/axe/lava_axe_effect.png diff --git a/resources/tinkertextures/tools/axes/axe_handle_12.png b/resources/tinkertextures/tools/axe/manyullyn_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_handle_12.png rename to resources/tinkertextures/tools/axe/manyullyn_axe_handle.png diff --git a/resources/tinkertextures/tools/axes/axe_head_12.png b/resources/tinkertextures/tools/axe/manyullyn_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_12.png rename to resources/tinkertextures/tools/axe/manyullyn_axe_head.png diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_12.png b/resources/tinkertextures/tools/axe/manyullyn_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_broken_12.png rename to resources/tinkertextures/tools/axe/manyullyn_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axes/axe_effect_4.png b/resources/tinkertextures/tools/axe/moss_axe_effect.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_effect_4.png rename to resources/tinkertextures/tools/axe/moss_axe_effect.png diff --git a/resources/tinkertextures/tools/axes/axe_effect_8.png b/resources/tinkertextures/tools/axe/necrotic_axe_effect.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_effect_8.png rename to resources/tinkertextures/tools/axe/necrotic_axe_effect.png diff --git a/resources/tinkertextures/tools/axes/axe_handle_7.png b/resources/tinkertextures/tools/axe/netherrack_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_handle_7.png rename to resources/tinkertextures/tools/axe/netherrack_axe_handle.png diff --git a/resources/tinkertextures/tools/axes/axe_head_7.png b/resources/tinkertextures/tools/axe/netherrack_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_7.png rename to resources/tinkertextures/tools/axe/netherrack_axe_head.png diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_7.png b/resources/tinkertextures/tools/axe/netherrack_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_broken_7.png rename to resources/tinkertextures/tools/axe/netherrack_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axes/axe_handle_6.png b/resources/tinkertextures/tools/axe/obsidian_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_handle_6.png rename to resources/tinkertextures/tools/axe/obsidian_axe_handle.png diff --git a/resources/tinkertextures/tools/axes/axe_head_6.png b/resources/tinkertextures/tools/axe/obsidian_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_6.png rename to resources/tinkertextures/tools/axe/obsidian_axe_head.png diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_6.png b/resources/tinkertextures/tools/axe/obsidian_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_broken_6.png rename to resources/tinkertextures/tools/axe/obsidian_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axes/axe_handle_9.png b/resources/tinkertextures/tools/axe/paper_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_handle_9.png rename to resources/tinkertextures/tools/axe/paper_axe_handle.png diff --git a/resources/tinkertextures/tools/axes/axe_head_9.png b/resources/tinkertextures/tools/axe/paper_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_9.png rename to resources/tinkertextures/tools/axe/paper_axe_head.png diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_9.png b/resources/tinkertextures/tools/axe/paper_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_broken_9.png rename to resources/tinkertextures/tools/axe/paper_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axes/axe_effect_2.png b/resources/tinkertextures/tools/axe/redstone_axe_effect.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_effect_2.png rename to resources/tinkertextures/tools/axe/redstone_axe_effect.png diff --git a/resources/tinkertextures/tools/axes/axe_handle_8.png b/resources/tinkertextures/tools/axe/slime_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_handle_8.png rename to resources/tinkertextures/tools/axe/slime_axe_handle.png diff --git a/resources/tinkertextures/tools/axes/axe_head_8.png b/resources/tinkertextures/tools/axe/slime_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_8.png rename to resources/tinkertextures/tools/axe/slime_axe_head.png diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_8.png b/resources/tinkertextures/tools/axe/slime_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_broken_8.png rename to resources/tinkertextures/tools/axe/slime_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axes/axe_handle_1.png b/resources/tinkertextures/tools/axe/stone_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_handle_1.png rename to resources/tinkertextures/tools/axe/stone_axe_handle.png diff --git a/resources/tinkertextures/tools/axes/axe_head_1.png b/resources/tinkertextures/tools/axe/stone_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_1.png rename to resources/tinkertextures/tools/axe/stone_axe_head.png diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_1.png b/resources/tinkertextures/tools/axe/stone_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_broken_1.png rename to resources/tinkertextures/tools/axe/stone_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axes/axe_handle_15.png b/resources/tinkertextures/tools/axe/thaumium_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_handle_15.png rename to resources/tinkertextures/tools/axe/thaumium_axe_handle.png diff --git a/resources/tinkertextures/tools/axes/axe_head_15.png b/resources/tinkertextures/tools/axe/thaumium_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_15.png rename to resources/tinkertextures/tools/axe/thaumium_axe_head.png diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_15.png b/resources/tinkertextures/tools/axe/thaumium_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_broken_15.png rename to resources/tinkertextures/tools/axe/thaumium_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axes/axe_handle_0.png b/resources/tinkertextures/tools/axe/wood_axe_handle.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_handle_0.png rename to resources/tinkertextures/tools/axe/wood_axe_handle.png diff --git a/resources/tinkertextures/tools/axes/axe_head_0.png b/resources/tinkertextures/tools/axe/wood_axe_head.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_0.png rename to resources/tinkertextures/tools/axe/wood_axe_head.png diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_0.png b/resources/tinkertextures/tools/axe/wood_axe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/axes/axe_head_broken_0.png rename to resources/tinkertextures/tools/axe/wood_axe_head_broken.png diff --git a/resources/tinkertextures/tools/axes.png b/resources/tinkertextures/tools/axes.png deleted file mode 100644 index 4a750608..00000000 Binary files a/resources/tinkertextures/tools/axes.png and /dev/null differ diff --git a/resources/tinkertextures/tools/battlesign/ardite_battlesign_handle.png b/resources/tinkertextures/tools/battlesign/ardite_battlesign_handle.png new file mode 100644 index 00000000..bc9e8b90 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/ardite_battlesign_handle.png differ diff --git a/resources/tinkertextures/tools/battlesign/ardite_battlesign_head.png b/resources/tinkertextures/tools/battlesign/ardite_battlesign_head.png new file mode 100644 index 00000000..656c1ed5 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/ardite_battlesign_head.png differ diff --git a/resources/tinkertextures/tools/battlesign/ardite_battlesign_head_broken.png b/resources/tinkertextures/tools/battlesign/ardite_battlesign_head_broken.png new file mode 100644 index 00000000..0c1d2106 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/ardite_battlesign_head_broken.png differ diff --git a/resources/tinkertextures/tools/battlesign/blaze_battlesign_effect.png b/resources/tinkertextures/tools/battlesign/blaze_battlesign_effect.png new file mode 100644 index 00000000..2a307f86 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/blaze_battlesign_effect.png differ diff --git a/resources/tinkertextures/tools/battlesign/bone_battlesign_handle.png b/resources/tinkertextures/tools/battlesign/bone_battlesign_handle.png new file mode 100644 index 00000000..49c636ef Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/bone_battlesign_handle.png differ diff --git a/resources/tinkertextures/tools/battlesign/bone_battlesign_head.png b/resources/tinkertextures/tools/battlesign/bone_battlesign_head.png new file mode 100644 index 00000000..836cd2d8 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/bone_battlesign_head.png differ diff --git a/resources/tinkertextures/tools/battlesign/bone_battlesign_head_broken.png b/resources/tinkertextures/tools/battlesign/bone_battlesign_head_broken.png new file mode 100644 index 00000000..3b370446 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/bone_battlesign_head_broken.png differ diff --git a/resources/tinkertextures/tools/battlesign/bronze_battlesign_handle.png b/resources/tinkertextures/tools/battlesign/bronze_battlesign_handle.png new file mode 100644 index 00000000..53a97192 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/bronze_battlesign_handle.png differ diff --git a/resources/tinkertextures/tools/battlesign/bronze_battlesign_head.png b/resources/tinkertextures/tools/battlesign/bronze_battlesign_head.png new file mode 100644 index 00000000..55cdc583 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/bronze_battlesign_head.png differ diff --git a/resources/tinkertextures/tools/battlesign/bronze_battlesign_head_broken.png b/resources/tinkertextures/tools/battlesign/bronze_battlesign_head_broken.png new file mode 100644 index 00000000..e251690c Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/bronze_battlesign_head_broken.png differ diff --git a/resources/tinkertextures/tools/battlesign/cactus_battlesign_handle.png b/resources/tinkertextures/tools/battlesign/cactus_battlesign_handle.png new file mode 100644 index 00000000..eb5e196e Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/cactus_battlesign_handle.png differ diff --git a/resources/tinkertextures/tools/battlesign/cactus_battlesign_head.png b/resources/tinkertextures/tools/battlesign/cactus_battlesign_head.png new file mode 100644 index 00000000..5dcb4d4b Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/cactus_battlesign_head.png differ diff --git a/resources/tinkertextures/tools/battlesign/cactus_battlesign_head_broken.png b/resources/tinkertextures/tools/battlesign/cactus_battlesign_head_broken.png new file mode 100644 index 00000000..2c08ee05 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/cactus_battlesign_head_broken.png differ diff --git a/resources/tinkertextures/tools/battlesign/cobalt_battlesign_handle.png b/resources/tinkertextures/tools/battlesign/cobalt_battlesign_handle.png new file mode 100644 index 00000000..61c9e181 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/cobalt_battlesign_handle.png differ diff --git a/resources/tinkertextures/tools/battlesign/cobalt_battlesign_head.png b/resources/tinkertextures/tools/battlesign/cobalt_battlesign_head.png new file mode 100644 index 00000000..812e0466 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/cobalt_battlesign_head.png differ diff --git a/resources/tinkertextures/tools/battlesign/cobalt_battlesign_head_broken.png b/resources/tinkertextures/tools/battlesign/cobalt_battlesign_head_broken.png new file mode 100644 index 00000000..becefca6 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/cobalt_battlesign_head_broken.png differ diff --git a/resources/tinkertextures/tools/battlesign/copper_battlesign_handle.png b/resources/tinkertextures/tools/battlesign/copper_battlesign_handle.png new file mode 100644 index 00000000..1aaa5cd3 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/copper_battlesign_handle.png differ diff --git a/resources/tinkertextures/tools/battlesign/copper_battlesign_head.png b/resources/tinkertextures/tools/battlesign/copper_battlesign_head.png new file mode 100644 index 00000000..13dc96fa Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/copper_battlesign_head.png differ diff --git a/resources/tinkertextures/tools/battlesign/copper_battlesign_head_broken.png b/resources/tinkertextures/tools/battlesign/copper_battlesign_head_broken.png new file mode 100644 index 00000000..9c31bdfd Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/copper_battlesign_head_broken.png differ diff --git a/resources/tinkertextures/tools/battlesign/diamond_battlesign_effect.png b/resources/tinkertextures/tools/battlesign/diamond_battlesign_effect.png new file mode 100644 index 00000000..4328acb8 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/diamond_battlesign_effect.png differ diff --git a/resources/tinkertextures/tools/battlesign/electric_battlesign_effect.png b/resources/tinkertextures/tools/battlesign/electric_battlesign_effect.png new file mode 100644 index 00000000..b7bb3e3e Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/electric_battlesign_effect.png differ diff --git a/resources/tinkertextures/tools/battlesign/emerald_battlesign_effect.png b/resources/tinkertextures/tools/battlesign/emerald_battlesign_effect.png new file mode 100644 index 00000000..6142ff21 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/emerald_battlesign_effect.png differ diff --git a/resources/tinkertextures/tools/battlesign/flint_battlesign_handle.png b/resources/tinkertextures/tools/battlesign/flint_battlesign_handle.png new file mode 100644 index 00000000..edde028e Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/flint_battlesign_handle.png differ diff --git a/resources/tinkertextures/tools/battlesign/flint_battlesign_head.png b/resources/tinkertextures/tools/battlesign/flint_battlesign_head.png new file mode 100644 index 00000000..0433befd Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/flint_battlesign_head.png differ diff --git a/resources/tinkertextures/tools/battlesign/flint_battlesign_head_broken.png b/resources/tinkertextures/tools/battlesign/flint_battlesign_head_broken.png new file mode 100644 index 00000000..99e59c4f Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/flint_battlesign_head_broken.png differ diff --git a/resources/tinkertextures/tools/battlesign/glowstone_battlesign_effect.png b/resources/tinkertextures/tools/battlesign/glowstone_battlesign_effect.png new file mode 100644 index 00000000..d9af8827 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/glowstone_battlesign_effect.png differ diff --git a/resources/tinkertextures/tools/battlesign/ice_battlesign_effect.png b/resources/tinkertextures/tools/battlesign/ice_battlesign_effect.png new file mode 100644 index 00000000..91970e39 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/ice_battlesign_effect.png differ diff --git a/resources/tinkertextures/tools/battlesign/iron_battlesign_handle.png b/resources/tinkertextures/tools/battlesign/iron_battlesign_handle.png new file mode 100644 index 00000000..38613904 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/iron_battlesign_handle.png differ diff --git a/resources/tinkertextures/tools/battlesign/iron_battlesign_head.png b/resources/tinkertextures/tools/battlesign/iron_battlesign_head.png new file mode 100644 index 00000000..06aa4891 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/iron_battlesign_head.png differ diff --git a/resources/tinkertextures/tools/battlesign/iron_battlesign_head_broken.png b/resources/tinkertextures/tools/battlesign/iron_battlesign_head_broken.png new file mode 100644 index 00000000..b5221d46 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/iron_battlesign_head_broken.png differ diff --git a/resources/tinkertextures/tools/battlesign/lapis_battlesign_effect.png b/resources/tinkertextures/tools/battlesign/lapis_battlesign_effect.png new file mode 100644 index 00000000..b86b6a47 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/lapis_battlesign_effect.png differ diff --git a/resources/tinkertextures/tools/battlesign/lava_battlesign_effect.png b/resources/tinkertextures/tools/battlesign/lava_battlesign_effect.png new file mode 100644 index 00000000..abefdedc Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/lava_battlesign_effect.png differ diff --git a/resources/tinkertextures/tools/battlesign/manyullyn_battlesign_handle.png b/resources/tinkertextures/tools/battlesign/manyullyn_battlesign_handle.png new file mode 100644 index 00000000..aba5831a Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/manyullyn_battlesign_handle.png differ diff --git a/resources/tinkertextures/tools/battlesign/manyullyn_battlesign_head.png b/resources/tinkertextures/tools/battlesign/manyullyn_battlesign_head.png new file mode 100644 index 00000000..4033ff89 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/manyullyn_battlesign_head.png differ diff --git a/resources/tinkertextures/tools/battlesign/manyullyn_battlesign_head_broken.png b/resources/tinkertextures/tools/battlesign/manyullyn_battlesign_head_broken.png new file mode 100644 index 00000000..fcd3aa7f Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/manyullyn_battlesign_head_broken.png differ diff --git a/resources/tinkertextures/tools/battlesign/moss_battlesign_effect.png b/resources/tinkertextures/tools/battlesign/moss_battlesign_effect.png new file mode 100644 index 00000000..a0db75a9 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/moss_battlesign_effect.png differ diff --git a/resources/tinkertextures/tools/battlesign/necrotic_battlesign_effect.png b/resources/tinkertextures/tools/battlesign/necrotic_battlesign_effect.png new file mode 100644 index 00000000..9f69a54a Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/necrotic_battlesign_effect.png differ diff --git a/resources/tinkertextures/tools/battlesign/netherrack_battlesign_handle.png b/resources/tinkertextures/tools/battlesign/netherrack_battlesign_handle.png new file mode 100644 index 00000000..75269bd6 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/netherrack_battlesign_handle.png differ diff --git a/resources/tinkertextures/tools/battlesign/netherrack_battlesign_head.png b/resources/tinkertextures/tools/battlesign/netherrack_battlesign_head.png new file mode 100644 index 00000000..2faff362 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/netherrack_battlesign_head.png differ diff --git a/resources/tinkertextures/tools/battlesign/netherrack_battlesign_head_broken.png b/resources/tinkertextures/tools/battlesign/netherrack_battlesign_head_broken.png new file mode 100644 index 00000000..75105c3a Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/netherrack_battlesign_head_broken.png differ diff --git a/resources/tinkertextures/tools/battlesign/obsidian_battlesign_handle.png b/resources/tinkertextures/tools/battlesign/obsidian_battlesign_handle.png new file mode 100644 index 00000000..8b4a115b Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/obsidian_battlesign_handle.png differ diff --git a/resources/tinkertextures/tools/battlesign/obsidian_battlesign_head.png b/resources/tinkertextures/tools/battlesign/obsidian_battlesign_head.png new file mode 100644 index 00000000..09dfd430 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/obsidian_battlesign_head.png differ diff --git a/resources/tinkertextures/tools/battlesign/obsidian_battlesign_head_broken.png b/resources/tinkertextures/tools/battlesign/obsidian_battlesign_head_broken.png new file mode 100644 index 00000000..8539520d Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/obsidian_battlesign_head_broken.png differ diff --git a/resources/tinkertextures/tools/battlesign/paper_battlesign_handle.png b/resources/tinkertextures/tools/battlesign/paper_battlesign_handle.png new file mode 100644 index 00000000..2db58f10 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/paper_battlesign_handle.png differ diff --git a/resources/tinkertextures/tools/battlesign/paper_battlesign_head.png b/resources/tinkertextures/tools/battlesign/paper_battlesign_head.png new file mode 100644 index 00000000..d407d8bb Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/paper_battlesign_head.png differ diff --git a/resources/tinkertextures/tools/battlesign/paper_battlesign_head_broken.png b/resources/tinkertextures/tools/battlesign/paper_battlesign_head_broken.png new file mode 100644 index 00000000..d252243a Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/paper_battlesign_head_broken.png differ diff --git a/resources/tinkertextures/tools/battlesign/redstone_battlesign_effect.png b/resources/tinkertextures/tools/battlesign/redstone_battlesign_effect.png new file mode 100644 index 00000000..0d433209 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/redstone_battlesign_effect.png differ diff --git a/resources/tinkertextures/tools/battlesign/slime_battlesign_handle.png b/resources/tinkertextures/tools/battlesign/slime_battlesign_handle.png new file mode 100644 index 00000000..512d78e9 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/slime_battlesign_handle.png differ diff --git a/resources/tinkertextures/tools/battlesign/slime_battlesign_head.png b/resources/tinkertextures/tools/battlesign/slime_battlesign_head.png new file mode 100644 index 00000000..b5777aa6 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/slime_battlesign_head.png differ diff --git a/resources/tinkertextures/tools/battlesign/slime_battlesign_head_broken.png b/resources/tinkertextures/tools/battlesign/slime_battlesign_head_broken.png new file mode 100644 index 00000000..fd41ea5b Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/slime_battlesign_head_broken.png differ diff --git a/resources/tinkertextures/tools/battlesign/stone_battlesign_handle.png b/resources/tinkertextures/tools/battlesign/stone_battlesign_handle.png new file mode 100644 index 00000000..8a080aa1 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/stone_battlesign_handle.png differ diff --git a/resources/tinkertextures/tools/battlesign/stone_battlesign_head.png b/resources/tinkertextures/tools/battlesign/stone_battlesign_head.png new file mode 100644 index 00000000..f097bbcd Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/stone_battlesign_head.png differ diff --git a/resources/tinkertextures/tools/battlesign/stone_battlesign_head_broken.png b/resources/tinkertextures/tools/battlesign/stone_battlesign_head_broken.png new file mode 100644 index 00000000..86f894ed Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/stone_battlesign_head_broken.png differ diff --git a/resources/tinkertextures/tools/battlesign/wood_battlesign_handle.png b/resources/tinkertextures/tools/battlesign/wood_battlesign_handle.png new file mode 100644 index 00000000..47d123ca Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/wood_battlesign_handle.png differ diff --git a/resources/tinkertextures/tools/battlesign/wood_battlesign_head.png b/resources/tinkertextures/tools/battlesign/wood_battlesign_head.png new file mode 100644 index 00000000..5ef68a2d Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/wood_battlesign_head.png differ diff --git a/resources/tinkertextures/tools/battlesign/wood_battlesign_head_broken.png b/resources/tinkertextures/tools/battlesign/wood_battlesign_head_broken.png new file mode 100644 index 00000000..f207a1c5 Binary files /dev/null and b/resources/tinkertextures/tools/battlesign/wood_battlesign_head_broken.png differ diff --git a/resources/tinkertextures/tools/battlesigns.png b/resources/tinkertextures/tools/battlesigns.png deleted file mode 100644 index d57a8403..00000000 Binary files a/resources/tinkertextures/tools/battlesigns.png and /dev/null differ diff --git a/resources/tinkertextures/tools/broadsword/ardite_sword_accessory.png b/resources/tinkertextures/tools/broadsword/ardite_sword_accessory.png new file mode 100644 index 00000000..335ce4c9 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/ardite_sword_accessory.png differ diff --git a/resources/tinkertextures/tools/broadsword/ardite_sword_blade.png b/resources/tinkertextures/tools/broadsword/ardite_sword_blade.png new file mode 100644 index 00000000..58435398 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/ardite_sword_blade.png differ diff --git a/resources/tinkertextures/tools/broadsword/ardite_sword_blade_broken.png b/resources/tinkertextures/tools/broadsword/ardite_sword_blade_broken.png new file mode 100644 index 00000000..5ef32d31 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/ardite_sword_blade_broken.png differ diff --git a/resources/tinkertextures/tools/broadsword/ardite_sword_handle.png b/resources/tinkertextures/tools/broadsword/ardite_sword_handle.png new file mode 100644 index 00000000..fdcea399 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/ardite_sword_handle.png differ diff --git a/resources/tinkertextures/tools/broadsword/blaze_sword_effect.png b/resources/tinkertextures/tools/broadsword/blaze_sword_effect.png new file mode 100644 index 00000000..2b84e52e Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/blaze_sword_effect.png differ diff --git a/resources/tinkertextures/tools/broadsword/bone_sword_accessory.png b/resources/tinkertextures/tools/broadsword/bone_sword_accessory.png new file mode 100644 index 00000000..5b27bd2a Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/bone_sword_accessory.png differ diff --git a/resources/tinkertextures/tools/broadsword/bone_sword_blade.png b/resources/tinkertextures/tools/broadsword/bone_sword_blade.png new file mode 100644 index 00000000..52b9c573 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/bone_sword_blade.png differ diff --git a/resources/tinkertextures/tools/broadsword/bone_sword_blade_broken.png b/resources/tinkertextures/tools/broadsword/bone_sword_blade_broken.png new file mode 100644 index 00000000..e325d9ec Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/bone_sword_blade_broken.png differ diff --git a/resources/tinkertextures/tools/broadsword/bone_sword_handle.png b/resources/tinkertextures/tools/broadsword/bone_sword_handle.png new file mode 100644 index 00000000..0e04e2c7 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/bone_sword_handle.png differ diff --git a/resources/tinkertextures/tools/broadsword/bronze_sword_accessory.png b/resources/tinkertextures/tools/broadsword/bronze_sword_accessory.png new file mode 100644 index 00000000..fa6ce5c1 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/bronze_sword_accessory.png differ diff --git a/resources/tinkertextures/tools/broadsword/bronze_sword_blade.png b/resources/tinkertextures/tools/broadsword/bronze_sword_blade.png new file mode 100644 index 00000000..465792ea Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/bronze_sword_blade.png differ diff --git a/resources/tinkertextures/tools/broadsword/bronze_sword_blade_broken.png b/resources/tinkertextures/tools/broadsword/bronze_sword_blade_broken.png new file mode 100644 index 00000000..76032001 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/bronze_sword_blade_broken.png differ diff --git a/resources/tinkertextures/tools/broadsword/bronze_sword_handle.png b/resources/tinkertextures/tools/broadsword/bronze_sword_handle.png new file mode 100644 index 00000000..58e8e967 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/bronze_sword_handle.png differ diff --git a/resources/tinkertextures/tools/broadsword/cactus_sword_accessory.png b/resources/tinkertextures/tools/broadsword/cactus_sword_accessory.png new file mode 100644 index 00000000..4f18937e Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/cactus_sword_accessory.png differ diff --git a/resources/tinkertextures/tools/broadsword/cactus_sword_blade.png b/resources/tinkertextures/tools/broadsword/cactus_sword_blade.png new file mode 100644 index 00000000..7ec563be Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/cactus_sword_blade.png differ diff --git a/resources/tinkertextures/tools/broadsword/cactus_sword_blade_broken.png b/resources/tinkertextures/tools/broadsword/cactus_sword_blade_broken.png new file mode 100644 index 00000000..9133613a Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/cactus_sword_blade_broken.png differ diff --git a/resources/tinkertextures/tools/broadsword/cactus_sword_handle.png b/resources/tinkertextures/tools/broadsword/cactus_sword_handle.png new file mode 100644 index 00000000..f43b229b Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/cactus_sword_handle.png differ diff --git a/resources/tinkertextures/tools/broadsword/cobalt_sword_accessory.png b/resources/tinkertextures/tools/broadsword/cobalt_sword_accessory.png new file mode 100644 index 00000000..e72af18e Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/cobalt_sword_accessory.png differ diff --git a/resources/tinkertextures/tools/broadsword/cobalt_sword_blade.png b/resources/tinkertextures/tools/broadsword/cobalt_sword_blade.png new file mode 100644 index 00000000..db04cffd Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/cobalt_sword_blade.png differ diff --git a/resources/tinkertextures/tools/broadsword/cobalt_sword_blade_broken.png b/resources/tinkertextures/tools/broadsword/cobalt_sword_blade_broken.png new file mode 100644 index 00000000..0cdeb93f Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/cobalt_sword_blade_broken.png differ diff --git a/resources/tinkertextures/tools/broadsword/cobalt_sword_handle.png b/resources/tinkertextures/tools/broadsword/cobalt_sword_handle.png new file mode 100644 index 00000000..16e1834c Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/cobalt_sword_handle.png differ diff --git a/resources/tinkertextures/tools/broadsword/copper_sword_accessory.png b/resources/tinkertextures/tools/broadsword/copper_sword_accessory.png new file mode 100644 index 00000000..50bc526e Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/copper_sword_accessory.png differ diff --git a/resources/tinkertextures/tools/broadsword/copper_sword_blade.png b/resources/tinkertextures/tools/broadsword/copper_sword_blade.png new file mode 100644 index 00000000..514a0a34 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/copper_sword_blade.png differ diff --git a/resources/tinkertextures/tools/broadsword/copper_sword_blade_broken.png b/resources/tinkertextures/tools/broadsword/copper_sword_blade_broken.png new file mode 100644 index 00000000..aae09af0 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/copper_sword_blade_broken.png differ diff --git a/resources/tinkertextures/tools/broadsword/copper_sword_handle.png b/resources/tinkertextures/tools/broadsword/copper_sword_handle.png new file mode 100644 index 00000000..674dd529 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/copper_sword_handle.png differ diff --git a/resources/tinkertextures/tools/broadsword/diamond_sword_effect.png b/resources/tinkertextures/tools/broadsword/diamond_sword_effect.png new file mode 100644 index 00000000..28822dfd Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/diamond_sword_effect.png differ diff --git a/resources/tinkertextures/tools/broadsword/electric_sword_effect.png b/resources/tinkertextures/tools/broadsword/electric_sword_effect.png new file mode 100644 index 00000000..33267cbe Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/electric_sword_effect.png differ diff --git a/resources/tinkertextures/tools/broadsword/emerald_sword_effect.png b/resources/tinkertextures/tools/broadsword/emerald_sword_effect.png new file mode 100644 index 00000000..901f8f79 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/emerald_sword_effect.png differ diff --git a/resources/tinkertextures/tools/broadsword/flint_sword_accessory.png b/resources/tinkertextures/tools/broadsword/flint_sword_accessory.png new file mode 100644 index 00000000..378a6d28 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/flint_sword_accessory.png differ diff --git a/resources/tinkertextures/tools/broadsword/flint_sword_blade.png b/resources/tinkertextures/tools/broadsword/flint_sword_blade.png new file mode 100644 index 00000000..d7a079d5 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/flint_sword_blade.png differ diff --git a/resources/tinkertextures/tools/broadsword/flint_sword_blade_broken.png b/resources/tinkertextures/tools/broadsword/flint_sword_blade_broken.png new file mode 100644 index 00000000..59524192 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/flint_sword_blade_broken.png differ diff --git a/resources/tinkertextures/tools/broadsword/flint_sword_handle.png b/resources/tinkertextures/tools/broadsword/flint_sword_handle.png new file mode 100644 index 00000000..f0e650d2 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/flint_sword_handle.png differ diff --git a/resources/tinkertextures/tools/broadsword/glowstone_sword_effect.png b/resources/tinkertextures/tools/broadsword/glowstone_sword_effect.png new file mode 100644 index 00000000..13fc6e09 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/glowstone_sword_effect.png differ diff --git a/resources/tinkertextures/tools/broadsword/ice_sword_effect.png b/resources/tinkertextures/tools/broadsword/ice_sword_effect.png new file mode 100644 index 00000000..7e94bfa3 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/ice_sword_effect.png differ diff --git a/resources/tinkertextures/tools/broadsword/iron_sword_accessory.png b/resources/tinkertextures/tools/broadsword/iron_sword_accessory.png new file mode 100644 index 00000000..628f33c4 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/iron_sword_accessory.png differ diff --git a/resources/tinkertextures/tools/broadsword/iron_sword_blade.png b/resources/tinkertextures/tools/broadsword/iron_sword_blade.png new file mode 100644 index 00000000..5d95af17 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/iron_sword_blade.png differ diff --git a/resources/tinkertextures/tools/broadsword/iron_sword_blade_broken.png b/resources/tinkertextures/tools/broadsword/iron_sword_blade_broken.png new file mode 100644 index 00000000..093c976e Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/iron_sword_blade_broken.png differ diff --git a/resources/tinkertextures/tools/broadsword/iron_sword_handle.png b/resources/tinkertextures/tools/broadsword/iron_sword_handle.png new file mode 100644 index 00000000..36bba9f2 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/iron_sword_handle.png differ diff --git a/resources/tinkertextures/tools/broadsword/lapis.png b/resources/tinkertextures/tools/broadsword/lapis.png new file mode 100644 index 00000000..2a13c5ee Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/lapis.png differ diff --git a/resources/tinkertextures/tools/broadsword/lava_sword_effect.png b/resources/tinkertextures/tools/broadsword/lava_sword_effect.png new file mode 100644 index 00000000..d919eb71 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/lava_sword_effect.png differ diff --git a/resources/tinkertextures/tools/broadsword/manyullyn_sword_accessory.png b/resources/tinkertextures/tools/broadsword/manyullyn_sword_accessory.png new file mode 100644 index 00000000..a20e8ae7 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/manyullyn_sword_accessory.png differ diff --git a/resources/tinkertextures/tools/broadsword/manyullyn_sword_blade.png b/resources/tinkertextures/tools/broadsword/manyullyn_sword_blade.png new file mode 100644 index 00000000..5fd31240 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/manyullyn_sword_blade.png differ diff --git a/resources/tinkertextures/tools/broadsword/manyullyn_sword_blade_broken.png b/resources/tinkertextures/tools/broadsword/manyullyn_sword_blade_broken.png new file mode 100644 index 00000000..93f2f9dc Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/manyullyn_sword_blade_broken.png differ diff --git a/resources/tinkertextures/tools/broadsword/manyullyn_sword_handle.png b/resources/tinkertextures/tools/broadsword/manyullyn_sword_handle.png new file mode 100644 index 00000000..d7e3cb37 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/manyullyn_sword_handle.png differ diff --git a/resources/tinkertextures/tools/broadsword/moss_sword_effect.png b/resources/tinkertextures/tools/broadsword/moss_sword_effect.png new file mode 100644 index 00000000..cac8cbed Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/moss_sword_effect.png differ diff --git a/resources/tinkertextures/tools/broadsword/necrotic_sword_effect.png b/resources/tinkertextures/tools/broadsword/necrotic_sword_effect.png new file mode 100644 index 00000000..9b7c69b2 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/necrotic_sword_effect.png differ diff --git a/resources/tinkertextures/tools/broadsword/netherrack_sword_accessory.png b/resources/tinkertextures/tools/broadsword/netherrack_sword_accessory.png new file mode 100644 index 00000000..ab18de9d Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/netherrack_sword_accessory.png differ diff --git a/resources/tinkertextures/tools/broadsword/netherrack_sword_blade.png b/resources/tinkertextures/tools/broadsword/netherrack_sword_blade.png new file mode 100644 index 00000000..1b4964cb Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/netherrack_sword_blade.png differ diff --git a/resources/tinkertextures/tools/broadsword/netherrack_sword_blade_broken.png b/resources/tinkertextures/tools/broadsword/netherrack_sword_blade_broken.png new file mode 100644 index 00000000..1f4a3bdf Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/netherrack_sword_blade_broken.png differ diff --git a/resources/tinkertextures/tools/broadsword/netherrack_sword_handle.png b/resources/tinkertextures/tools/broadsword/netherrack_sword_handle.png new file mode 100644 index 00000000..f47198c7 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/netherrack_sword_handle.png differ diff --git a/resources/tinkertextures/tools/broadsword/obsidian_sword_accessory.png b/resources/tinkertextures/tools/broadsword/obsidian_sword_accessory.png new file mode 100644 index 00000000..b50503b3 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/obsidian_sword_accessory.png differ diff --git a/resources/tinkertextures/tools/broadsword/obsidian_sword_blade.png b/resources/tinkertextures/tools/broadsword/obsidian_sword_blade.png new file mode 100644 index 00000000..d403712c Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/obsidian_sword_blade.png differ diff --git a/resources/tinkertextures/tools/broadsword/obsidian_sword_blade_broken.png b/resources/tinkertextures/tools/broadsword/obsidian_sword_blade_broken.png new file mode 100644 index 00000000..15c772de Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/obsidian_sword_blade_broken.png differ diff --git a/resources/tinkertextures/tools/broadsword/obsidian_sword_handle.png b/resources/tinkertextures/tools/broadsword/obsidian_sword_handle.png new file mode 100644 index 00000000..d5be789c Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/obsidian_sword_handle.png differ diff --git a/resources/tinkertextures/tools/broadsword/paper_sword_accessory.png b/resources/tinkertextures/tools/broadsword/paper_sword_accessory.png new file mode 100644 index 00000000..73807276 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/paper_sword_accessory.png differ diff --git a/resources/tinkertextures/tools/broadsword/paper_sword_blade.png b/resources/tinkertextures/tools/broadsword/paper_sword_blade.png new file mode 100644 index 00000000..cc0bc1d3 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/paper_sword_blade.png differ diff --git a/resources/tinkertextures/tools/broadsword/paper_sword_blade_broken.png b/resources/tinkertextures/tools/broadsword/paper_sword_blade_broken.png new file mode 100644 index 00000000..728677ad Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/paper_sword_blade_broken.png differ diff --git a/resources/tinkertextures/tools/broadsword/paper_sword_handle.png b/resources/tinkertextures/tools/broadsword/paper_sword_handle.png new file mode 100644 index 00000000..99fc5cf5 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/paper_sword_handle.png differ diff --git a/resources/tinkertextures/tools/broadsword/redstone_sword_effect.png b/resources/tinkertextures/tools/broadsword/redstone_sword_effect.png new file mode 100644 index 00000000..422b20e6 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/redstone_sword_effect.png differ diff --git a/resources/tinkertextures/tools/broadsword/slime_sword_accessory.png b/resources/tinkertextures/tools/broadsword/slime_sword_accessory.png new file mode 100644 index 00000000..a8f28134 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/slime_sword_accessory.png differ diff --git a/resources/tinkertextures/tools/broadsword/slime_sword_blade.png b/resources/tinkertextures/tools/broadsword/slime_sword_blade.png new file mode 100644 index 00000000..ae3fe387 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/slime_sword_blade.png differ diff --git a/resources/tinkertextures/tools/broadsword/slime_sword_blade_broken.png b/resources/tinkertextures/tools/broadsword/slime_sword_blade_broken.png new file mode 100644 index 00000000..422d79b2 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/slime_sword_blade_broken.png differ diff --git a/resources/tinkertextures/tools/broadsword/slime_sword_handle.png b/resources/tinkertextures/tools/broadsword/slime_sword_handle.png new file mode 100644 index 00000000..275809df Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/slime_sword_handle.png differ diff --git a/resources/tinkertextures/tools/broadsword/stone_sword_accessory.png b/resources/tinkertextures/tools/broadsword/stone_sword_accessory.png new file mode 100644 index 00000000..46117755 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/stone_sword_accessory.png differ diff --git a/resources/tinkertextures/tools/broadsword/stone_sword_blade.png b/resources/tinkertextures/tools/broadsword/stone_sword_blade.png new file mode 100644 index 00000000..da579aa1 Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/stone_sword_blade.png differ diff --git a/resources/tinkertextures/tools/broadsword/stone_sword_blade_broken.png b/resources/tinkertextures/tools/broadsword/stone_sword_blade_broken.png new file mode 100644 index 00000000..8ac8c80b Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/stone_sword_blade_broken.png differ diff --git a/resources/tinkertextures/tools/broadsword/stone_sword_handle.png b/resources/tinkertextures/tools/broadsword/stone_sword_handle.png new file mode 100644 index 00000000..1659297a Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/stone_sword_handle.png differ diff --git a/resources/tinkertextures/tools/broadsword/wood_sword_accessory.png b/resources/tinkertextures/tools/broadsword/wood_sword_accessory.png new file mode 100644 index 00000000..bf4ca42f Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/wood_sword_accessory.png differ diff --git a/resources/tinkertextures/tools/broadsword/wood_sword_blade.png b/resources/tinkertextures/tools/broadsword/wood_sword_blade.png new file mode 100644 index 00000000..c55e923c Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/wood_sword_blade.png differ diff --git a/resources/tinkertextures/tools/broadsword/wood_sword_blade_broken.png b/resources/tinkertextures/tools/broadsword/wood_sword_blade_broken.png new file mode 100644 index 00000000..2fa1a2df Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/wood_sword_blade_broken.png differ diff --git a/resources/tinkertextures/tools/broadsword/wood_sword_handle.png b/resources/tinkertextures/tools/broadsword/wood_sword_handle.png new file mode 100644 index 00000000..27c0b26a Binary files /dev/null and b/resources/tinkertextures/tools/broadsword/wood_sword_handle.png differ diff --git a/resources/tinkertextures/tools/frypan/ardite_frypan_handle.png b/resources/tinkertextures/tools/frypan/ardite_frypan_handle.png new file mode 100644 index 00000000..1611844f Binary files /dev/null and b/resources/tinkertextures/tools/frypan/ardite_frypan_handle.png differ diff --git a/resources/tinkertextures/tools/frypan/ardite_frypan_head.png b/resources/tinkertextures/tools/frypan/ardite_frypan_head.png new file mode 100644 index 00000000..3c8a80cd Binary files /dev/null and b/resources/tinkertextures/tools/frypan/ardite_frypan_head.png differ diff --git a/resources/tinkertextures/tools/frypan/ardite_frypan_head_broken.png b/resources/tinkertextures/tools/frypan/ardite_frypan_head_broken.png new file mode 100644 index 00000000..1997a5f4 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/ardite_frypan_head_broken.png differ diff --git a/resources/tinkertextures/tools/frypan/blaze_frypan_effect.png b/resources/tinkertextures/tools/frypan/blaze_frypan_effect.png new file mode 100644 index 00000000..8de25d4d Binary files /dev/null and b/resources/tinkertextures/tools/frypan/blaze_frypan_effect.png differ diff --git a/resources/tinkertextures/tools/frypan/bone_frypan_handle.png b/resources/tinkertextures/tools/frypan/bone_frypan_handle.png new file mode 100644 index 00000000..125afa0a Binary files /dev/null and b/resources/tinkertextures/tools/frypan/bone_frypan_handle.png differ diff --git a/resources/tinkertextures/tools/frypan/bone_frypan_head.png b/resources/tinkertextures/tools/frypan/bone_frypan_head.png new file mode 100644 index 00000000..d206ee5a Binary files /dev/null and b/resources/tinkertextures/tools/frypan/bone_frypan_head.png differ diff --git a/resources/tinkertextures/tools/frypan/bone_frypan_head_broken.png b/resources/tinkertextures/tools/frypan/bone_frypan_head_broken.png new file mode 100644 index 00000000..15af223b Binary files /dev/null and b/resources/tinkertextures/tools/frypan/bone_frypan_head_broken.png differ diff --git a/resources/tinkertextures/tools/frypan/bronze_frypan_handle.png b/resources/tinkertextures/tools/frypan/bronze_frypan_handle.png new file mode 100644 index 00000000..59fc6ad8 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/bronze_frypan_handle.png differ diff --git a/resources/tinkertextures/tools/frypan/bronze_frypan_head.png b/resources/tinkertextures/tools/frypan/bronze_frypan_head.png new file mode 100644 index 00000000..ab3e8550 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/bronze_frypan_head.png differ diff --git a/resources/tinkertextures/tools/frypan/bronze_frypan_head_broken.png b/resources/tinkertextures/tools/frypan/bronze_frypan_head_broken.png new file mode 100644 index 00000000..880f0539 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/bronze_frypan_head_broken.png differ diff --git a/resources/tinkertextures/tools/frypan/cactus_frypan_handle.png b/resources/tinkertextures/tools/frypan/cactus_frypan_handle.png new file mode 100644 index 00000000..f35d2f65 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/cactus_frypan_handle.png differ diff --git a/resources/tinkertextures/tools/frypan/cactus_frypan_head.png b/resources/tinkertextures/tools/frypan/cactus_frypan_head.png new file mode 100644 index 00000000..b33b33d7 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/cactus_frypan_head.png differ diff --git a/resources/tinkertextures/tools/frypan/cactus_frypan_head_broken.png b/resources/tinkertextures/tools/frypan/cactus_frypan_head_broken.png new file mode 100644 index 00000000..6ac8b0f0 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/cactus_frypan_head_broken.png differ diff --git a/resources/tinkertextures/tools/frypan/cobalt_frypan_handle.png b/resources/tinkertextures/tools/frypan/cobalt_frypan_handle.png new file mode 100644 index 00000000..3113f553 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/cobalt_frypan_handle.png differ diff --git a/resources/tinkertextures/tools/frypan/cobalt_frypan_head.png b/resources/tinkertextures/tools/frypan/cobalt_frypan_head.png new file mode 100644 index 00000000..cc1a9544 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/cobalt_frypan_head.png differ diff --git a/resources/tinkertextures/tools/frypan/cobalt_frypan_head_broken.png b/resources/tinkertextures/tools/frypan/cobalt_frypan_head_broken.png new file mode 100644 index 00000000..4c15463d Binary files /dev/null and b/resources/tinkertextures/tools/frypan/cobalt_frypan_head_broken.png differ diff --git a/resources/tinkertextures/tools/frypan/copper_frypan_handle.png b/resources/tinkertextures/tools/frypan/copper_frypan_handle.png new file mode 100644 index 00000000..eba4b2e8 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/copper_frypan_handle.png differ diff --git a/resources/tinkertextures/tools/frypan/copper_frypan_head.png b/resources/tinkertextures/tools/frypan/copper_frypan_head.png new file mode 100644 index 00000000..dc639529 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/copper_frypan_head.png differ diff --git a/resources/tinkertextures/tools/frypan/copper_frypan_head_broken.png b/resources/tinkertextures/tools/frypan/copper_frypan_head_broken.png new file mode 100644 index 00000000..2c61fb6f Binary files /dev/null and b/resources/tinkertextures/tools/frypan/copper_frypan_head_broken.png differ diff --git a/resources/tinkertextures/tools/frypan/diamond_frypan_effect.png b/resources/tinkertextures/tools/frypan/diamond_frypan_effect.png new file mode 100644 index 00000000..281b4aee Binary files /dev/null and b/resources/tinkertextures/tools/frypan/diamond_frypan_effect.png differ diff --git a/resources/tinkertextures/tools/frypan/electric_frypan_effect.png b/resources/tinkertextures/tools/frypan/electric_frypan_effect.png new file mode 100644 index 00000000..bad24664 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/electric_frypan_effect.png differ diff --git a/resources/tinkertextures/tools/frypan/emerald_frypan_effect.png b/resources/tinkertextures/tools/frypan/emerald_frypan_effect.png new file mode 100644 index 00000000..6e963298 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/emerald_frypan_effect.png differ diff --git a/resources/tinkertextures/tools/frypan/flint_frypan_handle.png b/resources/tinkertextures/tools/frypan/flint_frypan_handle.png new file mode 100644 index 00000000..54db593f Binary files /dev/null and b/resources/tinkertextures/tools/frypan/flint_frypan_handle.png differ diff --git a/resources/tinkertextures/tools/frypan/flint_frypan_head.png b/resources/tinkertextures/tools/frypan/flint_frypan_head.png new file mode 100644 index 00000000..6009cf92 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/flint_frypan_head.png differ diff --git a/resources/tinkertextures/tools/frypan/flint_frypan_head_broken.png b/resources/tinkertextures/tools/frypan/flint_frypan_head_broken.png new file mode 100644 index 00000000..2272c432 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/flint_frypan_head_broken.png differ diff --git a/resources/tinkertextures/tools/frypan/ice_frypan_effect.png b/resources/tinkertextures/tools/frypan/ice_frypan_effect.png new file mode 100644 index 00000000..f5d61eca Binary files /dev/null and b/resources/tinkertextures/tools/frypan/ice_frypan_effect.png differ diff --git a/resources/tinkertextures/tools/frypan/iron_frypan_handle.png b/resources/tinkertextures/tools/frypan/iron_frypan_handle.png new file mode 100644 index 00000000..a3e992d8 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/iron_frypan_handle.png differ diff --git a/resources/tinkertextures/tools/frypan/iron_frypan_head.png b/resources/tinkertextures/tools/frypan/iron_frypan_head.png new file mode 100644 index 00000000..f85920da Binary files /dev/null and b/resources/tinkertextures/tools/frypan/iron_frypan_head.png differ diff --git a/resources/tinkertextures/tools/frypan/iron_frypan_head_broken.png b/resources/tinkertextures/tools/frypan/iron_frypan_head_broken.png new file mode 100644 index 00000000..7217278a Binary files /dev/null and b/resources/tinkertextures/tools/frypan/iron_frypan_head_broken.png differ diff --git a/resources/tinkertextures/tools/frypan/lapis_frypan_effect.png b/resources/tinkertextures/tools/frypan/lapis_frypan_effect.png new file mode 100644 index 00000000..084b901e Binary files /dev/null and b/resources/tinkertextures/tools/frypan/lapis_frypan_effect.png differ diff --git a/resources/tinkertextures/tools/frypan/lava_frypan_effect.png b/resources/tinkertextures/tools/frypan/lava_frypan_effect.png new file mode 100644 index 00000000..3f9e6581 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/lava_frypan_effect.png differ diff --git a/resources/tinkertextures/tools/frypan/manyullyn_frypan_handle.png b/resources/tinkertextures/tools/frypan/manyullyn_frypan_handle.png new file mode 100644 index 00000000..e370ff67 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/manyullyn_frypan_handle.png differ diff --git a/resources/tinkertextures/tools/frypan/manyullyn_frypan_head.png b/resources/tinkertextures/tools/frypan/manyullyn_frypan_head.png new file mode 100644 index 00000000..1f238d85 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/manyullyn_frypan_head.png differ diff --git a/resources/tinkertextures/tools/frypan/manyullyn_frypan_head_broken.png b/resources/tinkertextures/tools/frypan/manyullyn_frypan_head_broken.png new file mode 100644 index 00000000..47fc73ec Binary files /dev/null and b/resources/tinkertextures/tools/frypan/manyullyn_frypan_head_broken.png differ diff --git a/resources/tinkertextures/tools/frypan/moss_frypan_effect.png b/resources/tinkertextures/tools/frypan/moss_frypan_effect.png new file mode 100644 index 00000000..bc3758e2 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/moss_frypan_effect.png differ diff --git a/resources/tinkertextures/tools/frypan/necrotic_frypan_effect.png b/resources/tinkertextures/tools/frypan/necrotic_frypan_effect.png new file mode 100644 index 00000000..6e5c1435 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/necrotic_frypan_effect.png differ diff --git a/resources/tinkertextures/tools/frypan/netherrack_frypan_handle.png b/resources/tinkertextures/tools/frypan/netherrack_frypan_handle.png new file mode 100644 index 00000000..64acc534 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/netherrack_frypan_handle.png differ diff --git a/resources/tinkertextures/tools/frypan/netherrack_frypan_head.png b/resources/tinkertextures/tools/frypan/netherrack_frypan_head.png new file mode 100644 index 00000000..43857843 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/netherrack_frypan_head.png differ diff --git a/resources/tinkertextures/tools/frypan/netherrack_frypan_head_broken.png b/resources/tinkertextures/tools/frypan/netherrack_frypan_head_broken.png new file mode 100644 index 00000000..59b3cb8b Binary files /dev/null and b/resources/tinkertextures/tools/frypan/netherrack_frypan_head_broken.png differ diff --git a/resources/tinkertextures/tools/frypan/obsidian_frypan_handle.png b/resources/tinkertextures/tools/frypan/obsidian_frypan_handle.png new file mode 100644 index 00000000..679ece5c Binary files /dev/null and b/resources/tinkertextures/tools/frypan/obsidian_frypan_handle.png differ diff --git a/resources/tinkertextures/tools/frypan/obsidian_frypan_head.png b/resources/tinkertextures/tools/frypan/obsidian_frypan_head.png new file mode 100644 index 00000000..b2b11c71 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/obsidian_frypan_head.png differ diff --git a/resources/tinkertextures/tools/frypan/obsidian_frypan_head_broken.png b/resources/tinkertextures/tools/frypan/obsidian_frypan_head_broken.png new file mode 100644 index 00000000..aaedc277 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/obsidian_frypan_head_broken.png differ diff --git a/resources/tinkertextures/tools/frypan/paper_frypan_handle.png b/resources/tinkertextures/tools/frypan/paper_frypan_handle.png new file mode 100644 index 00000000..3cc4c9d0 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/paper_frypan_handle.png differ diff --git a/resources/tinkertextures/tools/frypan/paper_frypan_head.png b/resources/tinkertextures/tools/frypan/paper_frypan_head.png new file mode 100644 index 00000000..baa357fc Binary files /dev/null and b/resources/tinkertextures/tools/frypan/paper_frypan_head.png differ diff --git a/resources/tinkertextures/tools/frypan/paper_frypan_head_broken.png b/resources/tinkertextures/tools/frypan/paper_frypan_head_broken.png new file mode 100644 index 00000000..4426a9e1 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/paper_frypan_head_broken.png differ diff --git a/resources/tinkertextures/tools/frypan/redstone_frypan_effect.png b/resources/tinkertextures/tools/frypan/redstone_frypan_effect.png new file mode 100644 index 00000000..6a7e9dd2 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/redstone_frypan_effect.png differ diff --git a/resources/tinkertextures/tools/frypan/slime_frypan_handle.png b/resources/tinkertextures/tools/frypan/slime_frypan_handle.png new file mode 100644 index 00000000..5911fe8b Binary files /dev/null and b/resources/tinkertextures/tools/frypan/slime_frypan_handle.png differ diff --git a/resources/tinkertextures/tools/frypan/slime_frypan_head.png b/resources/tinkertextures/tools/frypan/slime_frypan_head.png new file mode 100644 index 00000000..3ecd2bae Binary files /dev/null and b/resources/tinkertextures/tools/frypan/slime_frypan_head.png differ diff --git a/resources/tinkertextures/tools/frypan/slime_frypan_head_broken.png b/resources/tinkertextures/tools/frypan/slime_frypan_head_broken.png new file mode 100644 index 00000000..ae1dbfa2 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/slime_frypan_head_broken.png differ diff --git a/resources/tinkertextures/tools/frypan/stone_frypan_handle.png b/resources/tinkertextures/tools/frypan/stone_frypan_handle.png new file mode 100644 index 00000000..29031da1 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/stone_frypan_handle.png differ diff --git a/resources/tinkertextures/tools/frypan/stone_frypan_head.png b/resources/tinkertextures/tools/frypan/stone_frypan_head.png new file mode 100644 index 00000000..1c5033fe Binary files /dev/null and b/resources/tinkertextures/tools/frypan/stone_frypan_head.png differ diff --git a/resources/tinkertextures/tools/frypan/stone_frypan_head_broken.png b/resources/tinkertextures/tools/frypan/stone_frypan_head_broken.png new file mode 100644 index 00000000..d786d7b5 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/stone_frypan_head_broken.png differ diff --git a/resources/tinkertextures/tools/frypan/thaumium_frypan_handle.png b/resources/tinkertextures/tools/frypan/thaumium_frypan_handle.png new file mode 100644 index 00000000..1a884bb6 Binary files /dev/null and b/resources/tinkertextures/tools/frypan/thaumium_frypan_handle.png differ diff --git a/resources/tinkertextures/tools/frypan/wood_frypan_handle.png b/resources/tinkertextures/tools/frypan/wood_frypan_handle.png new file mode 100644 index 00000000..bdd1f5db Binary files /dev/null and b/resources/tinkertextures/tools/frypan/wood_frypan_handle.png differ diff --git a/resources/tinkertextures/tools/frypan/wood_frypan_head.png b/resources/tinkertextures/tools/frypan/wood_frypan_head.png new file mode 100644 index 00000000..6c291aac Binary files /dev/null and b/resources/tinkertextures/tools/frypan/wood_frypan_head.png differ diff --git a/resources/tinkertextures/tools/frypan/wood_frypan_head_broken.png b/resources/tinkertextures/tools/frypan/wood_frypan_head_broken.png new file mode 100644 index 00000000..5e4e508e Binary files /dev/null and b/resources/tinkertextures/tools/frypan/wood_frypan_head_broken.png differ diff --git a/resources/tinkertextures/tools/frypans.png b/resources/tinkertextures/tools/frypans.png deleted file mode 100644 index 952999a7..00000000 Binary files a/resources/tinkertextures/tools/frypans.png and /dev/null differ diff --git a/resources/tinkertextures/tools/longsword/ardite_longsword_accessory.png b/resources/tinkertextures/tools/longsword/ardite_longsword_accessory.png new file mode 100644 index 00000000..62c208a1 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/ardite_longsword_accessory.png differ diff --git a/resources/tinkertextures/tools/longsword/ardite_longsword_blade.png b/resources/tinkertextures/tools/longsword/ardite_longsword_blade.png new file mode 100644 index 00000000..23662a80 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/ardite_longsword_blade.png differ diff --git a/resources/tinkertextures/tools/longsword/ardite_longsword_blade_broken.png b/resources/tinkertextures/tools/longsword/ardite_longsword_blade_broken.png new file mode 100644 index 00000000..597f6667 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/ardite_longsword_blade_broken.png differ diff --git a/resources/tinkertextures/tools/longsword/ardite_longsword_handle.png b/resources/tinkertextures/tools/longsword/ardite_longsword_handle.png new file mode 100644 index 00000000..fdcea399 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/ardite_longsword_handle.png differ diff --git a/resources/tinkertextures/tools/longsword/blaze_longsword_effect.png b/resources/tinkertextures/tools/longsword/blaze_longsword_effect.png new file mode 100644 index 00000000..8f1348fd Binary files /dev/null and b/resources/tinkertextures/tools/longsword/blaze_longsword_effect.png differ diff --git a/resources/tinkertextures/tools/longsword/bone_longsword_accessory.png b/resources/tinkertextures/tools/longsword/bone_longsword_accessory.png new file mode 100644 index 00000000..934deaec Binary files /dev/null and b/resources/tinkertextures/tools/longsword/bone_longsword_accessory.png differ diff --git a/resources/tinkertextures/tools/longsword/bone_longsword_blade.png b/resources/tinkertextures/tools/longsword/bone_longsword_blade.png new file mode 100644 index 00000000..cb612775 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/bone_longsword_blade.png differ diff --git a/resources/tinkertextures/tools/longsword/bone_longsword_blade_broken.png b/resources/tinkertextures/tools/longsword/bone_longsword_blade_broken.png new file mode 100644 index 00000000..29161b55 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/bone_longsword_blade_broken.png differ diff --git a/resources/tinkertextures/tools/longsword/bone_longsword_handle.png b/resources/tinkertextures/tools/longsword/bone_longsword_handle.png new file mode 100644 index 00000000..0e04e2c7 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/bone_longsword_handle.png differ diff --git a/resources/tinkertextures/tools/longsword/bronze_longsword_accessory.png b/resources/tinkertextures/tools/longsword/bronze_longsword_accessory.png new file mode 100644 index 00000000..32459c2b Binary files /dev/null and b/resources/tinkertextures/tools/longsword/bronze_longsword_accessory.png differ diff --git a/resources/tinkertextures/tools/longsword/bronze_longsword_blade.png b/resources/tinkertextures/tools/longsword/bronze_longsword_blade.png new file mode 100644 index 00000000..e5217d32 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/bronze_longsword_blade.png differ diff --git a/resources/tinkertextures/tools/longsword/bronze_longsword_blade_broken.png b/resources/tinkertextures/tools/longsword/bronze_longsword_blade_broken.png new file mode 100644 index 00000000..868d2f49 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/bronze_longsword_blade_broken.png differ diff --git a/resources/tinkertextures/tools/longsword/bronze_longsword_handle.png b/resources/tinkertextures/tools/longsword/bronze_longsword_handle.png new file mode 100644 index 00000000..58e8e967 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/bronze_longsword_handle.png differ diff --git a/resources/tinkertextures/tools/longsword/cactus_longsword_accessory.png b/resources/tinkertextures/tools/longsword/cactus_longsword_accessory.png new file mode 100644 index 00000000..5faaaa9d Binary files /dev/null and b/resources/tinkertextures/tools/longsword/cactus_longsword_accessory.png differ diff --git a/resources/tinkertextures/tools/longsword/cactus_longsword_blade.png b/resources/tinkertextures/tools/longsword/cactus_longsword_blade.png new file mode 100644 index 00000000..203e87bd Binary files /dev/null and b/resources/tinkertextures/tools/longsword/cactus_longsword_blade.png differ diff --git a/resources/tinkertextures/tools/longsword/cactus_longsword_blade_broken.png b/resources/tinkertextures/tools/longsword/cactus_longsword_blade_broken.png new file mode 100644 index 00000000..5e3c4a12 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/cactus_longsword_blade_broken.png differ diff --git a/resources/tinkertextures/tools/longsword/cactus_longsword_handle.png b/resources/tinkertextures/tools/longsword/cactus_longsword_handle.png new file mode 100644 index 00000000..f43b229b Binary files /dev/null and b/resources/tinkertextures/tools/longsword/cactus_longsword_handle.png differ diff --git a/resources/tinkertextures/tools/longsword/cobalt_longsword_accessory.png b/resources/tinkertextures/tools/longsword/cobalt_longsword_accessory.png new file mode 100644 index 00000000..09822e2a Binary files /dev/null and b/resources/tinkertextures/tools/longsword/cobalt_longsword_accessory.png differ diff --git a/resources/tinkertextures/tools/longsword/cobalt_longsword_blade.png b/resources/tinkertextures/tools/longsword/cobalt_longsword_blade.png new file mode 100644 index 00000000..d656fd57 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/cobalt_longsword_blade.png differ diff --git a/resources/tinkertextures/tools/longsword/cobalt_longsword_blade_broken.png b/resources/tinkertextures/tools/longsword/cobalt_longsword_blade_broken.png new file mode 100644 index 00000000..cfab553f Binary files /dev/null and b/resources/tinkertextures/tools/longsword/cobalt_longsword_blade_broken.png differ diff --git a/resources/tinkertextures/tools/longsword/cobalt_longsword_handle.png b/resources/tinkertextures/tools/longsword/cobalt_longsword_handle.png new file mode 100644 index 00000000..16e1834c Binary files /dev/null and b/resources/tinkertextures/tools/longsword/cobalt_longsword_handle.png differ diff --git a/resources/tinkertextures/tools/longsword/copper_longsword_accessory.png b/resources/tinkertextures/tools/longsword/copper_longsword_accessory.png new file mode 100644 index 00000000..5d643d8d Binary files /dev/null and b/resources/tinkertextures/tools/longsword/copper_longsword_accessory.png differ diff --git a/resources/tinkertextures/tools/longsword/copper_longsword_blade.png b/resources/tinkertextures/tools/longsword/copper_longsword_blade.png new file mode 100644 index 00000000..e6e5d7ce Binary files /dev/null and b/resources/tinkertextures/tools/longsword/copper_longsword_blade.png differ diff --git a/resources/tinkertextures/tools/longsword/copper_longsword_blade_broken.png b/resources/tinkertextures/tools/longsword/copper_longsword_blade_broken.png new file mode 100644 index 00000000..bb5276e0 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/copper_longsword_blade_broken.png differ diff --git a/resources/tinkertextures/tools/longsword/copper_longsword_handle.png b/resources/tinkertextures/tools/longsword/copper_longsword_handle.png new file mode 100644 index 00000000..674dd529 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/copper_longsword_handle.png differ diff --git a/resources/tinkertextures/tools/longsword/diamond_longsword_effect.png b/resources/tinkertextures/tools/longsword/diamond_longsword_effect.png new file mode 100644 index 00000000..e101b4d5 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/diamond_longsword_effect.png differ diff --git a/resources/tinkertextures/tools/longsword/electric_longsword_effect.png b/resources/tinkertextures/tools/longsword/electric_longsword_effect.png new file mode 100644 index 00000000..6b72e0a3 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/electric_longsword_effect.png differ diff --git a/resources/tinkertextures/tools/longsword/emerald_longsword_effect.png b/resources/tinkertextures/tools/longsword/emerald_longsword_effect.png new file mode 100644 index 00000000..d2ae8d58 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/emerald_longsword_effect.png differ diff --git a/resources/tinkertextures/tools/longsword/flint_longsword_accessory.png b/resources/tinkertextures/tools/longsword/flint_longsword_accessory.png new file mode 100644 index 00000000..15b0a31c Binary files /dev/null and b/resources/tinkertextures/tools/longsword/flint_longsword_accessory.png differ diff --git a/resources/tinkertextures/tools/longsword/flint_longsword_blade.png b/resources/tinkertextures/tools/longsword/flint_longsword_blade.png new file mode 100644 index 00000000..7fc7e079 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/flint_longsword_blade.png differ diff --git a/resources/tinkertextures/tools/longsword/flint_longsword_blade_broken.png b/resources/tinkertextures/tools/longsword/flint_longsword_blade_broken.png new file mode 100644 index 00000000..137e0ca4 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/flint_longsword_blade_broken.png differ diff --git a/resources/tinkertextures/tools/longsword/flint_longsword_handle.png b/resources/tinkertextures/tools/longsword/flint_longsword_handle.png new file mode 100644 index 00000000..f0e650d2 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/flint_longsword_handle.png differ diff --git a/resources/tinkertextures/tools/longsword/glowstone_longsword_effect.png b/resources/tinkertextures/tools/longsword/glowstone_longsword_effect.png new file mode 100644 index 00000000..8db1d796 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/glowstone_longsword_effect.png differ diff --git a/resources/tinkertextures/tools/longsword/ice_longsword_effect.png b/resources/tinkertextures/tools/longsword/ice_longsword_effect.png new file mode 100644 index 00000000..8ad82be7 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/ice_longsword_effect.png differ diff --git a/resources/tinkertextures/tools/longsword/iron_longsword_accessory.png b/resources/tinkertextures/tools/longsword/iron_longsword_accessory.png new file mode 100644 index 00000000..1d08caa6 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/iron_longsword_accessory.png differ diff --git a/resources/tinkertextures/tools/longsword/iron_longsword_blade.png b/resources/tinkertextures/tools/longsword/iron_longsword_blade.png new file mode 100644 index 00000000..8a3e99d5 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/iron_longsword_blade.png differ diff --git a/resources/tinkertextures/tools/longsword/iron_longsword_blade_broken.png b/resources/tinkertextures/tools/longsword/iron_longsword_blade_broken.png new file mode 100644 index 00000000..f63301d8 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/iron_longsword_blade_broken.png differ diff --git a/resources/tinkertextures/tools/longsword/iron_longsword_handle.png b/resources/tinkertextures/tools/longsword/iron_longsword_handle.png new file mode 100644 index 00000000..36bba9f2 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/iron_longsword_handle.png differ diff --git a/resources/tinkertextures/tools/longsword/lapis_longsword_effect.png b/resources/tinkertextures/tools/longsword/lapis_longsword_effect.png new file mode 100644 index 00000000..a612ad5d Binary files /dev/null and b/resources/tinkertextures/tools/longsword/lapis_longsword_effect.png differ diff --git a/resources/tinkertextures/tools/longsword/lava_longsword_effect.png b/resources/tinkertextures/tools/longsword/lava_longsword_effect.png new file mode 100644 index 00000000..30957827 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/lava_longsword_effect.png differ diff --git a/resources/tinkertextures/tools/longsword/manyullyn_longsword_accessory.png b/resources/tinkertextures/tools/longsword/manyullyn_longsword_accessory.png new file mode 100644 index 00000000..a3619c91 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/manyullyn_longsword_accessory.png differ diff --git a/resources/tinkertextures/tools/longsword/manyullyn_longsword_blade.png b/resources/tinkertextures/tools/longsword/manyullyn_longsword_blade.png new file mode 100644 index 00000000..bf9e5d24 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/manyullyn_longsword_blade.png differ diff --git a/resources/tinkertextures/tools/longsword/manyullyn_longsword_blade_broken.png b/resources/tinkertextures/tools/longsword/manyullyn_longsword_blade_broken.png new file mode 100644 index 00000000..2e381112 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/manyullyn_longsword_blade_broken.png differ diff --git a/resources/tinkertextures/tools/longsword/manyullyn_longsword_handle.png b/resources/tinkertextures/tools/longsword/manyullyn_longsword_handle.png new file mode 100644 index 00000000..d7e3cb37 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/manyullyn_longsword_handle.png differ diff --git a/resources/tinkertextures/tools/longsword/moss_longsword_effect.png b/resources/tinkertextures/tools/longsword/moss_longsword_effect.png new file mode 100644 index 00000000..3841e214 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/moss_longsword_effect.png differ diff --git a/resources/tinkertextures/tools/longsword/necrotic_longsword_effect.png b/resources/tinkertextures/tools/longsword/necrotic_longsword_effect.png new file mode 100644 index 00000000..b87ec94e Binary files /dev/null and b/resources/tinkertextures/tools/longsword/necrotic_longsword_effect.png differ diff --git a/resources/tinkertextures/tools/longsword/netherrack_longsword_accessory.png b/resources/tinkertextures/tools/longsword/netherrack_longsword_accessory.png new file mode 100644 index 00000000..2a5e0916 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/netherrack_longsword_accessory.png differ diff --git a/resources/tinkertextures/tools/longsword/netherrack_longsword_blade.png b/resources/tinkertextures/tools/longsword/netherrack_longsword_blade.png new file mode 100644 index 00000000..1258ee08 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/netherrack_longsword_blade.png differ diff --git a/resources/tinkertextures/tools/longsword/netherrack_longsword_blade_broken.png b/resources/tinkertextures/tools/longsword/netherrack_longsword_blade_broken.png new file mode 100644 index 00000000..90dc7175 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/netherrack_longsword_blade_broken.png differ diff --git a/resources/tinkertextures/tools/longsword/netherrack_longsword_handle.png b/resources/tinkertextures/tools/longsword/netherrack_longsword_handle.png new file mode 100644 index 00000000..f47198c7 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/netherrack_longsword_handle.png differ diff --git a/resources/tinkertextures/tools/longsword/obsidian_longsword_accessory.png b/resources/tinkertextures/tools/longsword/obsidian_longsword_accessory.png new file mode 100644 index 00000000..68b4b45f Binary files /dev/null and b/resources/tinkertextures/tools/longsword/obsidian_longsword_accessory.png differ diff --git a/resources/tinkertextures/tools/longsword/obsidian_longsword_blade.png b/resources/tinkertextures/tools/longsword/obsidian_longsword_blade.png new file mode 100644 index 00000000..522370d4 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/obsidian_longsword_blade.png differ diff --git a/resources/tinkertextures/tools/longsword/obsidian_longsword_blade_broken.png b/resources/tinkertextures/tools/longsword/obsidian_longsword_blade_broken.png new file mode 100644 index 00000000..a582555a Binary files /dev/null and b/resources/tinkertextures/tools/longsword/obsidian_longsword_blade_broken.png differ diff --git a/resources/tinkertextures/tools/longsword/obsidian_longsword_handle.png b/resources/tinkertextures/tools/longsword/obsidian_longsword_handle.png new file mode 100644 index 00000000..d5be789c Binary files /dev/null and b/resources/tinkertextures/tools/longsword/obsidian_longsword_handle.png differ diff --git a/resources/tinkertextures/tools/longsword/paper_longsword_accessory.png b/resources/tinkertextures/tools/longsword/paper_longsword_accessory.png new file mode 100644 index 00000000..976a39cf Binary files /dev/null and b/resources/tinkertextures/tools/longsword/paper_longsword_accessory.png differ diff --git a/resources/tinkertextures/tools/longsword/paper_longsword_blade.png b/resources/tinkertextures/tools/longsword/paper_longsword_blade.png new file mode 100644 index 00000000..bc0df743 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/paper_longsword_blade.png differ diff --git a/resources/tinkertextures/tools/longsword/paper_longsword_blade_broken.png b/resources/tinkertextures/tools/longsword/paper_longsword_blade_broken.png new file mode 100644 index 00000000..b32e1f42 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/paper_longsword_blade_broken.png differ diff --git a/resources/tinkertextures/tools/longsword/paper_longsword_handle.png b/resources/tinkertextures/tools/longsword/paper_longsword_handle.png new file mode 100644 index 00000000..99fc5cf5 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/paper_longsword_handle.png differ diff --git a/resources/tinkertextures/tools/longsword/redstone_longsword_effect.png b/resources/tinkertextures/tools/longsword/redstone_longsword_effect.png new file mode 100644 index 00000000..57f6719c Binary files /dev/null and b/resources/tinkertextures/tools/longsword/redstone_longsword_effect.png differ diff --git a/resources/tinkertextures/tools/longsword/slime_longsword_accessory.png b/resources/tinkertextures/tools/longsword/slime_longsword_accessory.png new file mode 100644 index 00000000..b05b42cc Binary files /dev/null and b/resources/tinkertextures/tools/longsword/slime_longsword_accessory.png differ diff --git a/resources/tinkertextures/tools/longsword/slime_longsword_blade.png b/resources/tinkertextures/tools/longsword/slime_longsword_blade.png new file mode 100644 index 00000000..d23bee36 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/slime_longsword_blade.png differ diff --git a/resources/tinkertextures/tools/longsword/slime_longsword_blade_broken.png b/resources/tinkertextures/tools/longsword/slime_longsword_blade_broken.png new file mode 100644 index 00000000..3ae972ff Binary files /dev/null and b/resources/tinkertextures/tools/longsword/slime_longsword_blade_broken.png differ diff --git a/resources/tinkertextures/tools/longsword/slime_longsword_handle.png b/resources/tinkertextures/tools/longsword/slime_longsword_handle.png new file mode 100644 index 00000000..275809df Binary files /dev/null and b/resources/tinkertextures/tools/longsword/slime_longsword_handle.png differ diff --git a/resources/tinkertextures/tools/longsword/stone_longsword_accessory.png b/resources/tinkertextures/tools/longsword/stone_longsword_accessory.png new file mode 100644 index 00000000..63d86af0 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/stone_longsword_accessory.png differ diff --git a/resources/tinkertextures/tools/longsword/stone_longsword_blade.png b/resources/tinkertextures/tools/longsword/stone_longsword_blade.png new file mode 100644 index 00000000..a71d5879 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/stone_longsword_blade.png differ diff --git a/resources/tinkertextures/tools/longsword/stone_longsword_blade_broken.png b/resources/tinkertextures/tools/longsword/stone_longsword_blade_broken.png new file mode 100644 index 00000000..f657dc73 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/stone_longsword_blade_broken.png differ diff --git a/resources/tinkertextures/tools/longsword/stone_longsword_handle.png b/resources/tinkertextures/tools/longsword/stone_longsword_handle.png new file mode 100644 index 00000000..2f1de108 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/stone_longsword_handle.png differ diff --git a/resources/tinkertextures/tools/longsword/wood_longsword_accessory.png b/resources/tinkertextures/tools/longsword/wood_longsword_accessory.png new file mode 100644 index 00000000..d6976c7d Binary files /dev/null and b/resources/tinkertextures/tools/longsword/wood_longsword_accessory.png differ diff --git a/resources/tinkertextures/tools/longsword/wood_longsword_blade.png b/resources/tinkertextures/tools/longsword/wood_longsword_blade.png new file mode 100644 index 00000000..26c3b178 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/wood_longsword_blade.png differ diff --git a/resources/tinkertextures/tools/longsword/wood_longsword_blade_broken.png b/resources/tinkertextures/tools/longsword/wood_longsword_blade_broken.png new file mode 100644 index 00000000..fc8c40b4 Binary files /dev/null and b/resources/tinkertextures/tools/longsword/wood_longsword_blade_broken.png differ diff --git a/resources/tinkertextures/tools/longsword/wood_longsword_handle.png b/resources/tinkertextures/tools/longsword/wood_longsword_handle.png new file mode 100644 index 00000000..27c0b26a Binary files /dev/null and b/resources/tinkertextures/tools/longsword/wood_longsword_handle.png differ diff --git a/resources/tinkertextures/tools/mattock.png b/resources/tinkertextures/tools/mattock.png deleted file mode 100644 index 0a2b3139..00000000 Binary files a/resources/tinkertextures/tools/mattock.png and /dev/null differ diff --git a/resources/tinkertextures/tools/mattock/ardite_mattock_back.png b/resources/tinkertextures/tools/mattock/ardite_mattock_back.png new file mode 100644 index 00000000..66248f48 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/ardite_mattock_back.png differ diff --git a/resources/tinkertextures/tools/mattock/ardite_mattock_handle.png b/resources/tinkertextures/tools/mattock/ardite_mattock_handle.png new file mode 100644 index 00000000..eb82e4a8 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/ardite_mattock_handle.png differ diff --git a/resources/tinkertextures/tools/mattock/ardite_mattock_head.png b/resources/tinkertextures/tools/mattock/ardite_mattock_head.png new file mode 100644 index 00000000..a22d4db5 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/ardite_mattock_head.png differ diff --git a/resources/tinkertextures/tools/mattock/ardite_mattock_head_broken.png b/resources/tinkertextures/tools/mattock/ardite_mattock_head_broken.png new file mode 100644 index 00000000..ecedac52 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/ardite_mattock_head_broken.png differ diff --git a/resources/tinkertextures/tools/mattock/blaze_mattock_effect.png b/resources/tinkertextures/tools/mattock/blaze_mattock_effect.png new file mode 100644 index 00000000..b4381f95 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/blaze_mattock_effect.png differ diff --git a/resources/tinkertextures/tools/mattock/bone_mattock_back.png b/resources/tinkertextures/tools/mattock/bone_mattock_back.png new file mode 100644 index 00000000..9fe34888 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/bone_mattock_back.png differ diff --git a/resources/tinkertextures/tools/mattock/bone_mattock_handle.png b/resources/tinkertextures/tools/mattock/bone_mattock_handle.png new file mode 100644 index 00000000..87fbdc44 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/bone_mattock_handle.png differ diff --git a/resources/tinkertextures/tools/mattock/bone_mattock_head.png b/resources/tinkertextures/tools/mattock/bone_mattock_head.png new file mode 100644 index 00000000..051b5469 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/bone_mattock_head.png differ diff --git a/resources/tinkertextures/tools/mattock/bone_mattock_head_broken.png b/resources/tinkertextures/tools/mattock/bone_mattock_head_broken.png new file mode 100644 index 00000000..8638ada9 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/bone_mattock_head_broken.png differ diff --git a/resources/tinkertextures/tools/mattock/bronze_mattock_back.png b/resources/tinkertextures/tools/mattock/bronze_mattock_back.png new file mode 100644 index 00000000..c67056fe Binary files /dev/null and b/resources/tinkertextures/tools/mattock/bronze_mattock_back.png differ diff --git a/resources/tinkertextures/tools/mattock/bronze_mattock_handle.png b/resources/tinkertextures/tools/mattock/bronze_mattock_handle.png new file mode 100644 index 00000000..5dc0618f Binary files /dev/null and b/resources/tinkertextures/tools/mattock/bronze_mattock_handle.png differ diff --git a/resources/tinkertextures/tools/mattock/bronze_mattock_head.png b/resources/tinkertextures/tools/mattock/bronze_mattock_head.png new file mode 100644 index 00000000..b9b548b3 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/bronze_mattock_head.png differ diff --git a/resources/tinkertextures/tools/mattock/bronze_mattock_head_broken.png b/resources/tinkertextures/tools/mattock/bronze_mattock_head_broken.png new file mode 100644 index 00000000..0f6bab0f Binary files /dev/null and b/resources/tinkertextures/tools/mattock/bronze_mattock_head_broken.png differ diff --git a/resources/tinkertextures/tools/mattock/cactus_mattock_back.png b/resources/tinkertextures/tools/mattock/cactus_mattock_back.png new file mode 100644 index 00000000..e7a03398 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/cactus_mattock_back.png differ diff --git a/resources/tinkertextures/tools/mattock/cactus_mattock_handle.png b/resources/tinkertextures/tools/mattock/cactus_mattock_handle.png new file mode 100644 index 00000000..356fc083 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/cactus_mattock_handle.png differ diff --git a/resources/tinkertextures/tools/mattock/cactus_mattock_head.png b/resources/tinkertextures/tools/mattock/cactus_mattock_head.png new file mode 100644 index 00000000..c4bb564e Binary files /dev/null and b/resources/tinkertextures/tools/mattock/cactus_mattock_head.png differ diff --git a/resources/tinkertextures/tools/mattock/cactus_mattock_head_broken.png b/resources/tinkertextures/tools/mattock/cactus_mattock_head_broken.png new file mode 100644 index 00000000..ee89fcb2 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/cactus_mattock_head_broken.png differ diff --git a/resources/tinkertextures/tools/mattock/cobalt_mattock_back.png b/resources/tinkertextures/tools/mattock/cobalt_mattock_back.png new file mode 100644 index 00000000..786e2d41 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/cobalt_mattock_back.png differ diff --git a/resources/tinkertextures/tools/mattock/cobalt_mattock_handle.png b/resources/tinkertextures/tools/mattock/cobalt_mattock_handle.png new file mode 100644 index 00000000..e2113afc Binary files /dev/null and b/resources/tinkertextures/tools/mattock/cobalt_mattock_handle.png differ diff --git a/resources/tinkertextures/tools/mattock/cobalt_mattock_head.png b/resources/tinkertextures/tools/mattock/cobalt_mattock_head.png new file mode 100644 index 00000000..a10a8f1c Binary files /dev/null and b/resources/tinkertextures/tools/mattock/cobalt_mattock_head.png differ diff --git a/resources/tinkertextures/tools/mattock/cobalt_mattock_head_broken.png b/resources/tinkertextures/tools/mattock/cobalt_mattock_head_broken.png new file mode 100644 index 00000000..1887874d Binary files /dev/null and b/resources/tinkertextures/tools/mattock/cobalt_mattock_head_broken.png differ diff --git a/resources/tinkertextures/tools/mattock/copper_mattock_back.png b/resources/tinkertextures/tools/mattock/copper_mattock_back.png new file mode 100644 index 00000000..c6eeb0dc Binary files /dev/null and b/resources/tinkertextures/tools/mattock/copper_mattock_back.png differ diff --git a/resources/tinkertextures/tools/mattock/copper_mattock_handle.png b/resources/tinkertextures/tools/mattock/copper_mattock_handle.png new file mode 100644 index 00000000..4236dbdd Binary files /dev/null and b/resources/tinkertextures/tools/mattock/copper_mattock_handle.png differ diff --git a/resources/tinkertextures/tools/mattock/copper_mattock_head.png b/resources/tinkertextures/tools/mattock/copper_mattock_head.png new file mode 100644 index 00000000..2874da17 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/copper_mattock_head.png differ diff --git a/resources/tinkertextures/tools/mattock/copper_mattock_head_broken.png b/resources/tinkertextures/tools/mattock/copper_mattock_head_broken.png new file mode 100644 index 00000000..e31f5ba2 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/copper_mattock_head_broken.png differ diff --git a/resources/tinkertextures/tools/mattock/diamond_mattock_effect.png b/resources/tinkertextures/tools/mattock/diamond_mattock_effect.png new file mode 100644 index 00000000..48803587 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/diamond_mattock_effect.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_effect_9.png b/resources/tinkertextures/tools/mattock/electric_mattock_effect.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_effect_9.png rename to resources/tinkertextures/tools/mattock/electric_mattock_effect.png diff --git a/resources/tinkertextures/tools/mattock/emerald_mattock_effect.png b/resources/tinkertextures/tools/mattock/emerald_mattock_effect.png new file mode 100644 index 00000000..c880b3d7 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/emerald_mattock_effect.png differ diff --git a/resources/tinkertextures/tools/mattock/flint_mattock_back.png b/resources/tinkertextures/tools/mattock/flint_mattock_back.png new file mode 100644 index 00000000..dc4fd22c Binary files /dev/null and b/resources/tinkertextures/tools/mattock/flint_mattock_back.png differ diff --git a/resources/tinkertextures/tools/mattock/flint_mattock_handle.png b/resources/tinkertextures/tools/mattock/flint_mattock_handle.png new file mode 100644 index 00000000..547ce73d Binary files /dev/null and b/resources/tinkertextures/tools/mattock/flint_mattock_handle.png differ diff --git a/resources/tinkertextures/tools/mattock/flint_mattock_head.png b/resources/tinkertextures/tools/mattock/flint_mattock_head.png new file mode 100644 index 00000000..79d3b991 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/flint_mattock_head.png differ diff --git a/resources/tinkertextures/tools/mattock/flint_mattock_head_broken.png b/resources/tinkertextures/tools/mattock/flint_mattock_head_broken.png new file mode 100644 index 00000000..dcc576fe Binary files /dev/null and b/resources/tinkertextures/tools/mattock/flint_mattock_head_broken.png differ diff --git a/resources/tinkertextures/tools/mattock/glowstone_mattock_effect.png b/resources/tinkertextures/tools/mattock/glowstone_mattock_effect.png new file mode 100644 index 00000000..10bdf19c Binary files /dev/null and b/resources/tinkertextures/tools/mattock/glowstone_mattock_effect.png differ diff --git a/resources/tinkertextures/tools/mattock/ice_mattock_effect.png b/resources/tinkertextures/tools/mattock/ice_mattock_effect.png new file mode 100644 index 00000000..fb07d195 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/ice_mattock_effect.png differ diff --git a/resources/tinkertextures/tools/mattock/iron_mattock_back.png b/resources/tinkertextures/tools/mattock/iron_mattock_back.png new file mode 100644 index 00000000..271ee4ef Binary files /dev/null and b/resources/tinkertextures/tools/mattock/iron_mattock_back.png differ diff --git a/resources/tinkertextures/tools/mattock/iron_mattock_handle.png b/resources/tinkertextures/tools/mattock/iron_mattock_handle.png new file mode 100644 index 00000000..a26a3a66 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/iron_mattock_handle.png differ diff --git a/resources/tinkertextures/tools/mattock/iron_mattock_head.png b/resources/tinkertextures/tools/mattock/iron_mattock_head.png new file mode 100644 index 00000000..4e3a65b5 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/iron_mattock_head.png differ diff --git a/resources/tinkertextures/tools/mattock/iron_mattock_head_broken.png b/resources/tinkertextures/tools/mattock/iron_mattock_head_broken.png new file mode 100644 index 00000000..e388b04f Binary files /dev/null and b/resources/tinkertextures/tools/mattock/iron_mattock_head_broken.png differ diff --git a/resources/tinkertextures/tools/mattock/lapis_mattock_effect.png b/resources/tinkertextures/tools/mattock/lapis_mattock_effect.png new file mode 100644 index 00000000..3a29bd6f Binary files /dev/null and b/resources/tinkertextures/tools/mattock/lapis_mattock_effect.png differ diff --git a/resources/tinkertextures/tools/mattock/lava_mattock_effect.png b/resources/tinkertextures/tools/mattock/lava_mattock_effect.png new file mode 100644 index 00000000..92df8c98 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/lava_mattock_effect.png differ diff --git a/resources/tinkertextures/tools/mattock/manyullyn_mattock_back.png b/resources/tinkertextures/tools/mattock/manyullyn_mattock_back.png new file mode 100644 index 00000000..4e43ba58 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/manyullyn_mattock_back.png differ diff --git a/resources/tinkertextures/tools/mattock/manyullyn_mattock_handle.png b/resources/tinkertextures/tools/mattock/manyullyn_mattock_handle.png new file mode 100644 index 00000000..5e7e7789 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/manyullyn_mattock_handle.png differ diff --git a/resources/tinkertextures/tools/mattock/manyullyn_mattock_head.png b/resources/tinkertextures/tools/mattock/manyullyn_mattock_head.png new file mode 100644 index 00000000..f30cd74d Binary files /dev/null and b/resources/tinkertextures/tools/mattock/manyullyn_mattock_head.png differ diff --git a/resources/tinkertextures/tools/mattock/manyullyn_mattock_head_broken.png b/resources/tinkertextures/tools/mattock/manyullyn_mattock_head_broken.png new file mode 100644 index 00000000..893f77e9 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/manyullyn_mattock_head_broken.png differ diff --git a/resources/tinkertextures/tools/mattock/moss_mattock_effect.png b/resources/tinkertextures/tools/mattock/moss_mattock_effect.png new file mode 100644 index 00000000..f7ec2024 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/moss_mattock_effect.png differ diff --git a/resources/tinkertextures/tools/mattock/necrotic_mattock_effect.png b/resources/tinkertextures/tools/mattock/necrotic_mattock_effect.png new file mode 100644 index 00000000..945822dc Binary files /dev/null and b/resources/tinkertextures/tools/mattock/necrotic_mattock_effect.png differ diff --git a/resources/tinkertextures/tools/mattock/netherrack_mattock_back.png b/resources/tinkertextures/tools/mattock/netherrack_mattock_back.png new file mode 100644 index 00000000..df266c97 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/netherrack_mattock_back.png differ diff --git a/resources/tinkertextures/tools/mattock/netherrack_mattock_handle.png b/resources/tinkertextures/tools/mattock/netherrack_mattock_handle.png new file mode 100644 index 00000000..147867cc Binary files /dev/null and b/resources/tinkertextures/tools/mattock/netherrack_mattock_handle.png differ diff --git a/resources/tinkertextures/tools/mattock/netherrack_mattock_head.png b/resources/tinkertextures/tools/mattock/netherrack_mattock_head.png new file mode 100644 index 00000000..646a71f2 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/netherrack_mattock_head.png differ diff --git a/resources/tinkertextures/tools/mattock/netherrack_mattock_head_broken.png b/resources/tinkertextures/tools/mattock/netherrack_mattock_head_broken.png new file mode 100644 index 00000000..b5ca8054 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/netherrack_mattock_head_broken.png differ diff --git a/resources/tinkertextures/tools/mattock/obsidian_mattock_back.png b/resources/tinkertextures/tools/mattock/obsidian_mattock_back.png new file mode 100644 index 00000000..39c5a878 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/obsidian_mattock_back.png differ diff --git a/resources/tinkertextures/tools/mattock/obsidian_mattock_handle.png b/resources/tinkertextures/tools/mattock/obsidian_mattock_handle.png new file mode 100644 index 00000000..390d03be Binary files /dev/null and b/resources/tinkertextures/tools/mattock/obsidian_mattock_handle.png differ diff --git a/resources/tinkertextures/tools/mattock/obsidian_mattock_head.png b/resources/tinkertextures/tools/mattock/obsidian_mattock_head.png new file mode 100644 index 00000000..d4d6c3b8 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/obsidian_mattock_head.png differ diff --git a/resources/tinkertextures/tools/mattock/obsidian_mattock_head_broken.png b/resources/tinkertextures/tools/mattock/obsidian_mattock_head_broken.png new file mode 100644 index 00000000..c4ce747b Binary files /dev/null and b/resources/tinkertextures/tools/mattock/obsidian_mattock_head_broken.png differ diff --git a/resources/tinkertextures/tools/mattock/paper_mattock_back.png b/resources/tinkertextures/tools/mattock/paper_mattock_back.png new file mode 100644 index 00000000..9601dfba Binary files /dev/null and b/resources/tinkertextures/tools/mattock/paper_mattock_back.png differ diff --git a/resources/tinkertextures/tools/mattock/paper_mattock_handle.png b/resources/tinkertextures/tools/mattock/paper_mattock_handle.png new file mode 100644 index 00000000..ef6ec59d Binary files /dev/null and b/resources/tinkertextures/tools/mattock/paper_mattock_handle.png differ diff --git a/resources/tinkertextures/tools/mattock/paper_mattock_head.png b/resources/tinkertextures/tools/mattock/paper_mattock_head.png new file mode 100644 index 00000000..5fcac7e5 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/paper_mattock_head.png differ diff --git a/resources/tinkertextures/tools/mattock/paper_mattock_head_broken.png b/resources/tinkertextures/tools/mattock/paper_mattock_head_broken.png new file mode 100644 index 00000000..29913632 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/paper_mattock_head_broken.png differ diff --git a/resources/tinkertextures/tools/mattock/redstone_mattock_effect.png b/resources/tinkertextures/tools/mattock/redstone_mattock_effect.png new file mode 100644 index 00000000..a54276e2 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/redstone_mattock_effect.png differ diff --git a/resources/tinkertextures/tools/mattock/slime_mattock_back.png b/resources/tinkertextures/tools/mattock/slime_mattock_back.png new file mode 100644 index 00000000..4aed6cbe Binary files /dev/null and b/resources/tinkertextures/tools/mattock/slime_mattock_back.png differ diff --git a/resources/tinkertextures/tools/mattock/slime_mattock_handle.png b/resources/tinkertextures/tools/mattock/slime_mattock_handle.png new file mode 100644 index 00000000..51398815 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/slime_mattock_handle.png differ diff --git a/resources/tinkertextures/tools/mattock/slime_mattock_head.png b/resources/tinkertextures/tools/mattock/slime_mattock_head.png new file mode 100644 index 00000000..0f0b3c35 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/slime_mattock_head.png differ diff --git a/resources/tinkertextures/tools/mattock/slime_mattock_head_broken.png b/resources/tinkertextures/tools/mattock/slime_mattock_head_broken.png new file mode 100644 index 00000000..54072bea Binary files /dev/null and b/resources/tinkertextures/tools/mattock/slime_mattock_head_broken.png differ diff --git a/resources/tinkertextures/tools/mattock/stone_mattock_back.png b/resources/tinkertextures/tools/mattock/stone_mattock_back.png new file mode 100644 index 00000000..a78863d5 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/stone_mattock_back.png differ diff --git a/resources/tinkertextures/tools/mattock/stone_mattock_handle.png b/resources/tinkertextures/tools/mattock/stone_mattock_handle.png new file mode 100644 index 00000000..6573815e Binary files /dev/null and b/resources/tinkertextures/tools/mattock/stone_mattock_handle.png differ diff --git a/resources/tinkertextures/tools/mattock/stone_mattock_head.png b/resources/tinkertextures/tools/mattock/stone_mattock_head.png new file mode 100644 index 00000000..469a9239 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/stone_mattock_head.png differ diff --git a/resources/tinkertextures/tools/mattock/stone_mattock_head_broken.png b/resources/tinkertextures/tools/mattock/stone_mattock_head_broken.png new file mode 100644 index 00000000..15f09a1a Binary files /dev/null and b/resources/tinkertextures/tools/mattock/stone_mattock_head_broken.png differ diff --git a/resources/tinkertextures/tools/mattock/wood_mattock_back.png b/resources/tinkertextures/tools/mattock/wood_mattock_back.png new file mode 100644 index 00000000..efedfc9a Binary files /dev/null and b/resources/tinkertextures/tools/mattock/wood_mattock_back.png differ diff --git a/resources/tinkertextures/tools/mattock/wood_mattock_handle.png b/resources/tinkertextures/tools/mattock/wood_mattock_handle.png new file mode 100644 index 00000000..9b86c982 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/wood_mattock_handle.png differ diff --git a/resources/tinkertextures/tools/mattock/wood_mattock_head.png b/resources/tinkertextures/tools/mattock/wood_mattock_head.png new file mode 100644 index 00000000..2209f2ee Binary files /dev/null and b/resources/tinkertextures/tools/mattock/wood_mattock_head.png differ diff --git a/resources/tinkertextures/tools/mattock/wood_mattock_head_broken.png b/resources/tinkertextures/tools/mattock/wood_mattock_head_broken.png new file mode 100644 index 00000000..ad404197 Binary files /dev/null and b/resources/tinkertextures/tools/mattock/wood_mattock_head_broken.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_11.png b/resources/tinkertextures/tools/pickaxe/ardite_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_accessory_11.png rename to resources/tinkertextures/tools/pickaxe/ardite_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_handle_11.png b/resources/tinkertextures/tools/pickaxe/ardite_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_handle_11.png rename to resources/tinkertextures/tools/pickaxe/ardite_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_11.png b/resources/tinkertextures/tools/pickaxe/ardite_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_head_11.png rename to resources/tinkertextures/tools/pickaxe/ardite_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_11.png b/resources/tinkertextures/tools/pickaxe/ardite_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_11.png rename to resources/tinkertextures/tools/pickaxe/ardite_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_effect_7.png b/resources/tinkertextures/tools/pickaxe/blaze_pickaxe_effect.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_effect_7.png rename to resources/tinkertextures/tools/pickaxe/blaze_pickaxe_effect.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_5.png b/resources/tinkertextures/tools/pickaxe/bone_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_accessory_5.png rename to resources/tinkertextures/tools/pickaxe/bone_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_handle_5.png b/resources/tinkertextures/tools/pickaxe/bone_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_handle_5.png rename to resources/tinkertextures/tools/pickaxe/bone_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_5.png b/resources/tinkertextures/tools/pickaxe/bone_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_head_5.png rename to resources/tinkertextures/tools/pickaxe/bone_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_5.png b/resources/tinkertextures/tools/pickaxe/bone_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_5.png rename to resources/tinkertextures/tools/pickaxe/bone_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_14.png b/resources/tinkertextures/tools/pickaxe/bronze_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_accessory_14.png rename to resources/tinkertextures/tools/pickaxe/bronze_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_handle_14.png b/resources/tinkertextures/tools/pickaxe/bronze_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_handle_14.png rename to resources/tinkertextures/tools/pickaxe/bronze_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_14.png b/resources/tinkertextures/tools/pickaxe/bronze_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_head_14.png rename to resources/tinkertextures/tools/pickaxe/bronze_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_14.png b/resources/tinkertextures/tools/pickaxe/bronze_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_14.png rename to resources/tinkertextures/tools/pickaxe/bronze_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_4.png b/resources/tinkertextures/tools/pickaxe/cactus_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_accessory_4.png rename to resources/tinkertextures/tools/pickaxe/cactus_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_handle_4.png b/resources/tinkertextures/tools/pickaxe/cactus_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_handle_4.png rename to resources/tinkertextures/tools/pickaxe/cactus_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_4.png b/resources/tinkertextures/tools/pickaxe/cactus_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_head_4.png rename to resources/tinkertextures/tools/pickaxe/cactus_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_4.png b/resources/tinkertextures/tools/pickaxe/cactus_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_4.png rename to resources/tinkertextures/tools/pickaxe/cactus_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_10.png b/resources/tinkertextures/tools/pickaxe/cobalt_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_accessory_10.png rename to resources/tinkertextures/tools/pickaxe/cobalt_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_handle_10.png b/resources/tinkertextures/tools/pickaxe/cobalt_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_handle_10.png rename to resources/tinkertextures/tools/pickaxe/cobalt_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_10.png b/resources/tinkertextures/tools/pickaxe/cobalt_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_head_10.png rename to resources/tinkertextures/tools/pickaxe/cobalt_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_10.png b/resources/tinkertextures/tools/pickaxe/cobalt_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_10.png rename to resources/tinkertextures/tools/pickaxe/cobalt_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_13.png b/resources/tinkertextures/tools/pickaxe/copper_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_accessory_13.png rename to resources/tinkertextures/tools/pickaxe/copper_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_handle_13.png b/resources/tinkertextures/tools/pickaxe/copper_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_handle_13.png rename to resources/tinkertextures/tools/pickaxe/copper_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_13.png b/resources/tinkertextures/tools/pickaxe/copper_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_head_13.png rename to resources/tinkertextures/tools/pickaxe/copper_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_13.png b/resources/tinkertextures/tools/pickaxe/copper_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_13.png rename to resources/tinkertextures/tools/pickaxe/copper_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_effect_0.png b/resources/tinkertextures/tools/pickaxe/diamond_pickaxe_effect.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_effect_0.png rename to resources/tinkertextures/tools/pickaxe/diamond_pickaxe_effect.png diff --git a/resources/tinkertextures/tools/pickaxe/electric_pickaxe_effect.png b/resources/tinkertextures/tools/pickaxe/electric_pickaxe_effect.png new file mode 100644 index 00000000..03c4a674 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxe/electric_pickaxe_effect.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_effect_1.png b/resources/tinkertextures/tools/pickaxe/emerald_pickaxe_effect.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_effect_1.png rename to resources/tinkertextures/tools/pickaxe/emerald_pickaxe_effect.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_3.png b/resources/tinkertextures/tools/pickaxe/flint_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_accessory_3.png rename to resources/tinkertextures/tools/pickaxe/flint_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_handle_3.png b/resources/tinkertextures/tools/pickaxe/flint_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_handle_3.png rename to resources/tinkertextures/tools/pickaxe/flint_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_3.png b/resources/tinkertextures/tools/pickaxe/flint_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_head_3.png rename to resources/tinkertextures/tools/pickaxe/flint_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_3.png b/resources/tinkertextures/tools/pickaxe/flint_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_3.png rename to resources/tinkertextures/tools/pickaxe/flint_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_effect_3.png b/resources/tinkertextures/tools/pickaxe/glowstone_pickaxe_effect.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_effect_3.png rename to resources/tinkertextures/tools/pickaxe/glowstone_pickaxe_effect.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_effect_5.png b/resources/tinkertextures/tools/pickaxe/ice_pickaxe_effect.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_effect_5.png rename to resources/tinkertextures/tools/pickaxe/ice_pickaxe_effect.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_2.png b/resources/tinkertextures/tools/pickaxe/iron_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_accessory_2.png rename to resources/tinkertextures/tools/pickaxe/iron_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_handle_2.png b/resources/tinkertextures/tools/pickaxe/iron_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_handle_2.png rename to resources/tinkertextures/tools/pickaxe/iron_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_2.png b/resources/tinkertextures/tools/pickaxe/iron_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_head_2.png rename to resources/tinkertextures/tools/pickaxe/iron_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_2.png b/resources/tinkertextures/tools/pickaxe/iron_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_2.png rename to resources/tinkertextures/tools/pickaxe/iron_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_effect_10.png b/resources/tinkertextures/tools/pickaxe/lapis_pickaxe_effect.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_effect_10.png rename to resources/tinkertextures/tools/pickaxe/lapis_pickaxe_effect.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_effect_6.png b/resources/tinkertextures/tools/pickaxe/lava_pickaxe_effect.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_effect_6.png rename to resources/tinkertextures/tools/pickaxe/lava_pickaxe_effect.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_12.png b/resources/tinkertextures/tools/pickaxe/manyullyn_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_accessory_12.png rename to resources/tinkertextures/tools/pickaxe/manyullyn_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_handle_12.png b/resources/tinkertextures/tools/pickaxe/manyullyn_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_handle_12.png rename to resources/tinkertextures/tools/pickaxe/manyullyn_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_12.png b/resources/tinkertextures/tools/pickaxe/manyullyn_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_head_12.png rename to resources/tinkertextures/tools/pickaxe/manyullyn_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_12.png b/resources/tinkertextures/tools/pickaxe/manyullyn_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_12.png rename to resources/tinkertextures/tools/pickaxe/manyullyn_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_effect_4.png b/resources/tinkertextures/tools/pickaxe/moss_pickaxe_effect.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_effect_4.png rename to resources/tinkertextures/tools/pickaxe/moss_pickaxe_effect.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_effect_8.png b/resources/tinkertextures/tools/pickaxe/necrotic_pickaxe_effect.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_effect_8.png rename to resources/tinkertextures/tools/pickaxe/necrotic_pickaxe_effect.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_7.png b/resources/tinkertextures/tools/pickaxe/netherrack_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_accessory_7.png rename to resources/tinkertextures/tools/pickaxe/netherrack_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_handle_7.png b/resources/tinkertextures/tools/pickaxe/netherrack_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_handle_7.png rename to resources/tinkertextures/tools/pickaxe/netherrack_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_7.png b/resources/tinkertextures/tools/pickaxe/netherrack_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_head_7.png rename to resources/tinkertextures/tools/pickaxe/netherrack_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_7.png b/resources/tinkertextures/tools/pickaxe/netherrack_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_7.png rename to resources/tinkertextures/tools/pickaxe/netherrack_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_6.png b/resources/tinkertextures/tools/pickaxe/obsidian_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_accessory_6.png rename to resources/tinkertextures/tools/pickaxe/obsidian_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_handle_6.png b/resources/tinkertextures/tools/pickaxe/obsidian_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_handle_6.png rename to resources/tinkertextures/tools/pickaxe/obsidian_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_6.png b/resources/tinkertextures/tools/pickaxe/obsidian_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_head_6.png rename to resources/tinkertextures/tools/pickaxe/obsidian_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_6.png b/resources/tinkertextures/tools/pickaxe/obsidian_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_6.png rename to resources/tinkertextures/tools/pickaxe/obsidian_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_9.png b/resources/tinkertextures/tools/pickaxe/paper_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_accessory_9.png rename to resources/tinkertextures/tools/pickaxe/paper_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_handle_9.png b/resources/tinkertextures/tools/pickaxe/paper_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_handle_9.png rename to resources/tinkertextures/tools/pickaxe/paper_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_9.png b/resources/tinkertextures/tools/pickaxe/paper_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_head_9.png rename to resources/tinkertextures/tools/pickaxe/paper_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_9.png b/resources/tinkertextures/tools/pickaxe/paper_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_9.png rename to resources/tinkertextures/tools/pickaxe/paper_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_effect_2.png b/resources/tinkertextures/tools/pickaxe/redstone_pickaxe_effect.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_effect_2.png rename to resources/tinkertextures/tools/pickaxe/redstone_pickaxe_effect.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_8.png b/resources/tinkertextures/tools/pickaxe/slime_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_accessory_8.png rename to resources/tinkertextures/tools/pickaxe/slime_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_handle_8.png b/resources/tinkertextures/tools/pickaxe/slime_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_handle_8.png rename to resources/tinkertextures/tools/pickaxe/slime_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_8.png b/resources/tinkertextures/tools/pickaxe/slime_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_head_8.png rename to resources/tinkertextures/tools/pickaxe/slime_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_8.png b/resources/tinkertextures/tools/pickaxe/slime_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_8.png rename to resources/tinkertextures/tools/pickaxe/slime_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_1.png b/resources/tinkertextures/tools/pickaxe/stone_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_accessory_1.png rename to resources/tinkertextures/tools/pickaxe/stone_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_handle_1.png b/resources/tinkertextures/tools/pickaxe/stone_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_handle_1.png rename to resources/tinkertextures/tools/pickaxe/stone_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_1.png b/resources/tinkertextures/tools/pickaxe/stone_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_head_1.png rename to resources/tinkertextures/tools/pickaxe/stone_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_1.png b/resources/tinkertextures/tools/pickaxe/stone_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_1.png rename to resources/tinkertextures/tools/pickaxe/stone_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_0.png b/resources/tinkertextures/tools/pickaxe/wood_pickaxe_accessory.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_accessory_0.png rename to resources/tinkertextures/tools/pickaxe/wood_pickaxe_accessory.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_handle_0.png b/resources/tinkertextures/tools/pickaxe/wood_pickaxe_handle.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_handle_0.png rename to resources/tinkertextures/tools/pickaxe/wood_pickaxe_handle.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_0.png b/resources/tinkertextures/tools/pickaxe/wood_pickaxe_head.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_head_0.png rename to resources/tinkertextures/tools/pickaxe/wood_pickaxe_head.png diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_0.png b/resources/tinkertextures/tools/pickaxe/wood_pickaxe_head_broken.png similarity index 100% rename from resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_0.png rename to resources/tinkertextures/tools/pickaxe/wood_pickaxe_head_broken.png diff --git a/resources/tinkertextures/tools/pickaxe/wood_pickaxe_head_effect.png b/resources/tinkertextures/tools/pickaxe/wood_pickaxe_head_effect.png new file mode 100644 index 00000000..98b56ff0 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxe/wood_pickaxe_head_effect.png differ diff --git a/resources/tinkertextures/tools/pickaxes.png b/resources/tinkertextures/tools/pickaxes.png deleted file mode 100644 index eefeb61b..00000000 Binary files a/resources/tinkertextures/tools/pickaxes.png and /dev/null differ diff --git a/resources/tinkertextures/tools/rapier/ardite_rapier_accessory.png b/resources/tinkertextures/tools/rapier/ardite_rapier_accessory.png new file mode 100644 index 00000000..6b2220b8 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/ardite_rapier_accessory.png differ diff --git a/resources/tinkertextures/tools/rapier/ardite_rapier_blade.png b/resources/tinkertextures/tools/rapier/ardite_rapier_blade.png new file mode 100644 index 00000000..352f263b Binary files /dev/null and b/resources/tinkertextures/tools/rapier/ardite_rapier_blade.png differ diff --git a/resources/tinkertextures/tools/rapier/ardite_rapier_blade_broken.png b/resources/tinkertextures/tools/rapier/ardite_rapier_blade_broken.png new file mode 100644 index 00000000..5bca5d5d Binary files /dev/null and b/resources/tinkertextures/tools/rapier/ardite_rapier_blade_broken.png differ diff --git a/resources/tinkertextures/tools/rapier/ardite_rapier_handle.png b/resources/tinkertextures/tools/rapier/ardite_rapier_handle.png new file mode 100644 index 00000000..11f8f149 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/ardite_rapier_handle.png differ diff --git a/resources/tinkertextures/tools/rapier/blaze_rapier_effect.png b/resources/tinkertextures/tools/rapier/blaze_rapier_effect.png new file mode 100644 index 00000000..ca810737 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/blaze_rapier_effect.png differ diff --git a/resources/tinkertextures/tools/rapier/bone_rapier_accessory.png b/resources/tinkertextures/tools/rapier/bone_rapier_accessory.png new file mode 100644 index 00000000..1def887c Binary files /dev/null and b/resources/tinkertextures/tools/rapier/bone_rapier_accessory.png differ diff --git a/resources/tinkertextures/tools/rapier/bone_rapier_blade.png b/resources/tinkertextures/tools/rapier/bone_rapier_blade.png new file mode 100644 index 00000000..07327935 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/bone_rapier_blade.png differ diff --git a/resources/tinkertextures/tools/rapier/bone_rapier_blade_broken.png b/resources/tinkertextures/tools/rapier/bone_rapier_blade_broken.png new file mode 100644 index 00000000..97773445 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/bone_rapier_blade_broken.png differ diff --git a/resources/tinkertextures/tools/rapier/bone_rapier_handle.png b/resources/tinkertextures/tools/rapier/bone_rapier_handle.png new file mode 100644 index 00000000..48ee00f2 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/bone_rapier_handle.png differ diff --git a/resources/tinkertextures/tools/rapier/bronze_rapier_accessory.png b/resources/tinkertextures/tools/rapier/bronze_rapier_accessory.png new file mode 100644 index 00000000..f9bf9491 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/bronze_rapier_accessory.png differ diff --git a/resources/tinkertextures/tools/rapier/bronze_rapier_blade.png b/resources/tinkertextures/tools/rapier/bronze_rapier_blade.png new file mode 100644 index 00000000..8562e6bd Binary files /dev/null and b/resources/tinkertextures/tools/rapier/bronze_rapier_blade.png differ diff --git a/resources/tinkertextures/tools/rapier/bronze_rapier_blade_broken.png b/resources/tinkertextures/tools/rapier/bronze_rapier_blade_broken.png new file mode 100644 index 00000000..36a2d91a Binary files /dev/null and b/resources/tinkertextures/tools/rapier/bronze_rapier_blade_broken.png differ diff --git a/resources/tinkertextures/tools/rapier/bronze_rapier_handle.png b/resources/tinkertextures/tools/rapier/bronze_rapier_handle.png new file mode 100644 index 00000000..9f3ff503 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/bronze_rapier_handle.png differ diff --git a/resources/tinkertextures/tools/rapier/cactus_rapier_accessory.png b/resources/tinkertextures/tools/rapier/cactus_rapier_accessory.png new file mode 100644 index 00000000..999e4d47 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/cactus_rapier_accessory.png differ diff --git a/resources/tinkertextures/tools/rapier/cactus_rapier_blade.png b/resources/tinkertextures/tools/rapier/cactus_rapier_blade.png new file mode 100644 index 00000000..5f47d168 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/cactus_rapier_blade.png differ diff --git a/resources/tinkertextures/tools/rapier/cactus_rapier_blade_broken.png b/resources/tinkertextures/tools/rapier/cactus_rapier_blade_broken.png new file mode 100644 index 00000000..2a31cba0 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/cactus_rapier_blade_broken.png differ diff --git a/resources/tinkertextures/tools/rapier/cactus_rapier_handle.png b/resources/tinkertextures/tools/rapier/cactus_rapier_handle.png new file mode 100644 index 00000000..64ed5273 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/cactus_rapier_handle.png differ diff --git a/resources/tinkertextures/tools/rapier/cobalt_rapier_accessory.png b/resources/tinkertextures/tools/rapier/cobalt_rapier_accessory.png new file mode 100644 index 00000000..9bd0f7ef Binary files /dev/null and b/resources/tinkertextures/tools/rapier/cobalt_rapier_accessory.png differ diff --git a/resources/tinkertextures/tools/rapier/cobalt_rapier_blade.png b/resources/tinkertextures/tools/rapier/cobalt_rapier_blade.png new file mode 100644 index 00000000..d3167d91 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/cobalt_rapier_blade.png differ diff --git a/resources/tinkertextures/tools/rapier/cobalt_rapier_blade_broken.png b/resources/tinkertextures/tools/rapier/cobalt_rapier_blade_broken.png new file mode 100644 index 00000000..27d37a99 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/cobalt_rapier_blade_broken.png differ diff --git a/resources/tinkertextures/tools/rapier/cobalt_rapier_handle.png b/resources/tinkertextures/tools/rapier/cobalt_rapier_handle.png new file mode 100644 index 00000000..22a17751 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/cobalt_rapier_handle.png differ diff --git a/resources/tinkertextures/tools/rapier/copper_rapier_accessory.png b/resources/tinkertextures/tools/rapier/copper_rapier_accessory.png new file mode 100644 index 00000000..f2bfd21e Binary files /dev/null and b/resources/tinkertextures/tools/rapier/copper_rapier_accessory.png differ diff --git a/resources/tinkertextures/tools/rapier/copper_rapier_blade.png b/resources/tinkertextures/tools/rapier/copper_rapier_blade.png new file mode 100644 index 00000000..72bc3994 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/copper_rapier_blade.png differ diff --git a/resources/tinkertextures/tools/rapier/copper_rapier_blade_broken.png b/resources/tinkertextures/tools/rapier/copper_rapier_blade_broken.png new file mode 100644 index 00000000..87170304 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/copper_rapier_blade_broken.png differ diff --git a/resources/tinkertextures/tools/rapier/copper_rapier_handle.png b/resources/tinkertextures/tools/rapier/copper_rapier_handle.png new file mode 100644 index 00000000..d4f017e7 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/copper_rapier_handle.png differ diff --git a/resources/tinkertextures/tools/rapier/diamond_rapier_effect.png b/resources/tinkertextures/tools/rapier/diamond_rapier_effect.png new file mode 100644 index 00000000..525e944f Binary files /dev/null and b/resources/tinkertextures/tools/rapier/diamond_rapier_effect.png differ diff --git a/resources/tinkertextures/tools/rapier/electric_rapier_effect.png b/resources/tinkertextures/tools/rapier/electric_rapier_effect.png new file mode 100644 index 00000000..45448b79 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/electric_rapier_effect.png differ diff --git a/resources/tinkertextures/tools/rapier/emerald_rapier_effect.png b/resources/tinkertextures/tools/rapier/emerald_rapier_effect.png new file mode 100644 index 00000000..2463a08e Binary files /dev/null and b/resources/tinkertextures/tools/rapier/emerald_rapier_effect.png differ diff --git a/resources/tinkertextures/tools/rapier/flint_rapier_accessory.png b/resources/tinkertextures/tools/rapier/flint_rapier_accessory.png new file mode 100644 index 00000000..1bead7a2 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/flint_rapier_accessory.png differ diff --git a/resources/tinkertextures/tools/rapier/flint_rapier_blade.png b/resources/tinkertextures/tools/rapier/flint_rapier_blade.png new file mode 100644 index 00000000..44a4fd77 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/flint_rapier_blade.png differ diff --git a/resources/tinkertextures/tools/rapier/flint_rapier_blade_broken.png b/resources/tinkertextures/tools/rapier/flint_rapier_blade_broken.png new file mode 100644 index 00000000..f57f2e93 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/flint_rapier_blade_broken.png differ diff --git a/resources/tinkertextures/tools/rapier/flint_rapier_handle.png b/resources/tinkertextures/tools/rapier/flint_rapier_handle.png new file mode 100644 index 00000000..5fac720d Binary files /dev/null and b/resources/tinkertextures/tools/rapier/flint_rapier_handle.png differ diff --git a/resources/tinkertextures/tools/rapier/glowstone_rapier_effect.png b/resources/tinkertextures/tools/rapier/glowstone_rapier_effect.png new file mode 100644 index 00000000..35e88b04 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/glowstone_rapier_effect.png differ diff --git a/resources/tinkertextures/tools/rapier/ice_rapier_effect.png b/resources/tinkertextures/tools/rapier/ice_rapier_effect.png new file mode 100644 index 00000000..129b5b80 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/ice_rapier_effect.png differ diff --git a/resources/tinkertextures/tools/rapier/iron_rapier_accessory.png b/resources/tinkertextures/tools/rapier/iron_rapier_accessory.png new file mode 100644 index 00000000..60c6d0b6 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/iron_rapier_accessory.png differ diff --git a/resources/tinkertextures/tools/rapier/iron_rapier_blade.png b/resources/tinkertextures/tools/rapier/iron_rapier_blade.png new file mode 100644 index 00000000..175c7d3b Binary files /dev/null and b/resources/tinkertextures/tools/rapier/iron_rapier_blade.png differ diff --git a/resources/tinkertextures/tools/rapier/iron_rapier_blade_broken.png b/resources/tinkertextures/tools/rapier/iron_rapier_blade_broken.png new file mode 100644 index 00000000..bd0a3b24 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/iron_rapier_blade_broken.png differ diff --git a/resources/tinkertextures/tools/rapier/iron_rapier_handle.png b/resources/tinkertextures/tools/rapier/iron_rapier_handle.png new file mode 100644 index 00000000..36c05ff1 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/iron_rapier_handle.png differ diff --git a/resources/tinkertextures/tools/rapier/lapis_rapier_effect.png b/resources/tinkertextures/tools/rapier/lapis_rapier_effect.png new file mode 100644 index 00000000..07fffcc6 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/lapis_rapier_effect.png differ diff --git a/resources/tinkertextures/tools/rapier/lava_rapier_effect.png b/resources/tinkertextures/tools/rapier/lava_rapier_effect.png new file mode 100644 index 00000000..50493321 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/lava_rapier_effect.png differ diff --git a/resources/tinkertextures/tools/rapier/manyullyn_rapier_accessory.png b/resources/tinkertextures/tools/rapier/manyullyn_rapier_accessory.png new file mode 100644 index 00000000..ebfa83de Binary files /dev/null and b/resources/tinkertextures/tools/rapier/manyullyn_rapier_accessory.png differ diff --git a/resources/tinkertextures/tools/rapier/manyullyn_rapier_blade.png b/resources/tinkertextures/tools/rapier/manyullyn_rapier_blade.png new file mode 100644 index 00000000..834831be Binary files /dev/null and b/resources/tinkertextures/tools/rapier/manyullyn_rapier_blade.png differ diff --git a/resources/tinkertextures/tools/rapier/manyullyn_rapier_blade_broken.png b/resources/tinkertextures/tools/rapier/manyullyn_rapier_blade_broken.png new file mode 100644 index 00000000..c98d7e6b Binary files /dev/null and b/resources/tinkertextures/tools/rapier/manyullyn_rapier_blade_broken.png differ diff --git a/resources/tinkertextures/tools/rapier/manyullyn_rapier_handle.png b/resources/tinkertextures/tools/rapier/manyullyn_rapier_handle.png new file mode 100644 index 00000000..763f72b8 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/manyullyn_rapier_handle.png differ diff --git a/resources/tinkertextures/tools/rapier/moss_rapier_effect.png b/resources/tinkertextures/tools/rapier/moss_rapier_effect.png new file mode 100644 index 00000000..9c8ddae6 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/moss_rapier_effect.png differ diff --git a/resources/tinkertextures/tools/rapier/necrotic_rapier_effect.png b/resources/tinkertextures/tools/rapier/necrotic_rapier_effect.png new file mode 100644 index 00000000..7806af0e Binary files /dev/null and b/resources/tinkertextures/tools/rapier/necrotic_rapier_effect.png differ diff --git a/resources/tinkertextures/tools/rapier/netherrack_rapier_accessory.png b/resources/tinkertextures/tools/rapier/netherrack_rapier_accessory.png new file mode 100644 index 00000000..0d0432e8 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/netherrack_rapier_accessory.png differ diff --git a/resources/tinkertextures/tools/rapier/netherrack_rapier_blade.png b/resources/tinkertextures/tools/rapier/netherrack_rapier_blade.png new file mode 100644 index 00000000..6fe1aedf Binary files /dev/null and b/resources/tinkertextures/tools/rapier/netherrack_rapier_blade.png differ diff --git a/resources/tinkertextures/tools/rapier/netherrack_rapier_blade_broken.png b/resources/tinkertextures/tools/rapier/netherrack_rapier_blade_broken.png new file mode 100644 index 00000000..f038c5b1 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/netherrack_rapier_blade_broken.png differ diff --git a/resources/tinkertextures/tools/rapier/netherrack_rapier_handle.png b/resources/tinkertextures/tools/rapier/netherrack_rapier_handle.png new file mode 100644 index 00000000..ea484451 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/netherrack_rapier_handle.png differ diff --git a/resources/tinkertextures/tools/rapier/obsidian_rapier_accessory.png b/resources/tinkertextures/tools/rapier/obsidian_rapier_accessory.png new file mode 100644 index 00000000..2bff9872 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/obsidian_rapier_accessory.png differ diff --git a/resources/tinkertextures/tools/rapier/obsidian_rapier_blade.png b/resources/tinkertextures/tools/rapier/obsidian_rapier_blade.png new file mode 100644 index 00000000..feb95776 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/obsidian_rapier_blade.png differ diff --git a/resources/tinkertextures/tools/rapier/obsidian_rapier_blade_broken.png b/resources/tinkertextures/tools/rapier/obsidian_rapier_blade_broken.png new file mode 100644 index 00000000..458ae462 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/obsidian_rapier_blade_broken.png differ diff --git a/resources/tinkertextures/tools/rapier/obsidian_rapier_handle.png b/resources/tinkertextures/tools/rapier/obsidian_rapier_handle.png new file mode 100644 index 00000000..840e2812 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/obsidian_rapier_handle.png differ diff --git a/resources/tinkertextures/tools/rapier/paper_rapier_accessory.png b/resources/tinkertextures/tools/rapier/paper_rapier_accessory.png new file mode 100644 index 00000000..b103e643 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/paper_rapier_accessory.png differ diff --git a/resources/tinkertextures/tools/rapier/paper_rapier_blade.png b/resources/tinkertextures/tools/rapier/paper_rapier_blade.png new file mode 100644 index 00000000..40dd001b Binary files /dev/null and b/resources/tinkertextures/tools/rapier/paper_rapier_blade.png differ diff --git a/resources/tinkertextures/tools/rapier/paper_rapier_blade_broken.png b/resources/tinkertextures/tools/rapier/paper_rapier_blade_broken.png new file mode 100644 index 00000000..7c4fbf45 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/paper_rapier_blade_broken.png differ diff --git a/resources/tinkertextures/tools/rapier/paper_rapier_handle.png b/resources/tinkertextures/tools/rapier/paper_rapier_handle.png new file mode 100644 index 00000000..0847dfaa Binary files /dev/null and b/resources/tinkertextures/tools/rapier/paper_rapier_handle.png differ diff --git a/resources/tinkertextures/tools/rapier/redstone_rapier_effect.png b/resources/tinkertextures/tools/rapier/redstone_rapier_effect.png new file mode 100644 index 00000000..f5887920 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/redstone_rapier_effect.png differ diff --git a/resources/tinkertextures/tools/rapier/slime_rapier_accessory.png b/resources/tinkertextures/tools/rapier/slime_rapier_accessory.png new file mode 100644 index 00000000..4d3be673 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/slime_rapier_accessory.png differ diff --git a/resources/tinkertextures/tools/rapier/slime_rapier_blade.png b/resources/tinkertextures/tools/rapier/slime_rapier_blade.png new file mode 100644 index 00000000..9216b051 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/slime_rapier_blade.png differ diff --git a/resources/tinkertextures/tools/rapier/slime_rapier_blade_broken.png b/resources/tinkertextures/tools/rapier/slime_rapier_blade_broken.png new file mode 100644 index 00000000..5e531292 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/slime_rapier_blade_broken.png differ diff --git a/resources/tinkertextures/tools/rapier/slime_rapier_handle.png b/resources/tinkertextures/tools/rapier/slime_rapier_handle.png new file mode 100644 index 00000000..cbaaf82f Binary files /dev/null and b/resources/tinkertextures/tools/rapier/slime_rapier_handle.png differ diff --git a/resources/tinkertextures/tools/rapier/stone_rapier_accessory.png b/resources/tinkertextures/tools/rapier/stone_rapier_accessory.png new file mode 100644 index 00000000..8a9959cc Binary files /dev/null and b/resources/tinkertextures/tools/rapier/stone_rapier_accessory.png differ diff --git a/resources/tinkertextures/tools/rapier/stone_rapier_blade.png b/resources/tinkertextures/tools/rapier/stone_rapier_blade.png new file mode 100644 index 00000000..e02c6ca0 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/stone_rapier_blade.png differ diff --git a/resources/tinkertextures/tools/rapier/stone_rapier_blade_broken.png b/resources/tinkertextures/tools/rapier/stone_rapier_blade_broken.png new file mode 100644 index 00000000..eeeb5778 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/stone_rapier_blade_broken.png differ diff --git a/resources/tinkertextures/tools/rapier/stone_rapier_handle.png b/resources/tinkertextures/tools/rapier/stone_rapier_handle.png new file mode 100644 index 00000000..ca790d42 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/stone_rapier_handle.png differ diff --git a/resources/tinkertextures/tools/rapier/wood_rapier_accessory.png b/resources/tinkertextures/tools/rapier/wood_rapier_accessory.png new file mode 100644 index 00000000..9ff75923 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/wood_rapier_accessory.png differ diff --git a/resources/tinkertextures/tools/rapier/wood_rapier_blade.png b/resources/tinkertextures/tools/rapier/wood_rapier_blade.png new file mode 100644 index 00000000..767b35ce Binary files /dev/null and b/resources/tinkertextures/tools/rapier/wood_rapier_blade.png differ diff --git a/resources/tinkertextures/tools/rapier/wood_rapier_blade_broken.png b/resources/tinkertextures/tools/rapier/wood_rapier_blade_broken.png new file mode 100644 index 00000000..92b6b3f8 Binary files /dev/null and b/resources/tinkertextures/tools/rapier/wood_rapier_blade_broken.png differ diff --git a/resources/tinkertextures/tools/rapier/wood_rapier_handle.png b/resources/tinkertextures/tools/rapier/wood_rapier_handle.png new file mode 100644 index 00000000..5bb337be Binary files /dev/null and b/resources/tinkertextures/tools/rapier/wood_rapier_handle.png differ diff --git a/resources/tinkertextures/tools/shovel/_shovel_effect.png b/resources/tinkertextures/tools/shovel/_shovel_effect.png new file mode 100644 index 00000000..86bc078b Binary files /dev/null and b/resources/tinkertextures/tools/shovel/_shovel_effect.png differ diff --git a/resources/tinkertextures/tools/shovel/ardite_shovel_handle.png b/resources/tinkertextures/tools/shovel/ardite_shovel_handle.png new file mode 100644 index 00000000..5ff7af7e Binary files /dev/null and b/resources/tinkertextures/tools/shovel/ardite_shovel_handle.png differ diff --git a/resources/tinkertextures/tools/shovel/ardite_shovel_head.png b/resources/tinkertextures/tools/shovel/ardite_shovel_head.png new file mode 100644 index 00000000..2c51a939 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/ardite_shovel_head.png differ diff --git a/resources/tinkertextures/tools/shovel/ardite_shovel_head_broken.png b/resources/tinkertextures/tools/shovel/ardite_shovel_head_broken.png new file mode 100644 index 00000000..45dfef0e Binary files /dev/null and b/resources/tinkertextures/tools/shovel/ardite_shovel_head_broken.png differ diff --git a/resources/tinkertextures/tools/shovel/blaze_shovel_effect.png b/resources/tinkertextures/tools/shovel/blaze_shovel_effect.png new file mode 100644 index 00000000..1d2fa54e Binary files /dev/null and b/resources/tinkertextures/tools/shovel/blaze_shovel_effect.png differ diff --git a/resources/tinkertextures/tools/shovel/bone_shovel_handle.png b/resources/tinkertextures/tools/shovel/bone_shovel_handle.png new file mode 100644 index 00000000..8f83d4d3 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/bone_shovel_handle.png differ diff --git a/resources/tinkertextures/tools/shovel/bone_shovel_head.png b/resources/tinkertextures/tools/shovel/bone_shovel_head.png new file mode 100644 index 00000000..5404e7d8 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/bone_shovel_head.png differ diff --git a/resources/tinkertextures/tools/shovel/bone_shovel_head_broken.png b/resources/tinkertextures/tools/shovel/bone_shovel_head_broken.png new file mode 100644 index 00000000..8e94cdbc Binary files /dev/null and b/resources/tinkertextures/tools/shovel/bone_shovel_head_broken.png differ diff --git a/resources/tinkertextures/tools/shovel/bronze_shovel_handle.png b/resources/tinkertextures/tools/shovel/bronze_shovel_handle.png new file mode 100644 index 00000000..f4714835 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/bronze_shovel_handle.png differ diff --git a/resources/tinkertextures/tools/shovel/bronze_shovel_head.png b/resources/tinkertextures/tools/shovel/bronze_shovel_head.png new file mode 100644 index 00000000..7bfee5f8 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/bronze_shovel_head.png differ diff --git a/resources/tinkertextures/tools/shovel/bronze_shovel_head_broken.png b/resources/tinkertextures/tools/shovel/bronze_shovel_head_broken.png new file mode 100644 index 00000000..59382abe Binary files /dev/null and b/resources/tinkertextures/tools/shovel/bronze_shovel_head_broken.png differ diff --git a/resources/tinkertextures/tools/shovel/cactus_shovel_handle.png b/resources/tinkertextures/tools/shovel/cactus_shovel_handle.png new file mode 100644 index 00000000..d8bc064e Binary files /dev/null and b/resources/tinkertextures/tools/shovel/cactus_shovel_handle.png differ diff --git a/resources/tinkertextures/tools/shovel/cactus_shovel_head.png b/resources/tinkertextures/tools/shovel/cactus_shovel_head.png new file mode 100644 index 00000000..099b7713 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/cactus_shovel_head.png differ diff --git a/resources/tinkertextures/tools/shovel/cactus_shovel_head_broken.png b/resources/tinkertextures/tools/shovel/cactus_shovel_head_broken.png new file mode 100644 index 00000000..7dce6a54 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/cactus_shovel_head_broken.png differ diff --git a/resources/tinkertextures/tools/shovel/cobalt_shovel_handle.png b/resources/tinkertextures/tools/shovel/cobalt_shovel_handle.png new file mode 100644 index 00000000..8f7ff037 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/cobalt_shovel_handle.png differ diff --git a/resources/tinkertextures/tools/shovel/cobalt_shovel_head.png b/resources/tinkertextures/tools/shovel/cobalt_shovel_head.png new file mode 100644 index 00000000..46812422 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/cobalt_shovel_head.png differ diff --git a/resources/tinkertextures/tools/shovel/cobalt_shovel_head_broken.png b/resources/tinkertextures/tools/shovel/cobalt_shovel_head_broken.png new file mode 100644 index 00000000..947dec0f Binary files /dev/null and b/resources/tinkertextures/tools/shovel/cobalt_shovel_head_broken.png differ diff --git a/resources/tinkertextures/tools/shovel/copper_shovel_handle.png b/resources/tinkertextures/tools/shovel/copper_shovel_handle.png new file mode 100644 index 00000000..2b58311d Binary files /dev/null and b/resources/tinkertextures/tools/shovel/copper_shovel_handle.png differ diff --git a/resources/tinkertextures/tools/shovel/copper_shovel_head.png b/resources/tinkertextures/tools/shovel/copper_shovel_head.png new file mode 100644 index 00000000..89794862 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/copper_shovel_head.png differ diff --git a/resources/tinkertextures/tools/shovel/copper_shovel_head_broken.png b/resources/tinkertextures/tools/shovel/copper_shovel_head_broken.png new file mode 100644 index 00000000..c2111527 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/copper_shovel_head_broken.png differ diff --git a/resources/tinkertextures/tools/shovel/electric_shovel_effect.png b/resources/tinkertextures/tools/shovel/electric_shovel_effect.png new file mode 100644 index 00000000..772f952c Binary files /dev/null and b/resources/tinkertextures/tools/shovel/electric_shovel_effect.png differ diff --git a/resources/tinkertextures/tools/shovel/emerald_shovel_effect.png b/resources/tinkertextures/tools/shovel/emerald_shovel_effect.png new file mode 100644 index 00000000..b9f6e307 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/emerald_shovel_effect.png differ diff --git a/resources/tinkertextures/tools/shovel/flint_shovel_handle.png b/resources/tinkertextures/tools/shovel/flint_shovel_handle.png new file mode 100644 index 00000000..58d7bf55 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/flint_shovel_handle.png differ diff --git a/resources/tinkertextures/tools/shovel/flint_shovel_head.png b/resources/tinkertextures/tools/shovel/flint_shovel_head.png new file mode 100644 index 00000000..09dc9f64 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/flint_shovel_head.png differ diff --git a/resources/tinkertextures/tools/shovel/flint_shovel_head_broken.png b/resources/tinkertextures/tools/shovel/flint_shovel_head_broken.png new file mode 100644 index 00000000..91169243 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/flint_shovel_head_broken.png differ diff --git a/resources/tinkertextures/tools/shovel/glowstone_shovel_effect.png b/resources/tinkertextures/tools/shovel/glowstone_shovel_effect.png new file mode 100644 index 00000000..48dbf33a Binary files /dev/null and b/resources/tinkertextures/tools/shovel/glowstone_shovel_effect.png differ diff --git a/resources/tinkertextures/tools/shovel/ice_shovel_effect.png b/resources/tinkertextures/tools/shovel/ice_shovel_effect.png new file mode 100644 index 00000000..a31e57ac Binary files /dev/null and b/resources/tinkertextures/tools/shovel/ice_shovel_effect.png differ diff --git a/resources/tinkertextures/tools/shovel/iron_shovel_handle.png b/resources/tinkertextures/tools/shovel/iron_shovel_handle.png new file mode 100644 index 00000000..1e3dd230 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/iron_shovel_handle.png differ diff --git a/resources/tinkertextures/tools/shovel/iron_shovel_head.png b/resources/tinkertextures/tools/shovel/iron_shovel_head.png new file mode 100644 index 00000000..90a307c5 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/iron_shovel_head.png differ diff --git a/resources/tinkertextures/tools/shovel/iron_shovel_head_broken.png b/resources/tinkertextures/tools/shovel/iron_shovel_head_broken.png new file mode 100644 index 00000000..2629b12d Binary files /dev/null and b/resources/tinkertextures/tools/shovel/iron_shovel_head_broken.png differ diff --git a/resources/tinkertextures/tools/shovel/lapis_shovel_effect.png b/resources/tinkertextures/tools/shovel/lapis_shovel_effect.png new file mode 100644 index 00000000..f6054c09 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/lapis_shovel_effect.png differ diff --git a/resources/tinkertextures/tools/shovel/lava_shovel_effect.png b/resources/tinkertextures/tools/shovel/lava_shovel_effect.png new file mode 100644 index 00000000..a93aa515 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/lava_shovel_effect.png differ diff --git a/resources/tinkertextures/tools/shovel/manyullyn_shovel_handle.png b/resources/tinkertextures/tools/shovel/manyullyn_shovel_handle.png new file mode 100644 index 00000000..08f0c025 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/manyullyn_shovel_handle.png differ diff --git a/resources/tinkertextures/tools/shovel/manyullyn_shovel_head.png b/resources/tinkertextures/tools/shovel/manyullyn_shovel_head.png new file mode 100644 index 00000000..b7b8f735 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/manyullyn_shovel_head.png differ diff --git a/resources/tinkertextures/tools/shovel/manyullyn_shovel_head_broken.png b/resources/tinkertextures/tools/shovel/manyullyn_shovel_head_broken.png new file mode 100644 index 00000000..e4f1e06e Binary files /dev/null and b/resources/tinkertextures/tools/shovel/manyullyn_shovel_head_broken.png differ diff --git a/resources/tinkertextures/tools/shovel/moss_shovel_effect.png b/resources/tinkertextures/tools/shovel/moss_shovel_effect.png new file mode 100644 index 00000000..9e99949d Binary files /dev/null and b/resources/tinkertextures/tools/shovel/moss_shovel_effect.png differ diff --git a/resources/tinkertextures/tools/shovel/necrotic_shovel_effect.png b/resources/tinkertextures/tools/shovel/necrotic_shovel_effect.png new file mode 100644 index 00000000..a851b384 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/necrotic_shovel_effect.png differ diff --git a/resources/tinkertextures/tools/shovel/netherrack_shovel_handle.png b/resources/tinkertextures/tools/shovel/netherrack_shovel_handle.png new file mode 100644 index 00000000..e644023d Binary files /dev/null and b/resources/tinkertextures/tools/shovel/netherrack_shovel_handle.png differ diff --git a/resources/tinkertextures/tools/shovel/netherrack_shovel_head.png b/resources/tinkertextures/tools/shovel/netherrack_shovel_head.png new file mode 100644 index 00000000..b97cf903 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/netherrack_shovel_head.png differ diff --git a/resources/tinkertextures/tools/shovel/netherrack_shovel_head_broken.png b/resources/tinkertextures/tools/shovel/netherrack_shovel_head_broken.png new file mode 100644 index 00000000..e1cdcc00 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/netherrack_shovel_head_broken.png differ diff --git a/resources/tinkertextures/tools/shovel/obsidian_shovel_handle.png b/resources/tinkertextures/tools/shovel/obsidian_shovel_handle.png new file mode 100644 index 00000000..c68c0f01 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/obsidian_shovel_handle.png differ diff --git a/resources/tinkertextures/tools/shovel/obsidian_shovel_head.png b/resources/tinkertextures/tools/shovel/obsidian_shovel_head.png new file mode 100644 index 00000000..252f2284 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/obsidian_shovel_head.png differ diff --git a/resources/tinkertextures/tools/shovel/obsidian_shovel_head_broken.png b/resources/tinkertextures/tools/shovel/obsidian_shovel_head_broken.png new file mode 100644 index 00000000..43ee7dc9 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/obsidian_shovel_head_broken.png differ diff --git a/resources/tinkertextures/tools/shovel/paper_shovel_handle.png b/resources/tinkertextures/tools/shovel/paper_shovel_handle.png new file mode 100644 index 00000000..96a47ecd Binary files /dev/null and b/resources/tinkertextures/tools/shovel/paper_shovel_handle.png differ diff --git a/resources/tinkertextures/tools/shovel/paper_shovel_head.png b/resources/tinkertextures/tools/shovel/paper_shovel_head.png new file mode 100644 index 00000000..e78bf346 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/paper_shovel_head.png differ diff --git a/resources/tinkertextures/tools/shovel/paper_shovel_head_broken.png b/resources/tinkertextures/tools/shovel/paper_shovel_head_broken.png new file mode 100644 index 00000000..9d74f60e Binary files /dev/null and b/resources/tinkertextures/tools/shovel/paper_shovel_head_broken.png differ diff --git a/resources/tinkertextures/tools/shovel/redstone_shovel_effect.png b/resources/tinkertextures/tools/shovel/redstone_shovel_effect.png new file mode 100644 index 00000000..e0ef523d Binary files /dev/null and b/resources/tinkertextures/tools/shovel/redstone_shovel_effect.png differ diff --git a/resources/tinkertextures/tools/shovel/slime_shovel_handle.png b/resources/tinkertextures/tools/shovel/slime_shovel_handle.png new file mode 100644 index 00000000..adef8f6e Binary files /dev/null and b/resources/tinkertextures/tools/shovel/slime_shovel_handle.png differ diff --git a/resources/tinkertextures/tools/shovel/slime_shovel_head.png b/resources/tinkertextures/tools/shovel/slime_shovel_head.png new file mode 100644 index 00000000..ad59b023 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/slime_shovel_head.png differ diff --git a/resources/tinkertextures/tools/shovel/slime_shovel_head_broken.png b/resources/tinkertextures/tools/shovel/slime_shovel_head_broken.png new file mode 100644 index 00000000..60e36bda Binary files /dev/null and b/resources/tinkertextures/tools/shovel/slime_shovel_head_broken.png differ diff --git a/resources/tinkertextures/tools/shovel/stone_shovel_handle.png b/resources/tinkertextures/tools/shovel/stone_shovel_handle.png new file mode 100644 index 00000000..baf99e30 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/stone_shovel_handle.png differ diff --git a/resources/tinkertextures/tools/shovel/stone_shovel_head.png b/resources/tinkertextures/tools/shovel/stone_shovel_head.png new file mode 100644 index 00000000..8efdef8a Binary files /dev/null and b/resources/tinkertextures/tools/shovel/stone_shovel_head.png differ diff --git a/resources/tinkertextures/tools/shovel/stone_shovel_head_broken.png b/resources/tinkertextures/tools/shovel/stone_shovel_head_broken.png new file mode 100644 index 00000000..1518d780 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/stone_shovel_head_broken.png differ diff --git a/resources/tinkertextures/tools/shovel/wood_shovel_handle.png b/resources/tinkertextures/tools/shovel/wood_shovel_handle.png new file mode 100644 index 00000000..d9a1e9e0 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/wood_shovel_handle.png differ diff --git a/resources/tinkertextures/tools/shovel/wood_shovel_head.png b/resources/tinkertextures/tools/shovel/wood_shovel_head.png new file mode 100644 index 00000000..aef1c626 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/wood_shovel_head.png differ diff --git a/resources/tinkertextures/tools/shovel/wood_shovel_head_broken.png b/resources/tinkertextures/tools/shovel/wood_shovel_head_broken.png new file mode 100644 index 00000000..ad601157 Binary files /dev/null and b/resources/tinkertextures/tools/shovel/wood_shovel_head_broken.png differ diff --git a/resources/tinkertextures/tools/shovels.png b/resources/tinkertextures/tools/shovels.png deleted file mode 100644 index 25c82a4d..00000000 Binary files a/resources/tinkertextures/tools/shovels.png and /dev/null differ diff --git a/resources/tinkertextures/tools/swordbroad.png b/resources/tinkertextures/tools/swordbroad.png deleted file mode 100644 index 77a1bb04..00000000 Binary files a/resources/tinkertextures/tools/swordbroad.png and /dev/null differ diff --git a/resources/tinkertextures/tools/swordlong.png b/resources/tinkertextures/tools/swordlong.png deleted file mode 100644 index 173a4d38..00000000 Binary files a/resources/tinkertextures/tools/swordlong.png and /dev/null differ diff --git a/resources/tinkertextures/tools/swordrapier.png b/resources/tinkertextures/tools/swordrapier.png deleted file mode 100644 index 4ac7695d..00000000 Binary files a/resources/tinkertextures/tools/swordrapier.png and /dev/null differ diff --git a/tinker/common/IPattern.java b/tinker/common/IPattern.java index 100cf67c..2701b933 100644 --- a/tinker/common/IPattern.java +++ b/tinker/common/IPattern.java @@ -1,6 +1,10 @@ package tinker.common; +import net.minecraft.item.ItemStack; +import tinker.tconstruct.crafting.PatternBuilder.MaterialSet; + public interface IPattern { public int getPatternCost (int metadata); + public ItemStack getPatternOutput(ItemStack stack, MaterialSet set); } diff --git a/tinker/common/IToolPart.java b/tinker/common/IToolPart.java new file mode 100644 index 00000000..27225973 --- /dev/null +++ b/tinker/common/IToolPart.java @@ -0,0 +1,8 @@ +package tinker.common; + +import net.minecraft.item.ItemStack; + +public interface IToolPart +{ + public int getMaterialID(ItemStack stack); +} diff --git a/tinker/tconstruct/EnumMaterial.java b/tinker/tconstruct/EnumMaterial.java deleted file mode 100644 index 179cd94f..00000000 --- a/tinker/tconstruct/EnumMaterial.java +++ /dev/null @@ -1,155 +0,0 @@ -package tinker.tconstruct; -/** - * This class is temporary. A full material registry is planned - */ -public enum EnumMaterial -{ - Wood (0, 59, 200, 0, 1.0F, 0, 0), - Stone (1, 131, 400, 1, 0.5F, 0, 1f), - Iron (2, 250, 600, 2, 1.3F, 1, 0), - Flint (1, 171, 525, 2, 0.7F, 0, 1f), - Cactus (1, 150, 500, 2, 1.0F, 0, -1f), - Bone (1, 200, 500, 2, 1.0F, 0, 0), - Obsidian (3, 89, 700, 2, 0.8F, 3, 0), - Netherrack (2, 131, 400, 1, 1.2F, 0, 1f), - Slime (3, 1500, 150, 0, 5.0F, 0, 0), - Paper (0, 131, 200, 0, 0.1F, 0, 0), - Cobalt (4, 800, 800, 3, 1.8F, 2, 0), - Ardite (4, 800, 800, 3, 1.8F, 0, 0), - Manyullyn (5, 1200, 1000, 4, 2.5F, 0, 0), - Copper (1, 180, 500, 2, 1.15F, 0, 0), - Bronze (2, 250, 600, 2, 1.3F, 1, 0), - Demonite (5, 1790, 900, 5, 1.66F, 0, 0), - Holyshell (5, 1000, 700, 1, 1.5F, 0, 0); - - //mining level, durability, mining speed, baseDamage, handle modifier, Reinforced level, shoddy/spiny level - - private final int harvestLevel; - private final int durability; - private final int miningspeed; // <-- divided by 100 - private final int damageVsEntity; - private final float handleDurability; - private final int unbreaking; - private final float shoddy; - - private EnumMaterial(int level, int dur, int speed, int damage, float handle, int unb, float shd) - { - this.harvestLevel = level; - this.durability = dur; - this.miningspeed = speed; - this.damageVsEntity = damage; - this.handleDurability = handle; - this.unbreaking = unb; - this.shoddy = shd; - } - - /** - * The number of uses this material allows. (wood = 59, stone = 131, iron = 250, diamond = 1561, gold = 32) - */ - public int durability() - { - return this.durability; - } - - public static int durability(int type) - { - return getEnumByType(type).durability(); - } - - /** - * The strength of this tool material against blocks which it is effective against. - */ - public int toolSpeed() - { - return this.miningspeed; - } - - public static int toolSpeed(int type) - { - return getEnumByType(type).toolSpeed(); - } - - /** - * Damage versus entities. - */ - public int attack() - { - return this.damageVsEntity; - } - - public static int attack(int type) - { - return getEnumByType(type).attack(); - } - - /* - * Harvest level of the tool - */ - - public int harvestLevel() - { - return this.harvestLevel; - } - - public static int harvestLevel(int type) - { - return getEnumByType(type).harvestLevel(); - } - - /* - * Durability modifier of the handle - */ - - public float handleDurability() - { - return this.handleDurability; - } - - public static float handleDurability(int type) - { - return getEnumByType(type).handleDurability(); - } - - public int unbreaking() - { - return this.unbreaking; - } - - public static int unbreaking(int type) - { - return getEnumByType(type).unbreaking(); - } - - public float shoddy() - { - return this.shoddy; - } - - public static float shoddy(int type) - { - return getEnumByType(type).shoddy(); - } - - public static EnumMaterial getEnumByType(int type) - { - switch (type) - { - case 0: return Wood; - case 1: return Stone; - case 2: return Iron; - case 3: return Flint; - case 4: return Cactus; - case 5: return Bone; - case 6: return Obsidian; - case 7: return Netherrack; - case 8: return Slime; - case 9: return Paper; - case 10: return Cobalt; - case 11: return Ardite; - case 12: return Manyullyn; - case 13: return Copper; - case 14: return Bronze; - } - return null; - } -} diff --git a/tinker/tconstruct/TConstruct.java b/tinker/tconstruct/TConstruct.java index 60be763f..8abe3c9e 100644 --- a/tinker/tconstruct/TConstruct.java +++ b/tinker/tconstruct/TConstruct.java @@ -10,6 +10,7 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary.OreRegisterEvent; import tinker.tconstruct.client.gui.ToolGuiElement; import tinker.tconstruct.crafting.PatternBuilder; +import tinker.tconstruct.tools.ToolCore; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.Init; import cpw.mods.fml.common.Mod.Instance; @@ -38,8 +39,6 @@ public class TConstruct @SidedProxy(clientSide = "tinker.tconstruct.client.TProxyClient", serverSide = "tinker.tconstruct.TProxyCommon") public static TProxyCommon proxy; - public static ArrayList toolButtons = new ArrayList(20); - @PreInit public void preInit(FMLPreInitializationEvent evt) { @@ -51,27 +50,28 @@ public class TConstruct content = new TConstructContent(); NetworkRegistry.instance().registerGuiHandler(instance, new TConstructGuiHandler()); - addToolButtons(); } @Init public void load(FMLInitializationEvent evt) { - proxy.registerRenderer(); - proxy.addNames(); //GameRegistry.registerWorldGenerator(new TBaseWorldGenerator()); } @PostInit public void postInit(FMLPostInitializationEvent evt) { + proxy.addNames(); + proxy.registerRenderer(); + content.modIntegration(); + ArrayList copperIngots = OreDictionary.getOres("ingotCopper"); for (ItemStack copper : copperIngots) - PatternBuilder.instance.registerMaterial(copper, 2, "copper"); + PatternBuilder.instance.registerMaterial(copper, 2, "Copper"); ArrayList bronzeIngots = OreDictionary.getOres("ingotBronze"); for (ItemStack bronze : bronzeIngots) - PatternBuilder.instance.registerMaterial(bronze, 2, "bronze"); + PatternBuilder.instance.registerMaterial(bronze, 2, "Bronze"); } @ForgeSubscribe @@ -84,92 +84,13 @@ public class TConstruct content.modE.circuits.add(evt.Ore); if (evt.Name == "ingotCopper") - PatternBuilder.instance.registerMaterial(evt.Ore, 2, "copper"); + PatternBuilder.instance.registerMaterial(evt.Ore, 2, "Copper"); if (evt.Name == "ingotBronze") - PatternBuilder.instance.registerMaterial(evt.Ore, 2, "bronze"); - } + PatternBuilder.instance.registerMaterial(evt.Ore, 2, "Bronze"); + } - static int[][] slotTypes = { - new int[] {0, 3, 0}, //Repair - new int[] {1, 4, 0}, //Pickaxe - new int[] {2, 5, 0}, //Shovel - new int[] {2, 6, 0}, //Axe - //new int[] {2, 9, 0}, //Lumber Axe - //new int[] {1, 7, 0}, //Ice Axe - new int[] {3, 8, 0}, //Mattock - new int[] {1, 0, 1}, //Broadsword - new int[] {1, 1, 1}, //Longsword - new int[] {1, 2, 1}, //Rapier - new int[] {2, 3, 1}, //Frying pan - new int[] {2, 4, 1} //Battlesign - }; - - static int[][] iconCoords = { - new int[] { 0, 1, 2 }, new int[] { 13, 13, 13 }, //Repair - new int[] { 0, 0, 1 }, new int[] { 2, 3, 3 }, //Pickaxe - new int[] { 3, 0, 13 }, new int[] { 2, 3, 13 }, //Shovel - new int[] { 2, 0, 13 }, new int[] { 2, 3, 13 }, //Axe - //new int[] { 6, 0, 13 }, new int[] { 2, 3, 13 }, //Lumber Axe - //new int[] { 0, 0, 5 }, new int[] { 2, 3, 3 }, //Ice Axe - new int[] { 2, 0, 3 }, new int[] { 2, 3, 2 }, //Mattock - new int[] { 1, 0, 2 }, new int[] { 2, 3, 3 }, //Broadsword - new int[] { 1, 0, 3 }, new int[] { 2, 3, 3 }, //Longsword - new int[] { 1, 0, 4 }, new int[] { 2, 3, 3 }, //Rapier - new int[] { 4, 0, 13 }, new int[] { 2, 3, 13 }, //Frying Pan - new int[] { 5, 0, 13 }, new int[] { 2, 3, 13 } //Battlesign - }; - - static String[] toolNames = { - "Repair and Modification", - "Pickaxe", - "Shovel", - "Axe", - //"Lumber Axe", - //"Ice Axe", - "Mattock", - "Broadsword", - "Longsword", - "Rapier", - "Frying Pan", - "Battlesign" - }; - - static String[] toolDescriptions = { - "The main way to repair or change your tools. Place a tool and a material on the left to get started.", - "The Pickaxe is a basic mining tool. It is effective on stone and ores.\n\nRequired parts:\n- Pickaxe Head\n- Tool Binding\n- Handle", - "The Shovel is a basic digging tool. It is effective on dirt, sand, and snow.\n\nRequired parts:\n- Shovel Head\n- Handle", - "The Axe is a basic chopping tool. It is effective on wood and leaves.\n\nRequired parts:\n- Axe Head\n- Handle", - //"The Lumber Axe is a broad chopping tool. It harvests wood in a wide range and can fell entire trees.\n\nRequired parts:\n- Broad Axe Head\n- Handle", - //"The Ice Axe is a tool for harvesting ice, mining, and attacking foes.\n\nSpecial Ability:\n- Wall Climb\nNatural Ability:\n- Ice Harvest\nDamage: Moderate\n\nRequired parts:\n- Pickaxe Head\n- Spike\n- Handle", - "The Cutter Mattock is a versatile farming tool. It is effective on wood, dirt, and plants.\n\nSpecial Ability: Hoe\n\nRequired parts:\n- Axe Head\n- Shovel Head\n- Handle", - "The Broadsword is a defensive weapon. Blocking cuts damage in half.\n\nSpecial Ability: Block\nDamage: Moderate\nDurability: High\n\nRequired parts:\n- Sword Blade\n- Wide Guard\n- Handle", - "The Longsword is a balanced weapon. It is useful for knocking enemies away or getting in and out of battle quickly.\n\nNatural Ability:\n- Charge Boost\nDamage: Moderate\nDurability: Moderate\n\nRequired parts:\n- Sword Blade\n- Hand Guard\n- Handle", - "The Rapier is an offensive weapon that relies on quick strikes to defeat foes.\n\nNatural Abilities:\n- Armor Pierce\n- Quick Strike\n- Charge Boost\nDamage: High\nDurability: Low\n\nRequired parts:\n- Sword Blade\n- Crossbar\n- Handle", - "The Frying is a heavy weapon that uses sheer weight to stun foes.\n\nSpecial Ability: Block\nNatural Ability: Bash\nShift+rClick: Place Frying Pan\nDamage: High\nDurability: High\n\nRequired parts:\n- Pan\n- Handle", - //"The Battlesign is an advance in weapon technology worthy of Zombie Pigmen everywhere.\n\nSpecial Ability: Block\nShift-rClick: Place sign\nDamage: Low\nDurability: Average\n\nRequired parts:\n- Board\n- Handle" - "The Battlesign is an advance in weapon technology worthy of Zombie Pigmen everywhere.\n\nSpecial Ability: Block\nDamage: Low\nDurability: Average\n\nRequired parts:\n- Sign Board\n- Handle" - }; - - void addToolButtons() - { - for (int i = 0; i < toolNames.length; i++) - { - addToolButton(slotTypes[i][0], slotTypes[i][1], slotTypes[i][2], iconCoords[i*2], iconCoords[i*2+1], toolNames[i], toolDescriptions[i]); - } - } - - private void addToolButton(int slotType, int xButton, int yButton, int[] xIcons, int[] yIcons, String title, String body) - { - toolButtons.add(new ToolGuiElement(slotType, xButton, yButton, xIcons, yIcons, title, body)); - } - - public static void addToolButton(int slotType, int xButton, int yButton, int[] xIcons, int[] yIcons, String title, String body, String texture) - { - toolButtons.add(new ToolGuiElement(slotType, xButton, yButton, xIcons, yIcons, title, body, texture)); - } - - TConstructContent content; + public static TConstructContent content; public static Random tRand = new Random(); public static TabTools toolTab; diff --git a/tinker/tconstruct/TConstructContent.java b/tinker/tconstruct/TConstructContent.java index 2f7185e2..7b15f8d1 100644 --- a/tinker/tconstruct/TConstructContent.java +++ b/tinker/tconstruct/TConstructContent.java @@ -8,9 +8,11 @@ import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.oredict.ShapedOreRecipe; +import tinker.common.IPattern; import tinker.tconstruct.blocks.EquipBlock; import tinker.tconstruct.blocks.TConstructBlock; import tinker.tconstruct.blocks.ToolStationBlock; +import tinker.tconstruct.client.gui.ToolGuiElement; import tinker.tconstruct.crafting.PatternBuilder; import tinker.tconstruct.crafting.ToolBuilder; import tinker.tconstruct.items.CraftingItem; @@ -41,8 +43,7 @@ import cpw.mods.fml.common.IFuelHandler; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.GameRegistry; -public class TConstructContent - implements IFuelHandler +public class TConstructContent implements IFuelHandler { //Patterns and other materials public static Item blankPattern; @@ -52,7 +53,7 @@ public class TConstructContent public static Item woodPattern; //public static Item stonePattern; //public static Item netherPattern; - + //Tools public static ToolCore pickaxe; public static ToolCore shovel; @@ -60,14 +61,14 @@ public class TConstructContent public static ToolCore broadsword; public static ToolCore longsword; public static ToolCore rapier; - + public static ToolCore frypan; public static ToolCore battlesign; //public static ToolCore longbow; - + public static ToolCore mattock; public static ToolCore lumberaxe; - + //Tool parts public static Item pickaxeHead; public static Item shovelHead; @@ -77,42 +78,44 @@ public class TConstructContent public static Item medGuard; public static Item crossbar; public static Item binding; - + public static Item frypanHead; public static Item signHead; - + public static Item lumberHead; - + //Crafting blocks public static Block woodCrafter; public static Block smeltery; - + public static Block heldItemBlock; public static Block ores; public static Block lavaTank; public static Block craftedSoil; public static Block searedBrick; //public static Block axle; - + //Tool modifiers public static ModElectric modE; - + public TConstructContent() { createEntities(); createItems(); + addRenderMappings(); registerMaterials(); addToolRecipes(); addCraftingRecipes(); setupToolTabs(); + addToolButtons(); GameRegistry.registerFuelHandler(this); } - - void createEntities() + + void createEntities () { EntityRegistry.registerModEntity(tinker.tconstruct.entity.CartEntity.class, "Small Wagon", 0, TConstruct.instance, 32, 5, true); } - + void createItems () { woodCrafter = new ToolStationBlock(PHConstruct.woodCrafter, Material.wood); @@ -121,26 +124,26 @@ public class TConstructContent GameRegistry.registerTileEntity(tinker.tconstruct.logic.PartCrafterLogic.class, "PartCrafter"); GameRegistry.registerTileEntity(tinker.tconstruct.logic.PatternChestLogic.class, "PatternHolder"); GameRegistry.registerTileEntity(tinker.tconstruct.logic.PatternShaperLogic.class, "PatternShaper"); - + heldItemBlock = new EquipBlock(PHConstruct.heldItemBlock, Material.wood); GameRegistry.registerBlock(heldItemBlock, "HeldItemBlock"); GameRegistry.registerTileEntity(tinker.tconstruct.logic.FrypanLogic.class, "FrypanLogic"); - + //ores = new TBaseOre(PHTools.ores, 48); //GameRegistry.registerBlock(ores, tinker.toolconstruct.blocks.TBaseOreItem.class, "TConstruct.ores"); - + //lavaTank = new LavaTankBlock(PHConstruct.lavaTank); //GameRegistry.registerBlock(lavaTank, "LavaTank"); //GameRegistry.registerTileEntity(tinker.tconstruct.logic.LavaTankLogic.class, "TConstruct.LavaTank"); - + //smeltery = new SmelteryBlock(PHConstruct.smeltery); //GameRegistry.registerBlock(smeltery, "Smeltery"); //GameRegistry.registerTileEntity(tinker.tconstruct.logic.SmelteryLogic.class, "TConstruct.Smeltery"); - + craftedSoil = new TConstructBlock(PHConstruct.craftedSoil, 96, Material.sand, 3.0F, 2); craftedSoil.stepSound = Block.soundGravelFootstep; GameRegistry.registerBlock(craftedSoil, tinker.tconstruct.blocks.CraftedSoilItemBlock.class, "CraftedSoil"); - + searedBrick = new TConstructBlock(PHConstruct.searedBrick, 80, Material.iron, 10.0F, 1); GameRegistry.registerBlock(searedBrick, tinker.tconstruct.blocks.SearedBrickItemBlock.class, "SearedBrick"); MinecraftForge.setBlockHarvestLevel(searedBrick, 0, "pickaxe", 2); @@ -152,20 +155,20 @@ public class TConstructContent woodPattern = new Pattern(PHConstruct.woodPattern, 0, patternTexture).setItemName("tconstruct.Pattern"); //stonePattern = new Pattern(PHTools.stonePattern, 64, patternTexture).setItemName("tconstruct.Pattern"); //netherPattern = new Pattern(PHTools.netherPattern, 128, patternTexture).setItemName("tconstruct.Pattern"); - + pickaxe = new Pickaxe(PHConstruct.pickaxe, pickaxeTexture); shovel = new Shovel(PHConstruct.shovel, shovelTexture); axe = new Axe(PHConstruct.axe, axeTexture); broadsword = new Broadsword(PHConstruct.broadsword, broadswordTexture); longsword = new Longsword(PHConstruct.longsword, longswordTexture); rapier = new Rapier(PHConstruct.rapier, rapierTexture); - + frypan = new FryingPan(PHConstruct.frypan, frypanTexture); battlesign = new BattleSign(PHConstruct.battlesign, signTexture); //longbow = new RangedWeapon(PHConstruct.longbow, bowTexture); mattock = new Mattock(PHConstruct.mattock, mattockTexture); lumberaxe = new LumberAxe(PHConstruct.lumberaxe, lumberaxeTexture); - + pickaxeHead = new ToolPart(PHConstruct.pickaxeHead, 0, baseHeads).setItemName("tconstruct.PickaxeHead"); shovelHead = new ToolPart(PHConstruct.shovelHead, 64, baseHeads).setItemName("tconstruct.ShovelHead"); axeHead = new ToolPart(PHConstruct.axeHead, 128, baseHeads).setItemName("tconstruct.AxeHead"); @@ -174,43 +177,86 @@ public class TConstructContent medGuard = new ToolPart(PHConstruct.medGuard, 128, swordparts).setItemName("tconstruct.MediumGuard"); crossbar = new ToolPart(PHConstruct.crossbar, 192, swordparts).setItemName("tconstruct.Crossbar"); binding = new ToolPart(PHConstruct.binding, 0, baseAccessories).setItemName("tconstruct.Binding"); - + frypanHead = new ToolPart(PHConstruct.frypanHead, 0, jokeparts).setItemName("tconstruct.FrypanHead"); signHead = new ToolPart(PHConstruct.signHead, 64, jokeparts).setItemName("tconstruct.SignHead"); - + //lumberHead = new ToolPart(PHConstruct.lumberHead, 0, broadheads).setItemName("tconstruct.LumberHead"); } - - public static Item[] patternOutputs; - - void registerMaterials () + + void addRenderMappings () { - PatternBuilder pb = PatternBuilder.instance; - pb.registerFullMaterial(Block.planks, 2, "wood", new ItemStack(Item.stick), new ItemStack(Item.stick), 0); - pb.registerFullMaterial(Block.stone, 2, "stone", 1); - pb.registerMaterial(Block.cobblestone, 2, "stone"); - pb.registerFullMaterial(Item.ingotIron, 2, "iron", 2); - pb.registerFullMaterial(Item.flint, 2, "flint", 3); - pb.registerFullMaterial(Block.cactus, 2, "cactus", 4); - pb.registerFullMaterial(Item.bone, 2, "bone", new ItemStack(Item.dyePowder, 1, 15), new ItemStack(Item.bone), 5); - pb.registerFullMaterial(Block.obsidian, 2, "obsidian", 6); - pb.registerFullMaterial(Block.netherrack, 2, "netherrack", 7); - pb.registerFullMaterial(new ItemStack(materials, 1, 1), 2, "slime", new ItemStack(toolShard, 1, 8), new ItemStack(toolRod, 1, 8), 8); - pb.registerFullMaterial(new ItemStack(materials, 1, 0), 2, "paper", new ItemStack(Item.paper), new ItemStack(toolRod, 1, 9), 9); - pb.registerMaterialSet("copper", new ItemStack(toolShard, 1, 13), new ItemStack(toolRod, 1, 13), 13); - pb.registerMaterialSet("bronze", new ItemStack(toolShard, 1, 14), new ItemStack(toolRod, 1, 14), 14); - - patternOutputs = new Item[] { toolRod, pickaxeHead, shovelHead, axeHead, swordBlade, largeGuard, medGuard, crossbar, binding, frypanHead, signHead }; - for (int iter = 0; iter < patternOutputs.length; iter++) + String[] partTypes = { "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn", "copper", "bronze" }; + String[] effectTypes = { "diamond", "emerald", "redstone", "glowstone", "moss", "ice", "lava", "blaze", "necrotic", "electric", "lapis" }; + for (int partIter = 0; partIter < partTypes.length; partIter++) { - pb.addToolPattern(new ItemStack(woodPattern, 1, iter+1), patternOutputs[iter]); - //pb.addToolPattern(new ItemStack(stonePattern, 1, iter+1), items[iter]); - //pb.addToolPattern(new ItemStack(netherPattern, 1, iter+1), items[iter]); + materialRenderMap(partIter, partTypes[partIter]); + } + for (int effectIter = 0; effectIter < effectTypes.length; effectIter++) + { + effectRenderMap(effectIter, effectTypes[effectIter]); } } - + + void materialRenderMap (int materialID, String partialLocation) + { + for (ToolCore tool : TConstructRegistry.getToolMapping()) + { + tool.partTextures.put(materialID, tool.getTextureFile() + partialLocation); + } + } + + void effectRenderMap (int materialID, String partialLocation) + { + for (ToolCore tool : TConstructRegistry.getToolMapping()) + { + tool.effectTextures.put(materialID, tool.getTextureFile() + partialLocation); + } + } + + void registerMaterials () + { + TConstructRegistry.addToolMaterial(0, "Wood", 1, 0, 59, 200, 0, 1.0F, 0, 0f); + TConstructRegistry.addToolMaterial(1, "Stone", 1, 1, 131, 400, 1, 0.5F, 0, 1f); + TConstructRegistry.addToolMaterial(2, "Iron", 1, 2, 250, 600, 2, 1.3F, 1, 0f); + TConstructRegistry.addToolMaterial(3, "Flint", 1, 1, 171, 525, 2, 0.7F, 0, 1f); + TConstructRegistry.addToolMaterial(4, "Cactus", 1, 1, 150, 500, 2, 1.0F, 0, -1f); + TConstructRegistry.addToolMaterial(5, "Bone", 1, 1, 200, 500, 2, 1.0F, 0, 0f); + TConstructRegistry.addToolMaterial(6, "Obsidian", 1, 3, 89, 700, 2, 0.8F, 3, 0f); + TConstructRegistry.addToolMaterial(7, "Netherrack", 1, 2, 131, 400, 1, 1.2F, 0, 1f); + TConstructRegistry.addToolMaterial(8, "Slime", 1, 3, 1500, 150, 0, 5.0F, 0, 0f); + TConstructRegistry.addToolMaterial(9, "Paper", 1, 0, 131, 200, 0, 0.1F, 0, 0f); + TConstructRegistry.addToolMaterial(10, "Cobalt", 2, 4, 800, 800, 3, 1.8F, 2, 0f); + TConstructRegistry.addToolMaterial(11, "Ardite", 2, 4, 800, 800, 3, 1.8F, 0, 0f); + TConstructRegistry.addToolMaterial(12, "Manyullyn", 2, 5, 1200, 1000, 4, 2.5F, 0, 0f); + TConstructRegistry.addToolMaterial(13, "Copper", 1, 1, 180, 500, 2, 1.15F, 0, 0f); + TConstructRegistry.addToolMaterial(14, "Bronze", 1, 2, 250, 600, 2, 1.3F, 1, 0f); + + PatternBuilder pb = PatternBuilder.instance; + pb.registerFullMaterial(Block.planks, 2, "Wood", new ItemStack(Item.stick), new ItemStack(Item.stick), 0); + pb.registerFullMaterial(Block.stone, 2, "Stone", 1); + pb.registerMaterial(Block.cobblestone, 2, "Stone"); + pb.registerFullMaterial(Item.ingotIron, 2, "Iron", 2); + pb.registerFullMaterial(Item.flint, 2, "Flint", 3); + pb.registerFullMaterial(Block.cactus, 2, "Cactus", 4); + pb.registerFullMaterial(Item.bone, 2, "Bone", new ItemStack(Item.dyePowder, 1, 15), new ItemStack(Item.bone), 5); + pb.registerFullMaterial(Block.obsidian, 2, "Obsidian", 6); + pb.registerFullMaterial(Block.netherrack, 2, "Netherrack", 7); + pb.registerFullMaterial(new ItemStack(materials, 1, 1), 2, "Slime", new ItemStack(toolShard, 1, 8), new ItemStack(toolRod, 1, 8), 8); + pb.registerFullMaterial(new ItemStack(materials, 1, 0), 2, "Paper", new ItemStack(Item.paper), new ItemStack(toolRod, 1, 9), 9); + pb.registerMaterialSet("Copper", new ItemStack(toolShard, 1, 13), new ItemStack(toolRod, 1, 13), 13); + pb.registerMaterialSet("Bronze", new ItemStack(toolShard, 1, 14), new ItemStack(toolRod, 1, 14), 14); + + pb.addToolPattern((IPattern) woodPattern); + } + + public static Item[] patternOutputs; + void addToolRecipes () { + + patternOutputs = new Item[] { toolRod, pickaxeHead, shovelHead, axeHead, swordBlade, largeGuard, medGuard, crossbar, binding, frypanHead, signHead }; + ToolBuilder tb = ToolBuilder.instance; tb.addToolRecipe(pickaxe, pickaxeHead, binding); tb.addToolRecipe(broadsword, swordBlade, largeGuard); @@ -223,37 +269,27 @@ public class TConstructContent tb.addToolRecipe(mattock, axeHead, shovelHead); //tb.addToolRecipe(longbow, toolRod, toolRod); //tb.addToolRecipe(lumberaxe, lumberHead); - + tb.registerToolMod(new ModRepair()); - tb.registerToolMod(new ModDurability(new ItemStack[] {new ItemStack(Item.diamond)}, 0, 500, 0f, 3, "Diamond", "\u00a7bDurability +500", "\u00a7b")); - tb.registerToolMod(new ModDurability(new ItemStack[] {new ItemStack(Item.emerald)}, 1, 0, 0.5f, 2, "Emerald", "\u00a72Durability +50%", "\u00a72")); + tb.registerToolMod(new ModDurability(new ItemStack[] { new ItemStack(Item.diamond) }, 0, 500, 0f, 3, "Diamond", "\u00a7bDurability +500", "\u00a7b")); + tb.registerToolMod(new ModDurability(new ItemStack[] { new ItemStack(Item.emerald) }, 1, 0, 0.5f, 2, "Emerald", "\u00a72Durability +50%", "\u00a72")); modE = new ModElectric(); tb.registerToolMod(modE); - tb.registerToolMod(new ModRedstone(new ItemStack[] {new ItemStack(Item.redstone)}, 2, 1)); + tb.registerToolMod(new ModRedstone(new ItemStack[] { new ItemStack(Item.redstone) }, 2, 1)); tb.registerToolMod(new ModRedstone(new ItemStack[] { new ItemStack(Item.redstone), new ItemStack(Item.redstone) }, 2, 2)); - tb.registerToolMod(new ModLapisIncrease(new ItemStack[] {new ItemStack(Item.dyePowder, 1, 4)}, 10, 1)); - tb.registerToolMod(new ModLapisIncrease(new ItemStack[] {new ItemStack(Item.dyePowder, 1, 4), new ItemStack(Item.dyePowder, 1, 4)}, 10, 2)); - tb.registerToolMod(new ModLapisIncrease(new ItemStack[] {new ItemStack(Block.blockLapis)}, 10, 9)); - tb.registerToolMod(new ModLapisIncrease(new ItemStack[] {new ItemStack(Item.dyePowder, 1, 4), new ItemStack(Block.blockLapis)}, 10, 10)); - tb.registerToolMod(new ModLapisIncrease(new ItemStack[] {new ItemStack(Block.blockLapis), new ItemStack(Block.blockLapis)}, 10, 18)); - tb.registerToolMod(new ModLapisBase(new ItemStack[] {new ItemStack(Block.blockLapis), new ItemStack(Block.blockLapis)}, 10)); - tb.registerToolMod(new ModInteger(new ItemStack[] {new ItemStack(materials, 1, 6)}, 4, "Moss", 3, "\u00a72", "Auto-Repair")); - tb.registerToolMod(new ModBlaze(new ItemStack[] {new ItemStack(Item.blazePowder)}, 7, 1)); - tb.registerToolMod(new ModBlaze(new ItemStack[] {new ItemStack(Item.blazePowder), new ItemStack(Item.blazePowder)}, 7, 2)); - tb.registerToolMod(new ModBoolean(new ItemStack[] {new ItemStack(materials, 1, 7)}, 6, "Lava", "\u00a74", "Auto-Smelt")); - tb.registerToolMod(new ModInteger(new ItemStack[] {new ItemStack(materials, 1, 8)}, 8, "Necrotic", 1, "\u00a78", "Life Steal")); - - ItemStack reBattery = ic2.api.Items.getItem("reBattery"); - if (reBattery != null) - modE.batteries.add(reBattery); - ItemStack chargedReBattery = ic2.api.Items.getItem("chargedReBattery"); - if (chargedReBattery != null) - modE.batteries.add(new ItemStack(chargedReBattery.getItem(), 1, -1)); - ItemStack electronicCircuit = ic2.api.Items.getItem("electronicCircuit"); - if (electronicCircuit != null) - modE.circuits.add(electronicCircuit); + tb.registerToolMod(new ModLapisIncrease(new ItemStack[] { new ItemStack(Item.dyePowder, 1, 4) }, 10, 1)); + tb.registerToolMod(new ModLapisIncrease(new ItemStack[] { new ItemStack(Item.dyePowder, 1, 4), new ItemStack(Item.dyePowder, 1, 4) }, 10, 2)); + tb.registerToolMod(new ModLapisIncrease(new ItemStack[] { new ItemStack(Block.blockLapis) }, 10, 9)); + tb.registerToolMod(new ModLapisIncrease(new ItemStack[] { new ItemStack(Item.dyePowder, 1, 4), new ItemStack(Block.blockLapis) }, 10, 10)); + tb.registerToolMod(new ModLapisIncrease(new ItemStack[] { new ItemStack(Block.blockLapis), new ItemStack(Block.blockLapis) }, 10, 18)); + tb.registerToolMod(new ModLapisBase(new ItemStack[] { new ItemStack(Block.blockLapis), new ItemStack(Block.blockLapis) }, 10)); + tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(materials, 1, 6) }, 4, "Moss", 3, "\u00a72", "Auto-Repair")); + tb.registerToolMod(new ModBlaze(new ItemStack[] { new ItemStack(Item.blazePowder) }, 7, 1)); + tb.registerToolMod(new ModBlaze(new ItemStack[] { new ItemStack(Item.blazePowder), new ItemStack(Item.blazePowder) }, 7, 2)); + tb.registerToolMod(new ModBoolean(new ItemStack[] { new ItemStack(materials, 1, 7) }, 6, "Lava", "\u00a74", "Auto-Smelt")); + tb.registerToolMod(new ModInteger(new ItemStack[] { new ItemStack(materials, 1, 8) }, 8, "Necrotic", 1, "\u00a78", "Life Steal")); } - + void addCraftingRecipes () { /*GameRegistry.addRecipe(new ItemStack(woodCrafter, 1, 0), "c", 'c', Block.workbench); @@ -268,31 +304,31 @@ public class TConstructContent GameRegistry.addRecipe(new ItemStack(woodCrafter, 1, 11), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 1)); GameRegistry.addRecipe(new ItemStack(woodCrafter, 1, 12), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 2)); GameRegistry.addRecipe(new ItemStack(woodCrafter, 1, 13), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 3)); - GameRegistry.addRecipe( new ShapedOreRecipe(new ItemStack(woodCrafter, 1, 1), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', "logWood")); - GameRegistry.addRecipe( new ShapedOreRecipe(new ItemStack(woodCrafter, 1, 10), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', "plankWood")); - - GameRegistry.addRecipe( new ShapedOreRecipe(new ItemStack(blankPattern, 1, 0), "ps", "sp", 'p', "plankWood", 's', Item.stick)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(woodCrafter, 1, 1), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', "logWood")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(woodCrafter, 1, 10), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', "plankWood")); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blankPattern, 1, 0), "ps", "sp", 'p', "plankWood", 's', Item.stick)); /*GameRegistry.addRecipe(new ItemStack(stonePattern, 1, 0), "ps", "sp", 'p', Block.cobblestone, 's', new ItemStack(toolRod, 1, 1)); GameRegistry.addRecipe(new ItemStack(stonePattern, 1, 0), "ps", "sp", 'p', Block.stone, 's', new ItemStack(toolRod, 1, 1)); GameRegistry.addRecipe(new ItemStack(netherPattern, 1, 0), "ps", "sp", 'p', Block.netherrack, 's', new ItemStack(toolRod, 1, 7));*/ - + GameRegistry.addRecipe(new ItemStack(materials, 1, 0), "pp", "pp", 'p', Item.paper); //Paper stack GameRegistry.addRecipe(new ItemStack(materials, 1, 6), "ppp", "ppp", "ppp", 'p', Block.cobblestoneMossy); //Moss ball GameRegistry.addRecipe(new ItemStack(materials, 1, 7), "xcx", "cbc", "xcx", 'b', Item.bucketLava, 'c', Item.coal, 'x', Block.netherrack); //Auto-smelt GameRegistry.addShapelessRecipe(new ItemStack(materials, 1, 8), Item.bone, Item.rottenFlesh, Item.chickenRaw, Item.beefRaw, Item.porkRaw, Item.fishRaw); //Necrotic bone GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 1, 0), Item.slimeBall, Item.slimeBall, Item.slimeBall, Item.slimeBall, Block.sand, Block.dirt); //Slimy sand GameRegistry.addShapelessRecipe(new ItemStack(craftedSoil, 1, 1), Item.clay, Block.sand, Block.gravel); //Grout, Add stone dust? - + FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 0, new ItemStack(materials, 1, 1), 2f); //Slime FurnaceRecipes.smelting().addSmelting(craftedSoil.blockID, 1, new ItemStack(materials, 1, 2), 2f); //Seared brick item GameRegistry.addRecipe(new ItemStack(searedBrick, 1, 0), "pp", "pp", 'p', new ItemStack(materials, 1, 2)); //Seared brick block - + /*for (int i = 0; i < 12; i++) { GameRegistry.addRecipe(new ItemStack(TConstructContent.woodPattern, 1, i + 1), "s", 's', new ItemStack(TConstructContent.woodPattern, 1, i)); }*/ } - + void setupToolTabs () { TConstruct.materialTab.init(new ItemStack(TConstructContent.woodPattern, 1, 255)); @@ -308,9 +344,97 @@ public class TConstructContent TConstruct.toolTab.init(tool); } - + + static int[][] slotTypes = { new int[] { 0, 3, 0 }, //Repair + new int[] { 1, 4, 0 }, //Pickaxe + new int[] { 2, 5, 0 }, //Shovel + new int[] { 2, 6, 0 }, //Axe + //new int[] {2, 9, 0}, //Lumber Axe + //new int[] {1, 7, 0}, //Ice Axe + new int[] { 3, 8, 0 }, //Mattock + new int[] { 1, 0, 1 }, //Broadsword + new int[] { 1, 1, 1 }, //Longsword + new int[] { 1, 2, 1 }, //Rapier + new int[] { 2, 3, 1 }, //Frying pan + new int[] { 2, 4, 1 } //Battlesign + }; + + static int[][] iconCoords = { new int[] { 0, 1, 2 }, new int[] { 13, 13, 13 }, //Repair + new int[] { 0, 0, 1 }, new int[] { 2, 3, 3 }, //Pickaxe + new int[] { 3, 0, 13 }, new int[] { 2, 3, 13 }, //Shovel + new int[] { 2, 0, 13 }, new int[] { 2, 3, 13 }, //Axe + //new int[] { 6, 0, 13 }, new int[] { 2, 3, 13 }, //Lumber Axe + //new int[] { 0, 0, 5 }, new int[] { 2, 3, 3 }, //Ice Axe + new int[] { 2, 0, 3 }, new int[] { 2, 3, 2 }, //Mattock + new int[] { 1, 0, 2 }, new int[] { 2, 3, 3 }, //Broadsword + new int[] { 1, 0, 3 }, new int[] { 2, 3, 3 }, //Longsword + new int[] { 1, 0, 4 }, new int[] { 2, 3, 3 }, //Rapier + new int[] { 4, 0, 13 }, new int[] { 2, 3, 13 }, //Frying Pan + new int[] { 5, 0, 13 }, new int[] { 2, 3, 13 } //Battlesign + }; + + static String[] toolNames = { "Repair and Modification", "Pickaxe", "Shovel", "Axe", + //"Lumber Axe", + //"Ice Axe", + "Mattock", "Broadsword", "Longsword", "Rapier", "Frying Pan", "Battlesign" }; + + static String[] toolDescriptions = { "The main way to repair or change your tools. Place a tool and a material on the left to get started.", "The Pickaxe is a basic mining tool. It is effective on stone and ores.\n\nRequired parts:\n- Pickaxe Head\n- Tool Binding\n- Handle", "The Shovel is a basic digging tool. It is effective on dirt, sand, and snow.\n\nRequired parts:\n- Shovel Head\n- Handle", "The Axe is a basic chopping tool. It is effective on wood and leaves.\n\nRequired parts:\n- Axe Head\n- Handle", + //"The Lumber Axe is a broad chopping tool. It harvests wood in a wide range and can fell entire trees.\n\nRequired parts:\n- Broad Axe Head\n- Handle", + //"The Ice Axe is a tool for harvesting ice, mining, and attacking foes.\n\nSpecial Ability:\n- Wall Climb\nNatural Ability:\n- Ice Harvest\nDamage: Moderate\n\nRequired parts:\n- Pickaxe Head\n- Spike\n- Handle", + "The Cutter Mattock is a versatile farming tool. It is effective on wood, dirt, and plants.\n\nSpecial Ability: Hoe\n\nRequired parts:\n- Axe Head\n- Shovel Head\n- Handle", "The Broadsword is a defensive weapon. Blocking cuts damage in half.\n\nSpecial Ability: Block\nDamage: Moderate\nDurability: High\n\nRequired parts:\n- Sword Blade\n- Wide Guard\n- Handle", "The Longsword is a balanced weapon. It is useful for knocking enemies away or getting in and out of battle quickly.\n\nNatural Ability:\n- Charge Boost\nDamage: Moderate\nDurability: Moderate\n\nRequired parts:\n- Sword Blade\n- Hand Guard\n- Handle", "The Rapier is an offensive weapon that relies on quick strikes to defeat foes.\n\nNatural Abilities:\n- Armor Pierce\n- Quick Strike\n- Charge Boost\nDamage: High\nDurability: Low\n\nRequired parts:\n- Sword Blade\n- Crossbar\n- Handle", "The Frying is a heavy weapon that uses sheer weight to stun foes.\n\nSpecial Ability: Block\nNatural Ability: Bash\nShift+rClick: Place Frying Pan\nDamage: High\nDurability: High\n\nRequired parts:\n- Pan\n- Handle", + //"The Battlesign is an advance in weapon technology worthy of Zombie Pigmen everywhere.\n\nSpecial Ability: Block\nShift-rClick: Place sign\nDamage: Low\nDurability: Average\n\nRequired parts:\n- Board\n- Handle" + "The Battlesign is an advance in weapon technology worthy of Zombie Pigmen everywhere.\n\nSpecial Ability: Block\nDamage: Low\nDurability: Average\n\nRequired parts:\n- Sign Board\n- Handle" }; + + void addToolButtons () + { + for (int i = 0; i < toolNames.length; i++) + { + addToolButton(slotTypes[i][0], slotTypes[i][1], slotTypes[i][2], iconCoords[i * 2], iconCoords[i * 2 + 1], toolNames[i], toolDescriptions[i]); + } + } + + void addToolButton (int slotType, int xButton, int yButton, int[] xIcons, int[] yIcons, String title, String body) + { + TConstructRegistry.toolButtons.add(new ToolGuiElement(slotType, xButton, yButton, xIcons, yIcons, title, body)); + } + + public void modIntegration () + { + /* IC2 */ + ItemStack reBattery = ic2.api.Items.getItem("reBattery"); + if (reBattery != null) + modE.batteries.add(reBattery); + ItemStack chargedReBattery = ic2.api.Items.getItem("chargedReBattery"); + if (chargedReBattery != null) + modE.batteries.add(new ItemStack(chargedReBattery.getItem(), 1, -1)); + ItemStack electronicCircuit = ic2.api.Items.getItem("electronicCircuit"); + if (electronicCircuit != null) + modE.circuits.add(electronicCircuit); + + /* Thaumcraft */ + Object obj = getItem("itemResource", "thaumcraft.common.Config"); + } + + public static Object getItem (String name, String classPackage) + { + try + { + Class c = Class.forName(classPackage); + Object ret = c.getField(name); + if (ret != null && (ret instanceof ItemStack || ret instanceof Item)) + return ret; + return null; + } + catch (Exception e) + { + System.out.println("[TConstruct] Could not find item for " + name); + return null; + } + } + public static String blockTexture = "/tinkertextures/ConstructBlocks.png"; - + public static String blankSprite = "/tinkertextures/blanksprite.png"; + public static String craftingTexture = "/tinkertextures/materials.png"; public static String patternTexture = "/tinkertextures/tools/patterns.png"; public static String baseHeads = "/tinkertextures/tools/baseheads.png"; @@ -319,17 +443,17 @@ public class TConstructContent public static String jokeparts = "/tinkertextures/tools/jokeparts.png"; public static String broadheads = "/tinkertextures/tools/broadheads.png"; - public static String pickaxeTexture = "/tinkertextures/tools/pickaxes.png"; - public static String broadswordTexture = "/tinkertextures/tools/swordbroad.png"; - public static String shovelTexture = "/tinkertextures/tools/shovels.png"; - public static String axeTexture = "/tinkertextures/tools/axes.png"; - public static String longswordTexture = "/tinkertextures/tools/swordlong.png"; - public static String rapierTexture = "/tinkertextures/tools/swordrapier.png"; - public static String frypanTexture = "/tinkertextures/tools/frypans.png"; - public static String signTexture = "/tinkertextures/tools/battlesigns.png"; - public static String bowTexture = "/tinkertextures/tools/bows.png"; - public static String mattockTexture = "/tinkertextures/tools/mattock.png"; - public static String lumberaxeTexture = "/tinkertextures/tools/lumberaxe.png"; + public static String pickaxeTexture = "/tinkertextures/tools/pickaxe/"; + public static String broadswordTexture = "/tinkertextures/tools/broadsword/"; + public static String shovelTexture = "/tinkertextures/tools/shovel/"; + public static String axeTexture = "/tinkertextures/tools/axe/"; + public static String longswordTexture = "/tinkertextures/tools/longsword/"; + public static String rapierTexture = "/tinkertextures/tools/rapier/"; + public static String frypanTexture = "/tinkertextures/tools/frypan/"; + public static String signTexture = "/tinkertextures/tools/battlesign/"; + public static String bowTexture = "/tinkertextures/tools/bow/"; + public static String mattockTexture = "/tinkertextures/tools/mattock/"; + public static String lumberaxeTexture = "/tinkertextures/tools/lumberaxe/"; @Override public int getBurnTime (ItemStack fuel) diff --git a/tinker/tconstruct/TConstructRegistry.java b/tinker/tconstruct/TConstructRegistry.java new file mode 100644 index 00000000..410fc29f --- /dev/null +++ b/tinker/tconstruct/TConstructRegistry.java @@ -0,0 +1,83 @@ +package tinker.tconstruct; + +import java.util.ArrayList; +import java.util.HashMap; + +import tinker.tconstruct.client.gui.ToolGuiElement; +import tinker.tconstruct.tools.ToolCore; + +/** A registry to store any relevant API work + * + * @author mDiyo + */ + +public class TConstructRegistry +{ + public static TConstructRegistry instance = new TConstructRegistry(); + public static ArrayList tools = new ArrayList(20); + public static ArrayList toolButtons = new ArrayList(20); + public static HashMap toolMaterials = new HashMap(60); + + /* Mappings */ + public static void addToolMapping(ToolCore tool) + { + tools.add(tool); + } + + //Tools + public static ArrayList getToolMapping() + { + return tools; + } + + //Rendering + public static void addMaterialRenderMapping(int materialID, String textureLocation) + { + for (ToolCore tool : TConstructRegistry.getToolMapping()) + { + tool.partTextures.put(materialID, textureLocation); + } + } + + public static void addEffectRenderMapping(int materialID, String textureLocation) + { + for (ToolCore tool : TConstructRegistry.getToolMapping()) + { + tool.effectTextures.put(materialID, textureLocation); + } + } + + //Materials + public static void addToolMaterial(int materialID, String materialName, int craftingTier, int harvestLevel, + int durability, int miningspeed, int attack, float handleModifier, int reinforced, float shoddy) + { + ToolMaterial mat = toolMaterials.get(materialID); + if (mat == null) + { + toolMaterials.put(materialID, new ToolMaterial(materialName, craftingTier, harvestLevel, durability, miningspeed, attack, handleModifier, reinforced, shoddy)); + } + else + throw new RuntimeException("TConstruct material ID "+materialID+" is already occupied by "+mat.materialName); + } + + public static ToolMaterial getMaterial(int key) + { + return (toolMaterials.get(key)); + } + + //Gui + public static void addToolButton(ToolGuiElement element) + { + toolButtons.add(element); + } + + public static void addToolButton(int slotType, int xButton, int yButton, int[] xIcons, int[] yIcons, String title, String body, String texture) + { + toolButtons.add(new ToolGuiElement(slotType, xButton, yButton, xIcons, yIcons, title, body, texture)); + } + + public static ArrayList getToolButtons() + { + return toolButtons; + } +} diff --git a/tinker/tconstruct/ToolMaterial.java b/tinker/tconstruct/ToolMaterial.java new file mode 100644 index 00000000..a9f50e4a --- /dev/null +++ b/tinker/tconstruct/ToolMaterial.java @@ -0,0 +1,94 @@ +package tinker.tconstruct; +/** + * This class is temporary. A full material registry is planned + */ +public class ToolMaterial +{ + /*Wood (0, 59, 200, 0, 1.0F, 0, 0), + Stone (1, 131, 400, 1, 0.5F, 0, 1f), + Iron (2, 250, 600, 2, 1.3F, 1, 0), + Flint (1, 171, 525, 2, 0.7F, 0, 1f), + Cactus (1, 150, 500, 2, 1.0F, 0, -1f), + Bone (1, 200, 500, 2, 1.0F, 0, 0), + Obsidian (3, 89, 700, 2, 0.8F, 3, 0), + Netherrack (2, 131, 400, 1, 1.2F, 0, 1f), + Slime (3, 1500, 150, 0, 5.0F, 0, 0), + Paper (0, 131, 200, 0, 0.1F, 0, 0), + Cobalt (4, 800, 800, 3, 1.8F, 2, 0), + Ardite (4, 800, 800, 3, 1.8F, 0, 0), + Manyullyn (5, 1200, 1000, 4, 2.5F, 0, 0), + Copper (1, 180, 500, 2, 1.15F, 0, 0), + Bronze (2, 250, 600, 2, 1.3F, 1, 0), + Demonite (5, 1790, 900, 5, 1.66F, 0, 0), + Holyshell (5, 1000, 700, 1, 1.5F, 0, 0);*/ + + //mining level, durability, mining speed, baseDamage, handle modifier, Reinforced level, shoddy/spiny level + + public final String materialName; + public final int craftingTier; + public final int harvestLevel; + public final int durability; + public final int miningspeed; // <-- divided by 100 + public final int attack; + public final float handleModifier; + public final int reinforced; + public final float shoddy; + + public ToolMaterial(String name, int tier, int level, int dur, int speed, int damage, float handle, int unb, float shd) + { + this.materialName = name; + this.craftingTier = tier; + this.harvestLevel = level; + this.durability = dur; + this.miningspeed = speed; + this.attack = damage; + this.handleModifier = handle; + this.reinforced = unb; + this.shoddy = shd; + } + + public String name() + { + return materialName; + } + + public int tier() + { + return craftingTier; + } + + public int durability() + { + return this.durability; + } + + public int toolSpeed() + { + return this.miningspeed; + } + + public int attack() + { + return this.attack; + } + + public int harvestLevel() + { + return this.harvestLevel; + } + + public float handleDurability() + { + return this.handleModifier; + } + + public int reinforced() + { + return this.reinforced; + } + + public float shoddy() + { + return this.shoddy; + } +} diff --git a/tinker/tconstruct/client/SuperCustomToolRenderer.java b/tinker/tconstruct/client/SuperCustomToolRenderer.java index e10f35c3..5ed0f3e4 100644 --- a/tinker/tconstruct/client/SuperCustomToolRenderer.java +++ b/tinker/tconstruct/client/SuperCustomToolRenderer.java @@ -1,39 +1,24 @@ package tinker.tconstruct.client; -import static net.minecraftforge.client.IItemRenderer.ItemRenderType.EQUIPPED; -import static net.minecraftforge.client.IItemRenderer.ItemRenderType.FIRST_PERSON_MAP; - import java.util.Random; -import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityClientPlayerMP; -import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.RenderEngine; -import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.EnumAction; import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemMap; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; -import net.minecraft.world.storage.MapData; -import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.MinecraftForgeClient; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import tinker.tconstruct.tools.ToolCore; import cpw.mods.fml.client.TextureFXManager; public class SuperCustomToolRenderer implements IItemRenderer @@ -41,14 +26,15 @@ public class SuperCustomToolRenderer implements IItemRenderer RenderEngine renderEngine; RenderManager renderManager; Random random; - float par9 = 0; public SuperCustomToolRenderer() { - renderEngine = Minecraft.getMinecraft().renderEngine;//RenderManager.instance.renderEngine; + renderEngine = Minecraft.getMinecraft().renderEngine; renderManager = renderManager.instance; random = new Random(); } + + @Override public boolean handleRenderType (ItemStack item, ItemRenderType type) @@ -79,31 +65,31 @@ public class SuperCustomToolRenderer implements IItemRenderer /* Inventory */ void renderInventoryItem (ItemStack stack, RenderBlocks renderer) { - int var6 = stack.itemID; - int var7 = stack.getItemDamage(); - int var8 = stack.getIconIndex(); + ToolCore tool = (ToolCore) stack.getItem(); + //int itemID = stack.itemID; + int itemDamage = stack.getItemDamage(); float var16; - int par4 = 0; //What are these? - int par5 = 0; - GL11.glDisable(GL11.GL_LIGHTING); - renderEngine.bindTexture(renderEngine.getTexture(Item.itemsList[var6].getTextureFile())); - for (int renderPass = 0; renderPass < Item.itemsList[var6].getRenderPasses(var7); ++renderPass) + for (int renderPass = 0; renderPass < Item.itemsList[tool.itemID].getRenderPasses(itemDamage); renderPass++) { - int var10 = Item.itemsList[var6].getIconIndex(stack, renderPass); - int var11 = Item.itemsList[var6].getColorFromItemStack(stack, renderPass); - float var12 = (float) (var11 >> 16 & 255) / 255.0F; - float var13 = (float) (var11 >> 8 & 255) / 255.0F; - float var14 = (float) (var11 & 255) / 255.0F; + String texturePath = tool.getIconLocation(stack, renderPass); + renderEngine.bindTexture(renderEngine.getTexture(texturePath)); - /*if (this.field_77024_a) - { - GL11.glColor4f(var12, var13, var14, 1.0F); - }*/ + GL11.glScalef(0.0625F, 0.0625F, 1F); + this.renderTexturedQuad(); + GL11.glScalef(16F, 16F, 1F); + } + + for (int renderPass = 0; renderPass < 3; renderPass++) + { + String texturePath = tool.getEffectLocation(stack, renderPass); + renderEngine.bindTexture(renderEngine.getTexture(texturePath)); - this.renderTexturedQuad(par4, par5, var10 % 16 * 16, var10 / 16 * 16, 16, 16); + GL11.glScalef(0.0625F, 0.0625F, 1F); + this.renderTexturedQuad(); + GL11.glScalef(16F, 16F, 1F); } GL11.glEnable(GL11.GL_LIGHTING); @@ -116,18 +102,19 @@ public class SuperCustomToolRenderer implements IItemRenderer * Adds a textured quad to the tesselator at the specified position with the specified texture coords, width and * height. Args: x, y, u, v, width, height */ - public void renderTexturedQuad (int x, int y, int u, int v, int width, int height) - { - float var7 = 0.00390625F; - float var8 = 0.00390625F; - Tessellator var9 = Tessellator.instance; - var9.startDrawingQuads(); - var9.addVertexWithUV((double) (x + 0), (double) (y + height), (double) this.zLevel, (double) ((float) (u + 0) * var7), (double) ((float) (v + height) * var8)); - var9.addVertexWithUV((double) (x + width), (double) (y + height), (double) this.zLevel, (double) ((float) (u + width) * var7), (double) ((float) (v + height) * var8)); - var9.addVertexWithUV((double) (x + width), (double) (y + 0), (double) this.zLevel, (double) ((float) (u + width) * var7), (double) ((float) (v + 0) * var8)); - var9.addVertexWithUV((double) (x + 0), (double) (y + 0), (double) this.zLevel, (double) ((float) (u + 0) * var7), (double) ((float) (v + 0) * var8)); - var9.draw(); - } + public void renderTexturedQuad() + { + int x = 0, y = 0, u = 0, v = 0, height = 256, width = 256; + float var7 = 0.00390625F; + float var8 = 0.00390625F; + Tessellator var9 = Tessellator.instance; + var9.startDrawingQuads(); + var9.addVertexWithUV((double)(x + 0), (double)(y + height), (double)this.zLevel, (double)((float)(u + 0) * var7), (double)((float)(v + height) * var8)); + var9.addVertexWithUV((double)(x + width), (double)(y + height), (double)this.zLevel, (double)((float)(u + width) * var7), (double)((float)(v + height) * var8)); + var9.addVertexWithUV((double)(x + width), (double)(y + 0), (double)this.zLevel, (double)((float)(u + width) * var7), (double)((float)(v + 0) * var8)); + var9.addVertexWithUV((double)(x + 0), (double)(y + 0), (double)this.zLevel, (double)((float)(u + 0) * var7), (double)((float)(v + 0) * var8)); + var9.draw(); + } boolean shouldSpreadItems () { @@ -139,21 +126,30 @@ public class SuperCustomToolRenderer implements IItemRenderer { for (int x = 0; x < stack.getItem().getRenderPasses(stack.getItemDamage()); x++) { - this.doRenderEquippedItem(stack, living, x); + this.doRenderEquippedItem(stack, living, x, true); + } + + for (int x = 0; x < 3; x++) + { + this.doRenderEquippedItem(stack, living, x, false); } } - void doRenderEquippedItem (ItemStack stack, EntityLiving living, int pass) + void doRenderEquippedItem (ItemStack stack, EntityLiving living, int renderPass, boolean baseSprite) { GL11.glPushMatrix(); - GL11.glBindTexture(GL11.GL_TEXTURE_2D, renderEngine.getTexture(stack.getItem().getTextureFile())); Tessellator var5 = Tessellator.instance; - int var6 = living.getItemIcon(stack, pass); - float var7 = ((float) (var6 % 16 * 16) + 0.0F) / 256.0F; - float var8 = ((float) (var6 % 16 * 16) + 15.99F) / 256.0F; - float var9 = ((float) (var6 / 16 * 16) + 0.0F) / 256.0F; - float var10 = ((float) (var6 / 16 * 16) + 15.99F) / 256.0F; + String texturePath = null; + if (baseSprite) + texturePath = ((ToolCore)stack.getItem()).getIconLocation(stack, renderPass); + else + texturePath = ((ToolCore)stack.getItem()).getEffectLocation(stack, renderPass); + renderEngine.bindTexture(renderEngine.getTexture(texturePath)); + float var7 = 0; + float var8 = 1; + float var9 = 0; + float var10 = 1; float var11 = 0.0F; float var12 = 0.3F; GL11.glEnable(GL12.GL_RESCALE_NORMAL); @@ -201,67 +197,10 @@ public class SuperCustomToolRenderer implements IItemRenderer GL11.glPopMatrix(); } - public void doRenderItem (EntityLiving par1EntityLiving, ItemStack par2ItemStack, int par3) - { - - GL11.glBindTexture(GL11.GL_TEXTURE_2D, renderEngine.getTexture(par2ItemStack.getItem().getTextureFile())); - - Tessellator var5 = Tessellator.instance; - int var6 = par1EntityLiving.getItemIcon(par2ItemStack, par3); - float var7 = ((float) (var6 % 16 * 16) + 0.0F) / 256.0F; - float var8 = ((float) (var6 % 16 * 16) + 15.99F) / 256.0F; - float var9 = ((float) (var6 / 16 * 16) + 0.0F) / 256.0F; - float var10 = ((float) (var6 / 16 * 16) + 15.99F) / 256.0F; - float var11 = 0.0F; - float var12 = 0.3F; - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glTranslatef(-var11, -var12, 0.0F); - float var13 = 1.5F; - /*GL11.glScalef(var13, var13, var13); - GL11.glRotatef(50.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(335.0F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(-0.9375F, -0.0625F, 0.0F);*/ - renderItemIn2D(var5, var8, var9, var7, var10, 0.0625F); - - /*if (par2ItemStack != null && par2ItemStack.hasEffect() && par3 == 0) - { - GL11.glDepthFunc(GL11.GL_EQUAL); - GL11.glDisable(GL11.GL_LIGHTING); - renderEngine.bindTexture(renderEngine.getTexture("%blur%/misc/glint.png")); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); - float var14 = 0.76F; - GL11.glColor4f(0.5F * var14, 0.25F * var14, 0.8F * var14, 1.0F); - GL11.glMatrixMode(GL11.GL_TEXTURE); - GL11.glPushMatrix(); - float var15 = 0.125F; - GL11.glScalef(var15, var15, var15); - float var16 = (float) (Minecraft.getSystemTime() % 3000L) / 3000.0F * 8.0F; - GL11.glTranslatef(var16, 0.0F, 0.0F); - GL11.glRotatef(-50.0F, 0.0F, 0.0F, 1.0F); - renderItemIn2D(var5, 0.0F, 0.0F, 1.0F, 1.0F, 0.0625F); - GL11.glPopMatrix(); - GL11.glPushMatrix(); - GL11.glScalef(var15, var15, var15); - var16 = (float) (Minecraft.getSystemTime() % 4873L) / 4873.0F * 8.0F; - GL11.glTranslatef(-var16, 0.0F, 0.0F); - GL11.glRotatef(10.0F, 0.0F, 0.0F, 1.0F); - renderItemIn2D(var5, 0.0F, 0.0F, 1.0F, 1.0F, 0.0625F); - GL11.glPopMatrix(); - GL11.glMatrixMode(GL11.GL_MODELVIEW); - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDepthFunc(GL11.GL_LEQUAL); - }*/ - - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - - GL11.glPopMatrix(); - } - public static void renderItemIn2D (Tessellator par0Tessellator, float par1, float par2, float par3, float par4, float par5) { float var6 = 1.0F; + //GL11.glScalef(0.0625F, 0.0625F, 1F); par0Tessellator.startDrawingQuads(); par0Tessellator.setNormal(0.0F, 0.0F, 1.0F); par0Tessellator.addVertexWithUV(0.0D, 0.0D, 0.0D, (double) par1, (double) par4); @@ -283,7 +222,7 @@ public class SuperCustomToolRenderer implements IItemRenderer float var9; float var10; - int tileSize = TextureFXManager.instance().getTextureDimensions(GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D)).width / 16; + int tileSize = TextureFXManager.instance().getTextureDimensions(GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D)).width; float tx = 1.0f / (32 * tileSize); float tz = 1.0f / tileSize; @@ -345,6 +284,7 @@ public class SuperCustomToolRenderer implements IItemRenderer } par0Tessellator.draw(); + //GL11.glScalef(16F, 16F, 1F); } /* Entity */ @@ -352,37 +292,55 @@ public class SuperCustomToolRenderer implements IItemRenderer { this.random.setSeed(187L); ItemStack var10 = entity.func_92014_d(); + ToolCore tool = (ToolCore) var10.getItem(); if (var10.getItem() != null) { GL11.glPushMatrix(); - float var11 = shouldBob() ? MathHelper.sin(((float) entity.age + par9) / 10.0F + entity.hoverStart) * 0.1F + 0.1F : 0F; - float var12 = (((float) entity.age + par9) / 20.0F + entity.hoverStart) * (180F / (float) Math.PI); + float var11 = shouldBob() ? MathHelper.sin(((float) entity.age) / 10.0F + entity.hoverStart) * 0.1F + 0.1F : 0F; + float var12 = (((float) entity.age) / 20.0F + entity.hoverStart) * (180F / (float) Math.PI); byte var13 = getMiniBlockCountForItemStack(var10); //GL11.glTranslatef((float) par2, (float) par4 + var11, (float) par6); GL11.glEnable(GL12.GL_RESCALE_NORMAL); - int var16; + int renderIndex; float var19; float var20; float var24; - int var15; + int renderPass; float var17; - for (var15 = 0; var15 <= var10.getItem().getRenderPasses(var10.getItemDamage()); ++var15) + for (renderPass = 0; renderPass < tool.getRenderPasses(var10.getItemDamage()); ++renderPass) { - renderEngine.bindTexture(renderEngine.getTexture(Item.itemsList[var10.itemID].getTextureFile())); this.random.setSeed(187L); - var16 = var10.getItem().getIconIndex(var10, var15); var17 = 1.0F; + + String texturePath = tool.getIconLocation(var10, renderPass); + renderEngine.bindTexture(renderEngine.getTexture(texturePath)); - int var18 = Item.itemsList[var10.itemID].getColorFromItemStack(var10, var15); + int var18 = Item.itemsList[tool.itemID].getColorFromItemStack(var10, renderPass); var19 = (float) (var18 >> 16 & 255) / 255.0F; var20 = (float) (var18 >> 8 & 255) / 255.0F; float var21 = (float) (var18 & 255) / 255.0F; GL11.glColor4f(var19 * var17, var20 * var17, var21 * var17, 1.0F); - this.func_77020_a(entity, var16, var13, par9, var19 * var17, var20 * var17, var21 * var17); + this.func_77020_a(entity, 0, var13, 0, var19 * var17, var20 * var17, var21 * var17, renderPass, true); + } + + for (renderPass = 0; renderPass < tool.getRenderPasses(var10.getItemDamage()); ++renderPass) + { + this.random.setSeed(187L); + var17 = 1.0F; + + String texturePath = tool.getEffectLocation(var10, renderPass); + renderEngine.bindTexture(renderEngine.getTexture(texturePath)); + + int var18 = Item.itemsList[tool.itemID].getColorFromItemStack(var10, renderPass); + var19 = (float) (var18 >> 16 & 255) / 255.0F; + var20 = (float) (var18 >> 8 & 255) / 255.0F; + float var21 = (float) (var18 & 255) / 255.0F; + GL11.glColor4f(var19 * var17, var20 * var17, var21 * var17, 1.0F); + this.func_77020_a(entity, 0, var13, 0, var19 * var17, var20 * var17, var21 * var17, renderPass, false); } GL11.glDisable(GL12.GL_RESCALE_NORMAL); @@ -420,13 +378,13 @@ public class SuperCustomToolRenderer implements IItemRenderer return var13; } - private void func_77020_a (EntityItem par1EntityItem, int par2, int par3, float par4, float par5, float par6, float par7) + private void func_77020_a (EntityItem par1EntityItem, int par2, int par3, float par4, float par5, float par6, float par7, int renderPass, boolean baseSprite) { Tessellator var8 = Tessellator.instance; - float var9 = (float) (par2 % 16 * 16 + 0) / 256.0F; - float var10 = (float) (par2 % 16 * 16 + 16) / 256.0F; - float var11 = (float) (par2 / 16 * 16 + 0) / 256.0F; - float var12 = (float) (par2 / 16 * 16 + 16) / 256.0F; + float var9 = 0; + float var10 = 1f; + float var11 = 0; + float var12 = 1f; float var13 = 1.0F; float var14 = 0.5F; float var15 = 0.25F; @@ -440,9 +398,10 @@ public class SuperCustomToolRenderer implements IItemRenderer float var16 = 0.0625F; var17 = 0.021875F; - ItemStack var18 = par1EntityItem.func_92014_d(); - int var19 = var18.stackSize; - byte var24 = getMiniBlockCountForItemStack(var18); + ItemStack stack = par1EntityItem.func_92014_d(); + ToolCore tool = (ToolCore) stack.getItem(); + int var19 = stack.stackSize; + byte var24 = getMiniBlockCountForItemStack(stack); GL11.glTranslatef(-var14, -var15, -((var16 + var17) * (float) var24 / 2.0F)); @@ -460,13 +419,20 @@ public class SuperCustomToolRenderer implements IItemRenderer { GL11.glTranslatef(0f, 0f, var16 + var17); } + + //String texturePath = tool.getIconLocation(stack, renderPass); - renderEngine.bindTexture(renderEngine.getTexture(Item.itemsList[var18.itemID].getTextureFile())); + String texturePath = null; + if (baseSprite) + texturePath = ((ToolCore)stack.getItem()).getIconLocation(stack, renderPass); + else + texturePath = ((ToolCore)stack.getItem()).getEffectLocation(stack, renderPass); + renderEngine.bindTexture(renderEngine.getTexture(texturePath)); GL11.glColor4f(par5, par6, par7, 1.0F); ItemRenderer.renderItemIn2D(var8, var10, var11, var9, var12, var16); - if (var18 != null && var18.hasEffect()) + if (stack != null && stack.hasEffect()) { GL11.glDepthFunc(GL11.GL_EQUAL); GL11.glDisable(GL11.GL_LIGHTING); diff --git a/tinker/tconstruct/client/TProxyClient.java b/tinker/tconstruct/client/TProxyClient.java index 77af8760..ff96249c 100644 --- a/tinker/tconstruct/client/TProxyClient.java +++ b/tinker/tconstruct/client/TProxyClient.java @@ -4,10 +4,12 @@ package tinker.tconstruct.client; import java.io.File; import net.minecraft.client.Minecraft; -import net.minecraft.client.model.ModelBoat; +import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.client.MinecraftForgeClient; import tinker.tconstruct.TConstructContent; +import tinker.tconstruct.TConstructRegistry; import tinker.tconstruct.TProxyCommon; +import tinker.tconstruct.tools.ToolCore; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; @@ -22,7 +24,11 @@ public class TProxyClient extends TProxyCommon //RenderingRegistry.registerBlockHandler(new AxleRender()); MinecraftForgeClient.preloadTexture(TConstructContent.blockTexture); - MinecraftForgeClient.registerItemRenderer(TConstructContent.pickaxe.itemID, new SuperCustomToolRenderer()); + IItemRenderer render = new SuperCustomToolRenderer(); + for (ToolCore tool : TConstructRegistry.tools) + { + MinecraftForgeClient.registerItemRenderer(tool.itemID, render); + } RenderingRegistry.registerEntityRenderingHandler(tinker.tconstruct.entity.CartEntity.class, new CartRender()); } diff --git a/tinker/tconstruct/client/gui/PartCrafterGui.java b/tinker/tconstruct/client/gui/PartCrafterGui.java index 06652f86..46d898f5 100644 --- a/tinker/tconstruct/client/gui/PartCrafterGui.java +++ b/tinker/tconstruct/client/gui/PartCrafterGui.java @@ -8,7 +8,8 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; -import tinker.tconstruct.EnumMaterial; +import tinker.tconstruct.TConstructRegistry; +import tinker.tconstruct.ToolMaterial; import tinker.tconstruct.crafting.PatternBuilder; import tinker.tconstruct.logic.PartCrafterLogic; @@ -19,7 +20,7 @@ public class PartCrafterGui extends GuiContainer boolean drawChestPart; boolean hasTop, hasBottom; ItemStack topMaterial, bottomMaterial; - EnumMaterial topEnum, bottomEnum; + ToolMaterial topEnum, bottomEnum; public PartCrafterGui(InventoryPlayer inventoryplayer, PartCrafterLogic partlogic, World world, int x, int y, int z) { @@ -58,7 +59,7 @@ public class PartCrafterGui extends GuiContainer if (topID != -1) { - topEnum = EnumMaterial.getEnumByType(topID); + topEnum = TConstructRegistry.getMaterial(topID); hasTop = true; title = "\u00A7n"+topEnum.name(); } @@ -73,7 +74,7 @@ public class PartCrafterGui extends GuiContainer if (bottomID != -1) { - bottomEnum = EnumMaterial.getEnumByType(bottomID); + bottomEnum = TConstructRegistry.getMaterial(bottomID); hasBottom = true; otherTitle = "\u00A7n"+bottomEnum.name(); } diff --git a/tinker/tconstruct/client/gui/ToolStationGui.java b/tinker/tconstruct/client/gui/ToolStationGui.java index cf4bd9b0..3faf4f93 100644 --- a/tinker/tconstruct/client/gui/ToolStationGui.java +++ b/tinker/tconstruct/client/gui/ToolStationGui.java @@ -16,7 +16,7 @@ import net.minecraft.world.World; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import tinker.tconstruct.TConstruct; +import tinker.tconstruct.TConstructRegistry; import tinker.tconstruct.logic.ToolStationLogic; import tinker.tconstruct.tools.ToolCore; import tinker.tconstruct.tools.Weapon; @@ -70,14 +70,14 @@ public class ToolStationGui extends GuiContainer int cornerY = (this.height - this.ySize) / 2; this.controlList.clear(); - ToolGuiElement repair = TConstruct.toolButtons.get(0); + ToolGuiElement repair = TConstructRegistry.toolButtons.get(0); GuiButtonTool repairButton = new GuiButtonTool(0, cornerX - 110, cornerY, repair.buttonIconX, repair.buttonIconY, repair.texture); // Repair repairButton.enabled = false; this.controlList.add(repairButton); - for (int iter = 1; iter < TConstruct.toolButtons.size(); iter++) + for (int iter = 1; iter < TConstructRegistry.toolButtons.size(); iter++) { - ToolGuiElement element = TConstruct.toolButtons.get(iter); + ToolGuiElement element = TConstructRegistry.toolButtons.get(iter); GuiButtonTool button = new GuiButtonTool(iter, cornerX - 110 + 22 * (iter % 5), cornerY + 22 * (iter / 5), element.buttonIconX, element.buttonIconY, element.texture); // Repair this.controlList.add(button); } @@ -89,7 +89,7 @@ public class ToolStationGui extends GuiContainer guiType = button.id; button.enabled = false; - ToolGuiElement element = TConstruct.toolButtons.get(guiType); + ToolGuiElement element = TConstructRegistry.toolButtons.get(guiType); setSlotType(element.slotType); iconX = element.iconsX; iconY = element.iconsY; diff --git a/tinker/tconstruct/crafting/PatternBuilder.java b/tinker/tconstruct/crafting/PatternBuilder.java index 341a219a..3d15a85e 100644 --- a/tinker/tconstruct/crafting/PatternBuilder.java +++ b/tinker/tconstruct/crafting/PatternBuilder.java @@ -5,12 +5,12 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import tinker.tconstruct.TConstructContent; -import tinker.tconstruct.items.Pattern; - import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import tinker.common.IPattern; +import tinker.tconstruct.TConstructContent; +import tinker.tconstruct.items.Pattern; public class PatternBuilder { @@ -20,7 +20,7 @@ public class PatternBuilder HashMap materialSets = new HashMap(); //We could use IRecipe if it wasn't tied to InventoryCrafting - List toolPatterns = new ArrayList(); + List toolPatterns = new ArrayList(); /* Register methods */ public void registerMaterial (ItemStack material, int value, String key) @@ -42,9 +42,9 @@ public class PatternBuilder materialSets.put(key, new MaterialSet(shard, rod, materialID)); } - public void addToolPattern (ItemStack pattern, Item toolPart) + public void addToolPattern (IPattern item) { - toolPatterns.add(new PatternKey(pattern.getItem(), pattern.getItemDamage(), toolPart)); + toolPatterns.add(item); } /* Build tool parts from patterns */ @@ -53,11 +53,12 @@ public class PatternBuilder if (material != null && pattern != null) { ItemKey key = getItemKey(material); - Item toolPart = getMatchingPattern(pattern); + MaterialSet mat = (MaterialSet) materialSets.get(key.key); + ItemStack toolPart = getMatchingPattern(pattern, mat); + System.out.println("toolPart "+toolPart); if (key != null && toolPart != null) { - MaterialSet mat = (MaterialSet) materialSets.get(key.key); int patternValue = ((Pattern)pattern.getItem()).getPatternCost(pattern.getItemDamage()); int totalMaterial = key.value * material.stackSize; @@ -65,16 +66,16 @@ public class PatternBuilder return null; else if ( patternValue == key.value ) //Material only - return new ItemStack[] { new ItemStack(toolPart, 1, mat.materialID), null }; + return new ItemStack[] { toolPart, null }; else { if (patternValue % 2 == 1) { - return new ItemStack[] { new ItemStack(toolPart, 1, mat.materialID), mat.shard.copy() }; //Material + shard + return new ItemStack[] { toolPart, mat.shard.copy() }; //Material + shard } else - return new ItemStack[] { new ItemStack(toolPart, 1, mat.materialID), null }; + return new ItemStack[] { toolPart, null }; } /*if ( patternValue < totalMaterial ) { @@ -137,14 +138,13 @@ public class PatternBuilder return null; } - public Item getMatchingPattern (ItemStack pattern) + public ItemStack getMatchingPattern (ItemStack stack, MaterialSet set) { - Item pat = pattern.getItem(); - int damage = pattern.getItemDamage(); - for (PatternKey pk : toolPatterns) + Item item = stack.getItem(); + for (IPattern pattern : toolPatterns) { - if (pat == pk.item && (pk.damage == -1 || damage == pk.damage)) - return pk.output; + if (pattern == item) + return pattern.getPatternOutput(stack, set); } return null; } @@ -165,18 +165,19 @@ public class PatternBuilder } } - public class PatternKey + /*public class PatternKey { - public final Item item; - public final int damage; - public final Item output; - public PatternKey(Item i, int d, Item o) + public final IToolPart item; + public PatternKey(IToolPart i) { item = i; - damage = d; - output = o; } - } + + public ItemStack getOutput(ItemStack stack) + { + return item.getPatternOutput(); + } + }*/ public class MaterialSet { diff --git a/tinker/tconstruct/crafting/ToolBuilder.java b/tinker/tconstruct/crafting/ToolBuilder.java index a0efece4..3398dd5d 100644 --- a/tinker/tconstruct/crafting/ToolBuilder.java +++ b/tinker/tconstruct/crafting/ToolBuilder.java @@ -1,16 +1,18 @@ package tinker.tconstruct.crafting; /** Once upon a time, too many tools to count. Let's put them together automatically */ -import java.util.*; - -import tinker.tconstruct.EnumMaterial; -import tinker.tconstruct.items.ToolPart; -import tinker.tconstruct.modifiers.ToolMod; -import tinker.tconstruct.tools.ToolCore; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import tinker.common.IToolPart; +import tinker.tconstruct.TConstructRegistry; +import tinker.tconstruct.ToolMaterial; +import tinker.tconstruct.modifiers.ToolMod; +import tinker.tconstruct.tools.ToolCore; public class ToolBuilder { @@ -51,26 +53,59 @@ public class ToolBuilder return null; ToolCore item; - if (accessoryStack == null) - item = getMatchingRecipe(headStack.getItem(), handleStack.getItem(), null); + boolean validMaterials = true; + int head = -1, handle = -1, accessory = -1; + if (headStack.getItem() instanceof IToolPart) + { + head = ((IToolPart) headStack.getItem()).getMaterialID(headStack); + handle = ((IToolPart) handleStack.getItem()).getMaterialID(handleStack); + } else + validMaterials = false; + + Item handleItem = handleStack.getItem(); + + if (handleItem == Item.stick) + handle = 0; + else if (handleItem == Item.bone) + handle = 5; + else if (handleItem instanceof IToolPart) + handle = ((IToolPart)handleItem).getMaterialID(handleStack); + else + validMaterials = false; + + if (!validMaterials) + return null; + + if (accessoryStack == null) + { + item = getMatchingRecipe(headStack.getItem(), handleStack.getItem(), null); + } + else + { + if (accessoryStack.getItem() instanceof IToolPart) + accessory = ((IToolPart) accessoryStack.getItem()).getMaterialID(accessoryStack); + else + return null; + item = getMatchingRecipe(headStack.getItem(), handleStack.getItem(), accessoryStack.getItem()); + } + if (item == null) return null; - //System.out.println("Tool name: "+item.getToolName()); - int head = headStack.getItemDamage(); - //System.out.println("Head:"+head); - int handle = handleStack.getItemDamage(); - int accessory = -1; - if (accessoryStack != null) - accessory = accessoryStack.getItemDamage(); - if (handleStack.getItem() == Item.bone) //Don't worry about stick, it should be metadata 0. - handle = 5; + + + ToolMaterial headMat = null, handleMat = null, accessoryMat = null; + headMat = TConstructRegistry.getMaterial(head); + handleMat = TConstructRegistry.getMaterial(handle); + if (accessory != -1) + accessoryMat = TConstructRegistry.getMaterial(accessory); - int durability = (int) (EnumMaterial.durability(head) * EnumMaterial.handleDurability(handle) * item.getDurabilityModifier()); + System.out.println("Head: "+headMat+" Handle: "+handleMat); + int durability = (int) (headMat.durability() * handleMat.handleDurability() * item.getDurabilityModifier()); if (accessoryStack != null && (item.getHeadType() == 2 || item.getHeadType() == 3) ) - durability = (int) ((EnumMaterial.durability(head) + EnumMaterial.durability(accessory))/2 * EnumMaterial.handleDurability(handle) * item.getDurabilityModifier()); + durability = (int) ((headMat.durability() + accessoryMat.durability())/2 * handleMat.handleDurability() * item.getDurabilityModifier()); { /*Item accessoryItem = accessoryStack.getItem(); if (accessoryItem instanceof ToolPart && ((ToolPart)accessoryItem).isHead) //Two heads @@ -94,25 +129,25 @@ public class ToolBuilder compound.getCompoundTag("InfiTool").setInteger("BonusDurability", 0); //Modifier compound.getCompoundTag("InfiTool").setFloat("ModDurability", 0f); //Modifier compound.getCompoundTag("InfiTool").setBoolean("Broken", false); - compound.getCompoundTag("InfiTool").setInteger("Attack", EnumMaterial.attack(head) + item.getDamageVsEntity(null)); + compound.getCompoundTag("InfiTool").setInteger("Attack", headMat.attack() + item.getDamageVsEntity(null)); - compound.getCompoundTag("InfiTool").setInteger("MiningSpeed", EnumMaterial.toolSpeed(head)); + compound.getCompoundTag("InfiTool").setInteger("MiningSpeed", headMat.toolSpeed()); if (item.getHeadType() == 2) { - int hLvl = EnumMaterial.harvestLevel(head); - int shLvl = EnumMaterial.harvestLevel(accessory); + int hLvl = headMat.harvestLevel(); + int shLvl = accessoryMat.harvestLevel(); } else - compound.getCompoundTag("InfiTool").setInteger("HarvestLevel", EnumMaterial.harvestLevel(head)); + compound.getCompoundTag("InfiTool").setInteger("HarvestLevel", headMat.harvestLevel()); if (item.getHeadType() == 3) { - compound.getCompoundTag("InfiTool").setInteger("MiningSpeed2", EnumMaterial.toolSpeed(accessory)); - compound.getCompoundTag("InfiTool").setInteger("HarvestLevel2", EnumMaterial.harvestLevel(accessory)); + compound.getCompoundTag("InfiTool").setInteger("MiningSpeed2", accessoryMat.toolSpeed()); + compound.getCompoundTag("InfiTool").setInteger("HarvestLevel2", accessoryMat.harvestLevel()); } - compound.getCompoundTag("InfiTool").setInteger("Unbreaking", buildUnbreaking(head, handle, accessory)); - compound.getCompoundTag("InfiTool").setFloat("Shoddy", buildShoddy(head, handle, accessory)); + compound.getCompoundTag("InfiTool").setInteger("Unbreaking", buildReinforced(headMat, handleMat, accessoryMat)); + compound.getCompoundTag("InfiTool").setFloat("Shoddy", buildShoddy(headMat, handleMat, accessoryMat)); int modifiers = 3; if (accessory == -1) @@ -175,15 +210,15 @@ public class ToolBuilder return null; } - int buildUnbreaking (int head, int handle, int accessory) + int buildReinforced (ToolMaterial headMat, ToolMaterial handleMat, ToolMaterial accessoryMat) { int durability = 0; - int dHead = EnumMaterial.unbreaking(head); - int dHandle = EnumMaterial.unbreaking(handle); + int dHead = headMat.reinforced(); + int dHandle = handleMat.reinforced(); int dAccessory = 0; - if (accessory != -1) - dAccessory = EnumMaterial.unbreaking(accessory); + if (accessoryMat != null) + dAccessory = accessoryMat.reinforced(); if (dHead > durability) durability = dHead; @@ -195,13 +230,13 @@ public class ToolBuilder return durability; } - float buildShoddy (int head, int handle, int accessory) + float buildShoddy (ToolMaterial headMat, ToolMaterial handleMat, ToolMaterial accessoryMat) { - float sHead = EnumMaterial.shoddy(head); - float sHandle = EnumMaterial.shoddy(handle); - if (accessory != -1) + float sHead = headMat.shoddy(); + float sHandle = handleMat.shoddy(); + if (accessoryMat != null) { - float sAccessory = EnumMaterial.shoddy(accessory); + float sAccessory = accessoryMat.shoddy(); return (sHead + sHandle + sAccessory) / 3f; } return (sHead + sHandle) / 2f; diff --git a/tinker/tconstruct/items/Pattern.java b/tinker/tconstruct/items/Pattern.java index 209e7a3a..8780c7eb 100644 --- a/tinker/tconstruct/items/Pattern.java +++ b/tinker/tconstruct/items/Pattern.java @@ -4,9 +4,12 @@ import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import tinker.common.IPattern; +import tinker.tconstruct.TConstructContent; +import tinker.tconstruct.crafting.PatternBuilder.MaterialSet; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -20,6 +23,7 @@ public class Pattern extends CraftingItem this.setMaxDamage(0); this.setContainerItem(this); this.setMaxStackSize(1); + } public String getItemNameIS (ItemStack stack) @@ -86,4 +90,17 @@ public class Pattern extends CraftingItem default: return 0; } } + + + + @Override + public ItemStack getPatternOutput (ItemStack stack, MaterialSet set) + { + int type = stack.getItemDamage(); + if (type != 0 && type < TConstructContent.patternOutputs.length - 1) + { + return new ItemStack(TConstructContent.patternOutputs[type - 1], 1, set.materialID); + } + return null; + } } diff --git a/tinker/tconstruct/items/ToolPart.java b/tinker/tconstruct/items/ToolPart.java index fa50d53f..b8f7be8c 100644 --- a/tinker/tconstruct/items/ToolPart.java +++ b/tinker/tconstruct/items/ToolPart.java @@ -3,16 +3,13 @@ package tinker.tconstruct.items; import java.util.List; -import tinker.tconstruct.TConstruct; -import tinker.tconstruct.client.TProxyClient; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import tinker.common.IToolPart; public class ToolPart extends CraftingItem + implements IToolPart { public ToolPart(int id, int icon, String tex) { @@ -35,4 +32,10 @@ public class ToolPart extends CraftingItem public static final String[] toolMaterialNames = new String[] { "Wood", "Stone", "Iron", "Flint", "Cactus", "Bone", "Obsidian", "Netherrack", "Slime", "Paper", "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze" }; + + @Override + public int getMaterialID (ItemStack stack) + { + return stack.getItemDamage(); + } } diff --git a/tinker/tconstruct/tools/Axe.java b/tinker/tconstruct/tools/Axe.java index f6bc7c57..4052405c 100644 --- a/tinker/tconstruct/tools/Axe.java +++ b/tinker/tconstruct/tools/Axe.java @@ -1,5 +1,7 @@ package tinker.tconstruct.tools; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import tinker.tconstruct.AbilityHelper; import tinker.tconstruct.TConstructContent; import net.minecraft.block.Block; @@ -58,4 +60,32 @@ public class Axe extends HarvestTool { return null; } + + @SideOnly(Side.CLIENT) + @Override + public int getRenderPasses (int metadata) + { + return 2; + } + + protected String getRenderString (int renderPass, boolean broken) + { + switch (renderPass) + { + case 0: + return "_axe_handle.png"; + case 1: + if (broken) + return "_axe_head_broken.png"; + else + return "_axe_head.png"; + default: + return ""; + } + } + + protected String getEffectString (int renderPass) + { + return "_axe_effect.png"; + } } diff --git a/tinker/tconstruct/tools/BattleSign.java b/tinker/tconstruct/tools/BattleSign.java index 7cfea381..96f9c536 100644 --- a/tinker/tconstruct/tools/BattleSign.java +++ b/tinker/tconstruct/tools/BattleSign.java @@ -116,4 +116,32 @@ public class BattleSign extends Weapon { return null; } + + @SideOnly(Side.CLIENT) + @Override + public int getRenderPasses (int metadata) + { + return 2; + } + + protected String getRenderString (int renderPass, boolean broken) + { + switch (renderPass) + { + case 0: + return "_battlesign_handle.png"; + case 1: + if (broken) + return "_battlesign_head_broken.png"; + else + return "_battlesign_head.png"; + default: + return ""; + } + } + + protected String getEffectString (int renderPass) + { + return "_battlesign_effect.png"; + } } diff --git a/tinker/tconstruct/tools/Broadsword.java b/tinker/tconstruct/tools/Broadsword.java index ca4b3936..4e954de7 100644 --- a/tinker/tconstruct/tools/Broadsword.java +++ b/tinker/tconstruct/tools/Broadsword.java @@ -33,4 +33,27 @@ public class Broadsword extends Weapon { return 1.2f; } + + protected String getRenderString (int renderPass, boolean broken) + { + switch (renderPass) + { + case 0: + return "_sword_handle.png"; + case 1: + if (broken) + return "_sword_blade_broken.png"; + else + return "_sword_blade.png"; + case 2: + return "_sword_accessory.png"; + default: + return ""; + } + } + + protected String getEffectString (int renderPass) + { + return "_sword_effect.png"; + } } diff --git a/tinker/tconstruct/tools/DualHarvestTool.java b/tinker/tconstruct/tools/DualHarvestTool.java index 2b0ac0cb..24ba14a7 100644 --- a/tinker/tconstruct/tools/DualHarvestTool.java +++ b/tinker/tconstruct/tools/DualHarvestTool.java @@ -1,6 +1,6 @@ package tinker.tconstruct.tools; -import tinker.tconstruct.EnumMaterial; +import tinker.tconstruct.ToolMaterial; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.item.EntityItem; diff --git a/tinker/tconstruct/tools/FryingPan.java b/tinker/tconstruct/tools/FryingPan.java index 54ebc3da..7c45a9a0 100644 --- a/tinker/tconstruct/tools/FryingPan.java +++ b/tinker/tconstruct/tools/FryingPan.java @@ -1,5 +1,7 @@ package tinker.tconstruct.tools; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -103,4 +105,32 @@ public class FryingPan extends Weapon { return null; } + + @SideOnly(Side.CLIENT) + @Override + public int getRenderPasses (int metadata) + { + return 2; + } + + protected String getRenderString (int renderPass, boolean broken) + { + switch (renderPass) + { + case 0: + return "_frypan_handle.png"; + case 1: + if (broken) + return "_frypan_head_broken.png"; + else + return "_frypan_head.png"; + default: + return ""; + } + } + + protected String getEffectString (int renderPass) + { + return "_frypan_effect.png"; + } } diff --git a/tinker/tconstruct/tools/Hammer.java b/tinker/tconstruct/tools/Hammer.java index c6f0bb48..f8a63ee6 100644 --- a/tinker/tconstruct/tools/Hammer.java +++ b/tinker/tconstruct/tools/Hammer.java @@ -95,4 +95,27 @@ public class Hammer extends HarvestTool { return null; } + + protected String getRenderString (int renderPass, boolean broken) + { + switch (renderPass) + { + case 0: + return "_hammer_handle.png"; + case 1: + if (broken) + return "_hammer_head_broken.png"; + else + return "_hammer_head.png"; + case 2: + return "_hammer_accessory.png"; + default: + return ""; + } + } + + protected String getEffectString (int renderPass) + { + return "_hammer_effect.png"; + } } diff --git a/tinker/tconstruct/tools/Longsword.java b/tinker/tconstruct/tools/Longsword.java index 6829d913..8e324fb3 100644 --- a/tinker/tconstruct/tools/Longsword.java +++ b/tinker/tconstruct/tools/Longsword.java @@ -73,4 +73,27 @@ public class Longsword extends Weapon return true; }*/ + + protected String getRenderString (int renderPass, boolean broken) + { + switch (renderPass) + { + case 0: + return "_longsword_handle.png"; + case 1: + if (broken) + return "_longsword_blade_broken.png"; + else + return "_longsword_blade.png"; + case 2: + return "_longsword_accessory.png"; + default: + return ""; + } + } + + protected String getEffectString (int renderPass) + { + return "_longsword_effect.png"; + } } diff --git a/tinker/tconstruct/tools/LumberAxe.java b/tinker/tconstruct/tools/LumberAxe.java index 632c3c84..fc947a8f 100644 --- a/tinker/tconstruct/tools/LumberAxe.java +++ b/tinker/tconstruct/tools/LumberAxe.java @@ -178,4 +178,27 @@ public class LumberAxe extends HarvestTool { return null; } + + protected String getRenderString (int renderPass, boolean broken) + { + switch (renderPass) + { + case 0: + return "_lumberaxe_handle.png"; + case 1: + if (broken) + return "_lumberaxe_head_broken.png"; + else + return "_lumberaxe_head.png"; + case 2: + return "_lumberaxe_accessory.png"; + default: + return ""; + } + } + + protected String getEffectString (int renderPass) + { + return "_lumber_effect.png"; + } } diff --git a/tinker/tconstruct/tools/Mattock.java b/tinker/tconstruct/tools/Mattock.java index 2c81cb60..4d637e6f 100644 --- a/tinker/tconstruct/tools/Mattock.java +++ b/tinker/tconstruct/tools/Mattock.java @@ -71,4 +71,27 @@ public class Mattock extends DualHarvestTool { return TConstructContent.shovelHead; } + + protected String getRenderString (int renderPass, boolean broken) + { + switch (renderPass) + { + case 0: + return "_mattock_handle.png"; + case 1: + if (broken) + return "_mattock_head_broken.png"; + else + return "_mattock_head.png"; + case 2: + return "_mattock_back.png"; + default: + return ""; + } + } + + protected String getEffectString (int renderPass) + { + return "_mattock_effect.png"; + } } \ No newline at end of file diff --git a/tinker/tconstruct/tools/Pickaxe.java b/tinker/tconstruct/tools/Pickaxe.java index 5b30f04a..79c17514 100644 --- a/tinker/tconstruct/tools/Pickaxe.java +++ b/tinker/tconstruct/tools/Pickaxe.java @@ -44,4 +44,27 @@ public class Pickaxe extends HarvestTool { return TConstructContent.binding; } + + protected String getRenderString (int renderPass, boolean broken) + { + switch (renderPass) + { + case 0: + return "_pickaxe_handle.png"; + case 1: + if (broken) + return "_pickaxe_head_broken.png"; + else + return "_pickaxe_head.png"; + case 2: + return "_pickaxe_accessory.png"; + default: + return ""; + } + } + + protected String getEffectString (int renderPass) + { + return "_pickaxe_effect.png"; + } } diff --git a/tinker/tconstruct/tools/RangedWeapon.java b/tinker/tconstruct/tools/RangedWeapon.java index c29b104c..e0f9dd6c 100644 --- a/tinker/tconstruct/tools/RangedWeapon.java +++ b/tinker/tconstruct/tools/RangedWeapon.java @@ -16,7 +16,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.ArrowLooseEvent; import net.minecraftforge.event.entity.player.ArrowNockEvent; -public class RangedWeapon extends ToolCore +public abstract class RangedWeapon extends ToolCore { public RangedWeapon(int itemID, String texture) diff --git a/tinker/tconstruct/tools/Rapier.java b/tinker/tconstruct/tools/Rapier.java index 347affd6..af860cb6 100644 --- a/tinker/tconstruct/tools/Rapier.java +++ b/tinker/tconstruct/tools/Rapier.java @@ -67,4 +67,27 @@ public class Rapier extends Weapon { return TConstructContent.crossbar; } + + protected String getRenderString (int renderPass, boolean broken) + { + switch (renderPass) + { + case 0: + return "_rapier_handle.png"; + case 1: + if (broken) + return "_rapier_blade_broken.png"; + else + return "_rapier_blade.png"; + case 2: + return "_rapier_accessory.png"; + default: + return ""; + } + } + + protected String getEffectString (int renderPass) + { + return "_rapier_effect.png"; + } } diff --git a/tinker/tconstruct/tools/Shovel.java b/tinker/tconstruct/tools/Shovel.java index 22775cdc..c510816c 100644 --- a/tinker/tconstruct/tools/Shovel.java +++ b/tinker/tconstruct/tools/Shovel.java @@ -1,5 +1,7 @@ package tinker.tconstruct.tools; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import tinker.tconstruct.TConstructContent; import net.minecraft.block.material.Material; import net.minecraft.item.Item; @@ -43,4 +45,32 @@ public class Shovel extends HarvestTool { return null; } + + @SideOnly(Side.CLIENT) + @Override + public int getRenderPasses (int metadata) + { + return 2; + } + + protected String getRenderString (int renderPass, boolean broken) + { + switch (renderPass) + { + case 0: + return "_shovel_handle.png"; + case 1: + if (broken) + return "_shovel_head_broken.png"; + else + return "_shovel_head.png"; + default: + return ""; + } + } + + protected String getEffectString (int renderPass) + { + return "_shovel_effect.png"; + } } diff --git a/tinker/tconstruct/tools/ToolCore.java b/tinker/tconstruct/tools/ToolCore.java index 8ccbf945..ed0c1b3f 100644 --- a/tinker/tconstruct/tools/ToolCore.java +++ b/tinker/tconstruct/tools/ToolCore.java @@ -3,77 +3,74 @@ package tinker.tconstruct.tools; import ic2.api.IBoxable; import ic2.api.ICustomElectricItem; +import java.util.HashMap; import java.util.List; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.enchantment.EnchantmentThorns; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumToolMaterial; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; -import net.minecraft.stats.AchievementList; -import net.minecraft.stats.StatList; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; import tinker.tconstruct.AbilityHelper; import tinker.tconstruct.TConstruct; import tinker.tconstruct.TConstructContent; +import tinker.tconstruct.TConstructRegistry; import tinker.tconstruct.crafting.ToolBuilder; +import tinker.tconstruct.modifiers.ToolMod; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -/* NBTTags +/** NBTTags * Main tag - InfiTool + * @see ToolBuilder * * Required: - * Head: Render tag, above the handle - * Handle: Render tag, bottom layer + * Head: Base and render tag, above the handle + * Handle: Base and render tag, bottom layer * * Damage: Replacement for metadata * MaxDamage: ItemStacks only read setMaxDamage() * Broken: Represents whether the tool is broken (boolean) * Attack: How much damage a mob will take + * MiningSpeed: The speed at which a tool mines * * Others: - * Accessory: Render tag, above head. Sword guards, binding, etc + * Accessory: Base and tag, above head. Sword guards, binding, etc * Effects: Render tag, top layer. Fancy effects like moss or diamond edge. * Render order: Handle > Head > Accessory > Effect1 > Effect2 > Effect3 + * Unbreaking: Reinforced in-game, 10% chance to not use durability per level + * Shoddy/Spiny: Mines faster or slower and does less or more attack. * - * Durability: 10% chance to not use damage per level - * Shoddy: Mines slower, does more damage - * Spiny: Mines faster, does less damage - * Awareness: Glows in the presence of mobs + * Modifiers have their own tags. + * @see ToolMod */ public abstract class ToolCore extends Item - implements ICustomElectricItem, IBoxable//, IItemElectric + implements ICustomElectricItem, IBoxable { Random random = new Random(); String toolTexture; public int damageVsEntity; - public ToolCore(int itemID, int baseDamage, String texture) + public ToolCore(int id, int baseDamage, String texture) { - super(itemID); + super(id); this.maxStackSize = 1; this.setMaxDamage(100); this.setItemName("InfiTool"); this.setCreativeTab(TConstruct.toolTab); toolTexture = texture; damageVsEntity = baseDamage; + TConstructRegistry.addToolMapping(this);//tools.add(this); } - + /** Determines what type of heads the tool has. * 0: no heads * 1: one head @@ -81,14 +78,7 @@ public abstract class ToolCore extends Item * 3: Two heads, different uses * @return The head type */ - public abstract int getHeadType(); - - /* Texture */ - @Override - public String getTextureFile () - { - return toolTexture; - } + public abstract int getHeadType (); public String getToolName () { @@ -96,23 +86,123 @@ public abstract class ToolCore extends Item } /* Rendering */ + + public HashMap partTextures = new HashMap(); + public HashMap effectTextures = new HashMap(); + @SideOnly(Side.CLIENT) @Override - public boolean requiresMultipleRenderPasses () + public boolean requiresMultipleRenderPasses () //Redundant { return true; } + @Override + public String getTextureFile () //Repurposed for default texture locations + { + return toolTexture; + } + @SideOnly(Side.CLIENT) @Override public int getRenderPasses (int metadata) { - return 6; + return 3; } @SideOnly(Side.CLIENT) + public String getIconLocation (ItemStack stack, int renderPass) + { + NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); + + if (renderPass == 0) // Handle + { + return (partTextures.get((Integer) tags.getInteger("RenderHandle")) + getRenderString(renderPass, false)); + } + + if (renderPass == 1) // Head + { + if (tags.getBoolean("Broken")) + return (partTextures.get((Integer) tags.getInteger("RenderHead")) + getRenderString(renderPass, true)); + else + return (partTextures.get((Integer) tags.getInteger("RenderHead")) + getRenderString(renderPass, false)); + } + + if (renderPass == 2) // Accessory + { + if (tags.hasKey("RenderAccessory")) + { + return (partTextures.get((Integer) tags.getInteger("RenderAccessory")) + getRenderString(renderPass, false)); + } + } + + return TConstructContent.blankSprite; + } + + @SideOnly(Side.CLIENT) + public String getEffectLocation (ItemStack stack, int renderPass) + { + NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); + + if (renderPass == 0) + { + if (tags.hasKey("Effect1")) + return (effectTextures.get((Integer) tags.getInteger("Effect1")) + getEffectString(renderPass)); + } + + if (renderPass == 1) + { + if (tags.hasKey("Effect2")) + return (effectTextures.get((Integer) tags.getInteger("Effect2")) + getEffectString(renderPass)); + } + + if (renderPass == 2) + { + if (tags.hasKey("Effect3")) + return (effectTextures.get((Integer) tags.getInteger("Effect3")) + getEffectString(renderPass)); + } + + return TConstructContent.blankSprite; + } + + protected abstract String getRenderString(int renderPass, boolean broken); + protected abstract String getEffectString(int renderPass); + + /*String getRenderString (int renderPass, boolean broken) + { + switch (renderPass) + { + case 0: + return "_pickaxe_handle.png"; + case 1: + if (broken) + return "_pickaxe_head_broken.png"; + else + return "_pickaxe_head.png"; + case 2: + return "_pickaxe_accessory.png"; + default: + return ""; + } + } + + String getEffectString () + { + return "_pickaxe_effect.png"; + }*/ + + /*String types[] = { + + "_pickaxe_effect.png", + "_pickaxe_effect.png", + "_pickaxe_effect.png" + };*/ + + + + /*@SideOnly(Side.CLIENT) @Override - public int getIconIndex (ItemStack stack, int pass) + public int getIconIndex (ItemStack stack, int renderPass) { if (!stack.hasTagCompound()) return 255; @@ -120,12 +210,12 @@ public abstract class ToolCore extends Item NBTTagCompound tags = stack.getTagCompound(); if (tags.hasKey("InfiTool")) { - if (pass == 0) // Handle + if (renderPass == 0) // Handle { return tags.getCompoundTag("InfiTool").getInteger("RenderHandle"); } - if (pass == 1) // Head + if (renderPass == 1) // Head { if (tags.getCompoundTag("InfiTool").getBoolean("Broken")) return tags.getCompoundTag("InfiTool").getInteger("RenderHead") + 192; @@ -133,7 +223,7 @@ public abstract class ToolCore extends Item return tags.getCompoundTag("InfiTool").getInteger("RenderHead") + 64; } - if (pass == 2) // Accessory + if (renderPass == 2) // Accessory { if (tags.getCompoundTag("InfiTool").hasKey("RenderAccessory")) { @@ -144,7 +234,7 @@ public abstract class ToolCore extends Item } } - if (pass == 3) + if (renderPass == 3) { if (tags.getCompoundTag("InfiTool").hasKey("Effect1")) return tags.getCompoundTag("InfiTool").getInteger("Effect1") + 224; @@ -152,7 +242,7 @@ public abstract class ToolCore extends Item return 255; } - if (pass == 4) + if (renderPass == 4) { if (tags.getCompoundTag("InfiTool").hasKey("Effect2")) return tags.getCompoundTag("InfiTool").getInteger("Effect2") + 224; @@ -160,7 +250,7 @@ public abstract class ToolCore extends Item return 255; } - if (pass == 5) + if (renderPass == 5) { if (tags.getCompoundTag("InfiTool").hasKey("Effect3")) return tags.getCompoundTag("InfiTool").getInteger("Effect3") + 224; @@ -178,7 +268,7 @@ public abstract class ToolCore extends Item if (damage == 0 || broken) return 255; return 240 + (damage * 13 / maxDamage); - } + }*/ /* Tags and information about the tool */ @Override @@ -198,13 +288,13 @@ public abstract class ToolCore extends Item if (power != 0) { if (power <= this.getMaxCharge() / 3) - color = "\u00a74"; + color = "\u00a74"; else if (power > this.getMaxCharge() * 2 / 3) - color = "\u00a72"; + color = "\u00a72"; else color = "\u00a76"; } - + String charge = new StringBuilder().append(color).append(tags.getInteger("charge")).append("/").append(getMaxCharge()).append(" En").toString(); list.add(charge); } @@ -230,17 +320,17 @@ public abstract class ToolCore extends Item String bindingName = getAbilityNameForType(binding); if (!bindingName.equals("") && binding != head && binding != handle) list.add(getColorCodeForType(binding) + bindingName); - + String reinforced = getReinforcedName(head, handle, binding); if (!reinforced.equals("")) list.add(reinforced); - + boolean displayToolTips = true; int tipNum = 0; while (displayToolTips) { tipNum++; - String tooltip = "Tooltip"+tipNum; + String tooltip = "Tooltip" + tipNum; if (tags.getCompoundTag("InfiTool").hasKey(tooltip)) { String tipName = tags.getCompoundTag("InfiTool").getString(tooltip); @@ -331,24 +421,22 @@ public abstract class ToolCore extends Item return ""; } } - + //This method is temporary - public static String getReinforcedName(int head, int handle, int accessory) + public static String getReinforcedName (int head, int handle, int accessory) { if (head == 7 || handle == 7 || accessory == 7) return "\u00A7dReinforced III"; - else if (head == 11 || handle == 11 || accessory == 11) + else if (head == 11 || handle == 11 || accessory == 11) return "\u00A73Reinforced II"; - else if (head == 3 || handle == 3 || accessory == 3) + else if (head == 3 || handle == 3 || accessory == 3) return "\u00A7fReinforced I"; - else if (head == 15 || handle == 15 || accessory == 15) + else if (head == 15 || handle == 15 || accessory == 15) return "\u00A76Reinforced I"; return ""; } - - static String[] toolMaterialNames = { - "Wooden ", "Stone ", "Iron ", "Flint ", "Cactus ", "Bone ", "Obsidian ", "Nethrrack ", "Slime ", "Paper ", "Cobalt ", "Ardite ", "Manyullyn " , "Copper ", "Bronze " - }; + + static String[] toolMaterialNames = { "Wooden ", "Stone ", "Iron ", "Flint ", "Cactus ", "Bone ", "Obsidian ", "Nethrrack ", "Slime ", "Paper ", "Cobalt ", "Ardite ", "Manyullyn ", "Copper ", "Bronze " }; /* Creative mode tools */ public void getSubItems (int id, CreativeTabs tab, List list) @@ -357,21 +445,22 @@ public abstract class ToolCore extends Item { Item accessory = getAccessoryItem(); ItemStack accessoryStack = accessory != null ? new ItemStack(getAccessoryItem(), 1, i) : null; - ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, i), new ItemStack(getHandleItem(), 1, i), accessoryStack, toolMaterialNames[i]+getToolName()); + ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, i), new ItemStack(getHandleItem(), 1, i), accessoryStack, toolMaterialNames[i] + getToolName()); tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true); - list.add( tool ); + list.add(tool); } } - protected abstract Item getHeadItem(); - protected abstract Item getAccessoryItem(); - - protected Item getHandleItem() + protected abstract Item getHeadItem (); + + protected abstract Item getAccessoryItem (); + + protected Item getHandleItem () { return TConstructContent.toolRod; } - - public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5) + + public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boolean par5) { if (entity instanceof EntityLiving) { @@ -381,7 +470,7 @@ public abstract class ToolCore extends Item int chance = tags.getInteger("Moss"); if (random.nextInt(800) < chance) { - AbilityHelper.damageTool(stack, -1, (EntityLiving)entity, true); + AbilityHelper.damageTool(stack, -1, (EntityLiving) entity, true); } } } @@ -389,14 +478,14 @@ public abstract class ToolCore extends Item /* Tool uses */ @Override - public boolean onBlockStartBreak(ItemStack stack, int x, int y, int z, EntityPlayer player) + public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPlayer player) { NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); World world = player.worldObj; int bID = player.worldObj.getBlockId(x, y, z); int meta = world.getBlockMetadata(x, y, z); Block block = Block.blocksList[bID]; - + if (tags.getBoolean("Lava") && block.quantityDropped(meta, 0, random) != 0) { ItemStack result = FurnaceRecipes.smelting().getSmeltingResult(new ItemStack(block.idDropped(bID, random, 0), 1, block.damageDropped(meta))); @@ -408,8 +497,8 @@ public abstract class ToolCore extends Item onBlockDestroyed(stack, world, bID, x, y, z, player); if (!world.isRemote) { - EntityItem entityitem = new EntityItem(world, x+0.5, y+0.5, z+0.5, result.copy()); - + EntityItem entityitem = new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, result.copy()); + entityitem.delayBeforeCanPickup = 10; world.spawnEntityInWorld(entityitem); world.playAuxSFX(2001, x, y, z, bID + (meta << 12)); @@ -417,10 +506,10 @@ public abstract class ToolCore extends Item return true; } } - + return false; } - + @Override public boolean onBlockDestroyed (ItemStack itemstack, World world, int bID, int x, int y, int z, EntityLiving player) { @@ -449,35 +538,35 @@ public abstract class ToolCore extends Item { return false; } - + @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) - { + public boolean getIsRepairable (ItemStack par1ItemStack, ItemStack par2ItemStack) + { return false; - } + } /* Attacking */ @Override - public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) + public boolean onLeftClickEntity (ItemStack stack, EntityPlayer player, Entity entity) { AbilityHelper.onLeftClickEntity(stack, player, entity, this); - return true; + return true; } - - public boolean pierceArmor() + + public boolean pierceArmor () { return false; } - - public float chargeAttack() + + public float chargeAttack () { return 1f; } - - public int getDamageVsEntity(Entity par1Entity) //Redundant - { - return this.damageVsEntity; - } + + public int getDamageVsEntity (Entity par1Entity) //Redundant + { + return this.damageVsEntity; + } /* Enchanting */ public int getItemEnchantability () @@ -490,11 +579,11 @@ public abstract class ToolCore extends Item { return 1f; } - - public boolean isFull3D() - { - return true; - } + + public boolean isFull3D () + { + return true; + } /* * IC2 Support @@ -548,7 +637,7 @@ public abstract class ToolCore extends Item NBTTagCompound tags = stack.getTagCompound(); if (!tags.hasKey("charge")) //|| !tags.getCompoundTag("InfiTool").getBoolean("Electric")) return 0; - + if (amount > 0) { if (amount > getTransferLimit() && !ignoreTransferLimit) @@ -573,7 +662,7 @@ public abstract class ToolCore extends Item return amount; } - + else return 0; } @@ -584,7 +673,7 @@ public abstract class ToolCore extends Item NBTTagCompound tags = stack.getTagCompound(); if (!tags.hasKey("charge"))// || !tags.getCompoundTag("InfiTool").getBoolean("Electric")) return 0; - + if (amount > 0) { if (amount > getTransferLimit() && !ignoreTransferLimit) @@ -609,7 +698,7 @@ public abstract class ToolCore extends Item return amount; } - + else return 0; } @@ -617,20 +706,19 @@ public abstract class ToolCore extends Item @Override public boolean canUse (ItemStack itemStack, int amount) { - //TODO: Investigate this return false; } - + @Override public boolean canShowChargeToolTip (ItemStack itemStack) { return false; } - + /* Universal Electricity Support - * Temporarily disabled due to bugginess + * Disabled due to Calclavia changing UE's api too often */ - + /*@Override public double getJoules (Object... data) { diff --git a/tinker/tconstruct/tools/Weapon.java b/tinker/tconstruct/tools/Weapon.java index d930f963..1fc95ffe 100644 --- a/tinker/tconstruct/tools/Weapon.java +++ b/tinker/tconstruct/tools/Weapon.java @@ -1,6 +1,6 @@ package tinker.tconstruct.tools; -import tinker.tconstruct.EnumMaterial; +import tinker.tconstruct.ToolMaterial; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer;