Minor IDhLevel refactor and rename DhLevel -> AbstractDhLevel

core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/GeneratedFullDataFileHandler.java

@@ -20,21 +20,16 @@
 package com.seibel.distanthorizons.core.file.fullDatafile;
 
 import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor;
-import com.seibel.distanthorizons.core.dataObjects.fullData.sources.CompleteFullDataSource;
 import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IFullDataSource;
-import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IIncompleteFullDataSource;
 import com.seibel.distanthorizons.core.file.structure.AbstractSaveStructure;
 import com.seibel.distanthorizons.core.generation.IWorldGenerationQueue;
 import com.seibel.distanthorizons.core.generation.MissingWorldGenPositionFinder;
 import com.seibel.distanthorizons.core.generation.tasks.IWorldGenTaskTracker;
 import com.seibel.distanthorizons.core.generation.tasks.WorldGenResult;
-import com.seibel.distanthorizons.core.level.DhLevel;
 import com.seibel.distanthorizons.core.level.IDhLevel;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
 import com.seibel.distanthorizons.core.util.LodUtil;
-import com.seibel.distanthorizons.core.util.TimerUtil;
-import com.seibel.distanthorizons.core.util.objects.Reference;
 import org.apache.logging.log4j.Logger;
 
 import java.util.*;
@@ -251,7 +246,7 @@ public class GeneratedFullDataFileHandler extends FullDataFileHandler
 		{
 			return (chunkSizedFullDataSource) ->
 			{
-				((DhLevel) GeneratedFullDataFileHandler.this.level).updateDataSourcesWithChunkData(chunkSizedFullDataSource);
+				GeneratedFullDataFileHandler.this.level.updateDataSourcesWithChunkData(chunkSizedFullDataSource);
 			};
 		}
 	}

core/src/main/java/com/seibel/distanthorizons/core/level/AbstractDhLevel.java

@@ -27,18 +27,23 @@ import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
 
 import java.util.concurrent.CompletableFuture;
 
-public abstract class DhLevel implements IDhLevel
+public abstract class AbstractDhLevel implements IDhLevel
 {
-	
 	public final ChunkToLodBuilder chunkToLodBuilder;
 	
-	protected DhLevel() { this.chunkToLodBuilder = new ChunkToLodBuilder(); }
-	
-	public abstract void updateDataSourcesWithChunkData(ChunkSizedFullDataAccessor data);
 	
 	
-	@Override
-	public int getMinY() { return 0; }
+	//=============//
+	// constructor //
+	//=============//
+	
+	protected AbstractDhLevel() { this.chunkToLodBuilder = new ChunkToLodBuilder(); }
+	
+	
+	
+	//=================//
+	// default methods //
+	//=================//
 	
 	@Override
 	public void updateChunkAsync(IChunkWrapper chunk)

core/src/main/java/com/seibel/distanthorizons/core/level/DhClientLevel.java

@@ -31,14 +31,13 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrap
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
-import com.seibel.distanthorizons.coreapi.util.math.Mat4f;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
 
 /** The level used when connected to a server */
-public class DhClientLevel extends DhLevel implements IDhClientLevel
+public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel
 {
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	

core/src/main/java/com/seibel/distanthorizons/core/level/DhClientServerLevel.java

@@ -38,14 +38,13 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
-import com.seibel.distanthorizons.coreapi.util.math.Mat4f;
 import org.apache.logging.log4j.Logger;
 
 import java.awt.*;
 import java.util.Iterator;
 
 /** The level used on a singleplayer world */
-public class DhClientServerLevel extends DhLevel implements IDhClientLevel, IDhServerLevel
+public class DhClientServerLevel extends AbstractDhLevel implements IDhClientLevel, IDhServerLevel
 {
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	private static final IMinecraftClientWrapper MC_CLIENT = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);

core/src/main/java/com/seibel/distanthorizons/core/level/DhServerLevel.java

@@ -30,7 +30,7 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
 import org.apache.logging.log4j.Logger;
 
-public class DhServerLevel extends DhLevel implements IDhServerLevel
+public class DhServerLevel extends AbstractDhLevel implements IDhServerLevel
 {
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	public final ServerLevelModule serverside;

core/src/main/java/com/seibel/distanthorizons/core/level/IDhLevel.java

@@ -19,6 +19,7 @@
 
 package com.seibel.distanthorizons.core.level;
 
+import com.seibel.distanthorizons.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor;
 import com.seibel.distanthorizons.core.file.fullDatafile.IFullDataSourceProvider;
 import com.seibel.distanthorizons.core.file.structure.AbstractSaveStructure;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
@@ -44,5 +45,6 @@ public interface IDhLevel extends AutoCloseable
 	
 	boolean hasSkyLight();
 	
+	void updateDataSourcesWithChunkData(ChunkSizedFullDataAccessor data);
 	
 }

core/src/main/java/com/seibel/distanthorizons/core/util/RenderDataPointUtil.java

@@ -19,7 +19,7 @@
 
 package com.seibel.distanthorizons.core.util;
 
-import com.seibel.distanthorizons.core.level.DhLevel;
+import com.seibel.distanthorizons.core.level.AbstractDhLevel;
 import com.seibel.distanthorizons.core.logging.SpamReducedLogger;
 import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnArrayView;
 import com.seibel.distanthorizons.core.dataObjects.render.columnViews.IColumnDataView;
@@ -174,9 +174,9 @@ public class RenderDataPointUtil
 		return dataPoint & ~(HEIGHT_SHIFTED_MASK | DEPTH_SHIFTED_MASK) | height | depth;
 	}
 	
-	/** AKA the ending/top/highest Y value above {@link DhLevel#getMinY()} */
+	/** AKA the ending/top/highest Y value above {@link AbstractDhLevel#getMinY()} */
 	public static short getYMax(long dataPoint) { return (short) ((dataPoint >>> HEIGHT_SHIFT) & HEIGHT_MASK); }
-	/** AKA the starting/bottom/lowest Y value above {@link DhLevel#getMinY()} */
+	/** AKA the starting/bottom/lowest Y value above {@link AbstractDhLevel#getMinY()} */
 	public static short getYMin(long dataPoint) { return (short) ((dataPoint >>> DEPTH_SHIFT) & DEPTH_MASK); }
 	
 	public static short getAlpha(long dataPoint) { return (short) ((((dataPoint >>> ALPHA_SHIFT) & ALPHA_MASK) << ALPHA_DOWNSIZE_SHIFT) | 0b1111); }