diff --git a/TODO.txt b/TODO.txt index 6f08801..3bfa659 100644 --- a/TODO.txt +++ b/TODO.txt @@ -55,7 +55,6 @@ tech.base No Alloy furnace tech.base No Coke oven tech.base No Metal recycler ------------------------------------------------------------------------------------------------------- -tech.tools No Steel tools tech.tools No Steel armor ------------------------------------------------------------------------------------------------------- animals ??? Goats diff --git a/graphics/axe.xcf b/graphics/axe.xcf new file mode 100644 index 0000000..e78ae55 Binary files /dev/null and b/graphics/axe.xcf differ diff --git a/graphics/hoe.xcf b/graphics/hoe.xcf new file mode 100644 index 0000000..cceb484 Binary files /dev/null and b/graphics/hoe.xcf differ diff --git a/graphics/pickaxe.xcf b/graphics/pickaxe.xcf new file mode 100644 index 0000000..3be0d30 Binary files /dev/null and b/graphics/pickaxe.xcf differ diff --git a/graphics/shovel.xcf b/graphics/shovel.xcf new file mode 100644 index 0000000..86e83ff Binary files /dev/null and b/graphics/shovel.xcf differ diff --git a/graphics/sword.xcf b/graphics/sword.xcf new file mode 100644 index 0000000..992be7b Binary files /dev/null and b/graphics/sword.xcf differ diff --git a/src/java/mmm/tech/tools/TechTools.java b/src/java/mmm/tech/tools/TechTools.java index 3121120..857947b 100644 --- a/src/java/mmm/tech/tools/TechTools.java +++ b/src/java/mmm/tech/tools/TechTools.java @@ -10,9 +10,13 @@ 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; + public static final TTToolSet STEEL_TOOLS; + // public static final TTArmorSet STEEL_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[] { @@ -23,6 +27,8 @@ public class TechTools BRONZE_ARMOR = new TTArmorSet( "bronze" , Materials.BRONZE.INGOT , 13 , new int[] { 1 , 4 , 5 , 2 } , 20 , SoundEvents.ITEM_ARMOR_EQUIP_GENERIC , 0 ); + + STEEL_TOOLS = new TTToolSet( "steel" , Materials.STEEL.INGOT , 3 , 800 , 7f , 2.5f , 12 , 8.0f , -3f ); } diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang index 2f04921..0acd19b 100644 --- a/src/resources/assets/mmm/lang/en_US.lang +++ b/src/resources/assets/mmm/lang/en_US.lang @@ -74,6 +74,12 @@ 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.mmm.tech.tools.steel.shovel.name=Steel Shovel +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.milk.name=Cow milk item.mmm.food.milk.sheep.name=Sheep milk diff --git a/src/resources/assets/mmm/models/item/tech/tools/steel/axe.json b/src/resources/assets/mmm/models/item/tech/tools/steel/axe.json new file mode 100644 index 0000000..03eaa1c --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/steel/axe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/steel/axe" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/steel/hoe.json b/src/resources/assets/mmm/models/item/tech/tools/steel/hoe.json new file mode 100644 index 0000000..78e25b2 --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/steel/hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/steel/hoe" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/steel/pickaxe.json b/src/resources/assets/mmm/models/item/tech/tools/steel/pickaxe.json new file mode 100644 index 0000000..37a71af --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/steel/pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/steel/pickaxe" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/steel/shovel.json b/src/resources/assets/mmm/models/item/tech/tools/steel/shovel.json new file mode 100644 index 0000000..e17b7e0 --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/steel/shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/steel/shovel" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/steel/sword.json b/src/resources/assets/mmm/models/item/tech/tools/steel/sword.json new file mode 100644 index 0000000..839236d --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/steel/sword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/steel/sword" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/textures/items/tech/tools/steel/axe.png b/src/resources/assets/mmm/textures/items/tech/tools/steel/axe.png new file mode 100644 index 0000000..7ea93a0 Binary files /dev/null and b/src/resources/assets/mmm/textures/items/tech/tools/steel/axe.png differ diff --git a/src/resources/assets/mmm/textures/items/tech/tools/steel/hoe.png b/src/resources/assets/mmm/textures/items/tech/tools/steel/hoe.png new file mode 100644 index 0000000..c5c1942 Binary files /dev/null and b/src/resources/assets/mmm/textures/items/tech/tools/steel/hoe.png differ diff --git a/src/resources/assets/mmm/textures/items/tech/tools/steel/pickaxe.png b/src/resources/assets/mmm/textures/items/tech/tools/steel/pickaxe.png new file mode 100644 index 0000000..fff76e0 Binary files /dev/null and b/src/resources/assets/mmm/textures/items/tech/tools/steel/pickaxe.png differ diff --git a/src/resources/assets/mmm/textures/items/tech/tools/steel/shovel.png b/src/resources/assets/mmm/textures/items/tech/tools/steel/shovel.png new file mode 100644 index 0000000..d15b403 Binary files /dev/null and b/src/resources/assets/mmm/textures/items/tech/tools/steel/shovel.png differ diff --git a/src/resources/assets/mmm/textures/items/tech/tools/steel/sword.png b/src/resources/assets/mmm/textures/items/tech/tools/steel/sword.png new file mode 100644 index 0000000..c168eb8 Binary files /dev/null and b/src/resources/assets/mmm/textures/items/tech/tools/steel/sword.png differ