From d3567d3517a03bff643ac2c630a6b2e22030980a Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 19 Jul 2025 22:18:14 +0100 Subject: [PATCH 01/35] removed ore veins (this is for the really huge vanilla kind) --- .../worldgen/noise_settings/venus_noise.json | 70 +------------------ 1 file changed, 3 insertions(+), 67 deletions(-) diff --git a/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json b/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json index d5015191f..7b0e981ab 100644 --- a/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json +++ b/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json @@ -268,73 +268,9 @@ "xz_scale": 0.25, "y_scale": 0.0 }, - "vein_gap": { - "type": "minecraft:noise", - "noise": "minecraft:ore_gap", - "xz_scale": 1.0, - "y_scale": 1.0 - }, - "vein_ridged": { - "type": "minecraft:add", - "argument1": -0.07999999821186066, - "argument2": { - "type": "minecraft:max", - "argument1": { - "type": "minecraft:abs", - "argument": { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:range_choice", - "input": "minecraft:y", - "max_exclusive": 51.0, - "min_inclusive": -60.0, - "when_in_range": { - "type": "minecraft:noise", - "noise": "minecraft:ore_vein_a", - "xz_scale": 4.0, - "y_scale": 4.0 - }, - "when_out_of_range": 0.0 - } - } - }, - "argument2": { - "type": "minecraft:abs", - "argument": { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:range_choice", - "input": "minecraft:y", - "max_exclusive": 51.0, - "min_inclusive": -60.0, - "when_in_range": { - "type": "minecraft:noise", - "noise": "minecraft:ore_vein_b", - "xz_scale": 4.0, - "y_scale": 4.0 - }, - "when_out_of_range": 0.0 - } - } - } - } - }, - "vein_toggle": { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:range_choice", - "input": "minecraft:y", - "max_exclusive": 51.0, - "min_inclusive": -60.0, - "when_in_range": { - "type": "minecraft:noise", - "noise": "minecraft:ore_veininess", - "xz_scale": 1.5, - "y_scale": 1.5 - }, - "when_out_of_range": 0.0 - } - } + "vein_gap": 0, + "vein_ridged": 0, + "vein_toggle": 0 }, From e5d4e76ad13b231a831b44e56dc03b4cd991c3f0 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 03:18:27 +0500 Subject: [PATCH 02/35] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 38782c362..6d114306d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -161,7 +161,7 @@ jobs: id: check shell: bash run: | - echo "make_release=${{ steps.check_tag.outputs.exists == false && env.DEV_ENVIRONMENT == false }}" >> $GITHUB_OUTPUT + echo "make_release=${{ steps.check_tag.outputs.exists == 'false' && env.DEV_ENVIRONMENT == 'false' }}" >> $GITHUB_OUTPUT echo "exists=${{ steps.check_tag.outputs.exists }}" >> $GITHUB_OUTPUT echo "project_name=${{ steps.pakku_info.outputs.name }}" >> $GITHUB_OUTPUT MC_VERSIONS_JSON='${{ steps.pakku_lock_info.outputs.mc_versions }}' From fb0c7efb0f27aa0bd81b07fd249a695fd79dbc66 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 03:33:42 +0500 Subject: [PATCH 03/35] Update build.yml --- .github/workflows/build.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6d114306d..8120749a5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -246,17 +246,17 @@ jobs: path: ./build/curseforge/${{ needs.info.outputs.project_full_name }}-curseforge.zip if-no-files-found: error - # - name: ๐Ÿ“ Rename artifact modrinth - # run: | - # cd ./build/modrinth/ - # mv *.mrpack $(basename -s .mrpack *.mrpack)-modrinth.mrpack + - name: ๐Ÿ“ Rename artifact modrinth + run: | + cd ./build/modrinth/ + mv *.mrpack $(basename -s .mrpack *.mrpack)-modrinth.mrpack - # - name: ๐Ÿš€ Upload artifact modrinth - # uses: actions/upload-artifact@v4.6.2 - # with: - # name: ${{ needs.info.outputs.project_full_name }}-modrinth - # path: ./build/modrinth/${{ needs.info.outputs.project_full_name }}-modrinth.mrpack - # if-no-files-found: warn + - name: ๐Ÿš€ Upload artifact modrinth + uses: actions/upload-artifact@v4.6.2 + with: + name: ${{ needs.info.outputs.project_full_name }}-modrinth + path: ./build/modrinth/${{ needs.info.outputs.project_full_name }}-modrinth.mrpack + if-no-files-found: warn build-server: name: ๐Ÿ“ฆ Build Server From 8181680c0765ad6073e5b771abb403600525fa51 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 03:37:00 +0500 Subject: [PATCH 04/35] Update build.yml --- .github/workflows/build.yml | 37 +++---------------------------------- 1 file changed, 3 insertions(+), 34 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8120749a5..af6fb0cc5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -258,37 +258,6 @@ jobs: path: ./build/modrinth/${{ needs.info.outputs.project_full_name }}-modrinth.mrpack if-no-files-found: warn - build-server: - name: ๐Ÿ“ฆ Build Server - needs: [info] - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4.2.2 - - - name: ๐Ÿ”„ Replace strings - shell: bash - run: | - set +e - - VERSION=${{ needs.info.outputs.project_version }} - sed -i -e "s/DEV/${VERSION}/g" pakku.json - sed -i -e "s/DEV/${VERSION}/g" config/fancymenu/customization/gui_main_menu.txt - - - name: ๐Ÿ“ Cache pakku - uses: actions/cache@v4.2.3 - id: cache - with: - path: build/.cache - key: pakku-cache-${{ hashFiles('pakku-lock.json') }} - restore-keys: pakku-cache- - - - name: ๐Ÿ“ฆ Export modpack - run: | - mv -vf ./.pakku/server-overrides/* ./ - curl https://github.com/juraj-hrivnak/pakku/releases/latest/download/pakku.jar -o pakku.jar -L -J - java -jar pakku.jar export - - name: ๐Ÿ“ Rename artifact server run: | cd ./build/serverpack/ @@ -354,7 +323,7 @@ jobs: release-github: name: ๐Ÿš€ Release to GitHub - needs: [info, build-modpack, build-server, build-multimc] + needs: [info, build-modpack, build-multimc] runs-on: ubuntu-latest if: ${{ needs.info.outputs.make_release == 'true' }} outputs: @@ -424,7 +393,7 @@ jobs: release-curseforge: name: ๐Ÿš€ Release to CurseForge - needs: [info, build-modpack, build-server, release-github] + needs: [info, build-modpack, release-github] runs-on: ubuntu-latest if: ${{ needs.info.outputs.make_release == 'true' }} outputs: @@ -474,7 +443,7 @@ jobs: release-modrinth: name: ๐Ÿš€ Release to Modrinth - needs: [info, build-modpack, build-server, release-github] + needs: [info, build-modpack, release-github] runs-on: ubuntu-latest if: false outputs: From 99c89fcda050775cbb96e4d4fd26ae4448786fef Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 04:13:05 +0500 Subject: [PATCH 05/35] Update pakku-lock.json --- pakku-lock.json | 50 ++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/pakku-lock.json b/pakku-lock.json index 31b9f652f..579372bdf 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -4167,7 +4167,7 @@ ] }, { - "pakku_id": "NnX7LmflX7AOHEeC", + "pakku_id": "WR8Eaw7xnPnm4UOD", "pakku_links": [ "Nw8xTCQngHA15ilh" ], @@ -4186,6 +4186,30 @@ "modrinth": "ATDdrG1y" }, "files": [ + { + "type": "curseforge", + "file_name": "create_hypertube-0.2.3-FORGE.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "neoforge", + "forge" + ], + "release_type": "beta", + "url": "https://edge.forgecdn.net/files/6785/769/create_hypertube-0.2.3-FORGE.jar", + "id": "6785769", + "parent_id": "1281336", + "hashes": { + "sha1": "15fecf45a7da064af350847c259903af18b6007b", + "md5": "054b2859b02a495ecea2ab5fc6ff6fc1" + }, + "required_dependencies": [ + "328085" + ], + "size": 310156, + "date_published": "2025-07-19T00:55:36.140Z" + }, { "type": "modrinth", "file_name": "create_hypertube-0.2.3-FORGE.jar", @@ -4214,30 +4238,6 @@ ], "size": 310156, "date_published": "2025-07-19T00:59:05.441048Z" - }, - { - "type": "curseforge", - "file_name": "create_hypertube-0.2.2-FORGE.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "neoforge", - "forge" - ], - "release_type": "beta", - "url": "https://edge.forgecdn.net/files/6721/285/create_hypertube-0.2.2-FORGE.jar", - "id": "6721285", - "parent_id": "1281336", - "hashes": { - "sha1": "d162b8a797883b100d1e04f19ce8c0c12e0c1f11", - "md5": "e1776892a5897e2cb5361dfcc76049e6" - }, - "required_dependencies": [ - "328085" - ], - "size": 299727, - "date_published": "2025-07-02T14:17:53.393Z" } ] }, From c0150abe04d382b7f7358cd35190316a76e4615e Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 04:18:29 +0500 Subject: [PATCH 06/35] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index af6fb0cc5..d8c3fb1fd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -58,7 +58,7 @@ jobs: id: latest_tag shell: bash run: | - tag=$(git describe --tags --abbrev=0) + tag=$(git describe --tags --abbrev=0 origin/main) if [ -z "$tag" ]; then echo "โŒ Latest tag not found" && exit 1 else From b41318d7d913cdf10e516add11144d6ecc4ac837 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 20 Jul 2025 00:24:42 +0100 Subject: [PATCH 07/35] remove dikes from sandy areas --- kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json | 5 +---- kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json | 5 +---- kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json b/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json index 3dca99a4a..0be7126ab 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json @@ -33,10 +33,7 @@ "tfg:earth/geode/pyrite", "tfg:earth/geode/quartzite" ], - [ - "tfc:vein/gabbro_dike", - "tfc:vein/diorite_dike" - ], + [], [], [], "#tfg:mars_veins", diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json index 3dca99a4a..0be7126ab 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json @@ -33,10 +33,7 @@ "tfg:earth/geode/pyrite", "tfg:earth/geode/quartzite" ], - [ - "tfc:vein/gabbro_dike", - "tfc:vein/diorite_dike" - ], + [], [], [], "#tfg:mars_veins", diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json index 3dca99a4a..0be7126ab 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json @@ -33,10 +33,7 @@ "tfg:earth/geode/pyrite", "tfg:earth/geode/quartzite" ], - [ - "tfc:vein/gabbro_dike", - "tfc:vein/diorite_dike" - ], + [], [], [], "#tfg:mars_veins", From e52068c81f4677c17cdb7de2e68146471c9ec8ea Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 20 Jul 2025 00:24:57 +0100 Subject: [PATCH 08/35] starting mars sand dunes --- .../mars/caves/entrances.json | 70 --- .../density_function/mars/caves/noodle.json | 94 ---- .../density_function/mars/caves/pillars.json | 50 --- .../mars/caves/spaghetti_2d.json | 61 --- .../spaghetti_2d_thickness_modulator.json | 17 - .../caves/spaghetti_roughness_function.json | 33 -- .../density_function/mars/factor.json | 2 +- .../density_function/mars/offset.json | 39 +- .../density_function/mars/sand_dunes.json | 9 + .../tfg/worldgen/noise/mars_dunes_color.json | 14 + .../tfg/worldgen/noise/mars_dunes_offset.json | 6 + .../tfg/worldgen/noise/mars_dunes_size.json | 6 + .../worldgen/noise_settings/mars_noise.json | 401 +++++++++--------- kubejs/server_scripts/tfg/events.chunks.js | 2 +- 14 files changed, 265 insertions(+), 539 deletions(-) delete mode 100644 kubejs/data/tfg/worldgen/density_function/mars/caves/entrances.json delete mode 100644 kubejs/data/tfg/worldgen/density_function/mars/caves/noodle.json delete mode 100644 kubejs/data/tfg/worldgen/density_function/mars/caves/pillars.json delete mode 100644 kubejs/data/tfg/worldgen/density_function/mars/caves/spaghetti_2d.json delete mode 100644 kubejs/data/tfg/worldgen/density_function/mars/caves/spaghetti_2d_thickness_modulator.json delete mode 100644 kubejs/data/tfg/worldgen/density_function/mars/caves/spaghetti_roughness_function.json create mode 100644 kubejs/data/tfg/worldgen/density_function/mars/sand_dunes.json create mode 100644 kubejs/data/tfg/worldgen/noise/mars_dunes_color.json create mode 100644 kubejs/data/tfg/worldgen/noise/mars_dunes_offset.json create mode 100644 kubejs/data/tfg/worldgen/noise/mars_dunes_size.json diff --git a/kubejs/data/tfg/worldgen/density_function/mars/caves/entrances.json b/kubejs/data/tfg/worldgen/density_function/mars/caves/entrances.json deleted file mode 100644 index 4bd9b81c4..000000000 --- a/kubejs/data/tfg/worldgen/density_function/mars/caves/entrances.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "type": "minecraft:cache_once", - "argument": { - "type": "minecraft:min", - "argument1": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:add", - "argument1": 0.37, - "argument2": { - "type": "minecraft:noise", - "noise": "minecraft:cave_entrance", - "xz_scale": 0.5, - "y_scale": 0.25 - } - }, - "argument2": { - "type": "minecraft:y_clamped_gradient", - "from_value": 0.2, - "from_y": -10, - "to_value": 0, - "to_y": 30 - } - }, - "argument2": { - "type": "minecraft:add", - "argument1": "minecraft:overworld/caves/spaghetti_roughness_function", - "argument2": { - "type": "minecraft:clamp", - "input": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:max", - "argument1": { - "type": "minecraft:weird_scaled_sampler", - "input": { - "type": "minecraft:cache_once", - "argument": { - "type": "minecraft:noise", - "noise": "minecraft:spaghetti_3d_rarity", - "xz_scale": 2, - "y_scale": 1 - } - }, - "noise": "minecraft:spaghetti_3d_1", - "rarity_value_mapper": "type_1" - }, - "argument2": { - "type": "minecraft:weird_scaled_sampler", - "input": { - "type": "minecraft:cache_once", - "argument": { - "type": "minecraft:noise", - "noise": "minecraft:spaghetti_3d_rarity", - "xz_scale": 2, - "y_scale": 1 - } - }, - "noise": "minecraft:spaghetti_3d_2", - "rarity_value_mapper": "type_1" - } - }, - "argument2": 0 - }, - "max": 1, - "min": -1 - } - } - } -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/density_function/mars/caves/noodle.json b/kubejs/data/tfg/worldgen/density_function/mars/caves/noodle.json deleted file mode 100644 index 211c50c65..000000000 --- a/kubejs/data/tfg/worldgen/density_function/mars/caves/noodle.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "type": "minecraft:range_choice", - "input": { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:range_choice", - "input": "minecraft:y", - "max_exclusive": 321.0, - "min_inclusive": -30.0, - "when_in_range": { - "type": "minecraft:noise", - "noise": "minecraft:noodle", - "xz_scale": 1.0, - "y_scale": 1.0 - }, - "when_out_of_range": -1.0 - } - }, - "max_exclusive": 0.0, - "min_inclusive": -1000000.0, - "when_in_range": 64.0, - "when_out_of_range": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:range_choice", - "input": "minecraft:y", - "max_exclusive": 321.0, - "min_inclusive": -60.0, - "when_in_range": { - "type": "minecraft:add", - "argument1": -0.07500000000000001, - "argument2": { - "type": "minecraft:mul", - "argument1": -0.025, - "argument2": { - "type": "minecraft:noise", - "noise": "minecraft:noodle_thickness", - "xz_scale": 1.0, - "y_scale": 1.0 - } - } - }, - "when_out_of_range": 0.0 - } - }, - "argument2": { - "type": "minecraft:mul", - "argument1": 1.5, - "argument2": { - "type": "minecraft:max", - "argument1": { - "type": "minecraft:abs", - "argument": { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:range_choice", - "input": "minecraft:y", - "max_exclusive": 321.0, - "min_inclusive": -60.0, - "when_in_range": { - "type": "minecraft:noise", - "noise": "minecraft:noodle_ridge_a", - "xz_scale": 2.6666666666666665, - "y_scale": 2.6666666666666665 - }, - "when_out_of_range": 0.0 - } - } - }, - "argument2": { - "type": "minecraft:abs", - "argument": { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:range_choice", - "input": "minecraft:y", - "max_exclusive": 321.0, - "min_inclusive": -60.0, - "when_in_range": { - "type": "minecraft:noise", - "noise": "minecraft:noodle_ridge_b", - "xz_scale": 2.6666666666666665, - "y_scale": 2.6666666666666665 - }, - "when_out_of_range": 0.0 - } - } - } - } - } - } -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/density_function/mars/caves/pillars.json b/kubejs/data/tfg/worldgen/density_function/mars/caves/pillars.json deleted file mode 100644 index ef84930ec..000000000 --- a/kubejs/data/tfg/worldgen/density_function/mars/caves/pillars.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "type": "minecraft:cache_once", - "argument": { - "type": "minecraft:mul", - "argument1": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:mul", - "argument1": 2.0, - "argument2": { - "type": "minecraft:noise", - "noise": "minecraft:pillar", - "xz_scale": 25.0, - "y_scale": 0.3 - } - }, - "argument2": { - "type": "minecraft:add", - "argument1": -1.0, - "argument2": { - "type": "minecraft:mul", - "argument1": -1.0, - "argument2": { - "type": "minecraft:noise", - "noise": "minecraft:pillar_rareness", - "xz_scale": 1.0, - "y_scale": 1.0 - } - } - } - }, - "argument2": { - "type": "minecraft:cube", - "argument": { - "type": "minecraft:add", - "argument1": 0.55, - "argument2": { - "type": "minecraft:mul", - "argument1": 0.55, - "argument2": { - "type": "minecraft:noise", - "noise": "minecraft:pillar_thickness", - "xz_scale": 1.0, - "y_scale": 1.0 - } - } - } - } - } -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/density_function/mars/caves/spaghetti_2d.json b/kubejs/data/tfg/worldgen/density_function/mars/caves/spaghetti_2d.json deleted file mode 100644 index 6501b227e..000000000 --- a/kubejs/data/tfg/worldgen/density_function/mars/caves/spaghetti_2d.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "type": "minecraft:clamp", - "input": { - "type": "minecraft:max", - "argument1": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:weird_scaled_sampler", - "input": { - "type": "minecraft:noise", - "noise": "minecraft:spaghetti_2d_modulator", - "xz_scale": 2.0, - "y_scale": 1.0 - }, - "noise": "minecraft:spaghetti_2d", - "rarity_value_mapper": "type_2" - }, - "argument2": { - "type": "minecraft:mul", - "argument1": 0.083, - "argument2": "tfg:mars/caves/spaghetti_2d_thickness_modulator" - } - }, - "argument2": { - "type": "minecraft:cube", - "argument": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:abs", - "argument": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:add", - "argument1": 0.0, - "argument2": { - "type": "minecraft:mul", - "argument1": 8.0, - "argument2": { - "type": "minecraft:noise", - "noise": "minecraft:spaghetti_2d_elevation", - "xz_scale": 1.0, - "y_scale": 0.0 - } - } - }, - "argument2": { - "type": "minecraft:y_clamped_gradient", - "from_value": 8.0, - "from_y": -32, - "to_value": -20.0, - "to_y": 320 - } - } - }, - "argument2": "tfg:mars/caves/spaghetti_2d_thickness_modulator" - } - } - }, - "max": 1.0, - "min": -1.0 -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/density_function/mars/caves/spaghetti_2d_thickness_modulator.json b/kubejs/data/tfg/worldgen/density_function/mars/caves/spaghetti_2d_thickness_modulator.json deleted file mode 100644 index be1366551..000000000 --- a/kubejs/data/tfg/worldgen/density_function/mars/caves/spaghetti_2d_thickness_modulator.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:cache_once", - "argument": { - "type": "minecraft:add", - "argument1": -0.95, - "argument2": { - "type": "minecraft:mul", - "argument1": -0.35000000000000003, - "argument2": { - "type": "minecraft:noise", - "noise": "minecraft:spaghetti_2d_thickness", - "xz_scale": 2.0, - "y_scale": 1.0 - } - } - } -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/density_function/mars/caves/spaghetti_roughness_function.json b/kubejs/data/tfg/worldgen/density_function/mars/caves/spaghetti_roughness_function.json deleted file mode 100644 index 80d9fcefb..000000000 --- a/kubejs/data/tfg/worldgen/density_function/mars/caves/spaghetti_roughness_function.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "minecraft:cache_once", - "argument": { - "type": "minecraft:mul", - "argument1": { - "type": "minecraft:add", - "argument1": -0.05, - "argument2": { - "type": "minecraft:mul", - "argument1": -0.02, - "argument2": { - "type": "minecraft:noise", - "noise": "minecraft:spaghetti_roughness_modulator", - "xz_scale": 1, - "y_scale": 1 - } - } - }, - "argument2": { - "type": "minecraft:add", - "argument1": -0.6, - "argument2": { - "type": "minecraft:abs", - "argument": { - "type": "minecraft:noise", - "noise": "minecraft:spaghetti_roughness", - "xz_scale": 0.4, - "y_scale": 0.4 - } - } - } - } -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/density_function/mars/factor.json b/kubejs/data/tfg/worldgen/density_function/mars/factor.json index 710611209..824ef3eb0 100644 --- a/kubejs/data/tfg/worldgen/density_function/mars/factor.json +++ b/kubejs/data/tfg/worldgen/density_function/mars/factor.json @@ -21,7 +21,7 @@ { "derivative": 0.0, "location": -0.19, - "value": 3.95 + "value": 6 }, { "derivative": 0.0, diff --git a/kubejs/data/tfg/worldgen/density_function/mars/offset.json b/kubejs/data/tfg/worldgen/density_function/mars/offset.json index c056b64c6..d4f91fe18 100644 --- a/kubejs/data/tfg/worldgen/density_function/mars/offset.json +++ b/kubejs/data/tfg/worldgen/density_function/mars/offset.json @@ -37,27 +37,36 @@ { "derivative": 0.0, "location": -1.1, - "value": 0.044 + "value": 0.2222 }, { - "derivative": 0.0, - "location": -1.02, - "value": -0.2222 + "derivative": 0.0, + "location": -1.02, + "value": 0.02 }, { - "derivative": 0.0, - "location": -0.51, - "value": -0.2222 + "derivative": 0.0, + "location": -0.47, + "value": { + "coordinate": "tfg:mars/sand_dunes", + "points": [ + { + "derivative": 0, + "location": -1.0, + "value": -0.15 + }, + { + "derivative": 0, + "location": 1.0, + "value": 0.2222 + } + ] + } }, { - "derivative": 0.0, - "location": -0.44, - "value": -0.12 - }, - { - "derivative": 0.0, - "location": -0.18, - "value": -0.12 + "derivative": 0.0, + "location": -0.18, + "value": 0.015 }, { "derivative": 0.0, diff --git a/kubejs/data/tfg/worldgen/density_function/mars/sand_dunes.json b/kubejs/data/tfg/worldgen/density_function/mars/sand_dunes.json new file mode 100644 index 000000000..6228ffb0e --- /dev/null +++ b/kubejs/data/tfg/worldgen/density_function/mars/sand_dunes.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:flat_cache", + "argument": { + "type": "minecraft:noise", + "noise": "tfg:mars_dunes_size", + "xz_scale": 1.0, + "y_scale": 1.0 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/noise/mars_dunes_color.json b/kubejs/data/tfg/worldgen/noise/mars_dunes_color.json new file mode 100644 index 000000000..0c0cbe0a8 --- /dev/null +++ b/kubejs/data/tfg/worldgen/noise/mars_dunes_color.json @@ -0,0 +1,14 @@ +{ + "amplitudes": [ + 1, + 1, + 2, + 2, + 2, + 1, + 1, + 1, + 1 + ], + "firstOctave": -8 +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/noise/mars_dunes_offset.json b/kubejs/data/tfg/worldgen/noise/mars_dunes_offset.json new file mode 100644 index 000000000..4d258ef4e --- /dev/null +++ b/kubejs/data/tfg/worldgen/noise/mars_dunes_offset.json @@ -0,0 +1,6 @@ +{ + "firstOctave": -11, + "amplitudes": [ + 1 + ] +} diff --git a/kubejs/data/tfg/worldgen/noise/mars_dunes_size.json b/kubejs/data/tfg/worldgen/noise/mars_dunes_size.json new file mode 100644 index 000000000..26e29194f --- /dev/null +++ b/kubejs/data/tfg/worldgen/noise/mars_dunes_size.json @@ -0,0 +1,6 @@ +{ + "firstOctave": -7, + "amplitudes": [ + 0.5 + ] +} diff --git a/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json b/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json index 432e9cd9c..4c6895ed0 100644 --- a/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json +++ b/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json @@ -27,133 +27,45 @@ "depth": 0, "erosion": "tfg:mars/erosion", "final_density": { - "type": "minecraft:min", - "argument1": { - "type": "minecraft:squeeze", - "argument": { - "type": "minecraft:mul", - "argument1": 0.64, - "argument2": { - "type": "minecraft:interpolated", + "type": "minecraft:squeeze", + "argument": { + "type": "minecraft:mul", + "argument1": 0.64, + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:blend_density", "argument": { - "type": "minecraft:blend_density", - "argument": { - "type": "minecraft:add", - "argument1": 0.1171875, + "type": "minecraft:add", + "argument1": 0.1171875, + "argument2": { + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:y_clamped_gradient", + "from_y": -64, + "to_y": -40, + "from_value": 0, + "to_value": 1 + }, "argument2": { - "type": "minecraft:mul", - "argument1": { - "type": "minecraft:y_clamped_gradient", - "from_value": 0.0, - "from_y": -32, - "to_value": 1.0, - "to_y": -20 - }, + "type": "minecraft:add", + "argument1": -0.1171875, "argument2": { "type": "minecraft:add", - "argument1": -0.1171875, + "argument1": -0.078125, "argument2": { - "type": "minecraft:add", - "argument1": -0.078125, + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:y_clamped_gradient", + "from_y": 240, + "to_y": 256, + "from_value": 1, + "to_value": 0 + }, "argument2": { - "type": "minecraft:mul", - "argument1": { - "type": "minecraft:y_clamped_gradient", - "from_value": 1.0, - "from_y": 240, - "to_value": 0.0, - "to_y": 256 - }, - "argument2": { - "type": "minecraft:add", - "argument1": 0.078125, - "argument2": { - "type": "minecraft:range_choice", - "input": "tfg:mars/sloped_cheese", - "max_exclusive": 1.5625, - "min_inclusive": -1000000.0, - "when_in_range": { - "type": "minecraft:min", - "argument1": "tfg:mars/sloped_cheese", - "argument2": { - "type": "minecraft:mul", - "argument1": 5.0, - "argument2": "tfg:mars/caves/entrances" - } - }, - "when_out_of_range": { - "type": "minecraft:max", - "argument1": { - "type": "minecraft:min", - "argument1": { - "type": "minecraft:min", - "argument1": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:mul", - "argument1": 4.0, - "argument2": { - "type": "minecraft:square", - "argument": { - "type": "minecraft:noise", - "noise": "minecraft:cave_layer", - "xz_scale": 1.0, - "y_scale": 8.0 - } - } - }, - "argument2": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:clamp", - "input": { - "type": "minecraft:add", - "argument1": 0.27, - "argument2": { - "type": "minecraft:noise", - "noise": "minecraft:cave_cheese", - "xz_scale": 1.0, - "y_scale": 0.6666666666666666 - } - }, - "max": 1.0, - "min": -1.0 - }, - "argument2": { - "type": "minecraft:clamp", - "input": { - "type": "minecraft:add", - "argument1": 1.5, - "argument2": { - "type": "minecraft:mul", - "argument1": -0.64, - "argument2": "tfg:mars/sloped_cheese" - } - }, - "max": 0.5, - "min": 0.0 - } - } - }, - "argument2": "tfg:mars/caves/entrances" - }, - "argument2": { - "type": "minecraft:add", - "argument1": "tfg:mars/caves/spaghetti_2d", - "argument2": "tfg:mars/caves/spaghetti_roughness_function" - } - }, - "argument2": { - "type": "minecraft:range_choice", - "input": "tfg:mars/caves/pillars", - "max_exclusive": 0.03, - "min_inclusive": -1000000.0, - "when_in_range": -1000000.0, - "when_out_of_range": "tfg:mars/caves/pillars" - } - } - } - } + "type": "minecraft:add", + "argument1": 0.078125, + "argument2": "tfg:mars/sloped_cheese" } } } @@ -162,8 +74,7 @@ } } } - }, - "argument2": "tfg:mars/caves/noodle" + } }, "fluid_level_floodedness": { "type": "minecraft:noise", @@ -437,56 +348,6 @@ } } }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "tfg:mars/martian_dunes" - ] - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:blue_concrete" - } - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "tfg:mars/martian_deep_desert" - ] - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:purple_concrete" - } - } - } - }, { "type": "minecraft:condition", "if_true": { @@ -514,6 +375,152 @@ }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:biome", + "biome_is": [ + "tfg:mars/martian_dunes", + "tfg:mars/martian_deep_desert" + ] + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "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": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "tfg:mars_dunes_color", + "min_threshold": -2.0, + "max_threshold": -0.15 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "ad_astra:venus_sand" + } + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "tfg:mars_dunes_color", + "min_threshold": -0.15, + "max_threshold": 0.15 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "ad_astra:mars_sand" + } + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "tfg:mars_dunes_color", + "min_threshold": 0.15, + "max_threshold": 2.0 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:red_sand" + } + } + } + ] + } + ] + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:stone_depth", + "offset": 6, + "surface_type": "floor", + "add_surface_depth": false, + "secondary_depth_range": 0 + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "tfg:mars_dunes_color", + "min_threshold": -2.0, + "max_threshold": -0.15 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "ad_astra:venus_sandstone" + } + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "tfg:mars_dunes_color", + "min_threshold": -0.15, + "max_threshold": 0.15 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "tfc:raw_sandstone/red" + } + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "noise": "tfg:mars_dunes_color", + "min_threshold": 0.15, + "max_threshold": 2.0 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:red_sandstone" + } + } + } + ] + } + ] + } + } + ] + } + }, + { "type": "minecraft:condition", @@ -536,7 +543,7 @@ "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_1", "min_threshold": -1.0, - "max_threshold": -0.25 + "max_threshold": -0.15 }, "then_run": { "type": "minecraft:sequence", @@ -547,7 +554,7 @@ "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_2", "min_threshold": -1.0, - "max_threshold": -0.25 + "max_threshold": -0.15 }, "then_run": { "type": "minecraft:sequence", @@ -618,7 +625,7 @@ "if_true": { "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_2", - "min_threshold": 0.25, + "min_threshold": 0.15, "max_threshold": 1.0 }, "then_run": { @@ -669,7 +676,7 @@ "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_2", "min_threshold": -1.0, - "max_threshold": -0.25 + "max_threshold": -0.15 }, "then_run": { "type": "minecraft:sequence", @@ -740,7 +747,7 @@ "if_true": { "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_2", - "min_threshold": 0.25, + "min_threshold": 0.15, "max_threshold": 1.0 }, "then_run": { @@ -779,7 +786,7 @@ "if_true": { "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_1", - "min_threshold": 0.25, + "min_threshold": 0.15, "max_threshold": 1.0 }, "then_run": { @@ -791,7 +798,7 @@ "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_2", "min_threshold": -1.0, - "max_threshold": -0.25 + "max_threshold": -0.15 }, "then_run": { "type": "minecraft:sequence", @@ -862,7 +869,7 @@ "if_true": { "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_2", - "min_threshold": 0.25, + "min_threshold": 0.15, "max_threshold": 1.0 }, "then_run": { @@ -920,7 +927,7 @@ "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_1", "min_threshold": -1.0, - "max_threshold": -0.25 + "max_threshold": -0.15 }, "then_run": { "type": "minecraft:sequence", @@ -931,7 +938,7 @@ "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_2", "min_threshold": -1.0, - "max_threshold": -0.25 + "max_threshold": -0.15 }, "then_run": { "type": "minecraft:sequence", @@ -1002,7 +1009,7 @@ "if_true": { "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_2", - "min_threshold": 0.25, + "min_threshold": 0.15, "max_threshold": 1.0 }, "then_run": { @@ -1053,7 +1060,7 @@ "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_2", "min_threshold": -1.0, - "max_threshold": -0.25 + "max_threshold": -0.15 }, "then_run": { "type": "minecraft:sequence", @@ -1124,7 +1131,7 @@ "if_true": { "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_2", - "min_threshold": 0.25, + "min_threshold": 0.15, "max_threshold": 1.0 }, "then_run": { @@ -1163,7 +1170,7 @@ "if_true": { "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_1", - "min_threshold": 0.25, + "min_threshold": 0.15, "max_threshold": 1.0 }, "then_run": { @@ -1175,7 +1182,7 @@ "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_2", "min_threshold": -1.0, - "max_threshold": -0.25 + "max_threshold": -0.15 }, "then_run": { "type": "minecraft:sequence", @@ -1246,7 +1253,7 @@ "if_true": { "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_2", - "min_threshold": 0.25, + "min_threshold": 0.15, "max_threshold": 1.0 }, "then_run": { @@ -1479,7 +1486,7 @@ "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_1", "min_threshold": -1.0, - "max_threshold": -0.25 + "max_threshold": -0.15 }, "then_run": { "type": "minecraft:sequence", @@ -1490,7 +1497,7 @@ "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_2", "min_threshold": -1.0, - "max_threshold": -0.25 + "max_threshold": -0.15 }, "then_run": { "type": "minecraft:sequence", @@ -1561,7 +1568,7 @@ "if_true": { "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_2", - "min_threshold": 0.25, + "min_threshold": 0.15, "max_threshold": 1.0 }, "then_run": { @@ -1612,7 +1619,7 @@ "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_2", "min_threshold": -1.0, - "max_threshold": -0.25 + "max_threshold": -0.15 }, "then_run": { "type": "minecraft:sequence", @@ -1683,7 +1690,7 @@ "if_true": { "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_2", - "min_threshold": 0.25, + "min_threshold": 0.15, "max_threshold": 1.0 }, "then_run": { @@ -1722,7 +1729,7 @@ "if_true": { "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_1", - "min_threshold": 0.25, + "min_threshold": 0.15, "max_threshold": 1.0 }, "then_run": { @@ -1734,7 +1741,7 @@ "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_2", "min_threshold": -1.0, - "max_threshold": -0.25 + "max_threshold": -0.15 }, "then_run": { "type": "minecraft:sequence", @@ -1805,7 +1812,7 @@ "if_true": { "type": "minecraft:noise_threshold", "noise": "tfg:stone_layer_mars_2", - "min_threshold": 0.25, + "min_threshold": 0.15, "max_threshold": 1.0 }, "then_run": { diff --git a/kubejs/server_scripts/tfg/events.chunks.js b/kubejs/server_scripts/tfg/events.chunks.js index 473221a6b..8bd15be82 100644 --- a/kubejs/server_scripts/tfg/events.chunks.js +++ b/kubejs/server_scripts/tfg/events.chunks.js @@ -23,7 +23,7 @@ TFCEvents.createChunkDataProvider('mars', event => { var aquifer = []; i = 0; while (i < 16) { - aquifer.push(0); + aquifer.push(32); i++; } From b47804f7fe21d3e47ae0b78c60133594865b3cc1 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 20 Jul 2025 01:49:50 +0100 Subject: [PATCH 09/35] added noodle caves back --- .../worldgen/noise_settings/mars_noise.json | 91 ++++++++++--------- 1 file changed, 48 insertions(+), 43 deletions(-) diff --git a/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json b/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json index 4c6895ed0..59627302d 100644 --- a/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json +++ b/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json @@ -14,7 +14,7 @@ "min_y": -32, "height": 384, "size_horizontal": 1, - "size_vertical": 2 + "size_vertical": 1 }, "noise_router": { "barrier": { @@ -27,45 +27,48 @@ "depth": 0, "erosion": "tfg:mars/erosion", "final_density": { - "type": "minecraft:squeeze", - "argument": { - "type": "minecraft:mul", - "argument1": 0.64, - "argument2": { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:blend_density", + "type": "minecraft:min", + "argument1": { + "type": "minecraft:squeeze", + "argument": { + "type": "minecraft:mul", + "argument1": 0.64, + "argument2": { + "type": "minecraft:interpolated", "argument": { - "type": "minecraft:add", - "argument1": 0.1171875, - "argument2": { - "type": "minecraft:mul", - "argument1": { - "type": "minecraft:y_clamped_gradient", - "from_y": -64, - "to_y": -40, - "from_value": 0, - "to_value": 1 - }, + "type": "minecraft:blend_density", + "argument": { + "type": "minecraft:add", + "argument1": 0.1171875, "argument2": { - "type": "minecraft:add", - "argument1": -0.1171875, + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:y_clamped_gradient", + "from_y": -32, + "to_y": -20, + "from_value": 0, + "to_value": 1 + }, "argument2": { "type": "minecraft:add", - "argument1": -0.078125, + "argument1": -0.1171875, "argument2": { - "type": "minecraft:mul", - "argument1": { - "type": "minecraft:y_clamped_gradient", - "from_y": 240, - "to_y": 256, - "from_value": 1, - "to_value": 0 - }, + "type": "minecraft:add", + "argument1": -0.078125, "argument2": { - "type": "minecraft:add", - "argument1": 0.078125, - "argument2": "tfg:mars/sloped_cheese" + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:y_clamped_gradient", + "from_y": 240, + "to_y": 256, + "from_value": 1, + "to_value": 0 + }, + "argument2": { + "type": "minecraft:add", + "argument1": 0.078125, + "argument2": "tfg:mars/sloped_cheese" + } } } } @@ -74,7 +77,9 @@ } } } - } + }, + "argument2": "minecraft:overworld/caves/noodle" + }, "fluid_level_floodedness": { "type": "minecraft:noise", @@ -408,7 +413,7 @@ "type": "minecraft:noise_threshold", "noise": "tfg:mars_dunes_color", "min_threshold": -2.0, - "max_threshold": -0.15 + "max_threshold": -0.25 }, "then_run": { "type": "minecraft:block", @@ -422,8 +427,8 @@ "if_true": { "type": "minecraft:noise_threshold", "noise": "tfg:mars_dunes_color", - "min_threshold": -0.15, - "max_threshold": 0.15 + "min_threshold": -0.25, + "max_threshold": 0.05 }, "then_run": { "type": "minecraft:block", @@ -437,7 +442,7 @@ "if_true": { "type": "minecraft:noise_threshold", "noise": "tfg:mars_dunes_color", - "min_threshold": 0.15, + "min_threshold": 0.05, "max_threshold": 2.0 }, "then_run": { @@ -473,7 +478,7 @@ "type": "minecraft:noise_threshold", "noise": "tfg:mars_dunes_color", "min_threshold": -2.0, - "max_threshold": -0.15 + "max_threshold": -0.25 }, "then_run": { "type": "minecraft:block", @@ -487,8 +492,8 @@ "if_true": { "type": "minecraft:noise_threshold", "noise": "tfg:mars_dunes_color", - "min_threshold": -0.15, - "max_threshold": 0.15 + "min_threshold": -0.25, + "max_threshold": 0.05 }, "then_run": { "type": "minecraft:block", @@ -502,7 +507,7 @@ "if_true": { "type": "minecraft:noise_threshold", "noise": "tfg:mars_dunes_color", - "min_threshold": 0.15, + "min_threshold": 0.05, "max_threshold": 2.0 }, "then_run": { From 0fa887ebe13282e5a0687edd760e726d9a5b760b Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 20 Jul 2025 01:56:35 +0100 Subject: [PATCH 10/35] don't like that tfc red sandstone here --- kubejs/data/tfg/worldgen/noise_settings/mars_noise.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json b/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json index 59627302d..cac07b61b 100644 --- a/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json +++ b/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json @@ -498,7 +498,7 @@ "then_run": { "type": "minecraft:block", "result_state": { - "Name": "tfc:raw_sandstone/red" + "Name": "ad_astra:mars_stone" } } }, From 9ff82c5d53c9bfdbb93ba0f79e62781482e1e3e6 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 20 Jul 2025 02:06:07 +0100 Subject: [PATCH 11/35] nicer sand dunes! --- .../worldgen/density_function/mars/dune.json | 16 + .../density_function/mars/dunes_offset_x.json | 26 + .../density_function/mars/dunes_offset_z.json | 31 + .../density_function/mars/offset.json | 3135 +++++++++-------- .../density_function/mars/sand_dunes.json | 19 +- .../worldgen/noise_settings/mars_noise.json | 8 +- 6 files changed, 1710 insertions(+), 1525 deletions(-) create mode 100644 kubejs/data/tfg/worldgen/density_function/mars/dune.json create mode 100644 kubejs/data/tfg/worldgen/density_function/mars/dunes_offset_x.json create mode 100644 kubejs/data/tfg/worldgen/density_function/mars/dunes_offset_z.json diff --git a/kubejs/data/tfg/worldgen/density_function/mars/dune.json b/kubejs/data/tfg/worldgen/density_function/mars/dune.json new file mode 100644 index 000000000..c499e022d --- /dev/null +++ b/kubejs/data/tfg/worldgen/density_function/mars/dune.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:cache_2d", + "argument": { + "type": "minecraft:mul", + "argument1": -1, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:noise", + "noise": "tfg:mars_dunes_size", + "xz_scale": 1, + "y_scale": 0 + } + } + } +} diff --git a/kubejs/data/tfg/worldgen/density_function/mars/dunes_offset_x.json b/kubejs/data/tfg/worldgen/density_function/mars/dunes_offset_x.json new file mode 100644 index 000000000..cdc30dbb4 --- /dev/null +++ b/kubejs/data/tfg/worldgen/density_function/mars/dunes_offset_x.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:cache_2d", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": { + "type": "minecraft:noise", + "noise": "tfg:mars_dunes_offset", + "xz_scale": 1, + "y_scale": 0 + }, + "points": [ + { + "location": -1, + "derivative": 5.196152422706632, + "value": 0 + }, + { + "location": 1, + "derivative": 5.196152422706632, + "value": 0 + } + ] + } + } +} diff --git a/kubejs/data/tfg/worldgen/density_function/mars/dunes_offset_z.json b/kubejs/data/tfg/worldgen/density_function/mars/dunes_offset_z.json new file mode 100644 index 000000000..6bb9bc446 --- /dev/null +++ b/kubejs/data/tfg/worldgen/density_function/mars/dunes_offset_z.json @@ -0,0 +1,31 @@ +{ + "type": "minecraft:cache_2d", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": { + "type": "minecraft:noise", + "noise": "tfg:mars_dunes_offset", + "xz_scale": 1, + "y_scale": 0 + }, + "points": [ + { + "location": -1, + "derivative": 0, + "value": -1 + }, + { + "location": 0, + "derivative": 0, + "value": 1 + }, + { + "location": 1, + "derivative": 0, + "value": -1 + } + ] + } + } +} diff --git a/kubejs/data/tfg/worldgen/density_function/mars/offset.json b/kubejs/data/tfg/worldgen/density_function/mars/offset.json index d4f91fe18..d341d20d6 100644 --- a/kubejs/data/tfg/worldgen/density_function/mars/offset.json +++ b/kubejs/data/tfg/worldgen/density_function/mars/offset.json @@ -1,1532 +1,1637 @@ { - "type": "minecraft:flat_cache", - "argument": { - "type": "minecraft:cache_2d", + "type": "minecraft:flat_cache", "argument": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:mul", - "argument1": { - "type": "minecraft:blend_offset" - }, - "argument2": { - "type": "minecraft:add", - "argument1": 1.0, - "argument2": { - "type": "minecraft:mul", - "argument1": -1.0, - "argument2": { - "type": "minecraft:cache_once", - "argument": { - "type": "minecraft:blend_alpha" - } - } - } - } - }, - "argument2": { - "type": "minecraft:mul", - "argument1": { - "type": "minecraft:add", - "argument1": -0.5037500262260437, - "argument2": { - "type": "minecraft:spline", - "spline": { - "coordinate": "tfg:mars/continents", - "points": [ - { - "derivative": 0.0, - "location": -1.1, - "value": 0.2222 - }, - { - "derivative": 0.0, - "location": -1.02, - "value": 0.02 - }, - { - "derivative": 0.0, - "location": -0.47, - "value": { - "coordinate": "tfg:mars/sand_dunes", + "type": "minecraft:cache_2d", + "argument": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:spline", + "spline": { + "coordinate": { + "type": "minecraft:cube", + "argument": { + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:add", + "argument1": 1, + "argument2": "tfg:mars/dune" + }, + "argument2": { + "type": "minecraft:spline", + "spline": { + "coordinate": { + "type": "minecraft:add", + "argument1": "tfg:mars/dune", + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "tfg:mars_dunes_size", + "xz_scale": 1, + "y_scale": 0, + "shift_x": { + "type": "minecraft:mul", + "argument1": 16, + "argument2": "tfg:mars/dunes_offset_z" + }, + "shift_y": 0, + "shift_z": { + "type": "minecraft:mul", + "argument1": -16, + "argument2": "tfg:mars/dunes_offset_x" + } + } + } + }, + "points": [ + { + "location": 0, + "derivative": 0, + "value": 0.8 + }, + { + "location": 0.1, + "derivative": 0, + "value": 1 + } + ] + } + } + }, + "argument2": { + "type": "minecraft:spline", + "spline": { + "coordinate": { + "type": "minecraft:add", + "argument1": "tfg:mars/dune", + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "tfg:mars_dunes_size", + "xz_scale": 1, + "y_scale": 0, + "shift_x": { + "type": "minecraft:mul", + "argument1": 16, + "argument2": "tfg:mars/dunes_offset_x" + }, + "shift_y": 0, + "shift_z": { + "type": "minecraft:mul", + "argument1": 16, + "argument2": "tfg:mars/dunes_offset_z" + } + } + } + }, + "points": [ + { + "location": 0, + "derivative": 0, + "value": 1 + }, + { + "location": 0.3, + "derivative": 0, + "value": 0.8 + } + ] + } + } + } + }, "points": [ { - "derivative": 0, - "location": -1.0, - "value": -0.15 - }, - { - "derivative": 0, - "location": 1.0, - "value": 0.2222 + "location": 0, + "derivative": 0.3, + "value": -0.3 } ] } }, - { - "derivative": 0.0, - "location": -0.18, - "value": 0.015 - }, - { - "derivative": 0.0, - "location": -0.16, - "value": { - "coordinate": "tfg:mars/erosion", - "points": [ - { - "derivative": 0.0, - "location": -0.85, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ + "argument2": { + "type": "minecraft:spline", + "spline": { + "coordinate": "tfg:mars/continents", + "points": [ { - "derivative": 0.38940096, - "location": -1.0, - "value": -0.08880186 + "derivative": 0.0, + "location": -1.1, + "value": 0 }, { - "derivative": 0.38940096, - "location": 1.0, - "value": 0.69000006 + "derivative": 0.0, + "location": -1.02, + "value": 1 + }, + { + "derivative": 0.0, + "location": -0.47, + "value": 1 + }, + { + "derivative": 0.0, + "location": -0.18, + "value": 0 } - ] - } - }, - { - "derivative": 0.0, - "location": -0.7, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.37788022, - "location": -1.0, - "value": -0.115760356 - }, - { - "derivative": 0.37788022, - "location": 1.0, - "value": 0.6400001 - } - ] - } - }, - { - "derivative": 0.0, - "location": -0.4, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.0, - "location": -1.0, - "value": -0.2222 - }, - { - "derivative": 0.0, - "location": -0.75, - "value": -0.2222 - }, - { - "derivative": 0.0, - "location": -0.65, - "value": 0.0 - }, - { - "derivative": 0.0, - "location": 0.5954547, - "value": 2.9802322E-8 - }, - { - "derivative": 0.2534563, - "location": 0.6054547, - "value": 2.9802322E-8 - }, - { - "derivative": 0.2534563, - "location": 1.0, - "value": 0.100000024 - } - ] - } - }, - { - "derivative": 0.0, - "location": -0.35, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.5, - "location": -1.0, - "value": -0.3 - }, - { - "derivative": 0.0, - "location": -0.4, - "value": 0.05 - }, - { - "derivative": 0.0, - "location": 0.0, - "value": 0.05 - }, - { - "derivative": 0.0, - "location": 0.4, - "value": 0.05 - }, - { - "derivative": 0.007000001, - "location": 1.0, - "value": 0.060000002 - } - ] - } - }, - { - "derivative": 0.0, - "location": -0.1, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.5, - "location": -1.0, - "value": -0.15 - }, - { - "derivative": 0.0, - "location": -0.4, - "value": 0.0 - }, - { - "derivative": 0.0, - "location": 0.0, - "value": 0.0 - }, - { - "derivative": 0.1, - "location": 0.4, - "value": 0.05 - }, - { - "derivative": 0.007000001, - "location": 1.0, - "value": 0.060000002 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.2, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.5, - "location": -1.0, - "value": -0.15 - }, - { - "derivative": 0.0, - "location": -0.4, - "value": 0.0 - }, - { - "derivative": 0.0, - "location": 0.0, - "value": 0.0 - }, - { - "derivative": 0.0, - "location": 0.4, - "value": 0.0 - }, - { - "derivative": 0.0, - "location": 1.0, - "value": 0.0 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.7, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.0, - "location": -1.0, - "value": -0.02 - }, - { - "derivative": 0.0, - "location": -0.4, - "value": -0.03 - }, - { - "derivative": 0.0, - "location": 0.0, - "value": -0.03 - }, - { - "derivative": 0.06, - "location": 0.4, - "value": 0.0 - }, - { - "derivative": 0.0, - "location": 1.0, - "value": 0.0 - } - ] - } - } - ] - } - }, - { - "derivative": 0.0, - "location": -0.15, - "value": { - "coordinate": "tfg:mars/erosion", - "points": [ - { - "derivative": 0.0, - "location": -0.85, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.38940096, - "location": -1.0, - "value": -0.08880186 - }, - { - "derivative": 0.38940096, - "location": 1.0, - "value": 0.69000006 - } - ] - } - }, - { - "derivative": 0.0, - "location": -0.7, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.37788022, - "location": -1.0, - "value": -0.115760356 - }, - { - "derivative": 0.37788022, - "location": 1.0, - "value": 0.6400001 - } - ] - } - }, - { - "derivative": 0.0, - "location": -0.4, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.0, - "location": -1.0, - "value": -0.2222 - }, - { - "derivative": 0.0, - "location": -0.75, - "value": -0.2222 - }, - { - "derivative": 0.0, - "location": -0.65, - "value": 0.0 - }, - { - "derivative": 0.0, - "location": 0.5954547, - "value": 2.9802322E-8 - }, - { - "derivative": 0.2534563, - "location": 0.6054547, - "value": 2.9802322E-8 - }, - { - "derivative": 0.2534563, - "location": 1.0, - "value": 0.100000024 - } - ] - } - }, - { - "derivative": 0.0, - "location": -0.35, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.5, - "location": -1.0, - "value": -0.3 - }, - { - "derivative": 0.0, - "location": -0.4, - "value": 0.05 - }, - { - "derivative": 0.0, - "location": 0.0, - "value": 0.05 - }, - { - "derivative": 0.0, - "location": 0.4, - "value": 0.05 - }, - { - "derivative": 0.007000001, - "location": 1.0, - "value": 0.060000002 - } - ] - } - }, - { - "derivative": 0.0, - "location": -0.1, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.5, - "location": -1.0, - "value": -0.15 - }, - { - "derivative": 0.0, - "location": -0.4, - "value": 0.0 - }, - { - "derivative": 0.0, - "location": 0.0, - "value": 0.0 - }, - { - "derivative": 0.1, - "location": 0.4, - "value": 0.05 - }, - { - "derivative": 0.007000001, - "location": 1.0, - "value": 0.060000002 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.2, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.5, - "location": -1.0, - "value": -0.15 - }, - { - "derivative": 0.0, - "location": -0.4, - "value": 0.0 - }, - { - "derivative": 0.0, - "location": 0.0, - "value": 0.0 - }, - { - "derivative": 0.0, - "location": 0.4, - "value": 0.0 - }, - { - "derivative": 0.0, - "location": 1.0, - "value": 0.0 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.7, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.0, - "location": -1.0, - "value": -0.02 - }, - { - "derivative": 0.0, - "location": -0.4, - "value": -0.03 - }, - { - "derivative": 0.0, - "location": 0.0, - "value": -0.03 - }, - { - "derivative": 0.06, - "location": 0.4, - "value": 0.0 - }, - { - "derivative": 0.0, - "location": 1.0, - "value": 0.0 - } - ] - } - } - ] - } - }, - { - "derivative": 0.0, - "location": -0.1, - "value": { - "coordinate": "tfg:mars/erosion", - "points": [ - { - "derivative": 0.0, - "location": -0.85, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.38940096, - "location": -1.0, - "value": -0.08880186 - }, - { - "derivative": 0.38940096, - "location": 1.0, - "value": 0.69000006 - } - ] - } - }, - { - "derivative": 0.0, - "location": -0.7, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.37788022, - "location": -1.0, - "value": -0.115760356 - }, - { - "derivative": 0.37788022, - "location": 1.0, - "value": 0.6400001 - } - ] - } - }, - { - "derivative": 0.0, - "location": -0.4, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.0, - "location": -1.0, - "value": -0.2222 - }, - { - "derivative": 0.0, - "location": -0.75, - "value": -0.2222 - }, - { - "derivative": 0.0, - "location": -0.65, - "value": 0.0 - }, - { - "derivative": 0.0, - "location": 0.5954547, - "value": 2.9802322E-8 - }, - { - "derivative": 0.2534563, - "location": 0.6054547, - "value": 2.9802322E-8 - }, - { - "derivative": 0.2534563, - "location": 1.0, - "value": 0.100000024 - } - ] - } - }, - { - "derivative": 0.0, - "location": -0.35, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.5, - "location": -1.0, - "value": -0.25 - }, - { - "derivative": 0.0, - "location": -0.4, - "value": 0.05 - }, - { - "derivative": 0.0, - "location": 0.0, - "value": 0.05 - }, - { - "derivative": 0.0, - "location": 0.4, - "value": 0.05 - }, - { - "derivative": 0.007000001, - "location": 1.0, - "value": 0.060000002 - } - ] - } - }, - { - "derivative": 0.0, - "location": -0.1, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.5, - "location": -1.0, - "value": -0.1 - }, - { - "derivative": 0.01, - "location": -0.4, - "value": 0.001 - }, - { - "derivative": 0.01, - "location": 0.0, - "value": 0.003 - }, - { - "derivative": 0.094000004, - "location": 0.4, - "value": 0.05 - }, - { - "derivative": 0.007000001, - "location": 1.0, - "value": 0.060000002 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.2, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.5, - "location": -1.0, - "value": -0.1 - }, - { - "derivative": 0.0, - "location": -0.4, - "value": 0.01 - }, - { - "derivative": 0.0, - "location": 0.0, - "value": 0.01 - }, - { - "derivative": 0.04, - "location": 0.4, - "value": 0.03 - }, - { - "derivative": 0.049, - "location": 1.0, - "value": 0.1 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.7, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.0, - "location": -1.0, - "value": -0.02 - }, - { - "derivative": 0.0, - "location": -0.4, - "value": -0.03 - }, - { - "derivative": 0.0, - "location": 0.0, - "value": -0.03 - }, - { - "derivative": 0.12, - "location": 0.4, - "value": 0.03 - }, - { - "derivative": 0.049, - "location": 1.0, - "value": 0.1 - } - ] - } - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.25, - "value": { - "coordinate": "tfg:mars/erosion", - "points": [ - { - "derivative": 0.0, - "location": -0.85, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.0, - "location": -1.0, - "value": 0.20235021 - }, - { - "derivative": 0.5138249, - "location": 0.0, - "value": 0.7161751 - }, - { - "derivative": 0.5138249, - "location": 1.0, - "value": 1.23 - } - ] - } - }, - { - "derivative": 0.0, - "location": -0.7, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.0, - "location": -1.0, - "value": 0.2 - }, - { - "derivative": 0.43317974, - "location": 0.0, - "value": 0.44682026 - }, - { - "derivative": 0.43317974, - "location": 1.0, - "value": 0.88 - } - ] - } - }, - { - "derivative": 0.0, - "location": -0.4, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.0, - "location": -1.0, - "value": 0.2 - }, - { - "derivative": 0.3917051, - "location": 0.0, - "value": 0.30829495 - }, - { - "derivative": 0.3917051, - "location": 1.0, - "value": 0.70000005 - } - ] - } - }, - { - "derivative": 0.0, - "location": -0.35, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.5, - "location": -1.0, - "value": -0.25 - }, - { - "derivative": 0.0, - "location": -0.4, - "value": 0.35 - }, - { - "derivative": 0.0, - "location": 0.0, - "value": 0.35 - }, - { - "derivative": 0.0, - "location": 0.4, - "value": 0.35 - }, - { - "derivative": 0.049000014, - "location": 1.0, - "value": 0.42000002 - } - ] - } - }, - { - "derivative": 0.0, - "location": -0.1, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.5, - "location": -1.0, - "value": -0.1 - }, - { - "derivative": 0.07, - "location": -0.4, - "value": 0.0069999998 - }, - { - "derivative": 0.07, - "location": 0.0, - "value": 0.021 - }, - { - "derivative": 0.658, - "location": 0.4, - "value": 0.35 - }, - { - "derivative": 0.049000014, - "location": 1.0, - "value": 0.42000002 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.2, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.5, - "location": -1.0, - "value": -0.1 - }, - { - "derivative": 0.0, - "location": -0.4, - "value": 0.01 - }, - { - "derivative": 0.0, - "location": 0.0, - "value": 0.01 - }, - { - "derivative": 0.04, - "location": 0.4, - "value": 0.03 - }, - { - "derivative": 0.049, - "location": 1.0, - "value": 0.1 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.4, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.5, - "location": -1.0, - "value": -0.1 - }, - { - "derivative": 0.0, - "location": -0.4, - "value": 0.01 - }, - { - "derivative": 0.0, - "location": 0.0, - "value": 0.01 - }, - { - "derivative": 0.04, - "location": 0.4, - "value": 0.03 - }, - { - "derivative": 0.049, - "location": 1.0, - "value": 0.1 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.45, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.0, - "location": -1.0, - "value": -0.1 - }, - { - "derivative": 0.0, - "location": -0.4, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.5, - "location": -1.0, - "value": -0.1 - }, - { - "derivative": 0.0, - "location": -0.4, - "value": 0.01 - }, - { - "derivative": 0.0, - "location": 0.0, - "value": 0.01 - }, - { - "derivative": 0.04, - "location": 0.4, - "value": 0.03 - }, - { - "derivative": 0.049, - "location": 1.0, - "value": 0.1 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.0, - "value": 0.17 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.55, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.0, - "location": -1.0, - "value": -0.1 - }, - { - "derivative": 0.0, - "location": -0.4, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.5, - "location": -1.0, - "value": -0.1 - }, - { - "derivative": 0.0, - "location": -0.4, - "value": 0.01 - }, - { - "derivative": 0.0, - "location": 0.0, - "value": 0.01 - }, - { - "derivative": 0.04, - "location": 0.4, - "value": 0.03 - }, - { - "derivative": 0.049, - "location": 1.0, - "value": 0.1 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.0, - "value": 0.17 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.58, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.5, - "location": -1.0, - "value": -0.1 - }, - { - "derivative": 0.0, - "location": -0.4, - "value": 0.01 - }, - { - "derivative": 0.0, - "location": 0.0, - "value": 0.01 - }, - { - "derivative": 0.04, - "location": 0.4, - "value": 0.03 - }, - { - "derivative": 0.049, - "location": 1.0, - "value": 0.1 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.7, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.0, - "location": -1.0, - "value": -0.02 - }, - { - "derivative": 0.0, - "location": -0.4, - "value": -0.03 - }, - { - "derivative": 0.0, - "location": 0.0, - "value": -0.03 - }, - { - "derivative": 0.12, - "location": 0.4, - "value": 0.03 - }, - { - "derivative": 0.049, - "location": 1.0, - "value": 0.1 - } - ] - } - } - ] - } - }, - { - "derivative": 0.0, - "location": 1.0, - "value": { - "coordinate": "tfg:mars/erosion", - "points": [ - { - "derivative": 0.0, - "location": -0.85, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.0, - "location": -1.0, - "value": 0.34792626 - }, - { - "derivative": 0.5760369, - "location": 0.0, - "value": 0.9239631 - }, - { - "derivative": 0.5760369, - "location": 1.0, - "value": 1.5 - } - ] - } - }, - { - "derivative": 0.0, - "location": -0.7, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.0, - "location": -1.0, - "value": 0.2 - }, - { - "derivative": 0.4608295, - "location": 0.0, - "value": 0.5391705 - }, - { - "derivative": 0.4608295, - "location": 1.0, - "value": 1.0 - } - ] - } - }, - { - "derivative": 0.0, - "location": -0.4, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.0, - "location": -1.0, - "value": 0.2 - }, - { - "derivative": 0.4608295, - "location": 0.0, - "value": 0.5391705 - }, - { - "derivative": 0.4608295, - "location": 1.0, - "value": 1.0 - } - ] - } - }, - { - "derivative": 0.0, - "location": -0.35, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.5, - "location": -1.0, - "value": -0.2 - }, - { - "derivative": 0.0, - "location": -0.4, - "value": 0.5 - }, - { - "derivative": 0.0, - "location": 0.0, - "value": 0.5 - }, - { - "derivative": 0.0, - "location": 0.4, - "value": 0.5 - }, - { - "derivative": 0.070000015, - "location": 1.0, - "value": 0.6 - } - ] - } - }, - { - "derivative": 0.0, - "location": -0.1, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.5, - "location": -1.0, - "value": -0.05 - }, - { - "derivative": 0.099999994, - "location": -0.4, - "value": 0.01 - }, - { - "derivative": 0.099999994, - "location": 0.0, - "value": 0.03 - }, - { - "derivative": 0.94, - "location": 0.4, - "value": 0.5 - }, - { - "derivative": 0.070000015, - "location": 1.0, - "value": 0.6 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.2, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.5, - "location": -1.0, - "value": -0.05 - }, - { - "derivative": 0.0, - "location": -0.4, - "value": 0.01 - }, - { - "derivative": 0.0, - "location": 0.0, - "value": 0.01 - }, - { - "derivative": 0.04, - "location": 0.4, - "value": 0.03 - }, - { - "derivative": 0.049, - "location": 1.0, - "value": 0.1 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.4, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.5, - "location": -1.0, - "value": -0.05 - }, - { - "derivative": 0.0, - "location": -0.4, - "value": 0.01 - }, - { - "derivative": 0.0, - "location": 0.0, - "value": 0.01 - }, - { - "derivative": 0.04, - "location": 0.4, - "value": 0.03 - }, - { - "derivative": 0.049, - "location": 1.0, - "value": 0.1 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.45, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.0, - "location": -1.0, - "value": -0.05 - }, - { - "derivative": 0.0, - "location": -0.4, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.5, - "location": -1.0, - "value": -0.05 - }, - { - "derivative": 0.0, - "location": -0.4, - "value": 0.01 - }, - { - "derivative": 0.0, - "location": 0.0, - "value": 0.01 - }, - { - "derivative": 0.04, - "location": 0.4, - "value": 0.03 - }, - { - "derivative": 0.049, - "location": 1.0, - "value": 0.1 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.0, - "value": 0.17 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.55, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.0, - "location": -1.0, - "value": -0.05 - }, - { - "derivative": 0.0, - "location": -0.4, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.5, - "location": -1.0, - "value": -0.05 - }, - { - "derivative": 0.0, - "location": -0.4, - "value": 0.01 - }, - { - "derivative": 0.0, - "location": 0.0, - "value": 0.01 - }, - { - "derivative": 0.04, - "location": 0.4, - "value": 0.03 - }, - { - "derivative": 0.049, - "location": 1.0, - "value": 0.1 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.0, - "value": 0.17 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.58, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.5, - "location": -1.0, - "value": -0.05 - }, - { - "derivative": 0.0, - "location": -0.4, - "value": 0.01 - }, - { - "derivative": 0.0, - "location": 0.0, - "value": 0.01 - }, - { - "derivative": 0.04, - "location": 0.4, - "value": 0.03 - }, - { - "derivative": 0.049, - "location": 1.0, - "value": 0.1 - } - ] - } - }, - { - "derivative": 0.0, - "location": 0.7, - "value": { - "coordinate": "tfg:mars/ridges_folded", - "points": [ - { - "derivative": 0.015, - "location": -1.0, - "value": -0.02 - }, - { - "derivative": 0.0, - "location": -0.4, - "value": 0.01 - }, - { - "derivative": 0.0, - "location": 0.0, - "value": 0.01 - }, - { - "derivative": 0.04, - "location": 0.4, - "value": 0.03 - }, - { - "derivative": 0.049, - "location": 1.0, - "value": 0.1 - } - ] - } - } - ] - } + ] + } + } + }, + "argument2": { + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:add", + "argument1": -0.5037500262260437, + "argument2": { + "type": "minecraft:spline", + "spline": { + "coordinate": "tfg:mars/continents", + "points": [ + { + "derivative": 0.0, + "location": -1.1, + "value": 0.2222 + }, + { + "derivative": 0.0, + "location": -1.02, + "value": 0.02 + }, + { + "derivative": 0.0, + "location": -0.47, + "value": 0.02 + }, + { + "derivative": 0.0, + "location": -0.18, + "value": 0.015 + }, + { + "derivative": 0.0, + "location": -0.16, + "value": { + "coordinate": "tfg:mars/erosion", + "points": [ + { + "derivative": 0.0, + "location": -0.85, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.38940096, + "location": -1.0, + "value": -0.08880186 + }, + { + "derivative": 0.38940096, + "location": 1.0, + "value": 0.69000006 + } + ] + } + }, + { + "derivative": 0.0, + "location": -0.7, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.37788022, + "location": -1.0, + "value": -0.115760356 + }, + { + "derivative": 0.37788022, + "location": 1.0, + "value": 0.6400001 + } + ] + } + }, + { + "derivative": 0.0, + "location": -0.4, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.0, + "location": -1.0, + "value": -0.2222 + }, + { + "derivative": 0.0, + "location": -0.75, + "value": -0.2222 + }, + { + "derivative": 0.0, + "location": -0.65, + "value": 0.0 + }, + { + "derivative": 0.0, + "location": 0.5954547, + "value": 2.9802322E-8 + }, + { + "derivative": 0.2534563, + "location": 0.6054547, + "value": 2.9802322E-8 + }, + { + "derivative": 0.2534563, + "location": 1.0, + "value": 0.100000024 + } + ] + } + }, + { + "derivative": 0.0, + "location": -0.35, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.3 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.05 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.05 + }, + { + "derivative": 0.0, + "location": 0.4, + "value": 0.05 + }, + { + "derivative": 0.007000001, + "location": 1.0, + "value": 0.060000002 + } + ] + } + }, + { + "derivative": 0.0, + "location": -0.1, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.15 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.0 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.0 + }, + { + "derivative": 0.1, + "location": 0.4, + "value": 0.05 + }, + { + "derivative": 0.007000001, + "location": 1.0, + "value": 0.060000002 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.2, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.15 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.0 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.0 + }, + { + "derivative": 0.0, + "location": 0.4, + "value": 0.0 + }, + { + "derivative": 0.0, + "location": 1.0, + "value": 0.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.7, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.0, + "location": -1.0, + "value": -0.02 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": -0.03 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": -0.03 + }, + { + "derivative": 0.06, + "location": 0.4, + "value": 0.0 + }, + { + "derivative": 0.0, + "location": 1.0, + "value": 0.0 + } + ] + } + } + ] + } + }, + { + "derivative": 0.0, + "location": -0.15, + "value": { + "coordinate": "tfg:mars/erosion", + "points": [ + { + "derivative": 0.0, + "location": -0.85, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.38940096, + "location": -1.0, + "value": -0.08880186 + }, + { + "derivative": 0.38940096, + "location": 1.0, + "value": 0.69000006 + } + ] + } + }, + { + "derivative": 0.0, + "location": -0.7, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.37788022, + "location": -1.0, + "value": -0.115760356 + }, + { + "derivative": 0.37788022, + "location": 1.0, + "value": 0.6400001 + } + ] + } + }, + { + "derivative": 0.0, + "location": -0.4, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.0, + "location": -1.0, + "value": -0.2222 + }, + { + "derivative": 0.0, + "location": -0.75, + "value": -0.2222 + }, + { + "derivative": 0.0, + "location": -0.65, + "value": 0.0 + }, + { + "derivative": 0.0, + "location": 0.5954547, + "value": 2.9802322E-8 + }, + { + "derivative": 0.2534563, + "location": 0.6054547, + "value": 2.9802322E-8 + }, + { + "derivative": 0.2534563, + "location": 1.0, + "value": 0.100000024 + } + ] + } + }, + { + "derivative": 0.0, + "location": -0.35, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.3 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.05 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.05 + }, + { + "derivative": 0.0, + "location": 0.4, + "value": 0.05 + }, + { + "derivative": 0.007000001, + "location": 1.0, + "value": 0.060000002 + } + ] + } + }, + { + "derivative": 0.0, + "location": -0.1, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.15 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.0 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.0 + }, + { + "derivative": 0.1, + "location": 0.4, + "value": 0.05 + }, + { + "derivative": 0.007000001, + "location": 1.0, + "value": 0.060000002 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.2, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.15 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.0 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.0 + }, + { + "derivative": 0.0, + "location": 0.4, + "value": 0.0 + }, + { + "derivative": 0.0, + "location": 1.0, + "value": 0.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.7, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.0, + "location": -1.0, + "value": -0.02 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": -0.03 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": -0.03 + }, + { + "derivative": 0.06, + "location": 0.4, + "value": 0.0 + }, + { + "derivative": 0.0, + "location": 1.0, + "value": 0.0 + } + ] + } + } + ] + } + }, + { + "derivative": 0.0, + "location": -0.1, + "value": { + "coordinate": "tfg:mars/erosion", + "points": [ + { + "derivative": 0.0, + "location": -0.85, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.38940096, + "location": -1.0, + "value": -0.08880186 + }, + { + "derivative": 0.38940096, + "location": 1.0, + "value": 0.69000006 + } + ] + } + }, + { + "derivative": 0.0, + "location": -0.7, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.37788022, + "location": -1.0, + "value": -0.115760356 + }, + { + "derivative": 0.37788022, + "location": 1.0, + "value": 0.6400001 + } + ] + } + }, + { + "derivative": 0.0, + "location": -0.4, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.0, + "location": -1.0, + "value": -0.2222 + }, + { + "derivative": 0.0, + "location": -0.75, + "value": -0.2222 + }, + { + "derivative": 0.0, + "location": -0.65, + "value": 0.0 + }, + { + "derivative": 0.0, + "location": 0.5954547, + "value": 2.9802322E-8 + }, + { + "derivative": 0.2534563, + "location": 0.6054547, + "value": 2.9802322E-8 + }, + { + "derivative": 0.2534563, + "location": 1.0, + "value": 0.100000024 + } + ] + } + }, + { + "derivative": 0.0, + "location": -0.35, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.25 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.05 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.05 + }, + { + "derivative": 0.0, + "location": 0.4, + "value": 0.05 + }, + { + "derivative": 0.007000001, + "location": 1.0, + "value": 0.060000002 + } + ] + } + }, + { + "derivative": 0.0, + "location": -0.1, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.1 + }, + { + "derivative": 0.01, + "location": -0.4, + "value": 0.001 + }, + { + "derivative": 0.01, + "location": 0.0, + "value": 0.003 + }, + { + "derivative": 0.094000004, + "location": 0.4, + "value": 0.05 + }, + { + "derivative": 0.007000001, + "location": 1.0, + "value": 0.060000002 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.2, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.1 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.01 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.01 + }, + { + "derivative": 0.04, + "location": 0.4, + "value": 0.03 + }, + { + "derivative": 0.049, + "location": 1.0, + "value": 0.1 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.7, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.0, + "location": -1.0, + "value": -0.02 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": -0.03 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": -0.03 + }, + { + "derivative": 0.12, + "location": 0.4, + "value": 0.03 + }, + { + "derivative": 0.049, + "location": 1.0, + "value": 0.1 + } + ] + } + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.25, + "value": { + "coordinate": "tfg:mars/erosion", + "points": [ + { + "derivative": 0.0, + "location": -0.85, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.0, + "location": -1.0, + "value": 0.20235021 + }, + { + "derivative": 0.5138249, + "location": 0.0, + "value": 0.7161751 + }, + { + "derivative": 0.5138249, + "location": 1.0, + "value": 1.23 + } + ] + } + }, + { + "derivative": 0.0, + "location": -0.7, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.0, + "location": -1.0, + "value": 0.2 + }, + { + "derivative": 0.43317974, + "location": 0.0, + "value": 0.44682026 + }, + { + "derivative": 0.43317974, + "location": 1.0, + "value": 0.88 + } + ] + } + }, + { + "derivative": 0.0, + "location": -0.4, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.0, + "location": -1.0, + "value": 0.2 + }, + { + "derivative": 0.3917051, + "location": 0.0, + "value": 0.30829495 + }, + { + "derivative": 0.3917051, + "location": 1.0, + "value": 0.70000005 + } + ] + } + }, + { + "derivative": 0.0, + "location": -0.35, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.25 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.35 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.35 + }, + { + "derivative": 0.0, + "location": 0.4, + "value": 0.35 + }, + { + "derivative": 0.049000014, + "location": 1.0, + "value": 0.42000002 + } + ] + } + }, + { + "derivative": 0.0, + "location": -0.1, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.1 + }, + { + "derivative": 0.07, + "location": -0.4, + "value": 0.0069999998 + }, + { + "derivative": 0.07, + "location": 0.0, + "value": 0.021 + }, + { + "derivative": 0.658, + "location": 0.4, + "value": 0.35 + }, + { + "derivative": 0.049000014, + "location": 1.0, + "value": 0.42000002 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.2, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.1 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.01 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.01 + }, + { + "derivative": 0.04, + "location": 0.4, + "value": 0.03 + }, + { + "derivative": 0.049, + "location": 1.0, + "value": 0.1 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.4, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.1 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.01 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.01 + }, + { + "derivative": 0.04, + "location": 0.4, + "value": 0.03 + }, + { + "derivative": 0.049, + "location": 1.0, + "value": 0.1 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.45, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.0, + "location": -1.0, + "value": -0.1 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.1 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.01 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.01 + }, + { + "derivative": 0.04, + "location": 0.4, + "value": 0.03 + }, + { + "derivative": 0.049, + "location": 1.0, + "value": 0.1 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.17 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.55, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.0, + "location": -1.0, + "value": -0.1 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.1 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.01 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.01 + }, + { + "derivative": 0.04, + "location": 0.4, + "value": 0.03 + }, + { + "derivative": 0.049, + "location": 1.0, + "value": 0.1 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.17 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.58, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.1 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.01 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.01 + }, + { + "derivative": 0.04, + "location": 0.4, + "value": 0.03 + }, + { + "derivative": 0.049, + "location": 1.0, + "value": 0.1 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.7, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.0, + "location": -1.0, + "value": -0.02 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": -0.03 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": -0.03 + }, + { + "derivative": 0.12, + "location": 0.4, + "value": 0.03 + }, + { + "derivative": 0.049, + "location": 1.0, + "value": 0.1 + } + ] + } + } + ] + } + }, + { + "derivative": 0.0, + "location": 1.0, + "value": { + "coordinate": "tfg:mars/erosion", + "points": [ + { + "derivative": 0.0, + "location": -0.85, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.0, + "location": -1.0, + "value": 0.34792626 + }, + { + "derivative": 0.5760369, + "location": 0.0, + "value": 0.9239631 + }, + { + "derivative": 0.5760369, + "location": 1.0, + "value": 1.5 + } + ] + } + }, + { + "derivative": 0.0, + "location": -0.7, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.0, + "location": -1.0, + "value": 0.2 + }, + { + "derivative": 0.4608295, + "location": 0.0, + "value": 0.5391705 + }, + { + "derivative": 0.4608295, + "location": 1.0, + "value": 1.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": -0.4, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.0, + "location": -1.0, + "value": 0.2 + }, + { + "derivative": 0.4608295, + "location": 0.0, + "value": 0.5391705 + }, + { + "derivative": 0.4608295, + "location": 1.0, + "value": 1.0 + } + ] + } + }, + { + "derivative": 0.0, + "location": -0.35, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.2 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.5 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.5 + }, + { + "derivative": 0.0, + "location": 0.4, + "value": 0.5 + }, + { + "derivative": 0.070000015, + "location": 1.0, + "value": 0.6 + } + ] + } + }, + { + "derivative": 0.0, + "location": -0.1, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.05 + }, + { + "derivative": 0.099999994, + "location": -0.4, + "value": 0.01 + }, + { + "derivative": 0.099999994, + "location": 0.0, + "value": 0.03 + }, + { + "derivative": 0.94, + "location": 0.4, + "value": 0.5 + }, + { + "derivative": 0.070000015, + "location": 1.0, + "value": 0.6 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.2, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.05 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.01 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.01 + }, + { + "derivative": 0.04, + "location": 0.4, + "value": 0.03 + }, + { + "derivative": 0.049, + "location": 1.0, + "value": 0.1 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.4, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.05 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.01 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.01 + }, + { + "derivative": 0.04, + "location": 0.4, + "value": 0.03 + }, + { + "derivative": 0.049, + "location": 1.0, + "value": 0.1 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.45, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.0, + "location": -1.0, + "value": -0.05 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.05 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.01 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.01 + }, + { + "derivative": 0.04, + "location": 0.4, + "value": 0.03 + }, + { + "derivative": 0.049, + "location": 1.0, + "value": 0.1 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.17 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.55, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.0, + "location": -1.0, + "value": -0.05 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.05 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.01 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.01 + }, + { + "derivative": 0.04, + "location": 0.4, + "value": 0.03 + }, + { + "derivative": 0.049, + "location": 1.0, + "value": 0.1 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.17 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.58, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.05 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.01 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.01 + }, + { + "derivative": 0.04, + "location": 0.4, + "value": 0.03 + }, + { + "derivative": 0.049, + "location": 1.0, + "value": 0.1 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.7, + "value": { + "coordinate": "tfg:mars/ridges_folded", + "points": [ + { + "derivative": 0.015, + "location": -1.0, + "value": -0.02 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.01 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.01 + }, + { + "derivative": 0.04, + "location": 0.4, + "value": 0.03 + }, + { + "derivative": 0.049, + "location": 1.0, + "value": 0.1 + } + ] + } + } + ] + } + } + ] + } + } + }, + "argument2": { + "type": "minecraft:cache_once", + "argument": { + "type": "minecraft:blend_alpha" + } } - ] } - } - }, - "argument2": { - "type": "minecraft:cache_once", - "argument": { - "type": "minecraft:blend_alpha" - } } - } } - } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/density_function/mars/sand_dunes.json b/kubejs/data/tfg/worldgen/density_function/mars/sand_dunes.json index 6228ffb0e..c499e022d 100644 --- a/kubejs/data/tfg/worldgen/density_function/mars/sand_dunes.json +++ b/kubejs/data/tfg/worldgen/density_function/mars/sand_dunes.json @@ -1,9 +1,16 @@ { - "type": "minecraft:flat_cache", + "type": "minecraft:cache_2d", "argument": { - "type": "minecraft:noise", - "noise": "tfg:mars_dunes_size", - "xz_scale": 1.0, - "y_scale": 1.0 + "type": "minecraft:mul", + "argument1": -1, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:noise", + "noise": "tfg:mars_dunes_size", + "xz_scale": 1, + "y_scale": 0 + } + } } -} \ No newline at end of file +} diff --git a/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json b/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json index cac07b61b..4be061880 100644 --- a/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json +++ b/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json @@ -413,7 +413,7 @@ "type": "minecraft:noise_threshold", "noise": "tfg:mars_dunes_color", "min_threshold": -2.0, - "max_threshold": -0.25 + "max_threshold": -0.4 }, "then_run": { "type": "minecraft:block", @@ -427,7 +427,7 @@ "if_true": { "type": "minecraft:noise_threshold", "noise": "tfg:mars_dunes_color", - "min_threshold": -0.25, + "min_threshold": -0.4, "max_threshold": 0.05 }, "then_run": { @@ -478,7 +478,7 @@ "type": "minecraft:noise_threshold", "noise": "tfg:mars_dunes_color", "min_threshold": -2.0, - "max_threshold": -0.25 + "max_threshold": -0.4 }, "then_run": { "type": "minecraft:block", @@ -492,7 +492,7 @@ "if_true": { "type": "minecraft:noise_threshold", "noise": "tfg:mars_dunes_color", - "min_threshold": -0.25, + "min_threshold": -0.4, "max_threshold": 0.05 }, "then_run": { From e024e005bdc9e5f920c08cd5bd4b44e7d251817e Mon Sep 17 00:00:00 2001 From: Ian Laidlaw Date: Sun, 20 Jul 2025 06:55:41 -0400 Subject: [PATCH 12/35] Fixes bug where milling #tfg:hardwood would result in softwood pulp instead of the expected hardwood pulp. (#1391) * Fixes bug where milling #tfg:hardwood would result in softwood pulp instead of the expected hardwood pulp. Softwood pulp milling recipe still shows minecraft:logs as input but I'm not familiar enough with kubejs to know how to fix it. Logically this works though. * Fixes bug where milling #tfg:hardwood would result in softwood pulp instead of the expected hardwood pulp. Softwood pulp milling recipe still shows minecraft:logs as input but I'm not familiar enough with kubejs to know how to fix it. Logically this works though. * changed to removeMaceratorRecipe instead of event.remove() * Removed config file from pull request * Removed irrelevant changes * Update recipes.paper.js Signed-off-by: Pyritie --------- Signed-off-by: Pyritie Co-authored-by: Pyritie --- kubejs/server_scripts/tfg/recipes.paper.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/kubejs/server_scripts/tfg/recipes.paper.js b/kubejs/server_scripts/tfg/recipes.paper.js index 5f02457f8..d764c6332 100644 --- a/kubejs/server_scripts/tfg/recipes.paper.js +++ b/kubejs/server_scripts/tfg/recipes.paper.js @@ -46,8 +46,16 @@ function registerTFGPapermakingRecipes(event) { .duration(160) .EUt(7) - //Replace macerate logs into macerate softwood logs - event.replaceInput({ id: 'gtceu:macerator/macerate_logs' }, '#minecraft:logs', '#tfg:softwood') + removeMaceratorRecipe(event, 'macerate_logs') + + // Create macerator recipes for softwood + event.recipes.gtceu.macerator('macerate_softwood') + .itemInputs('#tfg:softwood') + .itemOutputs('6x gtceu:wood_dust') + .chancedOutput('gtceu:wood_dust', 8000, 680) + .duration(70) + .EUt(2) + //Create identical macerator recipe for hardwood event.recipes.gtceu.macerator('macerate_hardwood') .itemInputs('#tfg:hardwood') @@ -152,4 +160,4 @@ function registerTFGPapermakingRecipes(event) { .itemOutputs('minecraft:paper') .duration(40) .EUt(4) -} \ No newline at end of file +} From 611f5d919998f2f9d8c33681e64ecd55a7e0f359 Mon Sep 17 00:00:00 2001 From: Redeix <59435925+Redeix@users.noreply.github.com> Date: Sun, 20 Jul 2025 05:59:30 -0500 Subject: [PATCH 13/35] Recipes, Tags, Assets+ for railgun (#1394) * - Yeast recipe conflict fix * - Fixed seed oil voiding in barrels. And item weight inconsistency. * - Reduced loading screen logo size by 4MB * - Update Changelog * - Compressed loading screen images to maybe help with ram * - Added default gui scale to make the main menu look better on first launch * - Update Changelog * - Added utility script for adding circuits to existing recipes * fixed changelog conflict Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com> * - Added harvest baskets * - Fixed baked potato recipe mixing from oven * - Allowed elytras to be repaired regardless of damage * - Fixed sea water barrel recipe * - Gave plants tags to bushes so they can have other uses * - Pushed stubborn models * - updated Changelog * - Changelog typo * - Integrated Ad Astra wood * - Updated changelog * - Treated chipboard composite barrel lang * - Some Tacz fixes * - Jar dupe fix * - tacz data * - updated changelog * - we hate git * - Loading screen and main menu optimizations * - image push * - I think I got the title screen looking good on all resolutions * - Updated Changelog * - Added scale fix to loading screen too * - Fix pixel alignment * - Recipes, tags, assets+ for railgun --------- Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com> Signed-off-by: Pyritie Co-authored-by: Pyritie --- .../electromagnetic_accelerator.json | 7 +++ .../superconductor_coil_large.json | 7 +++ .../superconductor_coil_small.json | 7 +++ kubejs/assets/tfg/lang/en_us.json | 3 ++ .../casings/electromagnetic_accelerator.json | 1 + .../casings/superconductor_coil_large.json | 1 + .../casings/superconductor_coil_small.json | 1 + .../item/electromagnetic_accelerator.json | 3 ++ .../item/superconductor_coil_large.json | 3 ++ .../item/superconductor_coil_small.json | 3 ++ .../casings/electromagnetic_accelerator.png | Bin 0 -> 7156 bytes .../electromagnetic_accelerator.png.mcmeta | 12 +++++ .../electromagnetic_accelerator_ctm.png | Bin 0 -> 16732 bytes ...electromagnetic_accelerator_ctm.png.mcmeta | 8 ++++ .../casings/superconductor_coil_large.png | Bin 0 -> 566 bytes .../superconductor_coil_large.png.mcmeta | 5 ++ .../casings/superconductor_coil_large_ctm.png | Bin 0 -> 816 bytes .../casings/superconductor_coil_small.png | Bin 0 -> 524 bytes .../superconductor_coil_small.png.mcmeta | 5 ++ .../casings/superconductor_coil_small_ctm.png | Bin 0 -> 631 bytes .../tfg/recipes.miscellaneous.js | 43 ++++++++++++++++++ kubejs/server_scripts/tfg/tags.js | 7 +++ kubejs/startup_scripts/gtceu/constants.js | 15 ++++++ kubejs/startup_scripts/gtceu/materials.js | 16 ++++++- 24 files changed, 145 insertions(+), 2 deletions(-) create mode 100644 kubejs/assets/tfg/blockstates/electromagnetic_accelerator.json create mode 100644 kubejs/assets/tfg/blockstates/superconductor_coil_large.json create mode 100644 kubejs/assets/tfg/blockstates/superconductor_coil_small.json create mode 100644 kubejs/assets/tfg/models/block/casings/electromagnetic_accelerator.json create mode 100644 kubejs/assets/tfg/models/block/casings/superconductor_coil_large.json create mode 100644 kubejs/assets/tfg/models/block/casings/superconductor_coil_small.json create mode 100644 kubejs/assets/tfg/models/item/electromagnetic_accelerator.json create mode 100644 kubejs/assets/tfg/models/item/superconductor_coil_large.json create mode 100644 kubejs/assets/tfg/models/item/superconductor_coil_small.json create mode 100644 kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator.png create mode 100644 kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator.png.mcmeta create mode 100644 kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator_ctm.png create mode 100644 kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator_ctm.png.mcmeta create mode 100644 kubejs/assets/tfg/textures/block/casings/superconductor_coil_large.png create mode 100644 kubejs/assets/tfg/textures/block/casings/superconductor_coil_large.png.mcmeta create mode 100644 kubejs/assets/tfg/textures/block/casings/superconductor_coil_large_ctm.png create mode 100644 kubejs/assets/tfg/textures/block/casings/superconductor_coil_small.png create mode 100644 kubejs/assets/tfg/textures/block/casings/superconductor_coil_small.png.mcmeta create mode 100644 kubejs/assets/tfg/textures/block/casings/superconductor_coil_small_ctm.png diff --git a/kubejs/assets/tfg/blockstates/electromagnetic_accelerator.json b/kubejs/assets/tfg/blockstates/electromagnetic_accelerator.json new file mode 100644 index 000000000..5b3c414ea --- /dev/null +++ b/kubejs/assets/tfg/blockstates/electromagnetic_accelerator.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/casings/electromagnetic_accelerator" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/superconductor_coil_large.json b/kubejs/assets/tfg/blockstates/superconductor_coil_large.json new file mode 100644 index 000000000..9649a8a86 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/superconductor_coil_large.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/casings/superconductor_coil_large" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/superconductor_coil_small.json b/kubejs/assets/tfg/blockstates/superconductor_coil_small.json new file mode 100644 index 000000000..b3a456a13 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/superconductor_coil_small.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/casings/superconductor_coil_small" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 044b9f1c0..fbfd660a3 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -282,6 +282,9 @@ "block.tfg.sandstone.stairs.smooth.fluorapatite.yellow": "Smooth Yellow Fluorapatite Sandstone Stairs", "block.tfg.sandstone.fluorapatite.yellow": "Cut Yellow Fluorapatite Sandstone", "block.tfg.sandstone.smooth.chiseled.fluorapatite.yellow": "Chiseled Yellow Fluorapatite Sandstone", + "block.tfg.electromagnetic_accelerator": "Electromagnetic Accelerator", + "block.tfg.superconductor_coil_large": "Large Superconductor Coil", + "block.tfg.superconductor_coil_small": "Small Superconductor Coil", "tfg:nether_slurry": "Nether Slurry", "tfg:enriched_nether_slurry": "Enriched Nether Slurry", "tfg:ender_slurry": "Ender Slurry", diff --git a/kubejs/assets/tfg/models/block/casings/electromagnetic_accelerator.json b/kubejs/assets/tfg/models/block/casings/electromagnetic_accelerator.json new file mode 100644 index 000000000..2672e7793 --- /dev/null +++ b/kubejs/assets/tfg/models/block/casings/electromagnetic_accelerator.json @@ -0,0 +1 @@ +{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/electromagnetic_accelerator"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/casings/superconductor_coil_large.json b/kubejs/assets/tfg/models/block/casings/superconductor_coil_large.json new file mode 100644 index 000000000..32a088018 --- /dev/null +++ b/kubejs/assets/tfg/models/block/casings/superconductor_coil_large.json @@ -0,0 +1 @@ +{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/superconductor_coil_large"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/casings/superconductor_coil_small.json b/kubejs/assets/tfg/models/block/casings/superconductor_coil_small.json new file mode 100644 index 000000000..66d082401 --- /dev/null +++ b/kubejs/assets/tfg/models/block/casings/superconductor_coil_small.json @@ -0,0 +1 @@ +{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/superconductor_coil_small"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/electromagnetic_accelerator.json b/kubejs/assets/tfg/models/item/electromagnetic_accelerator.json new file mode 100644 index 000000000..a9144b2a5 --- /dev/null +++ b/kubejs/assets/tfg/models/item/electromagnetic_accelerator.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/casings/electromagnetic_accelerator" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/superconductor_coil_large.json b/kubejs/assets/tfg/models/item/superconductor_coil_large.json new file mode 100644 index 000000000..45199ae81 --- /dev/null +++ b/kubejs/assets/tfg/models/item/superconductor_coil_large.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/casings/superconductor_coil_large" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/superconductor_coil_small.json b/kubejs/assets/tfg/models/item/superconductor_coil_small.json new file mode 100644 index 000000000..a09965304 --- /dev/null +++ b/kubejs/assets/tfg/models/item/superconductor_coil_small.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/casings/superconductor_coil_small" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator.png b/kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator.png new file mode 100644 index 0000000000000000000000000000000000000000..3886d919549436f27d2448343fa6b3ddb8877b83 GIT binary patch literal 7156 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 R!odIl002ovPDHLkV1kDT7YP6W literal 0 HcmV?d00001 diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index 1cdf1d57c..48ff94d40 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -885,4 +885,47 @@ function registerTFGMiscellaneousRecipes(event) { event.shapeless('9x tfg:aes_insulation_sheet', [ 'tfg:aes_insulation_roll' ]).id('tfg:shapeless/aes_insulation_sheet') + + global.GTCEU_SUPERCONDUCTORS.forEach((type, index) => { + const multiplier = index + 1 + + event.recipes.gtceu.assembler(`tfg:assembler/superconductor_coil_small_from_${type.name}`) + .itemInputs( + ChemicalHelper.get(TagPrefix.plate, GTMaterials.HSLASteel, 4), + ChemicalHelper.get(TagPrefix.rod, GTMaterials.Steel, 2), + ChemicalHelper.get(TagPrefix.rod, GTMaterials.SteelMagnetic, 1), + ChemicalHelper.get(TagPrefix.wireFine, GTMaterials[type.materialId], 4), + ) + .inputFluids(Fluid.of('gtceu:silicone_rubber', 144)) + .itemOutputs(Item.of('tfg:superconductor_coil_small', 4 * multiplier)) + .circuit(4) + .duration(400) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.assembler(`tfg:assembler/superconductor_coil_large_from_${type.name}`) + .itemInputs( + ChemicalHelper.get(TagPrefix.plate, GTMaterials.HSLASteel, 4), + ChemicalHelper.get(TagPrefix.rod, GTMaterials.Steel, 2), + ChemicalHelper.get(TagPrefix.rod, GTMaterials.SteelMagnetic, 1), + ChemicalHelper.get(TagPrefix.wireGtSingle, GTMaterials[type.materialId], 4), + ) + .inputFluids(Fluid.of('gtceu:silicone_rubber', 144)) + .itemOutputs(Item.of('tfg:superconductor_coil_large', 4 * multiplier)) + .circuit(7) + .duration(600) + .EUt(GTValues.VA[GTValues.MV]) + }) + + event.recipes.gtceu.assembler('tfg:assembler/electromagnetic_accelerator') + .itemInputs( + '2x #forge:plates/desh', + 'gtceu:mv_voltage_coil', + '5x tfg:dry_ice', + 'gtceu:nonconducting_casing' + ) + .inputFluids(Fluid.of('gtceu:blue_alloy', 288)) + .itemOutputs('6x tfg:electromagnetic_accelerator') + .circuit(4) + .duration(800) + .EUt(GTValues.VA[GTValues.MV]) } diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 8a4c12254..dbe55d7b4 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -349,6 +349,13 @@ const registerTFGBlockTags = (event) => { event.add('tfg:harvester_harvestable', '#tfc:berry_bushes') event.add('tfg:harvester_harvestable', '#tfc:any_spreading_bush') + event.add('minecraft:mineable/pickaxe', 'tfg:superconductor_coil_large') + event.add('minecraft:mineable/pickaxe', 'tfg:superconductor_coil_small') + event.add('minecraft:mineable/pickaxe', 'tfg:electromagnetic_accelerator') + event.add('forge:mineable/wrench', 'tfg:superconductor_coil_large') + event.add('forge:mineable/wrench', 'tfg:superconductor_coil_small') + event.add('forge:mineable/wrench', 'tfg:electromagnetic_accelerator') + // #endregion } //#endregion diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index 67ffe8bb3..6a851fdfd 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -299,3 +299,18 @@ global.ADD_CIRCUIT = [ ]; //#endregion +//#region Superconductors +/** @global */ +global.GTCEU_SUPERCONDUCTORS = [ + {name: 'manganese_phosphide', materialId: 'ManganesePhosphide'}, + {name: 'magnesium_diboride', materialId: 'MagnesiumDiboride'}, + {name: 'mercury_barium_calcium_cuprate', materialId: 'MercuryBariumCalciumCuprate'}, + {name: 'uranium_triplatinum', materialId: 'UraniumTriplatinum'}, + {name: 'samarium_iron_arsenic_oxide', materialId: 'SamariumIronArsenicOxide'}, + {name: 'indium_tin_barium_titanium_cuprate', materialId: 'IndiumTinBariumTitaniumCuprate'}, + {name: 'uranium_rhodium_dinaquadide', materialId: 'UraniumRhodiumDinaquadide'}, + {name: 'enriched_naquadah_trinium_europium_duranide', materialId: 'EnrichedNaquadahTriniumEuropiumDuranide'}, + {name: 'ruthenium_trinium_americium_neutronate', materialId: 'RutheniumTriniumAmericiumNeutronate'} +] +//#endregion + diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index f04b5886f..584dd3a1d 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -40,7 +40,8 @@ const registerGTCEuMaterialModification = (event) => { GENERATE_PLATE, GENERATE_DENSE, GENERATE_RING, - GENERATE_FOIL + GENERATE_FOIL, + GENERATE_FINE_WIRE, } = $MATERIAL_FLAGS var metalTooling = [ @@ -183,7 +184,18 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.TinAlloy.addFlags(GENERATE_DOUBLE_INGOTS); GTMaterials.Lead.addFlags(GENERATE_DOUBLE_INGOTS); // - // /* ะ”ั€ัƒะณะพะต */ + // /* Superconductors */ + GTMaterials.ManganesePhosphide.addFlags(GENERATE_FINE_WIRE); + GTMaterials.MagnesiumDiboride.addFlags(GENERATE_FINE_WIRE); + GTMaterials.MercuryBariumCalciumCuprate.addFlags(GENERATE_FINE_WIRE); + GTMaterials.UraniumTriplatinum.addFlags(GENERATE_FINE_WIRE); + GTMaterials.SamariumIronArsenicOxide.addFlags(GENERATE_FINE_WIRE); + //GTMaterials.IndiumTinBariumTitaniumCuprate.addFlags(); + //GTMaterials.UraniumRhodiumDinaquadide.addFlags(); + //GTMaterials.EnrichedNaquadahTriniumEuropiumDuranide.addFlags(); + GTMaterials.RutheniumTriniumAmericiumNeutronate.addFlags(GENERATE_FINE_WIRE); + // + // /* ะ”ั€ัƒะณะพะต (Other) */ // TODO: Exception needs to check the wizardry GTMaterials.Bismuth.setProperty(PropertyKey.ORE, new $ORE_PROPERTY()); From 4e3e55ee41c0c1d7d0b35f24ecaa58ad1fcfb4cf Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 20 Jul 2025 12:01:08 +0100 Subject: [PATCH 14/35] langs --- kubejs/assets/ad_astra/lang/en_us.json | 2 +- kubejs/assets/ad_astra/lang/uk_ua.json | 2 +- kubejs/assets/tfg/lang/en_us.json | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kubejs/assets/ad_astra/lang/en_us.json b/kubejs/assets/ad_astra/lang/en_us.json index f9562c036..8d0a99275 100644 --- a/kubejs/assets/ad_astra/lang/en_us.json +++ b/kubejs/assets/ad_astra/lang/en_us.json @@ -24,7 +24,7 @@ "block.ad_astra.moon_deepslate": "Raw Norite", "block.ad_astra.cheese_block": "Moon Cheese Block", "block.ad_astra.moon_cheese_ore": "Anorthosite Cheese Ore", - "block.ad_astra.mars_sand": "Martian Sand", + "block.ad_astra.mars_sand": "Argillite Sand", "block.ad_astra.mars_stone": "Raw Argillite", "block.ad_astra.mars_cobblestone": "Argillite Cobble", "block.ad_astra.mars_cobblestone_slab": "Argillite Cobble Slab", diff --git a/kubejs/assets/ad_astra/lang/uk_ua.json b/kubejs/assets/ad_astra/lang/uk_ua.json index 1054c62be..6451b7f1b 100644 --- a/kubejs/assets/ad_astra/lang/uk_ua.json +++ b/kubejs/assets/ad_astra/lang/uk_ua.json @@ -24,7 +24,7 @@ "block.ad_astra.moon_deepslate": "ะกะธั€ะธะน ะะพั€ะธั‚", "block.ad_astra.cheese_block": "ะœั–ััั‡ะฝะธะน ัะธั€ะฝะธะน ะฑะปะพะบ", "block.ad_astra.moon_cheese_ore": "ะะฝะพั€ั‚ะพั†ะธั‚ะพะฒะธะน ะกะธั€ะฝะฐ ะ ัƒะดะฐ", - "block.ad_astra.mars_sand": "ะœะฐั€ัั–ะฐะฝััŒะบะธะน ะฟั–ัะพะบ", + "block.ad_astra.mars_sand": "ะั€ะณั–ะปั–ั‚ะพะฒะธะน ะฟั–ัะพะบ", "block.ad_astra.mars_stone": "ะกะธั€ะธะน ะั€ะณั–ะปั–ั‚", "block.ad_astra.mars_cobblestone": "ะั€ะณั–ะปั–ั‚ะพะฒะธะน ะฑั€ัƒะบ", "block.ad_astra.mars_cobblestone_slab": "ะั€ะณั–ะปั–ั‚ะพะฒะฐ ะฑั€ัƒะบั–ะฒะฝะฐ ะฟะปะธั‚ะฐ", diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 044b9f1c0..fbfd660a3 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -282,6 +282,9 @@ "block.tfg.sandstone.stairs.smooth.fluorapatite.yellow": "Smooth Yellow Fluorapatite Sandstone Stairs", "block.tfg.sandstone.fluorapatite.yellow": "Cut Yellow Fluorapatite Sandstone", "block.tfg.sandstone.smooth.chiseled.fluorapatite.yellow": "Chiseled Yellow Fluorapatite Sandstone", + "block.tfg.electromagnetic_accelerator": "Electromagnetic Accelerator", + "block.tfg.superconductor_coil_large": "Large Superconductor Coil", + "block.tfg.superconductor_coil_small": "Small Superconductor Coil", "tfg:nether_slurry": "Nether Slurry", "tfg:enriched_nether_slurry": "Enriched Nether Slurry", "tfg:ender_slurry": "Ender Slurry", From cc769b5a8af31d75a5768c4c16704f5dea5c770e Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 16:28:59 +0500 Subject: [PATCH 15/35] Update pakku-lock.json --- pakku-lock.json | 55 +++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/pakku-lock.json b/pakku-lock.json index 579372bdf..a5bdf2242 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -13471,9 +13471,10 @@ ] }, { - "pakku_id": "qsKC91BM2qENiBSo", + "pakku_id": "yUBBhskMKRv8l92B", "pakku_links": [ - "rbYKnXWzT4megBI6" + "rbYKnXWzT4megBI6", + "64uacGcEw697jVGs" ], "type": "MOD", "side": "BOTH", @@ -13490,6 +13491,31 @@ "modrinth": "lNttW2Xl" }, "files": [ + { + "type": "curseforge", + "file_name": "TerraFirmaGreg-Core-Modern-0.7.3.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "neoforge", + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6788/331/TerraFirmaGreg-Core-Modern-0.7.3.jar", + "id": "6788331", + "parent_id": "513402", + "hashes": { + "sha1": "a3c5f0ff25afdc7826ca3931493d705b0a5f2665", + "md5": "59e7caa63813f1eca2264c40aa457c67" + }, + "required_dependencies": [ + "890405", + "302973" + ], + "size": 451137, + "date_published": "2025-07-19T17:18:03.270Z" + }, { "type": "modrinth", "file_name": "TerraFirmaGreg-Core-Modern-0.7.3.jar", @@ -13514,31 +13540,6 @@ ], "size": 451137, "date_published": "2025-07-19T17:18:04.503966Z" - }, - { - "type": "curseforge", - "file_name": "TerraFirmaGreg-Core-Modern-0.7.2.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "neoforge", - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6763/731/TerraFirmaGreg-Core-Modern-0.7.2.jar", - "id": "6763731", - "parent_id": "513402", - "hashes": { - "sha1": "a8e280cf82fc0f189f23a3fd64da696d9922b6b5", - "md5": "0aa8b4d8f19866f341090664dab8496c" - }, - "required_dependencies": [ - "890405", - "302973" - ], - "size": 436018, - "date_published": "2025-07-13T12:04:21.110Z" } ] }, From b98c3bc1353309ebae1372d4a2ea56ed1340750c Mon Sep 17 00:00:00 2001 From: Eve <93487878+EveProgrammingsockson@users.noreply.github.com> Date: Sun, 20 Jul 2025 16:36:45 +0500 Subject: [PATCH 16/35] =?UTF-8?q?[=F0=9F=AA=B6]:=20Give=20Aged=20Corn=20Wh?= =?UTF-8?q?iskey=20and=20Aged=20Rye=20Whiskey=20status=20effects=20(#1390)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Export ".json"s from TFCagedalcohol mod to TFC Exporting effects ".json"s Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com> * Create tfc There is tfc/tfc/*files* Need additional file to access them Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com> * Delete kubejs/data/tfc/drinkables directory not there sh* Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com> * Delete kubejs/data/tfc/tfc Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com> * Create tfc Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com> * Delete kubejs/data/tfc/tfc Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com> * Create tfc Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com> * Delete kubejs/data/tfc/tfc Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com> * Create ihategithub Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com> * Exporting aged alcohol from TFCagedalcohol data Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com> * Create alcohols.json Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com> * Delete kubejs/data/tfc/tfc/ihategithub Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com> --------- Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com> --- kubejs/data/tfc/tags/fluids/alcohols.json | 21 +++++++++++++++++++ kubejs/data/tfc/tfc/drinkables/aged_beer.json | 13 ++++++++++++ .../data/tfc/tfc/drinkables/aged_cider.json | 13 ++++++++++++ .../tfc/tfc/drinkables/aged_corn_whiskey.json | 13 ++++++++++++ kubejs/data/tfc/tfc/drinkables/aged_rum.json | 13 ++++++++++++ .../tfc/tfc/drinkables/aged_rye_whiskey.json | 13 ++++++++++++ kubejs/data/tfc/tfc/drinkables/aged_sake.json | 13 ++++++++++++ .../data/tfc/tfc/drinkables/aged_vodka.json | 13 ++++++++++++ .../data/tfc/tfc/drinkables/aged_whiskey.json | 13 ++++++++++++ 9 files changed, 125 insertions(+) create mode 100644 kubejs/data/tfc/tags/fluids/alcohols.json create mode 100644 kubejs/data/tfc/tfc/drinkables/aged_beer.json create mode 100644 kubejs/data/tfc/tfc/drinkables/aged_cider.json create mode 100644 kubejs/data/tfc/tfc/drinkables/aged_corn_whiskey.json create mode 100644 kubejs/data/tfc/tfc/drinkables/aged_rum.json create mode 100644 kubejs/data/tfc/tfc/drinkables/aged_rye_whiskey.json 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/kubejs/data/tfc/tags/fluids/alcohols.json b/kubejs/data/tfc/tags/fluids/alcohols.json new file mode 100644 index 000000000..76c6115ca --- /dev/null +++ b/kubejs/data/tfc/tags/fluids/alcohols.json @@ -0,0 +1,21 @@ +{ + "replace":true, + "values":[ + "tfc:beer", + "tfc:cider", + "tfc:rum", + "tfc:sake", + "tfc:vodka", + "tfc:whiskey", + "tfc:corn_whiskey", + "tfc:rye_whiskey", + "tfcagedalcohol:aged_beer", + "tfcagedalcohol:aged_cider", + "tfcagedalcohol:aged_rum", + "tfcagedalcohol:aged_sake", + "tfcagedalcohol:aged_vodka", + "tfcagedalcohol:aged_whiskey", + "tfcagedalcohol:aged_corn_whiskey", + "tfcagedalcohol:aged_rye_whiskey" + ] +} diff --git a/kubejs/data/tfc/tfc/drinkables/aged_beer.json b/kubejs/data/tfc/tfc/drinkables/aged_beer.json new file mode 100644 index 000000000..672675975 --- /dev/null +++ b/kubejs/data/tfc/tfc/drinkables/aged_beer.json @@ -0,0 +1,13 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "ingredient": "tfcagedalcohol:aged_beer", + "thirst": 15, + "intoxication": 2000, + "effects": [ + { + "type": "minecraft:absorption", + "duration": 24000, + "amplifier": 1 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfc/tfc/drinkables/aged_cider.json b/kubejs/data/tfc/tfc/drinkables/aged_cider.json new file mode 100644 index 000000000..23fd5bd5a --- /dev/null +++ b/kubejs/data/tfc/tfc/drinkables/aged_cider.json @@ -0,0 +1,13 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "ingredient": "tfcagedalcohol:aged_cider", + "thirst": 15, + "intoxication": 2000, + "effects": [ + { + "type": "minecraft:speed", + "duration": 6400, + "amplifier": 0 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfc/tfc/drinkables/aged_corn_whiskey.json b/kubejs/data/tfc/tfc/drinkables/aged_corn_whiskey.json new file mode 100644 index 000000000..fb9caffac --- /dev/null +++ b/kubejs/data/tfc/tfc/drinkables/aged_corn_whiskey.json @@ -0,0 +1,13 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "ingredient": "tfcagedalcohol:aged_corn_whiskey", + "thirst": 15, + "intoxication": 2000, + "effects": [ + { + "type": "minecraft:haste", + "duration": 6400, + "amplifier": 0 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfc/tfc/drinkables/aged_rum.json b/kubejs/data/tfc/tfc/drinkables/aged_rum.json new file mode 100644 index 000000000..5653f8db1 --- /dev/null +++ b/kubejs/data/tfc/tfc/drinkables/aged_rum.json @@ -0,0 +1,13 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "ingredient": "tfcagedalcohol:aged_rum", + "thirst": 15, + "intoxication": 2000, + "effects": [ + { + "type": "minecraft:speed", + "duration": 3200, + "amplifier": 1 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfc/tfc/drinkables/aged_rye_whiskey.json b/kubejs/data/tfc/tfc/drinkables/aged_rye_whiskey.json new file mode 100644 index 000000000..bbf9420fc --- /dev/null +++ b/kubejs/data/tfc/tfc/drinkables/aged_rye_whiskey.json @@ -0,0 +1,13 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "ingredient": "tfcagedalcohol:aged_rye_whiskey", + "thirst": 15, + "intoxication": 2000, + "effects": [ + { + "type": "minecraft:haste", + "duration": 6400, + "amplifier": 0 + } + ] +} \ No newline at end of file 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..049b397bc --- /dev/null +++ b/kubejs/data/tfc/tfc/drinkables/aged_sake.json @@ -0,0 +1,13 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "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..ec4095c4a --- /dev/null +++ b/kubejs/data/tfc/tfc/drinkables/aged_vodka.json @@ -0,0 +1,13 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "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..b865f4376 --- /dev/null +++ b/kubejs/data/tfc/tfc/drinkables/aged_whiskey.json @@ -0,0 +1,13 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "ingredient": "tfcagedalcohol:aged_whiskey", + "thirst": 15, + "intoxication": 2000, + "effects": [ + { + "type": "minecraft:haste", + "duration": 3200, + "amplifier": 1 + } + ] +} \ No newline at end of file From 91d9738f1c6aebdf1a0a5f1d45016f5a150da1ce Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 20 Jul 2025 12:46:23 +0100 Subject: [PATCH 17/35] fixes #1397 --- kubejs/server_scripts/water_flasks/recipes.js | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/kubejs/server_scripts/water_flasks/recipes.js b/kubejs/server_scripts/water_flasks/recipes.js index 443665600..629c93a3f 100644 --- a/kubejs/server_scripts/water_flasks/recipes.js +++ b/kubejs/server_scripts/water_flasks/recipes.js @@ -76,26 +76,28 @@ const registerWaterFlasksRecipes = (event) => { }).id('tfg:shaped/iron_flask') event.remove({ id: 'waterflasks:crafting/repair_broken_iron' }) - event.shaped('waterflasks:iron_flask', [ - 'AB', - 'CD' - ], { - A: 'waterflasks:broken_iron_flask', - B: 'waterflasks:bladder', - C: '#forge:cloth', - D: '#forge:tools/knives' - }).id('tfg:shaped/repair_broken_iron') + event.recipes.tfc.no_remainder_shaped_crafting( + event.shaped('waterflasks:iron_flask', [ + 'AB', + 'CD' + ], { + A: 'waterflasks:broken_iron_flask', + B: 'waterflasks:bladder', + C: '#forge:cloth', + D: '#forge:tools/knives' + })).id('tfg:shaped/repair_broken_iron') event.remove({ id: 'waterflasks:crafting/repair_iron' }) - event.shaped('waterflasks:iron_flask', [ - 'AB', - 'CD' - ], { - A: 'waterflasks:iron_flask', - B: 'waterflasks:bladder', - C: '#forge:cloth', - D: '#forge:tools/knives' - }).id('tfg:shaped/repair_iron') + event.recipes.tfc.no_remainder_shaped_crafting( + event.shaped('waterflasks:iron_flask', [ + 'AB', + 'CD' + ], { + A: 'waterflasks:iron_flask', + B: 'waterflasks:bladder', + C: '#forge:cloth', + D: '#forge:tools/knives' + })).id('tfg:shaped/repair_iron') event.remove({ id: 'waterflasks:crafting/red_steel_flask' }) event.shaped('waterflasks:red_steel_flask', [ From de3e7dacb836d49e92c9d3f267814f9395895955 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 16:51:29 +0500 Subject: [PATCH 18/35] Update build.yml --- .github/workflows/build.yml | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d8c3fb1fd..20065f367 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -135,12 +135,6 @@ jobs: with: file_path: "pakku-lock.json" - - name: ๐Ÿ” Check if tag exists - uses: mukunku/tag-exists-action@v1.6.0 - id: check_tag - with: - tag: ${{ steps.pakku_info.outputs.version }} - - name: ๐Ÿ“„ Changelog Dev Parser id: changelog_dev if: ${{ env.DEV_ENVIRONMENT == 'true' }} @@ -157,6 +151,12 @@ jobs: path: CHANGELOG.md continue-on-error: true + - name: ๐Ÿ” Check if tag exists + uses: mukunku/tag-exists-action@v1.6.0 + id: check_tag + with: + tag: ${{ steps.changelog.outputs.version }} + - name: ๐Ÿ” Check id: check shell: bash @@ -185,6 +185,26 @@ jobs: ```markdown ${{ steps.read_diff.outputs.diff }} ``` + + - name: ๐Ÿ” Create Pull Request if tag not found + id: create_pr + if: ${{ steps.check_tag.outputs.exists == 'false' && env.DEV_ENVIRONMENT == 'true' }} + uses: peter-evans/create-pull-request@v7.0.8 + with: + token: ${{ secrets.GITHUB_TOKEN }} + title: 'Release: ${{ steps.check.outputs.project_version }}' + body: | + 'This is an automated Pull Request from the dev branch.' + ๐Ÿ“ƒ **Name**: ${{ steps.check.outputs.project_name }} + ๐Ÿ“ƒ **Release**: `${{ steps.check.outputs.project_version }}` + ๐Ÿ“ƒ **Release Type**: `${{ steps.check.outputs.release_type }}` + ๐Ÿ“ƒ **Game Version**: `${{ steps.check.outputs.minecraft_version }}` + + ${{ steps.changelog_dev.outputs.description }} + ${{ steps.format_diff.outputs.text }} + head: dev + base: main + team-reviewers: project-lead - name: ๐Ÿ“ Generate Github Summary uses: WcAServices/markdown-template-action@v1.1.1 From 5bb1c17eaea2c4ff596d25df6eee57ae60b3044d Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 20 Jul 2025 12:53:25 +0100 Subject: [PATCH 19/35] update changelog, revert unnecessary changes from #1390 --- CHANGELOG.md | 7 ++++++- kubejs/data/tfc/tags/fluids/alcohols.json | 21 ------------------- kubejs/data/tfc/tfc/drinkables/aged_beer.json | 13 ------------ .../data/tfc/tfc/drinkables/aged_cider.json | 13 ------------ kubejs/data/tfc/tfc/drinkables/aged_rum.json | 13 ------------ kubejs/data/tfc/tfc/drinkables/aged_sake.json | 13 ------------ .../data/tfc/tfc/drinkables/aged_vodka.json | 13 ------------ .../data/tfc/tfc/drinkables/aged_whiskey.json | 13 ------------ kubejs/server_scripts/tfc/tags.js | 9 ++++++++ 9 files changed, 15 insertions(+), 100 deletions(-) delete mode 100644 kubejs/data/tfc/tags/fluids/alcohols.json delete mode 100644 kubejs/data/tfc/tfc/drinkables/aged_beer.json delete mode 100644 kubejs/data/tfc/tfc/drinkables/aged_cider.json delete mode 100644 kubejs/data/tfc/tfc/drinkables/aged_rum.json delete mode 100644 kubejs/data/tfc/tfc/drinkables/aged_sake.json delete mode 100644 kubejs/data/tfc/tfc/drinkables/aged_vodka.json delete mode 100644 kubejs/data/tfc/tfc/drinkables/aged_whiskey.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 471bfcc38..50a956a34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Changelog -## [Unreleased] +## [0.10.2] - 20-07-2025 ### Changes +- Aged Corn Whiskey and Aged Rye Whiskey now have status effects (#1390) @EveProgrammingsockson +### Bug fixes +- Fixed TFG-Core version mismatch @Xikaro +- Fixed hardwood logs macerating into softwood pulp (#1391) @Forsuin +- Fixed iron flask dupe (#1397) @Pyritie ## [0.10.1] - 19-07-2025 ### Changes diff --git a/kubejs/data/tfc/tags/fluids/alcohols.json b/kubejs/data/tfc/tags/fluids/alcohols.json deleted file mode 100644 index 76c6115ca..000000000 --- a/kubejs/data/tfc/tags/fluids/alcohols.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "replace":true, - "values":[ - "tfc:beer", - "tfc:cider", - "tfc:rum", - "tfc:sake", - "tfc:vodka", - "tfc:whiskey", - "tfc:corn_whiskey", - "tfc:rye_whiskey", - "tfcagedalcohol:aged_beer", - "tfcagedalcohol:aged_cider", - "tfcagedalcohol:aged_rum", - "tfcagedalcohol:aged_sake", - "tfcagedalcohol:aged_vodka", - "tfcagedalcohol:aged_whiskey", - "tfcagedalcohol:aged_corn_whiskey", - "tfcagedalcohol:aged_rye_whiskey" - ] -} diff --git a/kubejs/data/tfc/tfc/drinkables/aged_beer.json b/kubejs/data/tfc/tfc/drinkables/aged_beer.json deleted file mode 100644 index 672675975..000000000 --- a/kubejs/data/tfc/tfc/drinkables/aged_beer.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "ingredient": "tfcagedalcohol:aged_beer", - "thirst": 15, - "intoxication": 2000, - "effects": [ - { - "type": "minecraft:absorption", - "duration": 24000, - "amplifier": 1 - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfc/tfc/drinkables/aged_cider.json b/kubejs/data/tfc/tfc/drinkables/aged_cider.json deleted file mode 100644 index 23fd5bd5a..000000000 --- a/kubejs/data/tfc/tfc/drinkables/aged_cider.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "ingredient": "tfcagedalcohol:aged_cider", - "thirst": 15, - "intoxication": 2000, - "effects": [ - { - "type": "minecraft:speed", - "duration": 6400, - "amplifier": 0 - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfc/tfc/drinkables/aged_rum.json b/kubejs/data/tfc/tfc/drinkables/aged_rum.json deleted file mode 100644 index 5653f8db1..000000000 --- a/kubejs/data/tfc/tfc/drinkables/aged_rum.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "ingredient": "tfcagedalcohol:aged_rum", - "thirst": 15, - "intoxication": 2000, - "effects": [ - { - "type": "minecraft:speed", - "duration": 3200, - "amplifier": 1 - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfc/tfc/drinkables/aged_sake.json b/kubejs/data/tfc/tfc/drinkables/aged_sake.json deleted file mode 100644 index 049b397bc..000000000 --- a/kubejs/data/tfc/tfc/drinkables/aged_sake.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "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 deleted file mode 100644 index ec4095c4a..000000000 --- a/kubejs/data/tfc/tfc/drinkables/aged_vodka.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "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 deleted file mode 100644 index b865f4376..000000000 --- a/kubejs/data/tfc/tfc/drinkables/aged_whiskey.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "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/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 5729af43d..013f440c3 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -517,6 +517,15 @@ const registerTFCFluidTags = (event) => { event.add('tfc:usable_in_blue_steel_bucket', 'tfc:spring_water') event.add('tfc:usable_in_red_steel_bucket', 'tfc:spring_water') + event.add('tfc:alcohols', "tfcagedalcohol:aged_beer") + event.add('tfc:alcohols', "tfcagedalcohol:aged_cider") + event.add('tfc:alcohols', "tfcagedalcohol:aged_rum") + event.add('tfc:alcohols', "tfcagedalcohol:aged_sake") + event.add('tfc:alcohols', "tfcagedalcohol:aged_vodka") + event.add('tfc:alcohols', "tfcagedalcohol:aged_whiskey") + event.add('tfc:alcohols', "tfcagedalcohol:aged_corn_whiskey") + event.add('tfc:alcohols', "tfcagedalcohol:aged_rye_whiskey") + // ะ”ะพะฑะฐะฒะปัะตะผ ั‚ะตะณ ะดะปั ัะบั€ั‹ั‚ะธั ะฒ EMI event.add('c:hidden_from_recipe_viewers', 'tfc:metal/bismuth') event.add('c:hidden_from_recipe_viewers', 'tfc:metal/bismuth_bronze') From c73c393b10092c39114482fd7aecd492ac0b83b6 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 16:53:48 +0500 Subject: [PATCH 20/35] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 20065f367..8c07a0cb4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -142,7 +142,7 @@ jobs: with: path: CHANGELOG.md version: "unreleased" - continue-on-error: true + continue-on-error: false - name: ๐Ÿ“„ Changelog Parser id: changelog From e81935032fe8e0862f1e7ca2e1c75842c00a659f Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 16:57:02 +0500 Subject: [PATCH 21/35] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8c07a0cb4..7e1f2f930 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -188,7 +188,7 @@ jobs: - name: ๐Ÿ” Create Pull Request if tag not found id: create_pr - if: ${{ steps.check_tag.outputs.exists == 'false' && env.DEV_ENVIRONMENT == 'true' }} + if: ${{ steps.check_tag.outputs.exists == 'false' && env.DEV_ENVIRONMENT == 'true' && 1 != 1 }} uses: peter-evans/create-pull-request@v7.0.8 with: token: ${{ secrets.GITHUB_TOKEN }} From 62dbe15231c2d4461a78edeeef8565cefc7cac18 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 16:58:06 +0500 Subject: [PATCH 22/35] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7e1f2f930..28ccf16be 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -142,7 +142,7 @@ jobs: with: path: CHANGELOG.md version: "unreleased" - continue-on-error: false + continue-on-error: true - name: ๐Ÿ“„ Changelog Parser id: changelog From d1f76ca1bde95c666361a2e40ccc0509c6cfa449 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 20 Jul 2025 13:03:01 +0100 Subject: [PATCH 23/35] fixes #1395 --- kubejs/server_scripts/gregtech/recipes.materials.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js index 8b2b4d77e..4e4b2f108 100644 --- a/kubejs/server_scripts/gregtech/recipes.materials.js +++ b/kubejs/server_scripts/gregtech/recipes.materials.js @@ -696,7 +696,11 @@ function registerGTCEUMetalRecipes(event) { { A: chipped, B: '#forge:tools/mortars' }) .id(`shapeless/mortar_chipped_${material.getName()}`) - event.recipes.greate.pressing(ChemicalHelper.get(TagPrefix.gem, material, 9), ChemicalHelper.get(TagPrefix.block, material, 1)) + let amount = 9; + if (material == GTMaterials.NetherQuartz || material == GTMaterials.Amethyst) + amount = 4; + + event.recipes.greate.pressing(ChemicalHelper.get(TagPrefix.gem, material, amount), ChemicalHelper.get(TagPrefix.block, material, 1)) .recipeTier(0) .id(`greate:pressing/unpacking_${material.getName()}_block`) } From 07245d6d07c225173d4410384e20d84ca35013ff Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 20 Jul 2025 13:03:13 +0100 Subject: [PATCH 24/35] removed leftover species recipes --- kubejs/server_scripts/species/recipes.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/server_scripts/species/recipes.js b/kubejs/server_scripts/species/recipes.js index 3a10d7025..43cba58a4 100644 --- a/kubejs/server_scripts/species/recipes.js +++ b/kubejs/server_scripts/species/recipes.js @@ -6,10 +6,10 @@ function registerSpeciesRecipes(event) { event.remove({ output: item }) }) + event.remove({ mod: 'species' }) + event.shapeless('species:music_disc_dial', ['etched:blank_music_disc', 'species:birt_egg']) - event.shapeless('species:music_disc_lapidarian', ['etched:blank_music_disc', 'tfc:rock/raw/basalt_slab']) - event.shapeless('species:music_disk_spawner', ['etched:blank_music_disc', 'computercraft:disk']) event.shaped('species:cranktrap', [ From e8e53f25bfa28be5da6332a9ff6ebf10e141ce5a Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 20 Jul 2025 13:03:25 +0100 Subject: [PATCH 25/35] changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 50a956a34..764bf2072 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,6 @@ # Changelog +## [Unreleased] + ## [0.10.2] - 20-07-2025 ### Changes - Aged Corn Whiskey and Aged Rye Whiskey now have status effects (#1390) @EveProgrammingsockson @@ -6,6 +8,7 @@ - Fixed TFG-Core version mismatch @Xikaro - Fixed hardwood logs macerating into softwood pulp (#1391) @Forsuin - Fixed iron flask dupe (#1397) @Pyritie +- Fixed amethyst/nether quartz dupe (#1395) @Pyritie ## [0.10.1] - 19-07-2025 ### Changes From a752914a5e01dcd1976202222a624f82700a043e Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 17:06:00 +0500 Subject: [PATCH 26/35] Update build.yml --- .github/workflows/build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 28ccf16be..70f67fa8d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -188,13 +188,14 @@ jobs: - name: ๐Ÿ” Create Pull Request if tag not found id: create_pr - if: ${{ steps.check_tag.outputs.exists == 'false' && env.DEV_ENVIRONMENT == 'true' && 1 != 1 }} + if: ${{ steps.check_tag.outputs.exists == 'false' && env.DEV_ENVIRONMENT == 'true'}} uses: peter-evans/create-pull-request@v7.0.8 with: token: ${{ secrets.GITHUB_TOKEN }} title: 'Release: ${{ steps.check.outputs.project_version }}' body: | - 'This is an automated Pull Request from the dev branch.' + **This is an automated Pull Request from the dev branch.** + ๐Ÿ“ƒ **Name**: ${{ steps.check.outputs.project_name }} ๐Ÿ“ƒ **Release**: `${{ steps.check.outputs.project_version }}` ๐Ÿ“ƒ **Release Type**: `${{ steps.check.outputs.release_type }}` @@ -202,8 +203,8 @@ jobs: ${{ steps.changelog_dev.outputs.description }} ${{ steps.format_diff.outputs.text }} - head: dev base: main + branch: dev team-reviewers: project-lead - name: ๐Ÿ“ Generate Github Summary From 321af9545cdb6ca8f274bb988b9d5254ad6f4f70 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 17:11:36 +0500 Subject: [PATCH 27/35] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 70f67fa8d..bd6628273 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -203,8 +203,8 @@ jobs: ${{ steps.changelog_dev.outputs.description }} ${{ steps.format_diff.outputs.text }} - base: main - branch: dev + base: dev + branch: main team-reviewers: project-lead - name: ๐Ÿ“ Generate Github Summary From 4a1a6344dd3670811880708370d994ca4a085da9 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 17:14:25 +0500 Subject: [PATCH 28/35] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bd6628273..70f67fa8d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -203,8 +203,8 @@ jobs: ${{ steps.changelog_dev.outputs.description }} ${{ steps.format_diff.outputs.text }} - base: dev - branch: main + base: main + branch: dev team-reviewers: project-lead - name: ๐Ÿ“ Generate Github Summary From c1c51231d8930c51e79520157e3680d980f85d77 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 17:17:25 +0500 Subject: [PATCH 29/35] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 70f67fa8d..fab220bd2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -204,7 +204,7 @@ jobs: ${{ steps.changelog_dev.outputs.description }} ${{ steps.format_diff.outputs.text }} base: main - branch: dev + head: dev team-reviewers: project-lead - name: ๐Ÿ“ Generate Github Summary From a044c703f2feaa1e59e6ae4f1bf0c0b75ad1cbf6 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 20 Jul 2025 13:24:24 +0100 Subject: [PATCH 30/35] credit links (#1401) --- .github/README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/README.md b/.github/README.md index 04fbebfbb..5c92b2a6b 100644 --- a/.github/README.md +++ b/.github/README.md @@ -64,9 +64,10 @@ Want to help translate? Please read [this](../kubejs/README%20IF%20TRANSLATING.m

External Credits and Special Thanks

-- WithersChat from the Monifactory team for the universal circuit textures. -- GregTech Community Pack Modern for most of their quest text. -- Better End for some assets. +- WithersChat from the [Monifactory](https://www.curseforge.com/minecraft/modpacks/monifactory) team for the universal circuit textures. +- [GregTech Community Pack Modern](https://www.curseforge.com/minecraft/modpacks/gregtech-community-pack-modern) for most of their quest text. +- [Better End](https://www.curseforge.com/minecraft/mc-mods/betterend) for some assets. +- Uni for Mars' dunes terrain generation. [TerraFirmaCraft]: https://www.curseforge.com/minecraft/mc-mods/terrafirmacraft From e895ae9b4961e24d788cf82c7a4b3572bc2fcd40 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 17:25:47 +0500 Subject: [PATCH 31/35] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fab220bd2..042106b54 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -188,7 +188,7 @@ jobs: - name: ๐Ÿ” Create Pull Request if tag not found id: create_pr - if: ${{ steps.check_tag.outputs.exists == 'false' && env.DEV_ENVIRONMENT == 'true'}} + if: ${{ steps.check_tag.outputs.exists == 'false' && env.DEV_ENVIRONMENT == 'true' && false}} uses: peter-evans/create-pull-request@v7.0.8 with: token: ${{ secrets.GITHUB_TOKEN }} From 78a1f7e7d8d84f7e4879c12b820aaf99cac2e74d Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 17:33:26 +0500 Subject: [PATCH 32/35] Update build.yml --- .github/workflows/build.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 042106b54..548fccef2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -188,24 +188,25 @@ jobs: - name: ๐Ÿ” Create Pull Request if tag not found id: create_pr - if: ${{ steps.check_tag.outputs.exists == 'false' && env.DEV_ENVIRONMENT == 'true' && false}} - uses: peter-evans/create-pull-request@v7.0.8 + if: ${{ steps.check_tag.outputs.exists == 'false' && env.DEV_ENVIRONMENT == 'true'}} + uses: devops-infra/action-pull-request@v0.6.0 with: - token: ${{ secrets.GITHUB_TOKEN }} + github_token: ${{ secrets.GITHUB_TOKEN }} + source_branch: dev + target_branch: main title: 'Release: ${{ steps.check.outputs.project_version }}' body: | **This is an automated Pull Request from the dev branch.** ๐Ÿ“ƒ **Name**: ${{ steps.check.outputs.project_name }} - ๐Ÿ“ƒ **Release**: `${{ steps.check.outputs.project_version }}` - ๐Ÿ“ƒ **Release Type**: `${{ steps.check.outputs.release_type }}` + ๐Ÿ“ƒ **Release**: `${{ steps.changelog.outputs.version }}` + ๐Ÿ“ƒ **Release Type**: `${{ steps.pakku_info.outputs.release_type }}` ๐Ÿ“ƒ **Game Version**: `${{ steps.check.outputs.minecraft_version }}` ${{ steps.changelog_dev.outputs.description }} ${{ steps.format_diff.outputs.text }} - base: main - head: dev - team-reviewers: project-lead + reviewer: project-lead + ignore_users: "dependabot" - name: ๐Ÿ“ Generate Github Summary uses: WcAServices/markdown-template-action@v1.1.1 From 0333cd89c88f45717099a8450e6b81cab9ddbbfa Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 17:40:30 +0500 Subject: [PATCH 33/35] Update build.yml --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 548fccef2..a5ae6f581 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -194,7 +194,7 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} source_branch: dev target_branch: main - title: 'Release: ${{ steps.check.outputs.project_version }}' + title: 'Release: ${{ steps.changelog.outputs.version }}' body: | **This is an automated Pull Request from the dev branch.** @@ -203,9 +203,9 @@ jobs: ๐Ÿ“ƒ **Release Type**: `${{ steps.pakku_info.outputs.release_type }}` ๐Ÿ“ƒ **Game Version**: `${{ steps.check.outputs.minecraft_version }}` - ${{ steps.changelog_dev.outputs.description }} + ${{ steps.changelog.outputs.description }} ${{ steps.format_diff.outputs.text }} - reviewer: project-lead + reviewer: Xikaro ignore_users: "dependabot" - name: ๐Ÿ“ Generate Github Summary From 676d14796cc03601378449c0f9c012cd4d8373f0 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 17:44:45 +0500 Subject: [PATCH 34/35] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a5ae6f581..ae33436bb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -178,7 +178,7 @@ jobs: - name: ๐Ÿ“„ Format diff id: format_diff - if: ${{ steps.read_diff.outputs.diff != '' }} + if: ${{ steps.read_diff.outputs.diff != '## Projects' }} uses: roamingowl/template-output-with-eta@v1.12.0 with: template: | From 78d0d3846996265da81055b0abe407302d084fb1 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 17:50:05 +0500 Subject: [PATCH 35/35] Update build.yml --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ae33436bb..8f49a3d3e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -178,7 +178,7 @@ jobs: - name: ๐Ÿ“„ Format diff id: format_diff - if: ${{ steps.read_diff.outputs.diff != '## Projects' }} + if: ${{ steps.read_diff.outputs.diff != '' }} uses: roamingowl/template-output-with-eta@v1.12.0 with: template: | @@ -204,7 +204,6 @@ jobs: ๐Ÿ“ƒ **Game Version**: `${{ steps.check.outputs.minecraft_version }}` ${{ steps.changelog.outputs.description }} - ${{ steps.format_diff.outputs.text }} reviewer: Xikaro ignore_users: "dependabot"