From 7fafc92d3c9f8f5d127a180d27198f83ed9e232c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 24 Dec 2025 21:34:31 +0000 Subject: [PATCH] unification of metal bars --- kubejs/server_scripts/create/recipes.js | 41 ++++++------ kubejs/server_scripts/createdeco/recipes.js | 63 +++++++++++++------ .../gregtech/recipes.materials.js | 16 ----- .../server_scripts/tfc/recipes.materials.js | 6 ++ 4 files changed, 73 insertions(+), 53 deletions(-) diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 36ee3d403..e427ed0bb 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -1234,7 +1234,7 @@ const registerCreateRecipes = (event) => { }).id('tfg:create/shaped/clipboard') // Лестница из железа - event.shaped('6x create:andesite_ladder', [ + event.shaped('7x create:andesite_ladder', [ 'A A', 'AAA', 'A A' @@ -1242,8 +1242,10 @@ const registerCreateRecipes = (event) => { A: '#forge:rods/tin_alloy' }).id('tfg:create/shaped/andesite_ladder') + TFGHelpers.registerMaterialInfo('createdeco:andesite_ladder', { 'tin_alloy': 0.5 }) + // Лестница из латуни - event.shaped('6x create:brass_ladder', [ + event.shaped('7x create:brass_ladder', [ 'A A', 'AAA', 'A A' @@ -1251,8 +1253,10 @@ const registerCreateRecipes = (event) => { A: '#forge:rods/brass' }).id('tfg:create/shaped/brass_ladder') + TFGHelpers.registerMaterialInfo('createdeco:brass_ladder', { 'brass': 0.5 }) + // Лестница из железа - event.shaped('6x create:copper_ladder', [ + event.shaped('7x create:copper_ladder', [ 'A A', 'AAA', 'A A' @@ -1260,6 +1264,8 @@ const registerCreateRecipes = (event) => { A: '#forge:rods/copper' }).id('tfg:create/shaped/copper_ladder') + TFGHelpers.registerMaterialInfo('createdeco:copper_ladder', { 'copper': 0.5 }) + // Леса из железа event.shaped('4x create:andesite_scaffolding', [ 'AAA', @@ -2373,23 +2379,22 @@ const registerCreateRecipes = (event) => { // Bars - event.recipes.gtceu.cutter('tfg:create_andesite_bars') - .itemInputs('#forge:plates/tin_alloy') - .itemOutputs('create:andesite_bars') - .duration(100) - .EUt(GTValues.VA[GTValues.LV]) + event.stonecutting('4x create:andesite_bars', '#forge:ingots/tin_alloy') + event.stonecutting('4x create:brass_bars', '#forge:ingots/brass') + event.stonecutting('4x create:copper_bars', '#forge:ingots/copper') - event.recipes.gtceu.cutter('tfg:create_copper_bars') - .itemInputs('#forge:plates/copper') - .itemOutputs('create:copper_bars') - .duration(100) - .EUt(GTValues.VA[GTValues.LV]) + event.recipes.tfc.anvil(`4x create:andesite_bars`, `#forge:ingots/tin_alloy`, ['shrink_last', 'punch_second_last', 'punch_third_last']) + .tier(3).id(`tfg:anvil/create_andesite_bars`) - event.recipes.gtceu.cutter('tfg:create_brass_bars') - .itemInputs('#forge:plates/brass') - .itemOutputs('create:brass_bars') - .duration(100) - .EUt(GTValues.VA[GTValues.LV]) + event.recipes.tfc.anvil(`4x create:brass_bars`, `#forge:ingots/brass`, ['shrink_last', 'punch_second_last', 'punch_third_last']) + .tier(2).id(`tfg:anvil/create_brass_bars`) + + event.recipes.tfc.anvil(`4x create:copper_bars`, `#forge:ingots/copper`, ['shrink_last', 'punch_second_last', 'punch_third_last']) + .tier(1).id(`tfg:anvil/create_copper_bars`) + + TFGHelpers.registerMaterialInfo('create:andesite_bars', { 'tin_alloy': 0.25 }) + TFGHelpers.registerMaterialInfo('create:brass_bars', { 'brass': 0.25 }) + TFGHelpers.registerMaterialInfo('create:copper_bars', { 'copper': 0.25 }) // Doors diff --git a/kubejs/server_scripts/createdeco/recipes.js b/kubejs/server_scripts/createdeco/recipes.js index 40c502bbf..627b1cefd 100644 --- a/kubejs/server_scripts/createdeco/recipes.js +++ b/kubejs/server_scripts/createdeco/recipes.js @@ -240,41 +240,46 @@ const registerCreatedecoRecipes = (event) => { event.remove({ id: `createdeco:${bar.metal}_trapdoor` }) event.remove({ id: `createdeco:${bar.metal}_door` }) + let quarterMap = {}; + quarterMap[bar.material] = 0.25; + if (bar.metal !== 'iron') { + // Bars event.remove({ type: 'minecraft:stonecutting', output: `createdeco:${bar.metal}_bars` }) event.recipes.tfc.anvil(`4x createdeco:${bar.metal}_bars`, `#forge:ingots/${bar.material}`, ['shrink_last', 'punch_second_last', 'punch_third_last']) - .tier(bar.tier).id(`createdeco:anvil/${bar.metal}_bars`) + .tier(bar.tier).id(`tfg:anvil/createdeco_${bar.metal}_bars`) - event.recipes.gtceu.assembler(`tfg:${bar.material}_create_deco_bars`) - .itemInputs(`2x #forge:rods/${bar.material}`) - .itemOutputs(`4x createdeco:${bar.metal}_bars`) - .duration(100) - .EUt(GTValues.VA[GTValues.LV]) - .circuit(12) + event.stonecutting(`4x createdeco:${bar.metal}_bars`, `#forge:ingots/${bar.material}`) + TFGHelpers.registerMaterialInfo(`createdeco:${bar.metal}_bars`, quarterMap) + + // Door event.recipes.tfc.anvil(`createdeco:${bar.metal}_door`, `#forge:double_plates/${bar.material}`, ['draw_last', 'draw_second_last', 'punch_third_last']) - .tier(bar.tier).id(`createdeco:anvil/${bar.metal}_door`) + .tier(bar.tier).id(`tfg:anvil/createdeco_${bar.metal}_door`) event.recipes.gtceu.cutter(`tfg:${bar.material}_create_deco_door`) .itemInputs(`#forge:double_plates/${bar.material}`) .itemOutputs(`createdeco:${bar.metal}_door`) .duration(100) .EUt(GTValues.VA[GTValues.LV]) + + let twoMap = {}; + twoMap[bar.material] = 2; + TFGHelpers.registerMaterialInfo(`createdeco:${bar.metal}_door`, twoMap) } + // Overlay bars event.remove({ type: 'minecraft:stonecutting', output: `createdeco:${bar.metal}_bars_overlay` }) - event.recipes.tfc.anvil(`2x createdeco:${bar.metal}_bars_overlay`, `#forge:ingots/${bar.material}`, ['draw_last', 'punch_second_last', 'punch_third_last']) - .tier(bar.tier).id(`createdeco:anvil/${bar.metal}_bars_overlay`) + event.recipes.tfc.anvil(`4x createdeco:${bar.metal}_bars_overlay`, `#forge:ingots/${bar.material}`, ['draw_last', 'punch_second_last', 'punch_third_last']) + .tier(bar.tier).id(`tfg:anvil/createdeco_${bar.metal}_bars_overlay`) - event.recipes.gtceu.assembler(`tfg:${bar.material}_create_deco_bars_overlay`) - .itemInputs(`1x #forge:rods/${bar.material}`, `1x #forge:plates/${bar.material}`) - .itemOutputs(`4x createdeco:${bar.metal}_bars_overlay`) - .duration(100) - .EUt(GTValues.VA[GTValues.LV]) - .circuit(13) + event.stonecutting(`4x createdeco:${bar.metal}_bars_overlay`, `#forge:ingots/${bar.material}`) + TFGHelpers.registerMaterialInfo(`createdeco:${bar.metal}_bars_overlay`, quarterMap) + + // Facade event.shaped(`4x createdeco:${bar.metal}_facade`, [ ' A ', 'ABA', @@ -291,9 +296,11 @@ const registerCreatedecoRecipes = (event) => { event.shapeless(`createdeco:copper_trapdoor`, `tfc:metal/trapdoor/copper`) event.shapeless(`tfc:metal/trapdoor/copper`, `createdeco:copper_trapdoor`) + TFGHelpers.registerMaterialInfo('createdeco:copper_trapdoor', { 'copper': 1 }) event.shapeless(`createdeco:industrial_iron_trapdoor`, `tfc:metal/trapdoor/steel`) event.shapeless(`tfc:metal/trapdoor/steel`, `createdeco:industrial_iron_trapdoor`) + TFGHelpers.registerMaterialInfo('createdeco:industrial_iron_trapdoor', { 'steel': 1 }) // TODO: move these two into the tag prefixes in tfg-core, then remove these recipes @@ -315,6 +322,8 @@ const registerCreatedecoRecipes = (event) => { .duration(GTMaterials.Brass.getMass()) .EUt(GTValues.VA[GTValues.ULV]) + TFGHelpers.registerMaterialInfo('createdeco:brass_trapdoor', { 'brass': 1 }) + event.recipes.tfc.anvil(`createdeco:zinc_trapdoor`, `#forge:ingots/zinc`, ['shrink_last', 'draw_second_last', 'draw_third_last']) .tier(1).id(`createdeco:anvil/zinc_trapdoor`) @@ -333,6 +342,8 @@ const registerCreatedecoRecipes = (event) => { .duration(GTMaterials.Zinc.getMass()) .EUt(GTValues.VA[GTValues.ULV]) + TFGHelpers.registerMaterialInfo('createdeco:zinc_trapdoor', { 'zinc': 1 }) + event.recipes.tfc.anvil(`createdeco:andesite_trapdoor`, `#forge:ingots/tin_alloy`, ['shrink_last', 'draw_second_last', 'draw_third_last']) .tier(3).id(`createdeco:anvil/andesite_trapdoor`) @@ -351,6 +362,8 @@ const registerCreatedecoRecipes = (event) => { .duration(GTMaterials.TinAlloy.getMass()) .EUt(GTValues.VA[GTValues.ULV]) + TFGHelpers.registerMaterialInfo('createdeco:andesite_trapdoor', { 'tin_alloy': 1 }) + // #endregion //#region Coins @@ -446,7 +459,7 @@ const registerCreatedecoRecipes = (event) => { // #region Ladders - event.shaped('6x createdeco:iron_ladder', [ + event.shaped('7x createdeco:iron_ladder', [ 'A A', 'AAA', 'A A' @@ -456,7 +469,9 @@ const registerCreatedecoRecipes = (event) => { event.stonecutting('2x createdeco:iron_ladder', '#forge:ingots/wrought_iron') - event.shaped('6x createdeco:zinc_ladder', [ + TFGHelpers.registerMaterialInfo('createdeco:iron_ladder', { 'wrought_iron': 0.5 }) + + event.shaped('7x createdeco:zinc_ladder', [ 'A A', 'AAA', 'A A' @@ -464,7 +479,9 @@ const registerCreatedecoRecipes = (event) => { A: '#forge:rods/zinc' }).id('tfg:createdeco/shaped/zinc_ladder') - event.shaped('6x createdeco:industrial_iron_ladder', [ + TFGHelpers.registerMaterialInfo('createdeco:zinc_ladder', { 'zinc': 0.5 }) + + event.shaped('7x createdeco:industrial_iron_ladder', [ 'A A', 'AAA', 'A A' @@ -472,6 +489,8 @@ const registerCreatedecoRecipes = (event) => { A: '#forge:rods/steel' }).id('tfg:createdeco/shaped/industrial_iron_ladder') + TFGHelpers.registerMaterialInfo('createdeco:industrial_iron_ladder', { 'steel': 0.5 }) + // #endregion // #region Shipping Containers @@ -509,11 +528,17 @@ const registerCreatedecoRecipes = (event) => { // #region Sheet Metal event.stonecutting('4x createdeco:andesite_sheet_metal', '#forge:plates/tin_alloy') + TFGHelpers.registerMaterialInfo('createdeco:andesite_sheet_metal', { 'tin_alloy': 0.25 }) event.stonecutting('4x createdeco:brass_sheet_metal', '#forge:plates/brass') + TFGHelpers.registerMaterialInfo('createdeco:brass_sheet_metal', { 'brass': 0.25 }) event.stonecutting('4x createdeco:iron_sheet_metal', '#forge:plates/wrought_iron') + TFGHelpers.registerMaterialInfo('createdeco:iron_sheet_metal', { 'wrought_iron': 0.25 }) event.stonecutting('4x createdeco:copper_sheet_metal', '#forge:plates/copper') + TFGHelpers.registerMaterialInfo('createdeco:copper_sheet_metal', { 'copper': 0.25 }) event.stonecutting('4x createdeco:industrial_iron_sheet_metal', '#forge:plates/steel') + TFGHelpers.registerMaterialInfo('createdeco:industrial_iron_sheet_metal', { 'steel': 0.25 }) event.stonecutting('4x createdeco:zinc_sheet_metal', '#forge:plates/zinc') + TFGHelpers.registerMaterialInfo('createdeco:zinc_sheet_metal', { 'zinc': 0.25 }) // #endregion }; diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js index a913fae05..74a77474f 100644 --- a/kubejs/server_scripts/gregtech/recipes.materials.js +++ b/kubejs/server_scripts/gregtech/recipes.materials.js @@ -1075,21 +1075,6 @@ function registerGTCEUMetalRecipes(event) { .EUt(GTValues.VA[GTValues.ULV]) } - /** - * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material - */ - const processBars = (material) => { - const barsStack = ChemicalHelper.get(TFGTagPrefix.bars, material, 4) - const ingotStack = ChemicalHelper.get(TagPrefix.ingot, material, 1) - if (barsStack === null) return; - - event.recipes.gtceu.cutter(`tfg:${material.getName()}_bars`) - .itemInputs(ingotStack) - .itemOutputs(barsStack) - .duration(100) - .EUt(GTValues.VA[GTValues.LV]) - } - /** * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material */ @@ -1234,7 +1219,6 @@ function registerGTCEUMetalRecipes(event) { processTrapdoor(material) processChain(material) processBell(material) - processBars(material) processBuzzsawBlade(material) event.remove({ id: `gtceu:shaped/spring_${material.getName()}` }) diff --git a/kubejs/server_scripts/tfc/recipes.materials.js b/kubejs/server_scripts/tfc/recipes.materials.js index 2e90975a1..c89a439d6 100644 --- a/kubejs/server_scripts/tfc/recipes.materials.js +++ b/kubejs/server_scripts/tfc/recipes.materials.js @@ -1303,6 +1303,12 @@ function registerTFCMaterialsRecipes(event) { .tier(tfcProperty.getTier()) .id(`tfc:anvil/${material.getName()}_bars`) + event.stonecutting(`4x tfc:metal/bars/${material.getName()}`, ingotItem); + + let quarterMap = {}; + quarterMap[material.getName()] = 0.25; + TFGHelpers.registerMaterialInfo(`tfc:metal/bars/${material.getName()}`, quarterMap) + // 16x Решетка event.recipes.tfc.anvil(`8x tfc:metal/bars/${material.getName()}`, ChemicalHelper.get(TFGTagPrefix.ingotDouble, material, 1), ['upset_last', 'punch_second_last', 'punch_third_last'])