Moved a7 package

src/main/java/com/seibel/lod/core/a7/DHLevel.java

@@ -1,15 +1,12 @@
-package com.seibel.lod.core.objects.a7;
+package com.seibel.lod.core.a7;
 
-import com.seibel.lod.core.api.internal.InternalApiShared;
-import com.seibel.lod.core.api.internal.a7.ClientApi;
+import com.seibel.lod.core.a7.data.DataFileHandler;
+import com.seibel.lod.core.a7.pos.DhBlockPos2D;
+import com.seibel.lod.core.a7.render.RenderBufferHandler;
 import com.seibel.lod.core.config.Config;
 import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
-import com.seibel.lod.core.objects.a7.data.DataFileHandler;
-import com.seibel.lod.core.objects.a7.pos.DhBlockPos2D;
-import com.seibel.lod.core.objects.a7.render.RenderBufferHandler;
 import com.seibel.lod.core.objects.math.Mat4f;
 import com.seibel.lod.core.render.a7LodRenderer;
-import com.seibel.lod.core.util.DetailDistanceUtil;
 import com.seibel.lod.core.util.EventLoop;
 import com.seibel.lod.core.util.LodUtil;
 import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;

src/main/java/com/seibel/lod/core/a7/DHWorld.java

@@ -1,9 +1,9 @@
-package com.seibel.lod.core.objects.a7;
+package com.seibel.lod.core.a7;
 
+import com.seibel.lod.core.a7.io.DHFolderHandler;
+import com.seibel.lod.core.a7.io.LevelToFileMatcher;
 import com.seibel.lod.core.config.Config;
 import com.seibel.lod.core.logging.DhLoggerBuilder;
-import com.seibel.lod.core.objects.a7.io.DHFolderHandler;
-import com.seibel.lod.core.objects.a7.io.LevelToFileMatcher;
 import com.seibel.lod.core.util.DetailDistanceUtil;
 import com.seibel.lod.core.util.EventLoop;
 import com.seibel.lod.core.util.LodUtil;

src/main/java/com/seibel/lod/core/a7/DhChunk.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.core.objects.a7;
+package com.seibel.lod.core.a7;
 
 import com.seibel.lod.core.wrapperInterfaces.block.IBlockDetailWrapper;
 import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper;

src/main/java/com/seibel/lod/core/a7/IdMappingUtil.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.core.objects.a7;
+package com.seibel.lod.core.a7;
 
 public class IdMappingUtil {
     public static final String BLOCKSTATE_ID_AIR = "air";

src/main/java/com/seibel/lod/core/a7/LodQuadTree.java

@@ -1,19 +1,16 @@
-package com.seibel.lod.core.objects.a7;
+package com.seibel.lod.core.a7;
 
+import com.seibel.lod.core.a7.datatype.column.ColumnDatatype;
+import com.seibel.lod.core.a7.pos.DhBlockPos2D;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.render.RenderDataSourceLoader;
 import com.seibel.lod.core.logging.DhLoggerBuilder;
-import com.seibel.lod.core.objects.a7.datatype.column.ColumnDatatype;
-import com.seibel.lod.core.objects.a7.datatype.full.FullDatatype;
-import com.seibel.lod.core.objects.a7.pos.DhBlockPos2D;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
-import com.seibel.lod.core.objects.a7.render.RenderDataSource;
-import com.seibel.lod.core.objects.a7.render.RenderDataSourceLoader;
 import com.seibel.lod.core.util.DetailDistanceUtil;
 import com.seibel.lod.core.util.LodUtil;
 import com.seibel.lod.core.util.gridList.MovableGridRingList;
 import org.apache.logging.log4j.Logger;
 
 import java.util.ArrayList;
-import java.util.Collections;
 
 // QuadTree built from several layers of 2d ring buffers
 

src/main/java/com/seibel/lod/core/a7/LodSection.java

@@ -1,8 +1,8 @@
-package com.seibel.lod.core.objects.a7;
+package com.seibel.lod.core.a7;
 
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
-import com.seibel.lod.core.objects.a7.render.RenderDataSource;
-import com.seibel.lod.core.objects.a7.render.RenderDataSourceLoader;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.render.RenderDataSource;
+import com.seibel.lod.core.a7.render.RenderDataSourceLoader;
 
 import java.util.concurrent.CompletableFuture;
 

src/main/java/com/seibel/lod/core/a7/ProtoSection.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.core.objects.a7;
+package com.seibel.lod.core.a7;
 
 import com.seibel.lod.core.wrapperInterfaces.block.IBlockDetailWrapper;
 import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper;

src/main/java/com/seibel/lod/core/a7/RenderDataProvider.java

@@ -0,0 +1,11 @@
+package com.seibel.lod.core.a7;
+
+import com.seibel.lod.core.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.render.RenderDataSource;
+import com.seibel.lod.core.a7.render.RenderDataSourceLoader;
+
+import java.util.concurrent.CompletableFuture;
+
+public interface RenderDataProvider {
+    CompletableFuture<RenderDataSource> createRenderData(RenderDataSourceLoader renderSourceLoader, DhSectionPos pos);
+}

src/main/java/com/seibel/lod/core/a7/Server.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.core.objects.a7;
+package com.seibel.lod.core.a7;
 
 public class Server {
     public final boolean isSinglePlayer;

src/main/java/com/seibel/lod/core/a7/UncheckedInterruptedException.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.core.objects.a7;
+package com.seibel.lod.core.a7;
 
 public class UncheckedInterruptedException extends RuntimeException {
     public UncheckedInterruptedException(String message) {

src/main/java/com/seibel/lod/core/a7/data/CompleteDataContainer.java

@@ -1,10 +1,9 @@
-package com.seibel.lod.core.objects.a7.data;
+package com.seibel.lod.core.a7.data;
 
-import com.seibel.lod.core.objects.a7.IdMappingUtil;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.IdMappingUtil;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
 import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
 
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
 

src/main/java/com/seibel/lod/core/a7/data/Data.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.core.objects.a7.data;
+package com.seibel.lod.core.a7.data;
 
 // Static class for the data format:
 // ID: blockState id    Y: Height(signed)    DP: Depth(signed?)

src/main/java/com/seibel/lod/core/a7/data/DataFileHandler.java

@@ -1,18 +1,17 @@
-package com.seibel.lod.core.objects.a7.data;
+package com.seibel.lod.core.a7.data;
 
 import com.google.common.collect.HashMultimap;
-import com.seibel.lod.core.objects.a7.DHLevel;
-import com.seibel.lod.core.objects.a7.RenderDataProvider;
-import com.seibel.lod.core.objects.a7.datatype.column.DataSourceSaver;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
-import com.seibel.lod.core.objects.a7.render.RenderDataSource;
-import com.seibel.lod.core.objects.a7.render.RenderDataSourceLoader;
+import com.seibel.lod.core.a7.RenderDataProvider;
+import com.seibel.lod.core.a7.DHLevel;
+import com.seibel.lod.core.a7.datatype.column.DataSourceSaver;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.render.RenderDataSource;
+import com.seibel.lod.core.a7.render.RenderDataSourceLoader;
 import com.seibel.lod.core.util.LodUtil;
 
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
-import java.rmi.server.ExportException;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;

src/main/java/com/seibel/lod/core/a7/data/DataSourceLoader.java

@@ -1,8 +1,8 @@
-package com.seibel.lod.core.objects.a7.data;
+package com.seibel.lod.core.a7.data;
 
 import com.google.common.collect.HashMultimap;
-import com.seibel.lod.core.objects.a7.DHLevel;
-import com.seibel.lod.core.objects.a7.io.file.DataMetaFile;
+import com.seibel.lod.core.a7.DHLevel;
+import com.seibel.lod.core.a7.io.file.DataMetaFile;
 
 import java.io.File;
 import java.io.IOException;

src/main/java/com/seibel/lod/core/a7/data/LodDataSource.java

@@ -1,9 +1,6 @@
-package com.seibel.lod.core.objects.a7.data;
+package com.seibel.lod.core.a7.data;
 
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
-
-import java.util.HashMap;
-import java.util.Objects;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
 
 public interface LodDataSource {
     DataSourceLoader getLatestLoader();

src/main/java/com/seibel/lod/core/a7/data/OldFileConverter.java

@@ -1,6 +1,6 @@
-package com.seibel.lod.core.objects.a7.data;
+package com.seibel.lod.core.a7.data;
 
-import com.seibel.lod.core.objects.a7.DHLevel;
+import com.seibel.lod.core.a7.DHLevel;
 
 import java.io.File;
 import java.util.List;

src/main/java/com/seibel/lod/core/a7/datatype/column/Alpha6DataLoader.java

@@ -1,10 +1,13 @@
-package com.seibel.lod.core.objects.a7.datatype.column;
+package com.seibel.lod.core.a7.datatype.column;
 
+import com.seibel.lod.core.a7.data.DataFileHandler;
+import com.seibel.lod.core.a7.data.LodDataSource;
+import com.seibel.lod.core.a7.data.OldFileConverter;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
 import com.seibel.lod.core.enums.config.EVerticalQuality;
-import com.seibel.lod.core.objects.a7.DHLevel;
+import com.seibel.lod.core.a7.DHLevel;
 import com.seibel.lod.core.objects.a7.data.*;
-import com.seibel.lod.core.objects.a7.io.file.DataMetaFile;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.io.file.DataMetaFile;
 import org.apache.commons.compress.compressors.xz.XZCompressorInputStream;
 
 import java.io.*;

src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnArrayView.java

@@ -1,8 +1,7 @@
-package com.seibel.lod.core.objects.a7.datatype.column;
+package com.seibel.lod.core.a7.datatype.column;
 
 
 import java.util.Arrays;
-import java.util.Iterator;
 
 public final class ColumnArrayView implements ColumnDataView {
     private final long[] data;

src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnBox.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.lod.core.objects.a7.datatype.column;
+package com.seibel.lod.core.a7.datatype.column;
 
 import com.seibel.lod.core.builders.lodBuilding.bufferBuilding.LodQuadBuilder;
 import com.seibel.lod.core.enums.ELodDirection;

src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnDataLoader.java

@@ -1,13 +1,13 @@
-package com.seibel.lod.core.objects.a7.datatype.column;
+package com.seibel.lod.core.a7.datatype.column;
 
+import com.seibel.lod.core.a7.data.DataFileHandler;
+import com.seibel.lod.core.a7.data.LodDataSource;
+import com.seibel.lod.core.a7.io.MetaFile;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
 import com.seibel.lod.core.config.Config;
 import com.seibel.lod.core.enums.config.EVerticalQuality;
-import com.seibel.lod.core.objects.a7.DHLevel;
-import com.seibel.lod.core.objects.a7.data.DataFileHandler;
-import com.seibel.lod.core.objects.a7.data.LodDataSource;
-import com.seibel.lod.core.objects.a7.io.MetaFile;
-import com.seibel.lod.core.objects.a7.io.file.DataMetaFile;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.DHLevel;
+import com.seibel.lod.core.a7.io.file.DataMetaFile;
 
 import java.io.*;
 import java.util.ArrayList;

src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnDataPoint.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.lod.core.objects.a7.datatype.column;
+package com.seibel.lod.core.a7.datatype.column;
 
 import com.seibel.lod.core.logging.SpamReducedLogger;
 import com.seibel.lod.core.util.ColorUtil;

src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnDataView.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.core.objects.a7.datatype.column;
+package com.seibel.lod.core.a7.datatype.column;
 
 import java.util.Iterator;
 

src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnDatatype.java

@@ -1,14 +1,14 @@
-package com.seibel.lod.core.objects.a7.datatype.column;
+package com.seibel.lod.core.a7.datatype.column;
 
+import com.seibel.lod.core.a7.data.DataSourceLoader;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.render.RenderBuffer;
 import com.seibel.lod.core.enums.ELodDirection;
 import com.seibel.lod.core.objects.LodDataView;
-import com.seibel.lod.core.objects.a7.DHLevel;
-import com.seibel.lod.core.objects.a7.LodQuadTree;
-import com.seibel.lod.core.objects.a7.LodSection;
-import com.seibel.lod.core.objects.a7.data.DataSourceLoader;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
-import com.seibel.lod.core.objects.a7.render.RenderDataSource;
-import com.seibel.lod.core.objects.a7.render.RenderBuffer;
+import com.seibel.lod.core.a7.DHLevel;
+import com.seibel.lod.core.a7.LodQuadTree;
+import com.seibel.lod.core.a7.LodSection;
+import com.seibel.lod.core.a7.render.RenderDataSource;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;

src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnQuadView.java

@@ -1,6 +1,4 @@
-package com.seibel.lod.core.objects.a7.datatype.column;
-
-import java.util.Iterator;
+package com.seibel.lod.core.a7.datatype.column;
 
 public class ColumnQuadView implements ColumnDataView {
     private final long[] data;

src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnRenderBuffer.java

@@ -1,5 +1,7 @@
-package com.seibel.lod.core.objects.a7.datatype.column;
+package com.seibel.lod.core.a7.datatype.column;
 
+import com.seibel.lod.core.a7.UncheckedInterruptedException;
+import com.seibel.lod.core.a7.render.RenderBuffer;
 import com.seibel.lod.core.config.Config;
 import com.seibel.lod.core.api.internal.ClientApi;
 import com.seibel.lod.core.builders.lodBuilding.LodBuilder;
@@ -12,8 +14,6 @@ import com.seibel.lod.core.enums.rendering.EDebugMode;
 import com.seibel.lod.core.enums.rendering.EGLProxyContext;
 import com.seibel.lod.core.logging.ConfigBasedLogger;
 import com.seibel.lod.core.logging.DhLoggerBuilder;
-import com.seibel.lod.core.objects.a7.UncheckedInterruptedException;
-import com.seibel.lod.core.objects.a7.render.RenderBuffer;
 import com.seibel.lod.core.render.GLProxy;
 import com.seibel.lod.core.render.LodRenderProgram;
 import com.seibel.lod.core.render.LodRenderer;

src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnRenderLoader.java

@@ -1,12 +1,12 @@
-package com.seibel.lod.core.objects.a7.datatype.column;
+package com.seibel.lod.core.a7.datatype.column;
 
-import com.seibel.lod.core.objects.a7.DHLevel;
+import com.seibel.lod.core.a7.data.LodDataSource;
+import com.seibel.lod.core.a7.datatype.full.FullDatatype;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.render.RenderDataSource;
+import com.seibel.lod.core.a7.render.RenderDataSourceLoader;
+import com.seibel.lod.core.a7.DHLevel;
 import com.seibel.lod.core.objects.a7.data.DataFile;
-import com.seibel.lod.core.objects.a7.data.LodDataSource;
-import com.seibel.lod.core.objects.a7.datatype.full.FullDatatype;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
-import com.seibel.lod.core.objects.a7.render.RenderDataSource;
-import com.seibel.lod.core.objects.a7.render.RenderDataSourceLoader;
 import com.seibel.lod.core.util.DetailDistanceUtil;
 import com.seibel.lod.core.util.LodUtil;
 
@@ -15,7 +15,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
 
-class ColumnRenderLoader extends RenderDataSourceLoader  {
+class ColumnRenderLoader extends RenderDataSourceLoader {
     public ColumnRenderLoader() {
         super(4);
     }

src/main/java/com/seibel/lod/core/a7/datatype/column/DataSourceSaver.java

@@ -1,13 +1,12 @@
-package com.seibel.lod.core.objects.a7.datatype.column;
+package com.seibel.lod.core.a7.datatype.column;
 
-import com.seibel.lod.core.objects.a7.DHLevel;
-import com.seibel.lod.core.objects.a7.data.DataFileHandler;
-import com.seibel.lod.core.objects.a7.data.DataSourceLoader;
-import com.seibel.lod.core.objects.a7.data.LodDataSource;
-import com.seibel.lod.core.objects.a7.io.MetaFile;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.data.DataFileHandler;
+import com.seibel.lod.core.a7.data.DataSourceLoader;
+import com.seibel.lod.core.a7.data.LodDataSource;
+import com.seibel.lod.core.a7.io.MetaFile;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.DHLevel;
 
-import java.io.DataOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;

src/main/java/com/seibel/lod/core/a7/datatype/column/IColumnDatatype.java

@@ -1,7 +1,7 @@
-package com.seibel.lod.core.objects.a7.datatype.column;
+package com.seibel.lod.core.a7.datatype.column;
 
+import com.seibel.lod.core.a7.data.LodDataSource;
 import com.seibel.lod.core.objects.LodDataView;
-import com.seibel.lod.core.objects.a7.data.LodDataSource;
 
 public interface IColumnDatatype extends LodDataSource {
     byte getDetailOffset();

src/main/java/com/seibel/lod/core/a7/datatype/column/OldColumnDatatype.java

@@ -1,9 +1,9 @@
-package com.seibel.lod.core.objects.a7.datatype.column;
+package com.seibel.lod.core.a7.datatype.column;
 
+import com.seibel.lod.core.a7.data.DataSourceLoader;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
 import com.seibel.lod.core.objects.LodDataView;
-import com.seibel.lod.core.objects.a7.DHLevel;
-import com.seibel.lod.core.objects.a7.data.DataSourceLoader;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.DHLevel;
 
 import java.io.DataInputStream;
 import java.io.IOException;

src/main/java/com/seibel/lod/core/a7/datatype/column/OldDataSourceLoader.java

@@ -1,7 +1,7 @@
-package com.seibel.lod.core.objects.a7.datatype.column;
+package com.seibel.lod.core.a7.datatype.column;
 
-import com.seibel.lod.core.objects.a7.data.DataSourceLoader;
-import com.seibel.lod.core.objects.a7.data.LodDataSource;
+import com.seibel.lod.core.a7.data.DataSourceLoader;
+import com.seibel.lod.core.a7.data.LodDataSource;
 
 public abstract class OldDataSourceLoader extends DataSourceLoader {
 

src/main/java/com/seibel/lod/core/a7/datatype/full/FullDatatype.java

@@ -1,8 +1,8 @@
-package com.seibel.lod.core.objects.a7.datatype.full;
+package com.seibel.lod.core.a7.datatype.full;
 
-import com.seibel.lod.core.objects.a7.data.DataSourceLoader;
-import com.seibel.lod.core.objects.a7.data.LodDataSource;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.data.DataSourceLoader;
+import com.seibel.lod.core.a7.data.LodDataSource;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
 
 public class FullDatatype implements LodDataSource {
     @Override

src/main/java/com/seibel/lod/core/a7/io/DHFolderHandler.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.core.objects.a7.io;
+package com.seibel.lod.core.a7.io;
 
 import com.seibel.lod.core.config.Config;
 import com.seibel.lod.core.enums.config.EServerFolderNameMode;

src/main/java/com/seibel/lod/core/a7/io/DataSourceProvider.java

@@ -1,8 +1,8 @@
-package com.seibel.lod.core.objects.a7.io;
+package com.seibel.lod.core.a7.io;
 
-import com.seibel.lod.core.objects.a7.data.LodDataSource;
-import com.seibel.lod.core.objects.a7.datatype.full.FullDatatype;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.data.LodDataSource;
+import com.seibel.lod.core.a7.datatype.full.FullDatatype;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
 
 import java.util.concurrent.CompletableFuture;
 

src/main/java/com/seibel/lod/core/a7/io/FileScanner.java

@@ -0,0 +1,4 @@
+package com.seibel.lod.core.a7.io;
+
+public class FileScanner {
+}

src/main/java/com/seibel/lod/core/a7/io/LevelFileHandler.java

@@ -0,0 +1,4 @@
+package com.seibel.lod.core.a7.io;
+
+public class LevelFileHandler {
+}

src/main/java/com/seibel/lod/core/a7/io/LevelToFileMatcher.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.core.objects.a7.io;
+package com.seibel.lod.core.a7.io;
 
 import com.seibel.lod.core.api.internal.InternalApiShared;
 import com.seibel.lod.core.builders.lodBuilding.LodBuilder;
@@ -14,8 +14,8 @@ import com.seibel.lod.core.handlers.dimensionFinder.SubDimCompare;
 import com.seibel.lod.core.logging.ConfigBasedLogger;
 import com.seibel.lod.core.objects.DHChunkPos;
 import com.seibel.lod.core.objects.DHRegionPos;
-import com.seibel.lod.core.objects.a7.DHLevel;
-import com.seibel.lod.core.objects.a7.DHWorld;
+import com.seibel.lod.core.a7.DHLevel;
+import com.seibel.lod.core.a7.DHWorld;
 import com.seibel.lod.core.objects.lod.LodDimension;
 import com.seibel.lod.core.objects.lod.LodRegion;
 import com.seibel.lod.core.util.DataPointUtil;

src/main/java/com/seibel/lod/core/a7/io/MetaFile.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.core.objects.a7.io;
+package com.seibel.lod.core.a7.io;
 
 import java.io.*;
 import java.nio.ByteBuffer;
@@ -12,10 +12,9 @@ import java.util.function.BiConsumer;
 import java.util.zip.Adler32;
 import java.util.zip.CheckedOutputStream;
 
-import com.seibel.lod.core.objects.a7.data.DataSourceLoader;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.data.DataSourceLoader;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
 import com.seibel.lod.core.util.LodUtil;
-import net.fabricmc.mapping.tree.Mapped;
 
 public class MetaFile {
     //Metadata format:

src/main/java/com/seibel/lod/core/a7/io/file/DataMetaFile.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.core.objects.a7.io.file;
+package com.seibel.lod.core.a7.io.file;
 
 import java.io.*;
 import java.lang.ref.SoftReference;
@@ -11,15 +11,15 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.function.BiConsumer;
 
+import com.seibel.lod.core.a7.data.DataSourceLoader;
+import com.seibel.lod.core.a7.data.LodDataSource;
+import com.seibel.lod.core.a7.datatype.full.FullDatatype;
+import com.seibel.lod.core.a7.io.MetaFile;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
 import com.seibel.lod.core.logging.DhLoggerBuilder;
-import com.seibel.lod.core.objects.a7.DHLevel;
-import com.seibel.lod.core.objects.a7.data.DataSourceLoader;
-import com.seibel.lod.core.objects.a7.data.LodDataSource;
-import com.seibel.lod.core.objects.a7.datatype.column.DataSourceSaver;
-import com.seibel.lod.core.objects.a7.datatype.column.OldDataSourceLoader;
-import com.seibel.lod.core.objects.a7.datatype.full.FullDatatype;
-import com.seibel.lod.core.objects.a7.io.MetaFile;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.DHLevel;
+import com.seibel.lod.core.a7.datatype.column.DataSourceSaver;
+import com.seibel.lod.core.a7.datatype.column.OldDataSourceLoader;
 import com.seibel.lod.core.util.LodUtil;
 import org.apache.logging.log4j.Logger;
 

src/main/java/com/seibel/lod/core/a7/io/file/LocalDataFileHandler.java

@@ -1,12 +1,12 @@
-package com.seibel.lod.core.objects.a7.io.file;
+package com.seibel.lod.core.a7.io.file;
 
 import com.google.common.collect.HashMultimap;
+import com.seibel.lod.core.a7.data.LodDataSource;
+import com.seibel.lod.core.a7.datatype.full.FullDatatype;
+import com.seibel.lod.core.a7.io.DataSourceProvider;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
 import com.seibel.lod.core.logging.DhLoggerBuilder;
-import com.seibel.lod.core.objects.a7.DHLevel;
-import com.seibel.lod.core.objects.a7.data.LodDataSource;
-import com.seibel.lod.core.objects.a7.datatype.full.FullDatatype;
-import com.seibel.lod.core.objects.a7.io.DataSourceProvider;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.DHLevel;
 import com.seibel.lod.core.util.LodUtil;
 import org.apache.logging.log4j.Logger;
 

src/main/java/com/seibel/lod/core/a7/io/render/RenderFileHandler.java

@@ -1,14 +1,12 @@
-package com.seibel.lod.core.objects.a7.io.render;
+package com.seibel.lod.core.a7.io.render;
 
+import com.seibel.lod.core.a7.RenderDataProvider;
+import com.seibel.lod.core.a7.datatype.full.FullDatatype;
+import com.seibel.lod.core.a7.io.DataSourceProvider;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
 import com.seibel.lod.core.logging.DhLoggerBuilder;
-import com.seibel.lod.core.objects.a7.RenderDataProvider;
-import com.seibel.lod.core.objects.a7.data.DataSourceLoader;
-import com.seibel.lod.core.objects.a7.data.LodDataSource;
-import com.seibel.lod.core.objects.a7.datatype.full.FullDatatype;
-import com.seibel.lod.core.objects.a7.io.DataSourceProvider;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
-import com.seibel.lod.core.objects.a7.render.RenderDataSource;
-import com.seibel.lod.core.objects.a7.render.RenderDataSourceLoader;
+import com.seibel.lod.core.a7.render.RenderDataSource;
+import com.seibel.lod.core.a7.render.RenderDataSourceLoader;
 import com.seibel.lod.core.util.LodUtil;
 import org.apache.logging.log4j.Logger;
 

src/main/java/com/seibel/lod/core/a7/io/render/RenderMetaFile.java

@@ -1,7 +1,7 @@
-package com.seibel.lod.core.objects.a7.io.render;
+package com.seibel.lod.core.a7.io.render;
 
-import com.seibel.lod.core.objects.a7.io.MetaFile;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.io.MetaFile;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
 
 import java.io.File;
 import java.io.IOException;

src/main/java/com/seibel/lod/core/a7/pos/DhBlockPos2D.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.core.objects.a7.pos;
+package com.seibel.lod.core.a7.pos;
 
 import com.seibel.lod.core.objects.DHBlockPos;
 import com.seibel.lod.core.objects.Pos2D;

src/main/java/com/seibel/lod/core/a7/pos/DhLodPos.java

@@ -1,6 +1,5 @@
-package com.seibel.lod.core.objects.a7.pos;
+package com.seibel.lod.core.a7.pos;
 
-import com.seibel.lod.core.objects.DHBlockPos;
 import com.seibel.lod.core.util.LodUtil;
 
 import java.util.Objects;

src/main/java/com/seibel/lod/core/a7/pos/DhLodUnit.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.core.objects.a7.pos;
+package com.seibel.lod.core.a7.pos;
 
 public class DhLodUnit {
     public final byte detail;

src/main/java/com/seibel/lod/core/a7/pos/DhSectionPos.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.core.objects.a7.pos;
+package com.seibel.lod.core.a7.pos;
 
 import com.seibel.lod.core.enums.ELodDirection;
 import com.seibel.lod.core.util.LodUtil;

src/main/java/com/seibel/lod/core/a7/render/EmptyRenderContainer.java

@@ -1,9 +1,6 @@
-package com.seibel.lod.core.objects.a7.render;
+package com.seibel.lod.core.a7.render;
 
-import com.seibel.lod.core.objects.a7.LodQuadTree;
-import com.seibel.lod.core.objects.a7.data.LodDataSource;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
-import com.seibel.lod.core.objects.a7.render.RenderBuffer;
+import com.seibel.lod.core.a7.LodQuadTree;
 
 import java.util.concurrent.atomic.AtomicReference;
 

src/main/java/com/seibel/lod/core/a7/render/RenderBuffer.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package com.seibel.lod.core.objects.a7.render;
+package com.seibel.lod.core.a7.render;
 
 import com.seibel.lod.core.render.LodRenderProgram;
 import com.seibel.lod.core.util.StatsMap;

src/main/java/com/seibel/lod/core/a7/render/RenderBufferHandler.java

@@ -1,9 +1,9 @@
-package com.seibel.lod.core.objects.a7.render;
+package com.seibel.lod.core.a7.render;
 
 import com.seibel.lod.core.objects.Pos2D;
-import com.seibel.lod.core.objects.a7.LodQuadTree;
-import com.seibel.lod.core.objects.a7.LodSection;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.LodQuadTree;
+import com.seibel.lod.core.a7.LodSection;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
 import com.seibel.lod.core.render.LodRenderProgram;
 import com.seibel.lod.core.util.LodUtil;
 import com.seibel.lod.core.util.gridList.MovableGridRingList;

src/main/java/com/seibel/lod/core/a7/render/RenderDataSource.java

@@ -1,9 +1,7 @@
-package com.seibel.lod.core.objects.a7.render;
+package com.seibel.lod.core.a7.render;
 
-import com.seibel.lod.core.objects.a7.LodQuadTree;
-import com.seibel.lod.core.objects.a7.render.RenderBuffer;
+import com.seibel.lod.core.a7.LodQuadTree;
 
-import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 
 /**

src/main/java/com/seibel/lod/core/a7/render/RenderDataSourceLoader.java

@@ -1,9 +1,9 @@
-package com.seibel.lod.core.objects.a7.render;
+package com.seibel.lod.core.a7.render;
 
-import com.seibel.lod.core.objects.a7.DHLevel;
+import com.seibel.lod.core.a7.data.LodDataSource;
+import com.seibel.lod.core.a7.pos.DhSectionPos;
+import com.seibel.lod.core.a7.DHLevel;
 import com.seibel.lod.core.objects.a7.data.DataFile;
-import com.seibel.lod.core.objects.a7.data.LodDataSource;
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
 
 import java.util.*;
 import java.util.stream.Collectors;

src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java

@@ -27,9 +27,9 @@ import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
 import com.seibel.lod.core.logging.ConfigBasedLogger;
 import com.seibel.lod.core.logging.ConfigBasedSpamLogger;
 import com.seibel.lod.core.logging.SpamReducedLogger;
-import com.seibel.lod.core.objects.a7.DHLevel;
-import com.seibel.lod.core.objects.a7.DHWorld;
-import com.seibel.lod.core.objects.a7.Server;
+import com.seibel.lod.core.a7.DHLevel;
+import com.seibel.lod.core.a7.DHWorld;
+import com.seibel.lod.core.a7.Server;
 import com.seibel.lod.core.objects.math.Mat4f;
 import com.seibel.lod.core.render.GLProxy;
 import com.seibel.lod.core.render.RenderSystemTest;

src/main/java/com/seibel/lod/core/api/internal/a7/ServerApi.java

@@ -21,8 +21,8 @@ package com.seibel.lod.core.api.internal.a7;
 
 import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
 import com.seibel.lod.core.logging.DhLoggerBuilder;
-import com.seibel.lod.core.objects.a7.DHWorld;
-import com.seibel.lod.core.objects.a7.Server;
+import com.seibel.lod.core.a7.DHWorld;
+import com.seibel.lod.core.a7.Server;
 import com.seibel.lod.core.wrapperInterfaces.IVersionConstants;
 import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
 import com.seibel.lod.core.wrapperInterfaces.world.IWorldWrapper;

src/main/java/com/seibel/lod/core/api/internal/a7/SharedApi.java

@@ -1,12 +1,9 @@
 package com.seibel.lod.core.api.internal.a7;
 
 import com.seibel.lod.core.logging.DhLoggerBuilder;
-import com.seibel.lod.core.objects.a7.DHWorld;
-import com.seibel.lod.core.objects.a7.Server;
-import com.seibel.lod.core.util.LodUtil;
-import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.lod.core.a7.DHWorld;
+import com.seibel.lod.core.a7.Server;
 import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
-import com.seibel.lod.core.wrapperInterfaces.world.IWorldWrapper;
 import org.apache.logging.log4j.Logger;
 
 public class SharedApi {

src/main/java/com/seibel/lod/core/builders/lodBuilding/bufferBuilding/CubicLodTemplate.java

@@ -22,8 +22,8 @@ package com.seibel.lod.core.builders.lodBuilding.bufferBuilding;
 import com.seibel.lod.core.enums.rendering.EDebugMode;
 import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
 import com.seibel.lod.core.objects.LodDataView;
-import com.seibel.lod.core.objects.a7.datatype.column.ColumnArrayView;
-import com.seibel.lod.core.objects.a7.datatype.column.ColumnBox;
+import com.seibel.lod.core.a7.datatype.column.ColumnArrayView;
+import com.seibel.lod.core.a7.datatype.column.ColumnBox;
 import com.seibel.lod.core.objects.opengl.LodBox;
 import com.seibel.lod.core.util.ColorUtil;
 import com.seibel.lod.core.util.DataPointUtil;

src/main/java/com/seibel/lod/core/objects/a7/RenderDataProvider.java

@@ -1,11 +0,0 @@
-package com.seibel.lod.core.objects.a7;
-
-import com.seibel.lod.core.objects.a7.pos.DhSectionPos;
-import com.seibel.lod.core.objects.a7.render.RenderDataSource;
-import com.seibel.lod.core.objects.a7.render.RenderDataSourceLoader;
-
-import java.util.concurrent.CompletableFuture;
-
-public interface RenderDataProvider {
-    CompletableFuture<RenderDataSource> createRenderData(RenderDataSourceLoader renderSourceLoader, DhSectionPos pos);
-}

src/main/java/com/seibel/lod/core/objects/a7/io/FileScanner.java

@@ -1,4 +0,0 @@
-package com.seibel.lod.core.objects.a7.io;
-
-public class FileScanner {
-}

src/main/java/com/seibel/lod/core/objects/a7/io/LevelFileHandler.java

@@ -1,4 +0,0 @@
-package com.seibel.lod.core.objects.a7.io;
-
-public class LevelFileHandler {
-}

src/main/java/com/seibel/lod/core/render/a7LodRenderer.java

@@ -28,8 +28,8 @@ import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
 import com.seibel.lod.core.logging.ConfigBasedLogger;
 import com.seibel.lod.core.logging.ConfigBasedSpamLogger;
 import com.seibel.lod.core.objects.DHBlockPos;
-import com.seibel.lod.core.objects.a7.DHLevel;
-import com.seibel.lod.core.objects.a7.render.RenderBufferHandler;
+import com.seibel.lod.core.a7.DHLevel;
+import com.seibel.lod.core.a7.render.RenderBufferHandler;
 import com.seibel.lod.core.objects.math.Mat4f;
 import com.seibel.lod.core.objects.math.Vec3d;
 import com.seibel.lod.core.objects.math.Vec3f;