From b79698d65ecbc6e59c9701fe5926930de8c92b9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= <tseeker@nocternity.net>
Date: Thu, 7 Jul 2016 16:06:04 +0200
Subject: [PATCH] Galena

---
 TODO.txt                                      |   7 +++-
 graphics/ore.xcf                              | Bin 6574 -> 6988 bytes
 src/java/mmm/materials/Materials.java         |   5 ++-
 src/java/mmm/materials/ore/MOGalena.java      |  32 ++++++++++++++++++
 .../mmm/blockstates/materials/ore/galena.json |   5 +++
 src/resources/assets/mmm/lang/en_US.lang      |   2 ++
 .../models/block/materials/ore/galena.json    |   6 ++++
 .../mmm/models/item/materials/ore/galena.json |   3 ++
 .../textures/blocks/materials/ore/galena.png  | Bin 0 -> 397 bytes
 9 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 src/java/mmm/materials/ore/MOGalena.java
 create mode 100644 src/resources/assets/mmm/blockstates/materials/ore/galena.json
 create mode 100644 src/resources/assets/mmm/models/block/materials/ore/galena.json
 create mode 100644 src/resources/assets/mmm/models/item/materials/ore/galena.json
 create mode 100644 src/resources/assets/mmm/textures/blocks/materials/ore/galena.png

diff --git a/TODO.txt b/TODO.txt
index f7f026b..1486f24 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -41,13 +41,18 @@ materials		No		Alloys
 materials		No		Metal from slag
 							-> in metal recycler
 materials		No		Black sand
+materials		No		Metals
+							Lead
+							Aluminium
+							Silver
+materials		No		Liquids
+							Mercury
 -------------------------------------------------------------------------------------------------------
 materials.rock	No		Smooth limestone
 materials.rock	No		Smooth slate
 materials.rock	No		Basalt
 -------------------------------------------------------------------------------------------------------
 materials.ore	No		Silver (native, horn silver)
-materials.ore	No		Lead (galena)
 materials.ore	No		Cinnabar
 materials.ore	No		Olivine
 -------------------------------------------------------------------------------------------------------
diff --git a/graphics/ore.xcf b/graphics/ore.xcf
index ea6107e4ca9cc377f3349c57ad834c7a88bf10ac..9531c3ae90911c5e2330755c0cfda082618f1265 100644
GIT binary patch
delta 872
zcmbtRL2DC16n?YKCh4Z`mTsEtru7hohIna1wG@K72%<MTh~6~j5CoN;3V~kY59p!v
z{Q!lE2M<EoLTMp~lCiy1uz2c0=&h$-JhW6X`d+%monCz~v-7_B-uJ#Y`*C`2X8D!~
z)^1nD<u?GyI{?;u0Ou-z`x+qM0Ps_^juAx(KUs6Q;#{v(pdZFV0JB8taI_Kt#`EYp
z!i;9vG$sd%t1+6OvJIVP?uNVOHBtT!FxZJvNimhwsi_?2VSQ*vgoo*;qF9abN!og#
z^Q{`ztdsI%0Q-X1%nO~FS>(K@jECtnylFRz^f3MLNZbzf61#&P8?k1N;}<uJgPGul
z5i#iFd<7VJ7gL~doFiSqIpzFc)2)$4aXeN+P2DNI#0@ZT7ow)mL<K8Zcl55#$v)yd
ztmhIUd@?#_IH`N}SB?2PqwEm3EiY2IkKO!GYnE@$!{h!OvH$8_@ZbeZ7?a($yu@2l
z{%lLxmIY1>+1;0E`D?#-Y|AWzGrU>y2Z6*hIV;P)K<hsg6kAX%prll6L9vAcws6op
zDz>25f?^8<5|1n>vd|Lno8IGP{=<a7$wN`Z2KPUoLw_;<8&<vTiNaeQ2Ku#ybsZ}x
Iyy7qY0XQYMO#lD@

delta 590
zcmX?Ow$6Bh9i#b1duv9?*$fP9ZVU`us~8yg)fpIsTNoI`GZ`2p{3lOmRG(Zg?lYN{
z+riL~0S=hL85mf#fm{J7W?^7p%7#iq#h9u$7c=QID=tS;#t7858&w(W>CJ~(wHP(O
zF)(l*M^Xwjk(~=wDZ3PiKiPrzF%<ute3dg*(H=<`&;qVtR9#%jlcTx5X+|+H@S(Yw
zI}cSQcO8fiGk>!KZyclIVxS1jlR(4ywxep{J3e_o-{i^iQU;Tmm>f)*pt3-U|2hMM
z&<Z5oKo9Z1M%B&#8^niM2&8{b-X@f)r~nj1vQyXu$Oi$an6S%a8{rb5ohg$=L?l#A
zA(Ajz2B1A6o~U9Xk(&cWl$j@sNzPT1kVcgQsh7}46_c=^d{gqEnk39SFvkFuN{XQ>
Ll~kL2K&l4-+<Hes

diff --git a/src/java/mmm/materials/Materials.java b/src/java/mmm/materials/Materials.java
index dbf76f4..0d5420a 100644
--- a/src/java/mmm/materials/Materials.java
+++ b/src/java/mmm/materials/Materials.java
@@ -5,6 +5,7 @@ import mmm.materials.ore.MOBauxite;
 import mmm.materials.ore.MOCassiterite;
 import mmm.materials.ore.MOCopper;
 import mmm.materials.ore.MOCuprite;
+import mmm.materials.ore.MOGalena;
 import mmm.materials.ore.MOMalachite;
 import mmm.materials.ore.MORockSalt;
 import mmm.materials.ore.MOSphalerite;
@@ -54,6 +55,7 @@ public class Materials
 	public static final MOre ORE_SPHALERITE;
 	public static final MOre ORE_ROCK_SALT;
 	public static final MOre ORE_BAUXITE;
+	public static final MOre ORE_GALENA;
 
 	static {
 		// Rocks
@@ -74,7 +76,7 @@ public class Materials
 		// Custom metals - alloys
 		BRONZE = new MMetal( "bronze" , 0f , 5f , 1 , MapColor.BROWN );
 		STEEL = new MMetal( "steel" , 0f , 7f , 2 , MapColor.LIGHT_BLUE );
-		STEEL.BLOCK.setResistance( 12f );
+		Materials.STEEL.BLOCK.setResistance( 12f );
 		// RED_COPPER = new MMetal( "red_copper" , 0f , 2f , 1 , MapColor.RED );
 
 		// Items that do not correspond to metals or ores
@@ -98,6 +100,7 @@ public class Materials
 		ORE_SPHALERITE = new MOSphalerite( );
 		ORE_ROCK_SALT = new MORockSalt( );
 		ORE_BAUXITE = new MOBauxite( );
+		ORE_GALENA = new MOGalena( );
 
 		// Other recipes
 		URegistry.addRecipeRegistrar( new Materials( ) );
diff --git a/src/java/mmm/materials/ore/MOGalena.java b/src/java/mmm/materials/ore/MOGalena.java
new file mode 100644
index 0000000..1bd242a
--- /dev/null
+++ b/src/java/mmm/materials/ore/MOGalena.java
@@ -0,0 +1,32 @@
+package mmm.materials.ore;
+
+
+import java.util.List;
+
+import mmm.materials.MOre;
+import mmm.utils.I_UOreGenerationRegistrar;
+import mmm.world.WLocation;
+import mmm.world.gen.WGOreCondition;
+import mmm.world.gen.WGOreParameters;
+
+
+
+public class MOGalena
+		extends MOre
+		implements I_UOreGenerationRegistrar
+{
+
+	public MOGalena( )
+	{
+		super( "galena" , 1 );
+	}
+
+
+	@Override
+	public void addConditions( final List< WGOreCondition > conditions )
+	{
+		conditions.add( new WGOreCondition( WLocation.inOverworld( ) ,
+				new WGOreParameters( this.getDefaultState( ) , 10 , 9 ) ) );
+	}
+
+}
diff --git a/src/resources/assets/mmm/blockstates/materials/ore/galena.json b/src/resources/assets/mmm/blockstates/materials/ore/galena.json
new file mode 100644
index 0000000..6c6e8f1
--- /dev/null
+++ b/src/resources/assets/mmm/blockstates/materials/ore/galena.json
@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "mmm:materials/ore/galena" }
+    }
+}
diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang
index 947f3cf..c0915a9 100644
--- a/src/resources/assets/mmm/lang/en_US.lang
+++ b/src/resources/assets/mmm/lang/en_US.lang
@@ -17,6 +17,8 @@ item.mmm.materials.stone.rock_salt.name=Salt Crystals
 
 tile.mmm.materials.ore.bauxite.name=Bauxite
 
+tile.mmm.materials.ore.galena.name=Galena
+
 item.mmm.materials.stone.coke.name=Coke
 item.mmm.materials.stone.slag.name=Slag
 item.mmm.materials.nugget.iron.name=Iron Nugget
diff --git a/src/resources/assets/mmm/models/block/materials/ore/galena.json b/src/resources/assets/mmm/models/block/materials/ore/galena.json
new file mode 100644
index 0000000..4e3c1f0
--- /dev/null
+++ b/src/resources/assets/mmm/models/block/materials/ore/galena.json
@@ -0,0 +1,6 @@
+{
+    "parent": "minecraft:block/cube_all",
+    "textures": {
+        "all": "mmm:blocks/materials/ore/galena"
+    }
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/models/item/materials/ore/galena.json b/src/resources/assets/mmm/models/item/materials/ore/galena.json
new file mode 100644
index 0000000..32c69ac
--- /dev/null
+++ b/src/resources/assets/mmm/models/item/materials/ore/galena.json
@@ -0,0 +1,3 @@
+{
+    "parent": "mmm:block/materials/ore/galena"
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/textures/blocks/materials/ore/galena.png b/src/resources/assets/mmm/textures/blocks/materials/ore/galena.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a9cb0db12fa14e3843ee471770a36f084adcee6
GIT binary patch
literal 397
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)0Pn*sE0W5GcY~;1OBO
zz`!jG!i)^F=12eq*-JcqUD+S7v-9d%+}l;2#lXNQ<>}%WVsW}PcsE~@gTS8trhp3{
z`Ab4VLPS`kr0g2!Z&+ZkPe_zo7znkwxw#%MUvty9P3O+aqYimDZqB`H>vP#8WZF}f
zGh1`DPi*qJcmENO{T7A`jkBJ&T=-z_c|fJ<u)&riD~{cGfBs43y$Z7xd`z4_-~P6H
zTc*DJuP3+O?cy`hF4k`8%)9cm%?=hnc>7Jlk}XCm<+1Z5m5}SEw)6FO#l06f{&B{X
zquoa@l`YV&-@Lxvrd)?}k;bI18$0<<e2$6PnRdWnzt-lrCcdd#9R(tsx9SPGRB3Nm
zzxvg--hGh;i_b@GiIZ1nJ*N2Y)_;RNE8pvfh_rHqt!54leY($MPVMHGYv;FD>Ry_)
pKf7eB(auxr=I(AY)n|Ced}movOmkA<cVNIVc)I$ztaD0e0suy|p{xJ^

literal 0
HcmV?d00001