diff --git a/CHANGELOG.md b/CHANGELOG.md index 70c155a89..d47fb3106 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Unreleased ### Changes ### Bug fixes +- Fixes some curving press tool head recipes being cheaper than intended (#2478) @Pyritie ### Translation updates ## [0.11.12] - 19-12-2025 diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js index c3fea2f30..6938448e4 100644 --- a/kubejs/server_scripts/gregtech/recipes.materials.js +++ b/kubejs/server_scripts/gregtech/recipes.materials.js @@ -77,11 +77,11 @@ function registerGTCEUMetalRecipes(event) { event.remove({ mod: 'gtceu', type: 'minecraft:crafting_shaped', output: toolHeadItem }) if (material.hasProperty(PropertyKey.INGOT)) { - const ingotItem = ChemicalHelper.get(TagPrefix.ingot, material, 1) + const ingotItem = ChemicalHelper.get(TagPrefix.ingot, material, 1); if (ingotItem.isEmpty() || ingotItem.hasTag('c:hidden_from_recipe_viewers')) return - const materialAmount = Math.floor(headTagPrefix.materialAmount() / GTValues.M) === 1 ? 1 : 2; + const materialAmount = Math.floor(headTagPrefix.materialAmount() / GTValues.M); event.recipes.gtceu.extruder(`tfg:extrude_${material.getName()}_ingot_to_${tagPrefixName}`) .itemInputs(ingotItem.copyWithCount(materialAmount)) @@ -90,7 +90,12 @@ function registerGTCEUMetalRecipes(event) { .duration(material.getMass() * 6) .EUt(GTValues.VA[GTValues.LV]) - event.recipes.vintageimprovements.curving(toolHeadItem, ingotItem.copyWithCount(materialAmount)) + let input_array = []; + for (let i = 0; i < materialAmount; i++) { + input_array.push(ingotItem); + } + + event.recipes.vintageimprovements.curving(toolHeadItem, input_array) .head(extruderMold) .id(`tfg:vi/curving/${material.getName()}_ingot_to_${tagPrefixName}`) @@ -120,12 +125,12 @@ function registerGTCEUMetalRecipes(event) { } else if (material.hasProperty(PropertyKey.GEM)) { - const gemItem = ChemicalHelper.get(TagPrefix.gem, material, 1) + const gemItem = ChemicalHelper.get(TagPrefix.gem, material, Math.floor(headTagPrefix.materialAmount() / GTValues.M)) if (gemItem.isEmpty()) return event.recipes.gtceu.laser_engraver(`tfg:engrave_${material.getName()}_gem_to_${tagPrefixName}`) - .itemInputs(gemItem.copyWithCount(Math.floor(headTagPrefix.materialAmount() / GTValues.M))) + .itemInputs(gemItem) .notConsumable(ChemicalHelper.get(TagPrefix.lens, GTMaterials.Glass, 1)) .circuit(circuitMeta) .itemOutputs(toolHeadItem) diff --git a/kubejs/server_scripts/gregtech/recipes.recycling.js b/kubejs/server_scripts/gregtech/recipes.recycling.js index 925f5f08f..e8981633c 100644 --- a/kubejs/server_scripts/gregtech/recipes.recycling.js +++ b/kubejs/server_scripts/gregtech/recipes.recycling.js @@ -126,19 +126,7 @@ function registerGTCEURecyclingRecipes(event) { // Iron Door - event.recipes.gtceu.macerator('gtceu:macerate_iron_door') - .itemInputs('minecraft:iron_door') - .itemOutputs('2x #forge:dusts/wrought_iron') - .duration(GTMaterials.WroughtIron.getMass() * 2) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('gtceu:arc_iron_door') - .itemInputs('minecraft:iron_door') - .itemOutputs('2x #forge:ingots/wrought_iron') - .duration(GTMaterials.WroughtIron.getMass() * 2) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) + TFGHelpers.registerMaterialInfo('minecraft:iron_door', { 'iron': 2 }) // #region Fix TFC hanging sign metal dupe for Macerator and Arc Furnace