- Memory Optimizations

- Thread safety

Author: Manwe03

src/main/java/com/manwe/dsl/dedicatedServer/proxy/back/packets/ProxyBoundContainerPacket.java

@@ -2,7 +2,6 @@
 
 import com.manwe.dsl.dedicatedServer.InternalPacketTypes;
 import com.manwe.dsl.dedicatedServer.proxy.back.listeners.ProxyListener;
-import io.netty.channel.embedded.EmbeddedChannel;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.network.*;
 import net.minecraft.network.codec.StreamCodec;
@@ -46,10 +45,8 @@ public ProxyBoundContainerPacket(FriendlyByteBuf buf) {
 
         this.playerId = buf.readUUID();
 
-        // 1. Leemos el resto de datos como un buffer aparte
         FriendlyByteBuf payloadBuf = new FriendlyByteBuf(buf.readBytes(buf.readableBytes()));
 
-        // 2. Los convertimos a paquetes PLAY
         List<Packet<? super ClientGamePacketListener>> list = new ArrayList<>();
         while (payloadBuf.isReadable()) {
             Packet<?> p = proto.codec().decode(payloadBuf);
@@ -71,9 +68,6 @@ private void write(FriendlyByteBuf buf) {
 
         buf.writeUUID(playerId);
 
-        EmbeddedChannel ch = new EmbeddedChannel();
-        Connection.configureInMemoryPipeline(ch.pipeline(), PacketFlow.CLIENTBOUND);
-
         ProtocolInfo<ClientGamePacketListener> proto = GameProtocols.CLIENTBOUND_TEMPLATE.bind(RegistryFriendlyByteBuf.decorator(currentServer.registryAccess(), ConnectionType.OTHER));
 
         // Serializamos el/los paquetes directamente con el codec de PLAY

src/main/java/com/manwe/dsl/dedicatedServer/worker/FakePlayerConnection.java

@@ -154,4 +154,9 @@ public void send(Packet<?> pPacket, @Nullable PacketSendListener pListener, bool
             DistributedServerLevels.LOGGER.warn("Worker tried to send an unknown packet", e);
         }
     }
+
+    @Override
+    public void handleDisconnection() {
+        super.handleDisconnection();
+    }
 }

src/main/java/com/manwe/dsl/dedicatedServer/worker/listeners/WorkerGamePacketListenerImpl.java

@@ -101,7 +101,6 @@ public void updateFakePlayers(){
     private boolean testOutsideWorkerBounds(ServerPlayer player) {
         int id = RegionRouter.computeWorkerId(player.getX(),player.getZ());
         if(id != DSLServerConfigs.WORKER_ID.get()){ //Transfer
-            //player.absMoveTo(nextX,nextY,nextZ,fY,fX);     //Possible malicious client packets, no checks
             workerListener.setTransfering(player.getUUID());
             workerListener.send(new ProxyBoundPlayerTransferPacket(player, id, preloadedWorkers));
             DistributedServerLevels.LOGGER.info("Transfer in progress block all incoming packets from ["+ player.getUUID()+"] to this worker");

src/main/java/com/manwe/dsl/dedicatedServer/worker/listeners/WorkerListenerImpl.java

@@ -220,7 +220,7 @@ private Connection generateFakePlayerConnection(ServerPlayer player, CommonListe
      */
     @Override
     public void handlePlayerDisconnect(WorkerBoundPlayerDisconnectPacket packet) {
-        //System.out.println("Player Disconnect Requested By Proxy Handling in worker");
+        System.out.println("Player Disconnect Requested By Proxy Handling in worker");
         UUID playerId = packet.getPlayerID();
         boolean fakePlayer = packet.isFakePlayer();
 
@@ -260,21 +260,25 @@ public void handlePlayerEndTransfer(WorkerBoundPlayerEndTransferPacket packet) {
 
     @Override
     public void handleFakePlayerMove(WorkerBoundFakePlayerMovePacket packet) {
-        ServerPlayer serverPlayer = server.getPlayerList().getPlayer(packet.getPlayerId());
-        if(serverPlayer instanceof ChunkLoadingFakePlayer fakePlayer){
-            fakePlayer.absMoveTo(packet.getPos().x,packet.getPos().y,packet.getPos().z);
-            //System.out.println("Fake Player absMoveTo: " + fakePlayer.position());
-        }
+        server.execute(()->{
+            ServerPlayer serverPlayer = server.getPlayerList().getPlayer(packet.getPlayerId());
+            if(serverPlayer instanceof ChunkLoadingFakePlayer fakePlayer){
+                fakePlayer.absMoveTo(packet.getPos().x,packet.getPos().y,packet.getPos().z);
+                //System.out.println("Fake Player absMoveTo: " + fakePlayer.position());
+            }
+        });
     }
 
     @Override
     public void handleFakePlayerInformation(WorkerBoundFakePlayerInformationPacket packet) {
-        ServerPlayer player = server.getPlayerList().getPlayer(packet.getPlayerId());
-        if(player instanceof ChunkLoadingFakePlayer fakePlayer){
-            fakePlayer.setFakePlayerRequestedViewDistance(packet.getViewDistance());
-        } else {
-            DistributedServerLevels.LOGGER.error("Tried to set view distance to a fake player that does not exists");
-        }
+        server.execute(()-> {
+            ServerPlayer player = server.getPlayerList().getPlayer(packet.getPlayerId());
+            if (player instanceof ChunkLoadingFakePlayer fakePlayer) {
+                fakePlayer.setFakePlayerRequestedViewDistance(packet.getViewDistance());
+            } else {
+                DistributedServerLevels.LOGGER.error("Tried to set view distance to a fake player that does not exists");
+            }
+        });
     }
 
     @Override
@@ -284,7 +288,9 @@ public void handleLevelInformation(WorkerBoundRequestLevelInformationPacket pack
 
     @Override
     public void handleEntityTransfer(WorkerBoundEntityTransferPacket packet) {
-        packet.placeEntity(server); //Add entity to level
+        server.execute(()-> {
+            packet.placeEntity(server); //Add entity to level
+        });
     }
 
     @Override

src/main/java/com/manwe/dsl/dedicatedServer/worker/packets/WorkerBoundContainerPacket.java

@@ -2,9 +2,6 @@
 
 import com.manwe.dsl.dedicatedServer.InternalPacketTypes;
 import com.manwe.dsl.dedicatedServer.worker.listeners.WorkerListener;
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.embedded.EmbeddedChannel;
-import io.netty.handler.flow.FlowControlHandler;
 import net.minecraft.network.*;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.network.protocol.Packet;
@@ -35,23 +32,13 @@ public WorkerBoundContainerPacket(UUID playerId, Packet<? extends ServerCommonPa
     private WorkerBoundContainerPacket(FriendlyByteBuf buf) {
         this.playerId = buf.readUUID();
 
-        int length = buf.readableBytes();
-        ByteBuf payloadRaw = buf.readBytes(length);
-
         MinecraftServer currentServer = ServerLifecycleHooks.getCurrentServer();
         if(currentServer == null) throw new RuntimeException("MinecraftServer is null");
         ProtocolInfo<ServerGamePacketListener> protocolInfo = GameProtocols.SERVERBOUND_TEMPLATE.bind(RegistryFriendlyByteBuf.decorator(currentServer.registryAccess(), ConnectionType.OTHER));
 
-        //TODO si se puede crear una sola instancia del EmbeddedChannel en vez de una por serialización y deserialización
-        EmbeddedChannel channel = new EmbeddedChannel(
-                new Varint21FrameDecoder(null),
-                new FlowControlHandler(),
-                new PacketDecoder<>(protocolInfo)
-        );
-        channel.writeInbound(payloadRaw);
-        this.payload = channel.readInbound();
-        if(payload == null) throw new RuntimeException("P->W Decode: Payload is null");
-        channel.finish();
+        FriendlyByteBuf payloadBuf = new FriendlyByteBuf(buf.readBytes(buf.readableBytes()));
+        this.payload = (Packet<? extends ServerCommonPacketListener>) protocolInfo.codec().decode(payloadBuf);
+
     }
 
     private void write(FriendlyByteBuf buf) {
@@ -61,16 +48,7 @@ private void write(FriendlyByteBuf buf) {
         if(currentServer == null) throw new RuntimeException("MinecraftServer is null");
         ProtocolInfo<ServerGamePacketListener> protocolInfo = GameProtocols.SERVERBOUND_TEMPLATE.bind(RegistryFriendlyByteBuf.decorator(currentServer.registryAccess(), ConnectionType.OTHER));
 
-        //TODO si se puede crear una sola instancia del EmbeddedChannel en vez de una por serialización y deserialización
-        EmbeddedChannel channel = new EmbeddedChannel(
-                new Varint21LengthFieldPrepender(),
-                new PacketEncoder<>(protocolInfo)
-        );
-        channel.writeOutbound(this.payload);
-        if(payload == null) throw new RuntimeException("P->W Encode: Payload is null");
-        ByteBuf encoded = channel.readOutbound();
-        buf.writeBytes(encoded);
-        channel.finish();
+        protocolInfo.codec().encode(buf, (Packet<? super ServerGamePacketListener>) this.payload);
     }
 
     public Packet<? extends ServerCommonPacketListener> getPayload(){