From 280a6221fa671d09fae7449e3688393fb576dfae Mon Sep 17 00:00:00 2001 From: careeoki <122191047+careeoki@users.noreply.github.com> Date: Thu, 26 Sep 2024 11:19:13 -0600 Subject: [PATCH] Stone tiles (#731) * Tweak bricks, add stone glactite tiles, tweak grey chalk * Sandstone + marble tiles, redo marble bricks, and tweak a bunch of textures randomly because im insane * i hate git * Tweaks, make glacite bricks consistent with tiles * Add limestone tiles * Add limestone tile texture * Make stone bircks consistent wile stone tile * formatting --- assets/cubyz/blocks/glacite.json | 2 +- assets/cubyz/blocks/glacite_bricks.json | 2 +- assets/cubyz/blocks/glacite_tile.json | 11 +++++++++++ assets/cubyz/blocks/limestone_tiles.json | 10 ++++++++++ assets/cubyz/blocks/marble_tile.json | 10 ++++++++++ assets/cubyz/blocks/sandstone_tile.json | 10 ++++++++++ assets/cubyz/blocks/stone_tile.json | 10 ++++++++++ .../cubyz/blocks/textures/chalk/dark_grey.png | Bin 335 -> 336 bytes assets/cubyz/blocks/textures/chalk/grey.png | Bin 331 -> 332 bytes assets/cubyz/blocks/textures/glacite_bricks.png | Bin 324 -> 348 bytes assets/cubyz/blocks/textures/glacite_tile.png | Bin 0 -> 366 bytes .../cubyz/blocks/textures/limestone_bricks.png | Bin 314 -> 321 bytes .../cubyz/blocks/textures/limestone_tiles.png | Bin 0 -> 337 bytes assets/cubyz/blocks/textures/marble_bricks.png | Bin 266 -> 326 bytes assets/cubyz/blocks/textures/marble_tile.png | Bin 0 -> 340 bytes .../cubyz/blocks/textures/sandstone_bricks.png | Bin 375 -> 414 bytes assets/cubyz/blocks/textures/sandstone_tile.png | Bin 0 -> 391 bytes assets/cubyz/blocks/textures/stone_bricks.png | Bin 293 -> 281 bytes assets/cubyz/blocks/textures/stone_tile.png | Bin 0 -> 308 bytes assets/cubyz/blocks/textures/void_stone.png | Bin 317 -> 326 bytes .../cubyz/blocks/textures/void_stone_bricks.png | Bin 316 -> 362 bytes 21 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 assets/cubyz/blocks/glacite_tile.json create mode 100644 assets/cubyz/blocks/limestone_tiles.json create mode 100644 assets/cubyz/blocks/marble_tile.json create mode 100644 assets/cubyz/blocks/sandstone_tile.json create mode 100644 assets/cubyz/blocks/stone_tile.json create mode 100644 assets/cubyz/blocks/textures/glacite_tile.png create mode 100644 assets/cubyz/blocks/textures/limestone_tiles.png create mode 100644 assets/cubyz/blocks/textures/marble_tile.png create mode 100644 assets/cubyz/blocks/textures/sandstone_tile.png create mode 100644 assets/cubyz/blocks/textures/stone_tile.png diff --git a/assets/cubyz/blocks/glacite.json b/assets/cubyz/blocks/glacite.json index 171886af..3a378090 100644 --- a/assets/cubyz/blocks/glacite.json +++ b/assets/cubyz/blocks/glacite.json @@ -1,6 +1,6 @@ { "class" : "stone", - "hardness" : 25, + "hardness" : 20, "breakingPower" : 1, "drops" : [ "auto" diff --git a/assets/cubyz/blocks/glacite_bricks.json b/assets/cubyz/blocks/glacite_bricks.json index 15746763..95e25f69 100644 --- a/assets/cubyz/blocks/glacite_bricks.json +++ b/assets/cubyz/blocks/glacite_bricks.json @@ -1,6 +1,6 @@ { "class" : "stone", - "hardness" : 25, + "hardness" : 20, "breakingPower" : 1, "drops" : [ "auto" diff --git a/assets/cubyz/blocks/glacite_tile.json b/assets/cubyz/blocks/glacite_tile.json new file mode 100644 index 00000000..3a1b9c1f --- /dev/null +++ b/assets/cubyz/blocks/glacite_tile.json @@ -0,0 +1,11 @@ +{ + "class" : "stone", + "hardness" : 20, + "breakingPower" : 1, + "drops" : [ + "auto" + ], + "rotation" : "stairs", + "model" : "cubyz:cube", + "texture" : "cubyz:glacite_tile" +} diff --git a/assets/cubyz/blocks/limestone_tiles.json b/assets/cubyz/blocks/limestone_tiles.json new file mode 100644 index 00000000..940bd704 --- /dev/null +++ b/assets/cubyz/blocks/limestone_tiles.json @@ -0,0 +1,10 @@ +{ + "class": "stone", + "hardness": 12, + "drops": [ + "auto" + ], + "rotation": "stairs", + "model": "cubyz:cube", + "texture": "cubyz:limestone_tiles" +} \ No newline at end of file diff --git a/assets/cubyz/blocks/marble_tile.json b/assets/cubyz/blocks/marble_tile.json new file mode 100644 index 00000000..fde07b72 --- /dev/null +++ b/assets/cubyz/blocks/marble_tile.json @@ -0,0 +1,10 @@ +{ + "class": "stone", + "hardness": 12, + "drops": [ + "auto" + ], + "rotation": "stairs", + "model": "cubyz:cube", + "texture": "cubyz:marble_tile" +} \ No newline at end of file diff --git a/assets/cubyz/blocks/sandstone_tile.json b/assets/cubyz/blocks/sandstone_tile.json new file mode 100644 index 00000000..6d2be26b --- /dev/null +++ b/assets/cubyz/blocks/sandstone_tile.json @@ -0,0 +1,10 @@ +{ + "class": "stone", + "hardness": 12, + "drops": [ + "auto" + ], + "rotation": "stairs", + "model": "cubyz:cube", + "texture": "cubyz:sandstone_tile" +} \ No newline at end of file diff --git a/assets/cubyz/blocks/stone_tile.json b/assets/cubyz/blocks/stone_tile.json new file mode 100644 index 00000000..c2311361 --- /dev/null +++ b/assets/cubyz/blocks/stone_tile.json @@ -0,0 +1,10 @@ +{ + "class": "stone", + "hardness": 12, + "drops": [ + "auto" + ], + "rotation": "stairs", + "model": "cubyz:cube", + "texture": "cubyz:stone_tile" +} \ No newline at end of file diff --git a/assets/cubyz/blocks/textures/chalk/dark_grey.png b/assets/cubyz/blocks/textures/chalk/dark_grey.png index a38bf7e6bee3be569a25b3e3310a8eb4bd4540b4..de54e238451e2e0c6349b07b4140965456729b7c 100644 GIT binary patch delta 309 zcmV-50m}Z*0?-1GB!3r4L_t(IjdhbjlEWYj1UqJe%X!?^?*IRhQ~F(Dl-!gQK;IaqLPg<9#*;L`%Ei ztP^yT(el35ZMp3?+lqA-uyKj8qdCBw7v!+chQ_ITnIAJl-5^E*a1`}XPU&)*ND-O~ z;=_t-PZY~ld@gw@fQk^kOYbvat)e{V4`Hm)fyL3bwEzDHTf7q=_R+|EsMn~cX8yx^(-H^6~#0>zjlK_A=#&th&i5s|+Xn_B)(fzTF4(s-JKmV6p zoRDn{XN)9LB^AQ7dZGm~?j%4$M0zOMs#J1u3n~NvJid=bo`1f2)+LWR?FcJ-)WcU5 zW4L?Cj!{-q^kB~g)iaj% z&igc{PH0|hXH*iZq6%V`+ZBtDSujH|1BrT|DDzs8=G04IB7Xp|%lUhd$M61gAN*iB z#PVzme3ntoJseN}nC6x7u-vYL5-OnFX9-MYYunTpHBJ?D6P1xh4%wxQ?QC=ty|EL# zmCdY5?zzBT-`;!X>bW}&tUXuRN)7;NPB5CaH#BseW$w+4Q7Qo%prdRd?kX~^ivTrE z&s3!4nr`019xBKd>H@7DYm0X{o*sbPy#U71b{YFWufh;SZu(hc00000NkvXXu0mjf DdDM(T delta 304 zcmV-00nh%-0?PuBB!3b~L_t(IjdfG)Y6CG0Q^83nmv*qe|5J>yr`lls;Bb7<{pcyx z-LCoPM3!a6-hF+3+`}EI6ofkfU}_G_1*sGOKu!q&&>{e!<5DRwKJp^`nH=tznq!>b zc|X+J39UtRMkS#tsvu^(oG}WS<&=<90*RQY%31`5T6+sD1b+bb`}4h!$8)=07k;oE zVi_9~UsY6d_lIN0&?{pwUd{_8R6x0}3Yf~)Z&P2?I91S1R7M)9q}s-MHoA#1vlG0Q z&8kWs?y$G_Q?ER=r_;dW&sDaP1He!#jAm^O4P9rOTQg&nN`NNlC|fR@icI?=Kuyz_ zinLwR&0Ft*ZYiNI(BsGE#oHf_|A6bg0G6X2GWLI%84!Z&yd6gX0000M|t?bm8P2!GA}px=aF_rb#(P@NuRf zf7Wg954%+!z)1U&tXr(=au(OT#7*##YYd6(yCIz=evN_0vRdWM*X0b{2iTw9D64v* zdO6#~11ZP+*Y}(^xvzQ#aQ8ir3kpqW|AUXe?u8z#(S-QE2E7ma!;Zcih{03jzRP1` z?`UmW9EnZNr8=|8U)Sd~bu9*9w6EjG=c4t#8`2&~k=`4V`zpwNzuj&#UIzRF9UB7= Tt#$f)00000NkvXXu0mjfveTUd delta 297 zcmV+^0oMN90>lE4B!3G@L_t(Ijg^u;Zo@DPg})k_YRB^83_)^(poh*-^jd)p4;Ii$ zj+M2Us4%i!pqwba#~<K zWirhGfJQddQ?*eCFp8}?0l?0H3hH-fEjnu%km9Y literal 0 HcmV?d00001 diff --git a/assets/cubyz/blocks/textures/limestone_bricks.png b/assets/cubyz/blocks/textures/limestone_bricks.png index 01d7e942215dd0680d06639536fe5415ea8ec6d9..e46215f32eb02fd2ac0bce73406a97accbcfe701 100644 GIT binary patch delta 294 zcmV+>0one#0>J{1B!37=L_t(IjkS_7YQsPjL|VQuZo27^;5|NBeG0T)p_v!nlpxm&-!oB`tQ#M}D^tLF!%zH7RRyAuF)lhj!9 z5rBoCsnP0ydR*NkmVORE@Rb^uey*l{KB#WPOFrT@aZ4zb{(q@09VvGZhX}#F)L_kTKE}tlL)@T>eeS%&N2&^1W9?)kvy`UxwiByo4B21ZcBIRMeo1p z?&)22)vaRKhbg}4l7prQsT z&DyeJv-T#61V#8?pT&-pB5r4P)^BzmUSFQS0epAn?frwN#|=~8obG&g2B2mQZ_8 lOVn-8ymPvJs~A^h&JTGu_h1)=PjUbN002ovPDHLkV1hhkitPXZ diff --git a/assets/cubyz/blocks/textures/limestone_tiles.png b/assets/cubyz/blocks/textures/limestone_tiles.png new file mode 100644 index 0000000000000000000000000000000000000000..da8d8ec1a5fa3f93fc8c480293c18074c9a43caa GIT binary patch literal 337 zcmV-X0j~auP)|iGVZ0%;%vBU#q0Dy7hED4b&1j=}^&k~@M zxCqBwV?wjv8A;yS4UUISk~}5B7-!=KvI4*T;H5)3azA(g5X@6TqgT+0figPV!i_T` zO$)y^(+^(QW@dSG0MNLngwD1&yUV@6qdS+l8)xiy=5HP7bCo(^BEP;#@D+)*J#{ir z=ztv@z)T0q3oc3>2nXfZ$3u7jyX9J3gfDV-m){liopl#JW2sa%Q6BYy!6Nkl4zblzd)K2lz(tl)r;YH!1Ke7_pc@v zZ|ZGa>$>#Hsw4~n=Nv`Xw1gp?g*xA750hRP0%i60DkC>I=c374%gfskJ^+*BtvRQ2Vy%s9=N!N9Qr++uww~Ak0000%?iRW5QL{CAhZz#L3|NUegC_n=nII{f>ksd z^rVNnb(5wI^}8f&GMk^7{MvN(YnWPNf}$bherUDc9h}8H&x0Z&atp_1 zNcwWXJ{QGm@HT3abx)K&$8w_Be->m~I}XUEjC3pY#WAE9_`1+1=8p^Iq-xlU@&WZdo1vmi`r!Zo002ovPDHLkV1m^!aY_IH diff --git a/assets/cubyz/blocks/textures/marble_tile.png b/assets/cubyz/blocks/textures/marble_tile.png new file mode 100644 index 0000000000000000000000000000000000000000..3ff6e07092a7e408dcd4a16c5e205b62eaddeec0 GIT binary patch literal 340 zcmV-a0jvIrP)XGuB|OV>qW`rR*DgV4SCz=vpf}?Ke!i?ikTGcDZ`Sbt$nV*y|&zJFH$$w70-vQ7VOHnzTt4YU;CG~zs zV=PMNor3tSF%|%GzM!*&(Lmu`O;5l|=K<6h%eFjr3WZ2#34cZ9f=GG`lKXTv1h^8} zP@r_q{Mw1J4L$MIf?J}v?OTDvscAbf=L?5Z!+g^B%;#fhS7%8_KxauH1W4DLiut4u zsNiihP(Og8csLOT2#`8g^Ip`Q={r|bUhl^GLY=E{|ELIW$=BN|$lTlWmy?kwX3?Jav7kig;yBQ%%<0%VhIvcXyRKasBAQ%xz;~!$7sH#v9=foFz zGMyzTos+ih+Tb4)&`w)&G8(9$Je>_`jP(}0s?UJzx!ipM5a&dci^_4>c*5j$^>h)h hw@2sd?mM*k_y%9<2r{*`3M2pk002ovPDHLkV1n77jTk zNRbfYGFgnFm-G;4vx!(bmtKNhzCIG7CTGG)+_SzLaN}2od-}Op8Q-5619+>B}mJ}$A(yJ>%bp>jnMtm4qlNFa;9-U1sU*7x;)mFmx_XG^<)tg& zmzOb}Yo|$4|OMc#725pt=_m3|Cvh|9;bYe6C7#vM`ex?(>U7DY(;6O*8?ir69 zGowC$iTPGgwpCdS=!zRCMw^&%MXB3x^`)JnI_Z;op*7+$J#~Jd1zkZW8^1vpH#(Y( uw4gjc(}_-M6d3CuKAw{sPQJt2*nR<>_7nr?3qXYc0000V+45QV>>ESxB*BOy_B1>%6cTCY>YiWLx4fia1_OBZw|4zyCe8hi47=1sEw$NMl} zt@+RC&L;q(^X%F{2p#!+wbn*@qVoV4TTkwCn#vGD$Lz5go#(i};`-qUY;29|hY3+G zjp#ha);}PxK-UkvzP;$(mf3_Pm*W07Dhb$@*)Jn`C7GpmQrm#49rsrS%XqfTa6aB0 z2>V}ZX+A=_Ys1um%qa>|iz5MvdQ+Kch>wc$p=5EnMV5;q$qQ_4MhCLK6r7TaqL2YN zAIJYd)@5vsEi<*7jwko!qEM3AqoM@ZREEnfve~v8Ub-1Md78eAFuob>iFI2RDsX6F z)}2oiMq6fFZc*3d`eBm%t_^A*Am40TZ7dfBt{-TsQCWzDq zK0<(gwrzXk3p+CL`+UOqp}krg??dIF9qvB-OT+{;0BXS9 z2O#|lHZdT5WdHzs<^)6|*u;QyYgcw*XJw}`(|M2M7|5in9d@-409tD>EuynpL|pm- zz}9uW4Dil(@d0qB0bP{l)ZE9bwSP<0;tI@s>cUu{i>e^hiT(*@MAA-rHr2_MsEmTC zr*e1XS*#;g)mo)r&$?&+u{mQpre)^sog-ot-Ra;1lH~K`gZ@3v00000NkvXXu0mjf DaSVKs delta 266 zcmV+l0rmcw0;K|wB!BElL_t(Ijg?Y4lEW|zLo%E(hQy0PpHvK#v z=94dVLi5)WB6)OwCa;r`sDy$U>Aa^flC${nNBqC(L{duj=x+=F-*oZ<)zat_4pemd Q00000NkvXXt^-0~f@WiRc>n+a diff --git a/assets/cubyz/blocks/textures/stone_tile.png b/assets/cubyz/blocks/textures/stone_tile.png new file mode 100644 index 0000000000000000000000000000000000000000..3b4c8df91f8d4d869cd3c368109e43c65072a042 GIT binary patch literal 308 zcmV-40n7f0P)&yfI zJl%(LYYk?0lhk?RGI*z=*Rl-$sm|SR1psiAGNe2c&H;A?nzBykL&;_~C>ugl zAj4~|AtF8|1J@383o2K`q;FNmFe3unwv8DmK(|iAqoS`C%nT9nbrUs@i1^$@dR8lQ zfW!=&$RCMdy-KdF+EF3^cpRk+jKFoj0N{UCG869J`&z#wSmYc5YYO-P0000%Q6B!3M_L_t(IjdfGYZp1JMoOHpCWy#)C`~RP~m7}i{{cnLob3j-D^&^7MVPFlfy-FZ;!{B x>_ZaAXg7mM%p`WR?4%*Bp0EX4fA|3czz9kroUEWKiRwM%vj2Z#rLComrS#AR5#;qH z3T9vi#>?II6MsiV(fbnsAZk!i000Lu*dc21^?ccE#X&}*C#h%vyX|Uo?BV#%vmdI-zC4kG7lU{# ocgyU&q0F9e1{-F7)Bys(8&}EpxgJ#Hp8x;=07*qoM6N<$f)5ms&Hw-a diff --git a/assets/cubyz/blocks/textures/void_stone_bricks.png b/assets/cubyz/blocks/textures/void_stone_bricks.png index 3fa56d515e938fb366d883478aeea07252736d88..7ff963302e3f26db44431d0f04d6e0ad19501348 100644 GIT binary patch delta 335 zcmV-V0kHnO0_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+002ovPDHLkV1htVr0W0x delta 289 zcmV++0p9-V0=xo{B!2@*L_t(Ijir)7OT;h`g*KNrf%_*^kLecOmXJR5RPc-77`qn zz-OZ!pOyDjGR87Qn#m;LR7>~zoS8aJ;f0N|bCzHon>v$0#($4-&S1*>Dur;w_0=8X z5;(3*wvI1rR8iPemQ_}GiBwV8^e5-L^lxU}4;{*~`t*o)vxU07c}PJ1P(VIwyV;^2 zIymP~-^3_+52Qhkj$msD11P~)DZWcWa4kp2rd1*dZt52O&~Y6vlKd|=o>^g|9rn*p naL#`KE|oDB;~Kd8{~o*nn}3hh