Attempted village pieces fixes

src/main/java/com/teammetallurgy/atum/entity/villager/AtumVillagerData.java

@@ -0,0 +1,33 @@
+package com.teammetallurgy.atum.entity.villager;
+
+import net.minecraft.entity.merchant.villager.VillagerData;
+import net.minecraft.entity.merchant.villager.VillagerProfession;
+import net.minecraft.entity.villager.VillagerType;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public class AtumVillagerData extends VillagerData { //Same as vanilla VillagerData, but makes sure VillagerType is not used
+
+    public AtumVillagerData(VillagerProfession profession, int level) {
+        super(null, profession, level);
+    }
+
+    @Override
+    @Nonnull
+    public VillagerData withProfession(@Nonnull VillagerProfession profession) {
+        return new AtumVillagerData(profession, this.getLevel());
+    }
+
+    @Override
+    @Nonnull
+    public VillagerData withType(@Nullable VillagerType type) {
+        return new AtumVillagerData(this.getProfession(), this.getLevel());
+    }
+
+    @Override
+    @Nonnull
+    public VillagerData withLevel(int level) {
+        return new AtumVillagerData(this.getProfession(), level);
+    }
+}

src/main/java/com/teammetallurgy/atum/entity/villager/AtumVillagerEntity.java

@@ -0,0 +1,23 @@
+package com.teammetallurgy.atum.entity.villager;
+
+import net.minecraft.entity.EntityType;
+import net.minecraft.entity.merchant.villager.VillagerData;
+import net.minecraft.entity.merchant.villager.VillagerEntity;
+import net.minecraft.entity.merchant.villager.VillagerProfession;
+import net.minecraft.entity.villager.VillagerType;
+import net.minecraft.world.World;
+
+import javax.annotation.Nonnull;
+
+public class AtumVillagerEntity extends VillagerEntity {
+
+    public AtumVillagerEntity(EntityType<? extends VillagerEntity> type, World world) {
+        super(type, world, VillagerType.DESERT); //Type not used, by Atum villagers
+    }
+
+    @Override
+    @Nonnull
+    public VillagerData getVillagerData() {
+        return super.getVillagerData();
+    }
+}

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

@@ -17,6 +17,6 @@ public static void init() {
         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)), 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/torch_1"), 3), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/torch_2"), 3), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/torch_3"), 3), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/torch_4"), 3), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/tree_1"), 3), Pair.of(JigsawPiece.func_242864_g(), 4)), JigsawPattern.PlacementBehaviour.RIGID));
+        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"), 3), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/decor/torch_2"), 3), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/decor/torch_3"), 3), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/decor/torch_4"), 3), Pair.of(JigsawPiece.func_242849_a("atum:village/generic/decor/tree_1"), 3), Pair.of(JigsawPiece.func_242864_g(), 4)), JigsawPattern.PlacementBehaviour.RIGID));
     }
 }