diff --git a/CHANGELOG.md b/CHANGELOG.md index 40a3fdc68..6824ae6e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,11 +10,9 @@ - Удалена примитивная помпа GTCEu. - Добавлено множество рецептов в миксере дублирующие рецепты бочки TFC. -- Исправлен рецепт лампы из TFC. - Добавлено больше рецептов для предметов TFC, через машины GTCEu. - Добавлено больше рецептов для предметов FirmaLife, через машины GTCEu. - Заменены бутылочки из Minecraft на TFC варианты. -- Добавлен TFC рецепт стеклодувки для стеклянной трубки из GTCEu. - Отключена механика рубки дерева топором GTCEu, сруб дерева все еще работает, потому что эта механика есть в TFC. - Исправлен баг, когда не тратилась прочность у ножа или косы во время сруба травы. - Добавлены JEI страницы переработки для бедных и богатых руд. @@ -42,6 +40,9 @@ - Скрыта категория в EMI, отражающая переработку в камнерезе, так как уже есть такая же из Create. - Исправлен баг, когда при первом входе на официальный сервер майнкрафт зависал на бесконечной загрузке. - Чуть увеличена частота спавна нефтеносного песка. +- Добавлен TFC рецепт стеклодувки для стеклянной трубки из GTCEu. +- Исправлен рецепт лампы из TFC. +- Изменены квесты в связи с разблокировкой бронзовых бойлеров. Теперь перейти в паровую эру можно с бронзы (правда, сделать машины из бронзы вы не сможете, хи-хи) ## [0.6.11] - 05.02.2024 ### Changes diff --git a/config/ftbquests/quests/chapters/primitive_age.snbt b/config/ftbquests/quests/chapters/primitive_age.snbt index cb94245e6..00079e64e 100644 --- a/config/ftbquests/quests/chapters/primitive_age.snbt +++ b/config/ftbquests/quests/chapters/primitive_age.snbt @@ -2307,46 +2307,6 @@ x: 22.5d y: 18.5d } - { - dependencies: ["445E060EF3300A49"] - description: [ - "The &dSolid Boiler&r is the only available Boiler for now, as the &aGlass&r needed for the others is not available just yet. You can get by with only one, but we would recommend making at least two." - "" - "Important: Boilers can explode! This still catches out &eexperienced GT players&r, so keep this warning in mind when setting your Boiler up." - "{@pagebreak}" - "Water does not gel well with &6high temperatures&r, and a &cSteam Explosion&r (Launch!) may occur under the following conditions:" - "" - "- The Boiler is &4overheating.&r Its temperature is indicated by the &cred bar&r in the GUI." - "...and..." - "- The Boiler does not have any &bwater&r. This is signified by the absence of a &bblue bar&r in the GUI." - "...AND..." - "- The Boiler receives water whilst &6both&r conditions are &2true&r." - "{@pagebreak}" - "You can avert catastrophe by filling the boiler with water before heating it up, and making sure the water supply is constant. The drain is slow - &b1 mB&r of Water boils into &7160 mB&r of Steam - so you shouldn't have to worry about running out." - "" - "The Boiler can auto eject steam on all its faces except the bottom. For automated Water input, use the bottom face." - "" - "&3Note:&r In this modpack, explosions are configured to &cnot&r damage any block or entity, but you'll &dstill lose&r your machine." - "" - "You may recall that regular Steam machines had a duration penalty, and were twice as slow. Not great." - "" - "&5High Pressure&r Steam machines no longer bear a &bduration penalty &rfor recipes, making them objective upgrades." - "" - "Make &eone&r of the proposed HP machines to complete this quest." - ] - id: "5C7B69F45F076A79" - shape: "gear" - size: 3.0d - subtitle: "Putting the Steam in Steam Age" - tasks: [{ - id: "2D2CDB71DF062E33" - item: "gtceu:hp_steam_solid_boiler" - type: "item" - }] - title: "Pressure Cookin'" - x: 24.5d - y: 24.0d - } { dependencies: ["6564CC704664FE81"] id: "0006D60580FCA6B7" @@ -5028,7 +4988,7 @@ } ] title: "Copper Waxing [WIP]" - x: -9.0d + x: -8.0d y: 0.0d } { @@ -5038,8 +4998,8 @@ title: "Cellar [WIP]" type: "checkmark" }] - x: -6.0d - y: 0.0d + x: -7.0d + y: -1.0d } { id: "13C1E19024011698" @@ -5049,7 +5009,7 @@ type: "checkmark" }] x: -7.0d - y: 0.0d + y: 1.0d } { id: "260CCACEAE35BFDC" @@ -5058,9 +5018,49 @@ title: "Greenhouse [WIP]" type: "checkmark" }] - x: -8.0d + x: -7.0d y: 0.0d } + { + dependencies: ["4504EBE720145441"] + description: [ + "The &dSolid Boiler&r is the only available Boiler for now, as the &aGlass&r needed for the others is not available just yet. You can get by with only one, but we would recommend making at least two." + "" + "Important: Boilers can explode! This still catches out &eexperienced GT players&r, so keep this warning in mind when setting your Boiler up." + "{@pagebreak}" + "Water does not gel well with &6high temperatures&r, and a &cSteam Explosion&r (Launch!) may occur under the following conditions:" + "" + "- The Boiler is &4overheating.&r Its temperature is indicated by the &cred bar&r in the GUI." + "...and..." + "- The Boiler does not have any &bwater&r. This is signified by the absence of a &bblue bar&r in the GUI." + "...AND..." + "- The Boiler receives water whilst &6both&r conditions are &2true&r." + "{@pagebreak}" + "You can avert catastrophe by filling the boiler with water before heating it up, and making sure the water supply is constant. The drain is slow - &b1 mB&r of Water boils into &7160 mB&r of Steam - so you shouldn't have to worry about running out." + "" + "The Boiler can auto eject steam on all its faces except the bottom. For automated Water input, use the bottom face." + "" + "&3Note:&r In this modpack, explosions are configured to &cnot&r damage any block or entity, but you'll &dstill lose&r your machine." + "" + "You may recall that regular Steam machines had a duration penalty, and were twice as slow. Not great." + "" + "&5High Pressure&r Steam machines no longer bear a &bduration penalty &rfor recipes, making them objective upgrades." + "" + "Make &eone&r of the proposed HP machines to complete this quest." + ] + id: "3FB3EE093DDC6B56" + shape: "gear" + size: 3.0d + subtitle: "Putting the Steam in Steam Age" + tasks: [{ + id: "4DCB027DEC293E72" + item: "gtceu:bronze_brick_casing" + type: "item" + }] + title: "Pressure Cookin'" + x: 20.5d + y: 24.0d + } ] title: "Primitive Age" } diff --git a/config/ftbquests/quests/chapters/steam_age.snbt b/config/ftbquests/quests/chapters/steam_age.snbt index 2b33a56ab..595ead98a 100644 --- a/config/ftbquests/quests/chapters/steam_age.snbt +++ b/config/ftbquests/quests/chapters/steam_age.snbt @@ -7,14 +7,6 @@ id: "3B89FB8839204148" order_index: 1 quest_links: [ - { - id: "582A6B4135EABE27" - linked_quest: "5C7B69F45F076A79" - shape: "gear" - size: 3.0d - x: -3.0d - y: 0.0d - } { id: "1C86D83D29134EBE" linked_quest: "253860AD4DF4224C" @@ -51,6 +43,14 @@ x: -0.5d y: -3.0d } + { + id: "3426BCAE1210DAE4" + linked_quest: "3FB3EE093DDC6B56" + shape: "gear" + size: 3.0d + x: -7.5d + y: 0.0d + } ] quests: [ { @@ -102,7 +102,7 @@ y: -3.0d } { - dependencies: ["5C7B69F45F076A79"] + dependencies: ["3FB3EE093DDC6B56"] description: [ "&6GregTech&r can quickly get &4overwhelming&r with the plethora of fluids it introduces, so you may be looking for a way to store them. " "" @@ -126,11 +126,11 @@ type: "item" }] title: "Armoured Tanks" - x: -4.5d + x: -9.0d y: -3.0d } { - dependencies: ["5C7B69F45F076A79"] + dependencies: ["3F087862270F649A"] description: [ "Make the listed molds for future alloy smelting. Be sure to make &aMolds&r - don't make &cExtruder Shapes&r, as they're used in a different machine." "" @@ -244,7 +244,7 @@ y: 3.0d } { - dependencies: ["5C7B69F45F076A79"] + dependencies: ["3FB3EE093DDC6B56"] description: [ "&bFluid Pipes&r will transport &7Steam&r between machines for you." "" @@ -278,11 +278,11 @@ type: "item" }] title: "Fluid Pipes" - x: -2.0d + x: -7.5d y: -3.0d } { - dependencies: ["5C7B69F45F076A79"] + dependencies: ["3F087862270F649A"] description: [ "&dSteam Machines&r accept any Steam that is pumped from nearby Boilers into their internal storage tank. They will run recipes from JEI up to 32 EU/t (&7LV&r-tier)." "" @@ -437,7 +437,7 @@ type: "item" }] title: "Potin Seller..." - x: -2.0d + x: -7.5d y: -4.5d } { @@ -645,8 +645,8 @@ } ] title: "Steam Oven" - x: -8.5d - y: -1.5d + x: -6.0d + y: 4.5d } { dependencies: ["03DBF1961AE21C76"] @@ -721,37 +721,26 @@ y: 4.5d } { - dependencies: ["5C7B69F45F076A79"] + dependencies: ["3F087862270F649A"] id: "011EC2CE0111C9A0" tasks: [{ id: "7A1C685F48E09F6B" item: "gtceu:hp_steam_furnace" type: "item" }] - x: -7.0d - y: -1.5d + x: -6.0d + y: 3.0d } { - dependencies: ["5C7B69F45F076A79"] - id: "3D6E423744153954" - tasks: [{ - id: "2908168A0D5379D3" - item: "gtceu:hp_steam_liquid_boiler" - type: "item" - }] - x: -7.0d - y: 0.0d - } - { - dependencies: ["5C7B69F45F076A79"] + dependencies: ["3F087862270F649A"] id: "41F23E44E154C3E9" tasks: [{ id: "22542CDE2F0C0524" item: "gtceu:hp_steam_rock_crusher" type: "item" }] - x: -7.0d - y: 1.5d + x: -3.0d + y: 3.0d } { dependencies: [ @@ -768,6 +757,46 @@ x: 1.0d y: -3.0d } + { + dependencies: ["3FB3EE093DDC6B56"] + id: "7470E713F599B891" + tasks: [{ + id: "0DF1243A3267F636" + item: { + Count: 1b + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(gtceu:lp_steam_solid_boiler)item(gtceu:lp_steam_liquid_boiler)item(gtceu:lp_steam_solar_boiler))" + } + } + title: "Any Low Pressure Boiler" + type: "item" + }] + x: -6.0d + y: -3.0d + } + { + dependencies: [ + "3FB3EE093DDC6B56" + "445E060EF3300A49" + ] + id: "3F087862270F649A" + size: 2.0d + tasks: [{ + id: "0BBF678F5A0517D7" + item: { + Count: 1b + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(gtceu:hp_steam_solid_boiler)item(gtceu:hp_steam_liquid_boiler)item(gtceu:hp_steam_solar_boiler))" + } + } + title: "Any High Pressure Boiler" + type: "item" + }] + x: -4.5d + y: 0.0d + } ] subtitle: ["Harness the power of Steam and learn the basics"] title: "Steam Age" diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 8cfbd424c..8d7cd78e1 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -916,21 +916,54 @@ 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' }) + //#region Выход: Бронзовые машины (Плюс их декрафты) + event.remove({ id: 'gtceu:shaped/bronze_hull' }) - event.remove({ id: 'gtceu:shaped/steam_boiler_solar_bronze' }) + event.remove({ id: 'gtceu:arc_furnace/arc_bronze_machine_casing' }) + event.remove({ id: 'gtceu:macerator/macerate_bronze_machine_casing' }) + + event.remove({ id: 'gtceu:shaped/steam_extractor_bronze' }) + event.remove({ id: 'gtceu:arc_furnace/arc_lp_steam_extractor' }) + event.remove({ id: 'gtceu:macerator/macerate_lp_steam_extractor' }) + + event.remove({ id: 'gtceu:shaped/steam_macerator_bronze' }) + event.remove({ id: 'gtceu:arc_furnace/arc_lp_steam_macerator' }) + event.remove({ id: 'gtceu:macerator/macerate_lp_steam_macerator' }) + + event.remove({ id: 'gtceu:shaped/steam_compressor_bronze' }) + event.remove({ id: 'gtceu:arc_furnace/arc_lp_steam_compressor' }) + event.remove({ id: 'gtceu:macerator/macerate_lp_steam_compressor' }) + + event.remove({ id: 'gtceu:shaped/steam_hammer_bronze' }) + event.remove({ id: 'gtceu:arc_furnace/arc_lp_steam_forge_hammer' }) + event.remove({ id: 'gtceu:macerator/macerate_lp_steam_forge_hammer' }) + + event.remove({ id: 'gtceu:shaped/steam_furnace_bronze' }) + event.remove({ id: 'gtceu:arc_furnace/arc_lp_steam_furnace' }) + event.remove({ id: 'gtceu:macerator/macerate_lp_steam_furnace' }) + + event.remove({ id: 'gtceu:shaped/steam_alloy_smelter_bronze' }) + event.remove({ id: 'gtceu:arc_furnace/arc_lp_steam_alloy_smelter' }) + event.remove({ id: 'gtceu:macerator/macerate_lp_steam_alloy_smelter' }) + + event.remove({ id: 'gtceu:shaped/steam_rock_breaker_bronze' }) + event.remove({ id: 'gtceu:arc_furnace/arc_lp_steam_rock_crusher' }) + event.remove({ id: 'gtceu:macerator/macerate_lp_steam_rock_crusher' }) + + event.remove({ id: 'gtceu:shaped/steam_miner' }) + event.remove({ id: 'gtceu:arc_furnace/arc_steam_miner' }) + event.remove({ id: 'gtceu:macerator/macerate_steam_miner' }) + + // Low Pressure Steam Solid Boiler + event.shaped('gtceu:lp_steam_solid_boiler', [ + 'AAA', + 'ABA', + 'ACA' + ], { + A: '#forge:plates/bronze', + B: '#forge:tools/wrenches', + C: 'gtceu:bronze_brick_casing' + }).id('gtceu:shaped/steam_boiler_coal_bronze') //#endregion @@ -1040,27 +1073,35 @@ const registerGTCEURecipes = (event) => { //#endregion + //#region Стеклодувка + + // Glass Tube + event.recipes.tfc.glassworking('gtceu:glass_tube', '#tfc:glass_batches_tier_3', ['blow', 'stretch', 'stretch']) + .id('tfg:gtceu/glassworking/glass_tube') + + //#endregion + // Удаление рецептов связанных с Primitive Blast Furnace - event.remove({id: 'gtceu:arc_furnace/arc_primitive_blast_furnace'}) - event.remove({id: 'gtceu:macerator/macerate_primitive_blast_furnace'}) + event.remove({ id: 'gtceu:arc_furnace/arc_primitive_blast_furnace' }) + event.remove({ id: 'gtceu:macerator/macerate_primitive_blast_furnace' }) // Удаление рецептов связанных с Barrel - event.remove({id: 'gtceu:shaped/wooden_barrel'}) - event.remove({id: 'gtceu:assembler/wood_barrel'}) - event.remove({id: 'gtceu:arc_furnace/arc_wood_drum'}) - event.remove({id: 'gtceu:macerator/macerate_wood_drum'}) - + event.remove({ id: 'gtceu:shaped/wooden_barrel' }) + event.remove({ id: 'gtceu:assembler/wood_barrel' }) + event.remove({ id: 'gtceu:arc_furnace/arc_wood_drum' }) + event.remove({ id: 'gtceu:macerator/macerate_wood_drum' }) + // Удаление рецептов связанных с FireBricks - event.remove({id: 'gtceu:shaped/casing_primitive_bricks'}) - event.remove({id: 'gtceu:macerator/macerate_firebricks'}) - event.remove({id: 'gtceu:extractor/extract_primitive_bricks'}) + event.remove({id: 'gtceu:shaped/casing_primitive_bricks' }) + event.remove({id: 'gtceu:macerator/macerate_firebricks' }) + event.remove({id: 'gtceu:extractor/extract_primitive_bricks' }) // Удаление рецептов связанных с FireBrick - event.remove({id: 'gtceu:smelting/fireclay_brick'}) - event.remove({id: 'gtceu:macerator/macerate_firebrick'}) + event.remove({ id: 'gtceu:smelting/fireclay_brick' }) + event.remove({ id: 'gtceu:macerator/macerate_firebrick' }) - // Удалить после фикса GTCEu - event.remove({id: 'gtceu:extractor/extract_raw_rubber_dust'}) + // TODO: Удалить после фикса GTCEu + event.remove({ id: 'gtceu:extractor/extract_raw_rubber_dust' }) // Пыль звезды незера // TODO: удалить после имплементации ада diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index 4a07960f4..2f3423165 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -7,17 +7,14 @@ global.GTCEU_DISABLED_ITEMS = [ 'gtceu:tiny_wheat_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:bronze_machine_casing', + 'gtceu:steam_miner', + '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_furnace', + 'gtceu:lp_steam_alloy_smelter', 'gtceu:lp_steam_rock_crusher', // Другое