From 442b8ba52618d40f0103ec7e82af1b4245697ca3 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 26 Nov 2023 20:55:22 +0700 Subject: [PATCH] fixes --- .../treetap/recipes/kapok_log_to_latex.json | 23 ---------- kubejs/server_scripts/mainServerScript.js | 1 + kubejs/server_scripts/treetap/recipes.js | 40 ++++++++++++++++++ mods/terrafirmagreg-1.20.1-0.0.12.jar | Bin 167633 -> 172901 bytes 4 files changed, 41 insertions(+), 23 deletions(-) delete mode 100644 kubejs/data/treetap/recipes/kapok_log_to_latex.json create mode 100644 kubejs/server_scripts/treetap/recipes.js diff --git a/kubejs/data/treetap/recipes/kapok_log_to_latex.json b/kubejs/data/treetap/recipes/kapok_log_to_latex.json deleted file mode 100644 index f321e536d..000000000 --- a/kubejs/data/treetap/recipes/kapok_log_to_latex.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "treetap:tap_extract", - "log": { - "item": "tfc:wood/log/kapok" - }, - "processing_time": 9600, - "metal_result": { - "item": "gtceu:latex_bucket" - }, - "wooden_result": { - "item": "tfc:wooden_bucket", - "nbt": "{fluid: {FluidName: \"gtceu:latex\", Amount: 1000}}" - }, - "life_cycle": [0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0], - "collect_bucket": true, - "fluid_color": "#FBB982", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "tfc" - } - ] -} \ No newline at end of file diff --git a/kubejs/server_scripts/mainServerScript.js b/kubejs/server_scripts/mainServerScript.js index 76c65aad6..7505d5d56 100644 --- a/kubejs/server_scripts/mainServerScript.js +++ b/kubejs/server_scripts/mainServerScript.js @@ -36,6 +36,7 @@ ServerEvents.recipes(event => { registerCreateRecipes(event) registerSBRecipes(event) registerExtendedCraftingRecipes(event) + registerTreeTapRecipes(event) }) /** diff --git a/kubejs/server_scripts/treetap/recipes.js b/kubejs/server_scripts/treetap/recipes.js new file mode 100644 index 000000000..9102ef545 --- /dev/null +++ b/kubejs/server_scripts/treetap/recipes.js @@ -0,0 +1,40 @@ +// priority: 0 + +const registerTreeTapRecipes = (event) => { + + event.remove({ id: 'treetap:tap' }) + + // TreeTap + addAnvilRecipe(event, + 'tfg:recipes/treetap', + { tag: 'forge:ingots/copper' }, + { item: 'treetap:tap' }, + 1, + [ "draw_not_last", "hit_not_last", "shrink_last" ] + ) + + // Latex + event.custom({ + type: "treetap:tap_extract", + log: { + "item": "tfc:wood/log/kapok" + }, + processing_time: 9600, + metal_result: { + item: "gtceu:latex_bucket" + }, + wooden_result: { + item: "tfc:wooden_bucket", + nbt: "{fluid: {FluidName: \"gtceu:latex\", Amount: 1000}}" + }, + life_cycle: [0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0], + collect_bucket: true, + fluid_color: "#FBB982", + conditions: [ + { + type: "forge:mod_loaded", + modid: "tfc" + } + ] + }) +} \ No newline at end of file diff --git a/mods/terrafirmagreg-1.20.1-0.0.12.jar b/mods/terrafirmagreg-1.20.1-0.0.12.jar index 9d5a24c5054697b1aa33a40b513e1edbbab150c0..b213734e8652f5e7b1a10f17b7cc590c2c0a675f 100644 GIT binary patch delta 7742 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 delta 2627 zcmaEQjO*fDt_eO&nSB%ejO*Fiw{Brv-#AUqi7&Qj`rXLvU3CUgo9y>XMP+Q>TQTGN z#pk7cYC9y0AEqyPlXStS>Ba8tEsJO0&G4H0@!(WeQ*DowH1~TEPSyN#4Sgn>94(NfR?WT9y{q$K*R#hPX3R0|PElMgp|h;Q^$@4ew+%DS8|*uLajo8+ zj3w{0)n{!mTe1GmA!nY=n}60#d=Ne3;iTx}`+hS8c(Zc^%B`Gmhk=1%G9v>+fHyOX z2m=QP2Sa9GRX76@kYiwA@ZDU`n8wJI*|+&Q(*h=@%)ZIIoGR1v>zTMVZ)Xi*21)R8 zz5*$je41B#dU_8N-{iBhyp!#@(?E&~Yvd;f2=h$;*T5t@`8{_zNG!kzEH=4JlYjDA zS?dkT)qJI38+HlUO*Rnd0LknUI0m9L zBs``!v@mf@z9d);;`<9d08xg*=RwrpGLTK0(=W6#aZe5vsR4kQT09$UH$D$Jd>A+H-N-6Bu;~;PxER|=9O&%F(=Aygitz@ z3*_2B%xXUE>Dk>(B9q^9b8dE!=LUyBfRXOzDuohIL~Q<`6wU@wC_gzMoo{oQrZbpt z*rB`mg?<`XO@Prd5IuRKELhESi#{gd%@(GwAqvyIK!L}yx!C4A3n-j(9OtouOk5x; zKiyyglkw&_cX^P&=6auY5Ixy2-D`7D(0h>L$$!hdHur|V0JHstK*noN-Yv$r`FxBR zNbTn5i5_6uFx>$}Pp^Y%Z*c1UYT6-lJrSbHD1x)PI_b*_Q-rlRvm;hGz-jwkm zn6b%*QJD{9*mW;Pe~^xL4PVCX8oo@ob(k{yrn6QtwS#2)s+a;mexLrJnn|zTG5e5% zK~$DBF2xLs=uPTsvD05E;VjHvq3Q|z-ZdcMYfr<-I|s5I&G8V zo_G7rzO~(6k_B7TJl}n2vYz5tFSq`f{NeiD(+oH1dH%nxT|eiH)9y-_^R~0)B~@r_e*L2AC%(#< zHxAq(EAH}ax$kQJhTXVy#jeHALa&M%JG?J!S+ZRt=4fKq@oO;;*s@-Vebn1yz;h_` zLfmP$MkmhQuXeS~)<}zHJx7u7NuaDd7~P)Rv`RV|YhD9oSLGI@c* z+^CL;6CCEY^-LZhiS~M?#~?bVfhinBA8lYt0@0d{Oc7vXcx)DCOmFC75}Q81k;x7u zb-xj;bh||plN8vj{mo1=(+irJd_l7No0&j`;&iPRrYsPDS_@Mth~{l&0u_wYt6G_I z!3KXnuqbD`K?{@Ebk;T|Kai5pHYQNvGW~EHQwfM~+0K*)R=RY@+jxl5qwP$7oFLyZ zS#F6)o!;2WBs$%&gDDU!=5SmlJ_RDSpo1w8WW?tVh>?k%Oo<@=kxr&)5Utn+_QUk5 zE~Y53ULM&spCYC=b}@-g|J21~2e!6i>I>89c1=uT)BU=c?trxE^e{z$=(ZlFWDxzj zhba<7yY)hhUEB+n-~P9kNgf|)6Q@9;>*y4w7?679sbB|8ubm2U&@Cu!K8@)$ zNM2<+QwWHznhtjO_N&vG1i%h`K7$EVp-lIi39)G3Or~^Df>EEvBnMXDKAWi+q;t<~ zrn4Zrdk$E^^iy-0WTp$uWzwF0jFnMg`kuK=JRoWNc}y})f4@vl+$lY|;0xdMpB#+R zaLM)am}Hp6IT@#4|4O(#(YT;%#)gaz?4yN`k8KspBxr4$uR3EA*48_H!ft70$Dm2B=uecS?b