From 3d16252f528f587d8730149d3d1a5efc8480dfcc Mon Sep 17 00:00:00 2001 From: Carrie <122191047+careeoki@users.noreply.github.com> Date: Thu, 30 Jan 2025 14:12:31 -0700 Subject: [PATCH] Update ores in prep for #611 (#979) * Update ores, add raw iron, tweak some textures * Make raw iron a block item * Remove temporary textures * Delete raw iron and revert associated changes --- assets/cubyz/blocks/iron_ore.zig.zon | 3 +++ assets/cubyz/blocks/textures/coal_ore.png | Bin 483 -> 279 bytes assets/cubyz/blocks/textures/diamond_ore.png | Bin 542 -> 347 bytes .../textures/diamond_ore_reflectivity.png | Bin 187 -> 215 bytes assets/cubyz/blocks/textures/iron_block.png | Bin 319 -> 309 bytes .../blocks/textures/iron_block_reflectivity.png | Bin 214 -> 204 bytes assets/cubyz/blocks/textures/iron_ore.png | Bin 534 -> 421 bytes .../blocks/textures/iron_ore_reflectivity.png | Bin 183 -> 234 bytes assets/cubyz/items/textures/coal.png | Bin 249 -> 292 bytes assets/cubyz/items/textures/iron_ingot.png | Bin 317 -> 375 bytes assets/cubyz/items/textures/raw_iron.png | Bin 0 -> 351 bytes 11 files changed, 3 insertions(+) create mode 100644 assets/cubyz/items/textures/raw_iron.png diff --git a/assets/cubyz/blocks/iron_ore.zig.zon b/assets/cubyz/blocks/iron_ore.zig.zon index 9705dd2f..b8b61231 100644 --- a/assets/cubyz/blocks/iron_ore.zig.zon +++ b/assets/cubyz/blocks/iron_ore.zig.zon @@ -17,4 +17,7 @@ .rotation = .ore, .model = "cubyz:cube", .texture = "cubyz:iron_ore", + .item = .{ + .texture = "raw_iron.png", + }, } diff --git a/assets/cubyz/blocks/textures/coal_ore.png b/assets/cubyz/blocks/textures/coal_ore.png index cc942d65158a5faa1c404e9224361978e2827115..3c9d1b0efa88bfa940671f64bb6d78519251a659 100644 GIT binary patch delta 252 zcmV4a6h^3?q!+Ez!kdgv$yIp@9 zMZ~=Kgb)C%B&i6N3Yl~qp8z=LW^a{>s?zs;MFMaH7 zC(b#B;k=veASFdrx!)hFd4X!#l}fgo72XT_NxT5+Jan)*dsEc_0000uDd3lAk z7HK;3s4+8E@9$Wx-f(>U6NAA3!zB6YAZGR`mzNhUj!H|D%W{w9@)-ayOcF#y2>u!4 z#p&`_apyPJ*kqYcW@Z$|pim7qS=K`N^ZU+ELbYLLTwVS0#ZQ; zW!zu8I$>^2rGFAZAR@5Vdhs;aGzypH9+Sx_;Pg^$hzP-CJO(qj&_tw_Y^}v|`RoA{ zq$MIdPCAA2^D{g?J^=vIbmm95$uh4=C2|l^7e>3#PHu1K==$?K_mn2%F@mPE%b6QH z5)t9SjWJDU-uGiP8r|1*jb5*ZD2kBhTUcwc-R{uu_d^kep9$sb%14i+5duqi66?7(|-o5dBkYg(efnbQ5!%} zpb$9jQl4KN12CHg)XauLQU=AsXxP#G$4_R{fO_BHWAR>CxV~D*!eQA^-e+FnL--{f zcUhf56&!ad56v3AZd0*$urEQHMXJmc?cxpF^+B=HZRqK8Yhdv694Q^AmF@~o2S`NB z)9ou_9dLhlnK|Xs>o!@xAr$bl&5rAcKKD~rP- z|3hq3%3hiSwGv5Xbs(vPaIJ+{Sb4o#SST!nB#g6se!swArX?^9I@B7&--swCMRK(+?j`t99a_kRNs!4E{J7=z@%&9J{2 zm>pYhw0evt6XtR3YX0`R&9KkIy-l-j)gK?0snxqwjGaU^=EX3kc6f)$>2s%n1pv%)6uhG_T<04SRqj1{!E*E# zfGCRG7XK31w||1zLe-cnU<=q5*!CAH#*nBokK@g{BFy5LK!mC>S8O~!=>ssXcNu+q zd1+&wzsrOwvp9CPHNy?~(-7Aih;Z%x!NIdMO=+}xT)$g}-}~&Wey~$4lBOxeVv!rA z65l_bG9K?!Sou^R+~UvYH>{RR3O2%D-aVyO?>d`ClYNQHKp=vM;4KC$M`acxIG;{Q zRPimxiZOVL0e}M^pY&<8ddxFTW^qguMNZs6LiZPZD@tQ*^k*Lc0000;P3wHCK`EYRq<=_cVwX+1g>I)>51%ds{c8 pIdEihf5%4o0DiXUKk!B1JD!SaH>`(Z*opuE002ovPDHLkV1j>URi^*| delta 159 zcmV;Q0AT;u0lNW^B!7ZQL_t(2k%f`55`-WOL|<-TC`^&g|Nlb@Ef@G3)oH8XTV55*;t4^U?iZ_NM`4#0cns*VIe;lq+g+Ib4YJD_!ST=O=-R&dd+l-{)Tp0OR_XX?h7~czP>aYL+ N002ovPDHLkV1hR}Mh5@@ diff --git a/assets/cubyz/blocks/textures/iron_block.png b/assets/cubyz/blocks/textures/iron_block.png index a80b5e3b1320c7c1fc5fd4514967db9f1e7701f4..fa564b5d2f19b6b6a48719b23b4afc01822e04b8 100644 GIT binary patch delta 283 zcmV+$0p$L_0<{8=BYyz=Nkl!u5 zKpX0=^GAwd2D;z+zUr=Xt61)~BYyz~NklUH{d_9J)TFGNANyHNM6yN2k! r*X>%uipWWS{vM)F+-~15qIEq0UF+kxIiBpy00000NkvXXu0mjfBf5y_ diff --git a/assets/cubyz/blocks/textures/iron_block_reflectivity.png b/assets/cubyz/blocks/textures/iron_block_reflectivity.png index bca0db441199d7c113a9f8368f9ee4f6aac66a73..6dcc733f3b78134cf5870571b20270a7e341de10 100644 GIT binary patch delta 176 zcmV;h08jtc0n7oAB!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&r3McCQZ`4go!6VT{j0vdTIP&Ms z#E<9BpI9?52woTfWzoanhF}JQ34o|UBisiTzp2p;rr om(*}%O02I0TJmO*MuTho06s5FvUu=IUH||907*qoM6N<$g8y?=X#fBK diff --git a/assets/cubyz/blocks/textures/iron_ore.png b/assets/cubyz/blocks/textures/iron_ore.png index a48f3f2190332171946cc63f3499166a333848c9..5afaa73729fd64f6eba6c34274e033ca05b2a42e 100644 GIT binary patch delta 395 zcmV;60d)SB1f>IzB!6s4L_t(IjfGP&Zo)tioQr5(*k{QU6p<{H1d0@SN*W%(2at#; zT&F+*`2((~+>kC66#^k7L_uKz1rmh|JHoi&0hek|ceW#@^xn+Q&aN5mU^W>G!!~id z$Q6VhHc_}JRwd}H0n;N{!rC%HW`c2peq1iIe%XvPEuL_=)Q}81;}oe zU1hiaFkoqx1Arz((B=t!PsB+IB76nYQvLDC1pu6nCv1Mwf&+!3xJ*y*#H0l07*qoLh5AB80^T z$jr#h_}elwLIM&m`Ph1bR^!nuM1 zKrmB9M7W-=nSZB48m$KHbWXh7E!#!&kdsc2UmEl2^LIS;TI5_=*LWE+{Bn=hqMg1t zf4h&XJMM0-0Jvx#@?$a~GutiWznW+?ULeyoXD>76>71k2M`guI5xsz_x+A7kkSLoo zo^F#pYotNHizdqO`o8>J71H;C4_d1#ebGDw;H1-I&~@)(1s(r3=ywqjW~wBrWM=HQ zTCI<()d~?IdCbWl5}qD^BB2mi%I_DiFf-DpfczohG&&%C3IJHGR-0k+Fhda(A)Xp% y>21l=`zV4wKq%XR3aZ?)O2d4$J^nZ5-u4Fsa5Wn2;+|yy0000WY!5)wj1P`?R1gA!SRrTY^8K?;D8`F6d%T7r`Jd9;zKyhjz* zK#y4l3<|`V;gs*8U^9aOnc@`14PK!{#3#{4aNFc{i#NlQb`+7X9gkH5dQkuX002ov JPDHLkV1g7ML^J>Z diff --git a/assets/cubyz/items/textures/coal.png b/assets/cubyz/items/textures/coal.png index 12c77171652ff661270231620004cd3b5d039d52..a9c4449d5f41c19dfdc89fec6aa64d900e1a5a7a 100644 GIT binary patch delta 265 zcmV+k0rvj+0i*(uB!BBkL_t(Ijm?s~PQySDMNbfsi}fpt#5QZ9NGQn)&(E~&P1XDeaIP6o zrz4w94Zz`Wq$rAUu2TWY4Dhty6GA{lem6lH8=x#p0KC6qjDJx9_uAub_sGL`3&6|k z8vr6gRn-7v*L5ou;9N82dCukXP6z?-uK*Zh5E0hv^>T#ysL32-R3oTMoGxtI55uqw z5D|S-tw|Fy z8Zg?q6~p|meZbju*#lVHrTq4OEb!MovN49ff8zaE#cT>#+a>4jXx#$f+yfx};;I6f z3}B2Qgs_>i5XiAJ8DN@bnx?4=+-jfMJ%qqC%>al9)^>P5CRP^1UnQ`%OG+t*;Z=~g z5)>^gfg%Dxj1dt*DRry`t=pCRzd;rWvTM!#a|^3us$F7&@7{?q0#wOc0xO||*c0mw Xh6`7hsM%+P00000NkvXXu0mjf!q;U^ diff --git a/assets/cubyz/items/textures/iron_ingot.png b/assets/cubyz/items/textures/iron_ingot.png index fc59d7654914aeaaa8d0e8d87cfac953207d1970..bf6b33eb72da943ae1889f26ebae16de0c3ae9e2 100644 GIT binary patch delta 348 zcmV-i0i*uC0`~%tB!50hL_t(Ijm46`PQp+W#(y=;gf?P~OGy_7O@O_GG|@Pz3#~qZ z;mwfZ3m8orBD*3wbZO`!#Gxg=KwY>;%OAsF;y2xU&i#G)?ztEKTiP~<+OC(W^=;qJ zF@iXI8N+Dwf4;I?W1g*UK)>&q&fahF;?7c?5u=mjqO5ISz3gGl?Qe zxTBmK^%_Y!7Z{MeX_}a($sh^{&tL^RwZGKRrIwm`)q8chuwb z7b1-zoqeE}ulb-_$o_xFd9$X{oO5x z-EI`F>a5?#0rUAQt5v~z{rx+{LWIlV5Q(%3pfNm0cEdT%j07*qoM6N<$g4WiBSpWb4 diff --git a/assets/cubyz/items/textures/raw_iron.png b/assets/cubyz/items/textures/raw_iron.png new file mode 100644 index 0000000000000000000000000000000000000000..1cda163d2916dda4408bdeeb221466df7476a175 GIT binary patch literal 351 zcmV-l0igbgP)Y5QZNmbs$+bkc1RAexNoAR%sNBu@bSe^@oW~DoL%zE`}5$5;(!Ly6%qLGIwx) zAQs6T?%iRn1Ixn9J~Q*~4E%dr`z?5Lb-Kv=ZimknQ<@+JRjo=(EB1D_02qy@IIhRz z>sX8JNA`wAoINaS%pDofPl{|cX(Fe#tfFLw98=BGNwb1Q)9@d>U zA`wc}QK}BWaqom6G-Yb-4n!h!r_K50833N=127oeBXL6dFaBJL2~wv!b8u%)R(&*{ zB5{JMRgpNMr4^3r6(yuvf8HOTUs+XvUiXNnmp5w)Rs!FMrPVh=ORKE?yWxWcTM|}* x1+aux6Y!1T&zC0;L&+lby9b5sD+B+IeFL9{hs|`@R)zoo002ovPDHLkV1m2|lD+@{ literal 0 HcmV?d00001