Add remaining raider camps

src/main/java/com/minecolonies/core/entity/pathfinding/pathjobs/PathJobRandomPos.java

@@ -158,18 +158,6 @@ public void setPathingOptions(final PathingOptions pathingOptions)
         getPathingOptions().canDrop = false;
     }
 
-    /**
-     * Checks if position and range match the given parameters
-     *
-     * @param range max dist to dest range
-     * @param pos   dest to look from
-     * @return
-     */
-    public boolean posAndRangeMatch(final int range, final BlockPos pos)
-    {
-        return;
-    }
-
     @Override
     public BlockPos getDestination()
     {

src/main/resources/data/minecolonies/tags/worldgen/biome/has_structure/amazon_camp.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "#minecraft:is_jungle"
+  ]
+}

src/main/resources/data/minecolonies/tags/worldgen/biome/has_structure/barbarian_camp.json

@@ -0,0 +1,17 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:plains",
+    "#forge:is_plains",
+    "minecraft:sunflower_plains",
+    "minecraft:snowy_plains",
+    "minecraft:forest",
+    "#minecraft:is_forest",
+    "minecraft:flower_forest",
+    "minecraft:birch_forest",
+    "minecraft:old_growth_birch_forest",
+    "minecraft:windswept_hills",
+    "minecraft:windswept_forest",
+    "minecraft:meadow"
+  ]
+}

src/main/resources/data/minecolonies/tags/worldgen/biome/has_structure/desert_camp.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "#forge:is_desert"
+  ]
+}

src/main/resources/data/minecolonies/tags/worldgen/biome/has_structure/desertoasis_colony.json

@@ -1,6 +1,6 @@
 {
   "replace": false,
   "values": [
-    "minecraft:desert"
+    "#forge:is_desert"
   ]
 }

src/main/resources/data/minecolonies/worldgen/processor_list/placeholder_replacement_desert.json

@@ -0,0 +1,44 @@
+{
+  "processors": [
+    {
+      "blocks": [
+        {
+          "Name": "structurize:blocksubstitution"
+        },
+        {
+          "Name": "minecolonies:blockwaypoint"
+        }
+      ],
+      "processor_type": "minecraft:block_ignore"
+    },
+    {
+      "rules": [
+        {
+          "output_state": {
+            "Name": "minecraft:sand"
+          },
+          "input_predicate": {
+            "block": "structurize:blocksolidsubstitution",
+            "predicate_type": "minecraft:block_match"
+          },
+          "location_predicate": {
+            "predicate_type": "minecraft:always_true"
+          }
+        },
+        {
+          "output_state": {
+            "Name": "minecraft:water"
+          },
+          "input_predicate": {
+            "block": "structurize:blockfluidsubstitution",
+            "predicate_type": "minecraft:block_match"
+          },
+          "location_predicate": {
+            "predicate_type": "minecraft:always_true"
+          }
+        }
+      ],
+      "processor_type": "minecraft:rule"
+    }
+  ]
+}

src/main/resources/data/minecolonies/worldgen/structure/amazon_camp.json

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:jigsaw",
+  "biomes": "#minecolonies:has_structure/amazon_camp",
+  "adapt_noise": false,
+  "start_pool": "minecolonies:amazon_camp",
+  "spawn_overrides": {},
+  "size": 7,
+  "step": "surface_structures",
+
+  "start_height": {
+    "absolute": 0
+  },
+  "project_start_to_heightmap": "WORLD_SURFACE_WG",
+  "max_distance_from_center": 16,
+  "use_expansion_hack": false
+}

src/main/resources/data/minecolonies/worldgen/structure/barbarian_camp.json

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:jigsaw",
+  "biomes": "#minecolonies:has_structure/barbarian_camp",
+  "adapt_noise": false,
+  "start_pool": "minecolonies:barbarian_camp",
+  "spawn_overrides": {},
+  "size": 1,
+  "step": "surface_structures",
+
+  "start_height": {
+    "absolute": 0
+  },
+  "project_start_to_heightmap": "WORLD_SURFACE_WG",
+  "max_distance_from_center": 16,
+  "use_expansion_hack": false
+}

src/main/resources/data/minecolonies/worldgen/structure/desert_camp.json

@@ -0,0 +1,17 @@
+{
+  "type": "minecraft:jigsaw",
+  "biomes": "#minecolonies:has_structure/desert_camp",
+  "adapt_noise": false,
+  "start_pool": "minecolonies:desert_camp",
+  "spawn_overrides": {},
+  "size": 1,
+  "step": "surface_structures",
+
+  "start_height": {
+    "absolute": 0
+  },
+  "terrain_adaptation": "beard_box",
+  "project_start_to_heightmap": "WORLD_SURFACE_WG",
+  "max_distance_from_center": 16,
+  "use_expansion_hack": false
+}

src/main/resources/data/minecolonies/worldgen/structure_set/amazon_camp.json

@@ -0,0 +1,14 @@
+{
+  "structures": [
+    {
+      "structure": "minecolonies:amazon_camp",
+      "weight": 1
+    }
+  ],
+  "placement": {
+    "salt": 1223366777,
+    "spacing": 55,
+    "separation": 25,
+    "type": "minecraft:random_spread"
+  }
+}

src/main/resources/data/minecolonies/worldgen/structure_set/barbarian_camp.json

@@ -0,0 +1,14 @@
+{
+  "structures": [
+    {
+      "structure": "minecolonies:barbarian_camp",
+      "weight": 1
+    }
+  ],
+  "placement": {
+    "salt": 1223366777,
+    "spacing": 55,
+    "separation": 25,
+    "type": "minecraft:random_spread"
+  }
+}

src/main/resources/data/minecolonies/worldgen/structure_set/desert_camp.json

@@ -0,0 +1,14 @@
+{
+  "structures": [
+    {
+      "structure": "minecolonies:desert_camp",
+      "weight": 1
+    }
+  ],
+  "placement": {
+    "salt": 1223366777,
+    "spacing": 55,
+    "separation": 25,
+    "type": "minecraft:random_spread"
+  }
+}

src/main/resources/data/minecolonies/worldgen/template_pool/amazon_camp.json

@@ -0,0 +1,15 @@
+{
+  "name": "minecolonies:start_pool",
+  "fallback": "minecraft:empty",
+  "elements": [
+    {
+      "weight": 1,
+      "element": {
+        "location": "minecolonies:camps/amazon/amazon_jungle_pyramid",
+        "processors": "minecolonies:placeholder_replacement",
+        "projection": "rigid",
+        "element_type": "minecraft:single_pool_element"
+      }
+    }
+  ]
+}

src/main/resources/data/minecolonies/worldgen/template_pool/amazon_jungle_pyramid.json

@@ -0,0 +1,132 @@
+{
+  "name": "minecolonies:amazon_jungle_pyramid",
+  "fallback": "minecraft:empty",
+  "elements": [
+    {
+      "weight": 1,
+      "element": {
+        "location": "minecolonies:camps/amazon/amazon_jungle_boss",
+        "processors": "minecolonies:placeholder_replacement",
+        "projection": "rigid",
+        "element_type": "minecraft:single_pool_element"
+      }
+    },
+    {
+      "weight": 1,
+      "element": {
+        "location": "minecolonies:camps/amazon/amazon_jungle_boss2",
+        "processors": "minecolonies:placeholder_replacement",
+        "projection": "rigid",
+        "element_type": "minecraft:single_pool_element"
+      }
+    },
+    {
+      "weight": 10,
+      "element": {
+        "location": "minecolonies:camps/amazon/amazon_jungle_corner",
+        "processors": "minecolonies:placeholder_replacement",
+        "projection": "rigid",
+        "element_type": "minecraft:single_pool_element"
+      }
+    },
+    {
+      "weight": 10,
+      "element": {
+        "location": "minecolonies:camps/amazon/amazon_jungle_intersection",
+        "processors": "minecolonies:placeholder_replacement",
+        "projection": "rigid",
+        "element_type": "minecraft:single_pool_element"
+      }
+    },
+    {
+      "weight": 1,
+      "element": {
+        "location": "minecolonies:camps/amazon/amazon_jungle_ladder",
+        "processors": "minecolonies:placeholder_replacement",
+        "projection": "rigid",
+        "element_type": "minecraft:single_pool_element"
+      }
+    },
+    {
+      "weight": 10,
+      "element": {
+        "location": "minecolonies:camps/amazon/amazon_jungle_pit_shaft",
+        "processors": "minecolonies:placeholder_replacement",
+        "projection": "rigid",
+        "element_type": "minecraft:single_pool_element"
+      }
+    },
+    {
+      "weight": 10,
+      "element": {
+        "location": "minecolonies:camps/amazon/amazon_jungle_ruined_spawner_shaft",
+        "processors": "minecolonies:placeholder_replacement",
+        "projection": "rigid",
+        "element_type": "minecraft:single_pool_element"
+      }
+    },
+    {
+      "weight": 10,
+      "element": {
+        "location": "minecolonies:camps/amazon/amazon_jungle_ruined_spawner_shaft_deadend",
+        "processors": "minecolonies:placeholder_replacement",
+        "projection": "rigid",
+        "element_type": "minecraft:single_pool_element"
+      }
+    },
+    {
+      "weight": 10,
+      "element": {
+        "location": "minecolonies:camps/amazon/amazon_jungle_ruined_shaft",
+        "processors": "minecolonies:placeholder_replacement",
+        "projection": "rigid",
+        "element_type": "minecraft:single_pool_element"
+      }
+    },
+    {
+      "weight": 10,
+      "element": {
+        "location": "minecolonies:camps/amazon/amazon_jungle_spawner_corner",
+        "processors": "minecolonies:placeholder_replacement",
+        "projection": "rigid",
+        "element_type": "minecraft:single_pool_element"
+      }
+    },
+    {
+      "weight": 10,
+      "element": {
+        "location": "minecolonies:camps/amazon/amazon_jungle_spawner_intersection",
+        "processors": "minecolonies:placeholder_replacement",
+        "projection": "rigid",
+        "element_type": "minecraft:single_pool_element"
+      }
+    },
+    {
+      "weight": 10,
+      "element": {
+        "location": "minecolonies:camps/amazon/amazon_jungle_spawner_shaft",
+        "processors": "minecolonies:placeholder_replacement",
+        "projection": "rigid",
+        "element_type": "minecraft:single_pool_element"
+      }
+    },
+    {
+      "weight": 10,
+      "element": {
+        "location": "minecolonies:camps/amazon/amazon_jungle_tnt_shaft",
+        "processors": "minecolonies:placeholder_replacement",
+        "projection": "rigid",
+        "element_type": "minecraft:single_pool_element"
+      }
+    },
+    {
+      "weight": 10,
+      "element": {
+        "location": "minecolonies:camps/amazon/amazon_jungle_trapped_corner",
+        "processors": "minecolonies:placeholder_replacement",
+        "projection": "rigid",
+        "element_type": "minecraft:single_pool_element"
+      }
+    }
+  ]
+}

src/main/resources/data/minecolonies/worldgen/template_pool/barbarian_camp.json

@@ -0,0 +1,24 @@
+{
+  "name": "minecolonies:start_pool",
+  "fallback": "minecraft:empty",
+  "elements": [
+    {
+      "weight": 1,
+      "element": {
+        "location": "minecolonies:camps/large_barbarian_camp",
+        "processors": "minecolonies:placeholder_replacement",
+        "projection": "rigid",
+        "element_type": "minecraft:single_pool_element"
+      }
+    },
+    {
+      "weight": 1,
+      "element": {
+        "location": "minecolonies:camps/small_barbarian_camp",
+        "processors": "minecolonies:placeholder_replacement",
+        "projection": "rigid",
+        "element_type": "minecraft:single_pool_element"
+      }
+    }
+  ]
+}

src/main/resources/data/minecolonies/worldgen/template_pool/desert_camp.json

@@ -0,0 +1,15 @@
+{
+  "name": "minecolonies:start_pool",
+  "fallback": "minecraft:empty",
+  "elements": [
+    {
+      "weight": 1,
+      "element": {
+        "location": "minecolonies:camps/desert_camp",
+        "processors": "minecolonies:placeholder_replacement_desert",
+        "projection": "rigid",
+        "element_type": "minecraft:single_pool_element"
+      }
+    }
+  ]
+}