diff --git a/kubejs/server_scripts/extended_crafting/recipes.js b/kubejs/server_scripts/extended_crafting/recipes.js deleted file mode 100644 index 82c9d2610..000000000 --- a/kubejs/server_scripts/extended_crafting/recipes.js +++ /dev/null @@ -1,6 +0,0 @@ -// priority: 0 - -const registerExtendedCraftingRecipes = (event) => { - - event.remove({ mod: 'extendedcrafting' }); -} \ No newline at end of file diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 49fc252bd..ee3c70528 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -48,6 +48,7 @@ TFCEvents.data(event => { registerTFCDataForTFC(event) // registerTFCDataForFirmaLife(event) registerTFCDataForWaterFlasks(event) + registerTFCDataForTreeTap(event) registerTFCDataForGTCEU(event) }) @@ -59,18 +60,17 @@ ServerEvents.recipes(event => { registerTFCRecipes(event) registerFirmaLifeRecipes(event) registerWaterFlasksRecipes(event) + registerTreeTapRecipes(event) // registerMinecraftRecipes(event) // registerGTCEURecipes(event) registerCreateRecipes(event) // registerAE2Recipes(event) // registerComputerCraftRecipes(event) registerAdAstraRecipes(event) - // registerTreeTapRecipes(event) // registerMoreRedRecipes(event) // registerSophisticatedBackpacksRecipes(event) // registerSmallShipsRecipes(event) - // registerExtendedCraftingRecipes(event) - // registerToolBeltRecipes(event) + registerToolBeltRecipes(event) }) /** diff --git a/kubejs/server_scripts/treetap/data.js b/kubejs/server_scripts/treetap/data.js new file mode 100644 index 000000000..ccaafbb3f --- /dev/null +++ b/kubejs/server_scripts/treetap/data.js @@ -0,0 +1,18 @@ +// priority: 0 + +const registerTFCDataForTreeTap = (event) => { + registerTreeTapHeats(event) +} + +/** + * event.itemHeat( + ingredient: Ingredient, + heatCapacity: number, + forgingTemperature: @Nullable number, + weldingTemperature: @Nullable number, + name?: string + ) + */ +const registerTreeTapHeats = (event) => { + event.itemHeat('treetap:tap', 0.2345, null, null) +} \ No newline at end of file diff --git a/kubejs/server_scripts/treetap/recipes.js b/kubejs/server_scripts/treetap/recipes.js index 9102ef545..5b41235d7 100644 --- a/kubejs/server_scripts/treetap/recipes.js +++ b/kubejs/server_scripts/treetap/recipes.js @@ -2,39 +2,40 @@ const registerTreeTapRecipes = (event) => { - event.remove({ id: 'treetap:tap' }) + // Удаление всех рецептов мода + event.remove({ mod: 'treetap' }) // TreeTap - addAnvilRecipe(event, - 'tfg:recipes/treetap', - { tag: 'forge:ingots/copper' }, - { item: 'treetap:tap' }, - 1, - [ "draw_not_last", "hit_not_last", "shrink_last" ] - ) + event.recipes.tfc.anvil('treetap:tap', '#forge:ingots/copper', [ 'draw_not_last', 'hit_not_last', 'shrink_last' ]) + .id('tfg:anvil/treetap') + + // TreeTap Heating + event.recipes.tfc.heating('treetap:tap', 1080) + .resultFluid(Fluid.of('gtceu:copper', 144)) + .id('tfg:heating/treetap') // Latex event.custom({ type: "treetap:tap_extract", log: { - "item": "tfc:wood/log/kapok" + "item": "tfc:wood/log/kapok" }, processing_time: 9600, metal_result: { - item: "gtceu:latex_bucket" + item: "gtceu:latex_bucket" }, wooden_result: { - item: "tfc:wooden_bucket", - nbt: "{fluid: {FluidName: \"gtceu:latex\", Amount: 1000}}" + 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" - } + { + type: "forge:mod_loaded", + modid: "tfc" + } ] - }) + }).id('tfg:treetap/latex') } \ No newline at end of file diff --git a/mods/ExtendedCrafting-1.20.1-6.0.4.jar b/mods/ExtendedCrafting-1.20.1-6.0.4.jar deleted file mode 100644 index 4b964919c..000000000 Binary files a/mods/ExtendedCrafting-1.20.1-6.0.4.jar and /dev/null differ