diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json b/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json index 30ce3d627..958fa459d 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json @@ -19,7 +19,7 @@ [ "tfc:erosion" ], - [], + "#tfg:mars_craters", [ "tfg:mars/terrain/clay_disc", "tfg:mars/terrain/peat_disc", diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json index 6c33e10b3..466cea222 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json @@ -22,7 +22,7 @@ [ "tfc:erosion" ], - [], + "#tfg:mars_craters", [ "tfg:mars/terrain/clay_disc", "tfg:mars/terrain/kaolin_clay_disc", diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json index 31daa1542..101511c0e 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json @@ -22,7 +22,7 @@ [ "tfc:erosion" ], - [], + "#tfg:mars_craters", [ "tfg:mars/terrain/clay_disc", "tfg:mars/terrain/peat_disc", diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json b/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json index 24a8f5ae3..0793774d9 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json @@ -21,7 +21,7 @@ [ "tfc:erosion" ], - [], + "#tfg:mars_craters", [ "tfg:mars/terrain/spice_disc", "tfg:mars/terrain/red_quicksand" diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json index 0c2a223e7..6af087625 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json @@ -21,7 +21,7 @@ [ "tfc:erosion" ], - [], + "#tfg:mars_craters", [ ], diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json index b82c2399b..3e28ac813 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json @@ -21,7 +21,7 @@ [ "tfc:erosion" ], - [], + "#tfg:mars_craters", [ "tfg:mars/terrain/red_quicksand" ], diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json index fd3adef6d..df0ba230b 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json @@ -22,7 +22,7 @@ [ "tfc:erosion" ], - [], + "#tfg:mars_craters", [ "tfg:mars/terrain/venus_sand_disc", "tfg:mars/terrain/basalt_delta", diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json index 968f20962..932a575dc 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json @@ -22,7 +22,7 @@ [ "tfc:erosion" ], - [], + "#tfg:mars_craters", [ ], diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json index 38afead75..d9aac6c25 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json @@ -19,7 +19,7 @@ [ "tfc:erosion" ], - [], + "#tfg:mars_craters", [ "tfg:mars/terrain/clay_disc", "tfg:mars/terrain/peat_disc", diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json index d70050440..9d483e3e0 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json @@ -22,7 +22,7 @@ [ "tfc:erosion" ], - [], + "#tfg:mars_craters", [ "tfg:mars/terrain/clay_disc", "tfg:mars/terrain/kaolin_clay_disc", diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json index 0a6d4446f..6cf5473cb 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json @@ -22,7 +22,7 @@ [ "tfc:erosion" ], - [], + "#tfg:mars_craters", [ "tfg:mars/terrain/clay_disc", "tfg:mars/terrain/peat_disc", diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json index 7b0313d66..69e10ed87 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json @@ -19,7 +19,7 @@ [ "tfc:erosion" ], - [], + "#tfg:mars_craters", [ "tfg:mars/terrain/clay_disc", "tfg:mars/terrain/peat_disc", diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json index ca4418cf4..a1247a115 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json @@ -22,7 +22,7 @@ [ "tfc:erosion" ], - [], + "#tfg:mars_craters", [ "tfg:mars/terrain/clay_disc", "tfg:mars/terrain/kaolin_clay_disc", diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json index 368bbe1c3..31d795fb2 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json @@ -22,7 +22,7 @@ [ "tfc:erosion" ], - [], + "#tfg:mars_craters", [ "tfg:mars/terrain/clay_disc", "tfg:mars/terrain/peat_disc", diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/crater_extra_large.json b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/crater_extra_large.json new file mode 100644 index 000000000..dd0805991 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/crater_extra_large.json @@ -0,0 +1,18 @@ +{ + "feature": "tfg:moon/crater/extra_large", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 150 + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 10 + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/crater_large.json b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/crater_large.json new file mode 100644 index 000000000..10f386d1c --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/crater_large.json @@ -0,0 +1,18 @@ +{ + "feature": "tfg:moon/crater/large", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 130 + }, + { + "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/mars/terrain/crater_medium.json b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/crater_medium.json new file mode 100644 index 000000000..43800c61d --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/crater_medium.json @@ -0,0 +1,18 @@ +{ + "feature": "tfg:moon/crater/medium", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 110 + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 5 + } + ] +} \ 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 94bca27df..1ebbd644c 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -468,7 +468,7 @@ const registerAdAstraEntityTypeTags = (event) => { const registerAdAstraPlacedFeatures = (event) => { - // Moon + //#region Moon 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') @@ -486,8 +486,15 @@ const registerAdAstraPlacedFeatures = (event) => { 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') + //#endregion + //#region Mars + // Craters + event.add('tfg:mars_craters', 'tfg:mars/terrain/crater_extra_large') + event.add('tfg:mars_craters', 'tfg:mars/terrain/crater_large') + event.add('tfg:mars_craters', 'tfg:mars/terrain/crater_medium') + // Underground decoration event.add('tfg:mars_underground_decoration', 'tfg:mars/underground/ice_cave')