merge server side and minor refactoring

common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java

@@ -1,18 +1,28 @@
 package com.seibel.distanthorizons.common;
 
+import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.arguments.*;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.mojang.brigadier.context.CommandContext;
 import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiAfterDhInitEvent;
 import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiBeforeDhInitEvent;
 import com.seibel.distanthorizons.common.wrappers.DependencySetup;
-import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftDedicatedServerWrapper;
+import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftServerWrapper;
+import com.seibel.distanthorizons.common.wrappers.misc.ServerPlayerWrapper;
 import com.seibel.distanthorizons.core.api.internal.SharedApi;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.config.ConfigBase;
 import com.seibel.distanthorizons.core.config.eventHandlers.presets.ThreadPresetConfigEventHandler;
+import com.seibel.distanthorizons.core.config.types.AbstractConfigType;
+import com.seibel.distanthorizons.core.config.types.ConfigEntry;
 import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.jar.ModJarInfo;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.network.messages.base.CodecCrashMessage;
+import com.seibel.distanthorizons.core.util.objects.Pair;
+import com.seibel.distanthorizons.core.world.DhServerWorld;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModAccessor;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModChecker;
 import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
@@ -23,9 +33,25 @@ import net.minecraft.server.dedicated.DedicatedServer;
 import org.apache.logging.log4j.Logger;
 
 import java.lang.invoke.MethodHandles;
+import java.util.HashMap;
+import java.util.Objects;
+import java.util.function.BiFunction;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.function.Supplier;
 
+import static com.mojang.brigadier.arguments.DoubleArgumentType.doubleArg;
+import static com.mojang.brigadier.arguments.IntegerArgumentType.integer;
+import static com.seibel.distanthorizons.core.network.messages.MessageRegistry.DEBUG_CODEC_CRASH_MESSAGE;
+import static net.minecraft.commands.Commands.argument;
+import static net.minecraft.commands.Commands.literal;
+
+#if MC_VER >= MC_1_19_2
+import net.minecraft.network.chat.Component;
+#else // < 1.19.2
+import net.minecraft.network.chat.TranslatableComponent;
+#endif
+
 /**
  * Base for all mod loader initializers 
  * and handles most setup. 
@@ -100,6 +126,8 @@ public abstract class AbstractModInitializer
 		
 		this.createServerProxy(true).registerEvents();
 		
+		this.initializeModCompat();
+		
 		LOGGER.info(ModInfo.READABLE_NAME + " Initialized");
 		ApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterDhInitEvent.class, null);
 		
@@ -107,7 +135,7 @@ public abstract class AbstractModInitializer
 		
 		this.subscribeServerStartingEvent(server -> 
 		{
-			MinecraftDedicatedServerWrapper.INSTANCE.dedicatedServer = (DedicatedServer)server;
+			MinecraftServerWrapper.INSTANCE.dedicatedServer = (DedicatedServer)server;
 			
 			this.initConfig();
 			this.postInit();
@@ -166,7 +194,136 @@ public abstract class AbstractModInitializer
 		LOGGER.info("Mod Post-Initialized");
 	}
 	
-	private void initCommands() { /* currently unimplemented */ }
+	@SuppressWarnings({"rawtypes", "unchecked"})
+	private void initCommands()
+	{
+		LiteralArgumentBuilder<CommandSourceStack> builder = literal("dhconfig")
+				.requires(source -> source.hasPermission(4));
+		
+		for (AbstractConfigType<?, ?> type : ConfigBase.INSTANCE.entries)
+		{
+			if (!(type instanceof ConfigEntry))
+			{
+				continue;
+			}
+			//noinspection PatternVariableCanBeUsed
+			ConfigEntry configEntry = (ConfigEntry) type;
+			if (configEntry.getServersideShortName() == null)
+			{
+				continue;
+			}
+			
+			Function<
+					Function<CommandContext<CommandSourceStack>, Object>,
+					Command<CommandSourceStack>
+					> makeConfigUpdater = (getter) -> (commandContext) -> {
+				Object value = getter.apply(commandContext);
+				
+				commandContext.getSource().sendSuccess(
+						#if MC_VER >= MC_1_20_1
+						() -> Component.literal("Changed the value of "+configEntry.getServersideShortName()+" to "+value),
+						#elif MC_VER >= MC_1_19_2
+						Component.literal("Changed the value of "+configEntry.getServersideShortName()+" to "+value),
+						#else
+						new TranslatableComponent("Changed the value of "+configEntry.getServersideShortName()+" to "+value),
+						#endif
+						true);
+				configEntry.set(value);
+				return 1;
+			};
+			
+			LiteralArgumentBuilder<CommandSourceStack> subcommand = literal(configEntry.getServersideShortName())
+					.executes((commandContext) -> {
+						#if MC_VER >= MC_1_20_1
+						commandContext.getSource().sendSuccess(() -> Component.literal("Current value of "+configEntry.getServersideShortName()+" is "+configEntry.get()), true);
+						#elif MC_VER >= MC_1_19_2
+						commandContext.getSource().sendSuccess(Component.literal("Current value of "+configEntry.getServersideShortName()+" is "+configEntry.get()), true);
+						#else // < 1.19.2
+						commandContext.getSource().sendSuccess(new TranslatableComponent("Current value of "+configEntry.getServersideShortName()+" is "+configEntry.get()), true);
+						#endif
+						return 1;
+					});
+			
+			if (Enum.class.isAssignableFrom(configEntry.getType()))
+			{
+				for (Object choice : configEntry.getType().getEnumConstants())
+				{
+					subcommand.then(
+							literal(choice.toString())
+									.executes(makeConfigUpdater.apply(c -> choice))
+					);
+				}
+			}
+			else
+			{
+				boolean setterAdded = false;
+				
+				for (java.util.Map.Entry<Class<?>, Pair<Supplier<ArgumentType<?>>, BiFunction<CommandContext<?>, String, ?>>> pair : new HashMap<
+						Class<?>,
+						Pair<
+								Supplier<ArgumentType<?>>,
+								BiFunction<CommandContext<?>, String, ?>>
+						>() {{
+					this.put(Integer.class, new Pair<>(() -> integer((int) configEntry.getMin(), (int) configEntry.getMax()), IntegerArgumentType::getInteger));
+					this.put(Double.class, new Pair<>(() -> doubleArg((double) configEntry.getMin(), (double) configEntry.getMax()), DoubleArgumentType::getDouble));
+					this.put(Boolean.class, new Pair<>(BoolArgumentType::bool, BoolArgumentType::getBool));
+					this.put(String.class, new Pair<>(StringArgumentType::string, StringArgumentType::getString));
+				}}.entrySet())
+				{
+					if (!pair.getKey().isAssignableFrom(configEntry.getType()))
+					{
+						continue;
+					}
+					
+					subcommand.then(argument("value", pair.getValue().first.get())
+							.executes(makeConfigUpdater.apply(c -> pair.getValue().second.apply(c, "value"))));
+					
+					setterAdded = true;
+					break;
+				}
+				
+				if (!setterAdded)
+				{
+					throw new RuntimeException("Config type of "+type.getName()+" is not supported: "+configEntry.getType().getSimpleName());
+				}
+			}
+			
+			builder.then(subcommand);
+		}
+		
+		this.commandDispatcher.register(builder);
+		
+		if (DEBUG_CODEC_CRASH_MESSAGE)
+		{
+			LiteralArgumentBuilder<CommandSourceStack> dhcrash = literal("dhcrash")
+					.requires(source -> source.hasPermission(4))
+					.then(literal("encode")
+							.executes(c -> {
+								assert SharedApi.getIDhServerWorld() != null;
+								((DhServerWorld) SharedApi.getIDhServerWorld()).remotePlayerConnectionHandler
+										#if MC_VER >= MC_1_19_2
+										.getConnectedPlayer(ServerPlayerWrapper.getWrapper(Objects.requireNonNull(c.getSource().getPlayer())))
+										#else
+										.getConnectedPlayer(ServerPlayerWrapper.getWrapper(Objects.requireNonNull(c.getSource().getPlayerOrException())))
+										#endif
+										.networkSession.sendMessage(new CodecCrashMessage(CodecCrashMessage.ECrashPhase.ENCODE));
+								return 1;
+							}))
+					.then(literal("decode")
+							.executes(c -> {
+								assert SharedApi.getIDhServerWorld() != null;
+								((DhServerWorld) SharedApi.getIDhServerWorld()).remotePlayerConnectionHandler
+										#if MC_VER >= MC_1_19_2
+										.getConnectedPlayer(ServerPlayerWrapper.getWrapper(Objects.requireNonNull(c.getSource().getPlayer())))
+										#else
+										.getConnectedPlayer(ServerPlayerWrapper.getWrapper(Objects.requireNonNull(c.getSource().getPlayerOrException())))
+										#endif
+										.networkSession.sendMessage(new CodecCrashMessage(CodecCrashMessage.ECrashPhase.DECODE));
+								return 1;
+							}));
+			this.commandDispatcher.register(dhcrash);
+		}
+	}
 	
 	
 	

common/src/main/java/com/seibel/distanthorizons/common/AbstractPluginPacketSender.java

@@ -0,0 +1,114 @@
+package com.seibel.distanthorizons.common;
+
+import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.logging.ConfigBasedLogger;
+import com.seibel.distanthorizons.core.network.event.internal.IncompatibleMessageInternalEvent;
+import com.seibel.distanthorizons.core.network.event.internal.ProtocolErrorInternalEvent;
+import com.seibel.distanthorizons.core.network.messages.MessageRegistry;
+import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage;
+import com.seibel.distanthorizons.core.network.messages.base.CloseReasonMessage;
+import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IPluginPacketSender;
+import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper;
+import com.seibel.distanthorizons.coreapi.ModInfo;
+import io.netty.buffer.ByteBufUtil;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.level.ServerPlayer;
+import org.apache.logging.log4j.LogManager;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.IOException;
+import java.util.Objects;
+
+public abstract class AbstractPluginPacketSender implements IPluginPacketSender
+{
+	private static final ConfigBasedLogger LOGGER = new ConfigBasedLogger(LogManager.getLogger(),
+			() -> Config.Client.Advanced.Logging.logNetworkEvent.get());
+	
+	#if MC_VER >= MC_1_21_1
+	public static final ResourceLocation WRAPPER_PACKET_RESOURCE = ResourceLocation.fromNamespaceAndPath(ModInfo.RESOURCE_NAMESPACE, ModInfo.WRAPPER_PACKET_PATH);
+	#else
+	public static final ResourceLocation WRAPPER_PACKET_RESOURCE = new ResourceLocation(ModInfo.RESOURCE_NAMESPACE, ModInfo.WRAPPER_PACKET_PATH);
+	#endif
+	
+	
+	@Override
+	public final void sendPluginServerPacket(IServerPlayerWrapper serverPlayer, AbstractNetworkMessage message)
+	{
+		this.sendPluginPacketServer((ServerPlayer) serverPlayer.getWrappedMcObject(), message);
+	}
+	
+	@Override
+	public abstract void sendPluginClientPacket(AbstractNetworkMessage message);
+	public abstract void sendPluginPacketServer(ServerPlayer serverPlayer, AbstractNetworkMessage message);
+	
+	@Nullable
+	public static AbstractNetworkMessage decodeMessage(FriendlyByteBuf in)
+	{
+		AbstractNetworkMessage message = null;
+		
+		try
+		{
+			in.markReaderIndex();
+			
+			int protocolVersion = in.readShort();
+			if (protocolVersion != ModInfo.PROTOCOL_VERSION)
+			{
+				return new IncompatibleMessageInternalEvent(protocolVersion);
+			}
+			
+			message = MessageRegistry.INSTANCE.createMessage(in.readUnsignedShort());
+			message.decode(in);
+			
+			if (in.isReadable())
+			{
+				throw new IOException("Buffer has not been fully read");
+			}
+			
+			return message;
+		}
+		catch (Exception e)
+		{
+			in.resetReaderIndex();
+			
+			LOGGER.error("Failed to decode message", e);
+			LOGGER.error("Buffer: ["+in+"]");
+			LOGGER.error("Buffer contents: ["+ByteBufUtil.hexDump(in)+"]");
+			
+			return new ProtocolErrorInternalEvent(e, message, true);
+		}
+		finally
+		{
+			// Prevent connection crashing if not entire buffer has been read
+			in.readerIndex(in.writerIndex());
+		}
+	}
+	
+	public static void encodeMessage(FriendlyByteBuf out, AbstractNetworkMessage message)
+	{
+		// This is intentionally unhandled, because errors related to this are unlikely to appear in wild
+		Objects.requireNonNull(message);
+		out.writeShort(ModInfo.PROTOCOL_VERSION);
+		
+		try
+		{
+			out.markWriterIndex();
+			out.writeShort(MessageRegistry.INSTANCE.getMessageId(message));
+			message.encode(out);
+		}
+		catch (Exception e)
+		{
+			LOGGER.error("Failed to encode message", e);
+			LOGGER.error("Message: ["+message+"]");
+			
+			message.getSession().tryHandleMessage(new ProtocolErrorInternalEvent(e, message, false));
+			
+			// Encode close reason message instead
+			out.resetWriterIndex();
+			message = new CloseReasonMessage("Internal error on other side");
+			out.writeShort(MessageRegistry.INSTANCE.getMessageId(message));
+			message.encode(out);
+		}
+	}
+	
+}

common/src/main/java/com/seibel/distanthorizons/common/CommonPacketPayload.java

@@ -0,0 +1,36 @@
+package com.seibel.distanthorizons.common;
+
+#if MC_VER >= MC_1_20_6
+
+import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public record CommonPacketPayload(@Nullable AbstractNetworkMessage message) implements CustomPacketPayload
+{
+	public static final Type<CommonPacketPayload> TYPE = new Type<>(AbstractPluginPacketSender.WRAPPER_PACKET_RESOURCE);
+	
+	@NotNull
+	@Override
+	public Type<? extends CustomPacketPayload> type() { return TYPE; }
+	
+	
+	public static class Codec implements StreamCodec<FriendlyByteBuf, CommonPacketPayload>
+	{
+		@NotNull
+		@Override
+		public CommonPacketPayload decode(@NotNull FriendlyByteBuf in)
+		{ return new CommonPacketPayload(AbstractPluginPacketSender.decodeMessage(in)); }
+		
+		@Override
+		public void encode(@NotNull FriendlyByteBuf out, CommonPacketPayload payload)
+		{ AbstractPluginPacketSender.encodeMessage(out, payload.message()); }
+		
+	}
+	
+}
+
+#endif

common/src/main/java/com/seibel/distanthorizons/common/wrappers/WrapperFactory.java

@@ -179,19 +179,9 @@ public class WrapperFactory implements IWrapperFactory
 			
 			
 			// level wrapper
-			ILevelWrapper levelWrapper;
-			if (level instanceof ServerLevel)
-			{
-				levelWrapper = ServerLevelWrapper.getWrapper((ServerLevel)level);
-			}
-			else if (level instanceof ClientLevel)
-			{
-				levelWrapper = ClientLevelWrapper.getWrapper((ClientLevel)level);
-			}
-			else
-			{
-				throw new ClassCastException(createChunkWrapperErrorMessage(objectArray));
-			}
+			ILevelWrapper levelWrapper = level.isClientSide()
+					? ClientLevelWrapper.getWrapper((ClientLevel)level)
+					: ServerLevelWrapper.getWrapper((ServerLevel)level);
 			
 			
 			return new ChunkWrapper(chunk, lightSource, levelWrapper);
@@ -215,7 +205,7 @@ public class WrapperFactory implements IWrapperFactory
 		expectedClassNames = new String[] 
 		{
 			ChunkAccess.class.getName(),
-			ServerLevel.class.getName() + "] or [" + ClientLevel.class.getName()
+			"[ServerLevel] or [ClientLevel]" // Classes are not referenced by names to avoid exception when one of them is missing
 		};
 		//#endif
 		

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java

@@ -54,7 +54,6 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.core.Registry;
 import net.minecraft.world.level.EmptyBlockGetter;
 #else
-import net.minecraft.client.Minecraft;
 import net.minecraft.world.level.Level;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.registries.Registries;
@@ -562,9 +561,8 @@ public class BlockStateWrapper implements IBlockStateWrapper
 			{
 				
 				#if MC_VER > MC_1_17_1
-				// use the given level if possible, otherwise try using the currently loaded one 
-				Level level = (levelWrapper != null ? (Level) levelWrapper.getWrappedMcObject() : null);
-				level = (level == null ? Minecraft.getInstance().level : level);
+				LodUtil.assertTrue(levelWrapper != null && levelWrapper.getWrappedMcObject() != null);
+				Level level = (Level)levelWrapper.getWrappedMcObject();
 				#endif
 				
 				Block block;

common/src/main/java/com/seibel/distanthorizons/common/wrappers/level/KeyedClientLevelManager.java

@@ -1,21 +1,19 @@
 package com.seibel.distanthorizons.common.wrappers.level;
 
-import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.core.level.IServerKeyedClientLevel;
 import com.seibel.distanthorizons.core.level.IKeyedClientLevelManager;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import net.minecraft.client.multiplayer.ClientLevel;
-
-import java.util.Objects;
+import org.jetbrains.annotations.Nullable;
 
 public class KeyedClientLevelManager implements IKeyedClientLevelManager
 {
 	public static final KeyedClientLevelManager INSTANCE = new KeyedClientLevelManager();
 	
 	/** This is set and managed by the ClientApi for servers with support for DH. */
-	private IServerKeyedClientLevel overrideWrapper = null;
-	private boolean useOverrideWrapper = false;
+	@Nullable
+	private IServerKeyedClientLevel serverKeyedLevel = null;
+	
 	
 	
 	//=============//
@@ -31,24 +29,20 @@ public class KeyedClientLevelManager implements IKeyedClientLevelManager
 	//======================//
 	
 	@Override
-	public void setServerKeyedLevel(IServerKeyedClientLevel clientLevel) { this.overrideWrapper = clientLevel; }
-	@Override
-	public IServerKeyedClientLevel getOverrideWrapper() { return this.overrideWrapper; }
+	@Nullable
+	public IServerKeyedClientLevel getServerKeyedLevel() { return this.serverKeyedLevel; }
 	
 	@Override
-	public IServerKeyedClientLevel getServerKeyedLevel(ILevelWrapper level, String serverLevelKey)
+	public IServerKeyedClientLevel setServerKeyedLevel(IClientLevelWrapper clientLevel, String levelKey)
 	{
-		Objects.requireNonNull(level);
-		Objects.requireNonNull(serverLevelKey);
-		return new ServerKeyedClientLevel((ClientLevel) level.getWrappedMcObject(), serverLevelKey);
+		IServerKeyedClientLevel keyedLevel = new ServerKeyedClientLevel((ClientLevel) clientLevel.getWrappedMcObject(), levelKey);
+		this.serverKeyedLevel = keyedLevel;
+		return keyedLevel;
 	}
 	
-	
 	@Override
-	public void setUseOverrideWrapper(boolean useOverrideWrapper) { this.useOverrideWrapper = useOverrideWrapper; }
+	public void clearKeyedLevel() { this.serverKeyedLevel = null; }
 	@Override
-	public boolean getUseOverrideWrapper() { return this.useOverrideWrapper; }
-	
-	
+	public boolean hasLevelSet() { return this.serverKeyedLevel != null; }
 	
 }

common/src/main/java/com/seibel/distanthorizons/common/wrappers/level/ServerKeyedClientLevel.java

@@ -18,4 +18,7 @@ public class ServerKeyedClientLevel extends ClientLevelWrapper implements IServe
 	@Override
 	public String getServerLevelKey() { return this.serverLevelKey; }
 	
+	@Override
+	public String getDimensionName() { return this.getServerLevelKey(); }
+
 }

common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java

@@ -44,6 +44,7 @@ import com.seibel.distanthorizons.core.pos.DhChunkPos;
 
 import net.minecraft.CrashReport;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.multiplayer.ServerData;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.core.BlockPos;
@@ -220,14 +221,19 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 	
 	@Nullable
 	@Override
-	public IClientLevelWrapper getWrappedClientLevel()
+	public IClientLevelWrapper getWrappedClientLevel() { return this.getWrappedClientLevel(false); }
+	
+	@Override
+	@Nullable
+	public IClientLevelWrapper getWrappedClientLevel(boolean bypassLevelKeyManager)
 	{
-		if (MINECRAFT.level == null)
+		ClientLevel level = MINECRAFT.level;
+		if (level == null)
 		{
 			return null;
 		}
 		
-		return ClientLevelWrapper.getWrapperIgnoringOverride(MINECRAFT.level);
+		return ClientLevelWrapper.getWrapper(level, bypassLevelKeyManager);
 	}
 	
 	@Override
@@ -266,7 +272,10 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 	public void sendChatMessage(String string)
 	{
 		LocalPlayer player = this.getPlayer();
-		if (player == null) return;
+		if (player == null)
+		{
+			return;
+		}
         #if MC_VER < MC_1_19_2
 		player.sendMessage(new TextComponent(string), getPlayer().getUUID());
         #else
@@ -306,4 +315,7 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 	@Override
 	public void executeOnRenderThread(Runnable runnable) { MINECRAFT.execute(runnable); }
 	
+	@Override
+	public boolean isWorldNew() { throw new UnsupportedOperationException("Not Implemented"); }
+	
 }

common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftServerWrapper.java

@@ -44,7 +44,7 @@ public class MinecraftServerWrapper implements IMinecraftSharedWrapper
 	}
 	
 	@Override
-	public boolean isWorldInitialized() 
+	public boolean isWorldNew() 
 	{ return this.dedicatedServer.getWorldData().overworldData().isInitialized(); }
 	
 }

common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/IMixinServerPlayer.java

@@ -0,0 +1,11 @@
+package com.seibel.distanthorizons.common.wrappers.misc;
+
+import net.minecraft.server.level.ServerLevel;
+import org.jetbrains.annotations.Nullable;
+
+public interface IMixinServerPlayer
+{
+	@Nullable
+	ServerLevel distantHorizons$getDimensionChangeDestination();
+	
+}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/ServerPlayerWrapper.java

@@ -1,55 +1,115 @@
 package com.seibel.distanthorizons.common.wrappers.misc;
 
+import com.google.common.base.Objects;
 import com.google.common.collect.MapMaker;
 import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
+import com.seibel.distanthorizons.core.util.math.Vec3d;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.network.ServerGamePacketListenerImpl;
+import net.minecraft.world.phys.Vec3;
 
-import java.util.UUID;
+import java.net.SocketAddress;
 import java.util.concurrent.ConcurrentMap;
 
+/**
+ * This wrapper transparently ensures that the underlying {@link ServerPlayer} is always valid,
+ * unless the player has disconnected.
+ */
 public class ServerPlayerWrapper implements IServerPlayerWrapper
 {
-	private static final ConcurrentMap<ServerPlayer, ServerPlayerWrapper>
-			serverPlayerWrapperMap = new MapMaker().weakKeys().makeMap();
+	private static final ConcurrentMap<ServerGamePacketListenerImpl, ServerPlayerWrapper> serverPlayerWrapperMap = new MapMaker().weakKeys().weakValues().makeMap();
 	
-	private final ServerPlayer serverPlayer;
+	private final ServerGamePacketListenerImpl connection;
 	
-	public static ServerPlayerWrapper getWrapper(ServerPlayer serverPlayer)
-	{
-		return serverPlayerWrapperMap.computeIfAbsent(serverPlayer, ServerPlayerWrapper::new);
-	}
 	
-	private ServerPlayerWrapper(ServerPlayer serverPlayer)
-	{
-		this.serverPlayer = serverPlayer;
-	}
 	
-	public UUID getUUID()
-	{
-		return serverPlayer.getUUID();
-	}
+	//=============//
+	// constructor //
+	//=============//
 	
+	public static ServerPlayerWrapper getWrapper(ServerPlayer serverPlayer) 
+	{ return serverPlayerWrapperMap.computeIfAbsent(serverPlayer.connection, ignored -> new ServerPlayerWrapper(serverPlayer.connection)); }
+	
+	private ServerPlayerWrapper(ServerGamePacketListenerImpl connection) { this.connection = connection; }
+	
+	
+	
+	//=========//
+	// getters //
+	//=========//
+	
+	private ServerPlayer getServerPlayer() { return this.connection.player; }
+	
+	@Override
+	public String getName() { return this.getServerPlayer().getName().getString(); }
+	
+	@Override
 	public IServerLevelWrapper getLevel()
 	{
-		#if MC_VER < MC_1_20_1
-		return ServerLevelWrapper.getWrapper(this.serverPlayer.getLevel());
-		#else
-		return ServerLevelWrapper.getWrapper(this.serverPlayer.serverLevel());
+		ServerLevel level = ((IMixinServerPlayer) this.getServerPlayer()).distantHorizons$getDimensionChangeDestination();
+		if (level == null)
+		{
+			#if MC_VER < MC_1_20_1
+			level = this.serverPlayer().getLevel();
+			#else
+			level = this.getServerPlayer().serverLevel();
+			#endif
+		}
+		
+		return ServerLevelWrapper.getWrapper(level);
+	}
+	
+	@Override
+	public Vec3d getPosition()
+	{
+		Vec3 position = this.getServerPlayer().position();
+		return new Vec3d(position.x, position.y, position.z);
+	}
+	
+	@Override
+	public int getViewDistance() { return this.getServerPlayer().server.getPlayerList().getViewDistance(); }
+	
+	@Override
+	public SocketAddress getRemoteAddress()
+	{
+		#if MC_VER >= MC_1_19_4
+		return this.getServerPlayer().connection.getRemoteAddress();
+		#else // < 1.19.4
+		return this.serverPlayer().connection.connection.getRemoteAddress();
 		#endif
 	}
 	
+	
+	
+	//================//
+	// base overrides //
+	//================//
+	
 	@Override
-	public Object getWrappedMcObject()
+	public Object getWrappedMcObject() { return this.getServerPlayer(); }
+	
+	@Override
+	public String toString() { return "Wrapped{" + this.getServerPlayer() + "}"; }
+	
+	@Override
+	public boolean equals(Object obj)
 	{
-		return this.serverPlayer();
+		if (this == obj)
+		{
+			return true;
+		}
+		if (!(obj instanceof ServerPlayerWrapper))
+		{
+			return false;
+		}
+		ServerPlayerWrapper that = (ServerPlayerWrapper) obj;
+		return Objects.equal(this.connection, that.connection);
 	}
 	
 	@Override
-	public String toString()
-	{
-		return "Wrapped{" + serverPlayer.toString() + "}";
-	}
+	public int hashCode() { return Objects.hashCode(this.connection); }
 	
 }

common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java

@@ -9,6 +9,7 @@ import com.seibel.distanthorizons.common.wrappers.block.ClientBlockStateColorCac
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.level.*;
+import com.seibel.distanthorizons.core.level.IServerKeyedClientLevel;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
@@ -69,23 +70,28 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	// wrapper logic //
 	//===============//
 	
+	public static IClientLevelWrapper getWrapper(@NotNull ClientLevel level) { return getWrapper(level, false); }
+	
 	@Nullable
-	public static IClientLevelWrapper getWrapper(@Nullable ClientLevel level)
+	public static IClientLevelWrapper getWrapper(@Nullable ClientLevel level, boolean bypassLevelKeyManager)
 	{
-		if (level == null)
+		if (!bypassLevelKeyManager)
 		{
-			return null;
+			if (level == null)
+			{
+				return null;
+			}
+			
+			// used if the client is connected to a server that defines the currently loaded level
+			IServerKeyedClientLevel overrideLevel = KEYED_CLIENT_LEVEL_MANAGER.getServerKeyedLevel();
+			if (overrideLevel != null)
+			{
+				return overrideLevel;
+			}
 		}
 		
-		// used if the client is connected to a server that defines the currently loaded level
-		if (KEYED_CLIENT_LEVEL_MANAGER.getUseOverrideWrapper())
-		{
-			return KEYED_CLIENT_LEVEL_MANAGER.getOverrideWrapper();
-		}
-		
-		return getWrapperIgnoringOverride(level);
+		return LEVEL_WRAPPER_BY_CLIENT_LEVEL.computeIfAbsent(level, ClientLevelWrapper::new);
 	}
-	public static IClientLevelWrapper getWrapperIgnoringOverride(@NotNull ClientLevel level) { return LEVEL_WRAPPER_BY_CLIENT_LEVEL.computeIfAbsent(level, ClientLevelWrapper::new); }
 	
 	@Nullable
 	@Override
@@ -118,8 +124,6 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 		}
 	}
 	
-	
-	
 	//====================//
 	// base level methods //
 	//====================//

common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/DimensionTypeWrapper.java

@@ -63,10 +63,14 @@ public class DimensionTypeWrapper implements IDimensionTypeWrapper
 	}
 	
 	
-	@Override
-	public String getDimensionName()
+	private String getDimensionName()
 	{
-		return dimensionType.effectsLocation().getPath();
+		#if MC_VER <= MC_1_16_5
+		// effectsLocation() is marked as client only, so using the backing field directly
+		return dimensionType.effectsLocation.getPath();
+		#else
+		return this.dimensionType.effectsLocation().getPath();
+		#endif
 	}
 	
 	@Override
@@ -87,7 +91,9 @@ public class DimensionTypeWrapper implements IDimensionTypeWrapper
 		return this.dimensionType;
 	}
 	
-	
+	// there's definitely a better way of doing this, but it should work well enough for now
+	@Override
+	public boolean isTheEnd() { return this.getDimensionName().equalsIgnoreCase("the_end"); }
 	
 	@Override
 	public boolean equals(Object obj)

common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ServerLevelWrapper.java

@@ -116,10 +116,18 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 	@Override
 	public IChunkWrapper tryGetChunk(DhChunkPos pos)
 	{
-		if (!level.hasChunk(pos.getX(), pos.getZ())) return null;
-		ChunkAccess chunk = level.getChunk(pos.getX(), pos.getZ(), ChunkStatus.FULL, false);
-		if (chunk == null) return null;
-		return new ChunkWrapper(chunk, level, this);
+		if (!this.level.hasChunk(pos.getX(), pos.getZ()))
+		{
+			return null;
+		}
+		
+		ChunkAccess chunk = this.level.getChunk(pos.getX(), pos.getZ(), ChunkStatus.FULL, false);
+		if (chunk == null)
+		{
+			return null;
+		}
+		
+		return new ChunkWrapper(chunk, this.level, this);
 	}
 	
 	@Override

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java

@@ -128,7 +128,7 @@ public class ChunkLoader
 		ChunkPos actualPos = new ChunkPos(tagLevel.getInt("xPos"), tagLevel.getInt("zPos"));
 		if (!Objects.equals(chunkPos, actualPos))
 		{
-			#if MC_VER > MC_1_17_1
+			#if MC_VER >= MC_1_18_2
 			if (actualPos.equals(ChunkPos.ZERO))
 			#else
 			if (actualPos.equals(ChunkPos.INVALID_CHUNK_POS))

common/src/main/resources/1_16.distanthorizons.accesswidener

@@ -47,4 +47,7 @@ accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite frames
 accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite framesY [I
 accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite mainImage [Lcom/mojang/blaze3d/platform/NativeImage;
 
+# DimensionTypeWrapper workaround
+accessible field net/minecraft/world/level/dimension/DimensionType effectsLocation Lnet/minecraft/resources/ResourceLocation;
+
 extendable class com/mojang/math/Matrix4f