From d6b0715c5275e422ed6f98992b10ef7e56b44eb3 Mon Sep 17 00:00:00 2001 From: GameStar <56610486+BlueBoat29@users.noreply.github.com> Date: Tue, 5 Aug 2025 11:07:04 -0500 Subject: [PATCH] Adding stuff related to tree saps + minor fixes (#1531) * tree juice changes * fixed texture stretch * glacian wool * Update CHANGELOG.md Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * oops * Update glacian_wool.png --------- Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> --- CHANGELOG.md | 1 + kubejs/assets/tfg/lang/en_us.json | 1 + .../assets/tfg/models/item/glacian_wool.json | 6 ++++++ .../butchery_knife_head_extruder_mold.png | Bin 5655 -> 5905 bytes .../assets/tfg/textures/item/glacian_wool.png | Bin 0 -> 5810 bytes kubejs/server_scripts/ad_astra/recipes.js | 2 +- kubejs/server_scripts/afc/recipes.js | 15 +++++++++++++++ .../tfg/recipes.miscellaneous.js | 7 +++++++ kubejs/startup_scripts/tfg/items.js | 1 + 9 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 kubejs/assets/tfg/models/item/glacian_wool.json create mode 100644 kubejs/assets/tfg/textures/item/glacian_wool.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c43154de..461253b6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### Changes - Added links from quests directly to field guide entries (#854) @Zippity - Added a second EBF recipe but from LV furnaces @Pyritie +- Added GT machine recipes for maple/birch saps (#1524) @BlueBoat29 ### Bug fixes - Fixed chain conveyors not connecting (#1520) @BlueBoat29 - Fixed a crash when opening a world with a railgun logistics monitor (#1526) @Redeix diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index c30b7fdc6..e9aa74903 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -528,6 +528,7 @@ "item.tfg.universal_compost_browns": "Brown Universal Compost", "item.tfg.universal_compost_greens": "Green Universal Compost", "item.tfg.etching_diamond_tip": "Etching Diamond Tip", + "item.tfg.glacian_wool": "Glacian Ram Wool", "material.tfg.latex": "Latex", "material.tfg.vulcanized_latex": "Vulcanized Latex", "material.tfg.fluix": "Fluix", diff --git a/kubejs/assets/tfg/models/item/glacian_wool.json b/kubejs/assets/tfg/models/item/glacian_wool.json new file mode 100644 index 000000000..ec0ee6a1e --- /dev/null +++ b/kubejs/assets/tfg/models/item/glacian_wool.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/glacian_wool" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/butchery_knife_head_extruder_mold.png b/kubejs/assets/tfg/textures/item/butchery_knife_head_extruder_mold.png index 62c58ba2543eceef97225021a954871f7c26c4b9..e843c9cb91c4ffb9a2c344e0803c25152b676b6b 100644 GIT binary patch delta 2378 zcmbQPGf}U;Gr-TCmrII^fq{Y7)59f*fq_8)ggMw47#QR~|4(FKV3nx~i6{w5ELSKf z%1_J8NmVGREJ#&It;kGcV5qpYHavaX7d4*0=e0JmsQfBg@jQh+vQBT=jx%SpaOR!HA^Y&SxiUarOR{YEpzzh?^x`3@q*6jI|i(p^Tb|$oVVQ7 ztfIVl?UR*}{*&zMqb#=_n{>G%YudS+4Lj3U%07zRwQ$byeQ$3mt@(cR)P~O0N~#}2 zy!f?4|4WJ*{(8K!o|V6-{w24YY*xYq*B!D?+7x%V?rg5?JuA7G|GNL3NdcF#()aBs zQ#)a6|EOfuH$;$w>`BdY?Yf_$9^ZyZRW&a*R+tRLpJpS%)i}cak*xN z^cx1ZbqbBoHxE zp=ZO>{``-@$F6LnQQ*G>$v7)ZsMq5uY&R(E&;L|a2QFThhN~Ni*)-AjBYSsFM$J#=& zSG`P|mFs76->F-AE9dLef4Q$@EIP&>H1}fe6^GKi&IR}Ue2(*UY*b@-*B~X}oK${h ziTc`|%GV7KSGKG&;8FHvUmoDj!|}>1M=JM?T76N|HM?BLIlp+?XIjqq=3!M;cs=%}-P?ULinFRO9$I9#boaqE+cR$; zQ8ZA<5C0Hce%1%x=Pr zu&?VU#_Z>~xI5sX<=m3lzIUEF=@^w2%;kIeaKhGSOV09&sYVto$!s*=f7Q+0*70F2 z-%Z_+G%I~S2KBnQYjKm=Pw8ElAkxkk(mn7-aUK{IM3$AiAwjbV8?DT|9 z+0QksJK)X+mHCBM#g#{2$If}T_`-Tl{)TDu1g>;Ntz!lN8%}<*pV;33S{zn{)`aHZ@F&69}*Y(FuwAQ$=P>dzYQ5Hzf4*BX|~p` z+TJS`t2^zsHH7Cs*LZTAU$Lg<;bG@L+}&p1VnuG*yklTsY{_(X4)An#hLxBM3>9-~ zCt7Wr*!M;Svm_xKnoKI2}U z^g&dS<-uZ^$um|i-_&hcaqPNnXwaRb75eXY*(W<_&f@vdd8BZewAe?sk8hSOExxB- z-?yP_iNJhee<>4%kIL6mr{A}jE-O}XzGLF)Gs5m2M~nDR+n&*C^RjW42@UD}#a%gF z^j!3ut5MCR&z|V>h;N;$b6wMY;t`=B59gL1wpA+*I`#PViU>>Y@~`;eE>k}%#%SlN zgeMUWvRW#~`Tw!+FVCK~Z229(hb#gW8{hU9D%9`b-ZFdJ-`bqpZ-o#1=ZVRTt>4Rf zrgqZ3H(3{z6AGkv?0A>;Nv>cgGmrhtNs5+}<_Bp^ZTN2dYZ;S43HO)vJF8#cdHjX( z#Km>f@*A3+6BhaGy>5F?_SN0n`%UNm{mWo0Su}CIOZp-P2ENeDkcg59UmvUF{9L`n zl>DSry^7p|&G*m($b7{lM+o$bxkZxjdc@^Qc`u(%uFrPEDX)f(=03|w{Uy$TIeE~xcN4B28Yq)cuU(Wp=Gba4!^INdr~F`vm$ z=4idD#)`ddo-?A<5}Xwre9pX4p0MDXXquXupu|3=u9kiSV?#zo4l_Rimd44-K5>?} zC2!rm+xOAu^0&S9_h0W9opa#s-{#Kq_wUEKiutEZWb|6f&A`>l#BlrVvA3;>90zL5 z#D4BLFlp(O;~QVN1bJ<#zn1sqFDrv(cK-I?r$pFqHzY{!u+{AT@vrG;jt;{oGpD6R zGX^R?ygj#AGyD{T$!uMQ$sH5Kq8A>`un>5AZt=${PT6m-6&D8C6pOhXZVWi( z?B!XaGs%1MCco{13~}@3w*=jbXAcs)`0K;_mkf8~?!Wnd|0GkQ#GZPJ`-E(Y<_>u^*MifBX{gtr>b`;%I`6|apBtQ V`$9M}7#J8BJYD@<);T3K0RRI-MbrQQ delta 2271 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�_-#+$cKg1qM4MvN z`!(PHE47`gD(ESHqLG?=x5;mfSM@^;*X6g3w<|C(255z!O|%c2VE;y!^K5$XH16<@ zpq*Jy?ti$aqsXFM{WVl zr79W5|9;fYy8of@T-0OdNi&kS{P^)^v-XRQtNu6hH`VPw&tF{{_vD#efq-GuwfREl z|9Ja-a}^f-a%i$rX8MACd@1!`PR~|a&a3aT`hNeS8j+2c8LhawW~C-i`;y}%d+Xb2 zp^NJy_4U_pu&-0ESkM0E@Ht+!Z577VtOs68^N5$E?B5$)_^{!mchO9)_L`^5e@|}A z&|C5Ew5R@>JGQ@~^6uUI^v>s@x%%i+*r~A5XrLdg@(bTTO}O2FGvbHHg?nbV)4t_3&9zQk zrL3W>^YdeJ-L8alQ@LEi^5Pk%7oWb_uyICoz7MmqNq_L+vJYSP)Qhd>VLSZklh;I^ z<6)tJ%(hyL`HLilnWN4+di~XC=-yDuAdzIiaIJ&cb<@e6E-da`99j+UCK!wI1aPcl zUh?^j;GK@>=w#1DwpUr%H#W)~`7L}8ox-?ZiEkzSQ3aNMrP1I4{eMV!J;_*3~p3Lz+IFEG}cbK@3#?oD< zu3k^bTC>vY>{gQ&|IfNxZUjx97X5NvvHRZ_8<*?ZemBZcn9?Sncw}N*kIgBU6~1Pd z&l^1U2~L~$H0|w$UmyQ8m|CsbdG^Yz8F|+fd|w7RuAb9!RFb3kn6QL@HxtX2=sA&! z@9!q%6{c-=4r5`TkXU#v(~ynruY$N*>>bJFJ$ldniRP>Q6u)=JKJ}c=tGW|+)bryv zUb}91#VmPN>**HxJXFK^~3KL3h7*qW1pCjHBq5hG~?s8pZW^j z-;7*SQrj~FZa=x(eBbKLj)hx1ZhLiSnTDTliKuz!8<;jnJN-|Vv!zwdqrFNj6CFPa zE_|wSh_`)vYMho)e7eh(eY%^&y^X8xuH}A}@N!q+j$^!Y7l{3enDtUY;jTy`r~SK| zQ$OwPi+aN?*s5i+$j^7@L$goZv*I@wc39s!5_7wMN#gVgyqD##6<2@C3s6+>xW;j` z)oc3V7gA{4i%ibG&|Gypl@7}e?P}a|7y8E7w8`(TV4n)O71mVIk&pJw7~qEk6pBOZ+Mz>Klypz*18Vn`wD-LNPPRV z&B^ZStczE+eN)PfiZ@CMJZJIe=_$jRwHKGjddxLj8N+#LpRNAANmj4+TwC+<L))<6R~^3 zed0UU)_^*$m2;V9G5&oLJ?+}3m9O`eu66Hlk$K4_eeTSwhksmt$lkkmyu{$)iPT>Ei^~@>jf{er7B?8Fktx zV~6PJXx5*rr!BiKB~}$ZeT(pfAL%9e7b5p|{{E)7QniPI86pGIgiCuD}c(PNs1i#F?@Q`a@KO1C>h${-(`Cgf&UZ{aeMZ>5<7g58Y1=beZC*CcGNB>8zql)>i=K;~ zb2X~D^w|@A9`UVHb*^i=Pdp+NI_mD-PV&mKXLWLdNTV`+jTbpzHt?+^WJTaNE^?O;*)K0qh zChMYdLV@&-9q+O}$rbEm=COY{NzroB{2+~~4d0D_En_k$;r_CIXZ7nlkH0XUxVUaw zenYc!!Xlr&*KO~~zPfvRzvXQ2>tmIipR1RclAn~S zSCL!500K7l6$OdO*{LN8NvY|XdA3ULckfqH$V{ z%1*XSQL?w=vZ=7D$SufCElE_U$j!+swyLmI0-I}l#hD=EpgRf_NpP;kyK zN>wn?Gto29b*;!OGg7kSQm`pXNwW%aaf2FBl#*tvlu=SrV5P5LUS6(OZmgGIl&)`R zX=$l%V5Dzkq+67drdwQ@SCUwvn^&w1G6G_TOKNd)QD#9&W`3Rm$jro~{L&IzB_%Ee z1qG<#6}bhzzHsC7ilL#9oS&;-kyxN_sAr&`o2!qkqqxMitOUP~;*iRMRQ;gT;{4L0 zhmUk`ewzndzB% zi8;uw0vVN(nPO#No|bH$n3}3GdD3kRlguF9V`I~a4W|EPg^A;Jp+VDKu%&wT7FTktx|YqUP^v>F+wUN zGdDH3BoP#zhUTUw#-~^xEB~U*)Vz{J zP)fB`G6d_W$StsPE=o--$uA1Y&(E<{0y#>-NY4=BAds|gYDr>BVo9P)Vo9p4l97Rt zsg;3+m4Qi!k%5(|p_PHDu7RnQ0h0Rsl+3hBLaOaR*~11B=^mNICHX~_U?E7J3QjGA z@F3irOps~?1qE=nuu4pZc%eA4EHwq}4Y*WtMq*xiYKpBAG{M5OWMWASNtTv|W`@Rz zx|T+UNxCLR#>Toy$tGsHCdnyj#wli&#wq5IV1=7roS#-wo>-LXn4X$fVyonynOgu3 zD+LW`RB58RraU7R6b}YQrn&|ex=2B$q!00)jXtQvfce%&A0s><3XqBzJ1zx?SdfdG z9hZ$hxSRu(c@P6ZWezPdG#+Sag@VGUB_xIKXmE`N7fB&NlH$?SH5yzbg#by4M^hKo zf{P2$nM%z|u~jNpvbS^kxn&mv0|Q%m7YyGDM6B!s7XL`CghFF~5I(dKA?Es0R_4`B?J>2H!(HR)k zp{vvEtJXYyovPw{0i$n{zZmBJ;*oVeacAug?`cOEolmGZi^|00aBCKRIevYCPEh-m zMZIfFGWWgYdH!c#@y_puiu>-$Eh(#>VE0t>2`i&n{PYV;9xSSM&ECK9iuR`yZjr}d zeJzxo?{-&V{Yj>+)hSEQhKV*rsAdGE{901%cXmy}yFAfpW*crdZ@IZjXmv}3>YOq? zW8MwhKfk;0K4Z42X2t%?E|Z%Iq!xKPt`X|l* zb8ht7P*uyY?$@_ZY@grWzAc(GRlv`gL8?^w^18>tre|CmcJ2<9xW9{G$`?};O^uh? zJ#E4!ni9O~KOB#|u{)P9aOX^ctb9ZM{qvi&St>r4&FxzG`S8AFSu { .itemInputs( 'gtceu:carbon_fiber_mesh', '#forge:aerogels', - 'tfc:wool'//replace with glacian wool + 'tfg:glacian_wool' ) .itemOutputs('2x tfg:better_space_suit_fabric') .duration(20 * 5) diff --git a/kubejs/server_scripts/afc/recipes.js b/kubejs/server_scripts/afc/recipes.js index cce376227..722f42b09 100644 --- a/kubejs/server_scripts/afc/recipes.js +++ b/kubejs/server_scripts/afc/recipes.js @@ -246,6 +246,21 @@ const registerAFCRecipes = (event) => { //#endregion + //region gt sap processing + event.recipes.gtceu.fluid_heater('maple_sap_condense') + .inputFluids(Fluid.of('afc:maple_sap', 4000)) + .outputFluids(Fluid.of('afc:maple_syrup', 100)) + .duration(20*25) + .EUt(GTValues.VA[GTValues.ULV]) + event.recipes.gtceu.fluid_heater('birch_sap_condense') + .inputFluids(Fluid.of('afc:birch_sap', 8000)) + .outputFluids(Fluid.of('afc:birch_syrup', 100)) + .duration(20*35) + .EUt(GTValues.VA[GTValues.ULV]) + + + //endregion + event.recipes.gtceu.fluid_solidifier('maple_syrup') .inputFluids(Fluid.of('afc:maple_syrup', 100)) .itemOutputs('afc:maple_sugar') diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index 58938b23d..12502a521 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -43,6 +43,13 @@ function registerTFGMiscellaneousRecipes(event) { event.recipes.tfc.pot('tfc:powder/charcoal', Fluid.of('tfg:conifer_pitch', 1000), 1200, 300) .itemOutput('tfg:conifer_rosin') .id('tfg:pot/conifer_pitch_to_rosin') + + event.recipes.gtceu.fluid_solidifier('tfg:pitch_to_rosin') + .inputFluids(Fluid.of('tfg:conifer_pitch', 1000)) + .itemInputs('tfc:powder/charcoal') + .itemOutputs('tfg:conifer_rosin') + .duration(20*24) + .EUt(GTValues.VA[GTValues.LV]) // Decorative Vases global.MINECRAFT_DYE_NAMES.forEach(color => { diff --git a/kubejs/startup_scripts/tfg/items.js b/kubejs/startup_scripts/tfg/items.js index 6014b8c03..6049828a5 100644 --- a/kubejs/startup_scripts/tfg/items.js +++ b/kubejs/startup_scripts/tfg/items.js @@ -368,6 +368,7 @@ const registerTFGItems = (event) => { event.create('tfg:elite_power_thruster') event.create('tfg:better_space_suit_fabric') + event.create('tfg:glacian_wool') //endregion //#region Universal compost items