diff --git a/TODO.txt b/TODO.txt index 42d0efe..6f08801 100644 --- a/TODO.txt +++ b/TODO.txt @@ -34,7 +34,6 @@ food No Extra recipes Various mashes ------------------------------------------------------------------------------------------------------- materials No Alloys - Steel Brass Alnico materials No Metal from slag @@ -56,7 +55,8 @@ tech.base No Alloy furnace tech.base No Coke oven tech.base No Metal recycler ------------------------------------------------------------------------------------------------------- -tech.tools +tech.tools No Steel tools +tech.tools No Steel armor ------------------------------------------------------------------------------------------------------- animals ??? Goats ------------------------------------------------------------------------------------------------------- diff --git a/src/java/mmm/materials/Materials.java b/src/java/mmm/materials/Materials.java index 237a523..4923575 100644 --- a/src/java/mmm/materials/Materials.java +++ b/src/java/mmm/materials/Materials.java @@ -26,6 +26,7 @@ public class Materials public static final MMetal COPPER; public static final MMetal TIN; public static final MMetal BRONZE; + public static final MMetal STEEL; // public static final MMetal RED_COPPER; public static final Item ITEM_SLAG; @@ -52,7 +53,9 @@ public class Materials // Custom metals COPPER = new MMetal( "copper" , 0.4f , 4f , 1 , MapColor.DIRT ); TIN = new MMetal( "tin" , 0.6f , 1f , 0 , MapColor.GRAY ); - BRONZE = new MMetal( "bronze" , 0f , 5f , 0 , MapColor.BROWN ); + BRONZE = new MMetal( "bronze" , 0f , 5f , 1 , MapColor.BROWN ); + STEEL = new MMetal( "steel" , 0f , 7f , 2 , MapColor.LIGHT_BLUE ); + STEEL.BLOCK.setResistance( 12f ); // RED_COPPER = new MMetal( "red_copper" , 0f , 2f , 1 , MapColor.RED ); // Items that do not correspond to metals or ores @@ -129,6 +132,20 @@ public class Materials .setOutput( Materials.ITEM_PIG_IRON_INGOT ).setSlag( 5 ) // .register( ); + // Steel + MAlloyRecipe.build( ).setName( "materials/steel/from_ingot" ).setBurnTime( 3200 ) // + .addInput( Materials.IRON.INGOT ) // + .addInput( Materials.ROCK_LIMESTONE ) // + .addInput( Materials.ITEM_PIG_IRON_INGOT ) // + .setOutput( Materials.STEEL.INGOT , 2 ).setSlag( 3 ) // + .register( ); + MAlloyRecipe.build( ).setName( "materials/steel/from_ore" ).setBurnTime( 3200 ) // + .addInput( Blocks.IRON_ORE ) // + .addInput( Materials.ROCK_LIMESTONE ) // + .addInput( Materials.ITEM_PIG_IRON_INGOT ) // + .setOutput( Materials.STEEL.INGOT ).setSlag( 5 ) // + .register( ); + // MAlloyRecipe.build( ).setName( "materials/red_copper" ).setBurnTime( 800 ) // .addInput( Materials.COPPER.INGOT , 1 ).addInput( Items.REDSTONE , 2 ) // .setOutput( Materials.RED_COPPER.INGOT ).setSlag( 1 ).register( ); diff --git a/src/resources/assets/mmm/blockstates/materials/block/steel.json b/src/resources/assets/mmm/blockstates/materials/block/steel.json new file mode 100644 index 0000000..65530c6 --- /dev/null +++ b/src/resources/assets/mmm/blockstates/materials/block/steel.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "mmm:materials/block/steel" } + } +} diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang index dbac844..2f04921 100644 --- a/src/resources/assets/mmm/lang/en_US.lang +++ b/src/resources/assets/mmm/lang/en_US.lang @@ -34,6 +34,10 @@ item.mmm.materials.ingot.bronze.name=Bronze Ingot item.mmm.materials.nugget.bronze.name=Bronze Nugget tile.mmm.materials.block.bronze.name=Bronze Block +item.mmm.materials.ingot.steel.name=Steel Ingot +item.mmm.materials.nugget.steel.name=Steel Nugget +tile.mmm.materials.block.steel.name=Steel Block + tile.mmm.tech.base.alloy_furnace.inactive.name=Alloy Furnace container.mmm.alloy_furnace.contents=Furnace Contents diff --git a/src/resources/assets/mmm/models/block/materials/block/steel.json b/src/resources/assets/mmm/models/block/materials/block/steel.json new file mode 100644 index 0000000..18f0add --- /dev/null +++ b/src/resources/assets/mmm/models/block/materials/block/steel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "mmm:blocks/materials/block/steel" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/materials/block/steel.json b/src/resources/assets/mmm/models/item/materials/block/steel.json new file mode 100644 index 0000000..27fe87d --- /dev/null +++ b/src/resources/assets/mmm/models/item/materials/block/steel.json @@ -0,0 +1,3 @@ +{ + "parent": "mmm:block/materials/block/steel" +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/materials/ingot/steel.json b/src/resources/assets/mmm/models/item/materials/ingot/steel.json new file mode 100644 index 0000000..9b8c411 --- /dev/null +++ b/src/resources/assets/mmm/models/item/materials/ingot/steel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/materials/ingots/steel" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/materials/nugget/steel.json b/src/resources/assets/mmm/models/item/materials/nugget/steel.json new file mode 100644 index 0000000..f255ed2 --- /dev/null +++ b/src/resources/assets/mmm/models/item/materials/nugget/steel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/materials/nuggets/steel" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/textures/blocks/materials/block/steel.png b/src/resources/assets/mmm/textures/blocks/materials/block/steel.png new file mode 100644 index 0000000..366ffed Binary files /dev/null and b/src/resources/assets/mmm/textures/blocks/materials/block/steel.png differ diff --git a/src/resources/assets/mmm/textures/items/materials/ingots/steel.png b/src/resources/assets/mmm/textures/items/materials/ingots/steel.png new file mode 100644 index 0000000..144d367 Binary files /dev/null and b/src/resources/assets/mmm/textures/items/materials/ingots/steel.png differ diff --git a/src/resources/assets/mmm/textures/items/materials/nuggets/steel.png b/src/resources/assets/mmm/textures/items/materials/nuggets/steel.png new file mode 100644 index 0000000..afa7579 Binary files /dev/null and b/src/resources/assets/mmm/textures/items/materials/nuggets/steel.png differ