Move Structures to match where the key location is.

GenerationsMod · Nov 28, 2023 · 2b63193 · 2b63193
1 parent 49dc786
commit 2b63193
Show file tree

Hide file tree

Showing 20 changed files with 19 additions and 22 deletions.
diff --git a/...rc/main/generated/resources/data/generations_structures/worldgen/template_pool/comet.json b/...rc/main/generated/resources/data/generations_structures/worldgen/template_pool/comet.json
@@ -3,7 +3,7 @@
     {
       "element": {
         "element_type": "minecraft:single_pool_element",
-        "location": "generations_structures:overworld/comet",
+        "location": "generations_structures:comet",
         "processors": "minecraft:empty",
         "projection": "rigid"
       },

diff --git a/...ources/data/generations_structures/worldgen/template_pool/loot_balloon/beast_balloon.json b/...ources/data/generations_structures/worldgen/template_pool/loot_balloon/beast_balloon.json
@@ -3,7 +3,7 @@
     {
       "element": {
         "element_type": "minecraft:single_pool_element",
-        "location": "generations_structures:overworld/loot_balloon/beast_balloon",
+        "location": "generations_structures:loot_balloon/beast_balloon",
         "processors": "minecraft:empty",
         "projection": "rigid"
       },

diff --git a/...ources/data/generations_structures/worldgen/template_pool/loot_balloon/great_balloon.json b/...ources/data/generations_structures/worldgen/template_pool/loot_balloon/great_balloon.json
@@ -3,7 +3,7 @@
     {
       "element": {
         "element_type": "minecraft:single_pool_element",
-        "location": "generations_structures:overworld/loot_balloon/great_balloon",
+        "location": "generations_structures:loot_balloon/great_balloon",
         "processors": "minecraft:empty",
         "projection": "rigid"
       },

diff --git a/...urces/data/generations_structures/worldgen/template_pool/loot_balloon/master_balloon.json b/...urces/data/generations_structures/worldgen/template_pool/loot_balloon/master_balloon.json
@@ -3,7 +3,7 @@
     {
       "element": {
         "element_type": "minecraft:single_pool_element",
-        "location": "generations_structures:overworld/loot_balloon/master_balloon",
+        "location": "generations_structures:loot_balloon/master_balloon",
         "processors": "minecraft:empty",
         "projection": "rigid"
       },

diff --git a/...urces/data/generations_structures/worldgen/template_pool/loot_balloon/meowth_balloon.json b/...urces/data/generations_structures/worldgen/template_pool/loot_balloon/meowth_balloon.json
@@ -3,7 +3,7 @@
     {
       "element": {
         "element_type": "minecraft:single_pool_element",
-        "location": "generations_structures:overworld/loot_balloon/meowth_balloon",
+        "location": "generations_structures:loot_balloon/meowth_balloon",
         "processors": "minecraft:empty",
         "projection": "rigid"
       },

diff --git a/...urces/data/generations_structures/worldgen/template_pool/loot_balloon/normal_balloon.json b/...urces/data/generations_structures/worldgen/template_pool/loot_balloon/normal_balloon.json
@@ -3,7 +3,7 @@
     {
       "element": {
         "element_type": "minecraft:single_pool_element",
-        "location": "generations_structures:overworld/normal_balloon/beast_balloon",
+        "location": "generations_structures:loot_balloon/normal_balloon",
         "processors": "minecraft:empty",
         "projection": "rigid"
       },

diff --git a/...ources/data/generations_structures/worldgen/template_pool/loot_balloon/ultra_balloon.json b/...ources/data/generations_structures/worldgen/template_pool/loot_balloon/ultra_balloon.json
@@ -3,7 +3,7 @@
     {
       "element": {
         "element_type": "minecraft:single_pool_element",
-        "location": "generations_structures:overworld/loot_balloon/ultra_balloon",
+        "location": "generations_structures:loot_balloon/ultra_balloon",
         "processors": "minecraft:empty",
         "projection": "rigid"
       },

diff --git a/...erated/resources/data/generations_structures/worldgen/template_pool/scarlet_pokeshop.json b/...erated/resources/data/generations_structures/worldgen/template_pool/scarlet_pokeshop.json
@@ -3,7 +3,7 @@
     {
       "element": {
         "element_type": "minecraft:single_pool_element",
-        "location": "generations_structures:overworld/scarlet_pokeshop",
+        "location": "generations_structures:scarlet_pokeshop",
         "processors": {
           "processors": []
         },

diff --git a/...rc/main/generated/resources/data/generations_structures/worldgen/template_pool/spike.json b/...rc/main/generated/resources/data/generations_structures/worldgen/template_pool/spike.json
@@ -3,7 +3,7 @@
     {
       "element": {
         "element_type": "minecraft:single_pool_element",
-        "location": "generations_structures:nether/spike",
+        "location": "generations_structures:spike",
         "processors": "minecraft:empty",
         "projection": "terrain_matching"
       },

diff --git a/...ons/structures/generationsstructures/worldgen/template_pool/GenerationsTemplatePools.java b/...ons/structures/generationsstructures/worldgen/template_pool/GenerationsTemplatePools.java
@@ -3,6 +3,7 @@
 import com.google.common.collect.ImmutableList;
 import com.mojang.datafixers.util.Pair;
 import generations.gg.generations.structures.generationsstructures.GenerationsStructures;
+import generations.gg.generations.structures.generationsstructures.structures.GenerationsStructuresKeys;
 import net.minecraft.core.Holder;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.data.worldgen.BootstapContext;
@@ -31,41 +32,41 @@ public class GenerationsTemplatePools {
 
     public static void bootstrap(BootstapContext<StructureTemplatePool> context) {
         register(context, BEAST_BALLOON, Pools.EMPTY, ImmutableList.of(
-                Pair.of(StructurePoolElement.single(getOverworldPath("loot_balloon/beast_balloon"), getProcessor(context, ProcessorLists.EMPTY)), 1)
+                Pair.of(StructurePoolElement.single(GenerationsStructuresKeys.BEAST_BALLOON.location().toString(), getProcessor(context, ProcessorLists.EMPTY)), 1)
         ), StructureTemplatePool.Projection.RIGID);
 
         register(context, GREAT_BALLOON, Pools.EMPTY, ImmutableList.of(
-                Pair.of(StructurePoolElement.single(getOverworldPath("loot_balloon/great_balloon"), getProcessor(context, ProcessorLists.EMPTY)), 1)
+                Pair.of(StructurePoolElement.single(GenerationsStructuresKeys.GREAT_BALLOON.location().toString(), getProcessor(context, ProcessorLists.EMPTY)), 1)
         ), StructureTemplatePool.Projection.RIGID);
 
         register(context, MASTER_BALLOON, Pools.EMPTY, ImmutableList.of(
-                Pair.of(StructurePoolElement.single(getOverworldPath("loot_balloon/master_balloon"), getProcessor(context, ProcessorLists.EMPTY)), 1)
+                Pair.of(StructurePoolElement.single(GenerationsStructuresKeys.MASTER_BALLOON.location().toString(), getProcessor(context, ProcessorLists.EMPTY)), 1)
         ), StructureTemplatePool.Projection.RIGID);
 
         register(context, MEOWTH_BALLOON, Pools.EMPTY, ImmutableList.of(
-                Pair.of(StructurePoolElement.single(getOverworldPath("loot_balloon/meowth_balloon"), getProcessor(context, ProcessorLists.EMPTY)), 1)
+                Pair.of(StructurePoolElement.single(GenerationsStructuresKeys.MEOWTH_BALLOON.location().toString(), getProcessor(context, ProcessorLists.EMPTY)), 1)
         ), StructureTemplatePool.Projection.RIGID);
 
         register(context, NORMAL_BALLOON, Pools.EMPTY, ImmutableList.of(
-                Pair.of(StructurePoolElement.single(getOverworldPath("normal_balloon/beast_balloon"), getProcessor(context, ProcessorLists.EMPTY)), 1)
+                Pair.of(StructurePoolElement.single(GenerationsStructuresKeys.NORMAL_BALLOON.location().toString(), getProcessor(context, ProcessorLists.EMPTY)), 1)
         ), StructureTemplatePool.Projection.RIGID);
 
         register(context, ULTRA_BALLOON, Pools.EMPTY, ImmutableList.of(
-                Pair.of(StructurePoolElement.single(getOverworldPath("loot_balloon/ultra_balloon"), getProcessor(context, ProcessorLists.EMPTY)), 1)
+                Pair.of(StructurePoolElement.single(GenerationsStructuresKeys.ULTRA_BALLOON.location().toString(), getProcessor(context, ProcessorLists.EMPTY)), 1)
         ), StructureTemplatePool.Projection.RIGID);
 
 
         register(context, COMET, Pools.EMPTY, ImmutableList.of(
-                Pair.of(StructurePoolElement.single(getOverworldPath("comet"), getProcessor(context, ProcessorLists.EMPTY)), 1)
+                Pair.of(StructurePoolElement.single(GenerationsStructuresKeys.COMET.location().toString(), getProcessor(context, ProcessorLists.EMPTY)), 1)
         ), StructureTemplatePool.Projection.RIGID);
 
         register(context, SCARLET_POKESHOP, Pools.EMPTY, ImmutableList.of(
-                Pair.of(StructurePoolElement.single(getOverworldPath("scarlet_pokeshop")), 1)
+                Pair.of(StructurePoolElement.single(GenerationsStructuresKeys.SCARLET_POKESHOP.location().toString()), 1)
         ), StructureTemplatePool.Projection.RIGID);
 
 
         register(context, SPIKE, Pools.EMPTY, ImmutableList.of(
-                Pair.of(StructurePoolElement.single("generations_structures:nether/spike", getProcessor(context, ProcessorLists.EMPTY)), 1)
+                Pair.of(StructurePoolElement.single(GenerationsStructuresKeys.SPIKE.location().toString(), getProcessor(context, ProcessorLists.EMPTY)), 1)
         ), StructureTemplatePool.Projection.TERRAIN_MATCHING);
     }
 
@@ -77,10 +78,6 @@ private static void register(BootstapContext<StructureTemplatePool> context, Res
         context.register(key, new StructureTemplatePool(context.lookup(Registries.TEMPLATE_POOL).getOrThrow(fallback), rawTemplateFactories, projection));
     }
 
-    private static String getOverworldPath(String name) {
-        return "generations_structures:overworld/" + name;
-    }
-
     private static Holder.Reference<StructureProcessorList> getProcessor(BootstapContext<StructureTemplatePool> context, ResourceKey<StructureProcessorList> processorList) {
         return context.lookup(Registries.PROCESSOR_LIST).getOrThrow(processorList);
     }

diff --git a/...structures/structures/overworld/comet.nbt → ...nerations_structures/structures/comet.nbt b/...structures/structures/overworld/comet.nbt → ...nerations_structures/structures/comet.nbt
diff --git a/...tures/structures/overworld/lighthouse.nbt → ...ions_structures/structures/lighthouse.nbt b/...tures/structures/overworld/lighthouse.nbt → ...ions_structures/structures/lighthouse.nbt
diff --git a/.../overworld/loot_balloon/beast_balloon.nbt → ...structures/loot_balloon/beast_balloon.nbt b/.../overworld/loot_balloon/beast_balloon.nbt → ...structures/loot_balloon/beast_balloon.nbt
diff --git a/.../overworld/loot_balloon/great_balloon.nbt → ...structures/loot_balloon/great_balloon.nbt b/.../overworld/loot_balloon/great_balloon.nbt → ...structures/loot_balloon/great_balloon.nbt
diff --git a/...overworld/loot_balloon/master_balloon.nbt → ...tructures/loot_balloon/master_balloon.nbt b/...overworld/loot_balloon/master_balloon.nbt → ...tructures/loot_balloon/master_balloon.nbt
diff --git a/...overworld/loot_balloon/meowth_balloon.nbt → ...tructures/loot_balloon/meowth_balloon.nbt b/...overworld/loot_balloon/meowth_balloon.nbt → ...tructures/loot_balloon/meowth_balloon.nbt
diff --git a/...overworld/loot_balloon/normal_balloon.nbt → ...tructures/loot_balloon/normal_balloon.nbt b/...overworld/loot_balloon/normal_balloon.nbt → ...tructures/loot_balloon/normal_balloon.nbt
diff --git a/.../overworld/loot_balloon/ultra_balloon.nbt → ...structures/loot_balloon/ultra_balloon.nbt b/.../overworld/loot_balloon/ultra_balloon.nbt → ...structures/loot_balloon/ultra_balloon.nbt
diff --git a/...structures/overworld/scarlet_pokeshop.nbt → ...tructures/structures/scarlet_pokeshop.nbt b/...structures/overworld/scarlet_pokeshop.nbt → ...tructures/structures/scarlet_pokeshop.nbt
diff --git a/...ns_structures/structures/nether/spike.nbt → ...nerations_structures/structures/spike.nbt b/...ns_structures/structures/nether/spike.nbt → ...nerations_structures/structures/spike.nbt