From f64c1810fb5cf5ba623c25dd0953456af47c90e1 Mon Sep 17 00:00:00 2001 From: Logan Date: Sat, 23 Aug 2025 11:37:09 -0500 Subject: [PATCH] feat: use bundle packet to bundle scoreboard packets --- .../me/lojosho/hibiscuscommons/nms/v1_20_R4/NMSPackets.java | 6 +++--- .../me/lojosho/hibiscuscommons/nms/v1_21_R1/NMSPackets.java | 6 +++--- .../me/lojosho/hibiscuscommons/nms/v1_21_R2/NMSPackets.java | 6 +++--- .../me/lojosho/hibiscuscommons/nms/v1_21_R3/NMSPackets.java | 6 +++--- .../me/lojosho/hibiscuscommons/nms/v1_21_R4/NMSPackets.java | 6 +++--- .../me/lojosho/hibiscuscommons/nms/v1_21_R5/NMSPackets.java | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/v1_20_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R4/NMSPackets.java b/v1_20_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R4/NMSPackets.java index c57da91..0ff338a 100644 --- a/v1_20_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R4/NMSPackets.java +++ b/v1_20_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R4/NMSPackets.java @@ -252,16 +252,16 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons. //Remove the Team (i assume so if it exists) ClientboundSetPlayerTeamPacket removeTeamPacket = ClientboundSetPlayerTeamPacket.createRemovePacket(team); - sendPacket(player, removeTeamPacket); //Creating the Team ClientboundSetPlayerTeamPacket createTeamPacket = ClientboundSetPlayerTeamPacket.createAddOrModifyPacket(team, true); - sendPacket(player, createTeamPacket); //Adding players to the team (You have to use the NPC's name, and add it to a list) ClientboundSetPlayerTeamPacket createPlayerTeamPacket = ClientboundSetPlayerTeamPacket.createMultiplePlayerPacket(team, new ArrayList() {{ add(name); add(player.getName()); }}, ClientboundSetPlayerTeamPacket.Action.ADD); - sendPacket(player, createPlayerTeamPacket); + + ClientboundBundlePacket bundlePacket = new ClientboundBundlePacket(List.of(removeTeamPacket, createTeamPacket, createPlayerTeamPacket)); + sendPacket(player, bundlePacket); } diff --git a/v1_21_R1/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R1/NMSPackets.java b/v1_21_R1/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R1/NMSPackets.java index 4013fb3..2c1076e 100644 --- a/v1_21_R1/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R1/NMSPackets.java +++ b/v1_21_R1/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R1/NMSPackets.java @@ -254,16 +254,16 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons. //Remove the Team (i assume so if it exists) ClientboundSetPlayerTeamPacket removeTeamPacket = ClientboundSetPlayerTeamPacket.createRemovePacket(team); - sendPacket(player, removeTeamPacket); //Creating the Team ClientboundSetPlayerTeamPacket createTeamPacket = ClientboundSetPlayerTeamPacket.createAddOrModifyPacket(team, true); - sendPacket(player, createTeamPacket); //Adding players to the team (You have to use the NPC's name, and add it to a list) ClientboundSetPlayerTeamPacket createPlayerTeamPacket = ClientboundSetPlayerTeamPacket.createMultiplePlayerPacket(team, new ArrayList() {{ add(name); add(player.getName()); }}, ClientboundSetPlayerTeamPacket.Action.ADD); - sendPacket(player, createPlayerTeamPacket); + + ClientboundBundlePacket bundlePacket = new ClientboundBundlePacket(List.of(removeTeamPacket, createTeamPacket, createPlayerTeamPacket)); + sendPacket(player, bundlePacket); } diff --git a/v1_21_R2/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R2/NMSPackets.java b/v1_21_R2/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R2/NMSPackets.java index 468a443..5a0bf0b 100644 --- a/v1_21_R2/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R2/NMSPackets.java +++ b/v1_21_R2/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R2/NMSPackets.java @@ -255,16 +255,16 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons. //Remove the Team (i assume so if it exists) ClientboundSetPlayerTeamPacket removeTeamPacket = ClientboundSetPlayerTeamPacket.createRemovePacket(team); - sendPacket(player, removeTeamPacket); //Creating the Team ClientboundSetPlayerTeamPacket createTeamPacket = ClientboundSetPlayerTeamPacket.createAddOrModifyPacket(team, true); - sendPacket(player, createTeamPacket); //Adding players to the team (You have to use the NPC's name, and add it to a list) ClientboundSetPlayerTeamPacket createPlayerTeamPacket = ClientboundSetPlayerTeamPacket.createMultiplePlayerPacket(team, new ArrayList() {{ add(name); add(player.getName()); }}, ClientboundSetPlayerTeamPacket.Action.ADD); - sendPacket(player, createPlayerTeamPacket); + + ClientboundBundlePacket bundlePacket = new ClientboundBundlePacket(List.of(removeTeamPacket, createTeamPacket, createPlayerTeamPacket)); + sendPacket(player, bundlePacket); } diff --git a/v1_21_R3/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R3/NMSPackets.java b/v1_21_R3/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R3/NMSPackets.java index cc5ca81..5548c47 100644 --- a/v1_21_R3/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R3/NMSPackets.java +++ b/v1_21_R3/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R3/NMSPackets.java @@ -255,16 +255,16 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons. //Remove the Team (i assume so if it exists) ClientboundSetPlayerTeamPacket removeTeamPacket = ClientboundSetPlayerTeamPacket.createRemovePacket(team); - sendPacket(player, removeTeamPacket); //Creating the Team ClientboundSetPlayerTeamPacket createTeamPacket = ClientboundSetPlayerTeamPacket.createAddOrModifyPacket(team, true); - sendPacket(player, createTeamPacket); //Adding players to the team (You have to use the NPC's name, and add it to a list) ClientboundSetPlayerTeamPacket createPlayerTeamPacket = ClientboundSetPlayerTeamPacket.createMultiplePlayerPacket(team, new ArrayList() {{ add(name); add(player.getName()); }}, ClientboundSetPlayerTeamPacket.Action.ADD); - sendPacket(player, createPlayerTeamPacket); + + ClientboundBundlePacket bundlePacket = new ClientboundBundlePacket(List.of(removeTeamPacket, createTeamPacket, createPlayerTeamPacket)); + sendPacket(player, bundlePacket); } diff --git a/v1_21_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R4/NMSPackets.java b/v1_21_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R4/NMSPackets.java index 55331f0..cd4fa45 100644 --- a/v1_21_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R4/NMSPackets.java +++ b/v1_21_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R4/NMSPackets.java @@ -255,16 +255,16 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons. //Remove the Team (i assume so if it exists) ClientboundSetPlayerTeamPacket removeTeamPacket = ClientboundSetPlayerTeamPacket.createRemovePacket(team); - sendPacket(player, removeTeamPacket); //Creating the Team ClientboundSetPlayerTeamPacket createTeamPacket = ClientboundSetPlayerTeamPacket.createAddOrModifyPacket(team, true); - sendPacket(player, createTeamPacket); //Adding players to the team (You have to use the NPC's name, and add it to a list) ClientboundSetPlayerTeamPacket createPlayerTeamPacket = ClientboundSetPlayerTeamPacket.createMultiplePlayerPacket(team, new ArrayList() {{ add(name); add(player.getName()); }}, ClientboundSetPlayerTeamPacket.Action.ADD); - sendPacket(player, createPlayerTeamPacket); + + ClientboundBundlePacket bundlePacket = new ClientboundBundlePacket(List.of(removeTeamPacket, createTeamPacket, createPlayerTeamPacket)); + sendPacket(player, bundlePacket); } diff --git a/v1_21_R5/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R5/NMSPackets.java b/v1_21_R5/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R5/NMSPackets.java index 3816fdf..61be102 100644 --- a/v1_21_R5/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R5/NMSPackets.java +++ b/v1_21_R5/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R5/NMSPackets.java @@ -252,16 +252,16 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons. //Remove the Team (i assume so if it exists) ClientboundSetPlayerTeamPacket removeTeamPacket = ClientboundSetPlayerTeamPacket.createRemovePacket(team); - sendPacket(player, removeTeamPacket); //Creating the Team ClientboundSetPlayerTeamPacket createTeamPacket = ClientboundSetPlayerTeamPacket.createAddOrModifyPacket(team, true); - sendPacket(player, createTeamPacket); //Adding players to the team (You have to use the NPC's name, and add it to a list) ClientboundSetPlayerTeamPacket createPlayerTeamPacket = ClientboundSetPlayerTeamPacket.createMultiplePlayerPacket(team, new ArrayList() {{ add(name); add(player.getName()); }}, ClientboundSetPlayerTeamPacket.Action.ADD); - sendPacket(player, createPlayerTeamPacket); + + ClientboundBundlePacket bundlePacket = new ClientboundBundlePacket(List.of(removeTeamPacket, createTeamPacket, createPlayerTeamPacket)); + sendPacket(player, bundlePacket); }