diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json index e10f32e22..7835bb243 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json @@ -47,7 +47,8 @@ "tfc:raw_boulder", "tfc:cobble_boulder", "tfc:raw_boulder_small_patch", - "tfc:cobble_boulder_small_patch" + "tfc:cobble_boulder_small_patch", + "tfg:mars/surface/rotten_flesh_patch" ], "#tfg:mars_amber_vegetal_decoration", "#tfg:mars_top_layer_modification" diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json index bb20e1a9b..a878dc6f0 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json @@ -37,11 +37,13 @@ [], "#tfg:mars_veins", [ - "tfg:mars/terrain/clay_disc" + "tfg:mars/terrain/clay_disc", + "tfg:mars/terrain/peat_disc" ], [ "tfg:mars_forest", - "tfg:mars/semiheavy_ammoniacal_water" + "tfg:mars/semiheavy_ammoniacal_water", + "tfg:mars/surface/rotten_flesh_patch" ], "#tfg:mars_amber_vegetal_decoration", "#tfg:mars_top_layer_modification" 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 0a4276160..2e5b3d472 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json @@ -42,7 +42,8 @@ "tfc:raw_boulder_small_patch", "tfc:cobble_boulder_small_patch", "tfg:mars/surface/small_skull_and_bones", - "tfg:mars/surface/large_skull_and_bones" + "tfg:mars/surface/large_skull_and_bones", + "tfg:mars/surface/rotten_flesh_patch" ], [ diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json index d900eddc0..7c89848c0 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json @@ -41,7 +41,8 @@ [], [ "tfc:raw_boulder_small_patch", - "tfc:cobble_boulder_small_patch" + "tfc:cobble_boulder_small_patch", + "tfg:mars/surface/rotten_flesh_patch" ], [ diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json index 968981e67..0c4e71478 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json @@ -47,7 +47,8 @@ "tfc:raw_boulder", "tfc:cobble_boulder", "tfc:raw_boulder_small_patch", - "tfc:cobble_boulder_small_patch" + "tfc:cobble_boulder_small_patch", + "tfg:mars/surface/rotten_flesh_patch" ], "#tfg:mars_rusticus_vegetal_decoration", "#tfg:mars_top_layer_modification" diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json index 0561ce8cf..2f7af6365 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json @@ -37,11 +37,13 @@ [], "#tfg:mars_veins", [ - "tfg:mars/terrain/clay_disc" + "tfg:mars/terrain/clay_disc", + "tfg:mars/terrain/peat_disc" ], [ "tfg:mars_forest", - "tfg:mars/semiheavy_ammoniacal_water" + "tfg:mars/semiheavy_ammoniacal_water", + "tfg:mars/surface/rotten_flesh_patch" ], "#tfg:mars_rusticus_vegetal_decoration", "#tfg:mars_top_layer_modification" diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json index f0b20e7d0..0247fa0b8 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json @@ -47,7 +47,8 @@ "tfc:raw_boulder", "tfc:cobble_boulder", "tfc:raw_boulder_small_patch", - "tfc:cobble_boulder_small_patch" + "tfc:cobble_boulder_small_patch", + "tfg:mars/surface/rotten_flesh_patch" ], "#tfg:mars_sangnum_vegetal_decoration", "#tfg:mars_top_layer_modification" diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json index a9f852556..be5ebd817 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json @@ -37,11 +37,13 @@ [], "#tfg:mars_veins", [ - "tfg:mars/terrain/clay_disc" + "tfg:mars/terrain/clay_disc", + "tfg:mars/terrain/peat_disc" ], [ "tfg:mars_forest", - "tfg:mars/semiheavy_ammoniacal_water" + "tfg:mars/semiheavy_ammoniacal_water", + "tfg:mars/surface/rotten_flesh_patch" ], "#tfg:mars_sangnum_vegetal_decoration", "#tfg:mars_top_layer_modification" diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/rotten_flesh_patch.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/rotten_flesh_patch.json new file mode 100644 index 000000000..04d2c2fad --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/rotten_flesh_patch.json @@ -0,0 +1,51 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:weighted_state_provider", + "entries": [ + { + "data": { + "Name": "tfc:groundcover/bone" + }, + "weight": 20 + }, + { + "data": { + "Name": "tfc:groundcover/rotten_flesh" + }, + "weight": 80 + } + ] + } + } + }, + "placement": [ + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + { + "type": "minecraft:matching_block_tag", + "offset": [ 0, -1, 0 ], + "tag": "tfg:mars_soil" + } + ] + } + } + ] + }, + "tries": 8, + "xz_spread": 4, + "y_spread": 2 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/peat_disc.json b/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/peat_disc.json new file mode 100644 index 000000000..e0371073a --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/peat_disc.json @@ -0,0 +1,26 @@ +{ + "type": "tfc:soil_disc", + "config": { + "min_radius": 5, + "max_radius": 9, + "height": 7, + "states": [ + { + "replace": "tfg:grass/mars_dirt", + "with": "tfc:peat" + }, + { + "replace": "tfg:grass/amber_mycelium", + "with": "tfc:peat" + }, + { + "replace": "tfg:grass/rusticus_mycelium", + "with": "tfc:peat" + }, + { + "replace": "tfg:grass/sangnum_mycelium", + "with": "tfc:peat" + } + ] + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/rotten_flesh_patch.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/rotten_flesh_patch.json new file mode 100644 index 000000000..e5fcb63be --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/rotten_flesh_patch.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:mars/surface/rotten_flesh_patch", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 50 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/peat_disc.json b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/peat_disc.json new file mode 100644 index 000000000..e83d66eb2 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/peat_disc.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:mars/terrain/peat_disc", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 100 + }, + { + "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 d50a381ca..df17c038c 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -398,7 +398,11 @@ const registerAdAstraEntityTypeTags = (event) => { event.add('tfg:ignores_gravity', 'species:birt') event.add('tfg:ignores_gravity', 'ad_astra:star_crawler') + // this guy has a bounce animation that looks silly in low grav + event.add('tfg:ignores_gravity', 'wan_ancient_beasts:crusher') + // this huge guy also looks silly in low grav event.add('tfg:ignores_gravity', 'wan_ancient_beasts:walker') + // flying mobs event.add('tfg:ignores_gravity', 'wan_ancient_beasts:soarer') event.add('tfg:ignores_gravity', 'wan_ancient_beasts:glider') } @@ -424,7 +428,7 @@ const registerAdAstraPlacedFeatures = (event) => { event.add('tfg:moon_small_rock_features', 'tfg:moon/surface/pile_black_sand') //#region Mars - + event.add('tfg:mars_veins', 'tfg:mars/terrain/ochrum_blob') // Vegetation event.add("tfg:mars_amber_small_plants", "tfg:mars/crop/amber_root")