From 3a590aca60fcc2c45dbd95435d1c1d5ced6ffcb3 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 31 Dec 2025 23:59:28 +0000 Subject: [PATCH] Feature/steam multis (#2574) * init * langs? * more steam multis --- .../chapters/applied_energistics_2.snbt | 20 + .../quests/chapters/hv__high_voltage.snbt | 2 +- .../quests/chapters/lv__low_voltage.snbt | 30 +- .../quests/chapters/ore_processing.snbt | 20 +- .../quests/chapters/questssteam_age.snbt | 366 +++++++++++++----- kubejs/assets/gtceu/lang/en_us.json | 8 +- kubejs/assets/gtceu/lang/ja_jp.json | 4 +- kubejs/assets/gtceu/lang/ru_ru.json | 2 +- kubejs/assets/gtceu/lang/uk_ua.json | 4 +- kubejs/assets/gtceu/lang/zh_cn.json | 4 +- kubejs/assets/sandworm_mod/lang/en_us.json | 6 + .../tfg/blockstates/steam_bloomery.json | 19 + .../assets/tfg/blockstates/steam_fuser.json | 19 + .../assets/tfg/blockstates/steam_presser.json | 19 + .../tfg/blockstates/steam_squasher.json | 19 + .../blockstates/steam_thermal_centrifuge.json | 19 + kubejs/assets/tfg/lang/en_us.json | 19 +- kubejs/assets/tfg/lang/fr_fr.json | 2 +- kubejs/assets/tfg/lang/ru_ru.json | 2 +- .../models/block/machines/steam_bloomery.json | 86 ++++ .../models/block/machines/steam_fuser.json | 110 ++++++ .../models/block/machines/steam_presser.json | 86 ++++ .../models/block/machines/steam_squasher.json | 90 +++++ .../machines/steam_thermal_centrifuge.json | 110 ++++++ .../tfg/models/item/steam_bloomery.json | 3 + .../assets/tfg/models/item/steam_fuser.json | 3 + .../assets/tfg/models/item/steam_presser.json | 3 + .../tfg/models/item/steam_squasher.json | 3 + .../models/item/steam_thermal_centrifuge.json | 3 + .../steam_bloomery/overlay_front.png | Bin .../steam_bloomery/overlay_front_active.png | Bin .../overlay_front_active.png.mcmeta | 0 kubejs/client_scripts/tooltips.js | 28 +- kubejs/server_scripts/firmalife/recipes.js | 15 - .../gregtech/recipes.machines.js | 41 +- .../tfg/machines/recipes.multiblocks.js | 75 +++- .../tfg/natural_blocks/recipes.rocks.js | 2 - .../tfg/powergen/nuclear/recipes.nuclear.js | 1 - .../primitive/recipes.glue_and_chipboard.js | 59 ++- .../server_scripts/tfg/recipes.temporary.js | 1 + .../vintage_improvements/recipes.js | 2 +- kubejs/startup_scripts/gtceu/machines.js | 41 -- kubejs/startup_scripts/gtceu/recipe_types.js | 7 - kubejs/startup_scripts/tfg/blocks.js | 4 + 44 files changed, 1142 insertions(+), 215 deletions(-) create mode 100644 kubejs/assets/sandworm_mod/lang/en_us.json create mode 100644 kubejs/assets/tfg/blockstates/steam_bloomery.json create mode 100644 kubejs/assets/tfg/blockstates/steam_fuser.json create mode 100644 kubejs/assets/tfg/blockstates/steam_presser.json create mode 100644 kubejs/assets/tfg/blockstates/steam_squasher.json create mode 100644 kubejs/assets/tfg/blockstates/steam_thermal_centrifuge.json create mode 100644 kubejs/assets/tfg/models/block/machines/steam_bloomery.json create mode 100644 kubejs/assets/tfg/models/block/machines/steam_fuser.json create mode 100644 kubejs/assets/tfg/models/block/machines/steam_presser.json create mode 100644 kubejs/assets/tfg/models/block/machines/steam_squasher.json create mode 100644 kubejs/assets/tfg/models/block/machines/steam_thermal_centrifuge.json create mode 100644 kubejs/assets/tfg/models/item/steam_bloomery.json create mode 100644 kubejs/assets/tfg/models/item/steam_fuser.json create mode 100644 kubejs/assets/tfg/models/item/steam_presser.json create mode 100644 kubejs/assets/tfg/models/item/steam_squasher.json create mode 100644 kubejs/assets/tfg/models/item/steam_thermal_centrifuge.json rename kubejs/assets/tfg/textures/block/{ => machines}/steam_bloomery/overlay_front.png (100%) rename kubejs/assets/tfg/textures/block/{ => machines}/steam_bloomery/overlay_front_active.png (100%) rename kubejs/assets/tfg/textures/block/{ => machines}/steam_bloomery/overlay_front_active.png.mcmeta (100%) diff --git a/config/ftbquests/quests/chapters/applied_energistics_2.snbt b/config/ftbquests/quests/chapters/applied_energistics_2.snbt index 8a53c009a..86e58834a 100644 --- a/config/ftbquests/quests/chapters/applied_energistics_2.snbt +++ b/config/ftbquests/quests/chapters/applied_energistics_2.snbt @@ -1263,6 +1263,26 @@ x: 5.0d y: -3.5d } + { + dependencies: ["386C54268DA9F2BF"] + description: ["{quests.ae2.universal_circuits.desc}"] + id: "4F3B767032E0282F" + subtitle: "{quests.ae2.universal_circuits.subtitle}" + tasks: [{ + id: "7427AEBF61BFC772" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(tfg:ulv_universal_circuit)item(tfg:lv_universal_circuit)item(tfg:mv_universal_circuit)item(tfg:hv_universal_circuit)item(tfg:ev_universal_circuit)item(tfg:iv_universal_circuit)item(tfg:luv_universal_circuit)item(tfg:zpm_universal_circuit)item(tfg:uv_universal_circuit)item(tfg:uhv_universal_circuit))" + } + } + type: "item" + }] + title: "{quests.ae2.universal_circuits.title}" + x: -2.0d + y: -9.0d + } ] subtitle: ["{quests.ae2.subtitle}"] title: "{quests.ae2}" diff --git a/config/ftbquests/quests/chapters/hv__high_voltage.snbt b/config/ftbquests/quests/chapters/hv__high_voltage.snbt index cb45408b1..98dd688e6 100644 --- a/config/ftbquests/quests/chapters/hv__high_voltage.snbt +++ b/config/ftbquests/quests/chapters/hv__high_voltage.snbt @@ -441,7 +441,7 @@ icon: "gtceu:hv_circuit_assembler" id: "6B1595678ECB7AC8" shape: "octagon" - size: 3.0d + size: 1.5d subtitle: "{quests.high_voltage.circuit_assembler.subtitle}" tasks: [{ id: "337D8EF42A7BD3A2" diff --git a/config/ftbquests/quests/chapters/lv__low_voltage.snbt b/config/ftbquests/quests/chapters/lv__low_voltage.snbt index 09d2663e7..ceb6ee679 100644 --- a/config/ftbquests/quests/chapters/lv__low_voltage.snbt +++ b/config/ftbquests/quests/chapters/lv__low_voltage.snbt @@ -21,6 +21,18 @@ x: -8.0d y: 11.5d } + { + id: "46612C429BCA8A18" + linked_quest: "6BAC3BE1D4FE0F6B" + x: 7.5d + y: 4.0d + } + { + id: "5E5AD44B50E0B15B" + linked_quest: "31A6A236B6710B95" + x: 7.5d + y: 5.0d + } ] quests: [ { @@ -191,7 +203,7 @@ ] title: "{quests.low_voltage.lv_battery_preparation.title}" x: 7.5d - y: 0.0d + y: -0.5d } { dependencies: [ @@ -342,7 +354,11 @@ y: 2.5d } { - dependencies: ["6E186F9C57155BFA"] + dependencies: [ + "6E186F9C57155BFA" + "46FA9DD4755A5548" + ] + dependency_requirement: "one_completed" description: [ "{quests.low_voltage.lbb.desc.1}" "{@pagebreak}" @@ -474,7 +490,7 @@ }] title: "{quests.low_voltage.lv_battery.title}" x: 7.5d - y: 1.5d + y: 1.0d } { dependencies: ["3E6DC423FE4A99F7"] @@ -504,7 +520,7 @@ }] title: "{quests.low_voltage.lv_battery_buffer_4x.title}" x: 7.5d - y: 3.0d + y: 2.5d } { dependencies: ["1646BF9194100E57"] @@ -612,7 +628,7 @@ }] title: "{quests.low_voltage.lv_ore_prospector.title}" x: 9.0d - y: 1.5d + y: 1.0d } { dependencies: [ @@ -1217,7 +1233,7 @@ }] title: "{quests.low_voltage.lv_turbo_charge.title}" x: 9.0d - y: 0.0d + y: -0.5d } { dependencies: ["22510C5F2386B453"] @@ -1378,7 +1394,7 @@ type: "item" }] x: 9.0d - y: 3.0d + y: 2.5d } { dependencies: ["2CDB9778C7A30044"] diff --git a/config/ftbquests/quests/chapters/ore_processing.snbt b/config/ftbquests/quests/chapters/ore_processing.snbt index d09cdf899..b5b4c3520 100644 --- a/config/ftbquests/quests/chapters/ore_processing.snbt +++ b/config/ftbquests/quests/chapters/ore_processing.snbt @@ -19,7 +19,7 @@ image: "ftblibrary:icons/star" rotation: 0.0d width: 2.0d - x: -0.5d + x: -2.5d y: -6.5d } { @@ -484,10 +484,15 @@ y: -0.5d } { - dependencies: ["0F0525A70047EEB2"] + dependencies: [ + "0F0525A70047EEB2" + "701BCADAE5CF6CA5" + ] + dependency_requirement: "one_completed" description: ["{quests.ore_proc.thermal_centrifuge.desc}"] icon: "gtceu:lv_thermal_centrifuge" id: "6BAC3BE1D4FE0F6B" + optional: true subtitle: "{quests.ore_proc.thermal_centrifuge.subtitle}" tasks: [{ disable_toast: true @@ -496,7 +501,7 @@ Count: 1 id: "ftbfiltersystem:smart_filter" tag: { - "ftbfiltersystem:filter": "or(item(gtceu:lv_thermal_centrifuge)item(gtceu:mv_thermal_centrifuge)item(gtceu:hv_thermal_centrifuge)item(gtceu:ev_thermal_centrifuge)item(gtceu:iv_thermal_centrifuge)item(gtceu:luv_thermal_centrifuge)item(gtceu:zpm_thermal_centrifuge)item(gtceu:uv_thermal_centrifuge))" + "ftbfiltersystem:filter": "or(item(gtceu:lv_thermal_centrifuge)item(gtceu:mv_thermal_centrifuge)item(gtceu:hv_thermal_centrifuge)item(gtceu:ev_thermal_centrifuge)item(gtceu:iv_thermal_centrifuge)item(gtceu:luv_thermal_centrifuge)item(gtceu:zpm_thermal_centrifuge)item(gtceu:uv_thermal_centrifuge)item(tfg:steam_thermal_centrifuge))" } } title: "{quests.ore_proc.thermal_centrifuge.task}" @@ -507,10 +512,15 @@ y: -6.5d } { - dependencies: ["0F0525A70047EEB2"] + dependencies: [ + "0F0525A70047EEB2" + "701BCADAE5CF6CA5" + ] + dependency_requirement: "one_completed" description: ["{quests.ore_proc.sifter.desc}"] icon: "gtceu:lv_sifter" id: "31A6A236B6710B95" + optional: true subtitle: "{quests.ore_proc.sifter.subtitle}" tasks: [{ disable_toast: true @@ -519,7 +529,7 @@ Count: 1 id: "ftbfiltersystem:smart_filter" tag: { - "ftbfiltersystem:filter": "or(item(gtceu:lv_sifter)item(gtceu:mv_sifter)item(gtceu:hv_sifter)item(gtceu:ev_sifter)item(gtceu:iv_sifter)item(gtceu:luv_sifter)item(gtceu:zpm_sifter)item(gtceu:uv_sifter))" + "ftbfiltersystem:filter": "or(item(vintageimprovements:vibrating_table)item(gtceu:lv_sifter)item(gtceu:mv_sifter)item(gtceu:hv_sifter)item(gtceu:ev_sifter)item(gtceu:iv_sifter)item(gtceu:luv_sifter)item(gtceu:zpm_sifter)item(gtceu:uv_sifter))" } } title: "{quests.ore_proc.sifter.task}" diff --git a/config/ftbquests/quests/chapters/questssteam_age.snbt b/config/ftbquests/quests/chapters/questssteam_age.snbt index 327213c5f..43bdf0a82 100644 --- a/config/ftbquests/quests/chapters/questssteam_age.snbt +++ b/config/ftbquests/quests/chapters/questssteam_age.snbt @@ -26,14 +26,14 @@ id: "0CE64B9914191C56" linked_quest: "6FFD4990FF07078A" shape: "diamond" - x: -11.5d - y: 9.5d + x: -9.5d + y: 11.5d } { id: "23A27702FF816291" linked_quest: "6903C72A254A7B08" - x: -14.5d - y: 6.0d + x: -12.5d + y: 8.0d } { id: "1F1E7097C015BE33" @@ -47,8 +47,8 @@ id: "7C03FE015586C652" linked_quest: "55213ACBF5F5D398" shape: "heart" - x: -15.0d - y: 13.0d + x: -12.0d + y: 16.0d } { id: "65E0B13E245D2E5F" @@ -60,15 +60,22 @@ id: "68F5E521F2DB0A86" linked_quest: "0404FBCC34011053" shape: "heart" - x: -14.0d - y: 13.0d + x: -13.0d + y: 16.0d } { id: "38ECA3FEC2B6A6A6" linked_quest: "533F32CCAD9D5B51" shape: "heart" - x: -19.5d - y: 11.5d + x: -18.5d + y: 12.5d + } + { + id: "61DCD50394B7FF0E" + linked_quest: "33263404ED38C6D2" + shape: "heart" + x: -22.5d + y: 4.0d } ] quests: [ @@ -267,7 +274,7 @@ }] title: "{quests.steam_age.boilers.title}" x: -19.5d - y: 7.5d + y: 6.75d } { dependencies: ["32046292AA5B0E30"] @@ -436,8 +443,8 @@ type: "item" }] title: "{quests.steam_age.crushing_wheel.title}" - x: -21.5d - y: 11.5d + x: -20.5d + y: 12.5d } { dependencies: ["7DB7AB5349218605"] @@ -460,10 +467,16 @@ item: "gtceu:treated_wood_plate" type: "item" } + { + id: "1497E51C6C204557" + item: "gtceu:treated_wood_normal_fluid_pipe" + optional_task: true + type: "item" + } ] title: "{quests.steam_age.treated_planks.title}" - x: -20.5d - y: 9.5d + x: -19.5d + y: 10.5d } { dependencies: [ @@ -483,7 +496,7 @@ }] title: "{quests.steam_age.electron_tube.title}" x: -19.5d - y: 14.5d + y: 15.0d } { dependencies: ["2C35D4E01AEC02AA"] @@ -509,14 +522,13 @@ } ] title: "{quests.steam_age.miner.title}" - x: -12.0d - y: 15.0d + x: -10.0d + y: 17.0d } { dependencies: [ "22E604DB7E7E87FB" "09E12A399EE0A628" - "1912758422EEB006" ] dependency_requirement: "one_completed" description: ["{quests.steam_age.glass_tube.desc}"] @@ -528,8 +540,8 @@ type: "item" }] title: "{quests.steam_age.glass_tube.title}" - x: -25.0d - y: 14.5d + x: -23.5d + y: 15.0d } { dependencies: ["033E74BC588E7EAD"] @@ -551,8 +563,8 @@ } ] title: "{quests.steam_age.deployers.title}" - x: -16.5d - y: 12.0d + x: -15.5d + y: 15.0d } { dependencies: ["1912758422EEB006"] @@ -574,8 +586,8 @@ } ] title: "{quests.steam_age.molding.title}" - x: -25.0d - y: 9.5d + x: -23.5d + y: 12.5d } { dependencies: ["033E74BC588E7EAD"] @@ -589,22 +601,22 @@ type: "item" }] title: "{quests.steam_age.mech_crafter.title}" - x: -20.5d - y: 12.0d + x: -19.5d + y: 12.5d } { dependencies: ["46FA9DD4755A5548"] description: ["{quests.steam_age.steam_bloomery.desc}"] - icon: "gtceu:steam_bloomery" + icon: "tfg:steam_bloomery" id: "0805CCABC8E7F6CF" optional: true shape: "heart" - size: 1.5d + size: 1.0d subtitle: "{quests.steam_age.steam_bloomery.subtitle}" tasks: [ { id: "72D748120CACABE2" - item: "gtceu:steam_bloomery" + item: "tfg:steam_bloomery" type: "item" } { @@ -630,8 +642,8 @@ } ] title: "{quests.steam_age.steam_bloomery.title}" - x: -22.5d - y: 4.0d + x: -16.5d + y: 5.5d } { dependencies: ["05CC8C5E63CD1DB8"] @@ -684,8 +696,8 @@ type: "item" }] title: "{quests.steam_age.circuit_boards.title}" - x: -11.5d - y: 8.5d + x: -9.5d + y: 10.5d } { dependencies: ["46FA9DD4755A5548"] @@ -699,8 +711,8 @@ type: "item" }] title: "{quests.steam_age.compressor.title}" - x: -19.5d - y: 9.5d + x: -16.5d + y: 8.5d } { dependencies: ["46FA9DD4755A5548"] @@ -716,7 +728,7 @@ }] title: "{quests.steam_age.alloy_smelter.title}" x: -22.5d - y: 9.5d + y: 8.5d } { dependencies: [ @@ -735,7 +747,7 @@ }] title: "{quests.steam_age.forge_hammer.title}" x: -22.5d - y: 8.0d + y: 6.5d } { dependencies: [ @@ -753,8 +765,8 @@ type: "item" }] title: "{quests.steam_age.vacuum_tubes.title}" - x: -10.0d - y: 12.0d + x: -8.0d + y: 14.0d } { dependencies: ["7DB7AB5349218605"] @@ -768,7 +780,7 @@ }] title: "{quests.steam_age.wood_plank.title}" x: -16.5d - y: 9.5d + y: 11.5d } { dependencies: ["46FA9DD4755A5548"] @@ -785,7 +797,7 @@ }] title: "{quests.steam_age.extractor.title}" x: -16.5d - y: 7.5d + y: 6.5d } { dependencies: [ @@ -804,8 +816,8 @@ type: "item" }] title: "{quests.steam_age.resistors.title}" - x: -7.0d - y: 9.5d + x: -5.0d + y: 11.5d } { dependencies: ["2C35D4E01AEC02AA"] @@ -820,8 +832,8 @@ type: "item" }] title: "{quests.steam_age.coiling_machine.title}" - x: -7.0d - y: 14.0d + x: -5.0d + y: 16.0d } { dependencies: ["2C35D4E01AEC02AA"] @@ -836,8 +848,8 @@ type: "item" }] title: "{quests.steam_age.steel_mixer.title}" - x: -7.0d - y: 12.5d + x: -5.0d + y: 14.5d } { dependencies: ["2C35D4E01AEC02AA"] @@ -851,8 +863,8 @@ type: "item" }] title: "{quests.steam_age.lathe.title}" - x: -8.0d - y: 15.0d + x: -6.0d + y: 17.0d } { dependencies: [ @@ -871,8 +883,8 @@ type: "item" }] title: "{quests.steam_age.centrifuge.title}" - x: -20.5d - y: 11.0d + x: -19.5d + y: 11.5d } { dependencies: [ @@ -889,8 +901,8 @@ type: "item" }] title: "{quests.steam_age.vibrating_table.title}" - x: -10.0d - y: 15.0d + x: -8.0d + y: 17.0d } { dependencies: ["2C35D4E01AEC02AA"] @@ -909,8 +921,8 @@ type: "item" }] title: "{quests.steam_age.rolling_mill.title}" - x: -7.0d - y: 11.0d + x: -5.0d + y: 13.0d } { dependencies: ["2C35D4E01AEC02AA"] @@ -924,8 +936,8 @@ type: "item" }] title: "{quests.steam_age.steel_saw.title}" - x: -9.0d - y: 15.0d + x: -7.0d + y: 17.0d } { dependencies: ["2C35D4E01AEC02AA"] @@ -939,8 +951,8 @@ type: "item" }] title: "{quests.steam_age.curving_press.title}" - x: -11.0d - y: 15.0d + x: -9.0d + y: 17.0d } { dependencies: [ @@ -956,7 +968,7 @@ type: "item" }] title: "{quests.steam_age.steam_furnace.title}" - x: -16.5d + x: -22.5d y: 5.5d } { @@ -1007,14 +1019,15 @@ } ] title: "{quests.steam_age.steam_oven.title}" - x: -16.5d - y: 4.0d + x: -24.5d + y: 5.5d } { dependencies: ["46FA9DD4755A5548"] description: ["{quests.steam_age.rock_crusher.desc}"] id: "2491CB5921B66446" optional: true + shape: "heart" subtitle: "{quests.steam_age.rock_crusher.subtitle}" tasks: [{ id: "5CA302572EF6D4E1" @@ -1022,8 +1035,8 @@ type: "item" }] title: "{quests.steam_age.rock_crusher.title}" - x: -22.5d - y: 7.0d + x: -16.5d + y: 7.5d } { dependencies: [ @@ -1060,7 +1073,7 @@ ] title: "{quests.steam_age.red_alloy.title}" x: -22.5d - y: 13.5d + y: 12.5d } { dependencies: ["51CBF7378FFAD514"] @@ -1149,8 +1162,8 @@ type: "item" }] title: "{quests.steam_age.potin.title}" - x: -5.5d - y: 12.5d + x: -3.5d + y: 14.5d } { dependencies: ["6F1BC99BE641B671"] @@ -1206,8 +1219,8 @@ } ] title: "{quests.steam_age.trains.title}" - x: -16.5d - y: 13.0d + x: -15.5d + y: 16.0d } { dependencies: ["6AA07588374B59AB"] @@ -1220,8 +1233,8 @@ type: "item" }] title: "{quests.steam_age.vacuum_chamber.title}" - x: -14.5d - y: 12.0d + x: -12.5d + y: 15.0d } { description: ["{quests.metal_age.black_steel_goodies.desc}"] @@ -1423,8 +1436,8 @@ type: "item" }] title: "{quests.steam_age.lv_circuit.title}" - x: -10.0d - y: 6.0d + x: -8.0d + y: 8.0d } { description: ["{quests.steam_age.paper.desc}"] @@ -1438,8 +1451,8 @@ type: "item" }] title: "{quests.steam_age.paper.title}" - x: -5.5d - y: 9.5d + x: -3.5d + y: 11.5d } { description: ["{quests.metal_age.bronze_goodies.desc}"] @@ -1520,6 +1533,7 @@ description: ["{quests.steam_age.steam_macerator.desc}"] id: "6CF7DCC996BACBFA" optional: true + shape: "heart" subtitle: "{quests.steam_age.steam_macerator.subtitle}" tasks: [{ id: "19146D7510558652" @@ -1528,7 +1542,7 @@ }] title: "{quests.steam_age.steam_macerator.title}" x: -22.5d - y: 6.0d + y: 7.5d } { dependencies: [ @@ -1537,18 +1551,42 @@ ] dependency_requirement: "one_completed" description: ["{quests.steam_age.steam_grinder.desc}"] + icon: "gtceu:steam_grinder" id: "0CC370A6FC56935B" optional: true shape: "heart" subtitle: "{quests.steam_age.steam_grinder.subtitle}" - tasks: [{ - id: "1CD61C4F273665DE" - item: "gtceu:steam_grinder" - type: "item" - }] + tasks: [ + { + id: "1CD61C4F273665DE" + item: "gtceu:steam_grinder" + type: "item" + } + { + count: 22L + id: "71D6716A2B985592" + item: { Count: 22, id: "gtceu:steam_machine_casing" } + type: "item" + } + { + id: "26D9013B4161E463" + item: "gtceu:steam_input_hatch" + type: "item" + } + { + id: "7D354B529103D126" + item: "gtceu:steam_input_bus" + type: "item" + } + { + id: "63B935735E346133" + item: "gtceu:steam_output_bus" + type: "item" + } + ] title: "{quests.steam_age.steam_grinder.title}" - x: -25.0d - y: 6.0d + x: -24.5d + y: 7.5d } { dependencies: ["32046292AA5B0E30"] @@ -1579,8 +1617,8 @@ type: "item" }] title: "{quests.steam_age.resin_boards.title}" - x: -13.5d - y: 9.5d + x: -11.5d + y: 11.5d } { dependencies: ["6E8CEE02CB5B678B"] @@ -1630,7 +1668,7 @@ }] title: "{quests.steam_age.packager.title}" x: -19.5d - y: 17.0d + y: 17.5d } { dependencies: [ @@ -1722,8 +1760,8 @@ type: "item" }] title: "{quests.steam_age.supers.title}" - x: -12.0d - y: 13.0d + x: -10.5d + y: 13.5d } { dependencies: ["0D0D461AE3A3F7BF"] @@ -1755,6 +1793,156 @@ x: -16.5d y: -2.0d } + { + dependencies: ["59F7F7A8C76DE31C"] + description: ["{quests.steam_age.steam_presser.desc}"] + icon: "tfg:steam_presser" + id: "65B6E2DACCF9159C" + optional: true + shape: "heart" + subtitle: "{quests.steam_age.steam_presser.subtitle}" + tasks: [ + { + id: "0AEC3F770A6166A4" + item: "tfg:steam_presser" + type: "item" + } + { + id: "5CC7BDBF599B405A" + item: "gtceu:steam_input_hatch" + type: "item" + } + { + id: "4998CA4B8DDF6E02" + item: "gtceu:steam_input_bus" + type: "item" + } + { + id: "31A69C679FC6F99A" + item: "gtceu:steam_output_bus" + type: "item" + } + { + count: 12L + id: "709D4C32D2F43ABD" + item: "gtceu:steam_machine_casing" + type: "item" + } + { + count: 4L + id: "559F1DA9AF2EC5C3" + item: { Count: 4, id: "gtceu:steel_machine_casing" } + type: "item" + } + { + count: 8L + id: "769C82179FD4F75B" + item: { Count: 8, id: "create:metal_girder" } + type: "item" + } + ] + title: "{quests.steam_age.steam_presser.title}" + x: -24.5d + y: 6.5d + } + { + dependencies: ["1912758422EEB006"] + description: ["{quests.steam_age.steam_fuser.desc}"] + icon: "tfg:steam_fuser" + id: "49F5B708E8F59ABF" + optional: true + shape: "heart" + subtitle: "{quests.steam_age.steam_fuser.subtitle}" + tasks: [ + { + id: "29EB9A9D81750312" + item: "tfg:steam_fuser" + type: "item" + } + { + id: "5496E814C911D5C1" + item: "gtceu:steam_input_hatch" + type: "item" + } + { + id: "40181C28B6560C94" + item: "gtceu:steam_output_bus" + type: "item" + } + { + id: "249376D261C69933" + item: "gtceu:steam_input_bus" + type: "item" + } + { + count: 8L + id: "790DDB716EAE9769" + item: { Count: 8, id: "gtceu:steam_machine_casing" } + type: "item" + } + { + count: 8L + id: "266BA05C0A212C6C" + item: { Count: 8, id: "gtceu:bronze_firebox_casing" } + type: "item" + } + ] + title: "{quests.steam_age.steam_fuser.title}" + x: -24.5d + y: 8.5d + } + { + dependencies: ["7DB7AB5349218605"] + description: ["{quests.steam_age.steam_squasher.desc}"] + icon: "tfg:steam_squasher" + id: "60399CB594078DE2" + optional: true + shape: "heart" + subtitle: "{quests.steam_age.steam_squasher.subtitle}" + tasks: [ + { + id: "74B02BED5D414B4C" + item: "tfg:steam_squasher" + type: "item" + } + { + id: "3BBEAD3334C1E3D0" + item: "gtceu:steam_input_hatch" + type: "item" + } + { + id: "6D8C5AA895D6DC15" + item: "gtceu:steam_output_bus" + type: "item" + } + { + id: "0D2DC79ED3C74B1F" + item: "gtceu:steam_input_bus" + type: "item" + } + { + count: 7L + id: "4BDAA78AC3C92713" + item: "gtceu:steam_machine_casing" + type: "item" + } + { + count: 3L + id: "4DFE7CD587BFFAB9" + item: { Count: 3, id: "gtceu:bronze_machine_casing" } + type: "item" + } + { + count: 6L + id: "7C5983298F614109" + item: { Count: 6, id: "gtceu:steel_frame" } + type: "item" + } + ] + title: "{quests.steam_age.steam_squasher.title}" + x: -14.5d + y: 8.5d + } ] subtitle: ["{quests.steam_age.subtitle}"] title: "{quests.steam_age}" diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index af50b8063..c385bb74a 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -2,7 +2,11 @@ "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", "block.bud_indicator": "%s Surface Bud", "block.gtceu.greenhouse": "Greenhouse", - "block.gtceu.steam_bloomery": "Steam Bloomery", + "block.tfg.steam_bloomery": "Steam Bloomery", + "block.tfg.steam_thermal_centrifuge": "Steam Thermal Centrifuge", + "block.tfg.steam_fuser": "Steam Fuser", + "block.tfg.steam_squasher": "Steam Squasher", + "block.tfg.steam_presser": "Steam Presser", "block.gtceu.large_solar_panel": "§9Large Solar Array MK I", "block.gtceu.large_solar_panel_tier2": "§bLarge Solar Array MK II", "block.gtceu.large_solar_panel_tier3": "§cLarge Solar Array MK III", @@ -66,7 +70,7 @@ "gtceu.tooltip.machine.steam_bloomery_1": "§7Upgrade your Bloomery with the power of Steam!§r", "gtceu.tooltip.machine.steam_bloomery_2": "§7Processes Iron-bearing Dusts or Ingots into Raw Iron Blooms.§r", "gtceu.tooltip.machine.steam_bloomery_3": "§7Fueling it with Coke or Anthracite will double the output.§r", - "gtceu.tooltip.machine.steam_bloomery_4": "§7Can process up to 8 recipes at once, which changes how much Steam is required.§r", + "gtceu.tooltip.machine.steam_parallel": "§7Can process up to 8 recipes at once, which changes how much Steam is required.§r", "gtceu.tooltip.machine.coal_liquefaction_tower_1": "§7Smoothie Maker§r", "gtceu.tooltip.machine.coal_liquefaction_tower_2": "§7Extracts gas and liquids from carbonic solids§r", "item.gtceu.tiny_wood_dust": "Tiny Pile of Softwood Pulp", diff --git a/kubejs/assets/gtceu/lang/ja_jp.json b/kubejs/assets/gtceu/lang/ja_jp.json index 92adeb03e..a63de7c45 100644 --- a/kubejs/assets/gtceu/lang/ja_jp.json +++ b/kubejs/assets/gtceu/lang/ja_jp.json @@ -2,7 +2,7 @@ "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", "block.bud_indicator": "%s Surface Bud", "block.gtceu.greenhouse": "電気温室", - "block.gtceu.steam_bloomery": "蒸気式塊鉄炉", + "block.tfg.steam_bloomery": "蒸気式塊鉄炉", "block.gtceu.large_solar_panel": "§9大型ソーラーアレイMK I", "block.gtceu.large_solar_panel_tier2": "§b大型ソーラーアレイMK II", "block.gtceu.large_solar_panel_tier3": "§c大型ソーラーアレイMK III", @@ -66,7 +66,7 @@ "gtceu.tooltip.machine.steam_bloomery_1": "§7Upgrade your Bloomery with the power of Steam!§r", "gtceu.tooltip.machine.steam_bloomery_2": "§7Processes Iron-bearing Dusts or Ingots into Raw Iron Blooms.§r", "gtceu.tooltip.machine.steam_bloomery_3": "§7Fueling it with Coke or Anthracite will double the output.§r", - "gtceu.tooltip.machine.steam_bloomery_4": "§7Can process up to 8 recipes at once, which changes how much Steam is required.§r", + "gtceu.tooltip.machine.steam_parallel": "§7Can process up to 8 recipes at once, which changes how much Steam is required.§r", "gtceu.tooltip.machine.coal_liquefaction_tower_1": "§7Smoothie Maker§r", "gtceu.tooltip.machine.coal_liquefaction_tower_2": "§7Extracts gas and liquids from carbonic solids§r", "item.gtceu.tiny_wood_dust": "極小の木のパルプ", diff --git a/kubejs/assets/gtceu/lang/ru_ru.json b/kubejs/assets/gtceu/lang/ru_ru.json index 254a2e60c..e3149ce5f 100644 --- a/kubejs/assets/gtceu/lang/ru_ru.json +++ b/kubejs/assets/gtceu/lang/ru_ru.json @@ -2,7 +2,7 @@ "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", "block.bud_indicator": "Поверхностная друза (%s)", "block.gtceu.greenhouse": "Теплица", - "block.gtceu.steam_bloomery": "Паровой сыродутный горн", + "block.tfg.steam_bloomery": "Паровой сыродутный горн", "block.gtceu.large_solar_panel": "§9Large Solar Array MK I", "block.gtceu.large_solar_panel_tier2": "§bLarge Solar Array MK II", "block.gtceu.large_solar_panel_tier3": "§cLarge Solar Array MK III", diff --git a/kubejs/assets/gtceu/lang/uk_ua.json b/kubejs/assets/gtceu/lang/uk_ua.json index ede196300..3792258f7 100644 --- a/kubejs/assets/gtceu/lang/uk_ua.json +++ b/kubejs/assets/gtceu/lang/uk_ua.json @@ -2,7 +2,7 @@ "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", "block.bud_indicator": "%s Поверхнева Друза", "block.gtceu.greenhouse": "Теплиця", - "block.gtceu.steam_bloomery": "Парова Сиродутна Піч", + "block.tfg.steam_bloomery": "Парова Сиродутна Піч", "block.gtceu.large_solar_panel": "§9Велика сонячна матриця MK I", "block.gtceu.large_solar_panel_tier2": "§bВелика сонячна матриця MK II", "block.gtceu.large_solar_panel_tier3": "§cВелика сонячна матриця MK III", @@ -66,7 +66,7 @@ "gtceu.tooltip.machine.steam_bloomery_1": "§7Покращуйте свою домницю силою пари!§r", "gtceu.tooltip.machine.steam_bloomery_2": "§7Переробляє пил або злитки, що містять залізо, у необроблені залізні криці.§r", "gtceu.tooltip.machine.steam_bloomery_3": "§7Використання коксу або антрациту як пального подвоїть продуктивність.§r", - "gtceu.tooltip.machine.steam_bloomery_4": "§7Може обробляти до 8 рецептів одночасно, що змінює кількість необхідної пари.§r", + "gtceu.tooltip.machine.steam_parallel": "§7Може обробляти до 8 рецептів одночасно, що змінює кількість необхідної пари.§r", "gtceu.tooltip.machine.coal_liquefaction_tower_1": "§7Фруктовий міксер§r", "gtceu.tooltip.machine.coal_liquefaction_tower_2": "§7Видобуває гази та рідини з вуглецевих твердих речовин§r", "item.gtceu.tiny_wood_dust": "Маленька купа хвойної целюлози", diff --git a/kubejs/assets/gtceu/lang/zh_cn.json b/kubejs/assets/gtceu/lang/zh_cn.json index 48a78abd1..4a094e0e3 100644 --- a/kubejs/assets/gtceu/lang/zh_cn.json +++ b/kubejs/assets/gtceu/lang/zh_cn.json @@ -2,7 +2,7 @@ "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", "block.bud_indicator": "%s 表面芽", "block.gtceu.greenhouse": "温室", - "block.gtceu.steam_bloomery": "蒸汽锻铁炉", + "block.tfg.steam_bloomery": "蒸汽锻铁炉", "block.gtceu.large_solar_panel": "§9大型太阳能阵列 MK I", "block.gtceu.large_solar_panel_tier2": "§b大型太阳能阵列 MK II", "block.gtceu.large_solar_panel_tier3": "§c大型太阳能阵列 MK III", @@ -66,7 +66,7 @@ "gtceu.tooltip.machine.steam_bloomery_1": "§7用蒸汽动力升级你的锻铁炉！§r", "gtceu.tooltip.machine.steam_bloomery_2": "§7将含铁矿粉或锭加工成生铁方坯。§r", "gtceu.tooltip.machine.steam_bloomery_3": "§7使用焦煤或无烟煤可倍增产量。§r", - "gtceu.tooltip.machine.steam_bloomery_4": "§7支持最多8组配方并行处理，相应调整蒸汽需求。§r", + "gtceu.tooltip.machine.steam_parallel": "§7支持最多8组配方并行处理，相应调整蒸汽需求。§r", "gtceu.tooltip.machine.coal_liquefaction_tower_1": "§7奶昔制造机§r", "gtceu.tooltip.machine.coal_liquefaction_tower_2": "§7从碳质固体中提取燃气和流体§r", "item.gtceu.tiny_wood_dust": "小撮软木浆", diff --git a/kubejs/assets/sandworm_mod/lang/en_us.json b/kubejs/assets/sandworm_mod/lang/en_us.json new file mode 100644 index 000000000..9281db3ff --- /dev/null +++ b/kubejs/assets/sandworm_mod/lang/en_us.json @@ -0,0 +1,6 @@ +{ + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "entity.sandworm_mod.worm_chain": "Sandworm", + "entity.sandworm_mod.worm_head_segment": "Sandworm Head", + "entity.sandworm_mod.worm_segment": "Sandworm Body" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/steam_bloomery.json b/kubejs/assets/tfg/blockstates/steam_bloomery.json new file mode 100644 index 000000000..c83f32133 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/steam_bloomery.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/steam_bloomery", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/steam_bloomery" + }, + "facing=south": { + "model": "tfg:block/machines/steam_bloomery", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/steam_bloomery", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/steam_fuser.json b/kubejs/assets/tfg/blockstates/steam_fuser.json new file mode 100644 index 000000000..eff6ab041 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/steam_fuser.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/steam_fuser", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/steam_fuser" + }, + "facing=south": { + "model": "tfg:block/machines/steam_fuser", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/steam_fuser", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/steam_presser.json b/kubejs/assets/tfg/blockstates/steam_presser.json new file mode 100644 index 000000000..30bb0ccd3 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/steam_presser.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/steam_presser", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/steam_presser" + }, + "facing=south": { + "model": "tfg:block/machines/steam_presser", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/steam_presser", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/steam_squasher.json b/kubejs/assets/tfg/blockstates/steam_squasher.json new file mode 100644 index 000000000..f1a4f1e21 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/steam_squasher.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/steam_squasher", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/steam_squasher" + }, + "facing=south": { + "model": "tfg:block/machines/steam_squasher", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/steam_squasher", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/steam_thermal_centrifuge.json b/kubejs/assets/tfg/blockstates/steam_thermal_centrifuge.json new file mode 100644 index 000000000..573435d86 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/steam_thermal_centrifuge.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/steam_thermal_centrifuge", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/steam_thermal_centrifuge" + }, + "facing=south": { + "model": "tfg:block/machines/steam_thermal_centrifuge", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/steam_thermal_centrifuge", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 081576af1..54e683aea 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -1857,7 +1857,7 @@ "quests.ae2.interplanetary_wireless.desc": "You can upgrade your Wireless Terminal with this special Card, allowing access to your network from any distance, even on different worlds! Sounds too good to be true? There's a major catch — transferring items uses a huge amount of energy.\n\nYou can sort of get around this with some Energy Cards and a battery in your inventory set to Discharge Mode, but it should work well enough for those times when you accidentally left something at your base on Earth and don't want to fly all the way back.\n\nFor proper automated transfer, you'll need a Railgun.", "quests.ae2.iv.title": "IV Tier AE2", "quests.ae2.iv.desc": "This entire branch becomes fully unlockable once you reach &1IV&r.", - "quests.ae2.accumulation_press.desc": "To get this &eNew Inscriber Press&r, you will need to invest a bit.\n\nFirst, you must upgrade your Implosion Compressor with &1two IV Energy Hatches&r.\n\nThen, get yourself a new IV Laser Engraver if you don't already have one.\n\nAnd finally, prepare a lot of Industrial TNT — it’s the &conly one that works&r for this process.\n\nPlan carefully, as this step is quite demanding!", + "quests.ae2.accumulation_press.desc": "To get this &eNew Inscriber Press&r, you will need to invest a bit.\n\nFirst, you must upgrade your Implosion Compressor with &5two EV Energy Hatches&r.\n\nThen, get yourself a new IV Laser Engraver if you don't already have one.\n\nAnd finally, prepare a lot of Industrial TNT — it’s the &conly one that works&r for this process.\n\nPlan carefully, as this step is quite demanding!", "quests.ae2.accumulation_processor.desc": "The &eAccumulation Processor&r will require a large amount of Silicon for each craft.\n\nWe hope you already have a dedicated EBF producing Silicon, or at least a strong infrastructure to manufacture it quickly.\n\nPrepare accordingly, as you’ll need plenty of it!", "quests.ae2.mega_crafting.desc": "These are a neat upgrade for your &bCrafting CPU&r.\n\nThey will help to speed up your auto-crafting and allow you to handle larger jobs with ease.", "quests.ae2.mega_battery.desc": "A &ebigger battery&r for a bigger network. Nothing else to it!", @@ -2582,7 +2582,7 @@ "quests.high_voltage.mv_superconductors.desc": "&a4A&r of &bMV&r energy transmission may be appealing, but you probably don't need these at this point. The option is always there if you need it.", "quests.high_voltage.circuit_assembler.title": "HV Circuit Assembler", "quests.high_voltage.circuit_assembler.subtitle": "You will need the Cleanroom before you can craft this one", - "quests.high_voltage.circuit_assembler.desc": "The next &3Circuit Assembler&r. This tier of Circuit Assembler is only required for one type of Circuit - your first ever &aMainframe&r. You may have only one use for them, the &5EV Circuit Assembler&r.\n\nYou can put this off until &5EV&r or simply just use it for faster circuits making.", + "quests.high_voltage.circuit_assembler.desc": "The next &3Circuit Assembler&r. This tier of Circuit Assembler is only required for one type of Circuit - your first ever &aMainframe&r. You may have only one use for them, the &5EV Circuit Assembler&r.\n\nOther than that, the HV Circuit Assembler is also required to make AE2's Processors.\n\nYou can put this off until &5EV&r or simply just use it for faster circuit making.", "quests.high_voltage.microprocessor_mainframe.title": "Mainframes - first IV Circuits!", "quests.high_voltage.microprocessor_mainframe.desc": "The first &1IV&r circuit. Congratulations on making it this far!\n\nThis will be used when you get to &5EV&r, or you can use it right now to craft an Advanced Nanosuit Chestplate, a big upgrade to your jetpack!.\n\n&l&3Lore:&r&o The original texture for the Mainframes was taken from an image of an IBM zEnterprise mainframe.", "quests.high_voltage.cleanroom.title": "The Cleanroom", @@ -2756,7 +2756,7 @@ "quests.low_voltage.lbb.title": "Large Bronze Boiler", "quests.low_voltage.lbb.subtitle": "Boom, boom, boom, boom", "quests.low_voltage.lbb.desc.1": "The &3Large Boiler&r is an &6optional&r big-boy variant of the Small Boilers. It runs off solid or liquid fuel.\n\nIf you want Steam-based power production, this is an alternative to the Create Steam Engine. Later power options are listed in the &bMV&r chapter.\n\nMake sure you set it up so it never runs out of water like your Small Boilers, otherwise it'll &cexplode&r!.", - "quests.low_voltage.lbb.desc.2": "Once fully heated up, the &3LBB&r produces 800 Steam per tick, which is &d400EU/t&r after conversion, or 12.5 Basic Steam Turbines. Such (relatively!) immense power comes at the cost of &la lot&r of burnable fuel. &5With this in consideration&r, the GUI lets you &9throttle&r the Boiler down to 25 percent power for 200 Steam per tick. That's &d100EU/t&r, or slightly above 3 Basic Steam Turbines.\n\nWe recommend holding off making this until you're ready to power your EBF.", + "quests.low_voltage.lbb.desc.2": "Once fully heated up, the &3LBB&r produces 800 Steam per tick, which is &d400EU/t&r after conversion, or 12.5 Basic Steam Turbines. Such (relatively!) immense power comes at the cost of &la lot&r of burnable fuel. &5With this in consideration&r, the GUI lets you &9throttle&r the Boiler down to 25 percent power for 200 Steam per tick. That's &d100EU/t&r, or slightly above 3 Basic Steam Turbines.\n\nWe recommend holding off making this until you're ready to power your EBF, or if you have a lot of steam multiblocks.", "quests.low_voltage.lbb.desc.3": "In TerraFirmaGreg, you have a few options for fuel. You can use a Hose Pulley to pull Lava out of a deep underground lake, or set up a tree farm into a coke oven for Charcoal and Creosote. Lastly, there are huge surface-level Coal veins that you can extract with some automated mining machines and turn into Coke and significantly more Creosote than charcoal.\n\nIf you go the tree farm route, you'll need three coke ovens to power a full-throttle LBB.", "quests.low_voltage.lv_polariser.title": "Basic Polarizer", "quests.low_voltage.lv_polariser.subtitle": "The Polarizer polarizes!", @@ -3493,7 +3493,7 @@ "quests.ore_proc.macerator_separator.task": "Any Macerator", "quests.ore_proc.thermal_centrifuge.title": "The Thermal Centrifuge", "quests.ore_proc.thermal_centrifuge.subtitle": "The go-to for most purified ores", - "quests.ore_proc.thermal_centrifuge.desc": "For all your other Purified Ores that doesn't need special treatment, it's best to run them through the &dThermal Centrifuge&r. This machine can produce byproducts at a reliable rate, while only using electricity. It's quite slow, however, so we suggest making multiple machines.", + "quests.ore_proc.thermal_centrifuge.desc": "For all your other Purified Ores that doesn't need special treatment, it's best to run them through the &dThermal Centrifuge&r. This machine can produce byproducts at a reliable rate, without needing any other ingredients. It's quite slow, however, so we suggest either making multiple machines or the steam parallel multiblock.", "quests.ore_proc.thermal_centrifuge.task": "Any Thermal Centrifuge", "quests.ore_proc.sifter.title": "The Sifter", "quests.ore_proc.sifter.subtitle": "The Skyblock Simulator", @@ -3790,7 +3790,7 @@ "quests.steam_age.steam_furnace.subtitle": "The Steam Furnace furnaces...", "quests.steam_age.steam_furnace.desc": "Want to quickly smelt something into an ingot? The &3Steam Furnace&r does just that! It can turn many ores and dusts quickly into their ingot form, at the expense of not getting any byproducts.", "quests.steam_age.steam_oven.title": "Steam Oven", - "quests.steam_age.steam_oven.subtitle": "The Steam Grinder's big brother", + "quests.steam_age.steam_oven.subtitle": "The Steam Furnace's big brother", "quests.steam_age.steam_oven.desc.1": "&o...or little brother. Don't let him know!&r\n\nThe &3Steam Oven&r is a great multiblock option if you need &6effortlessly smelt large quantities of items.&r No more lines of furnaces that you have to manually empty and refuel!\n\nIt effectively behaves as a parallel furnace, smelting up to 8 items at a time for a low cost of Steam.", "quests.steam_age.steam_oven.desc.2": "&l&3Lore:&r&o This Multiblock - despite being very similar to its brother, the Steam Grinder - isn't ported from a GregTech version or addon. Its actual progenitor is the Steam Oven from Railcraft, which dates back to 1.4.7!", "quests.steam_age.steam_macerator.title": "Steam Macerator", @@ -3931,6 +3931,15 @@ "quests.steam_age.supers.subtitle": "Super Storage Drawers", "quests.steam_age.supers.desc": "This is the &cu&6l&et&ai&bm&9a&5t&4e&r portable item and storage solution if you have a lot of single items or fluids. While these &dBasic&r (&8ULV&r) ones start out relatively small, higher tiers of Super chests and tanks can hold an insane amount of stuff - all in one single block without any regards to temperature or acidity!\n\nLike Drums, Super Tanks and Chests &6keep their contents when broken&r, can be cleared in the crafting grid, and can automatically void any overflow. Unlike drums, however, Super Tanks also &asafely contain&r their contents, preventing you from getting burnt, frozen, or floating.\n\nIf you hunger for &9even more&r storage, take a look at higher tier Quantum Chests and Tanks or AE2 Storage Cells.", "quests.steam_age.supers.task": "Any super chest or tank", + "quests.steam_age.steam_presser.title": "Steam Presser", + "quests.steam_age.steam_presser.subtitle": "The Steam Forge Hammer's aunt", + "quests.steam_age.steam_presser.desc": "The &3Steam Presser&r is a multiblock parallel version of the Forge Hammer.\n\nIf you're doing something where the forge hammer is a bottleneck, this upgrade might be useful. Otherwise, skip it.", + "quests.steam_age.steam_fuser.title": "Steam Fuser", + "quests.steam_age.steam_fuser.subtitle": "The Steam Alloy Smelter's cousin (twice removed)", + "quests.steam_age.steam_fuser.desc": "The &3Steam Fusor&r is a bigger and badder version of the Steam Alloy Smelter. Making a lot of alloys and need them fast? You'd like one of these!", + "quests.steam_age.steam_squasher.title": "Steam Squasher", + "quests.steam_age.steam_squasher.subtitle": "The Steam Compressor's childhood friend", + "quests.steam_age.steam_squasher.desc": "Need a lot of things compressed at the same time? The &3Steam Squasher&r is a multiblock parallel Compressor that may prove useful.", "quests.stone_age": "Stone Age", "quests.stone_age.subtitle": "Humble Beginnings", "quests.stone_age.foods.title": "Hungry?", diff --git a/kubejs/assets/tfg/lang/fr_fr.json b/kubejs/assets/tfg/lang/fr_fr.json index b8bbf9430..98e0fce23 100644 --- a/kubejs/assets/tfg/lang/fr_fr.json +++ b/kubejs/assets/tfg/lang/fr_fr.json @@ -1523,7 +1523,7 @@ "quests.ae2.interplanetary_wireless.desc": "You can upgrade your Wireless Terminal with this special Card, allowing access to your network from any distance, even on different worlds! Sounds too good to be true? There's a major catch — transferring items uses a huge amount of energy.\n\nYou can sort of get around this with some Energy Cards and a battery in your inventory set to Discharge Mode, but it should work well enough for those times when you accidentally left something at your base on Earth and don't want to fly all the way back.\n\nFor proper automated transfer, you'll need a Railgun.", "quests.ae2.iv.title": "IV Tier AE2", "quests.ae2.iv.desc": "This entire branch becomes fully unlockable once you reach &1IV&r.", - "quests.ae2.accumulation_press.desc": "To get this &eNew Inscriber Press&r, you will need to invest a bit.\n\nFirst, you must upgrade your Implosion Compressor with &1two IV Energy Hatches&r.\n\nThen, get yourself a new IV Laser Engraver if you don't already have one.\n\nAnd finally, prepare a lot of Industrial TNT — it’s the &conly one that works&r for this process.\n\nPlan carefully, as this step is quite demanding!", + "quests.ae2.accumulation_press.desc": "To get this &eNew Inscriber Press&r, you will need to invest a bit.\n\nFirst, you must upgrade your Implosion Compressor with &5two EV Energy Hatches&r.\n\nThen, get yourself a new IV Laser Engraver if you don't already have one.\n\nAnd finally, prepare a lot of Industrial TNT — it’s the &conly one that works&r for this process.\n\nPlan carefully, as this step is quite demanding!", "quests.ae2.accumulation_processor.desc": "The &eAccumulation Processor&r will require a large amount of Silicon for each craft.\n\nWe hope you already have a dedicated EBF producing Silicon, or at least a strong infrastructure to manufacture it quickly.\n\nPrepare accordingly, as you’ll need plenty of it!", "quests.ae2.mega_crafting.desc": "These are a neat upgrade for your &bCrafting CPU&r.\n\nThey will help to speed up your auto-crafting and allow you to handle larger jobs with ease.", "quests.ae2.mega_battery.desc": "A &ebigger battery&r for a bigger network. Nothing else to it!", diff --git a/kubejs/assets/tfg/lang/ru_ru.json b/kubejs/assets/tfg/lang/ru_ru.json index d061c354b..cc6f17ce8 100644 --- a/kubejs/assets/tfg/lang/ru_ru.json +++ b/kubejs/assets/tfg/lang/ru_ru.json @@ -1739,7 +1739,7 @@ "quests.ae2.interplanetary_wireless.desc": "You can upgrade your Wireless Terminal with this special Card, allowing access to your network from any distance, even on different worlds! Sounds too good to be true? There's a major catch — transferring items uses a huge amount of energy.\n\nYou can sort of get around this with some Energy Cards and a battery in your inventory set to Discharge Mode, but it should work well enough for those times when you accidentally left something at your base on Earth and don't want to fly all the way back.\n\nFor proper automated transfer, you'll need a Railgun.", "quests.ae2.iv.title": "IV Tier AE2", "quests.ae2.iv.desc": "This entire branch becomes fully unlockable once you reach &1IV&r.", - "quests.ae2.accumulation_press.desc": "To get this &eNew Inscriber Press&r, you will need to invest a bit.\n\nFirst, you must upgrade your Implosion Compressor with &1two IV Energy Hatches&r.\n\nThen, get yourself a new IV Laser Engraver if you don't already have one.\n\nAnd finally, prepare a lot of Industrial TNT — it’s the &conly one that works&r for this process.\n\nPlan carefully, as this step is quite demanding!", + "quests.ae2.accumulation_press.desc": "To get this &eNew Inscriber Press&r, you will need to invest a bit.\n\nFirst, you must upgrade your Implosion Compressor with &5two EV Energy Hatches&r.\n\nThen, get yourself a new IV Laser Engraver if you don't already have one.\n\nAnd finally, prepare a lot of Industrial TNT — it’s the &conly one that works&r for this process.\n\nPlan carefully, as this step is quite demanding!", "quests.ae2.accumulation_processor.desc": "The &eAccumulation Processor&r will require a large amount of Silicon for each craft.\n\nWe hope you already have a dedicated EBF producing Silicon, or at least a strong infrastructure to manufacture it quickly.\n\nPrepare accordingly, as you’ll need plenty of it!", "quests.ae2.mega_crafting.desc": "These are a neat upgrade for your &bCrafting CPU&r.\n\nThey will help to speed up your auto-crafting and allow you to handle larger jobs with ease.", "quests.ae2.mega_battery.desc": "A &ebigger battery&r for a bigger network. Nothing else to it!", diff --git a/kubejs/assets/tfg/models/block/machines/steam_bloomery.json b/kubejs/assets/tfg/models/block/machines/steam_bloomery.json new file mode 100644 index 000000000..5227238d0 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/steam_bloomery.json @@ -0,0 +1,86 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:steam_bloomery", + "texture_overrides": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks" + }, + "variants": { + "is_formed=false,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "tfg:block/machines/steam_bloomery/overlay_front" + } + } + }, + "is_formed=false,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "tfg:block/machines/steam_bloomery/overlay_front" + } + } + }, + "is_formed=false,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "tfg:block/machines/steam_bloomery/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/steam_bloomery/overlay_front_active" + } + } + }, + "is_formed=false,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "tfg:block/machines/steam_bloomery/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/steam_bloomery/overlay_front_active" + } + } + }, + "is_formed=true,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "tfg:block/machines/steam_bloomery/overlay_front" + } + } + }, + "is_formed=true,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "tfg:block/machines/steam_bloomery/overlay_front" + } + } + }, + "is_formed=true,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "tfg:block/machines/steam_bloomery/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/steam_bloomery/overlay_front_active" + } + } + }, + "is_formed=true,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "tfg:block/machines/steam_bloomery/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/steam_bloomery/overlay_front_active" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/steam_fuser.json b/kubejs/assets/tfg/models/block/machines/steam_fuser.json new file mode 100644 index 000000000..07f9b8670 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/steam_fuser.json @@ -0,0 +1,110 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:steam_fuser", + "texture_overrides": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks" + }, + "dynamic_renders": [ + { + "type": "gtceu:boiler_multi_parts", + "casing_block": { + "Name": "gtceu:steam_machine_casing" + }, + "firebox_active": { + "Name": "gtceu:bronze_firebox_casing", + "Properties": { + "active": "true" + } + }, + "firebox_idle": { + "Name": "gtceu:bronze_firebox_casing", + "Properties": { + "active": "false" + } + } + } + ], + "variants": { + "is_formed=false,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/alloy_smelter/overlay_front", + "overlay_front_emissive": "gtceu:block/machines/alloy_smelter/overlay_front_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/alloy_smelter/overlay_front_paused", + "overlay_front_emissive": "gtceu:block/machines/alloy_smelter/overlay_front_paused_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/alloy_smelter/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/alloy_smelter/overlay_front_active_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/alloy_smelter/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/alloy_smelter/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/alloy_smelter/overlay_front", + "overlay_front_emissive": "gtceu:block/machines/alloy_smelter/overlay_front_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/alloy_smelter/overlay_front_paused", + "overlay_front_emissive": "gtceu:block/machines/alloy_smelter/overlay_front_paused_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/alloy_smelter/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/alloy_smelter/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/alloy_smelter/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/alloy_smelter/overlay_front_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/steam_presser.json b/kubejs/assets/tfg/models/block/machines/steam_presser.json new file mode 100644 index 000000000..b088103a0 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/steam_presser.json @@ -0,0 +1,86 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:steam_presser", + "texture_overrides": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks" + }, + "variants": { + "is_formed=false,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/forge_hammer/overlay_front" + } + } + }, + "is_formed=false,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/forge_hammer/overlay_front" + } + } + }, + "is_formed=false,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/forge_hammer/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/forge_hammer/overlay_front_active_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/forge_hammer/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/forge_hammer/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/forge_hammer/overlay_front" + } + } + }, + "is_formed=true,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/forge_hammer/overlay_front" + } + } + }, + "is_formed=true,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/forge_hammer/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/forge_hammer/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/forge_hammer/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/forge_hammer/overlay_front_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/steam_squasher.json b/kubejs/assets/tfg/models/block/machines/steam_squasher.json new file mode 100644 index 000000000..e2b41d508 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/steam_squasher.json @@ -0,0 +1,90 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:steam_squasher", + "texture_overrides": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks" + }, + "variants": { + "is_formed=false,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/compressor/overlay_front", + "overlay_front_emissive": "gtceu:block/machines/compressor/overlay_front_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/compressor/overlay_front", + "overlay_front_emissive": "gtceu:block/machines/compressor/overlay_front_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/compressor/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/compressor/overlay_front_active_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/compressor/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/compressor/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/compressor/overlay_front", + "overlay_front_emissive": "gtceu:block/machines/compressor/overlay_front_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/compressor/overlay_front", + "overlay_front_emissive": "gtceu:block/machines/compressor/overlay_front_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/compressor/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/compressor/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", + "overlay_front": "gtceu:block/machines/compressor/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/compressor/overlay_front_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/steam_thermal_centrifuge.json b/kubejs/assets/tfg/models/block/machines/steam_thermal_centrifuge.json new file mode 100644 index 000000000..270c629d8 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/steam_thermal_centrifuge.json @@ -0,0 +1,110 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:steam_thermal_centrifuge", + "texture_overrides": { + "all": "gtceu:block/casings/gcym/industrial_steam_casing" + }, + "dynamic_renders": [ + { + "type": "gtceu:boiler_multi_parts", + "casing_block": { + "Name": "gtceu:industrial_steam_casing" + }, + "firebox_active": { + "Name": "gtceu:steel_firebox_casing", + "Properties": { + "active": "true" + } + }, + "firebox_idle": { + "Name": "gtceu:steel_firebox_casing", + "Properties": { + "active": "false" + } + } + } + ], + "variants": { + "is_formed=false,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/gcym/industrial_steam_casing", + "overlay_front": "gtceu:block/machines/thermal_centrifuge/overlay_front", + "overlay_front_emissive": "gtceu:block/machines/thermal_centrifuge/overlay_front_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/gcym/industrial_steam_casing", + "overlay_front": "gtceu:block/machines/thermal_centrifuge/overlay_front_paused", + "overlay_front_emissive": "gtceu:block/machines/thermal_centrifuge/overlay_front_paused_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/gcym/industrial_steam_casing", + "overlay_front": "gtceu:block/machines/thermal_centrifuge/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/thermal_centrifuge/overlay_front_active_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/gcym/industrial_steam_casing", + "overlay_front": "gtceu:block/machines/thermal_centrifuge/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/thermal_centrifuge/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/gcym/industrial_steam_casing", + "overlay_front": "gtceu:block/machines/thermal_centrifuge/overlay_front", + "overlay_front_emissive": "gtceu:block/machines/thermal_centrifuge/overlay_front_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/gcym/industrial_steam_casing", + "overlay_front": "gtceu:block/machines/thermal_centrifuge/overlay_front_paused", + "overlay_front_emissive": "gtceu:block/machines/thermal_centrifuge/overlay_front_paused_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/gcym/industrial_steam_casing", + "overlay_front": "gtceu:block/machines/thermal_centrifuge/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/thermal_centrifuge/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/gcym/industrial_steam_casing", + "overlay_front": "gtceu:block/machines/thermal_centrifuge/overlay_front_active", + "overlay_front_emissive": "gtceu:block/machines/thermal_centrifuge/overlay_front_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/steam_bloomery.json b/kubejs/assets/tfg/models/item/steam_bloomery.json new file mode 100644 index 000000000..f37cc19e8 --- /dev/null +++ b/kubejs/assets/tfg/models/item/steam_bloomery.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/steam_bloomery" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/steam_fuser.json b/kubejs/assets/tfg/models/item/steam_fuser.json new file mode 100644 index 000000000..421b4d1ca --- /dev/null +++ b/kubejs/assets/tfg/models/item/steam_fuser.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/steam_fuser" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/steam_presser.json b/kubejs/assets/tfg/models/item/steam_presser.json new file mode 100644 index 000000000..5588b3d45 --- /dev/null +++ b/kubejs/assets/tfg/models/item/steam_presser.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/steam_presser" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/steam_squasher.json b/kubejs/assets/tfg/models/item/steam_squasher.json new file mode 100644 index 000000000..e44a2bda6 --- /dev/null +++ b/kubejs/assets/tfg/models/item/steam_squasher.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/steam_squasher" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/steam_thermal_centrifuge.json b/kubejs/assets/tfg/models/item/steam_thermal_centrifuge.json new file mode 100644 index 000000000..7854ac2af --- /dev/null +++ b/kubejs/assets/tfg/models/item/steam_thermal_centrifuge.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/steam_thermal_centrifuge" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/steam_bloomery/overlay_front.png b/kubejs/assets/tfg/textures/block/machines/steam_bloomery/overlay_front.png similarity index 100% rename from kubejs/assets/tfg/textures/block/steam_bloomery/overlay_front.png rename to kubejs/assets/tfg/textures/block/machines/steam_bloomery/overlay_front.png diff --git a/kubejs/assets/tfg/textures/block/steam_bloomery/overlay_front_active.png b/kubejs/assets/tfg/textures/block/machines/steam_bloomery/overlay_front_active.png similarity index 100% rename from kubejs/assets/tfg/textures/block/steam_bloomery/overlay_front_active.png rename to kubejs/assets/tfg/textures/block/machines/steam_bloomery/overlay_front_active.png diff --git a/kubejs/assets/tfg/textures/block/steam_bloomery/overlay_front_active.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/steam_bloomery/overlay_front_active.png.mcmeta similarity index 100% rename from kubejs/assets/tfg/textures/block/steam_bloomery/overlay_front_active.png.mcmeta rename to kubejs/assets/tfg/textures/block/machines/steam_bloomery/overlay_front_active.png.mcmeta diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index 0528360e3..352a1b847 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -68,8 +68,8 @@ const registerTooltips = (event) => { event.addAdvanced(['tfg:ostrum_linear_accelerator'], (item, advanced, text) => { text.add(1, Text.translate('gtceu.tooltip.machine.ostrum_linear_accelerator_1')); text.add(2, Text.translate('gtceu.tooltip.machine.ostrum_linear_accelerator_2')); - text.add(2, Text.translate('gtceu.tooltip.machine.ostrum_linear_accelerator_3')); - text.add(3, Text.translate('tfg.tooltip.machine.two_energy_hatches')); + text.add(3, Text.translate('gtceu.tooltip.machine.ostrum_linear_accelerator_3')); + text.add(4, Text.translate('tfg.tooltip.machine.two_energy_hatches')); }) event.addAdvanced(['gtceu:heat_exchanger'], (item, advanced, text) => { text.add(1, Text.translate('gtceu.tooltip.machine.heat_exchanger_1')); @@ -84,11 +84,27 @@ const registerTooltips = (event) => { text.add(3, Text.translate('tfg.tooltip.machine.coil_speed_discount')); text.add(4, Text.translate('tfg.tooltip.machine.one_energy_hatch')); }) - event.addAdvanced(['gtceu:steam_bloomery'], (item, advanced, text) => { + event.addAdvanced(['tfg:steam_bloomery'], (item, advanced, text) => { text.add(1, Text.translate('gtceu.tooltip.machine.steam_bloomery_1')); text.add(2, Text.translate('gtceu.tooltip.machine.steam_bloomery_2')); - text.add(2, Text.translate('gtceu.tooltip.machine.steam_bloomery_3')); - text.add(2, Text.translate('gtceu.tooltip.machine.steam_bloomery_4')); + text.add(3, Text.translate('gtceu.tooltip.machine.steam_bloomery_3')); + text.add(4, Text.translate('gtceu.tooltip.machine.steam_parallel')); + }) + event.addAdvanced(['tfg:steam_thermal_centrifuge'], (item, advanced, text) => { + text.add(1, Text.translate('gtceu.machine.lv_thermal_centrifuge.tooltip')); + text.add(2, Text.translate('gtceu.tooltip.machine.steam_parallel')); + }) + event.addAdvanced(['tfg:steam_fuser'], (item, advanced, text) => { + text.add(1, Text.translate('gtceu.machine.hp_steam_alloy_smelter.tooltip')); + text.add(2, Text.translate('gtceu.tooltip.machine.steam_parallel')); + }) + event.addAdvanced(['tfg:steam_squasher'], (item, advanced, text) => { + text.add(1, Text.translate('gtceu.machine.hp_steam_compressor.tooltip')); + text.add(2, Text.translate('gtceu.tooltip.machine.steam_parallel')); + }) + event.addAdvanced(['tfg:steam_presser'], (item, advanced, text) => { + text.add(1, Text.translate('gtceu.machine.hp_steam_forge_hammer.tooltip')); + text.add(2, Text.translate('gtceu.tooltip.machine.steam_parallel')); }) event.addAdvanced(['gtceu:large_chemical_reactor'], (item, advanced, text) => { text.add(1, Text.translate('tfg.tooltip.machine.perfect_overclock')); @@ -98,7 +114,7 @@ const registerTooltips = (event) => { text.add(1, Text.translate('gtceu.tooltip.machine.coal_liquefaction_tower_1')); text.add(2, Text.translate('gtceu.tooltip.machine.coal_liquefaction_tower_2')); text.add(3, Text.translate('tfg.tooltip.machine.coil_speed_discount')); - text.add(3, Text.translate('tfg.tooltip.machine.one_energy_hatch')); + text.add(4, Text.translate('tfg.tooltip.machine.one_energy_hatch')); }) // Hot or not containers diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index de40b9c9a..a17c366ec 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -558,21 +558,6 @@ const registerFirmaLifeRecipes = (event) => { .EUt(GTValues.VA[GTValues.ULV]) .duration(200) - event.recipes.firmalife.mixing_bowl() - .itemIngredients(['#tfg:wood_dusts', '#tfg:wood_dusts', 'tfc:glue']) - .outputItem('2x tfg:chipboard_composite') - .id('tfg:mixing_bowl/chipboard_composite_glue') - - event.recipes.firmalife.mixing_bowl() - .itemIngredients(['#tfg:wood_dusts', '#tfg:wood_dusts', '#tfg:wood_dusts', '#tfg:wood_dusts', 'gtceu:sticky_resin']) - .outputItem('4x tfg:chipboard_composite') - .id('tfg:mixing_bowl/chipboard_composite_resin') - - event.recipes.firmalife.mixing_bowl() - .itemIngredients(['#tfg:wood_dusts', '#tfg:wood_dusts', '#forge:wax']) - .outputItem('2x tfg:chipboard_composite') - .id('tfg:mixing_bowl/chipboard_composite_wax') - // Dough global.TFC_GRAINS.forEach(grain => { diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js index d51f2945e..6603488ac 100644 --- a/kubejs/server_scripts/gregtech/recipes.machines.js +++ b/kubejs/server_scripts/gregtech/recipes.machines.js @@ -781,6 +781,22 @@ function registerGTCEuMachineRecipes(event) { B: '#forge:tools/hammers' }).addMaterialInfo().id('gtceu:shaped/steel_hull') + event.recipes.gtceu.shaped('gtceu:bronze_machine_casing', [ + ' A ', + 'ABA', + ' A ' + ], { + A: ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Bronze, 1), + B: '#forge:tools/hammers' + }).addMaterialInfo().id('gtceu:shaped/bronze_hull') + + event.recipes.gtceu.assembler('bronze_machine_casing') + .itemInputs('4x #forge:ingots/bronze') + .itemOutputs('gtceu:bronze_machine_casing') + .circuit(6) + .duration(2.5 * 20) + .EUt(GTValues.VHA[GTValues.LV]) + removeMaceratorRecipe(event, 'macerate_steam_input_hatch') event.recipes.gtceu.shaped('gtceu:steam_input_hatch', [ 'ACA', @@ -799,7 +815,7 @@ function registerGTCEuMachineRecipes(event) { 'ABA' ], { A: 'gtceu:bronze_plate', - B: ChemicalHelper.get(TagPrefix.gear, GTMaterials.Invar, 1), + B: ChemicalHelper.get(TagPrefix.gear, GTMaterials.Potin, 1), C: 'gtceu:hp_steam_macerator' }).addMaterialInfo().id('gtceu:shaped/steam_grinder') @@ -810,7 +826,7 @@ function registerGTCEuMachineRecipes(event) { 'ABA' ], { A: 'gtceu:bronze_plate', - B: 'gtceu:heatproof_machine_casing', + B: ChemicalHelper.get(TagPrefix.gear, GTMaterials.Invar, 1), C: 'gtceu:hp_steam_furnace' }).addMaterialInfo().id('gtceu:shaped/steam_oven') @@ -845,9 +861,9 @@ function registerGTCEuMachineRecipes(event) { ChemicalHelper.get(TagPrefix.frameGt, GTMaterials.Ultimet, 1) ) .itemOutputs('gtceu:palladium_substation') - .duration(20 * 2.5) .circuit(6) - .EUt(GTValues.VA[GTValues.LV]) + .duration(20 * 2.5) + .EUt(GTValues.VHA[GTValues.LV]) removeMaceratorRecipe(event, 'macerate_power_substation') @@ -862,4 +878,21 @@ function registerGTCEuMachineRecipes(event) { D: 'gtceu:palladium_substation' }).addMaterialInfo().id('gtceu:shaped/power_substation') + event.recipes.gtceu.shaped('2x gtceu:industrial_steam_casing', [ + 'ABA', + 'ACA', + 'ADA' + ], { + A: '#forge:plates/brass', + B: '#forge:tools/hammers', + C: '#forge:frames/steel', + D: '#forge:tools/wrenches' + }).addMaterialInfo().id('tfg:shaped/industrial_steam_casing') + + event.recipes.gtceu.assembler('industrial_steam_casing') + .itemInputs('6x #forge:plates/brass', '#forge:frames/steel') + .itemOutputs('2x gtceu:industrial_steam_casing') + .circuit(6) + .duration(2.5 * 20) + .EUt(GTValues.VHA[GTValues.LV]) } diff --git a/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js b/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js index 29dc5e567..65f5b2f21 100644 --- a/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js +++ b/kubejs/server_scripts/tfg/machines/recipes.multiblocks.js @@ -49,7 +49,7 @@ function registerTFGMultiblockRecipes(event) { }).id('gtceu:shaped/electric_blast_furnace2') // TFG customs - event.shaped('tfg:electric_greenhouse', [ + event.recipes.gtceu.shaped('tfg:electric_greenhouse', [ 'ABA', 'CDC', 'BCB' @@ -58,9 +58,9 @@ function registerTFGMultiblockRecipes(event) { B: '#forge:single_cables/copper', C: 'tfc:compost', D: 'gtceu:steel_machine_casing' - }).id('tfg:shaped/electric_greenhouse') + }).addMaterialInfo().id('tfg:shaped/electric_greenhouse') - event.shaped('gtceu:steam_bloomery', [ + event.recipes.gtceu.shaped('tfg:steam_bloomery', [ 'CEC', 'DAD', 'CBC' @@ -70,9 +70,51 @@ function registerTFGMultiblockRecipes(event) { C: '#forge:rods/black_steel', D: '#forge:screws/wrought_iron', E: '#forge:tools/wrenches' - }) + }).addMaterialInfo().id('tfg:shaped/steam_bloomery') - event.shaped('tfg:ostrum_linear_accelerator', [ + event.recipes.gtceu.shaped('tfg:steam_thermal_centrifuge', [ + 'ACA', + 'DBD', + 'ACA' + ], { + A: '#forge:plates/brass', + B: 'create:steam_engine', + C: ChemicalHelper.get(TagPrefix.gear, GTMaterials.Invar, 1), + D: '#gtceu:circuits/lv' + }).addMaterialInfo().id('tfg:shaped/steam_thermal_centrifuge') + + event.recipes.gtceu.shaped('tfg:steam_fuser', [ + 'ABA', + 'ACA', + 'ABA' + ], { + A: '#forge:plates/bronze', + B: 'gtceu:potin_large_fluid_pipe', + C: 'gtceu:hp_steam_alloy_smelter' + }).addMaterialInfo().id('gtceu:shaped/steam_fuser') + + event.recipes.gtceu.shaped('tfg:steam_squasher', [ + 'ABA', + 'ACA', + 'ABA' + ], { + A: '#forge:plates/brass', + B: 'gtceu:potin_large_fluid_pipe', + C: 'gtceu:hp_steam_compressor' + }).addMaterialInfo().id('gtceu:shaped/steam_squasher') + + event.recipes.gtceu.shaped('tfg:steam_presser', [ + 'ADA', + 'ACA', + 'ABA' + ], { + A: '#forge:plates/brass', + B: 'tfc:metal/anvil/steel', + C: 'gtceu:hp_steam_forge_hammer', + D: 'gtceu:potin_large_fluid_pipe' + }).addMaterialInfo().id('gtceu:shaped/steam_presser') + + event.recipes.gtceu.shaped('tfg:ostrum_linear_accelerator', [ 'USU', 'WZW', 'PTP' @@ -83,8 +125,7 @@ function registerTFGMultiblockRecipes(event) { U: '#forge:double_plates/stellite_100', T: '#forge:single_cables/platinum', P: 'gtceu:iv_electric_pump' - } - ).id('tfg:shaped/ostrum_linear_accelerator') + }).addMaterialInfo().id('tfg:shaped/ostrum_linear_accelerator') event.recipes.gtceu.assembler('tfg:ostrum_harvester') .itemInputs( @@ -123,7 +164,7 @@ function registerTFGMultiblockRecipes(event) { Z: 'gtceu:ev_machine_hull' }).addMaterialInfo().id('tfg:shaped/evaporation_tower') - event.shaped('deafission:fission_reactor_mk1', [ + event.recipes.gtceu.shaped('deafission:fission_reactor_mk1', [ 'TUT', 'WZW', 'TUT' @@ -132,10 +173,9 @@ function registerTFGMultiblockRecipes(event) { W: '#gtceu:circuits/ev', U: 'gtceu:hv_field_generator', Z: 'gtceu:ev_machine_hull' - } - ).id('tfg:shaped/fission_reactor_mk1') + }).addMaterialInfo().id('tfg:shaped/fission_reactor_mk1') - event.shaped('gtceu:nuclear_fuel_factory', [ + event.recipes.gtceu.shaped('gtceu:nuclear_fuel_factory', [ 'TUT', 'WZW', 'TBT' @@ -145,10 +185,9 @@ function registerTFGMultiblockRecipes(event) { U: 'gtceu:ev_emitter', Z: 'gtceu:ev_machine_hull', B: 'gtceu:ev_robot_arm' - } - ).id('tfg:shaped/nuclear_fuel_factory') + }).addMaterialInfo().id('tfg:shaped/nuclear_fuel_factory') - event.shaped('gtceu:heat_exchanger', [ + event.recipes.gtceu.shaped('gtceu:heat_exchanger', [ 'TUT', 'WZW', 'GBG' @@ -159,10 +198,9 @@ function registerTFGMultiblockRecipes(event) { Z: 'gtceu:ev_machine_hull', B: 'gtceu:ev_fluid_regulator', G: '#forge:gears/ostrum_iodide' - } - ).id('tfg:shaped/heat_exchanger') + }).addMaterialInfo().id('tfg:shaped/heat_exchanger') - event.shaped('tfg:nuclear_turbine', [ + event.recipes.gtceu.shaped('tfg:nuclear_turbine', [ 'CTC', 'TZT', 'BTB' @@ -171,8 +209,7 @@ function registerTFGMultiblockRecipes(event) { Z: 'gtceu:ev_machine_hull', B: 'gtceu:ultimet_large_item_pipe', C: '#gtceu:circuits/ev' - } - ).id('tfg:shaped/nuclear_turbine') + }).addMaterialInfo().id('tfg:shaped/nuclear_turbine') event.recipes.gtceu.shaped('gtceu:coal_liquefaction_tower', [ 'ABA', diff --git a/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js b/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js index 208c1f9f2..425001285 100644 --- a/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js +++ b/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js @@ -1195,14 +1195,12 @@ function registerTFGRockRecipes(event) { .itemOutputs('ad_astra:permafrost') .duration(40*20) .EUt(2) - .dimension('ad_astra:glacio') event.recipes.gtceu.compressor('tfg:venus_sandstone') .itemInputs('4x ad_astra:venus_sand') .itemOutputs('ad_astra:venus_sandstone') .duration(40*20) .EUt(2) - .dimension('ad_astra:mars') // #endregion COMPRESSOR diff --git a/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js b/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js index ce0b60834..167cda1d1 100644 --- a/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js +++ b/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js @@ -141,7 +141,6 @@ function registerTFGNuclearRecipes(event) { .outputFluids(Fluid.of('gtceu:dioxygen_difluoride', 1000)) .duration(20*16) .EUt(GTValues.VA[GTValues.IV]) - .dimension('ad_astra:mars') event.recipes.gtceu.large_chemical_reactor('plutonium_dust') .itemInputs('#forge:dusts/refined_nuclear_residue') diff --git a/kubejs/server_scripts/tfg/primitive/recipes.glue_and_chipboard.js b/kubejs/server_scripts/tfg/primitive/recipes.glue_and_chipboard.js index 29ccd1771..b6d6c956d 100644 --- a/kubejs/server_scripts/tfg/primitive/recipes.glue_and_chipboard.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.glue_and_chipboard.js @@ -29,6 +29,21 @@ function registerTFGChipboardRecipes(event) { .EUt(5) // Chipboard + event.recipes.firmalife.mixing_bowl() + .itemIngredients(['#tfg:wood_dusts', '#tfg:wood_dusts', 'tfc:glue']) + .outputItem('2x tfg:chipboard_composite') + .id('tfg:mixing_bowl/chipboard_composite_glue') + + event.recipes.firmalife.mixing_bowl() + .itemIngredients(['#tfg:wood_dusts', '#tfg:wood_dusts', '#tfg:wood_dusts', '#tfg:wood_dusts', 'gtceu:sticky_resin']) + .outputItem('4x tfg:chipboard_composite') + .id('tfg:mixing_bowl/chipboard_composite_resin') + + event.recipes.firmalife.mixing_bowl() + .itemIngredients(['#tfg:wood_dusts', '#tfg:wood_dusts', '#forge:wax']) + .outputItem('2x tfg:chipboard_composite') + .id('tfg:mixing_bowl/chipboard_composite_wax') + event.recipes.gtceu.mixer('gtceu:chipboard_composite_wax') .itemInputs('2x #tfg:wood_dusts', '1x #forge:wax') @@ -50,7 +65,6 @@ function registerTFGChipboardRecipes(event) { .duration(100) .EUt(GTValues.VA[GTValues.LV]) - event.recipes.gtceu.mixer('gtceu:chipboard_composite_fluid_glue') .itemInputs('1x #tfg:wood_dusts') .inputFluids(Fluid.of('gtceu:glue', 25)) @@ -58,6 +72,49 @@ function registerTFGChipboardRecipes(event) { .duration(10) .EUt(GTValues.VA[GTValues.LV]) + // Pre-treated chipboard + event.recipes.firmalife.mixing_bowl() + .itemIngredients(['gtceu:treated_wood_dust', 'gtceu:treated_wood_dust', 'tfc:glue']) + .outputItem('2x tfg:treated_chipboard_composite') + .id('tfg:mixing_bowl/treated_chipboard_composite_glue') + + event.recipes.firmalife.mixing_bowl() + .itemIngredients(['gtceu:treated_wood_dust', 'gtceu:treated_wood_dust', 'gtceu:treated_wood_dust', 'gtceu:treated_wood_dust', 'gtceu:sticky_resin']) + .outputItem('4x tfg:treated_chipboard_composite') + .id('tfg:mixing_bowl/treated_chipboard_composite_resin') + + event.recipes.firmalife.mixing_bowl() + .itemIngredients(['gtceu:treated_wood_dust', 'gtceu:treated_wood_dust', '#forge:wax']) + .outputItem('2x tfg:treated_chipboard_composite') + .id('tfg:mixing_bowl/treated_chipboard_composite_wax') + + event.recipes.gtceu.mixer('gtceu:treated_chipboard_composite_wax') + .itemInputs('2x gtceu:treated_wood_dust', '1x #forge:wax') + .itemOutputs('2x tfg:treated_chipboard_composite') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.mixer('gtceu:treated_chipboard_composite_resin') + .itemInputs('4x gtceu:treated_wood_dust', '1x gtceu:sticky_resin') + .itemOutputs('4x tfg:treated_chipboard_composite') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.mixer('gtceu:treated_chipboard_composite_glue') + .itemInputs('2x gtceu:treated_wood_dust', '1x tfc:glue') + .itemOutputs('2x tfg:treated_chipboard_composite') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.mixer('gtceu:treated_chipboard_composite_fluid_glue') + .itemInputs('1x gtceu:treated_wood_dust') + .inputFluids(Fluid.of('gtceu:glue', 25)) + .itemOutputs('1x tfg:treated_chipboard_composite') + .duration(10) + .EUt(GTValues.VA[GTValues.LV]) + + + // event.recipes.gtceu.compressor('gtceu:wood_mdf') .itemInputs('1x tfg:chipboard_composite') .itemOutputs('gtceu:wood_plate') diff --git a/kubejs/server_scripts/tfg/recipes.temporary.js b/kubejs/server_scripts/tfg/recipes.temporary.js index 349d3e852..2365c1fca 100644 --- a/kubejs/server_scripts/tfg/recipes.temporary.js +++ b/kubejs/server_scripts/tfg/recipes.temporary.js @@ -9,6 +9,7 @@ function registerTFGTemporaryRecipes(event) { event.shapeless('vintageimprovements:belt_grinder', 'vintageimprovements:lathe') event.shapeless('tfg:ostrum_linear_accelerator', 'gtceu:ostrum_linear_accelerator') + event.shapeless('tfg:steam_bloomery', 'gtceu:steam_bloomery') event.shapeless('greate:rose_quartz_dust', 'gtceu:rose_quartz_dust') event.shapeless('greate:tiny_rose_quartz_dust', 'gtceu:tiny_rose_quartz_dust') diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index 7bc7f8907..982e93d67 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -56,7 +56,7 @@ function registerVintageImprovementsRecipes(event) { ' A ' ], { A: '#forge:plates/treated_wood', - B: '#forge:rods/long/black_steel', + B: '#forge:rods/long/steel', C: 'create:andesite_casing', D: '#forge:frames/treated_wood', E: 'greate:steel_cogwheel' diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index 7f2d2099f..864e69f0e 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -2,49 +2,8 @@ const registerGTCEuMachines = (event) => { - const $SteamMulti = Java.loadClass('com.gregtechceu.gtceu.common.machine.multiblock.steam.SteamParallelMultiblockMachine'); - const $Tags = Java.loadClass("dev.latvian.mods.kubejs.util.Tags") const CoilWorkableElectricMultiblockMachine = Java.loadClass("com.gregtechceu.gtceu.api.machine.multiblock.CoilWorkableElectricMultiblockMachine") - //#region Steam Bloomery - - event.create('steam_bloomery', 'multiblock') - .machine((holder) => new $SteamMulti(holder, 8)) - .rotationState(RotationState.NON_Y_AXIS) - .recipeType('steam_bloomery') - .recipeModifier((machine, recipe) => $SteamMulti.recipeModifier(machine, recipe), true) - .appearanceBlock(GTBlocks.CASING_BRONZE_BRICKS) - .pattern(definition => FactoryBlockPattern.start() - .aisle(" F ", " C ", " E ", " E ", " E ") - .aisle("FCF", "C#C", "E#E", "E#E", "E#E") - .aisle(" F ", "CXC", " E ", " E ", " E ") - .where('X', Predicates.controller(Predicates.blocks(definition.get()))) - .where('C', Predicates.blockTag($Tags.block("tfc:bloomery_insulation"))) - .where('F', Predicates.blocks(GTBlocks.FIREBOX_BRONZE.get()) - .or(Predicates.abilities(PartAbility.STEAM).setExactLimit(1))) - .where('E', Predicates.abilities(PartAbility.STEAM_IMPORT_ITEMS).setMaxGlobalLimited(2) - .or(Predicates.abilities(PartAbility.STEAM_EXPORT_ITEMS).setExactLimit(1)) - .or(Predicates.blockTag($Tags.block("tfc:bloomery_insulation")))) - .where('#', Predicates.air()) - .where(' ', Predicates.any()) - .build() - ) - .shapeInfo(controller => MultiblockShapeInfo.builder() - .aisle(" F ", " C ", " C ", " C ", " C ") - .aisle("FCF", "C#C", "C#C", "C#C", "C#C") - .aisle(" i ", "CXC", " O ", " I ", " C ") - .where('X', controller, Direction.SOUTH) - .where('C', Block.getBlock('tfc:rock/bricks/rhyolite')) - .where('F', GTBlocks.FIREBOX_BRONZE.get()) - .where('i', GTMachines.STEAM_HATCH, Direction.SOUTH) - .where('O', GTMachines.STEAM_EXPORT_BUS, Direction.SOUTH) - .where('I', GTMachines.STEAM_IMPORT_BUS, Direction.SOUTH) - .build() - ) - .workableCasingModel( - "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", - "tfg:block/steam_bloomery") - //#endregion //#region Large Solar Panels //Tier 1 diff --git a/kubejs/startup_scripts/gtceu/recipe_types.js b/kubejs/startup_scripts/gtceu/recipe_types.js index 39c361169..3cffd2c81 100644 --- a/kubejs/startup_scripts/gtceu/recipe_types.js +++ b/kubejs/startup_scripts/gtceu/recipe_types.js @@ -1,12 +1,5 @@ const registerGTCEuRecipeTypes = (event) => { - event.create('steam_bloomery') - .category('steam_bloomery') - .setEUIO('in') - .setMaxIOSize(2, 1, 0, 0) - .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) - .setSound(GTSoundEntries.FIRE) - event.create('large_solar_panel') .category('generator') .setEUIO('out') diff --git a/kubejs/startup_scripts/tfg/blocks.js b/kubejs/startup_scripts/tfg/blocks.js index 85b9d9286..c358ce8c7 100644 --- a/kubejs/startup_scripts/tfg/blocks.js +++ b/kubejs/startup_scripts/tfg/blocks.js @@ -28,4 +28,8 @@ const registerTFGBlocks = (event) => { .requiresTool(false) .textureAll('tfg:item/deprecated') + event.create('gtceu:steam_bloomery') + .tagBlock('gtceu:mineable/pickaxe_or_wrench') + .requiresTool(false) + .textureAll('tfg:item/deprecated') }