Registry list abstraction

src/main/java/com/volmit/iris/engine/object/IrisBiome.java

@@ -19,8 +19,8 @@
 package com.volmit.iris.engine.object;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.IrisDataManager;
 import com.volmit.iris.core.gui.components.RenderType;
+import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.engine.IrisComplex;
 import com.volmit.iris.engine.cache.AtomicCache;
 import com.volmit.iris.engine.data.B;
@@ -66,7 +66,7 @@ public class IrisBiome extends IrisRegistrant implements IRare {
 
     @Desc("Spawn Entities in this area over time. Iris will continually replenish these mobs just like vanilla does.")
     @ArrayType(min = 1, type = String.class)
-    @RegistryListSpawner
+    @RegistryListResource(IrisSpawner.class)
     private KList<String> entitySpawners = new KList<>();
 
     @Desc("Add random chances for terrain features")
@@ -132,7 +132,7 @@ public class IrisBiome extends IrisRegistrant implements IRare {
     @Desc("If this biome has children biomes, and the gen layer chooses one of this biomes children, How will it be shaped?")
     private IrisGeneratorStyle childStyle = NoiseStyle.CELLULAR_IRIS_DOUBLE.style();
 
-    @RegistryListBiome
+    @RegistryListResource(IrisBiome.class)
     @ArrayType(min = 1, type = String.class)
     @Desc("List any biome names (file names without.json) here as children. Portions of this biome can sometimes morph into their children. Iris supports cyclic relationships such as A > B > A > B. Iris will stop checking 9 biomes down the tree.")
     private KList<String> children = new KList<>();
@@ -141,7 +141,7 @@ public class IrisBiome extends IrisRegistrant implements IRare {
     @Desc("Jigsaw structures")
     private KList<IrisJigsawStructurePlacement> jigsawStructures = new KList<>();
 
-    @RegistryListBiome
+    @RegistryListResource(IrisBiome.class)
     @Desc("The carving biome. If specified the biome will be used when under a carving instead of this current biome.")
     private String carvingBiome = "";
 
@@ -249,7 +249,7 @@ public class IrisBiome extends IrisRegistrant implements IRare {
         }).get(loadKey);
     }
 
-    public IrisBiome getRealCarvingBiome(IrisDataManager data) {
+    public IrisBiome getRealCarvingBiome(IrisData data) {
         return realCarveBiome.aquire(() ->
         {
             IrisBiome biome = data.getBiomeLoader().load(getCarvingBiome());
@@ -311,7 +311,7 @@ public class IrisBiome extends IrisRegistrant implements IRare {
         return childrenCell.aquire(() -> getChildStyle().create(random.nextParallelRNG(sig * 2137)).bake().scale(scale).bake());
     }
 
-    public KList<BlockData> generateLayers(double wx, double wz, RNG random, int maxDepth, int height, IrisDataManager rdata, IrisComplex complex) {
+    public KList<BlockData> generateLayers(double wx, double wz, RNG random, int maxDepth, int height, IrisData rdata, IrisComplex complex) {
         if (isLockLayers()) {
             return generateLockedLayers(wx, wz, random, maxDepth, height, rdata, complex);
         }
@@ -359,7 +359,7 @@ public class IrisBiome extends IrisRegistrant implements IRare {
         return data;
     }
 
-    public KList<BlockData> generateLockedLayers(double wx, double wz, RNG random, int maxDepthf, int height, IrisDataManager rdata, IrisComplex complex) {
+    public KList<BlockData> generateLockedLayers(double wx, double wz, RNG random, int maxDepthf, int height, IrisData rdata, IrisComplex complex) {
         KList<BlockData> data = new KList<>();
         KList<BlockData> real = new KList<>();
         int maxDepth = Math.min(maxDepthf, getLockLayersMax());
@@ -419,7 +419,7 @@ public class IrisBiome extends IrisRegistrant implements IRare {
         });
     }
 
-    public int getMaxWithObjectHeight(IrisDataManager data) {
+    public int getMaxWithObjectHeight(IrisData data) {
         return maxWithObjectHeight.aquire(() ->
         {
             int maxHeight = 0;
@@ -445,7 +445,7 @@ public class IrisBiome extends IrisRegistrant implements IRare {
         return this;
     }
 
-    public KList<BlockData> generateSeaLayers(double wx, double wz, RNG random, int maxDepth, IrisDataManager rdata) {
+    public KList<BlockData> generateSeaLayers(double wx, double wz, RNG random, int maxDepth, IrisData rdata) {
         KList<BlockData> data = new KList<>();
 
         for (int i = 0; i < seaLayers.size(); i++) {
@@ -477,7 +477,7 @@ public class IrisBiome extends IrisRegistrant implements IRare {
         return data;
     }
 
-    public KList<CNG> getLayerHeightGenerators(RNG rng, IrisDataManager rdata) {
+    public KList<CNG> getLayerHeightGenerators(RNG rng, IrisData rdata) {
         return layerHeightGenerators.aquire(() ->
         {
             KList<CNG> layerHeightGenerators = new KList<>();
@@ -492,7 +492,7 @@ public class IrisBiome extends IrisRegistrant implements IRare {
         });
     }
 
-    public KList<CNG> getLayerSeaHeightGenerators(RNG rng, IrisDataManager data) {
+    public KList<CNG> getLayerSeaHeightGenerators(RNG rng, IrisData data) {
         return layerSeaHeightGenerators.aquire(() ->
         {
             KList<CNG> layerSeaHeightGenerators = new KList<>();
@@ -609,7 +609,7 @@ public class IrisBiome extends IrisRegistrant implements IRare {
         return getBiomeGenerator(rng).fit(biomeScatter, x, y, z);
     }
 
-    public BlockData getSurfaceBlock(int x, int z, RNG rng, IrisDataManager idm) {
+    public BlockData getSurfaceBlock(int x, int z, RNG rng, IrisData idm) {
         if (getLayers().isEmpty()) {
             return B.get("AIR");
         }

src/main/java/com/volmit/iris/engine/object/IrisBiomeGeneratorLink.java

@@ -34,7 +34,7 @@ import lombok.experimental.Accessors;
 @Data
 public class IrisBiomeGeneratorLink {
 
-    @RegistryListGenerator
+    @RegistryListResource(IrisGenerator.class)
     @Desc("The generator id")
     private String generator = "default";
 

src/main/java/com/volmit/iris/engine/object/IrisBiomeMutation.java

@@ -34,13 +34,13 @@ import lombok.experimental.Accessors;
 @Desc("A biome mutation if a condition is met")
 @Data
 public class IrisBiomeMutation {
-    @RegistryListBiome
+    @RegistryListResource(IrisBiome.class)
     @Required
     @ArrayType(min = 1, type = String.class)
     @Desc("One of The following biomes or regions must show up")
     private KList<String> sideA = new KList<>();
 
-    @RegistryListBiome
+    @RegistryListResource(IrisBiome.class)
     @Required
     @ArrayType(min = 1, type = String.class)
     @Desc("One of The following biomes or regions must show up")
@@ -58,7 +58,7 @@ public class IrisBiomeMutation {
     @Desc("How many tries per chunk to check for this mutation")
     private int checks = 2;
 
-    @RegistryListObject
+    @RegistryListResource(IrisObject.class)
     @ArrayType(min = 1, type = IrisObjectPlacement.class)
     @Desc("Objects define what schematics (iob files) iris will place in this biome mutation")
     private KList<IrisObjectPlacement> objects = new KList<>();

src/main/java/com/volmit/iris/engine/object/IrisBiomePaletteLayer.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.object;
 
-import com.volmit.iris.core.IrisDataManager;
+import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.engine.cache.AtomicCache;
 import com.volmit.iris.engine.noise.CNG;
 import com.volmit.iris.engine.object.annotations.*;
@@ -70,11 +70,11 @@ public class IrisBiomePaletteLayer {
     private final transient AtomicCache<CNG> layerGenerator = new AtomicCache<>();
     private final transient AtomicCache<CNG> heightGenerator = new AtomicCache<>();
 
-    public CNG getHeightGenerator(RNG rng, IrisDataManager data) {
+    public CNG getHeightGenerator(RNG rng, IrisData data) {
         return heightGenerator.aquire(() -> CNG.signature(rng.nextParallelRNG(minHeight * maxHeight + getBlockData(data).size())));
     }
 
-    public BlockData get(RNG rng, double x, double y, double z, IrisDataManager data) {
+    public BlockData get(RNG rng, double x, double y, double z, IrisData data) {
         if (getBlockData(data).isEmpty()) {
             return null;
         }
@@ -86,7 +86,7 @@ public class IrisBiomePaletteLayer {
         return getLayerGenerator(rng, data).fit(getBlockData(data), x / zoom, y / zoom, z / zoom);
     }
 
-    public CNG getLayerGenerator(RNG rng, IrisDataManager data) {
+    public CNG getLayerGenerator(RNG rng, IrisData data) {
         return layerGenerator.aquire(() ->
         {
             RNG rngx = rng.nextParallelRNG(minHeight + maxHeight + getBlockData(data).size());
@@ -100,7 +100,7 @@ public class IrisBiomePaletteLayer {
         return palette;
     }
 
-    public KList<BlockData> getBlockData(IrisDataManager data) {
+    public KList<BlockData> getBlockData(IrisData data) {
         return blockData.aquire(() ->
         {
             KList<BlockData> blockData = new KList<>();

src/main/java/com/volmit/iris/engine/object/IrisBlockData.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.engine.object;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.IrisDataManager;
+import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.engine.cache.AtomicCache;
 import com.volmit.iris.engine.data.B;
 import com.volmit.iris.engine.object.annotations.*;
@@ -89,7 +89,7 @@ public class IrisBlockData extends IrisRegistrant {
         return computeProperties(getData());
     }
 
-    public BlockData getBlockData(IrisDataManager data) {
+    public BlockData getBlockData(IrisData data) {
         return blockdata.aquire(() ->
         {
             BlockData b = null;

src/main/java/com/volmit/iris/engine/object/IrisBlockDrops.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.object;
 
-import com.volmit.iris.core.IrisDataManager;
+import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.engine.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;
@@ -58,7 +58,7 @@ public class IrisBlockDrops {
 
     private final transient AtomicCache<KList<BlockData>> data = new AtomicCache<>();
 
-    public boolean shouldDropFor(BlockData data, IrisDataManager rdata) {
+    public boolean shouldDropFor(BlockData data, IrisData rdata) {
         KList<BlockData> list = this.data.aquire(() ->
         {
             KList<BlockData> b = new KList<>();

src/main/java/com/volmit/iris/engine/object/IrisCaveFluid.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.object;
 
-import com.volmit.iris.core.IrisDataManager;
+import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.engine.cache.AtomicCache;
 import com.volmit.iris.engine.data.B;
 import com.volmit.iris.engine.object.annotations.Desc;
@@ -52,11 +52,11 @@ public class IrisCaveFluid {
 
     private final transient AtomicCache<BlockData> fluidData = new AtomicCache<>();
 
-    public boolean hasFluid(IrisDataManager rdata) {
+    public boolean hasFluid(IrisData rdata) {
         return !B.isAir(getFluid(rdata));
     }
 
-    public BlockData getFluid(IrisDataManager rdata) {
+    public BlockData getFluid(IrisData rdata) {
         return fluidData.aquire(() ->
         {
             BlockData b = getFluidType().getBlockData(rdata);

src/main/java/com/volmit/iris/engine/object/IrisDecorator.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.engine.object;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.IrisDataManager;
+import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.engine.cache.AtomicCache;
 import com.volmit.iris.engine.noise.CNG;
 import com.volmit.iris.engine.object.annotations.*;
@@ -98,7 +98,7 @@ public class IrisDecorator {
     private final transient AtomicCache<KList<BlockData>> blockData = new AtomicCache<>();
     private final transient AtomicCache<KList<BlockData>> blockDataTops = new AtomicCache<>();
 
-    public int getHeight(RNG rng, double x, double z, IrisDataManager data) {
+    public int getHeight(RNG rng, double x, double z, IrisData data) {
         if (stackMin == stackMax) {
             return stackMin;
         }
@@ -106,16 +106,16 @@ public class IrisDecorator {
         return getHeightGenerator(rng, data).fit(stackMin, stackMax, x / heightVariance.getZoom(), z / heightVariance.getZoom()) + 1;
     }
 
-    public CNG getHeightGenerator(RNG rng, IrisDataManager data) {
+    public CNG getHeightGenerator(RNG rng, IrisData data) {
         return heightGenerator.aquire(() ->
                 heightVariance.create(rng.nextParallelRNG(getBlockData(data).size() + stackMax + stackMin)));
     }
 
-    public CNG getGenerator(RNG rng, IrisDataManager data) {
+    public CNG getGenerator(RNG rng, IrisData data) {
         return layerGenerator.aquire(() -> style.create(rng.nextParallelRNG(getBlockData(data).size())));
     }
 
-    public CNG getVarianceGenerator(RNG rng, IrisDataManager data) {
+    public CNG getVarianceGenerator(RNG rng, IrisData data) {
         return varianceGenerator.aquire(() ->
                 variance.create(
                         rng.nextParallelRNG(getBlockData(data).size()))
@@ -128,7 +128,7 @@ public class IrisDecorator {
         return palette;
     }
 
-    public BlockData getBlockData(IrisBiome b, RNG rng, double x, double z, IrisDataManager data) {
+    public BlockData getBlockData(IrisBiome b, RNG rng, double x, double z, IrisData data) {
         if (getBlockData(data).isEmpty()) {
             Iris.warn("Empty Block Data for " + b.getName());
             return null;
@@ -148,7 +148,7 @@ public class IrisDecorator {
         return null;
     }
 
-    public BlockData getBlockData100(IrisBiome b, RNG rng, double x, double y, double z, IrisDataManager data) {
+    public BlockData getBlockData100(IrisBiome b, RNG rng, double x, double y, double z, IrisData data) {
         if (getBlockData(data).isEmpty()) {
             Iris.warn("Empty Block Data for " + b.getName());
             return null;
@@ -171,7 +171,7 @@ public class IrisDecorator {
         return getVarianceGenerator(rng, data).fit(getBlockData(data), z, y, x).clone(); //X and Z must be switched
     }
 
-    public BlockData getBlockDataForTop(IrisBiome b, RNG rng, double x, double y, double z, IrisDataManager data) {
+    public BlockData getBlockDataForTop(IrisBiome b, RNG rng, double x, double y, double z, IrisData data) {
         if (getBlockDataTops(data).isEmpty()) {
             return getBlockData100(b, rng, x, y, z, data);
         }
@@ -190,7 +190,7 @@ public class IrisDecorator {
         return null;
     }
 
-    public KList<BlockData> getBlockData(IrisDataManager data) {
+    public KList<BlockData> getBlockData(IrisData data) {
         return blockData.aquire(() ->
         {
             KList<BlockData> blockData = new KList<>();
@@ -207,7 +207,7 @@ public class IrisDecorator {
         });
     }
 
-    public KList<BlockData> getBlockDataTops(IrisDataManager data) {
+    public KList<BlockData> getBlockDataTops(IrisData data) {
         return blockDataTops.aquire(() ->
         {
             KList<BlockData> blockDataTops = new KList<>();

src/main/java/com/volmit/iris/engine/object/IrisDepositGenerator.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.object;
 
-import com.volmit.iris.core.IrisDataManager;
+import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.engine.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.util.collection.KList;
@@ -85,7 +85,7 @@ public class IrisDepositGenerator {
     private final transient AtomicCache<KList<IrisObject>> objects = new AtomicCache<>();
     private final transient AtomicCache<KList<BlockData>> blockData = new AtomicCache<>();
 
-    public IrisObject getClump(RNG rng, IrisDataManager rdata) {
+    public IrisObject getClump(RNG rng, IrisData rdata) {
         KList<IrisObject> objects = this.objects.aquire(() ->
         {
             RNG rngv = rng.nextParallelRNG(3957778);
@@ -104,7 +104,7 @@ public class IrisDepositGenerator {
         return Math.min(11, (int) Math.round(Math.pow(maxSize, 1D / 3D)));
     }
 
-    private IrisObject generateClumpObject(RNG rngv, IrisDataManager rdata) {
+    private IrisObject generateClumpObject(RNG rngv, IrisData rdata) {
         int s = rngv.i(minSize, maxSize);
         int dim = Math.min(11, (int) Math.round(Math.pow(maxSize, 1D / 3D)));
         int w = dim / 2;
@@ -124,11 +124,11 @@ public class IrisDepositGenerator {
         return o;
     }
 
-    private BlockData nextBlock(RNG rngv, IrisDataManager rdata) {
+    private BlockData nextBlock(RNG rngv, IrisData rdata) {
         return getBlockData(rdata).get(rngv.i(0, getBlockData(rdata).size() - 1));
     }
 
-    public KList<BlockData> getBlockData(IrisDataManager rdata) {
+    public KList<BlockData> getBlockData(IrisData rdata) {
         return blockData.aquire(() ->
         {
             KList<BlockData> blockData = new KList<>();

src/main/java/com/volmit/iris/engine/object/IrisDimension.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.engine.object;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.IrisDataManager;
+import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.engine.cache.AtomicCache;
 import com.volmit.iris.engine.data.DataProvider;
 import com.volmit.iris.engine.noise.CNG;
@@ -63,7 +63,7 @@ public class IrisDimension extends IrisRegistrant {
     @Desc("Create an inverted dimension in the sky (like the nether)")
     private IrisDimension sky = null;
 
-    @RegistryListJigsaw
+    @RegistryListResource(IrisJigsawStructure.class)
     @Desc("If defined, Iris will place the given jigsaw structure where minecraft should place the overworld stronghold.")
     private String stronghold;
 
@@ -84,7 +84,7 @@ public class IrisDimension extends IrisRegistrant {
 
     @Desc("Spawn Entities in this dimension over time. Iris will continually replenish these mobs just like vanilla does.")
     @ArrayType(min = 1, type = String.class)
-    @RegistryListSpawner
+    @RegistryListResource(IrisSpawner.class)
     private KList<String> entitySpawners = new KList<>();
 
     @Desc("Add specific features in exact positions")
@@ -188,7 +188,7 @@ public class IrisDimension extends IrisRegistrant {
     @Desc("The world environment")
     private Environment environment = Environment.NORMAL;
 
-    @RegistryListRegion
+    @RegistryListResource(IrisRegion.class)
     @Required
     @ArrayType(min = 1, type = String.class)
     @Desc("Define all of the regions to include in this dimension. Dimensions -> Regions -> Biomes -> Objects etc")
@@ -204,11 +204,11 @@ public class IrisDimension extends IrisRegistrant {
     @Desc("The fluid height for this dimension")
     private int fluidHeight = 63;
 
-    @RegistryListBiome
+    @RegistryListResource(IrisBiome.class)
     @Desc("Keep this either undefined or empty. Setting any biome name into this will force iris to only generate the specified biome. Great for testing.")
     private String focus = "";
 
-    @RegistryListBiome
+    @RegistryListResource(IrisBiome.class)
     @Desc("Keep this either undefined or empty. Setting any region name into this will force iris to only generate the specified region. Great for testing.")
     private String focusRegion = "";
 
@@ -372,7 +372,7 @@ public class IrisDimension extends IrisRegistrant {
         KList<IrisRegion> r = new KList<>();
 
         for (String i : getRegions()) {
-            r.add(IrisDataManager.loadAnyRegion(i));
+            r.add(IrisData.loadAnyRegion(i));
         }
 
         return r;

src/main/java/com/volmit/iris/engine/object/IrisDimensionIndex.java

@@ -20,7 +20,7 @@ package com.volmit.iris.engine.object;
 
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.MinNumber;
-import com.volmit.iris.engine.object.annotations.RegistryListDimension;
+import com.volmit.iris.engine.object.annotations.RegistryListResource;
 import com.volmit.iris.engine.object.annotations.Required;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -47,7 +47,7 @@ public class IrisDimensionIndex {
     private boolean primary = false;
 
     @Required
-    @RegistryListDimension
+    @RegistryListResource(IrisDimension.class)
     @MinNumber(1)
     @Desc("Name of dimension")
     private String dimension = "";

src/main/java/com/volmit/iris/engine/object/IrisEntitySpawn.java

@@ -23,7 +23,7 @@ import com.volmit.iris.engine.cache.AtomicCache;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.MinNumber;
-import com.volmit.iris.engine.object.annotations.RegistryListEntity;
+import com.volmit.iris.engine.object.annotations.RegistryListResource;
 import com.volmit.iris.engine.object.annotations.Required;
 import com.volmit.iris.engine.object.common.IRare;
 import com.volmit.iris.util.format.C;
@@ -42,7 +42,7 @@ import org.bukkit.entity.Entity;
 @Desc("Represents an entity spawn during initial chunk generation")
 @Data
 public class IrisEntitySpawn implements IRare {
-    @RegistryListEntity
+    @RegistryListResource(IrisEntity.class)
     @Required
     @Desc("The entity")
     private String entity = "";

src/main/java/com/volmit/iris/engine/object/IrisEntitySpawnOverride.java

@@ -22,7 +22,7 @@ import com.volmit.iris.engine.cache.AtomicCache;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.MinNumber;
-import com.volmit.iris.engine.object.annotations.RegistryListEntity;
+import com.volmit.iris.engine.object.annotations.RegistryListResource;
 import com.volmit.iris.engine.object.annotations.Required;
 import com.volmit.iris.util.math.RNG;
 import lombok.AllArgsConstructor;
@@ -40,7 +40,7 @@ import org.bukkit.event.entity.EntitySpawnEvent;
 @Desc("Represents an entity spawn")
 @Data
 public class IrisEntitySpawnOverride {
-    @RegistryListEntity
+    @RegistryListResource(IrisEntity.class)
     @Required
     @Desc("The entity")
     private String entity = "";

src/main/java/com/volmit/iris/engine/object/IrisFeature.java

@@ -46,7 +46,7 @@ public class IrisFeature {
     @Desc("The chance an object that should be place actually will place. Set to below 1 to affect objects in this zone")
     private double objectChance = 1;
 
-    @RegistryListBiome
+    @RegistryListResource(IrisBiome.class)
     @Desc("Apply a custom biome here")
     private String customBiome = null;
 

src/main/java/com/volmit/iris/engine/object/IrisJigsawPiece.java

@@ -22,7 +22,7 @@ import com.volmit.iris.Iris;
 import com.volmit.iris.engine.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;
-import com.volmit.iris.engine.object.annotations.RegistryListObject;
+import com.volmit.iris.engine.object.annotations.RegistryListResource;
 import com.volmit.iris.engine.object.annotations.Required;
 import com.volmit.iris.util.collection.KList;
 import lombok.AllArgsConstructor;
@@ -43,7 +43,7 @@ import java.io.IOException;
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class IrisJigsawPiece extends IrisRegistrant {
-    @RegistryListObject
+    @RegistryListResource(IrisObject.class)
     @Required
     @Desc("The object this piece represents")
     private String object = "";

src/main/java/com/volmit/iris/engine/object/IrisJigsawPieceConnector.java

@@ -49,13 +49,13 @@ public class IrisJigsawPieceConnector {
     @Desc("If set to true, this connector is allowed to place pieces inside of it's own piece. For example if you are adding a light post, or house on top of a path piece, you would set this to true to allow the piece to collide with the path bounding box.")
     private boolean innerConnector = false;
 
-    @RegistryListJigsawPool
+    @RegistryListResource(IrisJigsawPool.class)
     @Desc("Pick piece pools to place onto this connector")
     @ArrayType(type = String.class, min = 1)
     @Required
     private KList<String> pools = new KList<>();
 
-    @RegistryListEntity
+    @RegistryListResource(IrisEntity.class)
     @Desc("Pick an entity to spawn on this connector")
     private String spawnEntity;
 

src/main/java/com/volmit/iris/engine/object/IrisJigsawPlacement.java

@@ -20,7 +20,7 @@ package com.volmit.iris.engine.object;
 
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.MinNumber;
-import com.volmit.iris.engine.object.annotations.RegistryListJigsaw;
+import com.volmit.iris.engine.object.annotations.RegistryListResource;
 import com.volmit.iris.engine.object.annotations.Required;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -33,7 +33,7 @@ import lombok.experimental.Accessors;
 @Desc("Represents a jigsaw placement")
 @Data
 public class IrisJigsawPlacement {
-    @RegistryListJigsaw
+    @RegistryListResource(IrisJigsawStructure.class)
     @Required
     @Desc("The jigsaw structure to use")
     private String structure = "";

src/main/java/com/volmit/iris/engine/object/IrisJigsawPool.java

@@ -20,7 +20,7 @@ package com.volmit.iris.engine.object;
 
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;
-import com.volmit.iris.engine.object.annotations.RegistryListJigsawPiece;
+import com.volmit.iris.engine.object.annotations.RegistryListResource;
 import com.volmit.iris.engine.object.annotations.Required;
 import com.volmit.iris.util.collection.KList;
 import lombok.AllArgsConstructor;
@@ -38,7 +38,7 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class IrisJigsawPool extends IrisRegistrant {
-    @RegistryListJigsawPiece
+    @RegistryListResource(IrisJigsawPiece.class)
     @Required
     @ArrayType(min = 1, type = String.class)
     @Desc("A list of structure piece pools")

src/main/java/com/volmit/iris/engine/object/IrisJigsawStructure.java

@@ -37,7 +37,7 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class IrisJigsawStructure extends IrisRegistrant {
-    @RegistryListJigsawPiece
+    @RegistryListResource(IrisJigsawPiece.class)
     @Required
     @ArrayType(min = 1, type = String.class)
     @Desc("The starting pieces. Randomly chooses a starting piece, then connects pieces using the pools define in the starting piece.")

src/main/java/com/volmit/iris/engine/object/IrisJigsawStructurePlacement.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.engine.object;
 
 import com.volmit.iris.engine.object.annotations.Desc;
-import com.volmit.iris.engine.object.annotations.RegistryListJigsaw;
+import com.volmit.iris.engine.object.annotations.RegistryListResource;
 import com.volmit.iris.engine.object.annotations.Required;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -36,7 +36,7 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class IrisJigsawStructurePlacement {
-    @RegistryListJigsaw
+    @RegistryListResource(IrisJigsawStructure.class)
     @Required
     @Desc("The structure to place")
     private String structure;

src/main/java/com/volmit/iris/engine/object/IrisLootReference.java

@@ -23,7 +23,7 @@ import com.volmit.iris.engine.data.DataProvider;
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.MinNumber;
-import com.volmit.iris.engine.object.annotations.RegistryListLoot;
+import com.volmit.iris.engine.object.annotations.RegistryListResource;
 import com.volmit.iris.util.collection.KList;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -39,7 +39,7 @@ public class IrisLootReference {
     @Desc("Add = add on top of parent tables, Replace = clear first then add these. Clear = Remove all and dont add loot from this or parent.")
     private LootMode mode = LootMode.ADD;
 
-    @RegistryListLoot
+    @RegistryListResource(IrisLootTable.class)
     @ArrayType(min = 1, type = String.class)
     @Desc("Add loot table registries here")
     private KList<String> tables = new KList<>();

src/main/java/com/volmit/iris/engine/object/IrisMaterialPalette.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.object;
 
-import com.volmit.iris.core.IrisDataManager;
+import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.engine.cache.AtomicCache;
 import com.volmit.iris.engine.noise.CNG;
 import com.volmit.iris.engine.object.annotations.ArrayType;
@@ -55,7 +55,7 @@ public class IrisMaterialPalette {
     private final transient AtomicCache<CNG> layerGenerator = new AtomicCache<>();
     private final transient AtomicCache<CNG> heightGenerator = new AtomicCache<>();
 
-    public BlockData get(RNG rng, double x, double y, double z, IrisDataManager rdata) {
+    public BlockData get(RNG rng, double x, double y, double z, IrisData rdata) {
         if (getBlockData(rdata).isEmpty()) {
             return null;
         }
@@ -67,7 +67,7 @@ public class IrisMaterialPalette {
         return getLayerGenerator(rng, rdata).fit(getBlockData(rdata), x / zoom, y / zoom, z / zoom);
     }
 
-    public CNG getLayerGenerator(RNG rng, IrisDataManager rdata) {
+    public CNG getLayerGenerator(RNG rng, IrisData rdata) {
         return layerGenerator.aquire(() ->
         {
             RNG rngx = rng.nextParallelRNG(-23498896 + getBlockData(rdata).size());
@@ -92,7 +92,7 @@ public class IrisMaterialPalette {
         return this;
     }
 
-    public KList<BlockData> getBlockData(IrisDataManager rdata) {
+    public KList<BlockData> getBlockData(IrisData rdata) {
         return blockData.aquire(() ->
         {
             KList<BlockData> blockData = new KList<>();

src/main/java/com/volmit/iris/engine/object/IrisMod.java

@@ -48,22 +48,22 @@ public class IrisMod extends IrisRegistrant {
     private int overrideFluidHeight = -1;
 
     @Desc("A list of biomes to remove")
-    @RegistryListBiome
+    @RegistryListResource(IrisBiome.class)
     @ArrayType(type = String.class, min = 1)
     private KList<String> removeBiomes = new KList<>();
 
     @Desc("A list of objects to remove")
-    @RegistryListObject
+    @RegistryListResource(IrisObject.class)
     @ArrayType(type = String.class, min = 1)
     private KList<String> removeObjects = new KList<>();
 
     @Desc("A list of regions to remove")
-    @RegistryListRegion
+    @RegistryListResource(IrisRegion.class)
     @ArrayType(type = String.class, min = 1)
     private KList<String> removeRegions = new KList<>();
 
     @Desc("A list of regions to inject")
-    @RegistryListRegion
+    @RegistryListResource(IrisRegion.class)
     @ArrayType(type = String.class, min = 1)
     private KList<String> injectRegions = new KList<>();
 

src/main/java/com/volmit/iris/engine/object/IrisModBiomeInjector.java

@@ -18,7 +18,10 @@
 
 package com.volmit.iris.engine.object;
 
-import com.volmit.iris.engine.object.annotations.*;
+import com.volmit.iris.engine.object.annotations.ArrayType;
+import com.volmit.iris.engine.object.annotations.Desc;
+import com.volmit.iris.engine.object.annotations.RegistryListResource;
+import com.volmit.iris.engine.object.annotations.Required;
 import com.volmit.iris.util.collection.KList;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -33,12 +36,12 @@ import lombok.experimental.Accessors;
 public class IrisModBiomeInjector {
     @Required
     @Desc("The region to find")
-    @RegistryListRegion
+    @RegistryListResource(IrisRegion.class)
     private String region = "";
 
     @Required
     @Desc("A biome to inject into the region")
-    @RegistryListBiome
+    @RegistryListResource(IrisBiome.class)
     @ArrayType(type = String.class, min = 1)
     private KList<String> inject = new KList<>();
 }

src/main/java/com/volmit/iris/engine/object/IrisModBiomeReplacer.java

@@ -20,7 +20,7 @@ package com.volmit.iris.engine.object;
 
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;
-import com.volmit.iris.engine.object.annotations.RegistryListBiome;
+import com.volmit.iris.engine.object.annotations.RegistryListResource;
 import com.volmit.iris.engine.object.annotations.Required;
 import com.volmit.iris.util.collection.KList;
 import lombok.AllArgsConstructor;
@@ -36,12 +36,12 @@ import lombok.experimental.Accessors;
 public class IrisModBiomeReplacer {
     @Required
     @Desc("A list of biomes to find")
-    @RegistryListBiome
+    @RegistryListResource(IrisBiome.class)
     @ArrayType(type = String.class, min = 1)
     private KList<String> find = new KList<>();
 
     @Required
     @Desc("A biome to replace it with")
-    @RegistryListBiome
+    @RegistryListResource(IrisBiome.class)
     private String replace = "";
 }

src/main/java/com/volmit/iris/engine/object/IrisModNoiseStyleReplacer.java

@@ -20,7 +20,7 @@ package com.volmit.iris.engine.object;
 
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;
-import com.volmit.iris.engine.object.annotations.RegistryListBiome;
+import com.volmit.iris.engine.object.annotations.RegistryListResource;
 import com.volmit.iris.engine.object.annotations.Required;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -44,6 +44,6 @@ public class IrisModNoiseStyleReplacer {
 
     @Required
     @Desc("A noise style to replace it with")
-    @RegistryListBiome
+    @RegistryListResource(IrisBiome.class)
     private IrisGeneratorStyle replace = new IrisGeneratorStyle();
 }

src/main/java/com/volmit/iris/engine/object/IrisModObjectPlacementBiomeInjector.java

@@ -20,7 +20,7 @@ package com.volmit.iris.engine.object;
 
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;
-import com.volmit.iris.engine.object.annotations.RegistryListBiome;
+import com.volmit.iris.engine.object.annotations.RegistryListResource;
 import com.volmit.iris.engine.object.annotations.Required;
 import com.volmit.iris.util.collection.KList;
 import lombok.AllArgsConstructor;
@@ -36,7 +36,7 @@ import lombok.experimental.Accessors;
 public class IrisModObjectPlacementBiomeInjector {
     @Required
     @Desc("The biome to find")
-    @RegistryListBiome
+    @RegistryListResource(IrisBiome.class)
     private String biome = "";
 
     @Required

src/main/java/com/volmit/iris/engine/object/IrisModObjectPlacementRegionInjector.java

@@ -20,7 +20,7 @@ package com.volmit.iris.engine.object;
 
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;
-import com.volmit.iris.engine.object.annotations.RegistryListRegion;
+import com.volmit.iris.engine.object.annotations.RegistryListResource;
 import com.volmit.iris.engine.object.annotations.Required;
 import com.volmit.iris.util.collection.KList;
 import lombok.AllArgsConstructor;
@@ -36,7 +36,7 @@ import lombok.experimental.Accessors;
 public class IrisModObjectPlacementRegionInjector {
     @Required
     @Desc("The biome to find")
-    @RegistryListRegion
+    @RegistryListResource(IrisRegion.class)
     private String biome = "";
 
     @Required

src/main/java/com/volmit/iris/engine/object/IrisModObjectReplacer.java

@@ -18,7 +18,10 @@
 
 package com.volmit.iris.engine.object;
 
-import com.volmit.iris.engine.object.annotations.*;
+import com.volmit.iris.engine.object.annotations.ArrayType;
+import com.volmit.iris.engine.object.annotations.Desc;
+import com.volmit.iris.engine.object.annotations.RegistryListResource;
+import com.volmit.iris.engine.object.annotations.Required;
 import com.volmit.iris.util.collection.KList;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -33,12 +36,12 @@ import lombok.experimental.Accessors;
 public class IrisModObjectReplacer {
     @Required
     @Desc("A list of objects to find")
-    @RegistryListObject
+    @RegistryListResource(IrisObject.class)
     @ArrayType(type = String.class, min = 1)
     private KList<String> find = new KList<>();
 
     @Required
     @Desc("An object to replace it with")
-    @RegistryListBiome
+    @RegistryListResource(IrisBiome.class)
     private String replace = "";
 }

src/main/java/com/volmit/iris/engine/object/IrisModRegionReplacer.java

@@ -20,7 +20,7 @@ package com.volmit.iris.engine.object;
 
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;
-import com.volmit.iris.engine.object.annotations.RegistryListRegion;
+import com.volmit.iris.engine.object.annotations.RegistryListResource;
 import com.volmit.iris.engine.object.annotations.Required;
 import com.volmit.iris.util.collection.KList;
 import lombok.AllArgsConstructor;
@@ -36,12 +36,12 @@ import lombok.experimental.Accessors;
 public class IrisModRegionReplacer {
     @Required
     @Desc("A list of regions to find")
-    @RegistryListRegion
+    @RegistryListResource(IrisRegion.class)
     @ArrayType(type = String.class, min = 1)
     private KList<String> find = new KList<>();
 
     @Required
     @Desc("A region to replace it with")
-    @RegistryListRegion
+    @RegistryListResource(IrisRegion.class)
     private String replace = "";
 }

src/main/java/com/volmit/iris/engine/object/IrisObject.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.engine.object;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.IrisDataManager;
+import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.engine.cache.AtomicCache;
 import com.volmit.iris.engine.data.B;
 import com.volmit.iris.engine.framework.placer.HeightmapObjectPlacer;
@@ -404,23 +404,23 @@ public class IrisObject extends IrisRegistrant {
         }
     }
 
-    public int place(int x, int z, IObjectPlacer placer, IrisObjectPlacement config, RNG rng, IrisDataManager rdata) {
+    public int place(int x, int z, IObjectPlacer placer, IrisObjectPlacement config, RNG rng, IrisData rdata) {
         return place(x, -1, z, placer, config, rng, rdata);
     }
 
-    public int place(int x, int z, IObjectPlacer placer, IrisObjectPlacement config, RNG rng, CarveResult c, IrisDataManager rdata) {
+    public int place(int x, int z, IObjectPlacer placer, IrisObjectPlacement config, RNG rng, CarveResult c, IrisData rdata) {
         return place(x, -1, z, placer, config, rng, null, c, rdata);
     }
 
-    public int place(int x, int yv, int z, IObjectPlacer placer, IrisObjectPlacement config, RNG rng, IrisDataManager rdata) {
+    public int place(int x, int yv, int z, IObjectPlacer placer, IrisObjectPlacement config, RNG rng, IrisData rdata) {
         return place(x, yv, z, placer, config, rng, null, null, rdata);
     }
 
-    public int place(Location loc, IObjectPlacer placer, IrisObjectPlacement config, RNG rng, IrisDataManager rdata) {
+    public int place(Location loc, IObjectPlacer placer, IrisObjectPlacement config, RNG rng, IrisData rdata) {
         return place(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ(), placer, config, rng, rdata);
     }
 
-    public int place(int x, int yv, int z, IObjectPlacer oplacer, IrisObjectPlacement config, RNG rng, Consumer<BlockPosition> listener, CarveResult c, IrisDataManager rdata) {
+    public int place(int x, int yv, int z, IObjectPlacer oplacer, IrisObjectPlacement config, RNG rng, Consumer<BlockPosition> listener, CarveResult c, IrisData rdata) {
         IObjectPlacer placer = (config.getHeightmap() != null) ? new HeightmapObjectPlacer(rng, x, yv, z, config, oplacer) : oplacer;
 
         if (config.isSmartBore()) {

src/main/java/com/volmit/iris/engine/object/IrisObjectLoot.java

@@ -18,11 +18,11 @@
 
 package com.volmit.iris.engine.object;
 
-import com.volmit.iris.core.IrisDataManager;
+import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.engine.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.ArrayType;
 import com.volmit.iris.engine.object.annotations.Desc;
-import com.volmit.iris.engine.object.annotations.RegistryListLoot;
+import com.volmit.iris.engine.object.annotations.RegistryListResource;
 import com.volmit.iris.engine.object.annotations.Required;
 import com.volmit.iris.util.collection.KList;
 import lombok.AllArgsConstructor;
@@ -46,7 +46,7 @@ public class IrisObjectLoot {
 
     @Desc("The loot table name")
     @Required
-    @RegistryListLoot
+    @RegistryListResource(IrisLootTable.class)
     private String name;
 
     @Desc("The weight of this loot table being chosen")
@@ -54,7 +54,7 @@ public class IrisObjectLoot {
 
     private final transient AtomicCache<KList<BlockData>> filterCache = new AtomicCache<>();
 
-    public KList<BlockData> getFilter(IrisDataManager rdata) {
+    public KList<BlockData> getFilter(IrisData rdata) {
         return filterCache.aquire(() ->
         {
             KList<BlockData> b = new KList<>();
@@ -71,7 +71,7 @@ public class IrisObjectLoot {
         });
     }
 
-    public boolean matchesFilter(IrisDataManager manager, BlockData data) {
+    public boolean matchesFilter(IrisData manager, BlockData data) {
         for (BlockData filterData : getFilter(manager)) {
             if (filterData.matches(data)) return true;
         }

src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.engine.object;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.IrisDataManager;
+import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.engine.cache.AtomicCache;
 import com.volmit.iris.engine.data.B;
 import com.volmit.iris.engine.data.DataProvider;
@@ -46,7 +46,7 @@ import org.bukkit.block.data.BlockData;
 @Desc("Represents an iris object placer. It places objects.")
 @Data
 public class IrisObjectPlacement {
-    @RegistryListObject
+    @RegistryListResource(IrisObject.class)
     @Required
     @ArrayType(min = 1, type = String.class)
     @Desc("List of objects to place")
@@ -231,7 +231,7 @@ public class IrisObjectPlacement {
         final transient KMap<Material, KMap<BlockData, WeightedRandom<IrisLootTable>>> exact = new KMap<>();
     }
 
-    private TableCache getCache(IrisDataManager manager) {
+    private TableCache getCache(IrisData manager) {
         return cache.aquire(() -> {
             TableCache tc = new TableCache();
 
@@ -280,7 +280,7 @@ public class IrisObjectPlacement {
      * @param dataManager Iris Data Manager
      * @return The loot table it should use.
      */
-    public IrisLootTable getTable(BlockData data, IrisDataManager dataManager) {
+    public IrisLootTable getTable(BlockData data, IrisData dataManager) {
         TableCache cache = getCache(dataManager);
 
         if (B.isStorageChest(data)) {

src/main/java/com/volmit/iris/engine/object/IrisObjectReplace.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.object;
 
-import com.volmit.iris.core.IrisDataManager;
+import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.engine.cache.AtomicCache;
 import com.volmit.iris.engine.noise.CNG;
 import com.volmit.iris.engine.object.annotations.*;
@@ -57,7 +57,7 @@ public class IrisObjectReplace {
     private final transient AtomicCache<KList<BlockData>> findData = new AtomicCache<>();
     private final transient AtomicCache<KList<BlockData>> replaceData = new AtomicCache<>();
 
-    public KList<BlockData> getFind(IrisDataManager rdata) {
+    public KList<BlockData> getFind(IrisData rdata) {
         return findData.aquire(() ->
         {
             KList<BlockData> b = new KList<>();
@@ -74,7 +74,7 @@ public class IrisObjectReplace {
         });
     }
 
-    public BlockData getReplace(RNG seed, double x, double y, double z, IrisDataManager rdata) {
+    public BlockData getReplace(RNG seed, double x, double y, double z, IrisData rdata) {
         return getReplace().get(seed, x, y, z, rdata);
     }
 }

src/main/java/com/volmit/iris/engine/object/IrisRareObject.java

@@ -20,7 +20,7 @@ package com.volmit.iris.engine.object;
 
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.MinNumber;
-import com.volmit.iris.engine.object.annotations.RegistryListObject;
+import com.volmit.iris.engine.object.annotations.RegistryListResource;
 import com.volmit.iris.engine.object.annotations.Required;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -42,7 +42,7 @@ public class IrisRareObject {
     @Desc("The rarity is 1 in X")
     private int rarity = 1;
 
-    @RegistryListObject
+    @RegistryListResource(IrisObject.class)
     @Required
     @Desc("The object to place if rarity check passed")
     private String object = "";

src/main/java/com/volmit/iris/engine/object/IrisRegion.java

@@ -19,8 +19,8 @@
 package com.volmit.iris.engine.object;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.IrisDataManager;
 import com.volmit.iris.core.gui.components.RenderType;
+import com.volmit.iris.core.project.loader.IrisData;
 import com.volmit.iris.engine.cache.AtomicCache;
 import com.volmit.iris.engine.data.DataProvider;
 import com.volmit.iris.engine.noise.CNG;
@@ -69,7 +69,7 @@ public class IrisRegion extends IrisRegistrant implements IRare {
 
     @Desc("Spawn Entities in this region over time. Iris will continually replenish these mobs just like vanilla does.")
     @ArrayType(min = 1, type = String.class)
-    @RegistryListSpawner
+    @RegistryListResource(IrisSpawner.class)
     private KList<String> entitySpawners = new KList<>();
 
     @MinNumber(1)
@@ -134,35 +134,35 @@ public class IrisRegion extends IrisRegistrant implements IRare {
     @Desc("The biome implosion ratio, how much to implode biomes into children (chance)")
     private double biomeImplosionRatio = 0.4;
 
-    @RegistryListBiome
+    @RegistryListResource(IrisBiome.class)
     @Required
     @ArrayType(min = 1, type = String.class)
     @Desc("A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.")
     private KList<String> landBiomes = new KList<>();
 
-    @RegistryListBiome
+    @RegistryListResource(IrisBiome.class)
     @Required
     @ArrayType(min = 1, type = String.class)
     @Desc("A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.")
     private KList<String> seaBiomes = new KList<>();
 
-    @RegistryListBiome
+    @RegistryListResource(IrisBiome.class)
     @Required
     @ArrayType(min = 1, type = String.class)
     @Desc("A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.")
     private KList<String> shoreBiomes = new KList<>();
 
-    @RegistryListBiome
+    @RegistryListResource(IrisBiome.class)
     @ArrayType(min = 1, type = String.class)
     @Desc("A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.")
     private KList<String> riverBiomes = new KList<>();
 
-    @RegistryListBiome
+    @RegistryListResource(IrisBiome.class)
     @ArrayType(min = 1, type = String.class)
     @Desc("A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.")
     private KList<String> lakeBiomes = new KList<>();
 
-    @RegistryListBiome
+    @RegistryListResource(IrisBiome.class)
     @ArrayType(min = 1, type = String.class)
     @Desc("A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.")
     private KList<String> caveBiomes = new KList<>();
@@ -493,7 +493,7 @@ public class IrisRegion extends IrisRegistrant implements IRare {
                     continue;
                 }
 
-                IrisBiome biome = IrisDataManager.loadAnyBiome(i);
+                IrisBiome biome = IrisData.loadAnyBiome(i);
 
                 names.remove(i);
                 if (biome == null) {

src/main/java/com/volmit/iris/engine/object/IrisRegionRidge.java

@@ -33,7 +33,7 @@ import lombok.experimental.Accessors;
 @Desc("A ridge config")
 @Data
 public class IrisRegionRidge {
-    @RegistryListBiome
+    @RegistryListResource(IrisBiome.class)
     @Required
     @Desc("The biome name")
     private String biome = "";

src/main/java/com/volmit/iris/engine/object/IrisRegionSpot.java

@@ -22,7 +22,7 @@ import com.volmit.iris.engine.cache.AtomicCache;
 import com.volmit.iris.engine.noise.CellGenerator;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.MinNumber;
-import com.volmit.iris.engine.object.annotations.RegistryListBiome;
+import com.volmit.iris.engine.object.annotations.RegistryListResource;
 import com.volmit.iris.engine.object.annotations.Required;
 import com.volmit.iris.util.math.RNG;
 import lombok.AllArgsConstructor;
@@ -36,7 +36,7 @@ import lombok.experimental.Accessors;
 @Desc("A spot config")
 @Data
 public class IrisRegionSpot {
-    @RegistryListBiome
+    @RegistryListResource(IrisBiome.class)
     @Required
     @Desc("The biome to be placed")
     private String biome = "";

src/main/java/com/volmit/iris/engine/object/IrisRegistrant.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.engine.object;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.core.IrisDataManager;
+import com.volmit.iris.core.project.loader.IrisData;
 import lombok.Data;
 
 import java.awt.*;
@@ -27,7 +27,7 @@ import java.io.File;
 
 @Data
 public abstract class IrisRegistrant {
-    private transient IrisDataManager loader;
+    private transient IrisData loader;
 
     private transient String loadKey;
 

src/main/java/com/volmit/iris/engine/object/annotations/RegistryListDimension.java

@@ -1,31 +0,0 @@
-/*
- * Iris is a World Generator for Minecraft Bukkit Servers
- * Copyright (c) 2021 Arcane Arts (Volmit Software)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.volmit.iris.engine.object.annotations;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-@Retention(RUNTIME)
-@Target({PARAMETER, TYPE, FIELD})
-public @interface RegistryListDimension {
-
-}

src/main/java/com/volmit/iris/engine/object/annotations/RegistryListEntity.java

@@ -1,31 +0,0 @@
-/*
- * Iris is a World Generator for Minecraft Bukkit Servers
- * Copyright (c) 2021 Arcane Arts (Volmit Software)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.volmit.iris.engine.object.annotations;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-@Retention(RUNTIME)
-@Target({PARAMETER, TYPE, FIELD})
-public @interface RegistryListEntity {
-
-}

src/main/java/com/volmit/iris/engine/object/annotations/RegistryListGenerator.java

@@ -1,31 +0,0 @@
-/*
- * Iris is a World Generator for Minecraft Bukkit Servers
- * Copyright (c) 2021 Arcane Arts (Volmit Software)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.volmit.iris.engine.object.annotations;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-@Retention(RUNTIME)
-@Target({PARAMETER, TYPE, FIELD})
-public @interface RegistryListGenerator {
-
-}

src/main/java/com/volmit/iris/engine/object/annotations/RegistryListJigsaw.java

@@ -1,31 +0,0 @@
-/*
- * Iris is a World Generator for Minecraft Bukkit Servers
- * Copyright (c) 2021 Arcane Arts (Volmit Software)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.volmit.iris.engine.object.annotations;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-@Retention(RUNTIME)
-@Target({PARAMETER, TYPE, FIELD})
-public @interface RegistryListJigsaw {
-
-}

src/main/java/com/volmit/iris/engine/object/annotations/RegistryListJigsawPiece.java

@@ -1,31 +0,0 @@
-/*
- * Iris is a World Generator for Minecraft Bukkit Servers
- * Copyright (c) 2021 Arcane Arts (Volmit Software)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.volmit.iris.engine.object.annotations;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-@Retention(RUNTIME)
-@Target({PARAMETER, TYPE, FIELD})
-public @interface RegistryListJigsawPiece {
-
-}

src/main/java/com/volmit/iris/engine/object/annotations/RegistryListJigsawPool.java

@@ -1,31 +0,0 @@
-/*
- * Iris is a World Generator for Minecraft Bukkit Servers
- * Copyright (c) 2021 Arcane Arts (Volmit Software)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.volmit.iris.engine.object.annotations;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-@Retention(RUNTIME)
-@Target({PARAMETER, TYPE, FIELD})
-public @interface RegistryListJigsawPool {
-
-}

src/main/java/com/volmit/iris/engine/object/annotations/RegistryListLoot.java

@@ -1,31 +0,0 @@
-/*
- * Iris is a World Generator for Minecraft Bukkit Servers
- * Copyright (c) 2021 Arcane Arts (Volmit Software)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.volmit.iris.engine.object.annotations;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-@Retention(RUNTIME)
-@Target({PARAMETER, TYPE, FIELD})
-public @interface RegistryListLoot {
-
-}

src/main/java/com/volmit/iris/engine/object/annotations/RegistryListObject.java

@@ -1,31 +0,0 @@
-/*
- * Iris is a World Generator for Minecraft Bukkit Servers
- * Copyright (c) 2021 Arcane Arts (Volmit Software)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.volmit.iris.engine.object.annotations;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-@Retention(RUNTIME)
-@Target({PARAMETER, TYPE, FIELD})
-public @interface RegistryListObject {
-
-}

src/main/java/com/volmit/iris/engine/object/annotations/RegistryListRegion.java

@@ -1,31 +0,0 @@
-/*
- * Iris is a World Generator for Minecraft Bukkit Servers
- * Copyright (c) 2021 Arcane Arts (Volmit Software)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.volmit.iris.engine.object.annotations;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-@Retention(RUNTIME)
-@Target({PARAMETER, TYPE, FIELD})
-public @interface RegistryListRegion {
-
-}

src/main/java/com/volmit/iris/engine/object/annotations/RegistryListResource.java

@@ -18,6 +18,8 @@
 
 package com.volmit.iris.engine.object.annotations;
 
+import com.volmit.iris.engine.object.IrisRegistrant;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -26,6 +28,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 @Retention(RUNTIME)
 @Target({PARAMETER, TYPE, FIELD})
-public @interface RegistryListBiome {
-
+public @interface RegistryListResource {
+    Class<? extends IrisRegistrant> value();
 }

src/main/java/com/volmit/iris/engine/object/annotations/RegistryListSpawner.java

@@ -1,31 +0,0 @@
-/*
- * Iris is a World Generator for Minecraft Bukkit Servers
- * Copyright (c) 2021 Arcane Arts (Volmit Software)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.volmit.iris.engine.object.annotations;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-@Retention(RUNTIME)
-@Target({PARAMETER, TYPE, FIELD})
-public @interface RegistryListSpawner {
-
-}