Additional network cleanup

sakura-ryoko · Jan 17, 2025 · b35846b · b35846b
1 parent 5c5268a
commit b35846b
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/src/main/java/fi/dy/masa/minihud/config/Configs.java b/src/main/java/fi/dy/masa/minihud/config/Configs.java
@@ -54,7 +54,7 @@ public static class Generic
         public static final ConfigBoolean       DONT_RESET_SEED_ON_DIMENSION_CHANGE = new ConfigBoolean("dontClearStoredSeedOnDimensionChange", true).apply(GENERIC_KEY);
         public static final ConfigBooleanHotkeyed ENTITY_DATA_SYNC                  = new ConfigBooleanHotkeyed("entityDataSync", false, "").apply(GENERIC_KEY);
         public static final ConfigBoolean       ENTITY_DATA_SYNC_BACKUP             = new ConfigBoolean("entityDataSyncBackup", false).apply(GENERIC_KEY);
-        public static final ConfigFloat         ENTITY_DATA_SYNC_CACHE_TIMEOUT      = new ConfigFloat("entityDataSyncCacheTimeout", 1.0f, 0.25f, 5.0f).apply(GENERIC_KEY);
+        public static final ConfigFloat         ENTITY_DATA_SYNC_CACHE_TIMEOUT      = new ConfigFloat("entityDataSyncCacheTimeout", 0.75f, 0.25f, 5.0f).apply(GENERIC_KEY);
         public static final ConfigBoolean       ENTITY_DATA_LOAD_NBT                = new ConfigBoolean("entityDataSyncLoadNbt", false).apply(GENERIC_KEY);
         //public static final ConfigBoolean       FIX_VANILLA_DEBUG_RENDERERS         = new ConfigBoolean("enableVanillaDebugRendererFix", true).apply(GENERIC_KEY);
         public static final ConfigDouble        FONT_SCALE                          = new ConfigDouble("fontScale", 0.5, 0.01, 100.0).apply(GENERIC_KEY);

diff --git a/src/main/java/fi/dy/masa/minihud/network/ServuxDebugHandler.java b/src/main/java/fi/dy/masa/minihud/network/ServuxDebugHandler.java
@@ -123,7 +123,7 @@ public <P extends IClientPayloadData> void encodeClientData(P data)
         {
             if (this.failures > MAX_FAILURES)
             {
-                MiniHUD.printDebug("encodeClientData(): encountered [{}] sendPayload failures, cancelling any Servux join attempt(s)", MAX_FAILURES);
+                MiniHUD.printDebug("ServuxDebugHandler#encodeClientData(): encountered [{}] sendPayload failures, cancelling any Servux join attempt(s)", MAX_FAILURES);
                 this.servuxRegistered = false;
                 ServuxDebugHandler.INSTANCE.unregisterPlayReceiver();
                 DebugDataManager.getInstance().onPacketFailure();

diff --git a/src/main/java/fi/dy/masa/minihud/network/ServuxDebugPacket.java b/src/main/java/fi/dy/masa/minihud/network/ServuxDebugPacket.java
@@ -87,7 +87,7 @@ public static ServuxDebugPacket ResponseS2CStart(@Nonnull NbtCompound nbt)
     public static ServuxDebugPacket ResponseS2CData(@Nonnull PacketByteBuf buffer)
     {
         var packet = new ServuxDebugPacket(Type.PACKET_S2C_NBT_RESPONSE_DATA);
-        packet.buffer = buffer;
+        packet.buffer = new PacketByteBuf(buffer.copy());
         packet.nbt = new NbtCompound();
         return packet;
     }

diff --git a/src/main/java/fi/dy/masa/minihud/network/ServuxEntitiesHandler.java b/src/main/java/fi/dy/masa/minihud/network/ServuxEntitiesHandler.java
@@ -161,7 +161,7 @@ else if (!ServuxEntitiesHandler.INSTANCE.sendPlayPayload(new ServuxEntitiesPacke
         {
             if (this.failures > MAX_FAILURES)
             {
-                MiniHUD.printDebug("encodeClientData(): encountered [{}] sendPayload failures, cancelling any Servux join attempt(s)", MAX_FAILURES);
+                MiniHUD.printDebug("ServuxEntitiesHandler#encodeClientData(): encountered [{}] sendPayload failures, cancelling any Servux join attempt(s)", MAX_FAILURES);
                 this.servuxRegistered = false;
                 ServuxEntitiesHandler.INSTANCE.unregisterPlayReceiver();
                 EntitiesDataManager.getInstance().onPacketFailure();

diff --git a/src/main/java/fi/dy/masa/minihud/network/ServuxEntitiesPacket.java b/src/main/java/fi/dy/masa/minihud/network/ServuxEntitiesPacket.java
@@ -101,7 +101,7 @@ public static ServuxEntitiesPacket ResponseS2CStart(@Nonnull NbtCompound nbt)
     public static ServuxEntitiesPacket ResponseS2CData(@Nonnull PacketByteBuf buffer)
     {
         var packet = new ServuxEntitiesPacket(Type.PACKET_S2C_NBT_RESPONSE_DATA);
-        packet.buffer = buffer;
+        packet.buffer = new PacketByteBuf(buffer.copy());
         packet.nbt = new NbtCompound();
         return packet;
     }
@@ -116,7 +116,7 @@ public static ServuxEntitiesPacket ResponseC2SStart(@Nonnull NbtCompound nbt)
     public static ServuxEntitiesPacket ResponseC2SData(@Nonnull PacketByteBuf buffer)
     {
         var packet = new ServuxEntitiesPacket(Type.PACKET_C2S_NBT_RESPONSE_DATA);
-        packet.buffer = buffer;
+        packet.buffer = new PacketByteBuf(buffer.copy());
         packet.nbt = new NbtCompound();
         return packet;
     }

diff --git a/src/main/java/fi/dy/masa/minihud/network/ServuxHudHandler.java b/src/main/java/fi/dy/masa/minihud/network/ServuxHudHandler.java
@@ -151,7 +151,7 @@ public <P extends IClientPayloadData> void encodeClientData(P data)
         {
             if (this.failures > MAX_FAILURES)
             {
-                MiniHUD.printDebug("encodeClientData(): encountered [{}] sendPayload failures, cancelling any Servux join attempt(s)", MAX_FAILURES);
+                MiniHUD.printDebug("ServuxHudHandler#encodeClientData(): encountered [{}] sendPayload failures, cancelling any Servux join attempt(s)", MAX_FAILURES);
                 this.servuxRegistered = false;
                 ServuxHudHandler.INSTANCE.unregisterPlayReceiver();
                 HudDataManager.getInstance().onPacketFailure();

diff --git a/src/main/java/fi/dy/masa/minihud/network/ServuxHudPacket.java b/src/main/java/fi/dy/masa/minihud/network/ServuxHudPacket.java
@@ -97,7 +97,7 @@ public static ServuxHudPacket ResponseS2CStart(@Nonnull NbtCompound nbt)
     public static ServuxHudPacket ResponseS2CData(@Nonnull PacketByteBuf buffer)
     {
         var packet = new ServuxHudPacket(Type.PACKET_S2C_NBT_RESPONSE_DATA);
-        packet.buffer = buffer;
+        packet.buffer = new PacketByteBuf(buffer.copy());
         packet.nbt = new NbtCompound();
         return packet;
     }

diff --git a/src/main/java/fi/dy/masa/minihud/network/ServuxStructuresHandler.java b/src/main/java/fi/dy/masa/minihud/network/ServuxStructuresHandler.java
@@ -113,7 +113,7 @@ public void decodeStructuresPacket(Identifier channel, ServuxStructuresPacket pa
                     this.servuxRegistered = true;
                 }
             }
-            // For backwards compat, only if hud_data isn't connected
+            // For backwards compat, only if hud_data isn't connected, or if Servux is too old
             case PACKET_S2C_SPAWN_METADATA ->
             {
                 if (HudDataManager.getInstance().hasServuxServer() == false)

diff --git a/src/main/java/fi/dy/masa/minihud/network/ServuxStructuresPacket.java b/src/main/java/fi/dy/masa/minihud/network/ServuxStructuresPacket.java
@@ -39,7 +39,7 @@ public ServuxStructuresPacket(Type type, @Nonnull PacketByteBuf packet)
     {
         this.packetType = type;
         this.nbt = new NbtCompound();
-        this.buffer = packet;
+        this.buffer = new PacketByteBuf(packet.copy());
     }
 
     @Override