diff --git a/kubejs/data/ad_astra/dimension/mars.json b/kubejs/data/ad_astra/dimension/mars.json index 4b3fec560..db308181a 100644 --- a/kubejs/data/ad_astra/dimension/mars.json +++ b/kubejs/data/ad_astra/dimension/mars.json @@ -279,7 +279,7 @@ { "biome": "tfg:mars/rusticus_hills", "parameters": { - "continentalness": [ 0.1, 0.4 ], + "continentalness": [ 0.1, 0.5 ], "depth": 0, "erosion": [ -1, 0 ], "humidity": [ -0.2, 0.2 ], @@ -291,7 +291,7 @@ { "biome": "tfg:mars/sangnum_hills", "parameters": { - "continentalness": [ 0.1, 0.4 ], + "continentalness": [ 0.1, 0.5 ], "depth": 0, "erosion": [ -1, 0 ], "humidity": [ -0.2, 0.2 ], @@ -304,7 +304,7 @@ { "biome": "tfg:mars/sangnum_hills", "parameters": { - "continentalness": [ 0.1, 0.4 ], + "continentalness": [ 0.1, 0.5 ], "depth": 0, "erosion": [ -1, 0 ], "humidity": [ -1, -0.2 ], @@ -316,7 +316,7 @@ { "biome": "tfg:mars/amber_hills", "parameters": { - "continentalness": [ 0.1, 0.4 ], + "continentalness": [ 0.1, 0.5 ], "depth": 0, "erosion": [ -1, 0 ], "humidity": [ -1, -0.2 ], @@ -329,7 +329,7 @@ { "biome": "tfg:mars/amber_hills", "parameters": { - "continentalness": [ 0.1, 0.4 ], + "continentalness": [ 0.1, 0.5 ], "depth": 0, "erosion": [ -1, 0 ], "humidity": [ 0.2, 1 ], @@ -341,7 +341,7 @@ { "biome": "tfg:mars/rusticus_hills", "parameters": { - "continentalness": [ 0.1, 0.4 ], + "continentalness": [ 0.1, 0.5 ], "depth": 0, "erosion": [ -1, 0 ], "humidity": [ 0.2, 1 ], @@ -356,75 +356,75 @@ { "biome": "tfg:mars/rusticus_hills", "parameters": { - "continentalness": [ 0.4, 0.7 ], + "continentalness": [ 0.5, 1 ], "depth": 0, "erosion": [ -1, 1 ], "humidity": [ -0.2, 0.2 ], "offset": 0, "temperature": [ -1, 1 ], - "weirdness": [ 0, 1 ] + "weirdness": [ 0, 0.8 ] } }, { "biome": "tfg:mars/sangnum_hills", "parameters": { - "continentalness": [ 0.4, 0.7 ], + "continentalness": [ 0.5, 1 ], "depth": 0, "erosion": [ -1, 1 ], "humidity": [ -0.2, 0.2 ], "offset": 0, "temperature": [ -1, 1 ], - "weirdness": [ -1, 0 ] + "weirdness": [ -0.8, 0 ] } }, { "biome": "tfg:mars/sangnum_hills", "parameters": { - "continentalness": [ 0.4, 0.7 ], + "continentalness": [ 0.5, 1 ], "depth": 0, "erosion": [ -1, 1 ], "humidity": [ -1, -0.2 ], "offset": 0, "temperature": [ -1, 1 ], - "weirdness": [ 0, 1 ] + "weirdness": [ 0, 0.8 ] } }, { "biome": "tfg:mars/amber_hills", "parameters": { - "continentalness": [ 0.4, 0.7 ], + "continentalness": [ 0.5, 1 ], "depth": 0, "erosion": [ -1, 1 ], "humidity": [ -1, -0.2 ], "offset": 0, "temperature": [ -1, 1 ], - "weirdness": [ -1, 0 ] + "weirdness": [ -0.8, 0 ] } }, { "biome": "tfg:mars/amber_hills", "parameters": { - "continentalness": [ 0.4, 0.7 ], + "continentalness": [ 0.5, 1 ], "depth": 0, "erosion": [ -1, 1 ], "humidity": [ 0.2, 1 ], "offset": 0, "temperature": [ -1, 1 ], - "weirdness": [ 0, 1 ] + "weirdness": [ 0, 0.8 ] } }, { "biome": "tfg:mars/rusticus_hills", "parameters": { - "continentalness": [ 0.4, 0.7 ], + "continentalness": [ 0.5, 1 ], "depth": 0, "erosion": [ -1, 1 ], "humidity": [ 0.2, 1 ], "offset": 0, "temperature": [ -1, 1 ], - "weirdness": [ -1, 0 ] + "weirdness": [ -0.8, 0 ] } }, @@ -439,7 +439,19 @@ "humidity": [ -1, 1 ], "offset": 0, "temperature": [ -1, 1 ], - "weirdness": [ -1, 1 ] + "weirdness": [ -1, -0.8 ] + } + }, + { + "biome": "tfg:mars/martian_mountains", + "parameters": { + "continentalness": [ 0.65, 1 ], + "depth": 0, + "erosion": [ -1, 1 ], + "humidity": [ -1, 1 ], + "offset": 0, + "temperature": [ -1, 1 ], + "weirdness": [ 0.8, 1 ] } } ] diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json index 9ca5f414d..da5bdfbd1 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json @@ -52,6 +52,11 @@ "tfg:mars/surface/feather_patch" ], [ + "tfg:mars/surface/charnia", + "tfg:mars/surface/aeridium", + "tfg:mars/surface/clawfern", + "tfg:mars/surface/flamaea", + "tfg:mars/surface/flammalix" ], "#tfg:mars_top_layer_modification" ], diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json index 552a99840..13cf0ecc0 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json @@ -42,7 +42,7 @@ "tfc:cobble_boulder_small_patch" ], [ - + "tfg:mars/surface/charnia" ], "#tfg:mars_top_layer_modification" ], diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/charnia.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/charnia.json new file mode 100644 index 000000000..86eb221e5 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/charnia.json @@ -0,0 +1,102 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:weighted_state_provider", + "entries": [ + { + "data": { + "Name": "betterend:charnia_cyan", + "Properties": { + "fluid": "semiheavy_ammoniacal_water" + } + }, + "weight": 25 + }, + { + "data": { + "Name": "betterend:charnia_green", + "Properties": { + "fluid": "semiheavy_ammoniacal_water" + } + }, + "weight": 10 + }, + { + "data": { + "Name": "betterend:charnia_purple", + "Properties": { + "fluid": "semiheavy_ammoniacal_water" + } + }, + "weight": 5 + }, + { + "data": { + "Name": "betterend:charnia_light_blue", + "Properties": { + "fluid": "semiheavy_ammoniacal_water" + } + }, + "weight": 20 + }, + { + "data": { + "Name": "betterend:charnia_orange", + "Properties": { + "fluid": "semiheavy_ammoniacal_water" + } + }, + "weight": 15 + }, + { + "data": { + "Name": "betterend:charnia_red", + "Properties": { + "fluid": "semiheavy_ammoniacal_water" + } + }, + "weight": 15 + } + ] + } + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_fluids", + "fluids": "tfg:semiheavy_ammoniacal_water" + }, + { + "type": "minecraft:matching_fluids", + "offset": [ 0, 1, 0 ], + "fluids": "tfg:fluid/semiheavy_ammoniacal_water" + }, + { + "type": "minecraft:matching_block_tag", + "offset": [ 0, -1, 0 ], + "tag": "ad_astra:mars_stone_replaceables" + } + ] + } + } + ] + }, + "tries": 36, + "xz_spread": 7, + "y_spread": 1 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/charnia.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/charnia.json new file mode 100644 index 000000000..1179b3ecf --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/charnia.json @@ -0,0 +1,26 @@ +{ + "feature": "tfg:mars/surface/charnia", + "placement": [ + { + "type": "minecraft:count", + "count": 10 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_fluids", + "fluids": "tfg:semiheavy_ammoniacal_water" + } + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/small_amaranita_mushroom.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/small_amaranita_mushroom.json index 3702fc112..d9c1589d4 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/small_amaranita_mushroom.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/small_amaranita_mushroom.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 2 + "chance": 3 }, { "type": "minecraft:in_square" diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index d8b239c62..ccb6525e5 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -469,15 +469,16 @@ 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/charnia") - event.add("tfg:mars_amber_vegetal_decoration", "#tfg:mars_amber_small_plants") event.add("tfg:mars_amber_vegetal_decoration", "#tfg:mars_global_small_plants") + event.add("tfg:mars_amber_vegetal_decoration", "#tfg:mars_amber_small_plants") - event.add("tfg:mars_rusticus_vegetal_decoration", "#tfg:mars_rusticus_small_plants") event.add("tfg:mars_rusticus_vegetal_decoration", "#tfg:mars_global_small_plants") + event.add("tfg:mars_rusticus_vegetal_decoration", "#tfg:mars_rusticus_small_plants") - event.add("tfg:mars_sangnum_vegetal_decoration", "#tfg:mars_sangnum_small_plants") event.add("tfg:mars_sangnum_vegetal_decoration", "#tfg:mars_global_small_plants") + event.add("tfg:mars_sangnum_vegetal_decoration", "#tfg:mars_sangnum_small_plants") // Top layer event.add("tfg:mars_top_layer_modification", "tfg:glow_lichen") diff --git a/kubejs/server_scripts/tfg/events.chunks.js b/kubejs/server_scripts/tfg/events.chunks.js index ad12db91c..1906d8643 100644 --- a/kubejs/server_scripts/tfg/events.chunks.js +++ b/kubejs/server_scripts/tfg/events.chunks.js @@ -42,7 +42,7 @@ TFCEvents.createChunkDataProvider('mars', event => { .octaves(3) .scaled(70, 90) const forestLayer = TFC.misc.newOpenSimplex2D(event.worldSeed + 98713856895664) - .spread(0.0002) + .spread(0.00002) .terraces(9) .affine(6, 12) .scaled(6, 18, 0, 1) diff --git a/kubejs/startup_scripts/betterend/blocks.js b/kubejs/startup_scripts/betterend/blocks.js index 78fb4fbda..a9e532dcf 100644 --- a/kubejs/startup_scripts/betterend/blocks.js +++ b/kubejs/startup_scripts/betterend/blocks.js @@ -31,32 +31,45 @@ function registerBetterEndBlocks(event) { .box(2, 0, 2, 14, 14, 14) createPlant(event, 'amber_grass', 'mars') .box(3, 0, 3, 13, 8, 13) + .lootItem('tfc:straw') createPlant(event, 'bushy_grass', 'mars') .box(3, 0, 3, 13, 12, 13) createPlant(event, 'cave_grass', 'mars') .box(3, 0, 3, 13, 12, 13) + .lootItem('beneath:warped_straw') createPlant(event, 'clawfern', 'mars') .box(2, 0, 2, 14, 14, 14) createPlant(event, 'creeping_moss', 'mars') .box(2, 0, 2, 14, 20, 14) + .lootItem('beneath:warped_straw') createPlant(event, 'flamaea', 'mars') .box(2, 0, 2, 14, 3, 14) createPlant(event, 'flammalix', 'mars') createPlant(event, 'globulagus', 'mars') .box(3, 0, 3, 13, 13, 13) + .lootItem('beneath:crimson_straw') createPlant(event, 'lamellarium', 'mars') createPlant(event, 'lutebus', 'mars') .box(3, 0, 3, 13, 8, 13) + .lootItem('tfc:straw') createPlant(event, 'orango', 'mars') .box(3, 0, 3, 13, 12, 13) + .lootItem('tfc:straw') createPlant(event, 'ruscus', 'mars') + .lootItem('beneath:crimson_straw') createPlant(event, 'small_amaranita_mushroom', 'mars') .box(3, 0, 3, 13, 8, 13) // 1 block tall waterlogged - // charnia (and its colors) // jungle_grass + createPlant(event, 'charnia_orange', 'mars') + createPlant(event, 'charnia_cyan', 'mars') + createPlant(event, 'charnia_green', 'mars') + createPlant(event, 'charnia_light_blue', 'mars') + createPlant(event, 'charnia_purple', 'mars') + createPlant(event, 'charnia_red', 'mars') + // Crops // amber_root // blossom_berry