From af2f0e85824b8774573bd4095e2bea65a8df4747 Mon Sep 17 00:00:00 2001
From: s809 <43530948+s809@users.noreply.github.com>
Date: Mon, 18 Mar 2024 21:37:58 +0500
Subject: [PATCH] Fix Forge

---
 .../core/network/plugin/PluginChannelHandler.java            | 5 +----
 .../com/seibel/distanthorizons/core/world/DhClientWorld.java | 1 -
 .../core/wrapperInterfaces/misc/IPluginPacketSender.java     | 4 +++-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/com/seibel/distanthorizons/core/network/plugin/PluginChannelHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/network/plugin/PluginChannelHandler.java
index b8c48a15d..94ccbf01a 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/network/plugin/PluginChannelHandler.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/network/plugin/PluginChannelHandler.java
@@ -11,7 +11,6 @@ import com.seibel.distanthorizons.core.network.protocol.plugin.PluginMessageEnco
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IPluginPacketSender;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper;
 import io.netty.buffer.ByteBuf;
-import io.netty.buffer.PooledByteBufAllocator;
 import org.apache.logging.log4j.LogManager;
 import org.jetbrains.annotations.Nullable;
 
@@ -73,9 +72,7 @@ public class PluginChannelHandler extends NetworkEventSource<PluginChannelMessag
 	}
 	public void sendMessage(@Nullable IServerPlayerWrapper serverPlayer, PluginChannelMessage message)
 	{
-		ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
-		this.messageEncoder.encode(message, buffer);
-		this.packetSender.sendPluginPacket(serverPlayer, buffer);
+		this.packetSender.sendPluginPacket(serverPlayer, buffer -> this.messageEncoder.encode(message, buffer));
 	}
 	
 	@Override
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/world/DhClientWorld.java b/core/src/main/java/com/seibel/distanthorizons/core/world/DhClientWorld.java
index c75c41192..b28da2556 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/world/DhClientWorld.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/world/DhClientWorld.java
@@ -26,7 +26,6 @@ import com.seibel.distanthorizons.core.level.DhClientLevel;
 import com.seibel.distanthorizons.core.level.IDhLevel;
 import com.seibel.distanthorizons.core.multiplayer.client.ClientNetworkState;
 import com.seibel.distanthorizons.core.network.netty.NettyClient;
-import com.seibel.distanthorizons.core.network.plugin.PluginChannelHandler;
 import com.seibel.distanthorizons.core.util.ThreadUtil;
 import com.seibel.distanthorizons.core.util.objects.EventLoop;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/misc/IPluginPacketSender.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/misc/IPluginPacketSender.java
index 3e51771f4..20321562b 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/misc/IPluginPacketSender.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/misc/IPluginPacketSender.java
@@ -4,8 +4,10 @@ import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindab
 import io.netty.buffer.ByteBuf;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.function.Consumer;
+
 public interface IPluginPacketSender extends IBindable
 {
-	void sendPluginPacket(@Nullable IServerPlayerWrapper serverPlayer, ByteBuf buffer);
+	void sendPluginPacket(@Nullable IServerPlayerWrapper serverPlayer, Consumer<ByteBuf> encoder);
 	
 }