From 221bd9d3467daa12088252afeb25f3b644b2cffe Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Sun, 17 Dec 2023 01:23:47 -0800 Subject: [PATCH 01/35] Basic Worldgen - dimension type - dimension - default noise for routers - placeholder routers --- .../dimension/celesterra.json | 24 ++++++ .../dimension_type/celesterra.json | 25 ++++++ .../density_function/routers/continents.json | 12 +++ .../density_function/routers/density.json | 5 ++ .../density_function/routers/depth.json | 5 ++ .../density_function/routers/erosion.json | 5 ++ .../density_function/routers/ridges.json | 12 +++ .../density_function/routers/temperature.json | 9 +++ .../density_function/routers/vegetation.json | 9 +++ .../worldgen/noise/continentalness.json | 10 +++ .../worldgen/noise/erosion.json | 11 +++ .../worldgen/noise/ridge.json | 11 +++ .../worldgen/noise/temperature.json | 11 +++ .../worldgen/noise/vegetation.json | 11 +++ .../worldgen/noise_settings/celesterra.json | 77 +++++++++++++++++++ gm4_sky_dimension/pack.mcmeta | 6 ++ 16 files changed, 243 insertions(+) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/dimension_type/celesterra.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/continents.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/density.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/depth.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/erosion.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/ridges.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/temperature.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/vegetation.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/continentalness.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/ridge.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/temperature.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/vegetation.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json create mode 100644 gm4_sky_dimension/pack.mcmeta diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json new file mode 100644 index 0000000000..78d2d7ac08 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json @@ -0,0 +1,24 @@ +{ + "type": "gm4_sky_dimension:celesterra", + "generator": { + "type": "minecraft:noise", + "settings": "gm4_sky_dimension:celesterra", + "biome_source": { + "type": "minecraft:multi_noise", + "biomes": [ + { + "biome": "minecraft:plains", + "parameters": { + "temperature": 0, + "humidity": 0, + "continentalness": 0, + "erosion": 0, + "weirdness": 0, + "depth": 0, + "offset": 0 + } + } + ] + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/dimension_type/celesterra.json b/gm4_sky_dimension/data/gm4_sky_dimension/dimension_type/celesterra.json new file mode 100644 index 0000000000..8b274c9fbd --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/dimension_type/celesterra.json @@ -0,0 +1,25 @@ +{ + "ultrawarm": false, + "natural": true, + "piglin_safe": true, + "respawn_anchor_works": true, + "bed_works": true, + "has_raids": false, + "has_skylight": true, + "has_ceiling": false, + "coordinate_scale": 1, + "ambient_light": 0.3, + "logical_height": 336, + "effects": "minecraft:overworld", + "infiniburn": "#minecraft:infiniburn_overworld", + "min_y": 384, + "height": 336, + "monster_spawn_light_level": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 0, + "max_inclusive": 7 + } + }, + "monster_spawn_block_light_limit": 0 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/continents.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/continents.json new file mode 100644 index 0000000000..040a08c4fa --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/continents.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:flat_cache", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion", + "xz_scale": 0.25, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/density.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/density.json new file mode 100644 index 0000000000..79e51619e4 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/density.json @@ -0,0 +1,5 @@ +{ + "type": "minecraft:add", + "argument1": "minecraft:end/base_3d_noise", + "argument2": "minecraft:end/sloped_cheese" +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/depth.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/depth.json new file mode 100644 index 0000000000..1844f7c30a --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/depth.json @@ -0,0 +1,5 @@ +{ + "type": "minecraft:mul", + "argument1": 0.0001, + "argument2": "minecraft:y" +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/erosion.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/erosion.json new file mode 100644 index 0000000000..1844f7c30a --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/erosion.json @@ -0,0 +1,5 @@ +{ + "type": "minecraft:mul", + "argument1": 0.0001, + "argument2": "minecraft:y" +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/ridges.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/ridges.json new file mode 100644 index 0000000000..858be6e2e5 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/ridges.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:flat_cache", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:ridge", + "xz_scale": 0.25, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/temperature.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/temperature.json new file mode 100644 index 0000000000..55dc88516e --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/temperature.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:temperature", + "xz_scale": 0.25, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/vegetation.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/vegetation.json new file mode 100644 index 0000000000..fa64b3a50e --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/vegetation.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:vegetation", + "xz_scale": 0.25, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/continentalness.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/continentalness.json new file mode 100644 index 0000000000..c95d90efa3 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/continentalness.json @@ -0,0 +1,10 @@ +{ + "firstOctave": -9, + "amplitudes": [ + 1, + 1, + 0, + 1, + 1 + ] +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion.json new file mode 100644 index 0000000000..4fff6fe06a --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion.json @@ -0,0 +1,11 @@ +{ + "firstOctave": -10, + "amplitudes": [ + 1.5, + 0, + 1, + 0, + 0, + 0 + ] +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/ridge.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/ridge.json new file mode 100644 index 0000000000..c5ba780a71 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/ridge.json @@ -0,0 +1,11 @@ +{ + "firstOctave": -7, + "amplitudes": [ + 1, + 2, + 1, + 0, + 0, + 0 + ] +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/temperature.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/temperature.json new file mode 100644 index 0000000000..b6ee838780 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/temperature.json @@ -0,0 +1,11 @@ +{ + "firstOctave": -8, + "amplitudes": [ + 1, + 1, + 0, + 0, + 0, + 0 + ] +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/vegetation.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/vegetation.json new file mode 100644 index 0000000000..c5ba780a71 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/vegetation.json @@ -0,0 +1,11 @@ +{ + "firstOctave": -7, + "amplitudes": [ + 1, + 2, + 1, + 0, + 0, + 0 + ] +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json new file mode 100644 index 0000000000..da5f300912 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json @@ -0,0 +1,77 @@ +{ + "sea_level": 0, + "disable_mob_generation": false, + "aquifers_enabled": false, + "ore_veins_enabled": false, + "legacy_random_source": false, + "default_block": { + "Name": "minecraft:calcite" + }, + "default_fluid": { + "Name": "minecraft:water", + "Properties": { + "level": "0" + } + }, + "noise": { + "min_y": 384, + "height": 336, + "size_horizontal": 1, + "size_vertical": 2 + }, + "noise_router": { + "barrier": 0, + "fluid_level_floodedness": 0, + "fluid_level_spread": 0, + "lava": 0, + "temperature": "gm4_sky_dimension:routers/temperature", + "vegetation": "gm4_sky_dimension:routers/vegetation", + "continents": "gm4_sky_dimension:routers/continents", + "erosion": "gm4_sky_dimension:routers/erosion", + "depth": "gm4_sky_dimension:routers/depth", + "ridges": "gm4_sky_dimension:routers/ridges", + "initial_density_without_jaggedness": "gm4_sky_dimension:routers/density", + "final_density": "gm4_sky_dimension:routers/density", + "vein_toggle": 0, + "vein_ridged": 0, + "vein_gap": 0 + }, + "spawn_target": [], + "surface_rule": { + "type": "minecraft:sequence", + "sequence": [ + { + "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:grass_block" + } + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:stone_depth", + "offset": 0, + "surface_type": "floor", + "add_surface_depth": true, + "secondary_depth_range": 0 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:dirt" + } + } + } + ] + } +} diff --git a/gm4_sky_dimension/pack.mcmeta b/gm4_sky_dimension/pack.mcmeta new file mode 100644 index 0000000000..12cf462878 --- /dev/null +++ b/gm4_sky_dimension/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "pack_format": 26, + "description": "" + } +} From 52de8850beb83c2a50949d9911adce471d7ee13c Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Mon, 18 Dec 2023 21:29:45 -0800 Subject: [PATCH 02/35] update some dimension stuff - reduce ambient light - add placeholder biomes for testing --- .../dimension/celesterra.json | 143 +++++++++++++++++- .../dimension_type/celesterra.json | 2 +- 2 files changed, 140 insertions(+), 5 deletions(-) diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json index 78d2d7ac08..fe0fd4a2a3 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json @@ -7,12 +7,147 @@ "type": "minecraft:multi_noise", "biomes": [ { - "biome": "minecraft:plains", + "biome": "minecraft:small_end_islands", "parameters": { "temperature": 0, - "humidity": 0, - "continentalness": 0, - "erosion": 0, + "humidity": [ + -1, + 1 + ], + "continentalness": [ + -1, + 1 + ], + "erosion": [ + 0.7, + 1 + ], + "weirdness": 0, + "depth": 0, + "offset": 0 + } + }, + { + "biome": "minecraft:end_highlands", + "parameters": { + "temperature": 0, + "humidity": [ + -1, + 1 + ], + "continentalness": [ + -1, + -0.465 + ], + "erosion": [ + -1, + 0.7 + ], + "weirdness": 0, + "depth": 0, + "offset": 0 + } + }, + { + "biome": "minecraft:cherry_grove", + "parameters": { + "temperature": 0, + "humidity": [ + -1, + -0.5 + ], + "continentalness": [ + -0.465, + 1 + ], + "erosion": [ + -1, + 0.7 + ], + "weirdness": 0, + "depth": 0, + "offset": 0 + } + }, + { + "biome": "minecraft:desert", + "parameters": { + "temperature": 0, + "humidity": [ + 0.4, + 1 + ], + "continentalness": [ + -0.465, + 1 + ], + "erosion": [ + -1, + 0.7 + ], + "weirdness": 0, + "depth": 0, + "offset": 0 + } + }, + { + "biome": "minecraft:taiga", + "parameters": { + "temperature": 0, + "humidity": [ + 0.3, + 0.4 + ], + "continentalness": [ + -0.465, + 1 + ], + "erosion": [ + -1, + 0.7 + ], + "weirdness": 0, + "depth": 0, + "offset": 0 + } + }, + { + "biome": "minecraft:swamp", + "parameters": { + "temperature": 0, + "humidity": [ + -0.3, + 0.3 + ], + "continentalness": [ + -0.465, + 1 + ], + "erosion": [ + -1, + 0.7 + ], + "weirdness": 0, + "depth": 0, + "offset": 0 + } + }, + { + "biome": "minecraft:dark_forest", + "parameters": { + "temperature": 0, + "humidity": [ + -0.5, + -0.3 + ], + "continentalness": [ + -0.465, + 1 + ], + "erosion": [ + -1, + 0.7 + ], "weirdness": 0, "depth": 0, "offset": 0 diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/dimension_type/celesterra.json b/gm4_sky_dimension/data/gm4_sky_dimension/dimension_type/celesterra.json index 8b274c9fbd..795c3e4409 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/dimension_type/celesterra.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/dimension_type/celesterra.json @@ -8,7 +8,7 @@ "has_skylight": true, "has_ceiling": false, "coordinate_scale": 1, - "ambient_light": 0.3, + "ambient_light": 0.08, "logical_height": 336, "effects": "minecraft:overworld", "infiniburn": "#minecraft:infiniburn_overworld", From cb98c58ff6abf98b2017c58c55271c29bcaa1899 Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Tue, 19 Dec 2023 19:16:01 -0800 Subject: [PATCH 03/35] move min_y to 0 - Necessary due to MC-255097 - Made max_y 384 so cloud level is at halfway point of the dimension --- .../data/gm4_sky_dimension/dimension_type/celesterra.json | 6 +++--- .../worldgen/noise_settings/celesterra.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/dimension_type/celesterra.json b/gm4_sky_dimension/data/gm4_sky_dimension/dimension_type/celesterra.json index 795c3e4409..dc14ec9530 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/dimension_type/celesterra.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/dimension_type/celesterra.json @@ -9,11 +9,11 @@ "has_ceiling": false, "coordinate_scale": 1, "ambient_light": 0.08, - "logical_height": 336, + "logical_height": 384, "effects": "minecraft:overworld", "infiniburn": "#minecraft:infiniburn_overworld", - "min_y": 384, - "height": 336, + "min_y": 0, + "height": 384, "monster_spawn_light_level": { "type": "minecraft:uniform", "value": { diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json index da5f300912..8d82ab4dd1 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json @@ -1,5 +1,5 @@ { - "sea_level": 0, + "sea_level": -16, "disable_mob_generation": false, "aquifers_enabled": false, "ore_veins_enabled": false, @@ -14,8 +14,8 @@ } }, "noise": { - "min_y": 384, - "height": 336, + "min_y": 0, + "height": 384, "size_horizontal": 1, "size_vertical": 2 }, From 7ff7000f2a438e512bf1538f23e9834935bf794b Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Wed, 20 Dec 2023 12:13:36 -0800 Subject: [PATCH 04/35] simple continents - determines where void vs land will generate (islands created via erosion in a later commit) --- .../continents/land_mass.json | 41 ++++++++++++++++++ .../continents/sea_level.json | 43 +++++++++++++++++++ .../density_function/routers/continents.json | 4 +- .../density_function/routers/density.json | 4 +- .../density_function/routers/erosion.json | 13 ++++-- .../density_function/routers/temperature.json | 17 +++++--- .../density_function/routers/vegetation.json | 17 +++++--- 7 files changed, 118 insertions(+), 21 deletions(-) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/land_mass.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/sea_level.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/land_mass.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/land_mass.json new file mode 100644 index 0000000000..c35a81ffd0 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/land_mass.json @@ -0,0 +1,41 @@ +{ + "type": "minecraft:add", + "argument1": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:continents/sea_level", + "argument2": { + "type": "minecraft:add", + "argument1": 0.35, + "argument2": { + "type": "minecraft:quarter_negative", + "argument": "gm4_sky_dimension:routers/continents" + } + } + }, + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/continents", + "points": [ + { + "location": -0.8, + "derivative": 0, + "value": -2 + }, + { + "location": -0.5, + "derivative": 0, + "value": -0.7 + }, + { + "location": -0.43, + "derivative": 0, + "value": 0 + } + ] + } + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/sea_level.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/sea_level.json new file mode 100644 index 0000000000..fa297f9e23 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/sea_level.json @@ -0,0 +1,43 @@ +{ + "type": "minecraft:min", + "argument1": { + "type": "minecraft:range_choice", + "input": "minecraft:y", + "min_inclusive": 32, + "max_exclusive": 170, + "when_in_range": { + "type": "minecraft:y_clamped_gradient", + "from_y": 32, + "to_y": 170, + "from_value": -0.9, + "to_value": 0 + }, + "when_out_of_range": { + "type": "minecraft:y_clamped_gradient", + "from_y": 64, + "to_y": 170, + "from_value": -2, + "to_value": 0 + } + }, + "argument2": { + "type": "minecraft:range_choice", + "input": "minecraft:y", + "min_inclusive": 192, + "max_exclusive": 336, + "when_in_range": { + "type": "minecraft:y_clamped_gradient", + "from_y": 336, + "to_y": 192, + "from_value": -1, + "to_value": 0 + }, + "when_out_of_range": { + "type": "minecraft:y_clamped_gradient", + "from_y": 384, + "to_y": 192, + "from_value": -1.3, + "to_value": 0 + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/continents.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/continents.json index 040a08c4fa..1df765f150 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/continents.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/continents.json @@ -2,8 +2,8 @@ "type": "minecraft:flat_cache", "argument": { "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion", - "xz_scale": 0.25, + "noise": "gm4_sky_dimension:continentalness", + "xz_scale": 0.07, "y_scale": 0, "shift_x": "minecraft:shift_x", "shift_y": 0, diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/density.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/density.json index 79e51619e4..69a04a124c 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/density.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/density.json @@ -1,5 +1,5 @@ { "type": "minecraft:add", - "argument1": "minecraft:end/base_3d_noise", - "argument2": "minecraft:end/sloped_cheese" + "argument1": 0, + "argument2": "gm4_sky_dimension:continents/land_mass" } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/erosion.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/erosion.json index 1844f7c30a..040a08c4fa 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/erosion.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/erosion.json @@ -1,5 +1,12 @@ { - "type": "minecraft:mul", - "argument1": 0.0001, - "argument2": "minecraft:y" + "type": "minecraft:flat_cache", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion", + "xz_scale": 0.25, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/temperature.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/temperature.json index 55dc88516e..934a780c1c 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/temperature.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/temperature.json @@ -1,9 +1,12 @@ { - "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:temperature", - "xz_scale": 0.25, - "y_scale": 0, - "shift_x": "minecraft:shift_x", - "shift_y": 0, - "shift_z": "minecraft:shift_z" + "type": "minecraft:cache_once", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:temperature", + "xz_scale": 0.25, + "y_scale": 0.2, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/vegetation.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/vegetation.json index fa64b3a50e..9bf5f21d15 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/vegetation.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/vegetation.json @@ -1,9 +1,12 @@ { - "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:vegetation", - "xz_scale": 0.25, - "y_scale": 0, - "shift_x": "minecraft:shift_x", - "shift_y": 0, - "shift_z": "minecraft:shift_z" + "type": "minecraft:cache_all_in_cell", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:vegetation", + "xz_scale": 0.25, + "y_scale": 0.5, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } } From ce3e632bc0f06e8db320488c4290fa713fb4f994 Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Wed, 20 Dec 2023 22:37:12 -0800 Subject: [PATCH 05/35] Island Groups Island groups are determined by temperature. In the future separate islands will be determined by the vegetation (and will probably be set by erosion). --- .../continents/island_groups.json | 65 +++++++++++++++++++ .../density_function/continents/total.json | 8 +++ .../density_function/routers/density.json | 2 +- .../density_function/routers/temperature.json | 2 +- 4 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/island_groups.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/total.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/island_groups.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/island_groups.json new file mode 100644 index 0000000000..3f86a95030 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/island_groups.json @@ -0,0 +1,65 @@ +{ + "type": "minecraft:mul", + "argument1": 2, + "argument2": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:y_clamped_gradient", + "from_y": 384, + "to_y": 0, + "from_value": 0, + "to_value": -0.7 + }, + "argument2": { + "type": "minecraft:spline", + "spline": { + "coordinate": { + "type": "minecraft:abs", + "argument": "gm4_sky_dimension:routers/temperature" + }, + "points": [ + { + "location": 0, + "derivative": 0, + "value": -0.5 + }, + { + "location": 0.05, + "derivative": 0, + "value": 0.6 + }, + { + "location": 0.2, + "derivative": 0, + "value": 0.6 + }, + { + "location": 0.3, + "derivative": 0, + "value": 0 + }, + { + "location": 0.35, + "derivative": 0, + "value": 0.6 + }, + { + "location": 0.5, + "derivative": 0, + "value": 0.6 + }, + { + "location": 0.6, + "derivative": 0, + "value": 0 + }, + { + "location": 0.65, + "derivative": 0, + "value": 0.6 + } + ] + } + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/total.json new file mode 100644 index 0000000000..0f041b3f9f --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/total.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:min", + "argument1": "gm4_sky_dimension:continents/land_mass", + "argument2": { + "type": "minecraft:interpolated", + "argument": "gm4_sky_dimension:continents/island_groups" + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/density.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/density.json index 69a04a124c..5dd7f11ab3 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/density.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/density.json @@ -1,5 +1,5 @@ { "type": "minecraft:add", "argument1": 0, - "argument2": "gm4_sky_dimension:continents/land_mass" + "argument2": "gm4_sky_dimension:continents/total" } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/temperature.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/temperature.json index 934a780c1c..7487026382 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/temperature.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/temperature.json @@ -4,7 +4,7 @@ "type": "minecraft:shifted_noise", "noise": "gm4_sky_dimension:temperature", "xz_scale": 0.25, - "y_scale": 0.2, + "y_scale": 0, "shift_x": "minecraft:shift_x", "shift_y": 0, "shift_z": "minecraft:shift_z" From 891456e7e92e399e03d132f17c7c88f7f74c29b7 Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Sun, 24 Dec 2023 02:27:55 -0800 Subject: [PATCH 06/35] Separate Islands - Middle Islands - islands separated based on vegetation - middle islands will generate with terrain cutting through the clouds and usually a surface above the clouds - placeholder surface terrain; will be based on ridges eventually --- .../continents/island_groups.json | 2 +- .../continents/land_mass.json | 129 ++++++++++++++---- .../continents/sea_level.json | 6 +- .../normal/middle/carver_underside.json | 60 ++++++++ .../normal/middle/gradient_carver.json | 7 + .../normal/middle/gradient_topside.json | 7 + .../normal/middle/gradient_underside.json | 7 + .../normal/middle/terrain_topside.json | 23 ++++ .../normal/middle/terrain_underside.json | 39 ++++++ .../erosion/normal/middle/total.json | 8 ++ .../density_function/erosion/total.json | 5 + .../density_function/routers/density.json | 4 +- .../density_function/routers/vegetation.json | 4 +- .../worldgen/noise/erosion/middle.json | 9 ++ 14 files changed, 274 insertions(+), 36 deletions(-) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/carver_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_carver.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_topside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/terrain_topside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/terrain_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/total.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/middle.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/island_groups.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/island_groups.json index 3f86a95030..7784bccbd6 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/island_groups.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/island_groups.json @@ -6,7 +6,7 @@ "argument1": { "type": "minecraft:y_clamped_gradient", "from_y": 384, - "to_y": 0, + "to_y": -64, "from_value": 0, "to_value": -0.7 }, diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/land_mass.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/land_mass.json index c35a81ffd0..d3368b6d26 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/land_mass.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/land_mass.json @@ -2,40 +2,113 @@ "type": "minecraft:add", "argument1": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:continents/sea_level", - "argument2": { + "argument1": { "type": "minecraft:add", - "argument1": 0.35, + "argument1": "gm4_sky_dimension:continents/sea_level", "argument2": { - "type": "minecraft:quarter_negative", - "argument": "gm4_sky_dimension:routers/continents" + "type": "minecraft:add", + "argument1": 0.35, + "argument2": { + "type": "minecraft:quarter_negative", + "argument": "gm4_sky_dimension:routers/continents" + } + } + }, + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/continents", + "points": [ + { + "location": -0.8, + "derivative": 0, + "value": -2 + }, + { + "location": -0.5, + "derivative": 0, + "value": -0.7 + }, + { + "location": -0.43, + "derivative": 0, + "value": 0 + } + ] + } } } }, "argument2": { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:spline", - "spline": { - "coordinate": "gm4_sky_dimension:routers/continents", - "points": [ - { - "location": -0.8, - "derivative": 0, - "value": -2 - }, - { - "location": -0.5, - "derivative": 0, - "value": -0.7 - }, - { - "location": -0.43, - "derivative": 0, - "value": 0 + "type": "minecraft:range_choice", + "input": "minecraft:y", + "min_inclusive": 0, + "max_exclusive": 192, + "when_in_range": { + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/normal/middle/gradient_carver", + "argument2": { + "type": "minecraft:mul", + "argument1": -2.5, + "argument2": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:y_clamped_gradient", + "from_y": 384, + "to_y": 0, + "from_value": 0, + "to_value": -0.4 + }, + "argument2": { + "type": "minecraft:spline", + "spline": { + "coordinate": { + "type": "minecraft:abs", + "argument": "gm4_sky_dimension:routers/vegetation" + }, + "points": [ + { + "location": 0, + "derivative": 0, + "value": 0.6 + }, + { + "location": 0.2, + "derivative": 0.5, + "value": 0.4 + }, + { + "location": 0.4, + "derivative": 0, + "value": 0.6 + }, + { + "location": 0.6, + "derivative": 0, + "value": 0.4 + }, + { + "location": 0.8, + "derivative": -0.5, + "value": 0.5 + }, + { + "location": 1, + "derivative": 0, + "value": 0.6 + } + ] + } + } } - ] - } - } + } + }, + "argument2": -1 + }, + "when_out_of_range": 0 } } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/sea_level.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/sea_level.json index fa297f9e23..5e0bd52ae0 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/sea_level.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/sea_level.json @@ -3,13 +3,13 @@ "argument1": { "type": "minecraft:range_choice", "input": "minecraft:y", - "min_inclusive": 32, + "min_inclusive": 16, "max_exclusive": 170, "when_in_range": { "type": "minecraft:y_clamped_gradient", - "from_y": 32, + "from_y": 16, "to_y": 170, - "from_value": -0.9, + "from_value": -1, "to_value": 0 }, "when_out_of_range": { diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/carver_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/carver_underside.json new file mode 100644 index 0000000000..c1fd5464be --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/carver_underside.json @@ -0,0 +1,60 @@ +{ + "type": "minecraft:range_choice", + "input": { + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/normal/middle/gradient_carver", + "argument2": { + "type": "minecraft:mul", + "argument1": -2, + "argument2": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:y_clamped_gradient", + "from_y": 384, + "to_y": 0, + "from_value": 0, + "to_value": -0.8 + }, + "argument2": { + "type": "minecraft:spline", + "spline": { + "coordinate": { + "type": "minecraft:abs", + "argument": "gm4_sky_dimension:routers/vegetation" + }, + "points": [ + { + "location": 0, + "derivative": 0, + "value": 0 + }, + { + "location": 0.4, + "derivative": 0, + "value": 0.2 + }, + { + "location": 0.6, + "derivative": 0, + "value": 0.6 + }, + { + "location": 1, + "derivative": 0, + "value": 0 + } + ] + } + } + } + } + }, + "argument2": -1 + }, + "min_inclusive": -1000000, + "max_exclusive": 0, + "when_in_range": -1, + "when_out_of_range": "gm4_sky_dimension:erosion/normal/middle/terrain_underside" +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_carver.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_carver.json new file mode 100644 index 0000000000..89c80e34bf --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_carver.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 356, + "to_y": 16, + "from_value": -1.5, + "to_value": 0 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_topside.json new file mode 100644 index 0000000000..4be7e44b1a --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_topside.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 396, + "to_y": 106, + "from_value": -2, + "to_value": 0 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_underside.json new file mode 100644 index 0000000000..909eeb2d68 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_underside.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 276, + "to_y": 56, + "from_value": 0, + "to_value": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/terrain_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/terrain_topside.json new file mode 100644 index 0000000000..1032f3a1e7 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/terrain_topside.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/normal/middle/gradient_topside", + "argument2": { + "type": "minecraft:add", + "argument1": 0.5, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion/middle", + "xz_scale": 0.35, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/terrain_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/terrain_underside.json new file mode 100644 index 0000000000..811a8ecb47 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/terrain_underside.json @@ -0,0 +1,39 @@ +{ + "type": "minecraft:range_choice", + "input": { + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/normal/middle/gradient_underside", + "argument2": { + "type": "minecraft:mul", + "argument1": 0.5, + "argument2": { + "type": "minecraft:add", + "argument1": 0.2, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion/middle", + "xz_scale": 5, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } + }, + "argument2": -1 + }, + "min_inclusive": -1000000, + "max_exclusive": 0, + "when_in_range": { + "type": "minecraft:add", + "argument1": 1, + "argument2": "gm4_sky_dimension:erosion/normal/middle/gradient_underside" + }, + "when_out_of_range": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/total.json new file mode 100644 index 0000000000..bf9757e5b9 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/total.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:range_choice", + "input": "gm4_sky_dimension:erosion/normal/middle/terrain_topside", + "min_inclusive": 0, + "max_exclusive": 1000000, + "when_in_range": "gm4_sky_dimension:erosion/normal/middle/carver_underside", + "when_out_of_range": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json new file mode 100644 index 0000000000..a8e1d0aa27 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json @@ -0,0 +1,5 @@ +{ + "type": "minecraft:add", + "argument1": 0, + "argument2": "gm4_sky_dimension:erosion/normal/middle/total" +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/density.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/density.json index 5dd7f11ab3..649d174418 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/density.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/density.json @@ -1,5 +1,5 @@ { - "type": "minecraft:add", - "argument1": 0, + "type": "minecraft:min", + "argument1": "gm4_sky_dimension:erosion/total", "argument2": "gm4_sky_dimension:continents/total" } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/vegetation.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/vegetation.json index 9bf5f21d15..af5003d8b2 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/vegetation.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/vegetation.json @@ -3,8 +3,8 @@ "argument": { "type": "minecraft:shifted_noise", "noise": "gm4_sky_dimension:vegetation", - "xz_scale": 0.25, - "y_scale": 0.5, + "xz_scale": 1, + "y_scale": 0, "shift_x": "minecraft:shift_x", "shift_y": 0, "shift_z": "minecraft:shift_z" diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/middle.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/middle.json new file mode 100644 index 0000000000..24a6ee93dd --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/middle.json @@ -0,0 +1,9 @@ +{ + "firstOctave": -8, + "amplitudes": [ + 1, + 1, + 1, + 1 + ] +} From 620c971ef8b5c5354badff73d2a8a1e7aef39288 Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Mon, 25 Dec 2023 12:05:50 -0800 Subject: [PATCH 07/35] Better island separation - ensure carver is what's causing the separation instead of the underside terrain - made topside terrain flat to test consistent separation - placeholder biomes to test island size and separation - still need to mess with island size (too large) --- .../dimension/celesterra.json | 337 +++++++++++++++++- .../normal/middle/carver_underside.json | 44 ++- .../normal/middle/gradient_carver.json | 2 +- .../normal/middle/gradient_underside.json | 2 +- .../normal/middle/terrain_topside.json | 2 +- .../worldgen/noise_settings/celesterra.json | 36 ++ 6 files changed, 392 insertions(+), 31 deletions(-) diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json index fe0fd4a2a3..a97e3fd735 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json @@ -49,12 +49,15 @@ } }, { - "biome": "minecraft:cherry_grove", + "biome": "minecraft:ice_spikes", "parameters": { - "temperature": 0, + "temperature": [ + -1, + -0.6 + ], "humidity": [ -1, - -0.5 + -0.25 ], "continentalness": [ -0.465, @@ -70,11 +73,38 @@ } }, { - "biome": "minecraft:desert", + "biome": "minecraft:snowy_plains", "parameters": { - "temperature": 0, + "temperature": [ + -1, + -0.6 + ], "humidity": [ - 0.4, + -0.25, + 0.5 + ], + "continentalness": [ + -0.465, + 1 + ], + "erosion": [ + -1, + 0.7 + ], + "weirdness": 0, + "depth": 0, + "offset": 0 + } + }, + { + "biome": "minecraft:snowy_taiga", + "parameters": { + "temperature": [ + -1, + -0.6 + ], + "humidity": [ + 0.5, 1 ], "continentalness": [ @@ -90,13 +120,40 @@ "offset": 0 } }, + { + "biome": "minecraft:windswept_forest", + "parameters": { + "temperature": [ + -0.6, + -0.3 + ], + "humidity": [ + -1, + -0.25 + ], + "continentalness": [ + -0.465, + 1 + ], + "erosion": [ + -1, + 0.7 + ], + "weirdness": 0, + "depth": 0, + "offset": 0 + } + }, { "biome": "minecraft:taiga", "parameters": { - "temperature": 0, + "temperature": [ + -0.6, + -0.3 + ], "humidity": [ - 0.3, - 0.4 + 0.4, + 1 ], "continentalness": [ -0.465, @@ -112,17 +169,140 @@ } }, { - "biome": "minecraft:swamp", + "biome": "minecraft:plains", "parameters": { - "temperature": 0, + "temperature": [ + -0.3, + 0 + ], + "humidity": [ + -1, + -0.25 + ], + "continentalness": [ + -1, + 0.7 + ], + "erosion": [ + -1, + 0.7 + ], + "weirdness": 0, + "depth": 0, + "offset": 0 + } + }, + { + "biome": "minecraft:birch_forest", + "parameters": { + "temperature": [ + -0.3, + 0 + ], "humidity": [ + -0.25, + 0.5 + ], + "continentalness": [ + -1, + 0.7 + ], + "erosion": [ + -1, + 0.7 + ], + "weirdness": 0, + "depth": 0, + "offset": 0 + } + }, + { + "biome": "minecraft:dark_forest", + "parameters": { + "temperature": [ -0.3, + 0 + ], + "humidity": [ + 0.5, + 1 + ], + "continentalness": [ + -1, + 0.7 + ], + "erosion": [ + -1, + 0.7 + ], + "weirdness": 0, + "depth": 0, + "offset": 0 + } + }, + { + "biome": "minecraft:meadow", + "parameters": { + "temperature": [ + 0, 0.3 ], + "humidity": [ + -1, + -0.25 + ], "continentalness": [ - -0.465, + -1, + 0.7 + ], + "erosion": [ + -1, + 0.7 + ], + "weirdness": 0, + "depth": 0, + "offset": 0 + } + }, + { + "biome": "minecraft:cherry_grove", + "parameters": { + "temperature": [ + 0, + 0.3 + ], + "humidity": [ + -0.25, + 0.5 + ], + "continentalness": [ + -1, + 0.7 + ], + "erosion": [ + -1, + 0.7 + ], + "weirdness": 0, + "depth": 0, + "offset": 0 + } + }, + { + "biome": "minecraft:forest", + "parameters": { + "temperature": [ + 0, + 0.3 + ], + "humidity": [ + 0.5, 1 ], + "continentalness": [ + -1, + 0.7 + ], "erosion": [ -1, 0.7 @@ -133,17 +313,140 @@ } }, { - "biome": "minecraft:dark_forest", + "biome": "minecraft:flower_forest", "parameters": { - "temperature": 0, + "temperature": [ + 0.3, + 0.6 + ], "humidity": [ - -0.5, - -0.3 + -1, + -0.25 ], "continentalness": [ - -0.465, + -1, + 0.7 + ], + "erosion": [ + -1, + 0.7 + ], + "weirdness": 0, + "depth": 0, + "offset": 0 + } + }, + { + "biome": "minecraft:swamp", + "parameters": { + "temperature": [ + 0.3, + 0.6 + ], + "humidity": [ + -0.25, + 0.5 + ], + "continentalness": [ + -1, + 0.7 + ], + "erosion": [ + -1, + 0.7 + ], + "weirdness": 0, + "depth": 0, + "offset": 0 + } + }, + { + "biome": "minecraft:mangrove_swamp", + "parameters": { + "temperature": [ + 0.3, + 0.6 + ], + "humidity": [ + 0.5, + 1 + ], + "continentalness": [ + -1, + 0.7 + ], + "erosion": [ + -1, + 0.7 + ], + "weirdness": 0, + "depth": 0, + "offset": 0 + } + }, + { + "biome": "minecraft:desert", + "parameters": { + "temperature": [ + 0.6, + 1 + ], + "humidity": [ + -1, + -0.25 + ], + "continentalness": [ + -1, + 0.7 + ], + "erosion": [ + -1, + 0.7 + ], + "weirdness": 0, + "depth": 0, + "offset": 0 + } + }, + { + "biome": "minecraft:savanna", + "parameters": { + "temperature": [ + 0.6, 1 ], + "humidity": [ + -0.25, + 0.5 + ], + "continentalness": [ + -1, + 0.7 + ], + "erosion": [ + -1, + 0.7 + ], + "weirdness": 0, + "depth": 0, + "offset": 0 + } + }, + { + "biome": "minecraft:jungle", + "parameters": { + "temperature": [ + 0.6, + 1 + ], + "humidity": [ + 0.5, + 1 + ], + "continentalness": [ + -1, + 0.7 + ], "erosion": [ -1, 0.7 diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/carver_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/carver_underside.json index c1fd5464be..40030ddce3 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/carver_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/carver_underside.json @@ -15,35 +15,57 @@ "from_y": 384, "to_y": 0, "from_value": 0, - "to_value": -0.8 + "to_value": -1.5 }, "argument2": { "type": "minecraft:spline", "spline": { - "coordinate": { - "type": "minecraft:abs", - "argument": "gm4_sky_dimension:routers/vegetation" - }, + "coordinate": "gm4_sky_dimension:routers/vegetation", "points": [ { - "location": 0, + "location": -1, "derivative": 0, "value": 0 }, { - "location": 0.4, + "location": -0.75, "derivative": 0, - "value": 0.2 + "value": 0.5 }, { - "location": 0.6, + "location": -0.5, "derivative": 0, - "value": 0.6 + "value": 0.5 }, { - "location": 1, + "location": -0.25, + "derivative": 0, + "value": 0 + }, + { + "location": 0, + "derivative": 0, + "value": 0.5 + }, + { + "location": 0.25, + "derivative": 0, + "value": 0.5 + }, + { + "location": 0.5, "derivative": 0, "value": 0 + }, + { + "location": 0.75, + "derivative": 0, + "value": 0.5 + }, + { + "location": 1, + "derivative": 0, + "value": 0.5 } ] } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_carver.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_carver.json index 89c80e34bf..868dff9036 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_carver.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_carver.json @@ -1,6 +1,6 @@ { "type": "minecraft:y_clamped_gradient", - "from_y": 356, + "from_y": 326, "to_y": 16, "from_value": -1.5, "to_value": 0 diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_underside.json index 909eeb2d68..5143195fd4 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_underside.json @@ -1,6 +1,6 @@ { "type": "minecraft:y_clamped_gradient", - "from_y": 276, + "from_y": 216, "to_y": 56, "from_value": 0, "to_value": -1 diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/terrain_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/terrain_topside.json index 1032f3a1e7..d829cb170b 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/terrain_topside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/terrain_topside.json @@ -11,7 +11,7 @@ "argument": { "type": "minecraft:shifted_noise", "noise": "gm4_sky_dimension:erosion/middle", - "xz_scale": 0.35, + "xz_scale": 0, "y_scale": 0, "shift_x": "minecraft:shift_x", "shift_y": 0, diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json index 8d82ab4dd1..8d333ab963 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json @@ -40,6 +40,42 @@ "surface_rule": { "type": "minecraft:sequence", "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:biome", + "biome_is": [ + "minecraft:desert" + ] + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:stone_depth", + "offset": 0, + "surface_type": "floor", + "add_surface_depth": true, + "secondary_depth_range": 0 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:sand" + } + } + }, + { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:sandstone" + } + } + ] + } + }, { "type": "minecraft:condition", "if_true": { From bd9a0121f86d9c609b20d6d04c040f194995626d Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Mon, 25 Dec 2023 12:26:14 -0800 Subject: [PATCH 08/35] make island smaller - split using underside terrain (so the islands separated by vegetation are further split by random noise) --- .../erosion/normal/middle/gradient_underside.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_underside.json index 5143195fd4..7d2f050628 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_underside.json @@ -1,6 +1,6 @@ { "type": "minecraft:y_clamped_gradient", - "from_y": 216, + "from_y": 266, "to_y": 56, "from_value": 0, "to_value": -1 From 2ee8ad40616a8042026a6b4cbc48a9dd54f8dffa Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Mon, 25 Dec 2023 23:30:03 -0800 Subject: [PATCH 09/35] Tweak Island Height - moved down closer to cloud level, tweaking size of islands --- .../erosion/normal/middle/gradient_carver.json | 2 +- .../erosion/normal/middle/gradient_topside.json | 2 +- .../erosion/normal/middle/gradient_underside.json | 2 +- .../erosion/normal/middle/terrain_underside.json | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_carver.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_carver.json index 868dff9036..83eb2378aa 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_carver.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_carver.json @@ -1,6 +1,6 @@ { "type": "minecraft:y_clamped_gradient", - "from_y": 326, + "from_y": 266, "to_y": 16, "from_value": -1.5, "to_value": 0 diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_topside.json index 4be7e44b1a..e9584322bd 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_topside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_topside.json @@ -1,6 +1,6 @@ { "type": "minecraft:y_clamped_gradient", - "from_y": 396, + "from_y": 346, "to_y": 106, "from_value": -2, "to_value": 0 diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_underside.json index 7d2f050628..3c57da41f2 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_underside.json @@ -1,6 +1,6 @@ { "type": "minecraft:y_clamped_gradient", - "from_y": 266, + "from_y": 236, "to_y": 56, "from_value": 0, "to_value": -1 diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/terrain_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/terrain_underside.json index 811a8ecb47..e236aec758 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/terrain_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/terrain_underside.json @@ -7,7 +7,7 @@ "argument1": "gm4_sky_dimension:erosion/normal/middle/gradient_underside", "argument2": { "type": "minecraft:mul", - "argument1": 0.5, + "argument1": 0.4, "argument2": { "type": "minecraft:add", "argument1": 0.2, @@ -16,7 +16,7 @@ "argument": { "type": "minecraft:shifted_noise", "noise": "gm4_sky_dimension:erosion/middle", - "xz_scale": 5, + "xz_scale": 4, "y_scale": 0, "shift_x": "minecraft:shift_x", "shift_y": 0, From b9fef9affa097e0fcd91ed1bf28c779ad156efd1 Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Tue, 26 Dec 2023 18:56:04 -0800 Subject: [PATCH 10/35] Bottom Half of Islands - 3 layers of islands - layer above the clouds: large islands with a lot of underside terrain - layer at bottom (black void level): small islands, pretty common - layer between: medium islands, not much underside terrain, somewhat sparse - readded void area and biome (issue with continent terrain and multi-noise biome placement) --- .../dimension/celesterra.json | 65 ++++++++------- .../continents/land_mass.json | 36 ++------ .../normal/bottom/carver_underside.json | 82 +++++++++++++++++++ .../normal/bottom/gradient_carver.json | 7 ++ .../normal/bottom/gradient_topside.json | 7 ++ .../normal/bottom/gradient_underside.json | 7 ++ .../normal/bottom/terrain_topside.json | 23 ++++++ .../normal/bottom/terrain_underside.json | 39 +++++++++ .../erosion/normal/bottom/total.json | 8 ++ .../normal/mid_bottom/carver_underside.json | 82 +++++++++++++++++++ .../normal/mid_bottom/gradient_carver.json | 7 ++ .../normal/mid_bottom/gradient_topside.json | 7 ++ .../normal/mid_bottom/gradient_underside.json | 7 ++ .../normal/mid_bottom/terrain_topside.json | 23 ++++++ .../normal/mid_bottom/terrain_underside.json | 39 +++++++++ .../erosion/normal/mid_bottom/total.json | 8 ++ .../normal/mid_top/carver_underside.json | 82 +++++++++++++++++++ .../normal/mid_top/gradient_carver.json | 7 ++ .../normal/mid_top/gradient_topside.json | 7 ++ .../normal/mid_top/gradient_underside.json | 7 ++ .../normal/mid_top/terrain_topside.json | 23 ++++++ .../normal/mid_top/terrain_underside.json | 39 +++++++++ .../erosion/normal/mid_top/total.json | 8 ++ .../erosion/normal/top/carver_underside.json | 82 +++++++++++++++++++ .../erosion/normal/top/gradient_carver.json | 7 ++ .../erosion/normal/top/gradient_topside.json | 7 ++ .../normal/top/gradient_underside.json | 7 ++ .../erosion/normal/top/terrain_topside.json | 23 ++++++ .../erosion/normal/top/terrain_underside.json | 39 +++++++++ .../erosion/normal/top/total.json | 8 ++ .../density_function/erosion/total.json | 18 +++- .../worldgen/noise/erosion/bottom.json | 9 ++ .../worldgen/noise/erosion/mid_bottom.json | 9 ++ .../worldgen/noise/erosion/mid_top.json | 9 ++ .../worldgen/noise/erosion/top.json | 9 ++ 35 files changed, 786 insertions(+), 61 deletions(-) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/carver_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_carver.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_topside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/terrain_topside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/terrain_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/total.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/carver_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_carver.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_topside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/terrain_topside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/terrain_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/total.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/carver_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/gradient_carver.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/gradient_topside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/gradient_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/terrain_topside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/terrain_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/total.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/carver_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/gradient_carver.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/gradient_topside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/gradient_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/terrain_topside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/terrain_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/total.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/bottom.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/mid_bottom.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/mid_top.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/top.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json index a97e3fd735..71201227dc 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json @@ -30,14 +30,17 @@ { "biome": "minecraft:end_highlands", "parameters": { - "temperature": 0, + "temperature": [ + -1, + 1 + ], "humidity": [ -1, 1 ], "continentalness": [ -1, - -0.465 + -0.485 ], "erosion": [ -1, @@ -60,7 +63,7 @@ -0.25 ], "continentalness": [ - -0.465, + -0.485, 1 ], "erosion": [ @@ -84,7 +87,7 @@ 0.5 ], "continentalness": [ - -0.465, + -0.485, 1 ], "erosion": [ @@ -108,7 +111,7 @@ 1 ], "continentalness": [ - -0.465, + -0.485, 1 ], "erosion": [ @@ -132,7 +135,7 @@ -0.25 ], "continentalness": [ - -0.465, + -0.485, 1 ], "erosion": [ @@ -156,7 +159,7 @@ 1 ], "continentalness": [ - -0.465, + -0.485, 1 ], "erosion": [ @@ -180,8 +183,8 @@ -0.25 ], "continentalness": [ - -1, - 0.7 + -0.485, + 1 ], "erosion": [ -1, @@ -204,8 +207,8 @@ 0.5 ], "continentalness": [ - -1, - 0.7 + -0.485, + 1 ], "erosion": [ -1, @@ -228,8 +231,8 @@ 1 ], "continentalness": [ - -1, - 0.7 + -0.485, + 1 ], "erosion": [ -1, @@ -252,8 +255,8 @@ -0.25 ], "continentalness": [ - -1, - 0.7 + -0.485, + 1 ], "erosion": [ -1, @@ -276,8 +279,8 @@ 0.5 ], "continentalness": [ - -1, - 0.7 + -0.485, + 1 ], "erosion": [ -1, @@ -300,8 +303,8 @@ 1 ], "continentalness": [ - -1, - 0.7 + -0.485, + 1 ], "erosion": [ -1, @@ -324,8 +327,8 @@ -0.25 ], "continentalness": [ - -1, - 0.7 + -0.485, + 1 ], "erosion": [ -1, @@ -348,8 +351,8 @@ 0.5 ], "continentalness": [ - -1, - 0.7 + -0.485, + 1 ], "erosion": [ -1, @@ -372,8 +375,8 @@ 1 ], "continentalness": [ - -1, - 0.7 + -0.485, + 1 ], "erosion": [ -1, @@ -396,8 +399,8 @@ -0.25 ], "continentalness": [ - -1, - 0.7 + -0.485, + 1 ], "erosion": [ -1, @@ -420,8 +423,8 @@ 0.5 ], "continentalness": [ - -1, - 0.7 + -0.485, + 1 ], "erosion": [ -1, @@ -444,8 +447,8 @@ 1 ], "continentalness": [ - -1, - 0.7 + -0.485, + 1 ], "erosion": [ -1, diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/land_mass.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/land_mass.json index d3368b6d26..1d6ae7de0d 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/land_mass.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/land_mass.json @@ -53,7 +53,7 @@ "argument1": "gm4_sky_dimension:erosion/normal/middle/gradient_carver", "argument2": { "type": "minecraft:mul", - "argument1": -2.5, + "argument1": -1.5, "argument2": { "type": "minecraft:add", "argument1": { @@ -61,45 +61,27 @@ "from_y": 384, "to_y": 0, "from_value": 0, - "to_value": -0.4 + "to_value": -0.1 }, "argument2": { "type": "minecraft:spline", "spline": { - "coordinate": { - "type": "minecraft:abs", - "argument": "gm4_sky_dimension:routers/vegetation" - }, + "coordinate": "gm4_sky_dimension:routers/continents", "points": [ { - "location": 0, + "location": -0.8, "derivative": 0, - "value": 0.6 + "value": -2 }, { - "location": 0.2, - "derivative": 0.5, - "value": 0.4 - }, - { - "location": 0.4, + "location": -0.5, "derivative": 0, - "value": 0.6 - }, - { - "location": 0.6, - "derivative": 0, - "value": 0.4 - }, - { - "location": 0.8, - "derivative": -0.5, - "value": 0.5 + "value": -0.5 }, { - "location": 1, + "location": -0.43, "derivative": 0, - "value": 0.6 + "value": 0 } ] } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/carver_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/carver_underside.json new file mode 100644 index 0000000000..fc38f9a670 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/carver_underside.json @@ -0,0 +1,82 @@ +{ + "type": "minecraft:range_choice", + "input": { + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/normal/bottom/gradient_carver", + "argument2": { + "type": "minecraft:mul", + "argument1": -2, + "argument2": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:y_clamped_gradient", + "from_y": 192, + "to_y": 0, + "from_value": 0, + "to_value": -1.1 + }, + "argument2": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/vegetation", + "points": [ + { + "location": -1, + "derivative": 0, + "value": 0 + }, + { + "location": -0.75, + "derivative": 0, + "value": 0.5 + }, + { + "location": -0.5, + "derivative": 0, + "value": 0.5 + }, + { + "location": -0.25, + "derivative": 0, + "value": 0 + }, + { + "location": 0, + "derivative": 0, + "value": 0.5 + }, + { + "location": 0.25, + "derivative": 0, + "value": 0.5 + }, + { + "location": 0.5, + "derivative": 0, + "value": 0 + }, + { + "location": 0.75, + "derivative": 0, + "value": 0.5 + }, + { + "location": 1, + "derivative": 0, + "value": 0.5 + } + ] + } + } + } + } + }, + "argument2": -1 + }, + "min_inclusive": -1000000, + "max_exclusive": 0, + "when_in_range": -1, + "when_out_of_range": "gm4_sky_dimension:erosion/normal/bottom/terrain_underside" +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_carver.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_carver.json new file mode 100644 index 0000000000..a0535d91b7 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_carver.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 16, + "to_y": 0, + "from_value": -1.5, + "to_value": 0 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_topside.json new file mode 100644 index 0000000000..d86d601d28 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_topside.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 60, + "to_y": 16, + "from_value": -2, + "to_value": 0 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_underside.json new file mode 100644 index 0000000000..1a6f8b3d5e --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_underside.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 60, + "to_y": 0, + "from_value": 0, + "to_value": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/terrain_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/terrain_topside.json new file mode 100644 index 0000000000..1dab5f8ba4 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/terrain_topside.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/normal/bottom/gradient_topside", + "argument2": { + "type": "minecraft:add", + "argument1": 0.5, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion/bottom", + "xz_scale": 0, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/terrain_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/terrain_underside.json new file mode 100644 index 0000000000..ab8339d370 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/terrain_underside.json @@ -0,0 +1,39 @@ +{ + "type": "minecraft:range_choice", + "input": { + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/normal/bottom/gradient_underside", + "argument2": { + "type": "minecraft:mul", + "argument1": 0.7, + "argument2": { + "type": "minecraft:add", + "argument1": 0.2, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion/bottom", + "xz_scale": 7, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } + }, + "argument2": -1 + }, + "min_inclusive": -1000000, + "max_exclusive": 0, + "when_in_range": { + "type": "minecraft:add", + "argument1": 1, + "argument2": "gm4_sky_dimension:erosion/normal/bottom/gradient_underside" + }, + "when_out_of_range": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/total.json new file mode 100644 index 0000000000..3371c36093 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/total.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:range_choice", + "input": "gm4_sky_dimension:erosion/normal/bottom/terrain_topside", + "min_inclusive": 0, + "max_exclusive": 1000000, + "when_in_range": "gm4_sky_dimension:erosion/normal/bottom/carver_underside", + "when_out_of_range": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/carver_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/carver_underside.json new file mode 100644 index 0000000000..b992390ba5 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/carver_underside.json @@ -0,0 +1,82 @@ +{ + "type": "minecraft:range_choice", + "input": { + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/normal/mid_bottom/gradient_carver", + "argument2": { + "type": "minecraft:mul", + "argument1": -2, + "argument2": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:y_clamped_gradient", + "from_y": 384, + "to_y": 0, + "from_value": 0, + "to_value": -1.1 + }, + "argument2": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/vegetation", + "points": [ + { + "location": -1, + "derivative": 0, + "value": 0 + }, + { + "location": -0.75, + "derivative": 0, + "value": 0.5 + }, + { + "location": -0.5, + "derivative": 0, + "value": 0.5 + }, + { + "location": -0.25, + "derivative": 0, + "value": 0 + }, + { + "location": 0, + "derivative": 0, + "value": 0.5 + }, + { + "location": 0.25, + "derivative": 0, + "value": 0.5 + }, + { + "location": 0.5, + "derivative": 0, + "value": 0 + }, + { + "location": 0.75, + "derivative": 0, + "value": 0.5 + }, + { + "location": 1, + "derivative": 0, + "value": 0.5 + } + ] + } + } + } + } + }, + "argument2": -1 + }, + "min_inclusive": -1000000, + "max_exclusive": 0, + "when_in_range": -1, + "when_out_of_range": "gm4_sky_dimension:erosion/normal/mid_bottom/terrain_underside" +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_carver.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_carver.json new file mode 100644 index 0000000000..950280889d --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_carver.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 192, + "to_y": -64, + "from_value": -1.5, + "to_value": 0 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_topside.json new file mode 100644 index 0000000000..93aa2da5cc --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_topside.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 180, + "to_y": 32, + "from_value": -2, + "to_value": 0 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_underside.json new file mode 100644 index 0000000000..2b9c11b752 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_underside.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 140, + "to_y": 0, + "from_value": 0, + "to_value": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/terrain_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/terrain_topside.json new file mode 100644 index 0000000000..4fd6807ad7 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/terrain_topside.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/normal/mid_bottom/gradient_topside", + "argument2": { + "type": "minecraft:add", + "argument1": 0.5, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion/mid_bottom", + "xz_scale": 0, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/terrain_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/terrain_underside.json new file mode 100644 index 0000000000..d4ff99cb21 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/terrain_underside.json @@ -0,0 +1,39 @@ +{ + "type": "minecraft:range_choice", + "input": { + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/normal/mid_bottom/gradient_underside", + "argument2": { + "type": "minecraft:mul", + "argument1": 0.4, + "argument2": { + "type": "minecraft:add", + "argument1": 0.2, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion/mid_bottom", + "xz_scale": 3, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } + }, + "argument2": -1 + }, + "min_inclusive": -1000000, + "max_exclusive": 0, + "when_in_range": { + "type": "minecraft:add", + "argument1": 1, + "argument2": "gm4_sky_dimension:erosion/normal/mid_bottom/gradient_underside" + }, + "when_out_of_range": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/total.json new file mode 100644 index 0000000000..5d367cac24 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/total.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:range_choice", + "input": "gm4_sky_dimension:erosion/normal/mid_bottom/terrain_topside", + "min_inclusive": 0, + "max_exclusive": 1000000, + "when_in_range": "gm4_sky_dimension:erosion/normal/mid_bottom/carver_underside", + "when_out_of_range": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/carver_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/carver_underside.json new file mode 100644 index 0000000000..40030ddce3 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/carver_underside.json @@ -0,0 +1,82 @@ +{ + "type": "minecraft:range_choice", + "input": { + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/normal/middle/gradient_carver", + "argument2": { + "type": "minecraft:mul", + "argument1": -2, + "argument2": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:y_clamped_gradient", + "from_y": 384, + "to_y": 0, + "from_value": 0, + "to_value": -1.5 + }, + "argument2": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/vegetation", + "points": [ + { + "location": -1, + "derivative": 0, + "value": 0 + }, + { + "location": -0.75, + "derivative": 0, + "value": 0.5 + }, + { + "location": -0.5, + "derivative": 0, + "value": 0.5 + }, + { + "location": -0.25, + "derivative": 0, + "value": 0 + }, + { + "location": 0, + "derivative": 0, + "value": 0.5 + }, + { + "location": 0.25, + "derivative": 0, + "value": 0.5 + }, + { + "location": 0.5, + "derivative": 0, + "value": 0 + }, + { + "location": 0.75, + "derivative": 0, + "value": 0.5 + }, + { + "location": 1, + "derivative": 0, + "value": 0.5 + } + ] + } + } + } + } + }, + "argument2": -1 + }, + "min_inclusive": -1000000, + "max_exclusive": 0, + "when_in_range": -1, + "when_out_of_range": "gm4_sky_dimension:erosion/normal/middle/terrain_underside" +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/gradient_carver.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/gradient_carver.json new file mode 100644 index 0000000000..83eb2378aa --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/gradient_carver.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 266, + "to_y": 16, + "from_value": -1.5, + "to_value": 0 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/gradient_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/gradient_topside.json new file mode 100644 index 0000000000..e9584322bd --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/gradient_topside.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 346, + "to_y": 106, + "from_value": -2, + "to_value": 0 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/gradient_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/gradient_underside.json new file mode 100644 index 0000000000..3c57da41f2 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/gradient_underside.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 236, + "to_y": 56, + "from_value": 0, + "to_value": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/terrain_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/terrain_topside.json new file mode 100644 index 0000000000..d829cb170b --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/terrain_topside.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/normal/middle/gradient_topside", + "argument2": { + "type": "minecraft:add", + "argument1": 0.5, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion/middle", + "xz_scale": 0, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/terrain_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/terrain_underside.json new file mode 100644 index 0000000000..e236aec758 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/terrain_underside.json @@ -0,0 +1,39 @@ +{ + "type": "minecraft:range_choice", + "input": { + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/normal/middle/gradient_underside", + "argument2": { + "type": "minecraft:mul", + "argument1": 0.4, + "argument2": { + "type": "minecraft:add", + "argument1": 0.2, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion/middle", + "xz_scale": 4, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } + }, + "argument2": -1 + }, + "min_inclusive": -1000000, + "max_exclusive": 0, + "when_in_range": { + "type": "minecraft:add", + "argument1": 1, + "argument2": "gm4_sky_dimension:erosion/normal/middle/gradient_underside" + }, + "when_out_of_range": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/total.json new file mode 100644 index 0000000000..bf9757e5b9 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/total.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:range_choice", + "input": "gm4_sky_dimension:erosion/normal/middle/terrain_topside", + "min_inclusive": 0, + "max_exclusive": 1000000, + "when_in_range": "gm4_sky_dimension:erosion/normal/middle/carver_underside", + "when_out_of_range": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/carver_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/carver_underside.json new file mode 100644 index 0000000000..40030ddce3 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/carver_underside.json @@ -0,0 +1,82 @@ +{ + "type": "minecraft:range_choice", + "input": { + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/normal/middle/gradient_carver", + "argument2": { + "type": "minecraft:mul", + "argument1": -2, + "argument2": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:y_clamped_gradient", + "from_y": 384, + "to_y": 0, + "from_value": 0, + "to_value": -1.5 + }, + "argument2": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/vegetation", + "points": [ + { + "location": -1, + "derivative": 0, + "value": 0 + }, + { + "location": -0.75, + "derivative": 0, + "value": 0.5 + }, + { + "location": -0.5, + "derivative": 0, + "value": 0.5 + }, + { + "location": -0.25, + "derivative": 0, + "value": 0 + }, + { + "location": 0, + "derivative": 0, + "value": 0.5 + }, + { + "location": 0.25, + "derivative": 0, + "value": 0.5 + }, + { + "location": 0.5, + "derivative": 0, + "value": 0 + }, + { + "location": 0.75, + "derivative": 0, + "value": 0.5 + }, + { + "location": 1, + "derivative": 0, + "value": 0.5 + } + ] + } + } + } + } + }, + "argument2": -1 + }, + "min_inclusive": -1000000, + "max_exclusive": 0, + "when_in_range": -1, + "when_out_of_range": "gm4_sky_dimension:erosion/normal/middle/terrain_underside" +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/gradient_carver.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/gradient_carver.json new file mode 100644 index 0000000000..83eb2378aa --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/gradient_carver.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 266, + "to_y": 16, + "from_value": -1.5, + "to_value": 0 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/gradient_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/gradient_topside.json new file mode 100644 index 0000000000..e9584322bd --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/gradient_topside.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 346, + "to_y": 106, + "from_value": -2, + "to_value": 0 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/gradient_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/gradient_underside.json new file mode 100644 index 0000000000..3c57da41f2 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/gradient_underside.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 236, + "to_y": 56, + "from_value": 0, + "to_value": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/terrain_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/terrain_topside.json new file mode 100644 index 0000000000..d829cb170b --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/terrain_topside.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/normal/middle/gradient_topside", + "argument2": { + "type": "minecraft:add", + "argument1": 0.5, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion/middle", + "xz_scale": 0, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/terrain_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/terrain_underside.json new file mode 100644 index 0000000000..e236aec758 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/terrain_underside.json @@ -0,0 +1,39 @@ +{ + "type": "minecraft:range_choice", + "input": { + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/normal/middle/gradient_underside", + "argument2": { + "type": "minecraft:mul", + "argument1": 0.4, + "argument2": { + "type": "minecraft:add", + "argument1": 0.2, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion/middle", + "xz_scale": 4, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } + }, + "argument2": -1 + }, + "min_inclusive": -1000000, + "max_exclusive": 0, + "when_in_range": { + "type": "minecraft:add", + "argument1": 1, + "argument2": "gm4_sky_dimension:erosion/normal/middle/gradient_underside" + }, + "when_out_of_range": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/total.json new file mode 100644 index 0000000000..bf9757e5b9 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/total.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:range_choice", + "input": "gm4_sky_dimension:erosion/normal/middle/terrain_topside", + "min_inclusive": 0, + "max_exclusive": 1000000, + "when_in_range": "gm4_sky_dimension:erosion/normal/middle/carver_underside", + "when_out_of_range": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json index a8e1d0aa27..7eaa235256 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json @@ -1,5 +1,17 @@ { - "type": "minecraft:add", - "argument1": 0, - "argument2": "gm4_sky_dimension:erosion/normal/middle/total" + "type": "minecraft:max", + "argument1": { + "type": "minecraft:max", + "argument1": { + "type": "minecraft:max", + "argument1": "gm4_sky_dimension:erosion/normal/middle/total", + "argument2": "gm4_sky_dimension:erosion/normal/mid_top/total" + }, + "argument2": "gm4_sky_dimension:erosion/normal/mid_bottom/total" + }, + "argument2": { + "type": "minecraft:max", + "argument1": "gm4_sky_dimension:erosion/normal/top/total", + "argument2": "gm4_sky_dimension:erosion/normal/bottom/total" + } } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/bottom.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/bottom.json new file mode 100644 index 0000000000..24a6ee93dd --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/bottom.json @@ -0,0 +1,9 @@ +{ + "firstOctave": -8, + "amplitudes": [ + 1, + 1, + 1, + 1 + ] +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/mid_bottom.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/mid_bottom.json new file mode 100644 index 0000000000..24a6ee93dd --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/mid_bottom.json @@ -0,0 +1,9 @@ +{ + "firstOctave": -8, + "amplitudes": [ + 1, + 1, + 1, + 1 + ] +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/mid_top.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/mid_top.json new file mode 100644 index 0000000000..24a6ee93dd --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/mid_top.json @@ -0,0 +1,9 @@ +{ + "firstOctave": -8, + "amplitudes": [ + 1, + 1, + 1, + 1 + ] +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/top.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/top.json new file mode 100644 index 0000000000..24a6ee93dd --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/top.json @@ -0,0 +1,9 @@ +{ + "firstOctave": -8, + "amplitudes": [ + 1, + 1, + 1, + 1 + ] +} From fb6d1f88acefaf5f4309e3c3500b42afb936729c Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Wed, 27 Dec 2023 02:13:19 -0800 Subject: [PATCH 11/35] 4 layer dimension - fix bottom layer not appearing due to continent land mass df - add wispy islands - tweak heights --- .../continents/land_mass.json | 81 ++++++++++-------- .../continents/sea_level.json | 6 +- .../normal/mid_top/carver_underside.json | 82 ------------------- .../normal/mid_top/gradient_carver.json | 7 -- .../normal/mid_top/gradient_topside.json | 7 -- .../normal/mid_top/gradient_underside.json | 7 -- .../normal/mid_top/terrain_topside.json | 23 ------ .../normal/mid_top/terrain_underside.json | 39 --------- .../erosion/normal/mid_top/total.json | 8 -- .../erosion/normal/top/carver_underside.json | 46 ++++++++++- .../erosion/normal/top/gradient_carver.json | 4 +- .../erosion/normal/top/gradient_topside.json | 4 +- .../normal/top/gradient_underside.json | 4 +- .../erosion/normal/top/terrain_topside.json | 4 +- .../erosion/normal/top/terrain_underside.json | 10 +-- .../erosion/normal/top/total.json | 4 +- .../density_function/erosion/total.json | 6 +- .../worldgen/noise/erosion/mid_top.json | 9 -- 18 files changed, 108 insertions(+), 243 deletions(-) delete mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/carver_underside.json delete mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/gradient_carver.json delete mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/gradient_topside.json delete mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/gradient_underside.json delete mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/terrain_topside.json delete mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/terrain_underside.json delete mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/total.json delete mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/mid_top.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/land_mass.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/land_mass.json index 1d6ae7de0d..f4ba516fe3 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/land_mass.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/land_mass.json @@ -47,49 +47,60 @@ "min_inclusive": 0, "max_exclusive": 192, "when_in_range": { - "type": "minecraft:mul", + "type": "minecraft:add", "argument1": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/normal/middle/gradient_carver", + "argument1": { + "type": "minecraft:y_clamped_gradient", + "from_y": 32, + "to_y": 0, + "from_value": 0.8, + "to_value": -0.4 + }, "argument2": { - "type": "minecraft:mul", - "argument1": -1.5, - "argument2": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:y_clamped_gradient", - "from_y": 384, - "to_y": 0, - "from_value": 0, - "to_value": -0.1 - }, + "type": "minecraft:add", + "argument1": { + "type": "minecraft:mul", + "argument1": -0.4, "argument2": { - "type": "minecraft:spline", - "spline": { - "coordinate": "gm4_sky_dimension:routers/continents", - "points": [ - { - "location": -0.8, - "derivative": 0, - "value": -2 - }, - { - "location": -0.5, - "derivative": 0, - "value": -0.5 - }, - { - "location": -0.43, - "derivative": 0, - "value": 0 - } - ] - } + "type": "minecraft:noise", + "noise": "gm4_sky_dimension:continentalness", + "xz_scale": 7, + "y_scale": 0 } + }, + "argument2": { + "type": "minecraft:quarter_negative", + "argument": "gm4_sky_dimension:routers/continents" } } }, - "argument2": -1 + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/continents", + "points": [ + { + "location": -0.8, + "derivative": 0, + "value": -2 + }, + { + "location": -0.5, + "derivative": 0, + "value": -1.5 + }, + { + "location": -0.43, + "derivative": 0, + "value": 0 + } + ] + } + } + } }, "when_out_of_range": 0 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/sea_level.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/sea_level.json index 5e0bd52ae0..3948203c91 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/sea_level.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/sea_level.json @@ -7,7 +7,7 @@ "max_exclusive": 170, "when_in_range": { "type": "minecraft:y_clamped_gradient", - "from_y": 16, + "from_y": -32, "to_y": 170, "from_value": -1, "to_value": 0 @@ -24,10 +24,10 @@ "type": "minecraft:range_choice", "input": "minecraft:y", "min_inclusive": 192, - "max_exclusive": 336, + "max_exclusive": 366, "when_in_range": { "type": "minecraft:y_clamped_gradient", - "from_y": 336, + "from_y": 512, "to_y": 192, "from_value": -1, "to_value": 0 diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/carver_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/carver_underside.json deleted file mode 100644 index 40030ddce3..0000000000 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/carver_underside.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "type": "minecraft:range_choice", - "input": { - "type": "minecraft:mul", - "argument1": { - "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/normal/middle/gradient_carver", - "argument2": { - "type": "minecraft:mul", - "argument1": -2, - "argument2": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:y_clamped_gradient", - "from_y": 384, - "to_y": 0, - "from_value": 0, - "to_value": -1.5 - }, - "argument2": { - "type": "minecraft:spline", - "spline": { - "coordinate": "gm4_sky_dimension:routers/vegetation", - "points": [ - { - "location": -1, - "derivative": 0, - "value": 0 - }, - { - "location": -0.75, - "derivative": 0, - "value": 0.5 - }, - { - "location": -0.5, - "derivative": 0, - "value": 0.5 - }, - { - "location": -0.25, - "derivative": 0, - "value": 0 - }, - { - "location": 0, - "derivative": 0, - "value": 0.5 - }, - { - "location": 0.25, - "derivative": 0, - "value": 0.5 - }, - { - "location": 0.5, - "derivative": 0, - "value": 0 - }, - { - "location": 0.75, - "derivative": 0, - "value": 0.5 - }, - { - "location": 1, - "derivative": 0, - "value": 0.5 - } - ] - } - } - } - } - }, - "argument2": -1 - }, - "min_inclusive": -1000000, - "max_exclusive": 0, - "when_in_range": -1, - "when_out_of_range": "gm4_sky_dimension:erosion/normal/middle/terrain_underside" -} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/gradient_carver.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/gradient_carver.json deleted file mode 100644 index 83eb2378aa..0000000000 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/gradient_carver.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "minecraft:y_clamped_gradient", - "from_y": 266, - "to_y": 16, - "from_value": -1.5, - "to_value": 0 -} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/gradient_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/gradient_topside.json deleted file mode 100644 index e9584322bd..0000000000 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/gradient_topside.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "minecraft:y_clamped_gradient", - "from_y": 346, - "to_y": 106, - "from_value": -2, - "to_value": 0 -} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/gradient_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/gradient_underside.json deleted file mode 100644 index 3c57da41f2..0000000000 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/gradient_underside.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "minecraft:y_clamped_gradient", - "from_y": 236, - "to_y": 56, - "from_value": 0, - "to_value": -1 -} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/terrain_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/terrain_topside.json deleted file mode 100644 index d829cb170b..0000000000 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/terrain_topside.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/normal/middle/gradient_topside", - "argument2": { - "type": "minecraft:add", - "argument1": 0.5, - "argument2": { - "type": "minecraft:abs", - "argument": { - "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/middle", - "xz_scale": 0, - "y_scale": 0, - "shift_x": "minecraft:shift_x", - "shift_y": 0, - "shift_z": "minecraft:shift_z" - } - } - } - } -} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/terrain_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/terrain_underside.json deleted file mode 100644 index e236aec758..0000000000 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/terrain_underside.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "minecraft:range_choice", - "input": { - "type": "minecraft:mul", - "argument1": { - "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/normal/middle/gradient_underside", - "argument2": { - "type": "minecraft:mul", - "argument1": 0.4, - "argument2": { - "type": "minecraft:add", - "argument1": 0.2, - "argument2": { - "type": "minecraft:abs", - "argument": { - "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/middle", - "xz_scale": 4, - "y_scale": 0, - "shift_x": "minecraft:shift_x", - "shift_y": 0, - "shift_z": "minecraft:shift_z" - } - } - } - } - }, - "argument2": -1 - }, - "min_inclusive": -1000000, - "max_exclusive": 0, - "when_in_range": { - "type": "minecraft:add", - "argument1": 1, - "argument2": "gm4_sky_dimension:erosion/normal/middle/gradient_underside" - }, - "when_out_of_range": -1 -} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/total.json deleted file mode 100644 index bf9757e5b9..0000000000 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_top/total.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:range_choice", - "input": "gm4_sky_dimension:erosion/normal/middle/terrain_topside", - "min_inclusive": 0, - "max_exclusive": 1000000, - "when_in_range": "gm4_sky_dimension:erosion/normal/middle/carver_underside", - "when_out_of_range": -1 -} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/carver_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/carver_underside.json index 40030ddce3..0e0f62b47e 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/carver_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/carver_underside.json @@ -4,7 +4,7 @@ "type": "minecraft:mul", "argument1": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/normal/middle/gradient_carver", + "argument1": "gm4_sky_dimension:erosion/normal/top/gradient_carver", "argument2": { "type": "minecraft:mul", "argument1": -2, @@ -15,7 +15,7 @@ "from_y": 384, "to_y": 0, "from_value": 0, - "to_value": -1.5 + "to_value": -5.7 }, "argument2": { "type": "minecraft:spline", @@ -27,41 +27,81 @@ "derivative": 0, "value": 0 }, + { + "location": -0.875, + "derivative": 0, + "value": 0 + }, { "location": -0.75, "derivative": 0, "value": 0.5 }, + { + "location": -0.625, + "derivative": 0, + "value": 0 + }, { "location": -0.5, "derivative": 0, "value": 0.5 }, + { + "location": -0.375, + "derivative": 0, + "value": 0 + }, { "location": -0.25, "derivative": 0, "value": 0 }, + { + "location": -0.125, + "derivative": 0, + "value": 0 + }, { "location": 0, "derivative": 0, "value": 0.5 }, + { + "location": 0.125, + "derivative": 0, + "value": 0 + }, { "location": 0.25, "derivative": 0, "value": 0.5 }, + { + "location": 0.375, + "derivative": 0, + "value": 0 + }, { "location": 0.5, "derivative": 0, "value": 0 }, + { + "location": 0.625, + "derivative": 0, + "value": 0 + }, { "location": 0.75, "derivative": 0, "value": 0.5 }, + { + "location": 0.875, + "derivative": 0, + "value": 0 + }, { "location": 1, "derivative": 0, @@ -78,5 +118,5 @@ "min_inclusive": -1000000, "max_exclusive": 0, "when_in_range": -1, - "when_out_of_range": "gm4_sky_dimension:erosion/normal/middle/terrain_underside" + "when_out_of_range": "gm4_sky_dimension:erosion/normal/top/terrain_underside" } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/gradient_carver.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/gradient_carver.json index 83eb2378aa..41ef7b4fcd 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/gradient_carver.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/gradient_carver.json @@ -1,7 +1,7 @@ { "type": "minecraft:y_clamped_gradient", - "from_y": 266, - "to_y": 16, + "from_y": 386, + "to_y": 216, "from_value": -1.5, "to_value": 0 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/gradient_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/gradient_topside.json index e9584322bd..c069f6ee38 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/gradient_topside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/gradient_topside.json @@ -1,7 +1,7 @@ { "type": "minecraft:y_clamped_gradient", - "from_y": 346, - "to_y": 106, + "from_y": 384, + "to_y": 276, "from_value": -2, "to_value": 0 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/gradient_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/gradient_underside.json index 3c57da41f2..6a0c863c18 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/gradient_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/gradient_underside.json @@ -1,7 +1,7 @@ { "type": "minecraft:y_clamped_gradient", - "from_y": 236, - "to_y": 56, + "from_y": 356, + "to_y": 266, "from_value": 0, "to_value": -1 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/terrain_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/terrain_topside.json index d829cb170b..2d70d6f993 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/terrain_topside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/terrain_topside.json @@ -2,7 +2,7 @@ "type": "minecraft:interpolated", "argument": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/normal/middle/gradient_topside", + "argument1": "gm4_sky_dimension:erosion/normal/top/gradient_topside", "argument2": { "type": "minecraft:add", "argument1": 0.5, @@ -10,7 +10,7 @@ "type": "minecraft:abs", "argument": { "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/middle", + "noise": "gm4_sky_dimension:erosion/top", "xz_scale": 0, "y_scale": 0, "shift_x": "minecraft:shift_x", diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/terrain_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/terrain_underside.json index e236aec758..069e61619e 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/terrain_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/terrain_underside.json @@ -4,10 +4,10 @@ "type": "minecraft:mul", "argument1": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/normal/middle/gradient_underside", + "argument1": "gm4_sky_dimension:erosion/normal/top/gradient_underside", "argument2": { "type": "minecraft:mul", - "argument1": 0.4, + "argument1": 0.7, "argument2": { "type": "minecraft:add", "argument1": 0.2, @@ -15,8 +15,8 @@ "type": "minecraft:abs", "argument": { "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/middle", - "xz_scale": 4, + "noise": "gm4_sky_dimension:erosion/top", + "xz_scale": 3, "y_scale": 0, "shift_x": "minecraft:shift_x", "shift_y": 0, @@ -33,7 +33,7 @@ "when_in_range": { "type": "minecraft:add", "argument1": 1, - "argument2": "gm4_sky_dimension:erosion/normal/middle/gradient_underside" + "argument2": "gm4_sky_dimension:erosion/normal/top/gradient_underside" }, "when_out_of_range": -1 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/total.json index bf9757e5b9..8e6402f9d3 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/total.json @@ -1,8 +1,8 @@ { "type": "minecraft:range_choice", - "input": "gm4_sky_dimension:erosion/normal/middle/terrain_topside", + "input": "gm4_sky_dimension:erosion/normal/top/terrain_topside", "min_inclusive": 0, "max_exclusive": 1000000, - "when_in_range": "gm4_sky_dimension:erosion/normal/middle/carver_underside", + "when_in_range": "gm4_sky_dimension:erosion/normal/top/carver_underside", "when_out_of_range": -1 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json index 7eaa235256..68e7faab13 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json @@ -2,11 +2,7 @@ "type": "minecraft:max", "argument1": { "type": "minecraft:max", - "argument1": { - "type": "minecraft:max", - "argument1": "gm4_sky_dimension:erosion/normal/middle/total", - "argument2": "gm4_sky_dimension:erosion/normal/mid_top/total" - }, + "argument1": "gm4_sky_dimension:erosion/normal/middle/total", "argument2": "gm4_sky_dimension:erosion/normal/mid_bottom/total" }, "argument2": { diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/mid_top.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/mid_top.json deleted file mode 100644 index 24a6ee93dd..0000000000 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/mid_top.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "firstOctave": -8, - "amplitudes": [ - 1, - 1, - 1, - 1 - ] -} From a2b2685edde073c30ecf805ec429cd83c90f99ca Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Wed, 27 Dec 2023 22:49:01 -0800 Subject: [PATCH 12/35] make island bands closer - move up bottom and mid bottom layers to be closer to the main layer - bottom layer islands no longer generate in areas of low continentalness --- .../worldgen/density_function/continents/land_mass.json | 8 ++++---- .../erosion/normal/bottom/gradient_carver.json | 2 +- .../erosion/normal/bottom/gradient_topside.json | 4 ++-- .../erosion/normal/bottom/gradient_underside.json | 4 ++-- .../erosion/normal/mid_bottom/carver_underside.json | 2 +- .../erosion/normal/mid_bottom/gradient_carver.json | 4 ++-- .../erosion/normal/mid_bottom/gradient_topside.json | 4 ++-- .../erosion/normal/mid_bottom/gradient_underside.json | 2 +- .../erosion/normal/mid_bottom/terrain_underside.json | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/land_mass.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/land_mass.json index f4ba516fe3..3a97fb82d4 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/land_mass.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/land_mass.json @@ -52,8 +52,8 @@ "type": "minecraft:add", "argument1": { "type": "minecraft:y_clamped_gradient", - "from_y": 32, - "to_y": 0, + "from_y": 192, + "to_y": 48, "from_value": 0.8, "to_value": -0.4 }, @@ -61,11 +61,11 @@ "type": "minecraft:add", "argument1": { "type": "minecraft:mul", - "argument1": -0.4, + "argument1": -0.3, "argument2": { "type": "minecraft:noise", "noise": "gm4_sky_dimension:continentalness", - "xz_scale": 7, + "xz_scale": 5, "y_scale": 0 } }, diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_carver.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_carver.json index a0535d91b7..0631e75712 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_carver.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_carver.json @@ -1,6 +1,6 @@ { "type": "minecraft:y_clamped_gradient", - "from_y": 16, + "from_y": 140, "to_y": 0, "from_value": -1.5, "to_value": 0 diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_topside.json index d86d601d28..46d3f9b9df 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_topside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_topside.json @@ -1,7 +1,7 @@ { "type": "minecraft:y_clamped_gradient", - "from_y": 60, - "to_y": 16, + "from_y": 110, + "to_y": 50, "from_value": -2, "to_value": 0 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_underside.json index 1a6f8b3d5e..4de4f348b2 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_underside.json @@ -1,7 +1,7 @@ { "type": "minecraft:y_clamped_gradient", - "from_y": 60, - "to_y": 0, + "from_y": 110, + "to_y": 16, "from_value": 0, "to_value": -1 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/carver_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/carver_underside.json index b992390ba5..659da070eb 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/carver_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/carver_underside.json @@ -50,7 +50,7 @@ { "location": 0.25, "derivative": 0, - "value": 0.5 + "value": 0.4 }, { "location": 0.5, diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_carver.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_carver.json index 950280889d..3dfb5a5257 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_carver.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_carver.json @@ -1,7 +1,7 @@ { "type": "minecraft:y_clamped_gradient", - "from_y": 192, - "to_y": -64, + "from_y": 200, + "to_y": 0, "from_value": -1.5, "to_value": 0 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_topside.json index 93aa2da5cc..7039d3f708 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_topside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_topside.json @@ -1,7 +1,7 @@ { "type": "minecraft:y_clamped_gradient", - "from_y": 180, - "to_y": 32, + "from_y": 190, + "to_y": 100, "from_value": -2, "to_value": 0 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_underside.json index 2b9c11b752..049746895b 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_underside.json @@ -1,6 +1,6 @@ { "type": "minecraft:y_clamped_gradient", - "from_y": 140, + "from_y": 160, "to_y": 0, "from_value": 0, "to_value": -1 diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/terrain_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/terrain_underside.json index d4ff99cb21..ec9ba4d5aa 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/terrain_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/terrain_underside.json @@ -10,7 +10,7 @@ "argument1": 0.4, "argument2": { "type": "minecraft:add", - "argument1": 0.2, + "argument1": 0.1, "argument2": { "type": "minecraft:abs", "argument": { From 6b576c9ecb8ed6e4c4467ff294fee49df386cfd8 Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Wed, 27 Dec 2023 22:56:16 -0800 Subject: [PATCH 13/35] add beet.yaml - got tired of it sending a failure notification/email --- gm4_sky_dimension/beet.yaml | 23 +++++++++++++++++++++++ gm4_sky_dimension/pack.mcmeta | 6 ------ 2 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 gm4_sky_dimension/beet.yaml delete mode 100644 gm4_sky_dimension/pack.mcmeta diff --git a/gm4_sky_dimension/beet.yaml b/gm4_sky_dimension/beet.yaml new file mode 100644 index 0000000000..1893d0a4b3 --- /dev/null +++ b/gm4_sky_dimension/beet.yaml @@ -0,0 +1,23 @@ +id: gm4_sky_dimension +name: Sky Dimension +version: 1.0.X + +data_pack: + load: . + +pipeline: + - gm4.plugins.extend.module + +meta: + gm4: + versioning: + schedule_loops: [] + website: + description: Soar high to reach and explore the Sky Dimension, Celesterra! + recommended: [] + notes: [] + video: null + wiki: https://wiki.gm4.co/wiki/Sky_Dimension + credits: + Creator: + - BluePsychoRanger diff --git a/gm4_sky_dimension/pack.mcmeta b/gm4_sky_dimension/pack.mcmeta deleted file mode 100644 index 12cf462878..0000000000 --- a/gm4_sky_dimension/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack": { - "pack_format": 26, - "description": "" - } -} From aa670a30267a2a8caf60d260b3967788891898b5 Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Thu, 28 Dec 2023 01:43:21 -0800 Subject: [PATCH 14/35] high erosion (rough draft) - make high erosion areas "shattered" into many small islands --- .../dimension/celesterra.json | 9 ++-- .../density_function/erosion/high/carver.json | 5 +++ .../density_function/erosion/high/noise.json | 42 +++++++++++++++++++ .../density_function/erosion/high/total.json | 22 ++++++++++ .../erosion/normal/total.json | 13 ++++++ .../density_function/erosion/total.json | 14 ++----- 6 files changed, 91 insertions(+), 14 deletions(-) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/carver.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/noise.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/total.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/total.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json index 71201227dc..fa61ae6c2d 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json @@ -9,13 +9,16 @@ { "biome": "minecraft:small_end_islands", "parameters": { - "temperature": 0, + "temperature": [ + -1, + 1 + ], "humidity": [ -1, 1 ], "continentalness": [ - -1, + -0.485, 1 ], "erosion": [ @@ -44,7 +47,7 @@ ], "erosion": [ -1, - 0.7 + 1 ], "weirdness": 0, "depth": 0, diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/carver.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/carver.json new file mode 100644 index 0000000000..e562f81b1b --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/carver.json @@ -0,0 +1,5 @@ +{ + "type": "minecraft:min", + "argument1": "gm4_sky_dimension:erosion/normal/total", + "argument2": "gm4_sky_dimension:erosion/high/noise" +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/noise.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/noise.json new file mode 100644 index 0000000000..42a9d6f9ff --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/noise.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:range_choice", + "input": "minecraft:y", + "min_inclusive": 0, + "max_exclusive": 384, + "when_in_range": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:mul", + "argument1": 4, + "argument2": { + "type": "minecraft:add", + "argument1": -0.5, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:vegetation", + "xz_scale": 5, + "y_scale": 5, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + }, + "argument2": { + "type": "minecraft:add", + "argument1": 0.1, + "argument2": { + "type": "minecraft:mul", + "argument1": -0.3, + "argument2": { + "type": "minecraft:abs", + "argument": "gm4_sky_dimension:routers/erosion" + } + } + } + }, + "when_out_of_range": 0 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/total.json new file mode 100644 index 0000000000..b41eb3290b --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/total.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:mul", + "argument1": "gm4_sky_dimension:erosion/high/carver", + "argument2": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/erosion", + "points": [ + { + "location": 0.695, + "derivative": 0, + "value": 0 + }, + { + "location": 0.7, + "derivative": 0, + "value": 1 + } + ] + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/total.json new file mode 100644 index 0000000000..68e7faab13 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/total.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:max", + "argument1": { + "type": "minecraft:max", + "argument1": "gm4_sky_dimension:erosion/normal/middle/total", + "argument2": "gm4_sky_dimension:erosion/normal/mid_bottom/total" + }, + "argument2": { + "type": "minecraft:max", + "argument1": "gm4_sky_dimension:erosion/normal/top/total", + "argument2": "gm4_sky_dimension:erosion/normal/bottom/total" + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json index 68e7faab13..1e8435c778 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json @@ -1,13 +1,5 @@ { - "type": "minecraft:max", - "argument1": { - "type": "minecraft:max", - "argument1": "gm4_sky_dimension:erosion/normal/middle/total", - "argument2": "gm4_sky_dimension:erosion/normal/mid_bottom/total" - }, - "argument2": { - "type": "minecraft:max", - "argument1": "gm4_sky_dimension:erosion/normal/top/total", - "argument2": "gm4_sky_dimension:erosion/normal/bottom/total" - } + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/normal/total", + "argument2": "gm4_sky_dimension:erosion/high/total" } From 7e408ca5ee074fbebd1fb7dfb8114f555a2357a6 Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Fri, 29 Dec 2023 18:36:02 -0800 Subject: [PATCH 15/35] low and high erosion - high erosion: normal terrain split into small blobs - low erosion: huge islands --- .../dimension/celesterra.json | 88 ++++++++++++++---- .../density_function/erosion/high/carver.json | 5 - .../density_function/erosion/high/noise.json | 4 +- .../density_function/erosion/high/total.json | 23 +---- .../huge_islands/main/carver_underside.json | 82 +++++++++++++++++ .../huge_islands/main/gradient_carver.json | 7 ++ .../huge_islands/main/gradient_topside.json | 7 ++ .../huge_islands/main/gradient_underside.json | 7 ++ .../huge_islands/main/terrain_topside.json | 23 +++++ .../huge_islands/main/terrain_underside.json | 39 ++++++++ .../erosion/huge_islands/main/total.json | 8 ++ .../erosion/huge_islands/total.json | 5 + .../density_function/erosion/total.json | 92 ++++++++++++++++++- .../density_function/routers/erosion.json | 2 +- 14 files changed, 341 insertions(+), 51 deletions(-) delete mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/carver.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/carver_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/gradient_carver.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/gradient_topside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/gradient_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/terrain_topside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/terrain_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/total.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/total.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json index fa61ae6c2d..0f3afa94b2 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json @@ -7,7 +7,31 @@ "type": "minecraft:multi_noise", "biomes": [ { - "biome": "minecraft:small_end_islands", + "biome": "minecraft:bamboo_jungle", + "parameters": { + "temperature": [ + -1, + 1 + ], + "humidity": [ + -1, + 1 + ], + "continentalness": [ + -0.485, + 1 + ], + "erosion": [ + -1, + -0.5 + ], + "weirdness": 0, + "depth": 0, + "offset": 0 + } + }, + { + "biome": "minecraft:beach", "parameters": { "temperature": [ -1, @@ -31,7 +55,7 @@ } }, { - "biome": "minecraft:end_highlands", + "biome": "minecraft:ocean", "parameters": { "temperature": [ -1, @@ -70,7 +94,7 @@ 1 ], "erosion": [ - -1, + -0.5, 0.7 ], "weirdness": 0, @@ -94,7 +118,7 @@ 1 ], "erosion": [ - -1, + -0.5, 0.7 ], "weirdness": 0, @@ -118,7 +142,7 @@ 1 ], "erosion": [ - -1, + -0.5, 0.7 ], "weirdness": 0, @@ -142,7 +166,7 @@ 1 ], "erosion": [ - -1, + -0.5, 0.7 ], "weirdness": 0, @@ -158,7 +182,31 @@ -0.3 ], "humidity": [ - 0.4, + -0.25, + 0.5 + ], + "continentalness": [ + -0.485, + 1 + ], + "erosion": [ + -0.5, + 0.7 + ], + "weirdness": 0, + "depth": 0, + "offset": 0 + } + }, + { + "biome": "minecraft:taiga", + "parameters": { + "temperature": [ + -0.6, + -0.3 + ], + "humidity": [ + 0.5, 1 ], "continentalness": [ @@ -166,7 +214,7 @@ 1 ], "erosion": [ - -1, + -0.5, 0.7 ], "weirdness": 0, @@ -190,7 +238,7 @@ 1 ], "erosion": [ - -1, + -0.5, 0.7 ], "weirdness": 0, @@ -214,7 +262,7 @@ 1 ], "erosion": [ - -1, + -0.5, 0.7 ], "weirdness": 0, @@ -238,7 +286,7 @@ 1 ], "erosion": [ - -1, + -0.5, 0.7 ], "weirdness": 0, @@ -262,7 +310,7 @@ 1 ], "erosion": [ - -1, + -0.5, 0.7 ], "weirdness": 0, @@ -286,7 +334,7 @@ 1 ], "erosion": [ - -1, + -0.5, 0.7 ], "weirdness": 0, @@ -310,7 +358,7 @@ 1 ], "erosion": [ - -1, + -0.5, 0.7 ], "weirdness": 0, @@ -334,7 +382,7 @@ 1 ], "erosion": [ - -1, + -0.5, 0.7 ], "weirdness": 0, @@ -358,7 +406,7 @@ 1 ], "erosion": [ - -1, + -0.5, 0.7 ], "weirdness": 0, @@ -382,7 +430,7 @@ 1 ], "erosion": [ - -1, + -0.5, 0.7 ], "weirdness": 0, @@ -406,7 +454,7 @@ 1 ], "erosion": [ - -1, + -0.5, 0.7 ], "weirdness": 0, @@ -430,7 +478,7 @@ 1 ], "erosion": [ - -1, + -0.5, 0.7 ], "weirdness": 0, @@ -454,7 +502,7 @@ 1 ], "erosion": [ - -1, + -0.5, 0.7 ], "weirdness": 0, diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/carver.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/carver.json deleted file mode 100644 index e562f81b1b..0000000000 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/carver.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "minecraft:min", - "argument1": "gm4_sky_dimension:erosion/normal/total", - "argument2": "gm4_sky_dimension:erosion/high/noise" -} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/noise.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/noise.json index 42a9d6f9ff..fa720bcff8 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/noise.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/noise.json @@ -7,10 +7,10 @@ "type": "minecraft:add", "argument1": { "type": "minecraft:mul", - "argument1": 4, + "argument1": 2, "argument2": { "type": "minecraft:add", - "argument1": -0.5, + "argument1": -0.3, "argument2": { "type": "minecraft:abs", "argument": { diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/total.json index b41eb3290b..e562f81b1b 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/total.json @@ -1,22 +1,5 @@ { - "type": "minecraft:mul", - "argument1": "gm4_sky_dimension:erosion/high/carver", - "argument2": { - "type": "minecraft:spline", - "spline": { - "coordinate": "gm4_sky_dimension:routers/erosion", - "points": [ - { - "location": 0.695, - "derivative": 0, - "value": 0 - }, - { - "location": 0.7, - "derivative": 0, - "value": 1 - } - ] - } - } + "type": "minecraft:min", + "argument1": "gm4_sky_dimension:erosion/normal/total", + "argument2": "gm4_sky_dimension:erosion/high/noise" } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/carver_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/carver_underside.json new file mode 100644 index 0000000000..842ec2ef9f --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/carver_underside.json @@ -0,0 +1,82 @@ +{ + "type": "minecraft:range_choice", + "input": { + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/huge_islands/main/gradient_carver", + "argument2": { + "type": "minecraft:mul", + "argument1": -2, + "argument2": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:y_clamped_gradient", + "from_y": 384, + "to_y": 0, + "from_value": 0, + "to_value": -1.2 + }, + "argument2": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/vegetation", + "points": [ + { + "location": -1, + "derivative": 0, + "value": 0 + }, + { + "location": -0.75, + "derivative": 0, + "value": 0.5 + }, + { + "location": -0.5, + "derivative": 0, + "value": 0.5 + }, + { + "location": -0.25, + "derivative": 0, + "value": 0 + }, + { + "location": 0, + "derivative": 0, + "value": 0.5 + }, + { + "location": 0.25, + "derivative": 0, + "value": 0.5 + }, + { + "location": 0.5, + "derivative": 0, + "value": 0 + }, + { + "location": 0.75, + "derivative": 0, + "value": 0.5 + }, + { + "location": 1, + "derivative": 0, + "value": 0.5 + } + ] + } + } + } + } + }, + "argument2": -1 + }, + "min_inclusive": -1000000, + "max_exclusive": 0, + "when_in_range": -1, + "when_out_of_range": "gm4_sky_dimension:erosion/huge_islands/main/terrain_underside" +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/gradient_carver.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/gradient_carver.json new file mode 100644 index 0000000000..8bdd091829 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/gradient_carver.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 366, + "to_y": -64, + "from_value": -1, + "to_value": 0 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/gradient_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/gradient_topside.json new file mode 100644 index 0000000000..b570b9ae86 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/gradient_topside.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 446, + "to_y": 106, + "from_value": -2, + "to_value": 0 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/gradient_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/gradient_underside.json new file mode 100644 index 0000000000..fb09cf34ca --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/gradient_underside.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 296, + "to_y": 0, + "from_value": 0, + "to_value": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/terrain_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/terrain_topside.json new file mode 100644 index 0000000000..042a5e4027 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/terrain_topside.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/huge_islands/main/gradient_topside", + "argument2": { + "type": "minecraft:add", + "argument1": 0.5, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion/middle", + "xz_scale": 0, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/terrain_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/terrain_underside.json new file mode 100644 index 0000000000..a54910e5fa --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/terrain_underside.json @@ -0,0 +1,39 @@ +{ + "type": "minecraft:range_choice", + "input": { + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/huge_islands/main/gradient_underside", + "argument2": { + "type": "minecraft:mul", + "argument1": 0.4, + "argument2": { + "type": "minecraft:add", + "argument1": 1.2, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion/middle", + "xz_scale": 2, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } + }, + "argument2": -1 + }, + "min_inclusive": -1000000, + "max_exclusive": 0, + "when_in_range": { + "type": "minecraft:add", + "argument1": 1, + "argument2": "gm4_sky_dimension:erosion/huge_islands/main/gradient_underside" + }, + "when_out_of_range": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/total.json new file mode 100644 index 0000000000..56d832ffa9 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/total.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:range_choice", + "input": "gm4_sky_dimension:erosion/huge_islands/main/terrain_topside", + "min_inclusive": 0, + "max_exclusive": 1000000, + "when_in_range": "gm4_sky_dimension:erosion/huge_islands/main/terrain_underside", + "when_out_of_range": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/total.json new file mode 100644 index 0000000000..ba2725d3a1 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/total.json @@ -0,0 +1,5 @@ +{ + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/huge_islands/main/total", + "argument2": 0 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json index 1e8435c778..8f897dfd47 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json @@ -1,5 +1,91 @@ { - "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/normal/total", - "argument2": "gm4_sky_dimension:erosion/high/total" + "type": "minecraft:max", + "argument1": { + "type": "minecraft:max", + "argument1": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/huge_islands/total", + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/erosion", + "points": [ + { + "location": -0.6, + "derivative": 0, + "value": 0 + }, + { + "location": -0.5, + "derivative": 0, + "value": -1 + } + ] + } + } + } + }, + "argument2": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/normal/total", + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/erosion", + "points": [ + { + "location": -0.4, + "derivative": 0, + "value": -1 + }, + { + "location": -0.35, + "derivative": 0, + "value": 0 + }, + { + "location": 0.675, + "derivative": 0, + "value": 0 + }, + { + "location": 0.685, + "derivative": 0, + "value": -1 + } + ] + } + } + } + } + }, + "argument2": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/high/total", + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/erosion", + "points": [ + { + "location": 0.7, + "derivative": 0, + "value": -1 + }, + { + "location": 0.725, + "derivative": 0, + "value": 0 + } + ] + } + } + } + } } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/erosion.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/erosion.json index 040a08c4fa..8a41874158 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/erosion.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/erosion.json @@ -1,5 +1,5 @@ { - "type": "minecraft:flat_cache", + "type": "minecraft:cache_2d", "argument": { "type": "minecraft:shifted_noise", "noise": "gm4_sky_dimension:erosion", From 6a749e9d7f80014d9a84e3b0c7d648c90815fe4f Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Sat, 30 Dec 2023 10:59:07 -0800 Subject: [PATCH 16/35] full island blobs - added full island blobs that span the entire dimension height --- .../dimension/celesterra.json | 64 ++++++--- .../erosion/full_blobs/noise.json | 42 ++++++ .../erosion/full_blobs/total.json | 4 + .../density_function/erosion/total.json | 122 +++++++++++++----- 4 files changed, 181 insertions(+), 51 deletions(-) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/noise.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/total.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json index 0f3afa94b2..d7830b466d 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json @@ -6,6 +6,30 @@ "biome_source": { "type": "minecraft:multi_noise", "biomes": [ + { + "biome": "minecraft:sparse_jungle", + "parameters": { + "temperature": [ + -1, + 1 + ], + "humidity": [ + -1, + 1 + ], + "continentalness": [ + 0.05, + 1 + ], + "erosion": [ + 0.7, + 1 + ], + "weirdness": 0, + "depth": 0, + "offset": 0 + } + }, { "biome": "minecraft:bamboo_jungle", "parameters": { @@ -23,7 +47,7 @@ ], "erosion": [ -1, - -0.5 + -0.75 ], "weirdness": 0, "depth": 0, @@ -43,7 +67,7 @@ ], "continentalness": [ -0.485, - 1 + 0.05 ], "erosion": [ 0.7, @@ -94,7 +118,7 @@ 1 ], "erosion": [ - -0.5, + -0.75, 0.7 ], "weirdness": 0, @@ -118,7 +142,7 @@ 1 ], "erosion": [ - -0.5, + -0.75, 0.7 ], "weirdness": 0, @@ -142,7 +166,7 @@ 1 ], "erosion": [ - -0.5, + -0.75, 0.7 ], "weirdness": 0, @@ -166,7 +190,7 @@ 1 ], "erosion": [ - -0.5, + -0.75, 0.7 ], "weirdness": 0, @@ -190,7 +214,7 @@ 1 ], "erosion": [ - -0.5, + -0.75, 0.7 ], "weirdness": 0, @@ -214,7 +238,7 @@ 1 ], "erosion": [ - -0.5, + -0.75, 0.7 ], "weirdness": 0, @@ -238,7 +262,7 @@ 1 ], "erosion": [ - -0.5, + -0.75, 0.7 ], "weirdness": 0, @@ -262,7 +286,7 @@ 1 ], "erosion": [ - -0.5, + -0.75, 0.7 ], "weirdness": 0, @@ -286,7 +310,7 @@ 1 ], "erosion": [ - -0.5, + -0.75, 0.7 ], "weirdness": 0, @@ -310,7 +334,7 @@ 1 ], "erosion": [ - -0.5, + -0.75, 0.7 ], "weirdness": 0, @@ -334,7 +358,7 @@ 1 ], "erosion": [ - -0.5, + -0.75, 0.7 ], "weirdness": 0, @@ -358,7 +382,7 @@ 1 ], "erosion": [ - -0.5, + -0.75, 0.7 ], "weirdness": 0, @@ -382,7 +406,7 @@ 1 ], "erosion": [ - -0.5, + -0.75, 0.7 ], "weirdness": 0, @@ -406,7 +430,7 @@ 1 ], "erosion": [ - -0.5, + -0.75, 0.7 ], "weirdness": 0, @@ -430,7 +454,7 @@ 1 ], "erosion": [ - -0.5, + -0.75, 0.7 ], "weirdness": 0, @@ -454,7 +478,7 @@ 1 ], "erosion": [ - -0.5, + -0.75, 0.7 ], "weirdness": 0, @@ -478,7 +502,7 @@ 1 ], "erosion": [ - -0.5, + -0.75, 0.7 ], "weirdness": 0, @@ -502,7 +526,7 @@ 1 ], "erosion": [ - -0.5, + -0.75, 0.7 ], "weirdness": 0, diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/noise.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/noise.json new file mode 100644 index 0000000000..7aef121ff4 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/noise.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:range_choice", + "input": "minecraft:y", + "min_inclusive": 0, + "max_exclusive": 384, + "when_in_range": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:mul", + "argument1": 1.5, + "argument2": { + "type": "minecraft:add", + "argument1": -0.6, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:vegetation", + "xz_scale": 10, + "y_scale": 10, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + }, + "argument2": { + "type": "minecraft:add", + "argument1": 0.1, + "argument2": { + "type": "minecraft:mul", + "argument1": -0.3, + "argument2": { + "type": "minecraft:abs", + "argument": "gm4_sky_dimension:routers/erosion" + } + } + } + }, + "when_out_of_range": 0 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/total.json new file mode 100644 index 0000000000..f8f8567997 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/total.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:squeeze", + "argument": "gm4_sky_dimension:erosion/full_blobs/noise" +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json index 8f897dfd47..702f64344e 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json @@ -13,12 +13,12 @@ "coordinate": "gm4_sky_dimension:routers/erosion", "points": [ { - "location": -0.6, + "location": -0.8, "derivative": 0, "value": 0 }, { - "location": -0.5, + "location": -0.75, "derivative": 0, "value": -1 } @@ -27,6 +27,91 @@ } } }, + "argument2": -1 + }, + "argument2": { + "type": "minecraft:max", + "argument1": { + "type": "minecraft:max", + "argument1": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/high/total", + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/erosion", + "points": [ + { + "location": 0.7, + "derivative": 0, + "value": -1 + }, + { + "location": 0.725, + "derivative": 0, + "value": { + "coordinate": "gm4_sky_dimension:routers/continents", + "points": [ + { + "location": 0.04, + "derivative": 0, + "value": 0 + }, + { + "location": 0.05, + "derivative": 0, + "value": -1 + } + ] + } + } + ] + } + } + } + }, + "argument2": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/full_blobs/total", + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/erosion", + "points": [ + { + "location": 0.7, + "derivative": 0, + "value": -1 + }, + { + "location": 0.725, + "derivative": 0, + "value": { + "coordinate": "gm4_sky_dimension:routers/continents", + "points": [ + { + "location": 0.05, + "derivative": 0, + "value": -1 + }, + { + "location": 0.06, + "derivative": 0, + "value": 0 + } + ] + } + } + ] + } + } + } + } + }, "argument2": { "type": "minecraft:add", "argument1": "gm4_sky_dimension:erosion/normal/total", @@ -38,22 +123,22 @@ "coordinate": "gm4_sky_dimension:routers/erosion", "points": [ { - "location": -0.4, + "location": -0.75, "derivative": 0, "value": -1 }, { - "location": -0.35, + "location": -0.7, "derivative": 0, "value": 0 }, { - "location": 0.675, + "location": 0.65, "derivative": 0, "value": 0 }, { - "location": 0.685, + "location": 0.7, "derivative": 0, "value": -1 } @@ -62,30 +147,5 @@ } } } - }, - "argument2": { - "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/high/total", - "argument2": { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:spline", - "spline": { - "coordinate": "gm4_sky_dimension:routers/erosion", - "points": [ - { - "location": 0.7, - "derivative": 0, - "value": -1 - }, - { - "location": 0.725, - "derivative": 0, - "value": 0 - } - ] - } - } - } } } From 631330303fb1e13f12565c6368527514da67fd3b Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Mon, 1 Jan 2024 03:48:33 -0800 Subject: [PATCH 17/35] floating falls --- .../dimension/celesterra.json | 26 ++- .../worldgen/biome/floating_falls.json | 162 ++++++++++++++++++ .../continents/island_groups.json | 65 ------- .../continents/land_mass.json | 107 ------------ .../density_function/continents/total.json | 107 +++++++++++- .../lake/gradient_topside.json} | 6 +- .../lake/gradient_underside.json | 7 + .../floating_falls/lake/terrain_topside.json | 23 +++ .../lake/terrain_underside.json | 39 +++++ .../erosion/floating_falls/lake/total.json | 8 + .../floating_falls/small_islands/islands.json | 21 +++ .../small_islands/sawtooth.json | 133 ++++++++++++++ .../floating_falls/small_islands/total.json | 18 ++ .../small_islands/wavy_sawtooth.json | 21 +++ .../erosion/floating_falls/total.json | 5 + .../erosion/full_blobs/total.json | 8 +- .../density_function/erosion/high/total.json | 8 +- .../huge_islands/main/carver_underside.json | 82 --------- .../erosion/huge_islands/total.json | 6 +- .../erosion/island_groups.json | 68 ++++++++ .../erosion/normal/total.json | 20 ++- .../density_function/erosion/total.json | 61 ++++++- .../worldgen/noise_settings/celesterra.json | 86 ++++++++++ 23 files changed, 808 insertions(+), 279 deletions(-) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/biome/floating_falls.json delete mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/island_groups.json delete mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/land_mass.json rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/{huge_islands/main/gradient_carver.json => floating_falls/lake/gradient_topside.json} (54%) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/gradient_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/terrain_topside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/terrain_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/total.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/islands.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/sawtooth.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/total.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/wavy_sawtooth.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/total.json delete mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/carver_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/island_groups.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json index d7830b466d..3f69e5a9c0 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json @@ -6,6 +6,30 @@ "biome_source": { "type": "minecraft:multi_noise", "biomes": [ + { + "biome": "gm4_sky_dimension:floating_falls", + "parameters": { + "temperature": [ + -1, + 1 + ], + "humidity": [ + -1, + 1 + ], + "continentalness": [ + 0.25, + 1 + ], + "erosion": [ + -1, + -0.75 + ], + "weirdness": 0, + "depth": 0, + "offset": 0 + } + }, { "biome": "minecraft:sparse_jungle", "parameters": { @@ -43,7 +67,7 @@ ], "continentalness": [ -0.485, - 1 + 0.25 ], "erosion": [ -1, diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/biome/floating_falls.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/biome/floating_falls.json new file mode 100644 index 0000000000..e2f111917c --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/biome/floating_falls.json @@ -0,0 +1,162 @@ +{ + "temperature": 1, + "downfall": 1, + "has_precipitation": true, + "temperature_modifier": "none", + "effects": { + "sky_color": 7907327, + "fog_color": 12638463, + "water_color": 4159204, + "water_fog_color": 329011, + "mood_sound": { + "sound": "minecraft:ambient.cave", + "tick_delay": 6000, + "block_search_extent": 8, + "offset": 2 + } + }, + "spawners": { + "ambient": [ + { + "type": "minecraft:bat", + "weight": 10, + "minCount": 8, + "maxCount": 8 + } + ], + "axolotls": [], + "creature": [ + { + "type": "minecraft:turtle", + "weight": 5, + "minCount": 2, + "maxCount": 5 + } + ], + "misc": [], + "monster": [ + { + "type": "minecraft:spider", + "weight": 100, + "minCount": 4, + "maxCount": 4 + }, + { + "type": "minecraft:zombie", + "weight": 95, + "minCount": 4, + "maxCount": 4 + }, + { + "type": "minecraft:zombie_villager", + "weight": 5, + "minCount": 1, + "maxCount": 1 + }, + { + "type": "minecraft:skeleton", + "weight": 100, + "minCount": 4, + "maxCount": 4 + }, + { + "type": "minecraft:creeper", + "weight": 100, + "minCount": 4, + "maxCount": 4 + }, + { + "type": "minecraft:slime", + "weight": 100, + "minCount": 4, + "maxCount": 4 + }, + { + "type": "minecraft:enderman", + "weight": 10, + "minCount": 1, + "maxCount": 4 + }, + { + "type": "minecraft:witch", + "weight": 5, + "minCount": 1, + "maxCount": 1 + } + ], + "underground_water_creature": [ + { + "type": "minecraft:glow_squid", + "weight": 10, + "minCount": 4, + "maxCount": 6 + } + ], + "water_ambient": [], + "water_creature": [] + }, + "spawn_costs": {}, + "carvers": { + "air": [ + "minecraft:cave", + "minecraft:cave_extra_underground", + "minecraft:canyon" + ] + }, + "features": [ + [], + [], + [ + "minecraft:amethyst_geode" + ], + [ + "minecraft:monster_room", + "minecraft:monster_room_deep" + ], + [], + [], + [ + "minecraft:ore_dirt", + "minecraft:ore_granite_upper", + "minecraft:ore_granite_lower", + "minecraft:ore_diorite_upper", + "minecraft:ore_diorite_lower", + "minecraft:ore_andesite_upper", + "minecraft:ore_andesite_lower", + "minecraft:ore_tuff", + "minecraft:ore_coal_upper", + "minecraft:ore_coal_lower", + "minecraft:ore_iron_upper", + "minecraft:ore_iron_middle", + "minecraft:ore_iron_small", + "minecraft:ore_gold", + "minecraft:ore_gold_lower", + "minecraft:ore_redstone", + "minecraft:ore_redstone_lower", + "minecraft:ore_diamond", + "minecraft:ore_diamond_medium", + "minecraft:ore_diamond_large", + "minecraft:ore_diamond_buried", + "minecraft:ore_lapis", + "minecraft:ore_lapis_buried", + "minecraft:ore_copper", + "minecraft:underwater_magma" + ], + [], + [ + "minecraft:spring_water" + ], + [ + "minecraft:glow_lichen", + "minecraft:flower_default", + "minecraft:patch_grass_badlands", + "minecraft:brown_mushroom_normal", + "minecraft:red_mushroom_normal", + "minecraft:patch_sugar_cane", + "minecraft:patch_pumpkin" + ], + [ + "minecraft:freeze_top_layer" + ] + ] +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/island_groups.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/island_groups.json deleted file mode 100644 index 7784bccbd6..0000000000 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/island_groups.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "type": "minecraft:mul", - "argument1": 2, - "argument2": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:y_clamped_gradient", - "from_y": 384, - "to_y": -64, - "from_value": 0, - "to_value": -0.7 - }, - "argument2": { - "type": "minecraft:spline", - "spline": { - "coordinate": { - "type": "minecraft:abs", - "argument": "gm4_sky_dimension:routers/temperature" - }, - "points": [ - { - "location": 0, - "derivative": 0, - "value": -0.5 - }, - { - "location": 0.05, - "derivative": 0, - "value": 0.6 - }, - { - "location": 0.2, - "derivative": 0, - "value": 0.6 - }, - { - "location": 0.3, - "derivative": 0, - "value": 0 - }, - { - "location": 0.35, - "derivative": 0, - "value": 0.6 - }, - { - "location": 0.5, - "derivative": 0, - "value": 0.6 - }, - { - "location": 0.6, - "derivative": 0, - "value": 0 - }, - { - "location": 0.65, - "derivative": 0, - "value": 0.6 - } - ] - } - } - } -} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/land_mass.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/land_mass.json deleted file mode 100644 index 3a97fb82d4..0000000000 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/land_mass.json +++ /dev/null @@ -1,107 +0,0 @@ -{ - "type": "minecraft:add", - "argument1": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:add", - "argument1": "gm4_sky_dimension:continents/sea_level", - "argument2": { - "type": "minecraft:add", - "argument1": 0.35, - "argument2": { - "type": "minecraft:quarter_negative", - "argument": "gm4_sky_dimension:routers/continents" - } - } - }, - "argument2": { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:spline", - "spline": { - "coordinate": "gm4_sky_dimension:routers/continents", - "points": [ - { - "location": -0.8, - "derivative": 0, - "value": -2 - }, - { - "location": -0.5, - "derivative": 0, - "value": -0.7 - }, - { - "location": -0.43, - "derivative": 0, - "value": 0 - } - ] - } - } - } - }, - "argument2": { - "type": "minecraft:range_choice", - "input": "minecraft:y", - "min_inclusive": 0, - "max_exclusive": 192, - "when_in_range": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:y_clamped_gradient", - "from_y": 192, - "to_y": 48, - "from_value": 0.8, - "to_value": -0.4 - }, - "argument2": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:mul", - "argument1": -0.3, - "argument2": { - "type": "minecraft:noise", - "noise": "gm4_sky_dimension:continentalness", - "xz_scale": 5, - "y_scale": 0 - } - }, - "argument2": { - "type": "minecraft:quarter_negative", - "argument": "gm4_sky_dimension:routers/continents" - } - } - }, - "argument2": { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:spline", - "spline": { - "coordinate": "gm4_sky_dimension:routers/continents", - "points": [ - { - "location": -0.8, - "derivative": 0, - "value": -2 - }, - { - "location": -0.5, - "derivative": 0, - "value": -1.5 - }, - { - "location": -0.43, - "derivative": 0, - "value": 0 - } - ] - } - } - } - }, - "when_out_of_range": 0 - } -} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/total.json index 0f041b3f9f..3a97fb82d4 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/total.json @@ -1,8 +1,107 @@ { - "type": "minecraft:min", - "argument1": "gm4_sky_dimension:continents/land_mass", + "type": "minecraft:add", + "argument1": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:continents/sea_level", + "argument2": { + "type": "minecraft:add", + "argument1": 0.35, + "argument2": { + "type": "minecraft:quarter_negative", + "argument": "gm4_sky_dimension:routers/continents" + } + } + }, + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/continents", + "points": [ + { + "location": -0.8, + "derivative": 0, + "value": -2 + }, + { + "location": -0.5, + "derivative": 0, + "value": -0.7 + }, + { + "location": -0.43, + "derivative": 0, + "value": 0 + } + ] + } + } + } + }, "argument2": { - "type": "minecraft:interpolated", - "argument": "gm4_sky_dimension:continents/island_groups" + "type": "minecraft:range_choice", + "input": "minecraft:y", + "min_inclusive": 0, + "max_exclusive": 192, + "when_in_range": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:y_clamped_gradient", + "from_y": 192, + "to_y": 48, + "from_value": 0.8, + "to_value": -0.4 + }, + "argument2": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:mul", + "argument1": -0.3, + "argument2": { + "type": "minecraft:noise", + "noise": "gm4_sky_dimension:continentalness", + "xz_scale": 5, + "y_scale": 0 + } + }, + "argument2": { + "type": "minecraft:quarter_negative", + "argument": "gm4_sky_dimension:routers/continents" + } + } + }, + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/continents", + "points": [ + { + "location": -0.8, + "derivative": 0, + "value": -2 + }, + { + "location": -0.5, + "derivative": 0, + "value": -1.5 + }, + { + "location": -0.43, + "derivative": 0, + "value": 0 + } + ] + } + } + } + }, + "when_out_of_range": 0 } } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/gradient_carver.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/gradient_topside.json similarity index 54% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/gradient_carver.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/gradient_topside.json index 8bdd091829..e9584322bd 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/gradient_carver.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/gradient_topside.json @@ -1,7 +1,7 @@ { "type": "minecraft:y_clamped_gradient", - "from_y": 366, - "to_y": -64, - "from_value": -1, + "from_y": 346, + "to_y": 106, + "from_value": -2, "to_value": 0 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/gradient_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/gradient_underside.json new file mode 100644 index 0000000000..d59dc145f3 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/gradient_underside.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 256, + "to_y": 0, + "from_value": 0, + "to_value": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/terrain_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/terrain_topside.json new file mode 100644 index 0000000000..79797a3474 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/terrain_topside.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/floating_falls/lake/gradient_topside", + "argument2": { + "type": "minecraft:add", + "argument1": 0.5, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion/middle", + "xz_scale": 0, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/terrain_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/terrain_underside.json new file mode 100644 index 0000000000..9898feb46a --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/terrain_underside.json @@ -0,0 +1,39 @@ +{ + "type": "minecraft:range_choice", + "input": { + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/floating_falls/lake/gradient_underside", + "argument2": { + "type": "minecraft:mul", + "argument1": 0.4, + "argument2": { + "type": "minecraft:add", + "argument1": 0.6, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion/middle", + "xz_scale": 2, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } + }, + "argument2": -1 + }, + "min_inclusive": -1000000, + "max_exclusive": 0, + "when_in_range": { + "type": "minecraft:add", + "argument1": 1, + "argument2": "gm4_sky_dimension:erosion/floating_falls/lake/gradient_underside" + }, + "when_out_of_range": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/total.json new file mode 100644 index 0000000000..28eb914d2c --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/total.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:range_choice", + "input": "gm4_sky_dimension:erosion/floating_falls/lake/terrain_topside", + "min_inclusive": 0, + "max_exclusive": 1000000, + "when_in_range": "gm4_sky_dimension:erosion/floating_falls/lake/terrain_underside", + "when_out_of_range": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/islands.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/islands.json new file mode 100644 index 0000000000..117198be54 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/islands.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:add", + "argument1": { + "type": "minecraft:mul", + "argument1": 0.8, + "argument2": "gm4_sky_dimension:erosion/floating_falls/small_islands/wavy_sawtooth" + }, + "argument2": { + "type": "minecraft:add", + "argument1": 0.2, + "argument2": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion/top", + "xz_scale": 8, + "y_scale": 4, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/sawtooth.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/sawtooth.json new file mode 100644 index 0000000000..e09c030337 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/sawtooth.json @@ -0,0 +1,133 @@ +{ + "type": "minecraft:add", + "argument1": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:range_choice", + "input": "minecraft:y", + "min_inclusive": 336, + "max_exclusive": 384, + "when_in_range": { + "type": "minecraft:y_clamped_gradient", + "from_y": 384, + "to_y": 336, + "from_value": 0, + "to_value": -1 + }, + "when_out_of_range": 0 + }, + "argument2": { + "type": "minecraft:range_choice", + "input": "minecraft:y", + "min_inclusive": 288, + "max_exclusive": 336, + "when_in_range": { + "type": "minecraft:y_clamped_gradient", + "from_y": 336, + "to_y": 288, + "from_value": 0, + "to_value": -1 + }, + "when_out_of_range": 0 + } + }, + "argument2": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:range_choice", + "input": "minecraft:y", + "min_inclusive": 240, + "max_exclusive": 288, + "when_in_range": { + "type": "minecraft:y_clamped_gradient", + "from_y": 288, + "to_y": 240, + "from_value": 0, + "to_value": -1 + }, + "when_out_of_range": 0 + }, + "argument2": { + "type": "minecraft:range_choice", + "input": "minecraft:y", + "min_inclusive": 192, + "max_exclusive": 240, + "when_in_range": { + "type": "minecraft:y_clamped_gradient", + "from_y": 240, + "to_y": 192, + "from_value": 0, + "to_value": -1 + }, + "when_out_of_range": 0 + } + } + }, + "argument2": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:range_choice", + "input": "minecraft:y", + "min_inclusive": 144, + "max_exclusive": 192, + "when_in_range": { + "type": "minecraft:y_clamped_gradient", + "from_y": 192, + "to_y": 144, + "from_value": 0, + "to_value": -1 + }, + "when_out_of_range": 0 + }, + "argument2": { + "type": "minecraft:range_choice", + "input": "minecraft:y", + "min_inclusive": 96, + "max_exclusive": 144, + "when_in_range": { + "type": "minecraft:y_clamped_gradient", + "from_y": 144, + "to_y": 96, + "from_value": 0, + "to_value": -1 + }, + "when_out_of_range": 0 + } + }, + "argument2": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:range_choice", + "input": "minecraft:y", + "min_inclusive": 48, + "max_exclusive": 96, + "when_in_range": { + "type": "minecraft:y_clamped_gradient", + "from_y": 96, + "to_y": 48, + "from_value": 0, + "to_value": -1 + }, + "when_out_of_range": 0 + }, + "argument2": { + "type": "minecraft:range_choice", + "input": "minecraft:y", + "min_inclusive": 0, + "max_exclusive": 48, + "when_in_range": { + "type": "minecraft:y_clamped_gradient", + "from_y": 48, + "to_y": 0, + "from_value": 0, + "to_value": -1 + }, + "when_out_of_range": 0 + } + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/total.json new file mode 100644 index 0000000000..b0318f3eab --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/total.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:range_choice", + "input": "minecraft:y", + "min_inclusive": 192, + "max_exclusive": 340, + "when_in_range": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:y_clamped_gradient", + "from_y": 192, + "to_y": 160, + "from_value": 0, + "to_value": -1 + }, + "argument2": "gm4_sky_dimension:erosion/floating_falls/small_islands/islands" + }, + "when_out_of_range": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/wavy_sawtooth.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/wavy_sawtooth.json new file mode 100644 index 0000000000..1ebce5d5dc --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/wavy_sawtooth.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:range_choice", + "input": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/floating_falls/small_islands/sawtooth", + "argument2": { + "type": "minecraft:mul", + "argument1": 0.2, + "argument2": { + "type": "minecraft:noise", + "noise": "gm4_sky_dimension:erosion/middle", + "xz_scale": 3, + "y_scale": 8 + } + } + }, + "min_inclusive": -10, + "max_exclusive": -0.2, + "when_in_range": "gm4_sky_dimension:erosion/floating_falls/small_islands/sawtooth", + "when_out_of_range": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/total.json new file mode 100644 index 0000000000..9521921e8a --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/total.json @@ -0,0 +1,5 @@ +{ + "type": "minecraft:max", + "argument1": "gm4_sky_dimension:erosion/floating_falls/lake/total", + "argument2": "gm4_sky_dimension:erosion/floating_falls/small_islands/total" +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/total.json index f8f8567997..157e883a8b 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/total.json @@ -1,4 +1,8 @@ { - "type": "minecraft:squeeze", - "argument": "gm4_sky_dimension:erosion/full_blobs/noise" + "type": "minecraft:min", + "argument1": "gm4_sky_dimension:erosion/island_groups", + "argument2": { + "type": "minecraft:squeeze", + "argument": "gm4_sky_dimension:erosion/full_blobs/noise" + } } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/total.json index e562f81b1b..df8339bbf4 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/total.json @@ -1,5 +1,9 @@ { "type": "minecraft:min", - "argument1": "gm4_sky_dimension:erosion/normal/total", - "argument2": "gm4_sky_dimension:erosion/high/noise" + "argument1": "gm4_sky_dimension:erosion/island_groups", + "argument2": { + "type": "minecraft:min", + "argument1": "gm4_sky_dimension:erosion/normal/total", + "argument2": "gm4_sky_dimension:erosion/high/noise" + } } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/carver_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/carver_underside.json deleted file mode 100644 index 842ec2ef9f..0000000000 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/carver_underside.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "type": "minecraft:range_choice", - "input": { - "type": "minecraft:mul", - "argument1": { - "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/huge_islands/main/gradient_carver", - "argument2": { - "type": "minecraft:mul", - "argument1": -2, - "argument2": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:y_clamped_gradient", - "from_y": 384, - "to_y": 0, - "from_value": 0, - "to_value": -1.2 - }, - "argument2": { - "type": "minecraft:spline", - "spline": { - "coordinate": "gm4_sky_dimension:routers/vegetation", - "points": [ - { - "location": -1, - "derivative": 0, - "value": 0 - }, - { - "location": -0.75, - "derivative": 0, - "value": 0.5 - }, - { - "location": -0.5, - "derivative": 0, - "value": 0.5 - }, - { - "location": -0.25, - "derivative": 0, - "value": 0 - }, - { - "location": 0, - "derivative": 0, - "value": 0.5 - }, - { - "location": 0.25, - "derivative": 0, - "value": 0.5 - }, - { - "location": 0.5, - "derivative": 0, - "value": 0 - }, - { - "location": 0.75, - "derivative": 0, - "value": 0.5 - }, - { - "location": 1, - "derivative": 0, - "value": 0.5 - } - ] - } - } - } - } - }, - "argument2": -1 - }, - "min_inclusive": -1000000, - "max_exclusive": 0, - "when_in_range": -1, - "when_out_of_range": "gm4_sky_dimension:erosion/huge_islands/main/terrain_underside" -} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/total.json index ba2725d3a1..21c1593832 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/total.json @@ -1,5 +1,5 @@ { - "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/huge_islands/main/total", - "argument2": 0 + "type": "minecraft:min", + "argument1": "gm4_sky_dimension:erosion/island_groups", + "argument2": "gm4_sky_dimension:erosion/huge_islands/main/total" } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/island_groups.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/island_groups.json new file mode 100644 index 0000000000..0ad5be774e --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/island_groups.json @@ -0,0 +1,68 @@ +{ + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:mul", + "argument1": 2, + "argument2": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:y_clamped_gradient", + "from_y": 384, + "to_y": -64, + "from_value": 0, + "to_value": -0.7 + }, + "argument2": { + "type": "minecraft:spline", + "spline": { + "coordinate": { + "type": "minecraft:abs", + "argument": "gm4_sky_dimension:routers/temperature" + }, + "points": [ + { + "location": 0, + "derivative": 0, + "value": -0.5 + }, + { + "location": 0.05, + "derivative": 0, + "value": 0.6 + }, + { + "location": 0.2, + "derivative": 0, + "value": 0.6 + }, + { + "location": 0.3, + "derivative": 0, + "value": 0 + }, + { + "location": 0.35, + "derivative": 0, + "value": 0.6 + }, + { + "location": 0.5, + "derivative": 0, + "value": 0.6 + }, + { + "location": 0.6, + "derivative": 0, + "value": 0 + }, + { + "location": 0.65, + "derivative": 0, + "value": 0.6 + } + ] + } + } + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/total.json index 68e7faab13..38ea0641c3 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/total.json @@ -1,13 +1,17 @@ { - "type": "minecraft:max", - "argument1": { - "type": "minecraft:max", - "argument1": "gm4_sky_dimension:erosion/normal/middle/total", - "argument2": "gm4_sky_dimension:erosion/normal/mid_bottom/total" - }, + "type": "minecraft:min", + "argument1": "gm4_sky_dimension:erosion/island_groups", "argument2": { "type": "minecraft:max", - "argument1": "gm4_sky_dimension:erosion/normal/top/total", - "argument2": "gm4_sky_dimension:erosion/normal/bottom/total" + "argument1": { + "type": "minecraft:max", + "argument1": "gm4_sky_dimension:erosion/normal/middle/total", + "argument2": "gm4_sky_dimension:erosion/normal/mid_bottom/total" + }, + "argument2": { + "type": "minecraft:max", + "argument1": "gm4_sky_dimension:erosion/normal/top/total", + "argument2": "gm4_sky_dimension:erosion/normal/bottom/total" + } } } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json index 702f64344e..75ff6060b4 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json @@ -15,7 +15,21 @@ { "location": -0.8, "derivative": 0, - "value": 0 + "value": { + "coordinate": "gm4_sky_dimension:routers/continents", + "points": [ + { + "location": 0.1, + "derivative": 0, + "value": 0 + }, + { + "location": 0.2, + "derivative": 0, + "value": -1.5 + } + ] + } }, { "location": -0.75, @@ -27,7 +41,50 @@ } } }, - "argument2": -1 + "argument2": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/floating_falls/total", + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/erosion", + "points": [ + { + "location": -0.8, + "derivative": 0, + "value": { + "coordinate": "gm4_sky_dimension:routers/continents", + "points": [ + { + "location": 0.2, + "derivative": 0, + "value": -1.5 + }, + { + "location": 0.3, + "derivative": 0, + "value": -1 + }, + { + "location": 0.4, + "derivative": 0, + "value": 0 + } + ] + } + }, + { + "location": -0.75, + "derivative": 0, + "value": -1 + } + ] + } + } + } + } }, "argument2": { "type": "minecraft:max", diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json index 8d333ab963..9fd32ac3bf 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json @@ -40,6 +40,92 @@ "surface_rule": { "type": "minecraft:sequence", "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:biome", + "biome_is": [ + "gm4_sky_dimension:floating_falls" + ] + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:y_above", + "anchor": { + "absolute": 220 + }, + "surface_depth_multiplier": 0, + "add_stone_depth": false + }, + "then_run": { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:not", + "invert": { + "type": "minecraft:steep" + } + }, + "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:water", + "Properties": { + "level": "0" + } + } + } + } + } + }, + { + "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:condition", + "if_true": { + "type": "minecraft:not", + "invert": { + "type": "minecraft:y_above", + "anchor": { + "absolute": 207 + }, + "surface_depth_multiplier": 0, + "add_stone_depth": false + } + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:water", + "Properties": { + "level": "0" + } + } + } + } + } + ] + } + }, { "type": "minecraft:condition", "if_true": { From e4a3a071412584fb9c131fdff1984b19e66e66af Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Mon, 1 Jan 2024 12:41:03 -0800 Subject: [PATCH 18/35] better floating falls - use springs and lakes for water instead of noise settings - make small floating islands ice based - make main island mud based --- .../worldgen/biome/floating_falls.json | 9 +- .../floating_falls_lake_water.json | 20 ++ .../floating_falls_shore.json | 185 ++++++++++++++++++ .../floating_falls/small_islands/islands.json | 6 +- .../small_islands/sawtooth.json | 16 +- .../floating_falls/small_islands/total.json | 4 +- .../small_islands/wavy_sawtooth.json | 2 +- .../worldgen/noise_settings/celesterra.json | 75 ++++--- .../placed_feature/floating_falls_lakes.json | 40 ++++ .../placed_feature/floating_falls_shore.json | 31 +++ .../floating_falls_springs.json | 31 +++ 11 files changed, 381 insertions(+), 38 deletions(-) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/configured_feature/floating_falls_lake_water.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/configured_feature/floating_falls_shore.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/placed_feature/floating_falls_lakes.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/placed_feature/floating_falls_shore.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/placed_feature/floating_falls_springs.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/biome/floating_falls.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/biome/floating_falls.json index e2f111917c..783ac34736 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/biome/floating_falls.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/biome/floating_falls.json @@ -105,7 +105,10 @@ }, "features": [ [], - [], + [ + "gm4_sky_dimension:floating_falls_lakes", + "gm4_sky_dimension:floating_falls_springs" + ], [ "minecraft:amethyst_geode" ], @@ -142,7 +145,9 @@ "minecraft:ore_copper", "minecraft:underwater_magma" ], - [], + [ + "gm4_sky_dimension:floating_falls_shore" + ], [ "minecraft:spring_water" ], diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/configured_feature/floating_falls_lake_water.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/configured_feature/floating_falls_lake_water.json new file mode 100644 index 0000000000..c44e7ea5b3 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/configured_feature/floating_falls_lake_water.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:lake", + "config": { + "fluid": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:water", + "Properties": { + "level": "0" + } + } + }, + "barrier": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:ice" + } + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/configured_feature/floating_falls_shore.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/configured_feature/floating_falls_shore.json new file mode 100644 index 0000000000..986a60075f --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/configured_feature/floating_falls_shore.json @@ -0,0 +1,185 @@ +{ + "type": "minecraft:disk", + "config": { + "state_provider": { + "fallback": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:mud" + } + }, + "rules": [ + { + "if_true": { + "type": "minecraft:matching_blocks", + "offset": [ + -1, + -1, + -1 + ], + "blocks": "minecraft:water" + }, + "then": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:air" + } + } + }, + { + "if_true": { + "type": "minecraft:matching_blocks", + "offset": [ + -1, + -1, + 0 + ], + "blocks": "minecraft:water" + }, + "then": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:air" + } + } + }, + { + "if_true": { + "type": "minecraft:matching_blocks", + "offset": [ + -1, + -1, + 1 + ], + "blocks": "minecraft:water" + }, + "then": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:air" + } + } + }, + { + "if_true": { + "type": "minecraft:matching_blocks", + "offset": [ + 0, + -1, + -1 + ], + "blocks": "minecraft:water" + }, + "then": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:air" + } + } + }, + { + "if_true": { + "type": "minecraft:matching_blocks", + "offset": [ + 0, + -1, + 0 + ], + "blocks": "minecraft:water" + }, + "then": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:air" + } + } + }, + { + "if_true": { + "type": "minecraft:matching_blocks", + "offset": [ + 0, + -1, + 1 + ], + "blocks": "minecraft:water" + }, + "then": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:air" + } + } + }, + { + "if_true": { + "type": "minecraft:matching_blocks", + "offset": [ + 1, + -1, + -1 + ], + "blocks": "minecraft:water" + }, + "then": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:air" + } + } + }, + { + "if_true": { + "type": "minecraft:matching_blocks", + "offset": [ + 1, + -1, + 0 + ], + "blocks": "minecraft:water" + }, + "then": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:air" + } + } + }, + { + "if_true": { + "type": "minecraft:matching_blocks", + "offset": [ + 1, + -1, + 1 + ], + "blocks": "minecraft:water" + }, + "then": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:air" + } + } + } + ] + }, + "target": { + "type": "minecraft:matching_blocks", + "offset": [ + 0, + 0, + 0 + ], + "blocks": "minecraft:mud" + }, + "radius": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 1, + "max_inclusive": 3 + } + }, + "half_height": 1 + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/islands.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/islands.json index 117198be54..17867b97c2 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/islands.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/islands.json @@ -2,16 +2,16 @@ "type": "minecraft:add", "argument1": { "type": "minecraft:mul", - "argument1": 0.8, + "argument1": 0.3, "argument2": "gm4_sky_dimension:erosion/floating_falls/small_islands/wavy_sawtooth" }, "argument2": { "type": "minecraft:add", - "argument1": 0.2, + "argument1": 0.1, "argument2": { "type": "minecraft:shifted_noise", "noise": "gm4_sky_dimension:erosion/top", - "xz_scale": 8, + "xz_scale": 5, "y_scale": 4, "shift_x": "minecraft:shift_x", "shift_y": 0, diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/sawtooth.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/sawtooth.json index e09c030337..bf5a7ed225 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/sawtooth.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/sawtooth.json @@ -13,7 +13,7 @@ "type": "minecraft:y_clamped_gradient", "from_y": 384, "to_y": 336, - "from_value": 0, + "from_value": -0.3, "to_value": -1 }, "when_out_of_range": 0 @@ -27,7 +27,7 @@ "type": "minecraft:y_clamped_gradient", "from_y": 336, "to_y": 288, - "from_value": 0, + "from_value": -0.3, "to_value": -1 }, "when_out_of_range": 0 @@ -44,7 +44,7 @@ "type": "minecraft:y_clamped_gradient", "from_y": 288, "to_y": 240, - "from_value": 0, + "from_value": -0.3, "to_value": -1 }, "when_out_of_range": 0 @@ -58,7 +58,7 @@ "type": "minecraft:y_clamped_gradient", "from_y": 240, "to_y": 192, - "from_value": 0, + "from_value": -0.3, "to_value": -1 }, "when_out_of_range": 0 @@ -78,7 +78,7 @@ "type": "minecraft:y_clamped_gradient", "from_y": 192, "to_y": 144, - "from_value": 0, + "from_value": -0.3, "to_value": -1 }, "when_out_of_range": 0 @@ -92,7 +92,7 @@ "type": "minecraft:y_clamped_gradient", "from_y": 144, "to_y": 96, - "from_value": 0, + "from_value": -0.3, "to_value": -1 }, "when_out_of_range": 0 @@ -109,7 +109,7 @@ "type": "minecraft:y_clamped_gradient", "from_y": 96, "to_y": 48, - "from_value": 0, + "from_value": -0.3, "to_value": -1 }, "when_out_of_range": 0 @@ -123,7 +123,7 @@ "type": "minecraft:y_clamped_gradient", "from_y": 48, "to_y": 0, - "from_value": 0, + "from_value": -0.3, "to_value": -1 }, "when_out_of_range": 0 diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/total.json index b0318f3eab..f2684a6741 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/total.json @@ -7,8 +7,8 @@ "type": "minecraft:add", "argument1": { "type": "minecraft:y_clamped_gradient", - "from_y": 192, - "to_y": 160, + "from_y": 230, + "to_y": 180, "from_value": 0, "to_value": -1 }, diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/wavy_sawtooth.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/wavy_sawtooth.json index 1ebce5d5dc..e86d8c2657 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/wavy_sawtooth.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/wavy_sawtooth.json @@ -15,7 +15,7 @@ } }, "min_inclusive": -10, - "max_exclusive": -0.2, + "max_exclusive": -0.4, "when_in_range": "gm4_sky_dimension:erosion/floating_falls/small_islands/sawtooth", "when_out_of_range": -1 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json index 9fd32ac3bf..d960fbcc7e 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json @@ -62,32 +62,47 @@ "add_stone_depth": false }, "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:not", - "invert": { - "type": "minecraft:steep" - } - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:steep" + }, + "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_ice" + } + } + } }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:water", - "Properties": { - "level": "0" + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:stone_depth", + "offset": 0, + "surface_type": "floor", + "add_surface_depth": true, + "secondary_depth_range": 0 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:packed_ice" } } } - } + ] } }, { @@ -122,6 +137,22 @@ } } } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:stone_depth", + "offset": 0, + "surface_type": "floor", + "add_surface_depth": true, + "secondary_depth_range": 0 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:mud" + } + } } ] } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/placed_feature/floating_falls_lakes.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/placed_feature/floating_falls_lakes.json new file mode 100644 index 0000000000..211f1b8cd6 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/placed_feature/floating_falls_lakes.json @@ -0,0 +1,40 @@ +{ + "feature": "gm4_sky_dimension:floating_falls_lake_water", + "placement": [ + { + "type": "minecraft:count_on_every_layer", + "count": 256 + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": 220 + }, + "max_inclusive": { + "absolute": 384 + } + } + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "blocks": [ + "minecraft:packed_ice", + "minecraft:blue_ice" + ] + } + }, + { + "type": "minecraft:surface_relative_threshold_filter", + "heightmap": "WORLD_SURFACE_WG", + "min_inclusive": -2, + "max_inclusive": 1 + }, + { + "type": "minecraft:biome" + } + ] +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/placed_feature/floating_falls_shore.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/placed_feature/floating_falls_shore.json new file mode 100644 index 0000000000..d0adaffa37 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/placed_feature/floating_falls_shore.json @@ -0,0 +1,31 @@ +{ + "feature": "gm4_sky_dimension:floating_falls_shore", + "placement": [ + { + "type": "minecraft:count", + "count": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR_WG" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ + 0, + 0, + 0 + ], + "blocks": "minecraft:water" + } + }, + { + "type": "minecraft:biome" + } + ] +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/placed_feature/floating_falls_springs.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/placed_feature/floating_falls_springs.json new file mode 100644 index 0000000000..30d49470f2 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/placed_feature/floating_falls_springs.json @@ -0,0 +1,31 @@ +{ + "feature": "minecraft:spring_water", + "placement": [ + { + "type": "minecraft:count_on_every_layer", + "count": 200 + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "min_inclusive": { + "absolute": 220 + }, + "max_inclusive": { + "absolute": 384 + } + } + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:calcite" + } + }, + { + "type": "minecraft:biome" + } + ] +} From 41930410371fad923bec1810cef4c48d37894d4f Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Mon, 1 Jan 2024 13:34:42 -0800 Subject: [PATCH 19/35] Tweak Floating Falls Island Size - make main island larger, slightly lower density of waterfall islands, slightly increase size of waterfall islands --- .../erosion/floating_falls/lake/total.json | 6 +++++- .../floating_falls/small_islands/islands.json | 6 +++--- .../floating_falls/small_islands/total.json | 9 ++++++++- .../small_islands/wavy_sawtooth.json | 2 +- .../worldgen/density_function/erosion/total.json | 14 ++++++++++++-- 5 files changed, 29 insertions(+), 8 deletions(-) diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/total.json index 28eb914d2c..81c41ebd9d 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/total.json @@ -3,6 +3,10 @@ "input": "gm4_sky_dimension:erosion/floating_falls/lake/terrain_topside", "min_inclusive": 0, "max_exclusive": 1000000, - "when_in_range": "gm4_sky_dimension:erosion/floating_falls/lake/terrain_underside", + "when_in_range": { + "type": "minecraft:add", + "argument1": 0.5, + "argument2": "gm4_sky_dimension:erosion/floating_falls/lake/terrain_underside" + }, "when_out_of_range": -1 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/islands.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/islands.json index 17867b97c2..f3f048a14f 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/islands.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/islands.json @@ -2,17 +2,17 @@ "type": "minecraft:add", "argument1": { "type": "minecraft:mul", - "argument1": 0.3, + "argument1": 0.7, "argument2": "gm4_sky_dimension:erosion/floating_falls/small_islands/wavy_sawtooth" }, "argument2": { "type": "minecraft:add", - "argument1": 0.1, + "argument1": 0.2, "argument2": { "type": "minecraft:shifted_noise", "noise": "gm4_sky_dimension:erosion/top", "xz_scale": 5, - "y_scale": 4, + "y_scale": 5, "shift_x": "minecraft:shift_x", "shift_y": 0, "shift_z": "minecraft:shift_z" diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/total.json index f2684a6741..dbed181db6 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/total.json @@ -12,7 +12,14 @@ "from_value": 0, "to_value": -1 }, - "argument2": "gm4_sky_dimension:erosion/floating_falls/small_islands/islands" + "argument2": { + "type": "minecraft:quarter_negative", + "argument": { + "type": "minecraft:mul", + "argument1": 1.5, + "argument2": "gm4_sky_dimension:erosion/floating_falls/small_islands/islands" + } + } }, "when_out_of_range": -1 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/wavy_sawtooth.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/wavy_sawtooth.json index e86d8c2657..8f63dc6673 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/wavy_sawtooth.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/wavy_sawtooth.json @@ -15,7 +15,7 @@ } }, "min_inclusive": -10, - "max_exclusive": -0.4, + "max_exclusive": -0.3, "when_in_range": "gm4_sky_dimension:erosion/floating_falls/small_islands/sawtooth", "when_out_of_range": -1 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json index 75ff6060b4..62a6dccd2e 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json @@ -58,10 +58,15 @@ "coordinate": "gm4_sky_dimension:routers/continents", "points": [ { - "location": 0.2, + "location": 0.25, "derivative": 0, "value": -1.5 }, + { + "location": 0.26, + "derivative": 0, + "value": -1 + }, { "location": 0.3, "derivative": 0, @@ -76,9 +81,14 @@ } }, { - "location": -0.75, + "location": -0.76, "derivative": 0, "value": -1 + }, + { + "location": -0.75, + "derivative": 0, + "value": -1.5 } ] } From 4260dc09cdedff0fe0797fe788dacd9c01a20feb Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Tue, 2 Jan 2024 01:54:59 -0800 Subject: [PATCH 20/35] fix huge island generation - ensure biome border of huge islands and floating falls is in the void - ensure floating falls stops when huge islands generate (and vice versa) --- .../dimension/celesterra.json | 4 +-- .../density_function/erosion/total.json | 27 +++++++++++-------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json index 3f69e5a9c0..1005a51d8a 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json @@ -18,7 +18,7 @@ 1 ], "continentalness": [ - 0.25, + 0.2, 1 ], "erosion": [ @@ -67,7 +67,7 @@ ], "continentalness": [ -0.485, - 0.25 + 0.2 ], "erosion": [ -1, diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json index 62a6dccd2e..e8f8fac219 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json @@ -26,15 +26,20 @@ { "location": 0.2, "derivative": 0, + "value": -1 + }, + { + "location": 0.25, + "derivative": 0, "value": -1.5 } ] } }, { - "location": -0.75, + "location": -0.72, "derivative": 0, - "value": -1 + "value": -1.5 } ] } @@ -58,9 +63,9 @@ "coordinate": "gm4_sky_dimension:routers/continents", "points": [ { - "location": 0.25, + "location": 0.24, "derivative": 0, - "value": -1.5 + "value": -2 }, { "location": 0.26, @@ -81,14 +86,9 @@ } }, { - "location": -0.76, + "location": -0.72, "derivative": 0, - "value": -1 - }, - { - "location": -0.75, - "derivative": 0, - "value": -1.5 + "value": -2 } ] } @@ -192,6 +192,11 @@ { "location": -0.75, "derivative": 0, + "value": -2 + }, + { + "location": -0.73, + "derivative": 0, "value": -1 }, { From 072c7702b69bba9d34f088c33aab5678a081daa5 Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Wed, 3 Jan 2024 02:50:45 -0800 Subject: [PATCH 21/35] make bands less obvious - for normal terrain, vary the height of islands within a band - readd small islands into areas of low continentalness (the main point of the islands are to aid in traversing from the bottom of the world, so these islands need to generate almost everywhere) --- .../continents/sea_level.json | 16 ++--- .../density_function/continents/total.json | 12 ++-- .../normal/bottom/gradient_carver.json | 4 +- .../normal/bottom/gradient_topside.json | 2 +- .../normal/bottom/gradient_underside.json | 2 +- .../erosion/normal/bottom/noise.json | 18 ++++++ .../erosion/normal/bottom/shift.json | 59 +++++++++++++++++++ .../normal/bottom/terrain_topside.json | 38 +++++++----- .../normal/bottom/terrain_underside.json | 20 +++---- .../normal/mid_bottom/carver_underside.json | 2 +- .../normal/mid_bottom/gradient_carver.json | 2 +- .../normal/mid_bottom/gradient_topside.json | 4 +- .../normal/mid_bottom/gradient_underside.json | 4 +- .../erosion/normal/mid_bottom/noise.json | 18 ++++++ .../erosion/normal/mid_bottom/shift.json | 59 +++++++++++++++++++ .../normal/mid_bottom/terrain_topside.json | 38 +++++++----- .../normal/mid_bottom/terrain_underside.json | 22 +++---- .../normal/middle/gradient_carver.json | 4 +- .../normal/middle/gradient_topside.json | 4 +- .../normal/middle/gradient_underside.json | 2 +- .../erosion/normal/middle/noise.json | 18 ++++++ .../erosion/normal/middle/shift.json | 59 +++++++++++++++++++ .../normal/middle/terrain_topside.json | 38 +++++++----- .../normal/middle/terrain_underside.json | 22 +++---- 24 files changed, 363 insertions(+), 104 deletions(-) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/noise.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/shift.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/noise.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/shift.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/noise.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/shift.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/sea_level.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/sea_level.json index 3948203c91..50e493963e 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/sea_level.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/sea_level.json @@ -7,17 +7,17 @@ "max_exclusive": 170, "when_in_range": { "type": "minecraft:y_clamped_gradient", - "from_y": -32, - "to_y": 170, - "from_value": -1, - "to_value": 0 + "from_y": 170, + "to_y": 16, + "from_value": 0, + "to_value": -0.2 }, "when_out_of_range": { "type": "minecraft:y_clamped_gradient", - "from_y": 64, - "to_y": 170, - "from_value": -2, - "to_value": 0 + "from_y": 16, + "to_y": 0, + "from_value": -0.2, + "to_value": -2 } }, "argument2": { diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/total.json index 3a97fb82d4..1b46189205 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/total.json @@ -63,10 +63,14 @@ "type": "minecraft:mul", "argument1": -0.3, "argument2": { - "type": "minecraft:noise", - "noise": "gm4_sky_dimension:continentalness", - "xz_scale": 5, - "y_scale": 0 + "type": "minecraft:add", + "argument1": -0.7, + "argument2": { + "type": "minecraft:noise", + "noise": "gm4_sky_dimension:continentalness", + "xz_scale": 5, + "y_scale": 0 + } } }, "argument2": { diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_carver.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_carver.json index 0631e75712..c1a643465f 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_carver.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_carver.json @@ -1,7 +1,7 @@ { "type": "minecraft:y_clamped_gradient", - "from_y": 140, - "to_y": 0, + "from_y": 90, + "to_y": -32, "from_value": -1.5, "to_value": 0 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_topside.json index 46d3f9b9df..b686c246fa 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_topside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_topside.json @@ -1,6 +1,6 @@ { "type": "minecraft:y_clamped_gradient", - "from_y": 110, + "from_y": 140, "to_y": 50, "from_value": -2, "to_value": 0 diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_underside.json index 4de4f348b2..44d2c2cb43 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_underside.json @@ -1,6 +1,6 @@ { "type": "minecraft:y_clamped_gradient", - "from_y": 110, + "from_y": 100, "to_y": 16, "from_value": 0, "to_value": -1 diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/noise.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/noise.json new file mode 100644 index 0000000000..ce7fc5af53 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/noise.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:flat_cache", + "argument": { + "type": "minecraft:cache_2d", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion/bottom", + "xz_scale": 7, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/shift.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/shift.json new file mode 100644 index 0000000000..f2f530f9fa --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/shift.json @@ -0,0 +1,59 @@ +{ + "type": "minecraft:add", + "argument1": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/vegetation", + "points": [ + { + "location": -1, + "derivative": 0, + "value": 0 + }, + { + "location": -0.251, + "derivative": 0, + "value": 0 + }, + { + "location": -0.249, + "derivative": 0, + "value": 0.1 + }, + { + "location": 0.499, + "derivative": 0, + "value": 0.1 + }, + { + "location": 0.501, + "derivative": 0, + "value": 0.05 + }, + { + "location": 1, + "derivative": 0, + "value": 0.05 + } + ] + } + }, + "argument2": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:erosion/normal/bottom/noise", + "points": [ + { + "location": -0.001, + "derivative": 0, + "value": 0.03 + }, + { + "location": 0, + "derivative": 0, + "value": 0 + } + ] + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/terrain_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/terrain_topside.json index 1dab5f8ba4..c862ac8a40 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/terrain_topside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/terrain_topside.json @@ -1,23 +1,31 @@ { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/normal/bottom/gradient_topside", - "argument2": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:interpolated", + "argument": { "type": "minecraft:add", - "argument1": 0.5, + "argument1": "gm4_sky_dimension:erosion/normal/bottom/gradient_topside", "argument2": { - "type": "minecraft:abs", - "argument": { - "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/bottom", - "xz_scale": 0, - "y_scale": 0, - "shift_x": "minecraft:shift_x", - "shift_y": 0, - "shift_z": "minecraft:shift_z" + "type": "minecraft:add", + "argument1": 0.5, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion/bottom", + "xz_scale": 0, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } } } } + }, + "argument2": { + "type": "minecraft:mul", + "argument1": -4, + "argument2": "gm4_sky_dimension:erosion/normal/bottom/shift" } } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/terrain_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/terrain_underside.json index ab8339d370..41e5f852f1 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/terrain_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/terrain_underside.json @@ -10,18 +10,18 @@ "argument1": 0.7, "argument2": { "type": "minecraft:add", - "argument1": 0.2, + "argument1": { + "type": "minecraft:add", + "argument1": 0.1, + "argument2": { + "type": "minecraft:mul", + "argument1": 1, + "argument2": "gm4_sky_dimension:erosion/normal/bottom/shift" + } + }, "argument2": { "type": "minecraft:abs", - "argument": { - "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/bottom", - "xz_scale": 7, - "y_scale": 0, - "shift_x": "minecraft:shift_x", - "shift_y": 0, - "shift_z": "minecraft:shift_z" - } + "argument": "gm4_sky_dimension:erosion/normal/bottom/noise" } } } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/carver_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/carver_underside.json index 659da070eb..b992390ba5 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/carver_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/carver_underside.json @@ -50,7 +50,7 @@ { "location": 0.25, "derivative": 0, - "value": 0.4 + "value": 0.5 }, { "location": 0.5, diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_carver.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_carver.json index 3dfb5a5257..f3fbf0179d 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_carver.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_carver.json @@ -1,6 +1,6 @@ { "type": "minecraft:y_clamped_gradient", - "from_y": 200, + "from_y": 240, "to_y": 0, "from_value": -1.5, "to_value": 0 diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_topside.json index 7039d3f708..2cd7f42839 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_topside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_topside.json @@ -1,7 +1,7 @@ { "type": "minecraft:y_clamped_gradient", - "from_y": 190, - "to_y": 100, + "from_y": 210, + "to_y": 130, "from_value": -2, "to_value": 0 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_underside.json index 049746895b..4442be2536 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_underside.json @@ -1,7 +1,7 @@ { "type": "minecraft:y_clamped_gradient", - "from_y": 160, - "to_y": 0, + "from_y": 230, + "to_y": 32, "from_value": 0, "to_value": -1 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/noise.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/noise.json new file mode 100644 index 0000000000..52c59b3c1e --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/noise.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:flat_cache", + "argument": { + "type": "minecraft:cache_2d", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion/mid_bottom", + "xz_scale": 3, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/shift.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/shift.json new file mode 100644 index 0000000000..56dc2f721a --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/shift.json @@ -0,0 +1,59 @@ +{ + "type": "minecraft:add", + "argument1": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/vegetation", + "points": [ + { + "location": -1, + "derivative": 0, + "value": 0 + }, + { + "location": -0.251, + "derivative": 0, + "value": 0 + }, + { + "location": -0.249, + "derivative": 0, + "value": 0.1 + }, + { + "location": 0.499, + "derivative": 0, + "value": 0.1 + }, + { + "location": 0.501, + "derivative": 0, + "value": 0.05 + }, + { + "location": 1, + "derivative": 0, + "value": 0.05 + } + ] + } + }, + "argument2": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:erosion/normal/mid_bottom/noise", + "points": [ + { + "location": -0.001, + "derivative": 0, + "value": 0.03 + }, + { + "location": 0, + "derivative": 0, + "value": 0 + } + ] + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/terrain_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/terrain_topside.json index 4fd6807ad7..0343404187 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/terrain_topside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/terrain_topside.json @@ -1,23 +1,31 @@ { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/normal/mid_bottom/gradient_topside", - "argument2": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:interpolated", + "argument": { "type": "minecraft:add", - "argument1": 0.5, + "argument1": "gm4_sky_dimension:erosion/normal/mid_bottom/gradient_topside", "argument2": { - "type": "minecraft:abs", - "argument": { - "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/mid_bottom", - "xz_scale": 0, - "y_scale": 0, - "shift_x": "minecraft:shift_x", - "shift_y": 0, - "shift_z": "minecraft:shift_z" + "type": "minecraft:add", + "argument1": 0.8, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion/mid_bottom", + "xz_scale": 0, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } } } } + }, + "argument2": { + "type": "minecraft:mul", + "argument1": -4, + "argument2": "gm4_sky_dimension:erosion/normal/mid_bottom/shift" } } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/terrain_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/terrain_underside.json index ec9ba4d5aa..2098141e86 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/terrain_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/terrain_underside.json @@ -7,21 +7,21 @@ "argument1": "gm4_sky_dimension:erosion/normal/mid_bottom/gradient_underside", "argument2": { "type": "minecraft:mul", - "argument1": 0.4, + "argument1": 0.5, "argument2": { "type": "minecraft:add", - "argument1": 0.1, + "argument1": { + "type": "minecraft:add", + "argument1": 0.4, + "argument2": { + "type": "minecraft:mul", + "argument1": 1, + "argument2": "gm4_sky_dimension:erosion/normal/mid_bottom/shift" + } + }, "argument2": { "type": "minecraft:abs", - "argument": { - "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/mid_bottom", - "xz_scale": 3, - "y_scale": 0, - "shift_x": "minecraft:shift_x", - "shift_y": 0, - "shift_z": "minecraft:shift_z" - } + "argument": "gm4_sky_dimension:erosion/normal/mid_bottom/noise" } } } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_carver.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_carver.json index 83eb2378aa..28794b2ad0 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_carver.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_carver.json @@ -1,7 +1,7 @@ { "type": "minecraft:y_clamped_gradient", - "from_y": 266, - "to_y": 16, + "from_y": 336, + "to_y": -32, "from_value": -1.5, "to_value": 0 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_topside.json index e9584322bd..14638f7613 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_topside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_topside.json @@ -1,7 +1,7 @@ { "type": "minecraft:y_clamped_gradient", - "from_y": 346, - "to_y": 106, + "from_y": 286, + "to_y": 166, "from_value": -2, "to_value": 0 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_underside.json index 3c57da41f2..909eeb2d68 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_underside.json @@ -1,6 +1,6 @@ { "type": "minecraft:y_clamped_gradient", - "from_y": 236, + "from_y": 276, "to_y": 56, "from_value": 0, "to_value": -1 diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/noise.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/noise.json new file mode 100644 index 0000000000..afa1ec87cc --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/noise.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:flat_cache", + "argument": { + "type": "minecraft:cache_2d", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion/middle", + "xz_scale": 4, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/shift.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/shift.json new file mode 100644 index 0000000000..20ab660278 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/shift.json @@ -0,0 +1,59 @@ +{ + "type": "minecraft:add", + "argument1": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/vegetation", + "points": [ + { + "location": -1, + "derivative": 0, + "value": 0 + }, + { + "location": -0.251, + "derivative": 0, + "value": 0 + }, + { + "location": -0.249, + "derivative": 0, + "value": 0.1 + }, + { + "location": 0.499, + "derivative": 0, + "value": 0.1 + }, + { + "location": 0.501, + "derivative": 0, + "value": 0.05 + }, + { + "location": 1, + "derivative": 0, + "value": 0.05 + } + ] + } + }, + "argument2": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:erosion/normal/middle/noise", + "points": [ + { + "location": -0.001, + "derivative": 0, + "value": 0.03 + }, + { + "location": 0, + "derivative": 0, + "value": 0 + } + ] + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/terrain_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/terrain_topside.json index d829cb170b..c23a41dfbf 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/terrain_topside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/terrain_topside.json @@ -1,23 +1,31 @@ { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/normal/middle/gradient_topside", - "argument2": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:interpolated", + "argument": { "type": "minecraft:add", - "argument1": 0.5, + "argument1": "gm4_sky_dimension:erosion/normal/middle/gradient_topside", "argument2": { - "type": "minecraft:abs", - "argument": { - "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/middle", - "xz_scale": 0, - "y_scale": 0, - "shift_x": "minecraft:shift_x", - "shift_y": 0, - "shift_z": "minecraft:shift_z" + "type": "minecraft:add", + "argument1": 0.5, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion/middle", + "xz_scale": 0, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } } } } + }, + "argument2": { + "type": "minecraft:mul", + "argument1": -1, + "argument2": "gm4_sky_dimension:erosion/normal/middle/shift" } } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/terrain_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/terrain_underside.json index e236aec758..836e77450d 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/terrain_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/terrain_underside.json @@ -7,21 +7,21 @@ "argument1": "gm4_sky_dimension:erosion/normal/middle/gradient_underside", "argument2": { "type": "minecraft:mul", - "argument1": 0.4, + "argument1": 0.3, "argument2": { "type": "minecraft:add", - "argument1": 0.2, + "argument1": { + "type": "minecraft:add", + "argument1": 0.6, + "argument2": { + "type": "minecraft:mul", + "argument1": 3, + "argument2": "gm4_sky_dimension:erosion/normal/middle/shift" + } + }, "argument2": { "type": "minecraft:abs", - "argument": { - "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/middle", - "xz_scale": 4, - "y_scale": 0, - "shift_x": "minecraft:shift_x", - "shift_y": 0, - "shift_z": "minecraft:shift_z" - } + "argument": "gm4_sky_dimension:erosion/normal/middle/noise" } } } From ed5be165973ada445f460afa414421ea245e5c97 Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Wed, 3 Jan 2024 09:31:45 -0800 Subject: [PATCH 22/35] biome bands - use depth router to split dimension into biome bands (biomes not set yet) - prevent structures from generating at the void --- .../dimension/celesterra.json | 12 ++++++ .../worldgen/biome/desolate_void.json | 41 +++++++++++++++++++ .../density_function/routers/depth.json | 23 +++++++++-- 3 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/biome/desolate_void.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json index 1005a51d8a..7d39027afd 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json @@ -6,6 +6,18 @@ "biome_source": { "type": "minecraft:multi_noise", "biomes": [ + { + "biome": "gm4_sky_dimension:desolate_void", + "parameters": { + "temperature": 0, + "humidity": 0, + "continentalness": 0, + "erosion": 0, + "weirdness": 0, + "depth": -2, + "offset": 0 + } + }, { "biome": "gm4_sky_dimension:floating_falls", "parameters": { diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/biome/desolate_void.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/biome/desolate_void.json new file mode 100644 index 0000000000..0e4f1e88d3 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/biome/desolate_void.json @@ -0,0 +1,41 @@ +{ + "temperature": 0.5, + "downfall": 0.5, + "has_precipitation": false, + "effects": { + "sky_color": 8103167, + "fog_color": 12638463, + "water_color": 4159204, + "water_fog_color": 329011, + "mood_sound": { + "sound": "minecraft:ambient.cave", + "tick_delay": 6000, + "block_search_extent": 8, + "offset": 2 + } + }, + "spawners": { + "ambient": [], + "axolotls": [], + "creature": [], + "misc": [], + "monster": [], + "underground_water_creature": [], + "water_ambient": [], + "water_creature": [] + }, + "spawn_costs": {}, + "carvers": {}, + "features": [ + [], + [], + [], + [], + [], + [], + [], + [], + [], + [] + ] +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/depth.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/depth.json index 1844f7c30a..d88dfe05c8 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/depth.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/depth.json @@ -1,5 +1,22 @@ { - "type": "minecraft:mul", - "argument1": 0.0001, - "argument2": "minecraft:y" + "type": "minecraft:range_choice", + "input": "minecraft:y", + "min_inclusive": 300, + "max_exclusive": 384, + "when_in_range": 1, + "when_out_of_range": { + "type": "minecraft:range_choice", + "input": "minecraft:y", + "min_inclusive": 100, + "max_exclusive": 320, + "when_in_range": 0, + "when_out_of_range": { + "type": "minecraft:range_choice", + "input": "minecraft:y", + "min_inclusive": 8, + "max_exclusive": 100, + "when_in_range": -1, + "when_out_of_range": -2 + } + } } From 17e29c369c3cb793ee47ca72f109e1630feb5bac Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Wed, 3 Jan 2024 10:11:59 -0800 Subject: [PATCH 23/35] modify full blobs - add gradient so islands get smaller when reaching top and bottom limits - increase island size --- .../erosion/full_blobs/gradient.json | 43 +++++++++++++++++++ .../erosion/full_blobs/noise.json | 8 ++-- .../erosion/full_blobs/total.json | 5 ++- 3 files changed, 50 insertions(+), 6 deletions(-) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/gradient.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/gradient.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/gradient.json new file mode 100644 index 0000000000..453644a6ab --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/gradient.json @@ -0,0 +1,43 @@ +{ + "type": "minecraft:add", + "argument1": { + "type": "minecraft:range_choice", + "input": "minecraft:y", + "min_inclusive": 32, + "max_exclusive": 192, + "when_in_range": { + "type": "minecraft:y_clamped_gradient", + "from_y": 128, + "to_y": 32, + "from_value": 0, + "to_value": -0.5 + }, + "when_out_of_range": { + "type": "minecraft:y_clamped_gradient", + "from_y": 32, + "to_y": 0, + "from_value": -0.5, + "to_value": -1.5 + } + }, + "argument2": { + "type": "minecraft:range_choice", + "input": "minecraft:y", + "min_inclusive": 192, + "max_exclusive": 368, + "when_in_range": { + "type": "minecraft:y_clamped_gradient", + "from_y": 368, + "to_y": 256, + "from_value": -0.5, + "to_value": 0 + }, + "when_out_of_range": { + "type": "minecraft:y_clamped_gradient", + "from_y": 384, + "to_y": 368, + "from_value": -1, + "to_value": -0.5 + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/noise.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/noise.json index 7aef121ff4..831b1b0769 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/noise.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/noise.json @@ -7,17 +7,17 @@ "type": "minecraft:add", "argument1": { "type": "minecraft:mul", - "argument1": 1.5, + "argument1": 1.7, "argument2": { "type": "minecraft:add", - "argument1": -0.6, + "argument1": -0.3, "argument2": { "type": "minecraft:abs", "argument": { "type": "minecraft:shifted_noise", "noise": "gm4_sky_dimension:vegetation", - "xz_scale": 10, - "y_scale": 10, + "xz_scale": 5, + "y_scale": 5, "shift_x": "minecraft:shift_x", "shift_y": 0, "shift_z": "minecraft:shift_z" diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/total.json index 157e883a8b..4b0365c60d 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/total.json @@ -2,7 +2,8 @@ "type": "minecraft:min", "argument1": "gm4_sky_dimension:erosion/island_groups", "argument2": { - "type": "minecraft:squeeze", - "argument": "gm4_sky_dimension:erosion/full_blobs/noise" + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/full_blobs/noise", + "argument2": "gm4_sky_dimension:erosion/full_blobs/gradient" } } From 97635b78d5604ca440e2116470bdbdecd4cbfc54 Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Wed, 3 Jan 2024 11:42:34 -0800 Subject: [PATCH 24/35] tweak biome borders - use caching in noise routers - shrink the gap between different island groups --- .../density_function/erosion/high/total.json | 8 +- .../erosion/island_groups.json | 120 +++++++++--------- .../normal/bottom/carver_underside.json | 5 +- .../erosion/normal/bottom/shift.json | 5 +- .../normal/mid_bottom/carver_underside.json | 5 +- .../erosion/normal/mid_bottom/shift.json | 5 +- .../normal/middle/carver_underside.json | 5 +- .../erosion/normal/middle/shift.json | 5 +- .../density_function/erosion/total.json | 14 +- .../density_function/routers/depth.json | 29 +++-- .../density_function/routers/erosion.json | 17 ++- .../density_function/routers/ridges.json | 19 +-- .../density_function/routers/temperature.json | 19 +-- .../density_function/routers/vegetation.json | 19 +-- 14 files changed, 152 insertions(+), 123 deletions(-) diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/total.json index df8339bbf4..e562f81b1b 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/total.json @@ -1,9 +1,5 @@ { "type": "minecraft:min", - "argument1": "gm4_sky_dimension:erosion/island_groups", - "argument2": { - "type": "minecraft:min", - "argument1": "gm4_sky_dimension:erosion/normal/total", - "argument2": "gm4_sky_dimension:erosion/high/noise" - } + "argument1": "gm4_sky_dimension:erosion/normal/total", + "argument2": "gm4_sky_dimension:erosion/high/noise" } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/island_groups.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/island_groups.json index 0ad5be774e..7d92aadaf9 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/island_groups.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/island_groups.json @@ -1,67 +1,67 @@ { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:mul", - "argument1": 2, + "type": "minecraft:mul", + "argument1": 2, + "argument2": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:y_clamped_gradient", + "from_y": 384, + "to_y": -64, + "from_value": 0, + "to_value": -0.7 + }, "argument2": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:y_clamped_gradient", - "from_y": 384, - "to_y": -64, - "from_value": 0, - "to_value": -0.7 - }, - "argument2": { - "type": "minecraft:spline", - "spline": { - "coordinate": { - "type": "minecraft:abs", + "type": "minecraft:spline", + "spline": { + "coordinate": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:interpolated", "argument": "gm4_sky_dimension:routers/temperature" + } + }, + "points": [ + { + "location": 0, + "derivative": 0, + "value": -0.5 }, - "points": [ - { - "location": 0, - "derivative": 0, - "value": -0.5 - }, - { - "location": 0.05, - "derivative": 0, - "value": 0.6 - }, - { - "location": 0.2, - "derivative": 0, - "value": 0.6 - }, - { - "location": 0.3, - "derivative": 0, - "value": 0 - }, - { - "location": 0.35, - "derivative": 0, - "value": 0.6 - }, - { - "location": 0.5, - "derivative": 0, - "value": 0.6 - }, - { - "location": 0.6, - "derivative": 0, - "value": 0 - }, - { - "location": 0.65, - "derivative": 0, - "value": 0.6 - } - ] - } + { + "location": 0.05, + "derivative": 0, + "value": 0.6 + }, + { + "location": 0.2, + "derivative": 0, + "value": 0.6 + }, + { + "location": 0.3, + "derivative": 0, + "value": 0 + }, + { + "location": 0.35, + "derivative": 0, + "value": 0.6 + }, + { + "location": 0.5, + "derivative": 0, + "value": 0.6 + }, + { + "location": 0.6, + "derivative": 0, + "value": 0 + }, + { + "location": 0.65, + "derivative": 0, + "value": 0.6 + } + ] } } } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/carver_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/carver_underside.json index fc38f9a670..02b410efe5 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/carver_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/carver_underside.json @@ -20,7 +20,10 @@ "argument2": { "type": "minecraft:spline", "spline": { - "coordinate": "gm4_sky_dimension:routers/vegetation", + "coordinate": { + "type": "minecraft:interpolated", + "argument": "gm4_sky_dimension:routers/vegetation" + }, "points": [ { "location": -1, diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/shift.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/shift.json index f2f530f9fa..b9bd3fb377 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/shift.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/shift.json @@ -3,7 +3,10 @@ "argument1": { "type": "minecraft:spline", "spline": { - "coordinate": "gm4_sky_dimension:routers/vegetation", + "coordinate": { + "type": "minecraft:interpolated", + "argument": "gm4_sky_dimension:routers/vegetation" + }, "points": [ { "location": -1, diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/carver_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/carver_underside.json index b992390ba5..a3e17ea077 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/carver_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/carver_underside.json @@ -20,7 +20,10 @@ "argument2": { "type": "minecraft:spline", "spline": { - "coordinate": "gm4_sky_dimension:routers/vegetation", + "coordinate": { + "type": "minecraft:interpolated", + "argument": "gm4_sky_dimension:routers/vegetation" + }, "points": [ { "location": -1, diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/shift.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/shift.json index 56dc2f721a..6884b2e226 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/shift.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/shift.json @@ -3,7 +3,10 @@ "argument1": { "type": "minecraft:spline", "spline": { - "coordinate": "gm4_sky_dimension:routers/vegetation", + "coordinate": { + "type": "minecraft:interpolated", + "argument": "gm4_sky_dimension:routers/vegetation" + }, "points": [ { "location": -1, diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/carver_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/carver_underside.json index 40030ddce3..8752132d48 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/carver_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/carver_underside.json @@ -20,7 +20,10 @@ "argument2": { "type": "minecraft:spline", "spline": { - "coordinate": "gm4_sky_dimension:routers/vegetation", + "coordinate": { + "type": "minecraft:interpolated", + "argument": "gm4_sky_dimension:routers/vegetation" + }, "points": [ { "location": -1, diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/shift.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/shift.json index 20ab660278..288908ce87 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/shift.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/shift.json @@ -3,7 +3,10 @@ "argument1": { "type": "minecraft:spline", "spline": { - "coordinate": "gm4_sky_dimension:routers/vegetation", + "coordinate": { + "type": "minecraft:interpolated", + "argument": "gm4_sky_dimension:routers/vegetation" + }, "points": [ { "location": -1, diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json index e8f8fac219..ab9f5b6cbd 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json @@ -13,7 +13,7 @@ "coordinate": "gm4_sky_dimension:routers/erosion", "points": [ { - "location": -0.8, + "location": -0.77, "derivative": 0, "value": { "coordinate": "gm4_sky_dimension:routers/continents", @@ -57,7 +57,7 @@ "coordinate": "gm4_sky_dimension:routers/erosion", "points": [ { - "location": -0.8, + "location": -0.79, "derivative": 0, "value": { "coordinate": "gm4_sky_dimension:routers/continents", @@ -111,12 +111,12 @@ "coordinate": "gm4_sky_dimension:routers/erosion", "points": [ { - "location": 0.7, + "location": 0.69, "derivative": 0, "value": -1 }, { - "location": 0.725, + "location": 0.72, "derivative": 0, "value": { "coordinate": "gm4_sky_dimension:routers/continents", @@ -155,7 +155,7 @@ "value": -1 }, { - "location": 0.725, + "location": 0.71, "derivative": 0, "value": { "coordinate": "gm4_sky_dimension:routers/continents", @@ -205,12 +205,12 @@ "value": 0 }, { - "location": 0.65, + "location": 0.67, "derivative": 0, "value": 0 }, { - "location": 0.7, + "location": 0.71, "derivative": 0, "value": -1 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/depth.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/depth.json index d88dfe05c8..1b6b8986ce 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/depth.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/depth.json @@ -1,22 +1,25 @@ { - "type": "minecraft:range_choice", - "input": "minecraft:y", - "min_inclusive": 300, - "max_exclusive": 384, - "when_in_range": 1, - "when_out_of_range": { + "type": "minecraft:cache_once", + "argument": { "type": "minecraft:range_choice", "input": "minecraft:y", - "min_inclusive": 100, - "max_exclusive": 320, - "when_in_range": 0, + "min_inclusive": 300, + "max_exclusive": 384, + "when_in_range": 1, "when_out_of_range": { "type": "minecraft:range_choice", "input": "minecraft:y", - "min_inclusive": 8, - "max_exclusive": 100, - "when_in_range": -1, - "when_out_of_range": -2 + "min_inclusive": 100, + "max_exclusive": 320, + "when_in_range": 0, + "when_out_of_range": { + "type": "minecraft:range_choice", + "input": "minecraft:y", + "min_inclusive": 8, + "max_exclusive": 100, + "when_in_range": -1, + "when_out_of_range": -2 + } } } } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/erosion.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/erosion.json index 8a41874158..d3158a5eda 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/erosion.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/erosion.json @@ -1,12 +1,15 @@ { "type": "minecraft:cache_2d", "argument": { - "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion", - "xz_scale": 0.25, - "y_scale": 0, - "shift_x": "minecraft:shift_x", - "shift_y": 0, - "shift_z": "minecraft:shift_z" + "type": "minecraft:flat_cache", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion", + "xz_scale": 0.25, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } } } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/ridges.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/ridges.json index 858be6e2e5..0a367066d0 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/ridges.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/ridges.json @@ -1,12 +1,15 @@ { - "type": "minecraft:flat_cache", + "type": "minecraft:cache_2d", "argument": { - "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:ridge", - "xz_scale": 0.25, - "y_scale": 0, - "shift_x": "minecraft:shift_x", - "shift_y": 0, - "shift_z": "minecraft:shift_z" + "type": "minecraft:flat_cache", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:ridge", + "xz_scale": 0.25, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } } } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/temperature.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/temperature.json index 7487026382..ae8170d036 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/temperature.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/temperature.json @@ -1,12 +1,15 @@ { - "type": "minecraft:cache_once", + "type": "minecraft:cache_2d", "argument": { - "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:temperature", - "xz_scale": 0.25, - "y_scale": 0, - "shift_x": "minecraft:shift_x", - "shift_y": 0, - "shift_z": "minecraft:shift_z" + "type": "minecraft:flat_cache", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:temperature", + "xz_scale": 0.25, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } } } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/vegetation.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/vegetation.json index af5003d8b2..b52f196b47 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/vegetation.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/vegetation.json @@ -1,12 +1,15 @@ { - "type": "minecraft:cache_all_in_cell", + "type": "minecraft:cache_2d", "argument": { - "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:vegetation", - "xz_scale": 1, - "y_scale": 0, - "shift_x": "minecraft:shift_x", - "shift_y": 0, - "shift_z": "minecraft:shift_z" + "type": "minecraft:flat_cache", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:vegetation", + "xz_scale": 1, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } } } From 9d8cb187230d33ff83de325d04bc56b0fb94ea94 Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Wed, 3 Jan 2024 12:37:34 -0800 Subject: [PATCH 25/35] stair islands - for normal terrain, add steep slopes from the bottom island to the main islands - these islands generate between temperature groups --- .../erosion/stairs/gradient_topside.json | 7 ++ .../erosion/stairs/terrain_topside.json | 23 ++++ .../erosion/stairs/total.json | 79 +++++++++++++ .../density_function/erosion/total.json | 111 ++++++++++++------ 4 files changed, 186 insertions(+), 34 deletions(-) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/stairs/gradient_topside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/stairs/terrain_topside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/stairs/total.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/stairs/gradient_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/stairs/gradient_topside.json new file mode 100644 index 0000000000..dae42f7a25 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/stairs/gradient_topside.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 290, + "to_y": 40, + "from_value": -1, + "to_value": 0 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/stairs/terrain_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/stairs/terrain_topside.json new file mode 100644 index 0000000000..ad00210df6 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/stairs/terrain_topside.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/stairs/gradient_topside", + "argument2": { + "type": "minecraft:add", + "argument1": 0.05, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion/middle", + "xz_scale": 0.9, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/stairs/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/stairs/total.json new file mode 100644 index 0000000000..9ef00d592d --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/stairs/total.json @@ -0,0 +1,79 @@ +{ + "type": "minecraft:min", + "argument1": { + "type": "minecraft:mul", + "argument1": 2, + "argument2": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:y_clamped_gradient", + "from_y": 384, + "to_y": -64, + "from_value": -0.4, + "to_value": -0.6 + }, + "argument2": { + "type": "minecraft:spline", + "spline": { + "coordinate": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:interpolated", + "argument": "gm4_sky_dimension:routers/temperature" + } + }, + "points": [ + { + "location": 0, + "derivative": 0, + "value": -0.5 + }, + { + "location": 0.05, + "derivative": 0, + "value": 0 + }, + { + "location": 0.22, + "derivative": 0, + "value": 0 + }, + { + "location": 0.3, + "derivative": 0, + "value": 0.6 + }, + { + "location": 0.33, + "derivative": 0, + "value": 0 + }, + { + "location": 0.52, + "derivative": 0, + "value": 0 + }, + { + "location": 0.6, + "derivative": 0, + "value": 0.6 + }, + { + "location": 0.63, + "derivative": 0, + "value": 0 + } + ] + } + } + } + }, + "argument2": { + "type": "minecraft:range_choice", + "input": "gm4_sky_dimension:erosion/stairs/terrain_topside", + "min_inclusive": 0, + "max_exclusive": 0.03, + "when_in_range": 1, + "when_out_of_range": -1 + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json index ab9f5b6cbd..a5cde06df2 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json @@ -180,41 +180,84 @@ } }, "argument2": { - "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/normal/total", + "type": "minecraft:max", + "argument1": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/normal/total", + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/erosion", + "points": [ + { + "location": -0.75, + "derivative": 0, + "value": -2 + }, + { + "location": -0.73, + "derivative": 0, + "value": -1 + }, + { + "location": -0.7, + "derivative": 0, + "value": 0 + }, + { + "location": 0.67, + "derivative": 0, + "value": 0 + }, + { + "location": 0.71, + "derivative": 0, + "value": -1 + } + ] + } + } + } + }, "argument2": { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:spline", - "spline": { - "coordinate": "gm4_sky_dimension:routers/erosion", - "points": [ - { - "location": -0.75, - "derivative": 0, - "value": -2 - }, - { - "location": -0.73, - "derivative": 0, - "value": -1 - }, - { - "location": -0.7, - "derivative": 0, - "value": 0 - }, - { - "location": 0.67, - "derivative": 0, - "value": 0 - }, - { - "location": 0.71, - "derivative": 0, - "value": -1 - } - ] + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/stairs/total", + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/erosion", + "points": [ + { + "location": -0.75, + "derivative": 0, + "value": -2 + }, + { + "location": -0.73, + "derivative": 0, + "value": -1 + }, + { + "location": -0.7, + "derivative": 0, + "value": 0 + }, + { + "location": 0.67, + "derivative": 0, + "value": 0 + }, + { + "location": 0.71, + "derivative": 0, + "value": -1 + } + ] + } } } } From 2e088d313b36efcdda89857d513751d848155eb8 Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Wed, 3 Jan 2024 19:50:03 -0800 Subject: [PATCH 26/35] mountainous terrain attempt 1 commiting this in case I can't get the good mountainous terrain working --- .../dimension/celesterra.json | 178 +++++++++++++++--- .../erosion/mountainous/gradient_hills.json | 7 + .../erosion/mountainous/gradient_topside.json | 7 + .../mountainous/gradient_underside.json | 7 + .../erosion/mountainous/terrain_hills.json | 23 +++ .../erosion/mountainous/terrain_topside.json | 41 ++++ .../mountainous/terrain_underside.json | 27 +++ .../erosion/mountainous/total.json | 16 ++ .../density_function/erosion/total.json | 173 ++++++++++++----- .../density_function/routers/ridges.json | 2 +- .../worldgen/noise_settings/celesterra.json | 77 ++++++++ 11 files changed, 479 insertions(+), 79 deletions(-) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_hills.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_topside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/terrain_hills.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/terrain_topside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/terrain_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/total.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json index 7d39027afd..5eb938906a 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json @@ -6,6 +6,60 @@ "biome_source": { "type": "minecraft:multi_noise", "biomes": [ + { + "biome": "minecraft:the_void", + "parameters": { + "temperature": [ + -1, + 1 + ], + "humidity": [ + -1, + 1 + ], + "continentalness": [ + 0.2, + 1 + ], + "erosion": [ + -1, + -0.75 + ], + "weirdness": [ + 0, + 1 + ], + "depth": 0, + "offset": 0 + } + }, + { + "biome": "minecraft:snowy_slopes", + "parameters": { + "temperature": [ + -1, + 1 + ], + "humidity": [ + -1, + 1 + ], + "continentalness": [ + 0.2, + 1 + ], + "erosion": [ + -1, + -0.75 + ], + "weirdness": [ + -1, + 0 + ], + "depth": 0, + "offset": 0 + } + }, { "biome": "gm4_sky_dimension:desolate_void", "parameters": { @@ -13,7 +67,10 @@ "humidity": 0, "continentalness": 0, "erosion": 0, - "weirdness": 0, + "weirdness": [ + -1, + 1 + ], "depth": -2, "offset": 0 } @@ -30,14 +87,17 @@ 1 ], "continentalness": [ - 0.2, - 1 + -0.485, + 0.2 ], "erosion": [ -1, -0.75 ], - "weirdness": 0, + "weirdness": [ + 0, + 1 + ], "depth": 0, "offset": 0 } @@ -61,7 +121,10 @@ 0.7, 1 ], - "weirdness": 0, + "weirdness": [ + -1, + 1 + ], "depth": 0, "offset": 0 } @@ -85,7 +148,10 @@ -1, -0.75 ], - "weirdness": 0, + "weirdness": [ + -1, + 0 + ], "depth": 0, "offset": 0 } @@ -109,7 +175,10 @@ 0.7, 1 ], - "weirdness": 0, + "weirdness": [ + -1, + 1 + ], "depth": 0, "offset": 0 } @@ -133,7 +202,10 @@ -1, 1 ], - "weirdness": 0, + "weirdness": [ + -1, + 1 + ], "depth": 0, "offset": 0 } @@ -157,7 +229,10 @@ -0.75, 0.7 ], - "weirdness": 0, + "weirdness": [ + -1, + 1 + ], "depth": 0, "offset": 0 } @@ -181,7 +256,10 @@ -0.75, 0.7 ], - "weirdness": 0, + "weirdness": [ + -1, + 1 + ], "depth": 0, "offset": 0 } @@ -205,7 +283,10 @@ -0.75, 0.7 ], - "weirdness": 0, + "weirdness": [ + -1, + 1 + ], "depth": 0, "offset": 0 } @@ -229,7 +310,10 @@ -0.75, 0.7 ], - "weirdness": 0, + "weirdness": [ + -1, + 1 + ], "depth": 0, "offset": 0 } @@ -253,7 +337,10 @@ -0.75, 0.7 ], - "weirdness": 0, + "weirdness": [ + -1, + 1 + ], "depth": 0, "offset": 0 } @@ -277,7 +364,10 @@ -0.75, 0.7 ], - "weirdness": 0, + "weirdness": [ + -1, + 1 + ], "depth": 0, "offset": 0 } @@ -301,7 +391,10 @@ -0.75, 0.7 ], - "weirdness": 0, + "weirdness": [ + -1, + 1 + ], "depth": 0, "offset": 0 } @@ -325,7 +418,10 @@ -0.75, 0.7 ], - "weirdness": 0, + "weirdness": [ + -1, + 1 + ], "depth": 0, "offset": 0 } @@ -349,7 +445,10 @@ -0.75, 0.7 ], - "weirdness": 0, + "weirdness": [ + -1, + 1 + ], "depth": 0, "offset": 0 } @@ -373,7 +472,10 @@ -0.75, 0.7 ], - "weirdness": 0, + "weirdness": [ + -1, + 1 + ], "depth": 0, "offset": 0 } @@ -397,7 +499,10 @@ -0.75, 0.7 ], - "weirdness": 0, + "weirdness": [ + -1, + 1 + ], "depth": 0, "offset": 0 } @@ -421,7 +526,10 @@ -0.75, 0.7 ], - "weirdness": 0, + "weirdness": [ + -1, + 1 + ], "depth": 0, "offset": 0 } @@ -445,7 +553,10 @@ -0.75, 0.7 ], - "weirdness": 0, + "weirdness": [ + -1, + 1 + ], "depth": 0, "offset": 0 } @@ -469,7 +580,10 @@ -0.75, 0.7 ], - "weirdness": 0, + "weirdness": [ + -1, + 1 + ], "depth": 0, "offset": 0 } @@ -493,7 +607,10 @@ -0.75, 0.7 ], - "weirdness": 0, + "weirdness": [ + -1, + 1 + ], "depth": 0, "offset": 0 } @@ -517,7 +634,10 @@ -0.75, 0.7 ], - "weirdness": 0, + "weirdness": [ + -1, + 1 + ], "depth": 0, "offset": 0 } @@ -541,7 +661,10 @@ -0.75, 0.7 ], - "weirdness": 0, + "weirdness": [ + -1, + 1 + ], "depth": 0, "offset": 0 } @@ -565,7 +688,10 @@ -0.75, 0.7 ], - "weirdness": 0, + "weirdness": [ + -1, + 1 + ], "depth": 0, "offset": 0 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_hills.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_hills.json new file mode 100644 index 0000000000..5d70eaf84c --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_hills.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 200, + "to_y": 180, + "from_value": -1, + "to_value": 0 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_topside.json new file mode 100644 index 0000000000..85f8937885 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_topside.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 500, + "to_y": 120, + "from_value": -5, + "to_value": 0 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_underside.json new file mode 100644 index 0000000000..92b31a8eba --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_underside.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 126, + "to_y": 0, + "from_value": 0, + "to_value": -5 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/terrain_hills.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/terrain_hills.json new file mode 100644 index 0000000000..b16752bcb0 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/terrain_hills.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/mountainous/gradient_topside", + "argument2": { + "type": "minecraft:mul", + "argument1": 0.4, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion/mid_bottom", + "xz_scale": 0.2, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/terrain_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/terrain_topside.json new file mode 100644 index 0000000000..f7ecd7c067 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/terrain_topside.json @@ -0,0 +1,41 @@ +{ + "type": "minecraft:add", + "argument1": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/mountainous/gradient_topside", + "argument2": { + "type": "minecraft:mul", + "argument1": 2, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion/middle", + "xz_scale": 1.6, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } + }, + "argument2": { + "type": "minecraft:mul", + "argument1": 0.45, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:old_blended_noise", + "xz_scale": 0.25, + "y_scale": 0.02, + "xz_factor": 80, + "y_factor": 160, + "smear_scale_multiplier": 8 + } + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/terrain_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/terrain_underside.json new file mode 100644 index 0000000000..1d850658bd --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/terrain_underside.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/mountainous/gradient_underside", + "argument2": { + "type": "minecraft:mul", + "argument1": 3, + "argument2": { + "type": "minecraft:add", + "argument1": 0.5, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion/bottom", + "xz_scale": 1.2, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/total.json new file mode 100644 index 0000000000..210dc2114d --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/total.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:mul", + "argument1": 0.4, + "argument2": { + "type": "minecraft:range_choice", + "input": "gm4_sky_dimension:erosion/mountainous/terrain_underside", + "min_inclusive": 0, + "max_exclusive": 1000000, + "when_in_range": { + "type": "minecraft:max", + "argument1": "gm4_sky_dimension:erosion/mountainous/terrain_topside", + "argument2": "gm4_sky_dimension:erosion/mountainous/terrain_hills" + }, + "when_out_of_range": -1 + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json index a5cde06df2..e7316a44b1 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json @@ -3,52 +3,117 @@ "argument1": { "type": "minecraft:max", "argument1": { - "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/huge_islands/total", + "type": "minecraft:max", + "argument1": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/huge_islands/total", + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/erosion", + "points": [ + { + "location": -0.77, + "derivative": 0, + "value": { + "coordinate": "gm4_sky_dimension:routers/continents", + "points": [ + { + "location": 0.1, + "derivative": 0, + "value": { + "coordinate": "gm4_sky_dimension:routers/ridges", + "points": [ + { + "location": -0.05, + "derivative": 0, + "value": 0 + }, + { + "location": 0.05, + "derivative": 0, + "value": -1.5 + } + ] + } + }, + { + "location": 0.25, + "derivative": 0, + "value": -1.5 + } + ] + } + }, + { + "location": -0.72, + "derivative": 0, + "value": -1.5 + } + ] + } + } + } + }, "argument2": { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:spline", - "spline": { - "coordinate": "gm4_sky_dimension:routers/erosion", - "points": [ - { - "location": -0.77, - "derivative": 0, - "value": { - "coordinate": "gm4_sky_dimension:routers/continents", - "points": [ - { - "location": 0.1, - "derivative": 0, - "value": 0 - }, - { - "location": 0.2, - "derivative": 0, - "value": -1 - }, - { - "location": 0.25, - "derivative": 0, - "value": -1.5 - } - ] + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/floating_falls/total", + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/erosion", + "points": [ + { + "location": -0.79, + "derivative": 0, + "value": { + "coordinate": "gm4_sky_dimension:routers/continents", + "points": [ + { + "location": 0.1, + "derivative": 0, + "value": { + "coordinate": "gm4_sky_dimension:routers/ridges", + "points": [ + { + "location": 0, + "derivative": 0, + "value": -3 + }, + { + "location": 0.1, + "derivative": 0, + "value": 0 + } + ] + } + }, + { + "location": 0.25, + "derivative": 0, + "value": -3 + } + ] + } + }, + { + "location": -0.72, + "derivative": 0, + "value": -3 } - }, - { - "location": -0.72, - "derivative": 0, - "value": -1.5 - } - ] + ] + } } } } }, "argument2": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/floating_falls/total", + "argument1": "gm4_sky_dimension:erosion/mountainous/total", "argument2": { "type": "minecraft:interpolated", "argument": { @@ -57,30 +122,34 @@ "coordinate": "gm4_sky_dimension:routers/erosion", "points": [ { - "location": -0.79, + "location": -0.8, "derivative": 0, "value": { "coordinate": "gm4_sky_dimension:routers/continents", "points": [ { - "location": 0.24, + "location": 0.15, "derivative": 0, "value": -2 }, { - "location": 0.26, - "derivative": 0, - "value": -1 - }, - { - "location": 0.3, - "derivative": 0, - "value": -1 - }, - { - "location": 0.4, + "location": 0.25, "derivative": 0, - "value": 0 + "value": { + "coordinate": "gm4_sky_dimension:routers/ridges", + "points": [ + { + "location": -0.1, + "derivative": 0, + "value": 0 + }, + { + "location": 0, + "derivative": 0, + "value": -2 + } + ] + } } ] } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/ridges.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/ridges.json index 0a367066d0..0f277d1b97 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/ridges.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/ridges.json @@ -5,7 +5,7 @@ "argument": { "type": "minecraft:shifted_noise", "noise": "gm4_sky_dimension:ridge", - "xz_scale": 0.25, + "xz_scale": 0.03, "y_scale": 0, "shift_x": "minecraft:shift_x", "shift_y": 0, diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json index d960fbcc7e..f99f46f4d2 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json @@ -40,6 +40,83 @@ "surface_rule": { "type": "minecraft:sequence", "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:biome", + "biome_is": [ + "minecraft:snowy_slopes" + ] + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "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:condition", + "if_true": { + "type": "minecraft:y_above", + "anchor": { + "absolute": 115 + }, + "surface_depth_multiplier": 0, + "add_stone_depth": false + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:grass_block", + "Properties": { + "snowy": "false" + } + } + } + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:stone_depth", + "offset": 7, + "surface_type": "floor", + "add_surface_depth": true, + "secondary_depth_range": 0 + }, + "then_run": { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:y_above", + "anchor": { + "absolute": 115 + }, + "surface_depth_multiplier": 0, + "add_stone_depth": true + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:dirt" + } + } + } + }, + { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:calcite" + } + } + ] + } + }, { "type": "minecraft:condition", "if_true": { From ccefd6ae7a9e10c12cd64a287c93063bc5b2d912 Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Thu, 4 Jan 2024 02:27:00 -0800 Subject: [PATCH 27/35] nice mountainous terrain - new method to ensure the island borders are flat - use base_3d_noise and jagged noise to texture mountains --- .../erosion/mountainous/carver_underside.json | 43 ++++++++++++++++ ...nt_underside.json => gradient_carver.json} | 2 +- .../erosion/mountainous/gradient_hills.json | 6 +-- .../erosion/mountainous/gradient_noise.json | 7 +++ .../erosion/mountainous/gradient_topside.json | 4 +- .../erosion/mountainous/land_mass.json | 16 ++++++ .../erosion/mountainous/noise_underside.json | 31 ++++++++++++ .../erosion/mountainous/terrain_hills.json | 48 +++++++++++------- .../erosion/mountainous/terrain_topside.json | 50 ++++++------------- .../mountainous/terrain_underside.json | 27 ---------- .../erosion/mountainous/total.json | 33 ++++++++---- .../density_function/erosion/total.json | 4 +- .../worldgen/noise_settings/celesterra.json | 34 +++++++++++++ 13 files changed, 209 insertions(+), 96 deletions(-) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/carver_underside.json rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/{gradient_underside.json => gradient_carver.json} (84%) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_noise.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/land_mass.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/noise_underside.json delete mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/terrain_underside.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/carver_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/carver_underside.json new file mode 100644 index 0000000000..60a7363f69 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/carver_underside.json @@ -0,0 +1,43 @@ +{ + "type": "minecraft:add", + "argument1": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:mul", + "argument1": 1.2, + "argument2": "gm4_sky_dimension:erosion/mountainous/gradient_carver" + }, + "argument2": { + "type": "minecraft:mul", + "argument1": 2, + "argument2": { + "type": "minecraft:add", + "argument1": 1.4, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion/middle", + "xz_scale": 0.8, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } + } + }, + "argument2": { + "type": "minecraft:add", + "argument1": 1.8, + "argument2": "gm4_sky_dimension:erosion/mountainous/noise_underside" + } + }, + "argument2": 0 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_carver.json similarity index 84% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_underside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_carver.json index 92b31a8eba..8ca2332a70 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_carver.json @@ -1,6 +1,6 @@ { "type": "minecraft:y_clamped_gradient", - "from_y": 126, + "from_y": 226, "to_y": 0, "from_value": 0, "to_value": -5 diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_hills.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_hills.json index 5d70eaf84c..ad2df58419 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_hills.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_hills.json @@ -1,7 +1,7 @@ { "type": "minecraft:y_clamped_gradient", - "from_y": 200, - "to_y": 180, - "from_value": -1, + "from_y": 290, + "to_y": 240, + "from_value": -3, "to_value": 0 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_noise.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_noise.json new file mode 100644 index 0000000000..22d8066a1d --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_noise.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 216, + "to_y": 0, + "from_value": 0, + "to_value": -4 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_topside.json index 85f8937885..a755d770fa 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_topside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_topside.json @@ -1,7 +1,7 @@ { "type": "minecraft:y_clamped_gradient", - "from_y": 500, - "to_y": 120, + "from_y": 480, + "to_y": 220, "from_value": -5, "to_value": 0 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/land_mass.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/land_mass.json new file mode 100644 index 0000000000..172a40a9ac --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/land_mass.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:range_choice", + "input": "gm4_sky_dimension:erosion/mountainous/terrain_hills", + "min_inclusive": -1000000, + "max_exclusive": 0, + "when_in_range": { + "type": "minecraft:mul", + "argument1": 0.2, + "argument2": "gm4_sky_dimension:erosion/mountainous/terrain_topside" + }, + "when_out_of_range": { + "type": "minecraft:mul", + "argument1": 0.18, + "argument2": "gm4_sky_dimension:erosion/mountainous/carver_underside" + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/noise_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/noise_underside.json new file mode 100644 index 0000000000..3dc7d94aad --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/noise_underside.json @@ -0,0 +1,31 @@ +{ + "type": "minecraft:mul", + "argument1": -0.2, + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/mountainous/gradient_noise", + "argument2": { + "type": "minecraft:mul", + "argument1": 15, + "argument2": { + "type": "minecraft:add", + "argument1": 0.6, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion/mid_bottom", + "xz_scale": 3, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/terrain_hills.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/terrain_hills.json index b16752bcb0..2877274681 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/terrain_hills.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/terrain_hills.json @@ -1,23 +1,37 @@ { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/mountainous/gradient_topside", - "argument2": { - "type": "minecraft:mul", - "argument1": 0.4, - "argument2": { - "type": "minecraft:abs", - "argument": { - "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/mid_bottom", - "xz_scale": 0.2, - "y_scale": 0, - "shift_x": "minecraft:shift_x", - "shift_y": 0, - "shift_z": "minecraft:shift_z" + "type": "minecraft:add", + "argument1": { + "type": "minecraft:quarter_negative", + "argument": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/mountainous/gradient_hills", + "argument2": { + "type": "minecraft:mul", + "argument1": 1.2, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion/middle", + "xz_scale": 0.8, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } } } } + }, + "argument2": { + "type": "minecraft:mul", + "argument1": 0.04, + "argument2": { + "type": "minecraft:abs", + "argument": "minecraft:overworld/base_3d_noise" + } } } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/terrain_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/terrain_topside.json index f7ecd7c067..b58357c70d 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/terrain_topside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/terrain_topside.json @@ -1,41 +1,23 @@ { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/mountainous/gradient_topside", + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/mountainous/gradient_topside", + "argument2": { + "type": "minecraft:mul", + "argument1": 3, "argument2": { - "type": "minecraft:mul", - "argument1": 2, - "argument2": { - "type": "minecraft:abs", - "argument": { - "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/middle", - "xz_scale": 1.6, - "y_scale": 0, - "shift_x": "minecraft:shift_x", - "shift_y": 0, - "shift_z": "minecraft:shift_z" - } + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:erosion/middle", + "xz_scale": 0.8, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" } } } - }, - "argument2": { - "type": "minecraft:mul", - "argument1": 0.45, - "argument2": { - "type": "minecraft:abs", - "argument": { - "type": "minecraft:old_blended_noise", - "xz_scale": 0.25, - "y_scale": 0.02, - "xz_factor": 80, - "y_factor": 160, - "smear_scale_multiplier": 8 - } - } } } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/terrain_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/terrain_underside.json deleted file mode 100644 index 1d850658bd..0000000000 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/terrain_underside.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/mountainous/gradient_underside", - "argument2": { - "type": "minecraft:mul", - "argument1": 3, - "argument2": { - "type": "minecraft:add", - "argument1": 0.5, - "argument2": { - "type": "minecraft:abs", - "argument": { - "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/bottom", - "xz_scale": 1.2, - "y_scale": 0, - "shift_x": "minecraft:shift_x", - "shift_y": 0, - "shift_z": "minecraft:shift_z" - } - } - } - } - } -} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/total.json index 210dc2114d..8ba7f1ab1d 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/total.json @@ -1,16 +1,29 @@ { "type": "minecraft:mul", - "argument1": 0.4, + "argument1": 0.04, "argument2": { - "type": "minecraft:range_choice", - "input": "gm4_sky_dimension:erosion/mountainous/terrain_underside", - "min_inclusive": 0, - "max_exclusive": 1000000, - "when_in_range": { - "type": "minecraft:max", - "argument1": "gm4_sky_dimension:erosion/mountainous/terrain_topside", - "argument2": "gm4_sky_dimension:erosion/mountainous/terrain_hills" + "type": "minecraft:add", + "argument1": { + "type": "minecraft:mul", + "argument1": 40, + "argument2": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:erosion/mountainous/land_mass", + "argument2": { + "type": "minecraft:quarter_negative", + "argument": { + "type": "minecraft:mul", + "argument1": 0.05, + "argument2": { + "type": "minecraft:noise", + "noise": "minecraft:jagged", + "xz_scale": 1500, + "y_scale": 0 + } + } + } + } }, - "when_out_of_range": -1 + "argument2": "minecraft:overworld/base_3d_noise" } } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json index e7316a44b1..2161494907 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json @@ -128,12 +128,12 @@ "coordinate": "gm4_sky_dimension:routers/continents", "points": [ { - "location": 0.15, + "location": 0.2, "derivative": 0, "value": -2 }, { - "location": 0.25, + "location": 0.3, "derivative": 0, "value": { "coordinate": "gm4_sky_dimension:routers/ridges", diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json index f99f46f4d2..71c8e00f31 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json @@ -51,6 +51,40 @@ "then_run": { "type": "minecraft:sequence", "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:y_above", + "anchor": { + "absolute": 300 + }, + "surface_depth_multiplier": 5, + "add_stone_depth": true + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:snow_block" + } + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:y_above", + "anchor": { + "absolute": 250 + }, + "surface_depth_multiplier": 7, + "add_stone_depth": true + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:stone" + } + } + }, { "type": "minecraft:condition", "if_true": { From 2291bac65d25473f261477287a4eeb1f5f13e10f Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Fri, 5 Jan 2024 10:55:39 -0800 Subject: [PATCH 28/35] rename some stuff - erosion -> island_types - erosion/high -> island_types/shattered - mountainous -> mountainous/normal --- .vscode/settings.json | 4 ++-- .../erosion/floating_falls/total.json | 5 ----- .../erosion/full_blobs/total.json | 9 --------- .../density_function/erosion/high/total.json | 5 ----- .../erosion/huge_islands/main/total.json | 8 -------- .../erosion/huge_islands/total.json | 5 ----- .../erosion/normal/bottom/total.json | 8 -------- .../erosion/normal/mid_bottom/total.json | 8 -------- .../erosion/normal/middle/total.json | 8 -------- .../erosion/normal/top/total.json | 8 -------- .../density_function/erosion/normal/total.json | 17 ----------------- .../floating_falls/lake/gradient_topside.json | 0 .../floating_falls/lake/gradient_underside.json | 0 .../floating_falls/lake}/terrain_topside.json | 4 ++-- .../floating_falls/lake/terrain_underside.json | 6 +++--- .../floating_falls/lake/total.json | 4 ++-- .../floating_falls/small_islands/islands.json | 4 ++-- .../floating_falls/small_islands/sawtooth.json | 0 .../floating_falls/small_islands/total.json | 2 +- .../small_islands/wavy_sawtooth.json | 6 +++--- .../island_types/floating_falls/total.json | 5 +++++ .../full_blobs/gradient.json | 0 .../full_blobs/noise.json | 0 .../island_types/full_blobs/total.json | 9 +++++++++ .../huge_islands/main/gradient_topside.json | 0 .../huge_islands/main/gradient_underside.json | 0 .../huge_islands/main}/terrain_topside.json | 4 ++-- .../huge_islands/main/terrain_underside.json | 6 +++--- .../island_types/huge_islands/main/total.json | 8 ++++++++ .../island_types/huge_islands/total.json | 5 +++++ .../island_groups.json | 0 .../mountainous/normal}/carver_underside.json | 6 +++--- .../mountainous/normal}/gradient_carver.json | 0 .../mountainous/normal}/gradient_hills.json | 0 .../mountainous/normal}/gradient_noise.json | 0 .../mountainous/normal}/gradient_topside.json | 0 .../mountainous/normal}/land_mass.json | 6 +++--- .../mountainous/normal}/noise_underside.json | 4 ++-- .../mountainous/normal}/terrain_hills.json | 4 ++-- .../mountainous/normal}/terrain_topside.json | 4 ++-- .../mountainous/normal}/total.json | 2 +- .../island_types/mountainous/total.json | 5 +++++ .../normal/bottom/carver_underside.json | 4 ++-- .../normal/bottom/gradient_carver.json | 0 .../normal/bottom/gradient_topside.json | 0 .../normal/bottom/gradient_underside.json | 0 .../normal/bottom/noise.json | 2 +- .../normal/bottom/shift.json | 2 +- .../normal/bottom/terrain_topside.json | 6 +++--- .../normal/bottom/terrain_underside.json | 8 ++++---- .../island_types/normal/bottom/total.json | 8 ++++++++ .../normal/mid_bottom/carver_underside.json | 4 ++-- .../normal/mid_bottom/gradient_carver.json | 0 .../normal/mid_bottom/gradient_topside.json | 0 .../normal/mid_bottom/gradient_underside.json | 0 .../normal/mid_bottom/noise.json | 2 +- .../normal/mid_bottom/shift.json | 2 +- .../normal/mid_bottom/terrain_topside.json | 6 +++--- .../normal/mid_bottom/terrain_underside.json | 8 ++++---- .../island_types/normal/mid_bottom/total.json | 8 ++++++++ .../normal/middle/carver_underside.json | 4 ++-- .../normal/middle/gradient_carver.json | 0 .../normal/middle/gradient_topside.json | 0 .../normal/middle/gradient_underside.json | 0 .../normal/middle/noise.json | 2 +- .../normal/middle/shift.json | 2 +- .../normal/middle/terrain_topside.json | 6 +++--- .../normal/middle/terrain_underside.json | 8 ++++---- .../island_types/normal/middle/total.json | 8 ++++++++ .../normal/top/carver_underside.json | 4 ++-- .../normal/top/gradient_carver.json | 0 .../normal/top/gradient_topside.json | 0 .../normal/top/gradient_underside.json | 0 .../normal/top/terrain_topside.json | 4 ++-- .../normal/top/terrain_underside.json | 6 +++--- .../island_types/normal/top/total.json | 8 ++++++++ .../island_types/normal/total.json | 17 +++++++++++++++++ .../high => island_types/shattered}/noise.json | 0 .../island_types/shattered/total.json | 5 +++++ .../stairs/gradient_topside.json | 0 .../stairs/terrain_topside.json | 4 ++-- .../{erosion => island_types}/stairs/total.json | 2 +- .../{erosion => island_types}/total.json | 14 +++++++------- .../density_function/routers/density.json | 2 +- .../noise/{erosion => island_types}/bottom.json | 0 .../{erosion => island_types}/mid_bottom.json | 0 .../noise/{erosion => island_types}/middle.json | 0 .../noise/{erosion => island_types}/top.json | 0 88 files changed, 170 insertions(+), 165 deletions(-) delete mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/total.json delete mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/total.json delete mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/total.json delete mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/total.json delete mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/total.json delete mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/total.json delete mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/total.json delete mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/total.json delete mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/total.json delete mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/total.json rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/floating_falls/lake/gradient_topside.json (100%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/floating_falls/lake/gradient_underside.json (100%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion/huge_islands/main => island_types/floating_falls/lake}/terrain_topside.json (75%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/floating_falls/lake/terrain_underside.json (77%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/floating_falls/lake/total.json (53%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/floating_falls/small_islands/islands.json (72%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/floating_falls/small_islands/sawtooth.json (100%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/floating_falls/small_islands/total.json (84%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/floating_falls/small_islands/wavy_sawtooth.json (59%) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/floating_falls/total.json rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/full_blobs/gradient.json (100%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/full_blobs/noise.json (100%) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/full_blobs/total.json rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/huge_islands/main/gradient_topside.json (100%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/huge_islands/main/gradient_underside.json (100%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion/floating_falls/lake => island_types/huge_islands/main}/terrain_topside.json (76%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/huge_islands/main/terrain_underside.json (77%) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/huge_islands/main/total.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/huge_islands/total.json rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/island_groups.json (100%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion/mountainous => island_types/mountainous/normal}/carver_underside.json (79%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion/mountainous => island_types/mountainous/normal}/gradient_carver.json (100%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion/mountainous => island_types/mountainous/normal}/gradient_hills.json (100%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion/mountainous => island_types/mountainous/normal}/gradient_noise.json (100%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion/mountainous => island_types/mountainous/normal}/gradient_topside.json (100%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion/mountainous => island_types/mountainous/normal}/land_mass.json (50%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion/mountainous => island_types/mountainous/normal}/noise_underside.json (81%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion/mountainous => island_types/mountainous/normal}/terrain_hills.json (84%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion/mountainous => island_types/mountainous/normal}/terrain_topside.json (75%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion/mountainous => island_types/mountainous/normal}/total.json (88%) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/total.json rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/normal/bottom/carver_underside.json (92%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/normal/bottom/gradient_carver.json (100%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/normal/bottom/gradient_topside.json (100%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/normal/bottom/gradient_underside.json (100%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/normal/bottom/noise.json (86%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/normal/bottom/shift.json (93%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/normal/bottom/terrain_topside.json (74%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/normal/bottom/terrain_underside.json (70%) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/bottom/total.json rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/normal/mid_bottom/carver_underside.json (92%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/normal/mid_bottom/gradient_carver.json (100%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/normal/mid_bottom/gradient_topside.json (100%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/normal/mid_bottom/gradient_underside.json (100%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/normal/mid_bottom/noise.json (85%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/normal/mid_bottom/shift.json (93%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/normal/mid_bottom/terrain_topside.json (73%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/normal/mid_bottom/terrain_underside.json (68%) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/mid_bottom/total.json rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/normal/middle/carver_underside.json (92%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/normal/middle/gradient_carver.json (100%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/normal/middle/gradient_topside.json (100%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/normal/middle/gradient_underside.json (100%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/normal/middle/noise.json (86%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/normal/middle/shift.json (93%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/normal/middle/terrain_topside.json (74%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/normal/middle/terrain_underside.json (70%) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/total.json rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/normal/top/carver_underside.json (95%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/normal/top/gradient_carver.json (100%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/normal/top/gradient_topside.json (100%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/normal/top/gradient_underside.json (100%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/normal/top/terrain_topside.json (77%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/normal/top/terrain_underside.json (78%) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/top/total.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/total.json rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion/high => island_types/shattered}/noise.json (100%) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/shattered/total.json rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/stairs/gradient_topside.json (100%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/stairs/terrain_topside.json (77%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/stairs/total.json (96%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/{erosion => island_types}/total.json (95%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/{erosion => island_types}/bottom.json (100%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/{erosion => island_types}/mid_bottom.json (100%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/{erosion => island_types}/middle.json (100%) rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/{erosion => island_types}/top.json (100%) diff --git a/.vscode/settings.json b/.vscode/settings.json index 9eadc07c8f..0da3b25cae 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,7 @@ { - "datapack.env.cmdVersion": "1.20", + "datapack.env.cmdVersion": "1.20.3", "datapack.env.jsonVersion": "1.20", - "datapack.env.dataVersion": "1.20", + "datapack.env.dataVersion": "1.20.3", "datapack.lint.stringQuote": ["hint", true], "datapack.lint.nbtStringQuoteType": ["hint", "prefer double"] } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/total.json deleted file mode 100644 index 9521921e8a..0000000000 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/total.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "minecraft:max", - "argument1": "gm4_sky_dimension:erosion/floating_falls/lake/total", - "argument2": "gm4_sky_dimension:erosion/floating_falls/small_islands/total" -} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/total.json deleted file mode 100644 index 4b0365c60d..0000000000 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/total.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:min", - "argument1": "gm4_sky_dimension:erosion/island_groups", - "argument2": { - "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/full_blobs/noise", - "argument2": "gm4_sky_dimension:erosion/full_blobs/gradient" - } -} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/total.json deleted file mode 100644 index e562f81b1b..0000000000 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/total.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "minecraft:min", - "argument1": "gm4_sky_dimension:erosion/normal/total", - "argument2": "gm4_sky_dimension:erosion/high/noise" -} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/total.json deleted file mode 100644 index 56d832ffa9..0000000000 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/total.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:range_choice", - "input": "gm4_sky_dimension:erosion/huge_islands/main/terrain_topside", - "min_inclusive": 0, - "max_exclusive": 1000000, - "when_in_range": "gm4_sky_dimension:erosion/huge_islands/main/terrain_underside", - "when_out_of_range": -1 -} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/total.json deleted file mode 100644 index 21c1593832..0000000000 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/total.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "minecraft:min", - "argument1": "gm4_sky_dimension:erosion/island_groups", - "argument2": "gm4_sky_dimension:erosion/huge_islands/main/total" -} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/total.json deleted file mode 100644 index 3371c36093..0000000000 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/total.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:range_choice", - "input": "gm4_sky_dimension:erosion/normal/bottom/terrain_topside", - "min_inclusive": 0, - "max_exclusive": 1000000, - "when_in_range": "gm4_sky_dimension:erosion/normal/bottom/carver_underside", - "when_out_of_range": -1 -} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/total.json deleted file mode 100644 index 5d367cac24..0000000000 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/total.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:range_choice", - "input": "gm4_sky_dimension:erosion/normal/mid_bottom/terrain_topside", - "min_inclusive": 0, - "max_exclusive": 1000000, - "when_in_range": "gm4_sky_dimension:erosion/normal/mid_bottom/carver_underside", - "when_out_of_range": -1 -} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/total.json deleted file mode 100644 index bf9757e5b9..0000000000 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/total.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:range_choice", - "input": "gm4_sky_dimension:erosion/normal/middle/terrain_topside", - "min_inclusive": 0, - "max_exclusive": 1000000, - "when_in_range": "gm4_sky_dimension:erosion/normal/middle/carver_underside", - "when_out_of_range": -1 -} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/total.json deleted file mode 100644 index 8e6402f9d3..0000000000 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/total.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:range_choice", - "input": "gm4_sky_dimension:erosion/normal/top/terrain_topside", - "min_inclusive": 0, - "max_exclusive": 1000000, - "when_in_range": "gm4_sky_dimension:erosion/normal/top/carver_underside", - "when_out_of_range": -1 -} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/total.json deleted file mode 100644 index 38ea0641c3..0000000000 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/total.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:min", - "argument1": "gm4_sky_dimension:erosion/island_groups", - "argument2": { - "type": "minecraft:max", - "argument1": { - "type": "minecraft:max", - "argument1": "gm4_sky_dimension:erosion/normal/middle/total", - "argument2": "gm4_sky_dimension:erosion/normal/mid_bottom/total" - }, - "argument2": { - "type": "minecraft:max", - "argument1": "gm4_sky_dimension:erosion/normal/top/total", - "argument2": "gm4_sky_dimension:erosion/normal/bottom/total" - } - } -} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/gradient_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/floating_falls/lake/gradient_topside.json similarity index 100% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/gradient_topside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/floating_falls/lake/gradient_topside.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/gradient_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/floating_falls/lake/gradient_underside.json similarity index 100% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/gradient_underside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/floating_falls/lake/gradient_underside.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/terrain_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/floating_falls/lake/terrain_topside.json similarity index 75% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/terrain_topside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/floating_falls/lake/terrain_topside.json index 042a5e4027..a23dba2d0d 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/terrain_topside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/floating_falls/lake/terrain_topside.json @@ -2,7 +2,7 @@ "type": "minecraft:interpolated", "argument": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/huge_islands/main/gradient_topside", + "argument1": "gm4_sky_dimension:island_types/floating_falls/lake/gradient_topside", "argument2": { "type": "minecraft:add", "argument1": 0.5, @@ -10,7 +10,7 @@ "type": "minecraft:abs", "argument": { "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/middle", + "noise": "gm4_sky_dimension:island_types/middle", "xz_scale": 0, "y_scale": 0, "shift_x": "minecraft:shift_x", diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/terrain_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/floating_falls/lake/terrain_underside.json similarity index 77% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/terrain_underside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/floating_falls/lake/terrain_underside.json index 9898feb46a..98328744e5 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/terrain_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/floating_falls/lake/terrain_underside.json @@ -4,7 +4,7 @@ "type": "minecraft:mul", "argument1": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/floating_falls/lake/gradient_underside", + "argument1": "gm4_sky_dimension:island_types/floating_falls/lake/gradient_underside", "argument2": { "type": "minecraft:mul", "argument1": 0.4, @@ -15,7 +15,7 @@ "type": "minecraft:abs", "argument": { "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/middle", + "noise": "gm4_sky_dimension:island_types/middle", "xz_scale": 2, "y_scale": 0, "shift_x": "minecraft:shift_x", @@ -33,7 +33,7 @@ "when_in_range": { "type": "minecraft:add", "argument1": 1, - "argument2": "gm4_sky_dimension:erosion/floating_falls/lake/gradient_underside" + "argument2": "gm4_sky_dimension:island_types/floating_falls/lake/gradient_underside" }, "when_out_of_range": -1 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/floating_falls/lake/total.json similarity index 53% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/total.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/floating_falls/lake/total.json index 81c41ebd9d..fc27f6fe7d 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/floating_falls/lake/total.json @@ -1,12 +1,12 @@ { "type": "minecraft:range_choice", - "input": "gm4_sky_dimension:erosion/floating_falls/lake/terrain_topside", + "input": "gm4_sky_dimension:island_types/floating_falls/lake/terrain_topside", "min_inclusive": 0, "max_exclusive": 1000000, "when_in_range": { "type": "minecraft:add", "argument1": 0.5, - "argument2": "gm4_sky_dimension:erosion/floating_falls/lake/terrain_underside" + "argument2": "gm4_sky_dimension:island_types/floating_falls/lake/terrain_underside" }, "when_out_of_range": -1 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/islands.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/floating_falls/small_islands/islands.json similarity index 72% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/islands.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/floating_falls/small_islands/islands.json index f3f048a14f..c4d3e671b2 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/islands.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/floating_falls/small_islands/islands.json @@ -3,14 +3,14 @@ "argument1": { "type": "minecraft:mul", "argument1": 0.7, - "argument2": "gm4_sky_dimension:erosion/floating_falls/small_islands/wavy_sawtooth" + "argument2": "gm4_sky_dimension:island_types/floating_falls/small_islands/wavy_sawtooth" }, "argument2": { "type": "minecraft:add", "argument1": 0.2, "argument2": { "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/top", + "noise": "gm4_sky_dimension:island_types/top", "xz_scale": 5, "y_scale": 5, "shift_x": "minecraft:shift_x", diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/sawtooth.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/floating_falls/small_islands/sawtooth.json similarity index 100% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/sawtooth.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/floating_falls/small_islands/sawtooth.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/floating_falls/small_islands/total.json similarity index 84% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/total.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/floating_falls/small_islands/total.json index dbed181db6..a2a130c7f5 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/floating_falls/small_islands/total.json @@ -17,7 +17,7 @@ "argument": { "type": "minecraft:mul", "argument1": 1.5, - "argument2": "gm4_sky_dimension:erosion/floating_falls/small_islands/islands" + "argument2": "gm4_sky_dimension:island_types/floating_falls/small_islands/islands" } } }, diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/wavy_sawtooth.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/floating_falls/small_islands/wavy_sawtooth.json similarity index 59% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/wavy_sawtooth.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/floating_falls/small_islands/wavy_sawtooth.json index 8f63dc6673..f2ebfcb79d 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/small_islands/wavy_sawtooth.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/floating_falls/small_islands/wavy_sawtooth.json @@ -2,13 +2,13 @@ "type": "minecraft:range_choice", "input": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/floating_falls/small_islands/sawtooth", + "argument1": "gm4_sky_dimension:island_types/floating_falls/small_islands/sawtooth", "argument2": { "type": "minecraft:mul", "argument1": 0.2, "argument2": { "type": "minecraft:noise", - "noise": "gm4_sky_dimension:erosion/middle", + "noise": "gm4_sky_dimension:island_types/middle", "xz_scale": 3, "y_scale": 8 } @@ -16,6 +16,6 @@ }, "min_inclusive": -10, "max_exclusive": -0.3, - "when_in_range": "gm4_sky_dimension:erosion/floating_falls/small_islands/sawtooth", + "when_in_range": "gm4_sky_dimension:island_types/floating_falls/small_islands/sawtooth", "when_out_of_range": -1 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/floating_falls/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/floating_falls/total.json new file mode 100644 index 0000000000..10d81dd629 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/floating_falls/total.json @@ -0,0 +1,5 @@ +{ + "type": "minecraft:max", + "argument1": "gm4_sky_dimension:island_types/floating_falls/lake/total", + "argument2": "gm4_sky_dimension:island_types/floating_falls/small_islands/total" +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/gradient.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/full_blobs/gradient.json similarity index 100% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/gradient.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/full_blobs/gradient.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/noise.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/full_blobs/noise.json similarity index 100% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/full_blobs/noise.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/full_blobs/noise.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/full_blobs/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/full_blobs/total.json new file mode 100644 index 0000000000..ebacd9797a --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/full_blobs/total.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:min", + "argument1": "gm4_sky_dimension:island_types/island_groups", + "argument2": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:island_types/full_blobs/noise", + "argument2": "gm4_sky_dimension:island_types/full_blobs/gradient" + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/gradient_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/huge_islands/main/gradient_topside.json similarity index 100% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/gradient_topside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/huge_islands/main/gradient_topside.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/gradient_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/huge_islands/main/gradient_underside.json similarity index 100% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/gradient_underside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/huge_islands/main/gradient_underside.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/terrain_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/huge_islands/main/terrain_topside.json similarity index 76% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/terrain_topside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/huge_islands/main/terrain_topside.json index 79797a3474..d96b22bad1 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/floating_falls/lake/terrain_topside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/huge_islands/main/terrain_topside.json @@ -2,7 +2,7 @@ "type": "minecraft:interpolated", "argument": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/floating_falls/lake/gradient_topside", + "argument1": "gm4_sky_dimension:island_types/huge_islands/main/gradient_topside", "argument2": { "type": "minecraft:add", "argument1": 0.5, @@ -10,7 +10,7 @@ "type": "minecraft:abs", "argument": { "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/middle", + "noise": "gm4_sky_dimension:island_types/middle", "xz_scale": 0, "y_scale": 0, "shift_x": "minecraft:shift_x", diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/terrain_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/huge_islands/main/terrain_underside.json similarity index 77% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/terrain_underside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/huge_islands/main/terrain_underside.json index a54910e5fa..a486100cd8 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/huge_islands/main/terrain_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/huge_islands/main/terrain_underside.json @@ -4,7 +4,7 @@ "type": "minecraft:mul", "argument1": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/huge_islands/main/gradient_underside", + "argument1": "gm4_sky_dimension:island_types/huge_islands/main/gradient_underside", "argument2": { "type": "minecraft:mul", "argument1": 0.4, @@ -15,7 +15,7 @@ "type": "minecraft:abs", "argument": { "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/middle", + "noise": "gm4_sky_dimension:island_types/middle", "xz_scale": 2, "y_scale": 0, "shift_x": "minecraft:shift_x", @@ -33,7 +33,7 @@ "when_in_range": { "type": "minecraft:add", "argument1": 1, - "argument2": "gm4_sky_dimension:erosion/huge_islands/main/gradient_underside" + "argument2": "gm4_sky_dimension:island_types/huge_islands/main/gradient_underside" }, "when_out_of_range": -1 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/huge_islands/main/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/huge_islands/main/total.json new file mode 100644 index 0000000000..db193b8095 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/huge_islands/main/total.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:range_choice", + "input": "gm4_sky_dimension:island_types/huge_islands/main/terrain_topside", + "min_inclusive": 0, + "max_exclusive": 1000000, + "when_in_range": "gm4_sky_dimension:island_types/huge_islands/main/terrain_underside", + "when_out_of_range": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/huge_islands/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/huge_islands/total.json new file mode 100644 index 0000000000..5907292d13 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/huge_islands/total.json @@ -0,0 +1,5 @@ +{ + "type": "minecraft:min", + "argument1": "gm4_sky_dimension:island_types/island_groups", + "argument2": "gm4_sky_dimension:island_types/huge_islands/main/total" +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/island_groups.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/island_groups.json similarity index 100% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/island_groups.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/island_groups.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/carver_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/normal/carver_underside.json similarity index 79% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/carver_underside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/normal/carver_underside.json index 60a7363f69..f27691d08d 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/carver_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/normal/carver_underside.json @@ -9,7 +9,7 @@ "argument1": { "type": "minecraft:mul", "argument1": 1.2, - "argument2": "gm4_sky_dimension:erosion/mountainous/gradient_carver" + "argument2": "gm4_sky_dimension:island_types/mountainous/normal/gradient_carver" }, "argument2": { "type": "minecraft:mul", @@ -21,7 +21,7 @@ "type": "minecraft:abs", "argument": { "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/middle", + "noise": "gm4_sky_dimension:island_types/middle", "xz_scale": 0.8, "y_scale": 0, "shift_x": "minecraft:shift_x", @@ -36,7 +36,7 @@ "argument2": { "type": "minecraft:add", "argument1": 1.8, - "argument2": "gm4_sky_dimension:erosion/mountainous/noise_underside" + "argument2": "gm4_sky_dimension:island_types/mountainous/normal/noise_underside" } }, "argument2": 0 diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_carver.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/normal/gradient_carver.json similarity index 100% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_carver.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/normal/gradient_carver.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_hills.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/normal/gradient_hills.json similarity index 100% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_hills.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/normal/gradient_hills.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_noise.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/normal/gradient_noise.json similarity index 100% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_noise.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/normal/gradient_noise.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/normal/gradient_topside.json similarity index 100% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/gradient_topside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/normal/gradient_topside.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/land_mass.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/normal/land_mass.json similarity index 50% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/land_mass.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/normal/land_mass.json index 172a40a9ac..f6907343d1 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/land_mass.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/normal/land_mass.json @@ -1,16 +1,16 @@ { "type": "minecraft:range_choice", - "input": "gm4_sky_dimension:erosion/mountainous/terrain_hills", + "input": "gm4_sky_dimension:island_types/mountainous/normal/terrain_hills", "min_inclusive": -1000000, "max_exclusive": 0, "when_in_range": { "type": "minecraft:mul", "argument1": 0.2, - "argument2": "gm4_sky_dimension:erosion/mountainous/terrain_topside" + "argument2": "gm4_sky_dimension:island_types/mountainous/normal/terrain_topside" }, "when_out_of_range": { "type": "minecraft:mul", "argument1": 0.18, - "argument2": "gm4_sky_dimension:erosion/mountainous/carver_underside" + "argument2": "gm4_sky_dimension:island_types/mountainous/normal/carver_underside" } } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/noise_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/normal/noise_underside.json similarity index 81% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/noise_underside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/normal/noise_underside.json index 3dc7d94aad..713b51bca6 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/noise_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/normal/noise_underside.json @@ -5,7 +5,7 @@ "type": "minecraft:interpolated", "argument": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/mountainous/gradient_noise", + "argument1": "gm4_sky_dimension:island_types/mountainous/normal/gradient_noise", "argument2": { "type": "minecraft:mul", "argument1": 15, @@ -16,7 +16,7 @@ "type": "minecraft:abs", "argument": { "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/mid_bottom", + "noise": "gm4_sky_dimension:island_types/mid_bottom", "xz_scale": 3, "y_scale": 0, "shift_x": "minecraft:shift_x", diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/terrain_hills.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/normal/terrain_hills.json similarity index 84% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/terrain_hills.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/normal/terrain_hills.json index 2877274681..c851f15489 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/terrain_hills.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/normal/terrain_hills.json @@ -6,7 +6,7 @@ "type": "minecraft:interpolated", "argument": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/mountainous/gradient_hills", + "argument1": "gm4_sky_dimension:island_types/mountainous/normal/gradient_hills", "argument2": { "type": "minecraft:mul", "argument1": 1.2, @@ -14,7 +14,7 @@ "type": "minecraft:abs", "argument": { "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/middle", + "noise": "gm4_sky_dimension:island_types/middle", "xz_scale": 0.8, "y_scale": 0, "shift_x": "minecraft:shift_x", diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/terrain_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/normal/terrain_topside.json similarity index 75% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/terrain_topside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/normal/terrain_topside.json index b58357c70d..9ae09f4599 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/terrain_topside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/normal/terrain_topside.json @@ -2,7 +2,7 @@ "type": "minecraft:interpolated", "argument": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/mountainous/gradient_topside", + "argument1": "gm4_sky_dimension:island_types/mountainous/normal/gradient_topside", "argument2": { "type": "minecraft:mul", "argument1": 3, @@ -10,7 +10,7 @@ "type": "minecraft:abs", "argument": { "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/middle", + "noise": "gm4_sky_dimension:island_types/middle", "xz_scale": 0.8, "y_scale": 0, "shift_x": "minecraft:shift_x", diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/normal/total.json similarity index 88% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/total.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/normal/total.json index 8ba7f1ab1d..f8f3e3dd67 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/mountainous/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/normal/total.json @@ -8,7 +8,7 @@ "argument1": 40, "argument2": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/mountainous/land_mass", + "argument1": "gm4_sky_dimension:island_types/mountainous/normal/land_mass", "argument2": { "type": "minecraft:quarter_negative", "argument": { diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/total.json new file mode 100644 index 0000000000..4f8c6c2f10 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/total.json @@ -0,0 +1,5 @@ +{ + "type": "minecraft:add", + "argument1": 0, + "argument2": "gm4_sky_dimension:island_types/mountainous/normal/total" +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/carver_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/bottom/carver_underside.json similarity index 92% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/carver_underside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/bottom/carver_underside.json index 02b410efe5..76b862c98d 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/carver_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/bottom/carver_underside.json @@ -4,7 +4,7 @@ "type": "minecraft:mul", "argument1": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/normal/bottom/gradient_carver", + "argument1": "gm4_sky_dimension:island_types/normal/bottom/gradient_carver", "argument2": { "type": "minecraft:mul", "argument1": -2, @@ -81,5 +81,5 @@ "min_inclusive": -1000000, "max_exclusive": 0, "when_in_range": -1, - "when_out_of_range": "gm4_sky_dimension:erosion/normal/bottom/terrain_underside" + "when_out_of_range": "gm4_sky_dimension:island_types/normal/bottom/terrain_underside" } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_carver.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/bottom/gradient_carver.json similarity index 100% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_carver.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/bottom/gradient_carver.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/bottom/gradient_topside.json similarity index 100% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_topside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/bottom/gradient_topside.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/bottom/gradient_underside.json similarity index 100% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/gradient_underside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/bottom/gradient_underside.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/noise.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/bottom/noise.json similarity index 86% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/noise.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/bottom/noise.json index ce7fc5af53..631bb62b87 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/noise.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/bottom/noise.json @@ -6,7 +6,7 @@ "type": "minecraft:cache_2d", "argument": { "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/bottom", + "noise": "gm4_sky_dimension:island_types/bottom", "xz_scale": 7, "y_scale": 0, "shift_x": "minecraft:shift_x", diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/shift.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/bottom/shift.json similarity index 93% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/shift.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/bottom/shift.json index b9bd3fb377..e19ebf6d14 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/shift.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/bottom/shift.json @@ -44,7 +44,7 @@ "argument2": { "type": "minecraft:spline", "spline": { - "coordinate": "gm4_sky_dimension:erosion/normal/bottom/noise", + "coordinate": "gm4_sky_dimension:island_types/normal/bottom/noise", "points": [ { "location": -0.001, diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/terrain_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/bottom/terrain_topside.json similarity index 74% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/terrain_topside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/bottom/terrain_topside.json index c862ac8a40..bf08fb3ecf 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/terrain_topside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/bottom/terrain_topside.json @@ -4,7 +4,7 @@ "type": "minecraft:interpolated", "argument": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/normal/bottom/gradient_topside", + "argument1": "gm4_sky_dimension:island_types/normal/bottom/gradient_topside", "argument2": { "type": "minecraft:add", "argument1": 0.5, @@ -12,7 +12,7 @@ "type": "minecraft:abs", "argument": { "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/bottom", + "noise": "gm4_sky_dimension:island_types/bottom", "xz_scale": 0, "y_scale": 0, "shift_x": "minecraft:shift_x", @@ -26,6 +26,6 @@ "argument2": { "type": "minecraft:mul", "argument1": -4, - "argument2": "gm4_sky_dimension:erosion/normal/bottom/shift" + "argument2": "gm4_sky_dimension:island_types/normal/bottom/shift" } } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/terrain_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/bottom/terrain_underside.json similarity index 70% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/terrain_underside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/bottom/terrain_underside.json index 41e5f852f1..4aac680128 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/bottom/terrain_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/bottom/terrain_underside.json @@ -4,7 +4,7 @@ "type": "minecraft:mul", "argument1": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/normal/bottom/gradient_underside", + "argument1": "gm4_sky_dimension:island_types/normal/bottom/gradient_underside", "argument2": { "type": "minecraft:mul", "argument1": 0.7, @@ -16,12 +16,12 @@ "argument2": { "type": "minecraft:mul", "argument1": 1, - "argument2": "gm4_sky_dimension:erosion/normal/bottom/shift" + "argument2": "gm4_sky_dimension:island_types/normal/bottom/shift" } }, "argument2": { "type": "minecraft:abs", - "argument": "gm4_sky_dimension:erosion/normal/bottom/noise" + "argument": "gm4_sky_dimension:island_types/normal/bottom/noise" } } } @@ -33,7 +33,7 @@ "when_in_range": { "type": "minecraft:add", "argument1": 1, - "argument2": "gm4_sky_dimension:erosion/normal/bottom/gradient_underside" + "argument2": "gm4_sky_dimension:island_types/normal/bottom/gradient_underside" }, "when_out_of_range": -1 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/bottom/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/bottom/total.json new file mode 100644 index 0000000000..9e7fea8e3a --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/bottom/total.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:range_choice", + "input": "gm4_sky_dimension:island_types/normal/bottom/terrain_topside", + "min_inclusive": 0, + "max_exclusive": 1000000, + "when_in_range": "gm4_sky_dimension:island_types/normal/bottom/carver_underside", + "when_out_of_range": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/carver_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/mid_bottom/carver_underside.json similarity index 92% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/carver_underside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/mid_bottom/carver_underside.json index a3e17ea077..40f27709ee 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/carver_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/mid_bottom/carver_underside.json @@ -4,7 +4,7 @@ "type": "minecraft:mul", "argument1": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/normal/mid_bottom/gradient_carver", + "argument1": "gm4_sky_dimension:island_types/normal/mid_bottom/gradient_carver", "argument2": { "type": "minecraft:mul", "argument1": -2, @@ -81,5 +81,5 @@ "min_inclusive": -1000000, "max_exclusive": 0, "when_in_range": -1, - "when_out_of_range": "gm4_sky_dimension:erosion/normal/mid_bottom/terrain_underside" + "when_out_of_range": "gm4_sky_dimension:island_types/normal/mid_bottom/terrain_underside" } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_carver.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/mid_bottom/gradient_carver.json similarity index 100% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_carver.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/mid_bottom/gradient_carver.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/mid_bottom/gradient_topside.json similarity index 100% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_topside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/mid_bottom/gradient_topside.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/mid_bottom/gradient_underside.json similarity index 100% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/gradient_underside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/mid_bottom/gradient_underside.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/noise.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/mid_bottom/noise.json similarity index 85% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/noise.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/mid_bottom/noise.json index 52c59b3c1e..72a297dd7b 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/noise.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/mid_bottom/noise.json @@ -6,7 +6,7 @@ "type": "minecraft:cache_2d", "argument": { "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/mid_bottom", + "noise": "gm4_sky_dimension:island_types/mid_bottom", "xz_scale": 3, "y_scale": 0, "shift_x": "minecraft:shift_x", diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/shift.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/mid_bottom/shift.json similarity index 93% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/shift.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/mid_bottom/shift.json index 6884b2e226..32cf5abee7 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/shift.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/mid_bottom/shift.json @@ -44,7 +44,7 @@ "argument2": { "type": "minecraft:spline", "spline": { - "coordinate": "gm4_sky_dimension:erosion/normal/mid_bottom/noise", + "coordinate": "gm4_sky_dimension:island_types/normal/mid_bottom/noise", "points": [ { "location": -0.001, diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/terrain_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/mid_bottom/terrain_topside.json similarity index 73% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/terrain_topside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/mid_bottom/terrain_topside.json index 0343404187..ac08e908ec 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/terrain_topside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/mid_bottom/terrain_topside.json @@ -4,7 +4,7 @@ "type": "minecraft:interpolated", "argument": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/normal/mid_bottom/gradient_topside", + "argument1": "gm4_sky_dimension:island_types/normal/mid_bottom/gradient_topside", "argument2": { "type": "minecraft:add", "argument1": 0.8, @@ -12,7 +12,7 @@ "type": "minecraft:abs", "argument": { "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/mid_bottom", + "noise": "gm4_sky_dimension:island_types/mid_bottom", "xz_scale": 0, "y_scale": 0, "shift_x": "minecraft:shift_x", @@ -26,6 +26,6 @@ "argument2": { "type": "minecraft:mul", "argument1": -4, - "argument2": "gm4_sky_dimension:erosion/normal/mid_bottom/shift" + "argument2": "gm4_sky_dimension:island_types/normal/mid_bottom/shift" } } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/terrain_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/mid_bottom/terrain_underside.json similarity index 68% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/terrain_underside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/mid_bottom/terrain_underside.json index 2098141e86..93df8dc290 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/mid_bottom/terrain_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/mid_bottom/terrain_underside.json @@ -4,7 +4,7 @@ "type": "minecraft:mul", "argument1": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/normal/mid_bottom/gradient_underside", + "argument1": "gm4_sky_dimension:island_types/normal/mid_bottom/gradient_underside", "argument2": { "type": "minecraft:mul", "argument1": 0.5, @@ -16,12 +16,12 @@ "argument2": { "type": "minecraft:mul", "argument1": 1, - "argument2": "gm4_sky_dimension:erosion/normal/mid_bottom/shift" + "argument2": "gm4_sky_dimension:island_types/normal/mid_bottom/shift" } }, "argument2": { "type": "minecraft:abs", - "argument": "gm4_sky_dimension:erosion/normal/mid_bottom/noise" + "argument": "gm4_sky_dimension:island_types/normal/mid_bottom/noise" } } } @@ -33,7 +33,7 @@ "when_in_range": { "type": "minecraft:add", "argument1": 1, - "argument2": "gm4_sky_dimension:erosion/normal/mid_bottom/gradient_underside" + "argument2": "gm4_sky_dimension:island_types/normal/mid_bottom/gradient_underside" }, "when_out_of_range": -1 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/mid_bottom/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/mid_bottom/total.json new file mode 100644 index 0000000000..245e9f9dd2 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/mid_bottom/total.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:range_choice", + "input": "gm4_sky_dimension:island_types/normal/mid_bottom/terrain_topside", + "min_inclusive": 0, + "max_exclusive": 1000000, + "when_in_range": "gm4_sky_dimension:island_types/normal/mid_bottom/carver_underside", + "when_out_of_range": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/carver_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/carver_underside.json similarity index 92% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/carver_underside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/carver_underside.json index 8752132d48..d25cb64bf9 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/carver_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/carver_underside.json @@ -4,7 +4,7 @@ "type": "minecraft:mul", "argument1": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/normal/middle/gradient_carver", + "argument1": "gm4_sky_dimension:island_types/normal/middle/gradient_carver", "argument2": { "type": "minecraft:mul", "argument1": -2, @@ -81,5 +81,5 @@ "min_inclusive": -1000000, "max_exclusive": 0, "when_in_range": -1, - "when_out_of_range": "gm4_sky_dimension:erosion/normal/middle/terrain_underside" + "when_out_of_range": "gm4_sky_dimension:island_types/normal/middle/terrain_underside" } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_carver.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/gradient_carver.json similarity index 100% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_carver.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/gradient_carver.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/gradient_topside.json similarity index 100% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_topside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/gradient_topside.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/gradient_underside.json similarity index 100% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/gradient_underside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/gradient_underside.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/noise.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/noise.json similarity index 86% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/noise.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/noise.json index afa1ec87cc..091246177d 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/noise.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/noise.json @@ -6,7 +6,7 @@ "type": "minecraft:cache_2d", "argument": { "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/middle", + "noise": "gm4_sky_dimension:island_types/middle", "xz_scale": 4, "y_scale": 0, "shift_x": "minecraft:shift_x", diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/shift.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/shift.json similarity index 93% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/shift.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/shift.json index 288908ce87..ce506d6c88 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/shift.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/shift.json @@ -44,7 +44,7 @@ "argument2": { "type": "minecraft:spline", "spline": { - "coordinate": "gm4_sky_dimension:erosion/normal/middle/noise", + "coordinate": "gm4_sky_dimension:island_types/normal/middle/noise", "points": [ { "location": -0.001, diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/terrain_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/terrain_topside.json similarity index 74% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/terrain_topside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/terrain_topside.json index c23a41dfbf..1358871aad 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/terrain_topside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/terrain_topside.json @@ -4,7 +4,7 @@ "type": "minecraft:interpolated", "argument": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/normal/middle/gradient_topside", + "argument1": "gm4_sky_dimension:island_types/normal/middle/gradient_topside", "argument2": { "type": "minecraft:add", "argument1": 0.5, @@ -12,7 +12,7 @@ "type": "minecraft:abs", "argument": { "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/middle", + "noise": "gm4_sky_dimension:island_types/middle", "xz_scale": 0, "y_scale": 0, "shift_x": "minecraft:shift_x", @@ -26,6 +26,6 @@ "argument2": { "type": "minecraft:mul", "argument1": -1, - "argument2": "gm4_sky_dimension:erosion/normal/middle/shift" + "argument2": "gm4_sky_dimension:island_types/normal/middle/shift" } } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/terrain_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/terrain_underside.json similarity index 70% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/terrain_underside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/terrain_underside.json index 836e77450d..6e9b745e1c 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/middle/terrain_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/terrain_underside.json @@ -4,7 +4,7 @@ "type": "minecraft:mul", "argument1": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/normal/middle/gradient_underside", + "argument1": "gm4_sky_dimension:island_types/normal/middle/gradient_underside", "argument2": { "type": "minecraft:mul", "argument1": 0.3, @@ -16,12 +16,12 @@ "argument2": { "type": "minecraft:mul", "argument1": 3, - "argument2": "gm4_sky_dimension:erosion/normal/middle/shift" + "argument2": "gm4_sky_dimension:island_types/normal/middle/shift" } }, "argument2": { "type": "minecraft:abs", - "argument": "gm4_sky_dimension:erosion/normal/middle/noise" + "argument": "gm4_sky_dimension:island_types/normal/middle/noise" } } } @@ -33,7 +33,7 @@ "when_in_range": { "type": "minecraft:add", "argument1": 1, - "argument2": "gm4_sky_dimension:erosion/normal/middle/gradient_underside" + "argument2": "gm4_sky_dimension:island_types/normal/middle/gradient_underside" }, "when_out_of_range": -1 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/total.json new file mode 100644 index 0000000000..ad1a5a8c21 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/total.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:range_choice", + "input": "gm4_sky_dimension:island_types/normal/middle/terrain_topside", + "min_inclusive": 0, + "max_exclusive": 1000000, + "when_in_range": "gm4_sky_dimension:island_types/normal/middle/carver_underside", + "when_out_of_range": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/carver_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/top/carver_underside.json similarity index 95% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/carver_underside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/top/carver_underside.json index 0e0f62b47e..4cbbca61f4 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/carver_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/top/carver_underside.json @@ -4,7 +4,7 @@ "type": "minecraft:mul", "argument1": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/normal/top/gradient_carver", + "argument1": "gm4_sky_dimension:island_types/normal/top/gradient_carver", "argument2": { "type": "minecraft:mul", "argument1": -2, @@ -118,5 +118,5 @@ "min_inclusive": -1000000, "max_exclusive": 0, "when_in_range": -1, - "when_out_of_range": "gm4_sky_dimension:erosion/normal/top/terrain_underside" + "when_out_of_range": "gm4_sky_dimension:island_types/normal/top/terrain_underside" } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/gradient_carver.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/top/gradient_carver.json similarity index 100% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/gradient_carver.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/top/gradient_carver.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/gradient_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/top/gradient_topside.json similarity index 100% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/gradient_topside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/top/gradient_topside.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/gradient_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/top/gradient_underside.json similarity index 100% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/gradient_underside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/top/gradient_underside.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/terrain_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/top/terrain_topside.json similarity index 77% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/terrain_topside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/top/terrain_topside.json index 2d70d6f993..5eba1d92d7 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/terrain_topside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/top/terrain_topside.json @@ -2,7 +2,7 @@ "type": "minecraft:interpolated", "argument": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/normal/top/gradient_topside", + "argument1": "gm4_sky_dimension:island_types/normal/top/gradient_topside", "argument2": { "type": "minecraft:add", "argument1": 0.5, @@ -10,7 +10,7 @@ "type": "minecraft:abs", "argument": { "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/top", + "noise": "gm4_sky_dimension:island_types/top", "xz_scale": 0, "y_scale": 0, "shift_x": "minecraft:shift_x", diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/terrain_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/top/terrain_underside.json similarity index 78% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/terrain_underside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/top/terrain_underside.json index 069e61619e..33100ff8f1 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/normal/top/terrain_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/top/terrain_underside.json @@ -4,7 +4,7 @@ "type": "minecraft:mul", "argument1": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/normal/top/gradient_underside", + "argument1": "gm4_sky_dimension:island_types/normal/top/gradient_underside", "argument2": { "type": "minecraft:mul", "argument1": 0.7, @@ -15,7 +15,7 @@ "type": "minecraft:abs", "argument": { "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/top", + "noise": "gm4_sky_dimension:island_types/top", "xz_scale": 3, "y_scale": 0, "shift_x": "minecraft:shift_x", @@ -33,7 +33,7 @@ "when_in_range": { "type": "minecraft:add", "argument1": 1, - "argument2": "gm4_sky_dimension:erosion/normal/top/gradient_underside" + "argument2": "gm4_sky_dimension:island_types/normal/top/gradient_underside" }, "when_out_of_range": -1 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/top/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/top/total.json new file mode 100644 index 0000000000..4a067396a3 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/top/total.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:range_choice", + "input": "gm4_sky_dimension:island_types/normal/top/terrain_topside", + "min_inclusive": 0, + "max_exclusive": 1000000, + "when_in_range": "gm4_sky_dimension:island_types/normal/top/carver_underside", + "when_out_of_range": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/total.json new file mode 100644 index 0000000000..db8a1be878 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/total.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:min", + "argument1": "gm4_sky_dimension:island_types/island_groups", + "argument2": { + "type": "minecraft:max", + "argument1": { + "type": "minecraft:max", + "argument1": "gm4_sky_dimension:island_types/normal/middle/total", + "argument2": "gm4_sky_dimension:island_types/normal/mid_bottom/total" + }, + "argument2": { + "type": "minecraft:max", + "argument1": "gm4_sky_dimension:island_types/normal/top/total", + "argument2": "gm4_sky_dimension:island_types/normal/bottom/total" + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/noise.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/shattered/noise.json similarity index 100% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/high/noise.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/shattered/noise.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/shattered/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/shattered/total.json new file mode 100644 index 0000000000..8caacfee72 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/shattered/total.json @@ -0,0 +1,5 @@ +{ + "type": "minecraft:min", + "argument1": "gm4_sky_dimension:island_types/normal/total", + "argument2": "gm4_sky_dimension:island_types/shattered/noise" +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/stairs/gradient_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/stairs/gradient_topside.json similarity index 100% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/stairs/gradient_topside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/stairs/gradient_topside.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/stairs/terrain_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/stairs/terrain_topside.json similarity index 77% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/stairs/terrain_topside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/stairs/terrain_topside.json index ad00210df6..c17fceaa6f 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/stairs/terrain_topside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/stairs/terrain_topside.json @@ -2,7 +2,7 @@ "type": "minecraft:interpolated", "argument": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/stairs/gradient_topside", + "argument1": "gm4_sky_dimension:island_types/stairs/gradient_topside", "argument2": { "type": "minecraft:add", "argument1": 0.05, @@ -10,7 +10,7 @@ "type": "minecraft:abs", "argument": { "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:erosion/middle", + "noise": "gm4_sky_dimension:island_types/middle", "xz_scale": 0.9, "y_scale": 0, "shift_x": "minecraft:shift_x", diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/stairs/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/stairs/total.json similarity index 96% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/stairs/total.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/stairs/total.json index 9ef00d592d..9b00cbd0f9 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/stairs/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/stairs/total.json @@ -70,7 +70,7 @@ }, "argument2": { "type": "minecraft:range_choice", - "input": "gm4_sky_dimension:erosion/stairs/terrain_topside", + "input": "gm4_sky_dimension:island_types/stairs/terrain_topside", "min_inclusive": 0, "max_exclusive": 0.03, "when_in_range": 1, diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/total.json similarity index 95% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/total.json index 2161494907..590de038d6 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/erosion/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/total.json @@ -6,7 +6,7 @@ "type": "minecraft:max", "argument1": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/huge_islands/total", + "argument1": "gm4_sky_dimension:island_types/huge_islands/total", "argument2": { "type": "minecraft:interpolated", "argument": { @@ -59,7 +59,7 @@ }, "argument2": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/floating_falls/total", + "argument1": "gm4_sky_dimension:island_types/floating_falls/total", "argument2": { "type": "minecraft:interpolated", "argument": { @@ -113,7 +113,7 @@ }, "argument2": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/mountainous/total", + "argument1": "gm4_sky_dimension:island_types/mountainous/total", "argument2": { "type": "minecraft:interpolated", "argument": { @@ -171,7 +171,7 @@ "type": "minecraft:max", "argument1": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/high/total", + "argument1": "gm4_sky_dimension:island_types/shattered/total", "argument2": { "type": "minecraft:interpolated", "argument": { @@ -210,7 +210,7 @@ }, "argument2": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/full_blobs/total", + "argument1": "gm4_sky_dimension:island_types/full_blobs/total", "argument2": { "type": "minecraft:interpolated", "argument": { @@ -252,7 +252,7 @@ "type": "minecraft:max", "argument1": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/normal/total", + "argument1": "gm4_sky_dimension:island_types/normal/total", "argument2": { "type": "minecraft:interpolated", "argument": { @@ -292,7 +292,7 @@ }, "argument2": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:erosion/stairs/total", + "argument1": "gm4_sky_dimension:island_types/stairs/total", "argument2": { "type": "minecraft:interpolated", "argument": { diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/density.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/density.json index 649d174418..addc9ba908 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/density.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/density.json @@ -1,5 +1,5 @@ { "type": "minecraft:min", - "argument1": "gm4_sky_dimension:erosion/total", + "argument1": "gm4_sky_dimension:island_types/total", "argument2": "gm4_sky_dimension:continents/total" } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/bottom.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/island_types/bottom.json similarity index 100% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/bottom.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/island_types/bottom.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/mid_bottom.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/island_types/mid_bottom.json similarity index 100% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/mid_bottom.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/island_types/mid_bottom.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/middle.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/island_types/middle.json similarity index 100% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/middle.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/island_types/middle.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/top.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/island_types/top.json similarity index 100% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/erosion/top.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/island_types/top.json From 3e913799c04b0968ce8a7ed999fd849e4ca602ab Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Sat, 6 Jan 2024 10:31:29 -0800 Subject: [PATCH 29/35] make land mass not dependent on continentalness --- .../worldgen/density_function/continents/sea_level.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/sea_level.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/sea_level.json index 50e493963e..8a098307d7 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/sea_level.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/continents/sea_level.json @@ -4,7 +4,7 @@ "type": "minecraft:range_choice", "input": "minecraft:y", "min_inclusive": 16, - "max_exclusive": 170, + "max_exclusive": 192, "when_in_range": { "type": "minecraft:y_clamped_gradient", "from_y": 170, @@ -24,19 +24,19 @@ "type": "minecraft:range_choice", "input": "minecraft:y", "min_inclusive": 192, - "max_exclusive": 366, + "max_exclusive": 380, "when_in_range": { "type": "minecraft:y_clamped_gradient", "from_y": 512, "to_y": 192, - "from_value": -1, + "from_value": -0.5, "to_value": 0 }, "when_out_of_range": { "type": "minecraft:y_clamped_gradient", "from_y": 384, "to_y": 192, - "from_value": -1.3, + "from_value": -1, "to_value": 0 } } From ad8ae89f71bf25340c14c0f6a12903e8df9f9d54 Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Wed, 10 Jan 2024 23:41:10 -0800 Subject: [PATCH 30/35] Add Badlands island type and bridges - badlands island type (placement may change) - add bridges to shattered island type --- .../dimension/celesterra.json | 71 +++++++++++------ .../mountainous/canyons/carver_underside.json | 43 ++++++++++ .../mountainous/canyons/gradient_carver.json | 7 ++ .../mountainous/canyons/gradient_hills.json | 7 ++ .../mountainous/canyons/gradient_noise.json | 7 ++ .../mountainous/canyons/gradient_topside.json | 27 +++++++ .../mountainous/canyons/land_mass.json | 16 ++++ .../mountainous/canyons/noise_underside.json | 31 ++++++++ .../mountainous/canyons/terrain_hills.json | 26 ++++++ .../mountainous/canyons/terrain_topside.json | 24 ++++++ .../mountainous/canyons/total.json | 29 +++++++ .../island_types/mountainous/total.json | 54 ++++++++++++- .../island_types/shattered/bridges.json | 79 +++++++++++++++++++ .../island_types/shattered/full_bridges.json | 79 +++++++++++++++++++ .../island_types/shattered/noise.json | 4 +- .../island_types/shattered/total.json | 14 +++- .../density_function/island_types/total.json | 24 +++--- .../worldgen/noise/island_types/high.json | 11 +++ .../worldgen/noise_settings/celesterra.json | 34 ++++++++ 19 files changed, 545 insertions(+), 42 deletions(-) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/carver_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/gradient_carver.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/gradient_hills.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/gradient_noise.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/gradient_topside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/land_mass.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/noise_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/terrain_hills.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/terrain_topside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/total.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/shattered/bridges.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/shattered/full_bridges.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/island_types/high.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json index 5eb938906a..67b9fe6e24 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json @@ -6,6 +6,33 @@ "biome_source": { "type": "minecraft:multi_noise", "biomes": [ + { + "biome": "minecraft:badlands", + "parameters": { + "temperature": [ + 0, + 1 + ], + "humidity": [ + -1, + 1 + ], + "continentalness": [ + 0.2, + 1 + ], + "erosion": [ + -1, + -0.5 + ], + "weirdness": [ + -1, + 0 + ], + "depth": 0, + "offset": 0 + } + }, { "biome": "minecraft:the_void", "parameters": { @@ -38,7 +65,7 @@ "parameters": { "temperature": [ -1, - 1 + 0 ], "humidity": [ -1, @@ -50,7 +77,7 @@ ], "erosion": [ -1, - -0.75 + -0.5 ], "weirdness": [ -1, @@ -92,7 +119,7 @@ ], "erosion": [ -1, - -0.75 + -0.5 ], "weirdness": [ 0, @@ -146,7 +173,7 @@ ], "erosion": [ -1, - -0.75 + -0.5 ], "weirdness": [ -1, @@ -226,7 +253,7 @@ 1 ], "erosion": [ - -0.75, + -0.5, 0.7 ], "weirdness": [ @@ -253,7 +280,7 @@ 1 ], "erosion": [ - -0.75, + -0.5, 0.7 ], "weirdness": [ @@ -280,7 +307,7 @@ 1 ], "erosion": [ - -0.75, + -0.5, 0.7 ], "weirdness": [ @@ -307,7 +334,7 @@ 1 ], "erosion": [ - -0.75, + -0.5, 0.7 ], "weirdness": [ @@ -334,7 +361,7 @@ 1 ], "erosion": [ - -0.75, + -0.5, 0.7 ], "weirdness": [ @@ -361,7 +388,7 @@ 1 ], "erosion": [ - -0.75, + -0.5, 0.7 ], "weirdness": [ @@ -388,7 +415,7 @@ 1 ], "erosion": [ - -0.75, + -0.5, 0.7 ], "weirdness": [ @@ -415,7 +442,7 @@ 1 ], "erosion": [ - -0.75, + -0.5, 0.7 ], "weirdness": [ @@ -442,7 +469,7 @@ 1 ], "erosion": [ - -0.75, + -0.5, 0.7 ], "weirdness": [ @@ -469,7 +496,7 @@ 1 ], "erosion": [ - -0.75, + -0.5, 0.7 ], "weirdness": [ @@ -496,7 +523,7 @@ 1 ], "erosion": [ - -0.75, + -0.5, 0.7 ], "weirdness": [ @@ -523,7 +550,7 @@ 1 ], "erosion": [ - -0.75, + -0.5, 0.7 ], "weirdness": [ @@ -550,7 +577,7 @@ 1 ], "erosion": [ - -0.75, + -0.5, 0.7 ], "weirdness": [ @@ -577,7 +604,7 @@ 1 ], "erosion": [ - -0.75, + -0.5, 0.7 ], "weirdness": [ @@ -604,7 +631,7 @@ 1 ], "erosion": [ - -0.75, + -0.5, 0.7 ], "weirdness": [ @@ -631,7 +658,7 @@ 1 ], "erosion": [ - -0.75, + -0.5, 0.7 ], "weirdness": [ @@ -658,7 +685,7 @@ 1 ], "erosion": [ - -0.75, + -0.5, 0.7 ], "weirdness": [ @@ -685,7 +712,7 @@ 1 ], "erosion": [ - -0.75, + -0.5, 0.7 ], "weirdness": [ diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/carver_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/carver_underside.json new file mode 100644 index 0000000000..a2ec4d774b --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/carver_underside.json @@ -0,0 +1,43 @@ +{ + "type": "minecraft:add", + "argument1": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:mul", + "argument1": 1.8, + "argument2": "gm4_sky_dimension:island_types/mountainous/canyons/gradient_carver" + }, + "argument2": { + "type": "minecraft:mul", + "argument1": 2, + "argument2": { + "type": "minecraft:add", + "argument1": 1.4, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:island_types/middle", + "xz_scale": 3, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } + } + }, + "argument2": { + "type": "minecraft:add", + "argument1": 1.8, + "argument2": "gm4_sky_dimension:island_types/mountainous/canyons/noise_underside" + } + }, + "argument2": 0 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/gradient_carver.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/gradient_carver.json new file mode 100644 index 0000000000..8ca2332a70 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/gradient_carver.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 226, + "to_y": 0, + "from_value": 0, + "to_value": -5 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/gradient_hills.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/gradient_hills.json new file mode 100644 index 0000000000..74228d7ed8 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/gradient_hills.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 330, + "to_y": 220, + "from_value": -3, + "to_value": 0 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/gradient_noise.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/gradient_noise.json new file mode 100644 index 0000000000..22d8066a1d --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/gradient_noise.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 216, + "to_y": 0, + "from_value": 0, + "to_value": -4 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/gradient_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/gradient_topside.json new file mode 100644 index 0000000000..6fdc164b3f --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/gradient_topside.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:add", + "argument1": { + "type": "minecraft:y_clamped_gradient", + "from_y": 420, + "to_y": 210, + "from_value": -3, + "to_value": 0 + }, + "argument2": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:y_clamped_gradient", + "from_y": 300, + "to_y": 298, + "from_value": -3, + "to_value": 0 + }, + "argument2": { + "type": "minecraft:y_clamped_gradient", + "from_y": 270, + "to_y": 268, + "from_value": -0.5, + "to_value": 0 + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/land_mass.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/land_mass.json new file mode 100644 index 0000000000..3d49ff8bba --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/land_mass.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:range_choice", + "input": "gm4_sky_dimension:island_types/mountainous/canyons/terrain_hills", + "min_inclusive": -1000000, + "max_exclusive": 0, + "when_in_range": { + "type": "minecraft:mul", + "argument1": 0.12, + "argument2": "gm4_sky_dimension:island_types/mountainous/canyons/terrain_topside" + }, + "when_out_of_range": { + "type": "minecraft:mul", + "argument1": 0.23, + "argument2": "gm4_sky_dimension:island_types/mountainous/canyons/carver_underside" + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/noise_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/noise_underside.json new file mode 100644 index 0000000000..542f8c0843 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/noise_underside.json @@ -0,0 +1,31 @@ +{ + "type": "minecraft:mul", + "argument1": -0.2, + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:island_types/mountainous/canyons/gradient_noise", + "argument2": { + "type": "minecraft:mul", + "argument1": 15, + "argument2": { + "type": "minecraft:add", + "argument1": 0.6, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:island_types/mid_bottom", + "xz_scale": 3, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/terrain_hills.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/terrain_hills.json new file mode 100644 index 0000000000..f64b4eb0a6 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/terrain_hills.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:quarter_negative", + "argument": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:island_types/mountainous/canyons/gradient_hills", + "argument2": { + "type": "minecraft:mul", + "argument1": 0.3, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:island_types/middle", + "xz_scale": 1, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/terrain_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/terrain_topside.json new file mode 100644 index 0000000000..70d6197994 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/terrain_topside.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:island_types/mountainous/canyons/gradient_topside", + "argument2": { + "type": "minecraft:mul", + "argument1": 2.5, + "argument2": { + "type": "minecraft:add", + "argument1": 0.3, + "argument2": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:island_types/middle", + "xz_scale": 3, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/total.json new file mode 100644 index 0000000000..cd20956d8e --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/canyons/total.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:mul", + "argument1": 0.015, + "argument2": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:mul", + "argument1": 60, + "argument2": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:island_types/mountainous/canyons/land_mass", + "argument2": { + "type": "minecraft:quarter_negative", + "argument": { + "type": "minecraft:mul", + "argument1": 0.03, + "argument2": { + "type": "minecraft:noise", + "noise": "minecraft:jagged", + "xz_scale": 1500, + "y_scale": 0 + } + } + } + } + }, + "argument2": "minecraft:overworld/base_3d_noise" + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/total.json index 4f8c6c2f10..42c0c2130b 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/total.json @@ -1,5 +1,53 @@ { - "type": "minecraft:add", - "argument1": 0, - "argument2": "gm4_sky_dimension:island_types/mountainous/normal/total" + "type": "minecraft:max", + "argument1": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:island_types/mountainous/normal/total", + "argument2": { + "type": "minecraft:spline", + "spline": { + "coordinate": { + "type": "minecraft:interpolated", + "argument": "gm4_sky_dimension:routers/temperature" + }, + "points": [ + { + "location": -0.1, + "derivative": 0, + "value": 0 + }, + { + "location": 0, + "derivative": 0, + "value": -1.5 + } + ] + } + } + }, + "argument2": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:island_types/mountainous/canyons/total", + "argument2": { + "type": "minecraft:spline", + "spline": { + "coordinate": { + "type": "minecraft:interpolated", + "argument": "gm4_sky_dimension:routers/temperature" + }, + "points": [ + { + "location": 0, + "derivative": 0, + "value": -1.5 + }, + { + "location": 0.1, + "derivative": 0, + "value": 0 + } + ] + } + } + } } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/shattered/bridges.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/shattered/bridges.json new file mode 100644 index 0000000000..4cd7ca7399 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/shattered/bridges.json @@ -0,0 +1,79 @@ +{ + "type": "minecraft:range_choice", + "input": "minecraft:y", + "min_inclusive": 199, + "max_exclusive": 200, + "when_in_range": { + "type": "minecraft:mul", + "argument1": -4, + "argument2": { + "type": "minecraft:add", + "argument1": -0.1, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:island_types/high", + "xz_scale": 7, + "y_scale": 7, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + }, + "when_out_of_range": { + "type": "minecraft:range_choice", + "input": "minecraft:y", + "min_inclusive": 191, + "max_exclusive": 192, + "when_in_range": { + "type": "minecraft:mul", + "argument1": -4, + "argument2": { + "type": "minecraft:add", + "argument1": -0.08, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:island_types/high", + "xz_scale": 6, + "y_scale": 6, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + }, + "when_out_of_range": { + "type": "minecraft:range_choice", + "input": "minecraft:y", + "min_inclusive": 145, + "max_exclusive": 146, + "when_in_range": { + "type": "minecraft:mul", + "argument1": -5, + "argument2": { + "type": "minecraft:add", + "argument1": -0.09, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:island_types/high", + "xz_scale": 7, + "y_scale": 7, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + }, + "when_out_of_range": -1 + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/shattered/full_bridges.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/shattered/full_bridges.json new file mode 100644 index 0000000000..ff22698581 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/shattered/full_bridges.json @@ -0,0 +1,79 @@ +{ + "type": "minecraft:range_choice", + "input": "minecraft:y", + "min_inclusive": 190, + "max_exclusive": 191, + "when_in_range": { + "type": "minecraft:mul", + "argument1": -5, + "argument2": { + "type": "minecraft:add", + "argument1": -0.023, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:island_types/high", + "xz_scale": 1.3, + "y_scale": 1.3, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + }, + "when_out_of_range": { + "type": "minecraft:range_choice", + "input": "minecraft:y", + "min_inclusive": 196, + "max_exclusive": 197, + "when_in_range": { + "type": "minecraft:mul", + "argument1": -5, + "argument2": { + "type": "minecraft:add", + "argument1": -0.023, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:island_types/high", + "xz_scale": 1, + "y_scale": 1, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + }, + "when_out_of_range": { + "type": "minecraft:range_choice", + "input": "minecraft:y", + "min_inclusive": 150, + "max_exclusive": 151, + "when_in_range": { + "type": "minecraft:mul", + "argument1": -5, + "argument2": { + "type": "minecraft:add", + "argument1": -0.023, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:island_types/high", + "xz_scale": 1, + "y_scale": 1, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + }, + "when_out_of_range": -1 + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/shattered/noise.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/shattered/noise.json index fa720bcff8..ea396ae369 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/shattered/noise.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/shattered/noise.json @@ -10,14 +10,14 @@ "argument1": 2, "argument2": { "type": "minecraft:add", - "argument1": -0.3, + "argument1": -0.4, "argument2": { "type": "minecraft:abs", "argument": { "type": "minecraft:shifted_noise", "noise": "gm4_sky_dimension:vegetation", "xz_scale": 5, - "y_scale": 5, + "y_scale": 2, "shift_x": "minecraft:shift_x", "shift_y": 0, "shift_z": "minecraft:shift_z" diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/shattered/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/shattered/total.json index 8caacfee72..e6d332bed0 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/shattered/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/shattered/total.json @@ -1,5 +1,13 @@ { - "type": "minecraft:min", - "argument1": "gm4_sky_dimension:island_types/normal/total", - "argument2": "gm4_sky_dimension:island_types/shattered/noise" + "type": "minecraft:max", + "argument1": { + "type": "minecraft:min", + "argument1": { + "type": "minecraft:max", + "argument1": "gm4_sky_dimension:island_types/shattered/bridges", + "argument2": "gm4_sky_dimension:island_types/shattered/noise" + }, + "argument2": "gm4_sky_dimension:island_types/normal/total" + }, + "argument2": "gm4_sky_dimension:island_types/shattered/full_bridges" } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/total.json index 590de038d6..46e79b918c 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/total.json @@ -15,7 +15,7 @@ "coordinate": "gm4_sky_dimension:routers/erosion", "points": [ { - "location": -0.77, + "location": -0.52, "derivative": 0, "value": { "coordinate": "gm4_sky_dimension:routers/continents", @@ -48,7 +48,7 @@ } }, { - "location": -0.72, + "location": -0.47, "derivative": 0, "value": -1.5 } @@ -68,7 +68,7 @@ "coordinate": "gm4_sky_dimension:routers/erosion", "points": [ { - "location": -0.79, + "location": -0.54, "derivative": 0, "value": { "coordinate": "gm4_sky_dimension:routers/continents", @@ -101,7 +101,7 @@ } }, { - "location": -0.72, + "location": -0.47, "derivative": 0, "value": -3 } @@ -122,7 +122,7 @@ "coordinate": "gm4_sky_dimension:routers/erosion", "points": [ { - "location": -0.8, + "location": -0.55, "derivative": 0, "value": { "coordinate": "gm4_sky_dimension:routers/continents", @@ -155,7 +155,7 @@ } }, { - "location": -0.72, + "location": -0.47, "derivative": 0, "value": -2 } @@ -261,17 +261,17 @@ "coordinate": "gm4_sky_dimension:routers/erosion", "points": [ { - "location": -0.75, + "location": -0.5, "derivative": 0, "value": -2 }, { - "location": -0.73, + "location": -0.48, "derivative": 0, "value": -1 }, { - "location": -0.7, + "location": -0.45, "derivative": 0, "value": 0 }, @@ -301,17 +301,17 @@ "coordinate": "gm4_sky_dimension:routers/erosion", "points": [ { - "location": -0.75, + "location": -0.55, "derivative": 0, "value": -2 }, { - "location": -0.73, + "location": -0.48, "derivative": 0, "value": -1 }, { - "location": -0.7, + "location": -0.45, "derivative": 0, "value": 0 }, diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/island_types/high.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/island_types/high.json new file mode 100644 index 0000000000..c5ba780a71 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise/island_types/high.json @@ -0,0 +1,11 @@ +{ + "firstOctave": -7, + "amplitudes": [ + 1, + 2, + 1, + 0, + 0, + 0 + ] +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json index 71c8e00f31..cfd7a7f197 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json @@ -40,6 +40,40 @@ "surface_rule": { "type": "minecraft:sequence", "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:biome", + "biome_is": [ + "minecraft:badlands" + ] + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:y_above", + "anchor": { + "absolute": 230 + }, + "surface_depth_multiplier": 0, + "add_stone_depth": false + }, + "then_run": { + "type": "minecraft:bandlands" + } + }, + { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:terracotta" + } + } + ] + } + }, { "type": "minecraft:condition", "if_true": { From de2cbad295b2bd908d5f5bf9663c53364503cb29 Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Thu, 11 Jan 2024 20:52:22 -0800 Subject: [PATCH 31/35] Add "bowl" island type - outer ring of island creating huge "walls," surrounding smaller, lower islands. - outer ring slopes downwards towards the center --- .../dimension/celesterra.json | 29 +++- .../bowl/center/gradient_topside.json | 7 + .../bowl/center/gradient_underside.json | 7 + .../bowl/center/terrain_topside.json | 23 +++ .../bowl/center/terrain_underside.json | 39 +++++ .../island_types/bowl/center/total.json | 65 +++++++++ .../bowl/edge/gradient_topside.json | 28 ++++ .../bowl/edge/gradient_underside.json | 7 + .../bowl/edge/terrain_topside.json | 23 +++ .../bowl/edge/terrain_underside.json | 39 +++++ .../island_types/bowl/edge/total.json | 8 ++ .../island_types/bowl/total.json | 53 +++++++ .../density_function/island_types/total.json | 134 +++++++++++++----- 13 files changed, 429 insertions(+), 33 deletions(-) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/center/gradient_topside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/center/gradient_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/center/terrain_topside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/center/terrain_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/center/total.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/edge/gradient_topside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/edge/gradient_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/edge/terrain_topside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/edge/terrain_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/edge/total.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/total.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json index 67b9fe6e24..96e34c3049 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json @@ -6,6 +6,33 @@ "biome_source": { "type": "minecraft:multi_noise", "biomes": [ + { + "biome": "minecraft:mushroom_fields", + "parameters": { + "temperature": [ + -1, + 1 + ], + "humidity": [ + -1, + 1 + ], + "continentalness": [ + -0.485, + 0.05 + ], + "erosion": [ + 0.7, + 1 + ], + "weirdness": [ + -1, + 0.5 + ], + "depth": 0, + "offset": 0 + } + }, { "biome": "minecraft:badlands", "parameters": { @@ -203,7 +230,7 @@ 1 ], "weirdness": [ - -1, + 0.5, 1 ], "depth": 0, diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/center/gradient_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/center/gradient_topside.json new file mode 100644 index 0000000000..ce6fb1605f --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/center/gradient_topside.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 346, + "to_y": 220, + "from_value": -2, + "to_value": 0 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/center/gradient_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/center/gradient_underside.json new file mode 100644 index 0000000000..647fd7adbe --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/center/gradient_underside.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 296, + "to_y": 120, + "from_value": 0, + "to_value": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/center/terrain_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/center/terrain_topside.json new file mode 100644 index 0000000000..aba10f2b9b --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/center/terrain_topside.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:island_types/bowl/center/gradient_topside", + "argument2": { + "type": "minecraft:mul", + "argument1": 0.2, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:island_types/middle", + "xz_scale": 3, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/center/terrain_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/center/terrain_underside.json new file mode 100644 index 0000000000..33f9b6c6a4 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/center/terrain_underside.json @@ -0,0 +1,39 @@ +{ + "type": "minecraft:range_choice", + "input": { + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:island_types/bowl/center/gradient_underside", + "argument2": { + "type": "minecraft:mul", + "argument1": 0.4, + "argument2": { + "type": "minecraft:add", + "argument1": 1.2, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:island_types/middle", + "xz_scale": 2, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } + }, + "argument2": -1 + }, + "min_inclusive": -1000000, + "max_exclusive": 0, + "when_in_range": { + "type": "minecraft:add", + "argument1": 1, + "argument2": "gm4_sky_dimension:island_types/bowl/center/gradient_underside" + }, + "when_out_of_range": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/center/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/center/total.json new file mode 100644 index 0000000000..fbb8fe7dad --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/center/total.json @@ -0,0 +1,65 @@ +{ + "type": "minecraft:add", + "argument1": { + "type": "minecraft:range_choice", + "input": "gm4_sky_dimension:island_types/bowl/center/terrain_topside", + "min_inclusive": 0, + "max_exclusive": 1000000, + "when_in_range": "gm4_sky_dimension:island_types/bowl/center/terrain_underside", + "when_out_of_range": -1 + }, + "argument2": { + "type": "minecraft:spline", + "spline": { + "coordinate": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:interpolated", + "argument": "gm4_sky_dimension:routers/temperature" + } + }, + "points": [ + { + "location": 0, + "derivative": 0, + "value": -1.5 + }, + { + "location": 0.07, + "derivative": 0, + "value": 0 + }, + { + "location": 0.2, + "derivative": 0, + "value": 0 + }, + { + "location": 0.3, + "derivative": 0, + "value": -1.5 + }, + { + "location": 0.35, + "derivative": 0, + "value": 0 + }, + { + "location": 0.5, + "derivative": 0, + "value": 0 + }, + { + "location": 0.575, + "derivative": 0, + "value": -1.5 + }, + { + "location": 0.65, + "derivative": 0, + "value": 0 + } + ] + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/edge/gradient_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/edge/gradient_topside.json new file mode 100644 index 0000000000..726afbe4a0 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/edge/gradient_topside.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:add", + "argument1": { + "type": "minecraft:y_clamped_gradient", + "from_y": 800, + "to_y": 280, + "from_value": -2, + "to_value": 0 + }, + "argument2": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/erosion", + "points": [ + { + "location": 0, + "derivative": 0, + "value": 0.5 + }, + { + "location": 2, + "derivative": 0, + "value": -3 + } + ] + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/edge/gradient_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/edge/gradient_underside.json new file mode 100644 index 0000000000..fb09cf34ca --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/edge/gradient_underside.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 296, + "to_y": 0, + "from_value": 0, + "to_value": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/edge/terrain_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/edge/terrain_topside.json new file mode 100644 index 0000000000..40d31431d2 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/edge/terrain_topside.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:island_types/bowl/edge/gradient_topside", + "argument2": { + "type": "minecraft:add", + "argument1": 0.5, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:island_types/middle", + "xz_scale": 0, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/edge/terrain_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/edge/terrain_underside.json new file mode 100644 index 0000000000..cdd183207e --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/edge/terrain_underside.json @@ -0,0 +1,39 @@ +{ + "type": "minecraft:range_choice", + "input": { + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:island_types/bowl/edge/gradient_underside", + "argument2": { + "type": "minecraft:mul", + "argument1": 0.4, + "argument2": { + "type": "minecraft:add", + "argument1": 1.2, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:island_types/middle", + "xz_scale": 2, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } + }, + "argument2": -1 + }, + "min_inclusive": -1000000, + "max_exclusive": 0, + "when_in_range": { + "type": "minecraft:add", + "argument1": 1, + "argument2": "gm4_sky_dimension:island_types/bowl/edge/gradient_underside" + }, + "when_out_of_range": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/edge/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/edge/total.json new file mode 100644 index 0000000000..1afcd366e4 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/edge/total.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:range_choice", + "input": "gm4_sky_dimension:island_types/bowl/edge/terrain_topside", + "min_inclusive": 0, + "max_exclusive": 1000000, + "when_in_range": "gm4_sky_dimension:island_types/bowl/edge/terrain_underside", + "when_out_of_range": -1 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/total.json new file mode 100644 index 0000000000..7632661eab --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/bowl/total.json @@ -0,0 +1,53 @@ +{ + "type": "minecraft:max", + "argument1": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:island_types/bowl/edge/total", + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/erosion", + "points": [ + { + "location": 0.7, + "derivative": 0, + "value": 0 + }, + { + "location": 0.83, + "derivative": 0, + "value": -1.5 + } + ] + } + } + } + }, + "argument2": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:island_types/bowl/center/total", + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/erosion", + "points": [ + { + "location": 0.72, + "derivative": 0, + "value": -1.5 + }, + { + "location": 0.82, + "derivative": 0, + "value": 0 + } + ] + } + } + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/total.json index 46e79b918c..8eb2f1e1a1 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/total.json @@ -170,40 +170,110 @@ "argument1": { "type": "minecraft:max", "argument1": { - "type": "minecraft:add", - "argument1": "gm4_sky_dimension:island_types/shattered/total", + "type": "minecraft:max", + "argument1": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:island_types/bowl/total", + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/erosion", + "points": [ + { + "location": 0.7, + "derivative": 0, + "value": -1.7 + }, + { + "location": 0.75, + "derivative": 0, + "value": { + "coordinate": "gm4_sky_dimension:routers/continents", + "points": [ + { + "location": 0.04, + "derivative": 0, + "value": { + "coordinate": "gm4_sky_dimension:routers/ridges", + "points": [ + { + "location": 0.4, + "derivative": 0, + "value": 0 + }, + { + "location": 0.6, + "derivative": 0, + "value": -1 + } + ] + } + }, + { + "location": 0.05, + "derivative": 0, + "value": -1 + } + ] + } + } + ] + } + } + } + }, "argument2": { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:spline", - "spline": { - "coordinate": "gm4_sky_dimension:routers/erosion", - "points": [ - { - "location": 0.69, - "derivative": 0, - "value": -1 - }, - { - "location": 0.72, - "derivative": 0, - "value": { - "coordinate": "gm4_sky_dimension:routers/continents", - "points": [ - { - "location": 0.04, - "derivative": 0, - "value": 0 - }, - { - "location": 0.05, - "derivative": 0, - "value": -1 - } - ] + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:island_types/shattered/total", + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/erosion", + "points": [ + { + "location": 0.69, + "derivative": 0, + "value": -1 + }, + { + "location": 0.72, + "derivative": 0, + "value": { + "coordinate": "gm4_sky_dimension:routers/continents", + "points": [ + { + "location": 0.04, + "derivative": 0, + "value": { + "coordinate": "gm4_sky_dimension:routers/ridges", + "points": [ + { + "location": 0.4, + "derivative": 0, + "value": -2 + }, + { + "location": 0.6, + "derivative": 0, + "value": 0 + } + ] + } + }, + { + "location": 0.05, + "derivative": 0, + "value": -1 + } + ] + } } - } - ] + ] + } } } } From 5aa1a6741878e7849f90777fc372068ce4a83e50 Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Thu, 11 Jan 2024 23:31:28 -0800 Subject: [PATCH 32/35] Make normal terrain hillier - make some areas have steeper hills (based on ridges) - clamp stair islands to stop at Y=270 --- .../dimension/celesterra.json | 27 ++++ .../island_types/island_groups.json | 2 +- .../normal/middle/carver_underside.json | 2 +- .../normal/middle/terrain_topside.json | 72 +++++++-- .../island_types/normal/middle/total.json | 6 +- .../island_types/stairs/total.json | 149 +++++++++--------- 6 files changed, 169 insertions(+), 89 deletions(-) diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json index 96e34c3049..d5d4278a25 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json @@ -6,6 +6,33 @@ "biome_source": { "type": "minecraft:multi_noise", "biomes": [ + { + "biome": "minecraft:stony_peaks", + "parameters": { + "temperature": [ + -1, + 1 + ], + "humidity": [ + -1, + 1 + ], + "continentalness": [ + -0.485, + 1 + ], + "erosion": [ + -0.5, + 0.7 + ], + "weirdness": [ + 0.8, + 1 + ], + "depth": 0, + "offset": 0 + } + }, { "biome": "minecraft:mushroom_fields", "parameters": { diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/island_groups.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/island_groups.json index 7d92aadaf9..446164616a 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/island_groups.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/island_groups.json @@ -5,7 +5,7 @@ "type": "minecraft:add", "argument1": { "type": "minecraft:y_clamped_gradient", - "from_y": 384, + "from_y": 500, "to_y": -64, "from_value": 0, "to_value": -0.7 diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/carver_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/carver_underside.json index d25cb64bf9..100179b429 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/carver_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/carver_underside.json @@ -12,7 +12,7 @@ "type": "minecraft:add", "argument1": { "type": "minecraft:y_clamped_gradient", - "from_y": 384, + "from_y": 450, "to_y": 0, "from_value": 0, "to_value": -1.5 diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/terrain_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/terrain_topside.json index 1358871aad..e1dfe73f2d 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/terrain_topside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/terrain_topside.json @@ -1,31 +1,73 @@ { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:interpolated", - "argument": { + "type": "minecraft:squeeze", + "argument": { + "type": "minecraft:add", + "argument1": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:island_types/normal/middle/gradient_topside", + "argument1": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:island_types/normal/middle/gradient_topside", + "argument2": { + "type": "minecraft:add", + "argument1": 0.5, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:island_types/middle", + "xz_scale": 0, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } + }, "argument2": { - "type": "minecraft:add", - "argument1": 0.5, - "argument2": { - "type": "minecraft:abs", + "type": "minecraft:mul", + "argument1": -1, + "argument2": "gm4_sky_dimension:island_types/normal/middle/shift" + } + }, + "argument2": { + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:quarter_negative", "argument": { "type": "minecraft:shifted_noise", "noise": "gm4_sky_dimension:island_types/middle", - "xz_scale": 0, + "xz_scale": 1.3, "y_scale": 0, "shift_x": "minecraft:shift_x", "shift_y": 0, "shift_z": "minecraft:shift_z" } } + }, + "argument2": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/ridges", + "points": [ + { + "location": 0, + "derivative": 0, + "value": 0 + }, + { + "location": 0.7, + "derivative": 0, + "value": 0.7 + } + ] + } } } - }, - "argument2": { - "type": "minecraft:mul", - "argument1": -1, - "argument2": "gm4_sky_dimension:island_types/normal/middle/shift" } } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/total.json index ad1a5a8c21..aff5275861 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/normal/middle/total.json @@ -3,6 +3,10 @@ "input": "gm4_sky_dimension:island_types/normal/middle/terrain_topside", "min_inclusive": 0, "max_exclusive": 1000000, - "when_in_range": "gm4_sky_dimension:island_types/normal/middle/carver_underside", + "when_in_range": { + "type": "minecraft:mul", + "argument1": 0.2, + "argument2": "gm4_sky_dimension:island_types/normal/middle/carver_underside" + }, "when_out_of_range": -1 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/stairs/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/stairs/total.json index 9b00cbd0f9..58eeb8cef9 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/stairs/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/stairs/total.json @@ -1,79 +1,86 @@ { - "type": "minecraft:min", - "argument1": { - "type": "minecraft:mul", - "argument1": 2, - "argument2": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:y_clamped_gradient", - "from_y": 384, - "to_y": -64, - "from_value": -0.4, - "to_value": -0.6 - }, + "type": "minecraft:range_choice", + "input": "minecraft:y", + "min_inclusive": 0, + "max_exclusive": 271, + "when_in_range": { + "type": "minecraft:min", + "argument1": { + "type": "minecraft:mul", + "argument1": 2, "argument2": { - "type": "minecraft:spline", - "spline": { - "coordinate": { - "type": "minecraft:abs", - "argument": { - "type": "minecraft:interpolated", - "argument": "gm4_sky_dimension:routers/temperature" - } - }, - "points": [ - { - "location": 0, - "derivative": 0, - "value": -0.5 - }, - { - "location": 0.05, - "derivative": 0, - "value": 0 - }, - { - "location": 0.22, - "derivative": 0, - "value": 0 - }, - { - "location": 0.3, - "derivative": 0, - "value": 0.6 + "type": "minecraft:add", + "argument1": { + "type": "minecraft:y_clamped_gradient", + "from_y": 384, + "to_y": -64, + "from_value": -0.4, + "to_value": -0.6 + }, + "argument2": { + "type": "minecraft:spline", + "spline": { + "coordinate": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:interpolated", + "argument": "gm4_sky_dimension:routers/temperature" + } }, - { - "location": 0.33, - "derivative": 0, - "value": 0 - }, - { - "location": 0.52, - "derivative": 0, - "value": 0 - }, - { - "location": 0.6, - "derivative": 0, - "value": 0.6 - }, - { - "location": 0.63, - "derivative": 0, - "value": 0 - } - ] + "points": [ + { + "location": 0, + "derivative": 0, + "value": -0.5 + }, + { + "location": 0.05, + "derivative": 0, + "value": 0 + }, + { + "location": 0.22, + "derivative": 0, + "value": 0 + }, + { + "location": 0.3, + "derivative": 0, + "value": 0.6 + }, + { + "location": 0.33, + "derivative": 0, + "value": 0 + }, + { + "location": 0.52, + "derivative": 0, + "value": 0 + }, + { + "location": 0.6, + "derivative": 0, + "value": 0.6 + }, + { + "location": 0.63, + "derivative": 0, + "value": 0 + } + ] + } } } + }, + "argument2": { + "type": "minecraft:range_choice", + "input": "gm4_sky_dimension:island_types/stairs/terrain_topside", + "min_inclusive": 0, + "max_exclusive": 0.03, + "when_in_range": 1, + "when_out_of_range": -1 } }, - "argument2": { - "type": "minecraft:range_choice", - "input": "gm4_sky_dimension:island_types/stairs/terrain_topside", - "min_inclusive": 0, - "max_exclusive": 0.03, - "when_in_range": 1, - "when_out_of_range": -1 - } + "when_out_of_range": -1 } From 882f5f61de2ea056a348fa824f79aac224a82ca4 Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Fri, 12 Jan 2024 00:02:28 -0800 Subject: [PATCH 33/35] Change mountainous distribution - make badlands generate less frequently (higher temperatures) - remove stony peaks test biome --- .../dimension/celesterra.json | 31 ++----------------- .../island_types/mountainous/total.json | 8 ++--- 2 files changed, 6 insertions(+), 33 deletions(-) diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json index d5d4278a25..bf5e7e68a8 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json @@ -6,33 +6,6 @@ "biome_source": { "type": "minecraft:multi_noise", "biomes": [ - { - "biome": "minecraft:stony_peaks", - "parameters": { - "temperature": [ - -1, - 1 - ], - "humidity": [ - -1, - 1 - ], - "continentalness": [ - -0.485, - 1 - ], - "erosion": [ - -0.5, - 0.7 - ], - "weirdness": [ - 0.8, - 1 - ], - "depth": 0, - "offset": 0 - } - }, { "biome": "minecraft:mushroom_fields", "parameters": { @@ -64,7 +37,7 @@ "biome": "minecraft:badlands", "parameters": { "temperature": [ - 0, + 0.25, 1 ], "humidity": [ @@ -119,7 +92,7 @@ "parameters": { "temperature": [ -1, - 0 + 0.25 ], "humidity": [ -1, diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/total.json index 42c0c2130b..c1d738db24 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/mountainous/total.json @@ -12,12 +12,12 @@ }, "points": [ { - "location": -0.1, + "location": 0.125, "derivative": 0, "value": 0 }, { - "location": 0, + "location": 0.3, "derivative": 0, "value": -1.5 } @@ -37,12 +37,12 @@ }, "points": [ { - "location": 0, + "location": 0.23, "derivative": 0, "value": -1.5 }, { - "location": 0.1, + "location": 0.3, "derivative": 0, "value": 0 } From 22b38d0315c03ab87c9b3d6b93e8cebf5f987912 Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Fri, 12 Jan 2024 01:57:57 -0800 Subject: [PATCH 34/35] Cave Island Type - large islands with hollow "mountains" creating hills --- .../dimension/celesterra.json | 10 +- .../island_types/caves/carver_underside.json | 50 ++++++ .../island_types/caves/gradient_carver.json | 7 + .../island_types/caves/gradient_hills.json | 7 + .../island_types/caves/gradient_noise.json | 7 + .../island_types/caves/gradient_topside.json | 7 + .../island_types/caves/noise_underside.json | 31 ++++ .../island_types/caves/terrain_hills.json | 37 +++++ .../island_types/caves/terrain_topside.json | 48 ++++++ .../island_types/caves/total.json | 19 +++ .../density_function/island_types/total.json | 146 ++++++++++++------ .../worldgen/noise_settings/celesterra.json | 39 +++++ 12 files changed, 358 insertions(+), 50 deletions(-) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/carver_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/gradient_carver.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/gradient_hills.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/gradient_noise.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/gradient_topside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/noise_underside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/terrain_hills.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/terrain_topside.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/total.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json index bf5e7e68a8..de87e84c63 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/dimension/celesterra.json @@ -54,14 +54,14 @@ ], "weirdness": [ -1, - 0 + 0.25 ], "depth": 0, "offset": 0 } }, { - "biome": "minecraft:the_void", + "biome": "minecraft:dripstone_caves", "parameters": { "temperature": [ -1, @@ -77,10 +77,10 @@ ], "erosion": [ -1, - -0.75 + -0.5 ], "weirdness": [ - 0, + 0.25, 1 ], "depth": 0, @@ -108,7 +108,7 @@ ], "weirdness": [ -1, - 0 + 0.25 ], "depth": 0, "offset": 0 diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/carver_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/carver_underside.json new file mode 100644 index 0000000000..1fe2835e25 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/carver_underside.json @@ -0,0 +1,50 @@ +{ + "type": "minecraft:add", + "argument1": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:mul", + "argument1": 1.6, + "argument2": "gm4_sky_dimension:island_types/caves/gradient_carver" + }, + "argument2": { + "type": "minecraft:mul", + "argument1": 2, + "argument2": { + "type": "minecraft:add", + "argument1": 1.4, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:island_types/middle", + "xz_scale": 1, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } + } + }, + "argument2": { + "type": "minecraft:mul", + "argument1": 7, + "argument2": { + "type": "minecraft:add", + "argument1": 0.8, + "argument2": { + "type": "minecraft:quarter_negative", + "argument": "gm4_sky_dimension:island_types/caves/noise_underside" + } + } + } + }, + "argument2": 0 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/gradient_carver.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/gradient_carver.json new file mode 100644 index 0000000000..8ca2332a70 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/gradient_carver.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 226, + "to_y": 0, + "from_value": 0, + "to_value": -5 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/gradient_hills.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/gradient_hills.json new file mode 100644 index 0000000000..9959e354ac --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/gradient_hills.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 290, + "to_y": 210, + "from_value": -3, + "to_value": 0 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/gradient_noise.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/gradient_noise.json new file mode 100644 index 0000000000..fe35dbd302 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/gradient_noise.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 336, + "to_y": -16, + "from_value": 0, + "to_value": -4 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/gradient_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/gradient_topside.json new file mode 100644 index 0000000000..e177db1d89 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/gradient_topside.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:y_clamped_gradient", + "from_y": 480, + "to_y": 200, + "from_value": -5, + "to_value": 0 +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/noise_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/noise_underside.json new file mode 100644 index 0000000000..20d7a85dfa --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/noise_underside.json @@ -0,0 +1,31 @@ +{ + "type": "minecraft:mul", + "argument1": -0.2, + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:island_types/caves/gradient_noise", + "argument2": { + "type": "minecraft:mul", + "argument1": 15, + "argument2": { + "type": "minecraft:add", + "argument1": 0.6, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:island_types/mid_bottom", + "xz_scale": 12, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/terrain_hills.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/terrain_hills.json new file mode 100644 index 0000000000..bbaf2c8ee8 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/terrain_hills.json @@ -0,0 +1,37 @@ +{ + "type": "minecraft:add", + "argument1": { + "type": "minecraft:quarter_negative", + "argument": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:island_types/caves/gradient_hills", + "argument2": { + "type": "minecraft:mul", + "argument1": 1.2, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:island_types/middle", + "xz_scale": 1, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + } + } + } + }, + "argument2": { + "type": "minecraft:mul", + "argument1": 0.04, + "argument2": { + "type": "minecraft:abs", + "argument": "minecraft:overworld/base_3d_noise" + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/terrain_topside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/terrain_topside.json new file mode 100644 index 0000000000..42e0ca1e50 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/terrain_topside.json @@ -0,0 +1,48 @@ +{ + "type": "minecraft:mul", + "argument1": 0.1, + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:mul", + "argument1": 10, + "argument2": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:island_types/caves/gradient_topside", + "argument2": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:mul", + "argument1": 3, + "argument2": { + "type": "minecraft:abs", + "argument": { + "type": "minecraft:shifted_noise", + "noise": "gm4_sky_dimension:island_types/middle", + "xz_scale": 1, + "y_scale": 0, + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z" + } + } + }, + "argument2": { + "type": "minecraft:mul", + "argument1": 0.2, + "argument2": { + "type": "minecraft:noise", + "noise": "minecraft:jagged", + "xz_scale": 1500, + "y_scale": 0 + } + } + } + } + }, + "argument2": "minecraft:overworld/base_3d_noise" + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/total.json new file mode 100644 index 0000000000..d2a953bd4a --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/total.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:range_choice", + "input": "gm4_sky_dimension:island_types/caves/terrain_hills", + "min_inclusive": -1000000, + "max_exclusive": 0, + "when_in_range": { + "type": "minecraft:range_choice", + "input": "gm4_sky_dimension:island_types/caves/terrain_topside", + "min_inclusive": 0, + "max_exclusive": 0.2, + "when_in_range": "gm4_sky_dimension:island_types/caves/terrain_topside", + "when_out_of_range": -1 + }, + "when_out_of_range": { + "type": "minecraft:mul", + "argument1": 0.06, + "argument2": "gm4_sky_dimension:island_types/caves/carver_underside" + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/total.json index 8eb2f1e1a1..bcfc47c65a 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/total.json @@ -112,54 +112,110 @@ } }, "argument2": { - "type": "minecraft:add", - "argument1": "gm4_sky_dimension:island_types/mountainous/total", + "type": "minecraft:max", + "argument1": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:island_types/mountainous/total", + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/erosion", + "points": [ + { + "location": -0.55, + "derivative": 0, + "value": { + "coordinate": "gm4_sky_dimension:routers/continents", + "points": [ + { + "location": 0.2, + "derivative": 0, + "value": -2 + }, + { + "location": 0.3, + "derivative": 0, + "value": { + "coordinate": "gm4_sky_dimension:routers/ridges", + "points": [ + { + "location": -0.1, + "derivative": 0, + "value": 0 + }, + { + "location": 0.25, + "derivative": 0, + "value": -2 + } + ] + } + } + ] + } + }, + { + "location": -0.47, + "derivative": 0, + "value": -2 + } + ] + } + } + } + }, "argument2": { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:spline", - "spline": { - "coordinate": "gm4_sky_dimension:routers/erosion", - "points": [ - { - "location": -0.55, - "derivative": 0, - "value": { - "coordinate": "gm4_sky_dimension:routers/continents", - "points": [ - { - "location": 0.2, - "derivative": 0, - "value": -2 - }, - { - "location": 0.3, - "derivative": 0, - "value": { - "coordinate": "gm4_sky_dimension:routers/ridges", - "points": [ - { - "location": -0.1, - "derivative": 0, - "value": 0 - }, - { - "location": 0, - "derivative": 0, - "value": -2 - } - ] + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:island_types/caves/total", + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/erosion", + "points": [ + { + "location": -0.55, + "derivative": 0, + "value": { + "coordinate": "gm4_sky_dimension:routers/continents", + "points": [ + { + "location": 0.2, + "derivative": 0, + "value": -2 + }, + { + "location": 0.3, + "derivative": 0, + "value": { + "coordinate": "gm4_sky_dimension:routers/ridges", + "points": [ + { + "location": 0.25, + "derivative": 0, + "value": -2 + }, + { + "location": 0.35, + "derivative": 0, + "value": 0 + } + ] + } } - } - ] + ] + } + }, + { + "location": -0.47, + "derivative": 0, + "value": -2 } - }, - { - "location": -0.47, - "derivative": 0, - "value": -2 - } - ] + ] + } } } } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json index cfd7a7f197..e7e0a8a012 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json @@ -40,6 +40,45 @@ "surface_rule": { "type": "minecraft:sequence", "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:biome", + "biome_is": [ + "minecraft:dripstone_caves" + ] + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:vertical_gradient", + "random_name": "gm4_sky_dimension:dripstone_underside", + "true_at_and_below": { + "above_bottom": 185 + }, + "false_at_and_above": { + "above_bottom": 200 + } + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:dripstone_block" + } + } + }, + { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:smooth_basalt" + } + } + ] + } + }, { "type": "minecraft:condition", "if_true": { From 87fdde0e52c555fed0c30d692b689378eb108662 Mon Sep 17 00:00:00 2001 From: BluePsychoRanger Date: Fri, 12 Jan 2024 18:58:18 -0800 Subject: [PATCH 35/35] tweak cave islands - introduce preliminary surface from initial_density to allow cave islands to have different surface blocks inside and outside the caves - shrink border between normal and cave islands --- .../island_types/caves/carver_underside.json | 50 -- .../island_types/caves/gradient_noise.json | 7 - ...nt_carver.json => gradient_underside.json} | 4 +- .../island_types/caves/initial.json | 19 + ..._underside.json => terrain_underside.json} | 32 +- .../island_types/caves/total.json | 6 +- .../island_types/initial.json | 456 ++++++++++++++++++ .../density_function/island_types/total.json | 9 +- .../routers/initial_density.json | 5 + .../worldgen/noise_settings/celesterra.json | 42 +- 10 files changed, 547 insertions(+), 83 deletions(-) delete mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/carver_underside.json delete mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/gradient_noise.json rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/{gradient_carver.json => gradient_underside.json} (69%) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/initial.json rename gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/{noise_underside.json => terrain_underside.json} (51%) create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/initial.json create mode 100644 gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/initial_density.json diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/carver_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/carver_underside.json deleted file mode 100644 index 1fe2835e25..0000000000 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/carver_underside.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "type": "minecraft:add", - "argument1": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:mul", - "argument1": 1.6, - "argument2": "gm4_sky_dimension:island_types/caves/gradient_carver" - }, - "argument2": { - "type": "minecraft:mul", - "argument1": 2, - "argument2": { - "type": "minecraft:add", - "argument1": 1.4, - "argument2": { - "type": "minecraft:abs", - "argument": { - "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:island_types/middle", - "xz_scale": 1, - "y_scale": 0, - "shift_x": "minecraft:shift_x", - "shift_y": 0, - "shift_z": "minecraft:shift_z" - } - } - } - } - } - }, - "argument2": { - "type": "minecraft:mul", - "argument1": 7, - "argument2": { - "type": "minecraft:add", - "argument1": 0.8, - "argument2": { - "type": "minecraft:quarter_negative", - "argument": "gm4_sky_dimension:island_types/caves/noise_underside" - } - } - } - }, - "argument2": 0 -} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/gradient_noise.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/gradient_noise.json deleted file mode 100644 index fe35dbd302..0000000000 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/gradient_noise.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "minecraft:y_clamped_gradient", - "from_y": 336, - "to_y": -16, - "from_value": 0, - "to_value": -4 -} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/gradient_carver.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/gradient_underside.json similarity index 69% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/gradient_carver.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/gradient_underside.json index 8ca2332a70..fd3fa2ba0f 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/gradient_carver.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/gradient_underside.json @@ -1,7 +1,7 @@ { "type": "minecraft:y_clamped_gradient", - "from_y": 226, + "from_y": 300, "to_y": 0, "from_value": 0, - "to_value": -5 + "to_value": -1 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/initial.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/initial.json new file mode 100644 index 0000000000..b3c6c7600c --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/initial.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:range_choice", + "input": "gm4_sky_dimension:island_types/caves/terrain_hills", + "min_inclusive": -1000000, + "max_exclusive": 0, + "when_in_range": { + "type": "minecraft:range_choice", + "input": "gm4_sky_dimension:island_types/caves/terrain_topside", + "min_inclusive": -1000000, + "max_exclusive": 0, + "when_in_range": -1, + "when_out_of_range": 2 + }, + "when_out_of_range": { + "type": "minecraft:mul", + "argument1": 3, + "argument2": "gm4_sky_dimension:island_types/caves/terrain_underside" + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/noise_underside.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/terrain_underside.json similarity index 51% rename from gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/noise_underside.json rename to gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/terrain_underside.json index 20d7a85dfa..e56a81933a 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/noise_underside.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/terrain_underside.json @@ -1,23 +1,22 @@ { - "type": "minecraft:mul", - "argument1": -0.2, - "argument2": { - "type": "minecraft:interpolated", - "argument": { + "type": "minecraft:range_choice", + "input": { + "type": "minecraft:mul", + "argument1": { "type": "minecraft:add", - "argument1": "gm4_sky_dimension:island_types/caves/gradient_noise", + "argument1": "gm4_sky_dimension:island_types/caves/gradient_underside", "argument2": { "type": "minecraft:mul", - "argument1": 15, + "argument1": 0.4, "argument2": { "type": "minecraft:add", - "argument1": 0.6, + "argument1": 1, "argument2": { "type": "minecraft:abs", "argument": { "type": "minecraft:shifted_noise", - "noise": "gm4_sky_dimension:island_types/mid_bottom", - "xz_scale": 12, + "noise": "gm4_sky_dimension:island_types/middle", + "xz_scale": 5.5, "y_scale": 0, "shift_x": "minecraft:shift_x", "shift_y": 0, @@ -26,6 +25,15 @@ } } } - } - } + }, + "argument2": -1 + }, + "min_inclusive": -1000000, + "max_exclusive": 0, + "when_in_range": { + "type": "minecraft:add", + "argument1": 1, + "argument2": "gm4_sky_dimension:island_types/caves/gradient_underside" + }, + "when_out_of_range": -1 } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/total.json index d2a953bd4a..6ee1ee915d 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/caves/total.json @@ -8,12 +8,12 @@ "input": "gm4_sky_dimension:island_types/caves/terrain_topside", "min_inclusive": 0, "max_exclusive": 0.2, - "when_in_range": "gm4_sky_dimension:island_types/caves/terrain_topside", + "when_in_range": 0.1, "when_out_of_range": -1 }, "when_out_of_range": { "type": "minecraft:mul", - "argument1": 0.06, - "argument2": "gm4_sky_dimension:island_types/caves/carver_underside" + "argument1": 0.5, + "argument2": "gm4_sky_dimension:island_types/caves/terrain_underside" } } diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/initial.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/initial.json new file mode 100644 index 0000000000..752d688a44 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/initial.json @@ -0,0 +1,456 @@ +{ + "type": "minecraft:max", + "argument1": { + "type": "minecraft:max", + "argument1": { + "type": "minecraft:max", + "argument1": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:island_types/huge_islands/total", + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/erosion", + "points": [ + { + "location": -0.52, + "derivative": 0, + "value": { + "coordinate": "gm4_sky_dimension:routers/continents", + "points": [ + { + "location": 0.1, + "derivative": 0, + "value": { + "coordinate": "gm4_sky_dimension:routers/ridges", + "points": [ + { + "location": -0.05, + "derivative": 0, + "value": 0 + }, + { + "location": 0.05, + "derivative": 0, + "value": -1.5 + } + ] + } + }, + { + "location": 0.25, + "derivative": 0, + "value": -1.5 + } + ] + } + }, + { + "location": -0.47, + "derivative": 0, + "value": -1.5 + } + ] + } + } + } + }, + "argument2": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:island_types/floating_falls/total", + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/erosion", + "points": [ + { + "location": -0.54, + "derivative": 0, + "value": { + "coordinate": "gm4_sky_dimension:routers/continents", + "points": [ + { + "location": 0.1, + "derivative": 0, + "value": { + "coordinate": "gm4_sky_dimension:routers/ridges", + "points": [ + { + "location": 0, + "derivative": 0, + "value": -3 + }, + { + "location": 0.1, + "derivative": 0, + "value": 0 + } + ] + } + }, + { + "location": 0.25, + "derivative": 0, + "value": -3 + } + ] + } + }, + { + "location": -0.47, + "derivative": 0, + "value": -3 + } + ] + } + } + } + } + }, + "argument2": { + "type": "minecraft:max", + "argument1": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:island_types/mountainous/total", + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/erosion", + "points": [ + { + "location": -0.55, + "derivative": 0, + "value": { + "coordinate": "gm4_sky_dimension:routers/continents", + "points": [ + { + "location": 0.2, + "derivative": 0, + "value": -2 + }, + { + "location": 0.3, + "derivative": 0, + "value": { + "coordinate": "gm4_sky_dimension:routers/ridges", + "points": [ + { + "location": -0.1, + "derivative": 0, + "value": 0 + }, + { + "location": 0.25, + "derivative": 0, + "value": -2 + } + ] + } + } + ] + } + }, + { + "location": -0.47, + "derivative": 0, + "value": -2 + } + ] + } + } + } + }, + "argument2": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:island_types/caves/initial", + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/erosion", + "points": [ + { + "location": -0.52, + "derivative": 0, + "value": { + "coordinate": "gm4_sky_dimension:routers/continents", + "points": [ + { + "location": 0.2, + "derivative": 0, + "value": -2 + }, + { + "location": 0.3, + "derivative": 0, + "value": { + "coordinate": "gm4_sky_dimension:routers/ridges", + "points": [ + { + "location": 0.25, + "derivative": 0, + "value": -2 + }, + { + "location": 0.35, + "derivative": 0, + "value": 0 + } + ] + } + } + ] + } + }, + { + "location": -0.47, + "derivative": 0, + "value": -2 + } + ] + } + } + } + } + } + }, + "argument2": { + "type": "minecraft:max", + "argument1": { + "type": "minecraft:max", + "argument1": { + "type": "minecraft:max", + "argument1": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:island_types/bowl/total", + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/erosion", + "points": [ + { + "location": 0.7, + "derivative": 0, + "value": -1.7 + }, + { + "location": 0.75, + "derivative": 0, + "value": { + "coordinate": "gm4_sky_dimension:routers/continents", + "points": [ + { + "location": 0.04, + "derivative": 0, + "value": { + "coordinate": "gm4_sky_dimension:routers/ridges", + "points": [ + { + "location": 0.4, + "derivative": 0, + "value": 0 + }, + { + "location": 0.6, + "derivative": 0, + "value": -1 + } + ] + } + }, + { + "location": 0.05, + "derivative": 0, + "value": -1 + } + ] + } + } + ] + } + } + } + }, + "argument2": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:island_types/shattered/total", + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/erosion", + "points": [ + { + "location": 0.69, + "derivative": 0, + "value": -1 + }, + { + "location": 0.72, + "derivative": 0, + "value": { + "coordinate": "gm4_sky_dimension:routers/continents", + "points": [ + { + "location": 0.04, + "derivative": 0, + "value": { + "coordinate": "gm4_sky_dimension:routers/ridges", + "points": [ + { + "location": 0.4, + "derivative": 0, + "value": -2 + }, + { + "location": 0.6, + "derivative": 0, + "value": 0 + } + ] + } + }, + { + "location": 0.05, + "derivative": 0, + "value": -1 + } + ] + } + } + ] + } + } + } + } + }, + "argument2": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:island_types/full_blobs/total", + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/erosion", + "points": [ + { + "location": 0.7, + "derivative": 0, + "value": -1 + }, + { + "location": 0.71, + "derivative": 0, + "value": { + "coordinate": "gm4_sky_dimension:routers/continents", + "points": [ + { + "location": 0.05, + "derivative": 0, + "value": -1 + }, + { + "location": 0.06, + "derivative": 0, + "value": 0 + } + ] + } + } + ] + } + } + } + } + }, + "argument2": { + "type": "minecraft:max", + "argument1": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:island_types/normal/total", + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/erosion", + "points": [ + { + "location": -0.55, + "derivative": 0, + "value": -2 + }, + { + "location": -0.45, + "derivative": 0, + "value": 0 + }, + { + "location": 0.67, + "derivative": 0, + "value": 0 + }, + { + "location": 0.71, + "derivative": 0, + "value": -1 + } + ] + } + } + } + }, + "argument2": { + "type": "minecraft:add", + "argument1": "gm4_sky_dimension:island_types/stairs/total", + "argument2": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:spline", + "spline": { + "coordinate": "gm4_sky_dimension:routers/erosion", + "points": [ + { + "location": -0.55, + "derivative": 0, + "value": -2 + }, + { + "location": -0.48, + "derivative": 0, + "value": -1 + }, + { + "location": -0.45, + "derivative": 0, + "value": 0 + }, + { + "location": 0.67, + "derivative": 0, + "value": 0 + }, + { + "location": 0.71, + "derivative": 0, + "value": -1 + } + ] + } + } + } + } + } + } +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/total.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/total.json index bcfc47c65a..adb1ca91ee 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/total.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/island_types/total.json @@ -177,7 +177,7 @@ "coordinate": "gm4_sky_dimension:routers/erosion", "points": [ { - "location": -0.55, + "location": -0.52, "derivative": 0, "value": { "coordinate": "gm4_sky_dimension:routers/continents", @@ -387,15 +387,10 @@ "coordinate": "gm4_sky_dimension:routers/erosion", "points": [ { - "location": -0.5, + "location": -0.55, "derivative": 0, "value": -2 }, - { - "location": -0.48, - "derivative": 0, - "value": -1 - }, { "location": -0.45, "derivative": 0, diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/initial_density.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/initial_density.json new file mode 100644 index 0000000000..65b446afa5 --- /dev/null +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/density_function/routers/initial_density.json @@ -0,0 +1,5 @@ +{ + "type": "minecraft:min", + "argument1": "gm4_sky_dimension:island_types/initial", + "argument2": "gm4_sky_dimension:continents/total" +} diff --git a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json index e7e0a8a012..37b81b4ece 100644 --- a/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json +++ b/gm4_sky_dimension/data/gm4_sky_dimension/worldgen/noise_settings/celesterra.json @@ -30,7 +30,7 @@ "erosion": "gm4_sky_dimension:routers/erosion", "depth": "gm4_sky_dimension:routers/depth", "ridges": "gm4_sky_dimension:routers/ridges", - "initial_density_without_jaggedness": "gm4_sky_dimension:routers/density", + "initial_density_without_jaggedness": "gm4_sky_dimension:routers/initial_density", "final_density": "gm4_sky_dimension:routers/density", "vein_toggle": 0, "vein_ridged": 0, @@ -51,13 +51,35 @@ "then_run": { "type": "minecraft:sequence", "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:above_preliminary_surface" + }, + "then_run": { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:stone_depth", + "offset": 0, + "surface_type": "floor", + "add_surface_depth": true, + "secondary_depth_range": 0 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:packed_mud" + } + } + } + }, { "type": "minecraft:condition", "if_true": { "type": "minecraft:vertical_gradient", "random_name": "gm4_sky_dimension:dripstone_underside", "true_at_and_below": { - "above_bottom": 185 + "above_bottom": 190 }, "false_at_and_above": { "above_bottom": 200 @@ -70,6 +92,22 @@ } } }, + { + "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:calcite" + } + } + }, { "type": "minecraft:block", "result_state": {