Add Dragon Spiral Tower

JT122406 · JT122406 · commit 9c69f626a81f · 2025-03-09T21:34:53.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # 1.0.0
 - Add ModMenu Integration (Fabric Only)
+- Add Dragon Spiral Tower
 
 # 1.1.3-Beta
 - Add Haunted Mansion Shrine
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
@@ -17,6 +17,22 @@
       },
       "trigger": "minecraft:location"
     },
+    "dragon_spiral": {
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "location": {
+                "structure": "generations_structures:shrines/dragon_spiral"
+              }
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:location"
+    },
     "fiery_shrine": {
       "conditions": {
         "player": [
@@ -208,6 +224,9 @@
     ],
     [
       "haunted_mansion"
+    ],
+    [
+      "dragon_spiral"
     ]
   ],
   "sends_telemetry_event": true
diff --git a/common/src/main/generated/resources/data/generations_structures/tags/worldgen/biome/has_structure/dragon_spiral.json b/common/src/main/generated/resources/data/generations_structures/tags/worldgen/biome/has_structure/dragon_spiral.json
@@ -0,0 +1,9 @@
+{
+  "values": [
+    "#minecraft:is_forest",
+    {
+      "id": "#c:forest",
+      "required": false
+    }
+  ]
+}
diff --git a/common/src/main/generated/resources/data/generations_structures/tags/worldgen/biome/has_structure/fiery_shrine.json b/common/src/main/generated/resources/data/generations_structures/tags/worldgen/biome/has_structure/fiery_shrine.json
@@ -8,10 +8,6 @@
     {
       "id": "#c:desert",
       "required": false
-    },
-    {
-      "id": "biomesoplenty:volcanic_plains",
-      "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
@@ -39,6 +39,10 @@
     {
       "id": "generations_structures:shrines/haunted_mansion",
       "required": false
+    },
+    {
+      "id": "generations_structures:shrines/dragon_spiral",
+      "required": false
     }
   ]
 }
diff --git a/common/src/main/generated/resources/data/generations_structures/worldgen/structure/shrines/dragon_spiral.json b/common/src/main/generated/resources/data/generations_structures/worldgen/structure/shrines/dragon_spiral.json
@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:jigsaw",
+  "biomes": "#generations_structures:has_structure/dragon_spiral",
+  "max_distance_from_center": 80,
+  "project_start_to_heightmap": "WORLD_SURFACE_WG",
+  "size": 1,
+  "spawn_overrides": {},
+  "start_height": {
+    "absolute": 1
+  },
+  "start_pool": "generations_structures:shrines/dragon_spiral",
+  "step": "surface_structures",
+  "terrain_adaptation": "beard_thin",
+  "use_expansion_hack": false
+}
diff --git a/common/src/main/generated/resources/data/generations_structures/worldgen/structure_set/shrines/dragon_spiral.json b/common/src/main/generated/resources/data/generations_structures/worldgen/structure_set/shrines/dragon_spiral.json
@@ -0,0 +1,14 @@
+{
+  "placement": {
+    "type": "minecraft:random_spread",
+    "salt": 509787274,
+    "separation": 350,
+    "spacing": 2000
+  },
+  "structures": [
+    {
+      "structure": "generations_structures:shrines/dragon_spiral",
+      "weight": 1
+    }
+  ]
+}
diff --git a/common/src/main/generated/resources/data/generations_structures/worldgen/template_pool/shrines/dragon_spiral.json b/common/src/main/generated/resources/data/generations_structures/worldgen/template_pool/shrines/dragon_spiral.json
@@ -0,0 +1,14 @@
+{
+  "elements": [
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "generations_structures:shrines/dragon_spiral",
+        "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
@@ -117,6 +117,11 @@ public class GenerationsStructureSettings {
                     context.lookup(Registries.TEMPLATE_POOL).getOrThrow(GenerationsTemplatePools.HAUNTED_MANSION), 1,
                     ConstantHeight.of(VerticalAnchor.absolute(1)), Heightmap.Types.WORLD_SURFACE_WG));
 
+    public static final ResourceKey<Structure> DRAGON_SPIRAL = register("shrines/dragon_spiral", (context) ->
+            createJigsaw(structure(context.lookup(Registries.BIOME).getOrThrow(GenerationsBiomeTags.HAS_DRAGON_SPIRAL), TerrainAdjustment.BEARD_THIN),
+                    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> 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
@@ -54,6 +54,9 @@ public final class GenerationsBiomeTags {
     /** the tag for biomes that can have a haunted mansion */
     public static final TagKey<Biome> HAS_HAUNTED_MANSION = create("has_structure/haunted_mansion");
 
+    /** the tag for biomes that can have a dragon spiral tower */
+    public static final TagKey<Biome> HAS_DRAGON_SPIRAL = create("has_structure/dragon_spiral");
+
     /**
      * 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
@@ -71,6 +71,8 @@ public static void init() {
         register("shrines/tapu", GenerationsStructureSettings.TAPU_SHRINE, 2000, 350, 647365027);
 
         register("shrines/haunted_mansion", GenerationsStructureSettings.HAUNTED_MANSION, 2000, 350, 282258907);
+
+        register("shrines/dragon_spiral", GenerationsStructureSettings.DRAGON_SPIRAL, 2000, 350, 509787274);
     }
 
     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
@@ -60,6 +60,8 @@ public class GenerationsTemplatePools {
 
     public static final ResourceKey<StructureTemplatePool> HAUNTED_MANSION = registerSimple("shrines/haunted_mansion", GenerationsStructureSettings.HAUNTED_MANSION, GenerationsProcessorLists.HAUNTED_MANSION_PROCESSOR_LIST);
 
+    public static final ResourceKey<StructureTemplatePool> DRAGON_SPIRAL = registerSimple("shrines/dragon_spiral", GenerationsStructureSettings.DRAGON_SPIRAL, 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/dragon_spiral.nbt b/common/src/main/resources/data/generations_structures/structures/shrines/dragon_spiral.nbt
diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts
@@ -75,7 +75,7 @@ dependencies {
     //BiomeMod Integration
     modLocalRuntime("com.github.glitchfiend:TerraBlender-forge:$minecraftVersion-${project.properties["terrablender_version"]}")
     modCompileOnly("com.github.glitchfiend:BiomesOPlenty-forge:$minecraftVersion-${project.properties["BOP_version"]}")
-    //modLocalRuntime("com.github.glitchfiend:GlitchCore-forge:$minecraftVersion-${project.properties["GlitchCore_version"]}")
+    modLocalRuntime("com.github.glitchfiend:GlitchCore-forge:$minecraftVersion-${project.properties["GlitchCore_version"]}")
     modRuntimeOnly(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
     modApi("net.potionstudios:Oh-The-Biomes-Weve-Gone-Forge:${project.properties["BWG_version"]}")
     implementation("com.eliotlash.mclib:mclib:20")
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
@@ -154,6 +154,10 @@ protected void addTags(HolderLookup.@NotNull Provider provider) {
                     .addOptionalTag(Tags.Biomes.IS_SPOOKY)
                     .addOptionalTag(fabricTagMaker("floral_forests"))
                     .add(Biomes.DARK_FOREST, Biomes.FLOWER_FOREST);
+
+            tag(GenerationsBiomeTags.HAS_DRAGON_SPIRAL)
+                    .addTag(BiomeTags.IS_FOREST)
+                    .addOptionalTag(fabricTagMaker("forest"));
         }
     }
 
@@ -185,7 +189,8 @@ protected void addTags(HolderLookup.@NotNull Provider provider) {
                     .addOptional(GenerationsStructureSettings.FORCES_OF_NATURE_SHRINE.location())
                     .addOptional(GenerationsStructureSettings.GROUDON_SHRINE.location())
                     .addOptional(GenerationsStructureSettings.TAPU_SHRINE.location())
-                    .addOptional(GenerationsStructureSettings.HAUNTED_MANSION.location());
+                    .addOptional(GenerationsStructureSettings.HAUNTED_MANSION.location())
+                    .addOptional(GenerationsStructureSettings.DRAGON_SPIRAL.location());
             tag(GenerationsStructureTags.GENERATIONS_STRUCTURES)
                     .addTag(GenerationsStructureTags.POKESHOP)
                     .addTag(GenerationsStructureTags.LOOT_BALLOONS)
@@ -197,7 +202,7 @@ protected void addTags(HolderLookup.@NotNull Provider provider) {
     }
 
     private static ResourceLocation fabricTagMaker(String name) {
-        return new ResourceLocation("c", name);
+        return ResourceLocation.fromNamespaceAndPath("c", name);
     }
 
     private static class GenerationsStructureAdvancementProvider implements ForgeAdvancementProvider.AdvancementGenerator {
@@ -246,8 +251,9 @@ public void generate(HolderLookup.@NotNull Provider arg, @NotNull Consumer<Advan
                     .addCriterion("groudon_shrine", PlayerTrigger.TriggerInstance.located(LocationPredicate.inStructure(GenerationsStructureSettings.GROUDON_SHRINE)))
                     .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)))
                     .display(
-                            GenerationsShrines.LUNAR_SHRINE.getOrNull(),
+                            GenerationsShrines.LUNAR_SHRINE.get(),
                             translateAble("title.shrines"),
                             translateAble("description.shrines"),
                             GenerationsCore.id("textures/block/blue_poke_brick.png"),
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
@@ -31,7 +31,7 @@ logoFile = "icon.png"
 [[dependencies.generations_structures]]
     modId = "generations_core"
     mandatory = true
-    versionRange="[4.0.1-Beta,)"
+    versionRange="[1.0.0,)"
     ordering = "AFTER"
     side = "BOTH"
 
diff --git a/gradle.properties b/gradle.properties
@@ -9,14 +9,14 @@ maven_group=generations.gg.generations.structures.generationsstructures
 fabric_loader_version=0.16.10
 fabric_api_version=0.92.3
 
-forge_version=47.3.27
+forge_version=47.4.0
 neoforge_version=47.1.106
 
 use_neoforge=false
 
 parchment=2023.09.03
 
-generations-core_version=1.0.0
+generations-core_version=1.0.0-maven
 architectury_version=9.2.14
 botarium_version=2.3.4
 devauth_version=1.2.1

Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,6 @@`
`8`	`8`	`{`
`9`	`9`	`"id": "#c:desert",`
`10`	`10`	`"required": false`
`11`		`- },`
`12`		`- {`
`13`		`- "id": "biomesoplenty:volcanic_plains",`
`14`		`- "required": false`
`15`	`11`	`}`
`16`	`12`	`]`
`17`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,10 @@`
`39`	`39`	`{`
`40`	`40`	`"id": "generations_structures:shrines/haunted_mansion",`
`41`	`41`	`"required": false`
	`42`	`+ },`
	`43`	`+ {`
	`44`	`+ "id": "generations_structures:shrines/dragon_spiral",`
	`45`	`+ "required": false`
`42`	`46`	`}`
`43`	`47`	`]`
`44`	`48`	`}`