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++; }