From e5672dc0970f0a3c555a5a106d2058bf6664f1a3 Mon Sep 17 00:00:00 2001
From: altrisi <altrisi.trillosierra@gmail.com>
Date: Wed, 4 Jan 2023 20:58:34 +0100
Subject: [PATCH] Simplify logger packet sending

---
 .../java/carpet/logging/HUDController.java    | 26 ++++++-------------
 src/main/java/carpet/logging/HUDLogger.java   |  2 +-
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/main/java/carpet/logging/HUDController.java b/src/main/java/carpet/logging/HUDController.java
index ff29e255..2fb4d03c 100644
--- a/src/main/java/carpet/logging/HUDController.java
+++ b/src/main/java/carpet/logging/HUDController.java
@@ -6,19 +6,15 @@ import carpet.helpers.TickSpeed;
 import carpet.logging.logHelpers.PacketCounter;
 import carpet.utils.Messenger;
 import carpet.utils.SpawnReporter;
-import io.netty.buffer.Unpooled;
-import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.ClientboundTabListPacket;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.util.Mth;
-import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -64,13 +60,11 @@ public class HUDController
         }
         player_huds.get(player).add(hudMessage);
     }
-    public static void clear_player(Player player)
+
+    public static void clearPlayer(ServerPlayer player)
     {
-        FriendlyByteBuf packetData = new FriendlyByteBuf(Unpooled.buffer()).writeComponent(Component.literal("")).writeComponent(Component.literal(""));
-        ClientboundTabListPacket packet = new ClientboundTabListPacket(packetData);
-        //((PlayerListHeaderS2CPacketMixin)packet).setHeader(new LiteralText(""));
-        //((PlayerListHeaderS2CPacketMixin)packet).setFooter(new LiteralText(""));
-        ((ServerPlayer)player).connection.send(packet);
+        ClientboundTabListPacket packet = new ClientboundTabListPacket(Component.literal(""), Component.literal(""));
+        player.connection.send(packet);
     }
 
 
@@ -113,14 +107,10 @@ public class HUDController
         if (force!= null) targets.addAll(force);
         for (ServerPlayer player: targets)
         {
-            FriendlyByteBuf packetData = new FriendlyByteBuf(Unpooled.buffer()).
-                    writeComponent(scarpet_headers.getOrDefault(player.getScoreboardName(), Component.literal(""))).
-                    writeComponent(Messenger.c(player_huds.getOrDefault(player, Collections.emptyList()).toArray(new Object[0])));
-            ClientboundTabListPacket packet = new ClientboundTabListPacket(packetData);
-
-            //PlayerListHeaderS2CPacket packet = new PlayerListHeaderS2CPacket();
-            //((PlayerListHeaderS2CPacketMixin)packet).setHeader(scarpet_headers.getOrDefault(player.getEntityName(), new LiteralText("")));
-            //((PlayerListHeaderS2CPacketMixin)packet).setFooter(Messenger.c(player_huds.getOrDefault(player, Collections.emptyList()).toArray(new Object[0])));
+            ClientboundTabListPacket packet = new ClientboundTabListPacket(
+                        scarpet_headers.getOrDefault(player.getScoreboardName(), Component.literal("")),
+                        Messenger.c(player_huds.getOrDefault(player, List.of()).toArray(new Object[0]))
+                    );
             player.connection.send(packet);
         }
     }
diff --git a/src/main/java/carpet/logging/HUDLogger.java b/src/main/java/carpet/logging/HUDLogger.java
index 686bbb81..57e1e641 100644
--- a/src/main/java/carpet/logging/HUDLogger.java
+++ b/src/main/java/carpet/logging/HUDLogger.java
@@ -39,7 +39,7 @@ public class HUDLogger extends Logger
     public void removePlayer(String playerName)
     {
         ServerPlayer player = playerFromName(playerName);
-        if (player != null) HUDController.clear_player(player);
+        if (player != null) HUDController.clearPlayer(player);
         super.removePlayer(playerName);
     }