diff --git a/kubejs/data/ad_astra/dimension/mars.json b/kubejs/data/ad_astra/dimension/mars.json index 4d9fc2375..56143d3e6 100644 --- a/kubejs/data/ad_astra/dimension/mars.json +++ b/kubejs/data/ad_astra/dimension/mars.json @@ -40,8 +40,8 @@ "hardened": "tfg:rock/hardened_red_granite", "gravel": "tfg:rock/gravel_red_granite", "cobble": "gtceu:red_granite_cobblestone", - "sand": "minecraft:red_sand", - "sandstone": "minecraft:red_sandstone", + "sand": "tfc:sand/red", + "sandstone": "tfc:raw_sandstone/red", "spike": "tfg:spike/red_granite_spike", "loose": "tfg:loose/red_granite" }, diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/underground/ice_cave.json b/kubejs/data/tfg/worldgen/configured_feature/mars/underground/ice_cave.json new file mode 100644 index 000000000..57a0a88c6 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/underground/ice_cave.json @@ -0,0 +1,4 @@ +{ + "type": "tfc:ice_cave", + "config": {} +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/underground/ochrum_blob.json b/kubejs/data/tfg/worldgen/configured_feature/mars/underground/ochrum_blob.json index cf33edd51..e6e0d9641 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/underground/ochrum_blob.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/underground/ochrum_blob.json @@ -27,8 +27,8 @@ "Name": "create:ochrum" }, "target": { - "predicate_type": "minecraft:tag_match", - "tag": "tfc:dirt" + "predicate_type": "minecraft:block_match", + "block": "ad_astra:venus_sand" } }, { @@ -37,7 +37,7 @@ }, "target": { "predicate_type": "minecraft:block_match", - "block": "ad_astra:venus_sand" + "block": "ad_astra:venus_sandstone" } } ] diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/calcite.json b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/calcite.json index c3ccbd063..963c7940f 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/calcite.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/calcite.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 4 + "count": 3 }, { "type": "minecraft:in_square" @@ -16,7 +16,7 @@ "absolute": -24 }, "max_inclusive": { - "absolute": 75 + "absolute": 90 } } } diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/ice_cave.json b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/ice_cave.json new file mode 100644 index 000000000..64e28d980 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/ice_cave.json @@ -0,0 +1,28 @@ +{ + "feature": "tfg:mars/underground/ice_cave", + "placement": [ + { + "type": "tfc:climate", + "max_temperature": -85 + }, + { + "type": "minecraft:count", + "count": 15 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "uniform", + "min_inclusive": { + "absolute": -16 + }, + "max_inclusive": { + "absolute": 110 + } + } + } + ] +} \ 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 new file mode 100644 index 000000000..2bc4f392a --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/icicle.json @@ -0,0 +1,28 @@ +{ + "feature": "tfc:icicle", + "placement": [ + { + "type": "minecraft:count", + "count": 10 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "biased_to_bottom", + "min_inclusive": { + "absolute": 0 + }, + "max_inclusive": { + "absolute": 150 + } + } + }, + { + "type": "tfc:climate", + "max_temperature": -30 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/mega_calcite.json b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/mega_calcite.json index de356fbcb..00761526b 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/mega_calcite.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/mega_calcite.json @@ -16,7 +16,7 @@ "absolute": -24 }, "max_inclusive": { - "absolute": 50 + "absolute": 70 } } } diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/ochrum_blob.json b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/ochrum_blob.json index b08899350..843698b83 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/underground/ochrum_blob.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/underground/ochrum_blob.json @@ -13,10 +13,10 @@ "height": { "type": "minecraft:trapezoid", "max_inclusive": { - "absolute": 80 + "absolute": 120 }, "min_inclusive": { - "absolute": -32 + "absolute": -24 } } }, diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index f48058a84..0026b0e45 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -489,14 +489,20 @@ 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/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', '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/calcite') event.add('tfg:mars_underground_decoration', 'tfg:mars/underground/mega_calcite') event.add('tfg:mars_underground_decoration', 'tfc:icicle') event.add('tfg:mars_underground_decoration', 'tfg:mars/underground/loose_rocks') event.add('tfg:mars_underground_decoration', 'tfg:mars/underground/ochrum_blob') + event.add('tfg:mars_underground_decoration', 'tfg:mars/underground/ice_cave') + event.add('tfg:mars_underground_decoration', "tfg:earth/geode/amethyst") event.add('tfg:mars_underground_decoration', "tfg:earth/geode/barite") event.add('tfg:mars_underground_decoration', "tfg:earth/geode/calcite") @@ -550,8 +556,6 @@ const registerAdAstraPlacedFeatures = (event) => { event.add("tfg:mars_rusticus_vegetal_decoration", "tfg:mars/surface/bulb_moss") event.add("tfg:mars_rusticus_vegetal_decoration", "tfg:mars/surface/aurant_polypore") event.add("tfg:mars_rusticus_vegetal_decoration", "tfg:mars/surface/purple_polypore") - event.add("tfg:mars_rusticus_vegetal_decoration", "tfg:mars/surface/filalux_wings") - event.add("tfg:mars_rusticus_vegetal_decoration", "tfg:mars/surface/filalux_wings_top") event.add("tfg:mars_rusticus_vegetal_decoration", "tfg:mars/surface/aeridium") event.add("tfg:mars_rusticus_vegetal_decoration", "tfg:mars/surface/flammalix") @@ -570,8 +574,9 @@ const registerAdAstraPlacedFeatures = (event) => { event.add("tfg:mars_sangnum_vegetal_decoration", "tfg:mars/surface/small_amaranita_mushroom") event.add("tfg:mars_sangnum_vegetal_decoration", "tfg:mars/surface/large_amaranita_mushroom") - event.add("tfg:mars_sangnum_vegetal_decoration", "tfg:mars/surface/aurant_polypore") event.add("tfg:mars_sangnum_vegetal_decoration", "tfg:mars/surface/purple_polypore") + event.add("tfg:mars_sangnum_vegetal_decoration", "tfg:mars/surface/filalux_wings") + event.add("tfg:mars_sangnum_vegetal_decoration", "tfg:mars/surface/filalux_wings_top") event.add("tfg:mars_sangnum_vegetal_decoration", "tfg:mars/surface/cave_grass") event.add("tfg:mars_sangnum_vegetal_decoration", "tfg:mars/surface/clawfern")