diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 9285013c1..3f740e49a 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -844,54 +844,6 @@ const registerGTCEURecipes = (event) => { //#endregion - //#region Primitive Pump - - // Pump Deck - event.shaped('gtceu:pump_deck', [ - 'ABA', - 'CDE' - ], { - A: '#forge:screws/wrought_iron', - B: 'gtceu:treated_wood_planks', - C: '#forge:tools/hammers', - D: '#tfg:rock_slabs', - E: '#forge:tools/screwdrivers' - }).id('gtceu:shaped/pump_deck') - - // Pump Hatch - event.shaped('gtceu:pump_hatch', [ - 'ABC', - 'DED', - 'FBF' - ], { - A: '#forge:screws/wrought_iron', - B: '#forge:rings/wrought_iron', - C: '#forge:tools/screwdrivers', - D: 'gtceu:treated_wood_planks', - E: 'gtceu:wood_large_fluid_pipe', - F: '#tfg:rock_slabs' - - }).id('gtceu:shaped/pump_hatch') - - // Primitive Pump - event.shaped('gtceu:primitive_pump', [ - 'ABC', - 'DEF', - 'GHG' - ], { - A: '#forge:rings/wrought_iron', - B: 'gtceu:wood_normal_fluid_pipe', - C: '#forge:screws/wrought_iron', - D: '#forge:rotors/wrought_iron', - E: 'gtceu:treated_wood_planks', - F: '#forge:tools/screwdrivers', - G: '#tfg:rock_slabs', - H: 'gtceu:wood_large_fluid_pipe' - - }).id('gtceu:shaped/primitive_pump') - - //#endregion - //#region CokeOven // Coke Oven @@ -1090,6 +1042,14 @@ const registerGTCEURecipes = (event) => { event.remove({ id: 'gtceu:arc_furnace/arc_primitive_blast_furnace' }) event.remove({ id: 'gtceu:macerator/macerate_primitive_blast_furnace' }) + // Удаление рецепта беск. воды кавера + event.remove('gtceu:assembler/cover_infinite_water') + + // Удаление рецептов помпы + event.remove('gtceu:shaped/pump_deck') + event.remove('gtceu:shaped/pump_hatch') + event.remove('gtceu:shaped/primitive_pump') + // Удаление рецептов связанных с Barrel event.remove({ id: 'gtceu:shaped/wooden_barrel' }) event.remove({ id: 'gtceu:assembler/wood_barrel' }) @@ -1234,39 +1194,6 @@ const registerGTCEURecipes = (event) => { // Исправление рецепта пыли розовой бронзы generateMixerRecipe(event, ['#forge:dusts/copper', '4x #forge:dusts/gold'], [], '5x gtceu:rose_gold_dust', 3, [], 500, 24, 64, 'rose_gold') - //#region LV Casing - - event.shaped('gtceu:lv_machine_casing', [ - 'ABA', - 'BCB', - 'ABA' - ], { - A: '#forge:plates/red_steel', - B: '#forge:plates/blue_steel', - C: '#forge:tools/wrenches' - }).id('gtceu:shaped/casing_lv') - - event.recipes.gtceu.assembler('casing_lv') - .itemInputs('4x #forge:plates/red_steel', '4x #forge:plates/blue_steel') - .circuit(8) - .itemOutputs('gtceu:lv_machine_casing') - .duration(50) - .EUt(16) - - event.recipes.gtceu.macerator('macerate_lv_machine_casing') - .itemInputs('gtceu:lv_machine_casing') - .itemOutputs('4x gtceu:red_steel_dust', '4x gtceu:blue_steel_dust') - .duration(448) - .EUt(8) - - event.recipes.gtceu.arc_furnace('arc_lv_machine_casing') - .itemInputs('gtceu:lv_machine_casing') - .itemOutputs('4x gtceu:red_steel_ingot', '4x gtceu:blue_steel_ingot') - .duration(448) - .EUt(8) - - //#endregion - //#region Рецепт ULV микросхемы event.remove({ id: 'gtceu:shaped/vacuum_tube' }) diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index 2f3423165..95da95dae 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -17,6 +17,12 @@ global.GTCEU_DISABLED_ITEMS = [ 'gtceu:lp_steam_alloy_smelter', 'gtceu:lp_steam_rock_crusher', + // Примитивная помпа + 'gtceu:infinite_water_cover', + 'gtceu:pump_deck', + 'gtceu:pump_hatch', + 'gtceu:primitive_pump', + // Другое 'gtceu:flint_mortar', 'gtceu:flint_knife', @@ -39,6 +45,7 @@ global.GTCEU_DISABLED_ITEMS = [ 'gtceu:rubber_log', 'gtceu:rubber_leaves', 'gtceu:rubber_planks', + ]; global.GTCEU_HIDED_ITEMS = [