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 fd847e575..9e0367583 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json @@ -39,7 +39,10 @@ "tfg:mars/terrain/spice_disc", "tfg:mars/terrain/red_quicksand" ], - [], + [ + "tfg:mars/surface/small_skull_and_bones", + "tfg:mars/surface/large_skull_and_bones" + ], [ ], 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 f52a6a05e..0a4276160 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json @@ -40,7 +40,9 @@ "tfc:raw_boulder", "tfc:cobble_boulder", "tfc:raw_boulder_small_patch", - "tfc:cobble_boulder_small_patch" + "tfc:cobble_boulder_small_patch", + "tfg:mars/surface/small_skull_and_bones", + "tfg:mars/surface/large_skull_and_bones" ], [ diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json index 56e96bc63..9df6ba899 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json @@ -40,7 +40,9 @@ ], [ "tfc:raw_boulder_small_patch", - "tfc:cobble_boulder_small_patch" + "tfc:cobble_boulder_small_patch", + "tfg:mars/surface/small_skull_and_bones", + "tfg:mars/surface/large_skull_and_bones" ], [ 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 new file mode 100644 index 000000000..587cb5c1e --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/bone_patch.json @@ -0,0 +1,56 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:weighted_state_provider", + "entries": [ + { + "data": { + "Name": "tfc:groundcover/bone" + }, + "weight": 60 + }, + { + "data": { + "Name": "species:bone_spike", + "Properties": { + "thickness": "tip", + "vertical_direction": "up", + "waterlogged": "false" + } + }, + "weight": 40 + } + ] + } + } + }, + "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": "tfg:mars_soil" + } + ] + } + } + ] + }, + "tries": 8, + "xz_spread": 4, + "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 new file mode 100644 index 000000000..53912fd0a --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/large_bone_patch.json @@ -0,0 +1,74 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:weighted_state_provider", + "entries": [ + { + "data": { + "Name": "tfc:groundcover/bone" + }, + "weight": 40 + }, + { + "data": { + "Name": "minecraft:bone_block", + "Properties": { + "axis": "y" + } + }, + "weight": 20 + }, + { + "data": { + "Name": "species:bone_vertebra", + "Properties": { + "axis": "y" + } + }, + "weight": 20 + }, + { + "data": { + "Name": "species:bone_spike", + "Properties": { + "thickness": "tip", + "vertical_direction": "up", + "waterlogged": "false" + } + }, + "weight": 40 + } + ] + } + } + }, + "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": "tfg:mars_soil" + } + ] + } + } + ] + }, + "tries": 32, + "xz_spread": 10, + "y_spread": 2 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/large_skull.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/large_skull.json new file mode 100644 index 000000000..e8cc3b028 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/large_skull.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:simple_random_selector", + "config": { + "features": [ + { + "feature": "tfg:mars/surface/skulls/walker", + "placement": [] + }, + { + "feature": "tfg:mars/surface/skulls/eater", + "placement": [] + }, + { + "feature": "tfg:mars/surface/skulls/charger", + "placement": [] + } + ] + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/charger.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/charger.json new file mode 100644 index 000000000..a550e8198 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/charger.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:randomized_int_state_provider", + "property": "rotation", + "values": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 0, + "max_inclusive": 15 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "wan_ancient_beasts:charger_skull" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/crusher.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/crusher.json new file mode 100644 index 000000000..2bd27ecc1 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/crusher.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:randomized_int_state_provider", + "property": "rotation", + "values": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 0, + "max_inclusive": 15 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "wan_ancient_beasts:crusher_skull" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/eater.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/eater.json new file mode 100644 index 000000000..dad211431 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/eater.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:randomized_int_state_provider", + "property": "rotation", + "values": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 0, + "max_inclusive": 15 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "wan_ancient_beasts:eater_skull" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/glider.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/glider.json new file mode 100644 index 000000000..1677e2538 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/glider.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:randomized_int_state_provider", + "property": "rotation", + "values": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 0, + "max_inclusive": 15 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "wan_ancient_beasts:glider_skull" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/sniffer.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/sniffer.json new file mode 100644 index 000000000..a37afa288 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/sniffer.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:randomized_int_state_provider", + "property": "rotation", + "values": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 0, + "max_inclusive": 15 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "wan_ancient_beasts:sniffer_skull" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/soarer.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/soarer.json new file mode 100644 index 000000000..94c12da11 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/soarer.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:randomized_int_state_provider", + "property": "rotation", + "values": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 0, + "max_inclusive": 15 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "wan_ancient_beasts:soarer_skull" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/surfer.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/surfer.json new file mode 100644 index 000000000..99045c5f4 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/surfer.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:randomized_int_state_provider", + "property": "rotation", + "values": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 0, + "max_inclusive": 15 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "wan_ancient_beasts:surfer_skull" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/tiny.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/tiny.json new file mode 100644 index 000000000..800f2b41c --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/tiny.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:randomized_int_state_provider", + "property": "rotation", + "values": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 0, + "max_inclusive": 15 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "endermanoverhaul:tiny_skull" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/walker.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/walker.json new file mode 100644 index 000000000..a794d4fb5 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/skulls/walker.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:randomized_int_state_provider", + "property": "rotation", + "values": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 0, + "max_inclusive": 15 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "wan_ancient_beasts:walker_skull" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/small_skull.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/small_skull.json new file mode 100644 index 000000000..f413a15cf --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/small_skull.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:simple_random_selector", + "config": { + "features": [ + { + "feature": "tfg:mars/surface/skulls/crusher", + "placement": [] + }, + { + "feature": "tfg:mars/surface/skulls/glider", + "placement": [] + }, + { + "feature": "tfg:mars/surface/skulls/soarer", + "placement": [] + }, + { + "feature": "tfg:mars/surface/skulls/surfer", + "placement": [] + }, + { + "feature": "tfg:mars/surface/skulls/tiny", + "placement": [] + } + ] + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/large_skull_and_bones.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/large_skull_and_bones.json new file mode 100644 index 000000000..4ecfb4be3 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/large_skull_and_bones.json @@ -0,0 +1,31 @@ +{ + "feature": { + "type": "tfc:if_then", + "config": { + "if": { + "feature": "tfg:mars/surface/large_skull", + "placement": [] + }, + "then": { + "feature": "tfg:mars/surface/large_bone_patch", + "placement": [] + } + } + }, + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 80 + }, + { + "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/small_skull_and_bones.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/small_skull_and_bones.json new file mode 100644 index 000000000..9c17e8038 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/small_skull_and_bones.json @@ -0,0 +1,31 @@ +{ + "feature": { + "type": "tfc:if_then", + "config": { + "if": { + "feature": "tfg:mars/surface/small_skull", + "placement": [] + }, + "then": { + "feature": "tfg:mars/surface/bone_patch", + "placement": [] + } + } + }, + "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