From 4b0edf9833aea30ed2e8d44e75a971666a05e529 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 24 Jun 2025 17:27:24 +0100 Subject: [PATCH] finally removing this old greate jank --- kubejs/server_scripts/greate/recipes.js | 21 ------------ kubejs/server_scripts/gregtech/recipes.js | 34 ------------------- .../gregtech/recipes.materials.js | 9 +++-- 3 files changed, 4 insertions(+), 60 deletions(-) diff --git a/kubejs/server_scripts/greate/recipes.js b/kubejs/server_scripts/greate/recipes.js index 142f25e77..bdd98e363 100644 --- a/kubejs/server_scripts/greate/recipes.js +++ b/kubejs/server_scripts/greate/recipes.js @@ -638,25 +638,4 @@ function registerGreateRecipes(event) { // #endregion - // #region Cables - // TODO: Remove this when greate wire coating is configurable - - event.forEachRecipe([{ type: 'gtceu:wire_coating' }], recipe => { - let r = JSON.parse(recipe.json) - - let newRecipe = event.recipes.gtceu.assembler(recipe.getId()) - - let itemIns = []; - r.inputs.item.forEach(i => { - itemIns.push(`${i.content.count}x #${i.content.ingredient.tag}`); - }) - - newRecipe.itemInputs(itemIns); - newRecipe.inputFluids(Fluid.of(`${r.inputs.fluid[0].content.value[0].tag.replace(/forge/g, 'gtceu')}`, r.inputs.fluid[0].content.amount)) - newRecipe.itemOutputs(r.outputs.item[0].content.ingredient.item); - newRecipe.EUt(r.tickInputs.eu[0].content) - newRecipe.duration(r.duration); - }) - - // #endregion } diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index fbf312309..20c3be569 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1200,38 +1200,4 @@ const registerGTCEURecipes = (event) => { .duration(7 * 20) .EUt(60) //#endregion - - // TODO: Greate again... - event.shapeless('gtceu:programmed_circuit', ['minecraft:stick', '#forge:tools/wrenches']) - .id('tfg:shapeless/programmed_circuit_from_stick') - - event.shapeless('gtceu:red_alloy_single_cable', ['gtceu:red_alloy_single_wire', '#forge:plates/rubber']) - .id('tfg:shapeless/red_alloy_single_cable') - - event.shapeless('gtceu:tin_single_cable', ['gtceu:tin_single_wire', '#forge:plates/rubber']) - .id('tfg:shapeless/tin_single_cable') - event.shapeless('gtceu:tin_double_cable', ['gtceu:tin_double_wire', '#forge:plates/rubber', '#forge:plates/rubber']) - .id('tfg:shapeless/tin_double_cable') - event.shapeless('gtceu:tin_quadruple_cable', ['gtceu:tin_quadruple_wire', '#forge:plates/rubber', '#forge:plates/rubber', '#forge:plates/rubber', '#forge:plates/rubber']) - .id('tfg:shapeless/tin_quadruple_cable') - event.shapeless('gtceu:tin_octal_cable', ['gtceu:tin_octal_wire', '#forge:plates/rubber', '#forge:plates/rubber', '#forge:plates/rubber', '#forge:plates/rubber', '#forge:plates/rubber', '#forge:plates/rubber', '#forge:plates/rubber', '#forge:plates/rubber']) - .id('tfg:shapeless/tin_octal_cable') - - event.shapeless('gtceu:cobalt_single_cable', ['gtceu:cobalt_single_wire', '#forge:plates/rubber']) - .id('tfg:shapeless/cobalt_single_cable') - event.shapeless('gtceu:cobalt_double_cable', ['gtceu:cobalt_double_wire', '#forge:plates/rubber', '#forge:plates/rubber']) - .id('tfg:shapeless/cobalt_double_cable') - event.shapeless('gtceu:cobalt_quadruple_cable', ['gtceu:cobalt_quadruple_wire', '#forge:plates/rubber', '#forge:plates/rubber', '#forge:plates/rubber', '#forge:plates/rubber']) - .id('tfg:shapeless/cobalt_quadruple_cable') - event.shapeless('gtceu:cobalt_octal_cable', ['gtceu:cobalt_octal_wire', '#forge:plates/rubber', '#forge:plates/rubber', '#forge:plates/rubber', '#forge:plates/rubber', '#forge:plates/rubber', '#forge:plates/rubber', '#forge:plates/rubber', '#forge:plates/rubber']) - .id('tfg:shapeless/cobalt_octal_cable') - - event.shapeless('gtceu:nickel_single_cable', ['gtceu:nickel_single_wire', '#forge:plates/rubber']) - .id('tfg:shapeless/nickel_single_cable') - event.shapeless('gtceu:nickel_double_cable', ['gtceu:nickel_double_wire', '#forge:plates/rubber', '#forge:plates/rubber']) - .id('tfg:shapeless/nickel_double_cable') - event.shapeless('gtceu:nickel_quadruple_cable', ['gtceu:nickel_quadruple_wire', '#forge:plates/rubber', '#forge:plates/rubber', '#forge:plates/rubber', '#forge:plates/rubber']) - .id('tfg:shapeless/nickel_quadruple_cable') - event.shapeless('gtceu:nickel_octal_cable', ['gtceu:nickel_octal_wire', '#forge:plates/rubber', '#forge:plates/rubber', '#forge:plates/rubber', '#forge:plates/rubber', '#forge:plates/rubber', '#forge:plates/rubber', '#forge:plates/rubber', '#forge:plates/rubber']) - .id('tfg:shapeless/nickel_octal_cable') } diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js index c77755487..ca0f9b884 100644 --- a/kubejs/server_scripts/gregtech/recipes.materials.js +++ b/kubejs/server_scripts/gregtech/recipes.materials.js @@ -312,19 +312,16 @@ function registerGTCEUMetalRecipes(event) { // Macerator let maceratorRecipe = event.recipes.gtceu.macerator(`macerate_poor_raw_${material.getName()}_ore_to_crushed_ore`) + .itemInputs(poorOreItem) .category(GTRecipeCategories.ORE_CRUSHING) .duration(400) .EUt(2) if (multiplier > 1) { - maceratorRecipe.itemInputs(poorOreItem) maceratorRecipe.itemOutputs(crushedOreItem.copyWithCount(multiplier / 2)) } else { - // TODO: Change this when Greate fixes its bug - //maceratorRecipe.chancedOutput(crushedOreItem, 5000, 750) - maceratorRecipe.itemInputs(poorOreItem.copyWithCount(2)) - maceratorRecipe.itemOutputs(crushedOreItem.copyWithCount(1)) + maceratorRecipe.chancedOutput(crushedOreItem, 5000, 750) } maceratorRecipe.chancedOutput(crushedOreItem.copyWithCount(1), 2500, 500) maceratorRecipe.chancedOutput(crushedOreItem.copyWithCount(1), 1250, 250) @@ -380,6 +377,8 @@ function registerGTCEUMetalRecipes(event) { else hammerRecipe.itemOutputs(crushedOreItem) + event.remove({ id: `greate:milling/integration/gtceu/macerator/macerate_raw_${material.getName()}_ore_to_crushed_ore` }) + // Macerator event.recipes.gtceu.macerator(`macerate_raw_${material.getName()}_ore_to_crushed_ore`) .itemInputs(normalOreItem)