From 8f5e7d5fa9701b57284803821e2737cf9de06f90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= <tseeker@nocternity.net>
Date: Fri, 8 Jul 2016 14:17:52 +0200
Subject: [PATCH] Silver ore

---
 graphics/ore.xcf                              | Bin 6988 -> 8378 bytes
 src/java/mmm/materials/Materials.java         |  13 +++++++++----
 .../mmm/blockstates/materials/ore/silver.json |   5 +++++
 src/resources/assets/mmm/lang/en_US.lang      |   2 ++
 .../models/block/materials/ore/silver.json    |   6 ++++++
 .../mmm/models/item/materials/ore/silver.json |   3 +++
 .../textures/blocks/materials/ore/silver.png  | Bin 0 -> 482 bytes
 7 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 src/resources/assets/mmm/blockstates/materials/ore/silver.json
 create mode 100644 src/resources/assets/mmm/models/block/materials/ore/silver.json
 create mode 100644 src/resources/assets/mmm/models/item/materials/ore/silver.json
 create mode 100644 src/resources/assets/mmm/textures/blocks/materials/ore/silver.png

diff --git a/graphics/ore.xcf b/graphics/ore.xcf
index 9531c3ae90911c5e2330755c0cfda082618f1265..4e229510796aab92b4985d8ae88d4013563d8650 100644
GIT binary patch
delta 962
zcmZ9KPiPZC6vn^V%_d~mY-%>Rn>OyQp^XsH6tN;!YJ$C3y@&<H)Pv9>La|Um5Wy%E
zPYQ*H^dNfiAXxAZ0V`fAdJwVTNkPz);7Je<9u#r=CSBVd7anik_r2e|nPpb?K5x#C
zi18-}hsD5sAUy_{Z-D$xz<B_88KCbQu=P6NPXj@V7R1s(3oz;cdg4d{+6=Gd7i(I(
zb3v=?+ZHz@2*#GXP3vvOJ9=f@5_>2tdGy#BBu#4!HRB#m>EA&1ZDJ1|m9f=5GQO;-
zk^2(IFWzs&IN3fF_i-}i`rmQ+9OjAGi#7ACtT#sj1rEVsL@8*Tb<Ue24QXCyIkf06
zqBTQDiVZ!|*<?}hVoR5lw16Yn&2fk|gj@QknO>|}mjIjp^!kDLQr1oNK-L{uCoe_s
zvy&D3Wdh@S*dJ8P{z@(LXD$C3C_GHG@`U^kwY7)wjR~Db?zE^l)da)7vtMPLF<Q2X
zg5E(gtj3TQyPS%r0Cz`%=847gDqXxHYvoQ)3zHT1UIOEx?vjeRujzpEz3M$vW$*-V
zMb*4donysaI`x<4$nvaO`L^myru<0N%H1bP*SyiroL3iBf1m10#y_fR{set2^_$1f
zO<$av4QFPj=(0QC9F3be1>03XZW0WuT5v?xZGi=js~m^vjO);!(%owK-xHU3SW)qC
JH@)b+u?o*EjzRzc

delta 619
zcmdnxc*bmk9iziWduvA7`3wwfP7DlO%NQ8=l^Ga>8yFbGQyCZ}*@5`&<oS%-Rf8EA
zSk)OA7zCi0g@J)79moa&s2EfE=4vK=X2rz_AqGaEw(Vd=aAmB=C!c1WI{7}=6g9R_
z3=Euyk(2{XWoJWG&Mvn3FaKet$uWE>N?g`RYJo;``J<}kil6+5@2eVj7y|<znq#@M
zP?d650gY8>R^kJC9p(X$Yxy>#s^dF6*-d!z<a<IglUK@%Ozz=#nCvOSt;T<ufk9{q
zl2)M0`Jba|<^K+GxvhALlCTVtTA($;2B>O<9VQ<Zf3GECh$_qgG*-kFRZJul#NYft
zl7k6IurN-3AuY$k1QeQ_$mTJ5ue`(LE*Wku36O;#fD~a8XqHMifD}xUb=k};tIwz=
txf8?%0wgVxXCXo`G0D4=Bji*jXUor3lUjf(1#+v@7F02*Ba`(MdH~$APbmNZ

diff --git a/src/java/mmm/materials/Materials.java b/src/java/mmm/materials/Materials.java
index be600ba..ca3fc9a 100644
--- a/src/java/mmm/materials/Materials.java
+++ b/src/java/mmm/materials/Materials.java
@@ -64,6 +64,7 @@ public class Materials
 	public static final MOre ORE_GALENA;
 	public static final MOre ORE_CINNABAR;
 	public static final MOre ORE_SULPHUR;
+	public static final MOre ORE_SILVER;
 
 	static {
 		// Rocks
@@ -130,8 +131,9 @@ public class Materials
 		ORE_SULPHUR = new MOre( "sulphur" , 0 ) //
 				.setResistance( 2.0f ) //
 				.setHardness( 1.0f ) //
-				.setDrops( ITEM_SULPHUR_POWDER , 3 , 6 ) //
+				.setDrops( Materials.ITEM_SULPHUR_POWDER , 3 , 6 ) //
 				.setExperience( 1 , 2 );
+		ORE_SILVER = new MOre( "silver" , 2 );
 
 		// Other recipes, ore generation parameters, etc.
 		final Materials materials = new Materials( );
@@ -261,13 +263,13 @@ public class Materials
 				new WGOreParameters( Materials.ORE_CUPRITE , 10 , 9 , 0 , 60 ) ) );
 
 		conditions.add( new WGOreCondition( WLocation.inOverworld( ) ,
-				new WGOreParameters( Materials.ORE_CASSITERITE , 10 , 9 , 45 , 80 ) ) );
+				new WGOreParameters( Materials.ORE_CASSITERITE , 5 , 9 , 45 , 80 ) ) );
 
 		conditions.add( new WGOreCondition( WLocation.inOverworld( ) , //
 				new WGOreParameters( Materials.ORE_SPHALERITE , 15 , 15 ) ) );
 
 		conditions.add( new WGOreCondition( WLocation.inOverworld( ) , //
-				new WGOreParameters( Materials.ORE_ROCK_SALT , 5 , 30 , 45 , 255 ) ) );
+				new WGOreParameters( Materials.ORE_ROCK_SALT , 1 , 30 , 45 , 255 ) ) );
 
 		conditions.add( new WGOreCondition( WLocation.inOverworld( ) , //
 				new WGOreParameters( Materials.ORE_GALENA , 10 , 9 ) ) );
@@ -276,8 +278,11 @@ public class Materials
 				new WGOreParameters( Materials.ORE_CINNABAR , 1 , 20 , 0 , 50 ) ) );
 
 		conditions.add( new WGOreCondition( WLocation.inTheNether( ) , //
-				new WGOreParameters( Materials.ORE_SULPHUR , 15 , 25 , //
+				new WGOreParameters( Materials.ORE_SULPHUR , 5 , 25 , //
 						BlockMatcher.forBlock( Blocks.NETHERRACK ) ) ) );
+
+		conditions.add( new WGOreCondition( WLocation.inOverworld( ) , //
+				new WGOreParameters( Materials.ORE_SILVER , 3 , 9 , 0 , 40 ) ) );
 	}
 
 }
diff --git a/src/resources/assets/mmm/blockstates/materials/ore/silver.json b/src/resources/assets/mmm/blockstates/materials/ore/silver.json
new file mode 100644
index 0000000..8867ad7
--- /dev/null
+++ b/src/resources/assets/mmm/blockstates/materials/ore/silver.json
@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "mmm:materials/ore/silver" }
+    }
+}
diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang
index 149158e..946c0f2 100644
--- a/src/resources/assets/mmm/lang/en_US.lang
+++ b/src/resources/assets/mmm/lang/en_US.lang
@@ -25,6 +25,8 @@ tile.mmm.materials.ore.cinnabar.name=Cinnabar
 tile.mmm.materials.ore.sulphur.name=Sulphur
 item.mmm.materials.stone.sulphur_powder.name=Sulphur Powder
 
+tile.mmm.materials.ore.silver.name=Native Silver
+
 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/silver.json b/src/resources/assets/mmm/models/block/materials/ore/silver.json
new file mode 100644
index 0000000..beb0130
--- /dev/null
+++ b/src/resources/assets/mmm/models/block/materials/ore/silver.json
@@ -0,0 +1,6 @@
+{
+    "parent": "minecraft:block/cube_all",
+    "textures": {
+        "all": "mmm:blocks/materials/ore/silver"
+    }
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/models/item/materials/ore/silver.json b/src/resources/assets/mmm/models/item/materials/ore/silver.json
new file mode 100644
index 0000000..99f9325
--- /dev/null
+++ b/src/resources/assets/mmm/models/item/materials/ore/silver.json
@@ -0,0 +1,3 @@
+{
+    "parent": "mmm:block/materials/ore/silver"
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/textures/blocks/materials/ore/silver.png b/src/resources/assets/mmm/textures/blocks/materials/ore/silver.png
new file mode 100644
index 0000000000000000000000000000000000000000..23d4ca6a3d2eff7751239f4845bc2f5e5ab02c15
GIT binary patch
literal 482
zcmV<80UiE{P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;0Fi{1}Mkzv&8@a0dGk}
zK~y+TbyG=8!%z^;A5zg;7kUyA6b~XjiD-&;3Dy;Yt%WqvDh0I!6)ILytaxxaq=F!L
z5D)!bW9P{X^Ir5YZQtaZ`IeVjzVCzUx>{i`3`13p<EZcda29@GwQ95A<q|w7fz+dg
zG=tC70&Egk{>G(#A<1l|<vwWaPOu_YK#k6|tw0~`oEj|I{TkcnV?jNSSvXuDhuiub
ze7|f!Se}IUyVaOqX+zqv<hILTMzMO?gvMg}-gideyfXExfVSZw2m%Jl{@YDPNhiBl
zcvcE%GZr#OS4%PZ2==l=P+1v-ZnVS7I0M{xe>@NElXMJ#)s42{U~Lqd)oHa%=3tRz
zs@LYC=KuL(0sMSYvDdd!TBxjmRG5j&_d>Etb(T!HRvd%99+L#fp`*=|W`RQ_=1$9o
za%O<fc&!hoX*la$nHeluv?PlulWqX(>#4{?)%-ByI0H)mFBa2^robGazpojV9F&WH
Y0B|>MyY&(F(f|Me07*qoM6N<$f(w$+>Hq)$

literal 0
HcmV?d00001