From a2d1a9bff2d1fc0cdc3ced54a732ca8cfac2931f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 21 Apr 2025 15:27:38 +0100 Subject: [PATCH] cleaned up more duplicate tfc/gt recipes --- kubejs/server_scripts/beneath/recipes.js | 1 + kubejs/server_scripts/gregtech/recipes.js | 7 +++++ .../gregtech/recipes.removes.js | 20 ++++++++++++ kubejs/server_scripts/minecraft/recipes.js | 31 ++++++++++--------- .../minecraft/recipes.removes.js | 1 + kubejs/server_scripts/tfc/recipes.removes.js | 6 ++-- .../server_scripts/tfg/recipes.terrariums.js | 9 ------ kubejs/startup_scripts/minecraft/constants.js | 3 ++ 8 files changed, 53 insertions(+), 25 deletions(-) diff --git a/kubejs/server_scripts/beneath/recipes.js b/kubejs/server_scripts/beneath/recipes.js index 3232efb8f..48f4c6cd7 100644 --- a/kubejs/server_scripts/beneath/recipes.js +++ b/kubejs/server_scripts/beneath/recipes.js @@ -17,6 +17,7 @@ const registerBeneathRecipes = (event) => { event.remove({ id: 'beneath:crafting/blackstone_plate' }) event.remove({ id: 'beneath:crafting/blackstone_button' }) event.remove({ id: 'beneath:crafting/hellbricks' }) + event.remove({ id: 'beneath:crafting/nether_brick' }) event.remove({ id: 'beneath:quern/slime' }) event.shaped('beneath:unposter', [ diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 4e83ca7af..56395b420 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -232,6 +232,13 @@ const registerGTCEURecipes = (event) => { .duration(128) .EUt(3) + event.recipes.gtceu.brewery('biomass_from_minecraft_plants') + .itemInputs('#createaddition:plants') + .inputFluids(Fluid.of('minecraft:water', 20)) + .outputFluids(Fluid.of('gtceu:biomass', 20)) + .duration(128) + .EUt(3) + //#endregion //#region Выход: Рыбье масло diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index efeca1f05..2a785a1e4 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -574,6 +574,18 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:shaped/barrel' }) event.remove({ id: 'gtceu:shaped/book' }) event.remove({ id: 'gtceu:shaped/bucket_of_concrete' }) + event.remove({ id: 'gtceu:shaped/smithing_table' }) + event.remove({ id: 'gtceu:shaped/brick_slab_saw' }) + event.remove({ id: 'gtceu:shaped/brick_stair_saw' }) + event.remove({ id: 'gtceu:shaped/brick_wall_saw' }) + event.remove({ id: 'gtceu:shaped/lightning_rod' }) + event.remove({ id: 'gtceu:shaped/painting' }) + event.remove({ id: 'gtceu:shaped/rail' }) + event.remove({ id: 'gtceu:shaped/powered_rail' }) + event.remove({ id: 'gtceu:shaped/detector_rail' }) + event.remove({ id: 'gtceu:shaped/activator_rail' }) + event.remove({ id: 'gtceu:shaped/shield' }) + event.remove({ id: 'gtceu:shaped_fluid_container/treated_wood_planks' }) event.remove({ id: 'gtceu:assembler/bell' }) @@ -585,6 +597,14 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:assembler/barrel' }) event.remove({ id: 'gtceu:assembler/book_from_leather' }) event.remove({ id: 'gtceu:assembler/name_tag' }) + event.remove({ id: 'gtceu:assembler/smithing_table' }) + event.remove({ id: 'gtceu:assembler/loom' }) + event.remove({ id: 'gtceu:assembler/flower_pot' }) + event.remove({ id: 'gtceu:assembler/piston' }) + event.remove({ id: 'gtceu:assembler/clock' }) + event.remove({ id: 'gtceu:assembler/spyglass' }) + event.remove({ id: 'gtceu:assembler/map' }) + event.remove({ id: 'gtceu:assembler/spyglass' }) event.remove({ id: 'gtceu:chemical_reactor/ghast_tear_separation' }) } diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 359710340..010ebf123 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -274,6 +274,8 @@ const registerMinecraftRecipes = (event) => { .inputFluids(Fluid.of('gtceu:glue', 50)) .EUt(7).duration(30) + event.replaceInput({ id: 'minecraft:writable_book' }, 'minecraft:inc_sac', '#forge:dyes/black') + //#endregion //#region @@ -777,6 +779,21 @@ const registerMinecraftRecipes = (event) => { //#region Выход: Элитра // Ну и херь я придумал + + event.recipes.gtceu.arc_furnace('tfg:minecraft/arc_furnace/recycling/elytra') + .itemInputs(Item.of('minecraft:elytra', '{Damage:0}').strongNBT()) + .itemOutputs('4x gtceu:aluminium_ingot', '2x gtceu:polycaprolactam_ingot') + .duration(224) + .EUt(GTValues.VA[GTValues.LV]) + .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) + + event.recipes.gtceu.macerator('tfg:minecraft/macerator/recycling/elytra') + .itemInputs(Item.of('minecraft:elytra', '{Damage:0}').strongNBT()) + .itemOutputs('4x gtceu:aluminium_dust', '2x gtceu:polycaprolactam_dust') + .duration(224) + .EUt(GTValues.VA[GTValues.ULV]) + .category(GTRecipeCategories.MACERATOR_RECYCLING) + event.recipes.gtceu.assembler('tfg:minecraft/elytra') .itemInputs('16x #forge:foils/polycaprolactam', '16x #forge:foils/aluminium', '8x minecraft:phantom_membrane', '4x #forge:rings/aluminium', '2x #forge:rods/long/vanadium_steel', '2x #forge:small_springs/aluminium', '1x #forge:small_gears/aluminium') .circuit(4) @@ -798,20 +815,6 @@ const registerMinecraftRecipes = (event) => { .duration(1600) .EUt(120) - event.recipes.gtceu.arc_furnace('tfg:minecraft/arc_furnace/recycling/elytra') - .itemInputs(Item.of('minecraft:elytra', '{Damage:0}').strongNBT()) - .itemOutputs('4x gtceu:aluminium_ingot', '2x gtceu:polycaprolactam_ingot') - .duration(224) - .EUt(GTValues.VA[GTValues.LV]) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - - event.recipes.gtceu.macerator('tfg:minecraft/macerator/recycling/elytra') - .itemInputs(Item.of('minecraft:elytra', '{Damage:0}').strongNBT()) - .itemOutputs('4x gtceu:aluminium_dust', '2x gtceu:polycaprolactam_dust') - .duration(224) - .EUt(GTValues.VA[GTValues.ULV]) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - //#endregion //#region Glowstone diff --git a/kubejs/server_scripts/minecraft/recipes.removes.js b/kubejs/server_scripts/minecraft/recipes.removes.js index 6f4752edc..218d999b5 100644 --- a/kubejs/server_scripts/minecraft/recipes.removes.js +++ b/kubejs/server_scripts/minecraft/recipes.removes.js @@ -2074,4 +2074,5 @@ function removeMinecraftRecipes(event) { event.remove({ id: 'gtceu:assembler/end_crystal' }) //#endregion + event.remove({ id: 'minecraft:flower_banner_pattern' }) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/recipes.removes.js b/kubejs/server_scripts/tfc/recipes.removes.js index 213f2b033..582bcaf8c 100644 --- a/kubejs/server_scripts/tfc/recipes.removes.js +++ b/kubejs/server_scripts/tfc/recipes.removes.js @@ -141,7 +141,9 @@ function removeTFCRecipes(event) { event.remove({ id: `tfc:anvil/brass_mechanisms` }) event.remove({ id: `tfc:crafting/steel_pump` }) event.remove({ id: `tfc:crafting/crankshaft` }) - - event.remove({ id: 'tfc:crafting/sandpaper' }) + + event.remove({ id: 'tfc:crafting/vanilla/redstone/steel_minecart' }) + event.remove({ id: 'tfc:crafting/vanilla/redstone/minecart' }) + } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.terrariums.js b/kubejs/server_scripts/tfg/recipes.terrariums.js index a6f59272e..9e63e1565 100644 --- a/kubejs/server_scripts/tfg/recipes.terrariums.js +++ b/kubejs/server_scripts/tfg/recipes.terrariums.js @@ -76,15 +76,6 @@ function registerTFGTerrariumRecipes(event) { .EUt(512) // nether bricks - - event.shaped('4x minecraft:nether_bricks', [ - 'ABA', - 'BAB', - 'ABA' - ], { - A: 'minecraft:nether_brick', - B: 'tfc:mortar' - }).id('tfg:shaped/nether_bricks') event.recipes.gtceu.assembler('tfg:nether_bricks') .itemInputs('5x minecraft:nether_brick') diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index 958a8b15e..2833fb522 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -739,6 +739,7 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:nether_sprouts', 'minecraft:warped_roots', 'minecraft:dragon_head', + 'minecraft:dragon_breath', 'minecraft:creeper_head', 'minecraft:wither_skeleton_skull', 'minecraft:weeping_vines', @@ -748,6 +749,8 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:twisting_vines', 'minecraft:warped_fungus', 'minecraft:respawn_anchor', + 'minecraft:ghast_tear', + 'minecraft:nautilus_shell' ]; global.MINECRAFT_HIDED_ITEMS = [