From f37f8077a51a1956f8975be33a107022b25c4c41 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Wed, 27 Dec 2023 12:44:54 +0700 Subject: [PATCH] some work --- .../ftbquests/quests/chapters/bronze_age.snbt | 21 +++ config/ftbquests/quests/chapters/lv_age.snbt | 12 ++ config/ftbquests/quests/chapters/mv_age.snbt | 12 ++ .../ftbquests/quests/chapters/steel_age.snbt | 122 ++++++++++++++++++ kubejs/server_scripts/gregtech/recipes.js | 62 +++------ kubejs/startup_scripts/gtceu/constants.js | 16 ++- 6 files changed, 199 insertions(+), 46 deletions(-) create mode 100644 config/ftbquests/quests/chapters/bronze_age.snbt create mode 100644 config/ftbquests/quests/chapters/lv_age.snbt create mode 100644 config/ftbquests/quests/chapters/mv_age.snbt create mode 100644 config/ftbquests/quests/chapters/steel_age.snbt diff --git a/config/ftbquests/quests/chapters/bronze_age.snbt b/config/ftbquests/quests/chapters/bronze_age.snbt new file mode 100644 index 000000000..67726aee4 --- /dev/null +++ b/config/ftbquests/quests/chapters/bronze_age.snbt @@ -0,0 +1,21 @@ +{ + default_hide_dependency_lines: false + default_quest_shape: "" + filename: "bronze_age" + group: "" + icon: { + Count: 1b + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:bronze_ingot" + } + id: "5CAC071A36A0E3CE" + order_index: 1 + quest_links: [ ] + quests: [ ] + title: "Bronze Age" +} diff --git a/config/ftbquests/quests/chapters/lv_age.snbt b/config/ftbquests/quests/chapters/lv_age.snbt new file mode 100644 index 000000000..8977c9bcd --- /dev/null +++ b/config/ftbquests/quests/chapters/lv_age.snbt @@ -0,0 +1,12 @@ +{ + default_hide_dependency_lines: false + default_quest_shape: "" + filename: "lv_age" + group: "" + icon: "minecraft:bedrock" + id: "73F3EFA4BB543915" + order_index: 3 + quest_links: [ ] + quests: [ ] + title: "LV Age" +} diff --git a/config/ftbquests/quests/chapters/mv_age.snbt b/config/ftbquests/quests/chapters/mv_age.snbt new file mode 100644 index 000000000..0dead2b84 --- /dev/null +++ b/config/ftbquests/quests/chapters/mv_age.snbt @@ -0,0 +1,12 @@ +{ + default_hide_dependency_lines: false + default_quest_shape: "" + filename: "mv_age" + group: "" + icon: "minecraft:bedrock" + id: "1BE688FC900D9161" + order_index: 4 + quest_links: [ ] + quests: [ ] + title: "MV Age" +} diff --git a/config/ftbquests/quests/chapters/steel_age.snbt b/config/ftbquests/quests/chapters/steel_age.snbt new file mode 100644 index 000000000..8428f7235 --- /dev/null +++ b/config/ftbquests/quests/chapters/steel_age.snbt @@ -0,0 +1,122 @@ +{ + default_hide_dependency_lines: false + default_quest_shape: "" + filename: "steel_age" + group: "" + icon: { + Count: 1b + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:steel_ingot" + } + id: "0614D8560F1585FA" + order_index: 2 + quest_links: [ ] + quests: [ + { + id: "5BC4A386098962E3" + tasks: [{ + id: "4FC5CBC7937AC5B5" + item: "gtceu:hp_steam_solid_boiler" + type: "item" + }] + x: -2.0d + y: -0.5d + } + { + id: "3D6E423744153954" + tasks: [{ + id: "2908168A0D5379D3" + item: "gtceu:hp_steam_liquid_boiler" + type: "item" + }] + x: -1.0d + y: -0.5d + } + { + id: "7F0DEF5DD0C69551" + tasks: [{ + id: "7FDC691BF010439B" + item: "gtceu:hp_steam_extractor" + type: "item" + }] + x: 0.0d + y: -0.5d + } + { + id: "4F14E70185739952" + tasks: [{ + id: "4443E13098987EAE" + item: "gtceu:hp_steam_macerator" + type: "item" + }] + x: 1.0d + y: -0.5d + } + { + id: "6E047C0C4A6C2915" + tasks: [{ + id: "7FBF211B63242531" + item: "gtceu:hp_steam_compressor" + type: "item" + }] + x: -2.0d + y: 0.5d + } + { + id: "3FB00451823EF146" + tasks: [{ + id: "5D557E269613AAD1" + item: "gtceu:hp_steam_compressor" + type: "item" + }] + x: -1.0d + y: 0.5d + } + { + id: "011EC2CE0111C9A0" + tasks: [{ + id: "7A1C685F48E09F6B" + item: "gtceu:hp_steam_furnace" + type: "item" + }] + x: 1.0d + y: 0.5d + } + { + id: "2BC4477CF9DA0243" + tasks: [{ + id: "6A698D0532478E17" + item: "gtceu:hp_steam_forge_hammer" + type: "item" + }] + x: 0.0d + y: 0.5d + } + { + id: "26A2AB5D93993A35" + tasks: [{ + id: "18A285342E8BB681" + item: "gtceu:hp_steam_alloy_smelter" + type: "item" + }] + x: -2.0d + y: 1.5d + } + { + id: "41F23E44E154C3E9" + tasks: [{ + id: "22542CDE2F0C0524" + item: "gtceu:hp_steam_rock_crusher" + type: "item" + }] + x: -1.0d + y: 1.5d + } + ] + title: "Steel Age" +} diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index f90bb9303..f15690c11 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -749,17 +749,6 @@ const registerGTCEURecipes = (event) => { //#region Forge Hammers - event.shaped('gtceu:lp_steam_forge_hammer', [ - 'ABA', - 'ACA', - 'ADA' - ], { - A: 'gtceu:bronze_small_fluid_pipe', - B: '#forge:pistons', - C: 'gtceu:bronze_machine_casing', - D: 'tfc:metal/anvil/wrought_iron' - }).id('gtceu:shaped/steam_hammer_bronze') - event.shaped('gtceu:lv_forge_hammer', [ 'ABA', 'CDC', @@ -954,6 +943,23 @@ const registerGTCEURecipes = (event) => { //#endregion + //#region Выход: Бронзовые машины + + event.remove({ id: 'gtceu:shaped/steam_boiler_coal_bronze' }) + event.remove({ id: 'gtceu:shaped/steam_boiler_lava_bronze' }) + event.remove({ id: 'gtceu:shaped/steam_extractor_bronze' }) + event.remove({ id: 'gtceu:shaped/steam_macerator_bronze' }) + event.remove({ id: 'gtceu:shaped/steam_compressor_bronze' }) + event.remove({ id: 'gtceu:shaped/steam_hammer_bronze' }) + event.remove({ id: 'gtceu:shaped/steam_furnace_bronze' }) + event.remove({ id: 'gtceu:shaped/steam_alloy_smelter_bronze' }) + event.remove({ id: 'gtceu:shaped/steam_rock_breaker_bronze' }) + event.remove({ id: 'gtceu:shaped/steam_miner' }) + event.remove({ id: 'gtceu:shaped/bronze_bricks_hull' }) + event.remove({ id: 'gtceu:shaped/bronze_hull' }) + + //#endregion + // Удаление рецептов связанных с Primitive Blast Furnace event.remove({id: 'gtceu:arc_furnace/arc_primitive_blast_furnace'}) event.remove({id: 'gtceu:macerator/macerate_primitive_blast_furnace'}) @@ -996,17 +1002,6 @@ const registerGTCEURecipes = (event) => { .duration(15) .EUt(2) - // Bronze Steam Furnace - event.shaped('gtceu:lp_steam_furnace', [ - 'AAA', - 'ABA', - 'ACA' - ], { - A: 'gtceu:bronze_small_fluid_pipe', - B: 'gtceu:bronze_brick_casing', - C: 'tfc:blast_furnace' - }).id('gtceu:shaped/steam_furnace_bronze') - // Steel Steam Boiler event.shaped('gtceu:hp_steam_solid_boiler', [ 'AAA', @@ -1019,29 +1014,6 @@ const registerGTCEURecipes = (event) => { D: 'tfc:blast_furnace' }).id('gtceu:shaped/steam_boiler_coal_steel') - // Bronze Steam Boiler - event.shaped('gtceu:lp_steam_solid_boiler', [ - 'AAA', - 'ACA', - 'BDB' - ], { - A: '#forge:plates/bronze', - B: 'minecraft:bricks', - C: '#forge:tools/wrenches', - D: 'tfc:blast_furnace' - }).id('gtceu:shaped/steam_boiler_coal_bronze') - - // Bronze Alloy Smelter - event.shaped('gtceu:lp_steam_alloy_smelter', [ - 'AAA', - 'BCB', - 'AAA' - ], { - A: 'gtceu:bronze_small_fluid_pipe', - B: 'tfc:blast_furnace', - C: 'gtceu:bronze_brick_casing' - }).id('gtceu:shaped/steam_alloy_smelter_bronze') - // Multi-Smelter event.shaped('gtceu:multi_smelter', [ 'AAA', diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index 5213f2e76..2b9fde612 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -6,6 +6,20 @@ global.GTCEU_DISABLED_ITEMS = [ 'gtceu:wheat_small_dust', 'gtceu:wheat_tiny_dust', + // Bronze Machines + 'gtceu:bronze_machine_casing', + 'gtceu:bronze_brick_casing', + 'gtceu:steam_miner', + 'gtceu:lp_steam_solid_boiler', + 'gtceu:lp_steam_liquid_boiler', + 'gtceu:lp_steam_extractor', + 'gtceu:lp_steam_macerator', + 'gtceu:lp_steam_compressor', + 'gtceu:lp_steam_forge_hammer', + 'gtceu:lp_steam_furnace', + 'gtceu:lp_steam_alloy_smelter', + 'gtceu:lp_steam_rock_crusher', + // Другое 'gtceu:flint_mortar', 'gtceu:flint_knife', @@ -27,5 +41,5 @@ global.GTCEU_DISABLED_ITEMS = [ 'gtceu:rubber_sapling', 'gtceu:rubber_log', 'gtceu:rubber_leaves', - 'gtceu:rubber_planks' + 'gtceu:rubber_planks', ]; \ No newline at end of file