From 30382b73467d151dfcc8e8b49231adcab559231a Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 3 Jun 2025 01:13:18 +0100 Subject: [PATCH] added sand piles, added new sandy biome that replaces lunar_plains sometimes --- kubejs/data/ad_astra/dimension/moon.json | 46 +++++--- .../tfg/worldgen/biome/moon/lunar_sands.json | 107 ++++++++++++++++++ .../moon/crater/meteorite.json | 4 +- .../moon/surface/moon_rock_pile.json | 40 ------- .../moon/surface/pile_black_sand.json | 53 +++++++++ .../moon/surface/pile_moon_sand.json | 53 +++++++++ .../moon/surface/pile_white_sand.json | 53 +++++++++ .../moon/surface/warped_vine_short.json | 61 ++++++++++ ...warped_vine.json => warped_vine_tall.json} | 0 .../moon/surface/moon_rock_pile.json | 19 ---- .../moon/surface/pile_black_sand.json | 38 +++++++ .../moon/surface/pile_moon_sand.json | 44 +++++++ .../moon/surface/pile_white_sand.json | 41 +++++++ .../moon/surface/warped_vine_common.json | 2 +- .../moon/surface/warped_vine_rare.json | 2 +- .../structure/moon/moon_rabbit_houses.json | 2 +- .../tfg/worldgen/structure/moon/moonbase.json | 2 +- kubejs/server_scripts/ad_astra/tags.js | 18 +-- 18 files changed, 491 insertions(+), 94 deletions(-) create mode 100644 kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json delete mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/surface/moon_rock_pile.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile_black_sand.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile_moon_sand.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile_white_sand.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_vine_short.json rename kubejs/data/tfg/worldgen/configured_feature/moon/surface/{warped_vine.json => warped_vine_tall.json} (100%) delete mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/moon_rock_pile.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile_black_sand.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile_moon_sand.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile_white_sand.json diff --git a/kubejs/data/ad_astra/dimension/moon.json b/kubejs/data/ad_astra/dimension/moon.json index 6ab2ae0f6..ea2ff61f2 100644 --- a/kubejs/data/ad_astra/dimension/moon.json +++ b/kubejs/data/ad_astra/dimension/moon.json @@ -11,9 +11,9 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": [ 0.4, 1 ], + "continentalness": [ 0.5, 1 ], "erosion": 0, - "weirdness": [ 0.4, 1 ], + "weirdness": [ 0.5, 1 ], "depth": 0, "offset": 0 } @@ -23,9 +23,9 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": [ 0.2, 0.4 ], + "continentalness": [ 0.2, 0.5 ], "erosion": 0, - "weirdness": [ 0.2, 0.4 ], + "weirdness": [ 0.2, 0.5 ], "depth": 0, "offset": 0 } @@ -35,9 +35,9 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": [ 0.4, 1 ], + "continentalness": [ 0.5, 1 ], "erosion": 0, - "weirdness": [ -1, -0.4 ], + "weirdness": [ -1, -0.5 ], "depth": 0, "offset": 0 } @@ -47,9 +47,9 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": [ 0.2, 0.4 ], + "continentalness": [ 0.2, 0.5 ], "erosion": 0, - "weirdness": [ -0.4, -0.2 ], + "weirdness": [ -0.5, -0.2 ], "depth": 0, "offset": 0 } @@ -58,7 +58,19 @@ "biome": "tfg:moon/lunar_plains", "parameters": { "temperature": 0, - "humidity": 0, + "humidity": -0.1, + "continentalness": [ -0.2, 0.2 ], + "erosion": 0, + "weirdness": [ -0.2, 0.2 ], + "depth": 0, + "offset": 0 + } + }, + { + "biome": "tfg:moon/lunar_sands", + "parameters": { + "temperature": 0, + "humidity": 0.2, "continentalness": [ -0.2, 0.2 ], "erosion": 0, "weirdness": [ -0.2, 0.2 ], @@ -71,9 +83,9 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": [ -0.4, -0.2 ], + "continentalness": [ -0.5, -0.2 ], "erosion": 0, - "weirdness": [ -0.4, -0.2 ], + "weirdness": [ -0.5, -0.2 ], "depth": 0, "offset": 0 } @@ -83,9 +95,9 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": [ -1, -0.4 ], + "continentalness": [ -1, -0.5 ], "erosion": 0, - "weirdness": [ -1, -0.4 ], + "weirdness": [ -1, -0.5 ], "depth": 0, "offset": 0 } @@ -95,9 +107,9 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": [ -0.4, -0.2 ], + "continentalness": [ -0.5, -0.2 ], "erosion": 0, - "weirdness": [ 0.2, 0.4 ], + "weirdness": [ 0.2, 0.5 ], "depth": 0, "offset": 0 } @@ -107,9 +119,9 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": [ -1, -0.4 ], + "continentalness": [ -1, -0.5 ], "erosion": 0, - "weirdness": [ 0.4, 1 ], + "weirdness": [ 0.5, 1 ], "depth": 0, "offset": 0 } diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json new file mode 100644 index 000000000..4d1d0623f --- /dev/null +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json @@ -0,0 +1,107 @@ +{ + "carvers": { + "air": [ + "minecraft:cave", + "minecraft:cave_extra_underground", + "minecraft:canyon" + ] + }, + "downfall": 0.0, + "effects": { + "fog_color": 0, + "mood_sound": { + "block_search_extent": 8, + "offset": 2.0, + "sound": "minecraft:ambient.cave", + "tick_delay": 6000 + }, + "sky_color": 0, + "water_color": 4159204, + "water_fog_color": 329011 + }, + "features": [ + [], + "#tfg:moon_craters", + [ + "tfg:moon/asurine/blob_sparse", + "tfg:earth/geode/amethyst", + "tfg:earth/geode/barite", + "tfg:earth/geode/calcite", + "tfg:earth/geode/gypsum", + "tfg:earth/geode/opal", + "tfg:earth/geode/pyrite", + "tfg:earth/geode/quartzite" + ], + [], + [ + "tfc:vein/gabbro_dike", + "tfc:vein/diorite_dike" + ], + [], + "#tfg:moon_veins", + [], + [ + "tfg:moon/surface/pile_moon_sand", + "tfg:moon/surface/pile_white_sand", + "tfg:moon/surface/pile_black_sand" + ], + [ + "tfg:moon/surface/pile_moon_sand", + "tfg:moon/surface/pile_white_sand", + "tfg:moon/surface/pile_black_sand" + ], + [ + "tfg:moon/hardening" + ] + ], + "has_precipitation": false, + "spawn_costs": {}, + "spawners": { + "ambient": [], + "axolotls": [], + "creature": [], + "misc": [], + "monster": [ + { + "type": "ad_astra:star_crawler", + "maxCount": 4, + "minCount": 2, + "weight": 100 + }, + { + "type": "ad_astra:corrupted_lunarian", + "maxCount": 1, + "minCount": 1, + "weight": 20 + }, + { + "type": "minecraft:enderman", + "maxCount": 1, + "minCount": 1, + "weight": 20 + }, + { + "type": "minecraft:endermite", + "maxCount": 4, + "minCount": 2, + "weight": 10 + }, + { + "type": "species:limpet", + "maxCount": 2, + "minCount": 1, + "weight": 100 + }, + { + "type": "endermanoverhaul:soulsand_valley_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 10 + } + ], + "underground_water_creature": [], + "water_ambient": [], + "water_creature": [] + }, + "temperature": 0.7 +} \ 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 index ba5e1969c..f382fd6bd 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/crater/meteorite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/crater/meteorite.json @@ -10,7 +10,7 @@ }, "features": [ { - "chance": 0.2, + "chance": 0.4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -44,7 +44,7 @@ } }, { - "chance": 0.5, + "chance": 0.3, "feature": { "feature": { "type": "minecraft:simple_block", diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/moon_rock_pile.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/moon_rock_pile.json deleted file mode 100644 index bac81cf2b..000000000 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/moon_rock_pile.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "type": "minecraft:block_pile", - "config": { - "state_provider": { - "type": "minecraft:weighted_state_provider", - "entries": [ - { - "weight": 20, - "data": { - "Name": "ad_astra:moon_cobblestone_slab" - } - }, - { - "weight": 20, - "data": { - "Name": "ad_astra:moon_cobblestone" - } - }, - { - "weight": 20, - "data": { - "Name": "ad_astra:moon_stone_slab" - } - }, - { - "weight": 20, - "data": { - "Name": "ad_astra:moon_deepslate" - } - }, - { - "weight": 20, - "data": { - "Name": "ad_astra:moon_stone" - } - } - ] - } - } -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile_black_sand.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile_black_sand.json new file mode 100644 index 000000000..b9d8e06ab --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile_black_sand.json @@ -0,0 +1,53 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:randomized_int_state_provider", + "property": "layers", + "values": { + "type": "minecraft:biased_to_bottom", + "value": { + "min_inclusive": 1, + "max_inclusive": 3 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfg:pile/black_sand" + } + } + } + } + }, + "placement": [ + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:has_sturdy_face", + "offset": [ + 0, + -1, + 0 + ], + "direction": "up" + } + } + ] + }, + "tries": 32, + "xz_spread": 16, + "y_spread": 3 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile_moon_sand.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile_moon_sand.json new file mode 100644 index 000000000..2a35cd746 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile_moon_sand.json @@ -0,0 +1,53 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:randomized_int_state_provider", + "property": "layers", + "values": { + "type": "minecraft:biased_to_bottom", + "value": { + "min_inclusive": 1, + "max_inclusive": 3 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfg:pile/moon_sand" + } + } + } + } + }, + "placement": [ + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:has_sturdy_face", + "offset": [ + 0, + -1, + 0 + ], + "direction": "up" + } + } + ] + }, + "tries": 32, + "xz_spread": 16, + "y_spread": 3 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile_white_sand.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile_white_sand.json new file mode 100644 index 000000000..af18a1eb4 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/pile_white_sand.json @@ -0,0 +1,53 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:randomized_int_state_provider", + "property": "layers", + "values": { + "type": "minecraft:biased_to_bottom", + "value": { + "min_inclusive": 1, + "max_inclusive": 3 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfg:pile/white_sand" + } + } + } + } + }, + "placement": [ + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:has_sturdy_face", + "offset": [ + 0, + -1, + 0 + ], + "direction": "up" + } + } + ] + }, + "tries": 32, + "xz_spread": 16, + "y_spread": 3 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_vine_short.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_vine_short.json new file mode 100644 index 000000000..f7f6f1430 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_vine_short.json @@ -0,0 +1,61 @@ +{ + "type": "minecraft:tree", + "config": { + "decorators": [], + "dirt_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:moon_sand" + } + }, + "foliage_placer": { + "type": "minecraft:blob_foliage_placer", + "height": 0, + "offset": 1, + "radius": 1 + }, + "foliage_provider": { + "type": "minecraft:weighted_state_provider", + "entries": [ + { + "weight": 50, + "data": { + "Name": "minecraft:pearlescent_froglight" + } + }, + { + "weight": 30, + "data": { + "Name": "minecraft:verdant_froglight" + } + }, + { + "weight": 20, + "data": { + "Name": "minecraft:ochre_froglight" + } + } + ] + }, + "force_dirt": false, + "ignore_vines": true, + "minimum_size": { + "type": "minecraft:two_layers_feature_size", + "limit": 1, + "lower_size": 0, + "upper_size": 1 + }, + "trunk_placer": { + "type": "minecraft:straight_trunk_placer", + "base_height": 5, + "height_rand_a": 15, + "height_rand_b": 5 + }, + "trunk_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:twisting_vines_plant" + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_vine.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_vine_tall.json similarity index 100% rename from kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_vine.json rename to kubejs/data/tfg/worldgen/configured_feature/moon/surface/warped_vine_tall.json diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/moon_rock_pile.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/moon_rock_pile.json deleted file mode 100644 index 8500af6ea..000000000 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/moon_rock_pile.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "tfg:moon/surface/moon_rock_pile", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 4 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile_black_sand.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile_black_sand.json new file mode 100644 index 000000000..695e564c5 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile_black_sand.json @@ -0,0 +1,38 @@ +{ + "feature": "tfg:moon/surface/pile_black_sand", + "placement": [ + { + "type": "minecraft:count", + "count": 5 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "tfc:rock/raw/basalt", + "tfc:rock/hardened/basalt", + "tfc:rock/gravel/basalt", + "ad_astra:moon_deepslate", + "tfg:rock/hardened_moon_deepslate", + "tfc:sand/black" + ] + } + }, + { + "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/pile_moon_sand.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile_moon_sand.json new file mode 100644 index 000000000..4212e36ec --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile_moon_sand.json @@ -0,0 +1,44 @@ +{ + "feature": "tfg:moon/surface/pile_moon_sand", + "placement": [ + { + "type": "minecraft:count", + "count": 5 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "tfc:rock/raw/andesite", + "tfc:rock/hardened/andesite", + "tfc:rock/gravel/andesite", + "tfc:rock/raw/dacite", + "tfc:rock/hardened/dacite", + "tfc:rock/gravel/dacite", + "tfc:rock/raw/gabbro", + "tfc:rock/hardened/gabbro", + "tfc:rock/gravel/gabbro", + "ad_astra:moon_stone", + "tfg:rock/hardened_moon_stone", + "ad_astra:moon_sand" + ] + } + }, + { + "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/pile_white_sand.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile_white_sand.json new file mode 100644 index 000000000..c9d7cca14 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/pile_white_sand.json @@ -0,0 +1,41 @@ +{ + "feature": "tfg:moon/surface/pile_white_sand", + "placement": [ + { + "type": "minecraft:count", + "count": 5 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": [ + "tfc:rock/raw/diorite", + "tfc:rock/hardened/diorite", + "tfc:rock/gravel/diorite", + "ad_astra:glacio_stone", + "tfg:rock/hardened_glacio_stone", + "ad_astra:glacio_cobblestone", + "tfc:rock/raw/rhyolite", + "tfc:rock/hardened/rhyolite", + "tfc:rock/gravel/rhyolite" + ] + } + }, + { + "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_common.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_vine_common.json index 771091545..62c6bb3ed 100644 --- 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 @@ -1,5 +1,5 @@ { - "feature": "tfg:moon/surface/warped_vine", + "feature": "tfg:moon/surface/warped_vine_tall", "placement": [ { "type": "minecraft:biome" diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_vine_rare.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_vine_rare.json index ebbca0ab5..0a937d0b2 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_vine_rare.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_vine_rare.json @@ -1,5 +1,5 @@ { - "feature": "tfg:moon/surface/warped_vine", + "feature": "tfg:moon/surface/warped_vine_short", "placement": [ { "type": "minecraft:biome" diff --git a/kubejs/data/tfg/worldgen/structure/moon/moon_rabbit_houses.json b/kubejs/data/tfg/worldgen/structure/moon/moon_rabbit_houses.json index 003100dab..da7154a4b 100644 --- a/kubejs/data/tfg/worldgen/structure/moon/moon_rabbit_houses.json +++ b/kubejs/data/tfg/worldgen/structure/moon/moon_rabbit_houses.json @@ -9,7 +9,7 @@ "start_height": { "absolute": 0 }, - "project_start_to_heightmap": "WORLD_SURFACE_WG", + "project_start_to_heightmap": "MOTION_BLOCKING", "use_expansion_hack": false, "spawn_overrides": {} } \ 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 7d66bb0cb..e07ca7104 100644 --- a/kubejs/data/tfg/worldgen/structure/moon/moonbase.json +++ b/kubejs/data/tfg/worldgen/structure/moon/moonbase.json @@ -7,7 +7,7 @@ "size": 5, "biomes": "#tfg:has_structure/moonbase", "max_distance_from_center": 80, - "project_start_to_heightmap": "WORLD_SURFACE_WG", + "project_start_to_heightmap": "MOTION_BLOCKING", "step": "surface_structures", "terrain_adaptation": "beard_thin", "use_expansion_hack": false, diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index 5e736366f..6be49425d 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -79,17 +79,7 @@ const registerAdAstraBlockTags = (event) => { event.add('tfc:can_carve', rock) }) - // Moon - event.add('minecraft:rabbits_spawnable_on', 'ad_astra:moon_sand') - event.add('minecraft:rabbits_spawnable_on', 'tfc:sand/black') - event.add('minecraft:rabbits_spawnable_on', 'tfc:sand/white') - event.add('minecraft:rabbits_spawnable_on', 'tfc:rock/gravel/diorite') - event.add('minecraft:rabbits_spawnable_on', 'tfc:rock/gravel/gabbro') - event.add('minecraft:rabbits_spawnable_on', 'tfc:rock/gravel/basalt') - event.add('minecraft:rabbits_spawnable_on', 'tfc:rock/gravel/rhyolite') - event.add('minecraft:rabbits_spawnable_on', 'tfc:rock/gravel/andesite') - event.add('minecraft:rabbits_spawnable_on', 'tfc:rock/gravel/dacite') - + // Moon event.add('ad_astra:moon_stone_replaceables', 'ad_astra:moon_sand') event.add('ad_astra:moon_stone_replaceables', 'tfg:rock/hardened_moon_stone') event.add('ad_astra:moon_stone_replaceables', 'tfc:sand/white') @@ -117,6 +107,8 @@ const registerAdAstraBlockTags = (event) => { event.add('ad_astra:moon_stone_replaceables', 'tfc:rock/raw/dacite') event.add('ad_astra:moon_stone_replaceables', 'tfc:rock/hardened/dacite') + event.add('minecraft:rabbits_spawnable_on', 'ad_astra:moon_stone_replaceables') + event.add('tfc:can_landslide', 'ad_astra:moon_sand') event.add('tfc:can_landslide', 'ad_astra:mars_sand') event.add('tfc:can_landslide', 'ad_astra:venus_sand') @@ -203,7 +195,6 @@ const registerAdAstraEntityTypeTags = (event) => { event.add('tfc:deals_crushing_damage', 'ad_astra:star_crawler') } -// All space veins go in tfg/tags.js const registerAdAstraPlacedFeatures = (event) => { event.add('tfg:moon_craters', 'tfg:moon/crater/extra_large') @@ -220,4 +211,7 @@ const registerAdAstraPlacedFeatures = (event) => { event.add('tfg:moon_small_rock_features', `tfg:moon/surface/spike/${stone}`) }) + event.add('tfg:moon_small_rock_features', 'tfg:moon/surface/pile_moon_sand') + event.add('tfg:moon_small_rock_features', 'tfg:moon/surface/pile_white_sand') + event.add('tfg:moon_small_rock_features', 'tfg:moon/surface/pile_black_sand') }