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 f916840c4..47c00416f 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", @@ -43,8 +43,8 @@ "#tfg:moon_small_rock_features", [ "tfg:moon/surface/warped_sprouts_patch", - "tfg:moon/asurine/asurine_spikes", - "tfg:moon/asurine/asurine" + "tfg:moon/asurine/asurine", + "tfg:moon/asurine/asurine_spikes" ], [ "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 c8113dabd..f438403d1 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 a168314ac..4c35f3d2f 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 4559a072c..8091a9f89 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 41aa0dfbe..6b75ee0b4 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 71f941597..507fa2074 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 e4f073500..05f7745fa 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 ccf3a705a..afc91da7d 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/asurine/asurine_geode.json b/kubejs/data/tfg/worldgen/configured_feature/moon/asurine/asurine_geode.json index 04cc4076b..5a2469afd 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/asurine/asurine_geode.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/asurine/asurine_geode.json @@ -84,9 +84,9 @@ "middle_layer": 3.2, "outer_layer": 4.5 }, - "max_gen_offset": 24, - "min_gen_offset": -24, - "noise_multiplier": 0.05, + "max_gen_offset": 36, + "min_gen_offset": -36, + "noise_multiplier": 0.1, "outer_wall_distance": { "type": "minecraft:uniform", "value": { 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 new file mode 100644 index 000000000..bb1eec9b2 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/crater/extra_large.json @@ -0,0 +1,83 @@ +{ + "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 new file mode 100644 index 000000000..6fae055ee --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/crater/extra_small.json @@ -0,0 +1,83 @@ +{ + "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 new file mode 100644 index 000000000..b00d38f32 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/crater/large.json @@ -0,0 +1,83 @@ +{ + "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 new file mode 100644 index 000000000..f6fa83a67 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/crater/medium.json @@ -0,0 +1,83 @@ +{ + "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 new file mode 100644 index 000000000..6431c78cd --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/crater/small.json @@ -0,0 +1,83 @@ +{ + "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 new file mode 100644 index 000000000..0de411562 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/crater/extra_large.json @@ -0,0 +1,18 @@ +{ + "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 new file mode 100644 index 000000000..696a7b95d --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/crater/extra_small.json @@ -0,0 +1,13 @@ +{ + "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 new file mode 100644 index 000000000..1c5534369 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/crater/large.json @@ -0,0 +1,18 @@ +{ + "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 new file mode 100644 index 000000000..faabafcfc --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/crater/medium.json @@ -0,0 +1,18 @@ +{ + "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 new file mode 100644 index 000000000..2049cbf41 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/crater/small.json @@ -0,0 +1,18 @@ +{ + "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 568956e42..0fc8a9b12 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -205,6 +205,12 @@ 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