Merge branch 'More-Structure-Fixes' into 'main'

More structure fixes

See merge request cable-mc/cobblemon!2491

common/src/main/resources/data/cobblemon/worldgen/placed_feature/fossils/prehistoric_eroded_pillar.json

@@ -7,7 +7,7 @@
         },
         {
             "type": "minecraft:rarity_filter",
-            "chance": 400
+            "chance": 300
         },
         {
             "type": "minecraft:heightmap",

common/src/main/resources/data/cobblemon/worldgen/placed_feature/fossils/prehistoric_frozen_pond.json

@@ -7,7 +7,7 @@
         },
         {
             "type": "minecraft:rarity_filter",
-            "chance": 200
+            "chance": 100
         },
         {
             "type": "minecraft:heightmap",
@@ -23,7 +23,7 @@
                 ],
                 "offset": [
                     0,
-                    0,
+                    -1,
                     0
                 ]
             },

common/src/main/resources/data/cobblemon/worldgen/placed_feature/fossils/prehistoric_frozen_spike.json

@@ -7,7 +7,7 @@
         },
         {
             "type": "minecraft:rarity_filter",
-            "chance": 200
+            "chance": 100
         },
         {
             "type": "minecraft:heightmap",
@@ -23,7 +23,7 @@
                 ],
                 "offset": [
                     0,
-                    0,
+                    -1,
                     0
                 ]
             },
@@ -46,7 +46,7 @@
         },
         {
             "type": "minecraft:random_offset",
-            "y_spread": -1,
+            "y_spread": -2,
             "xz_spread": 0
         }
     ]

common/src/main/resources/data/cobblemon/worldgen/placed_feature/fossils/prehistoric_lush_den.json

@@ -14,30 +14,12 @@
             "heightmap": "WORLD_SURFACE_WG"
         },
         {
-            "type": "minecraft:environment_scan",
-            "allowed_search_condition": {
-                "type": "minecraft:matching_blocks",
-                "blocks": [
-                    "minecraft:grass_block"
-                ],
-                "offset": [
-                    0,
-                    0,
-                    0
-                ]
-            },
-            "direction_of_search": "up",
-            "max_steps": 3,
-            "target_condition": {
-                "type": "minecraft:matching_blocks",
-                "blocks": [
-                    "minecraft:air"
-                ],
-                "offset": [
-                    0,
-                    1,
-                    0
-                ]
+            "type": "minecraft:block_predicate_filter",
+            "predicate": {
+                "type": "minecraft:would_survive",
+                "state": {
+                    "Name": "minecraft:oak_sapling"
+                }
             }
         },
         {

common/src/main/resources/data/cobblemon/worldgen/placed_feature/habitats/root_nurseries.json

@@ -17,10 +17,10 @@
             "height": {
                 "type": "minecraft:uniform",
                 "min_inclusive": {
-                    "absolute": 68
+                    "absolute": 64
                 },
                 "max_inclusive": {
-                    "absolute": 64
+                    "absolute": 68
                 }
             }
         },

common/src/main/resources/data/cobblemon/worldgen/processor_list/habitats/berry_patch.json

@@ -45,7 +45,11 @@
                         "predicate_type": "minecraft:always_true"
                     },
                     "output_state": {
-                        "Name": "minecraft:oak_leaves"
+                        "Name": "minecraft:oak_leaves",
+                        "Properties": {
+                            "persistent": "true",
+                            "waterlogged": "false"
+                        }
                     }
                 }
             ]

common/src/main/resources/data/cobblemon/worldgen/processor_list/habitats/berry_patch_start.json

@@ -53,7 +53,11 @@
                             "predicate_type": "minecraft:always_true"
                         },
                         "output_state": {
-                            "Name": "minecraft:oak_leaves"
+                            "Name": "minecraft:oak_leaves",
+                            "Properties": {
+                                "persistent": "true",
+                                "waterlogged": "false"
+                            }
                         }
                     }
                 ]

common/src/main/resources/data/cobblemon/worldgen/structure_set/shipwreck_coves.json

@@ -1,6 +1,10 @@
 {
     "placement": {
         "type": "minecraft:random_spread",
+        "exclusion_zone": {
+            "chunk_count": 8,
+            "other_set": "minecraft:strongholds"
+        },
         "salt": 94251327,
         "separation": 50,
         "spacing": 100,