Add Kyogre Ocean Variant Shrine

JT122406 · JT122406 · commit c5d8d58f5648 · 2025-03-11T16:51:41.000-04:00
diff --git a/common/src/main/generated/resources/data/generations_structures/advancements/generations_structures/shrines.json b/common/src/main/generated/resources/data/generations_structures/advancements/generations_structures/shrines.json
@@ -113,6 +113,22 @@
       },
       "trigger": "minecraft:location"
     },
+    "kyogre_ocean": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "structure": "generations_structures:shrines/kyogre_ocean"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    },
     "lugia_shrine": {
       "conditions": {
         "player": [
@@ -227,6 +243,9 @@
     ],
     [
       "dragon_spiral"
+    ],
+    [
+      "kyogre_ocean"
     ]
   ],
   "sends_telemetry_event": true
diff --git a/common/src/main/generated/resources/data/generations_structures/tags/worldgen/biome/has_structure/kyogre_ocean.json b/common/src/main/generated/resources/data/generations_structures/tags/worldgen/biome/has_structure/kyogre_ocean.json
@@ -0,0 +1,9 @@
+{
+  "values": [
+    "#minecraft:is_ocean",
+    {
+      "id": "#c:ocean",
+      "required": false
+    }
+  ]
+}
diff --git a/common/src/main/generated/resources/data/generations_structures/tags/worldgen/structure/shrines.json b/common/src/main/generated/resources/data/generations_structures/tags/worldgen/structure/shrines.json
@@ -43,6 +43,10 @@
     {
       "id": "generations_structures:shrines/dragon_spiral",
       "required": false
+    },
+    {
+      "id": "generations_structures:shrines/kyogre_ocean",
+      "required": false
     }
   ]
 }
diff --git a/common/src/main/generated/resources/data/generations_structures/worldgen/structure/shrines/kyogre_ocean.json b/common/src/main/generated/resources/data/generations_structures/worldgen/structure/shrines/kyogre_ocean.json
@@ -0,0 +1,14 @@
+{
+  "type": "minecraft:jigsaw",
+  "biomes": "#generations_structures:has_structure/kyogre_ocean",
+  "max_distance_from_center": 80,
+  "project_start_to_heightmap": "WORLD_SURFACE_WG",
+  "size": 1,
+  "spawn_overrides": {},
+  "start_height": {
+    "absolute": -2
+  },
+  "start_pool": "generations_structures:shrines/kyogre_ocean",
+  "step": "surface_structures",
+  "use_expansion_hack": false
+}
diff --git a/common/src/main/generated/resources/data/generations_structures/worldgen/structure_set/shrines/kyogre_ocean.json b/common/src/main/generated/resources/data/generations_structures/worldgen/structure_set/shrines/kyogre_ocean.json
@@ -0,0 +1,14 @@
+{
+  "placement": {
+    "type": "minecraft:random_spread",
+    "salt": 162114187,
+    "separation": 350,
+    "spacing": 2000
+  },
+  "structures": [
+    {
+      "structure": "generations_structures:shrines/kyogre_ocean",
+      "weight": 1
+    }
+  ]
+}
diff --git a/common/src/main/generated/resources/data/generations_structures/worldgen/template_pool/shrines/kyogre_ocean.json b/common/src/main/generated/resources/data/generations_structures/worldgen/template_pool/shrines/kyogre_ocean.json
@@ -0,0 +1,14 @@
+{
+  "elements": [
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "generations_structures:shrines/kyogre_ocean",
+        "processors": "minecraft:empty",
+        "projection": "rigid"
+      },
+      "weight": 1
+    }
+  ],
+  "fallback": "minecraft:empty"
+}
diff --git a/common/src/main/java/generations/gg/generations/structures/generationsstructures/structures/GenerationsStructureSettings.java b/common/src/main/java/generations/gg/generations/structures/generationsstructures/structures/GenerationsStructureSettings.java
@@ -122,6 +122,11 @@ public class GenerationsStructureSettings {
                     context.lookup(Registries.TEMPLATE_POOL).getOrThrow(GenerationsTemplatePools.DRAGON_SPIRAL), 1,
                     ConstantHeight.of(VerticalAnchor.absolute(1)), Heightmap.Types.WORLD_SURFACE_WG));
 
+    public static final ResourceKey<Structure> KYOGRE_OCEAN = register("shrines/kyogre_ocean", (context) ->
+            createJigsaw(structure(context.lookup(Registries.BIOME).getOrThrow(GenerationsBiomeTags.HAS_KYOGRE_OCEAN), TerrainAdjustment.NONE),
+                    context.lookup(Registries.TEMPLATE_POOL).getOrThrow(GenerationsTemplatePools.KYOGRE_OCEAN), 1,
+                    ConstantHeight.of(VerticalAnchor.absolute(-2)), Heightmap.Types.WORLD_SURFACE_WG));
+
     public static final ResourceKey<Structure> ISLANDS = register("islands", (context) ->
             createJigsaw(structure(context.lookup(Registries.BIOME).getOrThrow(GenerationsBiomeTags.HAS_ISLANDS), TerrainAdjustment.NONE),
                     context.lookup(Registries.TEMPLATE_POOL).getOrThrow(GenerationsTemplatePools.ISLANDS), 1,
diff --git a/common/src/main/java/generations/gg/generations/structures/generationsstructures/tags/GenerationsBiomeTags.java b/common/src/main/java/generations/gg/generations/structures/generationsstructures/tags/GenerationsBiomeTags.java
@@ -57,6 +57,9 @@ public final class GenerationsBiomeTags {
     /** the tag for biomes that can have a dragon spiral tower */
     public static final TagKey<Biome> HAS_DRAGON_SPIRAL = create("has_structure/dragon_spiral");
 
+    /** the tag for biomes that can have a Kyogre ocean */
+    public static final TagKey<Biome> HAS_KYOGRE_OCEAN = create("has_structure/kyogre_ocean");
+
     /**
      * Creates a new {@link TagKey} for the given name.
      * @param name The name of the tag.
diff --git a/common/src/main/java/generations/gg/generations/structures/generationsstructures/worldgen/structure_set/GenerationsStructureSets.java b/common/src/main/java/generations/gg/generations/structures/generationsstructures/worldgen/structure_set/GenerationsStructureSets.java
@@ -73,6 +73,8 @@ public static void init() {
         register("shrines/haunted_mansion", GenerationsStructureSettings.HAUNTED_MANSION, 2000, 350, 282258907);
 
         register("shrines/dragon_spiral", GenerationsStructureSettings.DRAGON_SPIRAL, 2000, 350, 509787274);
+
+        register("shrines/kyogre_ocean", GenerationsStructureSettings.KYOGRE_OCEAN, 2000, 350, 162114187);
     }
 
     private static void register(String id, StructureSetFactory factory) {
diff --git a/common/src/main/java/generations/gg/generations/structures/generationsstructures/worldgen/template_pool/GenerationsTemplatePools.java b/common/src/main/java/generations/gg/generations/structures/generationsstructures/worldgen/template_pool/GenerationsTemplatePools.java
@@ -62,6 +62,8 @@ public class GenerationsTemplatePools {
 
     public static final ResourceKey<StructureTemplatePool> DRAGON_SPIRAL = registerSimple("shrines/dragon_spiral", GenerationsStructureSettings.DRAGON_SPIRAL, ProcessorLists.EMPTY);
 
+    public static final ResourceKey<StructureTemplatePool> KYOGRE_OCEAN = registerSimple("shrines/kyogre_ocean", GenerationsStructureSettings.KYOGRE_OCEAN, ProcessorLists.EMPTY);
+
     public static final ResourceKey<StructureTemplatePool> PLAINS_VILLAGE_POKECENTER_STREETS = register("village/plains/streets/pokecenter", context -> createTemplatePool(getPool(context, VanillaVillages.PLAINS.getVillagePool("streets")), ImmutableList.of(
             createPoolElement(context, GenerationsStructuresKeys.PLAINS_POKECENTER_STREET_CORNER_01, ProcessorLists.STREET_PLAINS, 1),
             createPoolElement(context, GenerationsStructuresKeys.PLAINS_POKECENTER_STREET_STRAIGHT_05, ProcessorLists.STREET_PLAINS, 1)
diff --git a/common/src/main/resources/data/generations_structures/structures/shrines/kyogre_ocean.nbt b/common/src/main/resources/data/generations_structures/structures/shrines/kyogre_ocean.nbt
diff --git a/forge/src/main/java/generations/gg/generations/structures/generationsstructures/forge/datagen/ForgeDatagen.java b/forge/src/main/java/generations/gg/generations/structures/generationsstructures/forge/datagen/ForgeDatagen.java
@@ -158,6 +158,10 @@ protected void addTags(HolderLookup.@NotNull Provider provider) {
             tag(GenerationsBiomeTags.HAS_DRAGON_SPIRAL)
                     .addTag(BiomeTags.IS_FOREST)
                     .addOptionalTag(fabricTagMaker("forest"));
+
+            tag(GenerationsBiomeTags.HAS_KYOGRE_OCEAN)
+                    .addTag(BiomeTags.IS_OCEAN)
+                    .addOptionalTag(fabricTagMaker("ocean"));
         }
     }
 
@@ -190,7 +194,8 @@ protected void addTags(HolderLookup.@NotNull Provider provider) {
                     .addOptional(GenerationsStructureSettings.GROUDON_SHRINE.location())
                     .addOptional(GenerationsStructureSettings.TAPU_SHRINE.location())
                     .addOptional(GenerationsStructureSettings.HAUNTED_MANSION.location())
-                    .addOptional(GenerationsStructureSettings.DRAGON_SPIRAL.location());
+                    .addOptional(GenerationsStructureSettings.DRAGON_SPIRAL.location())
+                    .addOptional(GenerationsStructureSettings.KYOGRE_OCEAN.location());
             tag(GenerationsStructureTags.GENERATIONS_STRUCTURES)
                     .addTag(GenerationsStructureTags.POKESHOP)
                     .addTag(GenerationsStructureTags.LOOT_BALLOONS)
@@ -252,6 +257,7 @@ public void generate(HolderLookup.@NotNull Provider arg, @NotNull Consumer<Advan
                     .addCriterion("tapu_shrine", PlayerTrigger.TriggerInstance.located(LocationPredicate.inStructure(GenerationsStructureSettings.TAPU_SHRINE)))
                     .addCriterion("haunted_mansion", PlayerTrigger.TriggerInstance.located(LocationPredicate.inStructure(GenerationsStructureSettings.HAUNTED_MANSION)))
                     .addCriterion("dragon_spiral", PlayerTrigger.TriggerInstance.located(LocationPredicate.inStructure(GenerationsStructureSettings.DRAGON_SPIRAL)))
+                    .addCriterion("kyogre_ocean", PlayerTrigger.TriggerInstance.located(LocationPredicate.inStructure(GenerationsStructureSettings.KYOGRE_OCEAN)))
                     .display(
                             GenerationsShrines.LUNAR_SHRINE.get(),
                             translateAble("title.shrines"),

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,10 @@`
`43`	`43`	`{`
`44`	`44`	`"id": "generations_structures:shrines/dragon_spiral",`
`45`	`45`	`"required": false`
	`46`	`+ },`
	`47`	`+ {`
	`48`	`+ "id": "generations_structures:shrines/kyogre_ocean",`
	`49`	`+ "required": false`
`46`	`50`	`}`
`47`	`51`	`]`
`48`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,8 @@ public static void init() {`
`73`	`73`	`register("shrines/haunted_mansion", GenerationsStructureSettings.HAUNTED_MANSION, 2000, 350, 282258907);`
`74`	`74`
`75`	`75`	`register("shrines/dragon_spiral", GenerationsStructureSettings.DRAGON_SPIRAL, 2000, 350, 509787274);`
	`76`	`+`
	`77`	`+ register("shrines/kyogre_ocean", GenerationsStructureSettings.KYOGRE_OCEAN, 2000, 350, 162114187);`
`76`	`78`	`}`
`77`	`79`
`78`	`80`	`private static void register(String id, StructureSetFactory factory) {`