diff --git a/src/main/java/techreborn/client/RegisterItemJsons.java b/src/main/java/techreborn/client/RegisterItemJsons.java index 489c24771..2e2ee97ae 100644 --- a/src/main/java/techreborn/client/RegisterItemJsons.java +++ b/src/main/java/techreborn/client/RegisterItemJsons.java @@ -52,9 +52,9 @@ public class RegisterItemJsons { private static void registerItems() { // Armor - register(TRItems.CLOAKING_DEVICE, "tool/cloaking_device"); - register(TRItems.LAPOTRONIC_ORBPACK, "tool/lapotronic_orbpack"); - register(TRItems.LITHIUM_ION_BATPACK, "tool/lithium_batpack"); + register(TRItems.CLOAKING_DEVICE, "armor/cloaking_device"); + register(TRItems.LAPOTRONIC_ORBPACK, "armor/lapotronic_orbpack"); + register(TRItems.LITHIUM_ION_BATPACK, "armor/lithium_batpack"); // Battery register(TRItems.RED_CELL_BATTERY, "battery/re_battery"); @@ -67,7 +67,7 @@ public class RegisterItemJsons { register(TRItems.INDUSTRIAL_CHAINSAW, "tool/industrial_chainsaw"); register(TRItems.INDUSTRIAL_DRILL, "tool/industrial_drill"); register(TRItems.INDUSTRIAL_JACKHAMMER, "tool/industrial_jackhammer"); - register(TRItems.DEBUG_TOOL, "misc/debug"); + register(TRItems.DEBUG_TOOL, "tool/debug"); register(TRItems.ADVANCED_CHAINSAW, "tool/advanced_chainsaw"); register(TRItems.ADVANCED_DRILL, "tool/advanced_drill"); register(TRItems.ADVANCED_JACKHAMMER, "tool/advanced_jackhammer"); @@ -89,43 +89,43 @@ public class RegisterItemJsons { // Gem armor & tools if (ConfigTechReborn.enableGemArmorAndTools) { - registerBlockstateMultiItem(TRItems.RUBY_HELMET, "ruby_helmet", "items/tool/armour"); - registerBlockstateMultiItem(TRItems.RUBY_CHESTPLATE, "ruby_chestplate", "items/tool/armour"); - registerBlockstateMultiItem(TRItems.RUBY_LEGGINGS, "ruby_leggings", "items/tool/armour"); - registerBlockstateMultiItem(TRItems.RUBY_BOOTS, "ruby_boots", "items/tool/armour"); - registerBlockstateMultiItem(TRItems.SAPPHIRE_HELMET, "sapphire_helmet", "items/tool/armour"); - registerBlockstateMultiItem(TRItems.SAPPHIRE_CHESTPLATE, "sapphire_chestplate", "items/tool/armour"); - registerBlockstateMultiItem(TRItems.SAPPHIRE_LEGGINGS, "sapphire_leggings", "items/tool/armour"); - registerBlockstateMultiItem(TRItems.SAPPHIRE_BOOTS, "sapphire_boots", "items/tool/armour"); - registerBlockstateMultiItem(TRItems.PERIDOT_HELMET, "peridot_helmet", "items/tool/armour"); - registerBlockstateMultiItem(TRItems.PERIDOT_CHESTPLATE, "peridot_chestplate", "items/tool/armour"); - registerBlockstateMultiItem(TRItems.PERIDOT_LEGGINGS, "peridot_leggings", "items/tool/armour"); - registerBlockstateMultiItem(TRItems.PERIDOT_BOOTS, "peridot_boots", "items/tool/armour"); - registerBlockstateMultiItem(TRItems.BRONZE_HELMET, "bronze_helmet", "items/tool/armour"); - registerBlockstateMultiItem(TRItems.BRONZE_CHESTPLATE, "bronze_chestplate", "items/tool/armour"); - registerBlockstateMultiItem(TRItems.BRONZE_LEGGINGS, "bronze_leggings", "items/tool/armour"); - registerBlockstateMultiItem(TRItems.BRONZE_BOOTS, "bronze_boots", "items/tool/armour"); + registerBlockstateMultiItem(TRItems.RUBY_HELMET, "ruby_helmet", "items/armour"); + registerBlockstateMultiItem(TRItems.RUBY_CHESTPLATE, "ruby_chestplate", "items/armour"); + registerBlockstateMultiItem(TRItems.RUBY_LEGGINGS, "ruby_leggings", "items/armour"); + registerBlockstateMultiItem(TRItems.RUBY_BOOTS, "ruby_boots", "items/armour"); + registerBlockstateMultiItem(TRItems.SAPPHIRE_HELMET, "sapphire_helmet", "items/armour"); + registerBlockstateMultiItem(TRItems.SAPPHIRE_CHESTPLATE, "sapphire_chestplate", "items/armour"); + registerBlockstateMultiItem(TRItems.SAPPHIRE_LEGGINGS, "sapphire_leggings", "items/armour"); + registerBlockstateMultiItem(TRItems.SAPPHIRE_BOOTS, "sapphire_boots", "items/armour"); + registerBlockstateMultiItem(TRItems.PERIDOT_HELMET, "peridot_helmet", "items/armour"); + registerBlockstateMultiItem(TRItems.PERIDOT_CHESTPLATE, "peridot_chestplate", "items/armour"); + registerBlockstateMultiItem(TRItems.PERIDOT_LEGGINGS, "peridot_leggings", "items/armour"); + registerBlockstateMultiItem(TRItems.PERIDOT_BOOTS, "peridot_boots", "items/armour"); + registerBlockstateMultiItem(TRItems.BRONZE_HELMET, "bronze_helmet", "items/armour"); + registerBlockstateMultiItem(TRItems.BRONZE_CHESTPLATE, "bronze_chestplate", "items/armour"); + registerBlockstateMultiItem(TRItems.BRONZE_LEGGINGS, "bronze_leggings", "items/armour"); + registerBlockstateMultiItem(TRItems.BRONZE_BOOTS, "bronze_boots", "items/armour"); - registerBlockstateMultiItem(TRItems.RUBY_PICKAXE, "ruby_pickaxe", "items/tool/tool"); - registerBlockstateMultiItem(TRItems.RUBY_SWORD, "ruby_sword", "items/tool/tool"); - registerBlockstateMultiItem(TRItems.RUBY_AXE, "ruby_axe", "items/tool/tool"); - registerBlockstateMultiItem(TRItems.RUBY_SPADE, "ruby_spade", "items/tool/tool"); - registerBlockstateMultiItem(TRItems.RUBY_HOE, "ruby_hoe", "items/tool/tool"); - registerBlockstateMultiItem(TRItems.SAPPHIRE_PICKAXE, "sapphire_pickaxe", "items/tool/tool"); - registerBlockstateMultiItem(TRItems.SAPPHIRE_SWORD, "sapphire_sword", "items/tool/tool"); - registerBlockstateMultiItem(TRItems.SAPPHIRE_AXE, "sapphire_axe", "items/tool/tool"); - registerBlockstateMultiItem(TRItems.SAPPHIRE_SPADE, "sapphire_spade", "items/tool/tool"); - registerBlockstateMultiItem(TRItems.SAPPHIRE_HOE, "sapphire_hoe", "items/tool/tool"); - registerBlockstateMultiItem(TRItems.PERIDOT_PICKAXE, "peridot_pickaxe", "items/tool/tool"); - registerBlockstateMultiItem(TRItems.PERIDOT_SWORD, "peridot_sword", "items/tool/tool"); - registerBlockstateMultiItem(TRItems.PERIDOT_AXE, "peridot_axe", "items/tool/tool"); - registerBlockstateMultiItem(TRItems.PERIDOT_SPADE, "peridot_spade", "items/tool/tool"); - registerBlockstateMultiItem(TRItems.PERIDOT_HOE, "peridot_hoe", "items/tool/tool"); - registerBlockstateMultiItem(TRItems.BRONZE_PICKAXE, "bronze_pickaxe", "items/tool/tool"); - registerBlockstateMultiItem(TRItems.BRONZE_SWORD, "bronze_sword", "items/tool/tool"); - registerBlockstateMultiItem(TRItems.BRONZE_AXE, "bronze_axe", "items/tool/tool"); - registerBlockstateMultiItem(TRItems.BRONZE_SPADE, "bronze_spade", "items/tool/tool"); - registerBlockstateMultiItem(TRItems.BRONZE_HOE, "bronze_hoe", "items/tool/tool"); + registerBlockstateMultiItem(TRItems.RUBY_PICKAXE, "ruby_pickaxe", "items/tool"); + registerBlockstateMultiItem(TRItems.RUBY_SWORD, "ruby_sword", "items/tool"); + registerBlockstateMultiItem(TRItems.RUBY_AXE, "ruby_axe", "items/tool"); + registerBlockstateMultiItem(TRItems.RUBY_SPADE, "ruby_spade", "items/tool"); + registerBlockstateMultiItem(TRItems.RUBY_HOE, "ruby_hoe", "items/tool"); + registerBlockstateMultiItem(TRItems.SAPPHIRE_PICKAXE, "sapphire_pickaxe", "items/tool"); + registerBlockstateMultiItem(TRItems.SAPPHIRE_SWORD, "sapphire_sword", "items/tool"); + registerBlockstateMultiItem(TRItems.SAPPHIRE_AXE, "sapphire_axe", "items/tool"); + registerBlockstateMultiItem(TRItems.SAPPHIRE_SPADE, "sapphire_spade", "items/tool"); + registerBlockstateMultiItem(TRItems.SAPPHIRE_HOE, "sapphire_hoe", "items/tool"); + registerBlockstateMultiItem(TRItems.PERIDOT_PICKAXE, "peridot_pickaxe", "items/tool"); + registerBlockstateMultiItem(TRItems.PERIDOT_SWORD, "peridot_sword", "items/tool"); + registerBlockstateMultiItem(TRItems.PERIDOT_AXE, "peridot_axe", "items/tool"); + registerBlockstateMultiItem(TRItems.PERIDOT_SPADE, "peridot_spade", "items/tool"); + registerBlockstateMultiItem(TRItems.PERIDOT_HOE, "peridot_hoe", "items/tool"); + registerBlockstateMultiItem(TRItems.BRONZE_PICKAXE, "bronze_pickaxe", "items/tool"); + registerBlockstateMultiItem(TRItems.BRONZE_SWORD, "bronze_sword", "items/tool"); + registerBlockstateMultiItem(TRItems.BRONZE_AXE, "bronze_axe", "items/tool"); + registerBlockstateMultiItem(TRItems.BRONZE_SPADE, "bronze_spade", "items/tool"); + registerBlockstateMultiItem(TRItems.BRONZE_HOE, "bronze_hoe", "items/tool"); } register(ModBlocks.RUBBER_SAPLING, "misc/rubber_sapling"); diff --git a/src/main/resources/assets/techreborn/blockstates/items/tool/armour.json b/src/main/resources/assets/techreborn/blockstates/items/armour.json similarity index 56% rename from src/main/resources/assets/techreborn/blockstates/items/tool/armour.json rename to src/main/resources/assets/techreborn/blockstates/items/armour.json index 9dab8c2fa..eaa132dab 100644 --- a/src/main/resources/assets/techreborn/blockstates/items/tool/armour.json +++ b/src/main/resources/assets/techreborn/blockstates/items/armour.json @@ -8,82 +8,82 @@ "type": { "ruby_helmet": { "textures": { - "layer0": "techreborn:items/tool/ruby_helmet" + "layer0": "techreborn:items/armor/ruby_helmet" } }, "ruby_chestplate": { "textures": { - "layer0": "techreborn:items/tool/ruby_chestplate" + "layer0": "techreborn:items/armor/ruby_chestplate" } }, "ruby_leggings": { "textures": { - "layer0": "techreborn:items/tool/ruby_leggings" + "layer0": "techreborn:items/armor/ruby_leggings" } }, "ruby_boots": { "textures": { - "layer0": "techreborn:items/tool/ruby_boots" + "layer0": "techreborn:items/armor/ruby_boots" } }, "sapphire_helmet": { "textures": { - "layer0": "techreborn:items/tool/sapphire_helmet" + "layer0": "techreborn:items/armor/sapphire_helmet" } }, "sapphire_chestplate": { "textures": { - "layer0": "techreborn:items/tool/sapphire_chestplate" + "layer0": "techreborn:items/armor/sapphire_chestplate" } }, "sapphire_leggings": { "textures": { - "layer0": "techreborn:items/tool/sapphire_leggings" + "layer0": "techreborn:items/armor/sapphire_leggings" } }, "sapphire_boots": { "textures": { - "layer0": "techreborn:items/tool/sapphire_boots" + "layer0": "techreborn:items/armor/sapphire_boots" } }, "peridot_helmet": { "textures": { - "layer0": "techreborn:items/tool/peridot_helmet" + "layer0": "techreborn:items/armor/peridot_helmet" } }, "peridot_chestplate": { "textures": { - "layer0": "techreborn:items/tool/peridot_chestplate" + "layer0": "techreborn:items/armor/peridot_chestplate" } }, "peridot_leggings": { "textures": { - "layer0": "techreborn:items/tool/peridot_leggings" + "layer0": "techreborn:items/armor/peridot_leggings" } }, "peridot_boots": { "textures": { - "layer0": "techreborn:items/tool/peridot_boots" + "layer0": "techreborn:items/armor/peridot_boots" } }, "bronze_helmet": { "textures": { - "layer0": "techreborn:items/tool/bronze_helmet" + "layer0": "techreborn:items/armor/bronze_helmet" } }, "bronze_chestplate": { "textures": { - "layer0": "techreborn:items/tool/bronze_chestplate" + "layer0": "techreborn:items/armor/bronze_chestplate" } }, "bronze_leggings": { "textures": { - "layer0": "techreborn:items/tool/bronze_leggings" + "layer0": "techreborn:items/armor/bronze_leggings" } }, "bronze_boots": { "textures": { - "layer0": "techreborn:items/tool/bronze_boots" + "layer0": "techreborn:items/armor/bronze_boots" } } } diff --git a/src/main/resources/assets/techreborn/blockstates/items/tool/tool.json b/src/main/resources/assets/techreborn/blockstates/items/tool.json similarity index 100% rename from src/main/resources/assets/techreborn/blockstates/items/tool/tool.json rename to src/main/resources/assets/techreborn/blockstates/items/tool.json diff --git a/src/main/resources/assets/techreborn/models/item/tool/cloaking_device.json b/src/main/resources/assets/techreborn/models/item/armor/cloaking_device.json similarity index 55% rename from src/main/resources/assets/techreborn/models/item/tool/cloaking_device.json rename to src/main/resources/assets/techreborn/models/item/armor/cloaking_device.json index 368c14ad6..e3ad36d3e 100644 --- a/src/main/resources/assets/techreborn/models/item/tool/cloaking_device.json +++ b/src/main/resources/assets/techreborn/models/item/armor/cloaking_device.json @@ -1,6 +1,6 @@ { "parent": "techreborn:item/techrebornItem", "textures": { - "layer0": "techreborn:items/tool/cloaking_device" + "layer0": "techreborn:items/armor/cloaking_device" } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/lapotronic_orbpack.json b/src/main/resources/assets/techreborn/models/item/armor/lapotronic_orbpack.json similarity index 54% rename from src/main/resources/assets/techreborn/models/item/tool/lapotronic_orbpack.json rename to src/main/resources/assets/techreborn/models/item/armor/lapotronic_orbpack.json index c6ce60aae..6593ccf00 100644 --- a/src/main/resources/assets/techreborn/models/item/tool/lapotronic_orbpack.json +++ b/src/main/resources/assets/techreborn/models/item/armor/lapotronic_orbpack.json @@ -1,6 +1,6 @@ { "parent": "techreborn:item/techrebornItem", "textures": { - "layer0": "techreborn:items/tool/lapotronic_orbpack" + "layer0": "techreborn:items/armor/lapotronic_orbpack" } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/lithium_batpack.json b/src/main/resources/assets/techreborn/models/item/armor/lithium_batpack.json similarity index 55% rename from src/main/resources/assets/techreborn/models/item/tool/lithium_batpack.json rename to src/main/resources/assets/techreborn/models/item/armor/lithium_batpack.json index b35c7e36b..d27b018a5 100644 --- a/src/main/resources/assets/techreborn/models/item/tool/lithium_batpack.json +++ b/src/main/resources/assets/techreborn/models/item/armor/lithium_batpack.json @@ -1,6 +1,6 @@ { "parent": "techreborn:item/techrebornItem", "textures": { - "layer0": "techreborn:items/tool/lithium_batpack" + "layer0": "techreborn:items/armor/lithium_batpack" } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/misc/debug.json b/src/main/resources/assets/techreborn/models/item/tool/debug.json similarity index 61% rename from src/main/resources/assets/techreborn/models/item/misc/debug.json rename to src/main/resources/assets/techreborn/models/item/tool/debug.json index f0a120650..00a39171a 100644 --- a/src/main/resources/assets/techreborn/models/item/misc/debug.json +++ b/src/main/resources/assets/techreborn/models/item/tool/debug.json @@ -1,6 +1,6 @@ { "parent": "techreborn:item/techrebornItem", "textures": { - "layer0": "techreborn:items/misc/debug" + "layer0": "techreborn:items/tool/debug" } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/items/tool/bronze_boots.png b/src/main/resources/assets/techreborn/textures/items/armor/bronze_boots.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/bronze_boots.png rename to src/main/resources/assets/techreborn/textures/items/armor/bronze_boots.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/bronze_chestplate.png b/src/main/resources/assets/techreborn/textures/items/armor/bronze_chestplate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/bronze_chestplate.png rename to src/main/resources/assets/techreborn/textures/items/armor/bronze_chestplate.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/bronze_helmet.png b/src/main/resources/assets/techreborn/textures/items/armor/bronze_helmet.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/bronze_helmet.png rename to src/main/resources/assets/techreborn/textures/items/armor/bronze_helmet.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/bronze_leggings.png b/src/main/resources/assets/techreborn/textures/items/armor/bronze_leggings.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/bronze_leggings.png rename to src/main/resources/assets/techreborn/textures/items/armor/bronze_leggings.png diff --git a/src/main/resources/assets/techreborn/textures/models/cloaking.png b/src/main/resources/assets/techreborn/textures/items/armor/cloaking.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/models/cloaking.png rename to src/main/resources/assets/techreborn/textures/items/armor/cloaking.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/cloaking_device.png b/src/main/resources/assets/techreborn/textures/items/armor/cloaking_device.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/cloaking_device.png rename to src/main/resources/assets/techreborn/textures/items/armor/cloaking_device.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/lapotronic_orbpack.png b/src/main/resources/assets/techreborn/textures/items/armor/lapotronic_orbpack.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/lapotronic_orbpack.png rename to src/main/resources/assets/techreborn/textures/items/armor/lapotronic_orbpack.png diff --git a/src/main/resources/assets/techreborn/textures/models/lapotronpack.png b/src/main/resources/assets/techreborn/textures/items/armor/lapotronpack.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/models/lapotronpack.png rename to src/main/resources/assets/techreborn/textures/items/armor/lapotronpack.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/lithium_batpack.png b/src/main/resources/assets/techreborn/textures/items/armor/lithium_batpack.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/lithium_batpack.png rename to src/main/resources/assets/techreborn/textures/items/armor/lithium_batpack.png diff --git a/src/main/resources/assets/techreborn/textures/models/lithiumbatpack.png b/src/main/resources/assets/techreborn/textures/items/armor/lithiumbatpack.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/models/lithiumbatpack.png rename to src/main/resources/assets/techreborn/textures/items/armor/lithiumbatpack.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/peridot_boots.png b/src/main/resources/assets/techreborn/textures/items/armor/peridot_boots.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/peridot_boots.png rename to src/main/resources/assets/techreborn/textures/items/armor/peridot_boots.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/peridot_chestplate.png b/src/main/resources/assets/techreborn/textures/items/armor/peridot_chestplate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/peridot_chestplate.png rename to src/main/resources/assets/techreborn/textures/items/armor/peridot_chestplate.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/peridot_helmet.png b/src/main/resources/assets/techreborn/textures/items/armor/peridot_helmet.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/peridot_helmet.png rename to src/main/resources/assets/techreborn/textures/items/armor/peridot_helmet.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/peridot_leggings.png b/src/main/resources/assets/techreborn/textures/items/armor/peridot_leggings.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/peridot_leggings.png rename to src/main/resources/assets/techreborn/textures/items/armor/peridot_leggings.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/ruby_boots.png b/src/main/resources/assets/techreborn/textures/items/armor/ruby_boots.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/ruby_boots.png rename to src/main/resources/assets/techreborn/textures/items/armor/ruby_boots.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/ruby_chestplate.png b/src/main/resources/assets/techreborn/textures/items/armor/ruby_chestplate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/ruby_chestplate.png rename to src/main/resources/assets/techreborn/textures/items/armor/ruby_chestplate.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/ruby_helmet.png b/src/main/resources/assets/techreborn/textures/items/armor/ruby_helmet.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/ruby_helmet.png rename to src/main/resources/assets/techreborn/textures/items/armor/ruby_helmet.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/ruby_leggings.png b/src/main/resources/assets/techreborn/textures/items/armor/ruby_leggings.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/ruby_leggings.png rename to src/main/resources/assets/techreborn/textures/items/armor/ruby_leggings.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/sapphire_boots.png b/src/main/resources/assets/techreborn/textures/items/armor/sapphire_boots.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/sapphire_boots.png rename to src/main/resources/assets/techreborn/textures/items/armor/sapphire_boots.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/sapphire_chestplate.png b/src/main/resources/assets/techreborn/textures/items/armor/sapphire_chestplate.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/sapphire_chestplate.png rename to src/main/resources/assets/techreborn/textures/items/armor/sapphire_chestplate.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/sapphire_helmet.png b/src/main/resources/assets/techreborn/textures/items/armor/sapphire_helmet.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/sapphire_helmet.png rename to src/main/resources/assets/techreborn/textures/items/armor/sapphire_helmet.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/sapphire_leggings.png b/src/main/resources/assets/techreborn/textures/items/armor/sapphire_leggings.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/sapphire_leggings.png rename to src/main/resources/assets/techreborn/textures/items/armor/sapphire_leggings.png diff --git a/src/main/resources/assets/techreborn/textures/items/misc/debug.png b/src/main/resources/assets/techreborn/textures/items/tool/debug.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/misc/debug.png rename to src/main/resources/assets/techreborn/textures/items/tool/debug.png diff --git a/src/main/resources/assets/techreborn/textures/items/misc/debug.png.mcmeta b/src/main/resources/assets/techreborn/textures/items/tool/debug.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/misc/debug.png.mcmeta rename to src/main/resources/assets/techreborn/textures/items/tool/debug.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/models/armor/bronze_layer_1.png b/src/main/resources/assets/techreborn/textures/models/armor/bronze_layer_1.png deleted file mode 100644 index ab22ed870..000000000 Binary files a/src/main/resources/assets/techreborn/textures/models/armor/bronze_layer_1.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/models/armor/bronze_layer_2.png b/src/main/resources/assets/techreborn/textures/models/armor/bronze_layer_2.png deleted file mode 100644 index 43b307ccd..000000000 Binary files a/src/main/resources/assets/techreborn/textures/models/armor/bronze_layer_2.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/models/armor/peridot_layer_1.png b/src/main/resources/assets/techreborn/textures/models/armor/peridot_layer_1.png deleted file mode 100644 index 23f8e95c9..000000000 Binary files a/src/main/resources/assets/techreborn/textures/models/armor/peridot_layer_1.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/models/armor/peridot_layer_2.png b/src/main/resources/assets/techreborn/textures/models/armor/peridot_layer_2.png deleted file mode 100644 index 76500a144..000000000 Binary files a/src/main/resources/assets/techreborn/textures/models/armor/peridot_layer_2.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/models/armor/ruby_layer_1.png b/src/main/resources/assets/techreborn/textures/models/armor/ruby_layer_1.png deleted file mode 100644 index 12a603511..000000000 Binary files a/src/main/resources/assets/techreborn/textures/models/armor/ruby_layer_1.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/models/armor/ruby_layer_2.png b/src/main/resources/assets/techreborn/textures/models/armor/ruby_layer_2.png deleted file mode 100644 index 2e58c32a2..000000000 Binary files a/src/main/resources/assets/techreborn/textures/models/armor/ruby_layer_2.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/models/armor/sapphire_layer_1.png b/src/main/resources/assets/techreborn/textures/models/armor/sapphire_layer_1.png deleted file mode 100644 index 8d64113f8..000000000 Binary files a/src/main/resources/assets/techreborn/textures/models/armor/sapphire_layer_1.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/models/armor/sapphire_layer_2.png b/src/main/resources/assets/techreborn/textures/models/armor/sapphire_layer_2.png deleted file mode 100644 index bd6caa287..000000000 Binary files a/src/main/resources/assets/techreborn/textures/models/armor/sapphire_layer_2.png and /dev/null differ