diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json index 84c8887ee..e10f32e22 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json @@ -38,7 +38,10 @@ [], [], "#tfg:mars_veins", - [], + [ + "tfg:mars/terrain/clay_disc", + "tfg:mars/terrain/kaolin_clay_disc" + ], [ "tfg:mars_forest", "tfc:raw_boulder", @@ -79,7 +82,7 @@ "weight": 50 }, { - "type": "species:wraptor", + "type": "tfg:wraptor", "maxCount": 4, "minCount": 1, "weight": 100 diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json index 25cb5ed0f..bb20e1a9b 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json @@ -36,7 +36,9 @@ [], [], "#tfg:mars_veins", - [], + [ + "tfg:mars/terrain/clay_disc" + ], [ "tfg:mars_forest", "tfg:mars/semiheavy_ammoniacal_water" @@ -74,7 +76,7 @@ "weight": 100 }, { - "type": "species:wraptor", + "type": "tfg:wraptor", "maxCount": 4, "minCount": 2, "weight": 100 diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json index 434e22a43..d900eddc0 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json @@ -72,7 +72,7 @@ "axolotls": [], "creature": [ { - "type": "species:wraptor", + "type": "tfg:wraptor", "maxCount": 2, "minCount": 1, "weight": 100 diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json index 304c71094..0fc243448 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json @@ -72,7 +72,7 @@ "axolotls": [], "creature": [ { - "type": "species:wraptor", + "type": "tfg:wraptor", "maxCount": 2, "minCount": 1, "weight": 50 diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json b/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json index f7eb9f539..c5801a6d1 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json @@ -75,7 +75,7 @@ "axolotls": [], "creature": [ { - "type": "species:wraptor", + "type": "tfg:wraptor", "maxCount": 2, "minCount": 1, "weight": 50 diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json index 3745a481c..968981e67 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json @@ -38,7 +38,10 @@ [], [], "#tfg:mars_veins", - [], + [ + "tfg:mars/terrain/clay_disc", + "tfg:mars/terrain/kaolin_clay_disc" + ], [ "tfg:mars_forest", "tfc:raw_boulder", @@ -79,7 +82,7 @@ "weight": 10 }, { - "type": "species:wraptor", + "type": "tfg:wraptor", "maxCount": 4, "minCount": 2, "weight": 100 diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json index 2fac9938b..0561ce8cf 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json @@ -36,7 +36,9 @@ [], [], "#tfg:mars_veins", - [], + [ + "tfg:mars/terrain/clay_disc" + ], [ "tfg:mars_forest", "tfg:mars/semiheavy_ammoniacal_water" @@ -74,7 +76,7 @@ "weight": 100 }, { - "type": "species:wraptor", + "type": "tfg:wraptor", "maxCount": 4, "minCount": 2, "weight": 100 diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json index 30bbb9f21..f0b20e7d0 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json @@ -38,7 +38,10 @@ [], [], "#tfg:mars_veins", - [], + [ + "tfg:mars/terrain/clay_disc", + "tfg:mars/terrain/kaolin_clay_disc" + ], [ "tfg:mars_forest", "tfc:raw_boulder", @@ -79,7 +82,7 @@ "weight": 20 }, { - "type": "species:wraptor", + "type": "tfg:wraptor", "maxCount": 4, "minCount": 2, "weight": 100 diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json index d1602f32f..a9f852556 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json @@ -36,7 +36,9 @@ [], [], "#tfg:mars_veins", - [], + [ + "tfg:mars/terrain/clay_disc" + ], [ "tfg:mars_forest", "tfg:mars/semiheavy_ammoniacal_water" @@ -74,7 +76,7 @@ "weight": 100 }, { - "type": "species:wraptor", + "type": "tfg:wraptor", "maxCount": 4, "minCount": 2, "weight": 100 diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/pitcher_plant.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/pitcher_plant.json index 058c49e57..a650f7a23 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/pitcher_plant.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/pitcher_plant.json @@ -61,8 +61,8 @@ } ] }, - "tries": 8, - "xz_spread": 16, - "y_spread": 2 + "tries": 16, + "xz_spread": 6, + "y_spread": 1 } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/torchflower.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/torchflower.json index 4c58a4854..a976b59b8 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/torchflower.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/torchflower.json @@ -33,8 +33,8 @@ } ] }, - "tries": 8, - "xz_spread": 16, - "y_spread": 2 + "tries": 16, + "xz_spread": 6, + "y_spread": 1 } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/clay_disc.json b/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/clay_disc.json new file mode 100644 index 000000000..0ea0d966e --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/clay_disc.json @@ -0,0 +1,53 @@ +{ + "type": "tfc:if_then", + "config": { + "if": { + "feature": { + "type": "tfc:soil_disc", + "config": { + "min_radius": 3, + "max_radius": 5, + "height": 3, + "states": [ + { + "replace": "tfg:grass/mars_dirt", + "with": "tfg:grass/mars_clay_dirt" + }, + { + "replace": "tfg:grass/amber_mycelium", + "with": { + "Name": "tfg:grass/amber_clay_mycelium", + "Properties": { + "snowy": "false" + } + } + }, + { + "replace": "tfg:grass/rusticus_mycelium", + "with": { + "Name": "tfg:grass/rusticus_clay_mycelium", + "Properties": { + "snowy": "false" + } + } + }, + { + "replace": "tfg:grass/sangnum_mycelium", + "with": { + "Name": "tfg:grass/sangnum_clay_mycelium", + "Properties": { + "snowy": "false" + } + } + } + ] + } + }, + "placement": [] + }, + "then": { + "feature": "tfg:mars/surface/pitcher_plant", + "placement": [] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/kaolin_clay_disc.json b/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/kaolin_clay_disc.json new file mode 100644 index 000000000..90b0db7be --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/kaolin_clay_disc.json @@ -0,0 +1,53 @@ +{ + "type": "tfc:if_then", + "config": { + "if": { + "feature": { + "type": "tfc:soil_disc", + "config": { + "min_radius": 7, + "max_radius": 9, + "height": 6, + "states": [ + { + "replace": "tfg:grass/mars_dirt", + "with": "tfc:red_kaolin_clay" + }, + { + "replace": "tfg:grass/amber_mycelium", + "with": { + "Name": "tfg:grass/amber_kaolin_mycelium", + "Properties": { + "snowy": "false" + } + } + }, + { + "replace": "tfg:grass/rusticus_mycelium", + "with": { + "Name": "tfg:grass/rusticus_kaolin_mycelium", + "Properties": { + "snowy": "false" + } + } + }, + { + "replace": "tfg:grass/sangnum_mycelium", + "with": { + "Name": "tfg:grass/sangnum_kaolin_mycelium", + "Properties": { + "snowy": "false" + } + } + } + ] + } + }, + "placement": [] + }, + "then": { + "feature": "tfg:mars/surface/torchflower", + "placement": [] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pitcher_plant.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pitcher_plant.json index 3f6047989..312f059cc 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pitcher_plant.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pitcher_plant.json @@ -1,26 +1,9 @@ { "feature": "tfg:mars/surface/pitcher_plant", "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 1 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:biome" - }, { "type": "minecraft:heightmap", "heightmap": "WORLD_SURFACE" - }, - { - "type": "tfc:near_fluid", - "radius": 6, - "fluids": [ - "tfg:semiheavy_ammoniacal_water" - ] } ] } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/torchflower.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/torchflower.json index 19d41518f..04e20b88a 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/torchflower.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/torchflower.json @@ -1,16 +1,6 @@ { "feature": "tfg:mars/surface/torchflower", "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 2 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:biome" - }, { "type": "minecraft:heightmap", "heightmap": "WORLD_SURFACE" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/clay_disc.json b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/clay_disc.json new file mode 100644 index 000000000..c49b6f888 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/clay_disc.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:mars/terrain/clay_disc", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 20 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE_WG" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/kaolin_clay_disc.json b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/kaolin_clay_disc.json new file mode 100644 index 000000000..f36c409cf --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/kaolin_clay_disc.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:mars/terrain/kaolin_clay_disc", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 50 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE_WG" + }, + { + "type": "minecraft:biome" + } + ] +} \ 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 c1742fdac..17629ee50 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -239,9 +239,16 @@ const registerAdAstraBlockTags = (event) => { event.add('tfg:mars_soil', 'tfc:sand/red') event.add('tfg:mars_soil', 'tfc:sand/pink') event.add('tfg:mars_soil', 'tfg:grass/mars_dirt') - event.add('tfg:mars_soil', 'tfg:grass/rusticus_mycelium') + event.add('tfg:mars_soil', 'tfg:grass/mars_clay_dirt') event.add('tfg:mars_soil', 'tfg:grass/amber_mycelium') + event.add('tfg:mars_soil', 'tfg:grass/rusticus_mycelium') event.add('tfg:mars_soil', 'tfg:grass/sangnum_mycelium') + event.add('tfg:mars_soil', 'tfg:grass/amber_clay_mycelium') + event.add('tfg:mars_soil', 'tfg:grass/rusticus_clay_mycelium') + event.add('tfg:mars_soil', 'tfg:grass/sangnum_clay_mycelium') + event.add('tfg:mars_soil', 'tfg:grass/amber_kaolin_mycelium') + event.add('tfg:mars_soil', 'tfg:grass/rusticus_kaolin_mycelium') + event.add('tfg:mars_soil', 'tfg:grass/sangnum_kaolin_mycelium') event.add('ad_astra:mars_stone_replaceables', '#tfg:mars_soil') event.add('minecraft:animals_spawnable_on', '#tfg:mars_soil') @@ -388,8 +395,7 @@ const registerAdAstraEntityTypeTags = (event) => { event.add('tfg:ignores_gravity', 'species:birt') event.add('tfg:ignores_gravity', 'ad_astra:star_crawler') - event.add('tfg:ignores_gravity', 'species:wraptor') - event.add('tfg:ignores_gravity', 'wan_ancient_beasts:crusher') + event.add('tfg:ignores_gravity', 'wan_ancient_beasts:walker') event.add('tfg:ignores_gravity', 'wan_ancient_beasts:soarer') event.add('tfg:ignores_gravity', 'wan_ancient_beasts:glider') } @@ -428,7 +434,6 @@ const registerAdAstraPlacedFeatures = (event) => { event.add("tfg:mars_amber_small_plants", "tfg:mars/surface/flammalix") event.add("tfg:mars_amber_small_plants", "tfg:mars/surface/lutebus") event.add("tfg:mars_amber_small_plants", "tfg:mars/surface/orango") - event.add("tfg:mars_amber_small_plants", "tfg:mars/surface/torchflower") event.add("tfg:mars_rusticus_small_plants", "tfg:mars/crop/amber_root") event.add("tfg:mars_rusticus_small_plants", "tfg:mars/crop/blossom_berry") @@ -441,9 +446,7 @@ const registerAdAstraPlacedFeatures = (event) => { event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/lamellarium") event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/lutebus") event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/orango") - event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/pitcher_plant") event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/ruscus") - event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/torchflower") event.add("tfg:mars_sangnum_small_plants", "tfg:mars/crop/blossom_berry") event.add("tfg:mars_sangnum_small_plants", "tfg:mars/crop/bolux_mushroom") @@ -455,7 +458,6 @@ const registerAdAstraPlacedFeatures = (event) => { event.add("tfg:mars_sangnum_small_plants", "tfg:mars/surface/flamaea") event.add("tfg:mars_sangnum_small_plants", "tfg:mars/surface/globulagus") event.add("tfg:mars_sangnum_small_plants", "tfg:mars/surface/lamellarium") - event.add("tfg:mars_sangnum_small_plants", "tfg:mars/surface/pitcher_plant") event.add("tfg:mars_sangnum_small_plants", "tfg:mars/surface/ruscus") event.add("tfg:mars_global_small_plants", "tfg:mars/surface/small_amaranita_mushroom") diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index b272df7de..9c31a059b 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -472,23 +472,44 @@ const registerTFGBlockTags = (event) => { // #region Mars blocks event.add('minecraft:dirt', 'tfg:grass/mars_dirt') + event.add('minecraft:dirt', 'tfg:grass/mars_clay_dirt') event.add('minecraft:dirt', 'tfg:grass/amber_mycelium') event.add('minecraft:dirt', 'tfg:grass/rusticus_mycelium') event.add('minecraft:dirt', 'tfg:grass/sangnum_mycelium') + event.add('minecraft:dirt', 'tfg:grass/amber_clay_mycelium') + event.add('minecraft:dirt', 'tfg:grass/rusticus_clay_mycelium') + event.add('minecraft:dirt', 'tfg:grass/sangnum_clay_mycelium') + event.add('minecraft:dirt', 'tfg:grass/amber_kaolin_mycelium') + event.add('minecraft:dirt', 'tfg:grass/rusticus_kaolin_mycelium') + event.add('minecraft:dirt', 'tfg:grass/sangnum_kaolin_mycelium') event.add('tfc:dirt', 'tfg:grass/mars_dirt') + event.add('tfc:dirt', 'tfg:grass/mars_clay_dirt') event.add('tfc:farmland', 'tfg:grass/mars_farmland') event.add('tfc:grass', 'tfg:grass/amber_mycelium') event.add('tfc:grass', 'tfg:grass/rusticus_mycelium') event.add('tfc:grass', 'tfg:grass/sangnum_mycelium') + event.add('tfc:grass', 'tfg:grass/amber_clay_mycelium') + event.add('tfc:grass', 'tfg:grass/rusticus_clay_mycelium') + event.add('tfc:grass', 'tfg:grass/sangnum_clay_mycelium') + event.add('tfc:grass', 'tfg:grass/amber_kaolin_mycelium') + event.add('tfc:grass', 'tfg:grass/rusticus_kaolin_mycelium') + event.add('tfc:grass', 'tfg:grass/sangnum_kaolin_mycelium') event.add('tfg:do_not_destroy_in_space', 'tfg:grass/amber_mycelium') event.add('tfg:do_not_destroy_in_space', 'tfg:grass/rusticus_mycelium') event.add('tfg:do_not_destroy_in_space', 'tfg:grass/sangnum_mycelium') event.add('tfg:do_not_destroy_in_space', 'tfg:grass/mars_farmland') event.add('tfc:can_landslide', 'tfg:grass/mars_dirt') + event.add('tfc:can_landslide', 'tfg:grass/mars_clay_dirt') event.add('tfc:can_landslide', 'tfg:grass/mars_farmland') event.add('tfc:can_landslide', 'tfg:grass/amber_mycelium') event.add('tfc:can_landslide', 'tfg:grass/rusticus_mycelium') event.add('tfc:can_landslide', 'tfg:grass/sangnum_mycelium') + event.add('tfc:can_landslide', 'tfg:grass/amber_clay_mycelium') + event.add('tfc:can_landslide', 'tfg:grass/rusticus_clay_mycelium') + event.add('tfc:can_landslide', 'tfg:grass/sangnum_clay_mycelium') + event.add('tfc:can_landslide', 'tfg:grass/amber_kaolin_mycelium') + event.add('tfc:can_landslide', 'tfg:grass/rusticus_kaolin_mycelium') + event.add('tfc:can_landslide', 'tfg:grass/sangnum_kaolin_mycelium') event.add('minecraft:mushroom_grow_block', '#tfc:dirt') event.add('minecraft:mushroom_grow_block', '#tfc:grass') event.add('minecraft:mineable/shovel', 'tfg:grass/mars_farmland')