Reorganised tool namespace and assets

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( ) );
 	}
 

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" );
 	}
 
 

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" );
 	}
 
 

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" );
 	}
 
 

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" );
 	}
 
 

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
+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

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"
     }
 }

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"
     }
 }

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"
     }
 }

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"
     }
 }

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"
     }
 }

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"
     }
 }

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"
     }
 }

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"
     }
 }