diff --git a/TODO.txt b/TODO.txt index 3bfa659..d0a7db1 100644 --- a/TODO.txt +++ b/TODO.txt @@ -55,7 +55,7 @@ tech.base No Alloy furnace tech.base No Coke oven tech.base No Metal recycler ------------------------------------------------------------------------------------------------------- -tech.tools No Steel armor +tech.tools ------------------------------------------------------------------------------------------------------- animals ??? Goats ------------------------------------------------------------------------------------------------------- diff --git a/src/java/mmm/tech/tools/TechTools.java b/src/java/mmm/tech/tools/TechTools.java index 857947b..f5db81f 100644 --- a/src/java/mmm/tech/tools/TechTools.java +++ b/src/java/mmm/tech/tools/TechTools.java @@ -15,7 +15,7 @@ public class TechTools public static final TTArmorSet BRONZE_ARMOR; public static final TTToolSet STEEL_TOOLS; - // public static final TTArmorSet STEEL_ARMOR; + public static final TTArmorSet STEEL_ARMOR; static { COPPER_TOOLS = new TTToolSet( "copper" , Materials.COPPER.INGOT , 2 , 192 , 5.0f , 1.5f , 16 , 7 , -3 ); @@ -29,6 +29,9 @@ public class TechTools } , 20 , SoundEvents.ITEM_ARMOR_EQUIP_GENERIC , 0 ); STEEL_TOOLS = new TTToolSet( "steel" , Materials.STEEL.INGOT , 3 , 800 , 7f , 2.5f , 12 , 8.0f , -3f ); + STEEL_ARMOR = new TTArmorSet( "steel" , Materials.STEEL.INGOT , 22 , new int[] { + 2 , 6 , 7 , 3 + } , 9 , SoundEvents.ITEM_ARMOR_EQUIP_GENERIC , 1 ); } diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang index 0acd19b..b9a4fee 100644 --- a/src/resources/assets/mmm/lang/en_US.lang +++ b/src/resources/assets/mmm/lang/en_US.lang @@ -79,6 +79,10 @@ item.mmm.tech.tools.steel.axe.name=Steel Axe item.mmm.tech.tools.steel.pickaxe.name=Steel Pickaxe item.mmm.tech.tools.steel.hoe.name=Steel Hoe item.mmm.tech.tools.steel.sword.name=Steel Sword +item.mmm.tech.tools.steel.armor.feet.name=Steel Boots +item.mmm.tech.tools.steel.armor.legs.name=Steel Leggings +item.mmm.tech.tools.steel.armor.chest.name=Steel Chestplate +item.mmm.tech.tools.steel.armor.head.name=Steel Helmet item.milk.name=Cow milk diff --git a/src/resources/assets/mmm/models/item/tech/tools/steel/armor/chest.json b/src/resources/assets/mmm/models/item/tech/tools/steel/armor/chest.json new file mode 100644 index 0000000..c414a89 --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/steel/armor/chest.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/steel/armor/chest" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/steel/armor/feet.json b/src/resources/assets/mmm/models/item/tech/tools/steel/armor/feet.json new file mode 100644 index 0000000..d139f1f --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/steel/armor/feet.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/steel/armor/feet" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/steel/armor/head.json b/src/resources/assets/mmm/models/item/tech/tools/steel/armor/head.json new file mode 100644 index 0000000..d4c10dd --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/steel/armor/head.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/steel/armor/head" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/steel/armor/legs.json b/src/resources/assets/mmm/models/item/tech/tools/steel/armor/legs.json new file mode 100644 index 0000000..22602c0 --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/steel/armor/legs.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/steel/armor/legs" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/textures/items/tech/tools/steel/armor/chest.png b/src/resources/assets/mmm/textures/items/tech/tools/steel/armor/chest.png new file mode 100644 index 0000000..d0d7b86 Binary files /dev/null and b/src/resources/assets/mmm/textures/items/tech/tools/steel/armor/chest.png differ diff --git a/src/resources/assets/mmm/textures/items/tech/tools/steel/armor/feet.png b/src/resources/assets/mmm/textures/items/tech/tools/steel/armor/feet.png new file mode 100644 index 0000000..4d99046 Binary files /dev/null and b/src/resources/assets/mmm/textures/items/tech/tools/steel/armor/feet.png differ diff --git a/src/resources/assets/mmm/textures/items/tech/tools/steel/armor/head.png b/src/resources/assets/mmm/textures/items/tech/tools/steel/armor/head.png new file mode 100644 index 0000000..b7a972c Binary files /dev/null and b/src/resources/assets/mmm/textures/items/tech/tools/steel/armor/head.png differ diff --git a/src/resources/assets/mmm/textures/items/tech/tools/steel/armor/legs.png b/src/resources/assets/mmm/textures/items/tech/tools/steel/armor/legs.png new file mode 100644 index 0000000..e4fa1a1 Binary files /dev/null and b/src/resources/assets/mmm/textures/items/tech/tools/steel/armor/legs.png differ diff --git a/src/resources/assets/mmm/textures/models/armor/steel_layer_1.png b/src/resources/assets/mmm/textures/models/armor/steel_layer_1.png new file mode 100644 index 0000000..2609312 Binary files /dev/null and b/src/resources/assets/mmm/textures/models/armor/steel_layer_1.png differ diff --git a/src/resources/assets/mmm/textures/models/armor/steel_layer_2.png b/src/resources/assets/mmm/textures/models/armor/steel_layer_2.png new file mode 100644 index 0000000..9a0b817 Binary files /dev/null and b/src/resources/assets/mmm/textures/models/armor/steel_layer_2.png differ