From d3567d3517a03bff643ac2c630a6b2e22030980a Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 19 Jul 2025 22:18:14 +0100 Subject: [PATCH 1/8] 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 b41318d7d913cdf10e516add11144d6ecc4ac837 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 20 Jul 2025 00:24:42 +0100 Subject: [PATCH 2/8] 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 3/8] 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 4/8] 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 5/8] 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 6/8] 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 7/8] 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 8/8] 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 zcmeAS@N?(olHy`uVBq!ia0y~yU=UznV0^&A#=yX^M(phw1_tTfo-U3d6?5Lst?r4r zUU{Sb{!Husxi^o$(VMVw^pvlgTs)^Jb$S==yc7HG+`hE* zXXoauudn%jX0D{3=f(BwdTb9Iom>2Vrt$YXJMX`*xnI7ocwJ28Q&B4;BQ6KK`RYqz z^xV_4Or+kP|5_#6aP+9L%g>s5`}Xboc5>muh2Ne#Eo5+58@4z^i*duAJ$LlxpMO5F zvy=1f>&;Ec$=3I;iJm!so^iv*K<6L*tFHUr?Cg)v{B8aHP^Z-$lZ2m#S8x0O%<#7S z_V>jvR9r-+SY)&NnJk>sES@!?yx`XDkFHy5uBwV2*|3?vLvfK>O0sp}mkTQnb}(=~ zJ}K_BZ$`+B-b78dtOs0@CoF$luyA3z&U2{mNmq#DhCeBM$1d4-&S`d%TolFq$4(n2Hh4=pa95U9G?Yx7ct zCgxRIb5?P8pPX+P%^G&lS8U4R`5|RbrksywK5cl%Cgpa)wRHAh5d-}$tSni_xJnfEL8jRrjp?p^9~QWCo(*0{lBMLS_n(?hg|-%;7|cy zoL5Ca$HCUJx0;%f8*`Obvs^rBG2?_*?V_HiQ+`%e#b@aX7cyLnc8X^?JMGgmwka-w z{LGORtF)%LtXzH4xXwyD{rdR7>DSXvzpi!9`TwFRH(hGgXH)C4b-KT98AhDeXisa| zZ_8&N)#z%JQKQi>NKb5)C%#pWD-i2wgr~8&*2dhu6{D0-9 zg-znhl6@rOVxrxpvOmHrZ_kR-_sToBl=H3BJ$E=V)!*^wqpcU7=bY}!tvx5w>sL5W zz%#$dZ`Y^q`({j=Tg9;G)r3vc8l8;~{f`OycT&!>o4vcU>0@)(2Axyw z`aagtf#oVwZBzN-@EM5 zpM8qLSJxcSJ!~-1`)H+7`t3fMHRirjaI)$|Z}xk=7p` z)ZM=STdAi0=81}`55doJKF1M$y+0w$?9^`r? zbo#@6(o>@4nx2P0*caYY|CTA~e+PTg*4cY52#85JZRK2NxJD+jIm_+m;>^^enwxdc zFVb4Rw`kQ;okcuP9==M95LG>QtL%eS$GSrw|71>RoACX@^`=C_zZx@Y4=ZJG&x>ub z`L^AiDZVl_+8z|iFDnBymfA?XZJvJ3A@-4d#?6lhnzh>=q%5AzzE0q9$E~s?(RcS) z!=EVh`P$#mJl1Tn?X$Dotk56R!yRrmNAI{@w|0u~z6#wtCOqrc%$~zOapnn0*E`CY^yWS;mhSbug6vS{=~5+6Pa+)?O&VMUS!d%@%&o5`;4S{#5Sh? z30!`r58CQZSXJa6Ui1CGVeWJPGq?X)uW!`!XKgn(3tX{>`0_vt&8<7VnnMHQV~So7H_b z`|tMMSN~qv>C|2)FvDO*pwd-6xfYS0-g8g(ePgS6Whne||L)T++ccl`aKGHBIwLnn z@7%kO!G}(2{kd2C;nggI8K$xax)n6e-R%7_Tgv2Wj@E`#a`t*V*3SuG`<1vrUT(bx zbM1wa0MXQIhm8u{5|^=_X3A!o6&xn}=j9xsqs52z*mk^;ZCk39A<5R*xvehY_oQ~G zV|N_04R;vd{&nzLMw7_CCA;$ZYZ7?Y-Dh3D{;<2+8uwiro7uTHzGP3Xj97VKW9jRq zu?wI4G&k4qUtcjV=A%saRO3}T-##Q9tuA6+`pzcb)MkHe@24k=j*EUi^jDuVwa~}a z>Ei5*H%~UNobz!(pzxw;i?`|B`OLiVhRC9q{)`&swv5NKCwau2Vp+I5IX35lSgP^9 z$zLA)%PZ8~kvHSZvIl3gwIvo-|Nmq9%syw^6d$H3yUbVcqizKQ+^ z&&7v}xp5VgxLQ>73Z(v?^3ZX0Wu#AU{mw-Dspq3u*B|$~c+lhGjEVXOnvYMJ9;TqB z%RRM){k>eH9skiMLG4F$rY&-Ml9(sUb%2|@?7R1AaG5({{hl{p{o^(ZzrUN?|L&l- zZhi8}f9KP$9q9gWHrZfOv-$@cH&wZP-ZOTC&7g;9r zIlgm0^Un{NrTgNEtI1b}7~9O5?ABYpzSoc5=*9Ci#~f56JF_<#ughG-v(n=Kue{>M zDU)7T=V+dMzv<6EqdT7jmaR4KG6-r&&OYQ8G*R3lD0JO>^F$@Vm+R%WZ|kj84BPt7 zHtgY(T>`3SrA|toEAlHyx_{0(aV4j7zG&(mrVP>mGDgUlVg7V3lu&lw97;RQ5Epoi*xiDeae%uLNXr1jY!( zMYk|pa+qEMCW_0(mTS%L+ zozZ<`-m-(uGN_W@M#8s3;8X2Axh3MxtXp&Ca(dNHJgNU^^*1uO^!wY5OxxdjwW_mh zw%N$SKYxqEbcKz<{0YkU_y4>*%`7_Z|4;61|Buyp?>D@ENjdcPKEwRu_1~vnyQzGi zVdt`whveht_DFZUJwEwgp4yDvr4R4#=hB~V#A#QeP6W+(JtCw8v)SR)+ZpOx#{J9M4uI8JrH+jQt_s~&sqo{&xyu_)fnVm_8 zS{OTOl(&js6P_?9P@*$PZ_c-6@^fzVuwQAZG1_-!rTmp-3B4sY8l7|HJr8-jam)Rj zkZrQ??oPWM`*-KF+_;|q`}y@A{_p!T_%EBs3zj{ZGCfUU)~{7YwaW`$FFtj3`hiX2 z&kpG`RxDk_;AED6?$tv_)jUn(xS+oa{AGnF3SB?)NN{7L7XOsVH8J8+y44@jRwsSz zTo`+H*|yr&y(=|0tt^&PSfzJ3zxIUD|8&h0t3#K>6`r%HPTas(wTPLSzwW)|<}c@Z}J9 z`hl%NN0Sz1EV7ChX%$L-J#i_@= zBR~8V5M2JtkwZCF{6u=t-v>R*emOok_|c4i(`}m{st+75@Hc(qRjc$B%+tuc9mY^m za&5_%iHld-pY^Tv&U6u*@oDGuoYgA-nkye<#NM>;kuBcFJJqJptngg0_%-vGNA?@u z_6dHL?_*5X+p5TAXp;4;zUE8VXZ2lKLQg+@+O*+gm_;_?(TIudv>YC7$?1QI9#5gk?`r?l}V*fyDofC zn8EJ9@!kIv-neKpxschHWRoO!y<25Iu~g4?nS?e&+`1+9uMSOV@RKvKuHl&bu=DWF zEoUk=h~MMmzjm}@!!w?@_J;gYrklmLRc?4%ae#Rhd)drQd-MBwr?UR!|K^l%==<}a z`v)7HXY6%|Tj~BRV^>hll6>RycmE~+INe&JVsLKO-UlnVe=ggguKnf&$M?NVp9`(F ziLLJZob3IfQ})n9)gSM4e(Z8s>pbJklI`c+&EK?Ni&jvQS*gWQQ!14wCAP0NE(Q>`;*>0T&ZfYbKWbiyEXx@_gPoJJa;8X`?BF##kC2GGU9J#l+L+x zgz44VJ>BfHm!9)-vy$uWB0ut(0KgLV-KMh+Gd*t8hP`R?!1|FOioV6q=i>Mm#t&Qt@WL&>~E^eM0>M; z-{odgY}?57?dTQP8N~+S+aK$;7VS&ta#QDib3M00A*RSeJ}O}4|1}i?hkVQ*I|kop zlS3SQRdig*xUtIj+w@;_1a9^t~xVF}0 z%^&09&ZdQ&I?X%SKEAyw=u~Igvp2iH?!s)d%lzlGgze^Zvp@IJ$1Zohbsh9 zGd?E-PBp$)e0}M$KBxKq6#>F*wtxN^8%z}R%jNhwZNoJYrIxvV68$~wJE!^f{r=&{ z&b#o2&#z<4xTf<*T>qDIbj|c&-doqI&(8k(PMEuHBj0p>j*a3<>T36mUvK+%a3cWq`| z)oAnP)%MT+x(D5tFPIp-NV>hnN5|%m+MN{!6Ginr--XLB(>9;=O~H0I$3!lE`OTlh zr%u|qZDwilw(Uav`;(OB@|0||XJ1{r=KQWb*R>yL@mfpndUN#HPF4LS!JQ9gTCAV9 zzre%nvDMl3dp{RdT(FGYy?24v^~QNyB>CNT$@dq3X6Rv$+g-WAjh&zC`D4brHVwIQ zdz>o@?oN@s!LGmcWMR0f|MSbQ&HmZVYINg%S1DANE`R5zfD8Ng1Dc_EGJ<|xmkO3e z=vB?0#bH)>Z(&WXl$2J8@u~f_f_(e@JK|=DE>W=A!(;wVv@A`y+4%D9jU0iSYC2UW zI_R%SuzAs)bGp>W^2HqAD`os@w4QOxOC#CgvF`1cUB0bWCzRnh@79cWx}D1 z`_HabyT6K^r?{lRHT`45`~z_>cAdH!FT(G3P(9!|2m@p8>?KK`Hw&KIM1nonQbbp5%)r&(Pqld|PZON-@N zj2!>$o>Qn8>tQc(vh@2C@w3eem(o8bY~!ldJJ5V?(@W79m#CZ=75=K}TVFmoc+PHD z<%OMRLLVHQcYf=b@0CC;fJcx&-fC;*^=&`Wo|hA`Ga<< zhEEQtP2{-gzvtKRZxQWM&x~dFTv6Nq=5_nD_QToV%Wf^z>1Zz*Lf3oCkyRA{O@XITX zA+N$0En!`IqUwR^#;uof{yELEzsEA`!y&6L-wy_-E38_>vGqu^V~*XCi*kpJpBz52 zQ==^^M>y5|siVO2IJq3Pm9sxB*wD#!uX0VX(S_U393#G3dc0;Y|5W_sV48>Z`Z|S^ z!goC8T@x@X+QsTIYk$&-X$QG}IWAIUlI6rLhf>SwS~IMzm~LM)Ia3cC-r)me6Wb`Ah1*#i_W*<*;H;XK` zW6ZjHIOU*|ww(!|{hZ?!AJq3RyEA`HcHvounzZQ#kEcGh64~6q(VcaAPt5!^#am1` z@=d3FQrJ*56mB{WM838roQZ?-bc-*@KQ?_a(P_|$EF+?rkX=R@?i`gNBMHwf0wvDc=ck=-)={rnj^4)tnJ9gpwIUUQ`2 zvq#jwZ-E_Ls^=efGfB?q(|z~Ge3RPu;<(#33?0U&CToA_)O@(M?NfNZQ%GcC%(NAi z&YlHFrC(3Ge_h`~J@&oYQTIaNF*t9Bm*12g%Z&@xmxyekn{_)IJC#$Ulm(6B(<*!Yu zPu62v1n&LioNBiIJ}d3kN#+Xa*K673_RRVdq0WD(atDW8PpMDK&(4Yqv+K0v-kdme zwev;13IBn-SKcSj))eX4zT@hwFWH#3X`dwjlEt3gyxP(g54cWt_3-j1TRt^EHnqxI zFtjL%%gG_RAmGW|Pk$trP6%9-blm7>Z_g)p^_JV^&VEzPC+nB&b7Ma6bgC??hMwx> z5PiXlcV*Gb9@$#{_4F7WI(=O%fBFo<2*(SctP59hzyJ`DP zD<;}-yw9%Q%6Q^uWx>7gTTAu!u+RRiuxI_-IW{+R{+_A0@J*d*U4YqJ>(>u#|89G+ zMrG=XSsvWmJW3xpUb|WLJFlSC#YEfm>CUc8K@(CMp9LKg>leIQCh|3jxo^GW(q%PO zUWG@cY`(qT_V&b0t4UW=M7y>w>;3oRNaux@8)9;~zW)*3A<4hpE^GVVS8sF$vhNjV zN6!3y%4Qn>FUPAlMW#G-Og+{-yX3|cp$Gf4bL6M(++~y>eEqc28qGkwa&(G&d z0oMy3K3CQ!tMkwKBVxm$|B2(L@BRBHSc5ozyzS*^fJo+R=3~uy6Zt-}Z{>11I_u=OzBzm2xE^$>sxq}1 zZFutb^hB-h-p%PAmY?pP4r(}?&RrbUzWG>lm)7_9!J8)PHd@-O2nbm8()zsZd#ycj zulgo#@tJ??zMa^?CkM9e-C#QF!|4xp;d&GFjxa|bym<4GLUN_V`Eq>~p)I8cUG{3r zWpXO9`2^eVW1D_dtyOR0>af#kvF(zgbMyOi{OvRTIp^*-dewdXmUgn8MM|_~<$Uc8 zFMr3Vch6e)L+(=A`{KP@bK>9C%+HQ6`j@-+{MS=8ySBJi%zxd-Y%X8;Car3H{rsP``?vhnXXO7UKUe9p;w^v6GzJC+22WQ%mvv4FO#mD_+YbN$ literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator.png.mcmeta new file mode 100644 index 000000000..1a3525e6f --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator.png.mcmeta @@ -0,0 +1,12 @@ +{ + "animation": { + "frametime": 1 + }, + "ldlib": { + "connection": "tfg:block/casings/electromagnetic_accelerator_ctm", + "emissive": true + }, + "shimmer": { + "bloom": true + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator_ctm.png b/kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator_ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..1d86b8616f6e0e54fe1b7226933989c040e91472 GIT binary patch literal 16732 zcmeAS@N?(olHy`uVBq!ia0y~yU{GLSU_QXX#=yW3a;^F`i0|p*7*a9k?cVAMGRJG5 z|2+BT)$uQT*qIY77}^%NG%0a%RUI^{oZ@@&ir0jEU){HRC)aHGbHPf+{r2`ts{GQ@($Kp7KhMVh3;HPEQ~6th;mv*B_2u!p z>)*d?zHne7Yvljemp@fKTeL^chFzzDKko9PmSrEGPiEawDqT>j{pHsO$Jfp#ddig* zuapYb$(9Js-@)W88CjNg+q%H|N5h2u-_mNDM2XXp-f^>g-emXKQJJ>hcEalTX$ zS6?y%5zpcS+lh*$7@=+m?;1JM&Zw0(e5HkD?c1%uP>ANH+{R4s>p#5&y7N- z92uqrNj#~n%aRK6`go)zN4uRXeh*tkrr4@)YP`G>3nbiL9~GFE{CZ)d{5`I#azD?o z%fG2C;GelrmtoJOsjFUnZ}d@f-ZRB(>8;;Wr;7d)+fnw*Nd29y^ zf1k$frW`Zx@bK{5_J9BW-TED)$L_E(V#)5^(hWOz?!5KyW={64?4|7Q?(woSbLhp+ zN-7M@ySz4f`^GI>Sh8apy{Efe($N=>p69Sx=sNSkC$-PBC%x*k{Zw^6&tf;z@3+O9 zr>PXDo|yOf+?og1gRQC-EM^B2>vqTmRDX*}Z_|-H`uf|}6C4Ruzl^s3{m6N2+kwaF zyyowNa?VTD<%9(CEL97Yh?{V0?&RVwW#cw;_99oikGzll-S$-_1fO`Z^k&BXv?_&t zwkDUX{$<%p?#*HC*gT)x{}>)T<+rFgEgZ3V&NrvSFU|fo z&RVcS`|X49my7~-?ccr}aQkR#JK^Gm^#7Y}C3nP#*_o?Fy*DsFYJEw zadTUF&%w9RqJLxC1g2)p$lwv?c3OVE@9;OhAGcUGaM)GE@`>J`Eo{XbXk*MBDXS^5 zwk2wFRN*=f#V%dTqc2@uE8`w^U%&fuMWw9N3_VxhmlcKwUN*f6HvObA)%nBG*EgrC zxLy-K{=Dz=imElvy*%CWr?z@h6~nxlt;}~< zxt;Xm*LYOL;HU3YStoqr#7oAA`Emg+RS$L+fO+3lzb?He-|@P!+3p|18nwm0E_v}= z7-g-l+;{Is*K?Vx7D(2G);lgp z=$`uZw#bSbRdy}&1k#?pWt93No+A>!oBd9zr*`wE^gDAWg{Lktl04;-S6-Vb9>4hU z!7Yj5=L-Ixy|6UZQ#*3kmJo$PE7_BWUtH_xyL~iUVEgY&nyK^ajcWA@ZfNQam z=Q#c+>qf}$StiXVH-WeBbhwj+4Rh4$TaJ9^RlYMy{FnIgDElw#JB6>V$E9X5eBUea z*7}>kk4Mc;`x6aW+0{krdbqgA%vFnatkKlVP7^oXS5f;|?C9dhYj1y#Tr2eU zca-lohJ6)(SLNQ`o^^lsvhCUTn{C{p8ujb${$ud4mA|k4CUU?11)lrc>=~p#vv(=- zW?#I1MLr`eZu^hMuP++4pYiXw1drB&qhA}!|2W)#KgWSH^~1WmLWc?y+5~Xv(N|${c=|)%+o}Ju>Hf z-W>n+@%%X~`@Q%}G7k#~v2Hzj>1FOGmQAb@1_s9Z{FfavX6XKWm|ariygwi{>Y!}1 z!KBU?B`V6N3)rS<9ZEYa>1@XkU(?$c+qwB_j^(H3*W2Z75^i1)UVqndU%~D@_r5FD zr2D-Hj#MiSu?p|I@#cVIqH%nU!8h>@d%c_N?%tH06}r_bm@g@dedc;CKAE0*`tf`8 z&Ky*~pSk04poJCx{2I$HX6ESGirzO*_?m?V`AijQ<@)icH1k41jUboi;rTt%&$cFR zk}}HW5qCQLb5)|0bG}%fR10gW#`4sizu!LS=Ff8}{=&3kl9IGjxG39Hfo|^8vLRf- ztS1ifib7lK`;oslfesAs0KP`V^-5LYu z?D_>$neGPc^U z-~M2Bo~a_aRo4DN@TA8*W)ZV0kG_2r{fqf5%h9U8jb9%$$CNK&-&S&PqpQKKKJhIV zi~7#5f8AcZRAv72T^|p9_2xZ!r=<-4e_2Uz zsH$CHU%$N0^V~M;#XJ6|-LU7-*FSmo;kpMNZWeZHTh4EmvfCj1iSfsyuQ!}GT@JsO zzT>^?LhlBJr5r(?izQpmF7paxnX4anIBWUtMIn#WibACHgH?~ZIPN>ZzJ6oX+XDxW zZESdFWM*|Drv*7|G0Sf5-6YRKSLZ(;dA8lXh&B-X~POri%IS{<{7> z-w!Tld;jz8|KFY6Z9BDkzImT7Q_YPqYMZyk<8`oV^ChE<+&w84n>o}{fBeaOaZ?|4k;$89z3O_lGxMlV;KtZ&wyEoW{%!V3Ue)z{ndr@c$$Hu$p2f*=kGrqy@s+CR z$9@n#9l){p|GIhSot10ui5|GDzBusv+egh6rIu3~Ppb-Ye_bj#-+9xnT=w}N*rf!| zy8US^`>=kueZYG5brF9WtUIsQ)*RHb{SfsF65X=48{}%-`C|%g1!6uQ7nGDepJvHd z)A{u$^X1FaSN_{HAuxvj&IKoahb8R){{5c)gn!4SKDiq)^$S|%Ziv)B_)uAydtIKv zzg}VDktMyCIO?DNZJblQWxMlyQH#Zr7V%A49GSW&bM&IKc@w6eb)BlsFt1|nYrd1E ztv0suMF~d=5{`T*GJLYhFowt3iN`tfaEwHdU+bSYd571(F`ZH3vF^5>T!rn|&0X_W zJ(|_?sGa@6>GXyE*=`v!h{#VNlgTOSEpui=^Y_>{1*LFA;|bzj)p&hKHb z`S|PP=dNPbAA9SkJSnZs{P@LrX@JBQHj$eB8l^S2*m|b%+Eltd?B?HBaqUB#bkDaZ zYaTAMTalq5aX3ZeFONyxRw8uxajm8i+k@JXJ|G^HrORB zdG`HucDY96j$b@F(;VZc#Xo9ZZ_BFuQ{&g(q!dGsm<_L+3=b5Eik%8Hl8)a~_8@xu zNx!e9TYpcgun$POv0go{dBf#k@!7(@i@(**399{ITA#qCQSpQMtE|}TtIX?H+dtsx zGM{E|@H_up@m0Rl&zV0x{BNUH^Y5J8!_V(^x#!y(>D@jbH|hHNy-eRY-@It-lY0Ro zGNkK|esyr({7W+`{OHoDqDC$!ixRiWF;u?)#4mDqiClxP&$QQH4hX%z&ODiQN##Dt zlqX*ftjjgg@%`I4)AtMet*gwh^X5I@GT;6J&;ED91^X2~%5OihZ$n&-Qsg^b=SdgB zA|0;w%_}~c@3`&$w%Ce)&ATU`EV_O0bxipQ^?R8WRd!ES{+w_*^>AwPjCGGc|1?mU zY`o^hgy5wU;%{bGWJOurWncd}@@VsM5oRxAF^x|Pd4jq=|BP_^u_q*iCDgaj^W(?= z%T9!g?E8`M=P*NCzg(NKYpSI7qA1r(8T0f47Y7}00VR_kt+ywaXxqoDZ+ZPvHN5{`J$XQKlNK z`7g!%%4_aPOVqthllZ4|;c@%*&8a81?Fk4B;rX&Oap9_n6gi_7pX{t%sj_^Q?`g(3UFlC!ZJ!SPyeU)jaLdCRHcNJY zIK+OpxGVDX^Xq($;T)CKD}PPB^1PDSkwbj?62(t{rrg z%6`8)X~M+s58Bt;Dy+Tr-SX}&`40!L+r_P}jpv#Do7wJ1!ujUv85<|9iLF0yF~rLHB>i(RwiP(@Z}#Vyz1(#f+Iy1O_v~V^H&QBpxjX6Kfsn{Y?Ay{3>%{!@ zJ@tPGr@Qd~xe!)ye8PjrRR?}D2ZwQ5+ZI%VpK+x_@qFY&F1!&!98n-`zhV|jS1H+5Ae zACNGzJgOw{BvB*x#|gQkHxAcT*w*zYnFQ=H<+pzQ^UkwLk^xOusBu=!iXauw=@cZySr-yhI<>yzk~eCf79EE%hn)#*7{B&z#KLoGRg= z?s~M~Siy&efQ|ZghSPgj^ViiZm)(?kc4_{(Q@s&pl9 z>J!Ox8LeSW=dzCau>QI{iQ)ZA%^Q<~ZT9o*`>|m6?F-kn8#`EeTf4q~Z|we7daC1* zWiaF72UFHw?9+FOH;?;~Q08PP>!2p@`}=BcW3=x4`9>Gkw!BvKVit>Qiu`bhU100w zsE?JaA2r86<-aoBt*(Bp$p?0`uIuj<*45r$)qDSgc-5n3+xeO2RK-~E7V+kKXv}{baBOyRc22>tLCFAk><=Dq&Np7*Nt|8vPmdrLl@oHOzj=fy0FPOZ~%5SSkN_2|dS zKMluU?S5nXaqEmr6`ju~T=0@pG*7zpvGQ2i{@;(98>cSW$+Mt$p~R|;kRC%$JN=vb z6|VwEdqS7) z%T9W4_Tv#V(@}T+!x;-CI8&Bg`}Jv|;?aka8tXOGoKJ)-F_PTxUUc!t15g+8a=p6u z=AUVNzNY_bzSy5!&2Pux`IY-(#6kWy0=?g-{mFV+c)z>gOV8_)3HCSH<$3DO9uW6Il=oTl@As3)Fs|N6)0XUQOHQyK zo>)l+baO*33UeU=?znlEmUh|h^uKe7m z+u*(Kk;YZ=_3W40>}$3!G*A05Ey;LWmg!-9*UkUQ^~XiQmAhkS zOl8a49Q^&&#M2o)>xNMM+iU+@J#0%~t5Nq~wBqF+g9XwL zo;C9y`^R+5UT4vw^ngc<_8S)e>@^Kc^f{e?B-ybUosnuJd72<3fc;U%3~W z=$$ir@L6Eb2S!)dYtN+nfB)4^l{n*Cb8l_R?*O-DyzE(*yM8{%Ui&zDyXmvfze?=S z&U*3oktz4dZME8g7eAb~{m8iY;+6e<=Vw2imtV$O^MUtodY66Kjx+%Fg@ZG>U^v&IEbHP-}ba#O{Tx^)qdPNu3}O>e{Y-o4Z%{2^HY{G z|N6jVQ|6~7e4RjjSsuuPd{JtVb`bPw)Qx&zJIHWH|d>Z_e$lS4x=6_U>7v5xVrzEFF!N9aSF>UC*2Eb+lkvME<(lxn8C| zWwUQA_pJ$-(L8^jZ`eM&$E$QLCvfscd8f^tkg+9ZPxC49_{+@uzxNvntxIx9mNd@XVAqS}sbTT= z^z0f`=I>r`C9L@J)l*EXK?8cce;dE@{k*fn{)61lSswfwJpVQH%iWmrqtXAZ`JZ#f zA3ldgo^90EYQN@x zu#$a_{e+7f@_qOU&gXf?J^s@;*)?+i7L94UxzoCTGfT?8Y^?Y+`^T^9Z6;jr->Y7n zYZu#fpwFv3g~xg`?=dlkeLoly(znkzelAb{+Q*-(SwAx06~7`bzenyY=LyUEdNQY% zR;>-;)n2$~m*C`&kGlC!NbM`w-7sycqO8QSw+D`LD;nCh`|ybgCVzTl)Waur;!!Jq zM5oqs!PoEkE%)F5^s~Kf$#LcIY4J0*er#AXp~EMSeZBo>=SgRt^|?Phmn-yoX|JPn zGbb;XXNmOk;0e;}0~q7?{9AhbVT_}hU5%SYsmkg#S9xzvc~sHJGS~0c-}n2%9(MDe zTDVB4>#;1;^R9wW&Z=N8))2;KuM3$A76@t0+pja_RrB@G+ZPQcP2XL%N8xVH=TMKE z|LnHEYkMBjd&c$i8`sMB&DRtCOCs-_n=q&P*wbmRy*xKXGnXt^d^7PVyL>?3FK(`F zpCW=L_`25pPZj?8x9|M<2s`#Y9~d+JZ7;lj&41(4Hv0#i?|(4Qe#XCLHM`kS`3|R_ zSF~&eq%JaBuFc|{Dx|(aa?%-hewJVVIP)Ys|1|zwwd$$-jr-h*85UW)v;Gyus2&ra zBjf*yv3>gF4gQWARSZ0rRj*!TmbKl$bst25hP3`CZ11ygST0vE`6a`i*HR}pRf2}S zl~Pi8Y;sSom}oyi+vV6}(`{k$e%x{_@4cMs7tH8Clyyf$KKN;b24CBpwz*{{?thH< zQh4_LkebSq&hz~~PlAOFv!mBd6}7G@hCWk6AH8WeZsTrDdHCVr>r>|?*)ErE*Zw3Q zwyG^ocI$h^%E`U;KEJqYK2*KQ=UI9nz)!mF?F^mGWqTf|J~-0#@SEckV_on1a*vyJ zEA`_xFN%n|R<>t>j=a>QKaSCjYp=bK4CsoH^m09EU-H85r23QY>#Voee!4U#X_d;H ze^=(H?AY3KD#i2KX|}pLADK_b&z;J!jNdbFZrIl2E0R*2<}_|8s4!FAQ@2Oq^lf&L z^*UPL_&ROlxekiYe{q*Pu%_H?O=t@o6@Gr-B>f_;@ek^QGXn4qW*p8DY4kU`Sz7#Vhl2~rey#5 z(W$Y2j`y7Um6P^t@#E)Nw(=+Q0&w=Ws!9;ux0rq14!Ij9^$cO3|Gs|3Z{c-sh1`vh z`U78iw|`;}d&wwnZ!k%``Qh|+hAEd!3}^`Ufek@oSwjrR_G_--Gt^#|j1m;ckP zm25cfv6>zI+7R)_OYU%m)%@DplizADt_Xem`(aPw!BD4pKcajsCiVaM=XG_0k=jQd z|EUkJ1epk*p17N5@y{1}+2Zl5IbT0t)w})W-3rGEE0b<$KNfzxG`7a!+6EzyMU!m9 zf_5J4`&jf_;m_TWFZI(d3-Np0<6j>cn4;Ykn|ZXr>*LAk4}&acRWHkF@tZ%RalS;D z%*@7oAEzCQ7OePi^!h(0$tLyp{yL{S^+FvrkA7@oWaaNa{Lk^|bpIJG-`_X$KRR6E zwCJB)2Y*=bH_?68%+IGKEv%gPV~LzW((>c6?<-c`S{AnT;xV(2oyRXIlvU*>2jw%I z<-ezAw~$?G>JP_9S6_HA+g{+?w^EM5-gZM=&E*QG2{lf6dsoUW*eDmFzb{p9*4Ga^ z_3a+=^Q8U(4LSX4wtjeG${9!VtmSR5E}acptiE4iI#Ybjhga+0C7$rwwExxudjqrD znd|RWFIuJ^H^=`KXU1CguF$QPADR95-#C3au>D#1>&6}S26GIzPP{(*8UK~njcblQ z)15B#k}=Z0X!^t_KPT@mpT}(7a{l{Up?zg{-X0UT=zm}>zW5F^JKv#=5n9{8<$Kvj zaPu%cjz8zxk0!ULrQg}Fc}@5+>j(4Ks)R)vRSCBL9Q3yG)gNeSTmClo>s-&n{ym5G zR|Q@3?>ihGzi6qPL1M`N_^G0Q9;@fHhA!P{&v0S>q?19h66dzscGcFF+Mg7@e?>my z>f0duvupVGt+aozBjywPiFEm!H~%bn`-u6}q2~*YbhH_c=B!=pUZ^R?|0DbOldW^M zO)Rur&?6q#9k}v^(XM09ZwGbREuEoz*lcaqYe$XK8^V^H4&$$Ql>L9oxzk>%oxPZrmF?5w`pdVA-i zeacHyPG;=bp)^07m*>h^t!sRC7vlw<7g<)ntSFg&CbvAipiK4F_Siqt&iqr}Uh(h! zu_x);HD}UK9FB(}zTYq)SdBjb-en$SpQFn{$Q(GJ_o|4~D8}NyH*GJZMH)|g(crvXx*v}c< zs{8!|9F^MZ+5heS!2W9glE_SpFSn~V-BqhvV6E!!aAy5FQS+Pcyq`<`VAiuwG;Ap^ z^H!St<4@cE>gL4%$`kDm=y2LHe461q_2H|(t2W++tp(_DJbErcBl)AD?Sv2PclbUo z3N`V0zRc~{dExmV*dK{hJ#T1vbandu`lUPVFYxUvWBOY2&ct!47AJrA!V-%!Q!^uO z9nHST+;((IqMziy>&b212WIbj=yI~)q{On`L_40!r7V-##DazFJ^cPu$k+Jt=lE;7 z1$F608P5uuqoJ{FxykL|O?C@J|FXT42?&T<%YN(V^%EF`H)pob=}ZnqK)&2ibKR zHYQ!ZnEI!(Z+et`>)we@%=>;ENsfq@`uX>)*X|!JYIi(VzGU>Tamd>$H^Xewl@;^O z8*j_ESjb+q`s)F=54>LwOjzNuO(Sq;^c&&rakd)-_r&@CzGr#=?JwrFAGTH}-1;{w zy6uUioS*xbSMy%~+$8g4+uKhkEVaHJyzX~Eb+_%-lovs5FDIQjH1&Gh>`$BioYDK~ z>8|hnZElhe>-O$&&>V8iABUKSTZB}!!zTGg*Dr{*{dnhx+HdCHYvg`hs|jJWux04| zdSKZvW=`9L?BlJw)=4jCH+#Zwlid1mBKM)^d3n3S{vCKId9Yhfpaz^g-1$wkWNizM zem(H|5&xD;pf-e$_|Y|GRSDf!nMH+nrWV?M;Ge!Gc7J4wN)?0LZif7KljEaKYOZEa znZGag!-*xEsu(z*XFub=b1i+w=FZ%xU(8!SvUZ*C=e7$eIKCip9an3>$3?YHeEx3# z8nmS*y{>Vkk3f>fBeizw0UI@A>f{d(o9pmCLFTMrX4pC@h`yuR-1JA%Dm!BZi0P z7@ZS%5@*b5esII-^MPw+A5CpP?0?&Anfl{`pM*Z=e0I&O8oOMc>4zuu$LZdg|C&p< zYC-ItWh-8AKMX#9$iu6!E^=c~s7{y&V^?m}Mq2^9^C6<^^)&A7_jUH1xV}L@?lQON z;)>w)5pU0*^(uMtQ)uhOqN4$Br(4U8-1)+_XJvRGpXk0H4%!c&cdFj7XPEB2;Z4hu zz0>dL2AdY_V(|ArRaGwa%=V+z9Pv6c6aK5syCiGg8trD<_oMW6<5r{9Te|aCvcEd} zEHsrDG*RGfTX53l^@JzImCoKEzC+;EA3Nur-=6(bbg|~nmcH}lOW*2mi+R$#zVc|V zm$99HOrC$uTe*V0vC*%0F)(f2RV)8q^7B#kKa33x8Uklq+IozP%54L;$!^czv!&ag z=Vy)T?5Cm+4A!!GW~R34oczhr9#yrfi63S7hG4gY&U35(s>7(lKA$0 z-8c4EUk@zvwcHzMd*OJxUcsH^)p*DnZ~8hPiPj6jVZ^H|UYHmtT)!a5bkE-Wt@Z}7P3+%0-2>i(oW_(K zP_brFBpC^6wM7QsulqW?luuAsaL zRtkwTFZgiub>o)Al_?gxS;~7Q>i)7yN}5M@9eJ|V(s^Z8Md`&2F@}F`oqhD1H-%?k zg>7`hJGsOCeFwR{H!R?}EU|BEO2owti&B}U+|zmUV&dETa~tJln}d!$=;pt7b-l+_ z(f+wD<&qMf+UqvmEsXV0@mZ;K{!{T~0g0o@%Ts^%-Yv?k{cv!#D97{#>bdTR6@5at zaOSG;1u*1IxpPg=BEDhrW`}LD*c#g`IYij~tmAEwhcx38e*|Y0@tgw`WqVWbzY0bS6W?z=3 z-q%RnC%;cDe9qMk^#K~j%a>NlN>v_nKAn@PT2>u)`X9r-AJ=v25^SrIiXX8@yyZWT zWh!1 zWMl3XX{&IycwzEZ&Xkm|2MXN298jLTh&}JM@tGY3bFFL(9)!H%^7(hK@}8Z>o079D zypAxx+wSxH$Dj4NqO%NEC;Q#p>%KT;$GLU=(|@jdbZ;@k#OQUA6Ry|%LTGgG4?@8PktsOK&^G&pxR`K`+e`Bk< z*QfjS;OlU0qm91d07nqM4yfW_kazM>v)3vIGsMkkcHYSH1 zkg?FHQqcH!kfl23_rJHvMh<`9tyWymV}7gIZm-Jc>-nCJE4k$Bx$2VT?|jxs_`*2*hIVf-P<{YlEU z8!|sKFJf0&ma$cCf_ISNq>0B%ALh@pKd|63bJEe~Ba=c`uUX6f<*#teZGDlS+wOjn zzgssoC+8WzjHT$-g5&=V8O&LD?EU--PtJXcNil9-H1%pz?@lX7>O8}QVN)qFfSdAf-H*%P^+r^y|iD9K#9 zS7x1>^+t_ivE44)mkQK;JUCz0{LkjsDgPd-r?c)^!H~QoMPc=#Mlbc#6E3wGT5nqu z!x&$)AY3H4_}fk1hpY5%EPFb!P_*;$_Zp4gbLUKE-cu!5!l_^LVAr(+zy5?Wnm;Pu z-oH40I?r+T{aH`GM%DcfSaweG`;q(zehaVMaQ-Wgg*6wKuRZwuW9@72-9Ok$LqBiQ zntsNr+B@oD^s7eh#3I{s&u{OF2)(y~&);6(;gm7Mu6^m)!okl;`ia|9g(U5^C*Hi{k>UW#eVg;^HH^CyOU<<9dx>RqcZC$drENEMW2w_ zx>I=X&k4D+(RtaVuSc(IEiwwY&?a)|xh8Kg!@`GGH>EtVji1k5Gi#_=1`t?{;kV-o*Ut@P49gj%R}96{d~~;BW1_OAfCx;%3J)V-PYTem}Vw# zyCJYfY0i4l`R~t|U1Xm3~*ZuiHJUl-ieqHmmLR_ose82WL{zIp|FYSw8>1Khrq z=GMgTky|U(X1wfL%)cYvo@}#qyT8|0xE)*a{~fQ|#lP>mzstve_$X{@yRrWJv9Cv# z9pV4+f-&Dyt;#`l)%CrVhd-)jMKOdddj5s~e(sOC=`Q?N+G?H!waqR+x#Pm_V=fl= zrnIjKo1=5c#j`C#X9{oh+CzVv-%D_D+A92Lk-M;nUG2?J_bP^Ya^~Pd2uy^>@mEZ~ zc+`K-AyeB$>~_VgbM9Z&tx7mx6)^quBKCbIdZGtUr$3$a=P$omW6z{2hh6Xa&wGT{ zIm@wKTEy;V^kHjpo5IqF6)p$g{yUfx`f{Irg~OrW_8%ubIyZ4e)GXb@_P1ip=HKH^ zsCXuFGR5NTpT=J`hx^V8|6~u^uvg_L%eVK_-ij{GNm=?pdmGoZjjRP98akiKXC#`K zC4aV->s?#%Nczh!k0;U|mv2qAn9u)o!Ja!Y1vxD1@7@uf%(_xznYWR;Zfys#hnYc-}$v=V)i%YYWr#J4*CyU`46SK z28ee&QS-Pf_5JrkvtsXySDyxdVzv9x_MO4x`|sI?al3!C$Yq##sm0y-CN=-K+T~2~ z`4^ab&j~2mwRgOIcaJwl_U&c8ePR4NcJBzxJo3E0mdk>7-w*9|>?P}NFW5Bc*zN_q z*S|_{YSa;5)#j@FetECrWaBw&Pwcz>i&y?m@`t0ZA5A*6#zX4;+{Q<5m|~_+Or1Sx zXXm=p2mE-KE=uCwpuP45??dJ54f=86b)iwK4@-7-_-kjz&5!9j^d&y7Df)M7%QWZE zZuUPjkBjcB2wk~OPO>T^?BZIU>T1!ct0GOe&f#|1ZICMQ|HiBT)yfsN-zIDc5mtWG zyD-aoe)E)7y-WJjuSuUfG5zf-H zd%LIfpIR8{D)y1-&L6Y9teNcJCBMxN+GDajWz9@|$zEF)^WI4o6AwtNvRcRfWb^O1 z61m0~jmq-b5BM7<2)bCdKd!kq-RRHV?@u2T);s9sx2$iuuzInjfR>kGeCzMHDcVM% zK`i`h9`c_FO=V*X-?e2WZ@>ys|2^k!->^%U+tr-Gb4)_Z?dp%c+5x7kO{W|EIn?{0 zoBvdz$@?|4vpp2;_B&bJji|fsP_7Vfv~^8Ion*~N$MSx~4g8L#0`Ap;2NyMZGbC=Q zTgDXf;HT<~mrd{E+V;uq`Ec;fo<$k%F+tO0oci`}zy7gudg{&vJV%XMrYDH)`M~?N zVew_RPQUBHW=;IBe%9;~>7CR&y`m?>iT{X~HK=oznC)S`ZFi}(^d;uAAM$-{FL(sy zy71?)$WJiV@NQC_z3sTKaNR<#6&Zhb)mdzl`1yBd9_RDV2ifEQ1WIiAe}AIuj|1Oc zwC8Tuovk=q;Qy;Si`@+MU-*7pemp_@@bi1G+po*tWUl|xq~k66V|DSRtMfcpM#WUD zP%* zxnX(p+xh+LBz&a#{PU9jFHE;$2J+YeKBA9?j%ZSe!fqqmO>?Y_mp z=6rKSXw`wa3BLSWKC$1ss>|6s$G+f0Psz?bHPonj{?Ut_SE=Q2a) zOo>tjVO9m++txRJ{+-UdVB+6K1Lc!NwI5asEu7Mor1z}k$n(6rU)isydCm1&x4k(& zyuL9ye!bic4m-n>%Wf~UJ6-lSz5IP&>*vZx;cs_|&EFlgp8eL*e2aMnyIA_?Z<0>C zQDBp3YjZ*22}d1v&uZ->sm z3-D=a+bMctIpfk9W{1+=OH5gO_RGPQlM)y3%l(j_A|6-&NBTl==$8=D`l`u~PNzS7 zr+Daf8Tp=&bhlb zvM}uX(f03vdZw;NUUc%Qmt8?2ucF-FwK(j0FP<}D;dYhN`qD**4JL%H{?oWaZibHO zCFa=*CtdhAU)K_|^9KLrIRHMeJI<+pKLrd<{2Ow11f5xY2go{1=Qr zOH-BOHftB!27G4k`d`+x+U<$ZwcpGiKQ>i=ZmUmcH5ledR}AGA<2W zYj$V0`Jb(#+Iov7#a+<*wfCxnYQsyfPu_D3Uv{rAz3;Dkn!U66#^&%7ceZM>{(Z?Y zC$7n;?#F?x@5N7DDr;YH@7lDpJ%4pfHucZmxcHXv%f_;goVFX5w4T?uUVJew?)Y=> zZwFMP*I$3#SoYz6$rpwnFB{W-w8Y-;I{#R8A-m1T)oeCqk3atky39Q9N9k+E@LN}z z&wjY|ai@2g^(^7Yw?AyA6;1hRbjL{K?f-+i6Xi0*<)7?wo;N3KLes}hiR*a&FU}2( zbMME;-#WN{75lT*U8>BMtUDFF z9*gNuW?hl;o@RDZ{=+5abMg@yhi{jkZtIUx zUjH#}{hT&?d(HXQo@G_r7PC)!4Q^%0+J5j4=09@s#RaS8n|a-;r=Q+Cu_n)(Kc}qj zQ17coU->s`RSbErC*NUS88V4A{AJ_G-{*=?o3gQx$<3{ zSN~{XJ^wGr|J=q(506J}kU!+MZ`g89O+9 zq$TwuF0^%-y;##Dex_Wy=40pa4@HhIu6(V#{<+ewMKATUF#8GPC!PK_ZRgJN<)oxc z$g;`(5_bHa_sR3OLDBjvsI7~4@2ap?zsHHYK8GIliL|I)(g=h2|qk% zr{;&7|4E3nnsewvz^b6vwXZIi z>7`~#&Q!Q0-1pB(^kw7IfRBG!r4#4hRq+(N&V2SyIibGJ@9Y( z*MA4y`Saf_m16T<+%fBZGHX?F&5?^JWwokWa4?k73becG$s4Px2c;L8-}012 zck-8Y|76a6*?9IFyV)9cGv&y2)8z_MO0HiuNPM|!qCLZhsfChT0^aj8+}XHzs~p2j zyG3#QS5|c_Umg~F)+Nwm+T66Iv3ts-)u$~H%RctJEkp12udEyF>+c?`_+6J?R{C2m z<&A@~-}i&&SD4q|U_ScuPHy{F(5S!e*8^ePIpLty8bSP5ruV*T{QBVfTK2ZfMw((< zmb1@#czr3m!=aCTH{*X_Ir?P%hl8)@Ouc;B_2DbGnsps|FH1bXmDarL<}cD*>E*rf zjQ9V>w;KXP1Kd0op&D*fTi@EzNYfGAsEN|?bKGCLgWoqq*sz1q-j-{_!^5e_B6fXM-|BXan|0raZ zV7uJ5vHgJf`gVKn{<%|o_y23UW73``>VNj6#m9FH)0}shsUMhshw-kavu2BvtJ;ar z2Y)|T-}Aj?`n($^p5MNR^yDqg%v{E9w)FI|myLU^XU%W8%zX5f)t|=dGViOB-`N$s zKJJ)izrk4h#}0djz)ydUh`xBycvalh3)B*EaOd9>SCtTaOnk?in%`xvH@`bno#!pc ziTu}8wfw90``ax)dHZkI9Q`dHSW}g6#H!#@bzmv~yUpL{TxPzPV)7@l;>Yo)pX2Kt z-1Q)1?PtTOtwHa(>_+OP1I z-89z48aoWzx#DzADF6CdcyyBL(iVFLBdK+voNtZqX3V=>_K{OBV%<8?7KNqzq`n)I`1TD&@YC+4`XP z`r=y!Up6If%lL6TQdv2*ccFwA_p%sMjpT^Fk3VO+&Yb^FIhief&pGjjo$}LDEtsdS zTA1+UUF4b*n_oXO=r8xu3lWk3ulD27R~L?QxkAG3&v>3wuhJ|53O9q*l1OKFh~Q{c)v|Iw zo=9r69^;mO^QZrMa@)2K5))ObCthoMGINHC_MPgcBvCm_Ui;GICG1^^OWI-*-l;ZO$zH{@ z!%V;G!M(+c*keBbF@ArO#pu&jVN)Y6kvpZ%)&Cqea`pEeZqK{1L+-+@FcHzsc6RI! zKSwPJ_OE$x=<~vjbLI34?do4C73guj&llf+O1_}3-g>F*pIKE7+V-{^#P%(fyOGD3 zSG%|>!S;tK(|e`as>^4;VDzsEwhcJ{vhRHCq|;kLiKp>#u}9nEoz`K>ub+o0*_EqK zXR`U|crNNWLsV8Y&#Gtdx#z2EUj12fG*Uw1(_!|XN?UiPzuzBeCNs~F#i5=n&54oS zZJFqL{e2a_*DlmlE=*7NDT4-eM1l?YtAFKcu|ePat~(f_<>d5?N( z_t=?;yuFFQT={m?OSC^YEm=CqWauJT2}87jOFeFnH77 zQF}7hYRt$uw5O|)z3=3;v%##-?61zg+Ha{l z{mR6PkA)BH*`psO8mk$x&aH|;iHmRI$+i;;}qyx)J z^|yfF;_Pca824-E z?Nr<4xXkO4>iq7biLGWkFFrpmnwhF(#d}bEz2mHFQ!hlm)>@e5th^<%CwINX(SK{Z ziniB0Yv%uEv!gxa?u7G?*XW+y#}t$Nmr>oxh5yJcmW}7Kn?u|}l}~TiJMntiG5#DE z{+wC%7yK$8gEs65=);%%A^17R}xqdbDl|0|Nttr>mdK II;Vst0HpNue*gdg literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator_ctm.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator_ctm.png.mcmeta new file mode 100644 index 000000000..1ecd38b81 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator_ctm.png.mcmeta @@ -0,0 +1,8 @@ +{ + "animation": { + "frametime": 1 + }, + "shimmer": { + "bloom": true + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/superconductor_coil_large.png b/kubejs/assets/tfg/textures/block/casings/superconductor_coil_large.png new file mode 100644 index 0000000000000000000000000000000000000000..1f8e602be6ae99d5f2dbe76d235860c50fd138de GIT binary patch literal 566 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_s6#o-U3d7QI&|`(_IVinPt2>1RB1iQz3pp{S4vx2B55OzZl^9COq6t(%tK-5p=o zd#+RvSrVe#VHo0Ra`H*B-K5!Pj)xlQU5Y79EPNd)yW@T3`_skeuU@;JzvT33GlpfE zM(cgl4!>7j8d5t+g`r|zcj7FyX{jp@Cv9BuE60r6LFV|A&y@^qhZkO&y{t1#Z+h_Q zS)ATWPye5?;Qo6?0awFgwYKb=T_pDM?Ji$8>9mASs;`)MNz^_E6(K>-Jtuu`^aM41 zoN^_~<@b+2j#lMyw{IL;DVKPAHA~%W?{A_EHQOCkRNwC_GtNu?R$tdOd4J}H?R%T!G!{gPMd=;yubP|kK;TDiRNR6~ zzZO2ZA}FCRcQ1%7TRK{WnSHY8uKajSw#NHvllBY!JE&0pErxyStfUQ9W&x-43Tuig z?3$as-md5QwbZA zEz|qoud>}y`&X(_qHtqDW7P8Q*cofrYpZocd|LU~uy6n8f5jXP>y~Hy|DXPgv-zUY WnY@~%hZz_c7(8A5T-G@yGywqL2Ksye literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/casings/superconductor_coil_large.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/superconductor_coil_large.png.mcmeta new file mode 100644 index 000000000..2eb488edc --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/superconductor_coil_large.png.mcmeta @@ -0,0 +1,5 @@ +{ + "ldlib": { + "connection": "tfg:block/casings/superconductor_coil_large_ctm" + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/superconductor_coil_large_ctm.png b/kubejs/assets/tfg/textures/block/casings/superconductor_coil_large_ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..d66623038c9f0f49d3025baa167104fc5390f3c0 GIT binary patch literal 816 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}oCO|{#S9GG!XV7ZFl&wk z0|V0|PZ!6Kh}O5$&-!03kT`BHTY7hf!S=3B0aL|&?7kL4_x~~UvRib-@Elt#?yn~I z$9c~W{R(pyVPSoi`$;TEQZz0wW^d1ny}fnPRp;wUpSEpfPd@biiq3xj>+$>VKd;;; zy3cOstmcFXE;t{zo6|}^huLJ>z2{B*Pk9fm)iC8!#8hLhYGW*sTO;71g>Qc z2v~h(jV8k`A=!Gzg#NDCUoV`sBE0LyyK9`^KRYbnb7QU# zlYwnGhp9{kW9`btXX>i9uWu`?eE9TkqW*;fh3SslWj@Ue@jkq`$EJp-ta;h8izYlW zp^lfsX3o=o^T9!+&Yxc;Me>s7EbY}Myv<*a-V8Xrb5Yp>_FGTCe{uN8&)aPE?g;bS zPlqmD4%EN!;gaXg>jw2aw@XicPuqUA@MeyIrCHzNckdcC_DE!GOqcz?H1T-t1BSZ) zb_&mL&Y9hRkNwtz@`{A*arZpsUrhPWpLTHnCx?LJfwmX)^yk>upF92h@280>ntLKQ zg~lB$iZ$O;Cd1xP6#4k-TWq8khfwF)o-x{>`y~b!%-luX7iE=-lS2|SueUNseqmBLihup0vI`8p_UUqx; z@%H+(84|qHe{MDUdQ9K0ZaagA%AOnd+cvge?0(JsaHUeE!aIYm+3HFBi&x&dwojw- bfqCBQBZU*)Tz4`sFfe$!`njxgN@xNAUz~h{ literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/casings/superconductor_coil_small.png b/kubejs/assets/tfg/textures/block/casings/superconductor_coil_small.png new file mode 100644 index 0000000000000000000000000000000000000000..1c24fc915450fad9b3de789d2c615679d94f4d07 GIT binary patch literal 524 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_s7`o-U3d7QI&|@6ErQAaJZcKl%CB^qASRBm`V?r-s#pPT}G#T_M2zhux#2(Y~v3 zqG)F??~$NwViN?IPkCHbG2!c*bE9vv$QgmF1|=^z&X??}F8O|EvGvAn*K};&%P<6a z`30;E`zd|-<(3}x$(#&rNc}})FY_jy~+smE7lWLA>%vYSZE>7>AiTFe>)`q!XwXgUH zf4>xZv> zu;IppgeFGLjTbtjB_+JXRP;Rc`8fUN9P#8z+mLmTp{uHm>two>)u-yd^VM>D@2lI! z#d668vmZG3V#@X`ku^M)&dF!aBZO`4&}W-es@vI7(d&VCdQ?Unmgilnc51*&5?BW>}A?u zQ$A@;;sonLuFRB{^G~mv+=^w`W;=gp^5ZLi{c4)s_4g|*nl8j9#P;tP!+{jV`UJMN ztLi*U=Ivcyuy029|EwA2cedZjEfu(`ZdvexN2ZSN%(-(d+iF=DTmzG;FTFI`-(R<1 z{(SY`xG#NQ^Y6r!9FYhRVfDTI=&bJPuIH;(F$u6Rwk0w=sEqrwcag>;9ucnAfXj=T zWuCtX;M?&|kKu0Kfw`-LlX&jv__QznBsWQfX@kLJ$I0%J=8L22*8aW{#mI2=RzvY* zwPjlFd6}8>_TBdT)u_TgsqVr5v)kMGWpD*f;pIdQbSJ%?jbL@&| zHr`(lxPHUqtvmMrV{ACsKcU92Q`RDbk3)QMD7zwCOLySP8GoA_+4Zj}vzaa0+RA { + 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());