[Code style] [Bukkit] Refactor team packet data

NEZNAMY · Feb 23, 2025 · 1340e6d · 1340e6d
1 parent cba7655
commit 1340e6d
Show file tree

Hide file tree

Showing 3 changed files with 159 additions and 184 deletions.
diff --git a/bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/scoreboard/packet/PacketScoreboard.java b/bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/scoreboard/packet/PacketScoreboard.java
@@ -3,13 +3,13 @@
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.SneakyThrows;
+import me.neznamy.chat.component.TabComponent;
 import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
 import me.neznamy.tab.platforms.bukkit.nms.BukkitReflection;
-import me.neznamy.tab.platforms.bukkit.nms.converter.ComponentConverter;
 import me.neznamy.tab.platforms.bukkit.nms.PacketSender;
+import me.neznamy.tab.platforms.bukkit.nms.converter.ComponentConverter;
 import me.neznamy.tab.shared.Limitations;
 import me.neznamy.tab.shared.TAB;
-import me.neznamy.chat.component.TabComponent;
 import me.neznamy.tab.shared.platform.decorators.SafeScoreboard;
 import me.neznamy.tab.shared.util.ReflectionUtils;
 import org.jetbrains.annotations.NotNull;
@@ -18,6 +18,7 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.util.HashSet;
 import java.util.List;
 
 /**
@@ -152,23 +153,30 @@ public void removeScore(@NonNull Score score) {
 
     @Override
     @NotNull
+    @SneakyThrows
     public Object createTeam(@NonNull String name) {
-        return teamPacketData.createTeam(name);
+        return teamPacketData.createTeam.apply(name);
     }
 
     @Override
+    @SneakyThrows
     public void registerTeam(@NonNull Team team) {
-        packetSender.sendPacket(player, teamPacketData.registerTeam(team, player.getVersion()));
+        teamPacketData.ScoreboardTeam_players.set(team.getPlatformTeam(), new HashSet<>(team.getPlayers()));
+        teamPacketData.updateTeamData(team, player.getVersion());
+        packetSender.sendPacket(player, teamPacketData.newRegisterTeamPacket.apply(team, player.getVersion()));
     }
 
     @Override
+    @SneakyThrows
     public void unregisterTeam(@NonNull Team team) {
-        packetSender.sendPacket(player, teamPacketData.unregisterTeam(team));
+        packetSender.sendPacket(player, teamPacketData.newUnregisterTeamPacket.apply(team));
     }
 
     @Override
+    @SneakyThrows
     public void updateTeam(@NonNull Team team) {
-        packetSender.sendPacket(player, teamPacketData.updateTeam(team, player.getVersion()));
+        teamPacketData.updateTeamData(team, player.getVersion());
+        packetSender.sendPacket(player, teamPacketData.newUpdateTeamPacket.apply(team, player.getVersion()));
     }
 
     @Override