From bd0ebec8c1ae5d0fe0030cd6f02414f8c99ee6e2 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 13 May 2025 19:41:31 +0100 Subject: [PATCH] tweaks for moon spikes and warped vines, added asurine biome decoration --- .../biome/moon/lunar_asurine_dense.json | 6 +- .../biome/moon/lunar_asurine_sparse.json | 7 +- .../biome/moon/lunar_chorus_sparse.json | 2 +- .../biome/moon/lunar_corals_sparse.json | 2 +- .../biome/moon/lunar_lights_dense.json | 2 +- .../biome/moon/lunar_lights_sparse.json | 5 +- .../tfg/worldgen/biome/moon/lunar_plains.json | 2 +- .../moon/asurine/asurine.json | 7 ++ .../moon/asurine/asurine_decoration.json | 98 ++++++++++++++++ .../moon/asurine/asurine_geode.json | 108 ++++++++++++++++++ .../moon/asurine/asurine_spikes.json | 80 +++++++++++++ .../{blob/asurine.json => asurine/blob.json} | 0 .../placed_feature/moon/asurine/asurine.json | 16 +++ .../moon/asurine/asurine_decoration.json | 16 +++ .../moon/asurine/asurine_geode.json | 4 + .../moon/asurine/asurine_spikes.json | 19 +++ .../moon/asurine/blob_dense.json | 27 +++++ .../moon/asurine/blob_sparse.json | 27 +++++ .../placed_feature/moon/blob/asurine.json | 27 ----- .../moon/surface/dead_coral_blocks.json | 5 +- .../moon/surface/delta/moon_deepslate.json | 3 +- .../moon/surface/loose/moon_deepslate.json | 3 +- .../moon/surface/pile/moon_deepslate.json | 3 +- .../moon/surface/spike/andesite.json | 3 +- .../moon/surface/spike/basalt.json | 3 +- .../moon/surface/spike/dacite.json | 3 +- .../moon/surface/spike/diorite.json | 3 +- .../moon/surface/spike/gabbro.json | 3 +- .../moon/surface/spike/glacio_stone.json | 3 +- .../moon/surface/spike/moon_stone.json | 3 +- .../moon/surface/spike/rhyolite.json | 3 +- .../moon/surface/warped_vine_common.json | 19 +++ ...warped_vine.json => warped_vine_rare.json} | 2 +- 33 files changed, 453 insertions(+), 61 deletions(-) create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/asurine/asurine.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/asurine/asurine_decoration.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/asurine/asurine_geode.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/asurine/asurine_spikes.json rename kubejs/data/tfg/worldgen/configured_feature/moon/{blob/asurine.json => asurine/blob.json} (100%) create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/asurine/asurine.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/asurine/asurine_decoration.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/asurine/asurine_geode.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/asurine/asurine_spikes.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/asurine/blob_dense.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/asurine/blob_sparse.json delete mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/blob/asurine.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_vine_common.json rename kubejs/data/tfg/worldgen/placed_feature/moon/surface/{warped_vine.json => warped_vine_rare.json} (94%) diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json index a87bfa04e..f916840c4 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json @@ -23,7 +23,7 @@ [], [], [ - "tfg:moon/blob/asurine", + "tfg:moon/asurine/blob_dense", "tfg:earth/geode/amethyst", "tfg:earth/geode/barite", "tfg:earth/geode/calcite", @@ -42,7 +42,9 @@ [], "#tfg:moon_small_rock_features", [ - + "tfg:moon/surface/warped_sprouts_patch", + "tfg:moon/asurine/asurine_spikes", + "tfg:moon/asurine/asurine" ], [ "tfg:moon/hardening" diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json index c31ecb66b..c8113dabd 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json @@ -23,7 +23,7 @@ [], [], [ - "tfg:moon/blob/asurine", + "tfg:moon/asurine/blob_dense", "tfg:earth/geode/amethyst", "tfg:earth/geode/barite", "tfg:earth/geode/calcite", @@ -42,7 +42,10 @@ "#tfg:moon_large_rock_features", "#tfg:moon_small_rock_features", [ - "tfg:moon/surface/warped_sprouts_patch" + "tfg:moon/surface/dead_coral_fans", + "tfg:moon/surface/warped_sprouts_patch", + "tfg:moon/surface/warped_roots_patch", + "tfg:moon/asurine/asurine_spikes" ], [ "tfg:moon/hardening" diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json index e768bec2a..a168314ac 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json @@ -23,7 +23,6 @@ [], [], [ - "tfg:moon/blob/asurine", "tfg:earth/geode/amethyst", "tfg:earth/geode/barite", "tfg:earth/geode/calcite", @@ -42,6 +41,7 @@ "#tfg:moon_large_rock_features", "#tfg:moon_small_rock_features", [ + "tfg:moon/surface/dead_coral_fans", "tfg:moon/surface/warped_sprouts_patch", "tfg:moon/surface/warped_roots_patch", "tfg:moon/surface/chorus_plant_rare" diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json index 5316958a0..41aa0dfbe 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json @@ -23,7 +23,7 @@ [], [], [ - "tfg:moon/blob/asurine", + "tfg:moon/asurine/blob_sparse", "tfg:earth/geode/amethyst", "tfg:earth/geode/barite", "tfg:earth/geode/calcite", diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json index 191656f96..71f941597 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json @@ -43,7 +43,7 @@ [ "tfg:moon/surface/warped_sprouts_patch", "tfg:moon/surface/warped_roots_patch", - "tfg:moon/surface/warped_vine" + "tfg:moon/surface/warped_vine_common" ], [ "tfg:moon/hardening" diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json index dafbf26e9..e4f073500 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json @@ -23,7 +23,7 @@ [], [], [ - "tfg:moon/blob/asurine", + "tfg:moon/asurine/blob_sparse", "tfg:earth/geode/amethyst", "tfg:earth/geode/barite", "tfg:earth/geode/calcite", @@ -43,7 +43,8 @@ "#tfg:moon_small_rock_features", [ "tfg:moon/surface/warped_sprouts_patch", - "tfg:moon/surface/warped_roots_patch" + "tfg:moon/surface/warped_roots_patch", + "tfg:moon/surface/warped_vine_rare" ], [ "tfg:moon/hardening" diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json index dd7b6e452..ccf3a705a 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json @@ -23,7 +23,7 @@ [], [], [ - "tfg:moon/blob/asurine", + "tfg:moon/asurine/blob_sparse", "tfg:earth/geode/amethyst", "tfg:earth/geode/barite", "tfg:earth/geode/calcite", diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/asurine/asurine.json b/kubejs/data/tfg/worldgen/configured_feature/moon/asurine/asurine.json new file mode 100644 index 000000000..28d86e54a --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/asurine/asurine.json @@ -0,0 +1,7 @@ +{ + "type": "tfc:if_then", + "config": { + "if": "tfg:moon/asurine/asurine_geode", + "then": "tfg:moon/asurine/asurine_decoration" + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/asurine/asurine_decoration.json b/kubejs/data/tfg/worldgen/configured_feature/moon/asurine/asurine_decoration.json new file mode 100644 index 000000000..792c80887 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/asurine/asurine_decoration.json @@ -0,0 +1,98 @@ +{ + "type": "minecraft:random_selector", + "config": { + "default": { + "feature": { + "type": "minecraft:no_op", + "config": {} + }, + "placement": [] + }, + "features": [ + { + "chance": 0.4, + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ae2:small_quartz_bud", + "Properties": { + "facing": "up", + "waterlogged": "false" + } + } + } + } + }, + "placement": [] + } + }, + { + "chance": 0.3, + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ae2:medium_quartz_bud", + "Properties": { + "facing": "up", + "waterlogged": "false" + } + } + } + } + }, + "placement": [] + } + }, + { + "chance": 0.2, + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ae2:large_quartz_bud", + "Properties": { + "facing": "up", + "waterlogged": "false" + } + } + } + } + }, + "placement": [] + } + }, + { + "chance": 0.1, + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ae2:quartz_cluster", + "Properties": { + "facing": "up", + "waterlogged": "false" + } + } + } + } + }, + "placement": [] + } + } + ] + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/asurine/asurine_geode.json b/kubejs/data/tfg/worldgen/configured_feature/moon/asurine/asurine_geode.json new file mode 100644 index 000000000..04cc4076b --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/asurine/asurine_geode.json @@ -0,0 +1,108 @@ +{ + "type": "minecraft:geode", + "config": { + "blocks": { + "filling_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:air" + } + }, + "inner_layer_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ae2:quartz_block" + } + }, + "alternate_inner_layer_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ae2:damaged_budding_quartz" + } + }, + "middle_layer_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "gtceu:moon_stone_certus_quartz_ore" + } + }, + "outer_layer_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "create:cut_asurine" + } + }, + "inner_placements": [ + { + "Name": "ae2:small_quartz_bud", + "Properties": { + "facing": "up", + "waterlogged": "false" + } + }, + { + "Name": "ae2:medium_quartz_bud", + "Properties": { + "facing": "up", + "waterlogged": "false" + } + }, + { + "Name": "ae2:large_quartz_bud", + "Properties": { + "facing": "up", + "waterlogged": "false" + } + }, + { + "Name": "ae2:quartz_cluster", + "Properties": { + "facing": "up", + "waterlogged": "false" + } + } + ], + "cannot_replace": "#minecraft:features_cannot_replace", + "invalid_blocks": "#minecraft:geode_invalid_blocks" + }, + "crack": { + "base_crack_size": 2, + "crack_point_offset": 2, + "generate_crack_chance": 0.1 + }, + "distribution_points": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 4, + "min_inclusive": 3 + } + }, + "invalid_blocks_threshold": 1, + "layers": { + "filling": 1.7, + "inner_layer": 2.2, + "middle_layer": 3.2, + "outer_layer": 4.5 + }, + "max_gen_offset": 24, + "min_gen_offset": -24, + "noise_multiplier": 0.05, + "outer_wall_distance": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 6, + "min_inclusive": 4 + } + }, + "placements_require_layer0_alternate": true, + "point_offset": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 2, + "min_inclusive": 1 + } + }, + "use_alternate_layer0_chance": 0.083, + "use_potential_placements_chance": 0.35 + } +} diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/asurine/asurine_spikes.json b/kubejs/data/tfg/worldgen/configured_feature/moon/asurine/asurine_spikes.json new file mode 100644 index 000000000..02f263290 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/asurine/asurine_spikes.json @@ -0,0 +1,80 @@ +{ + "type": "minecraft:vegetation_patch", + "config": { + "depth": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 2, + "min_inclusive": 1 + } + }, + "extra_bottom_block_chance": 0, + "extra_edge_column_chance": 0.2, + "ground_state": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "create:asurine" + } + }, + "replaceable": "#ad_astra:moon_stone_replaceables", + "surface": "floor", + "vegetation_chance": 0.4, + "vegetation_feature": { + "feature": { + "type": "minecraft:block_column", + "config": { + "allowed_placement": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction": "up", + "layers": [ + { + "height": { + "type": "minecraft:weighted_list", + "distribution": [ + { + "data": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 3, + "min_inclusive": 0 + } + }, + "weight": 5 + }, + { + "data": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 7, + "min_inclusive": 1 + } + }, + "weight": 1 + } + ] + }, + "provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "create:asurine" + } + } + } + ], + "prioritize_tip": true + } + }, + "placement": [] + }, + "vertical_range": 5, + "xz_radius": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 2, + "min_inclusive": 1 + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/blob/asurine.json b/kubejs/data/tfg/worldgen/configured_feature/moon/asurine/blob.json similarity index 100% rename from kubejs/data/tfg/worldgen/configured_feature/moon/blob/asurine.json rename to kubejs/data/tfg/worldgen/configured_feature/moon/asurine/blob.json diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/asurine/asurine.json b/kubejs/data/tfg/worldgen/placed_feature/moon/asurine/asurine.json new file mode 100644 index 000000000..39fae484f --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/asurine/asurine.json @@ -0,0 +1,16 @@ +{ + "feature": "tfg:moon/asurine/asurine", + "placement": [ + { + "type": "minecraft:count", + "count": 2 + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/asurine/asurine_decoration.json b/kubejs/data/tfg/worldgen/placed_feature/moon/asurine/asurine_decoration.json new file mode 100644 index 000000000..836742d79 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/asurine/asurine_decoration.json @@ -0,0 +1,16 @@ +{ + "feature": "tfg:moon/asurine/asurine_decoration", + "placement": [ + { + "type": "minecraft:count", + "count": 30 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/asurine/asurine_geode.json b/kubejs/data/tfg/worldgen/placed_feature/moon/asurine/asurine_geode.json new file mode 100644 index 000000000..132280eca --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/asurine/asurine_geode.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:moon/asurine/asurine_geode", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/asurine/asurine_spikes.json b/kubejs/data/tfg/worldgen/placed_feature/moon/asurine/asurine_spikes.json new file mode 100644 index 000000000..293c63b07 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/asurine/asurine_spikes.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:moon/asurine/asurine_spikes", + "placement": [ + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:rarity_filter", + "chance": 2 + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/asurine/blob_dense.json b/kubejs/data/tfg/worldgen/placed_feature/moon/asurine/blob_dense.json new file mode 100644 index 000000000..edacee72f --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/asurine/blob_dense.json @@ -0,0 +1,27 @@ +{ + "feature": "tfg:moon/asurine/blob", + "placement": [ + { + "type": "minecraft:count", + "count": 6 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:trapezoid", + "max_inclusive": { + "absolute": 210 + }, + "min_inclusive": { + "absolute": -64 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/asurine/blob_sparse.json b/kubejs/data/tfg/worldgen/placed_feature/moon/asurine/blob_sparse.json new file mode 100644 index 000000000..2c91be390 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/asurine/blob_sparse.json @@ -0,0 +1,27 @@ +{ + "feature": "tfg:moon/asurine/blob", + "placement": [ + { + "type": "minecraft:count", + "count": 2 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:trapezoid", + "max_inclusive": { + "absolute": 210 + }, + "min_inclusive": { + "absolute": -64 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/blob/asurine.json b/kubejs/data/tfg/worldgen/placed_feature/moon/blob/asurine.json deleted file mode 100644 index 70b1a47ca..000000000 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/blob/asurine.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "feature": "tfg:moon/blob/asurine", - "placement": [ - { - "type": "minecraft:count", - "count": 5 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:height_range", - "height": { - "type": "minecraft:trapezoid", - "max_inclusive": { - "absolute": 210 - }, - "min_inclusive": { - "absolute": -64 - } - } - }, - { - "type": "minecraft:biome" - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/dead_coral_blocks.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/dead_coral_blocks.json index 04bd5e70f..1124ba40f 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/dead_coral_blocks.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/dead_coral_blocks.json @@ -2,15 +2,12 @@ "feature": "tfg:moon/surface/dead_coral_blocks", "placement": [ { - "type": "minecraft:biome" + "type": "minecraft:in_square" }, { "type": "minecraft:rarity_filter", "chance": 1 }, - { - "type": "minecraft:in_square" - }, { "type": "minecraft:heightmap", "heightmap": "MOTION_BLOCKING" diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/moon_deepslate.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/moon_deepslate.json index 4c66c82ad..6a0dc3a13 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/moon_deepslate.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/delta/moon_deepslate.json @@ -19,7 +19,8 @@ "offset": [ 0, -1, 0 ], "blocks": [ "ad_astra:moon_deepslate", - "tfg:rock/hardened_moon_deepslate" + "tfg:rock/hardened_moon_deepslate", + "tfc:sand/black" ] } } diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/moon_deepslate.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/moon_deepslate.json index f9ba19b5f..3691966a0 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/moon_deepslate.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/loose/moon_deepslate.json @@ -19,7 +19,8 @@ "offset": [ 0, -1, 0 ], "blocks": [ "ad_astra:moon_deepslate", - "tfg:rock/hardened_moon_deepslate" + "tfg:rock/hardened_moon_deepslate", + "tfc:sand/black" ] } }, diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/moon_deepslate.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/moon_deepslate.json index 59f5b2038..b3c090de8 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/moon_deepslate.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile/moon_deepslate.json @@ -19,7 +19,8 @@ "offset": [ 0, -1, 0 ], "blocks": [ "ad_astra:moon_deepslate", - "tfg:rock/hardened_moon_deepslate" + "tfg:rock/hardened_moon_deepslate", + "tfc:sand/black" ] } }, diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/andesite.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/andesite.json index ab50caefa..1cac464a6 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/andesite.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/andesite.json @@ -38,8 +38,7 @@ "type": "minecraft:matching_blocks", "blocks": [ "tfc:rock/raw/andesite", - "tfc:rock/hardened/andesite", - "tfc:rock/gravel/andesite" + "tfc:rock/hardened/andesite" ] } } diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/basalt.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/basalt.json index d27df603b..5ca0a75d3 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/basalt.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/basalt.json @@ -38,8 +38,7 @@ "type": "minecraft:matching_blocks", "blocks": [ "tfc:rock/raw/basalt", - "tfc:rock/hardened/basalt", - "tfc:rock/gravel/basalt" + "tfc:rock/hardened/basalt" ] } } diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/dacite.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/dacite.json index b92e2302f..ef4a72d6f 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/dacite.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/dacite.json @@ -38,8 +38,7 @@ "type": "minecraft:matching_blocks", "blocks": [ "tfc:rock/raw/dacite", - "tfc:rock/hardened/dacite", - "tfc:rock/gravel/dacite" + "tfc:rock/hardened/dacite" ] } } diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/diorite.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/diorite.json index 049e90e95..255743baa 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/diorite.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/diorite.json @@ -38,8 +38,7 @@ "type": "minecraft:matching_blocks", "blocks": [ "tfc:rock/raw/diorite", - "tfc:rock/hardened/diorite", - "tfc:rock/gravel/diorite" + "tfc:rock/hardened/diorite" ] } } diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/gabbro.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/gabbro.json index eeaab7264..18b100266 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/gabbro.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/gabbro.json @@ -38,8 +38,7 @@ "type": "minecraft:matching_blocks", "blocks": [ "tfc:rock/raw/gabbro", - "tfc:rock/hardened/gabbro", - "tfc:rock/gravel/gabbro" + "tfc:rock/hardened/gabbro" ] } } diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/glacio_stone.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/glacio_stone.json index d379f24ff..1b1957d8b 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/glacio_stone.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/glacio_stone.json @@ -38,8 +38,7 @@ "type": "minecraft:matching_blocks", "blocks": [ "ad_astra:glacio_stone", - "tfg:rock/hardened_glacio_stone", - "ad_astra:glacio_cobblestone" + "tfg:rock/hardened_glacio_stone" ] } } diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/moon_stone.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/moon_stone.json index 9846ad356..a7b5976dc 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/moon_stone.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/moon_stone.json @@ -38,8 +38,7 @@ "type": "minecraft:matching_blocks", "blocks": [ "ad_astra:moon_stone", - "tfg:rock/hardened_moon_stone", - "ad_astra:moon_sand" + "tfg:rock/hardened_moon_stone" ] } } diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/rhyolite.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/rhyolite.json index 2a9decc49..698cd3234 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/rhyolite.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/spike/rhyolite.json @@ -38,8 +38,7 @@ "type": "minecraft:matching_blocks", "blocks": [ "tfc:rock/raw/rhyolite", - "tfc:rock/hardened/rhyolite", - "tfc:rock/gravel/rhyolite" + "tfc:rock/hardened/rhyolite" ] } } diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_vine_common.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_vine_common.json new file mode 100644 index 000000000..771091545 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_vine_common.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:moon/surface/warped_vine", + "placement": [ + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:count", + "count": 3 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_vine.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_vine_rare.json similarity index 94% rename from kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_vine.json rename to kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_vine_rare.json index 0d4730331..ebbca0ab5 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_vine.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_vine_rare.json @@ -6,7 +6,7 @@ }, { "type": "minecraft:rarity_filter", - "chance": 1 + "chance": 2 }, { "type": "minecraft:in_square"