Fix compilation

core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientApi.java

@@ -372,7 +372,7 @@ public class ClientApi
 					// Unload the current world, since it may be wrong.
 					// A followup WorldChanged event should be received from the server soon after this.
 					LOGGER.info("Unloading current client level so the server can define the correct multiverse level.");
-					this.clientLevelUnloadEvent((IClientLevelWrapper) MC.getWrappedClientWorld());
+					this.clientLevelUnloadEvent(MC.getWrappedClientLevel());
 				});
 				break;
 			
@@ -396,11 +396,11 @@ public class ClientApi
 				
 				LOGGER.info("Server level change event received, changing the level to [" + levelKey + "].");
 				MC.executeOnRenderThread(() -> {
-					if (MC.getWrappedClientWorld() != null)
+					if (MC.getWrappedClientLevel() != null)
 					{
-						this.clientLevelUnloadEvent((IClientLevelWrapper) MC.getWrappedClientWorld());
+						this.clientLevelUnloadEvent(MC.getWrappedClientLevel());
 					}
-					IServerKeyedClientLevel clientLevel = KEYED_CLIENT_LEVEL_MANAGER.getServerKeyedLevel(MC.getWrappedClientWorld(), levelKey);
+					IServerKeyedClientLevel clientLevel = KEYED_CLIENT_LEVEL_MANAGER.getServerKeyedLevel(MC.getWrappedClientLevel(), levelKey);
 					KEYED_CLIENT_LEVEL_MANAGER.setServerKeyedLevel(clientLevel);
 					this.multiverseClientLevelLoadEvent(clientLevel);
 				});

core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/loader/CompleteFullDataSourceLoader.java

@@ -20,8 +20,12 @@
 package com.seibel.distanthorizons.core.dataObjects.fullData.loader;
 
 import com.seibel.distanthorizons.core.dataObjects.fullData.sources.interfaces.IFullDataSource;
+import com.seibel.distanthorizons.core.level.IDhLevel;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
 import com.seibel.distanthorizons.core.dataObjects.fullData.sources.CompleteFullDataSource;
+import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataInputStream;
+
+import java.io.IOException;
 
 public class CompleteFullDataSourceLoader extends AbstractFullDataSourceLoader
 {

core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/interfaces/IFullDataSource.java

@@ -63,7 +63,6 @@ public interface IFullDataSource
 	
 	/** Returns the detail level of the data contained by this {@link IFullDataSource}. */
 	byte getDataDetailLevel();
-	long getTypeId();
 	byte getBinaryDataFormatVersion();
 	EDhApiWorldGenerationStep getWorldGenStep();
 	

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

@@ -76,7 +76,7 @@ public class FullDataFileHandler implements IFullDataSourceProvider
 		}
 		return map;
 	}
-	protected boolean fileExists(DhSectionPos pos) { return this.computeDataFilePath(pos).exists(); }
+	protected boolean fileExists(DhSectionPos pos) { return this.fullDataRepo.existsWithPrimaryKey(pos.serialize()); }
 	
 	protected final IDhLevel level;
 	protected final File saveDir;

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

@@ -36,6 +36,7 @@ import com.seibel.distanthorizons.core.util.LodUtil;
 import org.apache.logging.log4j.Logger;
 
 import javax.annotation.Nullable;
+import java.io.File;
 import java.lang.ref.WeakReference;
 import java.util.*;
 import java.util.concurrent.*;
@@ -47,7 +48,7 @@ public class GeneratedFullDataFileHandler extends FullDataFileHandler
 {
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
-	private final AtomicReference<IWorldGenerationQueue> worldGenQueueRef = new AtomicReference<>(null);
+	protected final AtomicReference<IWorldGenerationQueue> worldGenQueueRef = new AtomicReference<>(null);
 	
 	private final ArrayList<IOnWorldGenCompleteListener> onWorldGenTaskCompleteListeners = new ArrayList<>();
 	
@@ -55,6 +56,7 @@ public class GeneratedFullDataFileHandler extends FullDataFileHandler
 	private final ConcurrentHashMap<DhSectionPos, IFullDataSource> generatingDataSourceByPos = new ConcurrentHashMap<>();
 	
 	public GeneratedFullDataFileHandler(IDhLevel level, AbstractSaveStructure saveStructure) { super(level, saveStructure); }
+	public GeneratedFullDataFileHandler(IDhLevel level, AbstractSaveStructure saveStructure, @Nullable File saveDirOverride) { super(level, saveStructure, saveDirOverride); }
 	
 	
 	

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

@@ -58,10 +58,16 @@ public class RemoteFullDataFileHandler extends GeneratedFullDataFileHandler
 	private final AtomicBoolean isUpdating = new AtomicBoolean(false);
 	private boolean invalidSectionsFound = false;
 	
-	public RemoteFullDataFileHandler(IDhLevel level, AbstractSaveStructure saveStructure, @Nullable ClientNetworkState networkState) {
+	public RemoteFullDataFileHandler(IDhLevel level, AbstractSaveStructure saveStructure, @Nullable ClientNetworkState networkState)
+	{
 		super(level, saveStructure);
 		this.networkState = networkState;
 	}
+	public RemoteFullDataFileHandler(IDhLevel level, AbstractSaveStructure saveStructure, @Nullable File saveDirOverride, @Nullable ClientNetworkState networkState)
+	{
+		super(level, saveStructure, saveDirOverride);
+		this.networkState = networkState;
+	}
 	
 	private void sendUpdateChecks()
 	{

core/src/main/java/com/seibel/distanthorizons/core/file/subDimMatching/SubDimensionLevelMatcher.java

@@ -218,7 +218,7 @@ public class SubDimensionLevelMatcher implements AutoCloseable
 			try
 			{
 				// get the data source to compare against
-				IDhLevel tempLevel = new DhClientLevel(new ClientOnlySaveStructure(), this.currentClientLevel, testLevelFolder, false);
+				IDhLevel tempLevel = new DhClientLevel(new ClientOnlySaveStructure(), this.currentClientLevel, testLevelFolder, false, null);
 				IFullDataSource testFullDataSource = tempLevel.getFileHandler().readAsync(new DhSectionPos(this.playerData.playerBlockPos)).join();
 				if (testFullDataSource == null)
 				{

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

@@ -88,7 +88,7 @@ public class DhClientLevel extends DhLevel implements IDhClientLevel
 	{
 		this.levelWrapper = clientLevelWrapper;
 		this.saveStructure = saveStructure;
-		this.dataFileHandler = new RemoteFullDataFileHandler(this, saveStructure, networkState);
+		this.dataFileHandler = new RemoteFullDataFileHandler(this, saveStructure, fullDataSaveDirOverride, networkState);
 		
 		this.worldGeneratorEnabledConfig = new AppliedConfigState<>(Config.Client.Advanced.WorldGenerator.enableDistantGeneration);
 		this.networkState = networkState;

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

@@ -185,7 +185,6 @@ public class DhServerLevel extends DhLevel implements IDhServerLevel
 	
 	public void removePlayer(IServerPlayerWrapper serverPlayer)
 	{
-		//noinspection ResultOfMethodCallIgnored
 		this.worldGenLoopingQueue.remove(serverPlayer);
 	}
 	

core/src/main/java/com/seibel/distanthorizons/core/network/messages/fullData/generation/FullDataSourceResponseMessage.java

@@ -70,7 +70,7 @@ public class FullDataSourceResponseMessage extends FutureTrackableNetworkMessage
 	public void decode0(ByteBuf in)
 	{
 		byte dataVersion = in.readByte();
-		this.fullDataSourceLoader = (CompleteFullDataSourceLoader) AbstractFullDataSourceLoader.getLoader(CompleteFullDataSource.TYPE_ID, dataVersion);
+		this.fullDataSourceLoader = (CompleteFullDataSourceLoader) AbstractFullDataSourceLoader.getLoader(CompleteFullDataSource.DATA_SOURCE_TYPE, dataVersion);
 		this.dataBuffer = in.readBytes(in.readInt());
 	}