Re-explode the objects

src/main/java/com/volmit/iris/Iris.java

@@ -26,11 +26,11 @@ import com.volmit.iris.core.link.OraxenLink;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.nms.INMS;
 import com.volmit.iris.core.service.StudioSVC;
-import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.biome.IrisBiomeCustom;
+import com.volmit.iris.engine.object.IrisBiomeCustom;
-import com.volmit.iris.engine.object.common.IrisWorld;
+import com.volmit.iris.engine.object.IrisWorld;
-import com.volmit.iris.engine.object.compat.IrisCompat;
+import com.volmit.iris.engine.object.IrisCompat;
-import com.volmit.iris.engine.object.dimensional.IrisDimension;
+import com.volmit.iris.engine.object.IrisDimension;
 import com.volmit.iris.engine.platform.BukkitChunkGenerator;
 import com.volmit.iris.engine.platform.DummyChunkGenerator;
 import com.volmit.iris.util.collection.KList;

src/main/java/com/volmit/iris/core/commands/CommandIris.java

@@ -22,7 +22,7 @@ import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.service.StudioSVC;
 import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.engine.object.dimensional.IrisDimension;
+import com.volmit.iris.engine.object.IrisDimension;
 import com.volmit.iris.util.decree.DecreeExecutor;
 import com.volmit.iris.util.decree.DecreeOrigin;
 import com.volmit.iris.util.decree.annotations.Decree;

src/main/java/com/volmit/iris/core/commands/CommandObject.java

@@ -5,13 +5,13 @@ import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.service.ObjectSVC;
 import com.volmit.iris.core.service.StudioSVC;
 import com.volmit.iris.core.service.WandSVC;
-import com.volmit.iris.engine.object.common.IObjectPlacer;
+import com.volmit.iris.engine.object.IObjectPlacer;
-import com.volmit.iris.engine.object.dimensional.IrisDimension;
+import com.volmit.iris.engine.object.IrisDimension;
-import com.volmit.iris.engine.object.objects.IrisObject;
+import com.volmit.iris.engine.object.IrisObject;
-import com.volmit.iris.engine.object.objects.IrisObjectPlacement;
+import com.volmit.iris.engine.object.IrisObjectPlacement;
-import com.volmit.iris.engine.object.objects.IrisObjectPlacementScaleInterpolator;
+import com.volmit.iris.engine.object.IrisObjectPlacementScaleInterpolator;
-import com.volmit.iris.engine.object.objects.IrisObjectRotation;
+import com.volmit.iris.engine.object.IrisObjectRotation;
-import com.volmit.iris.engine.object.tile.TileData;
+import com.volmit.iris.engine.object.TileData;
 import com.volmit.iris.util.data.Cuboid;
 import com.volmit.iris.util.decree.DecreeExecutor;
 import com.volmit.iris.util.decree.DecreeOrigin;

src/main/java/com/volmit/iris/core/commands/CommandStudio.java

@@ -29,22 +29,22 @@ import com.volmit.iris.core.service.ConversionSVC;
 import com.volmit.iris.core.service.StudioSVC;
 import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.object.basic.IrisPosition;
+import com.volmit.iris.engine.object.IrisPosition;
-import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.biome.IrisBiomePaletteLayer;
+import com.volmit.iris.engine.object.IrisBiomePaletteLayer;
-import com.volmit.iris.engine.object.common.IrisScript;
+import com.volmit.iris.engine.object.IrisScript;
-import com.volmit.iris.engine.object.dimensional.IrisDimension;
+import com.volmit.iris.engine.object.IrisDimension;
-import com.volmit.iris.engine.object.entity.IrisEntity;
+import com.volmit.iris.engine.object.IrisEntity;
-import com.volmit.iris.engine.object.feature.IrisFeaturePositional;
+import com.volmit.iris.engine.object.IrisFeaturePositional;
-import com.volmit.iris.engine.object.loot.IrisLootTable;
+import com.volmit.iris.engine.object.IrisLootTable;
-import com.volmit.iris.engine.object.meta.InventorySlotType;
+import com.volmit.iris.engine.object.InventorySlotType;
-import com.volmit.iris.engine.object.noise.IrisGenerator;
+import com.volmit.iris.engine.object.IrisGenerator;
-import com.volmit.iris.engine.object.noise.IrisInterpolator;
+import com.volmit.iris.engine.object.IrisInterpolator;
-import com.volmit.iris.engine.object.noise.IrisNoiseGenerator;
+import com.volmit.iris.engine.object.IrisNoiseGenerator;
-import com.volmit.iris.engine.object.noise.NoiseStyle;
+import com.volmit.iris.engine.object.NoiseStyle;
-import com.volmit.iris.engine.object.objects.IrisObject;
+import com.volmit.iris.engine.object.IrisObject;
-import com.volmit.iris.engine.object.objects.IrisObjectPlacement;
+import com.volmit.iris.engine.object.IrisObjectPlacement;
-import com.volmit.iris.engine.object.regional.IrisRegion;
+import com.volmit.iris.engine.object.IrisRegion;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.collection.KSet;

src/main/java/com/volmit/iris/core/commands/CommandWhat.java

@@ -4,8 +4,8 @@ import com.google.gson.Gson;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.nms.INMS;
 import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.feature.IrisFeaturePositional;
+import com.volmit.iris.engine.object.IrisFeaturePositional;
 import com.volmit.iris.util.data.B;
 import com.volmit.iris.util.decree.DecreeExecutor;
 import com.volmit.iris.util.decree.DecreeOrigin;

src/main/java/com/volmit/iris/core/edit/JigsawEditor.java

@@ -21,11 +21,11 @@ package com.volmit.iris.core.edit;
 import com.google.gson.Gson;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.service.WandSVC;
-import com.volmit.iris.engine.object.basic.IrisPosition;
+import com.volmit.iris.engine.object.IrisPosition;
-import com.volmit.iris.engine.object.jigsaw.IrisJigsawPiece;
+import com.volmit.iris.engine.object.IrisJigsawPiece;
-import com.volmit.iris.engine.object.jigsaw.IrisJigsawPieceConnector;
+import com.volmit.iris.engine.object.IrisJigsawPieceConnector;
-import com.volmit.iris.engine.object.objects.IrisDirection;
+import com.volmit.iris.engine.object.IrisDirection;
-import com.volmit.iris.engine.object.objects.IrisObject;
+import com.volmit.iris.engine.object.IrisObject;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.data.Cuboid;
 import com.volmit.iris.util.io.IO;

src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java

@@ -20,7 +20,7 @@ package com.volmit.iris.core.gui;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.events.IrisEngineHotloadEvent;
-import com.volmit.iris.engine.object.noise.NoiseStyle;
+import com.volmit.iris.engine.object.NoiseStyle;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.function.Function2;
 import com.volmit.iris.util.math.M;

src/main/java/com/volmit/iris/core/gui/VisionGUI.java

@@ -24,9 +24,9 @@ import com.volmit.iris.core.gui.components.RenderType;
 import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.IrisComplex;
 import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.common.IrisWorld;
+import com.volmit.iris.engine.object.IrisWorld;
-import com.volmit.iris.engine.object.regional.IrisRegion;
+import com.volmit.iris.engine.object.IrisRegion;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.collection.KSet;

src/main/java/com/volmit/iris/core/link/MultiverseCoreLink.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.core.link;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.engine.object.dimensional.IrisDimension;
+import com.volmit.iris.engine.object.IrisDimension;
 import com.volmit.iris.util.collection.KMap;
 import org.bukkit.Bukkit;
 import org.bukkit.World;

src/main/java/com/volmit/iris/core/loader/IrisData.java

@@ -27,23 +27,23 @@ import com.volmit.iris.Iris;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.object.annotations.Snippet;
-import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.block.IrisBlockData;
+import com.volmit.iris.engine.object.IrisBlockData;
-import com.volmit.iris.engine.object.carving.IrisCave;
+import com.volmit.iris.engine.object.IrisCave;
-import com.volmit.iris.engine.object.carving.IrisRavine;
+import com.volmit.iris.engine.object.IrisRavine;
-import com.volmit.iris.engine.object.common.IrisScript;
+import com.volmit.iris.engine.object.IrisScript;
-import com.volmit.iris.engine.object.dimensional.IrisDimension;
+import com.volmit.iris.engine.object.IrisDimension;
-import com.volmit.iris.engine.object.entity.IrisEntity;
+import com.volmit.iris.engine.object.IrisEntity;
-import com.volmit.iris.engine.object.jigsaw.IrisJigsawPiece;
+import com.volmit.iris.engine.object.IrisJigsawPiece;
-import com.volmit.iris.engine.object.jigsaw.IrisJigsawPool;
+import com.volmit.iris.engine.object.IrisJigsawPool;
-import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructure;
+import com.volmit.iris.engine.object.IrisJigsawStructure;
-import com.volmit.iris.engine.object.loot.IrisLootTable;
+import com.volmit.iris.engine.object.IrisLootTable;
-import com.volmit.iris.engine.object.mods.IrisMod;
+import com.volmit.iris.engine.object.IrisMod;
-import com.volmit.iris.engine.object.noise.IrisExpression;
+import com.volmit.iris.engine.object.IrisExpression;
-import com.volmit.iris.engine.object.noise.IrisGenerator;
+import com.volmit.iris.engine.object.IrisGenerator;
-import com.volmit.iris.engine.object.objects.IrisObject;
+import com.volmit.iris.engine.object.IrisObject;
-import com.volmit.iris.engine.object.regional.IrisRegion;
+import com.volmit.iris.engine.object.IrisRegion;
-import com.volmit.iris.engine.object.spawners.IrisSpawner;
+import com.volmit.iris.engine.object.IrisSpawner;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.context.IrisContext;
 import com.volmit.iris.util.format.C;
@@ -55,7 +55,6 @@ import lombok.Data;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
-import java.lang.reflect.Type;
 import java.util.Objects;
 import java.util.function.Function;
 

src/main/java/com/volmit/iris/core/loader/IrisRegistrant.java

@@ -23,7 +23,7 @@ import com.volmit.iris.Iris;
 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.common.IrisScript;
+import com.volmit.iris.engine.object.IrisScript;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.json.JSONObject;
 import com.volmit.iris.util.plugin.VolmitSender;

src/main/java/com/volmit/iris/core/loader/ObjectResourceLoader.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.core.loader;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.engine.object.objects.IrisObject;
+import com.volmit.iris.engine.object.IrisObject;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.collection.KSet;

src/main/java/com/volmit/iris/core/loader/ScriptResourceLoader.java

@@ -19,7 +19,7 @@
 package com.volmit.iris.core.loader;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.engine.object.common.IrisScript;
+import com.volmit.iris.engine.object.IrisScript;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KSet;
 import com.volmit.iris.util.io.IO;

src/main/java/com/volmit/iris/core/pack/IrisPack.java

@@ -22,8 +22,8 @@ import com.volmit.iris.Iris;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.loader.ResourceLoader;
 import com.volmit.iris.core.service.StudioSVC;
-import com.volmit.iris.engine.object.common.IrisWorld;
+import com.volmit.iris.engine.object.IrisWorld;
-import com.volmit.iris.engine.object.dimensional.IrisDimension;
+import com.volmit.iris.engine.object.IrisDimension;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.exceptions.IrisException;
 import com.volmit.iris.util.format.Form;

src/main/java/com/volmit/iris/core/pregenerator/methods/HeadlessPregenMethod.java

@@ -20,7 +20,7 @@ package com.volmit.iris.core.pregenerator.methods;
 
 import com.volmit.iris.core.pregenerator.PregenListener;
 import com.volmit.iris.core.pregenerator.PregeneratorMethod;
-import com.volmit.iris.engine.object.common.HeadlessWorld;
+import com.volmit.iris.engine.object.HeadlessWorld;
 import com.volmit.iris.engine.platform.HeadlessGenerator;
 import lombok.Getter;
 

src/main/java/com/volmit/iris/core/pregenerator/methods/HybridPregenMethod.java

@@ -23,7 +23,7 @@ import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.pregenerator.PregenListener;
 import com.volmit.iris.core.pregenerator.PregeneratorMethod;
 import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.engine.object.common.HeadlessWorld;
+import com.volmit.iris.engine.object.HeadlessWorld;
 import com.volmit.iris.util.math.Position2;
 import org.bukkit.World;
 

src/main/java/com/volmit/iris/core/pregenerator/methods/SyndicatePregenMethod.java

@@ -25,7 +25,7 @@ import com.volmit.iris.core.pregenerator.PregenTask;
 import com.volmit.iris.core.pregenerator.PregeneratorMethod;
 import com.volmit.iris.core.pregenerator.syndicate.SyndicateClient;
 import com.volmit.iris.core.pregenerator.syndicate.command.*;
-import com.volmit.iris.engine.object.dimensional.IrisDimension;
+import com.volmit.iris.engine.object.IrisDimension;
 import com.volmit.iris.util.io.IO;
 import com.volmit.iris.util.scheduling.J;
 import lombok.Getter;

src/main/java/com/volmit/iris/core/pregenerator/syndicate/SyndicateServer.java

@@ -20,7 +20,7 @@ package com.volmit.iris.core.pregenerator.syndicate;
 
 import com.volmit.iris.core.pregenerator.PregenListener;
 import com.volmit.iris.core.pregenerator.syndicate.command.*;
-import com.volmit.iris.engine.object.common.HeadlessWorld;
+import com.volmit.iris.engine.object.HeadlessWorld;
 import com.volmit.iris.engine.platform.HeadlessGenerator;
 import com.volmit.iris.util.io.IO;
 import com.volmit.iris.util.scheduling.J;

src/main/java/com/volmit/iris/core/pregenerator/syndicate/command/SyndicateInstallPack.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.core.pregenerator.syndicate.command;
 
-import com.volmit.iris.engine.object.dimensional.IrisDimension;
+import com.volmit.iris.engine.object.IrisDimension;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

src/main/java/com/volmit/iris/core/project/IrisProject.java

@@ -25,22 +25,21 @@ import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.core.loader.ResourceLoader;
 import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.block.IrisBlockData;
+import com.volmit.iris.engine.object.IrisBlockData;
-import com.volmit.iris.engine.object.dimensional.IrisDimension;
+import com.volmit.iris.engine.object.IrisDimension;
-import com.volmit.iris.engine.object.entity.IrisEntity;
+import com.volmit.iris.engine.object.IrisEntity;
-import com.volmit.iris.engine.object.loot.IrisLootTable;
+import com.volmit.iris.engine.object.IrisLootTable;
-import com.volmit.iris.engine.object.noise.IrisGenerator;
+import com.volmit.iris.engine.object.IrisGenerator;
-import com.volmit.iris.engine.object.objects.IrisObject;
+import com.volmit.iris.engine.object.IrisObject;
-import com.volmit.iris.engine.object.objects.IrisObjectPlacement;
+import com.volmit.iris.engine.object.IrisObjectPlacement;
-import com.volmit.iris.engine.object.regional.IrisRegion;
+import com.volmit.iris.engine.object.IrisRegion;
-import com.volmit.iris.engine.object.spawners.IrisSpawner;
+import com.volmit.iris.engine.object.IrisSpawner;
 import com.volmit.iris.engine.platform.PlatformChunkGenerator;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.collection.KSet;
 import com.volmit.iris.util.exceptions.IrisException;
-import com.volmit.iris.util.format.Form;
 import com.volmit.iris.util.io.IO;
 import com.volmit.iris.util.json.JSONArray;
 import com.volmit.iris.util.json.JSONObject;

src/main/java/com/volmit/iris/core/service/BoardSVC.java

@@ -22,7 +22,7 @@ import com.volmit.iris.Iris;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.object.feature.IrisFeaturePositional;
+import com.volmit.iris.engine.object.IrisFeaturePositional;
 import com.volmit.iris.util.board.BoardProvider;
 import com.volmit.iris.util.board.BoardSettings;
 import com.volmit.iris.util.board.ScoreDirection;

src/main/java/com/volmit/iris/core/service/ConversionSVC.java

@@ -20,12 +20,12 @@ package com.volmit.iris.core.service;
 
 import com.google.gson.Gson;
 import com.volmit.iris.Iris;
-import com.volmit.iris.engine.object.basic.IrisPosition;
+import com.volmit.iris.engine.object.IrisPosition;
-import com.volmit.iris.engine.object.jigsaw.IrisJigsawPiece;
+import com.volmit.iris.engine.object.IrisJigsawPiece;
-import com.volmit.iris.engine.object.jigsaw.IrisJigsawPieceConnector;
+import com.volmit.iris.engine.object.IrisJigsawPieceConnector;
-import com.volmit.iris.engine.object.jigsaw.IrisJigsawPool;
+import com.volmit.iris.engine.object.IrisJigsawPool;
-import com.volmit.iris.engine.object.objects.IrisDirection;
+import com.volmit.iris.engine.object.IrisDirection;
-import com.volmit.iris.engine.object.objects.IrisObject;
+import com.volmit.iris.engine.object.IrisObject;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.format.Form;

src/main/java/com/volmit/iris/core/service/StudioSVC.java

@@ -27,7 +27,7 @@ import com.volmit.iris.core.pack.IrisPack;
 import com.volmit.iris.core.project.IrisProject;
 import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.data.cache.AtomicCache;
-import com.volmit.iris.engine.object.dimensional.IrisDimension;
+import com.volmit.iris.engine.object.IrisDimension;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.exceptions.IrisException;
 import com.volmit.iris.util.format.Form;

src/main/java/com/volmit/iris/core/service/TreeSVC.java

@@ -21,14 +21,14 @@ package com.volmit.iris.core.service;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.common.IObjectPlacer;
+import com.volmit.iris.engine.object.IObjectPlacer;
-import com.volmit.iris.engine.object.objects.IrisObject;
+import com.volmit.iris.engine.object.IrisObject;
-import com.volmit.iris.engine.object.objects.IrisObjectPlacement;
+import com.volmit.iris.engine.object.IrisObjectPlacement;
-import com.volmit.iris.engine.object.regional.IrisRegion;
+import com.volmit.iris.engine.object.IrisRegion;
-import com.volmit.iris.engine.object.tile.TileData;
+import com.volmit.iris.engine.object.TileData;
-import com.volmit.iris.engine.object.trees.IrisTreeModes;
+import com.volmit.iris.engine.object.IrisTreeModes;
-import com.volmit.iris.engine.object.trees.IrisTreeSize;
+import com.volmit.iris.engine.object.IrisTreeSize;
 import com.volmit.iris.engine.platform.PlatformChunkGenerator;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;

src/main/java/com/volmit/iris/core/service/VillageSVC.java

@@ -20,8 +20,8 @@ package com.volmit.iris.core.service;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.engine.object.villager.IrisVillagerOverride;
+import com.volmit.iris.engine.object.IrisVillagerOverride;
-import com.volmit.iris.engine.object.villager.IrisVillagerTrade;
+import com.volmit.iris.engine.object.IrisVillagerTrade;
 import com.volmit.iris.util.plugin.IrisService;
 import org.bukkit.Material;
 import org.bukkit.event.EventHandler;

src/main/java/com/volmit/iris/core/service/WandSVC.java

@@ -21,7 +21,7 @@ package com.volmit.iris.core.service;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.edit.DustRevealer;
 import com.volmit.iris.core.wand.WandSelection;
-import com.volmit.iris.engine.object.objects.IrisObject;
+import com.volmit.iris.engine.object.IrisObject;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.data.Cuboid;
 import com.volmit.iris.util.format.C;

src/main/java/com/volmit/iris/core/tools/IrisCreator.java

@@ -23,7 +23,7 @@ import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.pregenerator.PregenTask;
 import com.volmit.iris.core.service.StudioSVC;
-import com.volmit.iris.engine.object.dimensional.IrisDimension;
+import com.volmit.iris.engine.object.IrisDimension;
 import com.volmit.iris.engine.platform.PlatformChunkGenerator;
 import com.volmit.iris.util.exceptions.IrisException;
 import com.volmit.iris.util.format.C;

src/main/java/com/volmit/iris/core/tools/IrisToolbelt.java

@@ -27,7 +27,7 @@ import com.volmit.iris.core.pregenerator.PregeneratorMethod;
 import com.volmit.iris.core.pregenerator.methods.HeadlessPregenMethod;
 import com.volmit.iris.core.pregenerator.methods.HybridPregenMethod;
 import com.volmit.iris.core.service.StudioSVC;
-import com.volmit.iris.engine.object.dimensional.IrisDimension;
+import com.volmit.iris.engine.object.IrisDimension;
 import com.volmit.iris.engine.platform.HeadlessGenerator;
 import com.volmit.iris.engine.platform.PlatformChunkGenerator;
 import com.volmit.iris.util.plugin.VolmitSender;

src/main/java/com/volmit/iris/core/tools/IrisWorldCreator.java

@@ -19,8 +19,8 @@
 package com.volmit.iris.core.tools;
 
 import com.volmit.iris.core.loader.IrisData;
-import com.volmit.iris.engine.object.common.IrisWorld;
+import com.volmit.iris.engine.object.IrisWorld;
-import com.volmit.iris.engine.object.dimensional.IrisDimension;
+import com.volmit.iris.engine.object.IrisDimension;
 import com.volmit.iris.engine.platform.BukkitChunkGenerator;
 import org.bukkit.World;
 import org.bukkit.WorldCreator;

src/main/java/com/volmit/iris/engine/IrisComplex.java

@@ -22,13 +22,13 @@ import com.google.common.util.concurrent.AtomicDouble;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.object.biome.InferredType;
+import com.volmit.iris.engine.object.InferredType;
-import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.decoration.IrisDecorationPart;
+import com.volmit.iris.engine.object.IrisDecorationPart;
-import com.volmit.iris.engine.object.decoration.IrisDecorator;
+import com.volmit.iris.engine.object.IrisDecorator;
-import com.volmit.iris.engine.object.feature.IrisFeaturePositional;
+import com.volmit.iris.engine.object.IrisFeaturePositional;
-import com.volmit.iris.engine.object.noise.IrisGenerator;
+import com.volmit.iris.engine.object.IrisGenerator;
-import com.volmit.iris.engine.object.regional.IrisRegion;
+import com.volmit.iris.engine.object.IrisRegion;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.data.DataProvider;

src/main/java/com/volmit/iris/engine/IrisEngine.java

@@ -34,11 +34,11 @@ import com.volmit.iris.engine.mantle.EngineMantle;
 import com.volmit.iris.engine.modifier.IrisCarveModifier;
 import com.volmit.iris.engine.modifier.IrisDepositModifier;
 import com.volmit.iris.engine.modifier.IrisPostModifier;
-import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.biome.IrisBiomePaletteLayer;
+import com.volmit.iris.engine.object.IrisBiomePaletteLayer;
-import com.volmit.iris.engine.object.decoration.IrisDecorator;
+import com.volmit.iris.engine.object.IrisDecorator;
-import com.volmit.iris.engine.object.engine.IrisEngineData;
+import com.volmit.iris.engine.object.IrisEngineData;
-import com.volmit.iris.engine.object.objects.IrisObjectPlacement;
+import com.volmit.iris.engine.object.IrisObjectPlacement;
 import com.volmit.iris.engine.scripting.EngineExecutionEnvironment;
 import com.volmit.iris.util.atomics.AtomicRollingSequence;
 import com.volmit.iris.util.collection.KMap;

src/main/java/com/volmit/iris/engine/IrisEngineMantle.java

@@ -27,14 +27,14 @@ import com.volmit.iris.engine.mantle.components.MantleCarvingComponent;
 import com.volmit.iris.engine.mantle.components.MantleFeatureComponent;
 import com.volmit.iris.engine.mantle.components.MantleJigsawComponent;
 import com.volmit.iris.engine.mantle.components.MantleObjectComponent;
-import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.deposits.IrisDepositGenerator;
+import com.volmit.iris.engine.object.IrisDepositGenerator;
-import com.volmit.iris.engine.object.feature.IrisFeaturePotential;
+import com.volmit.iris.engine.object.IrisFeaturePotential;
-import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructurePlacement;
+import com.volmit.iris.engine.object.IrisJigsawStructurePlacement;
-import com.volmit.iris.engine.object.objects.IrisObject;
+import com.volmit.iris.engine.object.IrisObject;
-import com.volmit.iris.engine.object.objects.IrisObjectPlacement;
+import com.volmit.iris.engine.object.IrisObjectPlacement;
-import com.volmit.iris.engine.object.objects.IrisObjectScale;
+import com.volmit.iris.engine.object.IrisObjectScale;
-import com.volmit.iris.engine.object.regional.IrisRegion;
+import com.volmit.iris.engine.object.IrisRegion;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.collection.KSet;

src/main/java/com/volmit/iris/engine/IrisExecutionEnvironment.java

@@ -20,7 +20,7 @@ package com.volmit.iris.engine;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.object.common.IrisScript;
+import com.volmit.iris.engine.object.IrisScript;
 import com.volmit.iris.engine.scripting.EngineExecutionEnvironment;
 import com.volmit.iris.engine.scripting.IrisScriptingAPI;
 import com.volmit.iris.util.format.C;

src/main/java/com/volmit/iris/engine/IrisWorldManager.java

@@ -22,15 +22,15 @@ import com.volmit.iris.Iris;
 import com.volmit.iris.engine.data.cache.Cache;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.EngineAssignedWorldManager;
-import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.block.IrisBlockDrops;
+import com.volmit.iris.engine.object.IrisBlockDrops;
-import com.volmit.iris.engine.object.common.IRare;
+import com.volmit.iris.engine.object.IRare;
-import com.volmit.iris.engine.object.engine.IrisEngineChunkData;
+import com.volmit.iris.engine.object.IrisEngineChunkData;
-import com.volmit.iris.engine.object.engine.IrisEngineData;
+import com.volmit.iris.engine.object.IrisEngineData;
-import com.volmit.iris.engine.object.engine.IrisEngineSpawnerCooldown;
+import com.volmit.iris.engine.object.IrisEngineSpawnerCooldown;
-import com.volmit.iris.engine.object.entity.IrisEntitySpawn;
+import com.volmit.iris.engine.object.IrisEntitySpawn;
-import com.volmit.iris.engine.object.regional.IrisRegion;
+import com.volmit.iris.engine.object.IrisRegion;
-import com.volmit.iris.engine.object.spawners.IrisSpawner;
+import com.volmit.iris.engine.object.IrisSpawner;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.format.Form;

src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java

@@ -23,8 +23,8 @@ import com.volmit.iris.core.nms.INMS;
 import com.volmit.iris.engine.data.chunk.TerrainChunk;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.EngineAssignedActuator;
-import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.biome.IrisBiomeCustom;
+import com.volmit.iris.engine.object.IrisBiomeCustom;
 import com.volmit.iris.util.documentation.BlockCoordinates;
 import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.util.hunk.view.BiomeGridHunkView;

src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java

@@ -22,7 +22,7 @@ import com.volmit.iris.engine.decorator.*;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.EngineAssignedActuator;
 import com.volmit.iris.engine.framework.EngineDecorator;
-import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
 import com.volmit.iris.util.documentation.BlockCoordinates;
 import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.util.math.RNG;

src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java

@@ -20,7 +20,7 @@ package com.volmit.iris.engine.actuator;
 
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.EngineAssignedActuator;
-import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.documentation.BlockCoordinates;
 import com.volmit.iris.util.hunk.Hunk;

src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java

@@ -20,9 +20,9 @@ package com.volmit.iris.engine.decorator;
 
 import com.volmit.iris.engine.data.cache.Cache;
 import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.decoration.IrisDecorationPart;
+import com.volmit.iris.engine.object.IrisDecorationPart;
-import com.volmit.iris.engine.object.decoration.IrisDecorator;
+import com.volmit.iris.engine.object.IrisDecorator;
 import com.volmit.iris.util.documentation.BlockCoordinates;
 import com.volmit.iris.util.hunk.Hunk;
 import org.bukkit.Material;

src/main/java/com/volmit/iris/engine/decorator/IrisEngineDecorator.java

@@ -23,9 +23,9 @@ import com.volmit.iris.engine.data.cache.Cache;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.EngineAssignedComponent;
 import com.volmit.iris.engine.framework.EngineDecorator;
-import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.decoration.IrisDecorationPart;
+import com.volmit.iris.engine.object.IrisDecorationPart;
-import com.volmit.iris.engine.object.decoration.IrisDecorator;
+import com.volmit.iris.engine.object.IrisDecorator;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.math.RNG;
 import lombok.Getter;

src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java

@@ -20,9 +20,9 @@ package com.volmit.iris.engine.decorator;
 
 import com.volmit.iris.engine.data.cache.Cache;
 import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.decoration.IrisDecorationPart;
+import com.volmit.iris.engine.object.IrisDecorationPart;
-import com.volmit.iris.engine.object.decoration.IrisDecorator;
+import com.volmit.iris.engine.object.IrisDecorator;
 import com.volmit.iris.util.documentation.BlockCoordinates;
 import com.volmit.iris.util.hunk.Hunk;
 import org.bukkit.block.data.BlockData;

src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java

@@ -20,9 +20,9 @@ package com.volmit.iris.engine.decorator;
 
 import com.volmit.iris.engine.data.cache.Cache;
 import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.decoration.IrisDecorationPart;
+import com.volmit.iris.engine.object.IrisDecorationPart;
-import com.volmit.iris.engine.object.decoration.IrisDecorator;
+import com.volmit.iris.engine.object.IrisDecorator;
 import com.volmit.iris.util.documentation.BlockCoordinates;
 import com.volmit.iris.util.hunk.Hunk;
 import org.bukkit.block.data.BlockData;

src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java

@@ -20,9 +20,9 @@ package com.volmit.iris.engine.decorator;
 
 import com.volmit.iris.engine.data.cache.Cache;
 import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.decoration.IrisDecorationPart;
+import com.volmit.iris.engine.object.IrisDecorationPart;
-import com.volmit.iris.engine.object.decoration.IrisDecorator;
+import com.volmit.iris.engine.object.IrisDecorator;
 import com.volmit.iris.util.documentation.BlockCoordinates;
 import com.volmit.iris.util.hunk.Hunk;
 import org.bukkit.block.data.BlockData;

src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java

@@ -21,10 +21,10 @@ package com.volmit.iris.engine.decorator;
 import com.volmit.iris.Iris;
 import com.volmit.iris.engine.data.cache.Cache;
 import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.object.biome.InferredType;
+import com.volmit.iris.engine.object.InferredType;
-import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.decoration.IrisDecorationPart;
+import com.volmit.iris.engine.object.IrisDecorationPart;
-import com.volmit.iris.engine.object.decoration.IrisDecorator;
+import com.volmit.iris.engine.object.IrisDecorator;
 import com.volmit.iris.util.documentation.BlockCoordinates;
 import com.volmit.iris.util.hunk.Hunk;
 import org.bukkit.Material;

src/main/java/com/volmit/iris/engine/framework/Engine.java

@@ -26,18 +26,18 @@ import com.volmit.iris.engine.IrisComplex;
 import com.volmit.iris.engine.data.cache.Cache;
 import com.volmit.iris.engine.data.chunk.TerrainChunk;
 import com.volmit.iris.engine.mantle.EngineMantle;
-import com.volmit.iris.engine.object.basic.IrisColor;
+import com.volmit.iris.engine.object.IrisColor;
-import com.volmit.iris.engine.object.basic.IrisPosition;
+import com.volmit.iris.engine.object.IrisPosition;
-import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.common.IrisWorld;
+import com.volmit.iris.engine.object.IrisWorld;
-import com.volmit.iris.engine.object.dimensional.IrisDimension;
+import com.volmit.iris.engine.object.IrisDimension;
-import com.volmit.iris.engine.object.engine.IrisEngineData;
+import com.volmit.iris.engine.object.IrisEngineData;
-import com.volmit.iris.engine.object.loot.IrisLootMode;
+import com.volmit.iris.engine.object.IrisLootMode;
-import com.volmit.iris.engine.object.loot.IrisLootReference;
+import com.volmit.iris.engine.object.IrisLootReference;
-import com.volmit.iris.engine.object.loot.IrisLootTable;
+import com.volmit.iris.engine.object.IrisLootTable;
-import com.volmit.iris.engine.object.meta.InventorySlotType;
+import com.volmit.iris.engine.object.InventorySlotType;
-import com.volmit.iris.engine.object.objects.IrisObjectPlacement;
+import com.volmit.iris.engine.object.IrisObjectPlacement;
-import com.volmit.iris.engine.object.regional.IrisRegion;
+import com.volmit.iris.engine.object.IrisRegion;
 import com.volmit.iris.engine.scripting.EngineExecutionEnvironment;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;

src/main/java/com/volmit/iris/engine/framework/EngineComponent.java

@@ -21,7 +21,7 @@ package com.volmit.iris.engine.framework;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.IrisComplex;
-import com.volmit.iris.engine.object.dimensional.IrisDimension;
+import com.volmit.iris.engine.object.IrisDimension;
 import com.volmit.iris.util.math.RollingSequence;
 import com.volmit.iris.util.parallel.MultiBurst;
 import org.bukkit.event.Listener;

src/main/java/com/volmit/iris/engine/framework/EngineData.java

@@ -20,7 +20,7 @@ package com.volmit.iris.engine.framework;
 
 import com.google.gson.Gson;
 import com.volmit.iris.Iris;
-import com.volmit.iris.engine.object.basic.IrisPosition;
+import com.volmit.iris.engine.object.IrisPosition;
 import com.volmit.iris.util.io.IO;
 import lombok.Data;
 

src/main/java/com/volmit/iris/engine/framework/EngineDecorator.java

@@ -18,7 +18,7 @@
 
 package com.volmit.iris.engine.framework;
 
-import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
 import com.volmit.iris.util.data.B;
 import com.volmit.iris.util.documentation.BlockCoordinates;
 import com.volmit.iris.util.hunk.Hunk;

src/main/java/com/volmit/iris/engine/framework/EnginePlayer.java

@@ -19,9 +19,9 @@
 package com.volmit.iris.engine.framework;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.meta.IrisEffect;
+import com.volmit.iris.engine.object.IrisEffect;
-import com.volmit.iris.engine.object.regional.IrisRegion;
+import com.volmit.iris.engine.object.IrisRegion;
 import com.volmit.iris.util.math.M;
 import com.volmit.iris.util.scheduling.J;
 import lombok.Data;

src/main/java/com/volmit/iris/engine/framework/EngineTarget.java

@@ -19,8 +19,8 @@
 package com.volmit.iris.engine.framework;
 
 import com.volmit.iris.core.loader.IrisData;
-import com.volmit.iris.engine.object.common.IrisWorld;
+import com.volmit.iris.engine.object.IrisWorld;
-import com.volmit.iris.engine.object.dimensional.IrisDimension;
+import com.volmit.iris.engine.object.IrisDimension;
 import com.volmit.iris.util.parallel.MultiBurst;
 import lombok.Data;
 

src/main/java/com/volmit/iris/engine/framework/LootProvider.java

@@ -18,9 +18,9 @@
 
 package com.volmit.iris.engine.framework;
 
-import com.volmit.iris.engine.object.loot.IrisLootReference;
+import com.volmit.iris.engine.object.IrisLootReference;
-import com.volmit.iris.engine.object.loot.IrisLootTable;
+import com.volmit.iris.engine.object.IrisLootTable;
-import com.volmit.iris.engine.object.meta.InventorySlotType;
+import com.volmit.iris.engine.object.InventorySlotType;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.math.RNG;
 import org.bukkit.block.Block;

src/main/java/com/volmit/iris/engine/framework/PlacedObject.java

@@ -18,8 +18,8 @@
 
 package com.volmit.iris.engine.framework;
 
-import com.volmit.iris.engine.object.objects.IrisObject;
+import com.volmit.iris.engine.object.IrisObject;
-import com.volmit.iris.engine.object.objects.IrisObjectPlacement;
+import com.volmit.iris.engine.object.IrisObjectPlacement;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 

src/main/java/com/volmit/iris/engine/framework/placer/HeightmapObjectPlacer.java

@@ -19,9 +19,9 @@
 package com.volmit.iris.engine.framework.placer;
 
 import com.volmit.iris.core.loader.IrisData;
-import com.volmit.iris.engine.object.common.IObjectPlacer;
+import com.volmit.iris.engine.object.IObjectPlacer;
-import com.volmit.iris.engine.object.objects.IrisObjectPlacement;
+import com.volmit.iris.engine.object.IrisObjectPlacement;
-import com.volmit.iris.engine.object.tile.TileData;
+import com.volmit.iris.engine.object.TileData;
 import com.volmit.iris.util.math.RNG;
 import org.bukkit.block.TileState;
 import org.bukkit.block.data.BlockData;

src/main/java/com/volmit/iris/engine/jigsaw/PlannedPiece.java

@@ -21,16 +21,16 @@ package com.volmit.iris.engine.jigsaw;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.object.basic.IrisPosition;
+import com.volmit.iris.engine.object.IrisPosition;
-import com.volmit.iris.engine.object.common.IObjectPlacer;
+import com.volmit.iris.engine.object.IObjectPlacer;
-import com.volmit.iris.engine.object.jigsaw.IrisJigsawPiece;
+import com.volmit.iris.engine.object.IrisJigsawPiece;
-import com.volmit.iris.engine.object.jigsaw.IrisJigsawPieceConnector;
+import com.volmit.iris.engine.object.IrisJigsawPieceConnector;
-import com.volmit.iris.engine.object.loot.IrisLootTable;
+import com.volmit.iris.engine.object.IrisLootTable;
-import com.volmit.iris.engine.object.meta.InventorySlotType;
+import com.volmit.iris.engine.object.InventorySlotType;
-import com.volmit.iris.engine.object.objects.IrisObject;
+import com.volmit.iris.engine.object.IrisObject;
-import com.volmit.iris.engine.object.objects.IrisObjectRotation;
+import com.volmit.iris.engine.object.IrisObjectRotation;
-import com.volmit.iris.engine.object.objects.IrisObjectTranslate;
+import com.volmit.iris.engine.object.IrisObjectTranslate;
-import com.volmit.iris.engine.object.tile.TileData;
+import com.volmit.iris.engine.object.TileData;
 import com.volmit.iris.engine.platform.PlatformChunkGenerator;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.math.AxisAlignedBB;

src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java

@@ -21,14 +21,7 @@ package com.volmit.iris.engine.jigsaw;
 import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.loader.IrisData;
-import com.volmit.iris.engine.object.basic.IrisPosition;
+import com.volmit.iris.engine.object.*;
-import com.volmit.iris.engine.object.common.IObjectPlacer;
-import com.volmit.iris.engine.object.feature.IrisFeature;
-import com.volmit.iris.engine.object.feature.IrisFeaturePositional;
-import com.volmit.iris.engine.object.jigsaw.IrisJigsawPiece;
-import com.volmit.iris.engine.object.jigsaw.IrisJigsawPieceConnector;
-import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructure;
-import com.volmit.iris.engine.object.objects.*;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.interpolation.InterpolationMethod;
 import com.volmit.iris.util.mantle.Mantle;

src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java

@@ -23,10 +23,10 @@ import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.IrisComplex;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.EngineTarget;
-import com.volmit.iris.engine.object.common.IObjectPlacer;
+import com.volmit.iris.engine.object.IObjectPlacer;
-import com.volmit.iris.engine.object.dimensional.IrisDimension;
+import com.volmit.iris.engine.object.IrisDimension;
-import com.volmit.iris.engine.object.feature.IrisFeaturePositional;
+import com.volmit.iris.engine.object.IrisFeaturePositional;
-import com.volmit.iris.engine.object.tile.TileData;
+import com.volmit.iris.engine.object.TileData;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.data.B;
 import com.volmit.iris.util.documentation.BlockCoordinates;
@@ -37,7 +37,6 @@ import com.volmit.iris.util.mantle.MantleChunk;
 import com.volmit.iris.util.mantle.MantleFlag;
 import com.volmit.iris.util.matter.Matter;
 import com.volmit.iris.util.matter.MatterCavern;
-import com.volmit.iris.util.matter.slices.CavernMatter;
 import com.volmit.iris.util.matter.slices.UpdateMatter;
 import com.volmit.iris.util.parallel.BurstExecutor;
 import com.volmit.iris.util.parallel.MultiBurst;

src/main/java/com/volmit/iris/engine/mantle/MantleComponent.java

@@ -20,7 +20,7 @@ package com.volmit.iris.engine.mantle;
 
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.IrisComplex;
-import com.volmit.iris.engine.object.dimensional.IrisDimension;
+import com.volmit.iris.engine.object.IrisDimension;
 import com.volmit.iris.util.documentation.ChunkCoordinates;
 import com.volmit.iris.util.mantle.Mantle;
 import com.volmit.iris.util.mantle.MantleFlag;

src/main/java/com/volmit/iris/engine/mantle/MantleWriter.java

@@ -22,10 +22,10 @@ import com.google.common.collect.ImmutableList;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.data.cache.Cache;
-import com.volmit.iris.engine.object.basic.IrisPosition;
+import com.volmit.iris.engine.object.IrisPosition;
-import com.volmit.iris.engine.object.common.IObjectPlacer;
+import com.volmit.iris.engine.object.IObjectPlacer;
-import com.volmit.iris.engine.object.feature.IrisFeaturePositional;
+import com.volmit.iris.engine.object.IrisFeaturePositional;
-import com.volmit.iris.engine.object.tile.TileData;
+import com.volmit.iris.engine.object.TileData;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.collection.KSet;
 import com.volmit.iris.util.function.Function3;

src/main/java/com/volmit/iris/engine/mantle/components/MantleCarvingComponent.java

@@ -22,9 +22,9 @@ import com.volmit.iris.engine.data.cache.Cache;
 import com.volmit.iris.engine.mantle.EngineMantle;
 import com.volmit.iris.engine.mantle.IrisMantleComponent;
 import com.volmit.iris.engine.mantle.MantleWriter;
-import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.carving.IrisCarving;
+import com.volmit.iris.engine.object.IrisCarving;
-import com.volmit.iris.engine.object.regional.IrisRegion;
+import com.volmit.iris.engine.object.IrisRegion;
 import com.volmit.iris.util.documentation.ChunkCoordinates;
 import com.volmit.iris.util.mantle.MantleFlag;
 import com.volmit.iris.util.math.RNG;

src/main/java/com/volmit/iris/engine/mantle/components/MantleFeatureComponent.java

@@ -22,10 +22,10 @@ import com.volmit.iris.engine.data.cache.Cache;
 import com.volmit.iris.engine.mantle.EngineMantle;
 import com.volmit.iris.engine.mantle.IrisMantleComponent;
 import com.volmit.iris.engine.mantle.MantleWriter;
-import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.feature.IrisFeaturePositional;
+import com.volmit.iris.engine.object.IrisFeaturePositional;
-import com.volmit.iris.engine.object.feature.IrisFeaturePotential;
+import com.volmit.iris.engine.object.IrisFeaturePotential;
-import com.volmit.iris.engine.object.regional.IrisRegion;
+import com.volmit.iris.engine.object.IrisRegion;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.documentation.ChunkCoordinates;
 import com.volmit.iris.util.mantle.MantleFlag;

src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java

@@ -22,13 +22,13 @@ import com.volmit.iris.engine.jigsaw.PlannedStructure;
 import com.volmit.iris.engine.mantle.EngineMantle;
 import com.volmit.iris.engine.mantle.IrisMantleComponent;
 import com.volmit.iris.engine.mantle.MantleWriter;
-import com.volmit.iris.engine.object.basic.IrisPosition;
+import com.volmit.iris.engine.object.IrisPosition;
-import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.feature.IrisFeaturePositional;
+import com.volmit.iris.engine.object.IrisFeaturePositional;
-import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructure;
+import com.volmit.iris.engine.object.IrisJigsawStructure;
-import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructurePlacement;
+import com.volmit.iris.engine.object.IrisJigsawStructurePlacement;
-import com.volmit.iris.engine.object.noise.NoiseStyle;
+import com.volmit.iris.engine.object.NoiseStyle;
-import com.volmit.iris.engine.object.regional.IrisRegion;
+import com.volmit.iris.engine.object.IrisRegion;
 import com.volmit.iris.util.documentation.BlockCoordinates;
 import com.volmit.iris.util.documentation.ChunkCoordinates;
 import com.volmit.iris.util.mantle.MantleFlag;

src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java

@@ -23,13 +23,13 @@ import com.volmit.iris.engine.data.cache.Cache;
 import com.volmit.iris.engine.mantle.EngineMantle;
 import com.volmit.iris.engine.mantle.IrisMantleComponent;
 import com.volmit.iris.engine.mantle.MantleWriter;
-import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.feature.IrisFeature;
+import com.volmit.iris.engine.object.IrisFeature;
-import com.volmit.iris.engine.object.feature.IrisFeaturePositional;
+import com.volmit.iris.engine.object.IrisFeaturePositional;
-import com.volmit.iris.engine.object.feature.IrisFeaturePotential;
+import com.volmit.iris.engine.object.IrisFeaturePotential;
-import com.volmit.iris.engine.object.objects.IrisObject;
+import com.volmit.iris.engine.object.IrisObject;
-import com.volmit.iris.engine.object.objects.IrisObjectPlacement;
+import com.volmit.iris.engine.object.IrisObjectPlacement;
-import com.volmit.iris.engine.object.regional.IrisRegion;
+import com.volmit.iris.engine.object.IrisRegion;
 import com.volmit.iris.util.documentation.BlockCoordinates;
 import com.volmit.iris.util.documentation.ChunkCoordinates;
 import com.volmit.iris.util.mantle.MantleFlag;

src/main/java/com/volmit/iris/engine/modifier/IrisCarveModifier.java

@@ -23,11 +23,11 @@ import com.volmit.iris.engine.actuator.IrisDecorantActuator;
 import com.volmit.iris.engine.data.cache.Cache;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.EngineAssignedModifier;
-import com.volmit.iris.engine.object.basic.IrisPosition;
+import com.volmit.iris.engine.object.IrisPosition;
-import com.volmit.iris.engine.object.biome.InferredType;
+import com.volmit.iris.engine.object.InferredType;
-import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.decoration.IrisDecorationPart;
+import com.volmit.iris.engine.object.IrisDecorationPart;
-import com.volmit.iris.engine.object.decoration.IrisDecorator;
+import com.volmit.iris.engine.object.IrisDecorator;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.data.B;
@@ -37,14 +37,12 @@ import com.volmit.iris.util.mantle.Mantle;
 import com.volmit.iris.util.mantle.MantleChunk;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.matter.MatterCavern;
-import com.volmit.iris.util.matter.slices.CavernMatter;
 import com.volmit.iris.util.scheduling.PrecisionStopwatch;
 import lombok.Data;
 import org.bukkit.Material;
 import org.bukkit.block.data.BlockData;
 
 import java.util.Objects;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Supplier;
 
 public class IrisCarveModifier extends EngineAssignedModifier<BlockData> {

src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java

@@ -20,10 +20,10 @@ package com.volmit.iris.engine.modifier;
 
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.EngineAssignedModifier;
-import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
-import com.volmit.iris.engine.object.deposits.IrisDepositGenerator;
+import com.volmit.iris.engine.object.IrisDepositGenerator;
-import com.volmit.iris.engine.object.objects.IrisObject;
+import com.volmit.iris.engine.object.IrisObject;
-import com.volmit.iris.engine.object.regional.IrisRegion;
+import com.volmit.iris.engine.object.IrisRegion;
 import com.volmit.iris.util.data.HeightMap;
 import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.util.math.RNG;

src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java

@@ -20,7 +20,7 @@ package com.volmit.iris.engine.modifier;
 
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.framework.EngineAssignedModifier;
-import com.volmit.iris.engine.object.biome.IrisBiome;
+import com.volmit.iris.engine.object.IrisBiome;
 import com.volmit.iris.util.data.B;
 import com.volmit.iris.util.hunk.Hunk;
 import com.volmit.iris.util.math.RNG;

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.common;
+package com.volmit.iris.engine.object;
 
 import lombok.Value;
 

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.noise;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.engine.object.annotations.Desc;
 

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.common;
+package com.volmit.iris.engine.object;
 
 import lombok.Data;
 

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

@@ -16,14 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.common;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.service.StudioSVC;
 import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.framework.Engine;
-import com.volmit.iris.engine.object.dimensional.IrisDimension;
 import com.volmit.iris.engine.platform.BukkitChunkGenerator;
 import com.volmit.iris.engine.platform.HeadlessGenerator;
 import com.volmit.iris.util.plugin.VolmitSender;

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

@@ -16,10 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.common;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.core.loader.IrisData;
-import com.volmit.iris.engine.object.tile.TileData;
 import org.bukkit.block.TileState;
 import org.bukkit.block.data.BlockData;
 

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.common;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.util.collection.KList;
 import org.bukkit.block.data.BlockData;

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.common;
+package com.volmit.iris.engine.object;
 
 public interface IRare {
     int getRarity();

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.biome;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.engine.object.annotations.Desc;
 

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.meta;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.engine.object.annotations.Desc;
 

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.meta;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.MaxNumber;

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.objects;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.util.math.M;

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.biome;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.gui.components.RenderType;
@@ -26,22 +26,6 @@ import com.volmit.iris.engine.IrisComplex;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.object.annotations.*;
-import com.volmit.iris.engine.object.block.IrisBlockDrops;
-import com.volmit.iris.engine.object.carving.IrisCarving;
-import com.volmit.iris.engine.object.common.IRare;
-import com.volmit.iris.engine.object.decoration.IrisDecorator;
-import com.volmit.iris.engine.object.deposits.IrisDepositGenerator;
-import com.volmit.iris.engine.object.dimensional.IrisDimension;
-import com.volmit.iris.engine.object.feature.IrisFeaturePotential;
-import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructurePlacement;
-import com.volmit.iris.engine.object.loot.IrisLootReference;
-import com.volmit.iris.engine.object.meta.IrisEffect;
-import com.volmit.iris.engine.object.noise.IrisGeneratorStyle;
-import com.volmit.iris.engine.object.noise.IrisSlopeClip;
-import com.volmit.iris.engine.object.noise.NoiseStyle;
-import com.volmit.iris.engine.object.objects.IrisObject;
-import com.volmit.iris.engine.object.objects.IrisObjectPlacement;
-import com.volmit.iris.engine.object.spawners.IrisSpawner;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.collection.KSet;

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.biome;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.engine.object.annotations.*;

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.biome;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.engine.object.annotations.Desc;
 

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.biome;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.MaxNumber;

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.biome;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.engine.object.annotations.Desc;
 

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.biome;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.MaxNumber;

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.biome;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.engine.object.annotations.Desc;
 

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

@@ -16,11 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.biome;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.*;
-import com.volmit.iris.engine.object.noise.IrisGenerator;
 import com.volmit.iris.util.data.DataProvider;
 import com.volmit.iris.util.interpolation.IrisInterpolation;
 import lombok.AllArgsConstructor;

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

@@ -16,15 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.biome;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.*;
-import com.volmit.iris.engine.object.block.IrisBlockData;
-import com.volmit.iris.engine.object.noise.IrisGeneratorStyle;
-import com.volmit.iris.engine.object.noise.IrisSlopeClip;
-import com.volmit.iris.engine.object.noise.NoiseStyle;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.noise.CNG;

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.block;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.loader.IrisData;

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

@@ -16,14 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.block;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.data.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.Required;
-import com.volmit.iris.engine.object.loot.IrisLoot;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.math.RNG;
 import lombok.AllArgsConstructor;

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.carving;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.framework.Engine;

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

@@ -16,37 +16,24 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.carving;
+package com.volmit.iris.engine.object;
 
-import com.volmit.iris.Iris;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.loader.IrisRegistrant;
-import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.framework.Engine;
 import com.volmit.iris.engine.mantle.MantleWriter;
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.RegistryListResource;
-import com.volmit.iris.engine.object.basic.IrisPosition;
-import com.volmit.iris.engine.object.basic.IrisRange;
-import com.volmit.iris.engine.object.biome.IrisBiome;
-import com.volmit.iris.engine.object.block.IrisBlockData;
-import com.volmit.iris.engine.object.noise.IrisWorm;
-import com.volmit.iris.engine.object.objects.IrisObjectLimit;
 import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.data.B;
 import com.volmit.iris.util.json.JSONObject;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.matter.MatterCavern;
-import com.volmit.iris.util.matter.slices.CavernMatter;
 import com.volmit.iris.util.plugin.VolmitSender;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
-import org.bukkit.block.data.BlockData;
-
-import java.util.List;
 
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.carving;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.loader.IrisData;
@@ -27,10 +27,6 @@ import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.engine.object.annotations.MinNumber;
 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.engine.object.noise.IrisGeneratorStyle;
-import com.volmit.iris.engine.object.noise.IrisStyledRange;
-import com.volmit.iris.engine.object.noise.NoiseStyle;
 import com.volmit.iris.util.math.RNG;
 import lombok.AllArgsConstructor;
 import lombok.Data;

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.basic;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.engine.data.cache.AtomicCache;

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.compat;
+package com.volmit.iris.engine.object;
 
 import com.google.gson.Gson;
 import com.volmit.iris.Iris;

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.compat;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.engine.data.cache.AtomicCache;

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.compat;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.engine.data.cache.AtomicCache;

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.decoration;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.engine.object.annotations.Desc;
 

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

@@ -16,16 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.decoration;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.*;
-import com.volmit.iris.engine.object.biome.IrisBiome;
-import com.volmit.iris.engine.object.block.IrisBlockData;
-import com.volmit.iris.engine.object.noise.IrisGeneratorStyle;
-import com.volmit.iris.engine.object.noise.NoiseStyle;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.noise.CNG;

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

@@ -16,13 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.deposits;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.*;
-import com.volmit.iris.engine.object.block.IrisBlockData;
-import com.volmit.iris.engine.object.objects.IrisObject;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.math.RNG;
 import lombok.AllArgsConstructor;

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

@@ -16,32 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.dimensional;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.*;
-import com.volmit.iris.engine.object.biome.InferredType;
-import com.volmit.iris.engine.object.biome.IrisBiome;
-import com.volmit.iris.engine.object.biome.IrisBiomeCustom;
-import com.volmit.iris.engine.object.block.IrisBlockDrops;
-import com.volmit.iris.engine.object.block.IrisMaterialPalette;
-import com.volmit.iris.engine.object.carving.IrisCarving;
-import com.volmit.iris.engine.object.deposits.IrisDepositGenerator;
-import com.volmit.iris.engine.object.feature.IrisFeaturePositional;
-import com.volmit.iris.engine.object.feature.IrisFeaturePotential;
-import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructure;
-import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructurePlacement;
-import com.volmit.iris.engine.object.loot.IrisLootReference;
-import com.volmit.iris.engine.object.noise.IrisGeneratorStyle;
-import com.volmit.iris.engine.object.noise.IrisShapedGeneratorStyle;
-import com.volmit.iris.engine.object.noise.NoiseStyle;
-import com.volmit.iris.engine.object.regional.IrisRegion;
-import com.volmit.iris.engine.object.spawners.IrisSpawner;
-import com.volmit.iris.engine.object.trees.IrisTreeSettings;
-import com.volmit.iris.engine.object.villager.IrisVillagerOverride;
 import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.data.DataProvider;
 import com.volmit.iris.util.io.IO;

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.objects;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.util.collection.GBiset;

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.basic;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.engine.object.annotations.Desc;
 import com.volmit.iris.util.format.Form;

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

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.engine.object.meta;
+package com.volmit.iris.engine.object;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.engine.data.cache.AtomicCache;