diff --git a/kubejs/data/ad_astra/dimension/mars.json b/kubejs/data/ad_astra/dimension/mars.json index d0b3c4d4a..7d925cf95 100644 --- a/kubejs/data/ad_astra/dimension/mars.json +++ b/kubejs/data/ad_astra/dimension/mars.json @@ -146,18 +146,6 @@ "weirdness": [ -1, 1 ] } }, - { - "biome": "tfg:mars/martian_river", - "parameters": { - "continentalness": [ 0.01, 1 ], - "depth": 0, - "erosion": [ 0, 1 ], - "humidity": [ -1, 1 ], - "offset": 0, - "temperature": [ -1, 1 ], - "weirdness": [ -0.07, 0.07 ] - } - }, { @@ -198,6 +186,19 @@ }, + { + "biome": "tfg:mars/martian_river", + "parameters": { + "continentalness": [ -0.09, 0.65 ], + "depth": 0, + "erosion": [ 0, 1 ], + "humidity": [ -1, 1 ], + "offset": 0, + "temperature": [ -1, 1 ], + "weirdness": [ -0.07, 0.07 ] + } + }, + { "biome": "tfg:mars/amber_plains", diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json b/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json index cad698282..e273ef511 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json @@ -42,7 +42,11 @@ "tfg:mars_forest", "tfg:mars/surface/small_skull_and_bones", "tfg:mars/surface/large_skull_and_bones", - "tfg:mars/surface/rotten_flesh_patch" + "tfg:mars/surface/rotten_flesh_patch", + "tfg:mars/surface/pile_red_sand", + "tfg:mars/surface/pile_venus_sand_no_water", + "tfg:mars/surface/pile_mars_sand", + "tfg:mars/surface/flint_patch" ], "#tfg:mars_amber_vegetal_decoration", "#tfg:mars_top_layer_modification" diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json index 560c05930..0ec0acc0a 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json @@ -51,7 +51,8 @@ "tfc:cobble_boulder_small_patch", "tfg:mars/surface/small_skull_and_bones", "tfg:mars/surface/large_skull_and_bones", - "tfg:mars/surface/rotten_flesh_patch" + "tfg:mars/surface/rotten_flesh_patch", + "tfg:mars/surface/pile_venus_sand" ], "#tfg:mars_amber_vegetal_decoration", "#tfg:mars_top_layer_modification" diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json index e66a1c85b..5dd11ad68 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json @@ -46,7 +46,8 @@ "tfg:mars/semiheavy_ammoniacal_water", "tfg:mars/surface/small_skull_and_bones", "tfg:mars/surface/large_skull_and_bones", - "tfg:mars/surface/rotten_flesh_patch" + "tfg:mars/surface/rotten_flesh_patch", + "tfg:mars/surface/pile_venus_sand" ], "#tfg:mars_amber_vegetal_decoration", "#tfg:mars_top_layer_modification" 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 ab7497657..19d018628 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json @@ -43,7 +43,11 @@ "tfc:cobble_boulder_small_patch", "tfg:mars/surface/small_skull_and_bones", "tfg:mars/surface/large_skull_and_bones", - "tfg:mars/surface/rotten_flesh_patch" + "tfg:mars/surface/rotten_flesh_patch", + "tfg:mars/surface/pile_red_sand", + "tfg:mars/surface/pile_venus_sand_no_water", + "tfg:mars/surface/pile_mars_sand", + "tfg:mars/surface/flint_patch" ], [ "tfg:mars/surface/feather_patch_wraptor", diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json index 2e26ac47d..680c0f38e 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json @@ -50,7 +50,9 @@ "tfc:cobble_boulder_small_patch", "tfg:mars/surface/small_skull_and_bones", "tfg:mars/surface/large_skull_and_bones", - "tfg:mars/surface/rotten_flesh_patch" + "tfg:mars/surface/rotten_flesh_patch", + "tfg:mars/surface/pile_venus_sand", + "tfg:mars/surface/flint_patch" ], [ "tfg:mars/surface/charnia", diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json index 96a146b81..272cceaa5 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json @@ -39,7 +39,9 @@ [], [ "tfc:raw_boulder_small_patch", - "tfc:cobble_boulder_small_patch" + "tfc:cobble_boulder_small_patch", + "tfg:mars/surface/pile_venus_sand_no_water", + "tfg:mars/surface/flint_patch" ], [ "tfg:mars/surface/charnia" diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json index 318f783ad..745b466da 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json @@ -42,7 +42,11 @@ "tfg:mars_forest", "tfg:mars/surface/small_skull_and_bones", "tfg:mars/surface/large_skull_and_bones", - "tfg:mars/surface/rotten_flesh_patch" + "tfg:mars/surface/rotten_flesh_patch", + "tfg:mars/surface/pile_red_sand", + "tfg:mars/surface/pile_venus_sand_no_water", + "tfg:mars/surface/pile_mars_sand", + "tfg:mars/surface/flint_patch" ], "#tfg:mars_rusticus_vegetal_decoration", "#tfg:mars_top_layer_modification" diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json index 08385c878..1b66e774c 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json @@ -51,7 +51,8 @@ "tfc:cobble_boulder_small_patch", "tfg:mars/surface/small_skull_and_bones", "tfg:mars/surface/large_skull_and_bones", - "tfg:mars/surface/rotten_flesh_patch" + "tfg:mars/surface/rotten_flesh_patch", + "tfg:mars/surface/pile_venus_sand" ], "#tfg:mars_rusticus_vegetal_decoration", "#tfg:mars_top_layer_modification" diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json index ce24c3480..97df9436a 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json @@ -46,7 +46,8 @@ "tfg:mars/semiheavy_ammoniacal_water", "tfg:mars/surface/small_skull_and_bones", "tfg:mars/surface/large_skull_and_bones", - "tfg:mars/surface/rotten_flesh_patch" + "tfg:mars/surface/rotten_flesh_patch", + "tfg:mars/surface/pile_venus_sand" ], "#tfg:mars_rusticus_vegetal_decoration", "#tfg:mars_top_layer_modification" diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json index abcf4f18f..dedd9a2b1 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json @@ -42,7 +42,11 @@ "tfg:mars_forest", "tfg:mars/surface/small_skull_and_bones", "tfg:mars/surface/large_skull_and_bones", - "tfg:mars/surface/rotten_flesh_patch" + "tfg:mars/surface/rotten_flesh_patch", + "tfg:mars/surface/pile_red_sand", + "tfg:mars/surface/pile_venus_sand_no_water", + "tfg:mars/surface/pile_mars_sand", + "tfg:mars/surface/flint_patch" ], "#tfg:mars_sangnum_vegetal_decoration", "#tfg:mars_top_layer_modification" diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json index b710af2fe..02e216bb3 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json @@ -51,7 +51,8 @@ "tfc:cobble_boulder_small_patch", "tfg:mars/surface/small_skull_and_bones", "tfg:mars/surface/large_skull_and_bones", - "tfg:mars/surface/rotten_flesh_patch" + "tfg:mars/surface/rotten_flesh_patch", + "tfg:mars/surface/pile_venus_sand" ], "#tfg:mars_sangnum_vegetal_decoration", "#tfg:mars_top_layer_modification" diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json index 7270976c9..60595a05e 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json @@ -46,7 +46,8 @@ "tfg:mars/semiheavy_ammoniacal_water", "tfg:mars/surface/small_skull_and_bones", "tfg:mars/surface/large_skull_and_bones", - "tfg:mars/surface/rotten_flesh_patch" + "tfg:mars/surface/rotten_flesh_patch", + "tfg:mars/surface/pile_venus_sand" ], "#tfg:mars_sangnum_vegetal_decoration", "#tfg:mars_top_layer_modification" diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/aeridium.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/aeridium.json index e933d24f0..bea04eca1 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/aeridium.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/aeridium.json @@ -24,9 +24,23 @@ "blocks": "minecraft:air" }, { - "type": "minecraft:matching_block_tag", - "offset": [0, -1, 0], - "tag": "tfg:mars_soil" + "type": "minecraft:any_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ 0, -1, 0 ], + "tag": "tfg:mars_soil" + }, + { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "tfc:rock/raw/basalt", + "tfc:rock/raw/gabbro", + "gtceu:red_granite" + ] + } + ] } ] } diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/bone_patch.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/bone_patch.json index 72cb47a47..2ce351fe3 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/bone_patch.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/bone_patch.json @@ -42,7 +42,7 @@ { "type": "minecraft:matching_block_tag", "offset": [ 0, -1, 0 ], - "tag": "tfg:mars_soil" + "tag": "ad_astra:mars_stone_replaceables" } ] } diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/clawfern.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/clawfern.json index 5ca0f4db3..a1f6fd07f 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/clawfern.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/clawfern.json @@ -24,9 +24,23 @@ "blocks": "minecraft:air" }, { - "type": "minecraft:matching_block_tag", - "offset": [ 0, -1, 0 ], - "tag": "tfg:mars_soil" + "type": "minecraft:any_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ 0, -1, 0 ], + "tag": "tfg:mars_soil" + }, + { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "tfc:rock/raw/basalt", + "tfc:rock/raw/gabbro", + "gtceu:red_granite" + ] + } + ] } ] } diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/feather_patch_glider.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/feather_patch_glider.json index d9fbac8a6..841d65adf 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/feather_patch_glider.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/feather_patch_glider.json @@ -8,7 +8,7 @@ "to_place": { "type": "minecraft:simple_state_provider", "state": { - "Name": "tfc:groundcover/glider_feather" + "Name": "tfg:groundcover/glider_feather" } } } diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/feather_patch_wraptor.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/feather_patch_wraptor.json index 88b8492c7..aea74225e 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/feather_patch_wraptor.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/feather_patch_wraptor.json @@ -8,7 +8,7 @@ "to_place": { "type": "minecraft:simple_state_provider", "state": { - "Name": "tfc:groundcover/wraptor_feather" + "Name": "tfg:groundcover/wraptor_feather" } } } diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/flammalix.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/flammalix.json index 7b5ba6122..5838ae8e7 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/flammalix.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/flammalix.json @@ -24,9 +24,23 @@ "blocks": "minecraft:air" }, { - "type": "minecraft:matching_block_tag", - "offset": [ 0, -1, 0 ], - "tag": "tfg:mars_soil" + "type": "minecraft:any_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ 0, -1, 0 ], + "tag": "tfg:mars_soil" + }, + { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "tfc:rock/raw/basalt", + "tfc:rock/raw/gabbro", + "gtceu:red_granite" + ] + } + ] } ] } diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/flint_patch.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/flint_patch.json new file mode 100644 index 000000000..df3462c4f --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/flint_patch.json @@ -0,0 +1,40 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfc:groundcover/flint" + } + } + } + }, + "placement": [ + { + "type": "minecraft: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": "ad_astra:mars_stone_replaceables" + } + ] + } + } + ] + }, + "tries": 12, + "xz_spread": 5, + "y_spread": 2 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/large_bone_patch.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/large_bone_patch.json index 4510527cd..08ed4ce14 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/large_bone_patch.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/large_bone_patch.json @@ -60,7 +60,7 @@ { "type": "minecraft:matching_block_tag", "offset": [ 0, -1, 0 ], - "tag": "tfg:mars_soil" + "tag": "ad_astra:mars_stone_replaceables" } ] } diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/pile_mars_sand.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/pile_mars_sand.json new file mode 100644 index 000000000..ee5b2bed5 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/pile_mars_sand.json @@ -0,0 +1,53 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:randomized_int_state_provider", + "property": "layers", + "values": { + "type": "minecraft:biased_to_bottom", + "value": { + "min_inclusive": 1, + "max_inclusive": 2 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfg:pile/mars_sand" + } + } + } + } + }, + "placement": [ + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:has_sturdy_face", + "offset": [ + 0, + -1, + 0 + ], + "direction": "up" + } + } + ] + }, + "tries": 16, + "xz_spread": 16, + "y_spread": 2 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/pile_red_sand.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/pile_red_sand.json new file mode 100644 index 000000000..7cb6438fc --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/pile_red_sand.json @@ -0,0 +1,53 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:randomized_int_state_provider", + "property": "layers", + "values": { + "type": "minecraft:biased_to_bottom", + "value": { + "min_inclusive": 1, + "max_inclusive": 2 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfg:pile/red_sand" + } + } + } + } + }, + "placement": [ + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:has_sturdy_face", + "offset": [ + 0, + -1, + 0 + ], + "direction": "up" + } + } + ] + }, + "tries": 8, + "xz_spread": 16, + "y_spread": 2 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/pile_venus_sand.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/pile_venus_sand.json new file mode 100644 index 000000000..051fcabb4 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/pile_venus_sand.json @@ -0,0 +1,53 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:randomized_int_state_provider", + "property": "layers", + "values": { + "type": "minecraft:biased_to_bottom", + "value": { + "min_inclusive": 1, + "max_inclusive": 2 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfg:pile/venus_sand" + } + } + } + } + }, + "placement": [ + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:has_sturdy_face", + "offset": [ + 0, + -1, + 0 + ], + "direction": "up" + } + } + ] + }, + "tries": 16, + "xz_spread": 16, + "y_spread": 2 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/rotten_flesh_patch.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/rotten_flesh_patch.json index 04d2c2fad..900577909 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/rotten_flesh_patch.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/rotten_flesh_patch.json @@ -37,7 +37,7 @@ { "type": "minecraft:matching_block_tag", "offset": [ 0, -1, 0 ], - "tag": "tfg:mars_soil" + "tag": "ad_astra:mars_stone_replaceables" } ] } diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/flint_patch.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/flint_patch.json new file mode 100644 index 000000000..674be83e2 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/flint_patch.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:mars/surface/flint_patch", + "placement": [ + { + "type": "minecraft:count", + "count": 1 + }, + { + "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/pile_mars_sand.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pile_mars_sand.json new file mode 100644 index 000000000..a670b969c --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pile_mars_sand.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:mars/surface/pile_mars_sand", + "placement": [ + { + "type": "minecraft:count", + "count": 3 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pile_red_sand.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pile_red_sand.json new file mode 100644 index 000000000..96619fec1 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pile_red_sand.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:mars/surface/pile_red_sand", + "placement": [ + { + "type": "minecraft:count", + "count": 3 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pile_venus_sand.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pile_venus_sand.json new file mode 100644 index 000000000..4568ba959 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pile_venus_sand.json @@ -0,0 +1,26 @@ +{ + "feature": "tfg:mars/surface/pile_venus_sand", + "placement": [ + { + "type": "minecraft:count", + "count": 3 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR" + }, + { + "type": "tfc:near_fluid", + "fluids": [ + "tfg:semiheavy_ammoniacal_water" + ], + "radius": 4 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pile_venus_sand_no_water.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pile_venus_sand_no_water.json new file mode 100644 index 000000000..820123395 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pile_venus_sand_no_water.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:mars/surface/pile_venus_sand", + "placement": [ + { + "type": "minecraft:count", + "count": 3 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR" + } + ] +} \ No newline at end of file diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index e72e48f80..59b484980 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -309,6 +309,13 @@ const registerAdAstraBlockTags = (event) => { event.remove('ad_astra:strophar_caps', 'ad_astra:strophar_cap') event.remove('ad_astra:aeronos_caps', 'ad_astra:aeronos_cap') + event.add('tfg:environment_not_sturdy', 'ad_astra:strophar_cap') + event.add('tfg:environment_not_sturdy', 'ad_astra:aeronos_cap') + event.add('tfg:environment_not_sturdy', 'minecraft:nether_wart_block') + event.add('tfg:environment_not_sturdy', 'minecraft:warped_wart_block') + event.add('tfg:environment_not_sturdy', 'species:alphacene_mushroom_block') + event.add('tfg:environment_not_sturdy', 'species:alphacene_moss_block') + global.AD_ASTRA_WOOD.forEach(wood => { if (wood.log) {