From ba62ae1348ce8007bdc91f93bb5bd25248672136 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= <tseeker@nocternity.net>
Date: Thu, 30 Jun 2016 08:22:43 +0200
Subject: [PATCH] Steel
---
TODO.txt | 4 ++--
src/java/mmm/materials/Materials.java | 19 +++++++++++++++++-
.../blockstates/materials/block/steel.json | 5 +++++
src/resources/assets/mmm/lang/en_US.lang | 4 ++++
.../models/block/materials/block/steel.json | 6 ++++++
.../models/item/materials/block/steel.json | 3 +++
.../models/item/materials/ingot/steel.json | 6 ++++++
.../models/item/materials/nugget/steel.json | 6 ++++++
.../textures/blocks/materials/block/steel.png | Bin 0 -> 413 bytes
.../textures/items/materials/ingots/steel.png | Bin 0 -> 260 bytes
.../items/materials/nuggets/steel.png | Bin 0 -> 194 bytes
11 files changed, 50 insertions(+), 3 deletions(-)
create mode 100644 src/resources/assets/mmm/blockstates/materials/block/steel.json
create mode 100644 src/resources/assets/mmm/models/block/materials/block/steel.json
create mode 100644 src/resources/assets/mmm/models/item/materials/block/steel.json
create mode 100644 src/resources/assets/mmm/models/item/materials/ingot/steel.json
create mode 100644 src/resources/assets/mmm/models/item/materials/nugget/steel.json
create mode 100644 src/resources/assets/mmm/textures/blocks/materials/block/steel.png
create mode 100644 src/resources/assets/mmm/textures/items/materials/ingots/steel.png
create mode 100644 src/resources/assets/mmm/textures/items/materials/nuggets/steel.png
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 0000000000000000000000000000000000000000..366ffed6185eb7af92163d50a0cb5b7f743c8ff8
GIT binary patch
literal 413
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPNn;aXTuGR6(bOr`SEl(H65R21mr`+^oaujg=y}MIM
zk5j`@WGZ9l8e3*2HLVpLQii`A?uh?eJ|{Z&AdkVM4u18kb4#?oU%QlLntJ)rF-F~E
zpG7>UW#%4Vn6b+*aCPFM2lu86xpw7DbKCJg)TZ3$=w<h1ck0w?|9Sm-bk=41Ay4}W
zQ*&pF82$g2k=9hO$l>NO*;Kx2;U}}c+g-XUeXDp~W_bC`fSmgp1y=Gpx8Ln4J|dg0
z=)w5Pd^)RNLsp;n_N?u}Pq{ZVT5Kx#X}P9m<<}?4X@bdNpX+x&m^yducZv0^FB$G_
zV%1ntwtq#LX+nXRR=U2OnrKGQ>zVtbBkrw|;0|to@#5fzWcI1z35hpYH5y_h<$#*}
zCNRY<tK8Kf859wpl4P^G>uRg52-jPqz|XI^e=zN1oU`vAW5MEQn}Gqz;OXk;vd$@?
F2>|qFryu|T
literal 0
HcmV?d00001
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 0000000000000000000000000000000000000000..144d36792a421ce9c867f810e36ea7057d56af6b
GIT binary patch
literal 260
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPNn;aWIPySYq3ZT$LPZ!4!i_^&o5=IX9kNmRdn7ov;
z#al|f(a_QPf@!Wr(fj{bQmY?GtX8~XvM~EdCP&A_z&kwGTl^QhJD6~VUA^*~-;7}i
zX9|a+uY&0biK7e?l4dCWFlpRS?_wlznAhQ3v`dg(obL&VJckf3MTul%hDhc!_YHc4
xxDA{g*b+8#Ity?6;cnKT;d_HeG4gT)Gef(Hnv+Vrw-wNF44$rjF6*2Ung9h5Q5ygN
literal 0
HcmV?d00001
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 0000000000000000000000000000000000000000..afa7579d0a21988dcfd359cd5bb911730680ee4d
GIT binary patch
literal 194
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPNn;aXT)lQK&3xGoYo-U3d7N?UFBv>sPTj&0+mr(OA
zcD?=OzjWW7-}a?9=l#!$V*BrD#;|PXmdaEAw=8nI#N%kLpkdW)6Fwo;dK06<*_4}p
iqRa_x6V_I;Ff!PidQ_Zxed9gQXa-MLKbLh*2~7Y$JU*`g
literal 0
HcmV?d00001