From 084c99db07be34c80223e8d1a932fd3da45072ea Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 4 Aug 2025 11:22:18 +0100 Subject: [PATCH] Feature/mars rock layers (#1519) * moving to real tfc rock layers! * thanks git * git pls * that's a good start for the mars rock layer stuff now * langs, some desert block height tweaks * mars water fog color * forgot to convert back from hex to dec --- kubejs/assets/minecraft/lang/en_us.json | 13 +- kubejs/data/ad_astra/dimension/mars.json | 170 +- .../tfg/worldgen/biome/mars/amber_hills.json | 18 +- .../tfg/worldgen/biome/mars/amber_plains.json | 17 +- .../biome/mars/martian_deep_desert.json | 8 +- .../biome/mars/martian_dune_edge.json | 17 +- .../worldgen/biome/mars/martian_dunes.json | 13 +- .../biome/mars/martian_mountains.json | 18 +- .../worldgen/biome/mars/martian_oasis.json | 19 +- .../worldgen/biome/mars/martian_river.json | 17 +- .../worldgen/biome/mars/martian_riverbed.json | 18 +- .../worldgen/biome/mars/rusticus_hills.json | 18 +- .../worldgen/biome/mars/rusticus_plains.json | 17 +- .../worldgen/biome/mars/sangnum_hills.json | 18 +- .../worldgen/biome/mars/sangnum_plains.json | 17 +- .../mars/crop/amber_root.json | 42 + .../mars/crop/blossom_berry.json | 42 + .../{surface => crop}/bolux_mushroom.json | 32 +- .../mars/crop/cave_pumpkin.json | 37 + .../mars/crop/chorus_mushroom.json | 42 + .../mars/crop/shadow_berry.json | 42 + .../density_function/mars/offset.json | 8 +- .../worldgen/noise_settings/mars_noise.json | 1970 ++--------------- .../placed_feature/mars/crop/amber_root.json | 19 + .../mars/crop/blossom_berry.json | 19 + .../{surface => crop}/bolux_mushroom.json | 4 +- .../mars/crop/cave_pumpkin.json | 19 + .../mars/crop/chorus_mushroom.json | 19 + .../mars/crop/shadow_berry.json | 19 + .../worldgen/placed_feature/mars/no_op.json | 7 - .../mars/semiheavy_ammoniacal_water.json | 4 +- .../mars/surface/amber_grass.json | 3 + .../mars/surface/cave_grass.json | 3 + .../placed_feature/mars/surface/lutebus.json | 3 + .../placed_feature/mars/surface/orango.json | 3 + .../placed_feature/mars/surface/ruscus.json | 3 + kubejs/server_scripts/ad_astra/tags.js | 39 +- kubejs/server_scripts/tfg/events.chunks.js | 27 +- 38 files changed, 829 insertions(+), 1975 deletions(-) create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/crop/amber_root.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/crop/blossom_berry.json rename kubejs/data/tfg/worldgen/configured_feature/mars/{surface => crop}/bolux_mushroom.json (50%) create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/crop/cave_pumpkin.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/crop/chorus_mushroom.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/crop/shadow_berry.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/crop/amber_root.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/crop/blossom_berry.json rename kubejs/data/tfg/worldgen/placed_feature/mars/{surface => crop}/bolux_mushroom.json (78%) create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/crop/cave_pumpkin.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/crop/chorus_mushroom.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/crop/shadow_berry.json delete mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/no_op.json diff --git a/kubejs/assets/minecraft/lang/en_us.json b/kubejs/assets/minecraft/lang/en_us.json index c5ccf5f68..c1b1b6d87 100644 --- a/kubejs/assets/minecraft/lang/en_us.json +++ b/kubejs/assets/minecraft/lang/en_us.json @@ -45,7 +45,18 @@ "block.minecraft.pearlescent_froglight": "Pearlescent Lightbloom", "block.minecraft.verdant_froglight": "Verdant Lightbloom", "block.minecraft.ochre_froglight": "Ochre Lightbloom", - "minecraft:nether_wart_block": "Crimson Wart Block", + "block.minecraft.nether_wart_block": "Crimson Wart Block", + "block.minecraft.red_sand": "Hematitic Sand", + "block.minecraft.red_sandstone": "Hematitic Sandstone", + "block.minecraft.red_sandstone_stairs": "Hematitic Sandstone Stairs", + "block.minecraft.red_sandstone_slab": "Hematitic Sandstone Slab", + "block.minecraft.red_sandstone_wall": "Hematitic Sandstone Wall", + "block.minecraft.chiseled_red_sandstone": "Chiseled Hematitic Sandstone", + "block.minecraft.smooth_red_sandstone": "Smooth Hematitic Sandstone", + "block.minecraft.smooth_red_sandstone_stairs": "Smooth Hematitic Sandstone Stairs", + "block.minecraft.smooth_red_sandstone_slab": "Smooth Hematitic Sandstone Slab", + "block.minecraft.cut_red_sandstone": "Cut Hematitic Sandstone", + "block.minecraft.cut_red_sandstone_slab": "Cut Hematitic Sandstone Slab", "item.minecraft.iron_nugget": "Cast Iron Nugget", "item.minecraft.iron_ingot": "Cast Iron Ingot", "item.minecraft.iron_block": "Cast Iron Block", diff --git a/kubejs/data/ad_astra/dimension/mars.json b/kubejs/data/ad_astra/dimension/mars.json index b99de52cf..6f6e98036 100644 --- a/kubejs/data/ad_astra/dimension/mars.json +++ b/kubejs/data/ad_astra/dimension/mars.json @@ -1,5 +1,5 @@ { - "type": "tfg:mars", + "type": "ad_astra:mars", "generator": { "type": "kubejs_tfc:wrapped", "event_key": "mars", @@ -13,37 +13,95 @@ "continentalness": -0.5, "rock_layer_settings": { "rocks": { - "mars": { - "raw": "tfc:rock/raw/chert", - "hardened": "tfc:rock/hardened/chert", - "gravel": "tfc:rock/gravel/chert", - "cobble": "tfc:rock/cobble/chert", - "sand": "tfc:sand/red", - "sandstone": "tfc:raw_sandstone/red" - } + "mars": { + "raw": "ad_astra:mars_stone", + "hardened": "tfg:rock/hardened_mars_stone", + "gravel": "ad_astra:mars_cobblestone", + "cobble": "ad_astra:mars_cobblestone", + "sand": "ad_astra:mars_sand", + "sandstone": "ad_astra:mars_stone", + "spike": "tfg:spike/mars_stone_spike", + "loose": "tfg:loose/mars_stone" + }, + "venus": { + "raw": "ad_astra:venus_stone", + "hardened": "tfg:rock/hardened_venus_stone", + "gravel": "ad_astra:venus_cobblestone", + "cobble": "ad_astra:venus_cobblestone", + "sand": "ad_astra:venus_sand", + "sandstone": "ad_astra:venus_sandstone", + "spike": "tfg:spike/venus_stone_spike", + "loose": "tfg:loose/venus_stone" + }, + "red_granite": { + "raw": "gtceu:red_granite", + "hardened": "tfg:rock/hardened_red_granite", + "gravel": "gtceu:red_granite_cobblestone", + "cobble": "gtceu:red_granite_cobblestone", + "sand": "minecraft:red_sand", + "sandstone": "minecraft:red_sandstone", + "spike": "tfg:spike/red_granite_spike", + "loose": "tfg:loose/red_granite" + }, + "granite": "tfc:granite", + "diorite": "tfc:diorite", + "gabbro": "tfc:gabbro", + "shale": "tfc:shale", + "claystone": "tfc:claystone", + "limestone": "tfc:limestone", + "conglomerate": "tfc:conglomerate", + "dolomite": "tfc:dolomite", + "chert": "tfc:chert", + "chalk": "tfc:chalk", + "basalt": "tfc:basalt", + "dacite": "tfc:dacite" }, "layers": [ { - "id": "mars", + "id": "mix", "layers": { - "mars": "bottom" + "mars": "bottom", + "dolomite": "bottom", + "chert": "bottom", + "conglomerate": "bottom", + "red_granite": "bottom", + "basalt": "bottom", + "dacite": "bottom", + "venus": "bottom", + "shale": "bottom" + } + }, + { + "id": "sedimentary", + "layers": { + "mars": "mix", + "chalk": "mix", + "shale": "mix", + "dolomite": "mix", + "limestone": "mix", + "claystone": "mix", + "conglomerate": "mix", + "chert": "mix" } } ], "bottom": [ - "mars" + "red_granite", + "gabbro", + "diorite", + "granite" ], "ocean_floor": [ - "mars" + "sedimentary" ], "volcanic": [ - "mars" + "sedimentary" ], "land": [ - "mars" + "sedimentary" ], "uplift": [ - "mars" + "sedimentary" ] } }, @@ -4373,7 +4431,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ -0.11, @@ -4427,7 +4485,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ -0.11, @@ -4454,7 +4512,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ 0.03, @@ -4508,7 +4566,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ -0.19, @@ -4535,7 +4593,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ 0.03, @@ -4589,7 +4647,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ -0.11, @@ -4643,7 +4701,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ -0.11, @@ -13526,7 +13584,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ -0.19, @@ -13607,7 +13665,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ -0.11, @@ -13661,7 +13719,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ -0.19, @@ -13715,7 +13773,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ 0.03, @@ -13769,7 +13827,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ -0.19, @@ -13796,7 +13854,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ -0.19, @@ -13850,7 +13908,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ -0.19, @@ -21788,7 +21846,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ -0.19, @@ -21842,7 +21900,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ -0.19, @@ -21896,7 +21954,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ 0.03, @@ -21950,7 +22008,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ -0.19, @@ -22031,7 +22089,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ -0.19, @@ -29726,7 +29784,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ -0.19, @@ -29807,7 +29865,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ -0.11, @@ -29861,7 +29919,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ -0.19, @@ -29915,7 +29973,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ 0.03, @@ -29969,7 +30027,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ -0.19, @@ -29996,7 +30054,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ -0.19, @@ -30050,7 +30108,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ -0.19, @@ -39014,7 +39072,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ -0.11, @@ -39068,7 +39126,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ -0.11, @@ -39095,7 +39153,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ 0.03, @@ -39149,7 +39207,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ -0.19, @@ -39176,7 +39234,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ 0.03, @@ -39230,7 +39288,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ -0.11, @@ -39284,7 +39342,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ -0.11, @@ -47573,7 +47631,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ -0.11, @@ -47600,7 +47658,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ 0.03, @@ -47627,7 +47685,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ -0.11, @@ -47654,7 +47712,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ 0.03, @@ -47708,7 +47766,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ -0.11, @@ -47762,7 +47820,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ -0.11, @@ -47789,7 +47847,7 @@ } }, { - "biome": "tfg:mars/amber_plains", + "biome": "tfg:mars/sangnum_plains", "parameters": { "continentalness": [ 0.03, diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json index 3b4e30d34..1a55f6e36 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json @@ -22,10 +22,12 @@ }, "sky_color": 15117444, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 1069623 }, "features": [ - [], + [ + "tfc:erosion" + ], [], [ "tfg:earth/geode/amethyst", @@ -37,16 +39,20 @@ "tfg:earth/geode/quartzite" ], [ - "tfc:vein/gabbro_dike", - "tfc:vein/diorite_dike" + "tfc:random_empty_hot_spring" ], [], [], "#tfg:mars_veins", [], - "#tfg:mars_small_rock_features", + [ + "tfc:raw_boulder", + "tfc:cobble_boulder", + "tfc:raw_boulder_small_patch", + "tfc:cobble_boulder_small_patch" + ], "#tfg:mars_amber_vegetal_decoration", - [] + "#tfg:mars_top_layer_modification" ], "has_precipitation": false, "spawn_costs": { diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json index 69f3c3828..6a4d9eaf1 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json @@ -22,10 +22,12 @@ }, "sky_color": 15117444, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 1069623 }, "features": [ - [], + [ + "tfc:erosion" + ], [], [ "tfg:earth/geode/amethyst", @@ -36,17 +38,16 @@ "tfg:earth/geode/pyrite", "tfg:earth/geode/quartzite" ], - [ - "tfc:vein/gabbro_dike", - "tfc:vein/diorite_dike" - ], + [], [], [], "#tfg:mars_veins", [], - "#tfg:mars_small_rock_features", + [ + "tfg:mars/semiheavy_ammoniacal_water" + ], "#tfg:mars_amber_vegetal_decoration", - [] + "#tfg:mars_top_layer_modification" ], "has_precipitation": false, "spawn_costs": { diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json b/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json index 9afd3ba7b..78a015371 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json @@ -19,10 +19,12 @@ }, "sky_color": 15117444, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 1069623 }, "features": [ - [], + [ + "tfc:erosion" + ], [], [ "tfg:earth/geode/amethyst", @@ -38,7 +40,7 @@ [], "#tfg:mars_veins", [], - "#tfg:mars_small_rock_features", + [], [ ], diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json index d3ddec0ec..5daa5d6c7 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json @@ -19,10 +19,12 @@ }, "sky_color": 15117444, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 1069623 }, "features": [ - [], + [ + "tfc:erosion" + ], [], [ "tfg:earth/geode/amethyst", @@ -38,11 +40,18 @@ [], "#tfg:mars_veins", [], - "#tfg:mars_small_rock_features", + [ + "tfc:raw_boulder", + "tfc:cobble_boulder", + "tfc:raw_boulder_small_patch", + "tfc:cobble_boulder_small_patch" + ], [ ], - [] + [ + "tfc:surface_loose_rocks" + ] ], "has_precipitation": false, "spawn_costs": { diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json index 9afd3ba7b..d5696a2ff 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json @@ -19,10 +19,12 @@ }, "sky_color": 15117444, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 1069623 }, "features": [ - [], + [ + "tfc:erosion" + ], [], [ "tfg:earth/geode/amethyst", @@ -38,11 +40,14 @@ [], "#tfg:mars_veins", [], - "#tfg:mars_small_rock_features", + [ + "tfc:raw_boulder_small_patch", + "tfc:cobble_boulder_small_patch" + ], [ ], - [] + "#tfg:mars_top_layer_modification" ], "has_precipitation": false, "spawn_costs": { diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json index c080f5c7d..337134484 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json @@ -22,11 +22,13 @@ }, "sky_color": 15117444, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 1069623 }, "features": [ - [], - [], + [ + "tfc:erosion" + ], + "#tfc:feature/volcanoes", [ "tfg:earth/geode/amethyst", "tfg:earth/geode/barite", @@ -37,18 +39,20 @@ "tfg:earth/geode/quartzite" ], [ - "tfc:vein/gabbro_dike", - "tfc:vein/diorite_dike" + ], [], [], "#tfg:mars_veins", [], - "#tfg:mars_small_rock_features", + [ + "tfc:raw_boulder_small_patch", + "tfc:cobble_boulder_small_patch" + ], [ ], - [] + "#tfg:mars_top_layer_modification" ], "has_precipitation": false, "spawn_costs": { diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json b/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json index bf04464b2..2cb57e6e9 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json @@ -19,10 +19,12 @@ }, "sky_color": 15117444, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 1069623 }, "features": [ - [], + [ + "tfc:erosion" + ], [], [ "tfg:earth/geode/amethyst", @@ -34,18 +36,21 @@ "tfg:earth/geode/quartzite" ], [ - "tfc:vein/gabbro_dike", - "tfc:vein/diorite_dike" + "tfc:random_empty_hot_spring" ], [], [], "#tfg:mars_veins", [], - "#tfg:mars_small_rock_features", [ - + "tfc:raw_boulder", + "tfc:cobble_boulder", + "tfc:raw_boulder_small_patch", + "tfc:cobble_boulder_small_patch", + "tfg:mars/semiheavy_ammoniacal_water" ], - [] + "#tfg:mars_sangnum_vegetal_decoration", + "#tfg:mars_top_layer_modification" ], "has_precipitation": false, "spawn_costs": { diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json index 3602f9b61..0710509e4 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json @@ -22,10 +22,12 @@ }, "sky_color": 15117444, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 1069623 }, "features": [ - [], + [ + "tfc:erosion" + ], [], [ "tfg:earth/geode/amethyst", @@ -37,17 +39,20 @@ "tfg:earth/geode/quartzite" ], [ - "tfc:vein/gabbro_dike", - "tfc:vein/diorite_dike" + ], [], [], "#tfg:mars_veins", [], - "#tfg:mars_small_rock_features", [ + "tfc:raw_boulder_small_patch", + "tfc:cobble_boulder_small_patch" ], - [] + [ + + ], + "#tfg:mars_top_layer_modification" ], "has_precipitation": false, "spawn_costs": { diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json b/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json index 539d295bf..f06783c25 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json @@ -22,10 +22,12 @@ }, "sky_color": 15117444, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 1069623 }, "features": [ - [], + [ + "tfc:erosion" + ], [], [ "tfg:earth/geode/amethyst", @@ -37,18 +39,22 @@ "tfg:earth/geode/quartzite" ], [ - "tfc:vein/gabbro_dike", - "tfc:vein/diorite_dike" + ], [], [], "#tfg:mars_veins", [], - "#tfg:mars_small_rock_features", + [ + "tfc:raw_boulder", + "tfc:cobble_boulder", + "tfc:raw_boulder_small_patch", + "tfc:cobble_boulder_small_patch" + ], [ ], - [] + "#tfg:mars_top_layer_modification" ], "has_precipitation": false, "spawn_costs": { diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json index 1b1349e99..87a52cb71 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json @@ -22,10 +22,12 @@ }, "sky_color": 15117444, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 1069623 }, "features": [ - [], + [ + "tfc:erosion" + ], [], [ "tfg:earth/geode/amethyst", @@ -37,16 +39,20 @@ "tfg:earth/geode/quartzite" ], [ - "tfc:vein/gabbro_dike", - "tfc:vein/diorite_dike" + "tfc:random_empty_hot_spring" ], [], [], "#tfg:mars_veins", [], - "#tfg:mars_small_rock_features", + [ + "tfc:raw_boulder", + "tfc:cobble_boulder", + "tfc:raw_boulder_small_patch", + "tfc:cobble_boulder_small_patch" + ], "#tfg:mars_rusticus_vegetal_decoration", - [] + "#tfg:mars_top_layer_modification" ], "has_precipitation": false, "spawn_costs": { diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json index 255b16834..52a762b02 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json @@ -22,10 +22,12 @@ }, "sky_color": 15117444, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 1069623 }, "features": [ - [], + [ + "tfc:erosion" + ], [], [ "tfg:earth/geode/amethyst", @@ -36,17 +38,16 @@ "tfg:earth/geode/pyrite", "tfg:earth/geode/quartzite" ], - [ - "tfc:vein/gabbro_dike", - "tfc:vein/diorite_dike" - ], + [], [], [], "#tfg:mars_veins", [], - "#tfg:mars_small_rock_features", + [ + "tfg:mars/semiheavy_ammoniacal_water" + ], "#tfg:mars_rusticus_vegetal_decoration", - [] + "#tfg:mars_top_layer_modification" ], "has_precipitation": false, "spawn_costs": { diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json index f20015576..e0087f4a6 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json @@ -22,10 +22,12 @@ }, "sky_color": 15117444, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 1069623 }, "features": [ - [], + [ + "tfc:erosion" + ], [], [ "tfg:earth/geode/amethyst", @@ -37,16 +39,20 @@ "tfg:earth/geode/quartzite" ], [ - "tfc:vein/gabbro_dike", - "tfc:vein/diorite_dike" + "tfc:random_empty_hot_spring" ], [], [], "#tfg:mars_veins", [], - "#tfg:mars_small_rock_features", + [ + "tfc:raw_boulder", + "tfc:cobble_boulder", + "tfc:raw_boulder_small_patch", + "tfc:cobble_boulder_small_patch" + ], "#tfg:mars_sangnum_vegetal_decoration", - [] + "#tfg:mars_top_layer_modification" ], "has_precipitation": false, "spawn_costs": { diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json index 6d445d586..2dc4101e8 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json @@ -22,10 +22,12 @@ }, "sky_color": 15117444, "water_color": 4159204, - "water_fog_color": 329011 + "water_fog_color": 1069623 }, "features": [ - [], + [ + "tfc:erosion" + ], [], [ "tfg:earth/geode/amethyst", @@ -36,17 +38,16 @@ "tfg:earth/geode/pyrite", "tfg:earth/geode/quartzite" ], - [ - "tfc:vein/gabbro_dike", - "tfc:vein/diorite_dike" - ], + [], [], [], "#tfg:mars_veins", [], - "#tfg:mars_small_rock_features", + [ + "tfg:mars/semiheavy_ammoniacal_water" + ], "#tfg:mars_sangnum_vegetal_decoration", - [] + "#tfg:mars_top_layer_modification" ], "has_precipitation": false, "spawn_costs": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/crop/amber_root.json b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/amber_root.json new file mode 100644 index 000000000..6517e2edb --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/amber_root.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "betterend:amber_root_wild" + } + } + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE_WG" + }, + { + "type": "block_predicate_filter", + "predicate": { + "type": "tfc:replaceable" + } + }, + { + "type": "block_predicate_filter", + "predicate": { + "type": "would_survive", + "state": { + "Name": "betterend:amber_root_wild" + } + } + } + ] + }, + "tries": 16, + "xz_spread": 10, + "y_spread": 2 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/crop/blossom_berry.json b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/blossom_berry.json new file mode 100644 index 000000000..84b07a38f --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/blossom_berry.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "betterend:blossom_berry_wild" + } + } + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE_WG" + }, + { + "type": "block_predicate_filter", + "predicate": { + "type": "tfc:replaceable" + } + }, + { + "type": "block_predicate_filter", + "predicate": { + "type": "would_survive", + "state": { + "Name": "betterend:blossom_berry_wild" + } + } + } + ] + }, + "tries": 16, + "xz_spread": 10, + "y_spread": 2 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/bolux_mushroom.json b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/bolux_mushroom.json similarity index 50% rename from kubejs/data/tfg/worldgen/configured_feature/mars/surface/bolux_mushroom.json rename to kubejs/data/tfg/worldgen/configured_feature/mars/crop/bolux_mushroom.json index 2099cb38f..7ae8ad29f 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/bolux_mushroom.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/bolux_mushroom.json @@ -15,26 +15,28 @@ }, "placement": [ { - "type": "minecraft:block_predicate_filter", + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE_WG" + }, + { + "type": "block_predicate_filter", "predicate": { - "type": "minecraft:all_of", - "predicates": [ - { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" - }, - { - "type": "minecraft:matching_block_tag", - "offset": [ 0, -1, 0 ], - "tag": "tfg:mars_soil" - } - ] + "type": "tfc:replaceable" + } + }, + { + "type": "block_predicate_filter", + "predicate": { + "type": "would_survive", + "state": { + "Name": "betterend:bolux_mushroom_wild" + } } } ] }, - "tries": 8, + "tries": 16, "xz_spread": 10, - "y_spread": 3 + "y_spread": 2 } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/crop/cave_pumpkin.json b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/cave_pumpkin.json new file mode 100644 index 000000000..89db4f83c --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/cave_pumpkin.json @@ -0,0 +1,37 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "tfc:spreading_crop", + "config": { + "block": "betterend:cave_pumpkin_wild" + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE_WG" + }, + { + "type": "block_predicate_filter", + "predicate": { + "type": "tfc:replaceable" + } + }, + { + "type": "block_predicate_filter", + "predicate": { + "type": "would_survive", + "state": { + "Name": "betterend:cave_pumpkin_wild" + } + } + } + ] + }, + "tries": 16, + "xz_spread": 10, + "y_spread": 2 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/crop/chorus_mushroom.json b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/chorus_mushroom.json new file mode 100644 index 000000000..19e67254c --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/chorus_mushroom.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "betterend:chorus_mushroom_wild" + } + } + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE_WG" + }, + { + "type": "block_predicate_filter", + "predicate": { + "type": "tfc:replaceable" + } + }, + { + "type": "block_predicate_filter", + "predicate": { + "type": "would_survive", + "state": { + "Name": "betterend:chorus_mushroom_wild" + } + } + } + ] + }, + "tries": 16, + "xz_spread": 10, + "y_spread": 2 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/crop/shadow_berry.json b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/shadow_berry.json new file mode 100644 index 000000000..e316ca1e0 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/shadow_berry.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "betterend:shadow_berry_wild" + } + } + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE_WG" + }, + { + "type": "block_predicate_filter", + "predicate": { + "type": "tfc:replaceable" + } + }, + { + "type": "block_predicate_filter", + "predicate": { + "type": "would_survive", + "state": { + "Name": "betterend:shadow_berry_wild" + } + } + } + ] + }, + "tries": 16, + "xz_spread": 10, + "y_spread": 2 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/density_function/mars/offset.json b/kubejs/data/tfg/worldgen/density_function/mars/offset.json index 4045be58d..ae811e131 100644 --- a/kubejs/data/tfg/worldgen/density_function/mars/offset.json +++ b/kubejs/data/tfg/worldgen/density_function/mars/offset.json @@ -122,22 +122,22 @@ { "derivative": 0.0, "location": -1.1, - "value": 0 + "value": -0.4 }, { "derivative": 0.0, "location": -1.02, - "value": 1 + "value": 0.4 }, { "derivative": 0.0, "location": -0.26, - "value": 1 + "value": 0.4 }, { "derivative": 0.0, "location": -0.18, - "value": 0 + "value": -0.4 } ] } diff --git a/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json b/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json index b62ead51d..9b093369b 100644 --- a/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json +++ b/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json @@ -1,5 +1,5 @@ { - "sea_level": 80, + "sea_level": 88, "disable_mob_generation": false, "aquifers_enabled": true, "ore_veins_enabled": false, @@ -32,12 +32,12 @@ "points": [ { "derivative": 0.0, - "location": -0.19, + "location": -0.18, "value": -1 }, { "derivative": 0.0, - "location": -0.18, + "location": -0.17, "value": 1 } ] @@ -111,12 +111,12 @@ "points": [ { "derivative": 0.0, - "location": -0.15, + "location": -0.18, "value": -1 }, { "derivative": 0.0, - "location": -0.14, + "location": -0.17, "value": 0 } ] @@ -137,12 +137,12 @@ "points": [ { "derivative": 0.0, - "location": -0.15, + "location": -0.18, "value": 0 }, { "derivative": 0.0, - "location": -0.14, + "location": -0.17, "value": 1 } ] @@ -225,7 +225,7 @@ "points": [ { "derivative": 0.0, - "location": -0.18, + "location": -0.19, "value": 1 }, { @@ -283,77 +283,21 @@ } } }, - - { "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", "biome_is": [ + "tfg:mars/martian_river", "tfg:mars/martian_riverbed" ] }, - "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_glazed_terracotta" - } - } - } - }, - - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "tfg:mars/martian_dune_edge" - ] - }, - "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:light_blue_concrete" - } - } - } - }, - - - { - "_": "SAND + SAND STONE HARDENING", - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "tfg:mars/martian_dunes", - "tfg:mars/martian_deep_desert" - ] - }, "then_run": { "type": "minecraft:condition", "if_true": { "type": "minecraft:y_above", "anchor": { - "absolute": 50 + "absolute": 70 }, "surface_depth_multiplier": 0, "add_stone_depth": false @@ -365,62 +309,62 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", + "offset": 2, + "surface_type": "floor", "add_surface_depth": false, "secondary_depth_range": 0 }, "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:mars_dunes_color", - "min_threshold": -2.0, - "max_threshold": -0.4 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "ad_astra:venus_sandstone" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:mars_dunes_color", - "min_threshold": -0.4, - "max_threshold": 0.05 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "ad_astra:mars_stone" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:mars_dunes_color", - "min_threshold": 0.05, - "max_threshold": 2.0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:red_sandstone" - } - } - } - ] + "type": "minecraft:block", + "result_state": { + "Name": "ad_astra:venus_sand" + } } }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:stone_depth", + "offset": 6, + "surface_type": "floor", + "add_surface_depth": false, + "secondary_depth_range": 0 + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "ad_astra:venus_sandstone" + } + } + } + ] + } + } + }, + { + "_": "SAND + SAND STONE HARDENING", + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:biome", + "biome_is": [ + "tfg:mars/martian_dune_edge", + "tfg:mars/martian_dunes", + "tfg:mars/martian_deep_desert" + ] + }, + "then_run": { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:y_above", + "anchor": { + "absolute": 65 + }, + "surface_depth_multiplier": 0, + "add_stone_depth": false + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ { "type": "minecraft:condition", "if_true": { @@ -434,54 +378,32 @@ "type": "minecraft:sequence", "sequence": [ { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:mars_dunes_color", - "min_threshold": -2.0, - "max_threshold": -0.4 + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:not", + "invert": { + "type": "minecraft:vertical_gradient", + "random_name": "tfg:mars_top_layer_sand", + "false_at_and_above": { + "absolute": 87 }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "ad_astra:venus_sand" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:mars_dunes_color", - "min_threshold": -0.4, - "max_threshold": 0.05 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "ad_astra:mars_sand" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:mars_dunes_color", - "min_threshold": 0.05, - "max_threshold": 2.0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:red_sand" - } + "true_at_and_below": { + "absolute": 77 } } - ] + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "ad_astra:mars_sand" + } + } + }, + { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:red_sand" + } } ] } @@ -499,54 +421,32 @@ "type": "minecraft:sequence", "sequence": [ { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:mars_dunes_color", - "min_threshold": -2.0, - "max_threshold": -0.4 + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:not", + "invert": { + "type": "minecraft:vertical_gradient", + "random_name": "tfg:mars_top_layer_sand", + "false_at_and_above": { + "absolute": 84 }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "ad_astra:venus_sandstone" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:mars_dunes_color", - "min_threshold": -0.4, - "max_threshold": 0.05 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "ad_astra:mars_stone" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:mars_dunes_color", - "min_threshold": 0.05, - "max_threshold": 2.0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:red_sandstone" - } + "true_at_and_below": { + "absolute": 74 } } - ] + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "ad_astra:mars_stone" + } + } + }, + { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:red_sandstone" + } } ] } @@ -555,778 +455,12 @@ } } }, + + + + { - "_": "BOTTOM ROCK LAYER + HARDENING", - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:vertical_gradient", - "random_name": "tfg:mars_bottom_rock_layer", - "false_at_and_above": { - "absolute": 8 - }, - "true_at_and_below": { - "absolute": 0 - } - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_1", - "min_threshold": -1.0, - "max_threshold": -0.15 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": -1.0, - "max_threshold": -0.15 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfg:rock/hardened_red_granite" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "gtceu:red_granite" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": -0.2, - "max_threshold": 0.2 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/hardened/gabbro" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/raw/gabbro" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": 0.15, - "max_threshold": 1.0 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/hardened/diorite" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/raw/diorite" - } - } - ] - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_1", - "min_threshold": -0.2, - "max_threshold": 0.2 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": -1.0, - "max_threshold": -0.15 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/hardened/granite" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/raw/granite" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": -0.2, - "max_threshold": 0.2 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfg:rock/hardened_venus_stone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "ad_astra:venus_stone" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": 0.15, - "max_threshold": 1.0 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfg:rock/hardened_red_granite" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "gtceu:red_granite" - } - } - ] - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_1", - "min_threshold": 0.15, - "max_threshold": 1.0 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": -1.0, - "max_threshold": -0.15 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/hardened/andesite" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/raw/andesite" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": -0.2, - "max_threshold": 0.2 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/hardened/dacite" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/raw/dacite" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": 0.15, - "max_threshold": 1.0 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/hardened/diorite" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/raw/diorite" - } - } - ] - } - } - ] - } - } - ] - } - }, - { - "_": "MIDDLE ROCK LAYER + HARDENING", - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:vertical_gradient", - "random_name": "tfg:mars_middle_rock_layer", - "false_at_and_above": { - "absolute": 50 - }, - "true_at_and_below": { - "absolute": 42 - } - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_1", - "min_threshold": -1.0, - "max_threshold": -0.15 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": -1.0, - "max_threshold": -0.15 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfg:rock/hardened_mars_stone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "ad_astra:mars_stone" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": -0.2, - "max_threshold": 0.2 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/hardened/dolomite" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/raw/dolomite" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": 0.15, - "max_threshold": 1.0 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/hardened/chert" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/raw/chert" - } - } - ] - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_1", - "min_threshold": -0.2, - "max_threshold": 0.2 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": -1.0, - "max_threshold": -0.15 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/hardened/conglomerate" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/raw/conglomerate" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": -0.2, - "max_threshold": 0.2 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfg:rock/hardened_red_granite" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "gtceu:red_granite" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": 0.15, - "max_threshold": 1.0 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/hardened/basalt" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/raw/basalt" - } - } - ] - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_1", - "min_threshold": 0.15, - "max_threshold": 1.0 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": -1.0, - "max_threshold": -0.15 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/hardened/dacite" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/raw/dacite" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": -0.2, - "max_threshold": 0.2 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfg:rock/hardened_venus_stone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "ad_astra:venus_stone" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": 0.15, - "max_threshold": 1.0 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/hardened/shale" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/raw/shale" - } - } - ] - } - } - ] - } - } - ] - } - }, - { - "_": "TOP ROCK LAYER FOR MOUNTAINS + HARDENING", + "_": "TOP ROCK LAYER FOR MOUNTAINS", "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", @@ -1360,22 +494,6 @@ "then_run": { "type": "minecraft:sequence", "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfg:rock/hardened_red_granite" - } - } - }, { "type": "minecraft:block", "result_state": { @@ -1396,22 +514,6 @@ "then_run": { "type": "minecraft:sequence", "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/hardened/basalt" - } - } - }, { "type": "minecraft:block", "result_state": { @@ -1446,22 +548,6 @@ "then_run": { "type": "minecraft:sequence", "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/hardened/gabbro" - } - } - }, { "type": "minecraft:block", "result_state": { @@ -1482,22 +568,6 @@ "then_run": { "type": "minecraft:sequence", "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfg:rock/hardened_red_granite" - } - } - }, { "type": "minecraft:block", "result_state": { @@ -1513,279 +583,8 @@ ] } }, - { - "_": "STONE HARDENING ON THE TOP LAYER", - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_1", - "min_threshold": -1.0, - "max_threshold": -0.15 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": -1.0, - "max_threshold": -0.15 - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/hardened/chalk" - } - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": -0.2, - "max_threshold": 0.2 - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/hardened/shale" - } - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": 0.15, - "max_threshold": 1.0 - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/hardened/dolomite" - } - } - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_1", - "min_threshold": -0.2, - "max_threshold": 0.2 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": -1.0, - "max_threshold": -0.15 - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/hardened/limestone" - } - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": -0.2, - "max_threshold": 0.2 - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfg:rock/hardened_mars_stone" - } - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": 0.15, - "max_threshold": 1.0 - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/hardened/claystone" - } - } - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_1", - "min_threshold": 0.15, - "max_threshold": 1.0 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": -1.0, - "max_threshold": -0.15 - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/hardened/conglomerate" - } - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": -0.2, - "max_threshold": 0.2 - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/hardened/chert" - } - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": 0.15, - "max_threshold": 1.0 - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfg:rock/hardened_dripstone" - } - } - } - } - ] - } - } - ] - }, + + { "_": "AMBER MYCELIUM + DIRT", "type": "minecraft:condition", @@ -1812,6 +611,25 @@ "then_run": { "type": "minecraft:sequence", "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + + "type": "minecraft:not", + "invert": { + "type": "minecraft:water", + "offset": 0, + "surface_depth_multiplier": 0, + "add_stone_depth": false + } + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "ad_astra:venus_sand" + } + } + }, { "type": "minecraft:condition", "if_true": { @@ -1822,8 +640,8 @@ "secondary_depth_range": 0 }, "then_run": { - "type": "minecraft:block", - "result_state": { + "type": "tfg:needs_post_processing", + "state": { "Name": "tfg:grass/amber_mycelium" } } @@ -1875,6 +693,25 @@ "then_run": { "type": "minecraft:sequence", "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + + "type": "minecraft:not", + "invert": { + "type": "minecraft:water", + "offset": 0, + "surface_depth_multiplier": 0, + "add_stone_depth": false + } + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "ad_astra:venus_sand" + } + } + }, { "type": "minecraft:condition", "if_true": { @@ -1885,8 +722,8 @@ "secondary_depth_range": 0 }, "then_run": { - "type": "minecraft:block", - "result_state": { + "type": "tfg:needs_post_processing", + "state": { "Name": "tfg:grass/rusticus_mycelium" } } @@ -1939,6 +776,25 @@ "then_run": { "type": "minecraft:sequence", "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + + "type": "minecraft:not", + "invert": { + "type": "minecraft:water", + "offset": 0, + "surface_depth_multiplier": 0, + "add_stone_depth": false + } + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "ad_astra:venus_sand" + } + } + }, { "type": "minecraft:condition", "if_true": { @@ -1949,8 +805,8 @@ "secondary_depth_range": 0 }, "then_run": { - "type": "minecraft:block", - "result_state": { + "type": "tfg:needs_post_processing", + "state": { "Name": "tfg:grass/sangnum_mycelium" } } @@ -1977,475 +833,11 @@ } }, { - "_": "TOP ROCK LAYER, NO HARDENING", - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_1", - "min_threshold": -1.0, - "max_threshold": -0.15 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": -1.0, - "max_threshold": -0.15 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 60 - }, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 5, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/gravel/chalk" - } - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/raw/chalk" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": -0.2, - "max_threshold": 0.2 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 60 - }, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 5, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/gravel/shale" - } - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/raw/shale" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": 0.15, - "max_threshold": 1.0 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 60 - }, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 5, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/gravel/dolomite" - } - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/raw/dolomite" - } - } - ] - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_1", - "min_threshold": -0.2, - "max_threshold": 0.2 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": -1.0, - "max_threshold": -0.15 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 60 - }, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 5, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/gravel/limestone" - } - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/raw/limestone" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": -0.2, - "max_threshold": 0.2 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 60 - }, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 5, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "ad_astra:mars_cobblestone" - } - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "ad_astra:mars_stone" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": 0.15, - "max_threshold": 1.0 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 60 - }, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 5, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/gravel/claystone" - } - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/raw/claystone" - } - } - ] - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_1", - "min_threshold": 0.15, - "max_threshold": 1.0 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": -1.0, - "max_threshold": -0.15 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 60 - }, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 5, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/gravel/conglomerate" - } - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/raw/conglomerate" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": -0.2, - "max_threshold": 0.2 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 60 - }, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 5, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/gravel/chert" - } - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:rock/raw/chert" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "tfg:stone_layer_mars_2", - "min_threshold": 0.15, - "max_threshold": 1.0 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 60 - }, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 5, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "tfc:sand/brown" - } - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:dripstone_block" - } - } - ] - } - } - ] - } - } - ] + "type": "kubejs_tfc:rock", + "rock_block": "raw", + "fallback_state": { + "Name": "ad_astra:mars_stone" + } } ] }, diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/amber_root.json b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/amber_root.json new file mode 100644 index 000000000..e439f93ce --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/amber_root.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:mars/crop/amber_root", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 50 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/blossom_berry.json b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/blossom_berry.json new file mode 100644 index 000000000..5cff0483f --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/blossom_berry.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:mars/crop/blossom_berry", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 50 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/bolux_mushroom.json b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/bolux_mushroom.json similarity index 78% rename from kubejs/data/tfg/worldgen/placed_feature/mars/surface/bolux_mushroom.json rename to kubejs/data/tfg/worldgen/placed_feature/mars/crop/bolux_mushroom.json index 8dbaff4d4..42cd2d5c5 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/bolux_mushroom.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/bolux_mushroom.json @@ -1,9 +1,9 @@ { - "feature": "tfg:mars/surface/bolux_mushroom", + "feature": "tfg:mars/crop/bolux_mushroom", "placement": [ { "type": "minecraft:rarity_filter", - "chance": 2 + "chance": 50 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/cave_pumpkin.json b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/cave_pumpkin.json new file mode 100644 index 000000000..f571295d2 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/cave_pumpkin.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:mars/crop/cave_pumpkin", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 50 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/chorus_mushroom.json b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/chorus_mushroom.json new file mode 100644 index 000000000..3419830cf --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/chorus_mushroom.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:mars/crop/chorus_mushroom", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 50 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/shadow_berry.json b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/shadow_berry.json new file mode 100644 index 000000000..298f9b0bd --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/shadow_berry.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:mars/crop/shadow_berry", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 50 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/no_op.json b/kubejs/data/tfg/worldgen/placed_feature/mars/no_op.json deleted file mode 100644 index bf78f61b1..000000000 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/no_op.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "feature": { - "type": "minecraft:no_op", - "config": {} - }, - "placement": [] -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/semiheavy_ammoniacal_water.json b/kubejs/data/tfg/worldgen/placed_feature/mars/semiheavy_ammoniacal_water.json index 5752bd572..f1c558897 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/semiheavy_ammoniacal_water.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/semiheavy_ammoniacal_water.json @@ -2,8 +2,8 @@ "feature": "tfg:mars/semiheavy_ammoniacal_water", "placement": [ { - "type": "minecraft:count", - "count": 1 + "type": "minecraft:rarity_filter", + "chance": 30 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/amber_grass.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/amber_grass.json index 86239b1bc..758d5e645 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/amber_grass.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/amber_grass.json @@ -8,6 +8,9 @@ { "type": "minecraft:in_square" }, + { + "type": "minecraft:biome" + }, { "type": "minecraft:heightmap", "heightmap": "WORLD_SURFACE" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/cave_grass.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/cave_grass.json index fe798d667..b464f6c22 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/cave_grass.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/cave_grass.json @@ -8,6 +8,9 @@ { "type": "minecraft:in_square" }, + { + "type": "minecraft:biome" + }, { "type": "minecraft:heightmap", "heightmap": "WORLD_SURFACE" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/lutebus.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/lutebus.json index 6aeb77952..d674231a5 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/lutebus.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/lutebus.json @@ -8,6 +8,9 @@ { "type": "minecraft:in_square" }, + { + "type": "minecraft:biome" + }, { "type": "minecraft:heightmap", "heightmap": "WORLD_SURFACE" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/orango.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/orango.json index 215f72732..98419b076 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/orango.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/orango.json @@ -8,6 +8,9 @@ { "type": "minecraft:in_square" }, + { + "type": "minecraft:biome" + }, { "type": "minecraft:heightmap", "heightmap": "WORLD_SURFACE" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/ruscus.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/ruscus.json index 17ef473bc..36676060e 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/ruscus.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/ruscus.json @@ -8,6 +8,9 @@ { "type": "minecraft:in_square" }, + { + "type": "minecraft:biome" + }, { "type": "minecraft:heightmap", "heightmap": "WORLD_SURFACE" diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index 053e8fa39..86bc78a1f 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -382,14 +382,26 @@ const registerAdAstraPlacedFeatures = (event) => { event.add('tfg:moon_small_rock_features', 'tfg:moon/surface/pile_white_sand') event.add('tfg:moon_small_rock_features', 'tfg:moon/surface/pile_black_sand') - // Mars + //#region Mars + + // Vegetation + event.add("tfg:mars_amber_small_plants", "tfg:mars/crop/amber_root") + event.add("tfg:mars_amber_small_plants", "tfg:mars/crop/blossom_berry") + event.add("tfg:mars_amber_small_plants", "tfg:mars/crop/bolux_mushroom") + event.add("tfg:mars_amber_small_plants", "tfg:mars/crop/cave_pumpkin") + event.add("tfg:mars_amber_small_plants", "tfg:mars/crop/chorus_mushroom") event.add("tfg:mars_amber_small_plants", "tfg:mars/surface/amber_grass") event.add("tfg:mars_amber_small_plants", "tfg:mars/surface/flamaea") event.add("tfg:mars_amber_small_plants", "tfg:mars/surface/flammalix") event.add("tfg:mars_amber_small_plants", "tfg:mars/surface/lutebus") event.add("tfg:mars_amber_small_plants", "tfg:mars/surface/orango") - + + event.add("tfg:mars_rusticus_small_plants", "tfg:mars/crop/amber_root") + event.add("tfg:mars_rusticus_small_plants", "tfg:mars/crop/blossom_berry") + event.add("tfg:mars_rusticus_small_plants", "tfg:mars/crop/bolux_mushroom") + event.add("tfg:mars_rusticus_small_plants", "tfg:mars/crop/chorus_mushroom") + event.add("tfg:mars_rusticus_small_plants", "tfg:mars/crop/shadow_berry") event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/aeridium") event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/flamaea") event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/flammalix") @@ -397,7 +409,12 @@ const registerAdAstraPlacedFeatures = (event) => { event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/lutebus") event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/orango") event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/ruscus") - + + event.add("tfg:mars_sangnum_small_plants", "tfg:mars/crop/blossom_berry") + event.add("tfg:mars_sangnum_small_plants", "tfg:mars/crop/bolux_mushroom") + event.add("tfg:mars_sangnum_small_plants", "tfg:mars/crop/cave_pumpkin") + event.add("tfg:mars_sangnum_small_plants", "tfg:mars/crop/chorus_mushroom") + event.add("tfg:mars_sangnum_small_plants", "tfg:mars/crop/shadow_berry") event.add("tfg:mars_sangnum_small_plants", "tfg:mars/surface/cave_grass") event.add("tfg:mars_sangnum_small_plants", "tfg:mars/surface/clawfern") event.add("tfg:mars_sangnum_small_plants", "tfg:mars/surface/flamaea") @@ -406,7 +423,6 @@ const registerAdAstraPlacedFeatures = (event) => { event.add("tfg:mars_sangnum_small_plants", "tfg:mars/surface/ruscus") event.add("tfg:mars_global_small_plants", "tfg:mars/surface/small_amaranita_mushroom") - //event.add("tfg:mars_global_small_plants", "tfg:mars/surface/bolux_mushroom") // TODO event.add("tfg:mars_trees", "tfg:mars/surface/strophar_huge") @@ -414,11 +430,7 @@ const registerAdAstraPlacedFeatures = (event) => { event.add("tfg:mars_trees", "species:alphacene_mushroom") event.add("tfg:mars_global_small_plants", "tfg:mars/surface/aeronos_patch") event.add("tfg:mars_global_small_plants", "tfg:mars/surface/strophar_patch") - // Temp - event.add('tfg:mars_small_rock_features', 'tfg:mars/no_op') - event.add('tfg:mars_veins', 'tfg:mars/no_op') - - + event.add("tfg:mars_amber_vegetal_decoration", "#tfg:mars_trees") event.add("tfg:mars_amber_vegetal_decoration", "#tfg:mars_amber_small_plants") event.add("tfg:mars_amber_vegetal_decoration", "#tfg:mars_global_small_plants") @@ -430,9 +442,13 @@ const registerAdAstraPlacedFeatures = (event) => { event.add("tfg:mars_sangnum_vegetal_decoration", "#tfg:mars_trees") event.add("tfg:mars_sangnum_vegetal_decoration", "#tfg:mars_sangnum_small_plants") event.add("tfg:mars_sangnum_vegetal_decoration", "#tfg:mars_global_small_plants") - - // Venus + // Top layer + event.add("tfg:mars_top_layer_modification", "tfc:surface_loose_rocks") + + //#endregion + + //#region Venus event.add('tfg:venus_delta_surface_features', 'tfg:venus/surface/geyser_source_patch') event.add('tfg:venus_delta_surface_features', 'tfg:venus/surface/stromatolite_cluster_patch') event.add('tfg:venus_delta_surface_features', 'tfg:venus/surface/stromatolite_tower') @@ -447,4 +463,5 @@ const registerAdAstraPlacedFeatures = (event) => { event.add('tfg:venus_fractured_lands_terrain_features', 'tfg:venus/terrain/lake_geyserite') event.add('tfg:venus_fractured_lands_terrain_features', 'tfg:venus/terrain/lake_orange_sand') event.add('tfg:venus_fractured_lands_terrain_features', 'tfg:venus/terrain/lake_yellow_sand') + //#endregion } diff --git a/kubejs/server_scripts/tfg/events.chunks.js b/kubejs/server_scripts/tfg/events.chunks.js index 4cb83a835..a05bfab75 100644 --- a/kubejs/server_scripts/tfg/events.chunks.js +++ b/kubejs/server_scripts/tfg/events.chunks.js @@ -1,6 +1,10 @@ // priority: 0 "use strict"; +const $HeightMap = Java.loadClass("net.minecraft.world.level.levelgen.Heightmap") + +const ROCK_LAYER_HEIGHT = 40; + TFCEvents.createChunkDataProvider('mars', event => { const rain = TFC.misc.lerpFloatLayer(0, 0, 0, 0); @@ -14,15 +18,14 @@ TFCEvents.createChunkDataProvider('mars', event => { .affine(6, 12) .scaled(6, 18, 0, 1) - // Precompute the surface & aquifer heights as constants as this is nether and does not realistically change - let heights = []; + const rockNoise = TFC.misc.newOpenSimplex2D(event.worldSeed + 8008135) + .octaves(3) + .scaled(0x80000000, 0x7fffffff) // Integer.MIN_VALUE to Integer.MAX_VALUE + .spread(0.00001) // spread it out so the vaiance is small + + // Precompute the aquifer heights as constants as this is not used + var aquifer = []; let i = 0; - while (i < 256) { - heights.push(127); - i++; - } - let aquifer = []; - i = 0; while (i < 16) { aquifer.push(32); i++; @@ -49,10 +52,16 @@ TFCEvents.createChunkDataProvider('mars', event => { }); event.full((data, chunk) => { + let heights = []; + for (let z = 0; z < 16; z++) { + for (let x = 0; x < 16; x++) { + heights[x + 16 * z] = chunk.getHeight($HeightMap.Types.OCEAN_FLOOR_WG, x, z); + } + } data.generateFull(heights, aquifer); }); event.rocks((x, y, z, surfaceY, cache, rockLayers) => { - return rockLayers.sampleAtLayer(0, 0); + return rockLayers.sampleAtLayer(rockNoise.noise(x, z), (surfaceY - y) / ROCK_LAYER_HEIGHT); }); })