From 15c2031a627ec2fda42fc81c7bac148ac3735dfc Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 7 Dec 2025 23:16:35 +0000 Subject: [PATCH 01/25] forgot to add this to the last changelist, my bad --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8324b4ddd..5bf306f71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## Unreleased +### Changes +- Added recipes for create's shadow and radiant casings (#2256) @Ujhik +### Bug fixes + ## [0.11.9] - 7-12-2025 ### Breaking Changes #### Beginning of the Power Update From 042bd9870f46049547d4f15d98192512109639dd Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 8 Dec 2025 12:31:59 +0000 Subject: [PATCH 02/25] remove noisium (apparently it's discontinued because it barely does anything) --- pakku-lock.json | 65 ------------------------------------------------- 1 file changed, 65 deletions(-) diff --git a/pakku-lock.json b/pakku-lock.json index 8c92a816c..0714b88a5 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -9806,71 +9806,6 @@ } ] }, - { - "pakku_id": "srNw1bVsXfQKp9OA", - "type": "MOD", - "side": "SERVER", - "slug": { - "curseforge": "noisium", - "modrinth": "noisium" - }, - "name": { - "curseforge": "Noisium", - "modrinth": "Noisium" - }, - "id": { - "curseforge": "930207", - "modrinth": "KuNKN7d2" - }, - "files": [ - { - "type": "curseforge", - "file_name": "noisium-forge-2.3.0+mc1.20-1.20.1.jar", - "mc_versions": [ - "1.20.1", - "1.20" - ], - "loaders": [ - "neoforge", - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/5650/506/noisium-forge-2.3.0+mc1.20-1.20.1.jar", - "id": "5650506", - "parent_id": "930207", - "hashes": { - "sha1": "7da1cdf00c0ae5cad31e17f765f6ea021c8ac808", - "md5": "3a8e9a24408c991b3fb97685884f2cce" - }, - "required_dependencies": [], - "size": 218152, - "date_published": "2024-08-21T17:24:11.600Z" - }, - { - "type": "modrinth", - "file_name": "noisium-forge-2.3.0+mc1.20-1.20.1.jar", - "mc_versions": [ - "1.20", - "1.20.1" - ], - "loaders": [ - "forge", - "neoforge" - ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/KuNKN7d2/versions/gbYUKrDP/noisium-forge-2.3.0+mc1.20-1.20.1.jar", - "id": "gbYUKrDP", - "parent_id": "KuNKN7d2", - "hashes": { - "sha512": "5bc43bc1b748edcd63d074a8bb14d393d986c51e1933e1f38cd7a2dd2fd70dba5a46a6415f46d4a52c68e7e1e9ce101e54376ad04273df958608e2fdb43db502", - "sha1": "7da1cdf00c0ae5cad31e17f765f6ea021c8ac808" - }, - "required_dependencies": [], - "size": 218152, - "date_published": "2024-08-21T17:24:14.967570Z" - } - ] - }, { "pakku_id": "rZMUz1QjgqD53x3s", "type": "MOD", From a8d1bb1505d40a79d502578827ee744c005eac73 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 8 Dec 2025 12:35:11 +0000 Subject: [PATCH 03/25] new venus stuff --- kubejs/assets/ad_astra/lang/en_us.json | 1 + kubejs/assets/beneath/lang/en_us.json | 6 +- .../betterend/blockstates/brimstone.json | 10 + .../blockstates/flavolite_pillar.json | 16 ++ .../blockstates/hydrothermal_vent.json | 10 + .../betterend/blockstates/lacugrove_bark.json | 10 + .../betterend/blockstates/lucernia_bark.json | 10 + .../blockstates/sandy_jadestone_pillar.json | 16 ++ .../blockstates/sulphur_crystal.json | 9 + .../betterend/blockstates/sulphuric_rock.json | 7 + .../blockstates/sulphuric_rock_pillar.json | 16 ++ .../betterend/blockstates/tube_worm.json | 24 ++ kubejs/assets/betterend/lang/en_us.json | 21 ++ .../models/block/brimstone_active.json | 6 + .../models/block/brimstone_normal.json | 6 + .../models/block/flavolite_pillar.json | 7 + .../models/block/hydrothermal_vent.json | 164 ++++++++++++ .../models/block/lacugrove_bark.json | 6 + .../models/block/lacugrove_bark_2.json | 6 + .../models/block/lacugrove_bark_3.json | 6 + .../models/block/lacugrove_bark_4.json | 6 + .../betterend/models/block/lucernia_bark.json | 6 + .../models/block/lucernia_bark_2.json | 6 + .../models/block/lucernia_bark_3.json | 6 + .../models/block/lucernia_bark_4.json | 6 + .../models/block/sandy_jadestone_pillar.json | 7 + .../models/block/sulphur_crystal_0.json | 6 + .../models/block/sulphur_crystal_1.json | 6 + .../models/block/sulphur_crystal_2.json | 6 + .../models/block/sulphuric_rock.json | 7 + .../models/block/sulphuric_rock_pillar.json | 7 + .../betterend/models/block/tube_worm_01.json | 95 +++++++ .../betterend/models/block/tube_worm_02.json | 95 +++++++ .../betterend/models/block/tube_worm_03.json | 108 ++++++++ .../models/item/hydrothermal_vent.json | 3 + .../models/item/sulphur_crystal.json | 6 + .../betterend/models/item/tube_worm.json | 6 + .../betterend/textures/block/brimstone.png | Bin 0 -> 223 bytes .../betterend/textures/block/flavolite.png | Bin 0 -> 222 bytes .../textures/block/flavolite_bricks.png | Bin 0 -> 222 bytes .../textures/block/flavolite_pillar_side.png | Bin 0 -> 212 bytes .../textures/block/flavolite_pillar_top.png | Bin 0 -> 215 bytes .../textures/block/flavolite_polished.png | Bin 0 -> 214 bytes .../textures/block/flavolite_tiles.png | Bin 0 -> 221 bytes .../betterend/textures/block/geyser_top.png | Bin 0 -> 190 bytes .../textures/block/inactive_brimstone.png | Bin 0 -> 223 bytes .../textures/block/lacugrove_log_side.png | Bin 0 -> 233 bytes .../textures/block/lacugrove_log_side_2.png | Bin 0 -> 232 bytes .../textures/block/lacugrove_log_side_3.png | Bin 0 -> 317 bytes .../textures/block/lacugrove_log_side_4.png | Bin 0 -> 329 bytes .../textures/block/lucernia_log_side.png | Bin 0 -> 220 bytes .../textures/block/lucernia_log_side_2.png | Bin 0 -> 224 bytes .../textures/block/sandy_jadestone.png | Bin 0 -> 187 bytes .../textures/block/sandy_jadestone_bricks.png | Bin 0 -> 192 bytes .../block/sandy_jadestone_pillar_side.png | Bin 0 -> 175 bytes .../block/sandy_jadestone_pillar_top.png | Bin 0 -> 191 bytes .../block/sandy_jadestone_polished.png | Bin 0 -> 186 bytes .../textures/block/sandy_jadestone_tiles.png | Bin 0 -> 161 bytes .../textures/block/sulphur_crystal_0.png | Bin 0 -> 157 bytes .../textures/block/sulphur_crystal_1.png | Bin 0 -> 177 bytes .../textures/block/sulphur_crystal_2.png | Bin 0 -> 192 bytes .../textures/block/sulphuric_rock.png | Bin 0 -> 213 bytes .../textures/block/sulphuric_rock_bricks.png | Bin 0 -> 203 bytes .../block/sulphuric_rock_pillar_side.png | Bin 0 -> 221 bytes .../block/sulphuric_rock_pillar_top.png | Bin 0 -> 217 bytes .../block/sulphuric_rock_polished.png | Bin 0 -> 998 bytes .../textures/block/sulphuric_rock_tiles.png | Bin 0 -> 178 bytes .../textures/block/sulphuric_rock_top.png | Bin 0 -> 190 bytes .../betterend/textures/block/tube_worm_1.png | Bin 0 -> 132 bytes .../betterend/textures/block/tube_worm_2.png | Bin 0 -> 135 bytes .../betterend/textures/block/tube_worm_3.png | Bin 0 -> 186 bytes .../textures/item/thermal_fungus.png | Bin 0 -> 248 bytes .../betterend/textures/item/tube_worm.png | Bin 0 -> 187 bytes .../loot_tables/blocks/hydrothermal_vent.json | 4 + .../loot_tables/blocks/sulphur_crystal.json | 20 ++ .../loot_tables/blocks/tube_worm.json | 4 + .../worldgen/noise_settings/venus_noise.json | 234 ++++++------------ .../loot_tables/blocks/sulfur_block.json | 30 +++ .../tfg/natural_blocks/recipes.rocks.js | 4 + kubejs/server_scripts/tfg/recipes.js | 1 + .../server_scripts/tfg/venus/recipes.venus.js | 22 ++ kubejs/server_scripts/tfg/venus/tags.venus.js | 25 ++ .../tfg/venus/blocks.venus_deco.js | 97 ++++++++ .../vintage_improvements/constants.js | 1 - 84 files changed, 1012 insertions(+), 169 deletions(-) create mode 100644 kubejs/assets/betterend/blockstates/brimstone.json create mode 100644 kubejs/assets/betterend/blockstates/flavolite_pillar.json create mode 100644 kubejs/assets/betterend/blockstates/hydrothermal_vent.json create mode 100644 kubejs/assets/betterend/blockstates/lacugrove_bark.json create mode 100644 kubejs/assets/betterend/blockstates/lucernia_bark.json create mode 100644 kubejs/assets/betterend/blockstates/sandy_jadestone_pillar.json create mode 100644 kubejs/assets/betterend/blockstates/sulphur_crystal.json create mode 100644 kubejs/assets/betterend/blockstates/sulphuric_rock.json create mode 100644 kubejs/assets/betterend/blockstates/sulphuric_rock_pillar.json create mode 100644 kubejs/assets/betterend/blockstates/tube_worm.json create mode 100644 kubejs/assets/betterend/models/block/brimstone_active.json create mode 100644 kubejs/assets/betterend/models/block/brimstone_normal.json create mode 100644 kubejs/assets/betterend/models/block/flavolite_pillar.json create mode 100644 kubejs/assets/betterend/models/block/hydrothermal_vent.json create mode 100644 kubejs/assets/betterend/models/block/lacugrove_bark.json create mode 100644 kubejs/assets/betterend/models/block/lacugrove_bark_2.json create mode 100644 kubejs/assets/betterend/models/block/lacugrove_bark_3.json create mode 100644 kubejs/assets/betterend/models/block/lacugrove_bark_4.json create mode 100644 kubejs/assets/betterend/models/block/lucernia_bark.json create mode 100644 kubejs/assets/betterend/models/block/lucernia_bark_2.json create mode 100644 kubejs/assets/betterend/models/block/lucernia_bark_3.json create mode 100644 kubejs/assets/betterend/models/block/lucernia_bark_4.json create mode 100644 kubejs/assets/betterend/models/block/sandy_jadestone_pillar.json create mode 100644 kubejs/assets/betterend/models/block/sulphur_crystal_0.json create mode 100644 kubejs/assets/betterend/models/block/sulphur_crystal_1.json create mode 100644 kubejs/assets/betterend/models/block/sulphur_crystal_2.json create mode 100644 kubejs/assets/betterend/models/block/sulphuric_rock.json create mode 100644 kubejs/assets/betterend/models/block/sulphuric_rock_pillar.json create mode 100644 kubejs/assets/betterend/models/block/tube_worm_01.json create mode 100644 kubejs/assets/betterend/models/block/tube_worm_02.json create mode 100644 kubejs/assets/betterend/models/block/tube_worm_03.json create mode 100644 kubejs/assets/betterend/models/item/hydrothermal_vent.json create mode 100644 kubejs/assets/betterend/models/item/sulphur_crystal.json create mode 100644 kubejs/assets/betterend/models/item/tube_worm.json create mode 100644 kubejs/assets/betterend/textures/block/brimstone.png create mode 100644 kubejs/assets/betterend/textures/block/flavolite.png create mode 100644 kubejs/assets/betterend/textures/block/flavolite_bricks.png create mode 100644 kubejs/assets/betterend/textures/block/flavolite_pillar_side.png create mode 100644 kubejs/assets/betterend/textures/block/flavolite_pillar_top.png create mode 100644 kubejs/assets/betterend/textures/block/flavolite_polished.png create mode 100644 kubejs/assets/betterend/textures/block/flavolite_tiles.png create mode 100644 kubejs/assets/betterend/textures/block/geyser_top.png create mode 100644 kubejs/assets/betterend/textures/block/inactive_brimstone.png create mode 100644 kubejs/assets/betterend/textures/block/lacugrove_log_side.png create mode 100644 kubejs/assets/betterend/textures/block/lacugrove_log_side_2.png create mode 100644 kubejs/assets/betterend/textures/block/lacugrove_log_side_3.png create mode 100644 kubejs/assets/betterend/textures/block/lacugrove_log_side_4.png create mode 100644 kubejs/assets/betterend/textures/block/lucernia_log_side.png create mode 100644 kubejs/assets/betterend/textures/block/lucernia_log_side_2.png create mode 100644 kubejs/assets/betterend/textures/block/sandy_jadestone.png create mode 100644 kubejs/assets/betterend/textures/block/sandy_jadestone_bricks.png create mode 100644 kubejs/assets/betterend/textures/block/sandy_jadestone_pillar_side.png create mode 100644 kubejs/assets/betterend/textures/block/sandy_jadestone_pillar_top.png create mode 100644 kubejs/assets/betterend/textures/block/sandy_jadestone_polished.png create mode 100644 kubejs/assets/betterend/textures/block/sandy_jadestone_tiles.png create mode 100644 kubejs/assets/betterend/textures/block/sulphur_crystal_0.png create mode 100644 kubejs/assets/betterend/textures/block/sulphur_crystal_1.png create mode 100644 kubejs/assets/betterend/textures/block/sulphur_crystal_2.png create mode 100644 kubejs/assets/betterend/textures/block/sulphuric_rock.png create mode 100644 kubejs/assets/betterend/textures/block/sulphuric_rock_bricks.png create mode 100644 kubejs/assets/betterend/textures/block/sulphuric_rock_pillar_side.png create mode 100644 kubejs/assets/betterend/textures/block/sulphuric_rock_pillar_top.png create mode 100644 kubejs/assets/betterend/textures/block/sulphuric_rock_polished.png create mode 100644 kubejs/assets/betterend/textures/block/sulphuric_rock_tiles.png create mode 100644 kubejs/assets/betterend/textures/block/sulphuric_rock_top.png create mode 100644 kubejs/assets/betterend/textures/block/tube_worm_1.png create mode 100644 kubejs/assets/betterend/textures/block/tube_worm_2.png create mode 100644 kubejs/assets/betterend/textures/block/tube_worm_3.png create mode 100644 kubejs/assets/betterend/textures/item/thermal_fungus.png create mode 100644 kubejs/assets/betterend/textures/item/tube_worm.png create mode 100644 kubejs/data/betterend/loot_tables/blocks/hydrothermal_vent.json create mode 100644 kubejs/data/betterend/loot_tables/blocks/sulphur_crystal.json create mode 100644 kubejs/data/betterend/loot_tables/blocks/tube_worm.json create mode 100644 kubejs/data/vintageimprovements/loot_tables/blocks/sulfur_block.json create mode 100644 kubejs/server_scripts/tfg/venus/recipes.venus.js diff --git a/kubejs/assets/ad_astra/lang/en_us.json b/kubejs/assets/ad_astra/lang/en_us.json index 600bf4bb5..761d75ef6 100644 --- a/kubejs/assets/ad_astra/lang/en_us.json +++ b/kubejs/assets/ad_astra/lang/en_us.json @@ -1,6 +1,7 @@ { "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", "block.ad_astra.oxygen_distributor": "Breathable Air Distributor", + "block.ad_astra.infernal_spire_block": "Infernal Spire", "block.ad_astra.moon_sand": "Lunar Sand", "block.ad_astra.moon_stone": "Raw Anorthosite", "block.ad_astra.moon_cobblestone": "Anorthosite Cobble", diff --git a/kubejs/assets/beneath/lang/en_us.json b/kubejs/assets/beneath/lang/en_us.json index 71b2c93f5..f890d42f0 100644 --- a/kubejs/assets/beneath/lang/en_us.json +++ b/kubejs/assets/beneath/lang/en_us.json @@ -3,11 +3,11 @@ "block.beneath.blackstone_pebble": "Loose Pyroxenite", "block.beneath.blackstone_aqueduct": "Pyroxenite Aqueduct", "block.beneath.loose_blackstone": "Loose Pyroxenite", - "block.beneath.ore.nether_cursecoal": "Anthracite Ore", + "block.beneath.ore.nether_cursecoal": "Migmatite Anthracite Ore", "block.beneath.ore.nether_cursecoal.prospected": "Anthracite", "block.beneath.cursecoal_pile": "Anthracite Pile", - "block.beneath.ore.blackstone_sylvite": "Sylvite Ore", - "block.beneath.crackrack": "Keratophyre", + "block.beneath.ore.blackstone_sylvite": "Pyroxenite Sylvite Ore", + "block.beneath.crackrack": "Raw Keratophyre", "block.beneath.soul_clay": "Muddy Clay", "block.beneath.wood.log.crimson": "Crimson Stem", "block.beneath.wood.stripped_log.crimson": "Stripped Crimson Stem", diff --git a/kubejs/assets/betterend/blockstates/brimstone.json b/kubejs/assets/betterend/blockstates/brimstone.json new file mode 100644 index 000000000..8f26b4f6c --- /dev/null +++ b/kubejs/assets/betterend/blockstates/brimstone.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/brimstone_active" }, + { "model": "betterend:block/brimstone_active", "y": 180 }, + { "model": "betterend:block/brimstone_normal" }, + { "model": "betterend:block/brimstone_normal", "y": 180 } + ] + } +} diff --git a/kubejs/assets/betterend/blockstates/flavolite_pillar.json b/kubejs/assets/betterend/blockstates/flavolite_pillar.json new file mode 100644 index 000000000..e17d208b8 --- /dev/null +++ b/kubejs/assets/betterend/blockstates/flavolite_pillar.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=y": { + "model": "betterend:block/flavolite_pillar" + }, + "axis=z": { + "model": "betterend:block/flavolite_pillar", + "x": 90 + }, + "axis=x": { + "model": "betterend:block/flavolite_pillar", + "x": 90, + "y": 90 + } + } +} diff --git a/kubejs/assets/betterend/blockstates/hydrothermal_vent.json b/kubejs/assets/betterend/blockstates/hydrothermal_vent.json new file mode 100644 index 000000000..5ff455e55 --- /dev/null +++ b/kubejs/assets/betterend/blockstates/hydrothermal_vent.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/hydrothermal_vent" }, + { "model": "betterend:block/hydrothermal_vent", "y": 90 }, + { "model": "betterend:block/hydrothermal_vent", "y": 180 }, + { "model": "betterend:block/hydrothermal_vent", "y": 270 } + ] + } +} diff --git a/kubejs/assets/betterend/blockstates/lacugrove_bark.json b/kubejs/assets/betterend/blockstates/lacugrove_bark.json new file mode 100644 index 000000000..11e6da40d --- /dev/null +++ b/kubejs/assets/betterend/blockstates/lacugrove_bark.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/lacugrove_bark", "weight": 5 }, + { "model": "betterend:block/lacugrove_bark_2", "weight": 5 }, + { "model": "betterend:block/lacugrove_bark_3" }, + { "model": "betterend:block/lacugrove_bark_4" } + ] + } +} diff --git a/kubejs/assets/betterend/blockstates/lucernia_bark.json b/kubejs/assets/betterend/blockstates/lucernia_bark.json new file mode 100644 index 000000000..8faa8f4d7 --- /dev/null +++ b/kubejs/assets/betterend/blockstates/lucernia_bark.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/lucernia_bark", "weight": 6 }, + { "model": "betterend:block/lucernia_bark_2" }, + { "model": "betterend:block/lucernia_bark_3", "weight": 6 }, + { "model": "betterend:block/lucernia_bark_4" } + ] + } +} diff --git a/kubejs/assets/betterend/blockstates/sandy_jadestone_pillar.json b/kubejs/assets/betterend/blockstates/sandy_jadestone_pillar.json new file mode 100644 index 000000000..f7fda332b --- /dev/null +++ b/kubejs/assets/betterend/blockstates/sandy_jadestone_pillar.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=y": { + "model": "betterend:block/sandy_jadestone_pillar" + }, + "axis=z": { + "model": "betterend:block/sandy_jadestone_pillar", + "x": 90 + }, + "axis=x": { + "model": "betterend:block/sandy_jadestone_pillar", + "x": 90, + "y": 90 + } + } +} diff --git a/kubejs/assets/betterend/blockstates/sulphur_crystal.json b/kubejs/assets/betterend/blockstates/sulphur_crystal.json new file mode 100644 index 000000000..060336fc7 --- /dev/null +++ b/kubejs/assets/betterend/blockstates/sulphur_crystal.json @@ -0,0 +1,9 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/sulphur_crystal_0" }, + { "model": "betterend:block/sulphur_crystal_1" }, + { "model": "betterend:block/sulphur_crystal_2" } + ] + } +} diff --git a/kubejs/assets/betterend/blockstates/sulphuric_rock.json b/kubejs/assets/betterend/blockstates/sulphuric_rock.json new file mode 100644 index 000000000..40d81957e --- /dev/null +++ b/kubejs/assets/betterend/blockstates/sulphuric_rock.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/sulphuric_rock" } + ] + } +} diff --git a/kubejs/assets/betterend/blockstates/sulphuric_rock_pillar.json b/kubejs/assets/betterend/blockstates/sulphuric_rock_pillar.json new file mode 100644 index 000000000..ca6a9e00c --- /dev/null +++ b/kubejs/assets/betterend/blockstates/sulphuric_rock_pillar.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=y": { + "model": "betterend:block/sulphuric_rock_pillar" + }, + "axis=z": { + "model": "betterend:block/sulphuric_rock_pillar", + "x": 90 + }, + "axis=x": { + "model": "betterend:block/sulphuric_rock_pillar", + "x": 90, + "y": 90 + } + } +} diff --git a/kubejs/assets/betterend/blockstates/tube_worm.json b/kubejs/assets/betterend/blockstates/tube_worm.json new file mode 100644 index 000000000..69543e40d --- /dev/null +++ b/kubejs/assets/betterend/blockstates/tube_worm.json @@ -0,0 +1,24 @@ +{ + "variants": { + "facing=north": [ + { "model": "betterend:block/tube_worm_01", "y": 180 }, + { "model": "betterend:block/tube_worm_02", "y": 180 }, + { "model": "betterend:block/tube_worm_03", "y": 180 } + ], + "facing=south": [ + { "model": "betterend:block/tube_worm_01" }, + { "model": "betterend:block/tube_worm_02" }, + { "model": "betterend:block/tube_worm_03" } + ], + "facing=east": [ + { "model": "betterend:block/tube_worm_01", "y": 270 }, + { "model": "betterend:block/tube_worm_02", "y": 270 }, + { "model": "betterend:block/tube_worm_03", "y": 270 } + ], + "facing=west": [ + { "model": "betterend:block/tube_worm_01", "y": 90 }, + { "model": "betterend:block/tube_worm_02", "y": 90 }, + { "model": "betterend:block/tube_worm_03", "y": 90 } + ] + } +} diff --git a/kubejs/assets/betterend/lang/en_us.json b/kubejs/assets/betterend/lang/en_us.json index 7ebc3612a..41142b02d 100644 --- a/kubejs/assets/betterend/lang/en_us.json +++ b/kubejs/assets/betterend/lang/en_us.json @@ -14,6 +14,7 @@ "block.betterend.bolux_mushroom": "Bolux Mushroom Colony", "block.betterend.bolux_mushroom_wild": "Wild Bolux Mushroom Colony", "block.betterend.bolux_mushroom_dead": "Dead Bolux Mushroom Colony", + "block.betterend.brimstone": "Brimstone", "block.betterend.bushy_grass": "Novagrass", "block.betterend.bulb_moss": "Bulb Moss", "block.betterend.cave_bush": "Carmine Lamella", @@ -45,13 +46,20 @@ "block.betterend.filalux_wings": "Filalux Wings", "block.betterend.flamaea": "Flamaea Mushroom", "block.betterend.flammalix": "Flammalix Mushroom", + "block.betterend.flavolite": "Raw Leucitite", + "block.betterend.flavolite_bricks": "Leucitite Bricks", + "block.betterend.flavolite_pillar": "Leucitite Pillar", + "block.betterend.flavolite_polished": "Polished Leucitite", + "block.betterend.flavolite_tiles": "Leucitite Tiles", "block.betterend.fracturn": "Fracturn", "block.betterend.glacian_hymenophore": "Glacian Hymenophore", "block.betterend.globulagus": "Globulagus", + "block.betterend.hydrothermal_vent": "Thermal Vent", "block.betterend.hydralux": "Hydralux", "block.betterend.hydralux_sapling": "Hydralux Sprout", "block.betterend.inflexia": "Inflexia", "block.betterend.lacugrove": "Lacugrove Algae", + "block.betterend.lacugrove_bark": "Raw Adakite", "block.betterend.lamellarium": "Lamellarium", "block.betterend.lanceleaf": "Lanceleaf", "block.betterend.lanceleaf_small": "Lanceleaf Dagger", @@ -59,6 +67,7 @@ "block.betterend.lucernia_leaves": "Lucernia Lamella", "block.betterend.lucernia_leaves_fallen": "Small Lucernia Lamella", "block.betterend.lucernia_outer_leaves": "Lucernia Hyphae", + "block.betterend.lucernia_bark": "Fiendish Spire", "block.betterend.lutebus": "Lutebus", "block.betterend.magnula": "Magnula", "block.betterend.nightshade_moss": "Nox Moss", @@ -68,11 +77,23 @@ "block.betterend.rubinea": "Rubinea", "block.betterend.ruscus": "Ruscus Grass", "block.betterend.salteago": "Salteago", + "block.betterend.sandy_jadestone": "Raw Lamproite", + "block.betterend.sandy_jadestone_bricks": "Lamproite Bricks", + "block.betterend.sandy_jadestone_pillar": "Lamproite Pillar", + "block.betterend.sandy_jadestone_polished": "Polished Lamproite", + "block.betterend.sandy_jadestone_tiles": "Lamproite Tiles", "block.betterend.selagine": "Selagine", "block.betterend.shadow_berry": "Nox Berries", "block.betterend.shadow_berry_wild": "Wild Nox Berries", "block.betterend.shadow_berry_dead": "Dead Nox Berries", "block.betterend.small_amaranita_mushroom": "Small Amaranita Mushroom", + "block.betterend.sulphur_crystal": "Sulfur Crystal", + "block.betterend.sulphuric_rock": "Raw Ignimbrite", + "block.betterend.sulphuric_rock_bricks": "Ignimbrite Bricks", + "block.betterend.sulphuric_rock_pillar": "Ignimbrite Pillar", + "block.betterend.sulphuric_rock_polished": "Polished Ignimbrite", + "block.betterend.sulphuric_rock_tiles": "Ignimbrite Tiles", + "block.betterend.tube_worm": "Tube Worm", "block.betterend.twisted_moss": "Twisted Moss", "block.betterend.twisted_umbrella_moss": "Twisted Umbrella Moss", "block.betterend.twisted_umbrella_moss_tall": "Twisted Umbrella Moss", diff --git a/kubejs/assets/betterend/models/block/brimstone_active.json b/kubejs/assets/betterend/models/block/brimstone_active.json new file mode 100644 index 000000000..d7aa24865 --- /dev/null +++ b/kubejs/assets/betterend/models/block/brimstone_active.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/brimstone" + } +} diff --git a/kubejs/assets/betterend/models/block/brimstone_normal.json b/kubejs/assets/betterend/models/block/brimstone_normal.json new file mode 100644 index 000000000..da1bff0eb --- /dev/null +++ b/kubejs/assets/betterend/models/block/brimstone_normal.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/inactive_brimstone" + } +} diff --git a/kubejs/assets/betterend/models/block/flavolite_pillar.json b/kubejs/assets/betterend/models/block/flavolite_pillar.json new file mode 100644 index 000000000..c534dc009 --- /dev/null +++ b/kubejs/assets/betterend/models/block/flavolite_pillar.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "betterend:block/flavolite_pillar_top", + "side": "betterend:block/flavolite_pillar_side" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/hydrothermal_vent.json b/kubejs/assets/betterend/models/block/hydrothermal_vent.json new file mode 100644 index 000000000..40f1962b6 --- /dev/null +++ b/kubejs/assets/betterend/models/block/hydrothermal_vent.json @@ -0,0 +1,164 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "parent": "block/block", + "textures": { + "particle": "betterend:block/sulphuric_rock", + "texture": "betterend:block/sulphuric_rock", + "rock_top": "betterend:block/sulphuric_rock_top", + "geyser_top": "betterend:block/geyser_top" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 9, 10, 8 ], + "to": [ 13, 16, 12 ], + "faces": { + "up": { "uv": [ 0, 0, 4, 4 ], "texture": "#geyser_top", "cullface": "up" }, + "north": { "uv": [ 3, 0, 7, 6 ], "texture": "#texture" }, + "south": { "uv": [ 9, 0, 13, 6 ], "texture": "#texture" }, + "west": { "uv": [ 8, 0, 12, 6 ], "texture": "#texture" }, + "east": { "uv": [ 4, 0, 8, 6 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 8, 0, 7 ], + "to": [ 14, 10, 13 ], + "faces": { + "down": { "uv": [ 5, 5, 11, 11 ], "texture": "#rock_top", "cullface": "down" }, + "up": { "uv": [ 10, 5, 16, 11 ], "texture": "#geyser_top" }, + "north": { "uv": [ 5, 6, 11, 16 ], "texture": "#texture" }, + "south": { "uv": [ 5, 6, 11, 16 ], "texture": "#texture" }, + "west": { "uv": [ 5, 6, 11, 16 ], "texture": "#texture" }, + "east": { "uv": [ 5, 6, 11, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 4, 0, 1 ], + "to": [ 8, 5, 5 ], + "faces": { + "down": { "uv": [ 4, 11, 8, 15 ], "texture": "#rock_top", "cullface": "down" }, + "up": { "uv": [ 4, 1, 8, 5 ], "texture": "#geyser_top" }, + "north": { "uv": [ 8, 11, 12, 16 ], "texture": "#texture" }, + "west": { "uv": [ 1, 11, 5, 16 ], "texture": "#texture" }, + "east": { "uv": [ 11, 11, 15, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 5, 5, 2 ], + "to": [ 7, 11, 4 ], + "faces": { + "up": { "uv": [ 0, 4, 2, 6 ], "texture": "#geyser_top" }, + "north": { "uv": [ 8, 5, 10, 11 ], "texture": "#texture" }, + "south": { "uv": [ 6, 5, 8, 11 ], "texture": "#texture" }, + "west": { "uv": [ 1, 5, 3, 11 ], "texture": "#texture" }, + "east": { "uv": [ 13, 5, 15, 11 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 1, 0, 8 ], + "to": [ 5, 8, 12 ], + "faces": { + "down": { "uv": [ 1, 4, 5, 8 ], "texture": "#rock_top", "cullface": "down" }, + "up": { "uv": [ 5, 12, 9, 16 ], "texture": "#geyser_top" }, + "north": { "uv": [ 11, 8, 15, 16 ], "texture": "#texture" }, + "south": { "uv": [ 1, 8, 5, 16 ], "texture": "#texture" }, + "west": { "uv": [ 8, 8, 12, 16 ], "texture": "#texture" }, + "east": { "uv": [ 4, 8, 8, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 2, 8, 9 ], + "to": [ 4, 14, 11 ], + "faces": { + "up": { "uv": [ 0, 4, 2, 6 ], "texture": "#geyser_top" }, + "north": { "uv": [ 12, 2, 14, 8 ], "texture": "#texture" }, + "south": { "uv": [ 2, 2, 4, 8 ], "texture": "#texture" }, + "west": { "uv": [ 9, 2, 11, 8 ], "texture": "#texture" }, + "east": { "uv": [ 5, 2, 7, 8 ], "texture": "#texture" } + } + }, + { + "__comment": "Box7", + "from": [ 2, 0, 4 ], + "to": [ 5, 4, 7 ], + "faces": { + "down": { "uv": [ 2, 9, 5, 12 ], "texture": "#rock_top", "cullface": "down" }, + "up": { "uv": [ 9, 13, 12, 16 ], "texture": "#geyser_top" }, + "north": { "uv": [ 11, 12, 14, 16 ], "texture": "#texture" }, + "south": { "uv": [ 2, 12, 5, 16 ], "texture": "#texture" }, + "west": { "uv": [ 4, 12, 7, 16 ], "texture": "#texture" }, + "east": { "uv": [ 9, 12, 12, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box7", + "from": [ 3, 0, 13 ], + "to": [ 6, 4, 16 ], + "faces": { + "down": { "uv": [ 3, 0, 6, 3 ], "texture": "#rock_top", "cullface": "down" }, + "up": { "uv": [ 9, 0, 12, 3 ], "texture": "#geyser_top" }, + "north": { "uv": [ 10, 12, 13, 16 ], "texture": "#texture" }, + "south": { "uv": [ 3, 12, 6, 16 ], "texture": "#texture", "cullface": "south" }, + "west": { "uv": [ 13, 12, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 12, 3, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box7", + "from": [ 12, 0, 2 ], + "to": [ 15, 4, 5 ], + "faces": { + "down": { "uv": [ 12, 11, 15, 14 ], "texture": "#rock_top", "cullface": "down" }, + "up": { "uv": [ 9, 13, 12, 16 ], "texture": "#geyser_top" }, + "north": { "uv": [ 1, 12, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 12, 12, 15, 16 ], "texture": "#texture" }, + "west": { "uv": [ 2, 12, 5, 16 ], "texture": "#texture" }, + "east": { "uv": [ 11, 12, 14, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box7", + "from": [ 7, 0, 3 ], + "to": [ 12, 7, 8 ], + "faces": { + "down": { "uv": [ 7, 8, 12, 13 ], "texture": "#rock_top", "cullface": "down" }, + "up": { "uv": [ 4, 0, 9, 5 ], "texture": "#geyser_top" }, + "north": { "uv": [ 4, 9, 9, 16 ], "texture": "#texture" }, + "south": { "uv": [ 7, 9, 12, 16 ], "texture": "#texture" }, + "west": { "uv": [ 3, 9, 8, 16 ], "texture": "#texture" }, + "east": { "uv": [ 8, 9, 13, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box7", + "from": [ 4, 0, 9 ], + "to": [ 9, 7, 14 ], + "faces": { + "down": { "uv": [ 4, 2, 9, 7 ], "texture": "#rock_top", "cullface": "down" }, + "up": { "uv": [ 4, 0, 9, 5 ], "texture": "#geyser_top" }, + "north": { "uv": [ 7, 9, 12, 16 ], "texture": "#texture" }, + "south": { "uv": [ 4, 9, 9, 16 ], "texture": "#texture" }, + "west": { "uv": [ 9, 9, 14, 16 ], "texture": "#texture" }, + "east": { "uv": [ 2, 9, 7, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box7", + "from": [ 3, 0, 5 ], + "to": [ 8, 9, 10 ], + "faces": { + "down": { "uv": [ 3, 6, 8, 11 ], "texture": "#rock_top", "cullface": "down" }, + "up": { "uv": [ 4, 0, 9, 5 ], "texture": "#geyser_top" }, + "north": { "uv": [ 8, 7, 13, 16 ], "texture": "#texture" }, + "south": { "uv": [ 3, 7, 8, 16 ], "texture": "#texture" }, + "west": { "uv": [ 5, 7, 10, 16 ], "texture": "#texture" }, + "east": { "uv": [ 6, 7, 11, 16 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/lacugrove_bark.json b/kubejs/assets/betterend/models/block/lacugrove_bark.json new file mode 100644 index 000000000..9f6d5616f --- /dev/null +++ b/kubejs/assets/betterend/models/block/lacugrove_bark.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/lacugrove_log_side" + } +} diff --git a/kubejs/assets/betterend/models/block/lacugrove_bark_2.json b/kubejs/assets/betterend/models/block/lacugrove_bark_2.json new file mode 100644 index 000000000..086106bf1 --- /dev/null +++ b/kubejs/assets/betterend/models/block/lacugrove_bark_2.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/lacugrove_log_side_2" + } +} diff --git a/kubejs/assets/betterend/models/block/lacugrove_bark_3.json b/kubejs/assets/betterend/models/block/lacugrove_bark_3.json new file mode 100644 index 000000000..0ebc7fd4e --- /dev/null +++ b/kubejs/assets/betterend/models/block/lacugrove_bark_3.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/lacugrove_log_side_3" + } +} diff --git a/kubejs/assets/betterend/models/block/lacugrove_bark_4.json b/kubejs/assets/betterend/models/block/lacugrove_bark_4.json new file mode 100644 index 000000000..aba164716 --- /dev/null +++ b/kubejs/assets/betterend/models/block/lacugrove_bark_4.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/lacugrove_log_side_4" + } +} diff --git a/kubejs/assets/betterend/models/block/lucernia_bark.json b/kubejs/assets/betterend/models/block/lucernia_bark.json new file mode 100644 index 000000000..2d1d28db2 --- /dev/null +++ b/kubejs/assets/betterend/models/block/lucernia_bark.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/lucernia_log_side" + } +} diff --git a/kubejs/assets/betterend/models/block/lucernia_bark_2.json b/kubejs/assets/betterend/models/block/lucernia_bark_2.json new file mode 100644 index 000000000..1975f43dd --- /dev/null +++ b/kubejs/assets/betterend/models/block/lucernia_bark_2.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/lucernia_log_side_2" + } +} diff --git a/kubejs/assets/betterend/models/block/lucernia_bark_3.json b/kubejs/assets/betterend/models/block/lucernia_bark_3.json new file mode 100644 index 000000000..98dacd59e --- /dev/null +++ b/kubejs/assets/betterend/models/block/lucernia_bark_3.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_mirrored_all", + "textures": { + "all": "betterend:block/lucernia_log_side" + } +} diff --git a/kubejs/assets/betterend/models/block/lucernia_bark_4.json b/kubejs/assets/betterend/models/block/lucernia_bark_4.json new file mode 100644 index 000000000..9b91dce6b --- /dev/null +++ b/kubejs/assets/betterend/models/block/lucernia_bark_4.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_mirrored_all", + "textures": { + "all": "betterend:block/lucernia_log_side_2" + } +} diff --git a/kubejs/assets/betterend/models/block/sandy_jadestone_pillar.json b/kubejs/assets/betterend/models/block/sandy_jadestone_pillar.json new file mode 100644 index 000000000..03476c611 --- /dev/null +++ b/kubejs/assets/betterend/models/block/sandy_jadestone_pillar.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "betterend:block/sandy_jadestone_pillar_top", + "side": "betterend:block/sandy_jadestone_pillar_side" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/sulphur_crystal_0.json b/kubejs/assets/betterend/models/block/sulphur_crystal_0.json new file mode 100644 index 000000000..9a3ff8de4 --- /dev/null +++ b/kubejs/assets/betterend/models/block/sulphur_crystal_0.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/sulphur_crystal_0" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/sulphur_crystal_1.json b/kubejs/assets/betterend/models/block/sulphur_crystal_1.json new file mode 100644 index 000000000..8474044dd --- /dev/null +++ b/kubejs/assets/betterend/models/block/sulphur_crystal_1.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/sulphur_crystal_1" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/sulphur_crystal_2.json b/kubejs/assets/betterend/models/block/sulphur_crystal_2.json new file mode 100644 index 000000000..279f1c3ed --- /dev/null +++ b/kubejs/assets/betterend/models/block/sulphur_crystal_2.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/sulphur_crystal_2" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/sulphuric_rock.json b/kubejs/assets/betterend/models/block/sulphuric_rock.json new file mode 100644 index 000000000..1fea448f1 --- /dev/null +++ b/kubejs/assets/betterend/models/block/sulphuric_rock.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "betterend:block/sulphuric_rock_top", + "side": "betterend:block/sulphuric_rock" + } +} diff --git a/kubejs/assets/betterend/models/block/sulphuric_rock_pillar.json b/kubejs/assets/betterend/models/block/sulphuric_rock_pillar.json new file mode 100644 index 000000000..85734fb6b --- /dev/null +++ b/kubejs/assets/betterend/models/block/sulphuric_rock_pillar.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "betterend:block/sulphuric_rock_pillar_top", + "side": "betterend:block/sulphuric_rock_pillar_side" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/tube_worm_01.json b/kubejs/assets/betterend/models/block/tube_worm_01.json new file mode 100644 index 000000000..ae2acdf57 --- /dev/null +++ b/kubejs/assets/betterend/models/block/tube_worm_01.json @@ -0,0 +1,95 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/tube_worm_3", + "worm3": "betterend:block/tube_worm_3", + "worm2": "betterend:block/tube_worm_2", + "worm1": "betterend:block/tube_worm_1" + }, + "elements": [ + { + "__comment": "PlaneX1", + "from": [ 8, 0, 0 ], + "to": [ 8.001, 9, 16 ], + "shade": false, + "faces": { + "west": { "uv": [ 16, 7, 0, 16 ], "texture": "#worm3" }, + "east": { "uv": [ 0, 7, 16, 16 ], "texture": "#worm3" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 11, 0, 0 ], + "to": [ 11.001, 9, 16 ], + "rotation": { "origin": [ 11, 0, 0 ], "axis": "y", "angle": 22.5 }, + "shade": false, + "faces": { + "west": { "uv": [ 16, 7, 0, 16 ], "texture": "#worm1" }, + "east": { "uv": [ 0, 7, 16, 16 ], "texture": "#worm1" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 5, 0, 0 ], + "to": [ 5.001, 9, 16 ], + "rotation": { "origin": [ 5, 0, 0 ], "axis": "y", "angle": -22.5 }, + "shade": false, + "faces": { + "west": { "uv": [ 16, 7, 0, 16 ], "texture": "#worm2" }, + "east": { "uv": [ 0, 7, 16, 16 ], "texture": "#worm2" } + } + }, + { + "__comment": "Box4", + "from": [ 11, 6, 3 ], + "to": [ 14, 11, 6 ], + "faces": { + "down": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "up": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "north": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "south": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "west": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "east": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" } + } + }, + { + "__comment": "Box4", + "from": [ 2, 6, 5 ], + "to": [ 5, 11, 8 ], + "faces": { + "down": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "up": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "north": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "south": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "west": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "east": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" } + } + }, + { + "__comment": "Box4", + "from": [ 6.5, 7, 9 ], + "to": [ 9.5, 12, 12 ], + "faces": { + "down": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "up": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "north": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "south": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "west": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "east": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" } + } + }, + { + "__comment": "Box4", + "from": [ 6.5, 9, 3 ], + "to": [ 9.5, 14, 6 ], + "faces": { + "down": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "up": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "north": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "south": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "west": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "east": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" } + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/tube_worm_02.json b/kubejs/assets/betterend/models/block/tube_worm_02.json new file mode 100644 index 000000000..dad765bfe --- /dev/null +++ b/kubejs/assets/betterend/models/block/tube_worm_02.json @@ -0,0 +1,95 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/tube_worm_3", + "worm3": "betterend:block/tube_worm_3", + "worm2": "betterend:block/tube_worm_2", + "worm1": "betterend:block/tube_worm_1" + }, + "elements": [ + { + "__comment": "PlaneX1", + "from": [ 8, 0, 0 ], + "to": [ 8.001, 9, 16 ], + "shade": false, + "faces": { + "west": { "uv": [ 16, 7, 0, 16 ], "texture": "#worm2" }, + "east": { "uv": [ 0, 7, 16, 16 ], "texture": "#worm2" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 11, 0, 0 ], + "to": [ 11.001, 9, 16 ], + "rotation": { "origin": [ 11, 0, 0 ], "axis": "y", "angle": 22.5 }, + "shade": false, + "faces": { + "west": { "uv": [ 16, 7, 0, 16 ], "texture": "#worm3" }, + "east": { "uv": [ 0, 7, 16, 16 ], "texture": "#worm3" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 5, 0, 0 ], + "to": [ 5.001, 9, 16 ], + "rotation": { "origin": [ 5, 0, 0 ], "axis": "y", "angle": -22.5 }, + "shade": false, + "faces": { + "west": { "uv": [ 16, 7, 0, 16 ], "texture": "#worm2" }, + "east": { "uv": [ 0, 7, 16, 16 ], "texture": "#worm2" } + } + }, + { + "__comment": "Box4", + "from": [ 6.5, 6, 5.5 ], + "to": [ 9.5, 11, 8.5 ], + "faces": { + "down": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "up": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "north": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "south": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "west": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "east": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" } + } + }, + { + "__comment": "Box4", + "from": [ 1, 6, 5 ], + "to": [ 4, 11, 8 ], + "faces": { + "down": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "up": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "north": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "south": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "west": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "east": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" } + } + }, + { + "__comment": "Box4", + "from": [ 13.5, 7, 9 ], + "to": [ 16.5, 12, 12 ], + "faces": { + "down": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "up": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "north": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "south": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "west": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "east": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" } + } + }, + { + "__comment": "Box4", + "from": [ 11.5, 9, 3 ], + "to": [ 14.5, 14, 6 ], + "faces": { + "down": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "up": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "north": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "south": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "west": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "east": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" } + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/tube_worm_03.json b/kubejs/assets/betterend/models/block/tube_worm_03.json new file mode 100644 index 000000000..90a0db4a7 --- /dev/null +++ b/kubejs/assets/betterend/models/block/tube_worm_03.json @@ -0,0 +1,108 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/tube_worm_3", + "worm3": "betterend:block/tube_worm_3", + "worm2": "betterend:block/tube_worm_2", + "worm1": "betterend:block/tube_worm_1" + }, + "elements": [ + { + "__comment": "PlaneX1", + "from": [ 8, 0, 0 ], + "to": [ 8.001, 9, 16 ], + "shade": false, + "faces": { + "west": { "uv": [ 16, 7, 0, 16 ], "texture": "#worm2" }, + "east": { "uv": [ 0, 7, 16, 16 ], "texture": "#worm2" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 11, 0, 0 ], + "to": [ 11.001, 9, 16 ], + "rotation": { "origin": [ 11, 0, 0 ], "axis": "y", "angle": 22.5 }, + "shade": false, + "faces": { + "west": { "uv": [ 16, 7, 0, 16 ], "texture": "#worm3" }, + "east": { "uv": [ 0, 7, 16, 16 ], "texture": "#worm3" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 5, 0, 0 ], + "to": [ 5.001, 9, 16 ], + "rotation": { "origin": [ 5, 0, 0 ], "axis": "y", "angle": -22.5 }, + "shade": false, + "faces": { + "west": { "uv": [ 16, 7, 0, 16 ], "texture": "#worm3" }, + "east": { "uv": [ 0, 7, 16, 16 ], "texture": "#worm3" } + } + }, + { + "__comment": "Box4", + "from": [ 6.5, 6, 5.5 ], + "to": [ 9.5, 11, 8.5 ], + "faces": { + "down": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "up": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "north": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "south": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "west": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "east": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" } + } + }, + { + "__comment": "Box4", + "from": [ 14, 7, 9 ], + "to": [ 17, 12, 12 ], + "faces": { + "down": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "up": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "north": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "south": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "west": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "east": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" } + } + }, + { + "__comment": "Box4", + "from": [ 11.5, 9, 3 ], + "to": [ 14.5, 14, 6 ], + "faces": { + "down": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "up": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "north": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "south": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "west": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "east": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" } + } + }, + { + "__comment": "Box4", + "from": [ 1.5, 9, 3 ], + "to": [ 4.5, 14, 6 ], + "faces": { + "down": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "up": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "north": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "south": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "west": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "east": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" } + } + }, + { + "__comment": "Box4", + "from": [ -1, 7, 9 ], + "to": [ 2, 12, 12 ], + "faces": { + "down": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "up": { "uv": [ 10, 0, 13, 3 ], "texture": "#worm3" }, + "north": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "south": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "west": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" }, + "east": { "uv": [ 13, 0, 16, 5 ], "texture": "#worm3" } + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/hydrothermal_vent.json b/kubejs/assets/betterend/models/item/hydrothermal_vent.json new file mode 100644 index 000000000..df7a31771 --- /dev/null +++ b/kubejs/assets/betterend/models/item/hydrothermal_vent.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/hydrothermal_vent" +} diff --git a/kubejs/assets/betterend/models/item/sulphur_crystal.json b/kubejs/assets/betterend/models/item/sulphur_crystal.json new file mode 100644 index 000000000..899b962fa --- /dev/null +++ b/kubejs/assets/betterend/models/item/sulphur_crystal.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/sulphur_crystal_2" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/tube_worm.json b/kubejs/assets/betterend/models/item/tube_worm.json new file mode 100644 index 000000000..d754a00c5 --- /dev/null +++ b/kubejs/assets/betterend/models/item/tube_worm.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/tube_worm" + } +} diff --git a/kubejs/assets/betterend/textures/block/brimstone.png b/kubejs/assets/betterend/textures/block/brimstone.png new file mode 100644 index 0000000000000000000000000000000000000000..e6c11d99a4944516b89a63a5333325c8e4143cb4 GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdp969eo`c7&i8E|4C$JU|=u^ z@Ck8U(jl^Ay40}^I_D4BF%SWm=I@-rz`zjY>Eaktaf|gJBO|jR5A(*;^BnF9{;=Q> z`~2Lj^UUeeLuInRY!uF~YA7`cMDZ p`86)rXjw7)W%u^{n%>Qe^8TGL;q?zafAky3F`lk|F6*2UngI2AMY8|^ literal 0 HcmV?d00001 diff --git a/kubejs/assets/betterend/textures/block/flavolite.png b/kubejs/assets/betterend/textures/block/flavolite.png new file mode 100644 index 0000000000000000000000000000000000000000..f259025e7e6655068f0712bc7dc50d8d840d2458 GIT binary patch literal 222 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QUsuz{S+^6mc* zO?}3+JCWDY_~iCkTXh;A?rzvpc&69oaKg^c#aq+(4!?Y`J}l_=1jhKI`_j2LyPy5K zH|)fk`Kejj$Il(RldyNS!ODn-TTQUiW*SB}~yt}jQ!|jcq zZmoHBY4PJzvu_`od}Vj{xvecHH`E?kUB2mh<0b|Mh6+y?$B+s})`N|OM+_Ja8w8bo zyTASWG_Dz(zFZEEkKb$kT>eAW-RvA&%kP3tDe-6L`iliwX1wz_HD}#~8?8~{3BhId z5mN8N4J6bYE;CHz|JKKI?$_OfzZx1I5tDn{r6(wHGxbcgvAR=v^x9^D$cz~mt5X$v ca(=QebnuRyqx)|b0|Nttr>mdKI;Vst0DK)@&Hw-a literal 0 HcmV?d00001 diff --git a/kubejs/assets/betterend/textures/block/flavolite_pillar_side.png b/kubejs/assets/betterend/textures/block/flavolite_pillar_side.png new file mode 100644 index 0000000000000000000000000000000000000000..3f2e5468e31798aac117e0518b9c2e5d9307e1af GIT binary patch literal 212 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QUiW*SB}~yt}jQ!|jcq zZmoHBY4PJzvu_`od}Vj{xvecHH`E?kUB2mh<0b|MhCELf$B+s})`N|?hZ%U74ZJij zeEnaY+*@O}ujcXX-;bA9l&QUiW*SB}~yt}jQ!|jcq zZmoHBY4PJzvu_`od}Vj{xvecHH`E?kUB2mh<0b|MhC)vl$B+s})`N|XhaCi%4Ss&o zePgfZdCo(U;epkb;uJLalE%>@UCEaq-%=O1u(zj2xsa@xJR5GM1VCF`KAC_5emz9dv@tZLGR|~aw V*u&nG%D}+D;OXk;vd$@?2>^;DT8;n! literal 0 HcmV?d00001 diff --git a/kubejs/assets/betterend/textures/block/flavolite_polished.png b/kubejs/assets/betterend/textures/block/flavolite_polished.png new file mode 100644 index 0000000000000000000000000000000000000000..14c07cf6264e9212d86f4bd8f6db8b799ca502f0 GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QUiW*SB}~yt}jQ!|jcq zZmoHBY4PJzvu_`od}Vj{xvecHH`E?kUB2mh<0b|Mh5}C)$B+s})`N|VhZT634J1@ZCl&p zJ6$lec6ImZEhe#-cP;8%tCCe#p7z93E6qjPUGV?_ literal 0 HcmV?d00001 diff --git a/kubejs/assets/betterend/textures/block/flavolite_tiles.png b/kubejs/assets/betterend/textures/block/flavolite_tiles.png new file mode 100644 index 0000000000000000000000000000000000000000..3ee5436a63098011a2bc5a84c4638005ec590138 GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QUiW*SB}~yt}jQ!|jcq zZmoHBY4PJzvu_`od}Vj{xvecHH`E?kUB2mh<0b|MhH_6A$B+s})`J@x?=bK%8w5<- z`+v*Ie@7T*BwkBMyMFur>ihS%UCO_5neCIXv8UQwkNNh`CV3R8&y!GlU^sd6xs2>T zi^}3NZ$vaC%JFRexa{fg?{hQv&&_D^Ui9spO1g@ucZfoibxctBoygovvkE_zJkL(J dx8NuL#CnT`N%!tIFfcGMc)I$ztaD0e0s!+`Wr+X) literal 0 HcmV?d00001 diff --git a/kubejs/assets/betterend/textures/block/geyser_top.png b/kubejs/assets/betterend/textures/block/geyser_top.png new file mode 100644 index 0000000000000000000000000000000000000000..0fc22b0f12252bf9f09bebbe2898166e2ff81c70 GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdoVYd_r8y<6?8dLKA#_LS39a ztt{;g4Hy_0woE!am4SgF#nZ(xq#`c1=QMAFf`Ci8WrY~eyhu(~1z8TWge|Qv_p@xC zQ1QV;|Fg1iLk@8E&lvkVLj44$rjF6*2UngEHaK_mbG literal 0 HcmV?d00001 diff --git a/kubejs/assets/betterend/textures/block/inactive_brimstone.png b/kubejs/assets/betterend/textures/block/inactive_brimstone.png new file mode 100644 index 0000000000000000000000000000000000000000..0c0b22af919c2ce18843929ac76fadbb7d0b8f51 GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdp969eo`c7&i8E|4C$JU|=u^ z@Ck99n8vrbL}X2i{O*O83`BtD6`$TQFfc@Ux;TbZ++sb*$jEHS!@TkIJcql2KP))J zK0i0>JafAAP?_v68-??$8j6f=bL><e+wxqr3rl(}!!k3`Mq()Rk!adW+z{?k8p pevQjDT2{<{*}Xl#rg!tAyniQ5c>P1qAN>Y$jHj!g%Q~loCIHbQMaBRC literal 0 HcmV?d00001 diff --git a/kubejs/assets/betterend/textures/block/lacugrove_log_side.png b/kubejs/assets/betterend/textures/block/lacugrove_log_side.png new file mode 100644 index 0000000000000000000000000000000000000000..885e2800edee1c8b2d9610c25fe11f89f9bac22a GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdr%jd_r93RmDs#3U5gAE{k@{ z4t7ZPwFz@JaW>U5(^C4OZQ{njz|iUG;uum9$9ixhUz33d>xJK95uMEIHr$Zc*iy~A z!TC^@NL+Z9cB(1MpWO3~38yzd;>@0Tsdu^z-=Y&QeLuK)Ppxdee8b?>-s6^&B%bOk z-D=vl+uL#D`|W1J8tc|4W-o2JQux6pJ7kvHd!gP{hf8!S+uQE8@9e9HITWR4`q1+s j_r;VC&u;W)J(breRWb2-8WzUDz`)??>gTe~DWM4f`Wsr+ literal 0 HcmV?d00001 diff --git a/kubejs/assets/betterend/textures/block/lacugrove_log_side_2.png b/kubejs/assets/betterend/textures/block/lacugrove_log_side_2.png new file mode 100644 index 0000000000000000000000000000000000000000..1e4ddac3130a5c346cc1bdfa3f0e88a781ec92eb GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdr%jd_r93RmDs#3U5gAE{k@{ z4t7ZPwFz@JaW>U5(^C4OZQ{njz|i68;uum9$9m9EsL4Qp^}>9STkj$qa+}o|_$DyE zJ=~+qv1Y9zcV=nAr0m~vE%$A%+a&J(81O;8**bXsO4oz;r(Su&`{?kA;@j3o9$ar- z;;iJkQU{g=&i+7nM_e< z^#0ecFbZc7neT%5-Cdcem1ekqE33>=G+2J zQ=3f_ci+-owf)?|ED_J%8$Ag@O!v!HA9>$6gT>*;(yNCB!%WQU;E*no%G zq49J~#;u%V0qiIL|5qyynD|HeXEEzZ&W}e<@0jn{#_RO^VL{!SErNNBPfg@kO_^Q9 zHtVZx@K%+wbxy{Q{B$k(u4;Yxdt*^l9-}VjubS#RS9jfskz&j1FArre2s|t!csqac zL$%U#M@}o>ZtE&5(K}wXE^E8SuF|zGldsgVDrNL;?@hpB)N!=Z9tKKB`A#V!8t h7acx3)%ZW-EmOf)r;HxFWnf@n@O1TaS?83{1OUE^g4+N9 literal 0 HcmV?d00001 diff --git a/kubejs/assets/betterend/textures/block/lucernia_log_side.png b/kubejs/assets/betterend/textures/block/lucernia_log_side.png new file mode 100644 index 0000000000000000000000000000000000000000..37402358276940d5ce2245fcd952288642d80e24 GIT binary patch literal 220 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QUVS)R|WQUVS)R|W?6OX)Wja(ld!43Bo-tQx|Lxuxl_Br)jwwk` zb(H&kp_waU|IRlHnw}X?kQOnxefXZDXpP*-at_`ZIp1?NMBCR|OzFCL_nlbdsbP0l+XkKNqtUw literal 0 HcmV?d00001 diff --git a/kubejs/assets/betterend/textures/block/sandy_jadestone.png b/kubejs/assets/betterend/textures/block/sandy_jadestone.png new file mode 100644 index 0000000000000000000000000000000000000000..256ca2f7979087a748741d9a1ff9792e91a118c7 GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdm+fgWR1M)}51i$-uzCAK(+> zI(1V@|B|StX~ETP9>ujbcfTKvWME*3@^onkAF$xFRg~Vky-PQq^LJ+Ybug=jz`(%Z>FVdQ&MBb@09v_29smFU literal 0 HcmV?d00001 diff --git a/kubejs/assets/betterend/textures/block/sandy_jadestone_bricks.png b/kubejs/assets/betterend/textures/block/sandy_jadestone_bricks.png new file mode 100644 index 0000000000000000000000000000000000000000..939a6e8d839932dd95757b93ed14f5a64462af1a GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QUujbMuD4s7#J8LJzX3_D&lPW9QhawIhX`r{NKOl zV(7B~X{pl-3PL_JOf-2p?-R4f$q@Eg4{ol%$#~{=Zbnmmrk~`|WqgOv{y#q9-;X8r vwG;k*?K~Dc;on!sU)R~M*V}a*_*IjT#k9x6VZ|E;1_lOCS3j3^P6QUtE6ALL?C;9w4T{^o!E zPEXCU*B@?7n6M=xZ}P-{1`PbR$&SmsL{h>s9Tv8QVin^ZI?~E^Jct dKemN2Ybw*+WsiC#7#J8BJYD@<);T3K0RSZ(J6iw% literal 0 HcmV?d00001 diff --git a/kubejs/assets/betterend/textures/block/sandy_jadestone_pillar_top.png b/kubejs/assets/betterend/textures/block/sandy_jadestone_pillar_top.png new file mode 100644 index 0000000000000000000000000000000000000000..d961081ba2bac0992635fb67e840981e4ccf997f GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QUr$Ax%mz#a5zWXec%6S ziqYJ4o}!(#TuRLH!VlXyw_grc*&4R+O+ZKRO&QUujbMuD4s7#J9WJzX3_Di~Q0HZn3B@*Gi^QuTl0 ze=bvoC40=(zErXw){tQnIyLcV(p=wfX^V{2julM!HQ|ZEj1!CPjQ;p-PU)CqaN^YD og?4}BBs~hHR3!JdGrZyNHdG4InZtaTfq{X+)78&qol`;+0D(|GE&u=k literal 0 HcmV?d00001 diff --git a/kubejs/assets/betterend/textures/block/sandy_jadestone_tiles.png b/kubejs/assets/betterend/textures/block/sandy_jadestone_tiles.png new file mode 100644 index 0000000000000000000000000000000000000000..761ca2fbe4e9afc457caec1ff5fd7b2663ed36b1 GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QUujbMuD4s7#J9=JY5_^D&o$b+sMf5$aC1h*7fcF zqE(-HR$fqwpQK_lndy;a#!=(TzUQwnSqCq?`;+m(Jjc@8#`T|mFnTpJEiJig0J4+8 M)78&qol`;+03T8{%K!iX literal 0 HcmV?d00001 diff --git a/kubejs/assets/betterend/textures/block/sulphur_crystal_0.png b/kubejs/assets/betterend/textures/block/sulphur_crystal_0.png new file mode 100644 index 0000000000000000000000000000000000000000..7620e8daef8751ab467138994677315d45dacbb9 GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr z2=R1r45_%4{Nw+BduG)ci4qb9Ty3@%8$7<*8^v8xbc#9BEYkF$?`6>c{@e?V$%}X# zud!TWSae=~lkz!+8EF&P1l-E3ID~T*=VhGglIfAj5A*q3>lv7|9@ zG@A(JGI$93Fz*sikXWCVGCOfwv%xM2N9Ke&_iH^mZPy!AWt9?oPP-~t?)ld)$#Ce# eA%?pQ45t0I6X%F4w=gg;FnGH9xvX~XUff9&f|@cB$mW$0kb zR6EU(6W5S9M{0UW#~=2@l-Z6F&t&(kbG+8_uD-;sP0`@20;>W~vDq0{13SO)1?*xR thfNOeX_3>DU|Ya0p~pNSnPZ7KLuI$)PXjaGHUQJqfcnhou)WqNLt=U-wgUf08S z;n_avXeqVaFt)YRI&ZHo)^T3tegC*YpSwA4QZ+YwX|S#8lmMl#?B8b#8sGF5+rq%W Oz~JfX=d#Wzp$P!Vi%anU literal 0 HcmV?d00001 diff --git a/kubejs/assets/betterend/textures/block/sulphuric_rock_bricks.png b/kubejs/assets/betterend/textures/block/sulphuric_rock_bricks.png new file mode 100644 index 0000000000000000000000000000000000000000..d8411976da1363eac97a1eec0850d183443c1de1 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdp969eo`c7&i8E|4C$JU|S;`*ygxB5uRoZTc&A%4H??&zz|EMp^xtK;KMbW!B60AE@0ZJ1ss>e9gD> zMw6DN2`byYww%UlSZuwSNhdE>C*av#m7L$({<6pDN=}(nnZVD$z`)??>gTe~DWM4f DGY~`5 literal 0 HcmV?d00001 diff --git a/kubejs/assets/betterend/textures/block/sulphuric_rock_pillar_side.png b/kubejs/assets/betterend/textures/block/sulphuric_rock_pillar_side.png new file mode 100644 index 0000000000000000000000000000000000000000..26b4c9160b9f03398a2ae3ab94024571e3e356af GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdp969eo`c7&i8E|4C$JU|^67 z@Ck7(kBcpfjmZcON)HN5@b!uJ@eXlv40d$zw6e4}G&pzZ)j|dahAdAP$B>FR)kBVa z%?ctc7dqWnxW-C5-IeB0SD54f=kxO&zS;K<|9w>Vwr7XZi)?eSx<2(Ydb9G z>gIAw_}$1ld(91&d2=Ey4jcVX$SuiR+}t~Ns;rINhr^R6slQkp8mb*4pHN%Fn0LXT VTFIcRm4ShQ!PC{xWt~$(699Iu@b$?E4l0X{VZaT3i596aFffF8x;TbZ+zLH=koSNBN9)7% z%jM$1><mPm2yC7;VJ qQYh`Zlk+9_+&OhGYpeh3L#r4$T!cE@<5)^SwtKqzxvXQUdrvD%dqV?;Q7{?;!y*Kh zeU@`$U|?V@3Gxg6C-s=UmVtp`il>WXNJX4!|7o$q3LLELCfv96F8%-SSNthJN99|d zzz!abY|$4go?9NC?-9ANS!$N6!Ow4R4~L}Jr-xWvy>h2WOvl}Q_H|KaNvo{csU{On zeNwlPP_@mS-ft4=r5 ryyum&>q_rW{OWOyP_|P~;1~Lp(~IP4g7aBrHi*y*E4he7e;A zT$#5uuMfEHo2#>Chfl3wmqVOq?~RC~8w;;Ro{3u5FYvx%G4E*^zgNNM7I)>BmU)NY qyB2XIqTT0W#*4>*sj5>gJ5eog^;-HQyTaEm1ciWr#*v7EHj=Hk+7l+e*T l=XOdUR!8rc!Q>bQ_7=|5>%8SpGcYhPc)I$ztaD0e0swJ;IX3_R literal 0 HcmV?d00001 diff --git a/kubejs/assets/betterend/textures/item/thermal_fungus.png b/kubejs/assets/betterend/textures/item/thermal_fungus.png new file mode 100644 index 0000000000000000000000000000000000000000..bf1056d15d8e374795d7ebc31c4e2461c94f932e GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdp969eo`c7&i8E|4C$JU|=u^ z@CkAK|NlP&1H<>Hr_OAhxoJV`%HHys9p&BmF*OOkMae;h5w6kxj`6Oh`r@3@EDXX7 z41GEakt5tp3cz;JJOf>*=CYpeKqc$#>a_IRJZ z?ksV7b=E&;iPc%F^f;QXl*sVMb0>Y6Z+Vq3t-$K{8Yb^Tshww;HPdD+nzWPg%#0i} y=^Ufw-M85clB2!Mj;xz|*~~%W&hCRI45v-x%GPbLKgz(sz~JfX=d#Wzp$P!5{#UC2 literal 0 HcmV?d00001 diff --git a/kubejs/assets/betterend/textures/item/tube_worm.png b/kubejs/assets/betterend/textures/item/tube_worm.png new file mode 100644 index 0000000000000000000000000000000000000000..6159c2909f0c767ddbe2d6fb3c0cf7a131291158 GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdmu-d_r9R|Nnnx&+7F{r_Stc zD#(bR92nMa?GYL1S*2?gEu(88DF4gvt^@-E17k^$UoeBivm0p)3=AHgE{-7;amfh| z4Kt0^8#2#byP#)~>~`c#CZE8}Z7HG~F02Z5J;W#QRHy3&kNS!!-3u&34((vj3gioX nn8UaA^iGCT3GIdo3=A&X{9LU}({dRY7#KWV{an^LB{Ts59dJLh literal 0 HcmV?d00001 diff --git a/kubejs/data/betterend/loot_tables/blocks/hydrothermal_vent.json b/kubejs/data/betterend/loot_tables/blocks/hydrothermal_vent.json new file mode 100644 index 000000000..c1e0b0905 --- /dev/null +++ b/kubejs/data/betterend/loot_tables/blocks/hydrothermal_vent.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "pools": [] +} \ No newline at end of file diff --git a/kubejs/data/betterend/loot_tables/blocks/sulphur_crystal.json b/kubejs/data/betterend/loot_tables/blocks/sulphur_crystal.json new file mode 100644 index 000000000..dd6e85c07 --- /dev/null +++ b/kubejs/data/betterend/loot_tables/blocks/sulphur_crystal.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "gtceu:sulfur_dust" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/betterend/loot_tables/blocks/tube_worm.json b/kubejs/data/betterend/loot_tables/blocks/tube_worm.json new file mode 100644 index 000000000..c1e0b0905 --- /dev/null +++ b/kubejs/data/betterend/loot_tables/blocks/tube_worm.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "pools": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json b/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json index 9fba408ca..628dfa3e8 100644 --- a/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json +++ b/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json @@ -293,14 +293,14 @@ "if_true": { "type": "minecraft:noise_threshold", "noise": "minecraft:powder_snow", - "min_threshold": -0.2, - "max_threshold": -0.1 + "min_threshold": -0.3, + "max_threshold": 0 }, "then_run": { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", - "offset": 2, + "offset": 1, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 @@ -313,32 +313,6 @@ } } }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:powder_snow", - "min_threshold": -0.3, - "max_threshold": 0.0 - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 2, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "kubejs_tfc:rock", - "rock_block": "cobble", - "fallback_state": { - "Name": "ad_astra:venus_cobblestone" - } - } - } - }, { "type": "minecraft:condition", "if_true": { @@ -351,16 +325,15 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", - "offset": 2, + "offset": 1, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { - "type": "kubejs_tfc:rock", - "rock_block": "raw", - "fallback_state": { - "Name": "ad_astra:venus_stone" + "type": "minecraft:block", + "result_state": { + "Name": "betterend:flavolite" } } } @@ -369,7 +342,7 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", - "offset": 2, + "offset": 1, "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 @@ -380,6 +353,23 @@ "Name": "ad_astra:conglomerate" } } + }, + { + "type": "tfg:badlands", + "raw_rock_weight": 20, + "palette": [ + { "Name": "create:ochrum" }, + { "Name": "betterend:sandy_jadestone" }, + { "Name": "betterend:sandy_jadestone" }, + { "Name": "betterend:sandy_jadestone" }, + { "Name": "betterend:sandy_jadestone" }, + { "Name": "betterend:flavolite" }, + { "Name": "betterend:flavolite" }, + { "Name": "betterend:flavolite" } + ], + "fallback": { + "Name": "ad_astra:venus_stone" + } } ] } @@ -3316,13 +3306,12 @@ { "type": "minecraft:condition", "if_true": { - "type": "minecraft:vertical_gradient", - "random_name": "sulfuric_ravine_sea_level", - "true_at_and_below": { - "absolute": 58 - }, - "false_at_and_above": { - "absolute": 60 + "type": "minecraft:not", + "invert": { + "type": "minecraft:water", + "offset": 1, + "surface_depth_multiplier": 0, + "add_stone_depth": false } }, "then_run": { @@ -3333,10 +3322,11 @@ { "type": "minecraft:condition", "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:powder_snow", - "min_threshold": 0.1, - "max_threshold": 0.2 + "type": "minecraft:stone_depth", + "offset": 1, + "surface_type": "floor", + "add_surface_depth": false, + "secondary_depth_range": 0 }, "then_run": { "type": "minecraft:sequence", @@ -3344,11 +3334,10 @@ { "type": "minecraft:condition", "if_true": { - "type": "minecraft:stone_depth", - "offset": 1, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 + "type": "minecraft:noise_threshold", + "noise": "minecraft:powder_snow", + "min_threshold": 0.1, + "max_threshold": 0.2 }, "then_run": { "type": "minecraft:block", @@ -3358,39 +3347,10 @@ { "type": "minecraft:condition", "if_true": { - "type": "minecraft:stone_depth", - "offset": 3, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/brown" } - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:powder_snow", - "min_threshold": 0.0, - "max_threshold": 0.3 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 1, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 + "type": "minecraft:noise_threshold", + "noise": "minecraft:powder_snow", + "min_threshold": 0.0, + "max_threshold": 0.3 }, "then_run": { "type": "minecraft:block", @@ -3400,39 +3360,10 @@ { "type": "minecraft:condition", "if_true": { - "type": "minecraft:stone_depth", - "offset": 3, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/orange" } - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:powder_snow", - "min_threshold": -0.4, - "max_threshold": 0.7 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 1, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 + "type": "minecraft:noise_threshold", + "noise": "minecraft:powder_snow", + "min_threshold": -0.4, + "max_threshold": 0.7 }, "then_run": { "type": "minecraft:block", @@ -3440,58 +3371,31 @@ } }, { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 3, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/yellow" } - } + "type": "minecraft:block", + "result_state": { "Name": "tfc:sand/black" } } ] } }, { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 1, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:sand/black" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 3, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:raw_sandstone/black" - } - } - } - ] + "type": "tfg:badlands", + "raw_rock_weight": 5, + "palette": [ + { "Name": "create:scoria" }, + { "Name": "create:ochrum" }, + { "Name": "betterend:sulphuric_rock" }, + { "Name": "betterend:sandy_jadestone" }, + { "Name": "betterend:lacugrove_bark" }, + { "Name": "tfg:sandstone/raw/fluorapatite/brown" }, + { "Name": "tfg:sandstone/raw/fluorapatite/orange" }, + { "Name": "tfg:sandstone/raw/fluorapatite/yellow" }, + { "Name": "tfg:sandstone/raw/fluorapatite/yellow" }, + { "Name": "tfg:sandstone/raw/fluorapatite/yellow" }, + { "Name": "tfc:raw_sandstone/black" } + ], + "fallback": { + "Name": "ad_astra:venus_stone" + } } ] } @@ -4522,7 +4426,7 @@ }, "then_run": { "type": "minecraft:block", - "result_state": { "Name": "tfg:sandstone/raw/fluorapatite/brown" } + "result_state": { "Name": "tfg:sand/fluorapatite/brown" } } }, { diff --git a/kubejs/data/vintageimprovements/loot_tables/blocks/sulfur_block.json b/kubejs/data/vintageimprovements/loot_tables/blocks/sulfur_block.json new file mode 100644 index 000000000..390c620e6 --- /dev/null +++ b/kubejs/data/vintageimprovements/loot_tables/blocks/sulfur_block.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "gtceu:raw_sulfur", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 3, + "type": "minecraft:uniform" + } + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js b/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js index da873e89a..436a5b12b 100644 --- a/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js +++ b/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js @@ -1162,6 +1162,10 @@ function registerTFGRockRecipes(event) { { block: 'create:ochrum', dimension: 'ad_astra:mars' }, { block: 'create:scoria', dimension: 'ad_astra:venus' }, { block: 'minecraft:tuff', dimension: 'ad_astra:venus' }, + { block: 'betterend:flavolite', dimension: 'ad_astra:venus' }, + { block: 'betterend:sandy_jadestone', dimension: 'ad_astra:venus' }, + { block: 'betterend:sulphuric_rock', dimension: 'ad_astra:venus' }, + { block: 'betterend:brimstone', dimension: 'ad_astra:venus' }, { block: 'ad_astra:mercury_stone', dimension: 'ad_astra:mercury' }, { block: 'ad_astra:mercury_cobblestone', dimension: 'ad_astra:mercury' }, { block: 'create:crimsite', dimension: 'ad_astra:mercury' }, diff --git a/kubejs/server_scripts/tfg/recipes.js b/kubejs/server_scripts/tfg/recipes.js index e078a55b3..43f6d5572 100644 --- a/kubejs/server_scripts/tfg/recipes.js +++ b/kubejs/server_scripts/tfg/recipes.js @@ -79,5 +79,6 @@ const registerTFGRecipes = (event) => { registerTFGMarsIodineRecipes(event) registerTFGMarsOstrumRecipes(event) + registerTFGVenusRecipes(event) registerTFGBiochemRecipes(event) } diff --git a/kubejs/server_scripts/tfg/venus/recipes.venus.js b/kubejs/server_scripts/tfg/venus/recipes.venus.js new file mode 100644 index 000000000..51e2a90cc --- /dev/null +++ b/kubejs/server_scripts/tfg/venus/recipes.venus.js @@ -0,0 +1,22 @@ +"use strict"; + +function registerTFGVenusRecipes(event) { + + event.stonecutting('betterend:flavolite', '#tfg:leucitite_blocks') + event.stonecutting('betterend:flavolite_bricks', '#tfg:leucitite_blocks') + event.stonecutting('betterend:flavolite_pillar', '#tfg:leucitite_blocks') + event.stonecutting('betterend:flavolite_polished', '#tfg:leucitite_blocks') + event.stonecutting('betterend:flavolite_tiles', '#tfg:leucitite_blocks') + + event.stonecutting('betterend:sandy_jadestone', '#tfg:lamproite_blocks') + event.stonecutting('betterend:sandy_jadestone_bricks', '#tfg:lamproite_blocks') + event.stonecutting('betterend:sandy_jadestone_pillar', '#tfg:lamproite_blocks') + event.stonecutting('betterend:sandy_jadestone_polished', '#tfg:lamproite_blocks') + event.stonecutting('betterend:sandy_jadestone_tiles', '#tfg:lamproite_blocks') + + event.stonecutting('betterend:sulphuric_rock', '#tfg:ignimbrite_blocks') + event.stonecutting('betterend:sulphuric_rock_bricks', '#tfg:ignimbrite_blocks') + event.stonecutting('betterend:sulphuric_rock_pillar', '#tfg:ignimbrite_blocks') + event.stonecutting('betterend:sulphuric_rock_polished', '#tfg:ignimbrite_blocks') + event.stonecutting('betterend:sulphuric_rock_tiles', '#tfg:ignimbrite_blocks') +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/venus/tags.venus.js b/kubejs/server_scripts/tfg/venus/tags.venus.js index 493030147..3b1054640 100644 --- a/kubejs/server_scripts/tfg/venus/tags.venus.js +++ b/kubejs/server_scripts/tfg/venus/tags.venus.js @@ -1,7 +1,23 @@ "use strict"; function registerTFGVenusItemTags(event) { + event.add('tfg:leucitite_blocks', 'betterend:flavolite') + event.add('tfg:leucitite_blocks', 'betterend:flavolite_bricks') + event.add('tfg:leucitite_blocks', 'betterend:flavolite_pillar') + event.add('tfg:leucitite_blocks', 'betterend:flavolite_polished') + event.add('tfg:leucitite_blocks', 'betterend:flavolite_tiles') + event.add('tfg:lamproite_blocks', 'betterend:sandy_jadestone') + event.add('tfg:lamproite_blocks', 'betterend:sandy_jadestone_bricks') + event.add('tfg:lamproite_blocks', 'betterend:sandy_jadestone_pillar') + event.add('tfg:lamproite_blocks', 'betterend:sandy_jadestone_polished') + event.add('tfg:lamproite_blocks', 'betterend:sandy_jadestone_tiles') + + event.add('tfg:ignimbrite_blocks', 'betterend:sulphuric_rock') + event.add('tfg:ignimbrite_blocks', 'betterend:sulphuric_rock_bricks') + event.add('tfg:ignimbrite_blocks', 'betterend:sulphuric_rock_pillar') + event.add('tfg:ignimbrite_blocks', 'betterend:sulphuric_rock_polished') + event.add('tfg:ignimbrite_blocks', 'betterend:sulphuric_rock_tiles') } @@ -63,6 +79,13 @@ function registerTFGVenusBlockTags(event) { event.add('ad_astra:venus_stone_replaceables', 'create:scoria') event.add('ad_astra:venus_stone_replaceables', 'create:scorchia') event.add('ad_astra:venus_stone_replaceables', 'minecraft:tuff') + event.add('ad_astra:venus_stone_replaceables', 'betterend:brimstone') + event.add('ad_astra:venus_stone_replaceables', 'betterend:flavolite') + event.add('ad_astra:venus_stone_replaceables', 'betterend:sandy_jadestone') + event.add('ad_astra:venus_stone_replaceables', 'betterend:sulphuric_rock') + event.add('ad_astra:venus_stone_replaceables', 'betterend:flavolite') + event.add('ad_astra:venus_stone_replaceables', 'betterend:lacugrove_bark') + event.add('ad_astra:venus_stone_replaceables', 'betterend:lucernia_bark') event.add('tfc:can_carve', '#ad_astra:venus_stone_replaceables') @@ -72,6 +95,8 @@ function registerTFGVenusBlockTags(event) { event.add('tfc:can_landslide', 'tfg:sand/fluorapatite/orange') event.add('tfc:can_landslide', 'tfg:sand/fluorapatite/white') event.add('tfc:can_landslide', 'tfg:sand/fluorapatite/yellow') + + event.add('tfg:decorative_plant_attachable', 'betterend:sulphuric_rock') } function registerTFGVenusBiomeTags(event) { diff --git a/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js b/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js index 4e6961652..225b263e2 100644 --- a/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js +++ b/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js @@ -173,4 +173,101 @@ function registerTFGWorldGenVenusDecoBlocks(event) { .opaque(true) }) //#endregion + + // Some more stone blocks from better end, for variety's sake + + event.create('betterend:brimstone') + .soundType('tuff') + .mapColor('color_yellow') + .requiresTool(true) + .tagBlock('minecraft:mineable/pickaxe') + + event.create('betterend:hydrothermal_vent', 'tfg:particle_emitter_decoration') + .soundType('dripstone_block') + .mapColor('dirt') + .requiresTool(true) + .tagBlock('minecraft:mineable/pickaxe') + .opaque(false) + .fullBlock(false) + .box(1, 0, 1, 15, 16, 15) + .notSolid() + .particleOffset(0.3, 1, 0.3) + .particleVelocity(0, 0.1, 0) + .particle('minecraft:large_smoke') + .particleCount(5) + .particleForced(true) + + event.create('betterend:tube_worm', 'tfg:attached_decorative_plant') + .soundType('nether_wart') + .mapColor('terracotta_white') + .tagBlock('minecraft:replaceable') + .tagBlock('tfg:do_not_destroy_in_space') + + event.create('betterend:lacugrove_bark') + .soundType('basalt') + .mapColor('podzol') + .requiresTool(true) + .tagBlock('minecraft:mineable/pickaxe') + + event.create('betterend:lucernia_bark') + .soundType('netherrack') + .mapColor('wood') + .requiresTool(true) + .tagBlock('minecraft:mineable/pickaxe') + + event.create('betterend:sulphur_crystal', 'tfg:decorative_plant') + .soundType('deepslate') + .mapColor('gold') + .box(3, 0, 3, 13, 6, 13) + + const flavolite = [ 'flavolite', 'flavolite_bricks', 'flavolite_polished', 'flavolite_tiles' ]; + flavolite.forEach(f => { + event.create(`betterend:${f}`) + .soundType('deepslate') + .mapColor('sand') + .requiresTool(true) + .tagBlock('minecraft:mineable/pickaxe') + }) + + event.create(`betterend:flavolite_pillar`) + .property(BlockProperties.AXIS) + .placementState((event) => event.set(BlockProperties.AXIS, event.clickedFace.axis)) + .soundType('netherrack') + .mapColor('sand') + .requiresTool(true) + .tagBlock('minecraft:mineable/pickaxe') + + const jadestone = [ 'sandy_jadestone', 'sandy_jadestone_bricks', 'sandy_jadestone_polished', 'sandy_jadestone_tiles' ]; + jadestone.forEach(j => { + event.create(`betterend:${j}`) + .soundType('stone') + .mapColor('color_light_green') + .requiresTool(true) + .tagBlock('minecraft:mineable/pickaxe') + }) + + event.create(`betterend:sandy_jadestone_pillar`) + .property(BlockProperties.AXIS) + .placementState((event) => event.set(BlockProperties.AXIS, event.clickedFace.axis)) + .soundType('stone') + .mapColor('color_light_green') + .requiresTool(true) + .tagBlock('minecraft:mineable/pickaxe') + + const sulphuric_rock = [ 'sulphuric_rock', 'sulphuric_rock_bricks', 'sulphuric_rock_polished', 'sulphuric_rock_tiles' ]; + sulphuric_rock.forEach(s => { + event.create(`betterend:${s}`) + .soundType('dripstone_block') + .mapColor('terracotta_light_gray') + .requiresTool(true) + .tagBlock('minecraft:mineable/pickaxe') + }) + + event.create(`betterend:sulphuric_rock_pillar`) + .placementState((event) => event.set(BlockProperties.AXIS, event.clickedFace.axis)) + .property(BlockProperties.AXIS) + .soundType('dripstone_block') + .mapColor('terracotta_light_gray') + .requiresTool(true) + .tagBlock('minecraft:mineable/pickaxe') } \ No newline at end of file diff --git a/kubejs/startup_scripts/vintage_improvements/constants.js b/kubejs/startup_scripts/vintage_improvements/constants.js index 85e1c3d41..54208ebc8 100644 --- a/kubejs/startup_scripts/vintage_improvements/constants.js +++ b/kubejs/startup_scripts/vintage_improvements/constants.js @@ -16,7 +16,6 @@ global.VINTAGE_IMPROVEMENTS_DISABLED_ITEMS = [ 'vintageimprovements:laser_item', 'vintageimprovements:sulfur_chunk', 'vintageimprovements:sulfur', - 'vintageimprovements:sulfur_block', 'vintageimprovements:sulfuric_acid_bucket', 'vintageimprovements:copper_sulfate', 'vintageimprovements:incomplete_redstone_module', From bba8ce13968a9ed0069f73ea92470206d17ee6a5 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 8 Dec 2025 12:41:32 +0000 Subject: [PATCH 04/25] langs --- kubejs/assets/ad_astra/lang/zh_cn.json | 1 + kubejs/assets/beneath/lang/zh_cn.json | 6 +- kubejs/assets/betterend/lang/zh_cn.json | 21 +++++ kubejs/assets/gtceu/lang/zh_cn.json | 2 + kubejs/assets/tfg/lang/en_us.json | 2 + kubejs/assets/tfg/lang/ja_jp.json | 6 +- kubejs/assets/tfg/lang/zh_cn.json | 114 ++++++++++++++++++++---- 7 files changed, 128 insertions(+), 24 deletions(-) diff --git a/kubejs/assets/ad_astra/lang/zh_cn.json b/kubejs/assets/ad_astra/lang/zh_cn.json index 61b8ba40e..4a3bc05f8 100644 --- a/kubejs/assets/ad_astra/lang/zh_cn.json +++ b/kubejs/assets/ad_astra/lang/zh_cn.json @@ -1,6 +1,7 @@ { "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", "block.ad_astra.oxygen_distributor": "可呼吸空气分配器", + "block.ad_astra.infernal_spire_block": "炼狱尖刺", "block.ad_astra.moon_sand": "月沙", "block.ad_astra.moon_stone": "天然斜长岩", "block.ad_astra.moon_cobblestone": "斜长岩圆石", diff --git a/kubejs/assets/beneath/lang/zh_cn.json b/kubejs/assets/beneath/lang/zh_cn.json index bc9cabffb..74d646d27 100644 --- a/kubejs/assets/beneath/lang/zh_cn.json +++ b/kubejs/assets/beneath/lang/zh_cn.json @@ -3,11 +3,11 @@ "block.beneath.blackstone_pebble": "松散辉石岩", "block.beneath.blackstone_aqueduct": "辉石岩引水桥", "block.beneath.loose_blackstone": "松散辉石岩", - "block.beneath.ore.nether_cursecoal": "无烟煤矿石", + "block.beneath.ore.nether_cursecoal": "混合岩无烟煤矿石", "block.beneath.ore.nether_cursecoal.prospected": "无烟煤", "block.beneath.cursecoal_pile": "无烟煤堆", - "block.beneath.ore.blackstone_sylvite": "钾石盐矿石", - "block.beneath.crackrack": "角斑岩", + "block.beneath.ore.blackstone_sylvite": "辉石岩钾石盐矿石", + "block.beneath.crackrack": "天然角斑岩", "block.beneath.soul_clay": "泥泞黏土", "block.beneath.wood.log.crimson": "绯红菌柄", "block.beneath.wood.stripped_log.crimson": "去皮绯红菌柄", diff --git a/kubejs/assets/betterend/lang/zh_cn.json b/kubejs/assets/betterend/lang/zh_cn.json index d0ecd9550..bb9244343 100644 --- a/kubejs/assets/betterend/lang/zh_cn.json +++ b/kubejs/assets/betterend/lang/zh_cn.json @@ -14,6 +14,7 @@ "block.betterend.bolux_mushroom": "波鲁克斯菌丛", "block.betterend.bolux_mushroom_wild": "野生波鲁克斯菌丛", "block.betterend.bolux_mushroom_dead": "枯萎的波鲁克斯菌丛", + "block.betterend.brimstone": "硫磺石", "block.betterend.bushy_grass": "新星草", "block.betterend.bulb_moss": "球茎苔", "block.betterend.cave_bush": "朱红瓣叶", @@ -45,13 +46,20 @@ "block.betterend.filalux_wings": "丝光翅叶", "block.betterend.flamaea": "焰心菇", "block.betterend.flammalix": "焰顶菇", + "block.betterend.flavolite": "天然白榴石岩", + "block.betterend.flavolite_bricks": "白榴石岩砖", + "block.betterend.flavolite_pillar": "白榴石岩柱", + "block.betterend.flavolite_polished": "磨制白榴石岩", + "block.betterend.flavolite_tiles": "白榴石岩瓦", "block.betterend.fracturn": "碎晶蕨", "block.betterend.glacian_hymenophore": "霜原菌褶", "block.betterend.globulagus": "球囊藻", + "block.betterend.hydrothermal_vent": "热泉喷口", "block.betterend.hydralux": "水光莲", "block.betterend.hydralux_sapling": "水光莲苗", "block.betterend.inflexia": "曲枝草", "block.betterend.lacugrove": "泊林木海藻", + "block.betterend.lacugrove_bark": "天然埃达克岩", "block.betterend.lamellarium": "叠层藻", "block.betterend.lanceleaf": "矛叶草", "block.betterend.lanceleaf_small": "矛叶刃", @@ -59,6 +67,7 @@ "block.betterend.lucernia_leaves": "卢瑟尼亚瓣叶", "block.betterend.lucernia_leaves_fallen": "小型卢瑟尼亚瓣叶", "block.betterend.lucernia_outer_leaves": "卢瑟尼亚菌核", + "block.betterend.lucernia_bark": "残忍尖刺", "block.betterend.lutebus": "琉特草", "block.betterend.magnula": "磁光草", "block.betterend.nightshade_moss": "夜影苔", @@ -68,11 +77,23 @@ "block.betterend.rubinea": "红玉草", "block.betterend.ruscus": "假叶草", "block.betterend.salteago": "盐晶草", + "block.betterend.sandy_jadestone": "天然煌斑岩", + "block.betterend.sandy_jadestone_bricks": "煌斑岩砖", + "block.betterend.sandy_jadestone_pillar": "煌斑岩柱", + "block.betterend.sandy_jadestone_polished": "磨制煌斑岩", + "block.betterend.sandy_jadestone_tiles": "煌斑岩瓦", "block.betterend.selagine": "卷柏", "block.betterend.shadow_berry": "夜影浆果", "block.betterend.shadow_berry_wild": "野生夜影浆果", "block.betterend.shadow_berry_dead": "枯萎的夜影浆果", "block.betterend.small_amaranita_mushroom": " 赤星青茎菇", + "block.betterend.sulphur_crystal": "硫磺晶体", + "block.betterend.sulphuric_rock": "天然熔灰岩", + "block.betterend.sulphuric_rock_bricks": "熔灰岩砖", + "block.betterend.sulphuric_rock_pillar": "熔灰岩柱", + "block.betterend.sulphuric_rock_polished": "磨制熔灰岩", + "block.betterend.sulphuric_rock_tiles": "熔灰岩瓦", + "block.betterend.tube_worm": "管蠕虫", "block.betterend.twisted_moss": "缠结苔", "block.betterend.twisted_umbrella_moss": "缠结伞苔", "block.betterend.twisted_umbrella_moss_tall": "高缠结伞苔", diff --git a/kubejs/assets/gtceu/lang/zh_cn.json b/kubejs/assets/gtceu/lang/zh_cn.json index ea05f2f74..67e43084e 100644 --- a/kubejs/assets/gtceu/lang/zh_cn.json +++ b/kubejs/assets/gtceu/lang/zh_cn.json @@ -51,6 +51,7 @@ "gtceu.bioreactor": "生物反应器", "gtceu.growth_chamber": "生长室", "gtceu.coal_liquefaction_tower": "煤炭液化", + "gtceu.smr_generator": "小型模块化涡轮", "gtceu.tooltip.machine.moon_dust_harvester_1": "§7地外真空吸尘器§r", "gtceu.tooltip.machine.moon_dust_harvester_2": "§7根据所处生物群系无限采集风化土粉尘。§r", "gtceu.tooltip.machine.ostrum_harvester_1": "§7合法异星香料采集车§r", @@ -206,6 +207,7 @@ "gtceu.jei.bedrock_fluid.heavy_ammoniacal_water": "火星重氨水矿藏", "gtceu.jei.bedrock_fluid.liquid_ice": "火星冰矿藏", "gtceu.recipe.category.ingot_molding": "压模", + "block.gtceu.wire_coil.tooltip_pyro": "§8热解炉与核燃料工厂:§r", "block.gtceu.wire_coil.tooltip_cracking": "§8裂化机,煤炭液化塔,§r\n§8月壤和紫金采集器:§r", "tagprefix.sword_head": "%s剑身", "tagprefix.pickaxe_head": "%s镐头", diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index eb7726575..91bdba756 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -419,6 +419,8 @@ "block.tfg.rock.cut_red_sandstone_wall": "Cut Hematitic Sandstone Wall", "block.tfg.rock.raw.stromatolite": "Raw Stromatolite", "block.tfg.rock.spike.stromatolite": "Stromatolite Spike", + "block.tfg.stromatolite_cluster_small": "Small Stromatolite Cluster", + "block.tfg.stromatolite_cluster_medium": "Large Stromatolite Cluster", "block.tfg.rock.raw.geyserite": "Raw Geyserite", "block.tfg.rock.spike.geyserite": "Geyserite Spike", "block.tfg.mushroom_roots": "Mushroom Roots", diff --git a/kubejs/assets/tfg/lang/ja_jp.json b/kubejs/assets/tfg/lang/ja_jp.json index 1966130dc..98b7d6a48 100644 --- a/kubejs/assets/tfg/lang/ja_jp.json +++ b/kubejs/assets/tfg/lang/ja_jp.json @@ -2827,7 +2827,7 @@ "quests.medium_voltage.mv_aciditic.title": "とても危険な液体", "quests.medium_voltage.mv_aciditic.subtitle": "サンダー!", "quests.medium_voltage.mv_aciditic.desc.1": "&9硫酸&rなど、一部の液体は&a酸性&rです。\n\n通常の液体パイプでは、こういった酸性の液体を搬送することが出来ません。\n\n&bMV&rの段階では、&a金&rのパイプが最も低コストで作成できます。また、&aバナジウム鋼&rや&aクロム&rのパイプも、酸性液体を搬送出来ます。\n\n&6HV&r時代では、&aステンレス鋼&rや&aポリテトラフルオロエチレン&r(早口)が解禁されます。", - "quests.medium_voltage.mv_aciditic.desc.2": "酸性液体の貯蔵方法は、現時点で3種類あります。すなわち&dガラス製バイアル&r、&d金のドラム&r、&dスーパータンク&rの3つです。ガラス製バイアルは、要するに酸性液体用の&9液体セル&rです。金のドラムは説明不要でしょう。&9ポリエチレン&rが作成できたならば、スーパータンクがとても強力です。スーパータンクは大容量で、なおかつ貯蔵できる液体に制限がありません。\n\n&c注意:&r通常のパイプに酸を流した場合、&c液体の消失&r、&cパイプ火災&rなどが発生する上、多くの場合自分も&c即死&rします。注意しましょう。\n\n&l&3おまけ:&r&o酸性液体周りの仕様はGT6から輸入されたものです。", + "quests.medium_voltage.mv_aciditic.desc.2": "酸性液体の貯蔵方法は、現時点で3種類あります。すなわち&dガラス製バイアル&r、&d金のドラム&r、&dスーパータンク&rの3つです。ガラス製バイアルは、要するに酸性液体用の&9液体セル&rです。金のドラムは説明不要でしょう。少々作るのに手間がかかりますが、スーパータンクはとても強力です。スーパータンクは大容量で、なおかつ貯蔵できる液体に制限がありません。\n\n&c注意:&r通常のパイプに酸を流した場合、&c液体の消失&r、&cパイプ火災&rなどが発生する上、多くの場合自分も&c即死&rします。注意しましょう。\n\n&l&3おまけ:&r&o酸性液体周りの仕様はGT6から輸入されたものです。", "quests.medium_voltage.mv_aciditic.task": "だいたいわかった", "quests.medium_voltage.mv_hydrochloric.title": "塩酸", "quests.medium_voltage.mv_hydrochloric.subtitle": "大量に使う危険物", @@ -2920,14 +2920,14 @@ "quests.medium_voltage.mv_jetpack_2.desc": "電動ジェットパックは、電力を消費して空を飛ぶことができます。\n\n充電方法は普通のバッテリーと同じです。\n\n&4H&r(初期設定)を押すと、ホバーモードへの切り替えが可能です。\n\n&o&8(「ジェット」と言っているのにジェット推進じゃないって?そういう重箱の隅を突くのはやめましょう?ね?)&r", "quests.medium_voltage.mv_cutter.title": "発展型裁断機", "quests.medium_voltage.mv_cutter.subtitle": "強化!強化!また強化!", - "quests.medium_voltage.mv_cutter.desc": "&aレーザー刻印機&rを使用するためには、&3MV裁断機&rで&7シリコン単結晶&rを切断する必要があります。\n\n&d潤滑油&rがあれば、加工時間が大幅に短縮されるので、必ず用意しておきましょう。\n\n潤滑油は&3醸造機&rで&e石油&、&a滑石&r、&2石鹸石&r、&cレッドストーン&rなどを加工して作られます。\n\n&7ヒント:&6Greate&r&7のメカニカルソーでも、同じ加工ができます。液体タンクが搭載されているため、潤滑油による加速が可能です。&r&r", + "quests.medium_voltage.mv_cutter.desc": "&aレーザー刻印機&rを使用するためには、&3MV裁断機&rで&7シリコン単結晶&rを切断する必要があります。\n\n&d潤滑油&rがあれば、加工時間が大幅に短縮されるので、必ず用意しておきましょう。\n\n潤滑油は&3醸造機&rで&e石油&r、&a滑石&r、&2石鹸石&r、&cレッドストーン&rなどを加工して作られます。\n\n&7ヒント:&6Greate&r&7のメカニカルソーでも、同じ加工ができます。液体タンクが搭載されているため、潤滑油による加速が可能です。&r&r", "quests.medium_voltage.mv_cutter.task": "いずれかの裁断機", "quests.medium_voltage.mv_laser_engraver.title": "レーザー刻印機", "quests.medium_voltage.mv_laser_engraver.subtitle": "技術の粋。ただしめっちゃ遅い", "quests.medium_voltage.mv_laser_engraver.desc": "&3レーザー刻印機&rは、&9シリコンウェハー&rへの刻印を行う機械です。刻印の内容は、取り付けた&9レンズ&rによって決まります。刻印を行ったウェハーを&3裁断機&rで加工することにより、回路に搭載できるパーツとなります。\n\n上位の刻印機を使うことで、より高性能な回路のパーツを作成することができます。", "quests.medium_voltage.mv_silicon_boule.title": "シリコンガチャ", "quests.medium_voltage.mv_silicon_boule.subtitle": "ウェハーは代替可能", - "quests.medium_voltage.mv_silicon_boule.desc": "&9シリコン単結晶&rの作成には、&3EBF&rが必要です。その材料は、&aSilicon Dust&rが半スタックと、少量の&aヒ化ガリウム&rです。その主な用途は、回路の材料である&6ウェハー&rの作成です。\n\nシリコン単結晶が作成できたら、&3裁断機&rでそれを加工することにより、16個のシリコンウェハーを入手できます。\n\n&c注意:&rシリコン単結晶の精錬には、なんと&47分半&rもの時間を要します。消費電力は120EU/tで、合計すると1,080,000EUに達します。途中で電気が足りなくなった場合、精錬の&c進捗が低下&rします。\n\n電気が足りていたとしても、所要時間が猛烈に長いため、複数のEBFで同時に精錬を行うことをおすすめします。", + "quests.medium_voltage.mv_silicon_boule.desc": "&9シリコン単結晶&rの作成には、&3EBF&rが必要です。その材料は、&aケイ素の粉&rが半スタックと、少量の&aヒ化ガリウム&rです。その主な用途は、回路の材料である&6ウェハー&rの作成です。\n\nシリコン単結晶が作成できたら、&3裁断機&rでそれを加工することにより、16個のシリコンウェハーを入手できます。\n\n&c注意:&rシリコン単結晶の精錬には、なんと&47分半&rもの時間を要します。消費電力は120EU/tで、合計すると1,080,000EUに達します。途中で電気が足りなくなった場合、精錬の&c進捗が低下&rします。\n\n電気が足りていたとしても、所要時間が猛烈に長いため、複数のEBFで同時に精錬を行うことをおすすめします。", "quests.medium_voltage.mv_silicon.title": "ケイ素の粉", "quests.medium_voltage.mv_silicon.subtitle": "", "quests.medium_voltage.mv_silicon.desc.1": "&dGregTech&rにおいては、大抵のアイテムについて複数のレシピが存在します。&aTerrafirmaGreg&rでも、それは同じです。\n\n&5ケイ素&rの主な作成方法は2種類あります。どれが最適かは、自分の状況に合わせて考えましょう。", diff --git a/kubejs/assets/tfg/lang/zh_cn.json b/kubejs/assets/tfg/lang/zh_cn.json index 048f7f4a5..3a30a7544 100644 --- a/kubejs/assets/tfg/lang/zh_cn.json +++ b/kubejs/assets/tfg/lang/zh_cn.json @@ -419,6 +419,8 @@ "block.tfg.rock.cut_red_sandstone_wall": "切制赤铁矿砂岩墙", "block.tfg.rock.raw.stromatolite": "天然叠层石", "block.tfg.rock.spike.stromatolite": "叠层石尖刺", + "block.tfg.stromatolite_cluster_small": "小型叠层石簇", + "block.tfg.stromatolite_cluster_medium": "大型叠层石簇", "block.tfg.rock.raw.geyserite": "天然硅华", "block.tfg.rock.spike.geyserite": "硅华尖刺", "block.tfg.mushroom_roots": "菌丝根须", @@ -654,6 +656,8 @@ "block.tfg.nuclear_turbine": "核能蒸汽涡轮", "block.tfg.evaporation_tower": "蒸发塔", "block.tfg.cooling_tower": "核能冷却塔", + "block.tfg.smr_generator": "小型模块化涡轮", + "block.tfg.casings.machine_casing_desh_ptfe": "防辐射戴斯机械方块", "block.tfg.growth_monitor": "生长监控器", "block.tfg.sample_rack": "样本架", "block.tfg.casings.machine_casing_sterilizing_pipes": "除菌管道", @@ -1257,6 +1261,26 @@ "material.tfg.reformed_aromatic_feedstock": "重整芳香原料", "material.tfg.reformate_gas": "重整气", "material.tfg.cracker_off_gas": "裂化重整尾气", + "material.tfg.btx_fuel": "轻质芳烃气", + "material.tfg.critical_steam": "临界蒸汽", + "material.tfg.americium_241": "镅-241", + "material.tfg.californium_252": "锎-252", + "material.tfg.neptunium_237": "镎-237", + "material.tfg.mixed_radioactive_fluid": "混合放射性流体", + "material.tfg.degraded_solvent_stream": "降解溶剂流", + "material.tfg.boron_enriched_coolant": "富硼冷却剂", + "material.tfg.hot_boron_enriched_coolant": "热富硼冷却剂", + "material.tfg.polyalkylene_lubricant": "聚烯烃润滑剂", + "material.tfg.organic_degradation_slurry": "有机降解浆液", + "material.tfg.gas_fraction": "气相馏分", + "material.tfg.isotopic_solvent": "同位素分离溶剂", + "material.tfg.residual_sludge": "残余泥渣", + "material.tfg.sodium_fluoride": "氟化钠", + "material.tfg.trace_catalyst_salt_e": "痕量催化剂盐E", + "material.tfg.copper_trace_catalyst_dust": "铜基痕量催化剂粉", + "material.tfg.organic_stabilizer": "有机稳定剂", + "material.tfg.inert_dust_fraction": "惰性粉体馏分", + "material.tfg.recovered_ionic_complex": "回收离子络合物", "material.tfg.glucose": "葡萄糖", "material.tfg.galactose": "半乳糖", "material.tfg.fructose": "果糖", @@ -1595,8 +1619,10 @@ "tfg.tooltip.component.moderate_core_frame": "可置于裂变反应堆内,使热量上限提升 §910§r", "tfg.tooltip.component.dry_ice": "可作为裂变反应堆的输入物以冷却反应堆,需要材料支架", "tfg.tooltip.component.refrigerant_pellet": "可作为裂变反应堆的输入物以冷却反应堆,需要材料支架", - "tfg.tooltip.component.nuclear_turbine_1": "§e基础产出:§r 4096 EU/t", + "tfg.tooltip.component.nuclear_turbine_1": "§e基础产出:§r 8192 EU/t", "tfg.tooltip.component.nuclear_turbine_2": "每个高于 §5EV§r 阶段的转子支架 §7可提升§r 10% 效率,并使 EU/t 产出翻倍。", + "tfg.tooltip.component.smr_generator_1": "§e基础产出:§r 4096 EU/t", + "tfg.tooltip.component.smr_generator_2": "专为利用超临界二氧化碳与小模块化反应堆发电而设计。\n使用润滑剂与加速剂可提升其效率,并管理反应堆的冷却回路。", "tfg.gui.refrigerator.unify_dates.enabled": "过期日期统一:§a开", "tfg.gui.refrigerator.unify_dates.disabled": "过期日期统一:§a关", "tfg.machine.food_refrigerator_power_usage": "§7工作时消耗§r %s EU/t §7以保持食物新鲜。§r", @@ -1610,6 +1636,13 @@ "tfg.gui.menu.field_guide_splash_text": "提示:阅读野外指南!!!", "tfg.gui.menu.ram_usage": "内存:", "tfg.gui.menu.fps_count": "帧率:", + "tfg.gui.smr_generator.credit": "致谢:Frontiers团队", + "tfg.gui.smr_generator.lubricant_used": "润滑剂:%s", + "tfg.gui.smr_generator.booster_used": "助燃剂:%s", + "tfg.gui.max_energy_per_tick_amps.prefix": "最大EU/t:", + "tfg.gui.consumes": "消耗:", + "tfg.gui.per_cycle": "每周期", + "tfg.gui.cycle_duration": "周期时长:", "tfc.jei.flint_knapping": "打制石器", "tfc.jei.straw_knapping": "编制干草", "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.black": "染色", @@ -2179,8 +2212,8 @@ "quests.extreme_voltage.me_part.desc": "这些方块可替代多方块结构中常规的输入和输出总线/仓。&b输出&r版本特别实用,因为它们庞大的物品/流体存储容量足以应对大多数配置需求,非常适合在多方块结构间共享资源或避免输出堵塞。\n\n它们可以直接连接&dAE2&r线缆,无需借助存储总线或接口。但需注意,其行为模式类似于接口而非实体存储容器。这意味着你无法通过其他接口访问它们的内容。", "quests.extreme_voltage.tunsgten_line_step.title": "纯碱循环", "quests.extreme_voltage.tunsgten_line_step.subtitle": "总不能永远依赖采矿", - "quests.extreme_voltage.tunsgten_line_step.desc.1": "要实现&5钨生产线&r的完美循环并非易事,所以我们将用这个任务引导你走向正确的方向。\n\n用你获得的&b盐&r与&a二氧化碳&r、&6氨&r反应生成&3氯化铵&r,通过电解回收&6氨&r并获取制备&e钨酸钠&r所需的&9盐酸&r。\n\n此过程同时会产生&b碳酸氢钠&r,你应该电解它来回收&d纯碱&r。", - "quests.extreme_voltage.tunsgten_line_step.desc.2": "最后,要闭合循环,你需要管理你的&a二氧化碳&r。你可以选择将部分&d纯碱&r电解回收&a碳&r和&9氧&r来重新合成&a二氧化碳&r,或者直接通过&b液态空气&r蒸馏来无限制供应&a二氧化碳&r。", + "quests.extreme_voltage.tunsgten_line_step.desc.1": "完美循环&5钨生产线&r并非易事,本任务将为你指引正确方向。\n\n获得的&b盐&r应与&a二氧化碳&r和&6氨气&r结合,生成&3氯化铵&r;随后将其电解,即可回收&6氨气&r,并获得制备&e钨酸钠&r所需的&9盐酸&r。\n\n此过程还会产生&b碳酸氢钠&r,需通过电解回收其中的&d纯碱&r。", + "quests.extreme_voltage.tunsgten_line_step.desc.2": "最后,为完成闭环,你需要管理好&a二氧化碳&r。可通过电解&d碳酸氢钠&r回收&a二氧化碳&r,并将从方解石和锂中得到的&b碳&r与&b氧&r结合。或采用强制方案:利用&b液态空气&r分馏来无限供应&a二氧化碳&r。", "quests.extreme_voltage.tunsgten_line_step_1.title": "新的钨产线", "quests.extreme_voltage.tunsgten_line_step_1.subtitle": "为什么?到底为什么?", "quests.extreme_voltage.tunsgten_line_step_1.desc": "TerraFirmaGreg中的&e钨产线&r已被彻底重制——你会(或者不会)高兴地得知现在难度&c大幅提升&r。\n\n虽然可以&a完全循环&r钨产线中的所有材料,但这需要大量的工程规划。或者你也可以通过&c大规模生产&r所需资源来强行推进。\n\n小提示:&4火星&r上存在多处富含&e纯碱&r和&e钨&r的&a优质矿脉&r。\n\n稳扎稳打,优化流程,钨产线终将成为你中后期发展的基石。", @@ -2243,7 +2276,7 @@ "quests.gregtech_energy.transformer.desc": "格雷科技为每个问题都准备了多方块解决方案,&d有源变压器&r便是其中之一。\n\n此装置堪称终极变压器,能够在&aLV&r至&cUHV&r的任意等级间传输能量,且不会引发爆炸。但这并非其最突出的优势。\n\n它能够通过激光管道传输能量:\n&8•&r激光可传输超大安培能量\n&8•&r零损耗、无电缆,纯粹的能量传输\n&8•&r唯一限制:管道&c必须保持绝对直线&r\n\n当电缆传输能力不足时,请&l采用激光方案&r。", "quests.gregtech_energy.moving_wire.title": "用导线传输", "quests.gregtech_energy.moving_wire.subtitle": "放置起来有点意思", - "quests.gregtech_energy.moving_wire.desc": "在格雷科技中传输能量可能颇具挑战——&b多数电缆存在能量损耗&r。能量在导线中每传输一格距离、每安培电流都可能产生损耗。但无需担心,现有解决方案如下:\n\n&8•&r为电缆包裹橡胶包覆层。此举可显著降低长距离传输中的能量损耗,具体请参照任务物品示例。\n&8•&r采用更高等级的电缆。例如铂电缆每格仅损耗1EU,相较于其8192EU的传输容量而言几乎可忽略不计。\n&8•&r使用&b超导电缆&r。这类电缆成本稍高,但具备&9零损耗&r特性。它们无需橡胶包覆且不会对玩家造成电击,但需注意通常需在对应科技阶段的后期方可制造。\n\n优化能量传输体系——&b降低损耗&r,提升系统能效。", + "quests.gregtech_energy.moving_wire.desc": "在格雷科技中传输能量可能颇具挑战——&b多数电缆存在能量损耗&r。能量在导线中每传输一格距离、每安培电流都可能产生损耗。但无需担心,现有解决方案如下:\n\n&8•&r为电缆包裹橡胶包覆层。此举可显著降低长距离传输中的能量损耗,具体请参照任务物品示例。\n\n&8•&r采用更高等级的电缆。例如铂电缆每格仅损耗1EU,相较于其8192EU的传输容量而言几乎可忽略不计。\n\n&8•&r使用&b超导电缆&r。这类电缆成本稍高,但具备&9零损耗&r特性。它们无需橡胶包覆且不会对玩家造成电击,但需注意通常需在对应科技阶段的后期方可制造。\n\n优化能量传输体系——&b降低损耗&r,提升系统能效。", "quests.gregtech_energy.moving_wire.task": "我看完导线部分了", "quests.gregtech_energy.moving_amp.title": "管理电流", "quests.gregtech_energy.moving_amp.subtitle": "它会烧掉?", @@ -2260,6 +2293,7 @@ "quests.gregtech_energy.lv_generator.desc.2": "&e1.蒸汽动力&r:\n\n这是最经典的发电方式。你可以通过蒸汽轮机将高压锅炉产生的蒸汽转化为EU。\n\n该设备消耗&e64mB/t&r蒸汽产生&e32 EU/t&r电力。若选择此方案,我们强烈建议建造大型青铜锅炉,该锅炉可使用岩浆、杂酚油或其他可燃固体燃料(请查阅JEI!)轻松维持运作。", "quests.gregtech_energy.lv_generator.desc.3": "&e2.旋转动力&r:\n\n你可利用机械动力的旋转动力,配合&b交流发电机&r产生RF能量,再通过&7低压&r转换器将其转化为EU电能。\n\n(更多细节请参阅低压章节中关于&b交流发电机&r的任务说明。)", "quests.gregtech_energy.lv_generator.desc.4": "&e3.生物柴油发电(TFG独占)&r:\n\n油菜籽和向日葵可加工产出大量种子油。将其与TFC酒精混合即可制成生物柴油。\n\n该方法看似复杂,但生物柴油在&7LV&r和&bMV&r阶段效能极高。后期使用&e高十六烷值柴油&r后,甚至可平稳过渡至&5EV&r阶段。\n\n使用生物柴油需配备&7低压内燃发电机&r。虽然成本略高,但每mB生物柴油都能产生大量EU,更便于运输和储存。\n\n能源生产之路如何开启,完全由你决定。", + "quests.gregtech_energy.lv_generator.desc.5": "&e4. 合成气发电(TFG独占)&r:\n\n借助&6焦炉&r与&6真空腔室&r,你可在游戏前期获得这种气体燃料。它并非最强的选择,但若你希望遵循&e纯气体燃料路线&r,它已足够使用。为获得最佳效率,强烈推荐搭建基于&6机械动力&r的自动化树场。", "quests.gregtech_energy.lv_generator.task": "任何LV发电机", "quests.gregtech_energy.mv_generator.title": "MV发电机", "quests.gregtech_energy.mv_generator.subtitle": "基本上和LV的一样", @@ -2300,9 +2334,35 @@ "quests.gregtech_energy.lpt_fuel.task": "我不想做一桶等离子体", "quests.gregtech_energy.lgt_fuel.title": "气体燃料", "quests.gregtech_energy.lgt_fuel.subtitle": "每个人的最爱", - "quests.gregtech_energy.lgt_fuel.desc.1": "当我们谈及气体燃料时,我们实际上只谈一种——&e硝基苯&r。\n\n你在达到&6HV&r阶段后即可生产它。如果你计划使用大型燃气涡轮机,我们&a强烈推荐&r使用这种燃料。\n\n在能够生产硝基苯之前,&e苯&r是一个不错的起步选择。你可以通过树场获取它,或者,如果你足够幸运附近有重油的话,也可以通过处理重油来获得。", - "quests.gregtech_energy.lgt_fuel.desc.2": "制造硝基苯涉及多个步骤——但当你造出第一台大型化学反应釜(LCR)后,就能跳过许多中间环节,大幅简化流程。\n\n其实并不复杂:将氢气、氮气和氧气结合,即可无限制地生产&e硝酸&r。至于硫酸,你大概已经知道它只需硫和水就能制备——对吧?\n\n一旦你建立起这条生产链,硝基苯就会成为气体燃烧的顶级燃料之一。", + "quests.gregtech_energy.lgt_fuel.desc.1": "所有这些燃料都用于&2燃气轮机&r——此处按效率从低到高排序。\n\n&b燃气轮机&r总体比其同类&b内燃机&r稍便宜,但&e气体燃料&r的能量密度也低于燃烧燃料。这并不意味着它们更差——只是你需要更多毫桶(mB)才能达到相同的输出。在进程后期,它们可用在&2大型燃气涡轮&r里,这是一个非常强大的多方块结构,需要稍多一些管理。", + "quests.gregtech_energy.lgt_fuel.desc.2": "在TFG整合包中,&e气体燃料&r已得到广泛重新平衡。&6我们不建议依赖&e苯&r或&e硝基苯&r,因为它们已被大幅削弱。&r在&7LV&r初期,如果你想要加工油砂,我们建议使用&e合成气&r或&e液化石油气&r。之后,你可以在&bMV&r阶段升级为&e重整气&r,并在解锁&2裂化机&r后进一步提升其产量。", "quests.gregtech_energy.lgt_fuel.task": "桶装燃气?", + "quests.gregtech_energy.syngas.title": "合成气", + "quests.gregtech_energy.syngas.subtitle": "我在LV阶段就能获得气体燃料了?", + "quests.gregtech_energy.syngas.desc": "&e合成气&r是一种新的TFG气体燃料。你可以在&8ULV&r阶段很早解锁它,并在&7LV&r阶段用于你的首批&6燃气轮机&r中。它并非特别强效的燃料,但可以转化为有价值的副产品,例如&e润滑剂&r、&e甲烷&r和&e氢气&r。\n\n尽管它不是最强大的选择且难以规模化生产,但仅需三座&6焦炉&r和一台&6酿造室&r或&6真空腔室&r,你就能稳定供应,这足以支撑你到达&bMV&r阶段并解锁更强大的&e重整气&r。", + "quests.gregtech_energy.reformate_gas.title": "重整气", + "quests.gregtech_energy.reformate_gas.subtitle": "这是重整后的苯吗?", + "quests.gregtech_energy.reformate_gas.desc.1": "&9重整气&r是一种强大且新的气体燃料,在&bMV&r阶段承担了通常由苯扮演的角色。\n\n要生产它,你需要建造一座&6煤炭液化塔&r,并从仅存在于干燥炎热气候的&6塔基安矿&r矿脉中获取一些&5铼&r。两座&6热解炉&r——一座生产杂酚油,另一座生产木焦油——将提供生产这种燃料所需的全部材料。如果你想简化设置,请记住可以用&6流体加热器&r来生产蒸汽。", + "quests.gregtech_energy.reformate_gas.desc.2": "同样重要的是,需要考虑在&6HV&r阶段使用&6裂化机&r时可获得的提升产率。这将使你能够循环利用绝大部分的&5铼&r,使重整气实质上成为一种接近无限的燃料。\n\n在此流程中添加&9氮气&r和&9氢气&r,将进一步增强你的生产吞吐量。", + "quests.gregtech_energy.btx.title": "轻质芳烃", + "quests.gregtech_energy.btx.subtitle": "并非韩国乐队", + "quests.gregtech_energy.btx.desc": "轻质芳烃燃料尚未实装", + "quests.gregtech_energy.fission_rod.title": "裂变燃料", + "quests.gregtech_energy.fission_rod.subtitle": "别让我过热了", + "quests.gregtech_energy.fission_rod.desc.1": "地球裂变材料尚未实装,但或许即将到来", + "quests.gregtech_energy.fission_rod.desc.2": "", + "quests.gregtech_energy.fission_rod.task": "", + "quests.gregtech_energy.smr.title": "小型模块化反应堆", + "quests.gregtech_energy.smr.subtitle": "为遥远前哨站供能", + "quests.gregtech_energy.smr.desc.1": "小型模块化反应堆尚未实装,但或许即将到来", + "quests.gregtech_energy.smr.desc.2": "", + "quests.gregtech_energy.smr.task": "", + "quests.gregtech_energy.gasoline.title": "汽油", + "quests.gregtech_energy.gasoline.subtitle": "中间档位的选择", + "quests.gregtech_energy.gasoline.desc": "&a汽油&r是一种在&6HV&r阶段解锁的强力燃料,但实际上通常是在建造第一座&6分馏塔&r后才开始生产。&7甲苯&r可轻易从&7木焦油&r或&7重燃油&r中制得,其他所需原料则为&d炼厂气&r、&8石脑油&r以及&3氧气&r、&b氢气&r和&1碳&r的混合物。\n\n它强度高,制作相当简便,更妙的是还能升级为&c高标号汽油&r。", + "quests.gregtech_energy.high_gasoline.title": "高辛烷值汽油", + "quests.gregtech_energy.high_gasoline.subtitle": "动力澎湃", + "quests.gregtech_energy.high_gasoline.desc": "作为&c汽油&r的直接升级版,这是&5燃料效能翻倍&r的强化型号。虽其名称未明示,但你不仅需要添加&d辛烷&r,还需加入其他来自&8石油化工&r的原料。至此,我们期望你已能熟练运用&bEMI&r,并开始制备这种性能惊人的强力燃料。", "quests.gregtech_energy.lst_fuel.title": "这是蒸汽", "quests.gregtech_energy.lst_fuel.subtitle": "没什么选择余地", "quests.gregtech_energy.lst_fuel.desc": "蒸汽并不复杂——只需烧水。\n\n要高效地实现这一点,我们推荐使用&6大型锅炉&r。共有四种版本:分别对应&8ULV&r、&bMV&r、&5EV&r和&1IV&r阶段。每个等级都能显著提升蒸汽产量。\n\n但要注意:与其他发电方式相比,&d大型蒸汽涡轮&r配合这些锅炉的扩展性并不理想。\n\n大多数玩家会跳过钛和钨钢锅炉——它们确实存在,但不值得建造。蒸汽系统的扩展能力确实有限!\n\n温馨提示:&e2mB&r蒸汽=&e1EU&r电力。", @@ -2310,7 +2370,7 @@ "quests.gregtech_energy.lst_fuel.task.1": "大型锅炉", "quests.gregtech_energy.lce_fuel.title": "液体燃料", "quests.gregtech_energy.lce_fuel.subtitle": "污染者的最爱", - "quests.gregtech_energy.lce_fuel.desc.1": "所有这些燃料均用于&6内燃发电机&r——此处按效率从低到高排列。\n\n在&bMV&r阶段,我们建议从柴油或生物柴油起步。待发展到&6HV&r阶段后,可通过将柴油与氮气、氢气及氧气混合,升级使用&6高十六烷值柴油&r。", + "quests.gregtech_energy.lce_fuel.desc.1": "所有这些燃料均用于&6内燃发电机&r——此处按效率从低到高排列。\n\n在游戏早期阶段,我们建议从柴油或生物柴油起步。待发展到&6HV&r阶段后,可通过将柴油与氮气、氢气及氧气混合,升级使用&6高十六烷值柴油&r。", "quests.gregtech_energy.lce_fuel.desc.2": "当你达到&5EV&r阶段并建造&6蒸馏塔&r后,就可以转而使用汽油和高辛烷值汽油了。切勿过早尝试——油类需要被妥善分馏,使用普通蒸馏室来处理是极不经济的。\n\n为此,你需要结合原油分馏与一些有机化合物加工。所幸,一台热解炉和一座蒸馏塔即可流畅地处理全部流程。\n\n如果你能稳定供应高辛烷值汽油,仅靠内燃发电机就足以完成整个整合包的进程。", "quests.gregtech_energy.lce_fuel.task": "我足够了", "quests.gregtech_energy.large_solar.subtitle": "巨大的简易能源", @@ -2349,14 +2409,14 @@ "quests.gregtech_energy.spending_energy.title": "消耗能源", "quests.gregtech_energy.spending_energy.subtitle": "哦,你是会消耗能源的", "quests.gregtech_energy.spending_energy.desc.1": "如何消耗所有这些能源?\n\n使用你的机器!听起来很简单,对吧?\n嗯……不完全是这样。有许多小细节你应该学习,以帮助你完成&3TerraFirmaGreg&r的旅程。\n\n基础机器:\n-这些机器很简单。\n-它们每个最多可以请求&a2A&r。\n-如果你输入更高等级的能源……&4\uD83D\uDCA5它们会爆炸&r。\n\n格雷科技多方块结构:\n现在事情变得有趣了。多方块结构提供了更多的灵活性和动力——&e如果&r你了解它们如何工作。", - "quests.gregtech_energy.spending_energy.desc.2": "标准机制:\n-如果一个多方块结构可以接受两个能源仓(大多数都可以),这允许你使用比机器基础等级更高的配方。\n\n例子:\n如果你正在使用一个大型搅拌罐,并且你安装了两个IV能源仓,它将能够处理&cLuV&r等级的搅拌配方。\n\n这是多方块结构相对于单方块机器的主要好处之一——要将它们升级到下一个等级,你只需要更换它们的能源仓,而不是更换整个机器。", + "quests.gregtech_energy.spending_energy.desc.2": "标准机制:\n-如果一个多方块结构可以接受两个能源仓(大多数都可以),这允许你使用比机器基础等级更高的配方。\n\n例子:\n如果你正在建造一座电力高炉,并且你安装了两个LV能源仓,它将能够处理&cMV&r等级的电力高炉配方。\n\n这是多方块结构相对于单方块机器的主要好处之一——要将它们升级到下一个等级,你只需要更换它们的能源仓,而不是更换整个机器。", "quests.gregtech_energy.spending_energy.desc.3": "一些多方块结构只能安装一个能源仓,但这并不意味着你被限制在1A!\n\n你仍然可以使用4A或16A的能源仓。这将允许&b超频&r配方,但不能超频配方等级。\n\n例子:\n大型电路组装机只允许安装一个能源仓。如果你安装一个4A IV能源仓,你将能够超频所有IV及更低等级的配方。\n\n但是,它不能制作LuV等级的配方,因为机器不支持多个仓口。这个限制是故意的,以防止跳过格雷科技的进程系统。", "quests.gregtech_energy.spending_energy.desc.4": "因此请记住:单个能源仓的电流数越大,处理速度越快,但必须安装两个能源仓才能解锁更高阶的合成配方。", "quests.gregtech_energy.spending_energy.task": "我明白了", "quests.gregtech_energy.overclock.title": "超频", "quests.gregtech_energy.overclock.subtitle": "基本升级机制", "quests.gregtech_energy.overclock.desc.1": "你听说过超频,但不太明白它是什么?让我们花点时间解释一下。\n\n我们应该从基础开始:\n&d低压&r代表最多32EU/t——有时更少,但绝不会更多。\n&d中压&r达到128EU/t。\n&d高压&r达到512EU/t。\n基本上,每个等级的功耗增加4倍。", - "quests.gregtech_energy.overclock.desc.2": "当你在更高等级的机器中运行较低等级的配方时会发生什么?这就是我们所说的&e超频&r!\n\n一个&d中压&r配方(33–128EU/t)在&d高压&r机器中运行将:1)使用4倍的能量,并且2)速度快2倍。\n\n同一个中压配方在&d超高压&r机器中?能量消耗是8倍,但速度只快4倍。\n\n如你所见,使用多台机器比超频单台机器能效更高。\n但说实话:在大多数设置中,你会更喜欢超频,而不是建造大量相同的机器。\n\n不过,在早期能源紧张的时候知道这一点是很好的。", + "quests.gregtech_energy.overclock.desc.2": "当你在更高等级的机器中运行较低等级的配方时会发生什么?这就是我们所说的&e超频&r!\n\n一个&d中压&r配方(33–128EU/t)在&d高压&r机器中运行将:1)使用4倍的能量,并且2)速度快2倍。\n\n同一个中压配方在&d超高压&r机器中?能量消耗是16倍,但速度只快4倍。\n\n如你所见,使用多台机器比超频单台机器能效更高。\n但说实话:在大多数设置中,你会更喜欢超频,而不是建造大量相同的机器。\n\n不过,在早期能源紧张的时候知道这一点是很好的。", "quests.gregtech_energy.overclock.desc.3": "有一种特殊的超频只适用于少数多方块结构:&e完美超频&r。\n在这里,不是4倍能量换2倍速度,而是&a4倍能量&r换&a4倍速度&r!这使得它与运行多台机器一样高效。\n\n目前在TerraFirmaGreg中,只有以下多方块结构支持此功能:\n-电力高炉\n-合金冶炼炉\n-转底炉\n-大型化学反应釜\n-电力温室", "quests.gregtech_energy.overclock.task": "所以红色的更快,懂了", "quests.gregtech_energy.blast_oc.title": "高炉超频", @@ -2458,7 +2518,8 @@ "quests.high_voltage.ptfe.subtitle": "又名 - 特氟龙", "quests.high_voltage.ptfe.desc": "&a聚四氟乙烯 (PTFE)&r是一种&7碳&r-&b氟&r聚合物。与PVC类似,PTFE可用于提高塑料电路板及其他制品的产量。目前主要用于制造&3大型化学反应釜&r的内壁。\n\n生产过程中需要消耗&3氯气&r,但如果你电解废弃的&a盐酸&r,它就可以完全回收。\n\n&b氟&r也将用于&a铀&r和&7硅岩&r的精炼过程。\n\n&9提示:&r从现在开始,你应该将聚合物固化为&d条&r(或锭)的形式,因为它们可以很容易地使用&3挤压机&r塑造成你需要的任何形式。", "quests.high_voltage.nitrobenzene.title": "硝基苯", - "quests.high_voltage.nitrobenzene.desc": "制作&a硝基苯&r可将&a苯&r的能源利用效率提升约&6四倍&r,结果令人欣喜。\n\n需要注意该工艺需要消耗&d蒸馏水&r,并且每个生产步骤都会消耗少量的&d硫&r。", + "quests.high_voltage.nitrobenzene.subtitle": "昔日荣光不再", + "quests.high_voltage.nitrobenzene.desc": "在TFG整合包中,&a硝基苯&r与&a苯&r已被大幅削弱。它们仍可作为燃料使用,但现在其主要用途是作为合成原料。\n\n请注意,制作硝基苯的每个步骤都会消耗少量 &d硫磺&r。", "quests.high_voltage.lcr.title": "大型化学反应釜", "quests.high_voltage.lcr.desc.1": "&3大型化学反应釜(LCR)&r是具有更多输入/输出槽位的多方块结构&3化学反应釜&r。其特氟龙外壳允许它能够处理额外的配方。\n\n&3LCR&r可以执行某些专属反应,将多个常规&3化学反应釜&r的步骤&6整合为单步完成&r。例如:\n\n&9-&r&a二氧化氮&r(用于制造硝酸与四氧化二氮)\n&9-&r&a硫酸&r\n&9-&r&a苯酚&r\n&9-&r&a环氧氯丙烷&r(你需要用它来制造环氧树脂!)\n&9-&r&a环氧树脂&r", "quests.high_voltage.lcr.desc.2": "&3大型化学反应釜&r还包含独占配方。例如&d氡气&r目前只能在LCR中制造。\n\n所有在&3LCR&r中进行的&d超频&r均具有&6100%%效率&r(即完美超频);每次超频将实现&5四倍加速&r,而非普通设备的双倍加速。\n\n&3LCR&r还存在另一项&6优势&r:可通过安装&32个能源仓&r来运行&5下一阶段&r的配方,此项特性与&3电力高炉&r的机制相似。", @@ -2635,6 +2696,15 @@ "quests.low_voltage.lv_seeds.subtitle": "这些是高秆植物", "quests.low_voltage.lv_seeds.desc": "若遇到这类作物,建议采集并建立农场种植。\n\n它们将成为&a种子油&r的最佳来源,该液体可用于生产&e生物柴油&r。油菜籽耐寒性较强,而向日葵更适宜温暖环境。若不愿花费过多时间耕作,也可在电力温室中培育,仅需消耗少量电力即可实现自动化种植。", "quests.low_voltage.lv_seeds.task": "油菜或向日葵", + "quests.low_voltage.lv_gas_turbine.title": "燃气轮机", + "quests.low_voltage.lv_gas_turbine.subtitle": "它需要更多电路,但更少材料", + "quests.low_voltage.lv_gas_turbine.desc": "借助&7合成气&r,你现在拥有了在&7LV&r阶段使用&8燃气轮机&r的可行方案。它们与其他&6发电机&r工作原理完全相同,但应比&6内燃机&r略微节省材料。", + "quests.low_voltage.lv_gas_syngas.title": "合成气", + "quests.low_voltage.lv_gas_syngas.subtitle": "并非木煤气", + "quests.low_voltage.lv_gas_syngas.desc": "制造&7合成气&r非常简单。你只需为每台&6酿造室&r或&6真空腔室&r配备&b3座焦炉&r。然后借助&b机械动力树场&r收集&7木材&r以最大程度降低能耗,就能享受这种虽弱但易于生产的&7气体燃料&r了。", + "quests.low_voltage.lv_naphtha_light.title": "石脑油和轻油", + "quests.low_voltage.lv_naphtha_light.subtitle": "你可以用它们来制造塑料", + "quests.low_voltage.lv_naphtha_light.desc": "如果你实在厌恶种地,更偏爱在&6沙漠&r探险或开采大量&7油砂&r,那么或许&7石脑油&r(从&7原油&r中提取更佳)或&7轻燃油&r(从&7石油&r中提取更佳)会是值得你考虑的燃料。\n\n鉴于其易于生产的特性,它们的性价比相当不错,只不过在现阶段仍需手动采收。", "quests.low_voltage.lv_turbo_charge.title": "闪聚充电箱", "quests.low_voltage.lv_turbo_charge.subtitle": "可更快为电动工具充电", "quests.low_voltage.lv_turbo_charge.desc": "&o本任务主题为可选内容,但可能仍会引发你的兴趣。我们出于内容完整性的考虑将其放置于此。&r\n\n&3闪聚充电箱&r可为&6RF与EU&r设备(例如&9钻头&r)提供极速充电。\n\n该设备对每件充电物品最高支持4安培电流,使其充电速度达到&3电池箱&r的&6两倍&r,但不具备放电功能。\n\n&e任何&r类型的充电箱均可完成本任务。", @@ -2917,7 +2987,7 @@ "quests.medium_voltage.mv_fluid_rig.desc.1": "建造&3流体钻机&r确实需要不小投入,但这是&o目前&r最主流的&6石油获取方式&r。\n\n它能从基岩层下方抽取流体。需要注意的是这些流体并非真实存在,而是通过模拟计算生成。\n\n流体矿脉分布在&c区块大小区域&r内。每个矿脉蕴含不同流体,但大多以石油类为主。\n\n&o现阶段&r尚无法对流体矿脉进行勘探——该功能将在&6HV&r阶段开放。", "quests.medium_voltage.mv_fluid_rig.desc.2": "每个矿脉会以不同的基础产量生成,通常介于&d150L/s&r至&d300L/s&r之间。\n\n当被抽取时,流体矿脉会逐渐枯竭。这将导致流体产量随时间推移不断下降,直至达到枯竭产量值。此时应将钻机转移至其他矿脉。\n\n&3基础流体钻机&r可持续运行10万次操作(每次操作1秒)直至矿脉枯竭,这足以产出&6远超1万桶&r的石油。更高级别的钻机将大幅提升产量,同时显著降低矿脉枯竭速度。", "quests.medium_voltage.mv_fluid_rig.desc.3": "&l你可以在&2主世界&r&l中找到什么:&r\n\n&9石油:&r富含备受好评的&a轻燃油&r。\n&9轻油:&r富含&a炼油气&r,可用于发电。\n&9重油:&r富含&a重燃油&r,用途相对小众但可提取重要的&a甲苯&r。\n&9原油:&r富含&a石脑油&r,是早期石油产品的最佳来源。\n&9天然气:&r直接产出&a炼油气&r,无需蒸馏提纯。\n&9海水:&r可提取&a钠&r和&a氯&r,适用于后期生产。", - "quests.medium_voltage.mv_fluid_rig.desc.4": "&l你可以在&c下界&r&l发现以下资源:&r\n\n&9天然气:&r产出&a炼油气&r且产量高于主世界矿脉。\n&9熔岩:&r希望你认得这个。\n\n起步阶段可能需要随机勘探直至找到理想资源。请注意,你抽取的任何流体均可作为流体钻机的补充燃料。", + "quests.medium_voltage.mv_fluid_rig.desc.4": "&l你可以在&c幽冥之地&r&l发现以下资源:&r\n\n&9天然气:&r产出&a炼油气&r且产量高于主世界矿脉。\n&9熔岩:&r希望你认得这个。\n\n起步阶段可能需要随机勘探直至找到理想资源。请注意,你抽取的任何流体均可作为流体钻机的补充燃料。", "quests.medium_voltage.mv_oilsands.title": "美国模拟器", "quests.medium_voltage.mv_oilsands.subtitle": "此任务由美国军方赞助", "quests.medium_voltage.mv_oilsands.desc": "在地下探索时,你可能会遇到纯油砂矿脉。通过&3离心机&r处理其粉末可获得&a石油&r。\n\n&9&l注意:&r&l石油路线是制备&9&l乙烯&r&l的途径之一,其他路线则涉及乙醇的自然制备法。&r\n\n目前石油获取属于&d可选&r内容,直到后期&5EV&r阶段才会成为必需资源。\n\n石油可精炼成&a轻燃油&r、&a柴油&r乃至&a汽油&r,这些都是极佳的能源选择。\n\n若选择此路线,建议将石油同时用于发电和生产乙烯。\n\n油砂矿是&6理想的起步选择&r——它们能支撑你直至解锁流体钻机技术。", @@ -2941,9 +3011,13 @@ "quests.medium_voltage.mv_distillery.desc.3": "但这并不意味着&3蒸馏室&r是两者中更差的选择。它解锁时间更早,且具有&d体积更小&r、&d造价更低&r、每个配方&d能耗更低&r的优势。\n\n事实上多数情况下,你根本不会在意被废弃的其他流体。\n\n无论选择&a柴油&r还是&a苯&r作为发电原料,&3蒸馏室&r都是能源生产环节的核心组件。\n\n建议尽可能建造多台低级型号以避免超频带来的能量损耗。", "quests.medium_voltage.mv_distillery.task": "LV或MV蒸馏室均可", "quests.medium_voltage.mv_benzene.title": "苯教派", - "quests.medium_voltage.mv_benzene.subtitle": "到最后,总是苯", + "quests.medium_voltage.mv_benzene.subtitle": "到最后,&l曾经&r总是苯", "quests.medium_voltage.mv_benzene.desc.1": "&a苯&r是一种&9气体燃料&r。为了少一些挫折,这里介绍两种最佳获取方式:\n\n首选是&d木材加工路线&r。将原木放入&3热解炉&r生成&9木焦油&r,产出的木炭还可通过&3提取机&r加工获得更多&9木焦油&r,最后经&3蒸馏&r处理得到&a苯&r。\n\n次选是&d重油加工路线&r。将重油放入&3蒸馏室&r制成&9重燃料&r,随后进行&a重度蒸汽裂化&r并再次&3蒸馏&r即可获得&a苯&r。", - "quests.medium_voltage.mv_benzene.desc.2": "关于石油加工的具体方法,请查看轻燃料与石脑油任务。\n\n总体而言,优先部署更多机器(&d并行处理&r)比超频配方更有效率。这种方式能在处理资源时减少能量损耗。\n\n&a苯&r通过&3燃气轮机&r燃烧发电。该能源初始效能低于&e柴油&r,但在&6HV&r阶段精炼成&6硝基苯&r后将获得显著提升。最终选择何种能源仍由你自行决定。", + "quests.medium_voltage.mv_benzene.desc.2": "关于石油加工的具体方法,请查看轻燃料与石脑油任务。\n\n总体而言,优先部署更多机器(&d并行处理&r)比超频配方更有效率。这种方式能在处理资源时减少能量损耗。\n\n&a苯&r在&3燃气轮机&r中的燃烧效率相当低。该能源初始效能低于&e柴油&r,但可通过精炼成&6重整气&r来获得提升。说到底,选择何种能源取决于你。", + "quests.medium_voltage.mv_benzene.desc.3": "&l&3背景知识:&r&o自GTCEu以来,苯一直是最强大的气体燃料之一——其性能之强甚至成了一个梗。如今,它的辉煌时代在任何地方都屈指可数了。", + "quests.medium_voltage.reformate_gas.title": "重整气教派", + "quests.medium_voltage.reformate_gas.subtitle": "当一位巨人倒下,新的巨人已然崛起。", + "quests.medium_voltage.reformate_gas.desc": "如果这是你选择的路径,那么&8重整气&r将是你在&bMV&r阶段新的首选气体燃料。为实现完美效率,你只需要 &61座煤炭液化塔&r和&62座热解炉&r,便能开始不间断地产出这种珍贵气体。\n\n哦等等,首先你需要找到&5铼&r,这是一种仅在&7群峦传说&r干热区域发现的新材料。其消耗量极低,一个矿脉就足以支撑你直到整合包毕业,或者至少到&6HV&r阶段——届时,在 &6裂解机&r的帮助下,这种气体才能真正实现无限生产。", "quests.medium_voltage.mv_light_fuel.title": "轻燃油", "quests.medium_voltage.mv_light_fuel.subtitle": "把这里的灯点亮,宝贝", "quests.medium_voltage.mv_light_fuel.desc": "蒸馏&a原油&r可获得需要脱硫处理的燃料。\n\n&a硫化氢&r能在&3电解机&r中完美&d循环利用&r。\n\n要实现自动化流程,只需将&3化学反应釜&r与&3电解机&r相邻放置。记得使用&5螺丝刀&r&4启用输出面的输入功能&r。\n\n&a轻燃油&r是不错的&9发电&r选择,但还有更高效的方案……请查看左侧任务指引。", @@ -2952,6 +3026,10 @@ "quests.medium_voltage.mv_diesel.desc.1": "&a柴油&r是一种&d基于石油的&9内燃机燃料&r。\n\n要混合&a轻燃料&r和&a重燃料&r,使用&3蒸馏室&r时,从&d石油&r或&d原油&r中提取的合适比例是&63:2&r。\n\n这意味着需配备3台蒸馏室生产轻燃油,或2台蒸馏室生产重燃油。", "quests.medium_voltage.mv_diesel.desc.2": "通过专门使用&d重油&r来制备&a重燃油&r,可&6大幅削减&r所需&d石油&r用量。若选择此路线,&d油砂矿&r是绝佳选择!\n\n&o(给数据控:从8.33石油->6柴油,优化为5石油+0.4重油->6柴油)&r\n\n&e注意:&r请&c不要尝试&r将石油直接放入&3蒸馏塔&r处理!表面看来它能同时产出轻燃油和重燃油似乎很划算,但此过程需要大量超频才能达到理想效率,最终损耗的能量会远超副产品价值。", "quests.medium_voltage.mv_diesel.desc.3": "总体而言,优先部署更多机器(&d并行处理&r)比超频配方更有效率。这种方式能在处理资源时减少能量损耗。\n\n&a柴油&r通过&3内燃发电机&r燃烧发电。在&6HV&r阶段可进一步精炼成&6高十六烷值柴油&r。与其他能源相比,柴油总体效率更高,但加工流程更为复杂。若你选择&e石油&r路线生产&a聚乙烯&r,现有基础设施便能完美适配此方案。最终选择何种能源仍取决于你。", + "quests.medium_voltage.coal_tower.title": "煤炭液化塔", + "quests.medium_voltage.coal_tower.subtitle": "谁会不爱新的多方块结构呢", + "quests.medium_voltage.coal_tower.desc.1": "&b煤炭液化塔&r是一个新的&b多方块结构&r,用于生产&a重整气&r及其副产品&7煤焦油&r和&7合成气&r。根据你使用的&9线圈&r,每个配方所需的&7EU/t&r消耗将获得折扣。将鼠标悬停在线圈上并按shift键即可查看其加成效果。\n\n注意,&9煤炭液化塔&r可通过使用&8氢气&r来加速,从而减少耗时并降低总能耗。别忘了设置正确的&6电路配置&r以确保其正常运行。\n\n顺带一提,游戏内1秒等于20游戏刻。因此,要计算其每秒消耗,需将每游戏刻消耗量乘以20。", + "quests.medium_voltage.coal_tower.desc.2": "&l&3背景知识:&r&o设计出核裂变反应堆的同一个人,也绘制了煤炭液化塔的初版蓝图,这难道不疯狂吗。", "quests.medium_voltage.mv_jetpack.title": "我相信我能飞", "quests.medium_voltage.mv_jetpack.subtitle": "...嗯,几乎能飞", "quests.medium_voltage.mv_jetpack.desc": "这款喷气背包可使用多数&a内燃机燃料&r(不包括石油类)来提供基础飞行功能。\n\n填充方式与流体桶相同,或通过&3罐装机&r进行填充。\n\n按下&4H&r键(默认按键)可开启悬停模式。", @@ -2982,7 +3060,7 @@ "quests.medium_voltage.mv_aciditic.title": "它会融化你的血肉", "quests.medium_voltage.mv_aciditic.subtitle": "...如果你不读这个任务。", "quests.medium_voltage.mv_aciditic.desc.1": "你可能注意到某些流体被标注为&a酸性&r,其中&9硫酸&r就是典型代表。\n\n这意味着多数流体管道无法安全运输这类液体!\n\n在&bMV&r阶段,最经济的酸性流体运输管道当属&a金管道&r,造价更高的&a钒钢&r与&a铬&r分别位列第二、第三选择。\n\n待进入&6HV&r阶段后,&a不锈钢管道&r或&a聚四氟乙烯&r将成为可行的选择。", - "quests.medium_voltage.mv_aciditic.desc.2": "当前阶段你有三种酸性液体存储方案:&d玻璃瓶&r、&d金桶&r或&d超级缸&r。玻璃瓶类似&9流体单元&r,专为储存酸性液体设计;金桶顾名思义可直接使用;超级缸则在解锁&9聚乙烯&r后可用,能无限制存储任何流体。\n\n&c警告:&r酸性液体误入非抗腐蚀管道将导致&c流体消失&r、&c管道烧毁&r并伴随极高的&c致命风险&r!请务必谨慎操作!\n\n&l&3背景知识:&r&o酸性液体运输与存储机制源自格雷科技6版本的设计,并延续至今。&r", + "quests.medium_voltage.mv_aciditic.desc.2": "当前阶段你有三种实用的酸液存储方案:&d玻璃瓶&r、&d金桶&r或&d超级缸&r。玻璃瓶类似&9流体单元&r,专为储存酸性液体设计;金桶顾名思义可直接使用;超级缸能无限制存储任何流体,但也是最贵的。\n\n&c警告:&r酸性液体误入非抗腐蚀管道将导致&c流体消失&r、&c管道烧毁&r并伴随极高的&c致命风险&r!请务必谨慎操作!\n\n&l&3背景知识:&r&o酸性液体运输与存储机制源自格雷科技6版本的设计,并延续至今。&r", "quests.medium_voltage.mv_aciditic.task": "我是酸液专家,不必担心", "quests.medium_voltage.mv_hydrochloric.title": "盐酸", "quests.medium_voltage.mv_hydrochloric.subtitle": "你需要很多这个!", @@ -3368,7 +3446,7 @@ "quests.space_survival.flag.task": "任何旗帜", "quests.space_survival.chorus.title": "紫颂果", "quests.space_survival.chorus.subtitle": "这是末地吗?", - "quests.space_survival.chorus.desc": "&5紫颂果&r在月球上扮演着至关重要的角色——它将是你的主要氮气来源。首先,找到一些紫颂植物,跑酷到顶部,并打破&5紫颂花&r。从底部破坏植物不会得到任何紫颂花!接下来,在电力温室中种植紫颂花以获得可再生的紫颂果来源,然后你可以分别用酿造厂和发酵器将它们加工成生物质和氮气。你还可以将生物质蒸馏成碳,以获得更多的火箭燃料!", + "quests.space_survival.chorus.desc": "&5紫颂果&r在月球上扮演着至关重要的角色——它将是你的主要氮气来源。首先,找到一些紫颂植物,跑酷到顶部,并打破&5紫颂花&r。从底部破坏植物不会得到任何紫颂花!接下来,在电力温室中种植紫颂花以获得可再生的紫颂果来源,然后你可以分别用酿造室和发酵器将它们加工成生物质和氮气。你还可以将生物质蒸馏成碳,以获得更多的火箭燃料!", "quests.space_survival.rover.title": "太空漫游车", "quests.space_survival.rover.subtitle": "你的逃生工具", "quests.space_survival.rover.desc": "你不得不把你花哨的喷气背包留在家里,没有大气层供飞机飞行,马也无法生存,那么你该如何出行?\n\n&b漫游车(Rover)&r是一种可以容纳最多两名乘客的载具,使用可燃燃料(柴油、汽油和火箭燃料)运行,甚至还有一个物品栏和可以播放真实世界电台的收音机!", @@ -3648,7 +3726,7 @@ "quests.steam_age.extractor.desc": "在&6蒸汽时代&r,&3提取机&r能制造的物品并不多,因为它无法提取流体。", "quests.steam_age.glass_tube.title": "玻璃管", "quests.steam_age.glass_tube.subtitle": "这个需求量巨大", - "quests.steam_age.glass_tube.desc": "虽然你可通过玻璃吹制手工制作,但使用合金冶炼炉搭配对应模具进行生产的效率要高得多。需要大量玻璃粉?你可以一次性吹制16块玻璃板再进行粉碎,亦可使用碎石机与锻锤获取大量沙砾,随后混入少量燧石粉即可制成玻璃粉。", + "quests.steam_age.glass_tube.desc": "虽然你的第一个玻璃管需要手动&d吹制玻璃&r获得,但使用合金冶炼炉搭配对应模具进行生产的效率要高得多。需要大量玻璃粉?你可以一次性吹制16块玻璃板再进行粉碎,亦可使用碎石机与锻锤获取大量沙砾,随后混入少量燧石粉即可制成玻璃粉。", "quests.steam_age.treated_planks.title": "防腐木板", "quests.steam_age.treated_planks.subtitle": "也称为防腐胶合板", "quests.steam_age.treated_planks.desc": "希望你一直在积攒杂酚油,因为制作防腐木浆与防腐木板正是它的另一大用途。\n\n&l&3背景说明:&r&o在旧版TerraFirmaGreg中,直到这个阶段你才真正能开始玩机械动力!", @@ -4313,7 +4391,7 @@ "quests.tfg_tips.create_tree_sugar.task": "枫糖或桦糖", "quests.tfg_tips.create_rubber_ingot.title": "橡胶条", "quests.tfg_tips.create_rubber_ingot.subtitle": "把这些&6电缆&r包裹好。", - "quests.tfg_tips.create_rubber_ingot.desc": "使用&b真空腔室&r并辅以额外加热,你可以通过特定工艺将各种树木产生的&a乳胶&r加工成&d生橡胶末&r。随后,在&b合金冶炼炉&r中将3份&d生橡胶末&r与少量&e硫磺&r一同熔炼,即可制成&d橡胶条&r。它是电缆绝缘处理的理想材料,也是迈入&2电气时代&r及后续阶段所不可或缺的资源。", + "quests.tfg_tips.create_rubber_ingot.desc": "使用&b真空腔室&r并辅以额外加热,你可以通过特定工艺将各种树木产生的&a乳胶&r加工成&d生橡胶末&r。随后,在&b合金冶炼炉&r中将3份&d生橡胶末&r与少量&e硫磺&r一同熔炼,即可制成&d橡胶条&r。它是电缆绝缘处理的理想材料,也是迈入&2电气时代&r及后续阶段所不可或缺的资源。\n\n&9提示:&r随着进程推进,将出现多种使该流程更廉价、更简便的方法。记得常查看EMI!你将长期使用橡胶,因此很值得将其自动化。", "quests.tfg_tips.transportation.title": "交通工具", "quests.tfg_tips.transportation.subtitle": "穿梭广袤世界", "quests.tfg_tips.transportation.desc": "世界非常庞大,你可能需远行寻找特定生存发展资源。本节模组提供多种交通工具选择。", @@ -4461,7 +4539,7 @@ "quests.tfg_tips.beehive.desc": "要开启你的养蜂之旅,你需要准备一个&b蜂箱&r和一块&a巢脾&r。\n与原版《我的世界》不同,蜂巢不会自然生成,蜜蜂只会在玩家放置的、且已被&e蜂后&r入驻的&b蜂箱&r巢脾中诞生。蜂后入驻你巢脾的几率取决于随机数,但你可以在蜂箱周围放置&d花&r来提高成功率。\n\n一旦你的巢脾被蜂后入驻,它就会开始孕育蜜蜂并生产蜂蜜。", "quests.tfg_tips.not_the_bees.title": "养蜂人护甲", "quests.tfg_tips.not_the_bees.subtitle": "不要蜜蜂!", - "quests.tfg_tips.not_the_bees.desc": "蜜蜂可不乐意在被人打扰时,还任由对方收割自己宝贵的蜂蜜与蜂蜡。有三种方法能让你安全采收:\n\n*&d在夜间收获&r\n*&d点燃营火&r\n*&d穿戴养蜂护甲&r", + "quests.tfg_tips.not_the_bees.desc": "蜜蜂可不乐意在被人打扰时,还任由对方收割自己宝贵的蜂蜜与蜂蜡,或是挪动它们的巢脾。有三种方法能让你安全采收:\n\n*&d在夜间收获&r\n*&d点燃营火&r\n*&d穿戴养蜂护甲&r", "quests.tfg_tips.not_the_bees.task": "我会点燃营火或等到夜幕降临", "quests.tfg_tips.honey.title": "蜂蜜", "quests.tfg_tips.honey.subtitle": "哦,打扰了...", From dd1463acdfa0d7b60f53d751605bb7852cbf9f80 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 8 Dec 2025 19:36:35 +0000 Subject: [PATCH 05/25] update to forge 47.4.13, fix aged sake, fix cleanroom doors, fix butyraldehyde --- CHANGELOG.md | 6 +++++- kubejs/data/tfc/tfc/drinkables/aged_sake.json | 12 ++++++++++++ kubejs/data/tfc/tfc/drinkables/aged_vodka.json | 12 ++++++++++++ kubejs/data/tfc/tfc/drinkables/aged_whiskey.json | 12 ++++++++++++ kubejs/server_scripts/gregtech/tags.js | 6 ++++++ kubejs/startup_scripts/gtceu/constants.js | 4 ++-- pakku-lock.json | 2 +- 7 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 kubejs/data/tfc/tfc/drinkables/aged_sake.json create mode 100644 kubejs/data/tfc/tfc/drinkables/aged_vodka.json create mode 100644 kubejs/data/tfc/tfc/drinkables/aged_whiskey.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 5bf306f71..8b9590bce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,13 @@ # Changelog ## Unreleased -### Changes +### Breaking Changes +- Butyraldehyde in a chemical reactor now uses circuit 5 instead of 1 to avoid a conflict with Methanol @Pyritie +### Other Changes - Added recipes for create's shadow and radiant casings (#2256) @Ujhik ### Bug fixes +- Fixed missing cleanroom tags for the ad astra 3x3 doors, so now you can *actually* use them in a cleanroom @Pyritie +- Fixed aged sake, vodka, and whiskey losing their buff effects @Pyritie ## [0.11.9] - 7-12-2025 ### Breaking Changes diff --git a/kubejs/data/tfc/tfc/drinkables/aged_sake.json b/kubejs/data/tfc/tfc/drinkables/aged_sake.json new file mode 100644 index 000000000..1657f4f89 --- /dev/null +++ b/kubejs/data/tfc/tfc/drinkables/aged_sake.json @@ -0,0 +1,12 @@ +{ + "ingredient": "tfcagedalcohol:aged_sake", + "thirst": 15, + "intoxication": 2000, + "effects": [ + { + "type": "minecraft:resistance", + "duration": 6400, + "amplifier": 0 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfc/tfc/drinkables/aged_vodka.json b/kubejs/data/tfc/tfc/drinkables/aged_vodka.json new file mode 100644 index 000000000..baa19f8dd --- /dev/null +++ b/kubejs/data/tfc/tfc/drinkables/aged_vodka.json @@ -0,0 +1,12 @@ +{ + "ingredient": "tfcagedalcohol:aged_vodka", + "thirst": 15, + "intoxication": 2000, + "effects": [ + { + "type": "minecraft:resistance", + "duration": 3200, + "amplifier": 1 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfc/tfc/drinkables/aged_whiskey.json b/kubejs/data/tfc/tfc/drinkables/aged_whiskey.json new file mode 100644 index 000000000..740b7380a --- /dev/null +++ b/kubejs/data/tfc/tfc/drinkables/aged_whiskey.json @@ -0,0 +1,12 @@ +{ + "ingredient": "tfcagedalcohol:aged_whiskey", + "thirst": 15, + "intoxication": 2000, + "effects": [ + { + "type": "minecraft:haste", + "duration": 3200, + "amplifier": 1 + } + ] +} \ No newline at end of file diff --git a/kubejs/server_scripts/gregtech/tags.js b/kubejs/server_scripts/gregtech/tags.js index da08ef709..a7f7a9674 100644 --- a/kubejs/server_scripts/gregtech/tags.js +++ b/kubejs/server_scripts/gregtech/tags.js @@ -76,6 +76,12 @@ function registerGTCEUBlockTags(event) { event.add("gtceu:cleanroom_doors", "createdeco:zinc_door"); event.add("gtceu:cleanroom_doors", "createdeco:locked_zinc_door"); event.add("gtceu:cleanroom_doors", "ad_astra:steel_door"); + event.add("gtceu:cleanroom_doors", "ad_astra:iron_sliding_door"); + event.add("gtceu:cleanroom_doors", "ad_astra:steel_sliding_door"); + event.add("gtceu:cleanroom_doors", "ad_astra:reinforced_door"); + event.add("gtceu:cleanroom_doors", "ad_astra:desh_sliding_door"); + event.add("gtceu:cleanroom_doors", "ad_astra:ostrum_sliding_door"); + event.add("gtceu:cleanroom_doors", "ad_astra:calorite_sliding_door"); } /** @param {TagEvent.Fluid} event */ diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index 4666d23a6..b3806f41b 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -388,8 +388,8 @@ global.ADD_CIRCUIT = /** @type {const} */ ([ { recipeId: "gtceu:chemical_reactor/acetic_acid_from_methanol", circuitNumber: 1 }, { recipeId: "gtceu:large_chemical_reactor/acetic_acid_from_methanol", circuitNumber: 1 }, - { recipeId: "gtceu:chemical_reactor/butraldehyde", circuitNumber: 1 }, - { recipeId: "gtceu:large_chemical_reactor/butraldehyde", circuitNumber: 1 } + { recipeId: "gtceu:chemical_reactor/butraldehyde", circuitNumber: 5 }, + { recipeId: "gtceu:large_chemical_reactor/butraldehyde", circuitNumber: 5 } ]); //#endregion diff --git a/pakku-lock.json b/pakku-lock.json index 0714b88a5..3e7e3db7f 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -4,7 +4,7 @@ "1.20.1" ], "loaders": { - "forge": "47.4.6" + "forge": "47.4.13" }, "projects": [ { From 811cf2766f6a37d8d688f3f595b620b652c41d19 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 8 Dec 2025 19:53:36 +0000 Subject: [PATCH 06/25] move venus fluids into core --- .../tfg/worldgen/noise_settings/venus_noise.json | 2 +- kubejs/server_scripts/tfg/venus/tags.venus.js | 4 ++-- kubejs/startup_scripts/tfg/fluids.js | 15 --------------- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json b/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json index 628dfa3e8..6cc67118b 100644 --- a/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json +++ b/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json @@ -8,7 +8,7 @@ "Name": "ad_astra:venus_stone" }, "default_fluid": { - "Name": "tfg:sulfur_fumes" + "Name": "tfg:fluid/sulfur_fumes" }, "noise": { "min_y": -64, diff --git a/kubejs/server_scripts/tfg/venus/tags.venus.js b/kubejs/server_scripts/tfg/venus/tags.venus.js index 3b1054640..b41ce3ec4 100644 --- a/kubejs/server_scripts/tfg/venus/tags.venus.js +++ b/kubejs/server_scripts/tfg/venus/tags.venus.js @@ -73,8 +73,8 @@ function registerTFGVenusBlockTags(event) { event.add('ad_astra:venus_stone_replaceables', 'tfg:sandstone/raw/fluorapatite/white') event.add('ad_astra:venus_stone_replaceables', 'tfg:sand/fluorapatite/yellow') event.add('ad_astra:venus_stone_replaceables', 'tfg:sandstone/raw/fluorapatite/yellow') - event.add('ad_astra:venus_stone_replaceables', 'tfg:geyser_slurry') - event.add('ad_astra:venus_stone_replaceables', 'tfg:sulfur_fumes') + event.add('ad_astra:venus_stone_replaceables', 'tfg:fluid/geyser_slurry') + event.add('ad_astra:venus_stone_replaceables', 'tfg:fluid/sulfur_fumes') event.add('ad_astra:venus_stone_replaceables', 'minecraft:lava') event.add('ad_astra:venus_stone_replaceables', 'create:scoria') event.add('ad_astra:venus_stone_replaceables', 'create:scorchia') diff --git a/kubejs/startup_scripts/tfg/fluids.js b/kubejs/startup_scripts/tfg/fluids.js index 287f1dd0d..ddf04bc53 100644 --- a/kubejs/startup_scripts/tfg/fluids.js +++ b/kubejs/startup_scripts/tfg/fluids.js @@ -18,20 +18,5 @@ const registerTFGFluids = (event) => { .noBlock() // Venus - event.create('tfg:sulfur_fumes') - .stillTexture('tfg:block/planets/venus/sulfur_fumes_still') - .flowingTexture('tfg:block/planets/venus/sulfur_fumes_flow') - .bucketColor(0xc4d984) - .gaseous() - .viscosity(0) - .density(0) - .renderType('translucent') - - event.create('tfg:geyser_slurry', 'tfc:spring') - .stillTexture('tfg:block/planets/venus/geyser_slurry_still') - .flowingTexture('tfg:block/planets/venus/geyser_slurry_flow') - .bucketColor(0xc4d984) - .temperature(1000) - .renderType('translucent') } \ No newline at end of file From 752802bacfdac7038d1ee45cc73399defdde1d1f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 8 Dec 2025 20:58:16 +0000 Subject: [PATCH 07/25] langs --- kubejs/assets/create/lang/en_us.json | 2 + kubejs/assets/tfg/lang/en_us.json | 56 ++++++++++++++++++++++------ kubejs/assets/tfg/lang/fr_fr.json | 12 +++--- kubejs/assets/tfg/lang/ja_jp.json | 10 ++--- kubejs/assets/tfg/lang/pt_br.json | 13 +++---- kubejs/assets/tfg/lang/ru_ru.json | 12 +++--- kubejs/assets/tfg/lang/uk_ua.json | 10 ++--- kubejs/assets/tfg/lang/zh_cn.json | 10 ++--- 8 files changed, 77 insertions(+), 48 deletions(-) diff --git a/kubejs/assets/create/lang/en_us.json b/kubejs/assets/create/lang/en_us.json index 417c99027..7df80e91e 100644 --- a/kubejs/assets/create/lang/en_us.json +++ b/kubejs/assets/create/lang/en_us.json @@ -1,6 +1,8 @@ { "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", "block.create.netherite_backtank": "Blue Steel Backtank", + "block.create.shadow_casing": "Black Steel Casing", + "block.create.refined_radiance_casing": "Glowing Casing", "block.create.industrial_iron_block": "Industrial Steel Block", "block.create.weathered_iron_block": "Weathered Steel Block", "block.create.industrial_iron_window": "Industrial Steel Window", diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 91bdba756..a7d8f4cb8 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -495,6 +495,8 @@ "block.tfg.zpm_gas_pressurizer": "§cElite Gas Pressurizer III§r", "block.tfg.uv_gas_pressurizer": "§3Ultimate Gas Pressurizer§r", "block.tfg.fluid.semiheavy_ammoniacal_water": "Semiheavy Ammoniacal Water", + "block.tfg.fluid.sulfur_fumes": "Dense Sulfuric Fumes", + "block.tfg.fluid.geyser_slurry": "Super Heated Slurry", "block.tfg.grass.mars_dirt": "Martian Dirt", "block.tfg.grass.mars_clay_dirt": "Martian Clay Dirt", "block.tfg.grass.mars_farmland": "Martian Farmland", @@ -665,14 +667,10 @@ "block.tfg.impure_moderate_core": "Impure Moderate Core", "block.tfg.moderate_core_frame": "Moderate Core Frame", "block.tfg.impure_moderate_core_frame": "Impure Moderate Core Frame", - "fluid.tfg.nether_slurry": "Nether Slurry", - "fluid.tfg.enriched_nether_slurry": "Enriched Nether Slurry", - "fluid.tfg.ender_slurry": "Ender Slurry", - "fluid.tfg.enriched_ender_slurry": "Enriched Ender Slurry", "fluid.tfg.heavy_ammoniacal_water": "Heavy Ammoniacal Water", "fluid.tfg.semiheavy_ammoniacal_water": "Semiheavy Ammoniacal Water", - "fluid.tfg.sulfur_fumes": "Sulfur Fumes", - "fluid.tfg.super_heated_slurry": "Super Heated Slurry", + "fluid.tfg.sulfur_fumes": "Dense Sulfuric Fumes", + "fluid.tfg.geyser_slurry": "Super Heated Slurry", "fluid.tfg.cryogenized_fluix": "Cryogenized Fluix", "item.tfg.antipoison_pill": "Antipoison Pill", "item.tfg.haste_pill": "Haste Pill", @@ -907,8 +905,8 @@ "item.tfg.marker.mercury_orbit": "Mercury Orbit", "item.tfg.marker.glacio_orbit": "Europa Orbit", "item.tfg.railgun_ammo_shell": "Railgun Ammo Shell", - "item.tfg.sulfur_fumes_bucket": "Sulfur Fumes Bucket", - "item.tfg.super_heated_slurry_bucket": "Super Heated Slurry Bucket", + "item.tfg.sulfur_fumes_bucket": "Dense Sulfuric Fumes Bucket", + "item.tfg.geyser_slurry_bucket": "Super Heated Slurry Bucket", "item.tfg.cryogenized_fluix_bucket": "Cryogenized Fluix Bucket", "item.tfg.fluix_bucket": "Liquid Fluix Bucket", "item.tfg.latex_bucket": "Latex Bucket", @@ -4027,15 +4025,51 @@ "quests.tfg_tips.gt.title": "GregTech", "quests.tfg_tips.gt.subtitle": "One third of the modpack's name, after all.", "quests.tfg_tips.gt.desc": "&3GregTech&r can be quite intimidating, this quest branch should help you out.", + "quests.tfg_tips.gt_power_tools.title": "Power Tools", + "quests.tfg_tips.gt_power_tools.subtitle": "Men only want one thing and it's f&kuck&ring disgusting", + "quests.tfg_tips.gt_power_tools.desc.1": "As with any good tech mod, &5GregTech&r comes with a wide variety of &6tools&r you can use. To operate them, you'll need to &acharge them with energy&r — and there are several ways to do that: place the tool in a &6Battery Buffer&r, in an &denergy slot&r of a machine, or even better, use a &eTurbo Charger&r.\n\nJust remember: you can only charge an item using a power source of &7equal&r or &ahigher tier&r. &cLower-tier sources&r won’t work on higher-tier tools — but don’t worry, &cnothing should explode&r. Probably.", + "quests.tfg_tips.gt_power_tools.desc.2": "Most &5GregTech&r tools are crafted from a &6Tool Head&r. Try using &aEMI&r to explore what you can do with them — just remember two important things:\n\n- The &ehigher the Tool Head tier&r, the more &cpowerful&r the tool will be, and the &6larger the battery&r it will use.\n- Not every tool supports every Tool Head tier. For example, the &6Chainsaw&r can only be crafted with a &7LV Tool Head&r.", "quests.tfg_tips.nano_saber.title": "Nano Saber", "quests.tfg_tips.nano_saber.subtitle": "26 Attack Damage when active!", "quests.tfg_tips.nano_saber.desc": "The &6Nano Saber&r is a powerful weapon you’ll be able to unlock once you reach late &5EV&r. Simply use &dShift + Right-Click&r to activate the &cbzzzzz mode&r.", - "quests.tfg_tips.gt_tools.title": "GregTech Tools", - "quests.tfg_tips.gt_tools.subtitle": "", - "quests.tfg_tips.gt_tools.desc": "Most &5GregTech&r tools are crafted from a &6Tool Head&r. Try using &aEMI&r to explore what you can do with them — just remember two important things:\n\n- The &ehigher the Tool Head tier&r, the more &cpowerful&r the tool will be, and the &6larger the battery&r it will use.\n- Not every tool supports every Tool Head tier. For example, the &6Chainsaw&r can only be crafted with a &7LV Tool Head&r.", "quests.tfg_tips.magnets.title": "Item Magnets", "quests.tfg_tips.magnets.subtitle": "", "quests.tfg_tips.magnets.desc": "The &6Item Magnet&r is exactly what you'd expect — a magnet that pulls nearby &6items&r straight to you. &aVery useful&r. What more could you ask for?", + "quests.tfg_tips.long_distance_items.title": "Long-Distance Item Pipes", + "quests.tfg_tips.long_distance_items.subtitle": "Wondering how to move those ores around?", + "quests.tfg_tips.long_distance_items.desc": "&3Long-Distance Item Pipes&r can be used to send items across great distances. Place one endpoint at each end, and connect them with pipeline blocks.\n\nThese pipes instantly transfer from the input side to the output side.\n\nThey also have a minimum distance between pipe endpoints, so you can't use these for short-range operations.", + "quests.tfg_tips.long_distance_fluids.title": "Long-Distance Fluid Pipes", + "quests.tfg_tips.long_distance_fluids.subtitle": "Wondering how to move that oil around?", + "quests.tfg_tips.long_distance_fluids.desc": "&3Long-Distance Fluid Pipes&r can be used to send fluids across great distances. Place one endpoint at each end, and connect them with pipeline blocks.\n\nThese pipes instantly transfer from the input side to the output side.\n\nThey also have a minimum distance between pipe endpoints, so you can't use these for short-range operations.\n\nThese pipes have a reputation of being &4buggy&r to set up. If they don't seem to work at first, try rotating the endpoints with a &eWrench&r.", + "quests.tfg_tips.crates.title": "GregTech Storage", + "quests.tfg_tips.crates.subtitle": "Earlygame buffering", + "quests.tfg_tips.crates.desc": "In theory, Crates are flat upgrades to Chests. A single block space that stores more items - what more could you ask for?\n\nThey're more expensive than regular Chests, and can't be attached to Create contraptions, but can hold any size of item and can &6accept Covers&r, making them perfect candidates for buffers in automation.", + "quests.tfg_tips.tape.title": "Tape for Crates", + "quests.tfg_tips.tape.subtitle": "Moving stuff around", + "quests.tfg_tips.tape.desc": "You can right-click a Crate with Tape, which will then make the crate keep its contents when broken, making it easy to move around. This only works once per tape, however.\n\nGood thing it's cheap!", + "quests.tfg_tips.terminal.subtitle": "Automatic Multiblock Builder", + "quests.tfg_tips.terminal.desc": "&bThe Terminal&r has one main purpose, and &awe highly encourage you to craft it&r.\n\nBuilding all these &eMultiblocks&r can be a bit &cintimidating&r, right? Well, here's a tip: use &dShift + Right-Click&r on any &6Multiblock Controller&r to &aautomatically assemble the entire structure&r!\n\nYou might need to &emove around some buses and hatches&r to suit your setup, but overall, this feature will save you a &alot of time&r.", + "quests.tfg_tips.memory_card.subtitle": "Copy and Paste", + "quests.tfg_tips.memory_card.desc": "When you try to &aparallelize your setup&r with more machines, it can be a bother to set all the &einputs&r and &eoutputs&r for each one. Yeah, we're thinking of you, &dSuper Chests&r and &dTanks&r.\n\nIf you ever find yourself needing this little tool, don't hesitate to use it.", + "quests.tfg_tips.portable_scanner.subtitle": "For the nosiest GregTech players", + "quests.tfg_tips.portable_scanner.desc.1": "The &aPortable Scanner&r, or &aTricorder&r, is GTCEu's debug tool.\n\nUsing it will show you a block's details, the details of the energy network, its current status and contents, and its impact on performance.\n\nIt'll also display a percentage of fluid remaining in the fluid vein for the &3Fluid Rigs&r.", + "quests.tfg_tips.portable_scanner.desc.2": "&l&3Lore:&r&o This little useful device comes from GregTech 5. It was extremely useful in the early days, because very little information (basically nothing) was given by GUIs or WAILA.", + "quests.tfg_tips.duct_tape.subtitle": "If you can't fix it with this, use more of it!", + "quests.tfg_tips.duct_tape.desc": "You may have realized that most &eMultiblocks&r require a &6Maintenance Hatch&r. Until &6HV&r, where you can get an &aAutomatic Maintenance Hatch&r, you can use this item to fix the hatch without needing to use all of your maintenance tools.\n\nIt can be really useful if you don't want to invest in an &aAuto Maintenance Hatch&r yet, or if you're simply &cnot there yet&r.", + "quests.tfg_tips.gt_filters.title": "Filters", + "quests.tfg_tips.gt_filters.desc": "With &5GregTech&r, you get access to various &6filters&r that help you ease into &aautomation&r. All of them are compatible with different &dCovers&r, which you'll learn more about during the &7LV&r Chapter.\n\nHere, we're introducing two more specific filters that you might find &bhandy&r in certain situations.\n\nTo use a filter, simply apply it as a &dCover&r on any &5GT Machine&r or &6pipe&r.", + "quests.tfg_tips.smart_item_filter.subtitle": "Knock, knock - who's that? It's MENSA!", + "quests.tfg_tips.smart_item_filter.desc.1": "In this quest, we'll bestow upon you &5cursed wisdom&r... the ability to easily automate the Electrolyzer.\n\nThe &9Smart Item Filter&r is a filter that recognises Recipe Maps. When placed on the side of a machine, you can set it to \"&3Electrolyzer&r\" to allow insertion of electrolyzable items specifically. You heard that right - no need to filter manually!\n\nOh, and it only gets &abetter&r. If you combine this bad boy with a &aRobot Arm&r, it'll only supply the &6exact amount&r of items required for a successful recipe to the machine.", + "quests.tfg_tips.smart_item_filter.desc.2": "Place the &aRobot Arm&r on your Electrolyzer, open its GUI, then place the &9Smart Filter&r inside. Ensure that the Smart Filter is set to Electrolyzer.\n\nNext, configure it to &d&lImport&r and &d&lSupply Exact&r. Finally, attach any inventory &7(a chest will do)&r onto the side where you placed the &aRobot Arm&r. Ta-dah! You've figured out how to handle &6all&r Electrolyzer recipes!\n\nWhat about the output of the &3Electrolyzer&r? You may want to route the Fluids to several Tanks - or even &3Super Tanks&r if you've gotten that far. We highly recommend that you avoid any methods involving voiding Fluids.&7.&8. except for Water for obvious reasons.", + "quests.tfg_tips.smart_item_filter.desc.3": "&9Note:&r The Robot Arm has to facilitate the item transfer for its filtering functionality to work! Inserting directly into the machine &7(for instance, pushing with a Hopper!)&r will ignore the Robot Arm's &dSupply Exact&r setting.", + "quests.tfg_tips.hazard_materials.title": "Hazardous Materials", + "quests.tfg_tips.hazard_materials.subtitle": "Choking Hazard, Ages 3+", + "quests.tfg_tips.hazard_materials.desc": "With the new version of &5Gregtech&r, a &chazard system&r has been introduced. By holding &dShift&r while hovering over &cHazardous Materials&r, you can see how they might affect you.\n\nWe strongly advise using proper &6protective equipment&r to keep your &corgans intact&r.", + "quests.tfg_tips.face_mask.desc": "The &6Face Mask&r will protect you from &cinhaling dangerous dust&r. It’s quite &aeasy to craft&r and should prevent issues when working with &5arsenic&r.", + "quests.tfg_tips.rubber_gloves.desc": "The &6Gloves&r will obviously protect you from &cskin contact hazards&r. You have two ways to make them: a &7longer and more involved path&r through &2TerrafirmaCraft&r, or a much &aeasier method&r using the &6High Pressure Steam Alloy Smelter&r.", + "quests.tfg_tips.hazmat.desc": "The &6Hazardous Materials Suit&r is the best way to protect yourself from &cany kind of harm&r. You’ll be able to craft it once you reach &bMV&r, and &ayou should definitely take the time to do so&r.", + "quests.tfg_tips.armor.title": "GregTech Armor", + "quests.tfg_tips.armor.desc": "With &5GregTech&r comes its own line of armor. Sure, it was cool to wear &7metal plates&r, but now that you're an &bindustrial maniac&r, maybe it's time to check out some &atechnological armor&r.\n\n&5GregTech&r provides two models. The first one becomes available around &6HV&r and offers better protection than anything you've worn before. It's equipped with &estrong insulation&r to withstand Earth's harsh climate, and it may even be upgraded with a &dJetpack&r.\n\nThe second model won't be available until much later — around &1IV&r and &dLuV&r. This one will allow you to &9breathe in space&r using &3oxygen&r.", "quests.tfg_tips.terrafirmacraft.title": "TerraFirmaCraft Addons", "quests.tfg_tips.terrafirmacraft.subtitle": "The other two thirds of the modpack's name", "quests.tfg_tips.terrafirmacraft.desc": "&3TerraFirmaCraft&r is one of the main mods in &2TerraFirmaGreg.&r This branch mostly focuses on some of its survival features and other &dAdd-Ons&r the modpack has, such as &4Aged Alcohol&r and &bCanes.&r", diff --git a/kubejs/assets/tfg/lang/fr_fr.json b/kubejs/assets/tfg/lang/fr_fr.json index 5c9304fd3..b24b4f7cb 100644 --- a/kubejs/assets/tfg/lang/fr_fr.json +++ b/kubejs/assets/tfg/lang/fr_fr.json @@ -476,6 +476,8 @@ "block.tfg.zpm_gas_pressurizer": "§cPressuriseur de gaz d'Élite III§r", "block.tfg.uv_gas_pressurizer": "§3Pressuriseur de gaz Ultime§r", "block.tfg.fluid.semiheavy_ammoniacal_water": "Eau Ammoniacal Semilourde", + "block.tfg.fluid.sulfur_fumes": "Vapeurs Souffrées", + "block.tfg.fluid.geyser_slurry": "Boue Surchauffée", "block.tfg.grass.mars_dirt": "Terre Martienne", "block.tfg.grass.mars_clay_dirt": "Terre Martienne Argileuse", "block.tfg.grass.mars_farmland": "Terre Martienne Labourée", @@ -638,13 +640,11 @@ "block.tfg.growth_monitor": "Moniteur de Croissance", "block.tfg.sample_rack": "Plateau d'Échantillons", "block.tfg.casings.machine_casing_sterilizing_pipes": "Tuyaux Stérilisants", - "fluid.tfg.nether_slurry": "Boue du Nether", - "fluid.tfg.enriched_nether_slurry": "Boue du Nether Enrichie", - "fluid.tfg.ender_slurry": "Boue de l'End", - "fluid.tfg.enriched_ender_slurry": "Boue de l'End Enrichie", + "fluid.tfg.heavy_ammoniacal_water": "Heavy Ammoniacal Water", "fluid.tfg.semiheavy_ammoniacal_water": "Eau Ammoniacal Semi-Lourde", "fluid.tfg.sulfur_fumes": "Vapeurs Souffrées", - "fluid.tfg.super_heated_slurry": "Boue Surchauffée", + "fluid.tfg.geyser_slurry": "Boue Surchauffée", + "fluid.tfg.cryogenized_fluix": "Cryogenized Fluix", "item.tfg.antipoison_pill": "Pillule Anti-poison", "item.tfg.haste_pill": "Pillule de Célérité", "item.tfg.night_vision_pill": "Pillule de Vision Nocturne", @@ -838,7 +838,7 @@ "item.tfg.marker.mercury_orbit": "Orbite de Mercure", "item.tfg.railgun_ammo_shell": "Munition de Cannon Électro-magnétique", "item.tfg.sulfur_fumes_bucket": "Sceau de Fumées Sulfureuses", - "item.tfg.super_heated_slurry_bucket": "Sceau de Boue Surchauffé", + "item.tfg.geyser_slurry_bucket": "Sceau de Boue Surchauffé", "item.tfg.cryogenized_fluix_bucket": "Sceau de Fluix Cryogène", "item.tfg.fluix_bucket": "Sceau de Fluix Liquide", "item.tfg.latex_bucket": "Sceau de Latex", diff --git a/kubejs/assets/tfg/lang/ja_jp.json b/kubejs/assets/tfg/lang/ja_jp.json index 98b7d6a48..316dabe38 100644 --- a/kubejs/assets/tfg/lang/ja_jp.json +++ b/kubejs/assets/tfg/lang/ja_jp.json @@ -493,6 +493,8 @@ "block.tfg.zpm_gas_pressurizer": "§c精鋭型ガス圧縮機III§r", "block.tfg.uv_gas_pressurizer": "§3究極型ガス圧縮機§r", "block.tfg.fluid.semiheavy_ammoniacal_water": "アンモニア交じりの半重水", + "block.tfg.fluid.sulfur_fumes": "Dense Sulfuric Fumes", + "block.tfg.fluid.geyser_slurry": "Super Heated Slurry", "block.tfg.grass.mars_dirt": "火星の土", "block.tfg.grass.mars_clay_dirt": "火星の粘土", "block.tfg.grass.mars_farmland": "火星の耕地", @@ -661,14 +663,10 @@ "block.tfg.impure_moderate_core": "不純なモデレートコア", "block.tfg.moderate_core_frame": "モデレートコアフレーム", "block.tfg.impure_moderate_core_frame": "不純なモデレートコアフレーム", - "fluid.tfg.nether_slurry": "ネザー泥漿", - "fluid.tfg.enriched_nether_slurry": "Enriched Nether Slurry", - "fluid.tfg.ender_slurry": "エンダー泥漿", - "fluid.tfg.enriched_ender_slurry": "Enriched Ender Slurry", "fluid.tfg.semiheavy_ammoniacal_water": "アンモニア交じりの半重水", "fluid.tfg.heavy_ammoniacal_water": "アンモニア交じりの重水", "fluid.tfg.sulfur_fumes": "Sulfur Fumes", - "fluid.tfg.super_heated_slurry": "Super Heated Slurry", + "fluid.tfg.geyser_slurry": "Super Heated Slurry", "fluid.tfg.cryogenized_fluix": "超低温液化フルーシュ", "item.tfg.antipoison_pill": "解毒の丸薬", "item.tfg.haste_pill": "採掘の丸薬", @@ -904,7 +902,7 @@ "item.tfg.marker.glacio_orbit": "Europa Orbit", "item.tfg.railgun_ammo_shell": "レールガンの弾", "item.tfg.sulfur_fumes_bucket": "Sulfur Fumes Bucket", - "item.tfg.super_heated_slurry_bucket": "Super Heated Slurry Bucket", + "item.tfg.geyser_slurry_bucket": "Super Heated Slurry Bucket", "item.tfg.cryogenized_fluix_bucket": "超低温液化フルーシュ バケツ", "item.tfg.fluix_bucket": "液化フルーシュ バケツ", "item.tfg.latex_bucket": "ラテックス入りのバケツ", diff --git a/kubejs/assets/tfg/lang/pt_br.json b/kubejs/assets/tfg/lang/pt_br.json index a8797019a..1a0a0f1b9 100644 --- a/kubejs/assets/tfg/lang/pt_br.json +++ b/kubejs/assets/tfg/lang/pt_br.json @@ -248,6 +248,8 @@ "block.tfg.zpm_gas_pressurizer": "§cPressurizador de Gás Elite III§r", "block.tfg.uv_gas_pressurizer": "§3Pressurizador de Gás Supremo§r", "block.tfg.fluid.semiheavy_ammoniacal_water": "Água Amoniacal Semipesada", + "block.tfg.fluid.sulfur_fumes": "Fumos de Enxofre", + "block.tfg.fluid.geyser_slurry": "Lama Superaquecida", "block.tfg.grass.mars_dirt": "Terra Marciana", "block.tfg.grass.mars_clay_dirt": "Terra de Argila Marciana", "block.tfg.grass.mars_farmland": "Terra Arada Marciana", @@ -392,14 +394,11 @@ "block.tfg.large_nest_box": "Ninho Carmesim Grande", "tfg.block_entity.large_nest_box": "Caixa-ninho Grande", "block.tfg.large_nest_box_warped": "Ninho Distorcido Grande", - "fluid.tfg.nether_slurry": "Lama do Nether", - "fluid.tfg.enriched_nether_slurry": "Lama do Nether Enriquecida", - "fluid.tfg.ender_slurry": "Lama do Ender", - "fluid.tfg.enriched_ender_slurry": "Lama do Ender Enriquecida", - "fluid.tfg.semiheavy_ammoniacal_water": "Água Amoniacal Semipesada", + "fluid.tfg.heavy_ammoniacal_water": "Heavy Ammoniacal Water", "fluid.tfg.heavy_water": "Água Pesada", "fluid.tfg.sulfur_fumes": "Fumos de Enxofre", - "fluid.tfg.super_heated_slurry": "Lama Superaquecida", + "fluid.tfg.geyser_slurry": "Lama Superaquecida", + "fluid.tfg.cryogenized_fluix": "Cryogenized Fluix", "item.tfg.antipoison_pill": "Pílula Antiveneno", "item.tfg.haste_pill": "Pílula de Pressa", "item.tfg.night_vision_pill": "Pílula de Visão Noturna", @@ -621,7 +620,7 @@ "item.tfg.marker.mercury_orbit": "Órbita Mercuriana", "item.tfg.railgun_ammo_shell": "Cartucho de Arma de Raios", "item.tfg.sulfur_fumes_bucket": "Balde de Fumos de Enxofre", - "item.tfg.super_heated_slurry_bucket": "Balde de Lama Superaquecida", + "item.tfg.geyser_slurry_bucket": "Balde de Lama Superaquecida", "item.tfg.cryogenized_fluix_bucket": "Balde de Fluix Criogenizado", "item.tfg.fluix_bucket": "Balde de Fluix Líquido", "item.tfg.latex_bucket": "Balde de Látex", diff --git a/kubejs/assets/tfg/lang/ru_ru.json b/kubejs/assets/tfg/lang/ru_ru.json index 7c2118662..78cd12896 100644 --- a/kubejs/assets/tfg/lang/ru_ru.json +++ b/kubejs/assets/tfg/lang/ru_ru.json @@ -493,6 +493,8 @@ "block.tfg.zpm_gas_pressurizer": "§cElite Gas Pressurizer III§r", "block.tfg.uv_gas_pressurizer": "§3Ultimate Gas Pressurizer§r", "block.tfg.fluid.semiheavy_ammoniacal_water": "Полутяжёлая аммиачная вода", + "block.tfg.fluid.sulfur_fumes": "Пары серы", + "block.tfg.fluid.geyser_slurry": "Метастабильный шлам", "block.tfg.grass.mars_dirt": "Марсианская земля", "block.tfg.grass.mars_clay_dirt": "Марсианская земля с глиной", "block.tfg.grass.mars_farmland": "Марсианская пашня", @@ -657,13 +659,11 @@ "block.tfg.growth_monitor": "Growth Monitor", "block.tfg.sample_rack": "Стойка для образцов", "block.tfg.casings.machine_casing_sterilizing_pipes": "Стерилизующие трубы", - "fluid.tfg.nether_slurry": "Шлам незера", - "fluid.tfg.enriched_nether_slurry": "Обогащённый шлам незера", - "fluid.tfg.ender_slurry": "Шлам энда", - "fluid.tfg.enriched_ender_slurry": "Обогащённый шлам энда", + "fluid.tfg.heavy_ammoniacal_water": "Heavy Ammoniacal Water", "fluid.tfg.semiheavy_ammoniacal_water": "Полутяжёлая аммиачная вода", "fluid.tfg.sulfur_fumes": "Пары серы", - "fluid.tfg.super_heated_slurry": "Метастабильный шлам", + "fluid.tfg.geyser_slurry": "Метастабильный шлам", + "fluid.tfg.cryogenized_fluix": "Cryogenized Fluix", "item.tfg.antipoison_pill": "Пилюля противоядия", "item.tfg.haste_pill": "Пилюля спешки", "item.tfg.night_vision_pill": "Пилюля ночного зрения", @@ -874,7 +874,7 @@ "item.tfg.marker.glacio_orbit": "Орбита Европы", "item.tfg.railgun_ammo_shell": "Гильза снаряда рельсотрона", "item.tfg.sulfur_fumes_bucket": "Ведро (Пары серы)", - "item.tfg.super_heated_slurry_bucket": "Super Heated Slurry Bucket", + "item.tfg.geyser_slurry_bucket": "Super Heated Slurry Bucket", "item.tfg.cryogenized_fluix_bucket": "Ведро (Криогенный флюис)", "item.tfg.fluix_bucket": "Ведро (Флюис)", "item.tfg.latex_bucket": "Ведро (Латекс)", diff --git a/kubejs/assets/tfg/lang/uk_ua.json b/kubejs/assets/tfg/lang/uk_ua.json index 248b8b4b0..eb51c104e 100644 --- a/kubejs/assets/tfg/lang/uk_ua.json +++ b/kubejs/assets/tfg/lang/uk_ua.json @@ -493,6 +493,8 @@ "block.tfg.zpm_gas_pressurizer": "§dЕлітний Газовий Пресуризатор III§r", "block.tfg.uv_gas_pressurizer": "§3Ультимативний Газовий Пресуризатор§r", "block.tfg.fluid.semiheavy_ammoniacal_water": "Термохімічно збагачена амоніачна напівважка вода", + "block.tfg.fluid.sulfur_fumes": "Сірчані випари", + "block.tfg.fluid.geyser_slurry": "Супернагрітий шлам", "block.tfg.grass.mars_dirt": "Марсіанський ґрунт", "block.tfg.grass.mars_clay_dirt": "Марсіанський Глиняний Ґрунт", "block.tfg.grass.mars_farmland": "Марсіанське поле", @@ -661,14 +663,10 @@ "block.tfg.impure_moderate_core": "Нечисте помірне ядро", "block.tfg.moderate_core_frame": "Каркас помірного ядра", "block.tfg.impure_moderate_core_frame": "Каркас нечистого помірного ядра", - "fluid.tfg.nether_slurry": "Незерський шлам", - "fluid.tfg.enriched_nether_slurry": "Збагачений незерський шлам", - "fluid.tfg.ender_slurry": "Ендерський шлам", - "fluid.tfg.enriched_ender_slurry": "Збагачений ендерський шлам", "fluid.tfg.heavy_ammoniacal_water": "Важка аміачна вода", "fluid.tfg.semiheavy_ammoniacal_water": "Термохімічно збагачена амоніачна напівважка вода", "fluid.tfg.sulfur_fumes": "Сірчані випари", - "fluid.tfg.super_heated_slurry": "Супернагрітий шлам", + "fluid.tfg.geyser_slurry": "Супернагрітий шлам", "fluid.tfg.cryogenized_fluix": "Кріогенізований флюїкс", "item.tfg.antipoison_pill": "Антиотруйна Пілюля", "item.tfg.haste_pill": "Пілюля Прискорення", @@ -904,7 +902,7 @@ "item.tfg.marker.glacio_orbit": "Орбіта Європи", "item.tfg.railgun_ammo_shell": "Снаряд для рейкотрона", "item.tfg.sulfur_fumes_bucket": "Відро з сірчаними випарами", - "item.tfg.super_heated_slurry_bucket": "Відро з перегрітою пульпою", + "item.tfg.geyser_slurry_bucket": "Відро з перегрітою пульпою", "item.tfg.cryogenized_fluix_bucket": "Відро кріофлюїксу", "item.tfg.fluix_bucket": "Відро з рідким флюїксом", "item.tfg.latex_bucket": "Відро латексу", diff --git a/kubejs/assets/tfg/lang/zh_cn.json b/kubejs/assets/tfg/lang/zh_cn.json index 3a30a7544..2e2b1be15 100644 --- a/kubejs/assets/tfg/lang/zh_cn.json +++ b/kubejs/assets/tfg/lang/zh_cn.json @@ -495,6 +495,8 @@ "block.tfg.zpm_gas_pressurizer": "§c精英气体加压器 III§r", "block.tfg.uv_gas_pressurizer": "§3终极气体加压器§r", "block.tfg.fluid.semiheavy_ammoniacal_water": "半重氨水", + "block.tfg.fluid.sulfur_fumes": "硫磺烟气", + "block.tfg.fluid.geyser_slurry": "超高温浆液", "block.tfg.grass.mars_dirt": "火星土壤", "block.tfg.grass.mars_clay_dirt": "火星黏土质土壤", "block.tfg.grass.mars_farmland": "火星农田", @@ -665,14 +667,10 @@ "block.tfg.impure_moderate_core": "不纯慢化堆芯", "block.tfg.moderate_core_frame": "慢化堆芯框架", "block.tfg.impure_moderate_core_frame": "不纯慢化堆芯框架", - "fluid.tfg.nether_slurry": "下界浆液", - "fluid.tfg.enriched_nether_slurry": "富集下界浆液", - "fluid.tfg.ender_slurry": "末地浆液", - "fluid.tfg.enriched_ender_slurry": "富集末地浆液", "fluid.tfg.heavy_ammoniacal_water": "重氨水", "fluid.tfg.semiheavy_ammoniacal_water": "半重氨水", "fluid.tfg.sulfur_fumes": "硫磺烟气", - "fluid.tfg.super_heated_slurry": "超高温浆液", + "fluid.tfg.geyser_slurry": "超高温浆液", "fluid.tfg.cryogenized_fluix": "低温福鲁伊克斯", "quests.naming-1": "t - Title", "quests.naming-2": "st - Subtitle", @@ -1002,7 +1000,7 @@ "item.tfg.marker.glacio_orbit": "木卫二轨道", "item.tfg.railgun_ammo_shell": "轨道炮弹壳", "item.tfg.sulfur_fumes_bucket": "硫磺烟气桶", - "item.tfg.super_heated_slurry_bucket": "超高温浆液桶", + "item.tfg.geyser_slurry_bucket": "超高温浆液桶", "item.tfg.cryogenized_fluix_bucket": "低温福鲁伊克斯桶", "item.tfg.fluix_bucket": "液态福鲁伊克斯桶", "item.tfg.latex_bucket": "乳胶桶", From 2f24f08cdb3f4ab40aed0180c61829878eb2b03d Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 8 Dec 2025 20:58:28 +0000 Subject: [PATCH 08/25] added the smart filter quest over here too --- config/ftbquests/quests/chapters/mv__medium_voltage.snbt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt index 49f0aa477..a4132aec7 100644 --- a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt +++ b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt @@ -6,7 +6,12 @@ icon: "tfg:mv_universal_circuit" id: "43E779CEEB25D55B" order_index: 1 - quest_links: [ ] + quest_links: [{ + id: "4EEC4E3BE1B3D3B1" + linked_quest: "222295CD03AF00DC" + x: -1.5d + y: -5.5d + }] quests: [ { dependencies: ["22E462070F8B027A"] From 0ae9ad4cf400d0b4f3ec75a6e11e0fdeb754a12a Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 8 Dec 2025 21:18:25 +0000 Subject: [PATCH 09/25] fix https://github.com/TerraFirmaGreg-Team/Modpack-Modern/issues/2348 --- .../quests/chapters/tips__tools.snbt | 320 ++++++++---------- kubejs/assets/tfg/lang/en_us.json | 6 +- 2 files changed, 140 insertions(+), 186 deletions(-) diff --git a/config/ftbquests/quests/chapters/tips__tools.snbt b/config/ftbquests/quests/chapters/tips__tools.snbt index 33f0a8573..21eeea39e 100644 --- a/config/ftbquests/quests/chapters/tips__tools.snbt +++ b/config/ftbquests/quests/chapters/tips__tools.snbt @@ -557,33 +557,28 @@ y: 2.0357142857142847d } { - dependencies: ["74AE7DB845B88CF3"] + dependencies: [ + "74AE7DB845B88CF3" + "0EFEE489906256AA" + ] + dependency_requirement: "one_completed" description: [ - "In this quest, we'll bestow upon you &5cursed wisdom&r... the ability to easily automate the Electrolyzer." - "" - "The &9Smart Item Filter&r is a filter that recognises Recipe Maps. When placed on the side of a machine, you can set it to \"&3Electrolyzer&r\" to allow insertion of electrolyzable items specifically. You heard that right - no need to filter manually!" - "" - "Oh, and it only gets &abetter&r. If you combine this bad boy with a &aRobot Arm&r, it'll only supply the &6exact amount&r of items required for a successful recipe to the machine." + "{quests.tfg_tips.smart_item_filter.desc.1}" "{@pagebreak}" - "Place the &aRobot Arm&r on your Electrolyzer, open its GUI, then place the &9Smart Filter&r inside. Ensure that the Smart Filter is set to Electrolyzer." - "" - "Next, configure it to &d&lImport&r and &d&lSupply Exact&r. Finally, attach any inventory &7(a chest will do)&r onto the side where you placed the &aRobot Arm&r. Ta-dah! You've figured out how to handle &6all&r Electrolyzer recipes!" - "" - "What about the output of the &3Electrolyzer&r? You may want to route the Fluids to several Tanks - or even &3Super Tanks&r if you've gotten that far. We highly recommend that you avoid any methods involving voiding Fluids.&7.&8. except for Water for obvious reasons." + "{quests.tfg_tips.smart_item_filter.desc.2}" "{@pagebreak}" - "&9Note:&r The Robot Arm has to facilitate the item transfer for its filtering functionality to work! Inserting directly into the machine &7(for instance, pushing with a Hopper!)&r will ignore the Robot Arm's &dSupply Exact&r setting." + "{quests.tfg_tips.smart_item_filter.desc.3}" ] icon: "gtceu:item_smart_filter" id: "222295CD03AF00DC" shape: "square" size: 1.0d - subtitle: "Knock, knock - who's that? It's MENSA!" + subtitle: "{quests.tfg_tips.smart_item_filter.subtitle}" tasks: [{ id: "11EC9A6D9E2C4B7E" item: "gtceu:item_smart_filter" type: "item" }] - title: "200IQ" x: 10.0d y: 8.0d } @@ -621,18 +616,12 @@ } { dependencies: ["02FDECC931B5E8EF"] - description: [ - "In theory, Crates are flat upgrades to Chests. A single block space that stores more items - what more could you ask for?" - "" - "Unfortunately, there's a small downside - Crates do not support item movement shortcuts well. We plan on fixing this in the long-term." - "" - "Where they shine however is the fact that they &6accept Covers&r, making them perfect candidates for buffers in automation." - ] + description: ["{quests.tfg_tips.crates.desc}"] icon: "gtceu:bronze_crate" id: "6702D52922D85C0D" shape: "square" size: 1.0d - subtitle: "Earlygame buffering" + subtitle: "{quests.tfg_tips.crates.subtitle}" tasks: [{ id: "2F8D9ACDF8EB5B8D" item: { @@ -644,38 +633,37 @@ } type: "item" }] - title: "GregTech Storage" + title: "{quests.tfg_tips.crates.title}" x: 7.0d y: 6.0d } { dependencies: ["6702D52922D85C0D"] - description: ["With that tape you wil be able to move around the crate. The main advantage? You can put anything in a crate, weight won't be an issue here."] + description: ["{quests.tfg_tips.tape.desc}"] icon: "gtceu:basic_tape" id: "36B64597F76625ED" shape: "square" size: 1.0d - subtitle: "Moving stuff around" + subtitle: "{quests.tfg_tips.tape.subtitle}" tasks: [{ id: "1257FC299E957859" item: "gtceu:basic_tape" type: "item" }] - title: "Tape for Crate" + title: "{quests.tfg_tips.tape.title}" x: 7.0d y: 7.0d } { dependencies: ["02FDECC931B5E8EF"] - description: ["With &5GregTech&r, you get access to various &6filters&r that help you ease into &aautomation&r. All of them are compatible with different &dCovers&r, which you'll learn more about during the &7LV&r Chapter.\\n\\nHere, we're introducing two more specific filters that you might find &bhandy&r in certain situations.\\n\\nTo use a filter, simply apply it as a &dCover&r on any &5GT Machine&r or &6pipe&r."] + description: ["{quests.tfg_tips.gt_filters.desc}"] icon: "gtceu:item_filter" id: "74AE7DB845B88CF3" - subtitle: "filters" tasks: [{ id: "268110D7B7999A7B" - title: "Filters" type: "checkmark" }] + title: "{quests.tfg_tips.gt_filters.title}" x: 9.0d y: 8.5d } @@ -690,8 +678,8 @@ type: "item" }] title: "{quests.tfg_tips.nano_saber.title}" - x: 12.5d - y: 10.0d + x: 11.5d + y: 11.0d } { dependencies: ["2D2CB8104E40E808"] @@ -710,12 +698,12 @@ type: "item" }] title: "{quests.tfg_tips.magnets.title}" - x: 12.5d + x: 11.5d y: 12.0d } { dependencies: ["57FE828BAA8F6276"] - description: ["The &6Face Mask&r will protect you from &cinhaling dangerous dust&r. It’s quite &aeasy to craft&r and should prevent issues when working with &5arsenic&r."] + description: ["{quests.tfg_tips.face_mask.desc}"] id: "361AC06D62D9BCCF" tasks: [{ id: "7AC3F8AF754C76E2" @@ -728,105 +716,73 @@ } type: "item" }] - x: 9.5d - y: 15.0d - } - { - dependencies: ["7516BF9C12015DF3"] - id: "103025F1C35CF578" - tasks: [{ - id: "05DA89E5871EE93D" - item: { - Count: 1 - id: "gtceu:nanomuscle_helmet" - tag: { } - } - type: "item" - }] - x: 4.5d - y: 13.0d + x: 8.5d + y: 14.0d } { dependencies: ["7516BF9C12015DF3"] id: "38FF003C9349C0F2" - tasks: [{ - id: "78123F2C1E8B08F5" - item: "gtceu:nanomuscle_chestplate" - type: "item" - }] - x: 4.5d - y: 14.0d - } - { - dependencies: ["7516BF9C12015DF3"] - id: "4497F39E06A14406" - tasks: [{ - id: "430BB68AD2F334C3" - item: "gtceu:nanomuscle_leggings" - type: "item" - }] - x: 4.5d - y: 15.0d - } - { - dependencies: ["7516BF9C12015DF3"] - id: "61E1244FF797F11F" - tasks: [{ - id: "1C5E79A87E343C64" - item: "gtceu:nanomuscle_boots" - type: "item" - }] - x: 4.5d - y: 16.0d - } - { - dependencies: ["7516BF9C12015DF3"] - id: "20565B5D56786A6E" - tasks: [{ - id: "51DBD71B96BB2673" - item: { - Count: 1 - id: "gtceu:quarktech_helmet" - tag: { } + tasks: [ + { + id: "7C3E295B35639EC9" + item: { + Count: 1 + id: "gtceu:nanomuscle_helmet" + tag: { } + } + type: "item" } - type: "item" - }] - x: 6.5d - y: 13.0d + { + id: "5A6F7D3FBD64E383" + item: "gtceu:nanomuscle_chestplate" + type: "item" + } + { + id: "71FC38DE4929E578" + item: "gtceu:nanomuscle_leggings" + type: "item" + } + { + id: "275CF158B69FF055" + item: "gtceu:nanomuscle_boots" + type: "item" + } + ] + x: 5.0d + y: 14.0d } { dependencies: ["7516BF9C12015DF3"] id: "4D5B75F5270CCBD3" - tasks: [{ - id: "6624FAF8B9BBD4CA" - item: "gtceu:quarktech_chestplate" - type: "item" - }] - x: 6.5d + tasks: [ + { + id: "4DFF8E5F32E7AFC3" + item: { + Count: 1 + id: "gtceu:quarktech_helmet" + tag: { } + } + type: "item" + } + { + id: "3AA49E7CEA246A9B" + item: "gtceu:quarktech_chestplate" + type: "item" + } + { + id: "573F87C0CFC826DA" + item: "gtceu:quarktech_leggings" + type: "item" + } + { + id: "0452DFF0948B9B3E" + item: "gtceu:quarktech_boots" + type: "item" + } + ] + x: 6.0d y: 14.0d } - { - dependencies: ["7516BF9C12015DF3"] - id: "31CE775295A1BBF1" - tasks: [{ - id: "6EAB7217D35DDF42" - item: "gtceu:quarktech_leggings" - type: "item" - }] - x: 6.5d - y: 15.0d - } - { - dependencies: ["7516BF9C12015DF3"] - id: "2613FA0502BB5F12" - tasks: [{ - id: "6A740FDB1D788187" - item: "gtceu:quarktech_boots" - type: "item" - }] - x: 6.5d - y: 16.0d - } { dependencies: ["4D5B75F5270CCBD3"] id: "035B0FDD90E51C0C" @@ -839,32 +795,16 @@ } type: "item" }] - x: 7.5d - y: 14.0d - } - { - dependencies: ["2D2CB8104E40E808"] - description: ["{quests.tfg_tips.gt_tools.desc}"] - id: "2CA86664C6E0C888" - subtitle: "{quests.tfg_tips.gt_tools.subtitle}" - tasks: [{ - id: "153D23778A26C74F" - item: { - Count: 1 - id: "ftbfiltersystem:smart_filter" - tag: { - "ftbfiltersystem:filter": "or(item(gtceu:lv_power_unit)item(gtceu:mv_power_unit)item(gtceu:hv_power_unit)item(gtceu:ev_power_unit)item(gtceu:iv_power_unit))" - } - } - type: "item" - }] - title: "{quests.tfg_tips.gt_tools.title}" - x: 12.5d - y: 11.0d + x: 6.0d + y: 15.0d } { dependencies: ["02FDECC931B5E8EF"] - description: ["As with any good tech mod, &5GregTech&r comes with a wide variety of &6tools&r you can use. To operate them, you'll need to &acharge them with energy&r — and there are several ways to do that: place the tool in a &6Battery Buffer&r, in an &denergy slot&r of a machine, or even better, use a &eTurbo Charger&r.\\n\\nJust remember: you can only charge an item using a power source of &7equal&r or &ahigher tier&r. &cLower-tier sources&r won’t work on higher-tier tools — but don’t worry, &cnothing should explode&r. Probably."] + description: [ + "{quests.tfg_tips.gt_power_tools.desc.1}" + "{@pagebreak}" + "{quests.tfg_tips.gt_power_tools.desc.2}" + ] icon: { Count: 1 id: "gtceu:iv_copper_drill" @@ -892,6 +832,7 @@ } } id: "2D2CB8104E40E808" + subtitle: "{quests.tfg_tips.gt_power_tools.subtitle}" tasks: [ { id: "5DA224C235E227E3" @@ -905,12 +846,13 @@ type: "item" } ] - x: 11.5d - y: 11.0d + title: "{quests.tfg_tips.gt_power_tools.title}" + x: 10.5d + y: 11.5d } { dependencies: ["02FDECC931B5E8EF"] - description: ["With &5GregTech&r comes its own line of armor. Sure, it was cool to wear &7metal plates&r, but now that you're an &bindustrial maniac&r, maybe it's time to check out some &atechnological armor&r.\\n\\n&5GregTech&r provides two models. The first one becomes available around &6HV&r and offers better protection than anything you've worn before. It's equipped with &estrong insulation&r to withstand Earth's harsh climate, and it may even be upgraded with a &dJetpack&r.\\n\\nThe second model won't be available until much later — around &1IV&r and &dLuV&r. This one will allow you to &9breathe in space&r using &3oxygen&r."] + description: ["{quests.tfg_tips.armor.desc}"] icon: "gtceu:advanced_integrated_circuit" id: "7516BF9C12015DF3" tasks: [{ @@ -918,25 +860,28 @@ title: "Armor" type: "checkmark" }] + title: "{quests.tfg_tips.armor.title}" x: 5.5d y: 13.0d } { dependencies: ["02FDECC931B5E8EF"] - description: ["With the new version of &5Gregtech&r, a &chazard system&r has been introduced. By holding &dShift&r while hovering over &cHazardous Materials&r, you can see how they might affect you.\\n\\nWe strongly advise using proper &6protective equipment&r to keep your &corgans intact&r."] - icon: "gtceu:generic_hazard_sign_block" + description: ["{quests.tfg_tips.hazard_materials.desc}"] + icon: "createdeco:decal_warning" id: "57FE828BAA8F6276" + subtitle: "{quests.tfg_tips.hazard_materials.subtitle}" tasks: [{ id: "2BB4EAF68B305732" title: "Hazard" type: "checkmark" }] + title: "{quests.tfg_tips.hazard_materials.title}" x: 9.5d y: 14.0d } { dependencies: ["57FE828BAA8F6276"] - description: ["The &6Gloves&r will obviously protect you from &cskin contact hazards&r. You have two ways to make them: a &7longer and more involved path&r through &2TerrafirmaCraft&r, or a much &aeasier method&r using the &6High Pressure Steam Alloy Smelter&r."] + description: ["{quests.tfg_tips.rubber_gloves.desc}"] id: "3DB4AD491EF28CBE" tasks: [{ id: "32F0E30B11FE80E4" @@ -954,7 +899,7 @@ } { dependencies: ["57FE828BAA8F6276"] - description: ["The &6Hazardous Materials Suit&r is the best way to protect yourself from &cany kind of harm&r. You’ll be able to craft it once you reach &bMV&r, and &ayou should definitely take the time to do so&r."] + description: ["{quests.tfg_tips.hazmat.desc}"] id: "784A0743B257EAEB" tasks: [ { @@ -1002,26 +947,17 @@ type: "item" } ] - x: 10.5d + x: 9.5d y: 15.0d } { dependencies: ["02FDECC931B5E8EF"] - description: [ - "&3Long-Distance Fluid Pipes&r can be used to send fluids across great distances. Place one endpoint at each end, and connect them with pipeline blocks." - "" - "These pipes instantly transfer from the input side to the output side." - "" - "They also have a minimum distance between pipe endpoints, so you can't use these for short-range operations." - "{@pagebreak}" - "These pipes have a reputation of being &4buggy&r to set up. If they don't seem to work at first, try rotating the endpoints with a &eWrench&r." - ] + description: ["{quests.tfg_tips.long_distance_fluids.desc}"] icon: "gtceu:long_distance_fluid_pipeline_endpoint" id: "0B1AA0D4CEBD06A8" - optional: true shape: "square" size: 1.0d - subtitle: "Wondering how to move that oil around?" + subtitle: "{quests.tfg_tips.long_distance_fluids.subtitle}" tasks: [ { count: 2L @@ -1035,24 +971,18 @@ type: "item" } ] - title: "Long-Distance Pipeline" + title: "{quests.tfg_tips.long_distance_fluids.title}" x: 6.0d y: 6.0d } { dependencies: ["02FDECC931B5E8EF"] - description: [ - "&3Long-Distance Item Pipes&r can be used to send items across great distances. Place one endpoint at each end, and connect them with pipeline blocks." - "" - "These pipes instantly transfer from the input side to the output side." - "" - "They also have a minimum distance between pipe endpoints, so you can't use these for short-range operations." - ] + description: ["{quests.tfg_tips.long_distance_items.desc}"] icon: "gtceu:long_distance_item_pipeline_endpoint" id: "22B0E30FF38145E7" shape: "square" size: 1.0d - subtitle: "Wondering how to move those ores around?" + subtitle: "{quests.tfg_tips.long_distance_items.subtitle}" tasks: [ { count: 2L @@ -1066,7 +996,7 @@ type: "item" } ] - title: "Long-Distance Items" + title: "{quests.tfg_tips.long_distance_items.title}" x: 5.0d y: 6.0d } @@ -1092,8 +1022,9 @@ } { dependencies: ["02FDECC931B5E8EF"] - description: ["You may have realized that most &eMultiblocks&r require a &6Maintenance Hatch&r. Until &6HV&r, where you can get an &aAutomatic Maintenance Hatch&r, you can use this item to fix the hatch without needing to use all of your maintenance tools.\\n\\nIt can be really useful if you don't want to invest in an &aAuto Maintenance Hatch&r yet, or if you're simply &cnot there yet&r."] + description: ["{quests.tfg_tips.duct_tape.desc}"] id: "179E89C50E900DC0" + subtitle: "{quests.tfg_tips.duct_tape.subtitle}" tasks: [{ id: "7D2E6F5F843864DE" item: "gtceu:duct_tape" @@ -1106,18 +1037,14 @@ dependencies: ["02FDECC931B5E8EF"] dependency_requirement: "one_completed" description: [ - "The &aPortable Scanner&r, or &aTricorder&r, is GTCEu's debug tool." - "" - "Using it will show you a block's details, the details of the energy network, its current status and contents, and its impact on performance." - "" - "It'll also display a percentage of fluid remaining in the fluid vein for the &3Fluid Rigs&r." + "{quests.tfg_tips.portable_scanner.desc.1}" "{@pagebreak}" - "&l&3Lore:&r&o This little useful device comes from GregTech 5. It was extremely useful in the early days, because very little information (basically nothing) was given by GUIs or WAILA." + "{quests.tfg_tips.portable_scanner.desc.2}" ] id: "58D40A430654C997" shape: "square" size: 1.0d - subtitle: "For the nosiest GregTech players" + subtitle: "{quests.tfg_tips.portable_scanner.subtitle}" tasks: [{ id: "1E2E112D32893B8D" item: "gtceu:portable_scanner" @@ -1129,8 +1056,9 @@ } { dependencies: ["02FDECC931B5E8EF"] - description: ["When you try to &aparallelize your setup&r with more machines, it can be a &cbother&r to set all the &einputs&r and &eoutputs&r for each one. Yeah, we're thinking of you, &dSuper Chests&r and &dTanks&r.\\n\\nIf you ever find yourself needing this &blittle tool&r, &adon't hesitate to use it&r."] + description: ["{quests.tfg_tips.memory_card.desc}"] id: "7D5E9CFBE5990DFF" + subtitle: "{quests.tfg_tips.memory_card.subtitle}" tasks: [{ id: "39E0696844506874" item: "gtceu:machine_memory_card" @@ -1141,8 +1069,9 @@ } { dependencies: ["02FDECC931B5E8EF"] - description: ["&bThe Terminal&r has one main purpose, and &awe highly encourage you to craft it&r.\\n\\nBuilding all these &eMultiblocks&r can be a bit &cintimidating&r, right? Well, here's a tip: use &dShift + Right-Click&r on any &6Multiblock Controller&r to &aautomatically assemble the entire structure&r!\\n\\nYou might need to &emove around some buses and hatches&r to suit your setup, but overall, this feature will save you a &alot of time&r."] + description: ["{quests.tfg_tips.terminal.desc}"] id: "2F6C9A987865B966" + subtitle: "{quests.tfg_tips.terminal.subtitle}" tasks: [{ id: "6A86F6C3566828BF" item: "gtceu:terminal" @@ -1163,8 +1092,8 @@ } type: "item" }] - x: 3.5d - y: 14.0d + x: 5.0d + y: 15.0d } { dependencies: ["037CDA933FBE2CBE"] @@ -2927,6 +2856,27 @@ x: -1.0d y: -8.5d } + { + dependencies: ["150B7C5CD152E1BA"] + description: ["{quests.tfg_tips.feeding_troughs.desc}"] + id: "343A712E8869482A" + subtitle: "{quests.tfg_tips.feeding_troughs.subtitle}" + tasks: [{ + id: "3F76A6864626C87F" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(tfcgroomer:copper_grooming_station)item(tfcgroomer:bronze_grooming_station)item(tfcgroomer:bismuth_bronze_grooming_station)item(tfcgroomer:black_bronze_grooming_station)item(tfcgroomer:wrought_iron_grooming_station)item(tfcgroomer:steel_grooming_station)item(tfcgroomer:black_steel_grooming_station)item(tfcgroomer:blue_steel_grooming_station)item(tfcgroomer:red_steel_grooming_station))" + } + } + title: "{quests.tfg_tips.feeding_troughs.task}" + type: "item" + }] + title: "{quests.tfg_tips.feeding_troughs.title}" + x: -4.5d + y: 6.5d + } ] subtitle: ["{quests.tfg_tips.tools_tips.subtitle}"] title: "{quests.tfg_tips.tools_tips.title}" diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index a7d8f4cb8..deac5449b 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -4033,7 +4033,7 @@ "quests.tfg_tips.nano_saber.subtitle": "26 Attack Damage when active!", "quests.tfg_tips.nano_saber.desc": "The &6Nano Saber&r is a powerful weapon you’ll be able to unlock once you reach late &5EV&r. Simply use &dShift + Right-Click&r to activate the &cbzzzzz mode&r.", "quests.tfg_tips.magnets.title": "Item Magnets", - "quests.tfg_tips.magnets.subtitle": "", + "quests.tfg_tips.magnets.subtitle": "2010 called, it wants its juggalo meme back", "quests.tfg_tips.magnets.desc": "The &6Item Magnet&r is exactly what you'd expect — a magnet that pulls nearby &6items&r straight to you. &aVery useful&r. What more could you ask for?", "quests.tfg_tips.long_distance_items.title": "Long-Distance Item Pipes", "quests.tfg_tips.long_distance_items.subtitle": "Wondering how to move those ores around?", @@ -4081,6 +4081,10 @@ "quests.tfg_tips.hiking.subtitle": "&oThese boots are made for walking", "quests.tfg_tips.hiking.desc": "&dHiking Boots&r allow you to more easily explore your world! All &dHiking Boots&r allow you to pass through tall grass without resistance. Additionally, each tier of &dHiking Boots&r have progressively more &9armor&r, &9walk speed&r, and &9fall resistance&r along with other boosts.", "quests.tfg_tips.hiking.task": "Any Hiking Boots", + "quests.tfg_tips.feeding_troughs.title": "Feeding Troughs", + "quests.tfg_tips.feeding_troughs.subtitle": "Metallic Farmhand", + "quests.tfg_tips.feeding_troughs.desc": "Feeding Troughs (also known as Grooming Stations) are a way to automatically feed your animals every morning. It even comes with an option to avoid feeding animals that are already at maximum familiarity, in case you don't want to breed them.\n\nHigher tiers come with a higher range of effectiveness.\n\n&3&lTip:&r&o You might not want to put one right next to your fence, otherwise animals will try to use it to escape their pen!", + "quests.tfg_tips.feeding_troughs.task": "Any feeding trough", "quests.tfg_tips.glassblowing.title": "Glassblowing", "quests.tfg_tips.glassblowing.subtitle": "Realistic Glassworking!", "quests.tfg_tips.glassblowing.desc": "To make any sort of &dGlass Pane&r or &dBlock&r, you'll need a &3glassblowing&r setup.\n\n&3Glassblowing&r will require some sort of &aBlowpipe&r, and a platform made out of glassblowing blocks to pour the molten glass. Check out the &2Field Guide&r for more information on the shape of the platform and what blocks are valid. You'll have access to glassblowing as soon as you can shape &aBrass!&r", From 4e9e94eb4563639950c74d649dd2d4ad39e93a47 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 8 Dec 2025 21:18:31 +0000 Subject: [PATCH 10/25] fix some warnings --- kubejs/startup_scripts/gtceu/material_modification.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kubejs/startup_scripts/gtceu/material_modification.js b/kubejs/startup_scripts/gtceu/material_modification.js index aba518db4..cd9294168 100644 --- a/kubejs/startup_scripts/gtceu/material_modification.js +++ b/kubejs/startup_scripts/gtceu/material_modification.js @@ -7,7 +7,7 @@ const registerGTCEuMaterialModification = (event) => { const $TFC_PROPERTY = Java.loadClass('su.terrafirmagreg.core.compat.gtceu.properties.TFCProperty') const $ORE_PROPERTY = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.properties.OreProperty') const $INGOT_PROPERTY = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.properties.IngotProperty') - const $DustProperty = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.properties.DustProperty'); + const $DUST_PROPERTY = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.properties.DustProperty'); const $BLAST_PROPERTY = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.properties.BlastProperty') const $ITEM_PIPE_PROPERTY = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.properties.ItemPipeProperties') const $FLUID_PIPE_PROPERTY = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.properties.FluidPipeProperties') @@ -296,9 +296,10 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Thorium.addFlags(NO_ORE_SMELTING) // Unhiding elements - GTMaterials.Zirconium.addFlags(GENERATE_FINE_WIRE, GENERATE_PLATE, NO_ORE_SMELTING); + GTMaterials.Zirconium.setProperty(PropertyKey.DUST, new $DUST_PROPERTY()); GTMaterials.Zirconium.setProperty(PropertyKey.INGOT, new $INGOT_PROPERTY()); GTMaterials.Zirconium.setProperty(PropertyKey.BLAST, new $BLAST_PROPERTY(4200, 'mid', GTValues.VA[GTValues.EV], 1300, GTValues.VA[GTValues.HV], 14.7*20)); + GTMaterials.Zirconium.addFlags(GENERATE_FINE_WIRE, GENERATE_PLATE, NO_ORE_SMELTING); // Tools GTMaterials.Stone.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(1.2, 1.0, 8, 1, [ From a06e8779435c51de7488e6a7368f8da667da32c7 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 8 Dec 2025 21:52:57 +0000 Subject: [PATCH 11/25] fix #2339 --- kubejs/server_scripts/create/tags.js | 1 + 1 file changed, 1 insertion(+) diff --git a/kubejs/server_scripts/create/tags.js b/kubejs/server_scripts/create/tags.js index 0001ac2ad..312b484a6 100644 --- a/kubejs/server_scripts/create/tags.js +++ b/kubejs/server_scripts/create/tags.js @@ -33,6 +33,7 @@ const registerCreateItemTags = (event) => { if (dye !== 'white') event.add('tfg:colored_seats', `create:${dye}_seat`) }) + event.removeAll('create:crushed_raw_materials') event.add('create:blaze_burner_fuel/regular', "gtceu:poor_raw_coal") event.add('create:blaze_burner_fuel/regular', "gtceu:coal_dust") From deb466e801f74c5e8c06a59bb793de089422c4cb Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 8 Dec 2025 22:17:50 +0000 Subject: [PATCH 12/25] added temporary workaround for the missing pipe recipes --- CHANGELOG.md | 1 + .../server_scripts/tfg/recipes.converting.js | 12 -- kubejs/server_scripts/tfg/recipes.js | 2 +- .../server_scripts/tfg/recipes.temporary.js | 104 ++++++++++++++++++ kubejs/startup_scripts/tfg/tag_prefixes.js | 3 +- 5 files changed, 108 insertions(+), 14 deletions(-) delete mode 100644 kubejs/server_scripts/tfg/recipes.converting.js create mode 100644 kubejs/server_scripts/tfg/recipes.temporary.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b9590bce..0376bd5e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ ### Other Changes - Added recipes for create's shadow and radiant casings (#2256) @Ujhik ### Bug fixes +- Fixed missing recipes for many fluid and item pipes @Pyritie - Fixed missing cleanroom tags for the ad astra 3x3 doors, so now you can *actually* use them in a cleanroom @Pyritie - Fixed aged sake, vodka, and whiskey losing their buff effects @Pyritie diff --git a/kubejs/server_scripts/tfg/recipes.converting.js b/kubejs/server_scripts/tfg/recipes.converting.js deleted file mode 100644 index bb415f91a..000000000 --- a/kubejs/server_scripts/tfg/recipes.converting.js +++ /dev/null @@ -1,12 +0,0 @@ -// priority: 0 -"use strict"; - -/** - * @param {Internal.RecipesEventJS} event - */ -function registerTFGConvertingRecipes(event) { - - event.shapeless('vintageimprovements:belt_grinder', 'vintageimprovements:lathe') - - event.shapeless('tfg:ostrum_linear_accelerator', 'gtceu:ostrum_linear_accelerator') -} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.js b/kubejs/server_scripts/tfg/recipes.js index 43f6d5572..4424c0a17 100644 --- a/kubejs/server_scripts/tfg/recipes.js +++ b/kubejs/server_scripts/tfg/recipes.js @@ -8,7 +8,7 @@ const registerTFGRecipes = (event) => { registerTFGMoldRecipes(event) registerTFGMiscellaneousRecipes(event) - registerTFGConvertingRecipes(event) + registerTFGTemporaryRecipes(event) registerTFGFoodRecipes(event) registerTFGRefrigeratorRecipes(event) diff --git a/kubejs/server_scripts/tfg/recipes.temporary.js b/kubejs/server_scripts/tfg/recipes.temporary.js new file mode 100644 index 000000000..9d9015bc3 --- /dev/null +++ b/kubejs/server_scripts/tfg/recipes.temporary.js @@ -0,0 +1,104 @@ +// priority: 0 +"use strict"; + +/** + * @param {Internal.RecipesEventJS} event + */ +function registerTFGTemporaryRecipes(event) { + + event.shapeless('vintageimprovements:belt_grinder', 'vintageimprovements:lathe') + + event.shapeless('tfg:ostrum_linear_accelerator', 'gtceu:ostrum_linear_accelerator') + + // TODO: remove nether/ender air in 0.12 + + + // Temporary recipes until gregtech fixes its pipe problem with .setIgnored() + const broken_pipes = [ + GTMaterials.Copper, + GTMaterials.Brass, + GTMaterials.Gold, + GTMaterials.Iron, + GTMaterials.Cobalt, + GTMaterials.RoseGold, + GTMaterials.Aluminium, + GTMaterials.Invar, + GTMaterials.Lead, + GTMaterials.Nickel, + GTMaterials.Osmium, + GTMaterials.Palladium, + GTMaterials.Platinum, + GTMaterials.Rhodium, + GTMaterials.Silver, + GTMaterials.Vanadium, + GTMaterials.Zinc, + TFGHelpers.getMaterial('ostrum') + ] + broken_pipes.forEach(material => { + if (material.hasProperty(PropertyKey.FLUID_PIPE)) { + event.shaped(ChemicalHelper.get(TagPrefix.pipeTinyFluid, material, 1), [ + ' S ', + 'HPW' + ], { + P: ChemicalHelper.get(TagPrefix.plate, material, 1), + H: '#forge:tools/hammers', + W: '#forge:tools/wrenches', + S: '#forge:tools/saws' + }).id(`tfg:temp/tiny_fluid_pipe_${material.getName()}`) + + event.shaped(ChemicalHelper.get(TagPrefix.pipeSmallFluid, material, 1), [ + 'WPH' + ], { + P: ChemicalHelper.get(TagPrefix.plate, material, 1), + H: '#forge:tools/hammers', + W: '#forge:tools/wrenches' + }).id(`tfg:temp/small_fluid_pipe_${material.getName()}`) + + event.shaped(ChemicalHelper.get(TagPrefix.pipeNormalFluid, material, 1), [ + 'PPP', + 'W H' + ], { + P: ChemicalHelper.get(TagPrefix.plate, material, 1), + H: '#forge:tools/hammers', + W: '#forge:tools/wrenches' + }).id(`tfg:temp/normal_fluid_pipe_${material.getName()}`) + + event.shaped(ChemicalHelper.get(TagPrefix.pipeLargeFluid, material, 1), [ + 'PPP', + 'W H', + 'PPP' + ], { + P: ChemicalHelper.get(TagPrefix.plate, material, 1), + H: '#forge:tools/hammers', + W: '#forge:tools/wrenches' + }).id(`tfg:temp/large_fluid_pipe_${material.getName()}`) + } + else if (material.hasProperty(PropertyKey.ITEM_PIPE)) { + event.shaped(ChemicalHelper.get(TagPrefix.pipeSmallItem, material, 1), [ + 'WPH' + ], { + P: ChemicalHelper.get(TagPrefix.plate, material, 1), + H: '#forge:tools/hammers', + W: '#forge:tools/wrenches' + }).id(`tfg:temp/small_item_pipe_${material.getName()}`) + + event.shaped(ChemicalHelper.get(TagPrefix.pipeNormalItem, material, 1), [ + 'PPP', + 'W H' + ], { + P: ChemicalHelper.get(TagPrefix.plate, material, 1), + H: '#forge:tools/hammers', + W: '#forge:tools/wrenches' + }).id(`tfg:temp/normal_item_pipe_${material.getName()}`) + + event.shaped(ChemicalHelper.get(TagPrefix.pipeLargeItem, material, 1), [ + 'PPP', + 'W H', + 'PPP' + ], { + P: ChemicalHelper.get(TagPrefix.plate, material, 1), + H: '#forge:tools/hammers', + W: '#forge:tools/wrenches' + }).id(`tfg:temp/large_item_pipe_${material.getName()}`) + }) +} \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/tag_prefixes.js b/kubejs/startup_scripts/tfg/tag_prefixes.js index 800a69fb2..4e1ef1d21 100644 --- a/kubejs/startup_scripts/tfg/tag_prefixes.js +++ b/kubejs/startup_scripts/tfg/tag_prefixes.js @@ -7,7 +7,8 @@ function registerTFGTagPrefixes(event) { excludeAllGemsButNormal(TFGHelpers.getMaterial('tfg:tetrafluoroethane')); excludeAllGemsButNormal(TFGHelpers.getMaterial('tfg:crimsene')); excludeAllGemsButNormal(TFGHelpers.getMaterial('tfg:warpane')); - + + TagPrefix.nugget.setIgnored(GTMaterials.RawRubber); TagPrefix.ingot.setIgnored(GTMaterials.RawRubber); TagPrefix.plate.setIgnored(GTMaterials.RawRubber); TagPrefix.plateDouble.setIgnored(GTMaterials.RawRubber); From 9293d92bcdb313f997c04875d7b379159fac1c89 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 8 Dec 2025 22:30:53 +0000 Subject: [PATCH 13/25] langs, quests --- .../ftbquests/quests/chapters/queststfg.snbt | 26 ++++++++++++++++++- .../quests/chapters/tips__tools.snbt | 3 ++- kubejs/assets/tfg/lang/en_us.json | 7 +++-- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/config/ftbquests/quests/chapters/queststfg.snbt b/config/ftbquests/quests/chapters/queststfg.snbt index 03040b111..e3058149c 100644 --- a/config/ftbquests/quests/chapters/queststfg.snbt +++ b/config/ftbquests/quests/chapters/queststfg.snbt @@ -59,7 +59,7 @@ subtitle: "{quests.tfg.capture_territory.subtitle}" tasks: [{ id: "5EB438DED5A994C4" - title: "{quests.tasktypes.checkmark}" + title: "{quests.tasktype.checkmark}" type: "checkmark" }] title: "{quests.tfg.capture_territory.title}" @@ -119,6 +119,7 @@ } } id: "590CE4F4FA385701" + optional: true rewards: [ { id: "58D1E7EFD006D7F7" @@ -146,6 +147,29 @@ x: 0.0d y: 4.5d } + { + dependencies: ["0B42D4AE2AC67F93"] + description: ["{quests.tfg.chunk_limit.desc}"] + icon: { + Count: 1 + ForgeCaps: { + "tfc:food": { + creationDate: 18000L + traits: [ ] + } + } + id: "tfc:food/cherry" + } + id: "12BCC8F968904105" + tasks: [{ + id: "6A9ABF4B83F7FC3E" + title: "{quests.tasktype.checkmark}" + type: "checkmark" + }] + title: "{quests.tfg.chunk_limit.title}" + x: -2.5d + y: 3.5d + } ] subtitle: ["{quests.tfg.subtitle}"] title: "{quests.tfg}" diff --git a/config/ftbquests/quests/chapters/tips__tools.snbt b/config/ftbquests/quests/chapters/tips__tools.snbt index 21eeea39e..88f05be92 100644 --- a/config/ftbquests/quests/chapters/tips__tools.snbt +++ b/config/ftbquests/quests/chapters/tips__tools.snbt @@ -867,7 +867,7 @@ { dependencies: ["02FDECC931B5E8EF"] description: ["{quests.tfg_tips.hazard_materials.desc}"] - icon: "createdeco:decal_warning" + icon: "createdeco:decal_skull" id: "57FE828BAA8F6276" subtitle: "{quests.tfg_tips.hazard_materials.subtitle}" tasks: [{ @@ -947,6 +947,7 @@ type: "item" } ] + title: "{quests.tfg_tips.hazmat.title}" x: 9.5d y: 15.0d } diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index deac5449b..a9e0a85c6 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -3941,13 +3941,15 @@ "quests.tfg.subtitle": "Welcome to TerraFirmaGreg!", "quests.tfg.welcome.title": "Welcome to TerraFirmaGreg!", "quests.tfg.welcome.subtitle": "Survival Modpack As It Should've Been", - "quests.tfg.welcome.desc": "Thank you for starting TerraFirmaGreg Modern!\n\nIn this modpack, you will be put to the task of taking control of untouched wilderness and turning it to an industrial wonderland. Start from humble beginning picking up rocks, and end while traversing interstellar space!", + "quests.tfg.welcome.desc": "Thank you for starting TerraFirmaGreg Modern!\n\nIn this modpack, you will be put to the task of taking control of untouched wilderness and turning it to an industrial wonderland. Start from a humble beginning picking up rocks, and end while traversing interstellar space!", "quests.tfg.create_team.title": "How to create a team?", "quests.tfg.create_team.subtitle": "Do you play with friends?", "quests.tfg.create_team.desc": "You can create a team to complete quests together. To do this, open your inventory, then in the upper left corner select the button where 3 colorful people are drawn, then an interface will open in which you can create a team. Click the §aCreate a team§r button, then give it a name and possibly some other parameters, and after successfully creating a team, you can invite other players to it using the plus button in the green circle in the upper right corner. From this point onwards, your quests will be synchronized and any team member will be able to complete them. Good luck!", "quests.tfg.capture_territory.title": "How to capture territory?", "quests.tfg.capture_territory.subtitle": "And how to load chunks in your territory", - "quests.tfg.capture_territory.desc": "If you play on a server, you might want to claim your territory so other players can't interfere. Use the Open Claims key (default \"Ctrl+M\") to open the window, then left-click to claim a chunk and right-click to unclaim them. There is a limit to this, so you can't claim everything. You can shift-left-click on a chunk to forceload (aka \"chunk load\") it, and shift-right-click to un-forceload it. Claiming chunks will include your whole team, if you're using one.", + "quests.tfg.capture_territory.desc": "If you play on a server, you might want to claim your territory so other players can't interfere. Use the Open Claims key (default \"Ctrl+M\") to open the window, then left-click to claim a chunk and right-click to unclaim them.\n\nThere is a limit to this, so you can't claim everything. You can shift-left-click on a chunk to forceload (aka \"chunk load\") it, and shift-right-click to un-forceload it. Claiming chunks will include your whole team, if you're using one.", + "quests.tfg.chunk_limit.title": "How to increase my chunkload limit?", + "quests.tfg.chunk_limit.desc": "If you're playing on a server, by default you only have a small amount of forceload chunks available.\n\nServer owners can customize this (check the README.txt file!), but if you've got operator permissions (or have cheats enabled), you can also use &a/ftbchunks admin extra_force_load_chunks @p set X&r, where X is the new limit.", "quests.tfg.field_guide.title": "Important information about quests!", "quests.tfg.field_guide.subtitle": "I need to read more?", "quests.tfg.field_guide.desc": "The quests are still in development, and we're always working on improving them! A lot of information about specific mechanics are also in your Field Guide, accessible via the Book tab in your inventory.\n\nRemember that both JEI and the Field Guide are your friends, as not everything will be explained through quests.", @@ -4067,6 +4069,7 @@ "quests.tfg_tips.hazard_materials.desc": "With the new version of &5Gregtech&r, a &chazard system&r has been introduced. By holding &dShift&r while hovering over &cHazardous Materials&r, you can see how they might affect you.\n\nWe strongly advise using proper &6protective equipment&r to keep your &corgans intact&r.", "quests.tfg_tips.face_mask.desc": "The &6Face Mask&r will protect you from &cinhaling dangerous dust&r. It’s quite &aeasy to craft&r and should prevent issues when working with &5arsenic&r.", "quests.tfg_tips.rubber_gloves.desc": "The &6Gloves&r will obviously protect you from &cskin contact hazards&r. You have two ways to make them: a &7longer and more involved path&r through &2TerrafirmaCraft&r, or a much &aeasier method&r using the &6High Pressure Steam Alloy Smelter&r.", + "quests.tfg_tips.hazmat.title": "Hazardous Materials Suit", "quests.tfg_tips.hazmat.desc": "The &6Hazardous Materials Suit&r is the best way to protect yourself from &cany kind of harm&r. You’ll be able to craft it once you reach &bMV&r, and &ayou should definitely take the time to do so&r.", "quests.tfg_tips.armor.title": "GregTech Armor", "quests.tfg_tips.armor.desc": "With &5GregTech&r comes its own line of armor. Sure, it was cool to wear &7metal plates&r, but now that you're an &bindustrial maniac&r, maybe it's time to check out some &atechnological armor&r.\n\n&5GregTech&r provides two models. The first one becomes available around &6HV&r and offers better protection than anything you've worn before. It's equipped with &estrong insulation&r to withstand Earth's harsh climate, and it may even be upgraded with a &dJetpack&r.\n\nThe second model won't be available until much later — around &1IV&r and &dLuV&r. This one will allow you to &9breathe in space&r using &3oxygen&r.", From 3d735015b6c5641fab7ae252012d5ef4d9a28587 Mon Sep 17 00:00:00 2001 From: GameStar <56610486+BlueBoat29@users.noreply.github.com> Date: Mon, 8 Dec 2025 16:52:43 -0600 Subject: [PATCH 14/25] someone forgot a closing brace Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> --- kubejs/server_scripts/tfg/recipes.temporary.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/tfg/recipes.temporary.js b/kubejs/server_scripts/tfg/recipes.temporary.js index 9d9015bc3..83cbddb02 100644 --- a/kubejs/server_scripts/tfg/recipes.temporary.js +++ b/kubejs/server_scripts/tfg/recipes.temporary.js @@ -100,5 +100,6 @@ function registerTFGTemporaryRecipes(event) { H: '#forge:tools/hammers', W: '#forge:tools/wrenches' }).id(`tfg:temp/large_item_pipe_${material.getName()}`) + } }) -} \ No newline at end of file +} From 2e48d81cfba2d3f4c88da9103d7aa061dbcb58cd Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 8 Dec 2025 22:55:25 +0000 Subject: [PATCH 15/25] 2 tiny pipes instead of 1 --- kubejs/server_scripts/tfg/recipes.temporary.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/server_scripts/tfg/recipes.temporary.js b/kubejs/server_scripts/tfg/recipes.temporary.js index 9d9015bc3..aa6b31edc 100644 --- a/kubejs/server_scripts/tfg/recipes.temporary.js +++ b/kubejs/server_scripts/tfg/recipes.temporary.js @@ -36,7 +36,7 @@ function registerTFGTemporaryRecipes(event) { ] broken_pipes.forEach(material => { if (material.hasProperty(PropertyKey.FLUID_PIPE)) { - event.shaped(ChemicalHelper.get(TagPrefix.pipeTinyFluid, material, 1), [ + event.shaped(ChemicalHelper.get(TagPrefix.pipeTinyFluid, material, 2), [ ' S ', 'HPW' ], { From 5494a07dbf0be798d1b4f4d3b945af8f8d49fb1c Mon Sep 17 00:00:00 2001 From: GameStar <56610486+BlueBoat29@users.noreply.github.com> Date: Mon, 8 Dec 2025 17:43:30 -0600 Subject: [PATCH 16/25] Ochem stuff for Fission (#2338) * molecules * Update recipes.biochem.js * will use these later * update this * ugh * lang merger * Update fructose.json * iconsets I guess * Update recipes.nuclear.js Signed-off-by: Pyritie * Update recipes.nuclear.js --------- Signed-off-by: Pyritie Co-authored-by: Pyritie --- kubejs/assets/tfg/molecules/14_sorbitan.json | 167 ++++ .../assets/tfg/molecules/alpha_keratin.json | 483 ++++++++++ .../tfg/molecules/ammonium_carbamate.json | 149 +++ kubejs/assets/tfg/molecules/chitin.json | 501 ++++++++++ .../tfg/molecules/choline_chloride.json | 124 +++ .../tfg/molecules/epox_isosorbide_ln.json | 862 ++++++++++++++++++ .../assets/tfg/molecules/ethylene_oxide.json | 107 +++ kubejs/assets/tfg/molecules/fructose.json | 183 ++++ kubejs/assets/tfg/molecules/galactose.json | 183 ++++ kubejs/assets/tfg/molecules/glucose.json | 183 ++++ kubejs/assets/tfg/molecules/isosorbide.json | 188 ++++ .../assets/tfg/molecules/isosorbide_ln.json | 730 +++++++++++++++ .../assets/tfg/molecules/linolenic_acid.json | 284 ++++++ .../methylene_diphenyl_dicarbamate.json | 706 +++++++------- kubejs/assets/tfg/molecules/sorbitol.json | 176 ++++ .../assets/tfg/molecules/trimethylamine.json | 53 ++ kubejs/assets/tfg/molecules/urea.json | 65 ++ .../tfg/powergen/nuclear/recipes.nuclear.js | 83 +- .../tfg/space_general/recipes.insulation.js | 32 +- .../tfg/venus/recipes.biochem.js | 24 +- kubejs/startup_scripts/tfg/materials.js | 10 + .../tfg/nuclear/materials.nuclear.js | 47 + .../tfg/space_general/materials.rockets.js | 2 +- 23 files changed, 5002 insertions(+), 340 deletions(-) create mode 100644 kubejs/assets/tfg/molecules/14_sorbitan.json create mode 100644 kubejs/assets/tfg/molecules/alpha_keratin.json create mode 100644 kubejs/assets/tfg/molecules/ammonium_carbamate.json create mode 100644 kubejs/assets/tfg/molecules/chitin.json create mode 100644 kubejs/assets/tfg/molecules/choline_chloride.json create mode 100644 kubejs/assets/tfg/molecules/epox_isosorbide_ln.json create mode 100644 kubejs/assets/tfg/molecules/ethylene_oxide.json create mode 100644 kubejs/assets/tfg/molecules/fructose.json create mode 100644 kubejs/assets/tfg/molecules/galactose.json create mode 100644 kubejs/assets/tfg/molecules/glucose.json create mode 100644 kubejs/assets/tfg/molecules/isosorbide.json create mode 100644 kubejs/assets/tfg/molecules/isosorbide_ln.json create mode 100644 kubejs/assets/tfg/molecules/linolenic_acid.json create mode 100644 kubejs/assets/tfg/molecules/sorbitol.json create mode 100644 kubejs/assets/tfg/molecules/trimethylamine.json create mode 100644 kubejs/assets/tfg/molecules/urea.json diff --git a/kubejs/assets/tfg/molecules/14_sorbitan.json b/kubejs/assets/tfg/molecules/14_sorbitan.json new file mode 100644 index 000000000..1a9a7422c --- /dev/null +++ b/kubejs/assets/tfg/molecules/14_sorbitan.json @@ -0,0 +1,167 @@ +{ + "contents": [ + { + "type": "atom", + "element": "O", + "right": "H", + "index": 0, + "x": 0.0, + "y": 0.0 + }, + { + "type": "atom", + "index": 1, + "x": 0.866, + "y": 0.5 + }, + { + "type": "atom", + "index": 2, + "x": 1.732, + "y": 0.0 + }, + { + "type": "atom", + "index": 3, + "x": 2.5981, + "y": 0.5 + }, + { + "type": "atom", + "index": 4, + "x": 3.4641, + "y": 0.0 + }, + { + "type": "atom", + "element": "O", + "index": 5, + "x": 2.806, + "y": 1.4781 + }, + { + "type": "atom", + "index": 6, + "x": 3.8006, + "y": 1.5827 + }, + { + "type": "atom", + "index": 7, + "x": 4.2073, + "y": 0.6691 + }, + { + "type": "atom", + "element": "O", + "right": "H", + "index": 8, + "x": 3.5686, + "y": -0.9945 + }, + { + "type": "atom", + "element": "O", + "right": "H", + "index": 9, + "x": 5.1854, + "y": 0.4612 + }, + { + "type": "atom", + "element": "O", + "right": "H", + "index": 10, + "x": 1.732, + "y": -1.0 + }, + { + "type": "bond", + "a": 0, + "b": 1, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 1, + "b": 2, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 2, + "b": 3, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 3, + "b": 4, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 4, + "b": 7, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 7, + "b": 6, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 6, + "b": 5, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 3, + "b": 5, + "lines": [ + "outward" + ] + }, + { + "type": "bond", + "a": 4, + "b": 8, + "lines": [ + "outward" + ] + }, + { + "type": "bond", + "a": 7, + "b": 9, + "lines": [ + "inward" + ] + }, + { + "type": "bond", + "a": 2, + "b": 10, + "lines": [ + "inward" + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/molecules/alpha_keratin.json b/kubejs/assets/tfg/molecules/alpha_keratin.json new file mode 100644 index 000000000..3c1e844ba --- /dev/null +++ b/kubejs/assets/tfg/molecules/alpha_keratin.json @@ -0,0 +1,483 @@ +{ + "contents": [ + { + "type": "atom", + "index": 0, + "x": 0.3971, + "y": -8.9559 + }, + { + "type": "atom", + "index": 1, + "x": 1.0735, + "y": -8.6029 + }, + { + "type": "atom", + "index": 2, + "x": 2.5294, + "y": -7.8823 + }, + { + "type": "atom", + "index": 3, + "x": 3.103, + "y": -7.3676 + }, + { + "type": "atom", + "index": 4, + "x": 2.4118, + "y": -6.5588 + }, + { + "type": "atom", + "index": 5, + "x": 1.7794, + "y": -7.0588 + }, + { + "type": "atom", + "index": 6, + "x": -0.0294, + "y": -6.897 + }, + { + "type": "atom", + "index": 7, + "x": -0.2353, + "y": -6.3529 + }, + { + "type": "atom", + "index": 8, + "x": 0.6471, + "y": -6.0147 + }, + { + "type": "atom", + "index": 9, + "x": 1.3235, + "y": -5.6765 + }, + { + "type": "atom", + "index": 10, + "x": 2.6324, + "y": -5.1617 + }, + { + "type": "atom", + "index": 11, + "x": 3.0588, + "y": -4.4853 + }, + { + "type": "atom", + "index": 12, + "x": 2.4118, + "y": -3.6617 + }, + { + "type": "atom", + "index": 13, + "x": 1.8677, + "y": -3.8823 + }, + { + "type": "atom", + "index": 14, + "x": 0.1324, + "y": -3.8088 + }, + { + "type": "atom", + "index": 15, + "x": -0.0588, + "y": -3.0882 + }, + { + "type": "atom", + "index": 16, + "x": 0.8677, + "y": -3.0882 + }, + { + "type": "atom", + "index": 17, + "x": 1.4118, + "y": -2.5294 + }, + { + "type": "atom", + "index": 18, + "x": 2.7206, + "y": -2.0882 + }, + { + "type": "atom", + "index": 19, + "x": 3.1912, + "y": -1.4412 + }, + { + "type": "atom", + "index": 20, + "x": 2.1912, + "y": -0.5294 + }, + { + "type": "atom", + "index": 21, + "x": 1.4118, + "y": -0.6912 + }, + { + "type": "atom", + "index": 22, + "x": 0.0, + "y": 0.0 + }, + { + "type": "atom", + "element": "N", + "index": 23, + "x": 0.7794, + "y": -0.1323 + }, + { + "type": "atom", + "element": "N", + "index": 24, + "x": 2.8088, + "y": -0.7941 + }, + { + "type": "atom", + "element": "N", + "index": 25, + "x": 2.1912, + "y": -2.5588 + }, + { + "type": "atom", + "element": "N", + "index": 26, + "x": 0.2059, + "y": -2.5735 + }, + { + "type": "atom", + "element": "N", + "index": 27, + "x": 1.1471, + "y": -3.6617 + }, + { + "type": "atom", + "element": "N", + "index": 28, + "x": 3.0, + "y": -3.7647 + }, + { + "type": "atom", + "element": "N", + "index": 29, + "x": 2.0441, + "y": -5.6176 + }, + { + "type": "atom", + "element": "N", + "index": 30, + "x": -0.0882, + "y": -5.5882 + }, + { + "type": "atom", + "element": "N", + "index": 31, + "x": 0.9853, + "y": -6.8235 + }, + { + "type": "atom", + "element": "N", + "index": 32, + "x": 3.0294, + "y": -6.6912 + }, + { + "type": "atom", + "element": "N", + "index": 33, + "x": 1.8971, + "y": -8.397 + }, + { + "type": "bond", + "a": 0, + "b": 1, + "lines": [ + "thick" + ] + }, + { + "type": "bond", + "a": 1, + "b": 33, + "lines": [ + "thick" + ] + }, + { + "type": "bond", + "a": 33, + "b": 2, + "lines": [ + "thick" + ] + }, + { + "type": "bond", + "a": 2, + "b": 3, + "lines": [ + "thick" + ] + }, + { + "type": "bond", + "a": 32, + "b": 4, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 4, + "b": 5, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 5, + "b": 31, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 31, + "b": 6, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 6, + "b": 7, + "lines": [ + "outward" + ] + }, + { + "type": "bond", + "a": 7, + "b": 30, + "lines": [ + "thick" + ] + }, + { + "type": "bond", + "a": 30, + "b": 8, + "lines": [ + "thick" + ] + }, + { + "type": "bond", + "a": 8, + "b": 9, + "lines": [ + "thick" + ] + }, + { + "type": "bond", + "a": 9, + "b": 29, + "lines": [ + "thick" + ] + }, + { + "type": "bond", + "a": 29, + "b": 10, + "lines": [ + "thick" + ] + }, + { + "type": "bond", + "a": 10, + "b": 11, + "lines": [ + "thick" + ] + }, + { + "type": "bond", + "a": 28, + "b": 12, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 12, + "b": 13, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 13, + "b": 27, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 27, + "b": 14, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 26, + "b": 15, + "lines": [ + "thick" + ] + }, + { + "type": "bond", + "a": 26, + "b": 16, + "lines": [ + "thick" + ] + }, + { + "type": "bond", + "a": 16, + "b": 17, + "lines": [ + "thick" + ] + }, + { + "type": "bond", + "a": 17, + "b": 25, + "lines": [ + "thick" + ] + }, + { + "type": "bond", + "a": 25, + "b": 18, + "lines": [ + "thick" + ] + }, + { + "type": "bond", + "a": 18, + "b": 19, + "lines": [ + "thick" + ] + }, + { + "type": "bond", + "a": 24, + "b": 20, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 20, + "b": 21, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 21, + "b": 23, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 23, + "b": 22, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 14, + "b": 15, + "lines": [ + "outward" + ] + }, + { + "type": "bond", + "a": 24, + "b": 19, + "lines": [ + "outward" + ] + }, + { + "type": "bond", + "a": 28, + "b": 11, + "lines": [ + "outward" + ] + }, + { + "type": "bond", + "a": 32, + "b": 3, + "lines": [ + "outward" + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/molecules/ammonium_carbamate.json b/kubejs/assets/tfg/molecules/ammonium_carbamate.json new file mode 100644 index 000000000..b69a251d1 --- /dev/null +++ b/kubejs/assets/tfg/molecules/ammonium_carbamate.json @@ -0,0 +1,149 @@ +{ + "contents": [ + { + "type": "atom", + "index": 0, + "x": 4.266, + "y": 0.5667 + }, + { + "type": "atom", + "element": "N", + "right": [ + "H", + 2 + ], + "index": 1, + "x": 5.132, + "y": 0.0667 + }, + { + "type": "atom", + "element": "O", + "index": 2, + "x": 4.266, + "y": 1.5667 + }, + { + "type": "atom", + "element": "O", + "index": 3, + "x": 3.4, + "y": 0.0667 + }, + { + "sup": "-", + "atoms": [ + 0, + 1, + 2, + 3 + ], + "type": "parens" + }, + { + "type": "atom", + "element": "N", + "index": 4, + "x": 0.866, + "y": 0.5 + }, + { + "type": "atom", + "element": "H", + "index": 5, + "x": 1.4487, + "y": -0.4333 + }, + { + "type": "atom", + "element": "H", + "index": 6, + "x": 0.866, + "y": 1.5 + }, + { + "type": "atom", + "element": "H", + "index": 7, + "x": 0.0, + "y": 0.0 + }, + { + "type": "atom", + "element": "H", + "index": 8, + "x": 1.7987, + "y": 0.4167 + }, + { + "sup": "+", + "atoms": [ + 4, + 5, + 6, + 7, + 8 + ], + "type": "parens" + }, + { + "type": "bond", + "a": 0, + "b": 1, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 0, + "b": 2, + "lines": [ + "solid", + "solid" + ], + "centered": true + }, + { + "type": "bond", + "a": 0, + "b": 3, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 4, + "b": 5, + "lines": [ + "outward" + ] + }, + { + "type": "bond", + "a": 4, + "b": 6, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 4, + "b": 7, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 4, + "b": 8, + "lines": [ + "inward" + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/molecules/chitin.json b/kubejs/assets/tfg/molecules/chitin.json new file mode 100644 index 000000000..de026c71f --- /dev/null +++ b/kubejs/assets/tfg/molecules/chitin.json @@ -0,0 +1,501 @@ +{ + "contents": [ + { + "type": "atom", + "element": "O", + "index": 0, + "x": 3.2321, + "y": 0.866 + }, + { + "type": "atom", + "index": 1, + "x": 2.2321, + "y": 0.866 + }, + { + "type": "atom", + "index": 2, + "x": 1.7321, + "y": 0.0 + }, + { + "type": "atom", + "index": 3, + "x": 2.2321, + "y": -0.866 + }, + { + "type": "atom", + "index": 4, + "x": 3.2321, + "y": -0.866 + }, + { + "type": "atom", + "index": 5, + "x": 3.7321, + "y": 0.0 + }, + { + "type": "atom", + "element": "O", + "right": "H", + "index": 6, + "x": 2.2321, + "y": 0.134 + }, + { + "type": "atom", + "element": "N", + "right": "H", + "index": 7, + "x": 3.2321, + "y": -1.866 + }, + { + "type": "atom", + "index": 8, + "x": 2.2321, + "y": 1.866 + }, + { + "type": "atom", + "element": "O", + "right": "H", + "index": 9, + "x": 1.3661, + "y": 2.366 + }, + { + "type": "atom", + "element": "O", + "index": 10, + "x": 0.8661, + "y": -0.5 + }, + { + "type": "atom", + "element": "O", + "index": 11, + "x": 4.5981, + "y": 0.5 + }, + { + "type": "atom", + "index": 12, + "x": 5.4642, + "y": 0.0 + }, + { + "type": "atom", + "index": 13, + "x": 0.0, + "y": 0.0 + }, + { + "type": "atom", + "index": 14, + "x": 5.9642, + "y": -0.866 + }, + { + "type": "atom", + "element": "O", + "index": 15, + "x": 6.9642, + "y": -0.866 + }, + { + "type": "atom", + "index": 16, + "x": 7.4642, + "y": 0.0 + }, + { + "type": "atom", + "index": 17, + "x": 6.9641, + "y": 0.866 + }, + { + "type": "atom", + "index": 18, + "x": 5.9641, + "y": 0.866 + }, + { + "type": "atom", + "index": 19, + "x": 5.9642, + "y": -1.866 + }, + { + "type": "atom", + "index": 20, + "x": 2.3661, + "y": -2.366 + }, + { + "type": "atom", + "index": 21, + "x": 1.5001, + "y": -1.866 + }, + { + "type": "atom", + "element": "O", + "index": 22, + "x": 2.3661, + "y": -3.366 + }, + { + "type": "atom", + "element": "O", + "right": "H", + "index": 23, + "x": 5.0982, + "y": -2.366 + }, + { + "type": "atom", + "element": "O", + "index": 24, + "x": 8.3302, + "y": -0.5 + }, + { + "type": "atom", + "index": 25, + "x": 9.1962, + "y": 0.0 + }, + { + "type": "atom", + "element": "N", + "right": "H", + "index": 26, + "x": 6.9641, + "y": 1.866 + }, + { + "type": "atom", + "index": 27, + "x": 6.0981, + "y": 2.366 + }, + { + "type": "atom", + "index": 28, + "x": 5.2321, + "y": 1.866 + }, + { + "type": "atom", + "element": "O", + "index": 29, + "x": 6.0981, + "y": 3.366 + }, + { + "type": "atom", + "element": "O", + "right": "H", + "index": 30, + "x": 5.9641, + "y": -0.134 + }, + { + "sub": "n", + "atoms": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 26, + 27, + 28, + 29 + ], + "type": "parens" + }, + { + "type": "bond", + "a": 5, + "b": 0, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 0, + "b": 1, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 1, + "b": 2, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 2, + "b": 3, + "lines": [ + "outward" + ] + }, + { + "type": "bond", + "a": 3, + "b": 4, + "lines": [ + "thick" + ] + }, + { + "type": "bond", + "a": 5, + "b": 4, + "lines": [ + "outward" + ] + }, + { + "type": "bond", + "a": 3, + "b": 6, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 4, + "b": 7, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 1, + "b": 8, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 8, + "b": 9, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 2, + "b": 10, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 5, + "b": 11, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 11, + "b": 12, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 10, + "b": 13, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 18, + "b": 12, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 12, + "b": 14, + "lines": [ + "outward" + ] + }, + { + "type": "bond", + "a": 14, + "b": 15, + "lines": [ + "thick" + ] + }, + { + "type": "bond", + "a": 16, + "b": 17, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 17, + "b": 18, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 16, + "b": 15, + "lines": [ + "outward" + ] + }, + { + "type": "bond", + "a": 14, + "b": 19, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 7, + "b": 20, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 20, + "b": 21, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 20, + "b": 22, + "lines": [ + "solid", + "solid" + ], + "centered": true + }, + { + "type": "bond", + "a": 19, + "b": 23, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 16, + "b": 24, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 24, + "b": 25, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 17, + "b": 26, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 26, + "b": 27, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 27, + "b": 28, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 27, + "b": 29, + "lines": [ + "solid", + "solid" + ], + "centered": true + }, + { + "type": "bond", + "a": 18, + "b": 30, + "lines": [ + "solid" + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/molecules/choline_chloride.json b/kubejs/assets/tfg/molecules/choline_chloride.json new file mode 100644 index 000000000..2eaae8751 --- /dev/null +++ b/kubejs/assets/tfg/molecules/choline_chloride.json @@ -0,0 +1,124 @@ +{ + "contents": [ + { + "type": "atom", + "element": "N", + "index": 0, + "x": 2.5684, + "y": 0.032 + }, + { + "type": "atom", + "index": 1, + "x": 3.4344, + "y": -0.468 + }, + { + "type": "atom", + "index": 2, + "x": 2.5684, + "y": 1.032 + }, + { + "type": "atom", + "index": 3, + "x": 1.7023, + "y": -0.468 + }, + { + "type": "atom", + "index": 4, + "x": 3.4344, + "y": 0.532 + }, + { + "type": "atom", + "index": 5, + "x": 4.3004, + "y": 0.032 + }, + { + "type": "atom", + "element": "O", + "right": "H", + "index": 6, + "x": 5.1664, + "y": 0.532 + }, + { + "sup": "+", + "atoms": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6 + ], + "type": "parens" + }, + { + "type": "atom", + "element": { + "symbol": "Cl⁻", + "color": { + "color": -14684129, + "optional": true + }, + "material": "gtceu:chlorine" + }, + "index": 7, + "x": 0.75, + "y": 0.25 + }, + { + "type": "bond", + "a": 0, + "b": 1, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 0, + "b": 2, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 0, + "b": 3, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 0, + "b": 4, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 4, + "b": 5, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 5, + "b": 6, + "lines": [ + "solid" + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/molecules/epox_isosorbide_ln.json b/kubejs/assets/tfg/molecules/epox_isosorbide_ln.json new file mode 100644 index 000000000..9717fdee9 --- /dev/null +++ b/kubejs/assets/tfg/molecules/epox_isosorbide_ln.json @@ -0,0 +1,862 @@ +{ + "contents": [ + { + "type": "atom", + "element": "O", + "index": 0, + "x": 11.7692, + "y": -4.3487 + }, + { + "type": "atom", + "index": 1, + "x": 12.0782, + "y": -3.3977 + }, + { + "type": "atom", + "index": 2, + "x": 11.2692, + "y": -2.8099 + }, + { + "type": "atom", + "index": 3, + "x": 10.4602, + "y": -3.3977 + }, + { + "type": "atom", + "index": 4, + "x": 10.7692, + "y": -4.3487 + }, + { + "type": "atom", + "index": 5, + "x": 12.8872, + "y": -2.8099 + }, + { + "type": "atom", + "index": 6, + "x": 12.5782, + "y": -1.8588 + }, + { + "type": "atom", + "element": "O", + "index": 7, + "x": 11.5782, + "y": -1.8588 + }, + { + "type": "atom", + "element": "H", + "index": 8, + "x": 10.4602, + "y": -2.2221 + }, + { + "type": "atom", + "element": "H", + "index": 9, + "x": 12.8872, + "y": -3.9854 + }, + { + "type": "atom", + "element": "O", + "index": 10, + "x": 13.8383, + "y": -3.1189 + }, + { + "type": "atom", + "element": "O", + "index": 11, + "x": 9.5091, + "y": -3.0886 + }, + { + "type": "atom", + "index": 12, + "x": 8.766, + "y": -3.7578 + }, + { + "type": "atom", + "index": 13, + "x": 7.8149, + "y": -3.4488 + }, + { + "type": "atom", + "element": "O", + "index": 14, + "x": 8.9739, + "y": -4.7359 + }, + { + "type": "atom", + "index": 15, + "x": 7.0718, + "y": -4.1179 + }, + { + "type": "atom", + "index": 16, + "x": 6.1207, + "y": -3.8089 + }, + { + "type": "atom", + "index": 17, + "x": 5.3776, + "y": -4.478 + }, + { + "type": "atom", + "index": 18, + "x": 4.4265, + "y": -4.169 + }, + { + "type": "atom", + "index": 19, + "x": 3.6834, + "y": -4.8381 + }, + { + "type": "atom", + "index": 20, + "x": 2.7323, + "y": -4.5291 + }, + { + "type": "atom", + "index": 21, + "x": 1.9892, + "y": -5.1982 + }, + { + "type": "atom", + "index": 22, + "x": 1.0381, + "y": -4.8892 + }, + { + "type": "atom", + "index": 23, + "x": 0.8302, + "y": -3.9111 + }, + { + "type": "atom", + "index": 24, + "x": -0.1209, + "y": -3.602 + }, + { + "type": "atom", + "index": 25, + "x": -0.3288, + "y": -2.6239 + }, + { + "type": "atom", + "index": 26, + "x": 0.4144, + "y": -1.9548 + }, + { + "type": "atom", + "index": 27, + "x": 0.2065, + "y": -0.9766 + }, + { + "type": "atom", + "index": 28, + "x": 0.9496, + "y": -0.3075 + }, + { + "type": "atom", + "index": 29, + "x": 1.9007, + "y": -0.6165 + }, + { + "type": "atom", + "index": 30, + "x": 2.6438, + "y": 0.0526 + }, + { + "type": "atom", + "index": 31, + "x": 14.5814, + "y": -2.4498 + }, + { + "type": "atom", + "index": 32, + "x": 15.5325, + "y": -2.7588 + }, + { + "type": "atom", + "element": "O", + "index": 33, + "x": 14.3735, + "y": -1.4716 + }, + { + "type": "atom", + "index": 34, + "x": 16.2756, + "y": -2.0896 + }, + { + "type": "atom", + "index": 35, + "x": 17.2267, + "y": -2.3987 + }, + { + "type": "atom", + "index": 36, + "x": 17.9698, + "y": -1.7295 + }, + { + "type": "atom", + "index": 37, + "x": 18.9209, + "y": -2.0386 + }, + { + "type": "atom", + "index": 38, + "x": 19.664, + "y": -1.3694 + }, + { + "type": "atom", + "index": 39, + "x": 20.6151, + "y": -1.6784 + }, + { + "type": "atom", + "index": 40, + "x": 21.3582, + "y": -1.0093 + }, + { + "type": "atom", + "index": 41, + "x": 22.3093, + "y": -1.3183 + }, + { + "type": "atom", + "index": 42, + "x": 22.5172, + "y": -2.2965 + }, + { + "type": "atom", + "index": 43, + "x": 23.4683, + "y": -2.6055 + }, + { + "type": "atom", + "index": 44, + "x": 23.6762, + "y": -3.5836 + }, + { + "type": "atom", + "index": 45, + "x": 22.933, + "y": -4.2528 + }, + { + "type": "atom", + "index": 46, + "x": 23.1409, + "y": -5.2309 + }, + { + "type": "atom", + "index": 47, + "x": 22.3978, + "y": -5.9 + }, + { + "type": "atom", + "index": 48, + "x": 21.4467, + "y": -5.591 + }, + { + "type": "atom", + "index": 49, + "x": 20.7036, + "y": -6.2602 + }, + { + "type": "atom", + "element": "O", + "index": 50, + "x": -1.0698, + "y": -3.2925 + }, + { + "type": "atom", + "element": "O", + "index": 51, + "x": 0.0, + "y": 0.0 + }, + { + "type": "atom", + "element": "O", + "index": 52, + "x": 1.2466, + "y": -5.8653 + }, + { + "type": "atom", + "element": "O", + "index": 53, + "x": 23.3474, + "y": -6.2075 + }, + { + "type": "atom", + "element": "O", + "index": 54, + "x": 24.4172, + "y": -2.915 + }, + { + "type": "atom", + "element": "O", + "index": 55, + "x": 22.1008, + "y": -0.3423 + }, + { + "type": "bond", + "a": 0, + "b": 4, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 4, + "b": 3, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 3, + "b": 2, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 2, + "b": 1, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 1, + "b": 0, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 2, + "b": 7, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 7, + "b": 6, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 6, + "b": 5, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 5, + "b": 1, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 2, + "b": 8, + "lines": [ + "inward" + ] + }, + { + "type": "bond", + "a": 1, + "b": 9, + "lines": [ + "inward" + ] + }, + { + "type": "bond", + "a": 5, + "b": 10, + "lines": [ + "inward" + ] + }, + { + "type": "bond", + "a": 3, + "b": 11, + "lines": [ + "outward" + ] + }, + { + "type": "bond", + "a": 12, + "b": 13, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 12, + "b": 14, + "lines": [ + "solid", + "solid" + ], + "centered": true + }, + { + "type": "bond", + "a": 13, + "b": 15, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 15, + "b": 16, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 16, + "b": 17, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 17, + "b": 18, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 18, + "b": 19, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 19, + "b": 20, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 20, + "b": 21, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 21, + "b": 22, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 22, + "b": 23, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 23, + "b": 24, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 24, + "b": 25, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 25, + "b": 26, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 26, + "b": 27, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 27, + "b": 28, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 28, + "b": 29, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 29, + "b": 30, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 12, + "b": 11, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 31, + "b": 32, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 31, + "b": 33, + "lines": [ + "solid", + "solid" + ], + "centered": true + }, + { + "type": "bond", + "a": 32, + "b": 34, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 34, + "b": 35, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 35, + "b": 36, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 36, + "b": 37, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 37, + "b": 38, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 38, + "b": 39, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 39, + "b": 40, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 40, + "b": 41, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 41, + "b": 42, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 42, + "b": 43, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 43, + "b": 44, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 44, + "b": 45, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 45, + "b": 46, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 46, + "b": 47, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 47, + "b": 48, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 48, + "b": 49, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 31, + "b": 10, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 25, + "b": 50, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 50, + "b": 24, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 28, + "b": 51, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 51, + "b": 27, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 22, + "b": 52, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 52, + "b": 21, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 47, + "b": 53, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 53, + "b": 46, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 44, + "b": 54, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 54, + "b": 43, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 41, + "b": 55, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 55, + "b": 40, + "lines": [ + "solid" + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/molecules/ethylene_oxide.json b/kubejs/assets/tfg/molecules/ethylene_oxide.json new file mode 100644 index 000000000..dfc63995e --- /dev/null +++ b/kubejs/assets/tfg/molecules/ethylene_oxide.json @@ -0,0 +1,107 @@ +{ + "contents": [ + { + "type": "atom", + "index": 0, + "x": 0.866, + "y": -0.5 + }, + { + "type": "atom", + "index": 1, + "x": 1.866, + "y": -0.5 + }, + { + "type": "atom", + "element": "O", + "index": 2, + "x": 1.366, + "y": 0.3661 + }, + { + "type": "atom", + "element": "H", + "index": 3, + "x": 2.732, + "y": -1.0 + }, + { + "type": "atom", + "element": "H", + "index": 4, + "x": 0.0, + "y": -1.0 + }, + { + "type": "atom", + "element": "H", + "index": 5, + "x": 0.0, + "y": 0.0 + }, + { + "type": "atom", + "element": "H", + "index": 6, + "x": 2.732, + "y": 0.0 + }, + { + "type": "bond", + "a": 0, + "b": 1, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 0, + "b": 2, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 2, + "b": 1, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 1, + "b": 3, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 0, + "b": 4, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 0, + "b": 5, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 1, + "b": 6, + "lines": [ + "solid" + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/molecules/fructose.json b/kubejs/assets/tfg/molecules/fructose.json new file mode 100644 index 000000000..957051a45 --- /dev/null +++ b/kubejs/assets/tfg/molecules/fructose.json @@ -0,0 +1,183 @@ +{ + "contents": [ + { + "type": "atom", + "element": "O", + "index": 0, + "x": 1.675, + "y": -0.9122 + }, + { + "type": "atom", + "index": 1, + "x": 2.484, + "y": -1.5 + }, + { + "type": "atom", + "index": 2, + "x": 2.175, + "y": -2.451 + }, + { + "type": "atom", + "index": 3, + "x": 1.175, + "y": -2.451 + }, + { + "type": "atom", + "index": 4, + "x": 0.866, + "y": -1.5 + }, + { + "type": "atom", + "index": 5, + "x": 0.866, + "y": -0.5 + }, + { + "type": "atom", + "index": 6, + "x": 2.484, + "y": -2.5 + }, + { + "type": "atom", + "element": "O", + "right": "H", + "index": 7, + "x": 2.484, + "y": -0.5 + }, + { + "type": "atom", + "element": "O", + "left": "H", + "index": 8, + "x": 0.0, + "y": 0.0 + }, + { + "type": "atom", + "element": "O", + "right": "H", + "index": 9, + "x": 3.35, + "y": -3.0 + }, + { + "type": "atom", + "element": "O", + "left": "H", + "index": 10, + "x": 2.05, + "y": -1.5 + }, + { + "type": "atom", + "element": "O", + "right": "H", + "index": 11, + "x": 1.175, + "y": -3.451 + }, + { + "type": "bond", + "a": 0, + "b": 4, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 4, + "b": 3, + "lines": [ + "outward" + ] + }, + { + "type": "bond", + "a": 3, + "b": 2, + "lines": [ + "thick" + ] + }, + { + "type": "bond", + "a": 1, + "b": 0, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 1, + "b": 2, + "lines": [ + "outward" + ] + }, + { + "type": "bond", + "a": 4, + "b": 5, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 1, + "b": 6, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 1, + "b": 7, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 5, + "b": 8, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 6, + "b": 9, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 2, + "b": 10, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 3, + "b": 11, + "lines": [ + "solid" + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/molecules/galactose.json b/kubejs/assets/tfg/molecules/galactose.json new file mode 100644 index 000000000..eb3196ec9 --- /dev/null +++ b/kubejs/assets/tfg/molecules/galactose.json @@ -0,0 +1,183 @@ +{ + "contents": [ + { + "type": "atom", + "index": 0, + "x": 1.5, + "y": -3.5981 + }, + { + "type": "atom", + "index": 1, + "x": 2.0, + "y": -2.7321 + }, + { + "type": "atom", + "element": "O", + "index": 2, + "x": 1.5, + "y": -1.8661 + }, + { + "type": "atom", + "index": 3, + "x": 0.5, + "y": -1.8661 + }, + { + "type": "atom", + "index": 4, + "x": 0.0, + "y": -2.7321 + }, + { + "type": "atom", + "index": 5, + "x": 0.5, + "y": -3.5981 + }, + { + "type": "atom", + "index": 6, + "x": 0.5, + "y": -0.8661 + }, + { + "type": "atom", + "element": "O", + "left": "H", + "index": 7, + "x": 0.0, + "y": 0.0 + }, + { + "type": "atom", + "element": "O", + "right": "H", + "index": 8, + "x": 2.0, + "y": -3.7321 + }, + { + "type": "atom", + "element": "O", + "right": "H", + "index": 9, + "x": 1.5, + "y": -4.5981 + }, + { + "type": "atom", + "element": "O", + "right": "H", + "index": 10, + "x": 0.5, + "y": -2.5981 + }, + { + "type": "atom", + "element": "O", + "left": "H", + "index": 11, + "x": 0.0, + "y": -1.7321 + }, + { + "type": "bond", + "a": 5, + "b": 0, + "lines": [ + "thick" + ] + }, + { + "type": "bond", + "a": 1, + "b": 2, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 2, + "b": 3, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 3, + "b": 4, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 4, + "b": 5, + "lines": [ + "outward" + ] + }, + { + "type": "bond", + "a": 1, + "b": 0, + "lines": [ + "outward" + ] + }, + { + "type": "bond", + "a": 3, + "b": 6, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 6, + "b": 7, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 1, + "b": 8, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 0, + "b": 9, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 5, + "b": 10, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 4, + "b": 11, + "lines": [ + "solid" + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/molecules/glucose.json b/kubejs/assets/tfg/molecules/glucose.json new file mode 100644 index 000000000..890c2c2db --- /dev/null +++ b/kubejs/assets/tfg/molecules/glucose.json @@ -0,0 +1,183 @@ +{ + "contents": [ + { + "type": "atom", + "index": 0, + "x": 1.5, + "y": -3.5981 + }, + { + "type": "atom", + "index": 1, + "x": 2.0, + "y": -2.7321 + }, + { + "type": "atom", + "element": "O", + "index": 2, + "x": 1.5, + "y": -1.8661 + }, + { + "type": "atom", + "index": 3, + "x": 0.5, + "y": -1.8661 + }, + { + "type": "atom", + "index": 4, + "x": 0.0, + "y": -2.7321 + }, + { + "type": "atom", + "index": 5, + "x": 0.5, + "y": -3.5981 + }, + { + "type": "atom", + "index": 6, + "x": 0.5, + "y": -0.8661 + }, + { + "type": "atom", + "element": "O", + "left": "H", + "index": 7, + "x": 0.0, + "y": 0.0 + }, + { + "type": "atom", + "element": "O", + "right": "H", + "index": 8, + "x": 2.0, + "y": -3.7321 + }, + { + "type": "atom", + "element": "O", + "left": "H", + "index": 9, + "x": 0.0, + "y": -3.7321 + }, + { + "type": "atom", + "element": "O", + "right": "H", + "index": 10, + "x": 0.5, + "y": -2.5981 + }, + { + "type": "atom", + "element": "O", + "right": "H", + "index": 11, + "x": 1.5, + "y": -4.5981 + }, + { + "type": "bond", + "a": 5, + "b": 0, + "lines": [ + "thick" + ] + }, + { + "type": "bond", + "a": 1, + "b": 2, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 2, + "b": 3, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 3, + "b": 4, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 4, + "b": 5, + "lines": [ + "outward" + ] + }, + { + "type": "bond", + "a": 1, + "b": 0, + "lines": [ + "outward" + ] + }, + { + "type": "bond", + "a": 3, + "b": 6, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 6, + "b": 7, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 1, + "b": 8, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 4, + "b": 9, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 5, + "b": 10, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 0, + "b": 11, + "lines": [ + "solid" + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/molecules/isosorbide.json b/kubejs/assets/tfg/molecules/isosorbide.json new file mode 100644 index 000000000..c74ac4c63 --- /dev/null +++ b/kubejs/assets/tfg/molecules/isosorbide.json @@ -0,0 +1,188 @@ +{ + "contents": [ + { + "type": "atom", + "element": "O", + "index": 0, + "x": 2.0691, + "y": 1.2298 + }, + { + "type": "atom", + "index": 1, + "x": 1.7601, + "y": 0.2788 + }, + { + "type": "atom", + "index": 2, + "x": 2.5691, + "y": -0.309 + }, + { + "type": "atom", + "index": 3, + "x": 3.3781, + "y": 0.2788 + }, + { + "type": "atom", + "index": 4, + "x": 3.0691, + "y": 1.2298 + }, + { + "type": "atom", + "index": 5, + "x": 0.9511, + "y": -0.309 + }, + { + "type": "atom", + "index": 6, + "x": 1.2601, + "y": -1.26 + }, + { + "type": "atom", + "element": "O", + "index": 7, + "x": 2.2601, + "y": -1.26 + }, + { + "type": "atom", + "element": "H", + "index": 8, + "x": 3.3781, + "y": -0.8968 + }, + { + "type": "atom", + "element": "H", + "index": 9, + "x": 0.9511, + "y": 0.8666 + }, + { + "type": "atom", + "element": "O", + "left": "H", + "index": 10, + "x": 0.0, + "y": 0.0 + }, + { + "type": "atom", + "element": "O", + "right": "H", + "index": 11, + "x": 4.3292, + "y": -0.0302 + }, + { + "type": "bond", + "a": 0, + "b": 4, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 4, + "b": 3, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 3, + "b": 2, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 2, + "b": 1, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 1, + "b": 0, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 2, + "b": 7, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 7, + "b": 6, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 6, + "b": 5, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 5, + "b": 1, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 2, + "b": 8, + "lines": [ + "inward" + ] + }, + { + "type": "bond", + "a": 1, + "b": 9, + "lines": [ + "inward" + ] + }, + { + "type": "bond", + "a": 5, + "b": 10, + "lines": [ + "inward" + ] + }, + { + "type": "bond", + "a": 3, + "b": 11, + "lines": [ + "outward" + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/molecules/isosorbide_ln.json b/kubejs/assets/tfg/molecules/isosorbide_ln.json new file mode 100644 index 000000000..5de795e84 --- /dev/null +++ b/kubejs/assets/tfg/molecules/isosorbide_ln.json @@ -0,0 +1,730 @@ +{ + "contents": [ + { + "type": "atom", + "element": "O", + "index": 0, + "x": 11.5627, + "y": -3.3721 + }, + { + "type": "atom", + "index": 1, + "x": 11.8717, + "y": -2.4211 + }, + { + "type": "atom", + "index": 2, + "x": 11.0627, + "y": -1.8333 + }, + { + "type": "atom", + "index": 3, + "x": 10.2537, + "y": -2.4211 + }, + { + "type": "atom", + "index": 4, + "x": 10.5627, + "y": -3.3721 + }, + { + "type": "atom", + "index": 5, + "x": 12.6807, + "y": -1.8333 + }, + { + "type": "atom", + "index": 6, + "x": 12.3717, + "y": -0.8822 + }, + { + "type": "atom", + "element": "O", + "index": 7, + "x": 11.3717, + "y": -0.8822 + }, + { + "type": "atom", + "element": "H", + "index": 8, + "x": 10.2537, + "y": -1.2455 + }, + { + "type": "atom", + "element": "H", + "index": 9, + "x": 12.6807, + "y": -3.0088 + }, + { + "type": "atom", + "element": "O", + "index": 10, + "x": 13.6318, + "y": -2.1423 + }, + { + "type": "atom", + "element": "O", + "index": 11, + "x": 9.3026, + "y": -2.112 + }, + { + "type": "atom", + "index": 12, + "x": 8.5595, + "y": -2.7812 + }, + { + "type": "atom", + "index": 13, + "x": 7.6084, + "y": -2.4722 + }, + { + "type": "atom", + "element": "O", + "index": 14, + "x": 8.7674, + "y": -3.7593 + }, + { + "type": "atom", + "index": 15, + "x": 6.8653, + "y": -3.1413 + }, + { + "type": "atom", + "index": 16, + "x": 5.9142, + "y": -2.8323 + }, + { + "type": "atom", + "index": 17, + "x": 5.1711, + "y": -3.5014 + }, + { + "type": "atom", + "index": 18, + "x": 4.22, + "y": -3.1924 + }, + { + "type": "atom", + "index": 19, + "x": 3.4769, + "y": -3.8615 + }, + { + "type": "atom", + "index": 20, + "x": 2.5258, + "y": -3.5525 + }, + { + "type": "atom", + "index": 21, + "x": 1.7827, + "y": -4.2216 + }, + { + "type": "atom", + "index": 22, + "x": 0.8316, + "y": -3.9126 + }, + { + "type": "atom", + "index": 23, + "x": 0.6237, + "y": -2.9345 + }, + { + "type": "atom", + "index": 24, + "x": -0.3274, + "y": -2.6254 + }, + { + "type": "atom", + "index": 25, + "x": -0.5353, + "y": -1.6473 + }, + { + "type": "atom", + "index": 26, + "x": 0.2079, + "y": -0.9782 + }, + { + "type": "atom", + "index": 27, + "x": 0.0, + "y": 0.0 + }, + { + "type": "atom", + "index": 28, + "x": 0.7431, + "y": 0.6691 + }, + { + "type": "atom", + "index": 29, + "x": 1.6942, + "y": 0.3601 + }, + { + "type": "atom", + "index": 30, + "x": 2.4373, + "y": 1.0292 + }, + { + "type": "atom", + "index": 31, + "x": 14.3749, + "y": -1.4732 + }, + { + "type": "atom", + "index": 32, + "x": 15.326, + "y": -1.7822 + }, + { + "type": "atom", + "element": "O", + "index": 33, + "x": 14.167, + "y": -0.495 + }, + { + "type": "atom", + "index": 34, + "x": 16.0691, + "y": -1.113 + }, + { + "type": "atom", + "index": 35, + "x": 17.0202, + "y": -1.4221 + }, + { + "type": "atom", + "index": 36, + "x": 17.7633, + "y": -0.7529 + }, + { + "type": "atom", + "index": 37, + "x": 18.7144, + "y": -1.062 + }, + { + "type": "atom", + "index": 38, + "x": 19.4575, + "y": -0.3928 + }, + { + "type": "atom", + "index": 39, + "x": 20.4086, + "y": -0.7018 + }, + { + "type": "atom", + "index": 40, + "x": 21.1517, + "y": -0.0327 + }, + { + "type": "atom", + "index": 41, + "x": 22.1028, + "y": -0.3417 + }, + { + "type": "atom", + "index": 42, + "x": 22.3107, + "y": -1.3199 + }, + { + "type": "atom", + "index": 43, + "x": 23.2618, + "y": -1.6289 + }, + { + "type": "atom", + "index": 44, + "x": 23.4697, + "y": -2.607 + }, + { + "type": "atom", + "index": 45, + "x": 22.7265, + "y": -3.2762 + }, + { + "type": "atom", + "index": 46, + "x": 22.9344, + "y": -4.2543 + }, + { + "type": "atom", + "index": 47, + "x": 22.1913, + "y": -4.9234 + }, + { + "type": "atom", + "index": 48, + "x": 21.2402, + "y": -4.6144 + }, + { + "type": "atom", + "index": 49, + "x": 20.4971, + "y": -5.2836 + }, + { + "type": "bond", + "a": 0, + "b": 4, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 4, + "b": 3, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 3, + "b": 2, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 2, + "b": 1, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 1, + "b": 0, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 2, + "b": 7, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 7, + "b": 6, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 6, + "b": 5, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 5, + "b": 1, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 2, + "b": 8, + "lines": [ + "inward" + ] + }, + { + "type": "bond", + "a": 1, + "b": 9, + "lines": [ + "inward" + ] + }, + { + "type": "bond", + "a": 5, + "b": 10, + "lines": [ + "inward" + ] + }, + { + "type": "bond", + "a": 3, + "b": 11, + "lines": [ + "outward" + ] + }, + { + "type": "bond", + "a": 12, + "b": 13, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 12, + "b": 14, + "lines": [ + "solid", + "solid" + ], + "centered": true + }, + { + "type": "bond", + "a": 13, + "b": 15, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 15, + "b": 16, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 16, + "b": 17, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 17, + "b": 18, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 18, + "b": 19, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 19, + "b": 20, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 20, + "b": 21, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 22, + "b": 21, + "lines": [ + "solid", + "solid" + ] + }, + { + "type": "bond", + "a": 22, + "b": 23, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 23, + "b": 24, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 25, + "b": 24, + "lines": [ + "solid", + "solid" + ] + }, + { + "type": "bond", + "a": 25, + "b": 26, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 26, + "b": 27, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 28, + "b": 27, + "lines": [ + "solid", + "solid" + ] + }, + { + "type": "bond", + "a": 28, + "b": 29, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 29, + "b": 30, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 12, + "b": 11, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 31, + "b": 32, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 31, + "b": 33, + "lines": [ + "solid", + "solid" + ], + "centered": true + }, + { + "type": "bond", + "a": 32, + "b": 34, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 34, + "b": 35, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 35, + "b": 36, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 36, + "b": 37, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 37, + "b": 38, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 38, + "b": 39, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 39, + "b": 40, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 41, + "b": 40, + "lines": [ + "solid", + "solid" + ] + }, + { + "type": "bond", + "a": 41, + "b": 42, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 42, + "b": 43, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 44, + "b": 43, + "lines": [ + "solid", + "solid" + ] + }, + { + "type": "bond", + "a": 44, + "b": 45, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 45, + "b": 46, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 47, + "b": 46, + "lines": [ + "solid", + "solid" + ] + }, + { + "type": "bond", + "a": 47, + "b": 48, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 48, + "b": 49, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 31, + "b": 10, + "lines": [ + "solid" + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/molecules/linolenic_acid.json b/kubejs/assets/tfg/molecules/linolenic_acid.json new file mode 100644 index 000000000..de8f44aac --- /dev/null +++ b/kubejs/assets/tfg/molecules/linolenic_acid.json @@ -0,0 +1,284 @@ +{ + "contents": [ + { + "type": "atom", + "index": 0, + "x": 0.0, + "y": -1.0 + }, + { + "type": "atom", + "index": 1, + "x": 0.866, + "y": -1.5 + }, + { + "type": "atom", + "element": "O", + "left": "H", + "index": 2, + "x": -0.866, + "y": -1.5 + }, + { + "type": "atom", + "element": "O", + "index": 3, + "x": 0.0, + "y": 0.0 + }, + { + "type": "atom", + "index": 4, + "x": 1.732, + "y": -1.0 + }, + { + "type": "atom", + "index": 5, + "x": 2.5981, + "y": -1.5 + }, + { + "type": "atom", + "index": 6, + "x": 3.4641, + "y": -1.0 + }, + { + "type": "atom", + "index": 7, + "x": 4.3301, + "y": -1.5 + }, + { + "type": "atom", + "index": 8, + "x": 5.1961, + "y": -1.0 + }, + { + "type": "atom", + "index": 9, + "x": 6.0622, + "y": -1.5 + }, + { + "type": "atom", + "index": 10, + "x": 6.9282, + "y": -1.0 + }, + { + "type": "atom", + "index": 11, + "x": 7.9282, + "y": -1.0 + }, + { + "type": "atom", + "index": 12, + "x": 8.7942, + "y": -1.5 + }, + { + "type": "atom", + "index": 13, + "x": 9.6602, + "y": -1.0 + }, + { + "type": "atom", + "index": 14, + "x": 10.6602, + "y": -1.0 + }, + { + "type": "atom", + "index": 15, + "x": 11.5263, + "y": -1.5 + }, + { + "type": "atom", + "index": 16, + "x": 12.3923, + "y": -1.0 + }, + { + "type": "atom", + "index": 17, + "x": 13.3923, + "y": -1.0 + }, + { + "type": "atom", + "index": 18, + "x": 14.2583, + "y": -1.5 + }, + { + "type": "atom", + "index": 19, + "x": 15.1243, + "y": -1.0 + }, + { + "type": "bond", + "a": 0, + "b": 1, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 0, + "b": 2, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 0, + "b": 3, + "lines": [ + "solid", + "solid" + ], + "centered": true + }, + { + "type": "bond", + "a": 1, + "b": 4, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 4, + "b": 5, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 5, + "b": 6, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 6, + "b": 7, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 7, + "b": 8, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 8, + "b": 9, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 9, + "b": 10, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 11, + "b": 10, + "lines": [ + "solid", + "solid" + ] + }, + { + "type": "bond", + "a": 11, + "b": 12, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 12, + "b": 13, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 14, + "b": 13, + "lines": [ + "solid", + "solid" + ] + }, + { + "type": "bond", + "a": 14, + "b": 15, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 15, + "b": 16, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 17, + "b": 16, + "lines": [ + "solid", + "solid" + ] + }, + { + "type": "bond", + "a": 17, + "b": 18, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 18, + "b": 19, + "lines": [ + "solid" + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/molecules/methylene_diphenyl_dicarbamate.json b/kubejs/assets/tfg/molecules/methylene_diphenyl_dicarbamate.json index aa88c9920..aa47fd688 100644 --- a/kubejs/assets/tfg/molecules/methylene_diphenyl_dicarbamate.json +++ b/kubejs/assets/tfg/molecules/methylene_diphenyl_dicarbamate.json @@ -1,330 +1,380 @@ { - "contents": [ - { - "type": "atom", - "index": 0, - "x": 4.3301, - "y": -0.50009999999999977 - }, - { - "type": "atom", - "index": 1, - "x": 3.4641, - "y": -2.0001000000000007 - }, - { - "type": "atom", - "index": 2, - "x": 4.3301, - "y": -1.5001000000000007 - }, - { - "type": "atom", - "index": 3, - "x": 2.5980999999999987, - "y": -1.5001000000000007 - }, - { - "type": "atom", - "index": 4, - "x": 3.4641, - "y": 0 - }, - { - "type": "atom", - "index": 5, - "x": 2.5980999999999987, - "y": -0.50009999999999977 - }, - { - "type": "atom", - "index": 6, - "x": 5.1961999999999993, - "y": -2.0001000000000007 - }, - { - "type": "atom", - "index": 7, - "x": 6.0621999999999989, - "y": -1.5001000000000007 - }, - { - "type": "atom", - "index": 8, - "x": 6.9281999999999986, - "y": 0 - }, - { - "type": "atom", - "index": 9, - "x": 6.0621999999999989, - "y": -0.50009999999999977 - }, - { - "type": "atom", - "index": 10, - "x": 7.7941999999999982, - "y": -0.50009999999999977 - }, - { - "type": "atom", - "index": 11, - "x": 6.9281999999999986, - "y": -2.0001000000000007 - }, - { - "type": "atom", - "index": 12, - "x": 7.7941999999999982, - "y": -1.5001000000000007 - }, - { - "type": "atom", - "element": "O", - "index": 13, - "x": 1.7320999999999991, - "y": 0 - }, - { - "type": "atom", - "element": "O", - "index": 14, - "x": 8.6603000000000012, - "y": 0 - }, - { - "type": "atom", - "index": 15, - "x": 0.86599999999999966, - "y": -0.50009999999999977 - }, - { - "type": "atom", - "element": "O", - "index": 16, - "x": 0.86599999999999966, - "y": -1.4999999999999991 - }, - { - "type": "atom", - "element": "N", - "left": [ - "H", - 2 - ], - "index": 17, - "x": 0.0, - "y": 0.0 - }, - { - "type": "atom", - "index": 18, - "x": 9.5263, - "y": -0.50009999999999977 - }, - { - "type": "atom", - "element": "N", - "right": [ - "H", - 2 - ], - "index": 19, - "x": 9.5263, - "y": -1.5 - }, - { - "type": "atom", - "element": "O", - "index": 20, - "x": 10.3924, - "y": 0.0 - }, - { - "type": "bond", - "a": 2, - "b": 0, - "lines": [ - "solid", - "solid" - ] - }, - { - "type": "bond", - "a": 0, - "b": 4, - "lines": [ - "solid" - ] - }, - { - "type": "bond", - "a": 4, - "b": 5, - "lines": [ - "solid", - "solid" - ] - }, - { - "type": "bond", - "a": 5, - "b": 3, - "lines": [ - "solid" - ] - }, - { - "type": "bond", - "a": 3, - "b": 1, - "lines": [ - "solid", - "solid" - ] - }, - { - "type": "bond", - "a": 1, - "b": 2, - "lines": [ - "solid" - ] - }, - { - "type": "bond", - "a": 2, - "b": 6, - "lines": [ - "solid" - ] - }, - { - "type": "bond", - "a": 6, - "b": 7, - "lines": [ - "solid" - ] - }, - { - "type": "bond", - "a": 9, - "b": 7, - "lines": [ - "solid", - "solid" - ] - }, - { - "type": "bond", - "a": 7, - "b": 11, - "lines": [ - "solid" - ] - }, - { - "type": "bond", - "a": 11, - "b": 12, - "lines": [ - "solid", - "solid" - ] - }, - { - "type": "bond", - "a": 12, - "b": 10, - "lines": [ - "solid" - ] - }, - { - "type": "bond", - "a": 10, - "b": 8, - "lines": [ - "solid", - "solid" - ] - }, - { - "type": "bond", - "a": 8, - "b": 9, - "lines": [ - "solid" - ] - }, - { - "type": "bond", - "a": 5, - "b": 13, - "lines": [ - "solid" - ] - }, - { - "type": "bond", - "a": 10, - "b": 14, - "lines": [ - "solid" - ] - }, - { - "type": "bond", - "a": 13, - "b": 15, - "lines": [ - "solid" - ] - }, - { - "type": "bond", - "a": 15, - "b": 16, - "lines": [ - "solid", - "solid" - ], - "centered": true - }, - { - "type": "bond", - "a": 15, - "b": 17, - "lines": [ - "solid" - ] - }, - { - "type": "bond", - "a": 14, - "b": 18, - "lines": [ - "solid" - ] - }, - { - "type": "bond", - "a": 18, - "b": 19, - "lines": [ - "solid" - ] - }, - { - "type": "bond", - "a": 18, - "b": 20, - "lines": [ - "solid", - "solid" - ], - "centered": true - } - ] + "contents": [ + { + "type": "atom", + "index": 0, + "x": 3.4641, + "y": 0.0 + }, + { + "type": "atom", + "index": 1, + "x": 5.1962, + "y": 0.0 + }, + { + "type": "atom", + "index": 2, + "x": 4.3301, + "y": 0.5 + }, + { + "type": "atom", + "index": 3, + "x": 5.1962, + "y": -1.0 + }, + { + "type": "atom", + "index": 4, + "x": 3.4641, + "y": -1.0 + }, + { + "type": "atom", + "index": 5, + "x": 4.3301, + "y": -1.5 + }, + { + "type": "atom", + "index": 6, + "x": 6.0622, + "y": -1.5 + }, + { + "type": "atom", + "index": 7, + "x": 6.9282, + "y": -1.0 + }, + { + "type": "atom", + "index": 8, + "x": 7.7943, + "y": 0.5 + }, + { + "type": "atom", + "index": 9, + "x": 6.9282, + "y": 0.0 + }, + { + "type": "atom", + "index": 10, + "x": 8.6603, + "y": 0.0 + }, + { + "type": "atom", + "index": 11, + "x": 7.7943, + "y": -1.5 + }, + { + "type": "atom", + "index": 12, + "x": 8.6603, + "y": -1.0 + }, + { + "type": "atom", + "element": "N", + "index": 13, + "x": 2.5981, + "y": 0.5 + }, + { + "type": "atom", + "element": "N", + "index": 14, + "x": 9.5263, + "y": 0.5 + }, + { + "type": "atom", + "element": "H", + "index": 15, + "x": 2.5981, + "y": 1.5 + }, + { + "type": "atom", + "index": 16, + "x": 1.7321, + "y": 0.0 + }, + { + "type": "atom", + "index": 17, + "x": 10.3923, + "y": 0.0 + }, + { + "type": "atom", + "element": "H", + "index": 18, + "x": 9.5263, + "y": 1.5 + }, + { + "type": "atom", + "element": "O", + "index": 19, + "x": 0.866, + "y": 0.5 + }, + { + "type": "atom", + "element": "O", + "index": 20, + "x": 1.7321, + "y": -1.0 + }, + { + "type": "atom", + "element": "O", + "index": 21, + "x": 10.3923, + "y": -1.0 + }, + { + "type": "atom", + "element": "O", + "index": 22, + "x": 11.2584, + "y": 0.5 + }, + { + "type": "atom", + "index": 23, + "x": 12.1244, + "y": 0.0 + }, + { + "type": "atom", + "index": 24, + "x": 0.0, + "y": 0.0 + }, + { + "type": "bond", + "a": 2, + "b": 0, + "lines": [ + "solid", + "solid" + ] + }, + { + "type": "bond", + "a": 0, + "b": 4, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 4, + "b": 5, + "lines": [ + "solid", + "solid" + ] + }, + { + "type": "bond", + "a": 5, + "b": 3, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 3, + "b": 1, + "lines": [ + "solid", + "solid" + ] + }, + { + "type": "bond", + "a": 1, + "b": 2, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 3, + "b": 6, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 6, + "b": 7, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 9, + "b": 7, + "lines": [ + "solid", + "solid" + ] + }, + { + "type": "bond", + "a": 7, + "b": 11, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 11, + "b": 12, + "lines": [ + "solid", + "solid" + ] + }, + { + "type": "bond", + "a": 12, + "b": 10, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 10, + "b": 8, + "lines": [ + "solid", + "solid" + ] + }, + { + "type": "bond", + "a": 8, + "b": 9, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 0, + "b": 13, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 10, + "b": 14, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 13, + "b": 15, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 13, + "b": 16, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 14, + "b": 17, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 14, + "b": 18, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 16, + "b": 19, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 16, + "b": 20, + "lines": [ + "solid", + "solid" + ], + "centered": true + }, + { + "type": "bond", + "a": 17, + "b": 21, + "lines": [ + "solid", + "solid" + ], + "centered": true + }, + { + "type": "bond", + "a": 17, + "b": 22, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 22, + "b": 23, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 19, + "b": 24, + "lines": [ + "solid" + ] + } + ] } \ No newline at end of file diff --git a/kubejs/assets/tfg/molecules/sorbitol.json b/kubejs/assets/tfg/molecules/sorbitol.json new file mode 100644 index 000000000..7ba316f37 --- /dev/null +++ b/kubejs/assets/tfg/molecules/sorbitol.json @@ -0,0 +1,176 @@ +{ + "contents": [ + { + "type": "atom", + "element": "O", + "right": "H", + "index": 0, + "x": 0.0, + "y": 0.0 + }, + { + "type": "atom", + "index": 1, + "x": 0.866, + "y": 0.5 + }, + { + "type": "atom", + "index": 2, + "x": 1.7321, + "y": 0.0 + }, + { + "type": "atom", + "index": 3, + "x": 2.5981, + "y": 0.5 + }, + { + "type": "atom", + "index": 4, + "x": 3.4641, + "y": 0.0 + }, + { + "type": "atom", + "index": 5, + "x": 4.3301, + "y": 0.5 + }, + { + "type": "atom", + "index": 6, + "x": 5.1962, + "y": 0.0 + }, + { + "type": "atom", + "element": "O", + "right": "H", + "index": 7, + "x": 6.0622, + "y": 0.5 + }, + { + "type": "atom", + "element": "O", + "right": "H", + "index": 8, + "x": 4.3301, + "y": 1.5 + }, + { + "type": "atom", + "element": "O", + "right": "H", + "index": 9, + "x": 3.4641, + "y": -1.0 + }, + { + "type": "atom", + "element": "O", + "right": "H", + "index": 10, + "x": 2.5981, + "y": 1.5 + }, + { + "type": "atom", + "element": "O", + "right": "H", + "index": 11, + "x": 1.7321, + "y": -1.0 + }, + { + "type": "bond", + "a": 0, + "b": 1, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 1, + "b": 2, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 2, + "b": 3, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 3, + "b": 4, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 4, + "b": 5, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 5, + "b": 6, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 6, + "b": 7, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 5, + "b": 8, + "lines": [ + "outward" + ] + }, + { + "type": "bond", + "a": 4, + "b": 9, + "lines": [ + "outward" + ] + }, + { + "type": "bond", + "a": 3, + "b": 10, + "lines": [ + "outward" + ] + }, + { + "type": "bond", + "a": 2, + "b": 11, + "lines": [ + "inward" + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/molecules/trimethylamine.json b/kubejs/assets/tfg/molecules/trimethylamine.json new file mode 100644 index 000000000..80e341a2d --- /dev/null +++ b/kubejs/assets/tfg/molecules/trimethylamine.json @@ -0,0 +1,53 @@ +{ + "contents": [ + { + "type": "atom", + "element": "N", + "index": 0, + "x": 0.866, + "y": 0.5 + }, + { + "type": "atom", + "index": 1, + "x": 0.866, + "y": 1.5 + }, + { + "type": "atom", + "index": 2, + "x": 1.732, + "y": 0.0 + }, + { + "type": "atom", + "index": 3, + "x": 0.0, + "y": 0.0 + }, + { + "type": "bond", + "a": 0, + "b": 1, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 0, + "b": 2, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 0, + "b": 3, + "lines": [ + "solid" + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/molecules/urea.json b/kubejs/assets/tfg/molecules/urea.json new file mode 100644 index 000000000..10d871325 --- /dev/null +++ b/kubejs/assets/tfg/molecules/urea.json @@ -0,0 +1,65 @@ +{ + "contents": [ + { + "type": "atom", + "element": "N", + "right": [ + "H", + 2 + ], + "index": 0, + "x": 1.732, + "y": 0.0 + }, + { + "type": "atom", + "index": 1, + "x": 0.866, + "y": 0.5 + }, + { + "type": "atom", + "element": "N", + "left": [ + "H", + 2 + ], + "index": 2, + "x": 0.0, + "y": 0.0 + }, + { + "type": "atom", + "element": "O", + "index": 3, + "x": 0.866, + "y": 1.5 + }, + { + "type": "bond", + "a": 0, + "b": 1, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 1, + "b": 2, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 1, + "b": 3, + "lines": [ + "solid", + "solid" + ], + "centered": true + } + ] +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js b/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js index a6257a9c3..5562aac3f 100644 --- a/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js +++ b/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js @@ -568,6 +568,87 @@ function registerTFGNuclearRecipes(event) { //#endregion - + //#region Epoxidized Isosorbide Linolenate + + event.recipes.gtceu.distillery('tfg:linolenic_from_seed') + .inputFluids(Fluid.of('gtceu:seed_oil', 1000)) + .outputFluids(Fluid.of('tfg:linolenic_acid', 10)) + .circuit(2) + .duration(100) + .EUt(GTValues.VA[GTValues.MV]) + event.recipes.gtceu.distillery('tfg:linolenic_from_olive') + .inputFluids(Fluid.of('tfc:olive_oil', 1000)) + .outputFluids(Fluid.of('tfg:linolenic_acid', 20)) + .circuit(2) + .duration(100) + .EUt(GTValues.VA[GTValues.MV]) + event.recipes.gtceu.distillery('tfg:linolenic_from_soybean') + .inputFluids(Fluid.of('firmalife:soybean_oil', 1000)) + .outputFluids(Fluid.of('tfg:linolenic_acid', 50)) + .circuit(2) + .duration(100) + .EUt(GTValues.VA[GTValues.MV]) + + //These two might not fit here but eh + event.recipes.gtceu.chemical_reactor('tfg:sucrose_to_monos') + .itemInputs('8x #tfg:sugars') + .inputFluids(Fluid.of('minecraft:water', 8000), Fluid.of('gtceu:sulfuric_acid', 200)) + .circuit(2) + .itemOutputs('24x #forge:dusts/glucose', '24x #forge:dusts/fructose') + .duration(400) + .EUt(GTValues.VA[GTValues.IV]) + event.recipes.gtceu.chemical_reactor('tfg:lactose_to_monos') + .itemInputs('8x #forge:dusts/lactose') + .inputFluids(Fluid.of('minecraft:water', 8000), Fluid.of('gtceu:sulfuric_acid', 200)) + .circuit(2) + .itemOutputs('24x #forge:dusts/glucose', '24x #forge:dusts/galactose') + .duration(400) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.chemical_reactor('tfg:glucose_to_sorbitol') + .itemInputs('12x #forge:dusts/glucose') + .inputFluids(Fluid.of('gtceu:hydrogen', 2000)) + .notConsumable('#forge:dusts/ruthenium') + .circuit(2) + .itemOutputs('13x #forge:dusts/sorbitol') + .duration(100) + .EUt(GTValues.VA[GTValues.EV]) + + event.recipes.gtceu.chemical_reactor('tfg:sorbitol_to_sorbitan') + .itemInputs('26x #forge:dusts/sorbitol') + .inputFluids(Fluid.of('tfg:dimethyl_carbonate', 1000)) + .notConsumable('#forge:dusts/potassium_hydroxide') + .circuit(3) + .itemOutputs('23x #forge:dusts/14_sorbitan') + .duration(160) + .EUt(GTValues.VA[GTValues.IV]) + event.recipes.gtceu.chemical_reactor('tfg:sorbitan_to_isosorbide') + .itemInputs('23x #forge:dusts/14_sorbitan') + .inputFluids(Fluid.of('tfg:dimethyl_carbonate', 1000)) + .notConsumable('#forge:dusts/potassium_hydroxide') + .circuit(3) + .itemOutputs('20x #forge:dusts/isosorbide') + .duration(160) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.large_chemical_reactor('tfg:lipid_attach_isosorbide') + .itemInputs('10x #forge:dusts/isosorbide') + .inputFluids(Fluid.of('tfg:linolenic_acid', 1000), Fluid.of('minecraft:water', 2000)) + .notConsumableFluid(Fluid.of('gtceu:toluene', 1000)) + .circuit(4) + .outputFluids(Fluid.of('tfg:isosorbide_ln', 1000)) + .duration(100) + .EUt(GTValues.VA[GTValues.EV]) + + event.recipes.gtceu.large_chemical_reactor('tfg:epoxidation_isosorbide_ln') + .inputFluids(Fluid.of('tfg:isosorbide_ln', 1000), Fluid.of('gtceu:hydrogen_peroxide', 3000), Fluid.of('gtceu:sulfuric_acid', 200)) + .notConsumableFluid(Fluid.of('gtceu:acetic_acid', 1000)) + .circuit(4) + .outputFluids(Fluid.of('tfg:epox_isosorbide_ln', 1000)) + .duration(100) + .EUt(GTValues.VA[GTValues.IV]) + + + //#endregion } diff --git a/kubejs/server_scripts/tfg/space_general/recipes.insulation.js b/kubejs/server_scripts/tfg/space_general/recipes.insulation.js index 40bd3062d..25fc6579b 100644 --- a/kubejs/server_scripts/tfg/space_general/recipes.insulation.js +++ b/kubejs/server_scripts/tfg/space_general/recipes.insulation.js @@ -10,20 +10,38 @@ function registerTFGInsulationRecipes(event) { .EUt(GTValues.VA[GTValues.EV]) event.recipes.gtceu.electric_blast_furnace('tfg:molten_aes') - .itemInputs('2x tfg:aes_mix_dust') - .outputFluids(Fluid.of('tfg:molten_aes', 1000)) + .itemInputs('#forge:dusts/aes_mix') + .outputFluids(Fluid.of('tfg:molten_aes', 500)) .chancedOutput('gtceu:ash_dust', 3000, 0) .circuit(1) - .duration(400) + .duration(200) .blastFurnaceTemp(3000) .EUt(GTValues.VA[GTValues.EV]) event.recipes.gtceu.electric_blast_furnace('tfg:molten_aes_he') - .itemInputs('2x tfg:aes_mix_dust') - .inputFluids(Fluid.of('gtceu:helium', 200)) - .outputFluids(Fluid.of('tfg:molten_aes', 1000)) + .itemInputs('#forge:dusts/aes_mix') + .inputFluids(Fluid.of('gtceu:helium', 100)) + .outputFluids(Fluid.of('tfg:molten_aes', 500)) .circuit(2) - .duration(140) + .duration(70) + .blastFurnaceTemp(3000) + .EUt(GTValues.VA[GTValues.EV]) + + event.recipes.gtceu.electric_blast_furnace('tfg:small_molten_aes') + .itemInputs('#forge:small_dusts/aes_mix') + .outputFluids(Fluid.of('tfg:molten_aes', 125)) + .chancedOutput('gtceu:ash_dust', 1000, 0) + .circuit(1) + .duration(120) + .blastFurnaceTemp(3000) + .EUt(GTValues.VA[GTValues.EV]) + + event.recipes.gtceu.electric_blast_furnace('tfg:small_molten_aes_he') + .itemInputs('#forge:small_dusts/aes_mix') + .inputFluids(Fluid.of('gtceu:helium', 100)) + .outputFluids(Fluid.of('tfg:molten_aes', 125)) + .circuit(2) + .duration(40) .blastFurnaceTemp(3000) .EUt(GTValues.VA[GTValues.EV]) diff --git a/kubejs/server_scripts/tfg/venus/recipes.biochem.js b/kubejs/server_scripts/tfg/venus/recipes.biochem.js index c43cd7182..c3298a2da 100644 --- a/kubejs/server_scripts/tfg/venus/recipes.biochem.js +++ b/kubejs/server_scripts/tfg/venus/recipes.biochem.js @@ -565,17 +565,35 @@ function registerTFGBiochemRecipes(event) { .EUt(GTValues.VA[GTValues.IV]); // Triglycerides from cell factory. - bioreactorRecipe('triglyceride_oil_from_smooth_endoplasmic_reticula', 10*20, 1920, { + bioreactorRecipe('triglyceride_oil_from_smooth_er_byacid', 10*20, 1920, { fluidInputs: [ 'gtceu:glycerol 1000', - 'tfg:butyric_acid 1000' + 'tfg:butyric_acid 3000' ], itemInputs: [ 'tfg:smooth_endoplasmic_reticula', 'tfg:lab_equipment' ], fluidOutputs: [ - Fluid.of('tfg:triglyceride_oil', 2000) + Fluid.of('tfg:triglyceride_oil', 3000) + ], + itemOutputs: [ + 'tfg:dirty_lab_equipment' + ], + cleanroom: CleanroomType.CLEANROOM + }); + + bioreactorRecipe('triglyceride_oil_from_smooth_er_lnacid', 10*20, 1920, { + fluidInputs: [ + 'gtceu:glycerol 1000', + 'tfg:linolenic_acid 3000' + ], + itemInputs: [ + 'tfg:smooth_endoplasmic_reticula', + 'tfg:lab_equipment' + ], + fluidOutputs: [ + Fluid.of('tfg:triglyceride_oil', 3000) ], itemOutputs: [ 'tfg:dirty_lab_equipment' diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index b25ca13df..707ad6423 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -3,11 +3,21 @@ const registerTFGMaterials = (event) => { + //#region placeholder materials event.create('unknown') .color('0xFFFFFF') .formula('?') .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + event.create('ammonium') + .components('1x nitrogen', '4x hydrogen') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + + event.create('methoxy') + .components('1x oxygen', '1x carbon', '3x hydrogen') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + //#endregion + registerTFGPowerReworkMaterials(event); registerTFGNuclearMaterials(event); registerTFGBiolineMaterials(event); diff --git a/kubejs/startup_scripts/tfg/nuclear/materials.nuclear.js b/kubejs/startup_scripts/tfg/nuclear/materials.nuclear.js index 8da8a343d..5608f4ae6 100644 --- a/kubejs/startup_scripts/tfg/nuclear/materials.nuclear.js +++ b/kubejs/startup_scripts/tfg/nuclear/materials.nuclear.js @@ -274,6 +274,53 @@ const registerTFGNuclearMaterials = (event) => { .radioactiveHazard(10000000) //#endregion + + //#region Epoxidized Isosorbide Linolenate + event.create('tfg:glucose') + .dust() + .components('6x carbon', '12x hydrogen', '6x oxygen') + .color(0xFFE9E3) + event.create('tfg:galactose') + .dust() + .components('6x carbon', '12x hydrogen', '6x oxygen') + .color(0xEBE3FF) + event.create('tfg:fructose') + .dust() + .components('6x carbon', '12x hydrogen', '6x oxygen') + .iconSet(GTMaterialIconSet.SHINY) + .color(0xE6FFE3) + event.create('tfg:sorbitol') + .dust() + .components('6x carbon', '14x hydrogen', '6x oxygen') + .iconSet(GTMaterialIconSet.FINE) + .color(0xDEFEFF) + event.create('tfg:14_sorbitan') + .dust() + .components('6x carbon', '12x hydrogen', '5x oxygen') + .iconSet(GTMaterialIconSet.FINE) + .color(0xB1F1F2) + event.create('tfg:isosorbide') + .dust() + .components('6x carbon', '10x hydrogen', '4x oxygen') + .iconSet(GTMaterialIconSet.FINE) + .color(0x84D6DB) + event.create('tfg:linolenic_acid') + .liquid() + .components('18x carbon', '30x hydrogen', '2x oxygen') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xF5D478) + event.create('tfg:isosorbide_ln') + .liquid() + .components('42x carbon', '66x hydrogen', '6x oxygen') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xDB5178) + event.create('tfg:epox_isosorbide_ln') + .liquid() + .components('42x carbon', '66x hydrogen', '12x oxygen') + .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) + .color(0xAB2748) + + //#endregion //#region Isotopic Solvent diff --git a/kubejs/startup_scripts/tfg/space_general/materials.rockets.js b/kubejs/startup_scripts/tfg/space_general/materials.rockets.js index 49ffd7665..dbbccfcd6 100644 --- a/kubejs/startup_scripts/tfg/space_general/materials.rockets.js +++ b/kubejs/startup_scripts/tfg/space_general/materials.rockets.js @@ -120,7 +120,7 @@ function registerTFGRocketMaterials(event) { //#region aerogel event.create('tfg:tmos') .liquid() - .formula("Si(OCH3)4") + .components('1x silicon', '4x methoxy') .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) .color(0xC2C6CC) event.create('tfg:silica_gel') From ffd474608f21817401f4f2e2e892474de7e5a077 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 8 Dec 2025 23:59:55 +0000 Subject: [PATCH 17/25] fix #2353 --- kubejs/server_scripts/beneath/recipes.js | 7 +++---- kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/kubejs/server_scripts/beneath/recipes.js b/kubejs/server_scripts/beneath/recipes.js index ba4208649..aabd6c4e1 100644 --- a/kubejs/server_scripts/beneath/recipes.js +++ b/kubejs/server_scripts/beneath/recipes.js @@ -61,12 +61,11 @@ const registerBeneathRecipes = (event) => { 'tfc:powder/wood_ash' ]).id('tfg:shapeless/hellbricks_from_wood_ash') - event.recipes.gtceu.assembler("loose_blackstone_to_bricks") + event.recipes.gtceu.cutter("loose_blackstone_to_bricks") .itemInputs('beneath:blackstone_pebble') .itemOutputs('beneath:blackstone_brick') - .circuit(1) - .duration(40) - .EUt(8) + .duration(10) + .EUt(2) event.recipes.tfc.landslide('beneath:soul_clay', 'beneath:soul_clay') diff --git a/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js b/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js index 436a5b12b..1e8d61fe1 100644 --- a/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js +++ b/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js @@ -151,8 +151,8 @@ function registerTFGRockRecipes(event) { event.recipes.gtceu.cutter(`${x.loose}_to_${x.brick}`.replace(/:/g, '_')) .itemInputs(x.loose) .itemOutputs(x.brick) - .duration(40) - .EUt(8) + .duration(10) + .EUt(2) }) // #endregion LOOSE_TO_BRICKS From 961a97f2e2ca8948b0848394c134dbf0e797f2c6 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 9 Dec 2025 00:00:23 +0000 Subject: [PATCH 18/25] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0376bd5e1..cf0c11bf3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Fixed missing recipes for many fluid and item pipes @Pyritie - Fixed missing cleanroom tags for the ad astra 3x3 doors, so now you can *actually* use them in a cleanroom @Pyritie - Fixed aged sake, vodka, and whiskey losing their buff effects @Pyritie +- Fixed some inconsistencies with loose rocks into bricks (#2353) @Pyritie ## [0.11.9] - 7-12-2025 ### Breaking Changes From 0b331b98bcc8016fdb97f4f20fc7423c42b905ea Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 9 Dec 2025 00:02:06 +0000 Subject: [PATCH 19/25] moved the blackstone brick recipe --- kubejs/server_scripts/beneath/recipes.js | 6 ----- .../tfg/natural_blocks/recipes.rocks.js | 24 +++++++++---------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/kubejs/server_scripts/beneath/recipes.js b/kubejs/server_scripts/beneath/recipes.js index aabd6c4e1..e0fd264d8 100644 --- a/kubejs/server_scripts/beneath/recipes.js +++ b/kubejs/server_scripts/beneath/recipes.js @@ -61,12 +61,6 @@ const registerBeneathRecipes = (event) => { 'tfc:powder/wood_ash' ]).id('tfg:shapeless/hellbricks_from_wood_ash') - event.recipes.gtceu.cutter("loose_blackstone_to_bricks") - .itemInputs('beneath:blackstone_pebble') - .itemOutputs('beneath:blackstone_brick') - .duration(10) - .EUt(2) - event.recipes.tfc.landslide('beneath:soul_clay', 'beneath:soul_clay') diff --git a/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js b/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js index 1e8d61fe1..0988e5a3f 100644 --- a/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js +++ b/kubejs/server_scripts/tfg/natural_blocks/recipes.rocks.js @@ -129,18 +129,18 @@ function registerTFGRockRecipes(event) { // #region LOOSE_TO_BRICKS const LOOSE_TO_BRICKS = [ - { loose: 'tfg:loose/deepslate', brick: 'tfg:brick/deepslate' }, - { loose: 'tfg:loose/dripstone', brick: 'tfg:brick/dripstone' }, - { loose: 'tfg:loose/crackrack', brick: 'minecraft:nether_brick' }, - { loose: 'tfg:loose/moon_stone', brick: 'tfg:brick/moon_stone' }, - { loose: 'tfg:loose/moon_deepslate', brick: 'tfg:brick/moon_deepslate' }, - { loose: 'tfg:loose/mars_stone', brick: 'tfg:brick/mars_stone' }, - { loose: 'tfg:loose/venus_stone', brick: 'tfg:brick/venus_stone' }, - { loose: 'tfg:loose/mercury_stone', brick: 'tfg:brick/mercury_stone' }, - { loose: 'tfg:loose/glacio_stone', brick: 'tfg:brick/glacio_stone' }, - { loose: 'tfg:loose/permafrost', brick: 'tfg:brick/permafrost' }, - { loose: 'tfg:loose/red_granite', brick: 'tfg:brick/red_granite' }, - + { loose: 'tfg:loose/deepslate', brick: 'tfg:brick/deepslate' }, + { loose: 'tfg:loose/dripstone', brick: 'tfg:brick/dripstone' }, + { loose: 'tfg:loose/crackrack', brick: 'minecraft:nether_brick' }, + { loose: 'tfg:loose/moon_stone', brick: 'tfg:brick/moon_stone' }, + { loose: 'tfg:loose/moon_deepslate', brick: 'tfg:brick/moon_deepslate' }, + { loose: 'tfg:loose/mars_stone', brick: 'tfg:brick/mars_stone' }, + { loose: 'tfg:loose/venus_stone', brick: 'tfg:brick/venus_stone' }, + { loose: 'tfg:loose/mercury_stone', brick: 'tfg:brick/mercury_stone' }, + { loose: 'tfg:loose/glacio_stone', brick: 'tfg:brick/glacio_stone' }, + { loose: 'tfg:loose/permafrost', brick: 'tfg:brick/permafrost' }, + { loose: 'tfg:loose/red_granite', brick: 'tfg:brick/red_granite' }, + { loose: 'beneath:blackstone_pebble', brick: 'beneath:blackstone_brick' } ] LOOSE_TO_BRICKS.forEach(x => { From 0d75405aee6a00d522e1e175b4da3ab51b90265c Mon Sep 17 00:00:00 2001 From: Redeix Date: Tue, 9 Dec 2025 00:11:17 -0600 Subject: [PATCH 20/25] why doesnt rhino just have classes? (#2355) --- kubejs/startup_scripts/ad_astra/constants.js | 38 +++++++++++++++++-- .../advancedperipherals/constants.js | 2 +- kubejs/startup_scripts/ae2/constants.js | 20 +++++----- kubejs/startup_scripts/afc/constants.js | 3 +- .../startup_scripts/alekiroofs/constants.js | 2 +- .../startup_scripts/alekiships/constants.js | 1 + .../asticor_carts/constants.js | 2 +- kubejs/startup_scripts/beneath/constants.js | 2 +- .../computer_craft/constants.js | 2 +- kubejs/startup_scripts/constants.js | 6 --- kubejs/startup_scripts/create/constants.js | 2 +- kubejs/startup_scripts/create/creative_tab.js | 4 +- .../create_additions/constants.js | 2 +- .../create_connected/constants.js | 4 +- .../startup_scripts/createdeco/constants.js | 10 ++--- .../domum_ornamentum/constants.js | 6 +-- .../startup_scripts/extended_ae2/constants.js | 3 +- kubejs/startup_scripts/firmaciv/constants.js | 2 +- kubejs/startup_scripts/firmalife/constants.js | 6 +-- .../startup_scripts/framedblocks/constants.js | 8 ++-- .../startup_scripts/ftb_quests/constants.js | 2 +- .../startup_scripts/grapplemod/constants.js | 2 +- kubejs/startup_scripts/greate/constants.js | 24 ++++++------ kubejs/startup_scripts/gtceu/constants.js | 2 +- kubejs/startup_scripts/horornot/constants.js | 2 +- kubejs/startup_scripts/main_startup_script.js | 6 +-- .../startup_scripts/mega_cells/constants.js | 2 +- kubejs/startup_scripts/minecraft/constants.js | 2 +- .../modern_markings/constants.js | 2 +- kubejs/startup_scripts/more_red/constants.js | 2 +- kubejs/startup_scripts/railways/constants.js | 2 +- kubejs/startup_scripts/rnr/constants.js | 2 +- .../startup_scripts/sacksnsuch/constants.js | 2 +- .../sophisticated_backpacks/constants.js | 2 +- kubejs/startup_scripts/soulbind/constants.js | 5 ++- kubejs/startup_scripts/species/constants.js | 2 +- kubejs/startup_scripts/tacz/constants.js | 2 +- kubejs/startup_scripts/tfc/constants.js | 2 +- kubejs/startup_scripts/tfg/constants.js | 1 + .../vintage_improvements/constants.js | 4 +- .../wan_ancient_beasts/constants.js | 2 +- 41 files changed, 112 insertions(+), 85 deletions(-) delete mode 100644 kubejs/startup_scripts/constants.js diff --git a/kubejs/startup_scripts/ad_astra/constants.js b/kubejs/startup_scripts/ad_astra/constants.js index e706f6738..93a924324 100644 --- a/kubejs/startup_scripts/ad_astra/constants.js +++ b/kubejs/startup_scripts/ad_astra/constants.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: -100 "use strict"; global.AD_ASTRA_DISABLED_ITEMS = @@ -110,7 +110,37 @@ global.BREATHABLE_COMPRESSED_AIRS = ]; global.AD_ASTRA_WOOD = [ - {name: 'aeronos', logs: '#ad_astra:aeronos_caps', log: 'ad_astra:aeronos_stem', stripped_log: null, lumber: 'tfg:wood/lumber/aeronos', plank: 'ad_astra:aeronos_planks', stair: 'ad_astra:aeronos_stairs', slab: 'ad_astra:aeronos_slab', fence: 'ad_astra:aeronos_fence', fence_gate: 'ad_astra:aeronos_fence_gate', door: 'ad_astra:aeronos_door', trapdoor: 'ad_astra:aeronos_trapdoor', button: null, pressure_plate: null, support: 'tfg:aeronos_support', isHardwood: false}, - {name: 'strophar', logs: '#ad_astra:strophar_caps', log: 'ad_astra:strophar_stem', stripped_log: null, lumber: 'tfg:wood/lumber/strophar', plank: 'ad_astra:strophar_planks', stair: 'ad_astra:strophar_stairs', slab: 'ad_astra:strophar_slab', fence:'ad_astra:strophar_fence', fence_gate: 'ad_astra:strophar_fence_gate', door:'ad_astra:strophar_door', trapdoor: 'ad_astra:strophar_trapdoor', button: null, pressure_plate: null, support: 'tfg:strophar_support', isHardwood: false}, - {name: 'glacian', logs: '#ad_astra:glacian_logs', log: 'ad_astra:glacian_log', stripped_log: 'ad_astra:stripped_glacian_log', lumber: 'tfg:wood/lumber/glacian', plank: 'ad_astra:glacian_planks', stair: 'ad_astra:glacian_stairs', slab: 'ad_astra:glacian_slab', fence: 'ad_astra:glacian_fence', fence_gate: 'ad_astra:glacian_fence_gate', door: 'ad_astra:glacian_door', trapdoor: 'ad_astra:glacian_trapdoor', button: 'ad_astra:glacian_button', pressure_plate: 'ad_astra:glacian_pressure_plate', support: 'tfg:glacian_support', isHardwood: true}, + { + name: 'aeronos', + logs: '#ad_astra:aeronos_caps', log: 'ad_astra:aeronos_stem', stripped_log: null, + lumber: 'tfg:wood/lumber/aeronos', plank: 'ad_astra:aeronos_planks', + stair: 'ad_astra:aeronos_stairs', slab: 'ad_astra:aeronos_slab', + fence: 'ad_astra:aeronos_fence', fence_gate: 'ad_astra:aeronos_fence_gate', + door: 'ad_astra:aeronos_door', trapdoor: 'ad_astra:aeronos_trapdoor', + button: null, pressure_plate: null, + support: 'tfg:aeronos_support', + isHardwood: false + }, + { + name: 'strophar', + logs: '#ad_astra:strophar_caps', log: 'ad_astra:strophar_stem', stripped_log: null, + lumber: 'tfg:wood/lumber/strophar', plank: 'ad_astra:strophar_planks', + stair: 'ad_astra:strophar_stairs', slab: 'ad_astra:strophar_slab', + fence:'ad_astra:strophar_fence', fence_gate: 'ad_astra:strophar_fence_gate', + door:'ad_astra:strophar_door', trapdoor: 'ad_astra:strophar_trapdoor', + button: null, pressure_plate: null, + support: 'tfg:strophar_support', + isHardwood: false + }, + { + name: 'glacian', + logs: '#ad_astra:glacian_logs', log: 'ad_astra:glacian_log', stripped_log: 'ad_astra:stripped_glacian_log', + lumber: 'tfg:wood/lumber/glacian', plank: 'ad_astra:glacian_planks', + stair: 'ad_astra:glacian_stairs', slab: 'ad_astra:glacian_slab', + fence: 'ad_astra:glacian_fence', fence_gate: 'ad_astra:glacian_fence_gate', + door: 'ad_astra:glacian_door', trapdoor: 'ad_astra:glacian_trapdoor', + button: 'ad_astra:glacian_button', pressure_plate: 'ad_astra:glacian_pressure_plate', + support: 'tfg:glacian_support', + isHardwood: true + } ] \ No newline at end of file diff --git a/kubejs/startup_scripts/advancedperipherals/constants.js b/kubejs/startup_scripts/advancedperipherals/constants.js index 3680e5292..3862aed0b 100644 --- a/kubejs/startup_scripts/advancedperipherals/constants.js +++ b/kubejs/startup_scripts/advancedperipherals/constants.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: -100 "use strict"; global.ADVANCED_PERIPHERALS_DISABLED_ITEMS = [ diff --git a/kubejs/startup_scripts/ae2/constants.js b/kubejs/startup_scripts/ae2/constants.js index 88e39d121..f7d1ec8a9 100644 --- a/kubejs/startup_scripts/ae2/constants.js +++ b/kubejs/startup_scripts/ae2/constants.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: -100 "use strict"; global.AE2_DISABLED_ITEMS = [ @@ -62,7 +62,7 @@ global.AE2_GLASS_CABLES = [ 'ae2:brown_glass_cable', 'ae2:green_glass_cable', 'ae2:red_glass_cable', - 'ae2:black_glass_cable', + 'ae2:black_glass_cable' ] // Covered Cable @@ -82,7 +82,7 @@ global.AE2_COVERED_CABLES = [ 'ae2:brown_covered_cable', 'ae2:green_covered_cable', 'ae2:red_covered_cable', - 'ae2:black_covered_cable', + 'ae2:black_covered_cable' ] // Dense Covered Cable @@ -102,7 +102,7 @@ global.AE2_COVERED_DENSE_CABLES = [ 'ae2:brown_covered_dense_cable', 'ae2:green_covered_dense_cable', 'ae2:red_covered_dense_cable', - 'ae2:black_covered_dense_cable', + 'ae2:black_covered_dense_cable' ] // Smart Cable @@ -122,7 +122,7 @@ global.AE2_SMART_CABLES = [ 'ae2:brown_smart_cable', 'ae2:green_smart_cable', 'ae2:red_smart_cable', - 'ae2:black_smart_cable', + 'ae2:black_smart_cable' ] // Dense Smart Cable @@ -142,7 +142,7 @@ global.AE2_SMART_DENSE_CABLES = [ 'ae2:brown_smart_dense_cable', 'ae2:green_smart_dense_cable', 'ae2:red_smart_dense_cable', - 'ae2:black_smart_dense_cable', + 'ae2:black_smart_dense_cable' ] // Smart Cable @@ -162,7 +162,7 @@ global.AE2_SMART_CABLES = [ 'ae2:brown_smart_cable', 'ae2:green_smart_cable', 'ae2:red_smart_cable', - 'ae2:black_smart_cable', + 'ae2:black_smart_cable' ] // Dense Smart Cable @@ -182,7 +182,7 @@ global.AE2_SMART_DENSE_CABLES = [ 'ae2:brown_smart_dense_cable', 'ae2:green_smart_dense_cable', 'ae2:red_smart_dense_cable', - 'ae2:black_smart_dense_cable', + 'ae2:black_smart_dense_cable' ] @@ -203,7 +203,7 @@ global.AE2_PAINTBALLS = [ 'ae2:brown_paint_ball', 'ae2:green_paint_ball', 'ae2:red_paint_ball', - 'ae2:black_paint_ball', + 'ae2:black_paint_ball' ] // Lumen paint ball global.AE2_LUMEN_PAINTBALLS = [ @@ -222,6 +222,6 @@ global.AE2_LUMEN_PAINTBALLS = [ 'ae2:brown_lumen_paint_ball', 'ae2:green_lumen_paint_ball', 'ae2:red_lumen_paint_ball', - 'ae2:black_lumen_paint_ball', + 'ae2:black_lumen_paint_ball' ] diff --git a/kubejs/startup_scripts/afc/constants.js b/kubejs/startup_scripts/afc/constants.js index 6ccba7a9c..f8c487284 100644 --- a/kubejs/startup_scripts/afc/constants.js +++ b/kubejs/startup_scripts/afc/constants.js @@ -1,3 +1,4 @@ +// priority: -100 "use strict"; global.AFC_DISABLED_ITEMS = [ @@ -107,7 +108,7 @@ global.AFC_SOFTWOOD_TYPES = [ 'tualang', 'cypress', - 'fig', + 'fig' ] global.AFC_HARDWOOD_TYPES = diff --git a/kubejs/startup_scripts/alekiroofs/constants.js b/kubejs/startup_scripts/alekiroofs/constants.js index efc6bd946..c416eda46 100644 --- a/kubejs/startup_scripts/alekiroofs/constants.js +++ b/kubejs/startup_scripts/alekiroofs/constants.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: -100 "use strict"; global.ALEKIROOFS_DISABLED_ITEMS = [ diff --git a/kubejs/startup_scripts/alekiships/constants.js b/kubejs/startup_scripts/alekiships/constants.js index 69f512d1c..4d7c918a2 100644 --- a/kubejs/startup_scripts/alekiships/constants.js +++ b/kubejs/startup_scripts/alekiships/constants.js @@ -1,3 +1,4 @@ +// priority: -100 "use strict"; global.ALEKISHIPS_DISABLED_ITEMS = [ diff --git a/kubejs/startup_scripts/asticor_carts/constants.js b/kubejs/startup_scripts/asticor_carts/constants.js index 664e571a2..ff9a0509f 100644 --- a/kubejs/startup_scripts/asticor_carts/constants.js +++ b/kubejs/startup_scripts/asticor_carts/constants.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: -100 "use strict"; global.ASTICOR_CARTS_DISABLED_ITEMS = [ diff --git a/kubejs/startup_scripts/beneath/constants.js b/kubejs/startup_scripts/beneath/constants.js index 69fcec829..536ac80b1 100644 --- a/kubejs/startup_scripts/beneath/constants.js +++ b/kubejs/startup_scripts/beneath/constants.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: -100 "use strict"; global.BENEATH_DISABLED_ITEMS = [ diff --git a/kubejs/startup_scripts/computer_craft/constants.js b/kubejs/startup_scripts/computer_craft/constants.js index a108b9f5e..a345baf46 100644 --- a/kubejs/startup_scripts/computer_craft/constants.js +++ b/kubejs/startup_scripts/computer_craft/constants.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: -100 "use strict"; global.COMPUTER_CRAFT_DISCS = [ diff --git a/kubejs/startup_scripts/constants.js b/kubejs/startup_scripts/constants.js deleted file mode 100644 index f23433066..000000000 --- a/kubejs/startup_scripts/constants.js +++ /dev/null @@ -1,6 +0,0 @@ -// priority: 0 -"use strict"; - -global.TAB_IDS = Object.freeze({ - CREATE_BASE: 'create:base' -}) \ No newline at end of file diff --git a/kubejs/startup_scripts/create/constants.js b/kubejs/startup_scripts/create/constants.js index 7d2b4c4b0..6439596d0 100644 --- a/kubejs/startup_scripts/create/constants.js +++ b/kubejs/startup_scripts/create/constants.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: -100 "use strict"; /** diff --git a/kubejs/startup_scripts/create/creative_tab.js b/kubejs/startup_scripts/create/creative_tab.js index 61c769984..6f21cfa5c 100644 --- a/kubejs/startup_scripts/create/creative_tab.js +++ b/kubejs/startup_scripts/create/creative_tab.js @@ -1,7 +1,7 @@ // priority: 0 "use strict"; -function modifyCreateCreativeTab(event) { +StartupEvents.modifyCreativeTab('create:base', event => { event.add('create:shadow_steel_casing') event.add('create:refined_radiance_casing') -} +}) diff --git a/kubejs/startup_scripts/create_additions/constants.js b/kubejs/startup_scripts/create_additions/constants.js index 400bd3ba7..036d69ab2 100644 --- a/kubejs/startup_scripts/create_additions/constants.js +++ b/kubejs/startup_scripts/create_additions/constants.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: -100 "use strict"; global.CREATE_ADDITIONS_DISABLED_ITEMS = [ diff --git a/kubejs/startup_scripts/create_connected/constants.js b/kubejs/startup_scripts/create_connected/constants.js index ca883e3be..8a4b737d7 100644 --- a/kubejs/startup_scripts/create_connected/constants.js +++ b/kubejs/startup_scripts/create_connected/constants.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: -100 "use strict"; global.CREATE_CONNECTED_DISABLED_ITEMS = [ @@ -19,5 +19,5 @@ global.CREATE_CONNECTED_DISABLED_ITEMS = [ 'create_connected:brass_encased_cross_connector', 'create_connected:kinetic_bridge', 'create_connected:kinetic_battery', - 'create_connected:charged_kinetic_battery', + 'create_connected:charged_kinetic_battery' ] \ No newline at end of file diff --git a/kubejs/startup_scripts/createdeco/constants.js b/kubejs/startup_scripts/createdeco/constants.js index 8bfec458a..3387d561e 100644 --- a/kubejs/startup_scripts/createdeco/constants.js +++ b/kubejs/startup_scripts/createdeco/constants.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: -100 "use strict"; /** @global */ @@ -9,7 +9,7 @@ global.CREATEDECO_DISABLED_ITEMS = /** @type {const} */ ([ "createdeco:industrial_iron_sheet", "createdeco:netherite_nugget", "createdeco:industrial_iron_nugget", - "createdeco:industrial_iron_ingot", + "createdeco:industrial_iron_ingot" ]); /** @global */ @@ -21,7 +21,7 @@ global.CREATE_DECO_BRICK_TYPES = /** @type {const} */ ([ "blue", "pearl", "dean", - "red", + "red" ]); global.CREATE_DECO_GLASS_PANES = /** @type {const} */ ([ @@ -30,7 +30,7 @@ global.CREATE_DECO_GLASS_PANES = /** @type {const} */ ([ "createdeco:iron_window_pane", "createdeco:industrial_iron_window_pane", "createdeco:brass_window_pane", - "createdeco:zinc_window_pane", + "createdeco:zinc_window_pane" ]); global.CREATE_DECO_CATWALK_TYPES = /** @type {const} */ ([ @@ -39,5 +39,5 @@ global.CREATE_DECO_CATWALK_TYPES = /** @type {const} */ ([ "iron", "copper", "industrial_iron", - "zinc", + "zinc" ]); diff --git a/kubejs/startup_scripts/domum_ornamentum/constants.js b/kubejs/startup_scripts/domum_ornamentum/constants.js index e525d4c91..0226624f4 100644 --- a/kubejs/startup_scripts/domum_ornamentum/constants.js +++ b/kubejs/startup_scripts/domum_ornamentum/constants.js @@ -1,9 +1,9 @@ -// priority: 0 +// priority: -100 "use strict"; global.DOMUM_ORNAMENTUM_DISABLED_ITEMS = /** @type {const} */ ([ "domum_ornamentum:blockbarreldeco_standing", - "domum_ornamentum:blockbarreldeco_onside", + "domum_ornamentum:blockbarreldeco_onside" ]); global.DOMUM_ORNAMENTUM_FLOATING_CARPETS = /** @type {const} */ ([ @@ -22,5 +22,5 @@ global.DOMUM_ORNAMENTUM_FLOATING_CARPETS = /** @type {const} */ ([ "domum_ornamentum:brown_floating_carpet", "domum_ornamentum:green_floating_carpet", "domum_ornamentum:red_floating_carpet", - "domum_ornamentum:black_floating_carpet", + "domum_ornamentum:black_floating_carpet" ]); diff --git a/kubejs/startup_scripts/extended_ae2/constants.js b/kubejs/startup_scripts/extended_ae2/constants.js index 97a7c2945..486627ec1 100644 --- a/kubejs/startup_scripts/extended_ae2/constants.js +++ b/kubejs/startup_scripts/extended_ae2/constants.js @@ -1,3 +1,4 @@ +// priority: -100 "use strict"; global.EXTENDED_AE2_DISABLED_ITEMS = [ @@ -15,7 +16,7 @@ global.EXTENDED_AE2_DISABLED_ITEMS = [ 'expatternprovider:ex_charger', 'expatternprovider:caner', 'expatternprovider:circuit_cutter', - 'expatternprovider:silicon_block', + 'expatternprovider:silicon_block' //в будущем будет крафт diff --git a/kubejs/startup_scripts/firmaciv/constants.js b/kubejs/startup_scripts/firmaciv/constants.js index 3a6e659cd..563af9b9b 100644 --- a/kubejs/startup_scripts/firmaciv/constants.js +++ b/kubejs/startup_scripts/firmaciv/constants.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: -100 "use strict"; /** diff --git a/kubejs/startup_scripts/firmalife/constants.js b/kubejs/startup_scripts/firmalife/constants.js index 4a04d2c2c..db0ce962b 100644 --- a/kubejs/startup_scripts/firmalife/constants.js +++ b/kubejs/startup_scripts/firmalife/constants.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: -100 "use strict"; /** @@ -102,12 +102,12 @@ global.FIRMALIFE_JAMS = [ global.FIRMALIFE_GREENHOUSE_FRUIT_RECIPE_COMPONENTS = [ { input: 'firmalife:plant/cocoa_sapling', fluid_amount: 8000, output: '3x firmalife:food/cocoa_beans', name: 'cocoa_beans' }, - { input: 'firmalife:plant/fig_sapling', fluid_amount: 8000, output: '3x firmalife:food/fig', name: 'fig' }, + { input: 'firmalife:plant/fig_sapling', fluid_amount: 8000, output: '3x firmalife:food/fig', name: 'fig' } ]; global.FIRMALIFE_GREENHOUSE_BERRY_RECIPE_COMPONENTS = [ { input: 'firmalife:plant/pineapple_bush', fluid_amount: 6000, output: '3x firmalife:food/pineapple', name: 'pineapple' }, - { input: 'firmalife:plant/nightshade_bush', fluid_amount: 6000, output: '3x firmalife:food/nightshade_berry', name: 'nightshade' }, + { input: 'firmalife:plant/nightshade_bush', fluid_amount: 6000, output: '3x firmalife:food/nightshade_berry', name: 'nightshade' } ]; global.FIRMALIFE_COOKING_RECIPE_COMPONENTS = [ diff --git a/kubejs/startup_scripts/framedblocks/constants.js b/kubejs/startup_scripts/framedblocks/constants.js index 539d11f8a..c45e47f52 100644 --- a/kubejs/startup_scripts/framedblocks/constants.js +++ b/kubejs/startup_scripts/framedblocks/constants.js @@ -1,10 +1,10 @@ -// priority: 0 +// priority: -100 "use strict"; global.FRAMEDBLOCKS_DISABLED_ITEMS = [ "framedblocks:framed_soul_torch", "framedblocks:framed_torch", - "framedblocks:framed_obsidian_pressure_plate", + "framedblocks:framed_obsidian_pressure_plate" ]; /** @satisfies {Special.Item[]} */ @@ -44,7 +44,7 @@ global.FRAMED_HALF_BLOCKS = /** @type {const} */ ([ "framedblocks:framed_centered_slab", "framedblocks:framed_centered_panel", "framedblocks:framed_checkered_slab", - "framedblocks:framed_checkered_panel", + "framedblocks:framed_checkered_panel" ]); /** @satisfies {Special.Item[]} */ @@ -68,5 +68,5 @@ global.FRAMED_TINY_BLOCKS = /** @type {const} */ ([ "framedblocks:framed_small_corner_slope_panel", "framedblocks:framed_small_inner_corner_slope_panel", "framedblocks:framed_small_double_corner_slope_panel", - "framedblocks:framed_mini_cube", + "framedblocks:framed_mini_cube" ]); diff --git a/kubejs/startup_scripts/ftb_quests/constants.js b/kubejs/startup_scripts/ftb_quests/constants.js index 1c89e5871..d7eb41a35 100644 --- a/kubejs/startup_scripts/ftb_quests/constants.js +++ b/kubejs/startup_scripts/ftb_quests/constants.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: -100 "use strict"; /** diff --git a/kubejs/startup_scripts/grapplemod/constants.js b/kubejs/startup_scripts/grapplemod/constants.js index 49cb155c8..c51596e47 100644 --- a/kubejs/startup_scripts/grapplemod/constants.js +++ b/kubejs/startup_scripts/grapplemod/constants.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: -100 "use strict"; global.GRAPPLEMOD_DISABLED_ITEMS = [ diff --git a/kubejs/startup_scripts/greate/constants.js b/kubejs/startup_scripts/greate/constants.js index 29c2613e4..395ae8812 100644 --- a/kubejs/startup_scripts/greate/constants.js +++ b/kubejs/startup_scripts/greate/constants.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: -100 "use strict"; global.GREATE_DISABLED_ITEMS = /** @type {const} */ ([ @@ -145,14 +145,14 @@ global.GREATE_DISABLED_ITEMS = /** @type {const} */ ([ "gtceu:shadow_steel_rod", "gtceu:shadow_steel_screw", "gtceu:long_shadow_steel_rod", - "gtceu:shadow_steel_block", + "gtceu:shadow_steel_block" ]); global.GREATE_DISABLED_FLUIDS = /** @type {const} */ ([ "gtceu:andesite_alloy", "gtceu:refined_radiance", "gtceu:chromatic_compound", - "gtceu:shadow_steel", + "gtceu:shadow_steel" ]); global.GREATE_DISABLED_TAGS = /** @type {const} */ ([ @@ -167,7 +167,7 @@ global.GREATE_DISABLED_TAGS = /** @type {const} */ ([ "#forge:alloys/rhodium_plated_palladium", "#forge:alloys/naquadah_alloy", "#forge:alloys/darmstadtium", - "#forge:alloys/neutronium", + "#forge:alloys/neutronium" ]); global.GREATE_BELTS = /** @type {const} */ ([ @@ -175,7 +175,7 @@ global.GREATE_BELTS = /** @type {const} */ ([ "greate:polybenzimidazole_belt_connector", "greate:polyethylene_belt_connector", "greate:polytetrafluoroethylene_belt_connector", - "greate:rubber_belt_connector", + "greate:rubber_belt_connector" ]); global.GREATE_CRUSHING_WHEELS = /** @type {const} */ ([ @@ -188,7 +188,7 @@ global.GREATE_CRUSHING_WHEELS = /** @type {const} */ ([ "greate:rhodium_plated_palladium_crushing_wheel", "greate:naquadah_alloy_crushing_wheel", "greate:darmstadtium_crushing_wheel", - "greate:neutronium_crushing_wheel", + "greate:neutronium_crushing_wheel" ]); global.GREATE_ENCASED_FANS = /** @type {const} */ ([ @@ -201,7 +201,7 @@ global.GREATE_ENCASED_FANS = /** @type {const} */ ([ "greate:rhodium_plated_palladium_encased_fan", "greate:naquadah_alloy_encased_fan", "greate:darmstadtium_encased_fan", - "greate:neutronium_encased_fan", + "greate:neutronium_encased_fan" ]); global.GREATE_MECHANICAL_MIXERS = /** @type {const} */ ([ @@ -214,7 +214,7 @@ global.GREATE_MECHANICAL_MIXERS = /** @type {const} */ ([ "greate:rhodium_plated_palladium_mechanical_mixer", "greate:naquadah_alloy_mechanical_mixer", "greate:darmstadtium_mechanical_mixer", - "greate:neutronium_mechanical_mixer", + "greate:neutronium_mechanical_mixer" ]); global.GREATE_MECHANICAL_PRESSES = /** @type {const} */ ([ @@ -227,7 +227,7 @@ global.GREATE_MECHANICAL_PRESSES = /** @type {const} */ ([ "greate:rhodium_plated_palladium_mechanical_press", "greate:naquadah_alloy_mechanical_press", "greate:darmstadtium_mechanical_press", - "greate:neutronium_mechanical_press", + "greate:neutronium_mechanical_press" ]); global.GREATE_MECHANICAL_PUMPS = /** @type {const} */ ([ @@ -240,7 +240,7 @@ global.GREATE_MECHANICAL_PUMPS = /** @type {const} */ ([ "greate:rhodium_plated_palladium_mechanical_pump", "greate:naquadah_alloy_mechanical_pump", "greate:darmstadtium_mechanical_pump", - "greate:neutronium_mechanical_pump", + "greate:neutronium_mechanical_pump" ]); global.GREATE_MECHANICAL_SAWS = /** @type {const} */ ([ @@ -253,7 +253,7 @@ global.GREATE_MECHANICAL_SAWS = /** @type {const} */ ([ "greate:rhodium_plated_palladium_mechanical_saw", "greate:naquadah_alloy_mechanical_saw", "greate:darmstadtium_mechanical_saw", - "greate:neutronium_mechanical_saw", + "greate:neutronium_mechanical_saw" ]); global.GREATE_MILLSTONES = /** @type {const} */ ([ @@ -266,5 +266,5 @@ global.GREATE_MILLSTONES = /** @type {const} */ ([ "greate:rhodium_plated_palladium_millstone", "greate:naquadah_alloy_millstone", "greate:darmstadtium_millstone", - "greate:neutronium_millstone", + "greate:neutronium_millstone" ]); diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index b3806f41b..40de05b4a 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: -100 "use strict"; //#region Disabled Items diff --git a/kubejs/startup_scripts/horornot/constants.js b/kubejs/startup_scripts/horornot/constants.js index 1e7e4f093..10623336c 100644 --- a/kubejs/startup_scripts/horornot/constants.js +++ b/kubejs/startup_scripts/horornot/constants.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: -100 "use strict"; global.HOT_OR_NOT_DISABLED_ITEMS = [ diff --git a/kubejs/startup_scripts/main_startup_script.js b/kubejs/startup_scripts/main_startup_script.js index 79399185f..b651df6fb 100644 --- a/kubejs/startup_scripts/main_startup_script.js +++ b/kubejs/startup_scripts/main_startup_script.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: 100 "use strict"; StartupEvents.registry('item', event => { @@ -70,10 +70,6 @@ GTCEuStartupEvents.craftingComponents(event => { registerTFGCraftingComponents(event) }) -StartupEvents.modifyCreativeTab(global.TAB_IDS.CREATE_BASE, event => { - modifyCreateCreativeTab(event) -}) - Platform.mods.primitive_creatures.name = "Primitive Creatures"; Platform.mods.tfg.name = "TerraFirmaGreg"; Platform.mods.kubejs.name = "TerraFirmaGreg"; diff --git a/kubejs/startup_scripts/mega_cells/constants.js b/kubejs/startup_scripts/mega_cells/constants.js index b6092623f..dc245ba27 100644 --- a/kubejs/startup_scripts/mega_cells/constants.js +++ b/kubejs/startup_scripts/mega_cells/constants.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: -100 "use strict"; global.MEGA_CELLS_DISABLED_ITEMS = [ diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index 27dd03aa4..658c290f9 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: -100 "use strict"; /** diff --git a/kubejs/startup_scripts/modern_markings/constants.js b/kubejs/startup_scripts/modern_markings/constants.js index 8e8fdddb9..d9f193d84 100644 --- a/kubejs/startup_scripts/modern_markings/constants.js +++ b/kubejs/startup_scripts/modern_markings/constants.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: -100 "use strict"; global.MODERN_MARKINGS_DISABLED_ITEMS = [ diff --git a/kubejs/startup_scripts/more_red/constants.js b/kubejs/startup_scripts/more_red/constants.js index 1d68174d0..a1dc897b1 100644 --- a/kubejs/startup_scripts/more_red/constants.js +++ b/kubejs/startup_scripts/more_red/constants.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: -100 "use strict"; global.MORE_RED_DISABLED_ITEMS = [ diff --git a/kubejs/startup_scripts/railways/constants.js b/kubejs/startup_scripts/railways/constants.js index a9b82a08d..071c8bf6b 100644 --- a/kubejs/startup_scripts/railways/constants.js +++ b/kubejs/startup_scripts/railways/constants.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: -100 "use strict"; global.RAIL_WAYS_DISABLED_ITEMS = [ diff --git a/kubejs/startup_scripts/rnr/constants.js b/kubejs/startup_scripts/rnr/constants.js index d08795ff6..8fc4106bc 100644 --- a/kubejs/startup_scripts/rnr/constants.js +++ b/kubejs/startup_scripts/rnr/constants.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: -100 "use strict"; global.RNR_DISABLED_ITEMS = [ diff --git a/kubejs/startup_scripts/sacksnsuch/constants.js b/kubejs/startup_scripts/sacksnsuch/constants.js index 082ed5400..ee8509179 100644 --- a/kubejs/startup_scripts/sacksnsuch/constants.js +++ b/kubejs/startup_scripts/sacksnsuch/constants.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: -100 "use strict"; diff --git a/kubejs/startup_scripts/sophisticated_backpacks/constants.js b/kubejs/startup_scripts/sophisticated_backpacks/constants.js index e2cc7bc7f..209de7700 100644 --- a/kubejs/startup_scripts/sophisticated_backpacks/constants.js +++ b/kubejs/startup_scripts/sophisticated_backpacks/constants.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: -100 "use strict"; global.SOPHISTICATED_BACKPACKS_DISABLED_ITEMS = [ diff --git a/kubejs/startup_scripts/soulbind/constants.js b/kubejs/startup_scripts/soulbind/constants.js index b332e784c..222773199 100644 --- a/kubejs/startup_scripts/soulbind/constants.js +++ b/kubejs/startup_scripts/soulbind/constants.js @@ -1,3 +1,6 @@ +// priority: -100 +"use strict"; + global.SOULBINDABLE_ITEMS = [ { equipment: 'ad_astra:space_helmet', item: 'endermanoverhaul:soul_pearl' }, { equipment: 'ad_astra:space_suit', item: 'endermanoverhaul:soul_pearl' }, @@ -7,5 +10,5 @@ global.SOULBINDABLE_ITEMS = [ { equipment: 'ad_astra:netherite_space_helmet', item: 'sandworm_mod:sandworm_tooth' }, { equipment: 'ad_astra:netherite_space_suit', item: 'sandworm_mod:sandworm_tooth' }, { equipment: 'ad_astra:netherite_space_pants', item: 'sandworm_mod:sandworm_tooth' }, - { equipment: 'ad_astra:netherite_space_boots', item: 'sandworm_mod:sandworm_tooth' }, + { equipment: 'ad_astra:netherite_space_boots', item: 'sandworm_mod:sandworm_tooth' } ] \ No newline at end of file diff --git a/kubejs/startup_scripts/species/constants.js b/kubejs/startup_scripts/species/constants.js index 881a885ca..b3cd81106 100644 --- a/kubejs/startup_scripts/species/constants.js +++ b/kubejs/startup_scripts/species/constants.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: -100 "use strict"; global.SPECIES_DISABLED_BLOCKS = [ diff --git a/kubejs/startup_scripts/tacz/constants.js b/kubejs/startup_scripts/tacz/constants.js index ae2892684..1f404d387 100644 --- a/kubejs/startup_scripts/tacz/constants.js +++ b/kubejs/startup_scripts/tacz/constants.js @@ -1,6 +1,6 @@ +// priority: -100 "use strict"; - global.TACZ_GUNS_INDEX = [ //TACZ //Pistol diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index ddb133edf..b9ac3f4c6 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: -100 "use strict"; /** diff --git a/kubejs/startup_scripts/tfg/constants.js b/kubejs/startup_scripts/tfg/constants.js index 01e7e1586..a57d0665f 100644 --- a/kubejs/startup_scripts/tfg/constants.js +++ b/kubejs/startup_scripts/tfg/constants.js @@ -1,3 +1,4 @@ +// priority: -100 "use strict"; /** diff --git a/kubejs/startup_scripts/vintage_improvements/constants.js b/kubejs/startup_scripts/vintage_improvements/constants.js index 54208ebc8..1f3860d24 100644 --- a/kubejs/startup_scripts/vintage_improvements/constants.js +++ b/kubejs/startup_scripts/vintage_improvements/constants.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: -100 "use strict"; global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER = 4; @@ -92,7 +92,7 @@ global.VINTAGE_IMPROVEMENTS_DISABLED_ITEMS = [ global.VINTAGE_IMPROVEMENTS_DISABLED_BLOCKS = [ - 'vintageimprovements:sulfur_block', + 'vintageimprovements:sulfur_block' ] diff --git a/kubejs/startup_scripts/wan_ancient_beasts/constants.js b/kubejs/startup_scripts/wan_ancient_beasts/constants.js index cd4186842..6e5c22a5a 100644 --- a/kubejs/startup_scripts/wan_ancient_beasts/constants.js +++ b/kubejs/startup_scripts/wan_ancient_beasts/constants.js @@ -1,4 +1,4 @@ -// priority: 0 +// priority: -100 "use strict"; global.WAB_DISABLED_BLOCKS =[ From 1f6f8a857080d748922cc36566230871246f237b Mon Sep 17 00:00:00 2001 From: Yan <115050813@qq.com> Date: Tue, 9 Dec 2025 18:52:06 +0800 Subject: [PATCH 21/25] Add Screwdriver to the drums' patchouli page (#2356) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: update mis translations in zh_ch, change Location to 位置 * feat: add Screwdriver to the drums page. --------- Co-authored-by: 闫茂源 --- .../en_us/entries/tfg_tips/inventory_management.json | 2 +- .../zh_cn/entries/tfg_tips/inventory_management.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/inventory_management.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/inventory_management.json index 4b941cba3..297383796 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/inventory_management.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/inventory_management.json @@ -29,7 +29,7 @@ "type": "patchouli:text", "title": "Drums", "anchor": "drums", - "text": "For storing fluids, GregTech has $(item)Drums$(). These can hold a large amount of a single fluid type, and different tiers hold more, just like with crates.$(br2)Unlike crates, drums will retain their fluid when broken, making them ideal for moving fluids around.$(br2)Drums can automatically push their fluid out of their bottom face by right-clicking them with a $(thing)Soft Mallet$()." + "text": "For storing fluids, GregTech has $(item)Drums$(). These can hold a large amount of a single fluid type, and different tiers hold more, just like with crates.$(br2)Unlike crates, drums will retain their fluid when broken, making them ideal for moving fluids around.$(br2)Drums can automatically push their fluid out of their bottom face by right-clicking them with a $(thing)Soft Mallet$() or $(thing)Screwdriver$()." }, { "type": "patchouli:crafting", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_tips/inventory_management.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_tips/inventory_management.json index 45bee264f..128fe04f9 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_tips/inventory_management.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_tips/inventory_management.json @@ -29,7 +29,7 @@ "type": "patchouli:text", "title": "桶", "anchor": "drums", - "text": "在流体存储方面,格雷科技提供了$(item)桶$()。与板条箱类似,不同等级的桶可容纳单一流体的容量逐级提升。$(br2)与板条箱不同的是,桶被破坏时将保留内部流体,非常适合转移流体物资。$(br2)使用$(thing)软木槌$()右键点击桶可使其自动从底部面输出流体。" + "text": "在流体存储方面,格雷科技提供了$(item)桶$()。与板条箱类似,不同等级的桶可容纳单一流体的容量逐级提升。$(br2)与板条箱不同的是,桶被破坏时将保留内部流体,非常适合转移流体物资。$(br2)使用$(thing)软木槌$()或$(thing)螺丝刀$()右键点击桶可使其自动从底部面输出流体。" }, { "type": "patchouli:crafting", From 904c9389fc79dd5dcab108055aa563a1bfae47b2 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 9 Dec 2025 11:35:16 +0000 Subject: [PATCH 22/25] langs --- kubejs/assets/create/lang/zh_cn.json | 2 + kubejs/assets/gtceu/lang/en_us.json | 2 +- kubejs/assets/gtceu/lang/zh_cn.json | 2 +- kubejs/assets/tfg/lang/zh_cn.json | 61 ++++++++++++++++++++++++---- 4 files changed, 56 insertions(+), 11 deletions(-) diff --git a/kubejs/assets/create/lang/zh_cn.json b/kubejs/assets/create/lang/zh_cn.json index 92ca8c573..20c4259ec 100644 --- a/kubejs/assets/create/lang/zh_cn.json +++ b/kubejs/assets/create/lang/zh_cn.json @@ -1,6 +1,8 @@ { "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", "block.create.netherite_backtank": "蓝钢背罐", + "block.create.shadow_casing": "黑钢机壳", + "block.create.refined_radiance_casing": "荧光机壳", "block.create.industrial_iron_block": "工业钢块", "block.create.weathered_iron_block": "风化钢块", "block.create.industrial_iron_window": "工业钢窗户", diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index 7f13e1f42..2a15a5ce6 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -208,7 +208,7 @@ "gtceu.jei.bedrock_fluid.liquid_ice": "Martian Ice Deposit", "gtceu.recipe.category.ingot_molding": "Material Molding", "block.gtceu.wire_coil.tooltip_pyro": "§8Pyrolyse Oven and Nuclear Fuel Factory:§r", - "block.gtceu.wire_coil.tooltip_cracking": "§8Cracking Unit, Coal Liquefaction Tower,§r\n§8Moon and Ostrum Harvesters:§r", + "block.gtceu.wire_coil.tooltip_cracking": "§8Cracking Unit, Coal Liquefaction Tower, Moon and Ostrum Harvesters:§r", "tagprefix.sword_head": "%s Sword Head", "tagprefix.pickaxe_head": "%s Pickaxe Head", "tagprefix.shovel_head": "%s Shovel Head", diff --git a/kubejs/assets/gtceu/lang/zh_cn.json b/kubejs/assets/gtceu/lang/zh_cn.json index 67e43084e..077cda2f2 100644 --- a/kubejs/assets/gtceu/lang/zh_cn.json +++ b/kubejs/assets/gtceu/lang/zh_cn.json @@ -208,7 +208,7 @@ "gtceu.jei.bedrock_fluid.liquid_ice": "火星冰矿藏", "gtceu.recipe.category.ingot_molding": "压模", "block.gtceu.wire_coil.tooltip_pyro": "§8热解炉与核燃料工厂:§r", - "block.gtceu.wire_coil.tooltip_cracking": "§8裂化机,煤炭液化塔,§r\n§8月壤和紫金采集器:§r", + "block.gtceu.wire_coil.tooltip_cracking": "§8裂化机,煤炭液化塔,月壤和紫金采集器:§r", "tagprefix.sword_head": "%s剑身", "tagprefix.pickaxe_head": "%s镐头", "tagprefix.shovel_head": "%s铲头", diff --git a/kubejs/assets/tfg/lang/zh_cn.json b/kubejs/assets/tfg/lang/zh_cn.json index 2e2b1be15..bff72f71c 100644 --- a/kubejs/assets/tfg/lang/zh_cn.json +++ b/kubejs/assets/tfg/lang/zh_cn.json @@ -495,7 +495,7 @@ "block.tfg.zpm_gas_pressurizer": "§c精英气体加压器 III§r", "block.tfg.uv_gas_pressurizer": "§3终极气体加压器§r", "block.tfg.fluid.semiheavy_ammoniacal_water": "半重氨水", - "block.tfg.fluid.sulfur_fumes": "硫磺烟气", + "block.tfg.fluid.sulfur_fumes": "浓硫酸烟雾", "block.tfg.fluid.geyser_slurry": "超高温浆液", "block.tfg.grass.mars_dirt": "火星土壤", "block.tfg.grass.mars_clay_dirt": "火星黏土质土壤", @@ -669,7 +669,7 @@ "block.tfg.impure_moderate_core_frame": "不纯慢化堆芯框架", "fluid.tfg.heavy_ammoniacal_water": "重氨水", "fluid.tfg.semiheavy_ammoniacal_water": "半重氨水", - "fluid.tfg.sulfur_fumes": "硫磺烟气", + "fluid.tfg.sulfur_fumes": "浓硫酸烟雾", "fluid.tfg.geyser_slurry": "超高温浆液", "fluid.tfg.cryogenized_fluix": "低温福鲁伊克斯", "quests.naming-1": "t - Title", @@ -999,7 +999,7 @@ "item.tfg.marker.mercury_orbit": "水星轨道", "item.tfg.marker.glacio_orbit": "木卫二轨道", "item.tfg.railgun_ammo_shell": "轨道炮弹壳", - "item.tfg.sulfur_fumes_bucket": "硫磺烟气桶", + "item.tfg.sulfur_fumes_bucket": "浓硫酸烟雾桶", "item.tfg.geyser_slurry_bucket": "超高温浆液桶", "item.tfg.cryogenized_fluix_bucket": "低温福鲁伊克斯桶", "item.tfg.fluix_bucket": "液态福鲁伊克斯桶", @@ -4028,13 +4028,15 @@ "quests.tfg.subtitle": "欢迎来到群峦传说格雷科技!", "quests.tfg.welcome.title": "欢迎来到群峦传说格雷科技!", "quests.tfg.welcome.subtitle": "生存模组,本该如此。", - "quests.tfg.welcome.desc": "感谢你启动群峦传说格雷科技现代版!\n\n在此模组包中,你将担负起控制未开发荒野并将其转变为工业奇境的任务。从卑微的起点捡起石头开始,到穿越星际空间结束!", + "quests.tfg.welcome.desc": "感谢你启动群峦传说格雷科技现代版!\n\n在此模组包中,你将担负起控制未开发荒野并将其转变为工业奇境的任务。从一个卑微的起点捡起石头开始,到穿越星际空间结束!", "quests.tfg.create_team.title": "如何创建队伍?", "quests.tfg.create_team.subtitle": "你和朋友一起玩吗?", "quests.tfg.create_team.desc": "你可以创建队伍以共同完成任务。为此,打开你的物品栏,在左上角选择画有3个彩色人物的按钮,然后将打开一个界面,你可以在其中创建队伍。点击§a创建队伍§r按钮,给队伍起个名字,然后可能还需要一些其他的参数。成功创建队伍后,你可以使用右上角绿色圆圈中的加号按钮邀请其他玩家加入。从此以后,你们的任务将同步,任何队员都能完成任务。祝你好运!", "quests.tfg.capture_territory.title": "如何占领领土?", "quests.tfg.capture_territory.subtitle": "以及如何加载你领土中的区块", - "quests.tfg.capture_territory.desc": "如果你在服务器上游戏,可能想占领你的领土以防其他玩家干扰。使用打开领地键(默认为“Ctrl+M”)打开窗口,然后左键点击以占领区块,右键点击以取消占领。这有限制,因此你不能占领一切。你可以shift+左键点击区块以强制加载(又名“区块加载”)它,以及shift+右键点击以取消强制加载。如果使用队伍,占领区块将包括你的整个队伍。", + "quests.tfg.capture_territory.desc": "如果你在服务器上游戏,可能想占领你的领土以防其他玩家干扰。使用打开领地键(默认为“Ctrl+M”)打开窗口,然后左键点击以占领区块,右键点击以取消占领。\n\n这有限制,因此你不能占领一切。你可以shift+左键点击区块以强制加载(又名“区块加载”)它,以及shift+右键点击以取消强制加载。如果使用队伍,占领区块将包括你的整个队伍。", + "quests.tfg.chunk_limit.title": "如何提升我的强加载区块上限?", + "quests.tfg.chunk_limit.desc": "如果你在服务器上游戏,默认情况下你只有少量的区块可以被强制加载。\n\n服务器管理员可以自定义这个数量(请查看README.txt文件!)。但如果你拥有管理员权限(或启用作弊模式),你也可以使用命令 &a/ftbchunks admin extra_force_load_chunks @p set X&r 来设置,其中 X 代表新的上限数值。", "quests.tfg.field_guide.title": "关于任务的重要信息!", "quests.tfg.field_guide.subtitle": "我还需要读更多吗?", "quests.tfg.field_guide.desc": "任务仍在开发中,我们一直在努力改进它们!许多关于具体机制的信息也在你的野外指南中,可通过物品栏的书页标签访问。\n\n记住,JEI和野外指南都是你的朋友,因为并非所有内容都会通过任务解释。", @@ -4112,15 +4114,52 @@ "quests.tfg_tips.gt.title": "格雷科技", "quests.tfg_tips.gt.subtitle": "毕竟占了整合包三分之一的名字", "quests.tfg_tips.gt.desc": "&3格雷科技&r令人望而生畏,此分支任务将提供帮助。", + "quests.tfg_tips.gt_power_tools.title": "电动工具", + "quests.tfg_tips.gt_power_tools.subtitle": "男人的梦想", + "quests.tfg_tips.gt_power_tools.desc.1": "和所有优秀的科技模组一样,&5格雷科技&r提供了多种多样的&6工具&r供你使用。要操作它们,你需要&a为其充能&r——有几种方法可以做到:将工具放入&6电池箱&r、机器的&d能量槽&r,或者更好的选择是使用&e闪聚充电箱&r。\n\n请记住:你只能使用&7同级&r或&a更高等级&r的电源为物品充电。&c低等级的电源&r无法为高等级工具充电——不过别担心,&c应该不会有什么东西爆炸&r。大概吧。", + "quests.tfg_tips.gt_power_tools.desc.2": "大多数&5格雷科技&r工具都是由&6工具头&r加工而成。尝试使用&aEMI&r来探索你能用它们做什么——只需记住两件重要的事:\n\n- &e工具头的等级越高&r,制成的工具就越&c强力&r,并且使用的&6电池也越大&r。\n- 并非所有工具都支持每一个等级的工具头。例如,&6链锯&r只能使用&7LV等级的工具头&r来制作。", "quests.tfg_tips.nano_saber.title": "纳米剑", "quests.tfg_tips.nano_saber.subtitle": "激活时26点攻击伤害!", "quests.tfg_tips.nano_saber.desc": "&6纳米剑&r是&5EV&r阶段后期的强力武器。&dShift+右击&r激活&c嗡嗡模式&r。", - "quests.tfg_tips.gt_tools.title": "格雷科技工具", - "quests.tfg_tips.gt_tools.subtitle": "", - "quests.tfg_tips.gt_tools.desc": "多数&5格雷科技&r工具由&6工具头&r打造。用&aEMI&r查看配方——记住两点:\n\n-&e工具头等级越高&r,工具越&c强力&r,所需&6电池越大&r\n-非所有工具支持所有工具头等级。如&6链锯&r仅能用&7LV工具头&r制作", "quests.tfg_tips.magnets.title": "物品磁铁", - "quests.tfg_tips.magnets.subtitle": "", + "quests.tfg_tips.magnets.subtitle": "2010年来电话了,它想要回它的磁铁梗。", "quests.tfg_tips.magnets.desc": "&6物品磁铁&r如名所示,将附近&6物品&r吸向你。&a非常实用&r,夫复何求?", + "quests.tfg_tips.long_distance_items.title": "长距离物品管道", + "quests.tfg_tips.long_distance_items.subtitle": "想知道如何远距离运输矿石?", + "quests.tfg_tips.long_distance_items.desc": "&3长距离物品管道&r可用于远距离输送物品。在两端各放置一个端点,并用管道方块连接即可。\n\n这些管道能实现输入端到输出端的瞬时传输。\n\n管道端点间需保持最小间距,因此不适用于短程输送。", + "quests.tfg_tips.long_distance_fluids.title": "长距离流体管道", + "quests.tfg_tips.long_distance_fluids.subtitle": "想知道如何远距离运输石油?", + "quests.tfg_tips.long_distance_fluids.desc": "&3长距离流体管道&r可用于远距离输送流体。在两端各放置一个端点,并用管道方块连接即可。\n\n这些管道能实现输入端到输出端的瞬时传输。\n\n管道端点间需保持最小间距,因此不适用于短程流体输送。\n\n这些管道素以设置过程&4故障频发&r而闻名。如果它们初次使用时不能正常工作,请尝试用&e扳手&r旋转端点调整朝向。", + "quests.tfg_tips.crates.title": "格雷科技存储", + "quests.tfg_tips.crates.subtitle": "游戏早期的缓冲存储", + "quests.tfg_tips.crates.desc": "理论上,板条箱是箱子的全面升级版。一个方块空间能存储更多物品——你还能要求什么呢?\n\n它们比普通箱子更昂贵,且无法连接到机械动力装置上,但可以容纳任意大小的物品,并且能&6安装覆盖板&r,这使其成为自动化系统中缓冲存储的完美选择。", + "quests.tfg_tips.tape.title": "板条箱胶带", + "quests.tfg_tips.tape.subtitle": "搬运物资", + "quests.tfg_tips.tape.desc": "你可以对板条箱右键使用胶带,使其在被破坏时保留内部物品,便于搬运。不过,每卷胶带只能生效一次。\n\n好在它很便宜!", + "quests.tfg_tips.terminal.subtitle": "多方块自动建造器", + "quests.tfg_tips.terminal.desc": "&b终端&r有一个主要用途,并且&a我们强烈建议你制作一个&r。\n\n建造所有这些&e多方块结构&r可能有点&c令人望而生畏&r,对吧?好吧,这里有个技巧:在任意&6多方块结构控制器&r上使用&dShift + 右键点击&r,即可&a自动组装整个结构&r!\n\n你可能需要&e移动一些总线或舱口&r以适应你的布局,但总体来说,这个功能将为你节省&a大量时间&r。", + "quests.tfg_tips.memory_card.subtitle": "复制和粘贴", + "quests.tfg_tips.memory_card.desc": "当你尝试&a并行化你的生产线&r、铺设更多机器时,为每一台都设置所有的&e输入&r和&e输出&r可能会很麻烦。是的,我们说的就是你,&d超级箱&r和&d超级缸&r。\n\n如果你发现自己需要这个小工具,别犹豫,直接用吧。", + "quests.tfg_tips.portable_scanner.subtitle": "献给最好奇的格雷科技玩家", + "quests.tfg_tips.portable_scanner.desc.1": "&a便携式扫描仪&r(或称 &a三录仪&r),是GTCEu的调试工具。\n\n使用它可以查看方块的详细信息、能量网络的细节、当前状态与内容物,以及它对性能的影响。\n\n它还会为&3流体钻机&r显示流体矿脉的剩余百分比。", + "quests.tfg_tips.portable_scanner.desc.2": "&l&3背景知识:&r&o这个实用的小设备来自格雷科技5。在早期它极其有用,因为那时的GUI或WAILA提供的信息非常少(基本上什么都没有)。", + "quests.tfg_tips.duct_tape.subtitle": "如果一卷修不好,那就再来一卷!", + "quests.tfg_tips.duct_tape.desc": "你可能已经意识到,大多数&e多方块结构&r都需要一个&6维护仓&r。在达到可以制作&a自动维护仓&r的&6HV&r阶段之前,你可以使用这个物品来修复,而无需动用你所有的维护工具。\n\n如果你还不想投资&a自动维护仓&r,或者你根本&c还没到那个阶段&r,它会非常有用。", + "quests.tfg_tips.gt_filters.title": "过滤卡", + "quests.tfg_tips.gt_filters.desc": "使用&5格雷科技&r,你可以获得多种&6过滤卡&r,它们能帮助你轻松实现&a自动化&r。所有这些过滤卡都与不同的&d覆盖板&r兼容,你将在&7LV&r章节了解更多相关内容。\n\n在这里,我们将介绍两种在特定情况下你可能会觉得&b方便&r的、更具体的过滤卡。\n\n要使用过滤卡,只需将其作为&d覆盖板&r应用到任何&5格雷机器&r或&6管道&r上。", + "quests.tfg_tips.smart_item_filter.subtitle": "敲门,谁呀?是高智商俱乐部!", + "quests.tfg_tips.smart_item_filter.desc.1": "在这个任务中,我们将赐予你&5“受诅咒的智慧”&r……轻松自动化电解机的能力。\n\n&9智能物品过滤卡&r是一种能识别配方图谱的过滤卡。当将其放置于机器侧面时,你可以将其设置为“&3电解机&r”,以专门允许可电解物品的输入。你没听错——无需手动过滤!\n\n哦,而且它只会变得&a更好&r。如果你把这个好家伙和&a机械臂&r组合使用,它将只会为机器供应成功执行配方所需的&6精确数量&r的物品。", + "quests.tfg_tips.smart_item_filter.desc.2": "将&a机械臂&r放在你的电解机上,打开其GUI,然后将&9智能过滤卡&r放入其中。确保智能过滤卡已设置为电解机。\n\n接下来,将其配置为&d&l输入&r和&d&l精确供应&r。最后,在任何你放置了&a机械臂&r的侧面连接一个物品栏&7(箱子就行)&r。嗒-哒!你已经搞明白如何处理&6所有&r电解机配方了!\n\n那&3电解机&r的产出物呢?你可能想把流体导向几个储罐——如果你已经玩到那一步了,甚至是&3超级缸&r。我们强烈建议你避免任何涉及流体销毁的方法。&7.&8. 除了水,原因显而易见。", + "quests.tfg_tips.smart_item_filter.desc.3": "&9注意:&r 机械臂必须参与物品传输,其过滤功能才能生效!直接向机器输入物品&7(例如,用漏斗推送!)&r 会忽略机械臂的&d精确供应&r设置。", + "quests.tfg_tips.hazard_materials.title": "危险材料", + "quests.tfg_tips.hazard_materials.subtitle": "窒息危险,3岁以上适用", + "quests.tfg_tips.hazard_materials.desc": "随着新版本的&5格雷科技&r,一个&c危险系统&r被引入。将鼠标悬停在&c危险材料&r上时按住&dShift&r键,你可以看到它们可能对你造成的影响。\n\n我们强烈建议使用合适的&6防护装备&r来保持你的&c器官完好无损&r。", + "quests.tfg_tips.face_mask.desc": "&6口罩&r将保护你免受&c吸入危险粉尘&r的伤害。它&a相当容易制作&r,应该能防止你在处理&5砷&r时出现问题。", + "quests.tfg_tips.rubber_gloves.desc": "&6橡胶手套&r显然能保护你免受&c皮肤接触危害&r。你有两种制作方法:一种是通过&2群峦传说&r的&7较长且较复杂的途径&r,另一种是使用&6高压蒸汽合金炉&r的&a简单得多&r的方法。", + "quests.tfg_tips.hazmat.title": "危险材料防护服", + "quests.tfg_tips.hazmat.desc": "&6危险材料防护服&r是保护自己免受&c任何伤害&r的最佳方式。一旦你达到&bMV&r阶段就能制作它,并且&a你绝对应该花时间去做一套&r。", + "quests.tfg_tips.armor.title": "格雷科技护甲", + "quests.tfg_tips.armor.desc": "&5格雷科技&r带来了它自己的护甲系列。当然,穿着&7金属板&r很酷,但既然你现在是个&b工业狂人&r,也许是时候看看一些&a科技护甲&r了。\n\n&5格雷科技&r提供了两种型号。第一种大约在&6HV&r阶段可用,提供比你之前穿过的任何护甲都更好的保护。它配备了&e强大的绝缘层&r以抵御地球的恶劣气候,甚至还可以升级&d喷气背包&r。\n\n第二种型号要到很久以后——大约&1IV&r和&dLuV&r阶段——才会可用。这一款能让你使用&3氧气&r在太空中&9呼吸&r。", "quests.tfg_tips.terrafirmacraft.title": "群峦传说附加", "quests.tfg_tips.terrafirmacraft.subtitle": "整合包名字的另外三分之二", "quests.tfg_tips.terrafirmacraft.desc": "&3群峦传说&r是&2TerraFirmaGreg&r的核心模组。此分支聚焦生存特性与&d附加&r内容,如&4陈年佳酿&r和&b手杖&r。", @@ -4132,6 +4171,10 @@ "quests.tfg_tips.hiking.subtitle": "&o专业步行设备", "quests.tfg_tips.hiking.desc": "&d登山靴&r能让你更轻松地探索世界!所有&d登山靴&r都可使你畅通无阻地穿过高草丛。此外,每一等级的&d登山靴&r都会逐步提供更高的&9护甲值&r、&9移动速度&r与&9坠落抗性&r,以及其他属性提升。", "quests.tfg_tips.hiking.task": "任意登山靴", + "quests.tfg_tips.feeding_troughs.title": "喂食槽", + "quests.tfg_tips.feeding_troughs.subtitle": "金属牧场助手", + "quests.tfg_tips.feeding_troughs.desc": "喂食槽(亦称驯养站)能让你在每天早晨自动喂养动物。它甚至还有一个选项,可以避免喂养那些熟悉度已满的动物,以防你不想让它们繁殖。\n\n更高等级的喂养槽拥有更大的有效范围。\n\n&3&l提示:&r&o 你最好不要把它直接放在围栏旁边,否则动物们可能会试图利用它逃出围栏!", + "quests.tfg_tips.feeding_troughs.task": "任何喂食槽", "quests.tfg_tips.glassblowing.title": "玻璃吹制", "quests.tfg_tips.glassblowing.subtitle": "真实的玻璃工艺!", "quests.tfg_tips.glassblowing.desc": "制作任何类型的&d玻璃板&r或&d玻璃块&r,你都需要一套&3玻璃吹制&r设备。\n\n&3玻璃吹制&r需要一根&a吹管&r,以及一个用玻璃吹制方块搭建的平台来浇筑熔融玻璃。关于平台的具体形状和哪些方块符合要求,请查阅&2野外指南&r获取更多信息。当你能制作&a黄铜&r后即可解锁玻璃吹制工艺。", From 6cea8ec77bc4adbc1a207b28677aacd4402f5cb5 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 9 Dec 2025 11:48:20 +0000 Subject: [PATCH 23/25] fixed some line breaks in tooltips --- kubejs/assets/gtceu/lang/en_us.json | 7 +++++-- kubejs/assets/gtceu/lang/ja_jp.json | 9 +++++++-- kubejs/assets/gtceu/lang/uk_ua.json | 9 +++++++-- kubejs/assets/gtceu/lang/zh_cn.json | 7 +++++-- kubejs/client_scripts/tooltips.js | 3 +++ 5 files changed, 27 insertions(+), 8 deletions(-) diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index 2a15a5ce6..73820446d 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -55,7 +55,8 @@ "gtceu.tooltip.machine.moon_dust_harvester_1": "§7Extraterrestrial Vacuum Cleaner§r", "gtceu.tooltip.machine.moon_dust_harvester_2": "§7Harvests infinite Regolith Dust depending on the biome its placed in.§r", "gtceu.tooltip.machine.ostrum_harvester_1": "§7Legally Distinct Spice Crawler§r", - "gtceu.tooltip.machine.ostrum_harvester_2": "§7Harvests infinite Ostrum Dust when placed over an Ostrum deposit.\nRequires drilling fluid to work.§r", + "gtceu.tooltip.machine.ostrum_harvester_2": "§7Harvests infinite Ostrum Dust when placed over an Ostrum deposit.§r", + "gtceu.tooltip.machine.ostrum_harvester_3": "§7Requires drilling fluid to work.§r", "gtceu.tooltip.machine.ostrum_linear_accelerator_1": "§7Higgs Boson not included§r", "gtceu.tooltip.machine.ostrum_linear_accelerator_2": "§7Breaks down Ostrum Dust into its components. Requires various fluids from fission line.§r", "gtceu.tooltip.machine.heat_exchanger_1": "§7Heating up Fluids with other hot Fluids§r", @@ -63,7 +64,9 @@ "gtceu.tooltip.machine.nuclear_fuel_factory_1": "§7Producing extra spicy Rods§r", "gtceu.tooltip.machine.nuclear_fuel_factory_2": "§7Processes raw radioactive material into fissile fuel.§r", "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.\nFueling it with Coke or Anthracite will double the output.\nCan process up to 8 recipes at once, which changes how much Steam is required.§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.coal_liquefaction_tower_1": "§7Carbon Smoothie Maker§r", "gtceu.tooltip.machine.coal_liquefaction_tower_2": "§7Extracts gas fuels from carbonic solids and creosote§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 b9a7bb645..dee290026 100644 --- a/kubejs/assets/gtceu/lang/ja_jp.json +++ b/kubejs/assets/gtceu/lang/ja_jp.json @@ -52,7 +52,8 @@ "gtceu.tooltip.machine.moon_dust_harvester_1": "§7Extraterrestrial Vacuum Cleaner§r", "gtceu.tooltip.machine.moon_dust_harvester_2": "§7Harvests infinite Regolith Dust depending on the biome its placed in.§r", "gtceu.tooltip.machine.ostrum_harvester_1": "§7Legally Distinct Spice Crawler§r", - "gtceu.tooltip.machine.ostrum_harvester_2": "§7Harvests infinite Ostrum Dust when placed over an Ostrum deposit.\nRequires drilling fluid to work.§r", + "gtceu.tooltip.machine.ostrum_harvester_2": "§7Harvests infinite Ostrum Dust when placed over an Ostrum deposit.§r", + "gtceu.tooltip.machine.ostrum_harvester_3": "§7Requires drilling fluid to work.§r", "gtceu.tooltip.machine.ostrum_linear_accelerator_1": "§7Higgs Boson not included§r", "gtceu.tooltip.machine.ostrum_linear_accelerator_2": "§7Breaks down Ostrum Dust into its components. Requires various fluids from fission line.§r", "gtceu.tooltip.machine.heat_exchanger_1": "§7Heating up Fluids with other hot Fluids§r", @@ -60,7 +61,11 @@ "gtceu.tooltip.machine.nuclear_fuel_factory_1": "§7Producing extra spicy Rods§r", "gtceu.tooltip.machine.nuclear_fuel_factory_2": "§7Processes raw radioactive material into fissile fuel.§r", "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.\nFueling it with Coke or Anthracite will double the output.\nCan process up to 8 recipes at once, which changes how much Steam is required.§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.coal_liquefaction_tower_1": "§7Carbon Smoothie Maker§r", + "gtceu.tooltip.machine.coal_liquefaction_tower_2": "§7Extracts gas fuels from carbonic solids and creosote§r", "item.gtceu.tiny_wood_dust": "極小の木のパルプ", "item.gtceu.small_wood_dust": "小さな木のパルプ", "item.gtceu.wood_dust": "木のパルプ", diff --git a/kubejs/assets/gtceu/lang/uk_ua.json b/kubejs/assets/gtceu/lang/uk_ua.json index a5feb29cb..3e408c14d 100644 --- a/kubejs/assets/gtceu/lang/uk_ua.json +++ b/kubejs/assets/gtceu/lang/uk_ua.json @@ -52,7 +52,8 @@ "gtceu.tooltip.machine.moon_dust_harvester_1": "§7Позаземний пилосос§r", "gtceu.tooltip.machine.moon_dust_harvester_2": "§7Збирає нескінченну кількість реголітового пилу залежно від біома, в якому він розміщений.§r", "gtceu.tooltip.machine.ostrum_harvester_1": "§7Юридично відмінний пряний повзун§r", - "gtceu.tooltip.machine.ostrum_harvester_2": "§7Збирає нескінченну кількість острумового пилу, якщо розміщений над родовищем оструму. \nПотребує бурової рідини для роботи.§r", + "gtceu.tooltip.machine.ostrum_harvester_2": "§7Збирає нескінченну кількість острумового пилу, якщо розміщений над родовищем оструму.§r", + "gtceu.tooltip.machine.ostrum_harvester_3": "§7Потребує бурової рідини для роботи.§r", "gtceu.tooltip.machine.ostrum_linear_accelerator_1": "§7Бозон Хіггса не входить у комплект§r", "gtceu.tooltip.machine.ostrum_linear_accelerator_2": "§7Розкладає острумовий пил на його компоненти. Потребує різні рідини з лінії поділу.§r", "gtceu.tooltip.machine.heat_exchanger_1": "§7Нагрівання рідин іншими гарячими рідинами§r", @@ -60,7 +61,11 @@ "gtceu.tooltip.machine.nuclear_fuel_factory_1": "§7Виробляє додатково пікантні стрижні§r", "gtceu.tooltip.machine.nuclear_fuel_factory_2": "§7Переробляє необроблений радіоактивний матеріал у подільне паливо.§r", "gtceu.tooltip.machine.steam_bloomery_1": "§7Покращуйте свою домницю силою пари!§r", - "gtceu.tooltip.machine.steam_bloomery_2": "§7Переробляє залізовмісний пил або злитки у сирі залізні криці. \nВикористання коксу чи антрациту як палива подвоїть вихід. \nМоже обробляти до 8 рецептів одночасно, що змінює кількість необхідної пари.§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.coal_liquefaction_tower_1": "§7Carbon Smoothie Maker§r", + "gtceu.tooltip.machine.coal_liquefaction_tower_2": "§7Extracts gas fuels from carbonic solids and creosote§r", "item.gtceu.tiny_wood_dust": "Маленька купа хвойної целюлози", "item.gtceu.small_wood_dust": "Мала купа хвойної целюлози", "item.gtceu.wood_dust": "Хвойна целюлоза", diff --git a/kubejs/assets/gtceu/lang/zh_cn.json b/kubejs/assets/gtceu/lang/zh_cn.json index 077cda2f2..856be360c 100644 --- a/kubejs/assets/gtceu/lang/zh_cn.json +++ b/kubejs/assets/gtceu/lang/zh_cn.json @@ -55,7 +55,8 @@ "gtceu.tooltip.machine.moon_dust_harvester_1": "§7地外真空吸尘器§r", "gtceu.tooltip.machine.moon_dust_harvester_2": "§7根据所处生物群系无限采集风化土粉尘。§r", "gtceu.tooltip.machine.ostrum_harvester_1": "§7合法异星香料采集车§r", - "gtceu.tooltip.machine.ostrum_harvester_2": "§7置于紫金矿床上方可无限采集紫金粉。\n需消耗钻井液。§r", + "gtceu.tooltip.machine.ostrum_harvester_2": "§7置于紫金矿床上方可无限采集紫金粉。§r", + "gtceu.tooltip.machine.ostrum_harvester_3": "§7需消耗钻井液。§r", "gtceu.tooltip.machine.ostrum_linear_accelerator_1": "§7不含希格斯玻色子§r", "gtceu.tooltip.machine.ostrum_linear_accelerator_2": "§7将紫金矿粉分解为组分原料。需配合裂变产线多种流体。§r", "gtceu.tooltip.machine.heat_exchanger_1": "§7用高温流体加热其他流体§r", @@ -63,7 +64,9 @@ "gtceu.tooltip.machine.nuclear_fuel_factory_1": "§7超劲爆燃料棒制造厂§r", "gtceu.tooltip.machine.nuclear_fuel_factory_2": "§7将原始放射性材料加工成裂变燃料§r", "gtceu.tooltip.machine.steam_bloomery_1": "§7用蒸汽动力升级你的锻铁炉!§r", - "gtceu.tooltip.machine.steam_bloomery_2": "§7将含铁矿粉或锭加工成生铁方坯。\n使用焦煤或无烟煤可倍增产量。\n支持最多8组配方并行处理,相应调整蒸汽需求。§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.coal_liquefaction_tower_1": "§7碳素奶昔制造机§r", "gtceu.tooltip.machine.coal_liquefaction_tower_2": "§7从碳质固体与杂酚油中提取气体燃料§r", "item.gtceu.tiny_wood_dust": "小撮软木浆", diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index e33e5b69b..9c49c075c 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -62,6 +62,7 @@ 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')); }) event.addAdvanced(['gtceu:heat_exchanger'], (item, advanced, text) => { @@ -79,6 +80,8 @@ const registerTooltips = (event) => { event.addAdvanced(['gtceu: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')); }) event.addAdvanced(['gtceu:large_chemical_reactor'], (item, advanced, text) => { text.add(1, Text.translate('tfg.tooltip.machine.perfect_overclock')); From d45156ef30a024405a528a87f8d1a308b241419a Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 9 Dec 2025 11:48:55 +0000 Subject: [PATCH 24/25] adjusted spawn weights for primitive illagers --- .../biome_modifier/all_biome_modifier.json | 3 --- .../iloger_1_biome_modifier.json | 19 ++++++++++++++++++- .../iloger_2_biome_modifier.json | 19 ++++++++++++++++++- .../viloger_10_biome_modifier.json | 19 ++++++++++++++++++- 4 files changed, 54 insertions(+), 6 deletions(-) diff --git a/kubejs/data/primitive_creatures/forge/biome_modifier/all_biome_modifier.json b/kubejs/data/primitive_creatures/forge/biome_modifier/all_biome_modifier.json index f8f2c00b6..6afd60ede 100644 --- a/kubejs/data/primitive_creatures/forge/biome_modifier/all_biome_modifier.json +++ b/kubejs/data/primitive_creatures/forge/biome_modifier/all_biome_modifier.json @@ -5,8 +5,6 @@ }, "entity_types": [ "primitive_creatures:beast", - "primitive_creatures:iloger_1", - "primitive_creatures:iloger_2", "primitive_creatures:iloger_3", "primitive_creatures:iloger_4", "primitive_creatures:iloger_5", @@ -14,7 +12,6 @@ "primitive_creatures:musselwarden", "primitive_creatures:piloger_9", "primitive_creatures:iloger_10", - "primitive_creatures:viloger_10", "primitive_creatures:wiloger" ] } \ No newline at end of file diff --git a/kubejs/data/primitive_creatures/forge/biome_modifier/iloger_1_biome_modifier.json b/kubejs/data/primitive_creatures/forge/biome_modifier/iloger_1_biome_modifier.json index 2d96022cf..c4380d1a2 100644 --- a/kubejs/data/primitive_creatures/forge/biome_modifier/iloger_1_biome_modifier.json +++ b/kubejs/data/primitive_creatures/forge/biome_modifier/iloger_1_biome_modifier.json @@ -1,3 +1,20 @@ { - "type": "forge:none" + "type": "forge:add_spawns", + "biomes": [ + "tfc:highlands", + "tfc:hills", + "tfc:lowlands", + "tfc:plains", + "tfc:plateau", + "tfc:rolling_hills", + "tfc:salt_marsh", + "tfc:shore", + "tfc:tidal_flats" + ], + "spawners": { + "type": "primitive_creatures:iloger_1", + "weight": 1, + "minCount": 2, + "maxCount": 3 + } } \ No newline at end of file diff --git a/kubejs/data/primitive_creatures/forge/biome_modifier/iloger_2_biome_modifier.json b/kubejs/data/primitive_creatures/forge/biome_modifier/iloger_2_biome_modifier.json index 2d96022cf..e416f61c2 100644 --- a/kubejs/data/primitive_creatures/forge/biome_modifier/iloger_2_biome_modifier.json +++ b/kubejs/data/primitive_creatures/forge/biome_modifier/iloger_2_biome_modifier.json @@ -1,3 +1,20 @@ { - "type": "forge:none" + "type": "forge:add_spawns", + "biomes": [ + "tfc:highlands", + "tfc:hills", + "tfc:lowlands", + "tfc:plains", + "tfc:plateau", + "tfc:rolling_hills", + "tfc:salt_marsh", + "tfc:shore", + "tfc:tidal_flats" + ], + "spawners": { + "type": "primitive_creatures:iloger_2", + "weight": 1, + "minCount": 2, + "maxCount": 3 + } } \ No newline at end of file diff --git a/kubejs/data/primitive_creatures/forge/biome_modifier/viloger_10_biome_modifier.json b/kubejs/data/primitive_creatures/forge/biome_modifier/viloger_10_biome_modifier.json index 2d96022cf..b89e19b65 100644 --- a/kubejs/data/primitive_creatures/forge/biome_modifier/viloger_10_biome_modifier.json +++ b/kubejs/data/primitive_creatures/forge/biome_modifier/viloger_10_biome_modifier.json @@ -1,3 +1,20 @@ { - "type": "forge:none" + "type": "forge:add_spawns", + "biomes": [ + "tfc:badlands", + "tfc:canyons", + "tfc:inverted_badlands", + "tfc:low_canyons", + "tfc:mountains", + "tfc:oceanic_mountains", + "tfc:old_mountains", + "tfc:volcanic_mountains", + "tfc:volcanic_oceanic_mountains" + ], + "spawners": { + "type": "primitive_creatures:viloger_10", + "weight": 1, + "minCount": 2, + "maxCount": 3 + } } \ No newline at end of file From 445809cc875a24dd7274fa03e34b97c50979502b Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 9 Dec 2025 12:23:52 +0000 Subject: [PATCH 25/25] 0.11.10 --- CHANGELOG.md | 14 +++- kubejs/assets/gtceu/lang/en_us.json | 4 +- kubejs/assets/gtceu/lang/ja_jp.json | 4 +- kubejs/assets/gtceu/lang/ru_ru.json | 4 +- kubejs/assets/gtceu/lang/uk_ua.json | 4 +- kubejs/assets/gtceu/lang/zh_cn.json | 4 +- kubejs/assets/tfg/lang/en_us.json | 9 +++ .../tfg/europa/materials.europa.js | 1 - .../tfg/nuclear/materials.nuclear.js | 2 +- .../tfg/venus/materials.venus.js | 1 - pakku-lock.json | 64 +++++++++---------- 11 files changed, 65 insertions(+), 46 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf0c11bf3..c2b3b8560 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,27 @@ # Changelog ## Unreleased +### Changes +### Bug fixes +### Translation updates + +## [0.11.10] - 9-12-2025 ### Breaking Changes - Butyraldehyde in a chemical reactor now uses circuit 5 instead of 1 to avoid a conflict with Methanol @Pyritie ### Other Changes - Added recipes for create's shadow and radiant casings (#2256) @Ujhik +- Some small quest and field guide additions and fixes (#2348, #2356) @Pyritie @jmecn +- Adjusted the spawn weights of primitive illagers @Pyritie ### Bug fixes -- Fixed missing recipes for many fluid and item pipes @Pyritie +- Fixed a crash on boot on some linux systems (#2347, #2355) @Redeix @mgsmyrk +- Fixed missing recipes for many fluid and item pipes (#2359) @Pyritie - Fixed missing cleanroom tags for the ad astra 3x3 doors, so now you can *actually* use them in a cleanroom @Pyritie - Fixed aged sake, vodka, and whiskey losing their buff effects @Pyritie - Fixed some inconsistencies with loose rocks into bricks (#2353) @Pyritie +- Fixed a tag issue with some purified ores and Create's crushed ore tag (#2339) @Pyritie +### Translation updates +- Chinese (simplified) @jmecn +- Japanese @sakura-gondra ## [0.11.9] - 7-12-2025 ### Breaking Changes diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index 73820446d..3cb0b07be 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -140,8 +140,8 @@ "material.gtceu.armalcolite": "Armalcolite", "material.gtceu.desh": "Desh", "material.gtceu.ostrum": "Ostrum", - "material.gtceu.calorite": "Calorite", - "material.gtceu.etrium": "Etrium", + "material.tfg.calorite": "Calorite", + "material.tfg.etrium": "Etrium", "material.gtceu.tarkianite": "Tarkianite", "material.gtceu.aluminium_silicate": "Aluminium Silicate", "material.gtceu.rocket_alloy_t1": "R-Aluminosteel Rocket Alloy", diff --git a/kubejs/assets/gtceu/lang/ja_jp.json b/kubejs/assets/gtceu/lang/ja_jp.json index dee290026..7cdfb7d50 100644 --- a/kubejs/assets/gtceu/lang/ja_jp.json +++ b/kubejs/assets/gtceu/lang/ja_jp.json @@ -137,8 +137,8 @@ "material.gtceu.armalcolite": "アーマルコライト", "material.gtceu.desh": "デッシュ", "material.gtceu.ostrum": "オストラム", - "material.gtceu.calorite": "カロライト", - "material.gtceu.etrium": "エトリウム", + "material.tfg.calorite": "カロライト", + "material.tfg.etrium": "エトリウム", "material.gtceu.aluminium_silicate": "ケイ酸アルミニウム", "material.gtceu.rocket_alloy_t1": "R-AS ロケット合金", "material.gtceu.rocket_alloy_t2": "ASM-4914 チタニウムロケット合金", diff --git a/kubejs/assets/gtceu/lang/ru_ru.json b/kubejs/assets/gtceu/lang/ru_ru.json index 5d0ce4987..4369a0fbc 100644 --- a/kubejs/assets/gtceu/lang/ru_ru.json +++ b/kubejs/assets/gtceu/lang/ru_ru.json @@ -119,8 +119,8 @@ "material.gtceu.armalcolite": "Армалколит", "material.gtceu.desh": "Деш", "material.gtceu.ostrum": "Ostrum", - "material.gtceu.calorite": "Калорит", - "material.gtceu.etrium": "Этриум", + "material.tfg.calorite": "Калорит", + "material.tfg.etrium": "Этриум", "material.gtceu.aluminium_silicate": "Aluminium Silicate", "material.gtceu.rocket_alloy_t1": "Красный алюминиево-стальной ракетный сплав", "material.gtceu.rocket_alloy_t2": "ASM 4914 Titanium Rocket Alloy", diff --git a/kubejs/assets/gtceu/lang/uk_ua.json b/kubejs/assets/gtceu/lang/uk_ua.json index 3e408c14d..076d84661 100644 --- a/kubejs/assets/gtceu/lang/uk_ua.json +++ b/kubejs/assets/gtceu/lang/uk_ua.json @@ -127,8 +127,8 @@ "material.gtceu.armalcolite": "Армалколіт", "material.gtceu.desh": "Деш", "material.gtceu.ostrum": "Острум", - "material.gtceu.calorite": "Калорит", - "material.gtceu.etrium": "Етріум", + "material.tfg.calorite": "Калорит", + "material.tfg.etrium": "Етріум", "material.gtceu.aluminium_silicate": "Алюмосилікат", "material.gtceu.rocket_alloy_t1": "Алюміносталевий ракетний сплав R-класу", "material.gtceu.rocket_alloy_t2": "Ракетний титановий сплав ASM 4914", diff --git a/kubejs/assets/gtceu/lang/zh_cn.json b/kubejs/assets/gtceu/lang/zh_cn.json index 856be360c..ab5c5a070 100644 --- a/kubejs/assets/gtceu/lang/zh_cn.json +++ b/kubejs/assets/gtceu/lang/zh_cn.json @@ -140,8 +140,8 @@ "material.gtceu.armalcolite": "阿姆阿尔柯尔矿", "material.gtceu.desh": "戴斯", "material.gtceu.ostrum": "紫金", - "material.gtceu.calorite": "耐热金属", - "material.gtceu.etrium": "埃忒恩", + "material.tfg.calorite": "耐热金属", + "material.tfg.etrium": "埃忒恩", "material.gtceu.tarkianite": "塔基安矿", "material.gtceu.aluminium_silicate": "硅酸铝", "material.gtceu.rocket_alloy_t1": "R型铝钢火箭合金", diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index a9e0a85c6..886bd5662 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -35,6 +35,15 @@ "biome.tfg.mars/sangnum_edge": "Sangnum Edge", "biome.tfg.mars/sangnum_plains": "Sangnum Prairie", "biome.tfg.mars/sangnum_hills": "Sangnum Moorland", + "biome.tfg.venus/arachnoids": "Venusian Arachnoids", + "biome.tfg.venus/fractured_pools": "Fractured Pools", + "biome.tfg.venus/fumaroles": "Gaseous Fumaroles", + "biome.tfg.venus/geysers": "Scalding Geysers", + "biome.tfg.venus/jagged_tablelands": "Jagged Tablelands", + "biome.tfg.venus/salt_flats": "Salt Flats", + "biome.tfg.venus/stromatolite_beach": "Stromatolite Beach", + "biome.tfg.venus/sulfuric_ravine": "Sulfuric Ravine", + "biome.tfg.venus/volcanic_mountains": "Scorching Volcanoes", "block.tfg.piglin_disguise": "Piglin Disguise", "block.tfg.piglin_disguise_block": "Piglin Disguise", "block.tfg.dry_ice": "Dry Ice", diff --git a/kubejs/startup_scripts/tfg/europa/materials.europa.js b/kubejs/startup_scripts/tfg/europa/materials.europa.js index a4fb06ddd..8db9c8a1e 100644 --- a/kubejs/startup_scripts/tfg/europa/materials.europa.js +++ b/kubejs/startup_scripts/tfg/europa/materials.europa.js @@ -7,7 +7,6 @@ function registerTFGEuropaMaterials(event) { .color(0x7BFCD7) .secondaryColor(0x3582D2) .iconSet(GTMaterialIconSet.getByName('tfc_silver')) - .ore() .ingot() .flags( GTMaterialFlags.FORCE_GENERATE_BLOCK, diff --git a/kubejs/startup_scripts/tfg/nuclear/materials.nuclear.js b/kubejs/startup_scripts/tfg/nuclear/materials.nuclear.js index 5608f4ae6..5075a1e8e 100644 --- a/kubejs/startup_scripts/tfg/nuclear/materials.nuclear.js +++ b/kubejs/startup_scripts/tfg/nuclear/materials.nuclear.js @@ -30,7 +30,7 @@ const registerTFGNuclearMaterials = (event) => { .components('2x hydrogen', '1x oxygen') .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - event.create('critical_steam') + event.create('tfg:critical_steam') .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(3730)) .components('2x hydrogen', '1x oxygen') .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) diff --git a/kubejs/startup_scripts/tfg/venus/materials.venus.js b/kubejs/startup_scripts/tfg/venus/materials.venus.js index 124fa9c6e..e5a6e8f7e 100644 --- a/kubejs/startup_scripts/tfg/venus/materials.venus.js +++ b/kubejs/startup_scripts/tfg/venus/materials.venus.js @@ -9,7 +9,6 @@ function registerTFGVenusMaterials(event) { .color(0xC94D4E) .secondaryColor(0x9A296A) .iconSet(GTMaterialIconSet.getByName('tfc_copper')) - .ore() .ingot() .flags( GTMaterialFlags.FORCE_GENERATE_BLOCK, diff --git a/pakku-lock.json b/pakku-lock.json index 3e7e3db7f..580a6d6fe 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -9210,7 +9210,7 @@ "files": [ { "type": "modrinth", - "file_name": "modernfix-forge-5.25.1+mc1.20.1.jar", + "file_name": "modernfix-forge-5.25.2+mc1.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -9218,20 +9218,20 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/nmDcB62a/versions/PbIMs8a8/modernfix-forge-5.25.1+mc1.20.1.jar", - "id": "PbIMs8a8", + "url": "https://cdn.modrinth.com/data/nmDcB62a/versions/scXW7F8Q/modernfix-forge-5.25.2+mc1.20.1.jar", + "id": "scXW7F8Q", "parent_id": "nmDcB62a", "hashes": { - "sha512": "16ed32ed2e9e153cd6adad6d5d32280f33ce79b5b9829576f26bab9c8f37e1c415a49c86d11839de9527ab1c5222e32946792b5819d9f6a76daffeea305a3848", - "sha1": "124ea5db8c3b7dc00166806ef0fc412177882fda" + "sha512": "016940bd76b36865f507c07fc7834ea7dc6f7a6c0016aebf6375ee05a9405f2730e07c555ab8ce920775fce3b5a29ff5b638b67f29c03458074650478d37242a", + "sha1": "4069534174e618393f0c14d9dc61ac27a04bb992" }, "required_dependencies": [], - "size": 895267, - "date_published": "2025-11-08T20:05:06.924760Z" + "size": 895444, + "date_published": "2025-12-08T02:42:23.149141Z" }, { "type": "curseforge", - "file_name": "modernfix-forge-5.25.1+mc1.20.1.jar", + "file_name": "modernfix-forge-5.25.2+mc1.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -9239,16 +9239,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7200/213/modernfix-forge-5.25.1+mc1.20.1.jar", - "id": "7200213", + "url": "https://edge.forgecdn.net/files/7306/749/modernfix-forge-5.25.2+mc1.20.1.jar", + "id": "7306749", "parent_id": "790626", "hashes": { - "sha1": "124ea5db8c3b7dc00166806ef0fc412177882fda", - "md5": "3e7c495f3e3b9057c5e6227119e5b614" + "sha1": "4069534174e618393f0c14d9dc61ac27a04bb992", + "md5": "893b2aba13f35bd7ed3fdad2ca15a4d4" }, "required_dependencies": [], - "size": 895267, - "date_published": "2025-11-08T20:05:01.880Z" + "size": 895444, + "date_published": "2025-12-08T02:42:18.980Z" } ] }, @@ -13815,7 +13815,7 @@ "files": [ { "type": "modrinth", - "file_name": "TerraFirmaGreg-Core-Modern-0.8.7.jar", + "file_name": "TerraFirmaGreg-Core-Modern-0.8.8.jar", "mc_versions": [ "1.20.1" ], @@ -13824,23 +13824,23 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/lNttW2Xl/versions/bROqTVck/TerraFirmaGreg-Core-Modern-0.8.7.jar", - "id": "bROqTVck", + "url": "https://cdn.modrinth.com/data/lNttW2Xl/versions/6FdOjis1/TerraFirmaGreg-Core-Modern-0.8.8.jar", + "id": "6FdOjis1", "parent_id": "lNttW2Xl", "hashes": { - "sha512": "136f0851e89bdb911d319ed12aac0f2803d0b7d74ca18ad2fb6330ebc5965e0fee82862ea87f49901aa41783cea98a4968786b8ff2fb1503f90e3e828e79ee44", - "sha1": "c0c1a2c44998b630ad56be665017896287cf685c" + "sha512": "ebc09725e0662ff8059a605397f12fb49c300807aacd27742c858ac436e8730350516ed7697925047686a838932371812f58bee49e11802a387cbe9d315121f0", + "sha1": "75551167d5d6c8c61ae7ae713b3a767bf1bcb321" }, "required_dependencies": [ - "7tG215v7", - "JaCEZUhg" + "JaCEZUhg", + "7tG215v7" ], - "size": 9315464, - "date_published": "2025-12-07T21:45:07.908480Z" + "size": 9321318, + "date_published": "2025-12-09T11:16:17.379839Z" }, { "type": "curseforge", - "file_name": "TerraFirmaGreg-Core-Modern-0.8.7.jar", + "file_name": "TerraFirmaGreg-Core-Modern-0.8.8.jar", "mc_versions": [ "1.20.1" ], @@ -13849,19 +13849,19 @@ "neoforge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7305/932/TerraFirmaGreg-Core-Modern-0.8.7.jar", - "id": "7305932", + "url": "https://edge.forgecdn.net/files/7311/305/TerraFirmaGreg-Core-Modern-0.8.8.jar", + "id": "7311305", "parent_id": "513402", "hashes": { - "sha1": "c0c1a2c44998b630ad56be665017896287cf685c", - "md5": "e4dcd7222073266fe1188fe52ca35d5f" + "sha1": "75551167d5d6c8c61ae7ae713b3a767bf1bcb321", + "md5": "5f9e1df5cbe3f1421d23e1c15b712aca" }, "required_dependencies": [ - "302973", - "890405" + "890405", + "302973" ], - "size": 9315464, - "date_published": "2025-12-07T21:45:02.070Z" + "size": 9321318, + "date_published": "2025-12-09T11:16:13.343Z" } ] },