From 3f14e5dfa5f244ebd6a7396adb3a7773f96400d1 Mon Sep 17 00:00:00 2001
From: s809 <43530948+s809@users.noreply.github.com>
Date: Tue, 17 Sep 2024 09:42:32 +0500
Subject: [PATCH] Fix naming of some things and comments

---
 .../common/AbstractPluginPacketSender.java               | 9 ++++-----
 coreSubProjects                                          | 2 +-
 .../distanthorizons/fabric/FabricPluginPacketSender.java | 4 ++--
 .../distanthorizons/forge/ForgePluginPacketSender.java   | 4 ++--
 .../neoforge/NeoforgePluginPacketSender.java             | 4 ++--
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/common/src/main/java/com/seibel/distanthorizons/common/AbstractPluginPacketSender.java b/common/src/main/java/com/seibel/distanthorizons/common/AbstractPluginPacketSender.java
index 85b4141a0..0d625e341 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/AbstractPluginPacketSender.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/AbstractPluginPacketSender.java
@@ -33,16 +33,15 @@ public abstract class AbstractPluginPacketSender implements IPluginPacketSender
 	
 	
 	@Override
-	public final void sendPluginServerPacket(IServerPlayerWrapper serverPlayer, AbstractNetworkMessage message)
+	public final void sendToClient(IServerPlayerWrapper serverPlayer, AbstractNetworkMessage message)
 	{
-		this.sendPluginPacketServer((ServerPlayer) serverPlayer.getWrappedMcObject(), message);
+		this.sendToClient((ServerPlayer) serverPlayer.getWrappedMcObject(), message);
 	}
+	public abstract void sendToClient(ServerPlayer serverPlayer, AbstractNetworkMessage message);
 	
 	@Override
-	public abstract void sendPluginClientPacket(AbstractNetworkMessage message);
-	public abstract void sendPluginPacketServer(ServerPlayer serverPlayer, AbstractNetworkMessage message);
+	public abstract void sendToServer(AbstractNetworkMessage message);
 	
-	@Nullable
 	public static AbstractNetworkMessage decodeMessage(FriendlyByteBuf in)
 	{
 		AbstractNetworkMessage message = null;
diff --git a/coreSubProjects b/coreSubProjects
index 79d226921..5369bf628 160000
--- a/coreSubProjects
+++ b/coreSubProjects
@@ -1 +1 @@
-Subproject commit 79d2269218e76e1b08de16a7bf59256f35be2ddf
+Subproject commit 5369bf628a199666e6f55426a571cedf0c9ab41a
diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricPluginPacketSender.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricPluginPacketSender.java
index 9a48e31c0..5a2970d71 100644
--- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricPluginPacketSender.java
+++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricPluginPacketSender.java
@@ -16,7 +16,7 @@ import net.minecraft.network.FriendlyByteBuf;
 public class FabricPluginPacketSender extends AbstractPluginPacketSender
 {
 	@Override
-	public void sendPluginClientPacket(AbstractNetworkMessage message)
+	public void sendToServer(AbstractNetworkMessage message)
 	{
 		#if MC_VER >= MC_1_20_6
 		ClientPlayNetworking.send(new CommonPacketPayload(message));
@@ -30,7 +30,7 @@ public class FabricPluginPacketSender extends AbstractPluginPacketSender
 	}
 	
 	@Override
-	public void sendPluginPacketServer(ServerPlayer serverPlayer, AbstractNetworkMessage message)
+	public void sendToClient(ServerPlayer serverPlayer, AbstractNetworkMessage message)
 	{
 		#if MC_VER >= MC_1_20_6
 		ServerPlayNetworking.send(serverPlayer, new CommonPacketPayload(message));
diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/ForgePluginPacketSender.java b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgePluginPacketSender.java
index b4c4f982f..6a26d48a5 100644
--- a/forge/src/main/java/com/seibel/distanthorizons/forge/ForgePluginPacketSender.java
+++ b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgePluginPacketSender.java
@@ -95,7 +95,7 @@ public class ForgePluginPacketSender extends AbstractPluginPacketSender
 	}
 	
 	@Override
-	public void sendPluginClientPacket(AbstractNetworkMessage message)
+	public void sendToServer(AbstractNetworkMessage message)
 	{
 		#if MC_VER >= MC_1_20_2
 		PLUGIN_CHANNEL.send(new MessageWrapper(message), PacketDistributor.SERVER.noArg());
@@ -105,7 +105,7 @@ public class ForgePluginPacketSender extends AbstractPluginPacketSender
 	}
 	
 	@Override
-	public void sendPluginPacketServer(ServerPlayer serverPlayer, AbstractNetworkMessage message)
+	public void sendToClient(ServerPlayer serverPlayer, AbstractNetworkMessage message)
 	{
 		#if MC_VER >= MC_1_20_2
 		PLUGIN_CHANNEL.send(new MessageWrapper(message), PacketDistributor.PLAYER.with(serverPlayer));
diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgePluginPacketSender.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgePluginPacketSender.java
index 44d85c370..456711821 100644
--- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgePluginPacketSender.java
+++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgePluginPacketSender.java
@@ -40,11 +40,11 @@ public class NeoforgePluginPacketSender extends AbstractPluginPacketSender
 	}
 	
 	@Override
-	public void sendPluginClientPacket(AbstractNetworkMessage message)
+	public void sendToServer(AbstractNetworkMessage message)
 	{ PacketDistributor.sendToServer(new CommonPacketPayload(message)); }
 	
 	@Override
-	public void sendPluginPacketServer(ServerPlayer serverPlayer, AbstractNetworkMessage message)
+	public void sendToClient(ServerPlayer serverPlayer, AbstractNetworkMessage message)
 	{ PacketDistributor.sendToPlayer(serverPlayer, new CommonPacketPayload(message)); }
 	
 }
\ No newline at end of file