From 076f791b8c2c6b75bcf9efc4e671e406e56ce32a Mon Sep 17 00:00:00 2001 From: Mary Hopson Date: Tue, 18 Nov 2025 12:26:14 -0500 Subject: [PATCH 1/6] Lanterns --- src/main/java/team/chisel/Features.java | 36 ++++++++++++++++++ .../java/team/chisel/init/ChiselBlocks.java | 3 ++ .../resources/assets/chisel/lang/en_US.lang | 9 +++++ .../blocks/lantern/cursedlantern-bottom.png | Bin 0 -> 394 bytes .../blocks/lantern/cursedlantern-side.png | Bin 0 -> 553 bytes .../blocks/lantern/cursedlantern-top.png | Bin 0 -> 479 bytes .../textures/blocks/lantern/desktop.ini | 13 +++++++ .../blocks/lantern/endlantern-bottom.png | Bin 0 -> 394 bytes .../blocks/lantern/endlantern-side.png | Bin 0 -> 531 bytes .../blocks/lantern/endlantern-top.png | Bin 0 -> 454 bytes .../blocks/lantern/glowlantern-bottom.png | Bin 0 -> 394 bytes .../blocks/lantern/glowlantern-side.png | Bin 0 -> 513 bytes .../blocks/lantern/glowlantern-top.png | Bin 0 -> 456 bytes .../blocks/lantern/lantern-bottom.png | Bin 0 -> 394 bytes .../textures/blocks/lantern/lantern-side.png | Bin 0 -> 508 bytes .../textures/blocks/lantern/lantern-top.png | Bin 0 -> 459 bytes .../blocks/lantern/redlantern-bottom.png | Bin 0 -> 394 bytes .../blocks/lantern/redlantern-side.png | Bin 0 -> 476 bytes .../blocks/lantern/redlantern-top.png | Bin 0 -> 462 bytes .../blocks/lantern/soullantern-bottom.png | Bin 0 -> 394 bytes .../blocks/lantern/soullantern-side.png | Bin 0 -> 521 bytes .../blocks/lantern/soullantern-top.png | Bin 0 -> 458 bytes 22 files changed, 61 insertions(+) create mode 100644 src/main/resources/assets/chisel/textures/blocks/lantern/cursedlantern-bottom.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/lantern/cursedlantern-side.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/lantern/cursedlantern-top.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/lantern/desktop.ini create mode 100644 src/main/resources/assets/chisel/textures/blocks/lantern/endlantern-bottom.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/lantern/endlantern-side.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/lantern/endlantern-top.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/lantern/glowlantern-bottom.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/lantern/glowlantern-side.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/lantern/glowlantern-top.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/lantern/lantern-bottom.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/lantern/lantern-side.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/lantern/lantern-top.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/lantern/redlantern-bottom.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/lantern/redlantern-side.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/lantern/redlantern-top.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/lantern/soullantern-bottom.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/lantern/soullantern-side.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/lantern/soullantern-top.png diff --git a/src/main/java/team/chisel/Features.java b/src/main/java/team/chisel/Features.java index d239a351e..0bdd6d9a1 100644 --- a/src/main/java/team/chisel/Features.java +++ b/src/main/java/team/chisel/Features.java @@ -4536,6 +4536,42 @@ void addRecipes() { 'B', new ItemStack(Items.slime_ball, 1)); } + }, + + LANTERN { + + @Override + void addBlocks() { + BlockCarvable lantern = (BlockCarvable) new BlockCarvable() + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + .setHardness(1F) + .setLightLevel(1.0F) + .setStepSound(Block.soundTypeGlass); + + lantern.carverHelper.addVariation("tile.lantern.0.desc", 0, "lantern/lantern"); + lantern.carverHelper.addVariation("tile.lantern.1.desc", 1, "lantern/glowlantern"); + lantern.carverHelper.addVariation("tile.lantern.2.desc", 2, "lantern/redlantern"); + lantern.carverHelper.addVariation("tile.lantern.3.desc", 3, "lantern/soullantern"); + lantern.carverHelper.addVariation("tile.lantern.4.desc", 4, "lantern/cursedlantern"); + lantern.carverHelper.addVariation("tile.lantern.5.desc", 5, "lantern/endlantern"); + + lantern.carverHelper.registerAll(lantern, "lantern"); + } + + @Override + void addRecipes() { + GameRegistry.addRecipe( + new ItemStack(ChiselBlocks.lantern, 1, 0), + "gig", + "iGi", + "gig", + 'i', + new ItemStack(Items.iron_ingot, 1, 0), + 'G', + new ItemStack(Blocks.glowstone, 1), + 'g', + new ItemStack(Items.glowstone_dust, 1)); + } }; private static final String[] dyeOres = { "dyeBlack", "dyeRed", "dyeGreen", "dyeBrown", "dyeBlue", "dyePurple", diff --git a/src/main/java/team/chisel/init/ChiselBlocks.java b/src/main/java/team/chisel/init/ChiselBlocks.java index 46ed4e761..279dab47b 100644 --- a/src/main/java/team/chisel/init/ChiselBlocks.java +++ b/src/main/java/team/chisel/init/ChiselBlocks.java @@ -173,5 +173,8 @@ public final class ChiselBlocks { // 1.19, skipped 10 versions but thats fine public static final BlockCarvable froglight = null; + // Backports from Dustrial Deco + public static final BlockCarvable lantern = null; + private ChiselBlocks() {} } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 600f0d684..97bb53dc9 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -2698,5 +2698,14 @@ tile.froglight.7.desc=Orundum tile.froglight.8.desc=Blood-Stained tile.froglight.9.desc=Ichor +#Lanterns +tile.chisel.lantern.name=Lantern +tile.lantern.0.desc=Simple +tile.lantern.1.desc=Glow +tile.lantern.2.desc=Redstone +tile.lantern.3.desc=Soul +tile.lantern.4.desc=Cursed +tile.lantern.5.desc=Ender + tile.chisel.amber.name=Block of Amber tile.chisel.bloodBrick.name=Bloodstone Brick diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/cursedlantern-bottom.png b/src/main/resources/assets/chisel/textures/blocks/lantern/cursedlantern-bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..b72d2c6ceec80882e75e8f022931d1829de8d8bf GIT binary patch literal 394 zcmV;50d@X~P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0Ut?3K~y+Tjgn1E z!$1&*x7&~q>UT@iRxGH9z56S?_1dEc|ARkOupk(WR`BCs4=qxB)>kGm6zR*7-JN-6 zXLdG?$<@ur`>U&H{`vO1a;~*?poNT2&o3T&Z@(=o`k&_8xExzap_R6Ju({fF~6e>#@BK#uPFqmMA1Tn$GIqOF|;;$b0ce46|E&HOF{|; z&9VW5BB9kByIUDhdyUzw;Krh>NkV}28>tcnli|k}WXE};DE+yE zj<>pzXtrzaU?Pl11T|WAsd+ZKU`k@2rrS|7(&%)uo!$0o<>EL!IXxd74q=KS=NolSQn*aa+ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/cursedlantern-side.png b/src/main/resources/assets/chisel/textures/blocks/lantern/cursedlantern-side.png new file mode 100644 index 0000000000000000000000000000000000000000..e7ee0e78e3aba4e1b3ac20da82ddcf5d0b839c0c GIT binary patch literal 553 zcmV+^0@nSBP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0lrB@K~y+Tl~T(} z!$1_BBqgy;#aEU3M6sn76mj7$x)3)iiXaMts0e<5AovY}JMjYqcW$Jjd%?QVh0;x- z0Wo5$rPfzsX|&Zdy&6$BdYRstIXQFBncETi2Paf-HDj!@ss{P~?$%j5K_J31vqG@5 zuijsWjZ0PueYGuGAbxoh+=&>uq>7@o!CR7DNs`Vnp^wa1;1K7!Ol{C>05uz>M# ztOO#6_RUft(7~tiOlen&9Uqde$7zQUq3DRB3FuGdK`1b$Vh|f3eI+KhMCQ1Ync~%D z0!`Ex+-FlcP*EEoc_W(C-qDLm)uiqfZ*@pE6`RF9&?y#~VO#{3eUS2NvXyp;X+@M| zQIQpXAS@t{R!uI=&4UdQa)K>DhXArLG`^U(^OwdsiUGm}kWY@I$aFVYLe|$Z%`I&> z@YPm8xFu@i8i%pfjo30Z)Y=mHr%#&H(A0*h+^d?VmCa@_w0&QNyS1CuCZ`jp>q+1s zklKr#b2T;xu|m)jL|gQTwL7-Gi*CbVVqtw--!N$YmeW6gu=N`Gv(KC8-6Sa*^ r{xlR>d}E?zJ-xozWp2+uA0K1ywx7%iyNl}t00000NkvXXu0mjf4FmEp literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/cursedlantern-top.png b/src/main/resources/assets/chisel/textures/blocks/lantern/cursedlantern-top.png new file mode 100644 index 0000000000000000000000000000000000000000..2929ab7066ad65f345d8cc9690345660a6711cab GIT binary patch literal 479 zcmV<50U-W~P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0dz@3K~y+TT~fA?SsUoDlTGCqzmcRA8_YZaO1*1aN$SVjT;3Eg7wh~w%QolJnNY|H)-M_ z3^V7c!QqlH+^&1-n&ia0oC{1{IXqFbZLlD1covEWybTu-5CcU@&-OiqYD( zkv)8Qmazax6lgLM0EG`ud-vcUQ$Q=uBZXedj%k?W^wL5?dszAdpPL|L*zx$i9FonU z6+8JDeJXt&j&-DBN_2rkLSH9I0HoeMIsKWAYIVEQIo{Z8WUp#?ueaR&B#wf+h2=MG zXUA>tEweC==9+F$fj^sMX*^$qLExupiuPHi1iuqBHVut=q#_5FX21raVTnjhx-;uC z<81Gyi2*=D!Y7BWY)Q-)JS@?|^A6#VknauCVs({!;Gtn1$1R6s^JhW@eDiV@`A)D9 zazwV21X=k51lDj5MVBI*FF-vzzs876VJv3fhEL@XhhYber~qCWtBV&81a`$J${$-C V;Mzr+f6xE`002ovPDHLkV1nF-$DRNH literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/desktop.ini b/src/main/resources/assets/chisel/textures/blocks/lantern/desktop.ini new file mode 100644 index 000000000..d55b15e56 --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/lantern/desktop.ini @@ -0,0 +1,13 @@ +[LocalizedFileNames] +large_redstone_lantern_top_off.png=@large_redstone_lantern_top_off.png,0 +large_redstone_lantern_top.png=@large_redstone_lantern_top.png,0 +large_redstone_lantern_off.png=@large_redstone_lantern_off.png,0 +large_lantern_top.png=@large_lantern_top.png,0 +large_lantern_bottom.png=@large_lantern_bottom.png,0 +large_glow_lantern_top.png=@large_glow_lantern_top.png,0 +large_ender_lantern_top.png=@large_ender_lantern_top.png,0 +large_cursed_lantern_top.png=@large_cursed_lantern_top.png,0 +redstone_lantern_off.png=@redstone_lantern_off.png,0 +redstone_lantern.png.mcmeta=@redstone_lantern.png.mcmeta,0 +redstone_lantern.png=@redstone_lantern.png,0 +large_soul_lantern_top.png=@large_soul_lantern_top.png,0 diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/endlantern-bottom.png b/src/main/resources/assets/chisel/textures/blocks/lantern/endlantern-bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..b72d2c6ceec80882e75e8f022931d1829de8d8bf GIT binary patch literal 394 zcmV;50d@X~P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0Ut?3K~y+Tjgn1E z!$1&*x7&~q>UT@iRxGH9z56S?_1dEc|ARkOupk(WR`BCs4=qxB)>kGm6zR*7-JN-6 zXLdG?$<@ur`>U&H{`vO1a;~*?poNT2&o3T&Z@(=o`k&_8xExzap_R6Ju({fF~6e>#@BK#uPFqmMA1Tn$GIqOF|;;$b0ce46|E&HOF{|; z&9VW5BB9kByIUDhdyUzw;Krh>NkV}28>tcnli|k}WXE};DE+yE zj<>pzXtrzaU?Pl11T|WAsd+ZKU`k@2rrS|7(&%)uo!$0o<>EL!IXxd74q=KS=NolSQn*aa+ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/endlantern-side.png b/src/main/resources/assets/chisel/textures/blocks/lantern/endlantern-side.png new file mode 100644 index 0000000000000000000000000000000000000000..555949616e91ba603b09666d144d62f0624a282f GIT binary patch literal 531 zcmV+u0_^>XP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0jNntK~y+Tl~PMc z0$~vTch!~BB=gZ)Y-K2j2p#Gas3cwT5Jeq&K+y}rLzf6TcI)1`OSigqj-n2A=~yCU z53+|yrrCNhL;H3Iexy?k!|pfVd^7+2vnxb~CoI-B##pP}foHLh=a?Iju(J9t_(Nfj z>_%XeEX00)l?lLpk+0dDRzTDrO^C(k@Zt@0lJ%J8@qDQ6QP?IJ|CpEEc6 zJL$8lI{;cJQglAV+NCp(_XvEx0RI%&Hvqm5XVU2ufYRj^M#fespxOAMxHa-Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0b5B#K~y+TU6Q>@ z13?sp_eXY%Sf~+`C>BBl5iHV+eXMLPEz|>f| zKVRQzlFYI!V|<=_R5Lh^0`Wl@QG+)c=p)AxDGf&_9sg3*r>$!QK$7CKqN`hyzT4LU zBiii)03oEd#NAlk!aGPbUV2<;a^-Jg8uap7h1&_z0jd@wa^VCL%JB|vimTST{O(x~ wiK3R4=t3?dz#!8Asv757gyJa1|1+NV2aMC?zcDaZ@c;k-07*qoM6N<$g8g;F2mk;8 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/glowlantern-bottom.png b/src/main/resources/assets/chisel/textures/blocks/lantern/glowlantern-bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..b72d2c6ceec80882e75e8f022931d1829de8d8bf GIT binary patch literal 394 zcmV;50d@X~P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0Ut?3K~y+Tjgn1E z!$1&*x7&~q>UT@iRxGH9z56S?_1dEc|ARkOupk(WR`BCs4=qxB)>kGm6zR*7-JN-6 zXLdG?$<@ur`>U&H{`vO1a;~*?poNT2&o3T&Z@(=o`k&_8xExzap_R6Ju({fF~6e>#@BK#uPFqmMA1Tn$GIqOF|;;$b0ce46|E&HOF{|; z&9VW5BB9kByIUDhdyUzw;Krh>NkV}28>tcnli|k}WXE};DE+yE zj<>pzXtrzaU?Pl11T|WAsd+ZKU`k@2rrS|7(&%)uo!$0o<>EL!IXxd74q=KS=NolSQn*aa+ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/glowlantern-side.png b/src/main/resources/assets/chisel/textures/blocks/lantern/glowlantern-side.png new file mode 100644 index 0000000000000000000000000000000000000000..e3a4b04034839a36e3b13647e5ae46395adb605e GIT binary patch literal 513 zcmV+c0{;DpP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0hUQbK~y+Tl~PSh z0#Ouw^U+9X(kM)(g;vfW=Bf{gplBflL7QsRvQ5j{MZck?&?e|7v}hBw(yh6ZKCC3# zn2~5EO5o(!dGlhLW>tsBoAd5H@4j=H%Ppoh+#VkxWKi~FZ@kqkZh-}XcB{^*iG|^S zf`cfzS@g5hW(05qD=)9~0t@{S)Dk}SN+`oPfX5w=h-koaUn&(rc4v8-H<8ZM%h71e z()_Z-q-u-{c_%^2&FhC^4NSQX(N`h*WdWJ=v!iU7d&8CArKJ1hruUen7B5a5NvJfDGcF z{#bbc3MsiK&Zw5uN&&o8-VVb!=lRv|gAEW1YHZqM{7L39H5!CzSPx5Fx17sl@8Jr~ ztREH7u_X0FDFjEx^v(xZtJOwx%WJZ_ImZY6SQGP_+^e3R-J;_Gj~g;9ZfpC1K4yXq z+2M*5--&?S96#+}bU^I0NJqo*^Btps-7fg&@DcI_25Fy09NhHu00000NkvXXu0mjf DXj9++ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/glowlantern-top.png b/src/main/resources/assets/chisel/textures/blocks/lantern/glowlantern-top.png new file mode 100644 index 0000000000000000000000000000000000000000..8b71e9277208e3ab7c30355b14817a552f78cff0 GIT binary patch literal 456 zcmV;(0XP1MP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0bNN%K~y+TU6Q#@ z!$1^8y&$Iu1)DI7(j`(F3VK=!Iw(?5P*Cs>h~MBd_@PLNgur46f`AAXIAFsW-|^t& z%6hu*zGddUv44De?p1hueZej*ugV2d>M#X$HJfJGpJ|F+h?=ElUC>-yu?53nUy`u7 zu}*e!du{y^h!h0YD}lrZ*=}{_6os)Ah<3>d#pJ@_XY}MN2B|?Yho1w zx08p*r>kTQ(&_q4Nf!t%BB3(Hv^GQEB?Cr`<1Hj^hzf_KA7ieej^toT3wL(+Chy}S z|Ni{S(sYvNIqi$WBb&yJD3Bh65jj{h19ik$BB@95&BeayjdFPsG5{hWK09=MOPX)c z|D{E{-G$&HYD?UW)y=$vhQ?|h=bBjco0tNiCxr_*nOaZJ8&b6%kL9qXd=lucs*ybUtbLgP}0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0Ut?3K~y+Tjgn1E z!$1&*x7&~q>UT@iRxGH9z56S?_1dEc|ARkOupk(WR`BCs4=qxB)>kGm6zR*7-JN-6 zXLdG?$<@ur`>U&H{`vO1a;~*?poNT2&o3T&Z@(=o`k&_8xExzap_R6Ju({fF~6e>#@BK#uPFqmMA1Tn$GIqOF|;;$b0ce46|E&HOF{|; z&9VW5BB9kByIUDhdyUzw;Krh>NkV}28>tcnli|k}WXE};DE+yE zj<>pzXtrzaU?Pl11T|WAsd+ZKU`k@2rrS|7(&%)uo!$0o<>EL!IXxd74q=KS=NolSQn*aa+ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/lantern-side.png b/src/main/resources/assets/chisel/textures/blocks/lantern/lantern-side.png new file mode 100644 index 0000000000000000000000000000000000000000..6f63942e9710a0f226360fec23631ba2a3c87965 GIT binary patch literal 508 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0g*{WK~y+Tl~PSh z0#OuwGY$>p;8=#Kppq!G5L~$G!-8;A1O-tPNYEncAK12k(GO@5wrJC`O&Gb!B4{Bf znIoh`9~vqsQk^$99)qhoFmKL1_rCYeeeX$g$u+w+${2HwxG*+8-UJsQ5oovGrARd4 z^|%ozLv~X8y*3eGK&;hY_ym&v2x(zy8$T?7*&wO0XNgPt>hL;L6BW9$c<`ns_a0>ViE0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0bof)K~y+TU6MUZ z!%!54(=;SQ9sB^R7ICTIA}Fo}2PZdIM+g6dn}5SUXZ-?*6!_LFfW!xBt*%cg4!*mO0(TvS}QJzI4AHl7lrfP)Cd90WI3?4G1oxw#407-NZX+XsqUOu8Ebui7C*_YZY!Mj1Ez@6p0fj5KxSFa9v!s z)>Yd-IA%miQ%iI%ml2_nDS%bMxt0|_2=-s`ygv`-=l28=Y-s=h002ovPDHLkV1oQo B#R&ia literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/redlantern-bottom.png b/src/main/resources/assets/chisel/textures/blocks/lantern/redlantern-bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..b72d2c6ceec80882e75e8f022931d1829de8d8bf GIT binary patch literal 394 zcmV;50d@X~P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0Ut?3K~y+Tjgn1E z!$1&*x7&~q>UT@iRxGH9z56S?_1dEc|ARkOupk(WR`BCs4=qxB)>kGm6zR*7-JN-6 zXLdG?$<@ur`>U&H{`vO1a;~*?poNT2&o3T&Z@(=o`k&_8xExzap_R6Ju({fF~6e>#@BK#uPFqmMA1Tn$GIqOF|;;$b0ce46|E&HOF{|; z&9VW5BB9kByIUDhdyUzw;Krh>NkV}28>tcnli|k}WXE};DE+yE zj<>pzXtrzaU?Pl11T|WAsd+ZKU`k@2rrS|7(&%)uo!$0o<>EL!IXxd74q=KS=NolSQn*aa+ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/redlantern-side.png b/src/main/resources/assets/chisel/textures/blocks/lantern/redlantern-side.png new file mode 100644 index 0000000000000000000000000000000000000000..4e1eb209102676a2c2216a8846be6611046b8e57 GIT binary patch literal 476 zcmV<20VDp2P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0dYx0K~y+Tm6E$k zLqQORcQ=Qmh=msrFGLU%F(jo{8Y>&E0;UlpAd+WLd;q~`5SxRgLMkg8NouQvlj5XR z5xf+p5l`Z`nPdrKp~Eu!&%gifTv)xiwVNE9R7#CcOyS?(UL1BNB-Z(O)tP)@c4nHu zizkKs`s@h6evpq(&-Q{)e>9U?Sd&4 zwnlrvE~5wher!%c*8_7Klr-7{tf~4|H+)M3eWCIYv7H9>Qp4t5&KF=PgYx9)?)DlF zbCTVF@#a$*Ry(Mj#RkL1D4I}g*h6o1ZJki>9URMNl=oa}XHt^;(f|B>N__*WHpsd@ SH_>?j0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0b@x-K~y+TU6MOX z13?spXE(B2#KH#{A6OZ|#=_plM$jr?Wocn)?=SF&*lQ_RrSU%~7!eFUA{fQE=tg(- zn>~|plf!a3_uR+Ky|cmY-k}-b?ezsaF*z+4NGZb>l-0DKVt@Jxb}XtEnsY&Qe99HH zT33>Ux!D=A+jqClFMvov=)3|*e2|63fY9&c@#*<&V+XQi0;Z%31Q(G|kz!lhq3_$*j99D9BXL7iI3)S#at(DP2TNLI zb#1-(-p#Y`&#yE|dRdmyKF)TCdRU3b!P*(9BgPU*-8?@&Xr3zj=<gr* zU3|9I6>K&38Bx;661~f1L}+9SU}bQwW5o}G{a1|n13>TQEesv3#sB~S07*qoM6N<$ Eg3V9Fxc~qF literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/soullantern-bottom.png b/src/main/resources/assets/chisel/textures/blocks/lantern/soullantern-bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..b72d2c6ceec80882e75e8f022931d1829de8d8bf GIT binary patch literal 394 zcmV;50d@X~P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0Ut?3K~y+Tjgn1E z!$1&*x7&~q>UT@iRxGH9z56S?_1dEc|ARkOupk(WR`BCs4=qxB)>kGm6zR*7-JN-6 zXLdG?$<@ur`>U&H{`vO1a;~*?poNT2&o3T&Z@(=o`k&_8xExzap_R6Ju({fF~6e>#@BK#uPFqmMA1Tn$GIqOF|;;$b0ce46|E&HOF{|; z&9VW5BB9kByIUDhdyUzw;Krh>NkV}28>tcnli|k}WXE};DE+yE zj<>pzXtrzaU?Pl11T|WAsd+ZKU`k@2rrS|7(&%)uo!$0o<>EL!IXxd74q=KS=NolSQn*aa+ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/soullantern-side.png b/src/main/resources/assets/chisel/textures/blocks/lantern/soullantern-side.png new file mode 100644 index 0000000000000000000000000000000000000000..f6ee6b4f7a0ef347eb601e6196fb87b30524fde9 GIT binary patch literal 521 zcmV+k0`~ohP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0iH=jK~y+Tm6E$l z13?gn_u`p|2@(~=ATby;xxykKY7--fHo-0yN>C6x3&BFrzrjMVu(MIF5$z;}R)UR6 zz|t2A1|JdBAV~yY_+2I*qKyvA+&90S+nt#^E!LlKd+L-@-r9P6?(yDc+eE|)`3J47 zy~o$sK%hI_qQ1Qp1h60C&F!7_f=GWftuH>7xx9EE7$WG--QX#Js{u-t+V;FYe8u*< zzq!Q$iB%29);fdP?Dg5%5m&PSLPWO8N!%bMollNVCzDA}HEiaK`-w52Yh%S$7ECj^ zvf2LVzt2 zNF!NiAWVaRNvFQb{S5&gN|CIMjL*u?C|B9@u}vzm|LA}Id`f)+&riYcmq#p;00000 LNkvXXu0mjf(}Lte literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/soullantern-top.png b/src/main/resources/assets/chisel/textures/blocks/lantern/soullantern-top.png new file mode 100644 index 0000000000000000000000000000000000000000..c41e0111b89ff00b395511af202f2d6a5a5abbe7 GIT binary patch literal 458 zcmV;*0X6=KP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0bfZ(K~y+TU6M;n z!$1^;(^L|qE_{HkFWj`~rVDW^ZpEFrbK$~;8-IbnPw*GG5n6oJR|RXahMH=E-{efj zw1;px_uR+Ky_3?>$+?%K|M8BUom-F#q!eKaifTNHvA?4TI~7zi&AOm6Gj9vp?Q2QG zQf-m!&cm(sGaypnTQ36=A7o{%F`+p4?mh}UHg`qBAcWw$5bd$%1l=1bjO})xi>`^~ z@ZC;cUf)))E+F@fX{MwL1Q(G|mSS3)p`SV}Myytsk+>l$91?x?xQ05CgC(up+}as@ z_R{2M_#H>lAW0J1r>RFajl;l~?w12{ux1A8h_OUc?>4qC5BHRPb9T%Ch=lm;(8Voj zzV+6S7WMij1Q$_T;%=;N>>V^TR`WR5#PZ+76zJu(3bzwRhbUW$#IX|yD8@UuE-qW^ zD(xSfGNPo3B|4YOh|tIsz>45p%d#H?`>%N39~+V8X9-=Ci~s-t07*qoM6N<$f?)W_ Ay#N3J literal 0 HcmV?d00001 From 67528fc82ddcf1c0e46a8d2a926912eccfa4589c Mon Sep 17 00:00:00 2001 From: Mary Hopson Date: Tue, 18 Nov 2025 12:46:13 -0500 Subject: [PATCH 2/6] Sheetmetal and rusted iron --- src/main/java/team/chisel/Features.java | 36 ++++++++++++++++++ .../java/team/chisel/init/ChiselBlocks.java | 3 +- .../resources/assets/chisel/lang/en_US.lang | 14 +++++++ .../blocks/iron/terrain-iron-rusted.png | Bin 0 -> 407 bytes .../textures/blocks/sheetmetal/paneling.png | Bin 0 -> 402 bytes .../textures/blocks/sheetmetal/plating.png | Bin 0 -> 429 bytes .../blocks/sheetmetal/rustypaneling.png | Bin 0 -> 514 bytes .../blocks/sheetmetal/rustyplating.png | Bin 0 -> 482 bytes .../blocks/sheetmetal/rustysiding.png | Bin 0 -> 431 bytes .../blocks/sheetmetal/rustytreading.png | Bin 0 -> 456 bytes .../blocks/sheetmetal/rustywalling.png | Bin 0 -> 472 bytes .../textures/blocks/sheetmetal/siding.png | Bin 0 -> 318 bytes .../textures/blocks/sheetmetal/treading.png | Bin 0 -> 268 bytes .../textures/blocks/sheetmetal/walling.png | Bin 0 -> 303 bytes 14 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/chisel/textures/blocks/iron/terrain-iron-rusted.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/sheetmetal/paneling.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/sheetmetal/plating.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/sheetmetal/rustypaneling.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/sheetmetal/rustyplating.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/sheetmetal/rustysiding.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/sheetmetal/rustytreading.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/sheetmetal/rustywalling.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/sheetmetal/siding.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/sheetmetal/treading.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/sheetmetal/walling.png diff --git a/src/main/java/team/chisel/Features.java b/src/main/java/team/chisel/Features.java index 0bdd6d9a1..1da51de12 100644 --- a/src/main/java/team/chisel/Features.java +++ b/src/main/java/team/chisel/Features.java @@ -2050,6 +2050,7 @@ void addBlocks() { } Carving.chisel.addVariation("iron_block", Blocks.iron_block, 0, 0); + iron_block.carverHelper.addVariation("tile.iron.0.desc", 0, "iron/terrain-iron-rusted"); iron_block.carverHelper.addVariation("tile.iron.1.desc", 1, "iron/terrain-iron-largeingot"); iron_block.carverHelper.addVariation("tile.iron.2.desc", 2, "iron/terrain-iron-smallingot"); iron_block.carverHelper.addVariation("tile.iron.3.desc", 3, "iron/terrain-iron-gears"); @@ -4558,6 +4559,41 @@ void addBlocks() { lantern.carverHelper.registerAll(lantern, "lantern"); } + @Override + void addRecipes() { + GameRegistry.addRecipe( + new ItemStack(ChiselBlocks.sheetmetal, 1, 0), + "iii", + " ", + "iii", + 'i', + new ItemStack(Items.iron_ingot, 1, 0)); + } + }, + + SHEETMETAL { + + @Override + void addBlocks() { + BlockCarvable sheetmetal = (BlockCarvable) new BlockCarvable() + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + .setHardness(1F) + .setStepSound(Block.soundTypeMetal); + + sheetmetal.carverHelper.addVariation("tile.sheetmetal.0.desc", 0, "sheetmetal/walling"); + sheetmetal.carverHelper.addVariation("tile.sheetmetal.1.desc", 1, "sheetmetal/siding"); + sheetmetal.carverHelper.addVariation("tile.sheetmetal.2.desc", 2, "sheetmetal/paneling"); + sheetmetal.carverHelper.addVariation("tile.sheetmetal.3.desc", 3, "sheetmetal/plating"); + sheetmetal.carverHelper.addVariation("tile.sheetmetal.4.desc", 4, "sheetmetal/treading"); + sheetmetal.carverHelper.addVariation("tile.sheetmetal.5.desc", 5, "sheetmetal/rustywalling"); + sheetmetal.carverHelper.addVariation("tile.sheetmetal.6.desc", 6, "sheetmetal/rustysiding"); + sheetmetal.carverHelper.addVariation("tile.sheetmetal.7.desc", 7, "sheetmetal/rustypaneling"); + sheetmetal.carverHelper.addVariation("tile.sheetmetal.8.desc", 8, "sheetmetal/rustyplating"); + sheetmetal.carverHelper.addVariation("tile.sheetmetal.9.desc", 9, "sheetmetal/rustytreading"); + + sheetmetal.carverHelper.registerAll(sheetmetal, "sheetmetal"); + } + @Override void addRecipes() { GameRegistry.addRecipe( diff --git a/src/main/java/team/chisel/init/ChiselBlocks.java b/src/main/java/team/chisel/init/ChiselBlocks.java index 279dab47b..4ffc90c97 100644 --- a/src/main/java/team/chisel/init/ChiselBlocks.java +++ b/src/main/java/team/chisel/init/ChiselBlocks.java @@ -173,8 +173,9 @@ public final class ChiselBlocks { // 1.19, skipped 10 versions but thats fine public static final BlockCarvable froglight = null; - // Backports from Dustrial Deco + // Backports from Dustrial Deco. Original artists are WDSPC and Evo_94! public static final BlockCarvable lantern = null; + public static final BlockCarvable sheetmetal = null; private ChiselBlocks() {} } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 97bb53dc9..bfabb2783 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -1297,6 +1297,7 @@ tile.roadLine.4.desc=Hazard Tape #Iron Blocks tile.chisel.iron_block.name=Iron Block +tile.iron.0.desc=Rusted Block tile.iron.1.desc=Large Iron Ingots tile.iron.2.desc=Small Iron Ingots tile.iron.3.desc=Iron Gears @@ -2707,5 +2708,18 @@ tile.lantern.3.desc=Soul tile.lantern.4.desc=Cursed tile.lantern.5.desc=Ender +#Sheetmetal +tile.chisel.sheetmetal.name=Sheetmetal +tile.sheetmetal.0.desc=Walling +tile.sheetmetal.1.desc=Siding +tile.sheetmetal.2.desc=Paneling +tile.sheetmetal.3.desc=Plating +tile.sheetmetal.4.desc=Treading +tile.sheetmetal.5.desc=Walling (Rusty) +tile.sheetmetal.6.desc=Siding (Rusty) +tile.sheetmetal.7.desc=Paneling (Rusty) +tile.sheetmetal.8.desc=Plating (Rusty) +tile.sheetmetal.9.desc=Treading (Rusty) + tile.chisel.amber.name=Block of Amber tile.chisel.bloodBrick.name=Bloodstone Brick diff --git a/src/main/resources/assets/chisel/textures/blocks/iron/terrain-iron-rusted.png b/src/main/resources/assets/chisel/textures/blocks/iron/terrain-iron-rusted.png new file mode 100644 index 0000000000000000000000000000000000000000..232cca0e1317e5a228f89e59b27630c2d8928fb3 GIT binary patch literal 407 zcmV;I0cie-P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0W3*GK~y+TeUd#( z!%!H7ZzPR_R8eXvD0Q(S4sJS#gE|-d3F7FYxcK)RI*6;Fh;>ooXGujv5tCAVE=S_E zX?uo~^Cp+v=bpqnJUNQf#28a71h}jBtBa|XRi5^m*NkJeW!8B6#|OI`n_7`6?R+Z4 zZ;=8@lCSgUC!f>~L(M@jj;F8pg>sdwn;P-&)?KgN_4ex9)8(ptgQGP5m|I#@ez>_+ zKtVV1A=?^>R4J7RY=xgSPJPY+l4ci!00}M_g4B=X!XTFifn;mlSzFhfk)W&}Z7x|P zF8P)w=4;&PgiWZD%Z4|*kWme73C|a0kw$+w6umtDrhzTF6)}p+E$SbVNYJpN27I`D zQ8SZ8ji|pR!BCM1=?7OuIN6RITFF)RKP&vnm>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0VhdBK~y+TZIUrd z13?glH%myNf#@$fB!Y#K5G_*OuQRp5KnlSiha71xjfI_!fuz(N(Zb4aeKPE=KFDNt z_U-JOx7RAmaju}Zbuk-+%<-mP=TBoBm)>* zoZeB7*q8w@0}&Z zKWG{b%x-7e_zTI1&G0<4=@X2kr64namp+ilh|zfI_?xk+8IYI}Y?Z$C>zcJrnw#-# w6jcvHn?9f_ostjnXEPui5Gi?w|7UaV8|vr7QLI?}QUCw|07*qoM6N<$f(zoP8vpPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0YXVcK~y+TZIVq+ zgHRNO+iE276{;~Y($tMOkdZTI4%`AG2hQ9HbGre%12(`Sgp@&>)Iu?~BR@F!N{A;f zm-}<>y@!`K48!pJ@@&xHdvn0raFuPa#u$ZFRbfvlKRrGxwX1e=z}Spi?=N2z#o}Wz zQYwlfrGPS!mibaA{Y>ZY^X=D`ZEXX>DByUWr`fg>OfDut5Xc{)Tf+#Z{uDN$*fawi zX46yCY0w9#1}s}X>?U1<|E?RDN?EhDO0cRlzAQ`Z$X=pVBJ|jH&rwpB-9uMZ+aR|6 zjV=RUVqDj4uN5)af7w}@!G?OgB|Qg$J!1ECTQ+DVQIjfamaW;d+Zmx&wbu&bIPNNu zZuCHzY!Tx8@S+CZI29Dz>gYWx3ggnoOuWv7S-G{AL4SEk77-N0` XUHjddEI6Rv00000NkvXXu0mjf+D5at literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/sheetmetal/rustypaneling.png b/src/main/resources/assets/chisel/textures/blocks/sheetmetal/rustypaneling.png new file mode 100644 index 0000000000000000000000000000000000000000..033a865d973837a9be62b85fc2ffac0e625f8f79 GIT binary patch literal 514 zcmV+d0{#7oP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0hdWcK~y+TWs<*3 zLQxdQ?Gb^Qp%EBGlv_ju?X?IE5rm6FQ&U^?PxL=DH8#~E;SVB^h6<%Y5DhETO0*dWKuz2}~L?)QAp8wy1urN{ejIUj$>t!?jwjt-Z6zG5N~*xie#ZfEV| zH@-|ujR%0xo$qEU^*5PnHqC87M8`0w^mcEZXdmi9=BgI zrS~eF_{OHc*!gsIDoTL6J72@v@N~0QSl>U;{j=by;{VZ;B#=!HPx-92lw@t#J*wi$ zrdSR1=|Dh+2ys>=0ri8t!3%{6uac05Rs{u_Q5$iP)4R}2UWouK7MZD69iC|nz*(F~ zx6CT$1rDr)0pwDPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0e4A6K~y+TU6Q>@ z15pr#lQjg_n3#wViD*b_#-swVlsk=L1;!4q~4^kU|u}6q40I$S#|o zRYTM-IX4$^SZ2@6oS8c__r^~S_I!6LHj-S_Lt7JBY1INZFPx1U=mg>O<5RibJ8c1E zemZT?*gtsl9`0@va@|~Con2hwdX2(GH-jFy8TZH5{&gbe1lZZfDu6KM0gzJpf>T(PQ#lMgOkh6M!z%{) zGOdO%`_%*JwG;-|F$Y;U%_Omr)m zGHcbnh=DMxz_<4zQ)v=MH?L-FJ%E~#iMBar25dfJV#|q$jgZWicuppPn-_phOgs%L zPuVk7CW_lzYcsiIKMFrSe|#V94*HYL2464iSkF>=xc#sb#P^R5LH1#5X_9{r8wuR} YFK_MquK1c=tpET307*qoM6N<$g6-?be*gdg literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/sheetmetal/rustysiding.png b/src/main/resources/assets/chisel/textures/blocks/sheetmetal/rustysiding.png new file mode 100644 index 0000000000000000000000000000000000000000..348e95d11d49b7acf4e985163b03a0258bb54e63 GIT binary patch literal 431 zcmV;g0Z{&lP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0YpheK~y+Tb&|bG z13?sp*X>q~BqBr-EMjFP*z03hSXtTmNO^&19UB{qM6!qosYK8e!PS76kVLl-#cy)P zyGw$n7|z_iKWEO}rTTf}`z85Fo;nYY2S>+Wx2@;WMn8@ZPfk1Co2_W=`s$MS=;Exf zx8IE0VK4(pBA_~a6CqnGfnd<+u!>vRI|r{iKeP#j)LKYansYVSQd zg_UhZ{zFKTr+={Nv~<^~tZBvjE~lHI4|7l>B>_DQdD$C!>opPNp;bJOm2!m~Uog3A zacVRc&tk4CNoIzg7m{Q?8srjo>1t+VF40Lcc#q|Q{C)&iu(&l@%xV<`W{jUejcH|? z2(V=X)%ZQ=16Ry>MpHLI*~k!I)D29kmo&FK`Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0bNN%K~y+TWAuv- zVS4kLfq}tBN<_dbY|ET!S_<-30THv7%)=_q92yfY^8cSY7b~x!&Hpc-@7%rtWdCI2 zR+Euq`~4lr<`$Rw_x#b_7cYVAJAeN&+qpVg+Pec)01X2IiLY;fIw5RrYlrV|UP9QC zOn*OU=m8l_7J8;Y+aaRTs_H=7;cU3Lti2~(oaM!r&p@|6ym}tZ-7h4ifb7RSTxjCV z-nP~dcLQx#<>zJR-~h6Lwtsm4=GFcCX#N4Zmf6?S1L$s`&%hQk=y(JIeFkBx{rrsV zABaDhklhV*E8N{czhU(c^B0Dnw~rhIh8i#&{>ZBW*}zZ+h8s`?kPUP#(0+(G&{aTt zmM1i6P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0c}Y{K~y+TbyCYp z!$1_BNfettG_i%0NWr>yA-MDlTqyVeK|%Z_Kl{C(l)f{|)W1Cd zNgFZwLm0}04D_Jg5BUaQhQz=}fBo)}W(8B>^%Zn%ah6=!-ThLk<9?AhsxOr zet)N~72Oz>v3jiv#|>%;U;y#c^@gqjHLz!HEzXOuEprZYklqV!-Za6@yW3PNz_#=C zfi*QgfhAXWHtnd3k;QS`?--zIfEV>*xrnlIdW?H1X0nJ$R$=73f++X*)-$e$&5&a~ zc&!7NxRFkpYuI^8rIb3%@a7PCEmUw&ZedB?1KteAuT2B&2Rf}QMTj3v4Z@#n-WWXq O0000&Ha^ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/sheetmetal/siding.png b/src/main/resources/assets/chisel/textures/blocks/sheetmetal/siding.png new file mode 100644 index 0000000000000000000000000000000000000000..5d20d3a7d76339642a2c0bd7c43092b647da1ad3 GIT binary patch literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!ONa5jv*HQwG%fAH97FO_;Ycmvi()j=GK1m z-hXM4gm%4C+J+E`4I7FI4O@2ithbn^%ITRGI4!ky{oLZCD^K)Smag99%l3Bf^7@_g zzVCLvy{*Ud14qWZvn%SBycSXatC_epw(r&I-TM~T+1|5QdTNG1xa!9F9;yf8liBup znIylEHfGo+*c^74MU&rWu7~uBtZmDuGrpPDq@czuvQ_wBLQd!Di*_9E8Ch}#YWc4m zzOZri^;KWDgw0*NUGu;adugfK%dV<7c`khB;p8#O7oVTD+44Ih)0x~^P0V(4f!<^A MboFyt=akR{0Ao^kSpWb4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/sheetmetal/treading.png b/src/main/resources/assets/chisel/textures/blocks/sheetmetal/treading.png new file mode 100644 index 0000000000000000000000000000000000000000..aac24aceb673c375ab9dcf8dca8eac16814f4822 GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!G)eKjv*HQ$vUgf{QmY&oSC_K*REaDwq5&G z`r6mW$Hdh1dR}B_=$xG^7Pv%s%$Pns+%4?c^Yin+zrV}ANphw{>e440yNuggTQxPc z7$Y4HH#GE4TiCuKD?k^~JS*dAmhBXZQE>ueR8{ zf4{wBxpH^&ABPKf9T>#fe>N`IJ@IH{N1^$q9~m|bj9VW!HZn2@I&PVMUEuCYpko<4 MUHx3vIVCg!0L)@$9{>OV literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/sheetmetal/walling.png b/src/main/resources/assets/chisel/textures/blocks/sheetmetal/walling.png new file mode 100644 index 0000000000000000000000000000000000000000..71cff6f7def7f49897b490add1218f78a262c1f8 GIT binary patch literal 303 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!6Tk7jv*HQwG%h;9Wvl?najr$u=2z7nG!dC zEc?cOYTo-suhz!S?sKMLlfQAAep6K~FZIwodFao)k2(Hp^BXl4zBt?ORWrN0GkK%) z=3=SnZ^4}AMJENvSs&F%L!{k{_~Wr xFMo43;JT&6KNE*+uJ~(~0{K;6e~M0&&uMDDbntuCTA+UzJYD@<);T3K0RSM*c}D;M literal 0 HcmV?d00001 From eb2b2c212a24d53ceb98b8242a2141852c1ffdac Mon Sep 17 00:00:00 2001 From: Mary Hopson Date: Tue, 18 Nov 2025 13:28:23 -0500 Subject: [PATCH 3/6] Cardboard, cinder --- src/main/java/team/chisel/Features.java | 34 ++++++++++-------- .../resources/assets/chisel/lang/en_US.lang | 6 ++++ .../technical/new/cardboardbox-bottom.png | Bin 0 -> 330 bytes .../technical/new/cardboardbox-side.png | Bin 0 -> 330 bytes .../blocks/technical/new/cardboardbox-top.png | Bin 0 -> 376 bytes .../blocks/technical/new/cardboardscrap.png | Bin 0 -> 438 bytes .../blocks/technical/new/cinderblock-side.png | Bin 0 -> 350 bytes .../blocks/technical/new/cinderblock-top.png | Bin 0 -> 438 bytes .../blocks/technical/new/cinderbrick.png | Bin 0 -> 442 bytes .../blocks/technical/new/foldedcardboard.png | Bin 0 -> 1830 bytes .../new/polishedcinderblock-side.png | Bin 0 -> 418 bytes .../technical/new/polishedcinderblock-top.png | Bin 0 -> 436 bytes 12 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/cardboardbox-bottom.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/cardboardbox-side.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/cardboardbox-top.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/cardboardscrap.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/cinderblock-side.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/cinderblock-top.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/cinderbrick.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/foldedcardboard.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/polishedcinderblock-side.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/polishedcinderblock-top.png diff --git a/src/main/java/team/chisel/Features.java b/src/main/java/team/chisel/Features.java index 1da51de12..0ba01d8c6 100644 --- a/src/main/java/team/chisel/Features.java +++ b/src/main/java/team/chisel/Features.java @@ -3811,6 +3811,12 @@ void addBlocks() { 7, "technical/new/concrete/concreteBlocks", new SubmapManagerCombinedCTM(9, "technical/new/concrete/concreteBlocks", TextureType.R9)); + technical4.carverHelper.addVariation("tile.technical4.8.desc", 8, "technical/new/cinderblock", 42); + technical4.carverHelper.addVariation("tile.technical4.9.desc", 9, "technical/new/polishedcinderblock", 43); + technical4.carverHelper.addVariation("tile.technical4.10.desc", 10, "technical/new/cinderbrick", 44); + technical4.carverHelper.addVariation("tile.technical4.11.desc", 11, "technical/new/cardboardbox", 45); + technical4.carverHelper.addVariation("tile.technical4.12.desc", 12, "technical/new/foldedcardboard", 46); + technical4.carverHelper.addVariation("tile.technical4.13.desc", 13, "technical/new/cardboardscrap", 47); // The animation is malfunctioning. :( // technical4.carverHelper.addVariation("tile.technical4.7.desc", 7, "technical/new/TapeDrive"); technical4.carverHelper.registerBlock(technical4, "technical4"); @@ -4562,12 +4568,16 @@ void addBlocks() { @Override void addRecipes() { GameRegistry.addRecipe( - new ItemStack(ChiselBlocks.sheetmetal, 1, 0), - "iii", - " ", - "iii", + new ItemStack(ChiselBlocks.lantern, 1, 0), + "gig", + "iGi", + "gig", 'i', - new ItemStack(Items.iron_ingot, 1, 0)); + new ItemStack(Items.iron_ingot, 1, 0), + 'G', + new ItemStack(Blocks.glowstone, 1), + 'g', + new ItemStack(Items.glowstone_dust, 1)); } }, @@ -4597,16 +4607,12 @@ void addBlocks() { @Override void addRecipes() { GameRegistry.addRecipe( - new ItemStack(ChiselBlocks.lantern, 1, 0), - "gig", - "iGi", - "gig", + new ItemStack(ChiselBlocks.sheetmetal, 32, 0), + "iii", + " ", + "iii", 'i', - new ItemStack(Items.iron_ingot, 1, 0), - 'G', - new ItemStack(Blocks.glowstone, 1), - 'g', - new ItemStack(Items.glowstone_dust, 1)); + new ItemStack(Items.iron_ingot, 1, 0)); } }; diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index bfabb2783..73e0c7eba 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -881,6 +881,12 @@ tile.technical4.4.desc=Thermal Exhaust Plating tile.technical4.5.desc=Makeshift Plating tile.technical4.6.desc=Pipe Dream tile.technical4.7.desc=Worn Concrete +tile.technical4.8.desc=Cinder Block +tile.technical4.9.desc=Cinder Block (Polished) +tile.technical4.10.desc=Cinder Brick +tile.technical4.11.desc=Cardboard Box +tile.technical4.12.desc=Folded Cardboard +tile.technical4.13.desc=Cardboard Scrap tile.technical4.16.desc=Tape Drive? (I'm too young for this.) #End Stone diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/cardboardbox-bottom.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/cardboardbox-bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..58e578bf25457357eea6380e648ba9e467521ecc GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!TX*rjv*HQy^}Wb9x@Pcm6gg7)Z}=U#O4*2 zz!l||AP{A?V9`Ps1=gD-e?FUwALs0dpL6d2zt2aTUhRmsPCr}!$u4C1-)A*Dt*pO3 zTpF6TvGCe2fh~HoZ?>%H%IvZrcJf5WDs5%H%IvZrcJf5WDs5Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0S!q+K~y+TZIVrH z!Y~j+=%;h%>jA|79cf1s#Z2Tp7WW(4SgC#U*^~2q`%#) zohy1bc87YlT#cr0==0Zp_xUkI2#+}|d%CnsA1kPYfOSG4fqHy0K z_vW;h!5yZk3gU(Sdn#MWqOrg(6cGHR(h}`A&W^+%Ta`opVV;=0&8fzu7xQPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0ZU0lK~y+TRgp_h z0znXl#~z$%B8p7LjWN3A0LHBc&?B(sEMAH05W)sShKHd|fcSO)lX9pGO?CZ`s_wp; zeNEQQX21W*vTQK8sqTj)RJzF_ghTjM#qsO=^7-k}*ubm`AT+D*H3?fFH(xAKv!Mx? z%+!$RdryuXMKNOsHGQZnG1LbbJs+LL(Fl$|NxR0HP-94M;YW=l6|6tc_T z$8}K@V5jpL*>$hCi`25NM!@7+IX4NM_6)4L5c8&Dxu#%Fl6VF%T@HI;HkF~QN*u;w zYeWK##IREy*`QcZN5IM2%a*|W2$48|#JI;Zz+kV7?{ZUSFDK%ToZ5I2VUxP1JCVapDY{?T#XOKK*>tlfkgJgFz0= gM`d_-+j6}B10Ojsxu=Lg3IG5A07*qoM6N<$g0Q>0!THRgF&nGHQB)mSC7X53r9 z@BPFDeJ{SXD^D}=-E8yuIrFV$sfU!d#a`d|$n3T($G?qCR!)K!=bjVSNpez=G!f+N zeC!nPU|y_{kjloK9k1W^`S`jwNG+Y=a7z1z*vTb3T@T3GFI^G4;^wl@CFbiJj&|L6 zxBqP=ztMukXqR6PAD-~dQ1I~3@lE)0VBgyvPgnwMD}H#Y@ykeUf9##D&`}zy9JPY` tf3#_1hg@LYl>XpL;*%s*t#nU4Vty~MlaXzbNdeIN44$rjF6*2UngC!4i$wqc literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/cinderblock-top.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/cinderblock-top.png new file mode 100644 index 0000000000000000000000000000000000000000..76089d8429006021ff34e84938ab154cc9459a04 GIT binary patch literal 438 zcmV;n0ZIOeP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0ZU0lK~y+TeUd** z!%!5(%|mKqT6AioPGX^x(C<~hfQXZbs~`x1*3HGiPv9gt7n}+eCpC3a+8FKRFYkm) z2*tzY=Dhpo<-K!XaC&y$iZ_-#K9YBQ7>3QYbw$AR>odzT2yuLHb9=`pilRodk>@>T z)0v2ZEYmbqWLX;w23NJ(%6$GyNCXcrNBaFexQjQpws$&8&x?4 zJK-0a8lHwjiXDBsy`F6YezI?~BILnAD0bt~Xp&59r%I8QN^x(BbCr7@axKvKs{Vl>gf1{UpX#dLjj}<=22c! zMzMo&hq6i(nH3=q%7EjbsH+fd3r$%~ET1$cS^qH_C}U#zYc&Nbj}%{ir{aZ5FkPKf g+6y&e*>>Fi1B^QNrcN-=*Z=?k07*qoM6N<$g6WF3^Z)<= literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/cinderbrick.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/cinderbrick.png new file mode 100644 index 0000000000000000000000000000000000000000..df29b52395c784d68fb59bf118560dcd74d4ceac GIT binary patch literal 442 zcmV;r0Y(0aP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0Z&OpK~y+TjZ!^J z13?hYo(bf*1T~Nke}SN7u(il<5c0PKK?n$THWp%&B48z0L=fRrl$=R*m&+|C%I3Hf z7QWq)VIu+aSSIhy?Cxylow&KZt5vHxgKV)N;uec6iIWTlf$(1kiImWjc!KD8Ua4F% z8-6iY^E6F~C-GPx7!F6I|HbG%5dB9VjY#7HMAvl@%bQy!ms4M#h*_4^8ar<<&-%bP z()-rI!+qbu4<2nVWbkOi`cE$0w(=>6G+#rGm&3uruHwdP)$s1HS)+ zKX=$_+5WIIc{YI@P)gMsbsWHMDv=NDj{}VbO*LBJEJ5t5LjwWgD1QAT&-oCiS^ z*WI4JZ5f#NQMzsZ$QKIV k1~N%d_>ht_1mu-cKUh`-xZrU*NdN!<07*qoM6N<$g51%v^Z)<= literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/foldedcardboard.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/foldedcardboard.png new file mode 100644 index 0000000000000000000000000000000000000000..da48d21be6f71848ac73bdd82e134b009bb48f6a GIT binary patch literal 1830 zcmbVNTWB0r7#>rFBsMCof);9rX{-@CJC~iE%uKS@bT{oT?IvNf(D+c|*)wN$hwRLm z&P=kKv`SIist{}*8bh&pX-oSgA}FF3Er&-L8fNIV`E_URvY@h2s@Y2(yB$NxUYCboIv&Yp!l+>G*-FEi#KT zdEa+5jw=?6p<+0M-5e*Vs><;qCyFdVu->TcgA!|dyK4+_z%yhYH9-w(k+FP{%rX>|-yF??YYR zzQ+IwZ7Nl_v7r{rs+;iq?h)cfH6R^j=tZ2E~DoqKwFsaPuTlie{{P-U4FLqb_@Dy1cD&j&U{$#|3@@d=rxt|>}3tcpNpb-`$7BZ{Q6WEy65 zSqDfkvh5HWwexWdhl45z&Q~skjv?XrN1hBNBckgPD=MPFDypQgAe#-dA`f**<`qSb zpc-4RYmz$&3hP+|RXSmmp<+M@AXecGiH)d4m7*Y(m4vXGB~+rIprG>0#iS)nkED6D zdYAgqvFfN`(&hTm01WO$lz~A(Af2f$n;XPqQmD}zB5+Yxj>K*= zg~;7czXwJhtbTLZtjO9>{rbZFpX#f@fq7u(5NWj>6ZpdgO{tO^?%!D}@2zWKH8|;t z!LZ(r$)w)Ukxi&w(yph^AMPNnel8jB%Ct?4r?0oX!EfzkE@=%-@!N}Ak6!He#~+&$ z))ueyKD_PRg~45W?8YZ=zWeR56S^nr@xq-E49A!)XKugu@ukl2 zSKr_0Y2EqF-4nmgT$=ysuRlIp9XYl0Zo}C>ul=$>O{F_NS-m_sGqsR7wRA?f*n4yS zcdBpk+O7lC-s_XI^D~nleR{O#hn4Tft}ZpdwBuIe$;aE8jxXPNbPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0XIoRK~y+TU6Mgd z12GVV)83YCP>8nJE1nOnyS&_qWqK#o}RKYahxcYn3N?H_! zNNc+NYI8r#7*KlQ_Gv!1FVK@r6U#2Kb|RJ91=d4T*VrHd*pml<4Q4L^uGKaytBQnj zUdurz%m_Hkdhizod{?*bZ8#{cKmT4@l%B>-D-}fI#WuVx79{w|uUwai8Fc~>*sp;f zB8IL!S1a(wblmxtM0pKdJg|k M07*qoM6N<$g0+sVqW}N^ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/polishedcinderblock-top.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/polishedcinderblock-top.png new file mode 100644 index 0000000000000000000000000000000000000000..6f20fd3ea2cee6a6be37c3e5602f4291e1fb0bc5 GIT binary patch literal 436 zcmV;l0ZaagP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0ZBSr-|4e3g{*7+$?zPrcRVk%#upUAJ&zCP{G|ne%X_~fmTUao!=HduRSl2a9@%*&G z*3G)-XQ!>!=3?m$;L!m?#DkKEc*C_>$4`cHVWl`vz zT}g1grfI}ak_78hz{yI*aCpTS9KCiWu$62}s^32`Lo>s1uji6B?L3PxWK^tCiTi~r zQRJ7SESB%Uy)EOO>GzT>eNoB0G-HXZ|15rxzD_0EVnq;1d&T6{P${~;8L=@wF(=xr egOFg!EA<1#wCa1iKpY1E0000 Date: Tue, 18 Nov 2025 13:35:43 -0500 Subject: [PATCH 4/6] Spotless --- src/main/java/team/chisel/Features.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/team/chisel/Features.java b/src/main/java/team/chisel/Features.java index 0ba01d8c6..4c32c83dc 100644 --- a/src/main/java/team/chisel/Features.java +++ b/src/main/java/team/chisel/Features.java @@ -4549,8 +4549,7 @@ void addRecipes() { @Override void addBlocks() { - BlockCarvable lantern = (BlockCarvable) new BlockCarvable() - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + BlockCarvable lantern = (BlockCarvable) new BlockCarvable().setCreativeTab(ChiselTabs.tabOtherChiselBlocks) .setHardness(1F) .setLightLevel(1.0F) .setStepSound(Block.soundTypeGlass); From d18047758cd9c2655d47b06c6fab4546d6b74507 Mon Sep 17 00:00:00 2001 From: Mary Hopson Date: Tue, 18 Nov 2025 13:36:42 -0500 Subject: [PATCH 5/6] No way I got the mod name wrong skull emoji --- src/main/java/team/chisel/init/ChiselBlocks.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/team/chisel/init/ChiselBlocks.java b/src/main/java/team/chisel/init/ChiselBlocks.java index 4ffc90c97..03289fb0e 100644 --- a/src/main/java/team/chisel/init/ChiselBlocks.java +++ b/src/main/java/team/chisel/init/ChiselBlocks.java @@ -173,7 +173,7 @@ public final class ChiselBlocks { // 1.19, skipped 10 versions but thats fine public static final BlockCarvable froglight = null; - // Backports from Dustrial Deco. Original artists are WDSPC and Evo_94! + // Backports from Dustrial Decor. Original artists are WDSPC and Evo_94! public static final BlockCarvable lantern = null; public static final BlockCarvable sheetmetal = null; From 5eb41aad9e32af9852a2ea6cf758659b94e2900f Mon Sep 17 00:00:00 2001 From: Mary Hopson Date: Tue, 18 Nov 2025 14:12:39 -0500 Subject: [PATCH 6/6] We love windows --- .../chisel/textures/blocks/lantern/desktop.ini | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 src/main/resources/assets/chisel/textures/blocks/lantern/desktop.ini diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/desktop.ini b/src/main/resources/assets/chisel/textures/blocks/lantern/desktop.ini deleted file mode 100644 index d55b15e56..000000000 --- a/src/main/resources/assets/chisel/textures/blocks/lantern/desktop.ini +++ /dev/null @@ -1,13 +0,0 @@ -[LocalizedFileNames] -large_redstone_lantern_top_off.png=@large_redstone_lantern_top_off.png,0 -large_redstone_lantern_top.png=@large_redstone_lantern_top.png,0 -large_redstone_lantern_off.png=@large_redstone_lantern_off.png,0 -large_lantern_top.png=@large_lantern_top.png,0 -large_lantern_bottom.png=@large_lantern_bottom.png,0 -large_glow_lantern_top.png=@large_glow_lantern_top.png,0 -large_ender_lantern_top.png=@large_ender_lantern_top.png,0 -large_cursed_lantern_top.png=@large_cursed_lantern_top.png,0 -redstone_lantern_off.png=@redstone_lantern_off.png,0 -redstone_lantern.png.mcmeta=@redstone_lantern.png.mcmeta,0 -redstone_lantern.png=@redstone_lantern.png,0 -large_soul_lantern_top.png=@large_soul_lantern_top.png,0