diff --git a/TODO.txt b/TODO.txt index d57e992..a64ee32 100644 --- a/TODO.txt +++ b/TODO.txt @@ -52,7 +52,7 @@ materials.ore No Lead (galena) ------------------------------------------------------------------------------------------------------- tech.base No Coke oven ------------------------------------------------------------------------------------------------------- -tech.tools No Bronze armor +tech.tools ------------------------------------------------------------------------------------------------------- animals ??? Goats ------------------------------------------------------------------------------------------------------- diff --git a/src/java/mmm/tech/tools/TechTools.java b/src/java/mmm/tech/tools/TechTools.java index 4dada0e..3121120 100644 --- a/src/java/mmm/tech/tools/TechTools.java +++ b/src/java/mmm/tech/tools/TechTools.java @@ -11,14 +11,18 @@ public class TechTools public static final TTToolSet COPPER_TOOLS; public static final TTArmorSet COPPER_ARMOR; public static final TTToolSet BRONZE_TOOLS; + public static final TTArmorSet BRONZE_ARMOR; static { COPPER_TOOLS = new TTToolSet( "copper" , Materials.COPPER.INGOT , 2 , 192 , 5.0f , 1.5f , 16 , 7 , -3 ); COPPER_ARMOR = new TTArmorSet( "copper" , Materials.COPPER.INGOT , 10 , new int[] { 1 , 3 , 4 , 1 - } , 20 , SoundEvents.ITEM_ARMOR_EQUIP_GENERIC , 0 ); + } , 15 , SoundEvents.ITEM_ARMOR_EQUIP_GENERIC , 0 ); BRONZE_TOOLS = new TTToolSet( "bronze" , Materials.BRONZE.INGOT , 2 , 212 , 5.5f , 1.75f , 20 , 7.5f , -3.1f ); + BRONZE_ARMOR = new TTArmorSet( "bronze" , Materials.BRONZE.INGOT , 13 , new int[] { + 1 , 4 , 5 , 2 + } , 20 , SoundEvents.ITEM_ARMOR_EQUIP_GENERIC , 0 ); } diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang index 077903e..70ae32b 100644 --- a/src/resources/assets/mmm/lang/en_US.lang +++ b/src/resources/assets/mmm/lang/en_US.lang @@ -64,6 +64,10 @@ item.mmm.tech.tools.bronze.axe.name=Bronze Axe item.mmm.tech.tools.bronze.pickaxe.name=Bronze Pickaxe item.mmm.tech.tools.bronze.hoe.name=Bronze Hoe item.mmm.tech.tools.bronze.sword.name=Bronze Sword +item.mmm.tech.tools.bronze.armor.feet.name=Bronze Boots +item.mmm.tech.tools.bronze.armor.legs.name=Bronze Leggings +item.mmm.tech.tools.bronze.armor.chest.name=Bronze Chestplate +item.mmm.tech.tools.bronze.armor.head.name=Bronze Helmet item.milk.name=Cow milk diff --git a/src/resources/assets/mmm/models/item/tech/tools/bronze/armor/chest.json b/src/resources/assets/mmm/models/item/tech/tools/bronze/armor/chest.json new file mode 100644 index 0000000..52647a7 --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/bronze/armor/chest.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/bronze/armor/chest" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/bronze/armor/feet.json b/src/resources/assets/mmm/models/item/tech/tools/bronze/armor/feet.json new file mode 100644 index 0000000..1374942 --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/bronze/armor/feet.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/bronze/armor/feet" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/bronze/armor/head.json b/src/resources/assets/mmm/models/item/tech/tools/bronze/armor/head.json new file mode 100644 index 0000000..aa04984 --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/bronze/armor/head.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/bronze/armor/head" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/bronze/armor/legs.json b/src/resources/assets/mmm/models/item/tech/tools/bronze/armor/legs.json new file mode 100644 index 0000000..4f1d7a8 --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/bronze/armor/legs.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/bronze/armor/legs" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/textures/items/tech/tools/bronze/armor/chest.png b/src/resources/assets/mmm/textures/items/tech/tools/bronze/armor/chest.png new file mode 100644 index 0000000..f572657 Binary files /dev/null and b/src/resources/assets/mmm/textures/items/tech/tools/bronze/armor/chest.png differ diff --git a/src/resources/assets/mmm/textures/items/tech/tools/bronze/armor/feet.png b/src/resources/assets/mmm/textures/items/tech/tools/bronze/armor/feet.png new file mode 100644 index 0000000..e7e9e2f Binary files /dev/null and b/src/resources/assets/mmm/textures/items/tech/tools/bronze/armor/feet.png differ diff --git a/src/resources/assets/mmm/textures/items/tech/tools/bronze/armor/head.png b/src/resources/assets/mmm/textures/items/tech/tools/bronze/armor/head.png new file mode 100644 index 0000000..00ea418 Binary files /dev/null and b/src/resources/assets/mmm/textures/items/tech/tools/bronze/armor/head.png differ diff --git a/src/resources/assets/mmm/textures/items/tech/tools/bronze/armor/legs.png b/src/resources/assets/mmm/textures/items/tech/tools/bronze/armor/legs.png new file mode 100644 index 0000000..0514cad Binary files /dev/null and b/src/resources/assets/mmm/textures/items/tech/tools/bronze/armor/legs.png differ diff --git a/src/resources/assets/mmm/textures/models/armor/bronze_layer_1.png b/src/resources/assets/mmm/textures/models/armor/bronze_layer_1.png new file mode 100644 index 0000000..dfd82c7 Binary files /dev/null and b/src/resources/assets/mmm/textures/models/armor/bronze_layer_1.png differ diff --git a/src/resources/assets/mmm/textures/models/armor/bronze_layer_2.png b/src/resources/assets/mmm/textures/models/armor/bronze_layer_2.png new file mode 100644 index 0000000..3613979 Binary files /dev/null and b/src/resources/assets/mmm/textures/models/armor/bronze_layer_2.png differ