From acd98975ee8626afdcac5e64dce0b34b57d79614 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 13 May 2025 21:12:59 +0100 Subject: [PATCH] never mind, those craters looked bad --- .../biome/moon/lunar_asurine_dense.json | 2 +- .../biome/moon/lunar_asurine_sparse.json | 2 +- .../biome/moon/lunar_chorus_sparse.json | 2 +- .../biome/moon/lunar_corals_dense.json | 2 +- .../biome/moon/lunar_corals_sparse.json | 2 +- .../biome/moon/lunar_lights_dense.json | 2 +- .../biome/moon/lunar_lights_sparse.json | 2 +- .../tfg/worldgen/biome/moon/lunar_plains.json | 2 +- .../moon/crater/extra_large.json | 83 ------------------- .../moon/crater/extra_small.json | 83 ------------------- .../configured_feature/moon/crater/large.json | 83 ------------------- .../moon/crater/medium.json | 83 ------------------- .../configured_feature/moon/crater/small.json | 83 ------------------- .../moon/crater/extra_large.json | 18 ---- .../moon/crater/extra_small.json | 13 --- .../placed_feature/moon/crater/large.json | 18 ---- .../placed_feature/moon/crater/medium.json | 18 ---- .../placed_feature/moon/crater/small.json | 18 ---- kubejs/server_scripts/ad_astra/tags.js | 6 -- 19 files changed, 8 insertions(+), 514 deletions(-) delete mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/crater/extra_large.json delete mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/crater/extra_small.json delete mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/crater/large.json delete mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/crater/medium.json delete mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/crater/small.json delete mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/crater/extra_large.json delete mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/crater/extra_small.json delete mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/crater/large.json delete mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/crater/medium.json delete mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/crater/small.json 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 47c00416f..63bed05d7 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json @@ -21,7 +21,7 @@ }, "features": [ [], - "#tfg:moon_craters", + [], [ "tfg:moon/asurine/blob_dense", "tfg:earth/geode/amethyst", 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 f438403d1..c8113dabd 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json @@ -21,7 +21,7 @@ }, "features": [ [], - "#tfg:moon_craters", + [], [ "tfg:moon/asurine/blob_dense", "tfg:earth/geode/amethyst", 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 4c35f3d2f..a168314ac 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json @@ -21,7 +21,7 @@ }, "features": [ [], - "#tfg:moon_craters", + [], [ "tfg:earth/geode/amethyst", "tfg:earth/geode/barite", diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json index 8091a9f89..4559a072c 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json @@ -21,7 +21,7 @@ }, "features": [ [], - "#tfg:moon_craters", + [], [ "tfg:earth/geode/amethyst", "tfg:earth/geode/barite", 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 6b75ee0b4..41aa0dfbe 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json @@ -21,7 +21,7 @@ }, "features": [ [], - "#tfg:moon_craters", + [], [ "tfg:moon/asurine/blob_sparse", "tfg:earth/geode/amethyst", 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 507fa2074..71f941597 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json @@ -21,7 +21,7 @@ }, "features": [ [], - "#tfg:moon_craters", + [], [ "tfg:earth/geode/amethyst", "tfg:earth/geode/barite", 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 05f7745fa..e4f073500 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json @@ -21,7 +21,7 @@ }, "features": [ [], - "#tfg:moon_craters", + [], [ "tfg:moon/asurine/blob_sparse", "tfg:earth/geode/amethyst", diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json index afc91da7d..ccf3a705a 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json @@ -21,7 +21,7 @@ }, "features": [ [], - "#tfg:moon_craters", + [], [ "tfg:moon/asurine/blob_sparse", "tfg:earth/geode/amethyst", diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/crater/extra_large.json b/kubejs/data/tfg/worldgen/configured_feature/moon/crater/extra_large.json deleted file mode 100644 index bb1eec9b2..000000000 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/crater/extra_large.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "type": "minecraft:geode", - "config": { - "blocks": { - "alternate_inner_layer_provider": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "minecraft:air" - } - }, - "cannot_replace": "#minecraft:features_cannot_replace", - "filling_provider": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "minecraft:air" - } - }, - "inner_layer_provider": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "minecraft:air" - } - }, - "inner_placements": [ - { - "Name": "minecraft:air" - } - ], - "invalid_blocks": "#minecraft:geode_invalid_blocks", - "middle_layer_provider": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "minecraft:air" - } - }, - "outer_layer_provider": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "minecraft:air" - } - } - }, - "crack": { - "base_crack_size": 0, - "crack_point_offset": 0, - "generate_crack_chance": 0 - }, - "distribution_points": { - "type": "minecraft:uniform", - "value": { - "max_inclusive": 4, - "min_inclusive": 3 - } - }, - "invalid_blocks_threshold": 1, - "layers": { - "filling": 0.01, - "inner_layer": 0.01, - "middle_layer": 0.01, - "outer_layer": 25 - }, - "max_gen_offset": 32, - "min_gen_offset": -32, - "noise_multiplier": 0, - "outer_wall_distance": { - "type": "minecraft:uniform", - "value": { - "max_inclusive": 6, - "min_inclusive": 4 - } - }, - "placements_require_layer0_alternate": false, - "point_offset": { - "type": "minecraft:uniform", - "value": { - "max_inclusive": 2, - "min_inclusive": 1 - } - }, - "use_alternate_layer0_chance": 0, - "use_potential_placements_chance": 0 - } -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/crater/extra_small.json b/kubejs/data/tfg/worldgen/configured_feature/moon/crater/extra_small.json deleted file mode 100644 index 6fae055ee..000000000 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/crater/extra_small.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "type": "minecraft:geode", - "config": { - "blocks": { - "alternate_inner_layer_provider": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "minecraft:air" - } - }, - "cannot_replace": "#minecraft:features_cannot_replace", - "filling_provider": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "minecraft:air" - } - }, - "inner_layer_provider": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "minecraft:air" - } - }, - "inner_placements": [ - { - "Name": "minecraft:air" - } - ], - "invalid_blocks": "#minecraft:geode_invalid_blocks", - "middle_layer_provider": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "minecraft:air" - } - }, - "outer_layer_provider": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "minecraft:air" - } - } - }, - "crack": { - "base_crack_size": 0, - "crack_point_offset": 0, - "generate_crack_chance": 0 - }, - "distribution_points": { - "type": "minecraft:uniform", - "value": { - "max_inclusive": 4, - "min_inclusive": 3 - } - }, - "invalid_blocks_threshold": 1, - "layers": { - "filling": 0.01, - "inner_layer": 0.01, - "middle_layer": 0.01, - "outer_layer": 5 - }, - "max_gen_offset": 16, - "min_gen_offset": -16, - "noise_multiplier": 0, - "outer_wall_distance": { - "type": "minecraft:uniform", - "value": { - "max_inclusive": 6, - "min_inclusive": 4 - } - }, - "placements_require_layer0_alternate": false, - "point_offset": { - "type": "minecraft:uniform", - "value": { - "max_inclusive": 2, - "min_inclusive": 1 - } - }, - "use_alternate_layer0_chance": 0, - "use_potential_placements_chance": 0 - } -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/crater/large.json b/kubejs/data/tfg/worldgen/configured_feature/moon/crater/large.json deleted file mode 100644 index b00d38f32..000000000 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/crater/large.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "type": "minecraft:geode", - "config": { - "blocks": { - "alternate_inner_layer_provider": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "minecraft:air" - } - }, - "cannot_replace": "#minecraft:features_cannot_replace", - "filling_provider": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "minecraft:air" - } - }, - "inner_layer_provider": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "minecraft:air" - } - }, - "inner_placements": [ - { - "Name": "minecraft:air" - } - ], - "invalid_blocks": "#minecraft:geode_invalid_blocks", - "middle_layer_provider": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "minecraft:air" - } - }, - "outer_layer_provider": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "minecraft:air" - } - } - }, - "crack": { - "base_crack_size": 0, - "crack_point_offset": 0, - "generate_crack_chance": 0 - }, - "distribution_points": { - "type": "minecraft:uniform", - "value": { - "max_inclusive": 4, - "min_inclusive": 3 - } - }, - "invalid_blocks_threshold": 1, - "layers": { - "filling": 0.01, - "inner_layer": 0.01, - "middle_layer": 0.01, - "outer_layer": 20 - }, - "max_gen_offset": 32, - "min_gen_offset": -32, - "noise_multiplier": 0, - "outer_wall_distance": { - "type": "minecraft:uniform", - "value": { - "max_inclusive": 6, - "min_inclusive": 4 - } - }, - "placements_require_layer0_alternate": false, - "point_offset": { - "type": "minecraft:uniform", - "value": { - "max_inclusive": 2, - "min_inclusive": 1 - } - }, - "use_alternate_layer0_chance": 0, - "use_potential_placements_chance": 0 - } -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/crater/medium.json b/kubejs/data/tfg/worldgen/configured_feature/moon/crater/medium.json deleted file mode 100644 index f6fa83a67..000000000 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/crater/medium.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "type": "minecraft:geode", - "config": { - "blocks": { - "alternate_inner_layer_provider": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "minecraft:air" - } - }, - "cannot_replace": "#minecraft:features_cannot_replace", - "filling_provider": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "minecraft:air" - } - }, - "inner_layer_provider": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "minecraft:air" - } - }, - "inner_placements": [ - { - "Name": "minecraft:air" - } - ], - "invalid_blocks": "#minecraft:geode_invalid_blocks", - "middle_layer_provider": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "minecraft:air" - } - }, - "outer_layer_provider": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "minecraft:air" - } - } - }, - "crack": { - "base_crack_size": 0, - "crack_point_offset": 0, - "generate_crack_chance": 0 - }, - "distribution_points": { - "type": "minecraft:uniform", - "value": { - "max_inclusive": 4, - "min_inclusive": 3 - } - }, - "invalid_blocks_threshold": 1, - "layers": { - "filling": 0.01, - "inner_layer": 0.01, - "middle_layer": 0.01, - "outer_layer": 15 - }, - "max_gen_offset": 24, - "min_gen_offset": -24, - "noise_multiplier": 0, - "outer_wall_distance": { - "type": "minecraft:uniform", - "value": { - "max_inclusive": 6, - "min_inclusive": 4 - } - }, - "placements_require_layer0_alternate": false, - "point_offset": { - "type": "minecraft:uniform", - "value": { - "max_inclusive": 2, - "min_inclusive": 1 - } - }, - "use_alternate_layer0_chance": 0, - "use_potential_placements_chance": 0 - } -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/crater/small.json b/kubejs/data/tfg/worldgen/configured_feature/moon/crater/small.json deleted file mode 100644 index 6431c78cd..000000000 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/crater/small.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "type": "minecraft:geode", - "config": { - "blocks": { - "alternate_inner_layer_provider": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "minecraft:air" - } - }, - "cannot_replace": "#minecraft:features_cannot_replace", - "filling_provider": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "minecraft:air" - } - }, - "inner_layer_provider": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "minecraft:air" - } - }, - "inner_placements": [ - { - "Name": "minecraft:air" - } - ], - "invalid_blocks": "#minecraft:geode_invalid_blocks", - "middle_layer_provider": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "minecraft:air" - } - }, - "outer_layer_provider": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "minecraft:air" - } - } - }, - "crack": { - "base_crack_size": 0, - "crack_point_offset": 0, - "generate_crack_chance": 0 - }, - "distribution_points": { - "type": "minecraft:uniform", - "value": { - "max_inclusive": 4, - "min_inclusive": 3 - } - }, - "invalid_blocks_threshold": 1, - "layers": { - "filling": 0.01, - "inner_layer": 0.01, - "middle_layer": 0.01, - "outer_layer": 10 - }, - "max_gen_offset": 16, - "min_gen_offset": -16, - "noise_multiplier": 0, - "outer_wall_distance": { - "type": "minecraft:uniform", - "value": { - "max_inclusive": 6, - "min_inclusive": 4 - } - }, - "placements_require_layer0_alternate": false, - "point_offset": { - "type": "minecraft:uniform", - "value": { - "max_inclusive": 2, - "min_inclusive": 1 - } - }, - "use_alternate_layer0_chance": 0, - "use_potential_placements_chance": 0 - } -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/crater/extra_large.json b/kubejs/data/tfg/worldgen/placed_feature/moon/crater/extra_large.json deleted file mode 100644 index 0de411562..000000000 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/crater/extra_large.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "feature": "tfg:moon/crater/extra_large", - "placement": [ - { - "type": "minecraft:count", - "count": 1 - }, - { - "type": "minecraft:heightmap", - "heightmap": "WORLD_SURFACE_WG" - }, - { - "type": "minecraft:random_offset", - "xz_spread": 0, - "y_spread": 12 - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/crater/extra_small.json b/kubejs/data/tfg/worldgen/placed_feature/moon/crater/extra_small.json deleted file mode 100644 index 696a7b95d..000000000 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/crater/extra_small.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "feature": "tfg:moon/crater/extra_small", - "placement": [ - { - "type": "minecraft:count", - "count": 1 - }, - { - "type": "minecraft:heightmap", - "heightmap": "WORLD_SURFACE_WG" - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/crater/large.json b/kubejs/data/tfg/worldgen/placed_feature/moon/crater/large.json deleted file mode 100644 index 1c5534369..000000000 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/crater/large.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "feature": "tfg:moon/crater/large", - "placement": [ - { - "type": "minecraft:count", - "count": 1 - }, - { - "type": "minecraft:heightmap", - "heightmap": "WORLD_SURFACE_WG" - }, - { - "type": "minecraft:random_offset", - "xz_spread": 0, - "y_spread": 7 - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/crater/medium.json b/kubejs/data/tfg/worldgen/placed_feature/moon/crater/medium.json deleted file mode 100644 index faabafcfc..000000000 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/crater/medium.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "feature": "tfg:moon/crater/medium", - "placement": [ - { - "type": "minecraft:count", - "count": 2 - }, - { - "type": "minecraft:heightmap", - "heightmap": "WORLD_SURFACE_WG" - }, - { - "type": "minecraft:random_offset", - "xz_spread": 0, - "y_spread": 4 - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/crater/small.json b/kubejs/data/tfg/worldgen/placed_feature/moon/crater/small.json deleted file mode 100644 index 2049cbf41..000000000 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/crater/small.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "feature": "tfg:moon/crater/small", - "placement": [ - { - "type": "minecraft:count", - "count": 3 - }, - { - "type": "minecraft:heightmap", - "heightmap": "WORLD_SURFACE_WG" - }, - { - "type": "minecraft:random_offset", - "xz_spread": 0, - "y_spread": 2 - } - ] -} \ 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 0fc8a9b12..931fde276 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -206,12 +206,6 @@ const registerAdAstraEntityTypeTags = (event) => { // All space veins go in tfg/tags.js const registerAdAstraPlacedFeatures = (event) => { - event.add('tfg:moon_craters', 'tfg:moon/crater/extra_small') - event.add('tfg:moon_craters', 'tfg:moon/crater/small') - event.add('tfg:moon_craters', 'tfg:moon/crater/medium') - event.add('tfg:moon_craters', 'tfg:moon/crater/large') - event.add('tfg:moon_craters', 'tfg:moon/crater/extra_large') - global.MOON_STONE_TYPES.forEach(stone => { // only in the sparse ones event.add('tfg:moon_large_rock_features', `tfg:moon/surface/delta/${stone}`)