From a169e96dabd7710ef936d45daa38ef7b085d7ec3 Mon Sep 17 00:00:00 2001 From: careeoki <122191047+careeoki@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:24:39 -0700 Subject: [PATCH] Daffodil, Castilleja, and Ferns (#951) * Add daffodil, castilleja, and fern * Add fern item texture, tweak dry and lush grass items. tweak vetch and item * Update flower models to stay within 1 block of space * Castilleja.zig.zon, fix some formatting --- assets/cubyz/blocks/castilleja.zig.zon | 19 ++++++ assets/cubyz/blocks/daffodil.zig.zon | 19 ++++++ .../cubyz/blocks/dry_grass_vegetation.zig.zon | 4 +- assets/cubyz/blocks/fern.zig.zon | 17 ++++++ assets/cubyz/blocks/grass_vegetation.zig.zon | 4 +- .../blocks/lush_grass_vegetation.zig.zon | 4 +- assets/cubyz/blocks/textures/castilleja.png | Bin 0 -> 285 bytes .../cubyz/blocks/textures/castilleja_top.png | Bin 0 -> 246 bytes assets/cubyz/blocks/textures/daffodil.png | Bin 0 -> 259 bytes assets/cubyz/blocks/textures/daffodil_top.png | Bin 0 -> 220 bytes assets/cubyz/blocks/textures/fern.png | Bin 0 -> 373 bytes assets/cubyz/blocks/textures/vetch.png | Bin 424 -> 489 bytes assets/cubyz/blocks/vetch.zig.zon | 4 +- assets/cubyz/items/textures/castilleja.png | Bin 0 -> 416 bytes assets/cubyz/items/textures/daffodil.png | Bin 0 -> 410 bytes assets/cubyz/items/textures/dry_grass.png | Bin 379 -> 382 bytes assets/cubyz/items/textures/fern.png | Bin 0 -> 375 bytes assets/cubyz/items/textures/lush_grass.png | Bin 382 -> 391 bytes assets/cubyz/items/textures/vetch.png | Bin 453 -> 442 bytes assets/cubyz/models/flower/height_10.obj | 55 ++++++++++++++++++ assets/cubyz/models/flower/height_8.obj | 55 ++++++++++++++++++ 21 files changed, 173 insertions(+), 8 deletions(-) create mode 100644 assets/cubyz/blocks/castilleja.zig.zon create mode 100644 assets/cubyz/blocks/daffodil.zig.zon create mode 100644 assets/cubyz/blocks/fern.zig.zon create mode 100644 assets/cubyz/blocks/textures/castilleja.png create mode 100644 assets/cubyz/blocks/textures/castilleja_top.png create mode 100644 assets/cubyz/blocks/textures/daffodil.png create mode 100644 assets/cubyz/blocks/textures/daffodil_top.png create mode 100644 assets/cubyz/blocks/textures/fern.png create mode 100644 assets/cubyz/items/textures/castilleja.png create mode 100644 assets/cubyz/items/textures/daffodil.png create mode 100644 assets/cubyz/items/textures/fern.png create mode 100644 assets/cubyz/models/flower/height_10.obj create mode 100644 assets/cubyz/models/flower/height_8.obj diff --git a/assets/cubyz/blocks/castilleja.zig.zon b/assets/cubyz/blocks/castilleja.zig.zon new file mode 100644 index 00000000..79782381 --- /dev/null +++ b/assets/cubyz/blocks/castilleja.zig.zon @@ -0,0 +1,19 @@ +.{ + .class = .leaf, + .hardness = 0.1, + .drops = .{ + .{.items = .{.auto}}, + }, + .degradable = true, + .viewThrough = true, + .absorbedLight = 0x000000, + .collide = false, + .model = "cubyz:flower/height_10", + .texture = "cubyz:castilleja", + .texture_top = "cubyz:castilleja_top", + .texture_bottom = "cubyz:castilleja_top", + .item = .{ + .texture = "castilleja.png", + }, + .lodReplacement = "cubyz:air", +} diff --git a/assets/cubyz/blocks/daffodil.zig.zon b/assets/cubyz/blocks/daffodil.zig.zon new file mode 100644 index 00000000..d397ea32 --- /dev/null +++ b/assets/cubyz/blocks/daffodil.zig.zon @@ -0,0 +1,19 @@ +.{ + .class = .leaf, + .hardness = 0.1, + .drops = .{ + .{.items = .{.auto}}, + }, + .degradable = true, + .viewThrough = true, + .absorbedLight = 0x000000, + .collide = false, + .model = "cubyz:flower/height_8", + .texture = "cubyz:daffodil", + .texture_top = "cubyz:daffodil_top", + .texture_bottom = "cubyz:daffodil_top", + .item = .{ + .texture = "daffodil.png", + }, + .lodReplacement = "cubyz:air", +} diff --git a/assets/cubyz/blocks/dry_grass_vegetation.zig.zon b/assets/cubyz/blocks/dry_grass_vegetation.zig.zon index 73679613..50268c6a 100644 --- a/assets/cubyz/blocks/dry_grass_vegetation.zig.zon +++ b/assets/cubyz/blocks/dry_grass_vegetation.zig.zon @@ -7,10 +7,10 @@ .degradable = true, .viewThrough = true, .absorbedLight = 0x000000, - .collide= false, + .collide = false, .model = "cubyz:cross", .texture = "cubyz:dry_grass_vegetation", - .item= .{ + .item = .{ .texture = "dry_grass.png", }, .lodReplacement = "cubyz:air", diff --git a/assets/cubyz/blocks/fern.zig.zon b/assets/cubyz/blocks/fern.zig.zon new file mode 100644 index 00000000..b69bf565 --- /dev/null +++ b/assets/cubyz/blocks/fern.zig.zon @@ -0,0 +1,17 @@ +.{ + .class = .leaf, + .hardness = 0.1, + .drops = .{ + .{.items = .{.auto}}, + }, + .degradable = true, + .viewThrough = true, + .absorbedLight = 0x000000, + .collide = false, + .model = "cubyz:cross", + .texture = "cubyz:fern", + .item = .{ + .texture = "fern.png", + }, + .lodReplacement = "cubyz:air", +} diff --git a/assets/cubyz/blocks/grass_vegetation.zig.zon b/assets/cubyz/blocks/grass_vegetation.zig.zon index e951088a..461ff3ff 100644 --- a/assets/cubyz/blocks/grass_vegetation.zig.zon +++ b/assets/cubyz/blocks/grass_vegetation.zig.zon @@ -7,10 +7,10 @@ .degradable = true, .viewThrough = true, .absorbedLight = 0x000000, - .collide= false, + .collide = false, .model = "cubyz:cross", .texture = "cubyz:grass_vegetation", - .item= .{ + .item = .{ .texture = "grass.png", }, .lodReplacement = "cubyz:air", diff --git a/assets/cubyz/blocks/lush_grass_vegetation.zig.zon b/assets/cubyz/blocks/lush_grass_vegetation.zig.zon index 56870266..3d978a65 100644 --- a/assets/cubyz/blocks/lush_grass_vegetation.zig.zon +++ b/assets/cubyz/blocks/lush_grass_vegetation.zig.zon @@ -7,10 +7,10 @@ .degradable = true, .viewThrough = true, .absorbedLight = 0x000000, - .collide= false, + .collide = false, .model = "cubyz:cross", .texture = "cubyz:lush_grass_vegetation", - .item= .{ + .item = .{ .texture = "lush_grass.png", }, .lodReplacement = "cubyz:air", diff --git a/assets/cubyz/blocks/textures/castilleja.png b/assets/cubyz/blocks/textures/castilleja.png new file mode 100644 index 0000000000000000000000000000000000000000..33abfdbeccbc965c0d713ef43c48503e850464c0 GIT binary patch literal 285 zcmV+&0pk9NP)}MWL5DPIdCvPg?rt6P zBm!P34m!jSZ@6}jin2e0{`1%q7qi98m%YLj;&lRu(|XRT1zf0Kj6p zvEI|928?F$bzK4-!BQu9MLzjDmLwJ6n64#?sYJ3nS!G@2AZ;? j#5TSjM*r;wmck4kUiV!V70?@s00000NkvXXu0mjf$TxJN literal 0 HcmV?d00001 diff --git a/assets/cubyz/blocks/textures/castilleja_top.png b/assets/cubyz/blocks/textures/castilleja_top.png new file mode 100644 index 0000000000000000000000000000000000000000..2cdc81da1d7071eb9b6e0c560ff46b09be0eb567 GIT binary patch literal 246 zcmVyrMwb95(X`e%SA;?u9ZV1`QL@gmI)%^*oMw*|2Dr*e)x4XoGp+uk4;Roj7@L8 zvBlNLEDzuAvY31R01!0kO)!lAZ_mukeE7Hce~GZLxHOR|2VQ%>iQ~w>{#Re);E@mi zj@q+1a;mjSc8W_*JPJ~AB%9&P1poa1Mklg28`;BjX@>IZbxndNKdBU{&5$qhqtWl-66$Er0X%A*au*oMi?3cb?tFsP{=K zd)37Kw-$76sn{na#Sqh^%y4_Qq~T`9!&9DUT?^T9_Uvv)G*qA UJKP)1uhOF>Gzab;P!Q4<&4kq{2z4ZHyH033jL0dL?zj0rmyB}KYDpYQqL|D4{ioByR(DPB5*&aWW`@O1ZV{nVtGsT3b&EJ^0;qmX^e z0|VE0QAu{xpg6?RRL85Lk_<6hQE%CJXD0@_ub#};jPJ*m0RUXyUg!0e&33sX2%9)w zwFHRzQSSOKVz%P+$_GFtS=j(!F^vhrCNh@BqBrd3+D`u+7-)+iY?>f|j3ut`;&@dS z)7Y%1l8n({WZCnmDinUZLHxd< z7C6*fU-P!h9WM_P3&1Xxqkfd@Kq^!ToC-xM6t%!HDp!a8TT1Hy1%Ns5mH;x&%swgm7ozGR z=Mv!J{uY3pwL5KjVXA@`y1G}@GEYA`eiJWrDdo$FDXYsziEBOGMHXOwY=)h+JL!ck z9ly!X*-ciLj}mT<->h@_`AjIGa+6g}3sV(-wXXrl6%E}~%9rW*P3>fQaxSrp3_vMg zrqORxfAw7#u7BR`vUOM$2gQ#747xGXlXDujbyyV|;Ds)qe!LZC!C?PnMLhlqwToQQ zNPqzpR0B>cUwIybZj9yFdRaHyb)lv!xCQ`NjxBRV1Iw}H@7+rQ5ceVm-59el6x>$# z*gshj0Pi;!hrdz1sHrbr=dm1H2CYC(x!JA@``eOy?nnwiSdJ~tfR#B!6#7L_t(Ijg67NYr;SnhTjWKtb(Ctvy)(l2nClC1eg9Lr65Rg zk9_B{72LN8viiotLDs-W2k^-*eBK0B4*@cSEyg z(m8-rkW7HMu-dOP!G8iK-3?7H&71{>?Pba$1z;i5(g}NKT7NpZE7jom?*9gk?_%aG zVm7C0NaC&RlrFDQ!I9QNf85|!Y)2Zlm$aHM^I(76AS1063jsh*lT%gzAXW2auFM8v zSgez*3INh-zfLI!b_C<~o;tqEXMr7YBk_Akrlk``TkY3)dHAC9!IUKH06?-T09*jT z=WUN`i8r!3^?zQIKH6`X`G-31H%~_c_E75>^yB&&j_;z@F=Bru^r9GCJfz-h(wrt^ z`@Msr%E)Ol0y{$JMJQGZ*naN-0PUYKOiSnaz>Y8~9_p{W22J5w%`5ej;MwmtWb;8t?1 z12jIqFjouO_MGy_QuY$$N?GyxcFeFdl@Sb0rMp~Fn~o`uEJfP|J_+kot3BeXj-jd4 z7cx*1Ns3i+O%m`D|hXp7OfKmL69O5 zGP6w(8VtcSM7s(*?lRZVWA@ zGHIH$+BSeI-;=<4dFTH8L6PSJ@#)ro17*y-g1)K&X`v+}bzipZ?Q*$|AjQ|k^lez07*qoM6N<$ Eg1@`6e*gdg literal 0 HcmV?d00001 diff --git a/assets/cubyz/items/textures/dry_grass.png b/assets/cubyz/items/textures/dry_grass.png index fbe86ce8643c1f3aee8ff6aabf2d8e9b6ddb46ef..6f24f750d07132816afa3aa15c9c14b280e8a357 100644 GIT binary patch delta 355 zcmV-p0i6E(0{#M!B!5LoL_t(IjlGdEYr;?zMvobB z>f~4oPVHK#1?eg%xY)EqYNZJkVsR*>Lz~ycMD5f&h4=0`_q%!UALY1a?6_uJba(Vu zpx3QYBqlhSC3I#=gF!e(DQ9&B$bqx7#3GH-(hnu(3aI|31Z%NtR<9`xMXw1DYDb5KF<9U9> zpx?stBLKo+%b?#Pok%I#9Y`#pvD(B4Q)jh_xxTstU^rUHlmMke!G7n}CZ^kNFrKaH zwi|eU#Pc+e;GZ{0!_8V5fS1>Isud--W^M(5X00q?Vd{)$YwCt7Ww-ZB*_(;uxOQR* zjWF0!H&iLxCs~+#yJJqD{8CQfxOP&lD13Z=Q?2ZR)eV)&B#;BrU`DW?+^m%|la4{@ yQUJmrCJbUMp;I?h=3aCX%m{v)%_KejocaN52$CCnkkO3*0000P66@Yi{}H5FVy8<*sg0ix{^B}aDgZm0N4?oifOGtK+Xb#S znnx75p~wx-N|I)YEw#D7fpfLvA(gHWN>Jp6FqVkLgi2SG+Tb0U!8k{u1jo$@pcX0t zz~}1@fPAfkL01I$RfQ6SvGnin_lp-gP0$3mlmRMTQRJrO?s{f>@sM5yUn`9r4+&%0 zat9Df)Sy@b*wzVYmROf`aK2Lf_Fong0FIlJKcV>_^g?tHfZ%*>Wdm?n?eAycK<)&f zN$1QX9~w^TB!5mxL_t(IjkS_7Z^AGTg}+qBB3?okB4xmxP`h>N+>NEq<<|B0Hi8{neMY(GE4+! zQ3DYDwtn|CV!x~zCW5BwNT&*0w5|r6o8Swc{XhhusXB&C4T8MR9GqZ_){&d4a}Ls}a$f@7pNBX*2G~>`aV8xx&LsO~jak&#oehSa zIgq0PZFvZSJY@;#L|_&K8Ms1!uc$2#PUM8mx^{IwQ9+Qxw_a>oQWZIo)q4fN_HFB} zdmNl|q`l+#G&YzP690yeV63G`*ltN{{<0?O2neNH!D2d6Tf|gcV`o>Ndk}) z>6nDk=S$Up515Zrw>{FDusfvR1Ifmvm*M zngG=8M0IsU5uXp3rziZ-C0*@!Zyj&zJY!b zv8ejunKC5BjW002ovPDHLkV1nw? BsH^}0 diff --git a/assets/cubyz/items/textures/vetch.png b/assets/cubyz/items/textures/vetch.png index 6d3038685bf34205a52fdec3f3ec7c8b70a94583..89c8890f630014243ce095799f4b323e22368c09 100644 GIT binary patch delta 416 zcmV;R0bl;b1G)o{B!7WPL_t(Ijg6B#OT%Cog`a4p6sxIPFF|NPjTA%|7e_&%lS^G) z1pkIpe}y2rxa#60Xcs~1DpbUlLcI`eYA=zHUXag0QyOei&-i|v=RN0z5Bg{~aVT~Z zhr;W9pr3hVc7t-g=$dVUHbGi1Gt82GA^dqW@uL0KasN~#+If4 zsAfz43DmCW)$C8#UxVjI>LhT?&Q`Cuy%Ydw7&dRlOBwgpf9o3x*sti|11L2B0000< KMNUMnLSTXwXTXI3 delta 427 zcmV;c0aX6F1H}W7B!7%aL_t(IjeU^8N&-<7hQEn)NQYrCZlr`}AVETbn;>)7%1w(P zTm>z9fi{5;;5$T%piL3DXwwTc1+{2biv+EZ3&d5^ez;U0JUBVfc>>Yt{Rt|e%w;E%i6>UZMR9S*ZPG3&!0CVy{cW- zhVSqXP_@gN{c=vN*FqRc0ECg`&be0+hwtDU;m@LsnF|Ob1%UJQ#&RN$Fp}6W=PHH< zkS=8JlHg(PA|0)))4uUG-R!AXY-svl+a VzbBTMbNK)O002ovPDHLkV1k((#