Structure Sets/Structure jsons are now Complete on Datagen

GenerationsMod · Nov 29, 2023 · 00f7b51 · 00f7b51
1 parent 51a3bc3
commit 00f7b51
Show file tree

Hide file tree

Showing 15 changed files with 123 additions and 70 deletions.
diff --git a/..._structures/worldgen/structure/comet.json → ..._structures/worldgen/structure/comet.json b/..._structures/worldgen/structure/comet.json → ..._structures/worldgen/structure/comet.json
@@ -1,19 +1,19 @@
 {
   "type": "minecraft:jigsaw",
   "biomes": "#generations_structures:has_structure/comet",
-  "step": "surface_structures",
-  "start_pool": "generations_structures:comet",
+  "max_distance_from_center": 80,
   "size": 1,
+  "spawn_overrides": {},
   "start_height": {
     "type": "minecraft:uniform",
-    "min_inclusive": {
-      "absolute": 150
-    },
     "max_inclusive": {
+      "below_top": 150
+    },
+    "min_inclusive": {
       "absolute": 250
     }
   },
-  "use_expansion_hack": false,
-  "max_distance_from_center": 80,
-  "spawn_overrides": {}
-}
+  "start_pool": "generations_structures:comet",
+  "step": "surface_structures",
+  "use_expansion_hack": false
+}
diff --git a/.../resources/data/generations_structures/worldgen/structure/loot_balloon/beast_balloon.json b/.../resources/data/generations_structures/worldgen/structure/loot_balloon/beast_balloon.json
@@ -5,7 +5,13 @@
   "size": 1,
   "spawn_overrides": {},
   "start_height": {
-    "above_bottom": 150
+    "type": "minecraft:uniform",
+    "max_inclusive": {
+      "below_top": 160
+    },
+    "min_inclusive": {
+      "absolute": 260
+    }
   },
   "start_pool": "generations_structures:loot_balloon/beast_balloon",
   "step": "surface_structures",

diff --git a/.../resources/data/generations_structures/worldgen/structure/loot_balloon/great_balloon.json b/.../resources/data/generations_structures/worldgen/structure/loot_balloon/great_balloon.json
@@ -5,7 +5,13 @@
   "size": 1,
   "spawn_overrides": {},
   "start_height": {
-    "above_bottom": 150
+    "type": "minecraft:uniform",
+    "max_inclusive": {
+      "below_top": 160
+    },
+    "min_inclusive": {
+      "absolute": 260
+    }
   },
   "start_pool": "generations_structures:loot_balloon/great_balloon",
   "step": "surface_structures",

diff --git a/...resources/data/generations_structures/worldgen/structure/loot_balloon/master_balloon.json b/...resources/data/generations_structures/worldgen/structure/loot_balloon/master_balloon.json
@@ -5,7 +5,13 @@
   "size": 1,
   "spawn_overrides": {},
   "start_height": {
-    "above_bottom": 150
+    "type": "minecraft:uniform",
+    "max_inclusive": {
+      "below_top": 160
+    },
+    "min_inclusive": {
+      "absolute": 260
+    }
   },
   "start_pool": "generations_structures:loot_balloon/master_balloon",
   "step": "surface_structures",

diff --git a/...resources/data/generations_structures/worldgen/structure/loot_balloon/meowth_balloon.json b/...resources/data/generations_structures/worldgen/structure/loot_balloon/meowth_balloon.json
@@ -5,7 +5,13 @@
   "size": 1,
   "spawn_overrides": {},
   "start_height": {
-    "above_bottom": 150
+    "type": "minecraft:uniform",
+    "max_inclusive": {
+      "below_top": 160
+    },
+    "min_inclusive": {
+      "absolute": 260
+    }
   },
   "start_pool": "generations_structures:loot_balloon/meowth_balloon",
   "step": "surface_structures",

diff --git a/...resources/data/generations_structures/worldgen/structure/loot_balloon/normal_balloon.json b/...resources/data/generations_structures/worldgen/structure/loot_balloon/normal_balloon.json
@@ -5,7 +5,13 @@
   "size": 1,
   "spawn_overrides": {},
   "start_height": {
-    "above_bottom": 150
+    "type": "minecraft:uniform",
+    "max_inclusive": {
+      "below_top": 160
+    },
+    "min_inclusive": {
+      "absolute": 260
+    }
   },
   "start_pool": "generations_structures:loot_balloon/normal_balloon",
   "step": "surface_structures",

diff --git a/.../resources/data/generations_structures/worldgen/structure/loot_balloon/ultra_balloon.json b/.../resources/data/generations_structures/worldgen/structure/loot_balloon/ultra_balloon.json
@@ -5,7 +5,13 @@
   "size": 1,
   "spawn_overrides": {},
   "start_height": {
-    "above_bottom": 150
+    "type": "minecraft:uniform",
+    "max_inclusive": {
+      "below_top": 160
+    },
+    "min_inclusive": {
+      "absolute": 260
+    }
   },
   "start_pool": "generations_structures:loot_balloon/ultra_balloon",
   "step": "surface_structures",

diff --git a/.../worldgen/structure/scarlet_pokeshop.json → .../worldgen/structure/scarlet_pokeshop.json b/.../worldgen/structure/scarlet_pokeshop.json → .../worldgen/structure/scarlet_pokeshop.json
@@ -1,15 +1,15 @@
 {
-  "type": "yungsapi:yung_jigsaw",
+  "type": "minecraft:jigsaw",
   "biomes": "#generations_structures:has_structure/scarlet_pokeshop",
-  "step": "surface_structures",
-  "start_pool": "generations_structures:scarlet_pokeshop",
-  "size": 1,
-  "terrain_adaptation": "beard_thin",
+  "max_distance_from_center": 80,
   "project_start_to_heightmap": "WORLD_SURFACE_WG",
+  "size": 1,
+  "spawn_overrides": {},
   "start_height": {
     "absolute": 1
   },
-  "use_expansion_hack": false,
-  "max_distance_from_center": 80,
-  "spawn_overrides": {}
+  "start_pool": "generations_structures:scarlet_pokeshop",
+  "step": "surface_structures",
+  "terrain_adaptation": "beard_thin",
+  "use_expansion_hack": false
 }
diff --git a/..._structures/worldgen/structure/spike.json → ..._structures/worldgen/structure/spike.json b/..._structures/worldgen/structure/spike.json → ..._structures/worldgen/structure/spike.json
@@ -1,17 +1,20 @@
 {
   "type": "minecraft:jigsaw",
   "biomes": "#generations_structures:has_structure/spike",
-  "step": "underground_decoration",
-  "spawn_overrides": {},
-  "start_pool": "generations_structures:spike",
+  "max_distance_from_center": 75,
   "size": 1,
+  "spawn_overrides": {},
   "start_height": {
-    "absolute": 0
+    "type": "minecraft:uniform",
+    "max_inclusive": {
+      "below_top": 120
+    },
+    "min_inclusive": {
+      "absolute": 0
+    }
   },
-  "max_height": {
-    "absolute": 120
-  },
-  "max_distance_from_center": 75,
-  "use_expansion_hack": false,
-  "terrain_adaptation": "beard_thin"
-}
+  "start_pool": "generations_structures:spike",
+  "step": "underground_decoration",
+  "terrain_adaptation": "beard_thin",
+  "use_expansion_hack": false
+}
diff --git a/...uctures/worldgen/structure_set/comet.json → ...uctures/worldgen/structure_set/comet.json b/...uctures/worldgen/structure_set/comet.json → ...uctures/worldgen/structure_set/comet.json
@@ -1,14 +1,14 @@
 {
+  "placement": {
+    "type": "minecraft:random_spread",
+    "salt": 1189082690,
+    "separation": 15,
+    "spacing": 25
+  },
   "structures": [
     {
       "structure": "generations_structures:comet",
       "weight": 1
     }
-  ],
-  "placement": {
-    "type": "minecraft:random_spread",
-    "salt": 1189082690,
-    "spacing": 25,
-    "separation": 15
-  }
+  ]
 }
diff --git a/.../worldgen/structure_set/loot_balloon.json → .../worldgen/structure_set/loot_balloon.json b/.../worldgen/structure_set/loot_balloon.json → .../worldgen/structure_set/loot_balloon.json
@@ -1,34 +1,34 @@
 {
+  "placement": {
+    "type": "minecraft:random_spread",
+    "salt": 738478911,
+    "separation": 10,
+    "spacing": 20
+  },
   "structures": [
     {
-      "structure": "generations_structures:loot_balloon/normal_balloon",
+      "structure": "generations_structures:loot_balloon/great_balloon",
       "weight": 1
     },
     {
-      "structure": "generations_structures:loot_balloon/great_balloon",
+      "structure": "generations_structures:loot_balloon/master_balloon",
       "weight": 1
     },
     {
       "structure": "generations_structures:loot_balloon/ultra_balloon",
       "weight": 1
     },
     {
-      "structure": "generations_structures:loot_balloon/master_balloon",
+      "structure": "generations_structures:loot_balloon/beast_balloon",
       "weight": 1
     },
     {
-      "structure": "generations_structures:loot_balloon/beast_balloon",
+      "structure": "generations_structures:loot_balloon/meowth_balloon",
       "weight": 1
     },
     {
-      "structure": "generations_structures:loot_balloon/meowth_balloon",
+      "structure": "generations_structures:loot_balloon/normal_balloon",
       "weight": 1
     }
-  ],
-  "placement": {
-    "type": "minecraft:random_spread",
-    "salt": 738478911,
-    "spacing": 20,
-    "separation": 10
-  }
+  ]
 }
diff --git a/...res/worldgen/structure_set/pokeshops.json → ...res/worldgen/structure_set/pokeshops.json b/...res/worldgen/structure_set/pokeshops.json → ...res/worldgen/structure_set/pokeshops.json
@@ -1,14 +1,14 @@
 {
+  "placement": {
+    "type": "minecraft:random_spread",
+    "salt": 293756737,
+    "separation": 10,
+    "spacing": 15
+  },
   "structures": [
     {
       "structure": "generations_structures:scarlet_pokeshop",
       "weight": 1
     }
-  ],
-  "placement": {
-    "type": "minecraft:random_spread",
-    "salt": 293756737,
-    "spacing": 15,
-    "separation": 10
-  }
+  ]
 }
diff --git a/...uctures/worldgen/structure_set/spike.json → ...uctures/worldgen/structure_set/spike.json b/...uctures/worldgen/structure_set/spike.json → ...uctures/worldgen/structure_set/spike.json
@@ -1,14 +1,14 @@
 {
+  "placement": {
+    "type": "minecraft:random_spread",
+    "salt": 732790531,
+    "separation": 5,
+    "spacing": 10
+  },
   "structures": [
     {
       "structure": "generations_structures:spike",
       "weight": 1
     }
-  ],
-  "placement": {
-    "type": "minecraft:random_spread",
-    "salt": 732790531,
-    "spacing": 10,
-    "separation": 5
-  }
-}
+  ]
+}
diff --git a/...generations/structures/generationsstructures/structures/GenerationsStructureSettings.java b/...generations/structures/generationsstructures/structures/GenerationsStructureSettings.java
@@ -66,7 +66,21 @@ public static void bootstrap(BootstapContext<Structure> context) {
                 Optional.of(Heightmap.Types.WORLD_SURFACE_WG),
                 80
         ));
-
+        registerJigsaw(context, GenerationsStructuresKeys.SPIKE, createJigsaw(
+                new Structure.StructureSettings(
+                        biomeHolderGetter.getOrThrow(GenerationsBiomeTags.HAS_SPIKE),
+                        Map.of(),
+                        GenerationStep.Decoration.UNDERGROUND_DECORATION,
+                        TerrainAdjustment.BEARD_THIN
+                ),
+                poolHolderGetter.getOrThrow(GenerationsTemplatePools.SPIKE),
+                Optional.empty(),
+                1,
+                UniformHeight.of(VerticalAnchor.absolute(0), VerticalAnchor.belowTop(120)),
+                false,
+                Optional.empty(),
+                75
+        ));
     }
 
     private static void registerJigsaw(BootstapContext<Structure> context, ResourceKey<Structure> structureResourceKey, Structure structure){

diff --git a/...nerations/gg/generations/structures/generationsstructures/forge/datagen/ForgeDatagen.java b/...nerations/gg/generations/structures/generationsstructures/forge/datagen/ForgeDatagen.java
@@ -41,7 +41,7 @@ public static void gatherData(GatherDataEvent event) {
         PackOutput output = generator.getPackOutput();
         CompletableFuture<HolderLookup.Provider> lookup = event.getLookupProvider();
         generator.addProvider(true, new GenerationsStructuresBiomeTagsProvider(output, lookup, event.getExistingFileHelper()));
-        generator.addProvider(true, new GenerationsStructureTagsProvider(output, lookup, event.getExistingFileHelper()));
+        generator.addProvider(false, new GenerationsStructureTagsProvider(output, lookup, event.getExistingFileHelper()));
         generator.addProvider(true, new DatapackBuiltinEntriesProvider(output, lookup, BUILDER, Set.of(GenerationsStructures.MOD_ID)));
     }