From 85a6548d9a076993fb39e96b9457c452ea79f6ca Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 18 Feb 2026 20:24:44 +0000 Subject: [PATCH] make a bunch of quests optional, remove steam extractor --- .../quests/chapters/create_logistics.snbt | 26 ++++++++--- .../quests/chapters/lv__low_voltage.snbt | 8 ++-- .../quests/chapters/questssteam_age.snbt | 43 +++++++++---------- .../quests/chapters/tips__tools.snbt | 1 + .../gregtech/recipes.machines.js | 14 ------ kubejs/startup_scripts/gtceu/constants.js | 3 +- 6 files changed, 48 insertions(+), 47 deletions(-) diff --git a/config/ftbquests/quests/chapters/create_logistics.snbt b/config/ftbquests/quests/chapters/create_logistics.snbt index 914590ae0..f3f9eda38 100644 --- a/config/ftbquests/quests/chapters/create_logistics.snbt +++ b/config/ftbquests/quests/chapters/create_logistics.snbt @@ -43,6 +43,7 @@ "{quests.create_logistics.packager.desc.2}" ] id: "09D5BD00E3308E76" + optional: true size: 2.0d subtitle: "{quests.create_logistics.packager.subtitle}" tasks: [{ @@ -58,6 +59,7 @@ dependencies: ["09D5BD00E3308E76"] description: ["{quests.create_logistics.package_filter.desc}"] id: "0076B09B874EF126" + optional: true subtitle: "{quests.create_logistics.package_filter.subtitle}" tasks: [{ id: "56A7B04680CCC397" @@ -77,6 +79,7 @@ ] id: "43B4236DB93BC425" min_required_dependencies: 1 + optional: true subtitle: "{quests.create_logistics.frogport.subtitle}" tasks: [{ id: "795EBF0807564441" @@ -95,6 +98,7 @@ "{quests.create_logistics.postbox.desc.2}" ] id: "175CE4FE780E9994" + optional: true subtitle: "{quests.create_logistics.postbox.subtitle}" tasks: [{ id: "63CFD63E38058034" @@ -138,6 +142,7 @@ description: ["{quests.create_logistics.rose_quartz_lens.desc}"] icon: "greate:rose_quartz_lens" id: "7C4807A247AF36A1" + optional: true shape: "octagon" size: 2.0d subtitle: "{quests.create_logistics.rose_quartz_lens.subtitle}" @@ -162,6 +167,7 @@ description: ["{quests.create_logistics.rose_quartz.desc}"] icon: "gtceu:overworld_marker" id: "3137824EEA1E4D9B" + optional: true subtitle: "{quests.create_logistics.rose_quartz.subtitle}" tasks: [{ id: "2764C09EC03449D6" @@ -216,6 +222,7 @@ dependency_requirement: "one_completed" description: ["{quests.create_logistics.stock_link.desc}"] id: "76490E046A44BCC3" + optional: true size: 2.0d subtitle: "{quests.create_logistics.stock_link.subtitle}" tasks: [{ @@ -241,6 +248,9 @@ "{quests.create_logistics.stock_ticker.desc.3}" ] id: "341E2F290344BEEE" + optional: true + shape: "gear" + size: 3.0d subtitle: "{quests.create_logistics.stock_ticker.subtitle}" tasks: [{ id: "6D34CC70CB8465EF" @@ -248,8 +258,8 @@ type: "item" }] title: "{quests.create_logistics.stock_ticker.title}" - x: 8.5d - y: -2.5d + x: 8.0d + y: -1.0d } { dependencies: [ @@ -259,6 +269,7 @@ dependency_requirement: "one_completed" description: ["{quests.create_logistics.redstone_requester.desc}"] id: "3F44CFF8A6018F3E" + optional: true subtitle: "{quests.create_logistics.redstone_requester.subtitle}" tasks: [{ id: "3A3E75B8A2755E29" @@ -266,8 +277,8 @@ type: "item" }] title: "{quests.create_logistics.redstone_requester.title}" - x: 8.5d - y: 0.5d + x: 7.5d + y: -3.5d } { dependencies: [ @@ -285,6 +296,7 @@ "{quests.create_logistics.factory_gauge.desc.4}" ] id: "2262F1FD4EAB777F" + optional: true shape: "gear" size: 3.0d subtitle: "{quests.create_logistics.factory_gauge.subtitle}" @@ -313,6 +325,7 @@ "{quests.create_logistics.tablecloths.desc.2}" ] id: "546FC3BD93E54913" + optional: true subtitle: "{quests.create_logistics.tablecloths.subtitle}" tasks: [{ id: "75930EC6F9139FD5" @@ -320,13 +333,14 @@ type: "item" }] title: "{quests.create_logistics.tablecloths.title}" - x: 8.5d - y: -1.0d + x: 8.0d + y: 1.5d } { dependencies: ["09D5BD00E3308E76"] description: ["{quests.create_logistics.bottler.desc}"] id: "487D05818B3E9D19" + optional: true subtitle: "{quests.create_logistics.bottler.subtitle}" tasks: [{ id: "3D6CCC6C3853CD9C" diff --git a/config/ftbquests/quests/chapters/lv__low_voltage.snbt b/config/ftbquests/quests/chapters/lv__low_voltage.snbt index 1c6a03d73..15cb9ec5a 100644 --- a/config/ftbquests/quests/chapters/lv__low_voltage.snbt +++ b/config/ftbquests/quests/chapters/lv__low_voltage.snbt @@ -797,6 +797,7 @@ description: ["{quests.low_voltage.soldering_alloy.desc}"] icon: "gtceu:soldering_alloy_bucket" id: "713C8D6A20BF3A0E" + optional: true shape: "square" size: 1.0d subtitle: "{quests.low_voltage.soldering_alloy.subtitle}" @@ -1966,14 +1967,12 @@ y: 4.0d } { - dependencies: [ - "713C8D6A20BF3A0E" - "7C4807A247AF36A1" - ] + dependencies: ["7C4807A247AF36A1"] dependency_requirement: "one_completed" description: ["{quests.create_logistics.stock_link.desc}"] disable_toast: true id: "50FE830DA6F403B2" + optional: true subtitle: "{quests.create_logistics.stock_link.subtitle}" tasks: [{ id: "7B71B5DBEFD84C1F" @@ -1987,6 +1986,7 @@ { description: ["{quests.low_voltage.lv_laser_engraver.desc}"] id: "383A14A5C65B3ADF" + optional: true subtitle: "{quests.low_voltage.lv_laser_engraver.subtitle}" tasks: [{ id: "4CB619C294C16642" diff --git a/config/ftbquests/quests/chapters/questssteam_age.snbt b/config/ftbquests/quests/chapters/questssteam_age.snbt index e2a860202..02e619aed 100644 --- a/config/ftbquests/quests/chapters/questssteam_age.snbt +++ b/config/ftbquests/quests/chapters/questssteam_age.snbt @@ -55,6 +55,7 @@ { id: "65E0B13E245D2E5F" linked_quest: "379F434116632A89" + shape: "heart" x: -24.5d y: 1.0d } @@ -76,8 +77,8 @@ id: "61DCD50394B7FF0E" linked_quest: "33263404ED38C6D2" shape: "heart" - x: -22.5d - y: 4.0d + x: -16.5d + y: 4.5d } { id: "6C8C3BBD2BA9853B" @@ -119,6 +120,7 @@ "{quests.steam_age.horse_crank.desc.2}" ] id: "1059288C22CB56BB" + optional: true subtitle: "{quests.steam_age.horse_crank.subtitle}" tasks: [{ id: "1F3EE2CB3B8875EC" @@ -180,6 +182,7 @@ dependencies: ["0D0D461AE3A3F7BF"] description: ["{quests.steam_age.water_wheel.desc}"] id: "61DDB00751D1E7CB" + optional: true subtitle: "{quests.steam_age.water_wheel.subtitle}" tasks: [{ id: "1D82D22878EE6D21" @@ -194,6 +197,7 @@ dependencies: ["0D0D461AE3A3F7BF"] description: ["{quests.steam_age.windmill.desc}"] id: "617E0AFB7BA3D7A8" + optional: true subtitle: "{quests.steam_age.windmill.subtitle}" tasks: [ { @@ -234,6 +238,8 @@ ] description: ["{quests.steam_age.steel_encased_fan.desc}"] id: "616E28977F3216D9" + optional: true + shape: "heart" subtitle: "{quests.steam_age.steel_encased_fan.subtitle}" tasks: [{ id: "32279C21D7553637" @@ -295,7 +301,8 @@ dependencies: ["32046292AA5B0E30"] description: ["{quests.steam_age.steam_engine.desc}"] id: "183D47F04CAEBFA7" - size: 1.5d + optional: true + shape: "heart" subtitle: "{quests.steam_age.steam_engine.subtitle}" tasks: [ { @@ -318,11 +325,13 @@ dependencies: ["7F14D2A34F480ACA"] description: ["{quests.steam_age.mechanical_saw.desc}"] id: "069825FBCFB0FB9C" + optional: true rewards: [{ id: "64CA1397D201AF37" item: "create:filter" type: "item" }] + shape: "heart" subtitle: "{quests.steam_age.mechanical_saw.subtitle}" tasks: [{ id: "5005121E0361DBD2" @@ -337,6 +346,8 @@ dependencies: ["7F14D2A34F480ACA"] description: ["{quests.steam_age.mechanical_harvester.desc}"] id: "76871B4CEEEC70B8" + optional: true + shape: "heart" subtitle: "{quests.steam_age.mechanical_harvester.subtitle}" tasks: [{ id: "34092F5FBDFB9761" @@ -431,6 +442,7 @@ description: ["{quests.steam_age.steel_millstone.desc}"] hide_dependent_lines: true id: "5E4FC017E09ACF44" + optional: true subtitle: "{quests.steam_age.steel_millstone.subtitle}" tasks: [{ id: "3E3D4CD3283461DE" @@ -664,7 +676,7 @@ ] title: "{quests.steam_age.steam_bloomery.title}" x: -16.5d - y: 5.5d + y: 6.5d } { dependencies: ["05CC8C5E63CD1DB8"] @@ -810,23 +822,6 @@ x: -16.5d y: 11.5d } - { - dependencies: ["46FA9DD4755A5548"] - description: ["{quests.steam_age.extractor.desc}"] - id: "1DF4DBE41BB0B6FD" - optional: true - shape: "heart" - size: 1.0d - subtitle: "{quests.steam_age.extractor.subtitle}" - tasks: [{ - id: "5C84856667925F76" - item: "gtceu:hp_steam_extractor" - type: "item" - }] - title: "{quests.steam_age.extractor.title}" - x: -16.5d - y: 6.5d - } { dependencies: [ "6FFD4990FF07078A" @@ -1117,6 +1112,7 @@ ] icon: "gtceu:bronze_normal_fluid_pipe" id: "0109231F33296868" + optional: true size: 1.0d subtitle: "{quests.steam_age.fluid_pipes.subtitle}" tasks: [ @@ -1163,6 +1159,7 @@ "ftbfiltersystem:filter": "or(item(gtceu:bronze_drum)item(gtceu:steel_drum)item(gtceu:aluminium_drum)item(gtceu:stainless_steel_drum)item(gtceu:gold_drum)item(gtceu:titanium_drum)item(gtceu:tungsten_steel_drum))" } } + title: "{quests.tasktype.item.any}" type: "item" }] title: "{quests.steam_age.fluid_drums.title}" @@ -1632,7 +1629,6 @@ dependencies: ["32046292AA5B0E30"] description: ["{quests.steam_age.rotation_speed_controller.desc}"] id: "414835BADD34513F" - optional: true subtitle: "{quests.steam_age.rotation_speed_controller.subtitle}" tasks: [{ id: "74770DF964D26059" @@ -1757,6 +1753,7 @@ description: ["{quests.steam_age.fuel_sources.desc}"] icon: "createdeco:decal_fire" id: "753A53733C6DFA04" + optional: true shape: "circle" subtitle: "{quests.steam_age.fuel_sources.subtitle}" tasks: [{ @@ -1771,6 +1768,8 @@ dependencies: ["32046292AA5B0E30"] description: ["{quests.steam_age.large_water_wheel.desc}"] id: "56A068A5488CB273" + optional: true + shape: "heart" subtitle: "{quests.steam_age.large_water_wheel.subtitle}" tasks: [{ id: "5772AD3BB700FD84" diff --git a/config/ftbquests/quests/chapters/tips__tools.snbt b/config/ftbquests/quests/chapters/tips__tools.snbt index ad66df862..b8b0ed605 100644 --- a/config/ftbquests/quests/chapters/tips__tools.snbt +++ b/config/ftbquests/quests/chapters/tips__tools.snbt @@ -2737,6 +2737,7 @@ } } id: "379F434116632A89" + optional: true shape: "octagon" size: 2.0d subtitle: "{quests.tfg_tips.tools_tips.mattocks.subtitle}" diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js index 89709a1e6..0827e51f4 100644 --- a/kubejs/server_scripts/gregtech/recipes.machines.js +++ b/kubejs/server_scripts/gregtech/recipes.machines.js @@ -326,20 +326,6 @@ function registerGTCEuMachineRecipes(event) { // #region Other steam machines - removeMaceratorRecipe(event, 'macerate_hp_steam_extractor') - event.recipes.gtceu.shaped('gtceu:hp_steam_extractor', [ - 'BEB', - 'CAC', - 'DFD' - ], { - A: 'gtceu:steel_brick_casing', - B: ChemicalHelper.get(TagPrefix.pipeSmallFluid, GTMaterials.TinAlloy, 1), - C: ChemicalHelper.get(TagPrefix.plate, GTMaterials.Steel, 1), - D: ChemicalHelper.get(TagPrefix.plate, GTMaterials.WroughtIron, 1), - E: '#forge:glass_panes', - F: ChemicalHelper.get(TagPrefix.ring, GTMaterials.BlackSteel, 1) - }).addMaterialInfo().id('gtceu:shaped/steam_extractor_steel') - removeMaceratorRecipe(event, 'macerate_hp_steam_macerator') event.recipes.gtceu.shaped('gtceu:hp_steam_macerator', [ 'BFB', diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index 8084f8658..2ace7e593 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -10,7 +10,7 @@ global.GTCEU_DISABLED_ITEMS = /** @type {const} */ ([ "gtceu:tiny_wheat_dust", "gtceu:dough", - // Bronze Machines + // Early Machines "gtceu:bronze_brick_casing", "gtceu:lp_steam_miner", "gtceu:lp_steam_extractor", @@ -24,6 +24,7 @@ global.GTCEU_DISABLED_ITEMS = /** @type {const} */ ([ "gtceu:lp_steam_liquid_boiler", "gtceu:lp_steam_solar_boiler", "gtceu:charcoal_pile_igniter", + "gtceu:hp_steam_extractor", // Fishers "gtceu:lv_fisher",