From 13adbc189fa1efd99b9b8f67f27519dfd3d1dc26 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 14 May 2025 01:19:17 +0100 Subject: [PATCH] craters but for realsies this time --- .../ae2/loot_tables/blocks/quartz_block.json | 2 +- .../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/asurine/asurine_geode.json | 57 ++++--------- .../moon/crater/extra_large.json | 7 ++ .../moon/crater/extra_large_bowl.json | 83 +++++++++++++++++++ .../configured_feature/moon/crater/large.json | 7 ++ .../moon/crater/large_bowl.json | 83 +++++++++++++++++++ .../moon/crater/medium.json | 83 +++++++++++++++++++ .../moon/crater/meteorite.json | 65 +++++++++++++++ .../configured_feature/moon/crater/small.json | 83 +++++++++++++++++++ .../placed_feature/moon/asurine/asurine.json | 12 +-- .../moon/crater/extra_large.json | 18 ++++ .../moon/crater/extra_large_bowl.json | 4 + .../placed_feature/moon/crater/large.json | 18 ++++ .../moon/crater/large_bowl.json | 4 + .../placed_feature/moon/crater/medium.json | 18 ++++ .../placed_feature/moon/crater/meteorite.json | 22 +++++ .../placed_feature/moon/crater/small.json | 18 ++++ .../tfg/worldgen/structure/moon/moonbase.json | 2 +- kubejs/server_scripts/ad_astra/tags.js | 5 ++ kubejs/server_scripts/tfg/recipes.collapse.js | 6 ++ 28 files changed, 557 insertions(+), 56 deletions(-) create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/crater/extra_large.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/crater/extra_large_bowl.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/crater/large.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/crater/large_bowl.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/crater/medium.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/crater/meteorite.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/crater/small.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/crater/extra_large.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/crater/extra_large_bowl.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/crater/large.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/crater/large_bowl.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/crater/medium.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/crater/meteorite.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/crater/small.json diff --git a/kubejs/data/ae2/loot_tables/blocks/quartz_block.json b/kubejs/data/ae2/loot_tables/blocks/quartz_block.json index f45df8744..83a926aff 100644 --- a/kubejs/data/ae2/loot_tables/blocks/quartz_block.json +++ b/kubejs/data/ae2/loot_tables/blocks/quartz_block.json @@ -22,7 +22,7 @@ "name": "gtceu:rich_raw_certus_quartz" } ], - "rolls": 5.0 + "rolls": 3.0 } ], "random_sequence": "ad_astra:blocks/sky_stone" 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 63bed05d7..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", 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 5a2469afd..b1af3e761 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 @@ -5,25 +5,25 @@ "filling_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "minecraft:air" + "Name": "gtceu:moon_stone_certus_quartz_ore" } }, "inner_layer_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "ae2:quartz_block" + "Name": "gtceu:moon_stone_certus_quartz_ore" } }, "alternate_inner_layer_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "ae2:damaged_budding_quartz" + "Name": "gtceu:moon_stone_quartzite_ore" } }, "middle_layer_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "gtceu:moon_stone_certus_quartz_ore" + "Name": "create:asurine" } }, "outer_layer_provider": { @@ -34,32 +34,7 @@ }, "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" - } + "Name": "gtceu:moon_stone_certus_quartz_ore" } ], "cannot_replace": "#minecraft:features_cannot_replace", @@ -77,16 +52,16 @@ "min_inclusive": 3 } }, - "invalid_blocks_threshold": 1, + "invalid_blocks_threshold": 4, "layers": { - "filling": 1.7, - "inner_layer": 2.2, - "middle_layer": 3.2, - "outer_layer": 4.5 + "filling": 0.3, + "inner_layer": 1.8, + "middle_layer": 3.1, + "outer_layer": 4.0 }, - "max_gen_offset": 36, - "min_gen_offset": -36, - "noise_multiplier": 0.1, + "max_gen_offset": 24, + "min_gen_offset": -24, + "noise_multiplier": 0.05, "outer_wall_distance": { "type": "minecraft:uniform", "value": { @@ -94,7 +69,7 @@ "min_inclusive": 4 } }, - "placements_require_layer0_alternate": true, + "placements_require_layer0_alternate": false, "point_offset": { "type": "minecraft:uniform", "value": { @@ -102,7 +77,7 @@ "min_inclusive": 1 } }, - "use_alternate_layer0_chance": 0.083, - "use_potential_placements_chance": 0.35 + "use_alternate_layer0_chance": 0.4, + "use_potential_placements_chance": 0.30 } } 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..5a4449ec5 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/crater/extra_large.json @@ -0,0 +1,7 @@ +{ + "type": "tfc:if_then", + "config": { + "if": "tfg:moon/crater/extra_large_bowl", + "then": "tfg:moon/crater/meteorite" + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/crater/extra_large_bowl.json b/kubejs/data/tfg/worldgen/configured_feature/moon/crater/extra_large_bowl.json new file mode 100644 index 000000000..7538e4653 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/crater/extra_large_bowl.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": 4, + "layers": { + "filling": 0.01, + "inner_layer": 0.01, + "middle_layer": 0.01, + "outer_layer": 38 + }, + "max_gen_offset": 48, + "min_gen_offset": -48, + "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..b44eedd95 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/crater/large.json @@ -0,0 +1,7 @@ +{ + "type": "tfc:if_then", + "config": { + "if": "tfg:moon/crater/large_bowl", + "then": "tfg:moon/crater/meteorite" + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/crater/large_bowl.json b/kubejs/data/tfg/worldgen/configured_feature/moon/crater/large_bowl.json new file mode 100644 index 000000000..570836348 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/crater/large_bowl.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": 4, + "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..020307173 --- /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": 4, + "layers": { + "filling": 0.01, + "inner_layer": 0.01, + "middle_layer": 0.01, + "outer_layer": 10 + }, + "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/meteorite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/crater/meteorite.json new file mode 100644 index 000000000..ba5e1969c --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/crater/meteorite.json @@ -0,0 +1,65 @@ +{ + "type": "minecraft:random_selector", + "config": { + "default": { + "feature": { + "type": "minecraft:no_op", + "config": {} + }, + "placement": [] + }, + "features": [ + { + "chance": 0.2, + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:sky_stone" + } + } + } + }, + "placement": [] + } + }, + { + "chance": 0.3, + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ae2:sky_stone_block" + } + } + } + }, + "placement": [] + } + }, + { + "chance": 0.5, + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:mercury_stone" + } + } + } + }, + "placement": [] + } + } + ] + } +} \ 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..f751ec01a --- /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": 4, + "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/placed_feature/moon/asurine/asurine.json b/kubejs/data/tfg/worldgen/placed_feature/moon/asurine/asurine.json index 39fae484f..aacf5be1e 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/asurine/asurine.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/asurine/asurine.json @@ -2,15 +2,17 @@ "feature": "tfg:moon/asurine/asurine", "placement": [ { - "type": "minecraft:count", - "count": 2 - }, - { - "type": "minecraft:biome" + "type": "minecraft:rarity_filter", + "chance": 15 }, { "type": "minecraft:heightmap", "heightmap": "MOTION_BLOCKING" + }, + { + "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/extra_large.json b/kubejs/data/tfg/worldgen/placed_feature/moon/crater/extra_large.json new file mode 100644 index 000000000..f54e6d75e --- /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:rarity_filter", + "chance": 35 + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 8 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/crater/extra_large_bowl.json b/kubejs/data/tfg/worldgen/placed_feature/moon/crater/extra_large_bowl.json new file mode 100644 index 000000000..7f39409ca --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/crater/extra_large_bowl.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:moon/crater/extra_large_bowl", + "placement": [] +} \ 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..dc3ca542f --- /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:rarity_filter", + "chance": 25 + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 6 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/crater/large_bowl.json b/kubejs/data/tfg/worldgen/placed_feature/moon/crater/large_bowl.json new file mode 100644 index 000000000..bc6be83fd --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/crater/large_bowl.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:moon/crater/large_bowl", + "placement": [] +} \ 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..582d30602 --- /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:rarity_filter", + "chance": 20 + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 2 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/crater/meteorite.json b/kubejs/data/tfg/worldgen/placed_feature/moon/crater/meteorite.json new file mode 100644 index 000000000..982c836e0 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/crater/meteorite.json @@ -0,0 +1,22 @@ +{ + "feature": "tfg:moon/crater/meteorite", + "placement": [ + { + "type": "minecraft:random_offset", + "xz_spread": 6, + "y_spread": 0 + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 32, + "target_condition": { + "type": "minecraft:solid" + } + } + ] +} \ 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..2b894384e --- /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:rarity_filter", + "chance": 15 + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": -1 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/structure/moon/moonbase.json b/kubejs/data/tfg/worldgen/structure/moon/moonbase.json index 63c814b03..7d66bb0cb 100644 --- a/kubejs/data/tfg/worldgen/structure/moon/moonbase.json +++ b/kubejs/data/tfg/worldgen/structure/moon/moonbase.json @@ -8,7 +8,7 @@ "biomes": "#tfg:has_structure/moonbase", "max_distance_from_center": 80, "project_start_to_heightmap": "WORLD_SURFACE_WG", - "step": "top_layer_modification", + "step": "surface_structures", "terrain_adaptation": "beard_thin", "use_expansion_hack": false, "spawn_overrides": {} diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index 931fde276..5e736366f 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -206,6 +206,11 @@ const registerAdAstraEntityTypeTags = (event) => { // All space veins go in tfg/tags.js const registerAdAstraPlacedFeatures = (event) => { + event.add('tfg:moon_craters', 'tfg:moon/crater/extra_large') + event.add('tfg:moon_craters', 'tfg:moon/crater/large') + event.add('tfg:moon_craters', 'tfg:moon/crater/medium') + event.add('tfg:moon_craters', 'tfg:moon/crater/small') + global.MOON_STONE_TYPES.forEach(stone => { // only in the sparse ones event.add('tfg:moon_large_rock_features', `tfg:moon/surface/delta/${stone}`) diff --git a/kubejs/server_scripts/tfg/recipes.collapse.js b/kubejs/server_scripts/tfg/recipes.collapse.js index 3a3d369d7..d762221da 100644 --- a/kubejs/server_scripts/tfg/recipes.collapse.js +++ b/kubejs/server_scripts/tfg/recipes.collapse.js @@ -23,29 +23,35 @@ function registerTFGCollapseRecipes(event) { event.recipes.tfc.collapse('ad_astra:moon_cobblestone', 'ad_astra:moon_stone') event.recipes.tfc.collapse('ad_astra:moon_cobblestone', 'tfg:rock/hardened_moon_stone') event.recipes.tfc.landslide('ad_astra:moon_cobblestone', 'ad_astra:moon_cobblestone') + event.recipes.tfc.collapse('ad_astra:moon_cobblestone', '#forge:ores_in_ground/moon_stone') event.recipes.tfc.landslide('ad_astra:moon_sand', 'ad_astra:moon_sand') event.recipes.tfc.collapse('ad_astra:moon_deepslate', 'ad_astra:moon_deepslate') event.recipes.tfc.collapse('ad_astra:moon_deepslate', 'tfg:rock/hardened_moon_deepslate') + event.recipes.tfc.collapse('ad_astra:moon_deepslate', '#forge:ores_in_ground/moon_deepslate') event.recipes.tfc.collapse('ad_astra:mars_cobblestone', 'ad_astra:mars_stone') event.recipes.tfc.collapse('ad_astra:mars_cobblestone', 'tfg:rock/hardened_mars_stone') event.recipes.tfc.landslide('ad_astra:mars_cobblestone', 'ad_astra:mars_cobblestone') + event.recipes.tfc.collapse('ad_astra:mars_cobblestone', '#forge:ores_in_ground/mars_stone') event.recipes.tfc.landslide('ad_astra:mars_sand', 'ad_astra:mars_sand') event.recipes.tfc.collapse('ad_astra:venus_cobblestone', 'ad_astra:venus_stone') event.recipes.tfc.collapse('ad_astra:venus_cobblestone', 'tfg:rock/hardened_venus_stone') event.recipes.tfc.landslide('ad_astra:venus_cobblestone', 'ad_astra:venus_cobblestone') + event.recipes.tfc.collapse('ad_astra:venus_cobblestone', '#forge:ores_in_ground/venus_stone') event.recipes.tfc.landslide('ad_astra:venus_sand', 'ad_astra:venus_sand') event.recipes.tfc.collapse('ad_astra:mercury_cobblestone', 'ad_astra:mercury_stone') event.recipes.tfc.collapse('ad_astra:mercury_cobblestone', 'tfg:rock/hardened_mercury_stone') event.recipes.tfc.landslide('ad_astra:mercury_cobblestone', 'ad_astra:mercury_cobblestone') + event.recipes.tfc.collapse('ad_astra:mercury_cobblestone', '#forge:ores_in_ground/mercury_stone') event.recipes.tfc.landslide('ad_astra:mercury_sand', 'ad_astra:mercury_sand') event.recipes.tfc.collapse('ad_astra:glacio_cobblestone', 'ad_astra:glacio_stone') event.recipes.tfc.collapse('ad_astra:glacio_cobblestone', 'tfg:rock/hardened_glacio_stone') event.recipes.tfc.landslide('ad_astra:glacio_cobblestone', 'ad_astra:glacio_cobblestone') + event.recipes.tfc.collapse('ad_astra:glacio_cobblestone', '#forge:ores_in_ground/glacio_stone') event.recipes.tfc.landslide('ad_astra:glacio_sand', 'ad_astra:glacio_sand') // #endregion } \ No newline at end of file