From 332e9f57f03d32c5d4ebeb33175ca0c4b4c8decf Mon Sep 17 00:00:00 2001
From: Carrie <122191047+careeoki@users.noreply.github.com>
Date: Wed, 16 Apr 2025 04:36:26 -0600
Subject: [PATCH] Add silver ore (#1306)

* Add silver ore, ingot, block, lower gold ore

* Add recipes, make gold and silver ore values different
---
 assets/cubyz/blocks/gold_ore.zig.zon          |   4 ++--
 assets/cubyz/blocks/silver_block.zig.zon      |  11 ++++++++++
 assets/cubyz/blocks/silver_ore.zig.zon        |  20 ++++++++++++++++++
 .../textures/iron_block_reflectivity.png      | Bin 204 -> 226 bytes
 assets/cubyz/blocks/textures/silver_block.png | Bin 0 -> 342 bytes
 .../textures/silver_block_reflectivity.png    | Bin 0 -> 208 bytes
 assets/cubyz/blocks/textures/silver_ore.png   | Bin 0 -> 391 bytes
 .../textures/silver_ore_reflectivity.png      | Bin 0 -> 236 bytes
 assets/cubyz/items/silver_ingot.zig.zon       |  14 ++++++++++++
 assets/cubyz/items/textures/raw_silver.png    | Bin 0 -> 342 bytes
 assets/cubyz/items/textures/silver_ingot.png  | Bin 0 -> 401 bytes
 assets/cubyz/recipes/special_recipes.zig.zon  |  12 +++++++++++
 12 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 assets/cubyz/blocks/silver_block.zig.zon
 create mode 100644 assets/cubyz/blocks/silver_ore.zig.zon
 create mode 100644 assets/cubyz/blocks/textures/silver_block.png
 create mode 100644 assets/cubyz/blocks/textures/silver_block_reflectivity.png
 create mode 100644 assets/cubyz/blocks/textures/silver_ore.png
 create mode 100644 assets/cubyz/blocks/textures/silver_ore_reflectivity.png
 create mode 100644 assets/cubyz/items/silver_ingot.zig.zon
 create mode 100644 assets/cubyz/items/textures/raw_silver.png
 create mode 100644 assets/cubyz/items/textures/silver_ingot.png

diff --git a/assets/cubyz/blocks/gold_ore.zig.zon b/assets/cubyz/blocks/gold_ore.zig.zon
index 681a7ff4..5a710940 100644
--- a/assets/cubyz/blocks/gold_ore.zig.zon
+++ b/assets/cubyz/blocks/gold_ore.zig.zon
@@ -4,8 +4,8 @@
 	.blockResistance = 10,
 	.ore = .{
 		.veins = 3,
-		.size = 15,
-		.height = -500,
+		.size = 12,
+		.height = -600,
 		.density = 0.25,
 	},
 	.drops = .{
diff --git a/assets/cubyz/blocks/silver_block.zig.zon b/assets/cubyz/blocks/silver_block.zig.zon
new file mode 100644
index 00000000..241a6ab2
--- /dev/null
+++ b/assets/cubyz/blocks/silver_block.zig.zon
@@ -0,0 +1,11 @@
+.{
+	.tags = .{.stone},
+	.blockHealth = 50,
+	.blockResistance = 10,
+	.drops = .{
+		.{.items = .{.auto}},
+	},
+	.rotation = .stairs,
+	.model = "cubyz:cube",
+	.texture = "cubyz:silver_block",
+}
diff --git a/assets/cubyz/blocks/silver_ore.zig.zon b/assets/cubyz/blocks/silver_ore.zig.zon
new file mode 100644
index 00000000..f461bcbe
--- /dev/null
+++ b/assets/cubyz/blocks/silver_ore.zig.zon
@@ -0,0 +1,20 @@
+.{
+	.tags = .{.stone},
+	.blockHealth = 80,
+	.blockResistance = 10,
+	.ore = .{
+		.veins = 3,
+		.size = 15,
+		.height = -500,
+		.density = 0.25,
+	},
+	.drops = .{
+		.{.items = .{.auto}},
+	},
+	.rotation = .ore,
+	.model = "cubyz:cube",
+	.texture = "cubyz:silver_ore",
+	.item = .{
+		.texture = "raw_silver.png",
+	},
+}
diff --git a/assets/cubyz/blocks/textures/iron_block_reflectivity.png b/assets/cubyz/blocks/textures/iron_block_reflectivity.png
index 6dcc733f3b78134cf5870571b20270a7e341de10..f3aa0107e1b7fdcdc60c2ef791ea72519f6cf636 100644
GIT binary patch
delta 198
zcmV;%06G860pbCWB!8(%L_t(2k!{eyZp0uAgyFA16ltGi-~ZM2P_Y5pLk!tQ<$`6|
zzh~y_`QxAWj=w6r43MHZJ_Zkk9ZdlZ8FX1kp<+00j3es8uE}S)7~KQ?)KCp1J$4g@
zdJ%G5oeY|6(+%GWeYv<8mx@K0+n0*nIQu7|uYnN>nD(cJ=|3XtOGBH4bYpyIcw>wG
z78!0j_DL8<IGFcuNv4&*sOCORsgYTW`R4EY1-oEN?Wkg$<NyEw07*qoM6N<$g6y(h
AU;qFB

delta 176
zcmV;h08jto0n7oAB!81hL_t(2k!_Gm3d1lELtkMEK2Ps|scsSn3)+R}7l=0rw)94$
z*XPH>x%@jZ_#yzzFV%z#g8|5&l|o@?3ud}HWBI?qaDQjWx#uRtWsMML5iHR)!Wal~
zV4zH(HX>3aA>1Xg7^t>f^{}dk$k6wX3@ZqBYfwGI#qP2sVku;fMu^9UCht20DOR=V
eoo&ZEopJuyb4tw&7{0Lp0000<MNUMnLSTaL9!^XE

diff --git a/assets/cubyz/blocks/textures/silver_block.png b/assets/cubyz/blocks/textures/silver_block.png
new file mode 100644
index 0000000000000000000000000000000000000000..619082d9254faac79b7c2961da8dfa2c291399de
GIT binary patch
literal 342
zcmV-c0jd6pP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003UNkl<ZIE|H)
z!D_=W42J)O5L_*G*sajP_WsW@c35FgkbrYZsht{=%XSFTlqMsaE(S}V^y`oF@NqtW
zVJ9x}wz^9xq3t|MU64`&0K_m#p>?&~UE_$x*0{zw@B0CT?)V>=qtx)*`zLaqR&tH0
zWFj35oFg>0hVO^D0Z++!!t2Ws01(35)H#wyjjdr_Es6llD`?sGaAWHQOhf|bJpFj^
z8_c`2ANL^*bb*F-PAla>#U9KnY{3f!F^uB2hS@Y8^kg5`D`;0awqPCnb&5;8iBWqn
z5iMY2s`(x8&U7$%J{_fyh*pyI5P3)}-#J1IBihby8pe}ZZO#)4e#TnKUtq2)+s?!H
o0|3am^*;=k0Aninepuwc0sJt*s4L$(2><{907*qoM6N<$g0?M|i~s-t

literal 0
HcmV?d00001

diff --git a/assets/cubyz/blocks/textures/silver_block_reflectivity.png b/assets/cubyz/blocks/textures/silver_block_reflectivity.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4239e0fdcfa115864c386622de78436d2f99f64
GIT binary patch
literal 208
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6rhB?LhG<Nzo#@ENtjNQx&iU8<
z|Nlc?s~z|aH{>iWQZzWYt!XcN|J88Q9T}yDVg(B(vv8`Mljpg>Re!^eO{Gm(Wo-<*
zuNI%fgOW|>j6)s@m<dT#6&&__b9&_qt>iAR&}r&@%-v<G^B*3V-n)2<OvUf&-lv_p
zZ+V-JR3v8I@@`)B<Z_04_pHMad-q#3mc6{b<FDIskGcC<*Ew45kd06RI+4NC)z4*}
HQ$iB}h*D6M

literal 0
HcmV?d00001

diff --git a/assets/cubyz/blocks/textures/silver_ore.png b/assets/cubyz/blocks/textures/silver_ore.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6c2e7d660482c5d4d3c914ad78d103b0d3c5a71
GIT binary patch
literal 391
zcmV;20eJq2P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003_Nkl<ZIE}qi
zF-yZh6#gRp1EmB9!CC@EaCLAI99;Yj-MST>brDLyB`z+8Ze47aYz}Q81RAge5gh}i
z5Uwe7Nhs-%{W;~hHmT9Y2RGb%-+k}C@7@9b6#-+ErYTvDOJaVn2y8hn1&nO~?Xicq
z_fO0hOZ55%ujL3V$EEYL(;R81-I9j(1pbsEiq||ZiJ)HJprgYBe0=!;fbQM3gp#O;
zn<!qxpE5i@-scXA+OIAzN{Kgo2pFSm6`GiV#bQ&bV-|!^HJ$9ShkaSbEC_SmD;XF7
z=8GjS*kca>5U&!%s{}9RD?05~?&=i)7?>l(s{|*<4PFqzs-~0Z{EwO~$EBOw2ik?(
zmdfWqlp)uuI~&b{5KX1dUxgDWjfONZM~LDzfBzzLhxP<dJ!8YKQd!%7K-F|oHJyO1
lNi2%Y54l$T)nxuTz5&UD$sS_cJY@g?002ovPDHLkV1hZ_ri1_h

literal 0
HcmV?d00001

diff --git a/assets/cubyz/blocks/textures/silver_ore_reflectivity.png b/assets/cubyz/blocks/textures/silver_ore_reflectivity.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0e4fa515a8c83447b119396367681b4da9a5806
GIT binary patch
literal 236
zcmV<I02BX-P)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00029Nkl<ZD3N{8
zEsw%L6ougjLK-rHpa`N8IlBK}uSQljhzimmnx<w~^um<=y6R@;<evAOjZgp1?zhKA
zWpD-C@|-oX-3=y}_Y2w49DD183TzgJi@gEeUksCner1MW2tgMg$w!ck<wBN>u1H3;
zyYnjpI})a#XEvi<Gu+G$K@WAvl@yCfzrv&m+bvI%>Mh<V$)$%nk`&+*4%%nc-KwIa
mj9z6b7s@Op7x@pt_xS?4&^0x5(eGaX0000<MNUMnLSTaEEMzGF

literal 0
HcmV?d00001

diff --git a/assets/cubyz/items/silver_ingot.zig.zon b/assets/cubyz/items/silver_ingot.zig.zon
new file mode 100644
index 00000000..9f8324d6
--- /dev/null
+++ b/assets/cubyz/items/silver_ingot.zig.zon
@@ -0,0 +1,14 @@
+.{
+	.texture = "silver_ingot.png",
+	.material = .{
+		.density = 10.5,
+		.strength = 7.0,
+		.elasticity = 1.5,
+		.grip = 0.75,
+		.hardness = 2.5,
+		.textureRoughness = 0.05,
+		.colors = .{
+			0xff67727f, 0xff89919e, 0xffbdc2c6, 0xffe4e6e6, 0xfffcfcfc,
+		},
+	},
+}
diff --git a/assets/cubyz/items/textures/raw_silver.png b/assets/cubyz/items/textures/raw_silver.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d3465bee8adc031df0c318d42a2059ffa5e6659
GIT binary patch
literal 342
zcmV-c0jd6pP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003UNkl<ZIF0R+
zu}T9$6h%)$J|M6}lL>*4K2=B|2nu4ejfI6^WhLkb_yOAG2W*7|f`x?$Y1E(~SS)KZ
z%R*9!Adbl{1N#TDafe-#HLZoOntAi?z3*NI{wud^;Na+Fwy1w`-pK(JmVw%>Chb-e
z0LPU8^tydBTgU=6>NPB@h}IEWN4&nh1E5rx5=(7xe7KKTT|xR|0JM&<tRjvpY1C_6
zUJa;L%Gm^tE7`HP*xp<RU=jqVX@F9pS$}wc$MfUBWS5T*Bi{o+`eSY%o_LWSY8r5T
zGvwoQVyykFeDV_ei~Yu`)k>MYU7KFFpHfd*_<ooH2vIVGLX=P{<n*jF2cF9yNs`QE
o<a-Oj@XJS9+prB$7Wi+}7Zbp9<Xx|WHUIzs07*qoM6N<$g5Ri<1ONa4

literal 0
HcmV?d00001

diff --git a/assets/cubyz/items/textures/silver_ingot.png b/assets/cubyz/items/textures/silver_ingot.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc46ff24eaa8d939d553233d4873ea59500b8eb5
GIT binary patch
literal 401
zcmV;C0dD?@P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00044Nkl<ZIE}@U
z&r1S97>1t(@1a}j9%MxXy$VuUgqIE>At7}Nqe}*L=+OTX<TX4Q5go#-hkj6o5FL~v
zvVznc7yp9oP&>J;hKHc<H2Zz?yz|aG3;$ipD4WvRoN2934)Qj}H43OrXoPg#YMcEc
z10D2(iK!R>t!7uw&nlPFi82VBjZfqAdu-s(Z%f404`voq%+E~%&@p-lVGz)~yu7t-
zLIKT7JQn5s`PFo#vpI8TV;xm>15kf>l8&q%KtS`Ns&0fZs8nmjW6|#rE7cmSD+_dt
zo`i%j5W)Z;5)J}TD3%;~$yX>8OYCm1aaX^Wr;oeG27*=|Qo!f;&}w!mpI?!j`OKi%
zZc`|hcx*HP2<f^6_xJJuT$E201t5`3nVVZVdDlod=zsx^j}9ehbMV!WB7lU4fsPC;
vk)_PC9Nyks4+X7q3=+wd{O^AQ|ExX$*7uKRnK@9V00000NkvXXu0mjf_@k_D

literal 0
HcmV?d00001

diff --git a/assets/cubyz/recipes/special_recipes.zig.zon b/assets/cubyz/recipes/special_recipes.zig.zon
index cb40f1f4..c7a4ff2b 100644
--- a/assets/cubyz/recipes/special_recipes.zig.zon
+++ b/assets/cubyz/recipes/special_recipes.zig.zon
@@ -31,6 +31,10 @@
 		.inputs = .{"cubyz:coal", "cubyz:iron_ore"},
 		.output = "cubyz:iron_ingot",
 	},
+	.{
+		.inputs = .{"cubyz:coal", "cubyz:silver_ore"},
+		.output = "cubyz:silver_ingot",
+	},
 	.{
 		.inputs = .{"cubyz:coal", "cubyz:gold_ore"},
 		.output = "cubyz:gold_ingot",
@@ -63,6 +67,10 @@
 		.inputs = .{"4 cubyz:iron_ingot"},
 		.output = "cubyz:iron_block",
 	},
+	.{
+		.inputs = .{"4 cubyz:silver_ingot"},
+		.output = "cubyz:silver_block",
+	},
 	.{
 		.inputs = .{"4 cubyz:gold_ingot"},
 		.output = "cubyz:gold_block",
@@ -99,6 +107,10 @@
 		.inputs = .{"cubyz:iron_block"},
 		.output = "4 cubyz:iron_ingot",
 	},
+	.{
+		.inputs = .{"cubyz:silver_block"},
+		.output = "4 cubyz:silver_ingot",
+	},
 	.{
 		.inputs = .{"cubyz:gold_block"},
 		.output = "4 cubyz:gold_ingot",