diff --git a/src/java/mmm/tech/tools/TTArmor.java b/src/java/mmm/tech/tools/TTArmor.java index 5c7282a..6836818 100644 --- a/src/java/mmm/tech/tools/TTArmor.java +++ b/src/java/mmm/tech/tools/TTArmor.java @@ -18,7 +18,7 @@ public class TTArmor public TTArmor( final ArmorMaterial materialIn , final EntityEquipmentSlot equipmentSlotIn ) { super( materialIn , materialIn.ordinal( ) , equipmentSlotIn ); - URegistry.setIdentifiers( this , "tech" , "tools" , "armor" , materialIn.toString( ).toLowerCase( ) , + URegistry.setIdentifiers( this , "tech" , "tools" , materialIn.toString( ).toLowerCase( ) , "armor" , equipmentSlotIn.getName( ) ); } diff --git a/src/java/mmm/tech/tools/TTAxe.java b/src/java/mmm/tech/tools/TTAxe.java index c48ccea..259de55 100644 --- a/src/java/mmm/tech/tools/TTAxe.java +++ b/src/java/mmm/tech/tools/TTAxe.java @@ -18,7 +18,7 @@ public class TTAxe public TTAxe( final ToolMaterial material , float damage , float attackSpeed ) { super( material , damage , attackSpeed ); - URegistry.setIdentifiers( this , "tech" , "tools" , "axe" , material.toString( ).toLowerCase( ) ); + URegistry.setIdentifiers( this , "tech" , "tools" , material.toString( ).toLowerCase( ) , "axe" ); } diff --git a/src/java/mmm/tech/tools/TTPickaxe.java b/src/java/mmm/tech/tools/TTPickaxe.java index 1049f35..4a3285c 100644 --- a/src/java/mmm/tech/tools/TTPickaxe.java +++ b/src/java/mmm/tech/tools/TTPickaxe.java @@ -18,7 +18,7 @@ public class TTPickaxe public TTPickaxe( final ToolMaterial material ) { super( material ); - URegistry.setIdentifiers( this , "tech" , "tools" , "pickaxe" , material.toString( ).toLowerCase( ) ); + URegistry.setIdentifiers( this , "tech" , "tools" , material.toString( ).toLowerCase( ) , "pickaxe" ); } diff --git a/src/java/mmm/tech/tools/TTShovel.java b/src/java/mmm/tech/tools/TTShovel.java index f2244b7..3ca5716 100644 --- a/src/java/mmm/tech/tools/TTShovel.java +++ b/src/java/mmm/tech/tools/TTShovel.java @@ -17,7 +17,7 @@ public class TTShovel public TTShovel( final ToolMaterial material ) { super( material ); - URegistry.setIdentifiers( this , "tech" , "tools" , "shovel" , material.toString( ).toLowerCase( ) ); + URegistry.setIdentifiers( this , "tech" , "tools" , material.toString( ).toLowerCase( ) , "shovel" ); } diff --git a/src/java/mmm/tech/tools/TTSword.java b/src/java/mmm/tech/tools/TTSword.java index af3cb29..e71f8f1 100644 --- a/src/java/mmm/tech/tools/TTSword.java +++ b/src/java/mmm/tech/tools/TTSword.java @@ -21,7 +21,7 @@ public class TTSword { super( material ); this.material = material; - URegistry.setIdentifiers( this , "tech" , "tools" , "sword" , material.toString( ).toLowerCase( ) ); + URegistry.setIdentifiers( this , "tech" , "tools" , material.toString( ).toLowerCase( ) , "sword" ); } diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang index ad4518c..319a280 100644 --- a/src/resources/assets/mmm/lang/en_US.lang +++ b/src/resources/assets/mmm/lang/en_US.lang @@ -32,12 +32,11 @@ tile.mmm.materials.ore.malachite.name=Malachite Ore item.mmm.materials.stone.cuprite.name=Cuprite tile.mmm.materials.ore.cuprite.name=Cuprite Ore -item.mmm.tech.tools.shovel.copper.name=Copper Shovel -item.mmm.tech.tools.axe.copper.name=Copper Axe -item.mmm.tech.tools.pickaxe.copper.name=Copper Pickaxe -item.mmm.tech.tools.sword.copper.name=Copper Sword - -item.mmm.tech.tools.armor.copper.feet.name=Copper Boots -item.mmm.tech.tools.armor.copper.legs.name=Copper Leggings -item.mmm.tech.tools.armor.copper.chest.name=Copper Chestplate -item.mmm.tech.tools.armor.copper.head.name=Copper Helmet \ No newline at end of file +item.mmm.tech.tools.copper.shovel.name=Copper Shovel +item.mmm.tech.tools.copper.axe.name=Copper Axe +item.mmm.tech.tools.copper.pickaxe.name=Copper Pickaxe +item.mmm.tech.tools.copper.sword.name=Copper Sword +item.mmm.tech.tools.copper.armor.feet.name=Copper Boots +item.mmm.tech.tools.copper.armor.legs.name=Copper Leggings +item.mmm.tech.tools.copper.armor.chest.name=Copper Chestplate +item.mmm.tech.tools.copper.armor.head.name=Copper Helmet \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/armor/copper/chest.json b/src/resources/assets/mmm/models/item/tech/tools/copper/armor/chest.json similarity index 52% rename from src/resources/assets/mmm/models/item/tech/tools/armor/copper/chest.json rename to src/resources/assets/mmm/models/item/tech/tools/copper/armor/chest.json index 7655032..be79517 100644 --- a/src/resources/assets/mmm/models/item/tech/tools/armor/copper/chest.json +++ b/src/resources/assets/mmm/models/item/tech/tools/copper/armor/chest.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "mmm:items/tech/tools/armor/copper/chest" + "layer0": "mmm:items/tech/tools/copper/armor/chest" } } \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/armor/copper/feet.json b/src/resources/assets/mmm/models/item/tech/tools/copper/armor/feet.json similarity index 53% rename from src/resources/assets/mmm/models/item/tech/tools/armor/copper/feet.json rename to src/resources/assets/mmm/models/item/tech/tools/copper/armor/feet.json index 395d577..319ac04 100644 --- a/src/resources/assets/mmm/models/item/tech/tools/armor/copper/feet.json +++ b/src/resources/assets/mmm/models/item/tech/tools/copper/armor/feet.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "mmm:items/tech/tools/armor/copper/feet" + "layer0": "mmm:items/tech/tools/copper/armor/feet" } } \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/armor/copper/head.json b/src/resources/assets/mmm/models/item/tech/tools/copper/armor/head.json similarity index 53% rename from src/resources/assets/mmm/models/item/tech/tools/armor/copper/head.json rename to src/resources/assets/mmm/models/item/tech/tools/copper/armor/head.json index 12b3a26..626f6be 100644 --- a/src/resources/assets/mmm/models/item/tech/tools/armor/copper/head.json +++ b/src/resources/assets/mmm/models/item/tech/tools/copper/armor/head.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "mmm:items/tech/tools/armor/copper/head" + "layer0": "mmm:items/tech/tools/copper/armor/head" } } \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/armor/copper/legs.json b/src/resources/assets/mmm/models/item/tech/tools/copper/armor/legs.json similarity index 53% rename from src/resources/assets/mmm/models/item/tech/tools/armor/copper/legs.json rename to src/resources/assets/mmm/models/item/tech/tools/copper/armor/legs.json index e023117..5674394 100644 --- a/src/resources/assets/mmm/models/item/tech/tools/armor/copper/legs.json +++ b/src/resources/assets/mmm/models/item/tech/tools/copper/armor/legs.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "mmm:items/tech/tools/armor/copper/legs" + "layer0": "mmm:items/tech/tools/copper/armor/legs" } } \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/axe/copper.json b/src/resources/assets/mmm/models/item/tech/tools/copper/axe.json similarity index 56% rename from src/resources/assets/mmm/models/item/tech/tools/axe/copper.json rename to src/resources/assets/mmm/models/item/tech/tools/copper/axe.json index 21f32a4..e18e7d6 100644 --- a/src/resources/assets/mmm/models/item/tech/tools/axe/copper.json +++ b/src/resources/assets/mmm/models/item/tech/tools/copper/axe.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "mmm:items/tech/tools/axe/copper" + "layer0": "mmm:items/tech/tools/copper/axe" } } \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/pickaxe/copper.json b/src/resources/assets/mmm/models/item/tech/tools/copper/pickaxe.json similarity index 54% rename from src/resources/assets/mmm/models/item/tech/tools/pickaxe/copper.json rename to src/resources/assets/mmm/models/item/tech/tools/copper/pickaxe.json index 1fa0064..5f8232c 100644 --- a/src/resources/assets/mmm/models/item/tech/tools/pickaxe/copper.json +++ b/src/resources/assets/mmm/models/item/tech/tools/copper/pickaxe.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "mmm:items/tech/tools/pickaxe/copper" + "layer0": "mmm:items/tech/tools/copper/pickaxe" } } \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/shovel/copper.json b/src/resources/assets/mmm/models/item/tech/tools/copper/shovel.json similarity index 54% rename from src/resources/assets/mmm/models/item/tech/tools/shovel/copper.json rename to src/resources/assets/mmm/models/item/tech/tools/copper/shovel.json index 8226775..a1e6533 100644 --- a/src/resources/assets/mmm/models/item/tech/tools/shovel/copper.json +++ b/src/resources/assets/mmm/models/item/tech/tools/copper/shovel.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "mmm:items/tech/tools/shovel/copper" + "layer0": "mmm:items/tech/tools/copper/shovel" } } \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/sword/copper.json b/src/resources/assets/mmm/models/item/tech/tools/copper/sword.json similarity index 55% rename from src/resources/assets/mmm/models/item/tech/tools/sword/copper.json rename to src/resources/assets/mmm/models/item/tech/tools/copper/sword.json index 862a02e..5e95021 100644 --- a/src/resources/assets/mmm/models/item/tech/tools/sword/copper.json +++ b/src/resources/assets/mmm/models/item/tech/tools/copper/sword.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "mmm:items/tech/tools/sword/copper" + "layer0": "mmm:items/tech/tools/copper/sword" } } \ No newline at end of file diff --git a/src/resources/assets/mmm/textures/items/tech/tools/armor/copper/chest.png b/src/resources/assets/mmm/textures/items/tech/tools/copper/armor/chest.png similarity index 100% rename from src/resources/assets/mmm/textures/items/tech/tools/armor/copper/chest.png rename to src/resources/assets/mmm/textures/items/tech/tools/copper/armor/chest.png diff --git a/src/resources/assets/mmm/textures/items/tech/tools/armor/copper/feet.png b/src/resources/assets/mmm/textures/items/tech/tools/copper/armor/feet.png similarity index 100% rename from src/resources/assets/mmm/textures/items/tech/tools/armor/copper/feet.png rename to src/resources/assets/mmm/textures/items/tech/tools/copper/armor/feet.png diff --git a/src/resources/assets/mmm/textures/items/tech/tools/armor/copper/head.png b/src/resources/assets/mmm/textures/items/tech/tools/copper/armor/head.png similarity index 100% rename from src/resources/assets/mmm/textures/items/tech/tools/armor/copper/head.png rename to src/resources/assets/mmm/textures/items/tech/tools/copper/armor/head.png diff --git a/src/resources/assets/mmm/textures/items/tech/tools/armor/copper/legs.png b/src/resources/assets/mmm/textures/items/tech/tools/copper/armor/legs.png similarity index 100% rename from src/resources/assets/mmm/textures/items/tech/tools/armor/copper/legs.png rename to src/resources/assets/mmm/textures/items/tech/tools/copper/armor/legs.png diff --git a/src/resources/assets/mmm/textures/items/tech/tools/axe/copper.png b/src/resources/assets/mmm/textures/items/tech/tools/copper/axe.png similarity index 100% rename from src/resources/assets/mmm/textures/items/tech/tools/axe/copper.png rename to src/resources/assets/mmm/textures/items/tech/tools/copper/axe.png diff --git a/src/resources/assets/mmm/textures/items/tech/tools/pickaxe/copper.png b/src/resources/assets/mmm/textures/items/tech/tools/copper/pickaxe.png similarity index 100% rename from src/resources/assets/mmm/textures/items/tech/tools/pickaxe/copper.png rename to src/resources/assets/mmm/textures/items/tech/tools/copper/pickaxe.png diff --git a/src/resources/assets/mmm/textures/items/tech/tools/shovel/copper.png b/src/resources/assets/mmm/textures/items/tech/tools/copper/shovel.png similarity index 100% rename from src/resources/assets/mmm/textures/items/tech/tools/shovel/copper.png rename to src/resources/assets/mmm/textures/items/tech/tools/copper/shovel.png diff --git a/src/resources/assets/mmm/textures/items/tech/tools/sword/copper.png b/src/resources/assets/mmm/textures/items/tech/tools/copper/sword.png similarity index 100% rename from src/resources/assets/mmm/textures/items/tech/tools/sword/copper.png rename to src/resources/assets/mmm/textures/items/tech/tools/copper/sword.png