Reorganised tool namespace and assets

This commit is contained in:
Emmanuel BENOîT 2016-06-17 09:37:29 +02:00
parent ae8f8ff176
commit cc5c7ad790
22 changed files with 21 additions and 22 deletions

View file

@ -18,7 +18,7 @@ public class TTArmor
public TTArmor( final ArmorMaterial materialIn , final EntityEquipmentSlot equipmentSlotIn ) public TTArmor( final ArmorMaterial materialIn , final EntityEquipmentSlot equipmentSlotIn )
{ {
super( materialIn , materialIn.ordinal( ) , 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( ) ); equipmentSlotIn.getName( ) );
} }

View file

@ -18,7 +18,7 @@ public class TTAxe
public TTAxe( final ToolMaterial material , float damage , float attackSpeed ) public TTAxe( final ToolMaterial material , float damage , float attackSpeed )
{ {
super( material , damage , attackSpeed ); super( material , damage , attackSpeed );
URegistry.setIdentifiers( this , "tech" , "tools" , "axe" , material.toString( ).toLowerCase( ) ); URegistry.setIdentifiers( this , "tech" , "tools" , material.toString( ).toLowerCase( ) , "axe" );
} }

View file

@ -18,7 +18,7 @@ public class TTPickaxe
public TTPickaxe( final ToolMaterial material ) public TTPickaxe( final ToolMaterial material )
{ {
super( material ); super( material );
URegistry.setIdentifiers( this , "tech" , "tools" , "pickaxe" , material.toString( ).toLowerCase( ) ); URegistry.setIdentifiers( this , "tech" , "tools" , material.toString( ).toLowerCase( ) , "pickaxe" );
} }

View file

@ -17,7 +17,7 @@ public class TTShovel
public TTShovel( final ToolMaterial material ) public TTShovel( final ToolMaterial material )
{ {
super( material ); super( material );
URegistry.setIdentifiers( this , "tech" , "tools" , "shovel" , material.toString( ).toLowerCase( ) ); URegistry.setIdentifiers( this , "tech" , "tools" , material.toString( ).toLowerCase( ) , "shovel" );
} }

View file

@ -21,7 +21,7 @@ public class TTSword
{ {
super( material ); super( material );
this.material = material; this.material = material;
URegistry.setIdentifiers( this , "tech" , "tools" , "sword" , material.toString( ).toLowerCase( ) ); URegistry.setIdentifiers( this , "tech" , "tools" , material.toString( ).toLowerCase( ) , "sword" );
} }

View file

@ -32,12 +32,11 @@ tile.mmm.materials.ore.malachite.name=Malachite Ore
item.mmm.materials.stone.cuprite.name=Cuprite item.mmm.materials.stone.cuprite.name=Cuprite
tile.mmm.materials.ore.cuprite.name=Cuprite Ore tile.mmm.materials.ore.cuprite.name=Cuprite Ore
item.mmm.tech.tools.shovel.copper.name=Copper Shovel item.mmm.tech.tools.copper.shovel.name=Copper Shovel
item.mmm.tech.tools.axe.copper.name=Copper Axe item.mmm.tech.tools.copper.axe.name=Copper Axe
item.mmm.tech.tools.pickaxe.copper.name=Copper Pickaxe item.mmm.tech.tools.copper.pickaxe.name=Copper Pickaxe
item.mmm.tech.tools.sword.copper.name=Copper Sword item.mmm.tech.tools.copper.sword.name=Copper Sword
item.mmm.tech.tools.copper.armor.feet.name=Copper Boots
item.mmm.tech.tools.armor.copper.feet.name=Copper Boots item.mmm.tech.tools.copper.armor.legs.name=Copper Leggings
item.mmm.tech.tools.armor.copper.legs.name=Copper Leggings item.mmm.tech.tools.copper.armor.chest.name=Copper Chestplate
item.mmm.tech.tools.armor.copper.chest.name=Copper Chestplate item.mmm.tech.tools.copper.armor.head.name=Copper Helmet
item.mmm.tech.tools.armor.copper.head.name=Copper Helmet

View file

@ -1,6 +1,6 @@
{ {
"parent": "minecraft:item/generated", "parent": "minecraft:item/generated",
"textures": { "textures": {
"layer0": "mmm:items/tech/tools/armor/copper/chest" "layer0": "mmm:items/tech/tools/copper/armor/chest"
} }
} }

View file

@ -1,6 +1,6 @@
{ {
"parent": "minecraft:item/generated", "parent": "minecraft:item/generated",
"textures": { "textures": {
"layer0": "mmm:items/tech/tools/armor/copper/feet" "layer0": "mmm:items/tech/tools/copper/armor/feet"
} }
} }

View file

@ -1,6 +1,6 @@
{ {
"parent": "minecraft:item/generated", "parent": "minecraft:item/generated",
"textures": { "textures": {
"layer0": "mmm:items/tech/tools/armor/copper/head" "layer0": "mmm:items/tech/tools/copper/armor/head"
} }
} }

View file

@ -1,6 +1,6 @@
{ {
"parent": "minecraft:item/generated", "parent": "minecraft:item/generated",
"textures": { "textures": {
"layer0": "mmm:items/tech/tools/armor/copper/legs" "layer0": "mmm:items/tech/tools/copper/armor/legs"
} }
} }

View file

@ -1,6 +1,6 @@
{ {
"parent": "minecraft:item/generated", "parent": "minecraft:item/generated",
"textures": { "textures": {
"layer0": "mmm:items/tech/tools/axe/copper" "layer0": "mmm:items/tech/tools/copper/axe"
} }
} }

View file

@ -1,6 +1,6 @@
{ {
"parent": "minecraft:item/generated", "parent": "minecraft:item/generated",
"textures": { "textures": {
"layer0": "mmm:items/tech/tools/pickaxe/copper" "layer0": "mmm:items/tech/tools/copper/pickaxe"
} }
} }

View file

@ -1,6 +1,6 @@
{ {
"parent": "minecraft:item/generated", "parent": "minecraft:item/generated",
"textures": { "textures": {
"layer0": "mmm:items/tech/tools/shovel/copper" "layer0": "mmm:items/tech/tools/copper/shovel"
} }
} }

View file

@ -1,6 +1,6 @@
{ {
"parent": "minecraft:item/generated", "parent": "minecraft:item/generated",
"textures": { "textures": {
"layer0": "mmm:items/tech/tools/sword/copper" "layer0": "mmm:items/tech/tools/copper/sword"
} }
} }

View file

Before

Width:  |  Height:  |  Size: 171 B

After

Width:  |  Height:  |  Size: 171 B

View file

Before

Width:  |  Height:  |  Size: 182 B

After

Width:  |  Height:  |  Size: 182 B