From afcef76cdf4965df67f8ef86141e2dbef3d26c6a Mon Sep 17 00:00:00 2001 From: careeoki <122191047+careeoki@users.noreply.github.com> Date: Thu, 19 Dec 2024 09:52:56 -0700 Subject: [PATCH] Stone Walls (#825) * Add wall model, add stone walls with wip textures * Some work on textures... * More work on texture. Tweak Voidstone bricsk * Add voidstone and ferrock tiles, tweak their textures, more work on twall textures * Add voidstone and ferrock walls., more work on textures * Add remaining textures and add missing recipies * undo change * Remove mtl references * Optimized (but z-fighting) wall model * Fix a thing *backflip* * Update fence and wall model for new code * Improve how the fence rotation handles UVs on the top and bottom faces. --------- Co-authored-by: IntegratedQuantum --- assets/cubyz/blocks/basalt_wall.zig.zon | 15 ++ assets/cubyz/blocks/ferrock_tiles.zig.zon | 11 ++ assets/cubyz/blocks/ferrock_wall.zig.zon | 15 ++ assets/cubyz/blocks/glacite_wall.zig.zon | 15 ++ assets/cubyz/blocks/limestone_wall.zig.zon | 15 ++ assets/cubyz/blocks/marble_wall.zig.zon | 15 ++ assets/cubyz/blocks/sandstone_wall.zig.zon | 15 ++ assets/cubyz/blocks/stone_wall.zig.zon | 15 ++ assets/cubyz/blocks/textures/basalt_wall.png | Bin 0 -> 362 bytes .../cubyz/blocks/textures/basalt_wall_top.png | Bin 0 -> 323 bytes .../cubyz/blocks/textures/ferrock_bricks.png | Bin 440 -> 455 bytes .../cubyz/blocks/textures/ferrock_tiles.png | Bin 0 -> 420 bytes assets/cubyz/blocks/textures/ferrock_wall.png | Bin 0 -> 503 bytes .../blocks/textures/ferrock_wall_top.png | Bin 0 -> 360 bytes assets/cubyz/blocks/textures/glacite_wall.png | Bin 0 -> 420 bytes .../blocks/textures/glacite_wall_top.png | Bin 0 -> 354 bytes .../cubyz/blocks/textures/limestone_wall.png | Bin 0 -> 396 bytes .../blocks/textures/limestone_wall_top.png | Bin 0 -> 344 bytes assets/cubyz/blocks/textures/marble_wall.png | Bin 0 -> 361 bytes .../cubyz/blocks/textures/marble_wall_top.png | Bin 0 -> 300 bytes .../cubyz/blocks/textures/sandstone_wall.png | Bin 0 -> 423 bytes .../blocks/textures/sandstone_wall_top.png | Bin 0 -> 385 bytes assets/cubyz/blocks/textures/stone_wall.png | Bin 0 -> 367 bytes .../cubyz/blocks/textures/stone_wall_top.png | Bin 0 -> 310 bytes assets/cubyz/blocks/textures/void_stone.png | Bin 326 -> 320 bytes .../blocks/textures/void_stone_bricks.png | Bin 362 -> 352 bytes .../cubyz/blocks/textures/void_stone_tile.png | Bin 0 -> 310 bytes .../cubyz/blocks/textures/void_stone_wall.png | Bin 0 -> 352 bytes .../blocks/textures/void_stone_wall_top.png | Bin 0 -> 341 bytes assets/cubyz/blocks/void_stone_tile.zig.zon | 11 ++ assets/cubyz/blocks/void_stone_wall.zig.zon | 15 ++ assets/cubyz/items/textures/wall/basalt.png | Bin 0 -> 355 bytes assets/cubyz/items/textures/wall/ferrock.png | Bin 0 -> 444 bytes assets/cubyz/items/textures/wall/glacite.png | Bin 0 -> 404 bytes .../cubyz/items/textures/wall/limestone.png | Bin 0 -> 403 bytes assets/cubyz/items/textures/wall/marble.png | Bin 0 -> 377 bytes .../cubyz/items/textures/wall/sandstone.png | Bin 0 -> 433 bytes assets/cubyz/items/textures/wall/stone.png | Bin 0 -> 312 bytes .../cubyz/items/textures/wall/void_stone.png | Bin 0 -> 361 bytes assets/cubyz/models/fence.obj | 171 ++++++++++++------ assets/cubyz/models/wall.obj | 109 +++++++++++ assets/cubyz/recipes/brick_recipes.zig.zon | 40 ++++ src/rotation.zig | 12 +- 43 files changed, 412 insertions(+), 62 deletions(-) create mode 100644 assets/cubyz/blocks/basalt_wall.zig.zon create mode 100644 assets/cubyz/blocks/ferrock_tiles.zig.zon create mode 100644 assets/cubyz/blocks/ferrock_wall.zig.zon create mode 100644 assets/cubyz/blocks/glacite_wall.zig.zon create mode 100644 assets/cubyz/blocks/limestone_wall.zig.zon create mode 100644 assets/cubyz/blocks/marble_wall.zig.zon create mode 100644 assets/cubyz/blocks/sandstone_wall.zig.zon create mode 100644 assets/cubyz/blocks/stone_wall.zig.zon create mode 100644 assets/cubyz/blocks/textures/basalt_wall.png create mode 100644 assets/cubyz/blocks/textures/basalt_wall_top.png create mode 100644 assets/cubyz/blocks/textures/ferrock_tiles.png create mode 100644 assets/cubyz/blocks/textures/ferrock_wall.png create mode 100644 assets/cubyz/blocks/textures/ferrock_wall_top.png create mode 100644 assets/cubyz/blocks/textures/glacite_wall.png create mode 100644 assets/cubyz/blocks/textures/glacite_wall_top.png create mode 100644 assets/cubyz/blocks/textures/limestone_wall.png create mode 100644 assets/cubyz/blocks/textures/limestone_wall_top.png create mode 100644 assets/cubyz/blocks/textures/marble_wall.png create mode 100644 assets/cubyz/blocks/textures/marble_wall_top.png create mode 100644 assets/cubyz/blocks/textures/sandstone_wall.png create mode 100644 assets/cubyz/blocks/textures/sandstone_wall_top.png create mode 100644 assets/cubyz/blocks/textures/stone_wall.png create mode 100644 assets/cubyz/blocks/textures/stone_wall_top.png create mode 100644 assets/cubyz/blocks/textures/void_stone_tile.png create mode 100644 assets/cubyz/blocks/textures/void_stone_wall.png create mode 100644 assets/cubyz/blocks/textures/void_stone_wall_top.png create mode 100644 assets/cubyz/blocks/void_stone_tile.zig.zon create mode 100644 assets/cubyz/blocks/void_stone_wall.zig.zon create mode 100644 assets/cubyz/items/textures/wall/basalt.png create mode 100644 assets/cubyz/items/textures/wall/ferrock.png create mode 100644 assets/cubyz/items/textures/wall/glacite.png create mode 100644 assets/cubyz/items/textures/wall/limestone.png create mode 100644 assets/cubyz/items/textures/wall/marble.png create mode 100644 assets/cubyz/items/textures/wall/sandstone.png create mode 100644 assets/cubyz/items/textures/wall/stone.png create mode 100644 assets/cubyz/items/textures/wall/void_stone.png create mode 100644 assets/cubyz/models/wall.obj diff --git a/assets/cubyz/blocks/basalt_wall.zig.zon b/assets/cubyz/blocks/basalt_wall.zig.zon new file mode 100644 index 000000000..aaaf711ed --- /dev/null +++ b/assets/cubyz/blocks/basalt_wall.zig.zon @@ -0,0 +1,15 @@ +.{ + .class = .stone, + .hardness = 25, + .drops = .{ + .auto, + }, + .rotation = .fence, + .model = "cubyz:wall", + .texture = "cubyz:basalt_wall", + .texture_top = "cubyz:basalt_wall_top", + .texture_bottom = "cubyz:basalt_wall_top", + .item = .{ + .texture = "wall/basalt.png", + }, +} diff --git a/assets/cubyz/blocks/ferrock_tiles.zig.zon b/assets/cubyz/blocks/ferrock_tiles.zig.zon new file mode 100644 index 000000000..4fdde481f --- /dev/null +++ b/assets/cubyz/blocks/ferrock_tiles.zig.zon @@ -0,0 +1,11 @@ +.{ + .class = .stone, + .hardness = 25, + .breakingPower = 1, + .drops = .{ + .auto, + }, + .rotation = .stairs, + .model = "cubyz:cube", + .texture = "cubyz:ferrock_tiles", +} diff --git a/assets/cubyz/blocks/ferrock_wall.zig.zon b/assets/cubyz/blocks/ferrock_wall.zig.zon new file mode 100644 index 000000000..519ed06db --- /dev/null +++ b/assets/cubyz/blocks/ferrock_wall.zig.zon @@ -0,0 +1,15 @@ +.{ + .class = .stone, + .hardness = 12, + .drops = .{ + .auto, + }, + .rotation = .fence, + .model = "cubyz:wall", + .texture = "cubyz:ferrock_wall", + .texture_top = "cubyz:ferrock_wall_top", + .texture_bottom = "cubyz:ferrock_wall_top", + .item = .{ + .texture = "wall/ferrock.png", + }, +} diff --git a/assets/cubyz/blocks/glacite_wall.zig.zon b/assets/cubyz/blocks/glacite_wall.zig.zon new file mode 100644 index 000000000..dc10742d8 --- /dev/null +++ b/assets/cubyz/blocks/glacite_wall.zig.zon @@ -0,0 +1,15 @@ +.{ + .class = .stone, + .hardness = 20, + .drops = .{ + .auto, + }, + .rotation = .fence, + .model = "cubyz:wall", + .texture = "cubyz:glacite_wall", + .texture_top = "cubyz:glacite_wall_top", + .texture_bottom = "cubyz:stone_wall_top", + .item = .{ + .texture = "wall/glacite.png", + }, +} diff --git a/assets/cubyz/blocks/limestone_wall.zig.zon b/assets/cubyz/blocks/limestone_wall.zig.zon new file mode 100644 index 000000000..9e3c4a86a --- /dev/null +++ b/assets/cubyz/blocks/limestone_wall.zig.zon @@ -0,0 +1,15 @@ +.{ + .class = .stone, + .hardness = 12, + .drops = .{ + .auto, + }, + .rotation = .fence, + .model = "cubyz:wall", + .texture = "cubyz:limestone_wall", + .texture_top = "cubyz:limestone_wall_top", + .texture_bottom = "cubyz:limestone_wall_top", + .item = .{ + .texture = "wall/limestone.png", + }, +} diff --git a/assets/cubyz/blocks/marble_wall.zig.zon b/assets/cubyz/blocks/marble_wall.zig.zon new file mode 100644 index 000000000..4cf1e6784 --- /dev/null +++ b/assets/cubyz/blocks/marble_wall.zig.zon @@ -0,0 +1,15 @@ +.{ + .class = .stone, + .hardness = 12, + .drops = .{ + .auto, + }, + .rotation = .fence, + .model = "cubyz:wall", + .texture = "cubyz:marble_wall", + .texture_top = "cubyz:marble_wall_top", + .texture_bottom = "cubyz:marble_wall_top", + .item = .{ + .texture = "wall/marble.png", + }, +} diff --git a/assets/cubyz/blocks/sandstone_wall.zig.zon b/assets/cubyz/blocks/sandstone_wall.zig.zon new file mode 100644 index 000000000..752a96357 --- /dev/null +++ b/assets/cubyz/blocks/sandstone_wall.zig.zon @@ -0,0 +1,15 @@ +.{ + .class = .stone, + .hardness = 12, + .drops = .{ + .auto, + }, + .rotation = .fence, + .model = "cubyz:wall", + .texture = "cubyz:sandstone_wall", + .texture_top = "cubyz:sandstone_wall_top", + .texture_bottom = "cubyz:sandstone_wall_top", + .item = .{ + .texture = "wall/sandstone.png", + }, +} diff --git a/assets/cubyz/blocks/stone_wall.zig.zon b/assets/cubyz/blocks/stone_wall.zig.zon new file mode 100644 index 000000000..a5dc03f84 --- /dev/null +++ b/assets/cubyz/blocks/stone_wall.zig.zon @@ -0,0 +1,15 @@ +.{ + .class = .stone, + .hardness = 12, + .drops = .{ + .auto, + }, + .rotation = .fence, + .model = "cubyz:wall", + .texture = "cubyz:stone_wall", + .texture_top = "cubyz:stone_wall_top", + .texture_bottom = "cubyz:stone_wall_top", + .item = .{ + .texture = "wall/stone.png", + }, +} diff --git a/assets/cubyz/blocks/textures/basalt_wall.png b/assets/cubyz/blocks/textures/basalt_wall.png new file mode 100644 index 0000000000000000000000000000000000000000..ee6a693485fc6c212dbbdda09abf5f51ee562fcc GIT binary patch literal 362 zcmV-w0hRuVP)|E(INnw)tb#}o%^9(E)bOh zbo?4qB`WzFqFI*fmC~VL_r8i2?*PHs>Z;jA1&c;Xhy2rMksvDc>rEl8mO7ku@*GOm zLCt)AUff-cijI1Qs4(01yT7@26}vL@d<&NS`Tp!OZua=}0335rOK+EpLdEsX)&DsF zat@+dmh0nKw9_1-dFO6g!~@HN(8zhAZ&`E1cn#>zo*Gsp8!8Ryt-zaymszcmrZ&0gUsyZ`_I07*qo IM6N<$g1PRgg#Z8m literal 0 HcmV?d00001 diff --git a/assets/cubyz/blocks/textures/basalt_wall_top.png b/assets/cubyz/blocks/textures/basalt_wall_top.png new file mode 100644 index 0000000000000000000000000000000000000000..c58649331680a7f34f9c88ec9e2c4bc4c9ba248d GIT binary patch literal 323 zcmV-J0lfZ+P)+z$mBgfKfbcut|pGKWa0@kgazdNBHkYNhnO%ce>$BrloG^h z(Q2ZlY>Tw9BL^QDIHJf*(DmbxigW|(^=g4sGe>S(qoqIVz-iVpKC_~!LAixtGXg*o zO{pt8t4a2*0pRZD_M#$|cHLj$_5CfYS-eF1amrC@EC179m~@b8Y{6hEpbYsp`vHw* VirIXk2A==`002ovPDHLkV1j8{lH~vZ literal 0 HcmV?d00001 diff --git a/assets/cubyz/blocks/textures/ferrock_bricks.png b/assets/cubyz/blocks/textures/ferrock_bricks.png index afac17bcf43d96d62a1b8d366f6519921ac4a7fb..2385f190481845c84a02e919136ea71ed2c9dd68 100644 GIT binary patch delta 429 zcmV;e0aE_B1IGi9B!7-cL_t(IjeU|!Zrd;rhQHJlEX&UXNNWcL3MA>Wi>`a4o}(x0 z1#*A}Mixm(!C9E1NKsIWb|I6JY@@Rxhw~HjKQ4a$`2KgjNH|xjXb>(v`zDP=Y0bMn zSQX9S{PdEa1p;j5QvgI5F0BLL(ZXz+#d{xAxwa>JABu38O@A{0O6vyTJ`iA%WrLo0 zl$y7_0l@kC?8>@naK36ArXWiv@h(;uSFA3tczAwgnPf-c0%KLXnXh@jTJiPc&0t1I zW2v0O`HE$dAWabg{W89W{T{hoMggUVMSnxE{JI!*6vA+SEdZr8*TpD;){A6d_iUQ+^pbZr1}&hoDu93!YfI~J zzHUWSTH}1x*>e!`IE{Uqvvk~2*ybuKe*0m~rl-L!|HJ*|rwEe9vdvptjr|RbS_-pt zOzG>W18|~A&}B1U45)}>zqk4BB(6c1kiL+Y($|RK`6fIa$JpwFCN0;YE&#uFyO@=K XJhTY+@QSG100000NkvXXu0mjf)3wmb delta 414 zcmV;P0b%~f1Goc_B!7QNL_t(IjeU~QPQox4g+HZaFh*u#L=E1kTpJ(2C-OObGM~VE zNJxx?Iub(D($XwOFGjl!i2qgl_nhtj&pBuBZ?C_%!ycz805)3-z;tWL25G!ENzPV1+4!Ichis4nV1Kr@MQ#!S`f1wgiK$$( zE`9(|WqERBRhAg0Z65|(w#`U9rjvwXM>c_xvp&tT0m`8AOT0#nyp2ZWhJ6i z3gdlk&tAyGG&XGxj)_@OM8zkgQEQde_Ye2iqezmvwl(GeAno_D&P6hCq)E_aoYfcr zap?E_yEuw#&?WpeJKJzyJUM07*qo IM6N<$g66ou*Z=?k diff --git a/assets/cubyz/blocks/textures/ferrock_tiles.png b/assets/cubyz/blocks/textures/ferrock_tiles.png new file mode 100644 index 0000000000000000000000000000000000000000..de9dee9d0e950e4419085dc38125947bd0522ef7 GIT binary patch literal 420 zcmV;V0bBlwP)gp;x)CiG@2T*#?>@2&m5x^i6TmzJL0&r250IR@P?x|ZN1k!s(DY5g6 z^d9N`#|T|rWzKzFF=#_0L=*{*(t9q-@ulvo9kwnRVU~5%UyCBaE|4!LD7e=x{ut zjQtXx+`{A*y1GKUWgVewMJ954eZ{_QP{#6letp}k4(lR-%2<@K++JUCIGzC5w@nmC zuR4fmx2*3#8Oy$HVkf~p9V3N9-q#gHXfrrn_HE2lIQ(GRE%fL40p0-sPyHeTJe-FB O0000X6E$%**$PAS^k+h$1~&Oqwin8{5em2tR3Wn|JgR*1Mv22O;$BXr8u5~WjVNYRyDJ=8KpZ* z;|KuHg6c*CaC#K5&G&>t%t%_TpCtFD;AJF0Lny=}pc)41u7`Mj?)|*YUGR-OaGAb$ z&QJ(KA!xN`<@@Y_tSS-1fbLpDkl#O;61pCM%hUj+QYfWZ`M%4*)SehWpu3jiG)_q4 zgk^9t>$n9@!T(wsCwM>hd#dsFcqFkUtb89e3~sh$N-1_l!4B{~UwoLcUjMpt^;w(l z-@Fb?vw3EEU>){pK7BlUGF^bHjRe4IXOk(s$8R0Dy(|Y8EX#qSYDl7xO{M@i6qU(9 zDuwP^L=d`QF#5RKne>y$_-^C@01=#^yB=?wOX{xY-Foc=R5zMsB;2SQP1zWts#%Ql z1F$d|*e5jl{!Q7mlugU4m(RJ|-Mb8mvD`FHT$!E~5V2|Gi}Qda3f;{~6gtAGWmQSt t^>|hTwu#@aZvi+Re_JtWvbCvp{sNrZ0I&dUaV7u&002ovPDHLkV1k^m<;?&9 literal 0 HcmV?d00001 diff --git a/assets/cubyz/blocks/textures/ferrock_wall_top.png b/assets/cubyz/blocks/textures/ferrock_wall_top.png new file mode 100644 index 0000000000000000000000000000000000000000..3ccaa168cac15a012443129877fc248ebc3e1b81 GIT binary patch literal 360 zcmV-u0hj)XP)856}g z3Vvosgq!oTtP=n%w-&PcMWz4Kl!3_ILNWiIe|`Y~KH6_|mc~a2BAm=cI6{KXQlEf3 zr(%vM-bz4cDW)g^#Oun5gzh&&;Buk|DK^&S6G)|Cyhm%y$Q=MS)?u+)qt>$TL7Ko3 zp%Egw%S<0?Em3LJ3rM9P(a*qgYa@|I4mh4@Tuo2nzDNt+p6+))d%Aypaf;jL*TZjt ztJk^@UulKT(qMoBvTuPC19IfO0+m*%wZvkz27tljrT7B|)szazZ&{N70000Rv)xkFHA&+f``zIeNRs1o0N(~}0Fd}LU~_}b4RHui*34LfZvn8m(ZZ?C4N@dC zw%1*fyWlCOlb$?@Q~*PeFshCxGGjHV3tpRyih|U)fy`KDx7R%hahI4CTm~*OQrDaT zkoEEDL2p2ch(v(qT+^IujLk0+R`)CZi@&D7ST1`$NQIsN%JEp~#siLTWwYHXyHvWw zptz&Wje?EM>4MjJHO^fah(1||U1NsvKz$oXhV;bRvKPA(E{2NPCB6-G!S{eMqjEZ- zI-cl)S0~2!M5<=Ss!0IVDL#o!R!%2m#!?+mKRy_S_+a=d5Bql=D8M&jVgN5-aw$~+ O0000b>!3_Kg2EJ5<(42J!$qC+3iB|slgpi3W-A;_DGY&JZ^izP@|ogpA2DQZi=Fd!X| zcO+FHiNo=Jrqpi9QoU|EiTK#3DgH?J){!2ddGy$ z`n!cxTAG~e2i=uY3DB2buEubs9HF!RKE`ldL`MlB>41b`w1eSUp!R5^`WNPO(yqnxKr z?1zqR&}4FID6)?!+>5_<;a39S@%pB5jvAZB4e}_WuKQn+egFUf07*qoM6N<$f@^M- Ao&W#< literal 0 HcmV?d00001 diff --git a/assets/cubyz/blocks/textures/limestone_wall.png b/assets/cubyz/blocks/textures/limestone_wall.png new file mode 100644 index 0000000000000000000000000000000000000000..0f57c1c7dad7f33fa15c8696e63e4bd6d4e60033 GIT binary patch literal 396 zcmV;70dxL|P)S6oo&_Kx&4z3#oqyR#b2yuJs9g8(+wm@iAPs3oXfjGHGYhKtLDGolMfY@UAlV z_ndQY4&Gj0eoRp#HXSSWnJH?r+%nQbF3)uEtHsiFGslX!A%J%k0Bc`1&5{rstlS2G zR41JRDeA{0p5>M-x2Ux*S^E+@FPr46P~cs~%550wAu{O0e1X|En&?B+_3Sis&T`AN zq2OIbsuNP31T@x_+|ACr8pIs?oCN{ENDsll%5AzDWVrr1efRz9`RO(|O;P{<4*ENnI7Q!()dtPJoHOdwtYi8rd$k)%@^Y!azb8Q{#>ala+@>3rXh zE)_DoKi{AD-1P$hplxb&{eZTqar^LA$^MIc000C($Fn1od~*~Blwe60>#D>)`U#_- z03bP+P)X0h&$!u8v2lMmMr%@y>iPkW3@qtCCc^%3T&UuQ+ubKNxQ^;n+tdrToXL_- zf@MpN%)bIDl^=2*46ZY2@bhnovT40i(XS;P*=3KsCl+{dSQX12{RBq_>y^Sb4^et% z3yw_UGhZT^k&@m@cV3f4mlYelQ$b4a*%=vI0vj>dws$}yfk^z00000NkvXX Hu0mjfC4Qtd literal 0 HcmV?d00001 diff --git a/assets/cubyz/blocks/textures/marble_wall_top.png b/assets/cubyz/blocks/textures/marble_wall_top.png new file mode 100644 index 0000000000000000000000000000000000000000..c652118e3ba7554051a312017b1fc5b83fab48b4 GIT binary patch literal 300 zcmV+{0n`48P)YvTtOs_gU8_uyZGn=lDjRF5rlpKhvJS9= zbnP-1mA-xNADY|7Rf-IRopY(E@?fH3?;NxIOPxhl((BrV=FQQux@&;%^VeddvZ!mv y`^V>s^KgkauGpVAO4#@dTQ{(&z>;%EX7LBXHjipwBqHws0000+dQy9~5o-ACa zTdMs5r4y?C!4v&wZB-NMI6%jNCsI1`T9Cj1n_cT+kGnugtTI?- z1*@!6=tL1cK0N^bYGj3-uf5jp<~RNwEM7moQZKJYwhifhvuhdj6guhpFTNHQi*y{Y z%uGjcW>D=9j3<2nrpFlo#~CP#g)-UAuC*k0>JrQ~7mH5hQw8GXJ|xL1E0~Oi9u}Tw zZpz%tC^HaqzjYiC4tk2|^~E3J`SG~eGBfr%qckr_@y$J5w?(-F0Asq1`~u9z@v=NE RO4k4Y002ovPDHLkV1j)^yDIv42J(84jCJG6&i@ss!CN~VduTew1?<<4>9#!dfrn^>j^*6O0QHGr z`}b$Z5g1vu-}YKHP;Czi1SEwh^4feaUO$8#?~MfjKvHNDv}ynVs_o}O=LI;)Cb?z) z_(ze~lOV1>=M&X_YuLEgc)6Ob_WSdVL)l@oPOb!u$rdkHxKu}I)j(3{2uKQnvUBF* zaq_rNdw^Os4n7N0AmF801PX*hp;coDSR~CN$Il`jADG}$9ZeutWug1UlR2}`A1XHv zzG{1%&Kl3j9aP&xwL@@h5iqsK3u7Av0*?<8hqA-ztS2+F+x0nFQV7-7DDoO<7C{n_ zA~M*(aE f1;W`nNz>RrWSFvC5cwcJ00000NkvXXu0mjf99g3i literal 0 HcmV?d00001 diff --git a/assets/cubyz/blocks/textures/stone_wall.png b/assets/cubyz/blocks/textures/stone_wall.png new file mode 100644 index 0000000000000000000000000000000000000000..bc69c3717ee478c0a920d77666d52ee48763a766 GIT binary patch literal 367 zcmV-#0g(QQP)%t(CQ@Aq$jtrP%K&dl>n ztrZcW){5D(EcAWP?RIN#VJn4Q6@Y7u?d#9GDz#SP@ixzM^97%{tCDhV=TGM2!}EX+ zAR_+;ZQFJ#V2A*M@$`JHyWNMrXIEui*B09yNW&-I9*Ln;RYc^3=weRKc~|9GN-Jd4 zVvMAe82X-TjMQ2Qul&ZGTjH~nmMkKuDv!sb6$1$4I0Aor;Gz3MW^a2iO%qZN?UPtIvKiP-P*{8;j{yW!u++?li2Rw&rzwX27mQab&Wo^n{%^-VnM@!sAyFBZT+mlYPO!d)FXwcI%Bag0iCBS2ra?~+ViQqyw&)V{;F!Dqu~%J0AR+)z**y$)<}+tFW=!5+64QGh zno~MBVgwPvF+)TULMX|WSjR{y6~BmJoIBO*C7T>V!2WoYk%;KOgBIH6nR8VYcs;Ae zMrH3+SN}9km$=5N5mY#i8E4LAH|A>0B!34;rkrng|Nn^#yAZ*Wd+3>3$@)^7 zI69+~tvzJmKZqEw_Y(lXwStHN0A?Ls6fey`h00000NkvXXu0mjfgtm&D delta 299 zcmV+`0o4A$0>%Q6B!3M_L_t(IjdfGYZp1JMoOHpCWy#)C`~RP~m7}i{{cnLob3j-D^&^7MVPFlfy-FZ;!{B x>_ZaAXg7mM%p`WR?4%*Bp0EX4fA|3czz-kcbT} zmeK=wA#{r``(t}NwrBJ5{B~nu-#;x~*C689yW`S*XVUsQJXAd*j`QV2Syb%Zk=ECU zWTU^I634$pBtsf7ypxTpIz*=QHE!K*OWF&?jOMjkIR_*D!W(0J>FR^5! z2$1K8yZaJslcxEtEGk5@FnLuUD$R#$Rp0I(jxMc3B)I;hcxZH$Ik$pCi;GU#GD;~@Q{gF#^f zEnANB#Xk9R3hj!jM|Bd1v9Z7TJ;o%N?|R8*U@`dtn)5p%Szr=$ux2rhm_B|1 XE63dOzi_sb00000NkvXXu0mjfpQWK< delta 335 zcmV-V0kHny0_p;gB!4kUL_t(IjeV0rQ^GJ1g}=7jCRGp+XAt4Y(f|KzJnElonI#l%$fF#Rwd%M{50TC4meB(k7k}T6LKvC#{VNEkM(C7F$S+8~xF~sNB8>OD1 ziZaS2^ZBL?ujSwjR7J`D@QhN|(Ku;;6;b{CzVjDbW16aaA#)yhl#3>HWWUhG*5slG zg~B2(o`!4cKS-ZHMp&fxU^2OD{n^K!F!W|}wcz#riRpCNnK(uYe;Su}=Tgu3IK2Gr hfkU_t4r6-(@C&c&+GlZ}a?=0+002ovPDHLkV1jRLr4IlA diff --git a/assets/cubyz/blocks/textures/void_stone_tile.png b/assets/cubyz/blocks/textures/void_stone_tile.png new file mode 100644 index 0000000000000000000000000000000000000000..8329fe7a777f54fb12555858a42fb0dbaa98fd9d GIT binary patch literal 310 zcmV-60m=S}P)6jUb=OY9-oag$a^>q}kN;~9_pb^iH%;UDpM&Jf8U zeE|TG3;-Y+tgD^5w@CVp80A-L$(ZS!RnJK_~dpuK;gjmY{3&30T{M9D678-_HAx* zV1ks|Rpo6CR7b=pI~<Z;?)_7rT%ZHWGlNZ~!^SFpq literal 0 HcmV?d00001 diff --git a/assets/cubyz/blocks/textures/void_stone_wall_top.png b/assets/cubyz/blocks/textures/void_stone_wall_top.png new file mode 100644 index 0000000000000000000000000000000000000000..bf1fbe78caa42fb01ec0f773fcd72b817f79baf3 GIT binary patch literal 341 zcmV-b0jmCqP)ia(x7kUAPCQMy}HB%0$UB_(Fyx?3{sJP{&l4`fzU(zXa zvo4x`eov7&_);hc#=)ACJ;uo*hW`7L^FQIgHvUy7FCZ(L*2Hk zYa!j)7vPgUM(H9Z_Sc~~cRdH^F%0(9`SdBUs^#%vUak-(2a>KoM3cJyFf#Mzkx59T zL1Z}7@T-Ck;e6-jCDzSsMv58THNfKO`C`xKVrPKmV#C+*ZG_Kp`d{ nQvm!2o+P+|{Z&yj`I!CyFb1@+>?d!100000NkvXXu0mjf3;LQU literal 0 HcmV?d00001 diff --git a/assets/cubyz/blocks/void_stone_tile.zig.zon b/assets/cubyz/blocks/void_stone_tile.zig.zon new file mode 100644 index 000000000..41fd89be9 --- /dev/null +++ b/assets/cubyz/blocks/void_stone_tile.zig.zon @@ -0,0 +1,11 @@ +.{ + .class = .stone, + .hardness = 25, + .breakingPower = 1, + .drops = .{ + .auto, + }, + .rotation = .stairs, + .model = "cubyz:cube", + .texture = "cubyz:void_stone_tile", +} diff --git a/assets/cubyz/blocks/void_stone_wall.zig.zon b/assets/cubyz/blocks/void_stone_wall.zig.zon new file mode 100644 index 000000000..8a4d006ca --- /dev/null +++ b/assets/cubyz/blocks/void_stone_wall.zig.zon @@ -0,0 +1,15 @@ +.{ + .class = .stone, + .hardness = 60, + .drops = .{ + .auto, + }, + .rotation = .fence, + .model = "cubyz:wall", + .texture = "cubyz:void_stone_wall", + .texture_top = "cubyz:void_stone_wall_top", + .texture_bottom = "cubyz:void_stone_wall_top", + .item = .{ + .texture = "wall/void_stone.png", + }, +} diff --git a/assets/cubyz/items/textures/wall/basalt.png b/assets/cubyz/items/textures/wall/basalt.png new file mode 100644 index 0000000000000000000000000000000000000000..e58cd7b8c113469e68d1bd1b81c1c3a9fc74447f GIT binary patch literal 355 zcmV-p0i6DcP)GLCys;7?~EK-;z?Ndmw&%lu+| z_!um-8|&A#JEfEYpe#$bR~UmI)AsDj$4{p>&PAT*D5X$JQ5e&6wTxrt^E;%LUk9g> zszR!+nN8CUoY_VX0EfeubK*;XXaLfOlgvQ8;)xW`qaDg0I3D3g+&w%vY&$OcWWOY)H`jb%MHn7ay{Be=!R|(0l)+G zV2da^YrhBZH3qXWt)v$8P6rqNwgBmU>YUk2egKuGj2DZZr?3D3002ovPDHLkV1jPn BpQHc) literal 0 HcmV?d00001 diff --git a/assets/cubyz/items/textures/wall/ferrock.png b/assets/cubyz/items/textures/wall/ferrock.png new file mode 100644 index 0000000000000000000000000000000000000000..abac45aa62e4d74a26daf3949f0df992a08e8956 GIT binary patch literal 444 zcmV;t0Ym;?=7l zs(c$JdN6<<3{Y;FGgR@g&hbGM!?vdcZi%))w4vUMDXMr_M-K)RnH;nRQ11#R>K4robO%2GB%-?jJiRs84u!m6odClg zDieUH4FQPl`8`el0^DXsdaU-ZZ0p>AxTCfGo6c{Uz{IpJ4}I9HQY+AKmCoFT;3JN_}vvYPYZ9I7nx`a mDz!eDT;8|zwf!3=iGKk~ET&wtKY6lG1K<)BH|M z(f*qZ!<=u~(3#=H#%a^OFhu8IMQ`9kCi{OL>w zcwa22lq&#O9ZMCX!neV6fLtbn)v*AWPd(~KbpSpWAEF#NW7L>oXNmBDX_%OXDK7eh zKIu%BbSBHl8An_d^92seWo*a&0r-I*$>s+>{XrkAV= z*f@D>ILIFi!$0w(<=?8wS yNS!US4Q4xT1ZF!f?N(FU`L_i)JHHfX;U(YBJ*F>(@b9_+0000P)1unR)$h4R7sHrixvvv(oHX*E3e?fLwE!a(S=v&O83%@;HC(HD3KINuqjQO z5Q`w_qM7NWjkWJ)ewg>=`R1F^$aH;q{v+l$w|5#FN)zU@_7MPHkYc;OJn&zbu9^WX z(*SDO2*6r09bi2D;$VLVfW9+S&8Xo;VY=ApJ3|11Fyf@S3&1oY@=HV&ku)Ze^MFeKGB0FKbivanut}fd0k*HyFgHNkb1E936^Y}af$hWc6?d8H= x2OlzQo&NoGMP#1unCZX6tRK%%;P7W0Z#lKS8f+9FM_D6KA;L<6-!l9tJhz^1fGgwGK4Iv2$ zBn@=cLGQRUY1((m-Iu)2z2C=0<6ooU@JFn#2Lp{Yr3v%J)j0sp)aK#-QGT!rrmJRv zMyr{70+q>hfLWTccd!q@`|F!(MunHbbW!kKk0=PSZHL3-HURT1lTK%9qqZq#CIPB^ z*8^CZN~}jWx8(qUCN)ze|D6)W&x`=2^z%ZX)Xi z0Km)BGf9$?BxxlSmdxPf>{NnQNr%6Fw|94PFQOonpvnZMWno$ty>5qkeX9TwZKzU# z`q(hU?UI+|=%ZbL3C+?hx0f?eKsi{i+gTbv2T)Z8TWr&`EXIbRt^L~qT=x4inKF1?pqLFFvHZO{46|DT>Fh~oL-`b(bg9$yk{7ztT?dvylD$Qkn1@>Ifq zu%uoLkhOD^qH7d?DoX;0*_?xua{zjcnqG_!Uk6Ld2a|S_K=?S*1xFWo079>$Do4%` z-KLz`mP`nQPs&Uy6_a)o!^&e=c}C7KrYdXaC>1Qa18=Fo6(O1EoHEk{!l&1$0pLs* zWNk34r7}5a1<05N0R6F#y}zv>x`otij=8tX`^VCnvY>}EUC`<*KV^UHE1UX#Oo1yx zrJ|6x0Ai5eA}Prk)4&yBtdj)Ej;;vF{s3%s2OdwapD_h8IS_tq4*Gkgpi-^N?NUo} zdbpz$$s&0cv-zq801Xs_m5a9O?uwA(XjfJMdaQ$W2Oj03tt@p19+hf6vGH#UaDQ{D bl*uOFqiVNOO7&iR00000NkvXXu0mjfWf;4l literal 0 HcmV?d00001 diff --git a/assets/cubyz/items/textures/wall/stone.png b/assets/cubyz/items/textures/wall/stone.png new file mode 100644 index 0000000000000000000000000000000000000000..23936be27cd860963c666a3c8be695bd30c47213 GIT binary patch literal 312 zcmV-80muG{P)xJd_tO@(v!>I}l-HYG5QqLS$gLn`~29gU)mUbnzd*yPAUk7{~Ef z_R};Kd>Ms^hhYG~Imfnb@xmuqnTi3FQkNBYbXEc!$3fS109b2NF)2I;D=TJ&v zjEVW5+-2`Q-usWxtOJ18>jl8NuD8Mq;5d#;QqBTemgOE0LLh{I)|$Gmv!F)@#u%Bd zI3!Keyut3Eu?Gq00@GSQJIEz-Fey_agn%)o`1;!d48ste$s>QreTJ-s4|*~H0000< KMNUMnLSTY!@Pp<6 literal 0 HcmV?d00001 diff --git a/assets/cubyz/items/textures/wall/void_stone.png b/assets/cubyz/items/textures/wall/void_stone.png new file mode 100644 index 0000000000000000000000000000000000000000..bc712885eb1fb29ea64621c19eb2fe9a6df941b7 GIT binary patch literal 361 zcmV-v0ha!WP)L@fdaOG~-Xo9;T>Vq|W1c9QSRH~V98 zh>OM5x5~>ZwHO$-65m|k0gx9lz+jjy#Q;k`G}ixMHbC2LIX?>kNU}(Zk?=m4tqMsN z0kH43Ok59uUE647Uc~f`IqI7$$s#_#KA5;36W1dzV#C$a51Dxj$}0VJpt`H5>os+~ zHtN#Zrl~L-?7J<2AJTPgpDFSpCdndpZNqbNuj?b#E$~C5qjd8ZR0HPol@ELgF%-d2~)WeD+d<9`}#>g631~FJJViQ z?NK9njry5N*yZZ>#F>mCzs`V-ohh59qO4K?Yw)){hN 0.7) { + cornerUV[1] = 0.5; + } else { + cornerUV[0] = 0.5; + } } if(!data.isConnectedPosY and corner[1] == 1) { corner[1] = 0.5; - cornerUV[0] = 0.5; + if(@abs(quad.normal[2]) > 0.7) { + cornerUV[1] = 0.5; + } else { + cornerUV[0] = 0.5; + } } } }