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 zcmY*bdt6P~9^dUw-=?ie%3WVmEB_l(Cdb7|cDTRVpS`L5sZ`~7{_`u)~!)qgq-dejD` zfe>3#7VN3i(>rmTZB$j*`pG^`BE3uFnls#&9rNk1To%K(ZK-_G^B|>U{K+xNcN7N( zR$UFu>Tl6x@2~ES2~a=&dbh5Z%e*zwb8mDD(DKDk0gn5j88 z-E1x9YR!5OlFfS&l!0Q^&ODHE2S;a$RTmKiLtWkSKA#&;C~&vWVk34+!ZoD)!CoM^887B|Kw<@3Gp~cFRjdmYRI$_FyW_p zJraeA034nUpFHD*4m!rqs?kNqS~EN1UJ9Q4^0{`H;FW=Sl#nX|_(hAfC>CZBz!xv+ zr|X5I(B6e>F_-aIBF$;dgQ$5Fy$mTT1yU7?aZy)`i$t309dWuFwxU^i+i*RzExkwury{G)NCM z@KEeL^pp#i_{^BM(6*w3rdXGiW1&W{vM|NP4Qn=>W~SJ)zhkY&Z34R=JJkH!m0eBG zH1N=qgw%o_>8J%OP4Q%QB^7GD*stm0*bH`@3@fe&unVyw&nbx2I0eB?S0Ny}X^@9( zNg9M;@1!ps+?2E8&iESVXtQ2B+>7_0d14FaccfuaPhUg1$A(V#)XluQH+=RhZSUnd z6CJ<(q`OtS_DS^p@3oHeFZ>>6vbwBfRF{`*Pd)os-|>IT3e#1cp$(pSmzo^@9^z3^ zRX;Pfdd~K-ZGQi>HLSTg(0-&SU`*oi@$>)tYu3l*vy`@topxuHEfw-(Zu4K?bW!fT z%H8wzF_dxa0NVC$~TT*J!8i+V!p@{|r;~bp+Xud#cl1+O59layKPLHZYKK z$wbd#KDplG_(b+u{fdyS|I; z8@}$L`D3?Mcj=kftIIFWQTge&{M?*d?WBl^P?LN9FC}EbI)fklpLUO2Y?W|$$185^ zt_7Qto1VA)w945cbj5-G7r{RG9^Td5{m4^z3p;@!bs1nolD2`n1m8n^Daqk&@DYyq z{x%4}nR{e_KArhYCCo!2PYHJs<1=9i;`vNih3Kq;aB3r+Q5Qop3&EW1Q-L>9KdPuy zGc5}&saMB#uqKJyAqZI^z(8Zwg5Q%u@TS{t+1>9&yt9N81{c9C zEOXrf;fT3AU^U{S9k3K}PO)gaznJox!D6tZqp{s7c3rd+Qc*apR6NhdQrLj;ol=nx zE`#+Lx0Q+0nz9QLFmBi-@}oFWpEZO}I8h%}E?(F9a)?CzxZUCbx9t`WbYlpoR=^|V zKOnFeF^$lJYpxM6rU!jc32TuEt`awDuL6Y-YbNXgTPm1a4aq2It%l2pMSH1$Tu=*_ zZ>$Cv(y7bZlU6lIk@l$pYZ!dSMV+z|UK|URrIT2b zzid1#v!4wJHrLG=#{WH=6sw_v_F9-T>>CFfS(4LU>_~E{NbJeCPH=V|`xhl4syeX5 zP1Q(go!+Hx3n`>tA!R!CU20}Mj6o{A9;_|bPG_0;1Vw^d;s!;?0v1e}H~-U+5`hQ5 zX!50?r(*~$S5@i=zwH@13}gS^`7cHTd7LhMy)Wy*f@