From ec0e6656b400610c37f88fe19611652a019614f2 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 2 Jan 2026 13:22:30 +0000 Subject: [PATCH] cleanup greate a bit, remove gearbox extractor recipes --- kubejs/server_scripts/greate/recipes.js | 176 +++--------------- .../greate/recipes.recycling.js | 33 +--- .../server_scripts/greate/recipes.removes.js | 91 +++------ kubejs/startup_scripts/greate/constants.js | 22 +++ 4 files changed, 79 insertions(+), 243 deletions(-) diff --git a/kubejs/server_scripts/greate/recipes.js b/kubejs/server_scripts/greate/recipes.js index 7c6935782..2f48a8e4f 100644 --- a/kubejs/server_scripts/greate/recipes.js +++ b/kubejs/server_scripts/greate/recipes.js @@ -87,168 +87,52 @@ function registerGreateRecipes(event) { // #region Gearboxes - event.shaped('greate:andesite_alloy_gearbox', [ - ' A ', - 'ABA', - 'CA ' - ], { - A: 'greate:andesite_alloy_shaft', - B: 'create:andesite_casing', - C: '#forge:tools/wrenches' - }).id('tfg:shaped/andesite_alloy_gearbox') + global.AVAILABLE_GREATE_MATERIAL_TIERS.forEach(tier => { - event.shaped('greate:andesite_alloy_vertical_gearbox', [ - 'A A', - ' B ', - 'ACA' - ], { - A: 'greate:andesite_alloy_shaft', - B: 'create:andesite_casing', - C: '#forge:tools/wrenches' - }).id('tfg:shaped/andesite_alloy_vertical_gearbox') + event.shaped(`greate:${tier}_gearbox`, [ + ' A ', + 'ABA', + 'CA ' + ], { + A: `greate:${tier}_shaft`, + B: 'create:andesite_casing', + C: '#forge:tools/wrenches' + }).id(`tfg:shaped/${tier}_gearbox`) - event.shapeless('greate:andesite_alloy_gearbox', ['greate:andesite_alloy_vertical_gearbox']) - event.shapeless('greate:andesite_alloy_vertical_gearbox', ['greate:andesite_alloy_gearbox']) + event.shaped(`greate:${tier}_vertical_gearbox`, [ + 'A A', + ' B ', + 'ACA' + ], { + A: `greate:${tier}_shaft`, + B: 'create:andesite_casing', + C: '#forge:tools/wrenches' + }).id(`tfg:shaped/${tier}_vertical_gearbox`) + + event.shapeless(`greate:${tier}_gearbox`, [`greate:${tier}_vertical_gearbox`]) + event.shapeless(`greate:${tier}_vertical_gearbox`, [`greate:${tier}_gearbox`]) + + event.recipes.gtceu.assembler(`greate:${tier}_gearbox`) + .itemInputs('create:andesite_casing', `4x greate:${tier}_shaft`) + .itemOutputs(`greate:${tier}_gearbox`) + .circuit(5) + .duration(50) + .EUt(GTValues.VA[GTValues.ULV]) + }) - event.recipes.gtceu.assembler('greate:andesite_alloy_gearbox') - .itemInputs('create:andesite_casing', '4x greate:andesite_alloy_shaft') - .itemOutputs('greate:andesite_alloy_gearbox') - .circuit(5) - .duration(50) - .EUt(GTValues.VA[GTValues.ULV]) TFGHelpers.registerMaterialInfo('greate:andesite_alloy_gearbox', { 'wood': 1, 'wrought_iron': 1 }); TFGHelpers.registerMaterialInfo('greate:andesite_alloy_vertical_gearbox', { 'wood': 1, 'wrought_iron': 1 }); - event.shaped('greate:steel_gearbox', [ - ' A ', - 'ABA', - 'CA ' - ], { - A: 'greate:steel_shaft', - B: 'create:andesite_casing', - C: '#forge:tools/wrenches' - }).id('tfg:shaped/steel_gearbox') - - event.shaped('greate:steel_vertical_gearbox', [ - 'A A', - ' B ', - 'ACA' - ], { - A: 'greate:steel_shaft', - B: 'create:andesite_casing', - C: '#forge:tools/wrenches' - }).id('tfg:shaped/steel_vertical_gearbox') - - event.shapeless('greate:steel_gearbox', ['greate:steel_vertical_gearbox']) - event.shapeless('greate:steel_vertical_gearbox', ['greate:steel_gearbox']) - - event.recipes.gtceu.assembler('greate:steel_gearbox') - .itemInputs('create:andesite_casing', '4x greate:steel_shaft') - .itemOutputs('greate:steel_gearbox') - .circuit(5) - .duration(50) - .EUt(GTValues.VA[GTValues.ULV]) - TFGHelpers.registerMaterialInfo('greate:steel_gearbox', { 'wood': 1, 'wrought_iron': 1, 'steel': 4/9 }); TFGHelpers.registerMaterialInfo('greate:steel_vertical_gearbox', { 'wood': 1, 'wrought_iron': 1, 'steel': 4/9 }); - event.shaped('greate:aluminium_gearbox', [ - ' A ', - 'ABA', - 'CA ' - ], { - A: 'greate:aluminium_shaft', - B: 'create:andesite_casing', - C: '#forge:tools/wrenches' - }).id('tfg:shaped/aluminium_gearbox') - - event.shaped('greate:aluminium_vertical_gearbox', [ - 'A A', - ' B ', - 'ACA' - ], { - A: 'greate:aluminium_shaft', - B: 'create:andesite_casing', - C: '#forge:tools/wrenches' - }).id('tfg:shaped/aluminium_vertical_gearbox') - - event.shapeless('greate:aluminium_gearbox', ['greate:aluminium_vertical_gearbox']) - event.shapeless('greate:aluminium_vertical_gearbox', ['greate:aluminium_gearbox']) - - event.recipes.gtceu.assembler('greate:aluminium_gearbox') - .itemInputs('create:andesite_casing', '4x greate:aluminium_shaft') - .itemOutputs('greate:aluminium_gearbox') - .circuit(5) - .duration(50) - .EUt(GTValues.VA[GTValues.ULV]) - TFGHelpers.registerMaterialInfo('greate:aluminium_gearbox', { 'wood': 1, 'wrought_iron': 1, 'aluminium': 4/9 }); TFGHelpers.registerMaterialInfo('greate:aluminium_vertical_gearbox', { 'wood': 1, 'wrought_iron': 1, 'aluminium': 4/9 }); - event.shaped('greate:stainless_steel_gearbox', [ - ' A ', - 'ABA', - 'CA ' - ], { - A: 'greate:stainless_steel_shaft', - B: 'create:andesite_casing', - C: '#forge:tools/wrenches' - }).id('tfg:shaped/stainless_steel_gearbox') - - event.shaped('greate:stainless_steel_vertical_gearbox', [ - 'A A', - ' B ', - 'ACA' - ], { - A: 'greate:stainless_steel_shaft', - B: 'create:andesite_casing', - C: '#forge:tools/wrenches' - }).id('tfg:shaped/stainless_steel_vertical_gearbox') - - event.shapeless('greate:stainless_steel_gearbox', ['greate:stainless_steel_vertical_gearbox']) - event.shapeless('greate:stainless_steel_vertical_gearbox', ['greate:stainless_steel_gearbox']) - - event.recipes.gtceu.assembler('greate:stainless_steel_gearbox') - .itemInputs('create:andesite_casing', '4x greate:stainless_steel_shaft') - .itemOutputs('greate:stainless_steel_gearbox') - .circuit(5) - .duration(50) - .EUt(GTValues.VA[GTValues.ULV]) - TFGHelpers.registerMaterialInfo('greate:stainless_steel_gearbox', { 'wood': 1, 'wrought_iron': 1, 'stainless_steel': 4/9 }); TFGHelpers.registerMaterialInfo('greate:stainless_steel_vertical_gearbox', { 'wood': 1, 'wrought_iron': 1, 'stainless_steel': 4/9 }); - event.shaped('greate:titanium_gearbox', [ - ' A ', - 'ABA', - 'CA ' - ], { - A: 'greate:titanium_shaft', - B: 'create:andesite_casing', - C: '#forge:tools/wrenches' - }).id('tfg:shaped/titanium_gearbox') - - event.shaped('greate:titanium_vertical_gearbox', [ - 'A A', - ' B ', - 'ACA' - ], { - A: 'greate:titanium_shaft', - B: 'create:andesite_casing', - C: '#forge:tools/wrenches' - }).id('tfg:shaped/titanium_vertical_gearbox') - - event.shapeless('greate:titanium_gearbox', ['greate:titanium_vertical_gearbox']) - event.shapeless('greate:titanium_vertical_gearbox', ['greate:titanium_gearbox']) - - event.recipes.gtceu.assembler('greate:titanium_gearbox') - .itemInputs('create:andesite_casing', '4x greate:titanium_shaft') - .itemOutputs('greate:titanium_gearbox') - .circuit(5) - .duration(50) - .EUt(GTValues.VA[GTValues.ULV]) - TFGHelpers.registerMaterialInfo('greate:titanium_gearbox', { 'wood': 1, 'wrought_iron': 1, 'titanium': 4/9 }); TFGHelpers.registerMaterialInfo('greate:titanium_vertical_gearbox', { 'wood': 1, 'wrought_iron': 1, 'titanium': 4/9 }); diff --git a/kubejs/server_scripts/greate/recipes.recycling.js b/kubejs/server_scripts/greate/recipes.recycling.js index 517809086..aef21936b 100644 --- a/kubejs/server_scripts/greate/recipes.recycling.js +++ b/kubejs/server_scripts/greate/recipes.recycling.js @@ -42,35 +42,10 @@ function registerGreateRecyclingRecipes(event) { // #region Gearbox - event.recipes.tfc.extra_products_shapeless_crafting('4x greate:andesite_alloy_shaft', - event.shapeless('create:andesite_casing', ['greate:andesite_alloy_gearbox', '#forge:tools/hammers'])) - - event.recipes.tfc.extra_products_shapeless_crafting('4x greate:steel_shaft', - event.shapeless('create:andesite_casing', ['greate:steel_gearbox', '#forge:tools/hammers'])) - - event.recipes.tfc.extra_products_shapeless_crafting('4x greate:aluminium_shaft', - event.shapeless('create:andesite_casing', ['greate:aluminium_gearbox', '#forge:tools/hammers'])) - - event.recipes.tfc.extra_products_shapeless_crafting('4x greate:stainless_steel_shaft', - event.shapeless('create:andesite_casing', ['greate:stainless_steel_gearbox', '#forge:tools/hammers'])) - - event.recipes.tfc.extra_products_shapeless_crafting('4x greate:titanium_shaft', - event.shapeless('create:andesite_casing', ['greate:titanium_gearbox', '#forge:tools/hammers'])) - - event.recipes.tfc.extra_products_shapeless_crafting('4x greate:andesite_alloy_shaft', - event.shapeless('create:andesite_casing', ['greate:andesite_alloy_vertical_gearbox', '#forge:tools/hammers'])) - - event.recipes.tfc.extra_products_shapeless_crafting('4x greate:steel_shaft', - event.shapeless('create:andesite_casing', ['greate:steel_vertical_gearbox', '#forge:tools/hammers'])) - - event.recipes.tfc.extra_products_shapeless_crafting('4x greate:aluminium_shaft', - event.shapeless('create:andesite_casing', ['greate:aluminium_vertical_gearbox', '#forge:tools/hammers'])) - - event.recipes.tfc.extra_products_shapeless_crafting('4x greate:stainless_steel_shaft', - event.shapeless('create:andesite_casing', ['greate:stainless_steel_vertical_gearbox', '#forge:tools/hammers'])) - - event.recipes.tfc.extra_products_shapeless_crafting('4x greate:titanium_shaft', - event.shapeless('create:andesite_casing', ['greate:titanium_vertical_gearbox', '#forge:tools/hammers'])) + global.GREATE_MATERIAL_TIERS.forEach(tier => { + event.recipes.tfc.extra_products_shapeless_crafting(`4x greate:${tier}_shaft`, + event.shapeless('create:andesite_casing', [`greate:${tier}_gearbox`, '#forge:tools/hammers'])) + }) // #endregion } \ No newline at end of file diff --git a/kubejs/server_scripts/greate/recipes.removes.js b/kubejs/server_scripts/greate/recipes.removes.js index 1f49ddb72..0177031bf 100644 --- a/kubejs/server_scripts/greate/recipes.removes.js +++ b/kubejs/server_scripts/greate/recipes.removes.js @@ -23,82 +23,37 @@ function removeGreateRecipes(event) { event.remove({ mod: 'greate', input: 'create:andesite_alloy' }); event.remove({ mod: 'greate', output: 'minecraft:bamboo_pressure_plate'}) - - event.remove({ id: 'greate:shaped/andesite_alloy_shaft' }) - event.remove({ id: 'greate:shaped/andesite_alloy_cogwheel' }) - event.remove({ id: 'greate:shaped/andesite_alloy_large_cogwheel' }) - event.remove({ id: 'greate:shaped/andesite_alloy_large_cogwheel_from_little' }) - event.remove({ id: 'greate:shaped/steel_cogwheel' }) - event.remove({ id: 'greate:shaped/steel_large_cogwheel' }) - event.remove({ id: 'greate:shaped/steel_large_cogwheel_from_little' }) - event.remove({ id: 'greate:shaped/aluminium_cogwheel' }) - event.remove({ id: 'greate:shaped/aluminium_large_cogwheel' }) - event.remove({ id: 'greate:shaped/aluminium_large_cogwheel_from_little' }) - event.remove({ id: 'greate:shaped/stainless_steel_cogwheel' }) - event.remove({ id: 'greate:shaped/stainless_steel_large_cogwheel' }) - event.remove({ id: 'greate:shaped/stainless_steel_large_cogwheel_from_little' }) - event.remove({ id: 'greate:shaped/titanium_cogwheel' }) - event.remove({ id: 'greate:shaped/titanium_large_cogwheel' }) - event.remove({ id: 'greate:shaped/titanium_large_cogwheel_from_little' }) - removeCutterRecipe(event, "andesite_alloy_shaft") - removeCutterRecipe(event, "andesite_alloy_shaft_water") - removeCutterRecipe(event, "andesite_alloy_shaft_distilled_water") - removeCutterRecipe(event, "steel_shaft") - removeCutterRecipe(event, "steel_shaft_water") - removeCutterRecipe(event, "steel_shaft_distilled_water") - removeCutterRecipe(event, "aluminium_shaft") - removeCutterRecipe(event, "aluminium_shaft_water") - removeCutterRecipe(event, "aluminium_shaft_distilled_water") - removeCutterRecipe(event, "stainless_steel_shaft") - removeCutterRecipe(event, "stainless_steel_shaft_water") - removeCutterRecipe(event, "stainless_steel_shaft_distilled_water") - removeCutterRecipe(event, "titanium_shaft") - removeCutterRecipe(event, "titanium_shaft_water") - removeCutterRecipe(event, "titanium_shaft_distilled_water") + global.GREATE_MATERIAL_TIERS.forEach(tier => { + + event.remove({ id: `greate:shaped/${tier}_shaft` }) + event.remove({ id: `greate:shaped/${tier}_cogwheel` }) + event.remove({ id: `greate:shaped/${tier}_large_cogwheel` }) + event.remove({ id: `greate:shaped/${tier}_large_cogwheel_from_little` }) + + removeCutterRecipe(event, `${tier}_shaft`) + removeCutterRecipe(event, `${tier}_shaft_water`) + removeCutterRecipe(event, `${tier}_shaft_distilled_water`) + + event.remove({ id: `gtceu:smelting/smelt_dust_${tier}_to_ingot` }) + removeMaceratorRecipe(event, `macerate_${tier}`) + + event.remove({ id: `gtceu:extractor/extract_${tier}` }) + event.remove({ id: `gtceu:extractor/extract_${tier}_shaft` }) + event.remove({ id: `gtceu:extractor/extract_${tier}_cogwheel` }) + event.remove({ id: `gtceu:extractor/extract_${tier}_alloy` }) + event.remove({ id: `gtceu:extractor/extract_${tier}_gearbox` }) + event.remove({ id: `gtceu:extractor/extract_${tier}_vertical_gearbox` }) + }) event.remove({ id: 'greate:milling/integration/gtceu/macerator/macerate_marble'}) event.remove({ id: 'gtceu:electrolyzer/decomposition_electrolyzing_andesite_alloy' }) event.remove({ id: 'gtceu:electrolyzer/decomposition_electrolyzing_chromatic_compound' }) - - event.remove({ id: 'gtceu:smelting/smelt_dust_andesite_alloy_to_ingot' }) - event.remove({ id: 'gtceu:extractor/extract_andesite_alloy_shaft' }) - - event.remove({ id: 'gtceu:extractor/extract_andesite_alloy_cogwheel' }) - event.remove({ id: 'gtceu:extractor/extract_steel_cogwheel' }) - event.remove({ id: 'gtceu:extractor/extract_aluminium_cogwheel' }) - event.remove({ id: 'gtceu:extractor/extract_stainless_steel_cogwheel' }) - event.remove({ id: 'gtceu:extractor/extract_titanium_cogwheel' }) - event.remove({ id: 'gtceu:extractor/extract_large_andesite_alloy_cogwheel' }) - event.remove({ id: 'gtceu:extractor/extract_large_steel_cogwheel' }) - event.remove({ id: 'gtceu:extractor/extract_large_aluminium_cogwheel' }) - event.remove({ id: 'gtceu:extractor/extract_large_stainless_steel_cogwheel' }) - event.remove({ id: 'gtceu:extractor/extract_large_titanium_cogwheel' }) - + event.remove({ id: 'gtceu:shaped/andesite_alloy_shaft' }) event.remove({ id: 'gtceu:extractor/extract_andesite_alloy' }) - event.remove({ id: 'gtceu:extractor/extract_steel_alloy'}) - event.remove({ id: 'gtceu:extractor/extract_aluminium_alloy' }) - event.remove({ id: 'gtceu:extractor/extract_stainless_steel_alloy' }) - event.remove({ id: 'gtceu:extractor/extract_titanium_alloy' }) - event.remove({ id: 'gtceu:extractor/extract_tungsten_steel_alloy' }) - event.remove({ id: 'gtceu:extractor/extract_rhodium_plated_palladium_alloy' }) - event.remove({ id: 'gtceu:extractor/extract_naquadah_alloy_alloy' }) - event.remove({ id: 'gtceu:extractor/extract_darmstadtium_alloy' }) - event.remove({ id: 'gtceu:extractor/extract_neutronium_alloy' }) - - removeMaceratorRecipe(event, 'macerate_andesite_alloy') - removeMaceratorRecipe(event, 'macerate_steel_alloy') - removeMaceratorRecipe(event, 'macerate_aluminium_alloy') - removeMaceratorRecipe(event, 'macerate_stainless_steel_alloy') - removeMaceratorRecipe(event, 'macerate_titanium_alloy') - removeMaceratorRecipe(event, 'macerate_tungsten_steel_alloy') - removeMaceratorRecipe(event, 'macerate_rhodium_plated_palladium_alloy') - removeMaceratorRecipe(event, 'macerate_naquadah_alloy_alloy') - removeMaceratorRecipe(event, 'macerate_darmstadtium_alloy') - removeMaceratorRecipe(event, 'macerate_neutronium_alloy') - + event.remove({ id: /^greate:mixing\/integration\/create\/.*/ }) event.remove({ id: /^greate:sawing\/integration\/create\/.*/ }) event.remove({ id: /^greate:splashing\/integration\/create\/.*/ }) diff --git a/kubejs/startup_scripts/greate/constants.js b/kubejs/startup_scripts/greate/constants.js index 25070f941..7259a3d08 100644 --- a/kubejs/startup_scripts/greate/constants.js +++ b/kubejs/startup_scripts/greate/constants.js @@ -1,7 +1,29 @@ // priority: -100 "use strict"; +global.GREATE_MATERIAL_TIERS = [ + 'andesite_alloy', + 'steel', + 'aluminium', + 'stainless_steel', + 'titanium', + 'tungsten_steel', + 'rhodium_plated_palladium', + 'naquadah_alloy', + 'darmstadtium', + 'neutronium' +]; + +global.AVAILABLE_GREATE_MATERIAL_TIERS = [ + 'andesite_alloy', + 'steel', + 'aluminium', + 'stainless_steel', + 'titanium' +]; + global.GREATE_DISABLED_ITEMS = /** @type {const} */ ([ + "greate:andesite_alloy_alloy", "gtceu:steel_alloy", "gtceu:aluminium_alloy", "gtceu:stainless_steel_alloy",