diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json b/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json index e44c002c7..574172873 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json @@ -21,23 +21,15 @@ ], [], [ - "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" + "tfg:mars/terrain/clay_disc", + "tfg:mars/terrain/peat_disc", + "tfg:mars/terrain/venus_sand_disc" ], [], [], [], "#tfg:mars_veins", - [ - "tfg:mars/terrain/clay_disc", - "tfg:mars/terrain/peat_disc", - "tfg:mars/terrain/venus_sand_disc" - ], + "#tfg:mars_underground_decoration", [ "tfg:mars_forest", "tfg:mars/surface/small_skull_and_bones", diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json index 5c8542f8a..92a495cca 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json @@ -24,25 +24,16 @@ ], [], [ - "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" - ], - [ + "tfg:mars/terrain/clay_disc", + "tfg:mars/terrain/kaolin_clay_disc", + "tfg:mars/terrain/venus_sand_disc", "tfc:random_empty_hot_spring" ], [], [], + [], "#tfg:mars_veins", - [ - "tfg:mars/terrain/clay_disc", - "tfg:mars/terrain/kaolin_clay_disc", - "tfg:mars/terrain/venus_sand_disc" - ], + "#tfg:mars_underground_decoration", [ "tfg:mars_forest", "tfc:raw_boulder", diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json index 3231ce5a1..ff13b90cf 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json @@ -24,23 +24,15 @@ ], [], [ - "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" + "tfg:mars/terrain/clay_disc", + "tfg:mars/terrain/peat_disc", + "tfg:mars/terrain/venus_sand_disc" ], [], [], [], "#tfg:mars_veins", - [ - "tfg:mars/terrain/clay_disc", - "tfg:mars/terrain/peat_disc", - "tfg:mars/terrain/venus_sand_disc" - ], + "#tfg:mars_underground_decoration", [ "tfg:mars_forest", "tfg:mars/semiheavy_ammoniacal_water", 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 4b8d75703..a2b8fbec5 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json @@ -23,22 +23,14 @@ ], [], [ - "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" + "tfg:mars/terrain/spice_disc", + "tfg:mars/terrain/red_quicksand" ], [], [], [], "#tfg:mars_veins", - [ - "tfg:mars/terrain/spice_disc", - "tfg:mars/terrain/red_quicksand" - ], + "#tfg:mars_underground_decoration", [ "tfg:mars/surface/small_skull_and_bones", "tfg:mars/surface/large_skull_and_bones" 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 e3ec8fe89..f40f317bb 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json @@ -23,19 +23,13 @@ ], [], [ - "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" + ], [], [], [], "#tfg:mars_veins", - [], + "#tfg:mars_underground_decoration", [ "tfc:raw_boulder", "tfc:cobble_boulder", diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json index 21a810bb8..b3faedef0 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json @@ -23,21 +23,13 @@ ], [], [ - "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" + "tfg:mars/terrain/red_quicksand" ], [], [], [], "#tfg:mars_veins", - [ - "tfg:mars/terrain/red_quicksand" - ], + "#tfg:mars_underground_decoration", [ "tfc:raw_boulder_small_patch", "tfc:cobble_boulder_small_patch", diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json index 1ca48d900..1ff46117b 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json @@ -24,15 +24,10 @@ ], [], [ - "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" - ], - [ + "tfg:mars/terrain/venus_sand_disc", + "tfg:mars/terrain/basalt_delta", + "tfg:mars/terrain/gabbro_delta", + "tfg:mars/terrain/red_granite_delta", "tfc:random_empty_hot_spring", "tfg:mars/terrain/empty_rivulet", "tfg:mars/terrain/magma_rivulet", @@ -42,13 +37,9 @@ ], [], [], + [], "#tfg:mars_veins", - [ - "tfg:mars/terrain/venus_sand_disc", - "tfg:mars/terrain/basalt_delta", - "tfg:mars/terrain/gabbro_delta", - "tfg:mars/terrain/red_granite_delta" - ], + "#tfg:mars_underground_decoration", [ "tfc:raw_boulder", "tfc:raw_boulder_small_patch", diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json index b0b624986..c3a0b1048 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json @@ -24,19 +24,13 @@ ], [], [ - "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" + ], [], [], [], "#tfg:mars_veins", - [], + "#tfg:mars_underground_decoration", [ "tfc:raw_boulder_small_patch", "tfc:cobble_boulder_small_patch", diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json index dde4fb820..5aca69444 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json @@ -21,23 +21,15 @@ ], [], [ - "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" + "tfg:mars/terrain/clay_disc", + "tfg:mars/terrain/peat_disc", + "tfg:mars/terrain/venus_sand_disc" ], [], [], [], "#tfg:mars_veins", - [ - "tfg:mars/terrain/clay_disc", - "tfg:mars/terrain/peat_disc", - "tfg:mars/terrain/venus_sand_disc" - ], + "#tfg:mars_underground_decoration", [ "tfg:mars_forest", "tfg:mars/surface/small_skull_and_bones", diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json index 78fb109c2..ba3e82942 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json @@ -24,25 +24,16 @@ ], [], [ - "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" - ], - [ + "tfg:mars/terrain/clay_disc", + "tfg:mars/terrain/kaolin_clay_disc", + "tfg:mars/terrain/venus_sand_disc", "tfc:random_empty_hot_spring" ], [], [], + [], "#tfg:mars_veins", - [ - "tfg:mars/terrain/clay_disc", - "tfg:mars/terrain/kaolin_clay_disc", - "tfg:mars/terrain/venus_sand_disc" - ], + "#tfg:mars_underground_decoration", [ "tfg:mars_forest", "tfc:raw_boulder", diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json index a586b498f..91c878595 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json @@ -24,23 +24,15 @@ ], [], [ - "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" + "tfg:mars/terrain/clay_disc", + "tfg:mars/terrain/peat_disc", + "tfg:mars/terrain/venus_sand_disc" ], [], [], [], "#tfg:mars_veins", - [ - "tfg:mars/terrain/clay_disc", - "tfg:mars/terrain/peat_disc", - "tfg:mars/terrain/venus_sand_disc" - ], + "#tfg:mars_underground_decoration", [ "tfg:mars_forest", "tfg:mars/semiheavy_ammoniacal_water", diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json index 019622b48..1c1d6b0ca 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json @@ -21,23 +21,15 @@ ], [], [ - "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" + "tfg:mars/terrain/clay_disc", + "tfg:mars/terrain/peat_disc", + "tfg:mars/terrain/venus_sand_disc" ], [], [], [], "#tfg:mars_veins", - [ - "tfg:mars/terrain/clay_disc", - "tfg:mars/terrain/peat_disc", - "tfg:mars/terrain/venus_sand_disc" - ], + "#tfg:mars_underground_decoration", [ "tfg:mars_forest", "tfg:mars/surface/small_skull_and_bones", diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json index 59182c9df..4e934a127 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json @@ -24,25 +24,16 @@ ], [], [ - "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" - ], - [ + "tfg:mars/terrain/clay_disc", + "tfg:mars/terrain/kaolin_clay_disc", + "tfg:mars/terrain/venus_sand_disc", "tfc:random_empty_hot_spring" ], [], [], + [], "#tfg:mars_veins", - [ - "tfg:mars/terrain/clay_disc", - "tfg:mars/terrain/kaolin_clay_disc", - "tfg:mars/terrain/venus_sand_disc" - ], + "#tfg:mars_underground_decoration", [ "tfg:mars_forest", "tfc:raw_boulder", diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json index 268ebd82c..1bd8e7a6f 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json @@ -24,23 +24,15 @@ ], [], [ - "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" + "tfg:mars/terrain/clay_disc", + "tfg:mars/terrain/peat_disc", + "tfg:mars/terrain/venus_sand_disc" ], [], [], [], "#tfg:mars_veins", - [ - "tfg:mars/terrain/clay_disc", - "tfg:mars/terrain/peat_disc", - "tfg:mars/terrain/venus_sand_disc" - ], + "#tfg:mars_underground_decoration", [ "tfg:mars_forest", "tfg:mars/semiheavy_ammoniacal_water",