From 3b8a85a20d5cde8db7e34eb17297e421a13def39 Mon Sep 17 00:00:00 2001 From: GirixK Date: Tue, 26 Mar 2024 19:50:22 +0100 Subject: [PATCH] Backport Froglights Backported 3 froglights and added 6 more Pearlescent, Ochre, Veridium, and the 6 custom ones meant to look like Osmium, Tungstensteel, Iron, Titanium, Aluminium, and Grisium --- src/main/java/team/chisel/Features.java | 31 ++++++++++++++++++ .../java/team/chisel/init/ChiselBlocks.java | 2 ++ .../resources/assets/chisel/lang/en_US.lang | 12 +++++++ .../chisel/textures/blocks/froglight/0.png | Bin 0 -> 257 bytes .../chisel/textures/blocks/froglight/1.png | Bin 0 -> 260 bytes .../chisel/textures/blocks/froglight/2.png | Bin 0 -> 258 bytes .../chisel/textures/blocks/froglight/3.png | Bin 0 -> 803 bytes .../chisel/textures/blocks/froglight/4.png | Bin 0 -> 781 bytes .../chisel/textures/blocks/froglight/5.png | Bin 0 -> 792 bytes .../chisel/textures/blocks/froglight/6.png | Bin 0 -> 785 bytes .../chisel/textures/blocks/froglight/7.png | Bin 0 -> 786 bytes .../chisel/textures/blocks/froglight/8.png | Bin 0 -> 783 bytes 12 files changed, 45 insertions(+) create mode 100644 src/main/resources/assets/chisel/textures/blocks/froglight/0.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/froglight/1.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/froglight/2.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/froglight/3.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/froglight/4.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/froglight/5.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/froglight/6.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/froglight/7.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/froglight/8.png diff --git a/src/main/java/team/chisel/Features.java b/src/main/java/team/chisel/Features.java index 78488fce..183beff3 100644 --- a/src/main/java/team/chisel/Features.java +++ b/src/main/java/team/chisel/Features.java @@ -4302,8 +4302,39 @@ public enum Features { boolean needsMetaRecipes() { return true; } + }, + + FROGLIGHT { + + @Override + void addBlocks() { + BlockCarvable froglight = (BlockCarvable) new BlockCarvable() + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + .setHardness(1F) + .setLightLevel(1.0F) + .setStepSound(Block.soundTypeStone); + + for (int i = 0; i < 9; i++) { + froglight.carverHelper.addVariation("tile.froglight." + i + ".desc", i, "froglight/" + i); + } + + froglight.carverHelper.registerAll(froglight, "froglight"); + } + + @Override + void addRecipes() { + GameRegistry.addRecipe( + new ItemStack(ChiselBlocks.froglight, 8, 0), + "SGS", + "BSB", + "SGS", + 'S', new ItemStack(Blocks.stone, 1, 0), + 'G', new ItemStack(Items.glowstone_dust, 1), + 'B', new ItemStack(Items.slime_ball, 1)); + } }; + private static final String[] dyeOres = { "dyeBlack", "dyeRed", "dyeGreen", "dyeBrown", "dyeBlue", "dyePurple", "dyeCyan", "dyeLightGray", "dyeGray", "dyePink", "dyeLime", "dyeYellow", "dyeLightBlue", "dyeMagenta", "dyeOrange", "dyeWhite" }; diff --git a/src/main/java/team/chisel/init/ChiselBlocks.java b/src/main/java/team/chisel/init/ChiselBlocks.java index f8c8d07d..a6a21cdf 100644 --- a/src/main/java/team/chisel/init/ChiselBlocks.java +++ b/src/main/java/team/chisel/init/ChiselBlocks.java @@ -167,5 +167,7 @@ public final class ChiselBlocks { // 1.9... drull pls public static final BlockCarvable purpur = null; + // 1.19, skipped 10 versions but thats fine + public static final BlockCarvable froglight = 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 b9b73aea..fcc04da8 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -1878,3 +1878,15 @@ tile.glotek.12.desc=Cranberry tile.glotek.13.desc=Brink Pink tile.glotek.14.desc=Dark Salmon tile.glotek.15.desc=Harvest Gold + +#Froglight +tile.chisel.froglight.name=Froglight +tile.froglight.0.desc=Pearlescent +tile.froglight.1.desc=Ochre +tile.froglight.2.desc=Verdant +tile.froglight.3.desc=Osmium +tile.froglight.4.desc=Wolframsteel +tile.froglight.5.desc=Ferric +tile.froglight.6.desc=Titanic +tile.froglight.7.desc=Alumium +tile.froglight.8.desc=Girisite diff --git a/src/main/resources/assets/chisel/textures/blocks/froglight/0.png b/src/main/resources/assets/chisel/textures/blocks/froglight/0.png new file mode 100644 index 0000000000000000000000000000000000000000..8f15ce6ae75dbe11d25aed35481b080c32350d81 GIT binary patch literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Cp=voLp09!PO|1>GURcot>Zhu zX~7`N>fv$Wg1&eHcNABK#t)uZFA{TmTAoy>f3rAwOZfE7s_i#U_uX#(Yr!-9v!{dH znk!lR1TCvB{Vg*MJy4iGHPrWjng2aE75RmiqZ^&pKR+D8Y{*bCvH7t&tL=n*Ru|6= zb6s5c?(r@*5e8Dfx~CNGUU=r~fmptOKjt_6T7FvWws`K_boL*7=N^{`*Cfh`b!D+e zMM^#S5ZNTJn;9uv@%+FNof{L9zD}%s&#jvnGWY3Uw#v|ra$O1!4gvkd;OXk;vd$@? F2>{BbXTJad literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/froglight/1.png b/src/main/resources/assets/chisel/textures/blocks/froglight/1.png new file mode 100644 index 0000000000000000000000000000000000000000..c914bb836f83708a86ca356de8620abdd21f1e7b GIT binary patch literal 260 zcmV+f0sH=mP)@gidb-3O!#}Qw_ub;6)CO zpA_^!z7-H9!FCc6Ie0gW(o7IJcYpxKY+tmspB>;kIFHj! z@P&C;D5@1`WoeMZX9<3^q-AyBodc7yU_*-4N9MgRw1iQ0miHTv-IT&*JVluR0000< KMNUMnLSTXug=mTZ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/froglight/2.png b/src/main/resources/assets/chisel/textures/blocks/froglight/2.png new file mode 100644 index 0000000000000000000000000000000000000000..5f18747c7c6b065c52eaf4cb4134369354634e1b GIT binary patch literal 258 zcmV+d0sa1oP)Pit&{ z-pL=Y!}z!W@W!Mz!wPcrq}%f@DnM~<$x;($i-(svl8@l@RzPTaO`;0GFtCRlK7Llv z1AHrR)Cq5A5y;_pn^Bqwki&2NMasC{Q097|E{Fg4pMv_Q%NENQZS7}g@Ex4SsV3;c zJS;1!6|k~2oU_jo{Ah_Kb=WIs?34r>D3%YVy)Kl5t?DfAH@dBkIx1o`MF0Q*07*qo IM6N<$g5a2IU;qFB literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/froglight/3.png b/src/main/resources/assets/chisel/textures/blocks/froglight/3.png new file mode 100644 index 0000000000000000000000000000000000000000..975b127075991df6e125de8365330d1b27ca8787 GIT binary patch literal 803 zcmV+;1Kj+HP)rwM9ERBxGaaY%HlFJW_Q)@m}X{^T$PK1au654 z4*mnK%9T=zl;r5_*G1cSUaMB(o!)sqec$){^uFI0!l|NJ^6L7bWczMt?+gewOWzEHYR8)I2eCCcIj?EP zHk__Q`<!!#kx)J4K41IVPV&5Sd-ME#dA2cZ zbeh`J%i6Iwh%D{K_B#Et;YG*RtD^SFndgONdB+mO2qiE}U9j6fw$E(gJZD>F-h^Vk zLD!bEjg2R7mV{ywhqf>ml<8nv`WVw-A$M{ZTjXpNi1+tuF=tuGi#s~+`{c>r=n6Ga z)4+1}V)l!0K0%lib|yi-5Kcz(Nbe>RRI*U9wvW~)Xa^(^7VjTAHjrOif5b+lbp8{; z(@=3QAhKO#o6lW{7z0zqZD%eQxgh2f$dOpSib~{)>Oo_!bi^2#M4+Y;S7|(lSjb0I zkw6_)P{~3S0%^=bB|J36ays+n!RH^>eC1O}9F4Jrm1L_hmSa9C9N9RMM&&wTclWt> hyuLcHhsRaD&Od^P)1=dH78n2k002ovPDHLkV1oZVc;o;8 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/froglight/4.png b/src/main/resources/assets/chisel/textures/blocks/froglight/4.png new file mode 100644 index 0000000000000000000000000000000000000000..a4dc0534b54e97a0e154a8aa6cf94562da395d3b GIT binary patch literal 781 zcmV+o1M>WdP)B@T8^Gn+SI_-B|N3+Mp<}9IJ{og6>kdld{mUDHxCqNnA{Q&qYD z&(q9IPBgl^g3$S7S#KlY+<|({vc8Tit9}fQN4O|9{Uyn1`a|?uQ}Z2wdlSwsn_6-g z&bMIjK~EToAITxpp2@)LDfGsn{|35O8d?3Wb8-){4SAw#*xQFu+3#Nc2GU$-^&2~_ zMF0Q*32;bRa{vGf5&!@T5&_cPe*6Fc0Y*tgK~y*qjg!4fLqQOQ$IIf+MS~he(IP6O z@Bw^DeWch~iItUwB3J}0jD{GlXcOq@4XJEZ4PR;D0quj?J@?ws*W6{dS8~u5Pi!aw5KBVnuV= zWI+*Q(LBiT%HLKNY!00000 LNkvXXu0mjfem!lS literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/froglight/5.png b/src/main/resources/assets/chisel/textures/blocks/froglight/5.png new file mode 100644 index 0000000000000000000000000000000000000000..8c7e1d5830ade2ffe6b1cdbd4a717577b0d4215d GIT binary patch literal 792 zcmV+z1LypSP)B@T8^Gn+SI_-B|N3+Mp<}9IJ{og6>kdld{mUDHxCqNnA{Q&qYD z&(q9IPBgl^g3$S7S#KlY+<|({vc8Tit9}fQN4O|9{Uyn1`a|?uQ}Z2wdlSwsn_6-g z&bMIjK~EToAITxpp2@)LDfGsn{|35O8d?3Wb8-){4SAw#*xQFu+3#Nc2GU$-^&2~_ zMF0Q*32;bRa{vGf5&!@T5&_cPe*6Fc0Z~arK~y*qg_FTb!$1&*$FN!nG}fXNjG*=A z&FAz5d>D`V0QOYy(9%N>MNzwzK=e@khWud(O6Rb%^Uwd!49U*k{oU>M@chiM!ML=K z`OUFg3=FSYFd5A=zI4|_mRG(TqxA{82?^xCs^6LaFn(?O5xe>SMBp@3-U|rq7TFc^ z7Ba@bRB_jx#|0OU`2-3iR;;2DxuQ8}%#+R-1Ct1^sf0Be=a5VBj4BeSqY8>FuR?el zvrvIUQ#{9+FAp*QSh!*e38OI#;e)IF~Z(qQZB@T8^Gn+SI_-B|N3+Mp<}9IJ{og6>kdld{mUDHxCqNnA{Q&qYD z&(q9IPBgl^g3$S7S#KlY+<|({vc8Tit9}fQN4O|9{Uyn1`a|?uQ}Z2wdlSwsn_6-g z&bMIjK~EToAITxpp2@)LDfGsn{|35O8d?3Wb8-){4SAw#*xQFu+3#Nc2GU$-^&2~_ zMF0Q*32;bRa{vGf5&!@T5&_cPe*6Fc0ZK_kK~y*qg_BQ9!$1(lr(qQd#2{+XqLz@n1k^d?&Ai!pGf8GASC=>2gEMDXeLgY2+6Jtq zrB#Rf_ON`k+2X|7mvxFc)A>((Yt0V=%X9!=mh<9{=kqYR`x#xSA?6+Nqp;B81o@%7Gg69$ zxjfAay<48pVWD#4nA-3S#t9V&-@8uk0QocNBMvfs@LLf)4V4c9BF7^C#q2_%1(6~} zfB7sIc@PT|D1gY55>gR)8I4)#f-x|OfSO92ij>QFhYGvRFHuJcN=PUnkj7jn$3s(a z^H>gI1jVPgA6p!aF~^nURyF3WtX=O%WU6>5zT)z_2^~)_cI^Ikldkg@Qqj=2veD(k P00000NkvXXu0mjf=^$<4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/froglight/7.png b/src/main/resources/assets/chisel/textures/blocks/froglight/7.png new file mode 100644 index 0000000000000000000000000000000000000000..a1883e7a44307f77a689037b51ec92ad8e804c72 GIT binary patch literal 786 zcmV+t1MU2YP)B@T8^Gn+SI_-B|N3+Mp<}9IJ{og6>kdld{mUDHxCqNnA{Q&qYD z&(q9IPBgl^g3$S7S#KlY+<|({vc8Tit9}fQN4O|9{Uyn1`a|?uQ}Z2wdlSwsn_6-g z&bMIjK~EToAITxpp2@)LDfGsn{|35O8d?3Wb8-){4SAw#*xQFu+3#Nc2GU$-^&2~_ zMF0Q*32;bRa{vGf5&!@T5&_cPe*6Fc0ZU0lK~y*qg_F%n#6S>)+c>Pql3+j)4I+3H zpVWu(>cJQA?$2>SB?m!>WZZ+|U%oaq%m!o|lA5mW>TZ(hjq{7EpM%-9VMp^Fds@Ca zHoKM8RcW`2*3M2E>-v~{a^lCkz1g<~#0Vv@g}ETqrG0kMdCoQzz$n)Am9;Ou-FMFx zaxsY{xL`;IYnPdK=a_R$QjBpAl=ICb<}Ay3aeK#yK6yx^D>6Y%1I?LY(f$z5C&-iX z&Lqee!pUe}@TI4wWTE0yAFWR?4M-r2%P$>QkYAfV;!0$2{u9B|P;oCHa$01a&s``O z15?FyXD%1HAm$UukyyTpO5}?1MPt86jDbl6YASJ~#&d|}d_ffn)KLYMEL0(o#w=9e zr77BB^SB)N{Nu!rK83{57z?Z&N+R*{=FU5w*86t-@R-*57t;0Eok~Sx Q*8l(j07*qoM6N<$f-2l|Q2+n{ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/froglight/8.png b/src/main/resources/assets/chisel/textures/blocks/froglight/8.png new file mode 100644 index 0000000000000000000000000000000000000000..11f6dc8edfed66259292d967c97465977a000783 GIT binary patch literal 783 zcmV+q1MvKbP)O6}(9|kCs#$hXcwBgTy=W=k7Vg$^ zsa4@a;UQZND14>#w8zhivmU=Iwv&ko@Ts1WYy+noSj*Xl@St#?kuPbr^QfByb#s1B zYFK734hg1+6Cq8BHS!dRN;M_3zkRW)ZFHc$J z{yR@6GcxRT55}S8$#viQA+Q7A71#Yba^3G^@IS(ZS@#ztr?C&wD|M~!079E^c3Icb zyKue*Jr7pOPE{qpOkXAgucy$l2wgYOw(Mn9Tj%5+k{j|w*RZz_1F}D~@&meeXX+$p zO(y^V010qNS#tmY3labT3lag+-G2N400BoyL_t(I5sj0@c4=f$<%wNGB@TNPO1)G>E=u^~wfe1dtB0uquh6c5t8 z(6`M4N){@%^r`g;mH`zAKU2N|`9f}H{D~rkzZJpLP;nO!sp9`4yHIFBq)72!XO@dN zi1`F^Am%{{sff6Y#;kO~7??yrO(jl6ip}{76?U5|QAY_%NGKtY#xV_#iC2}UNdEFz z4*d0Y;^iZxTpD8)Pm)(<`(agU&Ka31C!IX;{^9H$Z?1ZKd@aZ4{0-zw&bHy9=+^)M N002ovPDHLkV1kt5T(tlI literal 0 HcmV?d00001