Move TemplatePools to Factories Model

Signed-off-by: Joseph T. McQuigg <[email protected]>
GenerationsMod · Sep 30, 2024 · c494bea · c494bea
1 parent e68991f
commit c494bea
Show file tree

Hide file tree

Showing 4 changed files with 125 additions and 154 deletions.
diff --git a/...generations/structures/generationsstructures/structures/GenerationsStructureSettings.java b/...generations/structures/generationsstructures/structures/GenerationsStructureSettings.java
@@ -114,19 +114,6 @@ public static void bootstrap(BootstapContext<Structure> context) {
                 Heightmap.Types.WORLD_SURFACE_WG
         ));
 
-        registerStructure(context, GenerationsStructuresKeys.LUGIA_SHRINE, createJigsaw(
-                new Structure.StructureSettings(
-                        biomeHolderGetter.getOrThrow(GenerationsBiomeTags.HAS_LUGIA_SHRINE),
-                        Map.of(),
-                        GenerationStep.Decoration.SURFACE_STRUCTURES,
-                        TerrainAdjustment.BEARD_THIN
-                ),
-                poolHolderGetter.getOrThrow(GenerationsTemplatePools.LUGIA_SHRINE),
-                1,
-                ConstantHeight.of(VerticalAnchor.absolute(1)),
-                Heightmap.Types.WORLD_SURFACE_WG
-        ));
-
         registerStructure(context, GenerationsStructuresKeys.ISLANDS, createJigsaw(
                 new Structure.StructureSettings(
                         biomeHolderGetter.getOrThrow(GenerationsBiomeTags.HAS_ISLANDS),

diff --git a/.../generations/gg/generations/structures/generationsstructures/village/VanillaVillages.java b/.../generations/gg/generations/structures/generationsstructures/village/VanillaVillages.java
@@ -13,10 +13,10 @@
 
 public enum VanillaVillages {
     PLAINS("plains", GenerationsTemplatePools.PLAINS_VILLAGE_POKECENTER, GenerationsTemplatePools.PLAINS_VILLAGE_POKEMART, GenerationsTemplatePools.PLAINS_VILLAGE_POKECENTER_STREETS, GenerationsTemplatePools.PLAINS_VILLAGE_POKEMART_STREETS, BiomeTags.HAS_VILLAGE_PLAINS),
-    DESERT("desert", GenerationsTemplatePools.DESERT_VILLAGE_POKECENTER, GenerationsTemplatePools.DESERT_VILLAGE_POKEMART, GenerationsTemplatePools.DESERT_VILLAGE_POKECENTER_STREETS, GenerationsTemplatePools.DESERT_VILLAGE_POKEMART_STREETS, BiomeTags.HAS_VILLAGE_DESERT),
-    SAVANNA("savanna", GenerationsTemplatePools.SAVANNA_VILLAGE_POKECENTER, GenerationsTemplatePools.SAVANNA_VILLAGE_POKEMART, GenerationsTemplatePools.SAVANNA_VILLAGE_POKECENTER_STREETS, GenerationsTemplatePools.SAVANNA_VILLAGE_POKEMART_STREETS, BiomeTags.HAS_VILLAGE_SAVANNA),
-    SNOWY("snowy", GenerationsTemplatePools.SNOWY_VILLAGE_POKECENTER, GenerationsTemplatePools.SNOWY_VILLAGE_POKEMART, GenerationsTemplatePools.SNOWY_VILLAGE_POKECENTER_STREETS, GenerationsTemplatePools.SNOWY_VILLAGE_POKEMART_STREETS, BiomeTags.HAS_VILLAGE_SNOWY),
-    TAIGA("taiga", GenerationsTemplatePools.TAIGA_VILLAGE_POKECENTER, GenerationsTemplatePools.TAIGA_VILLAGE_POKEMART, GenerationsTemplatePools.TAIGA_VILLAGE_POKECENTER_STREETS, GenerationsTemplatePools.TAIGA_VILLAGE_POKEMART_STREETS, BiomeTags.HAS_VILLAGE_TAIGA);
+    DESERT("desert", GenerationsTemplatePools.DESERT_VILLAGE_POKECENTER, GenerationsTemplatePools.DESERT_VILLAGE_POKEMART, GenerationsTemplatePools.DESERT_VILLAGE_POKECENTER_STREETS, GenerationsTemplatePools.DESERT_VILLAGE_POKEMART_STREETS, BiomeTags.HAS_VILLAGE_DESERT);
+    //SAVANNA("savanna", GenerationsTemplatePools.SAVANNA_VILLAGE_POKECENTER, GenerationsTemplatePools.SAVANNA_VILLAGE_POKEMART, GenerationsTemplatePools.SAVANNA_VILLAGE_POKECENTER_STREETS, GenerationsTemplatePools.SAVANNA_VILLAGE_POKEMART_STREETS, BiomeTags.HAS_VILLAGE_SAVANNA),
+    //SNOWY("snowy", GenerationsTemplatePools.SNOWY_VILLAGE_POKECENTER, GenerationsTemplatePools.SNOWY_VILLAGE_POKEMART, GenerationsTemplatePools.SNOWY_VILLAGE_POKECENTER_STREETS, GenerationsTemplatePools.SNOWY_VILLAGE_POKEMART_STREETS, BiomeTags.HAS_VILLAGE_SNOWY),
+    //TAIGA("taiga", GenerationsTemplatePools.TAIGA_VILLAGE_POKECENTER, GenerationsTemplatePools.TAIGA_VILLAGE_POKEMART, GenerationsTemplatePools.TAIGA_VILLAGE_POKECENTER_STREETS, GenerationsTemplatePools.TAIGA_VILLAGE_POKEMART_STREETS, BiomeTags.HAS_VILLAGE_TAIGA);
 
     private final String name;
     private final ResourceKey<StructureTemplatePool> pokecenter;