Merge branch 'Structure-Fixes-Round-2' into 'main'

Series 2 of 1.8 Structure Fixes

See merge request cable-mc/cobblemon!2238

common/src/main/resources/data/cobblemon/loot_table/injection/chests/jungle_temple.json

@@ -25,6 +25,32 @@
           "chance": 0.273
         }
       ]
+    },
+    {
+      "rolls": 1,
+      "bonus_rolls": 0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:technical_machine",
+          "functions": [
+            {
+              "function": "minecraft:set_components",
+              "components": {
+                "cobblemon:tm_move": {
+                  "move": "grasspledge"
+                }
+              }
+            }
+          ]
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:random_chance",
+          "chance": 0.45
+        }
+      ]
     }
   ]
 }

common/src/main/resources/data/cobblemon/loot_table/injection/chests/nether_bridge.json

@@ -22,6 +22,32 @@
           "chance": 0.45
         }
       ]
+    },
+    {
+      "rolls": 1,
+      "bonus_rolls": 0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:technical_machine",
+          "functions": [
+            {
+              "function": "minecraft:set_components",
+              "components": {
+                "cobblemon:tm_move": {
+                  "move": "firepledge"
+                }
+              }
+            }
+          ]
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:random_chance",
+          "chance": 0.45
+        }
+      ]
     }
   ]
 }

common/src/main/resources/data/cobblemon/loot_table/injection/chests/shipwreck_supply.json

@@ -25,6 +25,32 @@
           "chance": 0.273
         }
       ]
+    },
+    {
+      "rolls": 1,
+      "bonus_rolls": 0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "cobblemon:technical_machine",
+          "functions": [
+            {
+              "function": "minecraft:set_components",
+              "components": {
+                "cobblemon:tm_move": {
+                  "move": "waterpledge"
+                }
+              }
+            }
+          ]
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:random_chance",
+          "chance": 0.45
+        }
+      ]
     }
   ]
 }

common/src/main/resources/data/cobblemon/loot_table/ruins/gilded_chests/ruins.json

@@ -217,30 +217,6 @@
                     "weight": 1
                 }
             ]
-        },
-        {
-            "rolls": {
-                "type": "minecraft:uniform",
-                "max": 1.0,
-                "min": 1.0
-            },
-            "bonus_rolls": 0.0,
-            "entries": [
-                {
-                    "type": "minecraft:item",
-                    "name": "cobblemon:technical_machine",
-                    "functions": [
-                        {
-                            "function": "minecraft:set_components",
-                            "components": {
-                                "cobblemon:tm_move": {
-                                    "move": "lashout"
-                                }
-                            }
-                        }
-                    ]
-                }
-            ]
         }
     ],
     "random_sequence": "cobblemon:ruins/gilded_chests/ruins"

common/src/main/resources/data/cobblemon/tags/worldgen/structure/habitats/habitats.json

@@ -22,8 +22,8 @@
     "cobblemon:habitats/oak_wildfire_scar",
     "cobblemon:habitats/parched_peat_bog",
     "cobblemon:habitats/pinkflowerbed_clearing",
-    "cobblemon:habitats/reclaimed_deserted_monument_ruins",
-    "cobblemon:habitats/reclaimed_lush_monument_ruins",
+    "cobblemon:habitats/reclaimed_deserted_monument",
+    "cobblemon:habitats/reclaimed_lush_monument",
     "cobblemon:habitats/rocky_outcrop",
     "cobblemon:habitats/sandpit_clearing",
     "cobblemon:habitats/snowy_burrow",

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

@@ -7,7 +7,7 @@
         },
         {
             "type": "minecraft:rarity_filter",
-            "chance": 2
+            "chance": 1
         },
         {
             "type": "minecraft:height_range",
@@ -45,7 +45,7 @@
                 ],
                 "offset": [
                     0,
-                    -1,
+                    1,
                     0
                 ]
             }

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

@@ -7,7 +7,7 @@
         },
         {
             "type": "minecraft:rarity_filter",
-            "chance": 40
+            "chance": 150
         },
         {
             "type": "minecraft:height_range",

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

@@ -7,7 +7,7 @@
         },
         {
             "type": "minecraft:rarity_filter",
-            "chance": 5
+            "chance": 15
         },
         {
             "type": "minecraft:height_range",

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

@@ -7,7 +7,7 @@
         },
         {
             "type": "minecraft:rarity_filter",
-            "chance": 50
+            "chance": 200
         },
         {
             "type": "minecraft:height_range",

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

@@ -7,7 +7,7 @@
         },
         {
             "type": "minecraft:rarity_filter",
-            "chance": 5
+            "chance": 40
         },
         {
             "type": "minecraft:height_range",

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

@@ -7,7 +7,7 @@
         },
         {
             "type": "minecraft:rarity_filter",
-            "chance": 5
+            "chance": 40
         },
         {
             "type": "minecraft:height_range",

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

@@ -7,7 +7,7 @@
         },
         {
             "type": "minecraft:rarity_filter",
-            "chance": 20
+            "chance": 60
         },
         {
             "type": "minecraft:height_range",

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

@@ -7,7 +7,7 @@
         },
         {
             "type": "minecraft:rarity_filter",
-            "chance": 10
+            "chance": 120
         },
         {
             "type": "minecraft:height_range",

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

@@ -7,7 +7,7 @@
         },
         {
             "type": "minecraft:rarity_filter",
-            "chance": 10
+            "chance": 20
         },
         {
             "type": "minecraft:biome"

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

@@ -7,7 +7,7 @@
         },
         {
             "type": "minecraft:rarity_filter",
-            "chance": 30
+            "chance": 45
         },
         {
             "type": "minecraft:biome"

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

@@ -7,7 +7,7 @@
         },
         {
             "type": "minecraft:rarity_filter",
-            "chance": 5
+            "chance": 10
         },
         {
             "type": "minecraft:biome"

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

@@ -7,7 +7,7 @@
         },
         {
             "type": "minecraft:rarity_filter",
-            "chance": 40
+            "chance": 85
         },
         {
             "type": "minecraft:height_range",

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

@@ -7,7 +7,7 @@
         },
         {
             "type": "minecraft:rarity_filter",
-            "chance": 40
+            "chance": 100
         },
         {
             "type": "minecraft:height_range",

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

@@ -7,7 +7,7 @@
         },
         {
             "type": "minecraft:rarity_filter",
-            "chance": 30
+            "chance": 80
         },
         {
             "type": "minecraft:height_range",

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

@@ -7,7 +7,7 @@
         },
         {
             "type": "minecraft:rarity_filter",
-            "chance": 40
+            "chance": 140
         },
         {
             "type": "minecraft:height_range",

common/src/main/resources/data/cobblemon/worldgen/placed_feature/ruins/crumbling_arch.json

@@ -7,7 +7,7 @@
         },
         {
             "type": "minecraft:rarity_filter",
-            "chance": 20
+            "chance": 60
         },
         {
             "type": "minecraft:height_range",

common/src/main/resources/data/cobblemon/worldgen/placed_feature/ruins/rooted_arch.json

@@ -7,7 +7,7 @@
         },
         {
             "type": "minecraft:rarity_filter",
-            "chance": 10
+            "chance": 40
         },
         {
             "type": "minecraft:height_range",

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

@@ -13,7 +13,7 @@
                         "predicate_type": "minecraft:always_true"
                     },
                     "output_state": {
-                        "Name": "minecraft:air"
+                        "Name": "minecraft:water"
                     }
                 }
             ]

common/src/main/resources/data/cobblemon/worldgen/structure/habitats/natural_lightningrod.json

@@ -1,5 +1,5 @@
 {
-    "biomes": "#minecraft:stony_peaks",
+    "biomes": "#cobblemon:is_mountain",
     "spawn_overrides": {},
     "type": "minecraft:jigsaw",
     "start_pool": "cobblemon:habitats/natural_lightningrod_start",

common/src/main/resources/data/cobblemon/worldgen/structure/habitats/sandpit_clearing.json

@@ -1,5 +1,5 @@
 {
-    "biomes": "#cobblemon:has_block/sand",
+    "biomes": "#cobblemon:is_grassland",
     "spawn_overrides": {},
     "type": "minecraft:jigsaw",
     "start_pool": "cobblemon:habitats/sandpit_clearing_start",

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

@@ -1,8 +1,8 @@
 {
     "placement": {
         "type": "minecraft:random_spread",
-        "spacing": 32,
-        "separation": 16,
+        "spacing": 30,
+        "separation": 14,
         "salt": 1892293476,
         "spread_type": "triangular"
     },

common/src/main/resources/data/cobblemon/worldgen/template_pool/habitats/fae_mounds_connector.json

@@ -73,7 +73,7 @@
             }
         },
         {
-            "weight": 14,
+            "weight": 10,
             "element": {
                 "element_type": "minecraft:empty_pool_element"
             }

common/src/main/resources/data/cobblemon/worldgen/template_pool/habitats/sandpit_clearing_connector.json

@@ -83,7 +83,7 @@
             }
         },
         {
-            "weight": 40,
+            "weight": 50,
             "element": {
                 "element_type": "minecraft:empty_pool_element"
             }