Bronze alloy

TODO.txt

@@ -36,7 +36,6 @@ food		No		Extra recipes
 materials		No		Alloys
 							Pig iron
 							Steel
-							Bronze
 							Brass
 							Alnico
 materials		No		Metal from slag
@@ -53,6 +52,9 @@ materials.ore	No		Lead (galena)
 -------------------------------------------------------------------------------------------------------
 tech.base		No		Coke oven
 -------------------------------------------------------------------------------------------------------
+tech.tools		No		Bronze tools
+tech.tools		No		Bronze armor
+-------------------------------------------------------------------------------------------------------
 animals			???		Goats
 -------------------------------------------------------------------------------------------------------
 world			???		Limestone hills / mountains

src/java/mmm/materials/Materials.java

@@ -25,6 +25,7 @@ public class Materials
 	public static final MMetal IRON;
 	public static final MMetal COPPER;
 	public static final MMetal TIN;
+	public static final MMetal BRONZE;
 	// public static final MMetal RED_COPPER;
 
 	public static final Item ITEM_SLAG;
@@ -50,6 +51,7 @@ 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 );
 		// RED_COPPER = new MMetal( "red_copper" , 0f , 2f , 1 , MapColor.RED );
 
 		// Items that do not correspond to metals or ores
@@ -103,10 +105,16 @@ public class Materials
 	@Override
 	public void registerRecipes( )
 	{
-		// Alloy recipes
+		MAlloyRecipe.build( ).setName( "materials/bronze" ).setBurnTime( 400 ) //
+				.addInput( Materials.COPPER.INGOT ) //
+				.addInput( Materials.TIN.NUGGET ) //
+				.setOutput( Materials.BRONZE.INGOT ).setSlag( 1 ) //
+				.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( );
+
 		// XXX coke is not an alloy
 		MAlloyRecipe.build( ).setName( "materials/coke" ).setBurnTime( 3200 ).addInput( Items.COAL , 2 )
 				.setOutput( Materials.ITEM_COKE ).setSlag( 1 ).register( );

src/resources/assets/mmm/blockstates/materials/block/bronze.json

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

src/resources/assets/mmm/lang/en_US.lang

@@ -29,6 +29,10 @@ tile.mmm.materials.block.tin.name=Tin Block
 tile.mmm.materials.ore.cassiterite.name=Cassiterite Ore
 item.mmm.materials.stone.cassiterite.name=Cassiterite
 
+item.mmm.materials.ingot.bronze.name=Bronze Ingot
+item.mmm.materials.nugget.bronze.name=Bronze Nugget
+tile.mmm.materials.block.bronze.name=Bronze Block
+
 
 tile.mmm.tech.base.alloy_furnace.inactive.name=Alloy Furnace
 container.mmm.alloy_furnace.contents=Furnace Contents

src/resources/assets/mmm/models/block/materials/block/bronze.json

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

src/resources/assets/mmm/models/item/materials/block/bronze.json

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

src/resources/assets/mmm/models/item/materials/ingot/bronze.json

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

src/resources/assets/mmm/models/item/materials/nugget/bronze.json

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