Added bandit spawners

src/main/java/com/teammetallurgy/atum/world/gen/feature/pool/GenericVillagePools.java

@@ -20,9 +20,12 @@ public static void init() {
         JigsawPatternRegistry.func_244094_a(new JigsawPattern(terminators, new ResourceLocation("empty"), ImmutableList.of(Pair.of(JigsawPiece.func_242849_a("atum:village/generic/terminators/terminator_1"), 1)), JigsawPattern.PlacementBehaviour.TERRAIN_MATCHING));
         JigsawPatternRegistry.func_244094_a(new JigsawPattern(new ResourceLocation(Atum.MOD_ID, "village/generic/decor"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(JigsawPiece.func_242849_a("atum:village/generic/decor/torch_1"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/decor/torch_2"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/decor/torch_3"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/decor/torch_4"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/decor/tree_1"), 1), Pair.of(JigsawPiece.func_242864_g(), 10)), JigsawPattern.PlacementBehaviour.RIGID));
         JigsawPatternRegistry.func_244094_a(new JigsawPattern(new ResourceLocation(Atum.MOD_ID, "village/generic/villagers"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/nitwit_human_male"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/nitwit_human_female"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/baby_human_male"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/baby_human_female"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/unemployed_human_male"), 15), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/unemployed_human_female"), 15)), JigsawPattern.PlacementBehaviour.RIGID));
+        //JigsawPatternRegistry.func_244094_a(new JigsawPattern(new ResourceLocation(Atum.MOD_ID, "village/generic/villagers"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/nitwit_human_male"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/nitwit_human_female"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/nitwit_efreet_male"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/nitwit_efreet_female"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/nitwit_shabti_male"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/nitwit_shabti_female"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/nitwit_sylph_male"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/nitwit_sylph_female"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/nitwit_avi_male"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/nitwit_avi_female"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/nitwit_sphinx_male"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/nitwit_sphinx_female"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/baby_human_male"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/baby_human_female"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/baby_efreet_male"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/baby_efreet_female"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/baby_shabti_male"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/baby_shabti_female"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/baby_sylph_male"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/baby_sylph_female"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/baby_avi_male"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/baby_avi_female"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/baby_sphinx_male"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/baby_sphinx_female"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/unemployed_human_male"), 15), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/unemployed_human_female"), 15), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/unemployed_efreet_male"), 15), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/unemployed_efreet_female"), 15), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/unemployed_shabti_male"), 15), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/unemployed_shabti_female"), 15), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/unemployed_sylph_male"), 15), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/unemployed_sylph_female"), 15), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/unemployed_avi_male"), 15), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/unemployed_avi_female"), 15), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/unemployed_sphinx_male"), 15), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/unemployed_sphinx_female"), 15)), JigsawPattern.PlacementBehaviour.RIGID));
+
+        //Universal
         JigsawPatternRegistry.func_244094_a(new JigsawPattern(new ResourceLocation(Atum.MOD_ID, "village/camels"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(JigsawPiece.func_242849_a("atum:village/animals/camel"), 1)), JigsawPattern.PlacementBehaviour.RIGID));
         JigsawPatternRegistry.func_244094_a(new JigsawPattern(new ResourceLocation(Atum.MOD_ID, "village/quails"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(JigsawPiece.func_242849_a("atum:village/animals/quail"), 1)), JigsawPattern.PlacementBehaviour.RIGID));
         JigsawPatternRegistry.func_244094_a(new JigsawPattern(new ResourceLocation(Atum.MOD_ID, "village/desert_wolfs"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(JigsawPiece.func_242849_a("atum:village/animals/desert_wolf"), 10), Pair.of(JigsawPiece.func_242849_a("atum:village/animals/alpha_desert_wolf"), 1)), JigsawPattern.PlacementBehaviour.RIGID));
-        //JigsawPatternRegistry.func_244094_a(new JigsawPattern(new ResourceLocation(Atum.MOD_ID, "village/generic/villagers"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/nitwit_human_male"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/nitwit_human_female"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/nitwit_efreet_male"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/nitwit_efreet_female"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/nitwit_shabti_male"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/nitwit_shabti_female"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/nitwit_sylph_male"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/nitwit_sylph_female"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/nitwit_avi_male"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/nitwit_avi_female"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/nitwit_sphinx_male"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/nitwit_sphinx_female"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/baby_human_male"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/baby_human_female"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/baby_efreet_male"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/baby_efreet_female"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/baby_shabti_male"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/baby_shabti_female"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/baby_sylph_male"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/baby_sylph_female"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/baby_avi_male"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/baby_avi_female"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/baby_sphinx_male"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/baby_sphinx_female"), 1), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/unemployed_human_male"), 15), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/unemployed_human_female"), 15), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/unemployed_efreet_male"), 15), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/unemployed_efreet_female"), 15), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/unemployed_shabti_male"), 15), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/unemployed_shabti_female"), 15), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/unemployed_sylph_male"), 15), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/unemployed_sylph_female"), 15), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/unemployed_avi_male"), 15), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/unemployed_avi_female"), 15), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/unemployed_sphinx_male"), 15), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/villagers/unemployed_sphinx_female"), 15)), JigsawPattern.PlacementBehaviour.RIGID));
+        JigsawPatternRegistry.func_244094_a(new JigsawPattern(new ResourceLocation(Atum.MOD_ID, "village/spawner/bandits"), new ResourceLocation("empty"), ImmutableList.of(Pair.of(JigsawPiece.func_242849_a("atum:village/spawner/bandits/barbarian"), 2), Pair.of(JigsawPiece.func_242849_a("atum:village/spawner/bandits/brigand"), 5), Pair.of(JigsawPiece.func_242849_a("atum:village/spawner/bandits/nomad"), 5)), JigsawPattern.PlacementBehaviour.RIGID));
     }
 }

src/main/java/com/teammetallurgy/atum/world/gen/structure/GatehouseStructure.java

@@ -1,18 +1,8 @@
 package com.teammetallurgy.atum.world.gen.structure;
 
 import com.mojang.serialization.Codec;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.MutableBoundingBox;
-import net.minecraft.util.registry.DynamicRegistries;
-import net.minecraft.world.biome.Biome;
-import net.minecraft.world.gen.ChunkGenerator;
-import net.minecraft.world.gen.feature.jigsaw.JigsawManager;
-import net.minecraft.world.gen.feature.jigsaw.JigsawPatternRegistry;
-import net.minecraft.world.gen.feature.structure.AbstractVillagePiece;
 import net.minecraft.world.gen.feature.structure.JigsawStructure;
-import net.minecraft.world.gen.feature.structure.MarginedStructureStart;
 import net.minecraft.world.gen.feature.structure.VillageConfig;
-import net.minecraft.world.gen.feature.template.TemplateManager;
 
 public class GatehouseStructure extends JigsawStructure {