From 28989257fd851d4c4105ba131d3f37d7a89c25cf Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Thu, 19 Mar 2026 21:27:18 +0100 Subject: [PATCH] merge onflict --- .../botany/ceramic/BlockCeramicBrick.java | 8 ++++++-- .../textures/blocks/ceramic/chequered.1.png | Bin 732 -> 373 bytes .../textures/blocks/ceramic/crossed.1.png | Bin 569 -> 241 bytes 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java b/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java index f2f4f701..4a5e6b01 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java @@ -207,7 +207,11 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa VerticalBrick("verticalbrick", "verticalCeramicBricks"), VerticalStripeBrick("verticalbrickstripe", "verticalStripedCeramicBricks"), VerticalLargeBrick("verticalbricklarge", "largeVerticalCeramicBricks"); - + + /** + * Cached values() array for frequent read-only operations, the array should NOT be mutated. + */ + private static final TileType[] VALUES = values(); private final String id; private final String name; @@ -544,4 +548,4 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa return type.icons[layer]; } } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/chequered.1.png b/src/main/resources/assets/botany/textures/blocks/ceramic/chequered.1.png index 077dcb6393e70a48383f8dd44bc5f0128c6bc638..03eb2009cd86ced324942a09b6912bea30425ee8 100644 GIT binary patch delta 347 zcmV-h0i^!i1@!`uBYy!rNkl|yo#46uV`t_71e5+ty;@D6YC3Qa62`REyr|1H^FfZhUu1*UH z>pHGEB92-Lr+dtQ>?@4WsHHM~mUIF$I#v#U_ncu=|AViOOk+!j-v|Xrm5mJR;gO!LC%uBeF&qZd3k{cJHW~H9NOdInu z)Nw}TmlMrJ+EfXY)%e7cTE)DaxkwUFiG1>728YOm70FpKFW=gP6qy_5t!Nsw{Uby{ tJ(!ofH~w0zOn#+JSHz{Gk8<002ovPDHLkV1hOcq1pfd literal 732 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv=}#LT=BJwMkF1yemk zJwwAT4zY7UMLSX>JkvZqwHP>n999M?Mpgz!Aj=DgrJ-z)b2J#4!QxCnwjm=EgCLNO z0^-be7O;2@kPQL}Kn&6kqtR_;U|?oon841!0#svQWNg5=0Aemk59Mybe+SlRf;uvD#-#YpBrbPxKF5&AsnofQE|G(gw z#&-|BGj$)XCWd|#Sao@2$$JgHi23XHK55%3U8u3H-t^)eiB~PXlmA#Me0zP*+_-G_ zhJNYi+9L9v2OrFJtuKj})IOfPGx1(Q*gVaYn0+0^&Gqy8cz5L{S*ZHdT|T|*$C(86 zEqqh9*_+MyJhhus=}U}X>$W#978M5aOtLil@OARa?@#7j{M{DJe<^y~UDY#dWu#NI z9YdwJd9mCy2)Dl0`0MPFW!8C#KPHzyW^y}y*U%=(^&<1acNtT_9FB|7AolZ>N0d!g%fHwi}l^1RZw&CcAguo-31X?w+;biq18U zLlckRT(IgmP&jtUtmsol(|A?gcilb~q||M9@yMTvweIo9aI4FRGz_weN`o&x3eQf#S#0)z4*}Q$iB}zRCiQ diff --git a/src/main/resources/assets/botany/textures/blocks/ceramic/crossed.1.png b/src/main/resources/assets/botany/textures/blocks/ceramic/crossed.1.png index 3f898b3ccf9353dab47a70125eed37eff5c131b0..abeace363d9d5882fd134637fd176672f1021b0d 100644 GIT binary patch delta 213 zcmV;`04o2v1n~ioB!9R`L_t&-8STM|VFMu$0I}`A)Z^!Xs z$i-(pcs0zR*szgs9P5+m%V2XuF5Dh0Yf-hh+>vK&vQBoX#Ga6gxCW(Lted>2BJYTV zv?<{bv>+FCZ=&(6F<7}GKR^HWj!aW9C-R(xT(s$Fu5)T*KTaD_GtuP9?of0h7t0#t zPhW+l2|1zAX5iF}?;W}LV6gUuW*EL9Lmf4}q!>u1As6i(sOxN#DI@a*vzYTJI=-;G P00000NkvXXu0mjf;zwmF literal 569 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv=}#LT=BJwMkF1yemk zJwwAT4zY7UMLSX>JkvZqwHP>n999M?Mpgz!Aj=DgrJ-z)b2J#4!QxCnwjm=EgCLNO z0^-be7O;2@kPQL}Kn&6kqtR_;U|?oon841!0#svQWNg5=0Aemk59MybeGM{?7IEGmGzny$Kuh~GrwZGS}ZNdVLp#T4W zN3B$0WdE=^ZiDLIhHpCV>1k%)x$Ntnp5mA%G3Cpbv!Nf_Uf6$D=J>T$-`ccDP9-qA zCn{ol+V#Gj-Hn??U6KVu9jfd%?D$msI^fp(TZUW3b8K&1XT9s5a@wb4($(!xV&2{| zEDCM$H2NZG{QhwLKO3c%YQM#g3b|8Qk?+`&vEhH d!uwC;2jh9=^v$=6*Ifd6-qY33Wt~$(698J=tC9c!