Merge branch 'main' of https://gitlab.com/jeseibel/distant-horizons-core

api/src/main/java/com/seibel/distanthorizons/coreapi/ModInfo.java

@@ -28,6 +28,8 @@ public final class ModInfo
 	public static final String ID = "distanthorizons";
 	/** The internal protocol version used for networking */
 	public static final int PROTOCOL_VERSION = 1;
+	/** The protocol version used for multiverse networking */
+	public static final int MULTIVERSE_PLUGIN_PROTOCOL_VERSION = 1;
 	/** The internal mod name */
 	public static final String NAME = "DistantHorizons";
 	/** Human-readable version of NAME */
@@ -43,4 +45,8 @@ public final class ModInfo
 	/** This version should be updated whenever non-breaking fixes are added to the DH API */
 	public static final int API_PATH_VERSION = 0;
 	
+	public static final String NETWORKING_RESOURCE_NAMESPACE =  "distant_horizons";
+	public static final String MULTIVERSE_PLUGIN_NAMESPACE = "world_control";
+	
+	
 }

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

@@ -21,9 +21,10 @@ package com.seibel.distanthorizons.core.api.internal;
 
 import com.seibel.distanthorizons.api.methods.events.abstractEvents.*;
 import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiRenderParam;
-import com.seibel.distanthorizons.core.level.IServerKeyedClientLevel;
 import com.seibel.distanthorizons.core.level.IKeyedClientLevelManager;
+import com.seibel.distanthorizons.core.level.IServerKeyedClientLevel;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
+import com.seibel.distanthorizons.core.util.objects.Pair;
 import com.seibel.distanthorizons.core.world.*;
 import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
 import com.seibel.distanthorizons.core.level.IDhClientLevel;
@@ -52,6 +53,8 @@ import org.lwjgl.glfw.GLFW;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -62,53 +65,71 @@ import java.util.concurrent.TimeUnit;
 public class ClientApi
 {
 	private static final Logger LOGGER = LogManager.getLogger();
-	public static final boolean ENABLE_EVENT_LOGGING = true;
+	
 	public static boolean prefLoggerEnabled = false;
-
+	
 	public static final ClientApi INSTANCE = new ClientApi();
 	public static TestRenderer testRenderer = new TestRenderer();
+	
 	private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
 	private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
 	private static final IKeyedClientLevelManager KEYED_CLIENT_LEVEL_MANAGER = SingletonInjector.INSTANCE.get(IKeyedClientLevelManager.class);
-
+	
 	public static final long SPAM_LOGGER_FLUSH_NS = TimeUnit.NANOSECONDS.convert(1, TimeUnit.SECONDS);
-
+	
 	private boolean configOverrideReminderPrinted = false;
 	public boolean rendererDisabledBecauseOfExceptions = false;
-
+	
 	private long lastFlushNanoTime = 0;
-
-	private boolean isServerCommunicationEnabled = true;
-
-	private boolean serverIsMalformed = false;
-
-
+	
+	private boolean isServerCommunicationEnabled = false;
+	
+	/** set to true if any unexpected responses are received from the server */
+	private boolean serverNetworkingIsMalformed = false;
+	
+	/** Holds any levels that were loaded before the {@link ClientApi#onClientOnlyConnected} was fired. */
+	private final HashSet<IClientLevelWrapper> waitingClientLevels = new HashSet<>();
+	/** Holds any chunks that were loaded before the {@link ClientApi#clientLevelLoadEvent(IClientLevelWrapper)} was fired. */
+	private final HashMap<Pair<IClientLevelWrapper, DhChunkPos>, IChunkWrapper> waitingChunkByClientLevelAndPos = new HashMap<>();
+	
+	
+	
 	//==============//
 	// constructors //
 	//==============//
-
-	private ClientApi()
-	{
-
-	}
-
-
-
-	//========//
-	// events //
-	//========//
-
+	
+	private ClientApi() { }
+	
+	
+	
+	//==============//
+	// world events //
+	//==============//
+	
+	/** 
+	 * May be fired slightly before or after the associated
+	 * {@link ClientApi#clientLevelLoadEvent(IClientLevelWrapper)} event
+	 * depending on how the host mod loader functions.
+	 */
 	public void onClientOnlyConnected()
 	{
 		// only continue if the client is connected to a different server
 		if (MC.clientConnectedToDedicatedServer())
 		{
-			if (ENABLE_EVENT_LOGGING)
-			{
-				LOGGER.info("Client on ClientOnly mode connecting.");
-			}
-
+			LOGGER.info("Client on ClientOnly mode connecting.");
+			
+			// firing after clientLevelLoadEvent
+			// TODO if level has prepped to load it should fire level load event
 			SharedApi.setDhWorld(new DhClientWorld());
+			
+			
+			LOGGER.info("Loading ["+this.waitingClientLevels.size()+"] waiting client level wrappers.");
+			for (IClientLevelWrapper level : this.waitingClientLevels)
+			{
+				this.clientLevelLoadEvent(level);
+			}
+			
+			this.waitingClientLevels.clear();
 		}
 	}
 
@@ -119,21 +140,100 @@ public class ClientApi
 			AbstractDhWorld world = SharedApi.getAbstractDhWorld();
 			if (world != null)
 			{
-				if (ENABLE_EVENT_LOGGING)
-				{
-					LOGGER.info("Client on ClientOnly mode disconnecting.");
-				}
+				LOGGER.info("Client on ClientOnly mode disconnecting.");
 
 				world.close();
 				SharedApi.setDhWorld(null);
 			}
+			
+			// clear the previous server's information
 			this.isServerCommunicationEnabled = false;
-			this.serverIsMalformed = false;
+			this.serverNetworkingIsMalformed = false;
 			KEYED_CLIENT_LEVEL_MANAGER.setUseOverrideWrapper(false);
 			KEYED_CLIENT_LEVEL_MANAGER.setServerKeyedLevel(null);
+			
+			// remove any waiting items
+			this.waitingChunkByClientLevelAndPos.clear();
+			this.waitingClientLevels.clear();
 		}
 	}
-
+	
+	
+	
+	//==============//
+	// level events //
+	//==============//
+	
+	public void clientLevelUnloadEvent(IClientLevelWrapper level)
+	{
+		LOGGER.info("Unloading client level ["+level+"].");
+		
+		AbstractDhWorld world = SharedApi.getAbstractDhWorld();
+		if (world != null)
+		{
+			world.unloadLevel(level);
+			ApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelUnloadEvent.class, new DhApiLevelUnloadEvent.EventParam(level));
+		}
+		else
+		{
+			this.waitingClientLevels.remove(level);
+		}
+	}
+	
+	public void clientLevelLoadEvent(IClientLevelWrapper level) { this.clientLevelLoadEvent(level, false); }
+	public void multiverseClientLevelLoadEvent(IClientLevelWrapper level) { this.clientLevelLoadEvent(level, true); }
+	private void clientLevelLoadEvent(IClientLevelWrapper level, boolean isServerCommunication)
+	{
+		if (this.isServerCommunicationEnabled && !isServerCommunication)
+		{
+			LOGGER.info("Server supports communication, deferring loading.");
+			return;
+		}
+		
+		
+		LOGGER.info("Loading "+(isServerCommunication ? "Multiverse" : "")+" client level [" + level + "].");
+		
+		AbstractDhWorld world = SharedApi.getAbstractDhWorld();
+		if (world != null)
+		{
+			world.getOrLoadLevel(level);
+			ApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelLoadEvent.class, new DhApiLevelLoadEvent.EventParam(level));
+			
+			this.loadWaitingChunksForLevel(level);
+		}
+		else
+		{
+			this.waitingClientLevels.add(level);
+		}
+	}
+	private void loadWaitingChunksForLevel(IClientLevelWrapper level)
+	{
+		HashSet<Pair<IClientLevelWrapper, DhChunkPos>> keysToRemove = new HashSet<>();
+		for (Pair<IClientLevelWrapper, DhChunkPos> levelChunkPair : this.waitingChunkByClientLevelAndPos.keySet())
+		{
+			// only load chunks that came from this level
+			IClientLevelWrapper levelWrapper = levelChunkPair.first;
+			if (levelWrapper.equals(level))
+			{
+				IChunkWrapper chunkWrapper = this.waitingChunkByClientLevelAndPos.get(levelChunkPair);
+				this.applyChunkUpdate(chunkWrapper, levelWrapper);
+				keysToRemove.add(levelChunkPair);
+			}
+		}
+		LOGGER.info("Loaded ["+keysToRemove.size()+"] waiting chunk wrappers.");
+		
+		for (Pair<IClientLevelWrapper, DhChunkPos> keyToRemove : keysToRemove)
+		{
+			this.waitingChunkByClientLevelAndPos.remove(keyToRemove);
+		}
+	}
+	
+	
+	
+	//=======================//
+	// chunk modified events //
+	//=======================//
+	
 	public void clientChunkLoadEvent(IChunkWrapper chunk, IClientLevelWrapper level) { this.applyChunkUpdate(chunk, level); }
 	public void clientChunkSaveEvent(IChunkWrapper chunk, IClientLevelWrapper level) { this.applyChunkUpdate(chunk, level); }
 	private void applyChunkUpdate(IChunkWrapper chunk, IClientLevelWrapper level)
@@ -144,10 +244,14 @@ public class ClientApi
 			return;
 		}
 		
-		// only continue if the level is still loaded
+		// only continue if the level is loaded
 		IDhLevel dhLevel = SharedApi.getAbstractDhWorld().getLevel(level);
 		if (dhLevel == null)
 		{
+			// If the level isn't loaded yet, keep track of which chunks were loaded so we can use them later.
+			// This may happen if the world and level load events happen out of order
+			this.waitingChunkByClientLevelAndPos.replace(new Pair<>(level, chunk.getChunkPos()), chunk);
+			
 			return;
 		}
 		
@@ -169,81 +273,25 @@ public class ClientApi
 		}
 	}
 	
-
-	public void clientLevelUnloadEvent(IClientLevelWrapper level)
-	{
-		if (ENABLE_EVENT_LOGGING)
-		{
-			LOGGER.info("Client level "+level+" unloading.");
-		}
-
-		AbstractDhWorld world = SharedApi.getAbstractDhWorld();
-		if (world != null)
-		{
-			world.unloadLevel(level);
-			ApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelUnloadEvent.class, new DhApiLevelUnloadEvent.EventParam(level));
-		}
-	}
-
-	public void clientLevelLoadEvent(IClientLevelWrapper level)
-	{
-		if (this.isServerCommunicationEnabled)
-		{
-			if (ENABLE_EVENT_LOGGING)
-			{
-				LOGGER.info("Server supports communication, deferring loading.");
-			}
-			return;
-		}
-		
-		
-		if (ENABLE_EVENT_LOGGING)
-		{
-			LOGGER.info("Client level " + level + " loading.");
-		}
-		
-		AbstractDhWorld world = SharedApi.getAbstractDhWorld();
-		if (world != null)
-		{
-			world.getOrLoadLevel(level);
-			ApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelLoadEvent.class, new DhApiLevelLoadEvent.EventParam(level));
-		}
-	}
-
-	public void serverLevelLoadEvent(IServerKeyedClientLevel level)
-	{
-		if (ENABLE_EVENT_LOGGING)
-		{
-			LOGGER.info("Server level " + level + " (" + level.getServerLevelKey() + ") loading.");
-		}
-
-		AbstractDhWorld world = SharedApi.getAbstractDhWorld();
-		if (world != null)
-		{
-			world.getOrLoadLevel(level);
-			ApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelLoadEvent.class, new DhApiLevelLoadEvent.EventParam(level));
-		}
-	}
-
+	
+	
+	//===============//
+	// render events //
+	//===============//
+	
 	public void rendererShutdownEvent()
 	{
-		if (ENABLE_EVENT_LOGGING)
-		{
-			LOGGER.info("Renderer shutting down.");
-		}
+		LOGGER.info("Renderer shutting down.");
 
 		IProfilerWrapper profiler = MC.getProfiler();
 		profiler.push("DH-RendererShutdown");
 
 		profiler.pop();
 	}
-
+	
 	public void rendererStartupEvent()
 	{
-		if (ENABLE_EVENT_LOGGING)
-		{
-			LOGGER.info("Renderer starting up.");
-		}
+		LOGGER.info("Renderer starting up.");
 
 		IProfilerWrapper profiler = MC.getProfiler();
 		profiler.push("DH-RendererStartup");
@@ -252,7 +300,7 @@ public class ClientApi
 		GLProxy.getInstance();
 		profiler.pop();
 	}
-
+	
 	public void clientTickEvent()
 	{
 		IProfilerWrapper profiler = MC.getProfiler();
@@ -276,75 +324,136 @@ public class ClientApi
 		profiler.pop();
 	}
 	
+	
+	
+	//============//
+	// networking //
+	//============//
+	
 	/** @param byteBuf is Netty's {@link ByteBuffer} wrapper. */
 	public void serverMessageReceived(ByteBuf byteBuf)
 	{
+		if (!Config.Client.Advanced.Multiplayer.enableMultiverseNetworking.get())
+		{
+			// multiverse networking disabled, ignore anything sent from the server
+			return;
+		}
+		
+		
+		
+		// either value can be set to true to debug the received byte stream
+		boolean stopAndDisplayInputAsByteArray = false;
+		boolean stopAndDisplayInputAsString = false;
+		if (stopAndDisplayInputAsByteArray || stopAndDisplayInputAsString)
+		{
+			String messageString = "";
+			if (stopAndDisplayInputAsByteArray)
+			{
+				int byteCount = byteBuf.readableBytes();
+				byte[] arr = new byte[byteCount];
+				StringBuilder stringBuilder = new StringBuilder("Server message received: [");
+				for (int i = 0; i < byteCount; i++)
+				{
+					arr[i] = byteBuf.readByte();
+					stringBuilder.append(arr[i]);
+				}
+				stringBuilder.append("]");
+				
+				messageString = stringBuilder.toString();
+			}
+			else if (stopAndDisplayInputAsString)
+			{
+				messageString = byteBuf.toString(StandardCharsets.UTF_8);
+			}
+			
+			// this is logged as an error so it is easier to see in an Intellij log
+			LOGGER.error(messageString);
+			return;
+		}
+		
+		
+		
+		
 		// It is important to ensure malicious server input is ignored.
-		if (this.serverIsMalformed)
+		if (this.serverNetworkingIsMalformed)
 		{
 			return;
 		}
 		
+		// check that the incoming message is within the expected size
 		short commandLength = byteBuf.readShort();
-		if (commandLength > 32) // TODO 32 should be put into a constant somewhere
+		if (commandLength < 1 || commandLength > 32)
 		{
-			LOGGER.error("Server sent command > 32");
-			ClientApi.INSTANCE.serverIsMalformed = true;
+			LOGGER.error("Server command length ["+commandLength+"] outside the expected range of 1 to 32 (inclusive).");
+			ClientApi.INSTANCE.serverNetworkingIsMalformed = true;
+			return;
+		}
+		
+		// parse the command
+		String eventType;
+		try
+		{
+			eventType = byteBuf.readCharSequence(commandLength, StandardCharsets.UTF_8).toString();
+		}
+		catch (Exception e)
+		{
+			LOGGER.error("Server sent un-parsable command. Error: "+e.getMessage());
 			return;
 		}
 		
-		String eventType = byteBuf.readCharSequence(commandLength, StandardCharsets.UTF_8).toString();
 		switch (eventType)
 		{
 			case "ServerCommsEnabled":
-				LOGGER.info("Server supports DH protocol.");
+				LOGGER.info("Server supports DH multiverse protocol.");
 				ClientApi.INSTANCE.isServerCommunicationEnabled = true;
 				KEYED_CLIENT_LEVEL_MANAGER.setUseOverrideWrapper(true);
-				MC.executeOnRenderThread(() -> {
-					// Go ahead and unload the current world, because it may be wrong. We expect
-					// a followup WorldChanged event from the server soon anyways.
+				MC.executeOnRenderThread(() -> 
+				{
+					// 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());
 				});
 				break;
-				
-			case "WorldChanged":
-				short worldKeyLength = byteBuf.readShort();
-				if (worldKeyLength > 128) // TODO 128 should be put into a constant somewhere
+			
+			case "LevelChanged":
+				short levelKeyLength = byteBuf.readShort();
+				if (levelKeyLength < 1 || levelKeyLength > 128) // TODO 128 should be put into a constant somewhere
 				{
-					LOGGER.error("Server sent worldKey > 128");
-					this.serverIsMalformed = true;
+					LOGGER.error("Server [LevelChanged] command length ["+commandLength+"] outside the expected range of 1 to 128 (inclusive).");
+					this.serverNetworkingIsMalformed = true;
 					return;
 				}
 				
-				String worldKey = byteBuf.readCharSequence(worldKeyLength, StandardCharsets.UTF_8).toString();
-				if (!worldKey.matches("[a-zA-Z0-9_]+"))
+				String levelKey = byteBuf.readCharSequence(levelKeyLength, StandardCharsets.UTF_8).toString();
+				if (!levelKey.matches("[a-zA-Z0-9_]+"))
 				{
 					LOGGER.error("Server sent invalid world key name, and is being ignored.");
 					this.isServerCommunicationEnabled = false;
-					this.serverIsMalformed = true;
+					this.serverNetworkingIsMalformed = true;
 					return;
 				}
 				
-				LOGGER.info("Server sent world change event: " + worldKey);
+				LOGGER.info("Server level change event received, changing the level to ["+levelKey+"].");
 				MC.executeOnRenderThread(() -> {
 					if (MC.getWrappedClientWorld() != null)
 					{
 						this.clientLevelUnloadEvent((IClientLevelWrapper) MC.getWrappedClientWorld());
 					}
-					IServerKeyedClientLevel clientLevel = KEYED_CLIENT_LEVEL_MANAGER.getServerKeyedLevel(MC.getWrappedClientWorld(), worldKey);
+					IServerKeyedClientLevel clientLevel = KEYED_CLIENT_LEVEL_MANAGER.getServerKeyedLevel(MC.getWrappedClientWorld(), levelKey);
 					KEYED_CLIENT_LEVEL_MANAGER.setServerKeyedLevel(clientLevel);
-					this.serverLevelLoadEvent(clientLevel);
+					this.multiverseClientLevelLoadEvent(clientLevel);
 				});
 				break;
 		}
 	}
-
-
-
+	
+	
+	
 	//===========//
 	// rendering //
 	//===========//
-
+	
 	public void renderLods(IClientLevelWrapper levelWrapper, Mat4f mcModelViewMatrix, Mat4f mcProjectionMatrix, float partialTicks)
 	{
 		if (ModInfo.IS_DEV_BUILD && !this.configOverrideReminderPrinted && MC.playerExists())

core/src/main/java/com/seibel/distanthorizons/core/config/Config.java

@@ -741,9 +741,18 @@ public class Config
 						.comment(""
 								+ "If true Distant Horizons will attempt to communicate with the connected \n"
 								+ "server in order to improve multiverse support. \n"
-								+ "If you experience network issues when attempting to join a server, disable this option. \n"
+								+ "")
+						.build();
+				
+				public static ConfigEntry<Boolean> enableServerNetworking = new ConfigEntry.Builder<Boolean>()
+						.set(false)
+						.comment(""
+								+ "Attention: this is only for developers and hasn't been implemented.\n"
 								+ "\n"
-								+ "Note: this requires setup on the server in order to function. \n"
+								+ "If true Distant Horizons will attempt to communicate with the connected \n"
+								+ "server in order to load LODs outside your vanilla render distance. \n"
+								+ "\n"
+								+ "Note: This requires DH to be installed on the server in order to function. \n"
 								+ "")
 						.build();
 				
@@ -1116,10 +1125,6 @@ public class Config
 							.set(new ArrayList<String>(Arrays.asList("option 1", "option 2", "option 3")))
 							.build();
 					
-					public static ConfigEntry<Map<String, String>> mapTest = new ConfigEntry.Builder<Map<String, String>>()
-							.set(new HashMap<String, String>())
-							.build();
-					
 					public static ConfigCategory categoryTest = new ConfigCategory.Builder().set(CategoryTest.class).build();
 					
 					public static ConfigEntry<Integer> linkableTest = new ConfigEntry.Builder<Integer>()

core/src/main/java/com/seibel/distanthorizons/core/config/file/ConfigTypeConverters.java

@@ -85,7 +85,7 @@ public class ConfigTypeConverters {
                 jsonObject.add(mapObject.keySet().toArray()[i].toString(), mapObject.get(mapObject.keySet().toArray()[i]));
             }
 
-            return JsonFormat.fancyInstance().createWriter().writeToString(jsonObject);
+            return JsonFormat.minimalInstance().createWriter().writeToString(jsonObject);
         }
 
         @Override
@@ -94,7 +94,7 @@ public class ConfigTypeConverters {
 
             Config jsonObject = Config.inMemory();
             try {
-                JsonFormat.fancyInstance().createParser().parse(s, jsonObject, ParsingMode.REPLACE);
+                JsonFormat.minimalInstance().createParser().parse(s, jsonObject, ParsingMode.REPLACE);
             } catch (Exception e) { e.printStackTrace(); }
 
             return jsonObject.valueMap();

core/src/main/java/com/seibel/distanthorizons/core/config/types/ConfigEntry.java

@@ -7,8 +7,12 @@ import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance
 import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryPerformance;
 import com.seibel.distanthorizons.coreapi.interfaces.config.IConfigEntry;
 
+import java.time.temporal.Temporal;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
+
+import static com.electronwill.nightconfig.core.NullObject.NULL_OBJECT;
 
 /**
  * Use for making the config variables
@@ -40,6 +44,29 @@ public class ConfigEntry<T> extends AbstractConfigType<T, ConfigEntry<T>> implem
     private ConfigEntry(EConfigEntryAppearance appearance, T value, String comment, T min, T max, boolean allowApiOverride, EConfigEntryPerformance performance, ArrayList<IConfigListener> listenerList)
 	{
         super(appearance, value);
+		
+		// runtime check to make sure the config value is supported by NightConfig,
+		// unfortunately we can't do this type of check statically without Java 16
+		if (value == null)
+		{
+			throw new IllegalArgumentException("ConfigEntry setup failure. TOML doesn't support saving null values.");
+		}
+		// all of these types were taken from NightConfig's writing code
+		else if (!(value instanceof List)
+				&& !(value instanceof CharSequence) // String
+				&& !(value instanceof Enum)
+				&& !(value instanceof Temporal) // Date or DateTime
+				&& !(value instanceof Float || value instanceof Double)
+				&& !(value instanceof Number)
+				&& !(value instanceof Boolean)
+				// optional type that is specific to NightConfig, currently commented out so we aren't tied quite so tightly to NightConfig
+				//&& !(value instanceof Config) // NightConfig interface
+				)
+		{
+			throw new IllegalArgumentException("ConfigEntry setup failure. Value type ["+value.getClass()+"] is not supported by NightConfig.");
+		}
+		
+		
         this.defaultValue = value;
         this.comment = comment;
         this.min = min;

core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/RenderSourceFileHandler.java

@@ -72,7 +72,7 @@ public class RenderSourceFileHandler implements ILodRenderSourceProvider
 		{
 			LOGGER.warn("Unable to create render data folder, file saving may fail.");
 		}
-		fileHandlerThreadPool = ThreadUtil.makeSingleThreadPool("Render Source File Handler ["+this.level.getClientLevelWrapper().getDimensionType().getDimensionName()+"]");
+		this.fileHandlerThreadPool = ThreadUtil.makeSingleThreadPool("Render Source File Handler ["+this.level.getLevelWrapper().getDimensionType().getDimensionName()+"]");
 
 
 		this.threadPoolMsg = new F3Screen.NestedMessage(this::f3Log);

core/src/main/java/com/seibel/distanthorizons/core/file/structure/ClientOnlySaveStructure.java

@@ -109,7 +109,8 @@ public class ClientOnlySaveStructure extends AbstractSaveStructure
 		List<File> folders = this.getMatchingLevelFolders(level);
 		if (!folders.isEmpty() && folders.get(0) != null)
 		{
-			LOGGER.info("Default Sub Dimension set to: [" + LodUtil.shortenString(folders.get(0).getName(), 8) + "...]");
+			String folderName = folders.get(0).getName();
+			LOGGER.info("Default Sub Dimension set to: [" + LodUtil.shortenString(folderName, 8) + "...]");
 			return folders.get(0);
 		}
 		else

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

@@ -51,6 +51,12 @@ public class ClientLevelModule {
 
     public void clientTick()
     {
+	    // can be false if the level is unloading
+	    if (!MC_CLIENT.playerExists())
+	    {
+		    return;
+	    }
+		
         ClientRenderState clientRenderState = this.ClientRenderStateRef.get();
         if (clientRenderState == null)
         {
@@ -261,7 +267,9 @@ public class ClientLevelModule {
             this.renderSourceFileHandler = new RenderSourceFileHandler(fullDataSourceProvider, dhClientLevel, saveStructure);
 
             this.quadtree = new LodQuadTree(dhClientLevel, Config.Client.Advanced.Graphics.Quality.lodChunkRenderDistance.get() * LodUtil.CHUNK_WIDTH,
-                    MC_CLIENT.getPlayerBlockPos().x, MC_CLIENT.getPlayerBlockPos().z, this.renderSourceFileHandler);
+                    // initial position is (0,0) just in case the player hasn't loaded in yet, the tree will be moved once the level starts ticking
+		            0, 0, 
+		            this.renderSourceFileHandler);
 
             RenderBufferHandler renderBufferHandler = new RenderBufferHandler(this.quadtree);
             this.renderer = new LodRenderer(renderBufferHandler);

core/src/main/java/com/seibel/distanthorizons/core/network/NetworkClient.java

@@ -33,7 +33,7 @@ public class NetworkClient extends NetworkEventSource implements AutoCloseable
     }
 	
     private static final int FAILURE_RECONNECT_DELAY_SEC = 5;
-    private static final int FAILURE_RECONNECT_ATTEMPTS = 5;
+    private static final int FAILURE_RECONNECT_ATTEMPTS = 3;
 	
     // TODO move to payload of some sort
     private final InetSocketAddress address;

core/src/main/java/com/seibel/distanthorizons/core/render/LodRenderSection.java

@@ -348,7 +348,7 @@ public class LodRenderSection implements IDebugRenderable
 		}
 	}
 
-	public void disposeRenderData()
+	public synchronized void disposeRenderData() // synchronized is a band-aid solution to prevent a rare bug where the future isn't canceled in the right order
 	{
 		disposeRenderBuffer();
 		this.renderSource = null;

core/src/main/java/com/seibel/distanthorizons/core/util/objects/Pair.java

@@ -0,0 +1,23 @@
+package com.seibel.distanthorizons.core.util.objects;
+
+import java.util.Objects;
+
+/** A simple way to hold 2 objects together */
+public final class Pair<T, U>
+{
+	public final T first;
+	public final U second;
+	
+	public Pair(T first, U second)
+	{
+		this.second = second;
+		this.first = first;
+	}
+	
+	@Override
+	public String toString() { return "("+this.first+", "+this.second+")"; }
+	
+	@Override
+	public int hashCode() { return Objects.hash(this.first, this.second); }
+	
+}

core/src/main/java/com/seibel/distanthorizons/core/world/DhClientWorld.java

@@ -49,7 +49,7 @@ public class DhClientWorld extends AbstractDhWorld implements IDhClientWorld
         this.saveStructure = new ClientOnlySaveStructure();
         this.levels = new ConcurrentHashMap<>();
 
-		if (Config.Client.Advanced.Multiplayer.enableMultiverseNetworking.get())
+		if (Config.Client.Advanced.Multiplayer.enableServerNetworking.get())
 		{
 			// TODO server specific configs
 			this.networkClient = new NetworkClient(MC_CLIENT.getCurrentServerIp(), 25049);

core/src/main/resources/assets/distanthorizons/lang/en_us.json

@@ -259,9 +259,9 @@
   "distanthorizons.config.client.advanced.graphics.advancedGraphics.earthCurveRatio.@tooltip":
     "A value of 1 is equivalent to the curvature of Earth in real life.",
   "distanthorizons.config.client.advanced.graphics.advancedGraphics.lodBias":
-    "LOD Bias §6(Effects vanilla terrain)§r",
+    "LOD Bias §6(Affects vanilla terrain)§r",
   "distanthorizons.config.client.advanced.graphics.advancedGraphics.lodBias.@tooltip":
-    "Sets vanilla's lod bias value\nPlease press F3+T to reload the texture packs and apply this effect",
+    "Sets vanilla's lod bias value\nPlease press F3+T to reload the texture packs and apply this affect",
   
   
   "distanthorizons.config.client.advanced.worldGenerator":
@@ -300,6 +300,14 @@
     "Multiverse Required Similarity %",
   "distanthorizons.config.client.advanced.multiplayer.multiverseSimilarityRequiredPercent.@tooltip":
     "When matching worlds of the same dimension type the\ntested chunk(s) must be at least this percent the same\nin order to be considered the same world.\n\nNote: If you use portals to enter a dimension at two\ndifferent locations this system may think it is two different worlds.\n\n§61.0:§r the chunks must be identical.\n§60.5:§r the chunks must be half the same.\n§60.0:§r disables multi-dimension support\n     only one world will be used per dimension.",
+  "distanthorizons.config.client.advanced.multiplayer.enableMultiverseNetworking":
+    "Networked Multiverse Support",
+  "distanthorizons.config.client.advanced.multiplayer.enableMultiverseNetworking.@tooltip":
+    "If true Distant Horizons will attempt to communicate with the connected \nserver in order to improve multiverse support.",
+  "distanthorizons.config.client.advanced.multiplayer.enableServerNetworking":
+  "§4Unimplemented, Dev Use Only§r - Server Support",
+  "distanthorizons.config.client.advanced.multiplayer.enableServerNetworking.@tooltip":
+  "§6Attention:§r this is only for developers and hasn't been implemented. \n\nIf true Distant Horizons will attempt to communicate with the connected \nserver in order to load LODs outside your vanilla render distance. \n\nNote: This requires DH to be installed on the server in order to function.",