From 82db0f476d8ff3c4c5ec3c167bbe6b671602659c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= <tseeker@nocternity.net>
Date: Wed, 29 Jun 2016 21:50:05 +0200
Subject: [PATCH] Pig iron

---
 TODO.txt                                      |   1 -
 src/java/mmm/materials/Materials.java         |  18 ++++++++++++++++++
 src/resources/assets/mmm/lang/en_US.lang      |   1 +
 .../models/item/materials/ingot/pig_iron.json |   6 ++++++
 .../items/materials/ingots/pig_iron.png       | Bin 0 -> 404 bytes
 5 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 src/resources/assets/mmm/models/item/materials/ingot/pig_iron.json
 create mode 100644 src/resources/assets/mmm/textures/items/materials/ingots/pig_iron.png

diff --git a/TODO.txt b/TODO.txt
index a64ee32..4ce5c26 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -34,7 +34,6 @@ food		No		Extra recipes
 						Various mashes
 -------------------------------------------------------------------------------------------------------
 materials		No		Alloys
-							Pig iron
 							Steel
 							Brass
 							Alnico
diff --git a/src/java/mmm/materials/Materials.java b/src/java/mmm/materials/Materials.java
index a81fde8..237a523 100644
--- a/src/java/mmm/materials/Materials.java
+++ b/src/java/mmm/materials/Materials.java
@@ -33,6 +33,7 @@ public class Materials
 	public static final Item ITEM_CUPRITE;
 	public static final Item ITEM_COKE;
 	public static final Item ITEM_CASSITERITE;
+	public static final Item ITEM_PIG_IRON_INGOT;
 
 	public static final MOre ORE_COPPER;
 	public static final MOre ORE_MALACHITE;
@@ -60,6 +61,8 @@ public class Materials
 		ITEM_CUPRITE = Materials.makeItem( "cuprite" );
 		ITEM_COKE = Materials.makeFuel( "coke" , 9600 );
 		ITEM_CASSITERITE = Materials.makeItem( "cassiterite" );
+		ITEM_PIG_IRON_INGOT = new MMetalItem( E_MMetalItemType.INGOT , "pig_iron" );
+		URegistry.addItem( Materials.ITEM_PIG_IRON_INGOT );
 
 		// Actual ores
 		ORE_COPPER = new MOCopper( );
@@ -105,12 +108,27 @@ public class Materials
 	@Override
 	public void registerRecipes( )
 	{
+		// Bronze
 		MAlloyRecipe.build( ).setName( "materials/bronze" ).setBurnTime( 400 ) //
 				.addInput( Materials.COPPER.INGOT ) //
 				.addInput( Materials.TIN.NUGGET ) //
 				.setOutput( Materials.BRONZE.INGOT ).setSlag( 1 ) //
 				.register( );
 
+		// Pig iron
+		MAlloyRecipe.build( ).setName( "materials/pig_iron/from_ingot" ).setBurnTime( 1600 ) //
+				.addInput( Materials.IRON.INGOT ) //
+				.addInput( Materials.ROCK_LIMESTONE ) //
+				.addInput( Materials.ITEM_COKE ) //
+				.setOutput( Materials.ITEM_PIG_IRON_INGOT , 2 ).setSlag( 3 ) //
+				.register( );
+		MAlloyRecipe.build( ).setName( "materials/pig_iron/from_ore" ).setBurnTime( 1600 ) //
+				.addInput( Blocks.IRON_ORE ) //
+				.addInput( Materials.ROCK_LIMESTONE ) //
+				.addInput( Materials.ITEM_COKE ) //
+				.setOutput( Materials.ITEM_PIG_IRON_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/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang
index 70ae32b..dbac844 100644
--- a/src/resources/assets/mmm/lang/en_US.lang
+++ b/src/resources/assets/mmm/lang/en_US.lang
@@ -13,6 +13,7 @@ tile.mmm.materials.rock.limestone.name=Limestone
 item.mmm.materials.stone.coke.name=Coke
 item.mmm.materials.stone.slag.name=Slag
 item.mmm.materials.nugget.iron.name=Iron Nugget
+item.mmm.materials.ingot.pig_iron.name=Pig Iron Ingot
 
 item.mmm.materials.ingot.copper.name=Copper Ingot
 item.mmm.materials.nugget.copper.name=Copper Nugget
diff --git a/src/resources/assets/mmm/models/item/materials/ingot/pig_iron.json b/src/resources/assets/mmm/models/item/materials/ingot/pig_iron.json
new file mode 100644
index 0000000..9da3c6b
--- /dev/null
+++ b/src/resources/assets/mmm/models/item/materials/ingot/pig_iron.json
@@ -0,0 +1,6 @@
+{
+    "parent": "minecraft:item/generated",
+    "textures": {
+        "layer0": "mmm:items/materials/ingots/pig_iron"
+    }
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/textures/items/materials/ingots/pig_iron.png b/src/resources/assets/mmm/textures/items/materials/ingots/pig_iron.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed1beb54220c2a5c7d034d2e81b20fc6a1e4740c
GIT binary patch
literal 404
zcmV;F0c-w=P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;07HNDmyo$^W^{l0U=35
zK~y-))sfk1gFqC9^HRQn594L<A}ho&*%!%TI2zFALefkv1(DK1q0pPszSZ9|5=9%K
z%T4LP&k>yOJ7;EUwSTj8U5CoAAQidaLwerVk`lDr;WZ5L==+Fl8_{wJ$@N0=8G3LW
z+;g5>7YSFd+l5`P!)Y`S^m>pi$|dT9i12ni;^lBavf1D?nc!wRMZ8)e*>2&r+i+Vg
z7=}@brfEn8?@<I|>n)FW&G2clz}<R{m}NzP1_RJ+24cCYx!^enAm?*Xr-N`jE<^o3
zXgCC^|J;PQiD{Z?azV^z4TOMiS+F>26Y(T88s%^X6_X1D!=l;571vat##At;2xRBZ
yQhEi!w=2#QRCT(5s@`9mC-^p0CHXP*=j#JRvNa+Ne6M)`0000<MNUMnLSTZ(cB(l5

literal 0
HcmV?d00001