diff --git a/TODO.txt b/TODO.txt index ccc5295..d57e992 100644 --- a/TODO.txt +++ b/TODO.txt @@ -52,7 +52,6 @@ materials.ore No Lead (galena) ------------------------------------------------------------------------------------------------------- tech.base No Coke oven ------------------------------------------------------------------------------------------------------- -tech.tools No Bronze tools tech.tools No Bronze armor ------------------------------------------------------------------------------------------------------- animals ??? Goats diff --git a/src/java/mmm/tech/tools/TechTools.java b/src/java/mmm/tech/tools/TechTools.java index b3c202f..4dada0e 100644 --- a/src/java/mmm/tech/tools/TechTools.java +++ b/src/java/mmm/tech/tools/TechTools.java @@ -10,12 +10,15 @@ public class TechTools { public static final TTToolSet COPPER_TOOLS; public static final TTArmorSet COPPER_ARMOR; + public static final TTToolSet BRONZE_TOOLS; static { - COPPER_TOOLS = new TTToolSet( "copper" , Materials.COPPER.INGOT , 2 , 192 , 5.0f , 1.5f , 18 , 7 , -3 ); + 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 ); + + BRONZE_TOOLS = new TTToolSet( "bronze" , Materials.BRONZE.INGOT , 2 , 212 , 5.5f , 1.75f , 20 , 7.5f , -3.1f ); } diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang index 7184657..077903e 100644 --- a/src/resources/assets/mmm/lang/en_US.lang +++ b/src/resources/assets/mmm/lang/en_US.lang @@ -59,6 +59,12 @@ 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 +item.mmm.tech.tools.bronze.shovel.name=Bronze Shovel +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.milk.name=Cow milk item.mmm.food.milk.sheep.name=Sheep milk diff --git a/src/resources/assets/mmm/models/item/tech/tools/bronze/axe.json b/src/resources/assets/mmm/models/item/tech/tools/bronze/axe.json new file mode 100644 index 0000000..66d5635 --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/bronze/axe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/bronze/axe" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/bronze/hoe.json b/src/resources/assets/mmm/models/item/tech/tools/bronze/hoe.json new file mode 100644 index 0000000..9fdbb25 --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/bronze/hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/bronze/hoe" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/bronze/pickaxe.json b/src/resources/assets/mmm/models/item/tech/tools/bronze/pickaxe.json new file mode 100644 index 0000000..59310e0 --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/bronze/pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/bronze/pickaxe" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/bronze/shovel.json b/src/resources/assets/mmm/models/item/tech/tools/bronze/shovel.json new file mode 100644 index 0000000..478178d --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/bronze/shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/bronze/shovel" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/bronze/sword.json b/src/resources/assets/mmm/models/item/tech/tools/bronze/sword.json new file mode 100644 index 0000000..dbd5081 --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/bronze/sword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/bronze/sword" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/textures/items/tech/tools/bronze/axe.png b/src/resources/assets/mmm/textures/items/tech/tools/bronze/axe.png new file mode 100644 index 0000000..292b067 Binary files /dev/null and b/src/resources/assets/mmm/textures/items/tech/tools/bronze/axe.png differ diff --git a/src/resources/assets/mmm/textures/items/tech/tools/bronze/hoe.png b/src/resources/assets/mmm/textures/items/tech/tools/bronze/hoe.png new file mode 100644 index 0000000..8b70a32 Binary files /dev/null and b/src/resources/assets/mmm/textures/items/tech/tools/bronze/hoe.png differ diff --git a/src/resources/assets/mmm/textures/items/tech/tools/bronze/pickaxe.png b/src/resources/assets/mmm/textures/items/tech/tools/bronze/pickaxe.png new file mode 100644 index 0000000..42ba669 Binary files /dev/null and b/src/resources/assets/mmm/textures/items/tech/tools/bronze/pickaxe.png differ diff --git a/src/resources/assets/mmm/textures/items/tech/tools/bronze/shovel.png b/src/resources/assets/mmm/textures/items/tech/tools/bronze/shovel.png new file mode 100644 index 0000000..f765106 Binary files /dev/null and b/src/resources/assets/mmm/textures/items/tech/tools/bronze/shovel.png differ diff --git a/src/resources/assets/mmm/textures/items/tech/tools/bronze/sword.png b/src/resources/assets/mmm/textures/items/tech/tools/bronze/sword.png new file mode 100644 index 0000000..64d935a Binary files /dev/null and b/src/resources/assets/mmm/textures/items/tech/tools/bronze/sword.png differ