Simplify logger packet sending

This commit is contained in:
altrisi committed 2023-01-04 20:58:34 +01:00
1 parent e71cbcafab
commit e5672dc097
2 files changed
+9 -19

No files matched your search

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