From bf4f8a889803871c4310eaba70940a3f462ed1af Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 20 Sep 2025 17:32:09 +0100 Subject: [PATCH] mars spikes + rocks feature tweaks --- .../mars/underground/cave_spike.json | 4 -- .../mars/underground/loose_rocks.json | 4 -- .../mars/underground/cave_column.json | 16 ------ .../mars/underground/icicle.json | 4 +- .../mars/underground/icicle_extra.json | 28 ++++++++++ .../mars/underground/large_cave_spike.json | 16 ------ .../mars/underground/loose_rocks.json | 7 ++- ..._spike.json => noise_cave_stalagmite.json} | 18 +++++-- .../underground/noise_cave_stalagtite.json | 51 +++++++++++++++++++ kubejs/server_scripts/ad_astra/tags.js | 6 +-- kubejs/startup_scripts/create/constants.js | 38 -------------- 11 files changed, 103 insertions(+), 89 deletions(-) delete mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/underground/cave_spike.json delete mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/underground/loose_rocks.json delete mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/underground/cave_column.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/underground/icicle_extra.json delete mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/underground/large_cave_spike.json rename kubejs/data/tfg/worldgen/placed_feature/mars/underground/{cave_spike.json => noise_cave_stalagmite.json} (66%) create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/underground/noise_cave_stalagtite.json diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/underground/cave_spike.json b/kubejs/data/tfg/worldgen/configured_feature/mars/underground/cave_spike.json deleted file mode 100644 index f7663894b..000000000 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/underground/cave_spike.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "tfc:cave_spike", - "config": {} -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/underground/loose_rocks.json b/kubejs/data/tfg/worldgen/configured_feature/mars/underground/loose_rocks.json deleted file mode 100644 index d61b9d3ca..000000000 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/underground/loose_rocks.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "tfc:loose_rock", - "config": {} -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/cave_column.json b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/cave_column.json deleted file mode 100644 index a5778699c..000000000 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/cave_column.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "feature": "tfc:cave_column", - "placement": [ - { - "type": "minecraft:carving_mask", - "step": "air", - "min_y": { - "above_bottom": 25 - } - }, - { - "type": "minecraft:rarity_filter", - "chance": 667 - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/icicle.json b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/icicle.json index 2bc4f392a..fc0e253e7 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/icicle.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/icicle.json @@ -13,10 +13,10 @@ "height": { "type": "biased_to_bottom", "min_inclusive": { - "absolute": 0 + "absolute": -20 }, "max_inclusive": { - "absolute": 150 + "absolute": 100 } } }, diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/icicle_extra.json b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/icicle_extra.json new file mode 100644 index 000000000..6d287898a --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/icicle_extra.json @@ -0,0 +1,28 @@ +{ + "feature": "tfc:icicle", + "placement": [ + { + "type": "minecraft:count", + "count": 10 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "uniform", + "min_inclusive": { + "absolute": 40 + }, + "max_inclusive": { + "absolute": 150 + } + } + }, + { + "type": "tfc:climate", + "max_temperature": -70 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/large_cave_spike.json b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/large_cave_spike.json deleted file mode 100644 index 28252bcba..000000000 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/large_cave_spike.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "feature": "tfc:large_cave_spike", - "placement": [ - { - "type": "minecraft:carving_mask", - "step": "air", - "min_y": { - "above_bottom": 25 - } - }, - { - "type": "minecraft:rarity_filter", - "chance": 167 - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/loose_rocks.json b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/loose_rocks.json index dd9e1ea16..58f21e472 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/loose_rocks.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/loose_rocks.json @@ -1,5 +1,5 @@ { - "feature": "tfg:mars/underground/loose_rocks", + "feature": "tfc:underground_loose_rocks", "placement": [ { "type": "minecraft:count", @@ -24,7 +24,10 @@ "type": "minecraft:environment_scan", "allowed_search_condition": { "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "blocks": [ + "minecraft:air", + "tfg:fluid/semiheavy_ammoniacal_water" + ] }, "direction_of_search": "down", "max_steps": 8, diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/cave_spike.json b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/noise_cave_stalagmite.json similarity index 66% rename from kubejs/data/tfg/worldgen/placed_feature/mars/underground/cave_spike.json rename to kubejs/data/tfg/worldgen/placed_feature/mars/underground/noise_cave_stalagmite.json index a941961dd..aa855147b 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/cave_spike.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/noise_cave_stalagmite.json @@ -1,5 +1,5 @@ { - "feature": "tfg:mars/underground/cave_spike", + "feature": "tfc:cave_spike", "placement": [ { "type": "minecraft:count", @@ -10,10 +10,10 @@ "height": { "type": "minecraft:uniform", "min_inclusive": { - "above_bottom": 7 + "above_bottom": 5 }, "max_inclusive": { - "absolute": 75 + "absolute": 85 } } }, @@ -24,7 +24,10 @@ "type": "minecraft:environment_scan", "allowed_search_condition": { "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "blocks": [ + "minecraft:air", + "tfg:fluid/semiheavy_ammoniacal_water" + ] }, "direction_of_search": "down", "max_steps": 8, @@ -32,6 +35,13 @@ "type": "minecraft:solid" } }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_block_tag", + "tag": "forge:stone" + } + }, { "type": "minecraft:random_offset", "xz_spread": 0, diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/noise_cave_stalagtite.json b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/noise_cave_stalagtite.json new file mode 100644 index 000000000..2b1a19635 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/noise_cave_stalagtite.json @@ -0,0 +1,51 @@ +{ + "feature": "tfc:cave_spike", + "placement": [ + { + "type": "minecraft:count", + "count": 256 + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "min_inclusive": { + "above_bottom": 20 + }, + "max_inclusive": { + "absolute": 120 + } + } + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": [ + "minecraft:air", + "tfg:fluid/semiheavy_ammoniacal_water" + ] + }, + "direction_of_search": "up", + "max_steps": 8, + "target_condition": { + "type": "minecraft:solid" + } + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_block_tag", + "tag": "forge:stone" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": -1 + } + ] +} \ 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 7a48b2453..94bca27df 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -489,18 +489,18 @@ const registerAdAstraPlacedFeatures = (event) => { //#region Mars // Underground decoration - //event.add('tfg:mars_underground_decoration', 'tfg:mars/underground/cave_column') - //event.add('tfg:mars_underground_decoration', 'tfg:mars/underground/cave_spike') - //event.add('tfg:mars_underground_decoration', 'tfg:mars/underground/large_cave_spike') event.add('tfg:mars_underground_decoration', 'tfg:mars/underground/ice_cave') event.add('tfg:mars_underground_decoration', 'tfc:cave_spike') event.add('tfg:mars_underground_decoration', 'tfc:cave_column') event.add('tfg:mars_underground_decoration', 'tfc:large_cave_spike') + event.add('tfg:mars_underground_decoration', 'tfg:mars/underground/noise_cave_stalagmite') + event.add('tfg:mars_underground_decoration', 'tfg:mars/underground/noise_cave_stalagtite') event.add('tfg:mars_underground_decoration', 'tfg:mars/underground/calcite') event.add('tfg:mars_underground_decoration', 'tfg:mars/underground/mega_calcite') event.add('tfg:mars_underground_decoration', 'tfc:mars/underground/icicle') + event.add('tfg:mars_underground_decoration', 'tfc:mars/underground/icicle_extra') event.add('tfg:mars_underground_decoration', 'tfg:mars/underground/loose_rocks') event.add('tfg:mars_underground_decoration', 'tfg:mars/underground/ochrum_blob') diff --git a/kubejs/startup_scripts/create/constants.js b/kubejs/startup_scripts/create/constants.js index 0295f656b..0ead2a3f3 100644 --- a/kubejs/startup_scripts/create/constants.js +++ b/kubejs/startup_scripts/create/constants.js @@ -65,27 +65,6 @@ global.CREATE_DISABLED_ITEMS = [ 'create:layered_scoria', 'create:scoria_pillar', - // Ochrium - 'create:ochrum', - 'create:cut_ochrum', - 'create:cut_ochrum_stairs', - 'create:cut_ochrum_slab', - 'create:cut_ochrum_wall', - 'create:polished_cut_ochrum', - 'create:polished_cut_ochrum_stairs', - 'create:polished_cut_ochrum_slab', - 'create:polished_cut_ochrum_wall', - 'create:cut_ochrum_bricks', - 'create:cut_ochrum_brick_stairs', - 'create:cut_ochrum_brick_slab', - 'create:cut_ochrum_brick_wall', - 'create:small_ochrum_bricks', - 'create:small_ochrum_brick_stairs', - 'create:small_ochrum_brick_slab', - 'create:small_ochrum_brick_wall', - 'create:layered_ochrum', - 'create:ochrum_pillar', - // Cringite 'create:crimsite', 'create:cut_crimsite', @@ -127,23 +106,6 @@ global.CREATE_DISABLED_ITEMS = [ 'create:layered_tuff', 'create:tuff_pillar', - - // Shit Glass - 'create:crimson_window', - 'create:warped_window', - 'create:oak_window', - 'create:spruce_window', - 'create:birch_window', - 'create:jungle_window', - 'create:acacia_window', - 'create:oak_window_pane', - 'create:spruce_window_pane', - 'create:birch_window_pane', - 'create:jungle_window_pane', - 'create:acacia_window_pane', - 'create:crimson_window_pane', - 'create:warped_window_pane', - // Blocks 'create:andesite_alloy_block', 'create:experience_block',