Updated more buildings

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

@@ -15,7 +15,7 @@ public class GenericVillagePools {
     public static void init() {
         ResourceLocation terminators = new ResourceLocation(Atum.MOD_ID, "village/generic/terminators");
         JigsawPatternRegistry.func_244094_a(new JigsawPattern(new ResourceLocation(Atum.MOD_ID, "village/generic/streets"), terminators, ImmutableList.of(Pair.of(JigsawPiece.func_242849_a("atum:village/generic/streets/straight_1"), 5), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/streets/fourway_1"), 3), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/streets/threeway_1"), 3), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/streets/turn_1"), 3), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/streets/turn_2"), 3)), JigsawPattern.PlacementBehaviour.TERRAIN_MATCHING));
-        JigsawPatternRegistry.func_244094_a(new JigsawPattern(new ResourceLocation(Atum.MOD_ID, "village/generic/houses"), terminators, ImmutableList.of(Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_1", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_2", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_3", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_4", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_5", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_6", ProcessorLists.field_244101_a), 1), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_7", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_8", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/animal_pen_1", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/farm_1", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/farm_2", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/farm_3", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/market_1", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/palm_grove_1", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/wolf_kennel_1", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/quail_coop_1", ProcessorLists.field_244101_a), 1), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/alchemist", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/armorsmith", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/butcher", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/cartographer", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/curator", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/fletcher", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/glassblower", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/hunter", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/librarian", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/weaponsmith", ProcessorLists.field_244101_a), 2)), JigsawPattern.PlacementBehaviour.RIGID));
+        JigsawPatternRegistry.func_244094_a(new JigsawPattern(new ResourceLocation(Atum.MOD_ID, "village/generic/houses"), terminators, ImmutableList.of(Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_1", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_2", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_3", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_4", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_5", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_6", ProcessorLists.field_244101_a), 1), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_7", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/generic_small_house_8", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/animal_pen_1", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/farm_1", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/farm_2", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/farm_3", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/market_1", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/palm_grove_1", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/wolf_kennel_1", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/quail_coop_1", ProcessorLists.field_244101_a), 1), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/alchemist", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/armorsmith", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/butcher", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/cartographer", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/curator", ProcessorLists.field_244101_a), 1), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/fletcher", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/glassblower", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/hunter", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/tailor", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/librarian", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/houses/weaponsmith", ProcessorLists.field_244101_a), 2)), JigsawPattern.PlacementBehaviour.RIGID));
         JigsawPatternRegistry.func_244094_a(new JigsawPattern(new ResourceLocation(Atum.MOD_ID, "village/generic/market_stalls"), terminators, ImmutableList.of(Pair.of(JigsawPiece.func_242851_a("atum:village/generic/market_stalls/market_stall_1", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/market_stalls/market_stall_2", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/market_stalls/market_stall_3", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/market_stalls/market_stall_4", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/market_stalls/market_stall_5", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/market_stalls/market_stall_6", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/market_stalls/market_stall_7", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/market_stalls/market_stall_8", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/market_stalls/market_stall_9", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/market_stalls/market_stall_10", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/market_stalls/market_stall_11", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/market_stalls/market_stall_12", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/market_stalls/market_stall_13", ProcessorLists.field_244101_a), 2), Pair.of(JigsawPiece.func_242851_a("atum:village/generic/market_stalls/market_stall_14", ProcessorLists.field_244101_a), 2)), JigsawPattern.PlacementBehaviour.RIGID));
         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));

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

@@ -1,12 +1,23 @@
 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 {
 
     public GatehouseStructure(Codec<VillageConfig> config) {
         super(config, 0, true, true);
     }
+
 }

src/main/resources/assets/atum/lang/en_us.json

@@ -1036,6 +1036,18 @@
   "entity.atum.villager_female.avi.glassblower": "Avi Female Glassblower",
   "entity.atum.villager_male.sphinx.glassblower": "Sphinx Male Glassblower",
   "entity.atum.villager_female.sphinx.glassblower": "Sphinx Female Glassblower",
+  "entity.atum.villager_male.human.hunter": "Human Male Hunter",
+  "entity.atum.villager_female.human.hunter": "Human Female Hunter",
+  "entity.atum.villager_male.efreet.hunter": "Efreet Male Hunter",
+  "entity.atum.villager_female.efreet.hunter": "Efreet Female Hunter",
+  "entity.atum.villager_male.shabti.hunter": "Shabti Male Hunter",
+  "entity.atum.villager_female.shabti.hunter": "Shabti Female Hunter",
+  "entity.atum.villager_male.sylph.hunter": "Sylph Male Hunter",
+  "entity.atum.villager_female.sylph.hunter": "Sylph Female Hunter",
+  "entity.atum.villager_male.avi.hunter": "Avi Male Hunter",
+  "entity.atum.villager_female.avi.hunter": "Avi Female Hunter",
+  "entity.atum.villager_male.sphinx.hunter": "Sphinx Male Hunter",
+  "entity.atum.villager_female.sphinx.hunter": "Sphinx Female Hunter",
   "entity.atum.villager_male.human.librarian": "Human Male Librarian",
   "entity.atum.villager_female.human.librarian": "Human Female Librarian",
   "entity.atum.villager_male.efreet.librarian": "Efreet Male Librarian",

src/main/resources/data/atum/worldgen/noise_settings/atum.json

@@ -36,8 +36,8 @@
         "salt": 14150550
       },
       "minecraft:village": {
-        "spacing": 20,
-        "separation": 12,
+        "spacing": 26,
+        "separation": 16,
         "salt": 38616855
       }
     }