diff --git a/CHANGELOG.md b/CHANGELOG.md index 23ddff07a..b86773e12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,8 @@ - Increased durability of the blue steel diving suit to match blue steel armor @Pyritie - Phantom Silk and Polycaprolactam Fabric now count as High Quality Fabric @Pyritie - Added recipes to turn dirt into grass @Pyritie +- Changed durability of the diving equipment to match the TFC armor, made forging bonuses carry across when crafting @Pyritie +- Added/changed more recipes for metal bars, doors, and trapdoors ### Bug fixes - Fixed issue where "melts into" tooltips and certain timers on Jade were missing (#1102) @Xikaro - Improved block ordering logic with AoE mining tools to reduce incorrect cave-ins @voidstar240 diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 23c06d2ed..7035d80c8 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -36,16 +36,13 @@ const registerCreateRecipes = (event) => { { id: 'create:crafting/schematics/empty_schematic' }, { id: 'create:crafting/schematics/schematic_and_quill' }, { id: 'create:crafting/appliances/clipboard_clear' }, - { id: 'create:crafting/kinetics/andesite_door' }, - { id: 'create:crafting/kinetics/brass_door' }, - { id: 'create:crafting/kinetics/copper_door' }, - { id: 'create:crafting/kinetics/train_door' }, - { id: 'create:crafting/kinetics/train_trapdoor' }, { id: 'create:crafting/logistics/content_observer' }, { type: 'minecraft:stonecutting' } ], mod: 'create' }) + event.remove({ type: 'minecraft:stonecutting', input: 'create:andesite_alloy' }) + // Train Station event.shapeless('2x create:track_station', [ 'create:railway_casing', @@ -1932,4 +1929,41 @@ const registerCreateRecipes = (event) => { event.stonecutting('2x create:andesite_scaffolding', '#forge:ingots/tin_alloy') event.stonecutting('2x create:andesite_ladder', '#forge:ingots/tin_alloy') event.stonecutting('2x create:andesite_bars', '#forge:ingots/tin_alloy') + + // 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.recipes.gtceu.cutter('tfg:create_copper_bars') + .itemInputs('#forge:plates/copper') + .itemOutputs('create:copper_bars') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.cutter('tfg:create_brass_bars') + .itemInputs('#forge:plates/brass') + .itemOutputs('create:brass_bars') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + + // Doors + + event.shapeless('2x create:andesite_door', ['createdeco:andesite_door', '#minecraft:wooden_doors', 'minecraft:glass_pane']) + .id('tfg:shapeless/create_andesite_door') + + event.shapeless('2x create:brass_door', ['createdeco:brass_door', '#minecraft:wooden_doors', 'minecraft:glass_pane']) + .id('tfg:shapeless/create_brass_door') + + event.shapeless('2x create:copper_door', ['createdeco:copper_door', '#minecraft:wooden_doors', 'minecraft:glass_pane']) + .id('tfg:shapeless/create_copper_door') + + event.shapeless('2x create:train_door', ['createdeco:industrial_iron_door', '#minecraft:wooden_doors', 'minecraft:glass_pane']) + .id('tfg:shapeless/create_train_door') + + event.shapeless('2x create:train_trapdoor', ['tfc:metal/trapdoor/steel', '#minecraft:wooden_trapdoors']) + .id('tfg:shapeless/create_train_trapdoor') } diff --git a/kubejs/server_scripts/createdeco/recipes.js b/kubejs/server_scripts/createdeco/recipes.js index d25688cb3..24f81455b 100644 --- a/kubejs/server_scripts/createdeco/recipes.js +++ b/kubejs/server_scripts/createdeco/recipes.js @@ -174,7 +174,7 @@ const registerCreatedecoRecipes = (event) => { }); //#endregion - // #region Bars + // #region Bars + Doors const metalThings = [ { metal: 'andesite', material: 'tin_alloy', tier: 3 }, @@ -190,27 +190,106 @@ const registerCreatedecoRecipes = (event) => { event.remove({ id: `createdeco:${bar.metal}_door` }) if (bar.metal != 'iron') { + 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`) - event.recipes.tfc.anvil(`createdeco:${bar.metal}_door`, `#forge:ingots/${bar.material}`, ['draw_last', 'draw_second_last', 'punch_third_last']) + 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.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`) - event.recipes.tfc.anvil(`createdeco:${bar.metal}_trapdoor`, `#forge:ingots/${bar.material}`, ['shrink_last', 'draw_second_last', 'draw_third_last']) - .tier(bar.tier).id(`createdeco:anvil/${bar.metal}_trapdoor`) - - event.stonecutting(`createdeco:${bar.metal}_trapdoor`, `#forge:ingots/${bar.material}`) - .id(`createdeco:stonecutting/${bar.metal}_trapdoor`) - - event.stonecutting(`createdeco:${bar.metal}_door`, `#forge:ingots/${bar.material}`) - .id(`createdeco:stonecutting/${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]) } - event.recipes.tfc.anvil(`4x createdeco:${bar.metal}_bars_overlay`, `#forge:ingots/${bar.material}`, ['draw_last', 'punch_second_last', 'punch_third_last']) + 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.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) }) + // #endregion + + // #region Trapdoors + + event.shapeless(`createdeco:copper_trapdoor`, `tfc:metal/trapdoor/copper`) + event.shapeless(`tfc:metal/trapdoor/copper`, `createdeco:copper_trapdoor`) + + event.shapeless(`createdeco:industrial_iron_trapdoor`, `tfc:metal/trapdoor/steel`) + event.shapeless(`tfc:metal/trapdoor/steel`, `createdeco:industrial_iron_trapdoor`) + + // TODO: move these two into the tag prefixes in tfg-core, then remove these recipes + + event.recipes.tfc.anvil(`createdeco:brass_trapdoor`, `#forge:ingots/brass`, ['shrink_last', 'draw_second_last', 'draw_third_last']) + .tier(2).id(`createdeco:anvil/brass_trapdoor`) + + event.recipes.gtceu.alloy_smelter(`tfg:cast_brass_trapdoor`) + .itemInputs('#forge:ingots/brass') + .notConsumable('tfg:trapdoor_casting_mold') + .itemOutputs('createdeco:brass_trapdoor') + .duration(GTMaterials.Brass.getMass()) + .category(GTRecipeCategories.INGOT_MOLDING) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.fluid_solidifier(`tfg:solidify_brass_trapdoor`) + .inputFluids(Fluid.of(GTMaterials.Brass.getFluid(), 144)) + .notConsumable('tfg:trapdoor_casting_mold') + .itemOutputs('createdeco:brass_trapdoor') + .duration(GTMaterials.Brass.getMass()) + .EUt(GTValues.VA[GTValues.ULV]) + + 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`) + + event.recipes.gtceu.alloy_smelter(`tfg:cast_zinc_trapdoor`) + .itemInputs('#forge:ingots/zinc') + .notConsumable('tfg:trapdoor_casting_mold') + .itemOutputs('createdeco:zinc_trapdoor') + .duration(GTMaterials.Zinc.getMass()) + .category(GTRecipeCategories.INGOT_MOLDING) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.fluid_solidifier(`tfg:solidify_zinc_trapdoor`) + .inputFluids(Fluid.of(GTMaterials.Zinc.getFluid(), 144)) + .notConsumable('tfg:trapdoor_casting_mold') + .itemOutputs('createdeco:zinc_trapdoor') + .duration(GTMaterials.Zinc.getMass()) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.tfc.anvil(`createdeco:andesite_trapdoor`, `#forge:ingots/iron_alloy`, ['shrink_last', 'draw_second_last', 'draw_third_last']) + .tier(3).id(`createdeco:anvil/andesite_trapdoor`) + + event.recipes.gtceu.alloy_smelter(`tfg:cast_tin_alloy_trapdoor`) + .itemInputs('#forge:ingots/tin_alloy') + .notConsumable('tfg:trapdoor_casting_mold') + .itemOutputs('createdeco:andesite_trapdoor') + .duration(GTMaterials.TinAlloy.getMass()) + .category(GTRecipeCategories.INGOT_MOLDING) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.fluid_solidifier(`tfg:solidify_tin_alloy_trapdoor`) + .inputFluids(Fluid.of(GTMaterials.TinAlloy.getFluid(), 144)) + .notConsumable('tfg:trapdoor_casting_mold') + .itemOutputs('createdeco:andesite_trapdoor') + .duration(GTMaterials.TinAlloy.getMass()) + .EUt(GTValues.VA[GTValues.ULV]) // #endregion diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js index 21b58f96e..a3b5bbbc8 100644 --- a/kubejs/server_scripts/gregtech/recipes.materials.js +++ b/kubejs/server_scripts/gregtech/recipes.materials.js @@ -834,11 +834,16 @@ function registerGTCEUMetalRecipes(event) { const processBars = (material) => { const barsStack = ChemicalHelper.get(TFGTagPrefix.bars, material, 4) + const ingotStack = ChemicalHelper.get(TagPrefix.ingot, material, 1) if (barsStack == null) return; - event.stonecutting(barsStack, ChemicalHelper.get(TagPrefix.ingot, material, 1)) - .id(`${material.getName()}_ingot_to_bars`) + event.recipes.gtceu.cutter(`tfg:${material.getName()}_bars`) + .itemInputs(ingotStack) + .itemOutputs(barsStack) + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + .circuit(1) } forEachMaterial(material => { diff --git a/kubejs/server_scripts/tfc/recipes.materials.js b/kubejs/server_scripts/tfc/recipes.materials.js index 60d852406..a105e1203 100644 --- a/kubejs/server_scripts/tfc/recipes.materials.js +++ b/kubejs/server_scripts/tfc/recipes.materials.js @@ -1076,7 +1076,8 @@ function registerTFCMaterialsRecipes(event) { let plateItem = ChemicalHelper.get(TagPrefix.plate, material, 1); // Люк - event.recipes.tfc.anvil(`tfc:metal/trapdoor/${material.getName()}`, plateItem, ['bend_last', 'draw_second_last', 'draw_third_last']) + event.recipes.tfc.anvil(`tfc:metal/trapdoor/${material.getName()}`, plateItem, + ['bend_last', 'draw_second_last', 'draw_third_last']) .tier(tfcProperty.getTier()) .id(`tfc:anvil/${material.getName()}_trapdoor`) @@ -1086,12 +1087,14 @@ function registerTFCMaterialsRecipes(event) { .id(`tfc:heating/metal/${material.getName()}_bars`) // 8x Решетка - event.recipes.tfc.anvil(`8x tfc:metal/bars/${material.getName()}`, plateItem, ['upset_last', 'punch_second_last', 'punch_third_last']) + event.recipes.tfc.anvil(`4x tfc:metal/bars/${material.getName()}`, ingotItem, + ['upset_last', 'punch_second_last', 'punch_third_last']) .tier(tfcProperty.getTier()) .id(`tfc:anvil/${material.getName()}_bars`) // 16x Решетка - event.recipes.tfc.anvil(`16x tfc:metal/bars/${material.getName()}`, ChemicalHelper.get(TagPrefix.plateDouble, material, 1), ['upset_last', 'punch_second_last', 'punch_third_last']) + event.recipes.tfc.anvil(`8x tfc:metal/bars/${material.getName()}`, ChemicalHelper.get(TFGTagPrefix.ingotDouble, material, 1), + ['upset_last', 'punch_second_last', 'punch_third_last']) .tier(tfcProperty.getTier()) .id(`tfc:anvil/${material.getName()}_bars_double`) diff --git a/kubejs/startup_scripts/create/constants.js b/kubejs/startup_scripts/create/constants.js index 2c917a567..8fec001aa 100644 --- a/kubejs/startup_scripts/create/constants.js +++ b/kubejs/startup_scripts/create/constants.js @@ -272,9 +272,6 @@ global.CREATE_DISABLED_ITEMS = [ 'create:crushed_raw_osmium', 'create:crushed_raw_iron', 'create:experience_nugget', - 'create:andesite_bars', - 'create:brass_bars', - 'create:copper_bars', 'create:tree_fertilizer', 'create:handheld_worldshaper', 'create:creative_crate',