From 1174669b3e52853c4a4e666c08bb4a705f3f0327 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 30 Dec 2025 23:35:35 +0000 Subject: [PATCH] sorted out a new greate version --- config/greate-recipes.yaml | 4 ++ kubejs/server_scripts/greate/recipes.js | 70 +++++++++---------- .../server_scripts/greate/recipes.removes.js | 43 +++++++----- kubejs/startup_scripts/greate/constants.js | 2 +- 4 files changed, 67 insertions(+), 52 deletions(-) diff --git a/config/greate-recipes.yaml b/config/greate-recipes.yaml index 26c8e0850..352b7b5fd 100644 --- a/config/greate-recipes.yaml +++ b/config/greate-recipes.yaml @@ -5,6 +5,10 @@ enableGTWireCoatingRecipes: true # Enable/Disable harder recipes for various Create blocks & items. enableHardCreateRecipes: false +# Should certain Create items that have a GTCEu counterpart be used in recipes? +# If false, GTCEu items will be used instead. +useCreateItemsInRecipes: false + # Recipe types that should not be copied to Greate machines. Ex. 'gtceu:macerator' for macerator recipes ignoredRecipeTypes: - gtceu:ore_washer diff --git a/kubejs/server_scripts/greate/recipes.js b/kubejs/server_scripts/greate/recipes.js index b7117ab1f..6298b3e77 100644 --- a/kubejs/server_scripts/greate/recipes.js +++ b/kubejs/server_scripts/greate/recipes.js @@ -16,67 +16,67 @@ function registerGreateRecipes(event) { // #region Shafts event.shapeless('9x greate:andesite_alloy_shaft', ['#forge:plates/black_bronze', '#forge:tools/saws']) - .id('gtceu:shaped/andesite_alloy_shaft_black_bronze') + .id('greate:shaped/andesite_alloy_shaft_black_bronze') event.shapeless('9x greate:andesite_alloy_shaft', ['#forge:plates/bronze', '#forge:tools/saws']) - .id('gtceu:shaped/andesite_alloy_shaft_bronze') + .id('greate:shaped/andesite_alloy_shaft_bronze') event.shapeless('9x greate:andesite_alloy_shaft', ['#forge:plates/bismuth_bronze', '#forge:tools/saws']) - .id('gtceu:shaped/andesite_alloy_shaft_bismuth_bronze') + .id('greate:shaped/andesite_alloy_shaft_bismuth_bronze') event.shapeless('9x greate:steel_shaft', ['#forge:plates/steel', '#forge:tools/saws']) - .id('gtceu:shaped/steel_shaft') + .id('greate:shaped/steel_shaft') event.shapeless('9x greate:aluminium_shaft', ['#forge:plates/aluminium', '#forge:tools/saws']) - .id('gtceu:shaped/aluminium_shaft') + .id('greate:shaped/aluminium_shaft') event.shapeless('9x greate:stainless_steel_shaft', ['#forge:plates/stainless_steel', '#forge:tools/saws']) - .id('gtceu:shaped/stainless_steel_shaft') + .id('greate:shaped/stainless_steel_shaft') event.shapeless('9x greate:titanium_shaft', ['#forge:plates/titanium', '#forge:tools/saws']) - .id('gtceu:shaped/titanium_shaft') + .id('greate:shaped/titanium_shaft') - event.recipes.gtceu.cutter('andesite_alloy_shaft') + event.recipes.gtceu.cutter('greate:andesite_alloy_shaft') .itemInputs('#forge:plates/bronze') .itemOutputs('9x greate:andesite_alloy_shaft') .duration(100) .EUt(GTValues.VA[GTValues.ULV]) .removePreviousMaterialInfo() - event.recipes.gtceu.cutter('andesite_alloy_shaft_black') + event.recipes.gtceu.cutter('greate:andesite_alloy_shaft_black') .itemInputs('#forge:plates/black_bronze') .itemOutputs('9x greate:andesite_alloy_shaft') .duration(100) .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.cutter('andesite_alloy_shaft_bismuth') + event.recipes.gtceu.cutter('greate:andesite_alloy_shaft_bismuth') .itemInputs('#forge:plates/bismuth_bronze') .itemOutputs('9x greate:andesite_alloy_shaft') .duration(100) .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.cutter('steel_shaft') + event.recipes.gtceu.cutter('greate:steel_shaft') .itemInputs('#forge:plates/steel') .itemOutputs('9x greate:steel_shaft') .duration(100) .EUt(GTValues.VA[GTValues.ULV]) .addMaterialInfo(true) - event.recipes.gtceu.cutter('aluminium_shaft') + event.recipes.gtceu.cutter('greate:aluminium_shaft') .itemInputs('#forge:plates/aluminium') .itemOutputs('9x greate:aluminium_shaft') .duration(100) .EUt(GTValues.VA[GTValues.ULV]) .addMaterialInfo(true) - event.recipes.gtceu.cutter('stainless_steel_shaft') + event.recipes.gtceu.cutter('greate:stainless_steel_shaft') .itemInputs('#forge:plates/stainless_steel') .itemOutputs('9x greate:stainless_steel_shaft') .duration(100) .EUt(GTValues.VA[GTValues.ULV]) .addMaterialInfo(true) - event.recipes.gtceu.cutter('titanium_shaft') + event.recipes.gtceu.cutter('greate:titanium_shaft') .itemInputs('#forge:plates/titanium') .itemOutputs('9x greate:titanium_shaft') .duration(100) @@ -648,7 +648,7 @@ function registerGreateRecipes(event) { }).id('tfg:shaped/wood_belt_connector') removeMaceratorRecipe(event, 'macerate_andesite_alloy_belt_connector') - event.remove({ id: 'gtceu:shaped/andesite_alloy_belt_connector' }) + event.remove({ id: 'greate:shaped/andesite_alloy_belt_connector' }) event.remove({ id: 'gtceu:extractor/extract_andesite_alloy_belt_connector' }) event.remove({ id: 'gtceu:arc_furnace/arc_andesite_alloy_belt_connector' }) @@ -673,7 +673,7 @@ function registerGreateRecipes(event) { .EUt(GTValues.VA[GTValues.ULV]) removeMaceratorRecipe(event, 'macerate_stone_belt_connector') - event.remove({ id: 'gtceu:shaped/stone_belt_connector' }) + event.remove({ id: 'greate:shaped/stone_belt_connector' }) TFGHelpers.registerMaterialInfo('greate:stone_belt_connector', { 'air': 1 }); @@ -695,7 +695,7 @@ function registerGreateRecipes(event) { .EUt(GTValues.VA[GTValues.ULV]) .addMaterialInfo(true) - event.remove({ id: 'gtceu:shaped/rubber_belt_connector' }) + event.remove({ id: 'greate:shaped/rubber_belt_connector' }) removeMaceratorRecipe(event, 'macerate_rubber_belt_connector') event.remove({ id: 'gtceu:extractor/extract_rubber_belt_connector' }) @@ -719,7 +719,7 @@ function registerGreateRecipes(event) { .EUt(GTValues.VA[GTValues.ULV]) .addMaterialInfo(true) - event.remove({ id: 'gtceu:shaped/silicone_rubber_belt_connector' }) + event.remove({ id: 'greate:shaped/silicone_rubber_belt_connector' }) removeMaceratorRecipe(event, 'macerate_silicone_rubber_belt_connector') event.remove({ id: 'gtceu:extractor/extract_silicone_rubber_belt_connector' }) @@ -743,7 +743,7 @@ function registerGreateRecipes(event) { .EUt(GTValues.VA[GTValues.ULV]) .addMaterialInfo(true) - event.remove({ id: 'gtceu:shaped/styrene_butadiene_rubber_belt_connector' }) + event.remove({ id: 'greate:shaped/styrene_butadiene_rubber_belt_connector' }) removeMaceratorRecipe(event, 'macerate_styrene_butadiene_rubber_belt_connector') event.remove({ id: 'gtceu:extractor/extract_styrene_butadiene_rubber_belt_connector' }) @@ -852,9 +852,9 @@ function registerGreateRecipes(event) { B: '#forge:rings/steel', C: '#forge:tools/wrenches', D: '#forge:rods/long/steel' - }).id('gtceu:shaped/steel_whisk') + }).id('greate:shaped/steel_whisk') - event.recipes.gtceu.extruder('gtceu:steel_whisk') + event.recipes.gtceu.extruder('greate:steel_whisk') .itemInputs('4x #forge:ingots/steel') .notConsumable('tfg:whisk_extruder_mold') .itemOutputs('gtceu:steel_whisk') @@ -874,9 +874,9 @@ function registerGreateRecipes(event) { B: '#forge:rings/aluminium', C: '#forge:tools/wrenches', D: '#forge:rods/long/aluminium' - }).id('gtceu:shaped/aluminium_whisk') + }).id('greate:shaped/aluminium_whisk') - event.recipes.gtceu.extruder('gtceu:aluminium_whisk') + event.recipes.gtceu.extruder('greate:aluminium_whisk') .itemInputs('4x #forge:ingots/aluminium') .notConsumable('tfg:whisk_extruder_mold') .itemOutputs('gtceu:aluminium_whisk') @@ -896,9 +896,9 @@ function registerGreateRecipes(event) { B: '#forge:rings/stainless_steel', C: '#forge:tools/wrenches', D: '#forge:rods/long/stainless_steel' - }).id('gtceu:shaped/stainless_steel_whisk') + }).id('greate:shaped/stainless_steel_whisk') - event.recipes.gtceu.extruder('gtceu:stainless_steel_whisk') + event.recipes.gtceu.extruder('greate:stainless_steel_whisk') .itemInputs('4x #forge:ingots/stainless_steel') .notConsumable('tfg:whisk_extruder_mold') .itemOutputs('gtceu:stainless_steel_whisk') @@ -918,9 +918,9 @@ function registerGreateRecipes(event) { B: '#forge:rings/titanium', C: '#forge:tools/wrenches', D: '#forge:rods/long/titanium' - }).id('gtceu:shaped/titanium_whisk') + }).id('greate:shaped/titanium_whisk') - event.recipes.gtceu.extruder('gtceu:titanium_whisk') + event.recipes.gtceu.extruder('greate:titanium_whisk') .itemInputs('4x #forge:ingots/titanium') .notConsumable('tfg:whisk_extruder_mold') .itemOutputs('gtceu:titanium_whisk') @@ -940,9 +940,9 @@ function registerGreateRecipes(event) { B: '#forge:rings/tungsten_steel', C: '#forge:tools/wrenches', D: '#forge:rods/long/tungsten_steel' - }).id('gtceu:shaped/tungsten_steel_whisk') + }).id('greate:shaped/tungsten_steel_whisk') - event.recipes.gtceu.extruder('gtceu:tungsten_steel_whisk') + event.recipes.gtceu.extruder('greate:tungsten_steel_whisk') .itemInputs('4x #forge:ingots/tungsten_steel') .notConsumable('tfg:whisk_extruder_mold') .itemOutputs('gtceu:tungsten_steel_whisk') @@ -962,9 +962,9 @@ function registerGreateRecipes(event) { B: '#forge:rings/rhodium_plated_palladium', C: '#forge:tools/wrenches', D: '#forge:rods/long/rhodium_plated_palladium' - }).id('gtceu:shaped/rhodium_plated_palladium_whisk') + }).id('greate:shaped/rhodium_plated_palladium_whisk') - event.recipes.gtceu.extruder('gtceu:rhodium_plated_palladium_whisk') + event.recipes.gtceu.extruder('greate:rhodium_plated_palladium_whisk') .itemInputs('4x #forge:ingots/rhodium_plated_palladium') .notConsumable('tfg:whisk_extruder_mold') .itemOutputs('gtceu:rhodium_plated_palladium_whisk') @@ -984,9 +984,9 @@ function registerGreateRecipes(event) { B: '#forge:rings/naquadah_alloy', C: '#forge:tools/wrenches', D: '#forge:rods/long/naquadah_alloy' - }).id('gtceu:shaped/naquadah_alloy_whisk') + }).id('greate:shaped/naquadah_alloy_whisk') - event.recipes.gtceu.extruder('gtceu:naquadah_alloy_whisk') + event.recipes.gtceu.extruder('greate:naquadah_alloy_whisk') .itemInputs('4x #forge:ingots/naquadah_alloy') .notConsumable('tfg:whisk_extruder_mold') .itemOutputs('gtceu:naquadah_alloy_whisk') @@ -1006,9 +1006,9 @@ function registerGreateRecipes(event) { B: '#forge:rings/darmstadtium', C: '#forge:tools/wrenches', D: '#forge:rods/long/darmstadtium' - }).id('gtceu:shaped/darmstadtium_whisk') + }).id('greate:shaped/darmstadtium_whisk') - event.recipes.gtceu.extruder('gtceu:darmstadtium_whisk') + event.recipes.gtceu.extruder('greate:darmstadtium_whisk') .itemInputs('4x #forge:ingots/darmstadtium') .notConsumable('tfg:whisk_extruder_mold') .itemOutputs('gtceu:darmstadtium_whisk') diff --git a/kubejs/server_scripts/greate/recipes.removes.js b/kubejs/server_scripts/greate/recipes.removes.js index 71722cfe8..1f49ddb72 100644 --- a/kubejs/server_scripts/greate/recipes.removes.js +++ b/kubejs/server_scripts/greate/recipes.removes.js @@ -24,22 +24,22 @@ function removeGreateRecipes(event) { event.remove({ mod: 'greate', input: 'create:andesite_alloy' }); event.remove({ mod: 'greate', output: 'minecraft:bamboo_pressure_plate'}) - event.remove({ id: 'gtceu:shaped/andesite_alloy_shaft' }) - event.remove({ id: 'gtceu:shaped/andesite_alloy_cogwheel' }) - event.remove({ id: 'gtceu:shaped/andesite_alloy_large_cogwheel' }) - event.remove({ id: 'gtceu:shaped/andesite_alloy_large_cogwheel_from_little' }) - event.remove({ id: 'gtceu:shaped/steel_cogwheel' }) - event.remove({ id: 'gtceu:shaped/steel_large_cogwheel' }) - event.remove({ id: 'gtceu:shaped/steel_large_cogwheel_from_little' }) - event.remove({ id: 'gtceu:shaped/aluminium_cogwheel' }) - event.remove({ id: 'gtceu:shaped/aluminium_large_cogwheel' }) - event.remove({ id: 'gtceu:shaped/aluminium_large_cogwheel_from_little' }) - event.remove({ id: 'gtceu:shaped/stainless_steel_cogwheel' }) - event.remove({ id: 'gtceu:shaped/stainless_steel_large_cogwheel' }) - event.remove({ id: 'gtceu:shaped/stainless_steel_large_cogwheel_from_little' }) - event.remove({ id: 'gtceu:shaped/titanium_cogwheel' }) - event.remove({ id: 'gtceu:shaped/titanium_large_cogwheel' }) - event.remove({ id: 'gtceu:shaped/titanium_large_cogwheel_from_little' }) + 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") @@ -66,6 +66,17 @@ function removeGreateRecipes(event) { 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:extractor/extract_andesite_alloy' }) event.remove({ id: 'gtceu:extractor/extract_steel_alloy'}) event.remove({ id: 'gtceu:extractor/extract_aluminium_alloy' }) diff --git a/kubejs/startup_scripts/greate/constants.js b/kubejs/startup_scripts/greate/constants.js index 5155df690..5d7c82439 100644 --- a/kubejs/startup_scripts/greate/constants.js +++ b/kubejs/startup_scripts/greate/constants.js @@ -2,7 +2,7 @@ "use strict"; global.GREATE_DISABLED_ITEMS = /** @type {const} */ ([ - "create:andesite_alloy", + "greate:andesite_alloy_alloy", "greate:steel_alloy", "greate:aluminium_alloy", "greate:stainless_steel_alloy",