From 97025587113b851ea7a84846a411d7501ad7af02 Mon Sep 17 00:00:00 2001 From: Carrie Date: Tue, 24 Mar 2026 15:27:12 -0600 Subject: [PATCH 1/2] lumiflora and lumi torch --- .../biomes/cave/sky_islands/_defaults.zig.zon | 8 +++--- assets/cubyz/blocks/lumiflora.zig.zon | 24 +++++++++++++++++ assets/cubyz/blocks/textures/lumiflora.png | Bin 0 -> 331 bytes .../cubyz/blocks/textures/lumiflora.zig.zon | 3 +++ .../blocks/textures/lumiflora_emission.png | Bin 0 -> 127 bytes .../cubyz/blocks/textures/lumiflora_top.png | Bin 0 -> 330 bytes .../blocks/textures/lumiflora_top.zig.zon | 3 +++ assets/cubyz/blocks/textures/torch/lumi.png | Bin 0 -> 199 bytes .../blocks/textures/torch/lumi_emission.png | Bin 0 -> 4735 bytes assets/cubyz/blocks/torch/lumi.zig.zon | 25 ++++++++++++++++++ assets/cubyz/items/textures/torch/lumi.png | Bin 0 -> 291 bytes assets/cubyz/recipes/wood_recipes.zig.zon | 4 +++ 12 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 assets/cubyz/blocks/lumiflora.zig.zon create mode 100644 assets/cubyz/blocks/textures/lumiflora.png create mode 100644 assets/cubyz/blocks/textures/lumiflora.zig.zon create mode 100644 assets/cubyz/blocks/textures/lumiflora_emission.png create mode 100644 assets/cubyz/blocks/textures/lumiflora_top.png create mode 100644 assets/cubyz/blocks/textures/lumiflora_top.zig.zon create mode 100644 assets/cubyz/blocks/textures/torch/lumi.png create mode 100644 assets/cubyz/blocks/textures/torch/lumi_emission.png create mode 100644 assets/cubyz/blocks/torch/lumi.zig.zon create mode 100644 assets/cubyz/items/textures/torch/lumi.png diff --git a/assets/cubyz/biomes/cave/sky_islands/_defaults.zig.zon b/assets/cubyz/biomes/cave/sky_islands/_defaults.zig.zon index 10a88fbdb1..656c0e2aec 100644 --- a/assets/cubyz/biomes/cave/sky_islands/_defaults.zig.zon +++ b/assets/cubyz/biomes/cave/sky_islands/_defaults.zig.zon @@ -59,7 +59,7 @@ .{ .id = "cubyz:flower_patch", .blocks = .{"cubyz:daffodil"}, - .chance = 0.01, + .chance = 0.008, .width = 6, .variation = 3, .density = 0.1, @@ -67,9 +67,9 @@ }, .{ .id = "cubyz:flower_patch", - .blocks = .{"cubyz:castilleja"}, - .chance = 0.006, - .width = 8, + .blocks = .{"cubyz:lumiflora"}, + .chance = 0.012, + .width = 6, .variation = 3, .density = 0.1, .priority = 0.1, diff --git a/assets/cubyz/blocks/lumiflora.zig.zon b/assets/cubyz/blocks/lumiflora.zig.zon new file mode 100644 index 0000000000..4773ef6129 --- /dev/null +++ b/assets/cubyz/blocks/lumiflora.zig.zon @@ -0,0 +1,24 @@ +.{ + .tags = .{.cuttable}, + .blockHealth = 0.2, + .drops = .{ + .{.items = .{.auto}}, + }, + .degradable = true, + .viewThrough = true, + .absorbedLight = 0x000000, + .emittedLight = 0x7b3843, + .collide = false, + .model = "cubyz:flower/height_8", + .rotation = "cubyz:planar", + .texture = "cubyz:lumiflora", + .texture_top = "cubyz:lumiflora_top", + .texture_bottom = "cubyz:lumiflora_top", + .item = .{ + .texture = "hibiscus.png", + }, + .lodReplacement = "cubyz:air", + .onUpdate = .{ + .type = .checkSupportBlocks, + }, +} diff --git a/assets/cubyz/blocks/textures/lumiflora.png b/assets/cubyz/blocks/textures/lumiflora.png new file mode 100644 index 0000000000000000000000000000000000000000..f2830fc7ddbea8808e03ff4f97a6ead3de0c8d2f GIT binary patch literal 331 zcmV-R0kr;!P)}n5 z)dY4t1mNxCRU6Zx#b26W75B=$qN4}dbQ;C|#U{k*CjjC7af!3A#GZdE0Po*Z05;t9 zKjf9L-#b)0aOWR7QC9#=Y#D@oBTc=gl0YZwiis@%(sXDCe&OB@d@;K<0G`h8id9PT zxvQOI$Y_Ss@(Qxk@{rLC6WbysT8Ztzmn=!C?bNZ8j4VlczJ4@$FN3geQ~`j!(*yAu dYbEkLegH$LaHK3NcHRI0002ovPDHLkV1gW1l?4C* literal 0 HcmV?d00001 diff --git a/assets/cubyz/blocks/textures/lumiflora.zig.zon b/assets/cubyz/blocks/textures/lumiflora.zig.zon new file mode 100644 index 0000000000..fd3dc59eb2 --- /dev/null +++ b/assets/cubyz/blocks/textures/lumiflora.zig.zon @@ -0,0 +1,3 @@ +.{ + .hasOcclusion = false, +} diff --git a/assets/cubyz/blocks/textures/lumiflora_emission.png b/assets/cubyz/blocks/textures/lumiflora_emission.png new file mode 100644 index 0000000000000000000000000000000000000000..b92b54f28fdda67bd6b6a502b2ce7a6b2faa5164 GIT binary patch literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6+&oZrE6ht3Uz>yYcDCn%v=K?uEdP`I&mYeiGflE%n5iBe#g(Z5QBQ;WrNE9@Lm14Ho z6xJdl6Wk`#tY-iJqnZ5+e;T{hQD;e^r+RL#4b44);aO7X-Rh_(1!^Vxp;}1*0$Y&A zxt@Chb7x?U*-GPFM;9G2EF>w3SiN?GAM?wIM{ktM~| c-}uk*4JPP+x||1%GXMYp07*qoM6N<$g0?l16#xJL literal 0 HcmV?d00001 diff --git a/assets/cubyz/blocks/textures/lumiflora_top.zig.zon b/assets/cubyz/blocks/textures/lumiflora_top.zig.zon new file mode 100644 index 0000000000..fd3dc59eb2 --- /dev/null +++ b/assets/cubyz/blocks/textures/lumiflora_top.zig.zon @@ -0,0 +1,3 @@ +.{ + .hasOcclusion = false, +} diff --git a/assets/cubyz/blocks/textures/torch/lumi.png b/assets/cubyz/blocks/textures/torch/lumi.png new file mode 100644 index 0000000000000000000000000000000000000000..06834205b18c457de6995b20e8055e55026b6de2 GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`eV#6kAr`$$C+y~BG8AAvK24A# zqv3(q0$!t23JV#y7O=YTcj&!nYB=*qIEj0WbA*v3>z=zcZl9;^xwU1>UDG4nI^q^n z*$#ayF?=AfZtwHIx|*b$&7= z+RuNO^mKvP4vEaz<>G7RH&$7nX3DQrIKc1pSKof6qx>wO%NRUe{an^LB{Ts5Q#eb# literal 0 HcmV?d00001 diff --git a/assets/cubyz/blocks/textures/torch/lumi_emission.png b/assets/cubyz/blocks/textures/torch/lumi_emission.png new file mode 100644 index 0000000000000000000000000000000000000000..c43c48a4218371b4dc3258849d6c56e7a3bfd367 GIT binary patch literal 4735 zcmeHKYfw|y77j0Y3#f=NGRA-c+LPoYAtWh5A)urXh`adDCo1jxfAK!8#aP!T~< zR47xipuKknBBjbtqjOy6R~GTdit)%>)A@3Ad=kD(vz2=Da(!dv&!;a@;we0?W;FJF9N|kbXAb&MU9p zkiMuRA7gIJqt>=rKIg}t+$yv&Y&mx_YtY`b8X4(ovbzc^oK#rm?Wnn56MK)7^59zC zn@^H!ENw>o=}pCtMfp;^SD*i}8vU>PUzbD~=qHL&qOxN|WA_Yu zbp`4iHR7zyT&knPcUbq;8QarVOZU!QZBT~pkQ?X(_3y?ra~)4^F6H!DANlpbf!?_< z`^b962OQ_nZ^vg?9}!H1t4@@am#+&gEV&?pxIz9UL8oXIEdl{t97&DSY2!{azjIh?h2^lu)olg2r9Eorx@yvfbCsk(Dh8uzkf z<2>4)`G-1ic^pT}+MPJl5~tHwUDlL7UVa+t8=a5oR~1H7aLx4l0#0NRleSuv7v8Tu zZ?G%y{%FHK)A`*tZ4<4-_Gdj-aU@n>CiVIcEx(2_o`!@3zYzqwjkznolrSIle{-G~&av5>f zx%{P_Ce^Is`d1buG)EWW?#%ec#=|YgvUZ)WnOl>IAJuy_^yuhQ!m^&C1(BE4z5n&N zRyXjnCq3gvCHd-*oguB8{!3eS@zv_wvh~?k|HhRYwRTXRIJy`-7`spreXNdg{r4B+ zr^h<$TQV|y-LIJavb+ah+H=PI+W2LwuzjJAl#k#-qVL<*#Fjp{Yd%E=rM572Fy)ca z&*9HE{g@Te)|pe0gC6@=@TG#+;r;b35yv~jpOwDd)?0t+R7YZDv#-F)uK@4mX^w?# zatNpk$lXReDl}y;oZ?ACTEm6ap>53lUwsl3?5G8 zU2-ur>(RX!-*Z25fRT=)(2jSS%jHIS3tiH>2fEpZl;gD(t_@3cpDI#4hteECE3*@W zmKDzPXQ46)5fRD+7*Q>egO-NFxvx^o5i}lC;RRTXSjr~6sB0kL#X>e=y(^E*lXI|G zv2UsZ3r-CPK~v*VrjW48!^B<90t6CFh2Yha1gVmxW)rl$EHKtglL&Y%L>12_g!A}# zj!c2!X+#>44EdH#Q+wrINEqq~zpeVltH|Q^b&9CX-1b zQ%DpF1Q3uiMXEy7kW}fQp_t_G#+0Z+ELVwTQoM!}5y%o%YyttS<3GeFk@I-d^it)N z3P2B%8j+J=BAFzSkY-vaRX$08WGbM)wNQqD&QA)$l(IwxiuojAQkBC@3L!deFHck? zXwwm*BrE}w0H_jpg+Fn*mdoQ$TWBPR5liG+Ddy}h*Br1geYr` zOd&zQc8VoP3`UYmW3)arg0npNTsDD1B!8UYCm<>jFkln>#nMFe$Au8F1PfLn8Z}`z zGE8%&gNFh$sZ8oeP#C6Af=bkI!ek`IwP zm5eAb&lr#?$OaUUHXFRNR!Wyo(aEuxMkg|b3c(bJ42Qr>P#`Rd>q;`rB9jTEsf0*TZaot0}=uFq27 zv%s^}H7nO=Dezg~+3Nbg$z}5K!h=b{zo2ArosljS)q$(f9D(0jZ|$WB_a~=r3m6&8 zeIt}Ooaubcqk}8?ei4{7RB?Geh683g^H$i_q%AT6Q&g_EX9(lUa3O4kTWyqaBS-&i z`Ga2jC`a6XyeiH4p>GS!jDK*-+}vm!fGb!r6y5mF)FSwaks#*C)Wc#%ojN F{{Z$t`;Pzs literal 0 HcmV?d00001 diff --git a/assets/cubyz/blocks/torch/lumi.zig.zon b/assets/cubyz/blocks/torch/lumi.zig.zon new file mode 100644 index 0000000000..39c11f7df2 --- /dev/null +++ b/assets/cubyz/blocks/torch/lumi.zig.zon @@ -0,0 +1,25 @@ +.{ + .tags = .{.choppable}, + .blockHealth = 0.5, + .drops = .{ + .{.items = .{.auto}}, + }, + .replacable = true, + .emittedLight = 0xc0616a, + .viewThrough = true, + .absorbedLight = 0x010101, + .collide = false, + .rotation = "cubyz:torch", + .onUpdate = .{ + .type = .checkSupportBlocks, + }, + .model = .{ + .base = "cubyz:torch", + .side = "cubyz:torch_side", + }, + .texture = "cubyz:torch/lumi", + .item = .{ + .texture = "torch/lumi.png", + }, + .lodReplacement = "cubyz:air", +} diff --git a/assets/cubyz/items/textures/torch/lumi.png b/assets/cubyz/items/textures/torch/lumi.png new file mode 100644 index 0000000000000000000000000000000000000000..09c1d653a0fb1576afdc018983757f92bc5af4a2 GIT binary patch literal 291 zcmV+;0o?wHP)A#zi_mt6kbpvmX2_m39dr`+lzxJ)eyD6A?vh1aT(dY9B}6cPCP}juxejt2 z8t)DY{>D4r=Y8&d4-`qmNTgvTRQEC`x=U|#iV1Rdc#z*N#e4q)z|?VpMr$wt0Nl(j zDcj#dFPxKu00^?gGCm>5602+*yl~FN{c3L_t&9Mf$=x*o+x42~k1rOl4} Date: Wed, 25 Mar 2026 12:46:17 -0600 Subject: [PATCH 2/2] Lumiflora item and many tweaks --- assets/cubyz/blocks/lumiflora.zig.zon | 2 +- assets/cubyz/blocks/textures/lumiflora.png | Bin 331 -> 332 bytes .../blocks/textures/lumiflora_emission.png | Bin 127 -> 127 bytes assets/cubyz/blocks/textures/lumiflora_top.png | Bin 330 -> 334 bytes .../blocks/textures/lumiflora_top_emission.png | Bin 0 -> 169 bytes assets/cubyz/blocks/textures/torch/lumi.png | Bin 199 -> 204 bytes assets/cubyz/items/textures/lumiflora.png | Bin 0 -> 527 bytes assets/cubyz/items/textures/torch/lumi.png | Bin 291 -> 288 bytes 8 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 assets/cubyz/blocks/textures/lumiflora_top_emission.png create mode 100644 assets/cubyz/items/textures/lumiflora.png diff --git a/assets/cubyz/blocks/lumiflora.zig.zon b/assets/cubyz/blocks/lumiflora.zig.zon index 4773ef6129..d84c3625c9 100644 --- a/assets/cubyz/blocks/lumiflora.zig.zon +++ b/assets/cubyz/blocks/lumiflora.zig.zon @@ -15,7 +15,7 @@ .texture_top = "cubyz:lumiflora_top", .texture_bottom = "cubyz:lumiflora_top", .item = .{ - .texture = "hibiscus.png", + .texture = "lumiflora.png", }, .lodReplacement = "cubyz:air", .onUpdate = .{ diff --git a/assets/cubyz/blocks/textures/lumiflora.png b/assets/cubyz/blocks/textures/lumiflora.png index f2830fc7ddbea8808e03ff4f97a6ead3de0c8d2f..efe9e08fa067b0372af373533b43b9e9121b05cf 100644 GIT binary patch delta 305 zcmV-10nYx*0?Y!CB!3f0L_t(IjkS_3Ps30YhM(I|CPwH41Vfm?bo>-l69O|>9Iinu zlgk7GGX)v}3l_l-849x*LgCW?G;O*m88`Gi1Uw@il75B=$qN4}dbQ;C| z#U{k*CjjC7af!3A#GZdE0Po*Z05;t9Kjf9L-#b)0aOWR7QC9#=Y#D@oBTc=gl0YZw ziis@%(sXDCe&OB@d@;K<0G`h8id9PTxvQOI$Y_Ss@(Qxk@{rLC6WbysT8Ztzmn=!C z?bNZ8j4VlczA1h*c`t*oZ&U$*z0(8n8fzu;JbnN}sBok#D|X%h0000#h8!sqEU-J k8rC$fn?LbMfy6v628SJznU%+H>}3D~Pgg&ebxsLQ0Bc4d(*OVf delta 80 zcmV-W0I&ale~>gw=;KqM&%nUIhNcM31Pv%g07g_d=rb@d{A9R++k~GC3=F@}T=5?j mYM}8ke1Wc?k>qd~o(cewz!?D_ls(4)0000GvxQ8EsIlFB&Ci=R@8^H>5BzDYryG^Vnd-YU zcw`zo0?pGnQ|swQ^)@IQ*_z5m0^pf~BwDGlBhY6W#;viEXn&;w;Zrt}eSHK#^VuRa zdK;v1raV)S%YwJ>Pe#^>T{YnAIc%o^c>j1ct|FvyrpAuo$vX3qb!zLrKBBd5jEe@I zDfp>idyu$8n_YF5b=6uo#?3eA#sF}KHk!|ulMBz)7IchU76iiQ#q-(MN6JPL2%jWc z^{>%01>1vUzAT&=-K?`kXymfM9on~szK=A{9{$FEj$eXle{QqmHt7HW002ovPDHLk FV1oEcm&yPD delta 303 zcmV+~0nq-=0?GoAB!3Y}L_t(Ijn$GdZi7G+L?2PWkrrqu=&aD^0y#i>OH?S9oAf?` zOHRNMEG#R9C3>GDHByR56f}gDVz$^6)*>Pk+$PhkX8-@Anf(iY8oSj|XGx)_dTy=_ z%{_tPSyJfT>Zm6LY9;%jT1fx`Tad=No_hjwXJC!lO5;9G2EF>nM7^uu56sJMNh2-;pK7)!+Ef@eL;Ef4ZCpjWYlM002ovPDHLkV1inQ BkPQF; diff --git a/assets/cubyz/blocks/textures/lumiflora_top_emission.png b/assets/cubyz/blocks/textures/lumiflora_top_emission.png new file mode 100644 index 0000000000000000000000000000000000000000..52621726a2d07e9558f8d5346153109ed37bb55e GIT binary patch literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf63OrpLLo_C?ow%E;!GOor-}S}3 zrJMi%4?L%Lx7%69Cp+V+qmPIDlLLDd8K0Ui`~HpLgmFN0ro+~>O~JRMU1b}*$``+Q z^VOJp;-M@d$&3RlW!DOAILOLjEvezcbz{A8<@<%RozCpbP0l+XkKKz=}d literal 0 HcmV?d00001 diff --git a/assets/cubyz/blocks/textures/torch/lumi.png b/assets/cubyz/blocks/textures/torch/lumi.png index 06834205b18c457de6995b20e8055e55026b6de2..8d62aff13221261330628fd39367b12fe60df295 100644 GIT binary patch delta 176 zcmV;h08jtN0n7oAB!81hL_t(Ijir#i5kWx|M$hgn1~WQ%p%#=N(}P3{3ebWA#5#~D z!HiTQ*}xc)#aln~tV{vlz4cQaViaj^=5CtAsp&2^(V^$4{*zO zo8a+&=>khWfbX@s^xGX>fOWz-U1a!Q(Bz~GEcpOoH5%e#WGS!}3tWtps?rOlrzg#E eCkwpgfdD_jCNU?S#`;|V0000^V2xx%dN}vrg${?Wt3ZMl<4~Q=4 zf`H886JiUjLs&8y1-#vSM)Q`u+O)LYHN*=n7dVv$!tr!5;1I68=lw0RzysuxZGzXQ z*9De*06!UwnGQ#~0PBQ%ddTpQzwh_);DpsE6rDz)=$zCa ztVmE($!BR$bUxch04!7<2>&G*s3tPgba(eq@>$eO8uR|6u_B>yhw7~*qulI5nw3`oTzA}>oJ?ZKI-SF|hY1f8yx-rt>x88{k|?2_ zy+FGEkx=M2w$-C0YV`U&s*Nh;H>=*{J`308-0-%VyELs9hOE2$)=LaoN0|~?eeu{M z@rC&0wdsvGGkFeWN(7*^-KMl%3JwuKTV8ZdYc6Q6d}YM%hwMA*>zhI#fqFIPy~L^6 zI6vNYN9wQrK7dE$BlvfkNHU5jg*m8MM9;*CEyS7V9P_>YlluCmF!nEK%Zm;`BpD@g zF~-5uFYJ^}0YLqlbK*UIDC002ovPDHLkV1jT)^_&0z literal 0 HcmV?d00001 diff --git a/assets/cubyz/items/textures/torch/lumi.png b/assets/cubyz/items/textures/torch/lumi.png index 09c1d653a0fb1576afdc018983757f92bc5af4a2..147108905a9d244ebb94be355ed0969580eda220 100644 GIT binary patch delta 260 zcmV+f0sH==0-yqrB!A~gL_t(IjkS@nYr;Sjhrie^hO8Z;;3DE|=;qKVRGbxOXa67n zhhQfMA)`ZwLdnuDp>%18L9$77QqIM5Fugla{Ehc`-}~-8P-NB}h*@_aRCSq(uGn-Q zFhL$KAEMWh_$>|qwB0&nsn(zb0O+?G#HYrN-y;G6;Dv!@{C$EK23DMos z*8yZ!+s$==e4X%tZQ|<U^FmY0N@BAx=9|JAtXWo0000< KMNUMnLSTYa;CQhB delta 264 zcmV+j0r&o(0;2+uB!B8jL_t(IjkS_LOT$1Iho7j6&~}KBfI^36$euMFbQ1TJeuA!k zsB9tbl0{uyvp5zdL@<9QNwXEX4ssnD?+yz7#yj5UeeQh^6iLHKq+ujf_cABCOK)_F z337ILkl!xFd;bH#)Nz4EYcK!++{`X1+uuSjoRfn92(rX7K7S#|602+*yl~FN{c3L_ zt&9Mf$=x*o+x42~k1rOl4}