Incomplete

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

@@ -2,10 +2,7 @@ package com.seibel.distanthorizons.common;
 
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.arguments.ArgumentType;
-import com.mojang.brigadier.arguments.BoolArgumentType;
-import com.mojang.brigadier.arguments.DoubleArgumentType;
-import com.mojang.brigadier.arguments.IntegerArgumentType;
+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;
@@ -261,6 +258,7 @@ public abstract class AbstractModInitializer
 					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()))

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

@@ -8,6 +8,7 @@ import com.seibel.distanthorizons.coreapi.util.math.Vec3d;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.phys.Vec3;
 
+import java.net.SocketAddress;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentMap;
 
@@ -27,13 +28,13 @@ public class ServerPlayerWrapper implements IServerPlayerWrapper
 	{
 		this.serverPlayer = serverPlayer;
 	}
-
-	public UUID getUUID()
+	
+	@Override public UUID getUUID()
 	{
-		return serverPlayer.getUUID();
+		return this.serverPlayer.getUUID();
 	}
-
-	public IServerLevelWrapper getLevel()
+	
+	@Override public IServerLevelWrapper getLevel()
 	{
 		#if MC_VER < MC_1_20_1
 		return ServerLevelWrapper.getWrapper(this.serverPlayer.getLevel());
@@ -41,22 +42,30 @@ public class ServerPlayerWrapper implements IServerPlayerWrapper
 		return ServerLevelWrapper.getWrapper(this.serverPlayer.serverLevel());
 		#endif
     }
-
-    public Vec3d getPosition() {
-        Vec3 position = serverPlayer.position();
+	
+	@Override public Vec3d getPosition()
+	{
+		Vec3 position = this.serverPlayer.position();
         return new Vec3d(position.x, position.y, position.z);
     }
 	
-	public int getViewDistance() {
-		return serverPlayer.server.getPlayerList().getViewDistance();
+	@Override public int getViewDistance()
+	{
+		return this.serverPlayer.server.getPlayerList().getViewDistance();
 	}
-
-    public Object getWrappedMcObject() {
-        return serverPlayer;
+	
+	@Override public SocketAddress getRemoteAddress()
+	{
+		return this.serverPlayer.connection.getRemoteAddress();
+	}
+	
+	@Override public Object getWrappedMcObject()
+	{
+		return this.serverPlayer;
     }
 
     @Override
     public String toString() {
-        return "Wrapped{" + serverPlayer.toString() + "}";
+	    return "Wrapped{" + this.serverPlayer.toString() + "}";
     }
 }

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

@@ -8,7 +8,6 @@ import io.netty.buffer.ByteBufAllocator;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.function.Consumer;
 
@@ -18,7 +17,20 @@ public abstract class AbstractPluginPacketSender implements IPluginPacketSender
 	
 	
 	@Override
-	public final void sendPluginPacket(@Nullable IServerPlayerWrapper serverPlayer, Consumer<ByteBuf> encoder)
+	public final void sendPluginPacketClient(Consumer<ByteBuf> encoder)
+	{
+		FriendlyByteBuf buffer = this.createBuffer(encoder);
+		this.sendPluginPacketClient(buffer);
+	}
+	
+	@Override
+	public final void sendPluginPacketServer(IServerPlayerWrapper serverPlayer, Consumer<ByteBuf> encoder)
+	{
+		FriendlyByteBuf buffer = this.createBuffer(encoder);
+		this.sendPluginPacketServer((ServerPlayer) serverPlayer.getWrappedMcObject(), buffer);
+	}
+	
+	private FriendlyByteBuf createBuffer(Consumer<ByteBuf> encoder)
 	{
 		FriendlyByteBuf buffer = new FriendlyByteBuf(ByteBufAllocator.DEFAULT.buffer());
 		
@@ -28,15 +40,7 @@ public abstract class AbstractPluginPacketSender implements IPluginPacketSender
 		}
 		
 		encoder.accept(buffer);
-		
-		if (serverPlayer != null)
-		{
-			this.sendPluginPacketServer((ServerPlayer) serverPlayer.getWrappedMcObject(), buffer);
-		}
-		else
-		{
-			this.sendPluginPacketClient(buffer);
-		}
+		return buffer;
 	}
 	
 	protected boolean shouldAddForgePacketId()
@@ -44,7 +48,7 @@ public abstract class AbstractPluginPacketSender implements IPluginPacketSender
 		return false;
 	}
 	
-	protected abstract void sendPluginPacketServer(ServerPlayer serverPlayer, FriendlyByteBuf buffer);
 	protected abstract void sendPluginPacketClient(FriendlyByteBuf buffer);
+	protected abstract void sendPluginPacketServer(ServerPlayer serverPlayer, FriendlyByteBuf buffer);
 	
 }