This commit is contained in:
Emmanuel BENOîT 2016-06-30 08:22:43 +02:00
parent a14ab19331
commit ba62ae1348
11 changed files with 50 additions and 3 deletions

View file

@ -34,7 +34,6 @@ food No Extra recipes
Various mashes Various mashes
------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------
materials No Alloys materials No Alloys
Steel
Brass Brass
Alnico Alnico
materials No Metal from slag materials No Metal from slag
@ -56,7 +55,8 @@ tech.base No Alloy furnace
tech.base No Coke oven tech.base No Coke oven
tech.base No Metal recycler tech.base No Metal recycler
------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------
tech.tools tech.tools No Steel tools
tech.tools No Steel armor
------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------
animals ??? Goats animals ??? Goats
------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------

View file

@ -26,6 +26,7 @@ public class Materials
public static final MMetal COPPER; public static final MMetal COPPER;
public static final MMetal TIN; public static final MMetal TIN;
public static final MMetal BRONZE; public static final MMetal BRONZE;
public static final MMetal STEEL;
// public static final MMetal RED_COPPER; // public static final MMetal RED_COPPER;
public static final Item ITEM_SLAG; public static final Item ITEM_SLAG;
@ -52,7 +53,9 @@ public class Materials
// Custom metals // Custom metals
COPPER = new MMetal( "copper" , 0.4f , 4f , 1 , MapColor.DIRT ); COPPER = new MMetal( "copper" , 0.4f , 4f , 1 , MapColor.DIRT );
TIN = new MMetal( "tin" , 0.6f , 1f , 0 , MapColor.GRAY ); 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 ); // RED_COPPER = new MMetal( "red_copper" , 0f , 2f , 1 , MapColor.RED );
// Items that do not correspond to metals or ores // Items that do not correspond to metals or ores
@ -129,6 +132,20 @@ public class Materials
.setOutput( Materials.ITEM_PIG_IRON_INGOT ).setSlag( 5 ) // .setOutput( Materials.ITEM_PIG_IRON_INGOT ).setSlag( 5 ) //
.register( ); .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 ) // MAlloyRecipe.build( ).setName( "materials/red_copper" ).setBurnTime( 800 )
// .addInput( Materials.COPPER.INGOT , 1 ).addInput( Items.REDSTONE , 2 ) // .addInput( Materials.COPPER.INGOT , 1 ).addInput( Items.REDSTONE , 2 )
// .setOutput( Materials.RED_COPPER.INGOT ).setSlag( 1 ).register( ); // .setOutput( Materials.RED_COPPER.INGOT ).setSlag( 1 ).register( );

View file

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "mmm:materials/block/steel" }
}
}

View file

@ -34,6 +34,10 @@ item.mmm.materials.ingot.bronze.name=Bronze Ingot
item.mmm.materials.nugget.bronze.name=Bronze Nugget item.mmm.materials.nugget.bronze.name=Bronze Nugget
tile.mmm.materials.block.bronze.name=Bronze Block 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 tile.mmm.tech.base.alloy_furnace.inactive.name=Alloy Furnace
container.mmm.alloy_furnace.contents=Furnace Contents container.mmm.alloy_furnace.contents=Furnace Contents

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "mmm:blocks/materials/block/steel"
}
}

View file

@ -0,0 +1,3 @@
{
"parent": "mmm:block/materials/block/steel"
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "mmm:items/materials/ingots/steel"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "mmm:items/materials/nuggets/steel"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 413 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 260 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 194 B