From 2feb2f9540f52b7c15a2051aeb8befca1d3f9901 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 1 May 2025 23:37:32 +0100 Subject: [PATCH] remove brick duping --- kubejs/server_scripts/gregtech/recipes.js | 107 +++++++++--------- .../gregtech/recipes.recycling.js | 20 ++-- .../gregtech/recipes.removes.js | 26 ++++- kubejs/server_scripts/tfc/recipes.machines.js | 7 +- 4 files changed, 94 insertions(+), 66 deletions(-) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 0eb8fa5b3..efe3e0a59 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -7,7 +7,7 @@ const registerGTCEURecipes = (event) => { registerGTCEUMetalRecipes(event) - registerGTCEURecyclingRecipes(event) + registerGTCEURecyclingRecipes(event) registerGTCEuTFCMetalsRecipes(event) registerGTCEuMachineRecipes(event) @@ -69,15 +69,15 @@ const registerGTCEURecipes = (event) => { //#endregion - event.recipes.gtceu.centrifuge('tfg:beets_to_sugar') - .itemInputs('5x tfc:food/beet') - .inputFluids(Fluid.of('tfc:salt_water', 1000)) - .itemOutputs('3x minecraft:sugar', '3x gtceu:plant_ball', '1x #forge:dusts/salt') - .outputFluids(Fluid.of('minecraft:water', 1000)) - .duration(800) - .EUt(7) - .circuit(3) - + event.recipes.gtceu.centrifuge('tfg:beets_to_sugar') + .itemInputs('5x tfc:food/beet') + .inputFluids(Fluid.of('tfc:salt_water', 1000)) + .itemOutputs('3x minecraft:sugar', '3x gtceu:plant_ball', '1x #forge:dusts/salt') + .outputFluids(Fluid.of('minecraft:water', 1000)) + .duration(800) + .EUt(7) + .circuit(3) + event.smelting('4x tfc:powder/wood_ash', '1x #minecraft:logs_that_burn').id('tfg:wood_ash') //#region Выход: Соленая пыль + Вода @@ -143,7 +143,7 @@ const registerGTCEURecipes = (event) => { .id('tfg:pot/sticky_resin_from_conifer_pitch') event.recipes.gtceu.fluid_solidifier('tfg:fluid_solidifier/latex_heating') - .duration(24*20) + .duration(24 * 20) .EUt(30) .itemInputs('tfc:powder/sulfur') .itemOutputs('gtceu:sticky_resin') @@ -348,7 +348,7 @@ const registerGTCEURecipes = (event) => { //#endregion //#region GT marble - + event.stonecutting('gtceu:polished_marble', 'tfc:rock/bricks/marble').id('tfg:stonecutting/gt_polished_marble') event.stonecutting('gtceu:chiseled_marble', 'tfc:rock/bricks/marble').id('tfg:stonecutting/gt_chiseled_marble') event.stonecutting('gtceu:marble_tile', 'tfc:rock/bricks/marble').id('tfg:stonecutting/gt_marble_tile') @@ -462,17 +462,16 @@ const registerGTCEURecipes = (event) => { C: 'gtceu:brick_wooden_form' }).replaceIngredient('gtceu:brick_wooden_form', 'gtceu:brick_wooden_form').id('gtceu:shaped/compressed_coke_clay') - // Compressed Coke Clay -> Coke Oven Brick + // Coke Oven Brick event.recipes.tfc.heating('gtceu:compressed_coke_clay', 1399) .resultItem('gtceu:coke_oven_brick') .id('tfg:heating/coke_oven_bricks') - // TFC FireBrick -> FireBrick dust - event.recipes.gtceu.macerator('macerate_firebrick') - .itemInputs('tfc:ceramic/fire_brick') - .itemOutputs('gtceu:fireclay_dust') - .duration(15) - .EUt(2) + event.recipes.gtceu.alloy_smelter('gtceu:coke_oven_brick') + .itemInputs('#minecraft:sand', 'minecraft:clay_ball') + .itemOutputs('gtceu:coke_oven_brick') + .duration(7.5 * 20) + .EUt(GTValues.VA[GTValues.ULV]) // Multi-Smelter event.shaped('gtceu:multi_smelter', [ @@ -724,44 +723,44 @@ const registerGTCEURecipes = (event) => { .circuit(2) event.recipes.gtceu.coke_oven("tfg:raw_coal_to_coke") - .itemInputs('gtceu:raw_coal') - .itemOutputs('2x gtceu:coke_gem') - .outputFluids(Fluid.of('gtceu:creosote', 2000)) - .duration(1710) + .itemInputs('gtceu:raw_coal') + .itemOutputs('2x gtceu:coke_gem') + .outputFluids(Fluid.of('gtceu:creosote', 2000)) + .duration(1710) - event.recipes.gtceu.pyrolyse_oven("tfg:raw_coal_to_tar") - .itemInputs('6x gtceu:raw_coal') - .chancedOutput('gtceu:dark_ash_dust', 5000, 0) - .outputFluids(Fluid.of('gtceu:coal_tar', 3000)) - .duration(288) - .EUt(96) - .circuit(8) + event.recipes.gtceu.pyrolyse_oven("tfg:raw_coal_to_tar") + .itemInputs('6x gtceu:raw_coal') + .chancedOutput('gtceu:dark_ash_dust', 5000, 0) + .outputFluids(Fluid.of('gtceu:coal_tar', 3000)) + .duration(288) + .EUt(96) + .circuit(8) - event.recipes.gtceu.pyrolyse_oven("tfg:raw_coal_to_coke_creosote") - .itemInputs('8x gtceu:raw_coal') - .itemOutputs('16x gtceu:coke_gem') - .outputFluids(Fluid.of('gtceu:creosote', 8000)) - .duration(576) - .EUt(64) - .circuit(1) + event.recipes.gtceu.pyrolyse_oven("tfg:raw_coal_to_coke_creosote") + .itemInputs('8x gtceu:raw_coal') + .itemOutputs('16x gtceu:coke_gem') + .outputFluids(Fluid.of('gtceu:creosote', 8000)) + .duration(576) + .EUt(64) + .circuit(1) - event.recipes.gtceu.pyrolyse_oven("tfg:raw_coal_to_coal_gas") - .itemInputs('8x gtceu:raw_coal') - .itemOutputs('16x gtceu:coke_gem') - .inputFluids(Fluid.of('gtceu:steam')) - .outputFluids(Fluid.of('gtceu:coal_gas', 4000)) - .duration(288) - .EUt(96) - .circuit(22) + event.recipes.gtceu.pyrolyse_oven("tfg:raw_coal_to_coal_gas") + .itemInputs('8x gtceu:raw_coal') + .itemOutputs('16x gtceu:coke_gem') + .inputFluids(Fluid.of('gtceu:steam')) + .outputFluids(Fluid.of('gtceu:coal_gas', 4000)) + .duration(288) + .EUt(96) + .circuit(22) - event.recipes.gtceu.pyrolyse_oven("tfg:raw_coal_to_coke_creosote_nitrogen") - .itemInputs('8x gtceu:raw_coal') - .itemOutputs('16x gtceu:coke_gem') - .inputFluids(Fluid.of('gtceu:nitrogen')) - .outputFluids(Fluid.of('gtceu:creosote', 8000)) - .duration(288) - .EUt(96) - .circuit(2) + event.recipes.gtceu.pyrolyse_oven("tfg:raw_coal_to_coke_creosote_nitrogen") + .itemInputs('8x gtceu:raw_coal') + .itemOutputs('16x gtceu:coke_gem') + .inputFluids(Fluid.of('gtceu:nitrogen')) + .outputFluids(Fluid.of('gtceu:creosote', 8000)) + .duration(288) + .EUt(96) + .circuit(2) // #endregion @@ -1014,7 +1013,7 @@ const registerGTCEURecipes = (event) => { }) //#endregion - + // TODO: Greate again... event.shapeless('gtceu:programmed_circuit', ['minecraft:stick', '#forge:tools/wrenches']) .id('tfg:shapeless/programmed_circuit_from_stick') diff --git a/kubejs/server_scripts/gregtech/recipes.recycling.js b/kubejs/server_scripts/gregtech/recipes.recycling.js index bb34d453d..9b9202815 100644 --- a/kubejs/server_scripts/gregtech/recipes.recycling.js +++ b/kubejs/server_scripts/gregtech/recipes.recycling.js @@ -8,7 +8,7 @@ function registerGTCEURecyclingRecipes(event) { .itemOutputs( ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Tantalum, 1), ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Polyethylene, 1) - ) + ) .duration(GTMaterials.Tantalum.getMass() * 1) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) @@ -18,7 +18,7 @@ function registerGTCEURecyclingRecipes(event) { .itemOutputs( ChemicalHelper.get(TagPrefix.nugget, GTMaterials.Tantalum, 1), ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Ash, 1) - ) + ) .duration(GTMaterials.Tantalum.getMass() * 1) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) @@ -28,7 +28,7 @@ function registerGTCEURecyclingRecipes(event) { .itemInputs('gtceu:capacitor') .itemOutputs( ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Polyethylene, 1) - ) + ) .duration(GTMaterials.Polyethylene.getMass() * 1) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) @@ -37,7 +37,7 @@ function registerGTCEURecyclingRecipes(event) { .itemInputs('gtceu:capacitor') .itemOutputs( ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Ash, 1) - ) + ) .duration(GTMaterials.Ash.getMass() * 1) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) @@ -47,7 +47,7 @@ function registerGTCEURecyclingRecipes(event) { .itemInputs('gtceu:empty_tier_i_battery') .itemOutputs( ChemicalHelper.get(TagPrefix.dust, GTMaterials.Ultimet, 6) - ) + ) .duration(GTMaterials.Ultimet.getMass() * 6) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) @@ -56,7 +56,7 @@ function registerGTCEURecyclingRecipes(event) { .itemInputs('gtceu:empty_tier_i_battery') .itemOutputs( ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Ultimet, 6) - ) + ) .duration(GTMaterials.Ultimet.getMass() * 6) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) @@ -73,7 +73,7 @@ function registerGTCEURecyclingRecipes(event) { .itemInputs('gtceu:empty_tier_ii_battery') .itemOutputs( ChemicalHelper.get(TagPrefix.dust, GTMaterials.Ruridit, 6) - ) + ) .duration(GTMaterials.Ruridit.getMass() * 6) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) @@ -82,7 +82,7 @@ function registerGTCEURecyclingRecipes(event) { .itemInputs('gtceu:empty_tier_ii_battery') .itemOutputs( ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Ruridit, 6) - ) + ) .duration(GTMaterials.Ruridit.getMass() * 6) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) @@ -99,7 +99,7 @@ function registerGTCEURecyclingRecipes(event) { .itemInputs('gtceu:empty_tier_iii_battery') .itemOutputs( ChemicalHelper.get(TagPrefix.dust, GTMaterials.Neutronium, 6) - ) + ) .duration(GTMaterials.Neutronium.getMass() * 6) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) @@ -108,7 +108,7 @@ function registerGTCEURecyclingRecipes(event) { .itemInputs('gtceu:empty_tier_iii_battery') .itemOutputs( ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Neutronium, 6) - ) + ) .duration(GTMaterials.Neutronium.getMass() * 6) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index 87bbfe62a..3d5fefae8 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -158,6 +158,19 @@ function removeGTCEURecipes(event) { // #endregion + // #region Nether Quartz + + event.remove({ id: 'gtceu:shaped/quartz_stair_saw' }) + event.remove({ id: 'gtceu:assembler/assemble_quartz_into_stair' }) + event.remove({ id: 'gtceu:shaped/quartz_polish_hammer' }) + event.remove({ id: 'gtceu:assembler/assemble_quartz_into_polished' }) + event.remove({ id: 'gtceu:assembler/assemble_block_of_quartz_into_quartz_pillar' }) + event.remove({ id: 'gtceu:shaped/smooth_quartz_stair_saw' }) + event.remove({ id: 'gtceu:assembler/assemble_smooth_quartz_into_stair' }) + event.remove({ id: 'gtceu:shaped/smooth_quartz_slab_saw' }) + + // #endregion + // #region Plant Ball event.remove({ id: 'gtceu:compressor/plant_ball_from_wheat' }) @@ -589,6 +602,7 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:shaped/activator_rail' }) event.remove({ id: 'gtceu:shaped/shield' }) event.remove({ id: 'gtceu:shaped/pickaxe_iron' }) + event.remove({ id: 'gtceu:shapeless/glass_full_dust_flint' }) event.remove({ id: 'gtceu:shaped_fluid_container/treated_wood_planks' }) @@ -612,8 +626,18 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:assembler/spyglass' }) event.remove({ id: 'gtceu:chemical_reactor/ghast_tear_separation' }) - + + event.remove({ id: 'gtceu:assembler/assemble_brick_into_stair' }) + event.remove({ id: 'gtceu:assembler/assemble_brick_into_wall' }) event.remove({ id: 'gtceu:compressor/bricks' }) + event.remove({ id: 'gtceu:extractor/bricks_extraction' }) + event.remove({ id: 'gtceu:macerator/macerate_bricks' }) + event.remove({ id: 'gtceu:macerator/macerate_brick_stairs' }) + event.remove({ id: 'gtceu:macerator/macerate_brick_slab' }) + event.remove({ id: 'gtceu:macerator/macerate_brick_wall' }) + event.remove({ id: 'gtceu:macerator/macerate_flower_pot' }) + + event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__fireclay' }) event.remove({ id: 'gtceu:smelting/sticky_resin_from_slime' }) } diff --git a/kubejs/server_scripts/tfc/recipes.machines.js b/kubejs/server_scripts/tfc/recipes.machines.js index 2f2c32a88..e1a66046e 100644 --- a/kubejs/server_scripts/tfc/recipes.machines.js +++ b/kubejs/server_scripts/tfc/recipes.machines.js @@ -473,31 +473,36 @@ function registerTFCMachineRecipes(event) { // Ceramic Recycling event.recipes.gtceu.macerator('tfg:sherd_to_brick_dust') .itemInputs('firmalife:pottery_sherd') - .itemOutputs('5x #forge:dusts/brick') + .itemOutputs('#forge:dusts/brick') + .category(GTRecipeCategories.MACERATOR_RECYCLING) .duration(20) .EUt(2) event.recipes.gtceu.macerator('tfg:ceramic_molds') .itemInputs('#tfc:fired_molds') .itemOutputs('2x #forge:dusts/brick') + .category(GTRecipeCategories.MACERATOR_RECYCLING) .duration(20) .EUt(2) event.recipes.gtceu.macerator('tfg:large_vessels') .itemInputs('#tfc:fired_large_vessels') .itemOutputs('5x #forge:dusts/brick') + .category(GTRecipeCategories.MACERATOR_RECYCLING) .duration(20) .EUt(2) event.recipes.gtceu.macerator('tfg:casting_channel') .itemInputs('tfcchannelcasting:channel') .itemOutputs('1x #forge:dusts/brick') + .category(GTRecipeCategories.MACERATOR_RECYCLING) .duration(20) .EUt(2) event.recipes.gtceu.macerator('tfg:mold_table') .itemInputs('tfcchannelcasting:mold_table') .itemOutputs('5x #forge:dusts/brick') + .category(GTRecipeCategories.MACERATOR_RECYCLING) .duration(20) .EUt(2) }