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 62a67e208..31f6e1288 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json @@ -34,11 +34,12 @@ "#tfg:mars_underground_decoration", [ "tfg:mars/surface/small_skull_and_bones", - "tfg:mars/surface/large_skull_and_bones" - ], - [ - + "tfg:mars/surface/large_skull_and_bones", + "tfg:mars/surface/pile_hematitic_sand", + "tfg:mars/surface/pile_red_sand", + "tfg:mars/surface/pile_mars_sand" ], + [], [ "tfg:glow_lichen", "tfg:mars/terrain/mars_poles" diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json index 2359b826f..d51fb49f4 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json @@ -35,7 +35,10 @@ "tfc:raw_boulder_small_patch", "tfc:cobble_boulder_small_patch", "tfg:mars/surface/small_skull_and_bones", - "tfg:mars/surface/large_skull_and_bones" + "tfg:mars/surface/large_skull_and_bones", + "tfg:mars/surface/pile_hematitic_sand", + "tfg:mars/surface/pile_red_sand", + "tfg:mars/surface/pile_mars_sand" ], [ "tfg:mars/surface/selagine" diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/pile_hematitic_sand.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/pile_hematitic_sand.json new file mode 100644 index 000000000..ee38d552f --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/pile_hematitic_sand.json @@ -0,0 +1,55 @@ +{ + "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/hematitic_sand" + } + } + } + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR" + }, + { + "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": "forge:sand" + } + ] + } + } + ] + }, + "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_mars_sand.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/pile_mars_sand.json index 3453d126b..b6611d55d 100644 --- 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 @@ -32,20 +32,18 @@ { "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" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + { + "type": "minecraft:matching_block_tag", + "offset": [ 0, -1, 0 ], + "tag": "forge:sand" + } + ] } } ] 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 index f3c1886a7..77e33b33f 100644 --- 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 @@ -32,20 +32,18 @@ { "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" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + { + "type": "minecraft:matching_block_tag", + "offset": [ 0, -1, 0 ], + "tag": "forge:sand" + } + ] } } ] diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pile_hematitic_sand.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pile_hematitic_sand.json new file mode 100644 index 000000000..443b76c8b --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pile_hematitic_sand.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:mars/surface/pile_hematitic_sand", + "placement": [ + { + "type": "minecraft:count", + "count": 2 + }, + { + "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_mars_sand.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pile_mars_sand.json index a670b969c..13823153d 100644 --- 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 @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 3 + "count": 2 }, { "type": "minecraft:in_square" 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 index 96619fec1..30581cfa8 100644 --- 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 @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 3 + "count": 2 }, { "type": "minecraft:in_square" 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 index 820123395..16f3faf50 100644 --- 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 @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 3 + "count": 2 }, { "type": "minecraft:in_square"