26.1.2 support

bump version to 2.7.2 and add support for Spigot 26.1.1

.github/workflows/ci.yml

@@ -1,26 +1,24 @@
 name: CI
-
 on:
-  push:
-    branches: [ "main" ]
   pull_request:
-    branches: [ "main" ]
-  workflow_dispatch:
+  push:
+    branches:
+      - main
 
 jobs:
-  build:
+  ci:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-      - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v3
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
+      - uses: actions/checkout@v6
+      - uses: cachix/install-nix-action@v31
+      - name: Cache Gradle
+        uses: actions/cache@v4
         with:
-          java-version: 21
-          distribution: 'temurin'
-      - name: Build with Gradle
-        uses: gradle/gradle-build-action@v3.3.2
-        with:
-          arguments: build
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: ./gradlew build
+        run: nix develop .#jdk25 -i -c sh -c "./gradlew build"

.gitignore

@@ -2,4 +2,12 @@
 *.iml
 
 .gradle
-build/
+build/
+
+.classpath
+.project
+.settings/
+bin/
+
+test-env/servers
+test-env/cache

INSTALLATION.md

@@ -1,6 +1,6 @@
 # Installation
 
-Latest version: `2.1.9`
+Latest version: `2.7.4`
 
 ## Gradle
 
@@ -10,31 +10,16 @@ repositories {
 }
 
 dependencies {
-  val scoreboardLibraryVersion = "{VERSION HERE}"
-  implementation("net.megavex:scoreboard-library-api:$scoreboardLibraryVersion")
-  runtimeOnly("net.megavex:scoreboard-library-implementation:$scoreboardLibraryVersion")
-  implementation("net.megavex:scoreboard-library-extra-kotlin:$scoreboardLibraryVersion") // Kotlin specific extensions (optional)
+  implementation("net.megavex:scoreboard-library-api:2.7.4")
+  runtimeOnly("net.megavex:scoreboard-library-implementation:2.7.4")
 
-  // Add packet adapter implementations you want:
-  runtimeOnly("net.megavex:scoreboard-library-modern:$scoreboardLibraryVersion") // 1.17+
-  runtimeOnly("net.megavex:scoreboard-library-modern:$scoreboardLibraryVersion:mojmap") // Mojang mapped variant (only use if you know what you're doing!)
-  runtimeOnly("net.megavex:scoreboard-library-packetevents:$scoreboardLibraryVersion") // 1.8+
-  runtimeOnly("net.megavex:scoreboard-library-v1_8_R3:$scoreboardLibraryVersion") // 1.8
-
-  // If using the PacketEvents implementation, scoreboard-library expects PacketEvents to be in the classpath.
-  // Follow either of:
-  // - https://github.com/retrooper/packetevents/wiki/Depending-on-pre%E2%80%90built-PacketEvents
-  // - https://github.com/retrooper/packetevents/wiki/Shading-PacketEvents
-  // Example how to load PacketEvents in your plugin:
-  // https://github.com/retrooper/packetevents-example/blob/24f0c842d47362aef122b794dea29b8fee113fa3/thread-safe-listener/src/main/java/main/Main.java
-
-  // If targeting a Minecraft version without native Adventure support, add it as well:
-  implementation("net.kyori:adventure-platform-bukkit:4.0.1")
+  // If targeting a server version without native Adventure support, add it as well:
+  implementation("net.kyori:adventure-platform-bukkit:4.4.1")
 }
 ```
 
 You will need to shade these dependencies and relocate them with something
-like [Shadow](https://imperceptiblethoughts.com/shadow/).
+like [Shadow](https://gradleup.com/shadow/).
 
 ## Maven
 
@@ -43,59 +28,33 @@ like [Shadow](https://imperceptiblethoughts.com/shadow/).
   <dependency>
     <groupId>net.megavex</groupId>
     <artifactId>scoreboard-library-api</artifactId>
-    <version>{VERSION HERE}</version>
+    <version>2.7.4</version>
   </dependency>
   <dependency>
     <groupId>net.megavex</groupId>
     <artifactId>scoreboard-library-implementation</artifactId>
-    <version>{VERSION HERE}</version>
-    <scope>runtime</scope>
-  </dependency>
-  <!-- Kotlin specific extensions (optional) -->
-  <dependency>
-    <groupId>net.megavex</groupId>
-    <artifactId>scoreboard-library-extra-kotlin</artifactId>
-    <version>{VERSION HERE}</version>
-  </dependency>
-
-  <!-- Add packet adapter implementations you want: -->
-  <dependency>
-    <groupId>net.megavex</groupId>
-    <artifactId>scoreboard-library-modern</artifactId>
-    <version>{VERSION HERE}</version>
-    <scope>runtime</scope>
-    <!-- For a Mojang mapped variant, uncomment line below (only use if you know what you're doing!): -->
-    <!-- <classifier>mojmap</classifier> -->
-  </dependency>
-  <dependency>
-    <groupId>net.megavex</groupId>
-    <artifactId>scoreboard-library-packetevents</artifactId>
-    <version>{VERSION HERE}</version>
-    <scope>runtime</scope>
-  </dependency>
-  <dependency>
-    <groupId>net.megavex</groupId>
-    <artifactId>scoreboard-library-v1_8_R3</artifactId>
-    <version>{VERSION HERE}</version>
+    <version>2.7.4</version>
     <scope>runtime</scope>
   </dependency>
 
-  <!--
-    If using the PacketEvents implementation, scoreboard-library expects PacketEvents to be in the classpath.
-    Follow either of:
-    - https://github.com/retrooper/packetevents/wiki/Depending-on-pre-built-PacketEvents
-    - https://github.com/retrooper/packetevents/wiki/Shading-PacketEvents
-    Example how to load PacketEvents in your plugin:
-    https://github.com/retrooper/packetevents-example/blob/24f0c842d47362aef122b794dea29b8fee113fa3/thread-safe-listener/src/main/java/main/Main.java 
-    -->
-
-  <!-- If targeting a Minecraft version without native Adventure support, add it as well: -->
+  <!-- If targeting a server version without native Adventure support, add it as well: -->
   <dependency>
     <groupId>net.kyori</groupId>
     <artifactId>adventure-platform-bukkit</artifactId>
-    <version>4.0.1</version>
+    <version>4.4.1</version>
   </dependency>
 </dependencies>
 ```
 
 You will need to shade these dependencies and relocate them with [maven-shade-plugin](https://maven.apache.org/plugins/maven-shade-plugin/).
+
+## ViaVersion awareness
+
+For [ViaVersion awareness](https://github.com/vytskalt/scoreboard-library?tab=readme-ov-file#features) to be enabled, make sure to add `ViaVersion`
+to `softdepend` or `depend` of your `plugin.yml`:
+
+```yaml
+softdepend: ["ViaVersion"]
+# or
+depend: ["ViaVersion"]
+```

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2023 Megavex and Contributors
+Copyright (c) 2021-2026 vytskalt and Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -8,31 +8,28 @@ Join the [Discord](https://discord.gg/v7nmTDTW8W) or create an issue for support
 
 ## Features
 
-- Sidebars. Up to 42 characters (depends on the formatting) for 1.12.2 and below, no limit for newer versions
+- Sidebars. Up to 42 characters (depends on the formatting) for 1.12.2-, no limit for newer versions
 - Teams. Supports showing different properties (display name, prefix, entries etc.) of the same team to different
   players
 - Objectives.
 - Full support for new 1.20.4 features (score display names, custom score formats)
-- Doesn't require extra dependencies (assuming you're targeting modern versions of Paper)
+- No extra dependencies (assuming you're targeting modern versions of Paper)
 - Packet-level, meaning it works with other scoreboard plugins
 - Supports [Folia](https://github.com/PaperMC/Folia)
 - Fully async. All packet work is done asynchronously, so you can use the library from the main
   thread without sacrificing any performance
 - Automatically works with `TranslatableComponent`s. All components are translated using `GlobalTranslator` for
   each player's client locale and automatically update whenever the player changes it in their settings
+- ViaVersion awareness: automatically detects 1.12.2- on 1.13+ servers connected through ViaVersion and sends them
+  the optimal packets to maximise sidebar line lengths
 
-## Available Packet Adapters
+## Supported server versions
 
-- **modern.** Supports 1.17-1.20.6. Can take advantage of [Paper](https://papermc.io)'s native adventure support to be more efficient.
-- **PacketEvents.** Supports 1.8+. Requires [PacketEvents 2.0](https://github.com/retrooper/packetevents/tree/2.0) to be shaded or installed as a plugin.
-- **1.8.8.**
-
-> [!NOTE]  
-> You can add multiple packet adapters, the best one will automatically be picked depending on the server version.
+All Paper and Spigot versions from 1.7.10 to 26.1.2 are natively supported.
 
 ## Installation
 
-See installation instructions [here](https://github.com/MegavexNetwork/scoreboard-library/blob/dev/2.0/INSTALLATION.md)
+See installation instructions [here](https://github.com/vytskalt/scoreboard-library/blob/main/INSTALLATION.md)
 
 ### Getting started
 
@@ -41,9 +38,9 @@ ScoreboardLibrary scoreboardLibrary;
 try {
   scoreboardLibrary = ScoreboardLibrary.loadScoreboardLibrary(plugin);
 } catch (NoPacketAdapterAvailableException e) {
-  // If no packet adapter was found, you can fallback to the no-op implementation:
+  // If server version is not yet supported, you can fallback to the no-op implementation:
   scoreboardLibrary = new NoopScoreboardLibrary();
-  plugin.getLogger().warning("No scoreboard packet adapter available!");
+  plugin.getLogger().warning("Server version unsupported, scoreboard functionality will not be visible!");
 }
 
 // On plugin shutdown:

api/build.gradle.kts

@@ -1,3 +1,8 @@
 plugins {
   id("net.megavex.scoreboardlibrary.base-conventions")
 }
+
+dependencies {
+  compileOnlyApi(libs.bundles.adventure)
+  compileOnly(libs.spigotApi)
+}

api/src/main/java/net/megavex/scoreboardlibrary/api/ScoreboardLibrary.java

@@ -5,6 +5,7 @@ import net.megavex.scoreboardlibrary.api.noop.NoopScoreboardLibrary;
 import net.megavex.scoreboardlibrary.api.objective.ObjectiveManager;
 import net.megavex.scoreboardlibrary.api.sidebar.Sidebar;
 import net.megavex.scoreboardlibrary.api.team.TeamManager;
+import org.apache.commons.lang.RandomStringUtils;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.ApiStatus;
@@ -26,7 +27,7 @@ public interface ScoreboardLibrary {
    * Creates an instance of {@link ScoreboardLibrary}.
    *
    * @param plugin your plugin instance
-   * @throws NoPacketAdapterAvailableException if there is no packet adapter available for the current server version
+   * @throws NoPacketAdapterAvailableException if server version is not supported
    */
   static @NotNull ScoreboardLibrary loadScoreboardLibrary(@NotNull Plugin plugin) throws NoPacketAdapterAvailableException {
     Class<?> implClass;
@@ -56,7 +57,7 @@ public interface ScoreboardLibrary {
    * @return newly created sidebar
    */
   default @NotNull Sidebar createSidebar() {
-    return createSidebar(Sidebar.MAX_LINES, null);
+    return createSidebar(Sidebar.MAX_LINES);
   }
 
   /**
@@ -79,7 +80,21 @@ public interface ScoreboardLibrary {
    *                 or null if the locale should depend on the player
    * @return newly created sidebar
    */
-  @NotNull Sidebar createSidebar(@Range(from = 1, to = Integer.MAX_VALUE) int maxLines, @Nullable Locale locale);
+  default @NotNull Sidebar createSidebar(@Range(from = 1, to = Integer.MAX_VALUE) int maxLines, @Nullable Locale locale) {
+    return createSidebar(maxLines, locale, RandomStringUtils.randomAlphanumeric(16));
+  }
+
+  /**
+   * Creates a new {@link Sidebar}.
+   *
+   * @param maxLines max amount of lines the sidebar will have.
+   *                 Note that vanilla clients can only display at most {@value Sidebar#MAX_LINES}
+   * @param locale   locale which will be used for translating {@link net.kyori.adventure.text.TranslatableComponent}s,
+   *                 or null if the locale should depend on the player
+   * @param objectiveName objective name the sidebar should use
+   * @return newly created sidebar
+   */
+  @NotNull Sidebar createSidebar(@Range(from = 1, to = Integer.MAX_VALUE) int maxLines, @Nullable Locale locale, @NotNull String objectiveName);
 
   /**
    * Creates a new {@link TeamManager}.

api/src/main/java/net/megavex/scoreboardlibrary/api/noop/NoopObjectiveManager.java

@@ -7,6 +7,7 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 
 class NoopObjectiveManager implements ObjectiveManager {
   private final Map<String, ScoreboardObjective> objectives = new HashMap<>();
@@ -42,6 +43,12 @@ class NoopObjectiveManager implements ObjectiveManager {
     return players.remove(player);
   }
 
+  @Override
+  public CompletableFuture<Void> removePlayerFuture(@NotNull Player player) {
+    players.remove(player);
+    return CompletableFuture.completedFuture(null);
+  }
+
   @Override
   public void close() {
     isClosed = true;

api/src/main/java/net/megavex/scoreboardlibrary/api/noop/NoopScoreboardLibrary.java

@@ -19,9 +19,9 @@ public final class NoopScoreboardLibrary implements ScoreboardLibrary {
   private boolean closed = false;
 
   @Override
-  public @NotNull Sidebar createSidebar(@Range(from = 1, to = Sidebar.MAX_LINES) int maxLines, @Nullable Locale locale) {
+  public @NotNull Sidebar createSidebar(@Range(from = 1, to = Integer.MAX_VALUE) int maxLines,  @Nullable Locale locale, @NotNull String objectiveName) {
     checkClosed();
-    return new NoopSidebar(maxLines, locale);
+    return new NoopSidebar(maxLines, objectiveName, locale);
   }
 
   @Override

api/src/main/java/net/megavex/scoreboardlibrary/api/noop/NoopScoreboardObjective.java

@@ -52,6 +52,10 @@ public class NoopScoreboardObjective implements ScoreboardObjective {
     this.defaultScoreFormat = defaultScoreFormat;
   }
 
+  @Override
+  public void refreshProperties() {
+  }
+
   @Override
   public @Nullable ObjectiveScore scoreInfo(@NotNull String entry) {
     return scores.get(entry);
@@ -68,4 +72,8 @@ public class NoopScoreboardObjective implements ScoreboardObjective {
     scores.remove(entry);
     return this;
   }
+
+  @Override
+  public void refreshScore(@NotNull String entry) {
+  }
 }

api/src/main/java/net/megavex/scoreboardlibrary/api/noop/NoopSidebar.java

@@ -17,14 +17,16 @@ import static net.kyori.adventure.text.Component.empty;
 class NoopSidebar implements Sidebar {
   private final Set<Player> players = new HashSet<>();
   private final int maxLines;
+  private final String objectiveName;
   private final Locale locale;
   private final Component[] lines;
   private Component title = empty();
   private boolean closed;
 
-  NoopSidebar(int maxLines, @Nullable Locale locale) {
+  NoopSidebar(int maxLines, String objectiveName, @Nullable Locale locale) {
     this.maxLines = maxLines;
     this.locale = locale;
+    this.objectiveName = objectiveName;
     this.lines = new Component[maxLines];
   }
 
@@ -62,6 +64,11 @@ class NoopSidebar implements Sidebar {
     return maxLines;
   }
 
+  @Override
+  public @NotNull String objectiveName() {
+    return objectiveName;
+  }
+
   @Override
   public @Nullable Locale locale() {
     return locale;
@@ -74,6 +81,10 @@ class NoopSidebar implements Sidebar {
     lines[index] = value == null ? null : value.asComponent();
   }
 
+  @Override
+  public void refreshLine(@Range(from = 0, to = Integer.MAX_VALUE - 1) final int index) {
+
+  }
   @Override
   public @Nullable Component line(int line) {
     checkLineBounds(line);
@@ -93,6 +104,11 @@ class NoopSidebar implements Sidebar {
     this.title = title.asComponent();
   }
 
+  @Override
+  public void refreshTitle() {
+
+  }
+
   private void checkClosed() {
     if (closed) {
       throw new IllegalStateException("NoopSidebar is closed");

api/src/main/java/net/megavex/scoreboardlibrary/api/noop/NoopTeamDisplay.java

@@ -48,11 +48,21 @@ class NoopTeamDisplay implements TeamDisplay {
     return entries.add(entry);
   }
 
+  @Override
+  public boolean addEntries(@NotNull final Collection<String> entries) {
+    return this.entries.addAll(entries);
+  }
+
   @Override
   public boolean removeEntry(@NotNull String entry) {
     return entries.remove(entry);
   }
 
+  @Override
+  public boolean removeEntries(@NotNull final Collection<String> entries) {
+    return this.entries.removeAll(entries);
+  }
+
   @Override
   public @NotNull Component displayName() {
     return displayName;
@@ -140,4 +150,8 @@ class NoopTeamDisplay implements TeamDisplay {
     this.playerColor = playerColor;
     return this;
   }
+
+  @Override
+  public void refresh() {
+  }
 }

api/src/main/java/net/megavex/scoreboardlibrary/api/noop/NoopTeamManager.java

@@ -9,6 +9,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
@@ -48,6 +49,12 @@ class NoopTeamManager implements TeamManager {
     return true;
   }
 
+  @Override
+  public CompletableFuture<Void> removePlayerFuture(@NotNull Player player) {
+    this.removePlayer(player);
+    return CompletableFuture.completedFuture(null);
+  }
+
   @Override
   public @NotNull Collection<ScoreboardTeam> teams() {
     return closed ? Collections.emptySet() : Collections.unmodifiableCollection(teams.values());
@@ -80,6 +87,7 @@ class NoopTeamManager implements TeamManager {
       validateTeamDisplay(team, teamDisplay);
       team.displayMap().put(player, teamDisplay);
     }
+    teams.put(name, team);
 
     return team;
   }

api/src/main/java/net/megavex/scoreboardlibrary/api/objective/ObjectiveDisplaySlot.java

@@ -24,6 +24,9 @@ public interface ObjectiveDisplaySlot {
     return BelowName.INSTANCE;
   }
 
+  /**
+   * @since Minecraft 1.8
+   */
   static @NotNull TeamSidebar teamSidebar(@NotNull NamedTextColor teamColor) {
     Preconditions.checkNotNull(teamColor);
     return new TeamSidebar(teamColor);

api/src/main/java/net/megavex/scoreboardlibrary/api/objective/ObjectiveManager.java

@@ -5,6 +5,7 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * Represents a group of {@link ScoreboardObjective}s.
@@ -85,6 +86,14 @@ public interface ObjectiveManager {
     }
   }
 
+  /**
+   * Removes a viewer from this ObjectiveManager.
+   *
+   * @param player viewer to remove
+   * @return future that will be completed once all removal packets have been sent in an async task
+   */
+  CompletableFuture<Void> removePlayerFuture(@NotNull Player player);
+
   /**
    * Closes this ObjectiveManager.
    * This must be called once you no longer need this ObjectiveManager to prevent a memory leak.

api/src/main/java/net/megavex/scoreboardlibrary/api/objective/ScoreboardObjective.java

@@ -49,6 +49,11 @@ public interface ScoreboardObjective {
    */
   void defaultScoreFormat(@Nullable ScoreFormat defaultScoreFormat);
 
+  /**
+   * Refreshes the objective's {@link #value()} and {@link #defaultScoreFormat()}, re-rendering any {@link net.kyori.adventure.text.TranslatableComponent}s.
+   */
+  void refreshProperties();
+
   /**
    * Get the score for an entry, or null if the entry has no score.
    *
@@ -141,4 +146,11 @@ public interface ScoreboardObjective {
    * @param entry entry to remove score of
    */
   @NotNull ScoreboardObjective removeScore(@NotNull String entry);
+
+  /**
+   * Refreshes a score, re-rendering any {@link net.kyori.adventure.text.TranslatableComponent}s inside its format.
+   *
+   * @param entry entry to refresh score of
+   */
+  void refreshScore(@NotNull String entry);
 }

api/src/main/java/net/megavex/scoreboardlibrary/api/sidebar/Sidebar.java

@@ -1,18 +1,17 @@
 package net.megavex.scoreboardlibrary.api.sidebar;
 
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.ComponentLike;
 import net.megavex.scoreboardlibrary.api.ScoreboardLibrary;
 import net.megavex.scoreboardlibrary.api.objective.ScoreFormat;
+import java.util.Collection;
+import java.util.Locale;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.ComponentLike;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Range;
 
-import java.util.Collection;
-import java.util.Locale;
-
 /**
  * Represents a sidebar.
  * To get an instance of this interface, use {@link ScoreboardLibrary#createSidebar()}.
@@ -31,7 +30,13 @@ public interface Sidebar {
   /**
    * @return max amount of lines this sidebar can have
    */
-  @Range(from = 1, to = Integer.MAX_VALUE) int maxLines();
+  @Range(from = 1, to = Integer.MAX_VALUE)
+  int maxLines();
+
+  /**
+   * @return objective name used by this sidebar
+   */
+  @NotNull String objectiveName();
 
   /**
    * @return locale which is used for translating {@link net.kyori.adventure.text.TranslatableComponent}s,
@@ -85,6 +90,22 @@ public interface Sidebar {
     }
   }
 
+  /**
+   * Refreshes a specific line, re-rendering any {@link net.kyori.adventure.text.TranslatableComponent}s.
+   *
+   * @param index line index
+   */
+  void refreshLine(@Range(from = 0, to = Integer.MAX_VALUE - 1) int index);
+
+  /**
+   * Refreshes all lines in this sidebar, re-rendering any {@link net.kyori.adventure.text.TranslatableComponent}s.
+   */
+  default void refreshLines() {
+    for (int i = 0; i < maxLines(); i++) {
+      refreshLine(i);
+    }
+  }
+
   // Title
 
   /**
@@ -99,6 +120,11 @@ public interface Sidebar {
    */
   void title(@NotNull ComponentLike title);
 
+  /**
+   * Refresh the title of the sidebar, re-rendering any {@link net.kyori.adventure.text.TranslatableComponent}s.
+   */
+  void refreshTitle();
+
   // Players
 
   /**

api/src/main/java/net/megavex/scoreboardlibrary/api/sidebar/component/ComponentSidebarLayout.java

@@ -78,7 +78,7 @@ public final class ComponentSidebarLayout {
     public void drawLine(@NotNull ComponentLike line, @Nullable ScoreFormat scoreFormat) {
       Preconditions.checkNotNull(line);
 
-      if (index < Sidebar.MAX_LINES) {
+      if (index < sidebar.maxLines()) {
         sidebar.line(index++, line, scoreFormat);
       }
     }

api/src/main/java/net/megavex/scoreboardlibrary/api/team/TeamDisplay.java

@@ -42,6 +42,15 @@ public interface TeamDisplay {
    */
   boolean addEntry(@NotNull String entry);
 
+  /**
+   * Adds multiple entries.
+   *
+   * @param entries entries to add
+   * @return whether any entry was added
+   * @see #entries
+   */
+  boolean addEntries(@NotNull Collection<String> entries);
+
   /**
    * Removes an entry.
    *
@@ -51,6 +60,15 @@ public interface TeamDisplay {
    */
   boolean removeEntry(@NotNull String entry);
 
+  /**
+   * Removes multiple entries.
+   *
+   * @param entries entries to remove
+   * @return whether any entry was removed
+   * @see #entries
+   */
+  boolean removeEntries(@NotNull Collection<String> entries);
+
   // Properties
 
   /**
@@ -127,6 +145,7 @@ public interface TeamDisplay {
 
   /**
    * @return name tag visibility rule value
+   * @since Minecraft 1.8
    */
   @NotNull NameTagVisibility nameTagVisibility();
 
@@ -134,6 +153,7 @@ public interface TeamDisplay {
    * Updates the name tag visibility rule.
    *
    * @param nameTagVisibility new rule value
+   * @since Minecraft 1.8
    */
   @NotNull TeamDisplay nameTagVisibility(@NotNull NameTagVisibility nameTagVisibility);
 
@@ -156,6 +176,7 @@ public interface TeamDisplay {
    * It is also used for displaying team specific sidebars with the {@link ObjectiveDisplaySlot.TeamSidebar}} display slot.
    *
    * @return player color
+   * @since Minecraft 1.8
    */
   @Nullable NamedTextColor playerColor();
 
@@ -164,6 +185,12 @@ public interface TeamDisplay {
    *
    * @param playerColor new player color
    * @see #playerColor()
+   * @since Minecraft 1.8
    */
   @NotNull TeamDisplay playerColor(@Nullable NamedTextColor playerColor);
+
+  /**
+   * Refreshes the team display, re-rendering any {@link net.kyori.adventure.text.TranslatableComponent}s.
+   */
+  void refresh();
 }

api/src/main/java/net/megavex/scoreboardlibrary/api/team/TeamManager.java

@@ -7,6 +7,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
+import java.util.concurrent.CompletableFuture;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
@@ -104,7 +105,7 @@ public interface TeamManager {
    * The TeamManager will internally be added to a queue for this player who
    * will start seeing it once they are removed from all previous TeamManagers.
    *
-   * @param player player to add
+   * @param player              player to add
    * @param teamDisplayFunction a function that provides the team display to set for each team
    * @return whether the player was added
    */
@@ -152,6 +153,14 @@ public interface TeamManager {
     }
   }
 
+  /**
+   * Removes a viewer from this TeamManager.
+   *
+   * @param player viewer to remove
+   * @return future that will be completed once all removal packets have been sent in an async task
+   */
+  CompletableFuture<Void> removePlayerFuture(@NotNull Player player);
+
   // Close
 
   /**

build.gradle.kts

@@ -1,5 +1,5 @@
 allprojects {
-  version = "2.1.9"
+  version = "2.7.4"
   group = "net.megavex"
   description = "Powerful packet-level scoreboard library for Paper/Spigot servers"
 }

buildSrc/src/main/kotlin/net.megavex.scoreboardlibrary.base-conventions.gradle.kts

@@ -16,16 +16,18 @@ repositories {
   mavenCentral()
   maven("https://oss.sonatype.org/content/repositories/snapshots")
   maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
+  maven("https://hub.spigotmc.org/nexus/content/repositories/sonatype-nexus-snapshots/") {
+    content {
+      includeGroup("net.md-5")
+    }
+  }
 }
 
 dependencies {
-  compileOnly(libs.spigotApi)
-  compileOnly(libs.bundles.adventure)
-
   testImplementation(libs.spigotApi)
   testImplementation(libs.bundles.adventure)
-  testImplementation(libs.junitJupiterApi)
-  testRuntimeOnly(libs.junitJupiterEngine)
+  testImplementation(libs.junitJupiter)
+  testRuntimeOnly(libs.junitPlatformLauncher)
 }
 
 indra {
@@ -33,12 +35,14 @@ indra {
     ci(true)
   }
   mitLicense()
+  reproducibleBuilds(true)
 
   javaVersions {
     target(8)
     minimumToolchain(21)
   }
 
+  publishSnapshotsTo("forgejo", "https://git.megavex.net/api/packages/MegavexPublic/maven")
   configurePublications {
     pom {
       url = "https://github.com/MegavexNetwork/scoreboard-library"

commons/build.gradle.kts

@@ -1,7 +0,0 @@
-plugins {
-  id("net.megavex.scoreboardlibrary.base-conventions")
-}
-
-dependencies {
-  api(project(":scoreboard-library-api"))
-}

commons/src/main/java/net/megavex/scoreboardlibrary/implementation/commons/CollectionProvider.java

@@ -1,66 +0,0 @@
-package net.megavex.scoreboardlibrary.implementation.commons;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodHandles.Lookup;
-import java.lang.invoke.MethodType;
-import java.util.*;
-
-public final class CollectionProvider {
-  private static final MethodHandle mapConstructor, setConstructor, listConstructor;
-
-  static {
-    Lookup lookup = MethodHandles.publicLookup();
-    MethodType parameters = MethodType.methodType(void.class, int.class);
-    mapConstructor = getConstructor(lookup, "it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap", HashMap.class, parameters);
-    setConstructor = getConstructor(lookup, "it.unimi.dsi.fastutil.objects.ObjectOpenHashSet", HashSet.class, parameters);
-    listConstructor = getConstructor(lookup, "it.unimi.dsi.fastutil.objects.ObjectArrayList", ArrayList.class, parameters);
-  }
-
-  private CollectionProvider() {
-  }
-
-  private static MethodHandle getConstructor(Lookup lookup, String fastUtilClass, Class<?> fallback, MethodType parameters) {
-    Class<?> clazz;
-    try {
-      clazz = Class.forName(fastUtilClass);
-    } catch (ClassNotFoundException e) {
-      clazz = fallback;
-    }
-
-    try {
-      return lookup.findConstructor(clazz, parameters);
-    } catch (NoSuchMethodException | IllegalAccessException e) {
-      throw new ExceptionInInitializerError(e);
-    }
-  }
-
-  public static <K, V> @NotNull Map<K, V> map(int capacity) {
-    try {
-      // noinspection unchecked
-      return (Map<K, V>) mapConstructor.invokeWithArguments(capacity);
-    } catch (Throwable e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  public static <E> @NotNull Set<E> set(int capacity) {
-    try {
-      // noinspection unchecked
-      return (Set<E>) setConstructor.invokeWithArguments(capacity);
-    } catch (Throwable e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  public static <E> @NotNull List<E> list(int capacity) {
-    try {
-      // noinspection unchecked
-      return (List<E>) listConstructor.invokeWithArguments(capacity);
-    } catch (Throwable e) {
-      throw new RuntimeException(e);
-    }
-  }
-}

extra-kotlin/build.gradle.kts

@@ -1,4 +1,5 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
   id("net.megavex.scoreboardlibrary.base-conventions")
@@ -12,10 +13,11 @@ kotlin {
 dependencies {
   api(project(":scoreboard-library-api"))
   testImplementation(kotlin("test"))
+  compileOnly(libs.spigotApi)
 }
 
-tasks.withType<KotlinCompile>().configureEach {
-  kotlinOptions {
-    jvmTarget = "1.8"
+tasks.withType<KotlinJvmCompile>().configureEach {
+  compilerOptions {
+    jvmTarget = JvmTarget.JVM_1_8
   }
 }

flake.lock

@@ -0,0 +1,27 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1770056022,
+        "narHash": "sha256-yvCz+Qmci1bVucXEyac3TdoSPMtjqVJmVy5wro6j/70=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "d04d8548aed39902419f14a8537006426dc1e4fa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,46 @@
+{
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
+  };
+
+  outputs = { nixpkgs, ... }: let
+    forAllSystems = function:
+      nixpkgs.lib.genAttrs [
+        "x86_64-linux"
+        "aarch64-linux"
+        "x86_64-darwin"
+        "aarch64-darwin"
+      ] (system:
+        function (import nixpkgs {
+          inherit system;
+        }));
+  in {
+    devShells = forAllSystems (pkgs: rec {
+      default = jdk25;
+
+      jdk25 = pkgs.mkShellNoCC {
+        buildInputs = with pkgs; [
+          jdk25_headless
+        ];
+      };
+
+      jdk21 = pkgs.mkShellNoCC {
+        buildInputs = with pkgs; [
+          jdk21_headless
+        ];
+      };
+
+      jdk17 = pkgs.mkShellNoCC {
+        buildInputs = with pkgs; [
+          jdk17_headless
+        ];
+      };
+
+      jdk8 = pkgs.mkShellNoCC {
+        buildInputs = with pkgs; [
+          jdk8_headless
+        ];
+      };
+    });
+  };
+}

gradle/libs.versions.toml

@@ -1,25 +1,21 @@
 [versions]
-adventure = "4.17.0"
-junitJupiter = "5.10.2"
-devBundle = "1.20.5-R0.1-SNAPSHOT" # modern packet adapter
+adventure = "4.25.0"
 
 [libraries]
 spigotApi = "org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT" # do not update
-onePointEightPointEightNms = "org.github.spigot:1.8.8:1.8.8"
-packetEvents = "com.github.retrooper.packetevents:spigot:2.3.0"
-buildIndra = { module = "net.kyori:indra-common", version = "3.1.3" }
-buildNmcp = "com.gradleup.nmcp:com.gradleup.nmcp.gradle.plugin:0.0.7"
+buildIndra = { module = "net.kyori:indra-common", version = "4.0.0" }
+buildNmcp = "com.gradleup.nmcp:com.gradleup.nmcp.gradle.plugin:0.0.9"
 
 adventureApi = { module = "net.kyori:adventure-api", version.ref = "adventure" }
 adventureTextSerializerGson = { module = "net.kyori:adventure-text-serializer-gson", version.ref = "adventure" }
 adventureTextSerializerLegacy = { module = "net.kyori:adventure-text-serializer-legacy", version.ref = "adventure" }
 
-junitJupiterApi = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junitJupiter" }
-junitJupiterEngine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junitJupiter" }
+# TODO: v6 only supports java 17
+junitJupiter = "org.junit.jupiter:junit-jupiter:5.13.4"
+junitPlatformLauncher = "org.junit.platform:junit-platform-launcher:1.14.1"
 
 [plugins]
-kotlin = "org.jetbrains.kotlin.jvm:1.9.24"
-paperweight = "io.papermc.paperweight.userdev:1.7.1"
+kotlin = "org.jetbrains.kotlin.jvm:2.2.21"
 
 [bundles]
 adventure = [ "adventureApi", "adventureTextSerializerGson", "adventureTextSerializerLegacy" ]

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -112,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -170,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -203,15 +203,14 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -68,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

implementation/build.gradle.kts

@@ -1,8 +1,17 @@
 plugins {
   id("net.megavex.scoreboardlibrary.base-conventions")
+  //id("io.papermc.paperweight.userdev") version "2.0.0-beta.19"
+}
+
+repositories {
+  maven("https://repo.viaversion.com")
 }
 
 dependencies {
   api(project(":scoreboard-library-api"))
-  implementation(project(":scoreboard-library-packet-adapter-base"))
+  compileOnly(libs.spigotApi)
+
+  compileOnly("com.viaversion:viaversion-api:5.7.1")
+  compileOnly("io.netty:netty-buffer:4.2.10.Final")
+  compileOnly("io.netty:netty-handler:4.2.10.Final")
 }

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/PacketAdapterLoader.java

@@ -3,27 +3,24 @@ package net.megavex.scoreboardlibrary.implementation;
 import net.megavex.scoreboardlibrary.api.exception.NoPacketAdapterAvailableException;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.PacketAdapterProvider;
 import org.bukkit.Bukkit;
+import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.lang.reflect.InvocationTargetException;
 
 public final class PacketAdapterLoader {
-  private static final String MODERN = "modern",
-    V1_8_R3 = "v1_8_R3",
-    PACKET_EVENTS = "packetevents";
-
   private PacketAdapterLoader() {
   }
 
-  public static @NotNull PacketAdapterProvider loadPacketAdapter() throws NoPacketAdapterAvailableException {
+  public static @NotNull PacketAdapterProvider loadPacketAdapter(Plugin plugin) throws NoPacketAdapterAvailableException {
     Class<?> nmsClass = findAndLoadImplementationClass();
     if (nmsClass == null) {
       throw new NoPacketAdapterAvailableException();
     }
 
     try {
-      return (PacketAdapterProvider) nmsClass.getConstructors()[0].newInstance();
+      return (PacketAdapterProvider) nmsClass.getConstructors()[0].newInstance(plugin);
     } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
       throw new RuntimeException("couldn't initialize packet adapter", e);
     }
@@ -36,19 +33,60 @@ public final class PacketAdapterLoader {
       version = version.substring(0, dashIndex);
     }
 
-    Class<?> nmsClass = tryLoadVersion(version);
-    if (nmsClass != null) {
-      return nmsClass;
+    // New Paper 26.1.1+ versioning scheme: 26.1.1.build.29
+    int buildIndex = version.indexOf(".build");
+    if (buildIndex != -1) {
+      version = version.substring(0, buildIndex);
     }
 
-    return tryLoadPacketEvents();
+    return tryLoadVersion(version);
   }
 
   private static @Nullable Class<?> tryLoadVersion(@NotNull String serverVersion) {
+    // https://www.spigotmc.org/wiki/spigot-nms-and-minecraft-versions-legacy/
+    // https://www.spigotmc.org/wiki/spigot-nms-and-minecraft-versions-1-10-1-15/
     // https://www.spigotmc.org/wiki/spigot-nms-and-minecraft-versions-1-16/
+    // https://www.spigotmc.org/wiki/spigot-nms-and-minecraft-versions-1-21/
     switch (serverVersion) {
+      case "1.7.10":
+      case "1.8":
+      case "1.8.3":
+      case "1.8.4":
+      case "1.8.5":
+      case "1.8.6":
+      case "1.8.7":
       case "1.8.8":
-        return tryLoadImplementationClass(V1_8_R3);
+      case "1.9":
+      case "1.9.2":
+      case "1.9.4":
+      case "1.10.2":
+      case "1.11":
+      case "1.11.2":
+      case "1.12":
+      case "1.12.1":
+      case "1.12.2":
+        try {
+          return Class.forName("net.megavex.scoreboardlibrary.implementation.packetAdapter.legacy.PacketAdapterProviderImpl");
+        } catch (ClassNotFoundException ignored) {
+          return null;
+        }
+      case "1.13":
+      case "1.13.1":
+      case "1.13.2":
+      case "1.14":
+      case "1.14.1":
+      case "1.14.2":
+      case "1.14.3":
+      case "1.14.4":
+      case "1.15":
+      case "1.15.1":
+      case "1.15.2":
+      case "1.16":
+      case "1.16.1":
+      case "1.16.2":
+      case "1.16.3":
+      case "1.16.4":
+      case "1.16.5":
       case "1.17":
       case "1.17.1":
       case "1.18":
@@ -66,36 +104,36 @@ public final class PacketAdapterLoader {
       case "1.20.4":
       case "1.20.5":
       case "1.20.6":
-        return tryLoadImplementationClass(MODERN);
+      case "1.21":
+      case "1.21.1":
+      case "1.21.2":
+      case "1.21.3":
+      case "1.21.4":
+      case "1.21.5":
+      case "1.21.6":
+      case "1.21.7":
+      case "1.21.8":
+      case "1.21.9":
+      case "1.21.10":
+      case "1.21.11":
+      case "26.1":
+      case "26.1.1":
+      case "26.1.2":
+        return tryLoadModern();
       default:
         // Hide from relocation checkers
         String property = "net.mega".concat("vex.scoreboardlibrary.forceModern");
         if (System.getProperty(property, "").equalsIgnoreCase("true")) {
-          return tryLoadImplementationClass(MODERN);
+          return tryLoadModern();
         }
 
         return null;
     }
   }
 
-  private static @Nullable Class<?> tryLoadPacketEvents() {
-    Class<?> nmsClass = tryLoadImplementationClass(PACKET_EVENTS);
-    if (nmsClass == null) {
-      return null;
-    }
-
+  private static Class<?> tryLoadModern() {
     try {
-      Class.forName("com.github.retrooper.packetevents.PacketEvents");
-      return nmsClass;
-    } catch (ClassNotFoundException ignored) {
-      return null;
-    }
-  }
-
-  private static @Nullable Class<?> tryLoadImplementationClass(@NotNull String name) {
-    try {
-      String path = "net.megavex.scoreboardlibrary.implementation.packetAdapter." + name + ".PacketAdapterProviderImpl";
-      return Class.forName(path);
+      return Class.forName("net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.PacketAdapterProviderImpl");
     } catch (ClassNotFoundException ignored) {
       return null;
     }

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/ScoreboardLibraryImpl.java

@@ -30,7 +30,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-public class ScoreboardLibraryImpl implements ScoreboardLibrary {
+public final class ScoreboardLibraryImpl implements ScoreboardLibrary {
   private final Plugin plugin;
   private final PacketAdapterProvider packetAdapter;
   private final TaskScheduler taskScheduler;
@@ -59,7 +59,7 @@ public class ScoreboardLibraryImpl implements ScoreboardLibrary {
     }
 
     this.plugin = plugin;
-    this.packetAdapter = PacketAdapterLoader.loadPacketAdapter();
+    this.packetAdapter = PacketAdapterLoader.loadPacketAdapter(plugin);
     this.taskScheduler = TaskScheduler.create(plugin);
 
     boolean localeEventExists = false;
@@ -90,7 +90,7 @@ public class ScoreboardLibraryImpl implements ScoreboardLibrary {
   }
 
   @Override
-  public @NotNull Sidebar createSidebar(int maxLines, @Nullable Locale locale) {
+  public @NotNull Sidebar createSidebar(int maxLines, @Nullable Locale locale, @NotNull String objectiveName) {
     checkClosed();
 
     if (maxLines <= 0) {
@@ -99,9 +99,9 @@ public class ScoreboardLibraryImpl implements ScoreboardLibrary {
 
     AbstractSidebar sidebar;
     if (locale == null) {
-      sidebar = new PlayerDependantLocaleSidebar(this, maxLines);
+      sidebar = new PlayerDependantLocaleSidebar(this, maxLines, objectiveName);
     } else {
-      sidebar = new SingleLocaleSidebar(this, maxLines, locale);
+      sidebar = new SingleLocaleSidebar(this, maxLines, objectiveName, locale);
     }
 
     sidebars().add(sidebar);

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/commons/LegacyFormatUtil.java

@@ -8,6 +8,7 @@ import net.kyori.adventure.translation.GlobalTranslator;
 import org.bukkit.ChatColor;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
@@ -17,17 +18,16 @@ import static net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializ
 import static net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.parseChar;
 
 public final class LegacyFormatUtil {
-  private static final Map<NamedTextColor, Character> legacyMap;
+  private static final Map<NamedTextColor, ChatColor> chatColorMap;
 
   static {
     ChatColor[] values = ChatColor.values();
-    legacyMap = CollectionProvider.map(values.length);
+    chatColorMap = new HashMap<>(values.length);
     for (ChatColor value : values) {
       if (!value.isColor()) continue;
 
-      char c = value.getChar();
-      LegacyFormat format = Objects.requireNonNull(parseChar(c));
-      legacyMap.put((NamedTextColor) format.color(), c);
+      LegacyFormat format = Objects.requireNonNull(parseChar(value.getChar()));
+      chatColorMap.put((NamedTextColor) format.color(), value);
     }
   }
 
@@ -63,6 +63,12 @@ public final class LegacyFormatUtil {
   public static char getChar(@Nullable NamedTextColor color) {
     if (color == null) return 'r';
 
-    return legacyMap.getOrDefault(color, '\0');
+    ChatColor chatColor = chatColorMap.getOrDefault(color, ChatColor.WHITE);
+    return chatColor.getChar();
+  }
+
+  public static int getIndex(@Nullable NamedTextColor color) {
+    ChatColor chatColor = chatColorMap.getOrDefault(color == null ? NamedTextColor.WHITE : color, ChatColor.WHITE);
+    return chatColor.ordinal();
   }
 }

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/commons/LineRenderingStrategy.java

@@ -9,7 +9,7 @@ public enum LineRenderingStrategy {
    */
   LEGACY,
   /**
-   * For versions 1.13-1.20.2, where team properties are stored as components with no limits.
+   * For versions 1.13+, where team properties are stored as components with no limits.
    */
   MODERN,
   /**

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/commons/LocaleProvider.java

@@ -12,10 +12,13 @@ import java.util.function.Function;
 
 public final class LocaleProvider {
   private static final Locale DEFAULT_LOCALE = Locale.US;
-  private static final Function<Player, Locale> provider = get();
+  private static final Function<Player, Locale> PROVIDER = get();
+
+  private LocaleProvider() {
+  }
 
   public static @NotNull Locale locale(Player player) {
-    return provider.apply(player);
+    return PROVIDER.apply(player);
   }
 
   private static @NotNull Function<Player, Locale> get() {

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/objective/ObjectiveManagerImpl.java

@@ -6,7 +6,6 @@ import net.megavex.scoreboardlibrary.api.objective.ObjectiveManager;
 import net.megavex.scoreboardlibrary.api.objective.ObjectiveScore;
 import net.megavex.scoreboardlibrary.api.objective.ScoreboardObjective;
 import net.megavex.scoreboardlibrary.implementation.ScoreboardLibraryImpl;
-import net.megavex.scoreboardlibrary.implementation.commons.CollectionProvider;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.PropertiesPacketType;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.objective.ObjectivePacketAdapter;
 import net.megavex.scoreboardlibrary.implementation.player.PlayerDisplayable;
@@ -15,16 +14,17 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-public class ObjectiveManagerImpl implements ObjectiveManager, PlayerDisplayable {
+public final class ObjectiveManagerImpl implements ObjectiveManager, PlayerDisplayable {
   private final ScoreboardLibraryImpl library;
   private final Map<String, ScoreboardObjectiveImpl> objectives = new ConcurrentHashMap<>();
   private final Map<ObjectiveDisplaySlot, ScoreboardObjectiveImpl> displaySlots = new HashMap<>();
 
-  private final Set<Player> players = CollectionProvider.set(8);
-  private final Set<Player> displayingPlayers = CollectionProvider.set(8);
+  private final Set<Player> players = new HashSet<>(8);
+  private final Set<Player> displayingPlayers = new HashSet<>(8);
   private final Queue<ObjectiveManagerTask> taskQueue = new ConcurrentLinkedQueue<>();
   private boolean closed;
 
@@ -108,10 +108,23 @@ public class ObjectiveManagerImpl implements ObjectiveManager, PlayerDisplayable
       return false;
     }
 
-    taskQueue.add(new ObjectiveManagerTask.RemovePlayer(player));
+    taskQueue.add(new ObjectiveManagerTask.RemovePlayer(player, null));
     return true;
   }
 
+  @Override
+  public CompletableFuture<Void> removePlayerFuture(@NotNull Player player) {
+    Preconditions.checkNotNull(player);
+    checkClosed();
+    if (!players.remove(player)) {
+      return CompletableFuture.completedFuture(null);
+    }
+
+    CompletableFuture<Void> future = new CompletableFuture<>();
+    taskQueue.add(new ObjectiveManagerTask.RemovePlayer(player, future));
+    return future;
+  }
+
   @Override
   public void close() {
     if (!closed) {
@@ -146,14 +159,17 @@ public class ObjectiveManagerImpl implements ObjectiveManager, PlayerDisplayable
         @NotNull ScoreboardLibraryPlayer slPlayer = library.getOrCreatePlayer(player);
         slPlayer.objectiveManagerQueue().add(this);
       } else if (task instanceof ObjectiveManagerTask.RemovePlayer) {
-        Player player = ((ObjectiveManagerTask.RemovePlayer) task).player();
-        Collection<Player> singleton = Collections.singleton(player);
+        ObjectiveManagerTask.RemovePlayer removePlayerTask = (ObjectiveManagerTask.RemovePlayer) task;
+        Collection<Player> singleton = Collections.singleton(removePlayerTask.player());
         for (ScoreboardObjectiveImpl objective : objectives.values()) {
           objective.packetAdapter().remove(singleton);
         }
 
-        displayingPlayers.remove(player);
-        Objects.requireNonNull(library.getPlayer(player)).objectiveManagerQueue().remove(this);
+        displayingPlayers.remove(removePlayerTask.player());
+        Objects.requireNonNull(library.getPlayer(removePlayerTask.player())).objectiveManagerQueue().remove(this);
+        if (removePlayerTask.future() != null) {
+          removePlayerTask.future().complete(null);
+        }
       } else if (task instanceof ObjectiveManagerTask.ReloadPlayer) {
         Player player = ((ObjectiveManagerTask.ReloadPlayer) task).player();
         Collection<Player> singleton = Collections.singleton(player);
@@ -168,6 +184,7 @@ public class ObjectiveManagerImpl implements ObjectiveManager, PlayerDisplayable
       } else if (task instanceof ObjectiveManagerTask.AddObjective) {
         ScoreboardObjectiveImpl objective = ((ObjectiveManagerTask.AddObjective) task).objective();
         objective.sendProperties(displayingPlayers, PropertiesPacketType.CREATE);
+        objective.wasDisplayed(true);
       } else if (task instanceof ObjectiveManagerTask.RemoveObjective) {
         ScoreboardObjectiveImpl objective = ((ObjectiveManagerTask.RemoveObjective) task).objective();
         objective.packetAdapter().remove(displayingPlayers);
@@ -200,6 +217,10 @@ public class ObjectiveManagerImpl implements ObjectiveManager, PlayerDisplayable
     Collection<Player> singleton = Collections.singleton(player);
 
     for (ScoreboardObjectiveImpl objective : objectives.values()) {
+      if (!objective.wasDisplayed()) {
+        continue;
+      }
+
       objective.sendProperties(singleton, PropertiesPacketType.CREATE);
       for (Map.Entry<String, ObjectiveScore> entry : objective.scores().entrySet()) {
         ObjectiveScore score = entry.getValue();
@@ -208,6 +229,9 @@ public class ObjectiveManagerImpl implements ObjectiveManager, PlayerDisplayable
     }
 
     for (Map.Entry<ObjectiveDisplaySlot, ScoreboardObjectiveImpl> entry : displaySlots.entrySet()) {
+      if (!entry.getValue().wasDisplayed()) {
+        continue;
+      }
       entry.getValue().packetAdapter().display(singleton, entry.getKey());
     }
   }

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/objective/ObjectiveManagerTask.java

@@ -6,6 +6,8 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.concurrent.CompletableFuture;
+
 public class ObjectiveManagerTask {
   private ObjectiveManagerTask() {
   }
@@ -31,14 +33,20 @@ public class ObjectiveManagerTask {
 
   public static final class RemovePlayer extends ObjectiveManagerTask {
     private final Player player;
+    private final CompletableFuture<Void> future;
 
-    public RemovePlayer(@NotNull Player player) {
+    public RemovePlayer(@NotNull Player player, @Nullable CompletableFuture<Void> future) {
       this.player = player;
+      this.future = future;
     }
 
     public @NotNull Player player() {
       return player;
     }
+
+    public @Nullable CompletableFuture<Void> future() {
+      return future;
+    }
   }
 
   public static final class ReloadPlayer extends ObjectiveManagerTask {

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/objective/ObjectiveUpdaterTask.java

@@ -7,7 +7,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.Iterator;
 import java.util.logging.Level;
 
-public class ObjectiveUpdaterTask implements Runnable {
+public final class ObjectiveUpdaterTask implements Runnable {
   private final ScoreboardLibraryImpl scoreboardLibrary;
   private final RunningTask task;
   private final Object lock = new Object();

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/objective/ScoreboardObjectiveImpl.java

@@ -16,7 +16,7 @@ import java.util.*;
 
 import static net.kyori.adventure.text.Component.empty;
 
-public class ScoreboardObjectiveImpl implements ScoreboardObjective {
+public final class ScoreboardObjectiveImpl implements ScoreboardObjective {
   private final ObjectivePacketAdapter packetAdapter;
   private final Queue<ObjectiveManagerTask> taskQueue;
   private final String name;
@@ -26,6 +26,7 @@ public class ScoreboardObjectiveImpl implements ScoreboardObjective {
   private ObjectiveRenderType renderType = ObjectiveRenderType.INTEGER;
   private ScoreFormat defaultScoreFormat;
   private boolean closed;
+  private boolean wasDisplayed;
 
   public ScoreboardObjectiveImpl(@NotNull ObjectivePacketAdapter packetAdapter, @NotNull Queue<ObjectiveManagerTask> taskQueue, @NotNull String name) {
     this.packetAdapter = packetAdapter;
@@ -95,6 +96,13 @@ public class ScoreboardObjectiveImpl implements ScoreboardObjective {
     }
   }
 
+  @Override
+  public void refreshProperties() {
+    if (!closed) {
+      taskQueue.add(new ObjectiveManagerTask.UpdateObjective(this));
+    }
+  }
+
   @Override
   public @Nullable ObjectiveScore scoreInfo(@NotNull String entry) {
     return scores.get(entry);
@@ -117,7 +125,23 @@ public class ScoreboardObjectiveImpl implements ScoreboardObjective {
     return this;
   }
 
+  @Override
+  public void refreshScore(@NotNull String entry) {
+    ObjectiveScore score = scores.get(entry);
+    if (score != null) {
+      taskQueue.add(new ObjectiveManagerTask.UpdateScore(this, entry, score));
+    }
+  }
+
   public void sendProperties(@NotNull Collection<Player> players, @NotNull PropertiesPacketType packetType) {
     packetAdapter.sendProperties(players, packetType, value, renderType, defaultScoreFormat);
   }
+
+  public boolean wasDisplayed() {
+    return wasDisplayed;
+  }
+
+  public void wasDisplayed(boolean wasDisplayed) {
+    this.wasDisplayed = wasDisplayed;
+  }
 }

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/ImmutableTeamProperties.java

@@ -1,5 +1,6 @@
 package net.megavex.scoreboardlibrary.implementation.packetAdapter;
 
+import com.google.common.collect.ImmutableList;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.megavex.scoreboardlibrary.api.team.enums.CollisionRule;
 import net.megavex.scoreboardlibrary.api.team.enums.NameTagVisibility;
@@ -7,11 +8,10 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
-import java.util.Collections;
 
 public interface ImmutableTeamProperties<T> {
-  default @NotNull Collection<String> entries() {
-    return Collections.emptySet();
+  default @NotNull Collection<String> syncedEntries() {
+    return ImmutableList.of();
   }
 
   @NotNull T displayName();

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/legacy/ChatColorUtil.java

@@ -0,0 +1,41 @@
+package net.megavex.scoreboardlibrary.implementation.packetAdapter.legacy;
+
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.util.reflect.ReflectUtil;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.reflect.Method;
+
+public final class ChatColorUtil {
+  private static final MethodHandle FROM_NAME_METHOD, GET_INDEX_METHOD;
+
+  static {
+    Class<?> enumChatFormatClass = ReflectUtil.getClassOrThrow(LegacyMinecraftClasses.server("EnumChatFormat"));
+    MethodHandles.Lookup lookup = MethodHandles.lookup();
+
+    try {
+      Method fromNameMethod = enumChatFormatClass.getMethod("b", String.class);
+      FROM_NAME_METHOD = lookup.unreflect(fromNameMethod);
+
+      Method getIndexMethod = enumChatFormatClass.getMethod("b");
+      GET_INDEX_METHOD = lookup.unreflect(getIndexMethod);
+    } catch (NoSuchMethodException | IllegalAccessException e) {
+      throw new ExceptionInInitializerError(e);
+    }
+  }
+
+  private ChatColorUtil() {
+  }
+
+  public static int getColorIndex(@NotNull NamedTextColor color) {
+    String name = NamedTextColor.NAMES.key(color);
+    try {
+      Object format = FROM_NAME_METHOD.invoke(name);
+      return (int) GET_INDEX_METHOD.invoke(format);
+    } catch (Throwable e) {
+      throw new RuntimeException(e);
+    }
+  }
+}

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/legacy/LegacyMinecraftClasses.java

@@ -0,0 +1,16 @@
+package net.megavex.scoreboardlibrary.implementation.packetAdapter.legacy;
+
+import org.bukkit.Bukkit;
+import org.jetbrains.annotations.NotNull;
+
+// TODO: should be moved to MinecraftReflection at some point
+public final class LegacyMinecraftClasses {
+  private static final String NMS_VERSION_STRING = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
+
+  private LegacyMinecraftClasses() {
+  }
+
+  public static @NotNull String server(String path) {
+    return "net.minecraft.server." + NMS_VERSION_STRING + "." + path;
+  }
+}

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/legacy/LegacyPacketSender.java

@@ -0,0 +1,50 @@
+package net.megavex.scoreboardlibrary.implementation.packetAdapter.legacy;
+
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.PacketSender;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.util.reflect.MinecraftClasses;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.util.reflect.ReflectUtil;
+import org.bukkit.entity.Player;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+public final class LegacyPacketSender implements PacketSender<Object> {
+  public static final LegacyPacketSender INSTANCE = new LegacyPacketSender();
+
+  private static final MethodHandle GET_HANDLE_METHOD, PLAYER_CONNECTION_FIELD, SEND_PACKET_METHOD;
+
+  static {
+    Class<?> packetClass = ReflectUtil.getClassOrThrow(LegacyMinecraftClasses.server("Packet"));
+    Class<?> craftPlayerClass = ReflectUtil.getClassOrThrow(MinecraftClasses.craftBukkit("entity.CraftPlayer"));
+    MethodHandles.Lookup lookup = MethodHandles.lookup();
+
+    try {
+      Method getHandleMethod = craftPlayerClass.getMethod("getHandle");
+      GET_HANDLE_METHOD = lookup.unreflect(getHandleMethod);
+
+      Field playerConnectionField = getHandleMethod.getReturnType().getField("playerConnection");
+      PLAYER_CONNECTION_FIELD = lookup.unreflectGetter(playerConnectionField);
+
+      Method sendPacketMethod = playerConnectionField.getType().getMethod("sendPacket", packetClass);
+      SEND_PACKET_METHOD = lookup.unreflect(sendPacketMethod);
+    } catch (NoSuchMethodException | IllegalAccessException | NoSuchFieldException e) {
+      throw new ExceptionInInitializerError(e);
+    }
+  }
+
+  private LegacyPacketSender() {
+  }
+
+  @Override
+  public void sendPacket(Player player, Object packet) {
+    try {
+      Object handle = GET_HANDLE_METHOD.invoke(player);
+      Object playerConnection = PLAYER_CONNECTION_FIELD.invoke(handle);
+      SEND_PACKET_METHOD.invoke(playerConnection, packet);
+    } catch (Throwable e) {
+      throw new RuntimeException(e);
+    }
+  }
+}

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/legacy/ObjectivePacketAdapterImpl.java

@@ -1,40 +1,42 @@
-package net.megavex.scoreboardlibrary.implementation.packetAdapter.v1_8_R3;
+package net.megavex.scoreboardlibrary.implementation.packetAdapter.legacy;
 
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import net.kyori.adventure.translation.GlobalTranslator;
 import net.megavex.scoreboardlibrary.api.objective.ObjectiveDisplaySlot;
 import net.megavex.scoreboardlibrary.api.objective.ObjectiveRenderType;
 import net.megavex.scoreboardlibrary.api.objective.ScoreFormat;
 import net.megavex.scoreboardlibrary.implementation.commons.LegacyFormatUtil;
-import net.megavex.scoreboardlibrary.implementation.packetAdapter.PacketSender;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.PropertiesPacketType;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.objective.ObjectiveConstants;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.objective.ObjectivePacketAdapter;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.util.LocalePacketUtil;
-import net.minecraft.server.v1_8_R3.*;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
 
-public class ObjectivePacketAdapterImpl implements ObjectivePacketAdapter {
-  private final PacketSender<Packet<?>> sender;
-  private final String objectiveName;
-  private PacketPlayOutScoreboardObjective removePacket;
+import static net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection;
 
-  public ObjectivePacketAdapterImpl(@NotNull PacketSender<Packet<?>> sender, @NotNull String objectiveName) {
-    this.sender = sender;
+public final class ObjectivePacketAdapterImpl implements ObjectivePacketAdapter {
+  private final String objectiveName;
+  private Object removePacket;
+
+  public ObjectivePacketAdapterImpl(@NotNull String objectiveName) {
     this.objectiveName = objectiveName;
   }
 
+  @Override
+  public @NotNull String objectiveName() {
+    return objectiveName;
+  }
+
   @Override
   public void display(@NotNull Collection<Player> players, @NotNull ObjectiveDisplaySlot slot) {
-    PacketPlayOutScoreboardDisplayObjective packet = new PacketPlayOutScoreboardDisplayObjective();
-    PacketAccessors.DISPLAY_OBJECTIVE_POSITION.set(packet, ObjectiveConstants.displaySlotIndex(slot));
+    Object packet = PacketAccessors.DISPLAY_OBJECTIVE_CONSTRUCTOR.invoke();
+    PacketAccessors.DISPLAY_OBJECTIVE_POSITION.set(packet, ObjectiveConstants.displaySlotIndex(slot, false));
     PacketAccessors.DISPLAY_OBJECTIVE_NAME.set(packet, objectiveName);
-    sender.sendPacket(players, packet);
+    LegacyPacketSender.INSTANCE.sendPacket(players, packet);
   }
 
   @Override
@@ -46,7 +48,7 @@ public class ObjectivePacketAdapterImpl implements ObjectivePacketAdapter {
     @Nullable ScoreFormat scoreFormat
   ) {
     LocalePacketUtil.sendLocalePackets(
-      sender,
+      LegacyPacketSender.INSTANCE,
       players,
       locale -> createPropertiesPacket(packetType, GlobalTranslator.render(value, locale), renderType)
     );
@@ -55,11 +57,12 @@ public class ObjectivePacketAdapterImpl implements ObjectivePacketAdapter {
   @Override
   public void remove(@NotNull Collection<Player> players) {
     if (removePacket == null) {
-      removePacket = new PacketPlayOutScoreboardObjective();
+      removePacket = PacketAccessors.OBJECTIVE_CONSTRUCTOR.invoke();
       PacketAccessors.OBJECTIVE_NAME_FIELD.set(removePacket, objectiveName);
+      PacketAccessors.OBJECTIVE_DISPLAY_NAME_FIELD.set(removePacket, "");
       PacketAccessors.OBJECTIVE_MODE_FIELD.set(removePacket, ObjectiveConstants.MODE_REMOVE);
     }
-    sender.sendPacket(players, removePacket);
+    LegacyPacketSender.INSTANCE.sendPacket(players, removePacket);
   }
 
   @Override
@@ -70,45 +73,52 @@ public class ObjectivePacketAdapterImpl implements ObjectivePacketAdapter {
     @Nullable Component display,
     @Nullable ScoreFormat scoreFormat
   ) {
-    PacketPlayOutScoreboardScore packet = new PacketPlayOutScoreboardScore(entry);
+    Object packet = PacketAccessors.SCORE_CONSTRUCTOR.invoke(entry);
     PacketAccessors.SCORE_OBJECTIVE_NAME_FIELD.set(packet, objectiveName);
     PacketAccessors.SCORE_VALUE_FIELD.set(packet, value);
-    PacketAccessors.SCORE_ACTION_FIELD.set(packet, PacketPlayOutScoreboardScore.EnumScoreboardAction.CHANGE);
-    sender.sendPacket(players, packet);
+    if (PacketAccessors.SCORE_ACTION_FIELD_1_8 != null) {
+      PacketAccessors.SCORE_ACTION_FIELD_1_8.set(packet, PacketAccessors.SCORE_ACTION_CHANGE_1_8);
+    } else {
+      PacketAccessors.SCORE_ACTION_FIELD_1_7.set(packet, 0);
+    }
+
+    LegacyPacketSender.INSTANCE.sendPacket(players, packet);
   }
 
   @Override
   public void removeScore(@NotNull Collection<Player> players, @NotNull String entry) {
-    PacketPlayOutScoreboardScore packet = new PacketPlayOutScoreboardScore(entry);
+    Object packet = PacketAccessors.SCORE_CONSTRUCTOR.invoke(entry);
     PacketAccessors.SCORE_OBJECTIVE_NAME_FIELD.set(packet, objectiveName);
-    sender.sendPacket(players, packet);
+    LegacyPacketSender.INSTANCE.sendPacket(players, packet);
   }
 
-  private @NotNull PacketPlayOutScoreboardObjective createPropertiesPacket(
+  private @NotNull Object createPropertiesPacket(
     @NotNull PropertiesPacketType packetType,
     @NotNull Component value,
     @NotNull ObjectiveRenderType renderType
   ) {
-    PacketPlayOutScoreboardObjective packet = new PacketPlayOutScoreboardObjective();
+    Object packet = PacketAccessors.OBJECTIVE_CONSTRUCTOR.invoke();
     PacketAccessors.OBJECTIVE_NAME_FIELD.set(packet, objectiveName);
     PacketAccessors.OBJECTIVE_MODE_FIELD.set(packet, ObjectiveConstants.mode(packetType));
 
-    String legacyValue = LegacyFormatUtil.limitLegacyText(LegacyComponentSerializer.legacySection().serialize(value), ObjectiveConstants.LEGACY_VALUE_CHAR_LIMIT);
+    String legacyValue = LegacyFormatUtil.limitLegacyText(legacySection().serialize(value), ObjectiveConstants.LEGACY_VALUE_CHAR_LIMIT);
     PacketAccessors.OBJECTIVE_DISPLAY_NAME_FIELD.set(packet, legacyValue);
 
-    IScoreboardCriteria.EnumScoreboardHealthDisplay nmsRenderType;
-    switch (renderType) {
-      case INTEGER:
-        nmsRenderType = IScoreboardCriteria.EnumScoreboardHealthDisplay.INTEGER;
-        break;
-      case HEARTS:
-        nmsRenderType = IScoreboardCriteria.EnumScoreboardHealthDisplay.HEARTS;
-        break;
-      default:
-        throw new IllegalStateException();
+    if (PacketAccessors.OBJECTIVE_HEALTH_DISPLAY_FIELD != null) {
+      Object nmsRenderType;
+      switch (renderType) {
+        case INTEGER:
+          nmsRenderType = PacketAccessors.HEALTH_DISPLAY_INTEGER;
+          break;
+        case HEARTS:
+          nmsRenderType = PacketAccessors.HEALTH_DISPLAY_HEARTS;
+          break;
+        default:
+          throw new IllegalStateException();
+      }
+      PacketAccessors.OBJECTIVE_HEALTH_DISPLAY_FIELD.set(packet, nmsRenderType);
     }
 
-    PacketAccessors.OBJECTIVE_HEALTH_DISPLAY_FIELD.set(packet, nmsRenderType);
     return packet;
   }
 }

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/legacy/PacketAccessors.java

@@ -0,0 +1,80 @@
+package net.megavex.scoreboardlibrary.implementation.packetAdapter.legacy;
+
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.util.reflect.ConstructorAccessor;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.util.reflect.FieldAccessor;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.util.reflect.ReflectUtil;
+
+import java.util.Collection;
+
+public final class PacketAccessors {
+  public static final Class<?> HEALTH_DISPLAY_CLASS =
+    ReflectUtil.getOptionalClass(LegacyMinecraftClasses.server("IScoreboardCriteria$EnumScoreboardHealthDisplay"));
+  public static final Object HEALTH_DISPLAY_INTEGER = HEALTH_DISPLAY_CLASS != null ? ReflectUtil.getEnumInstance(HEALTH_DISPLAY_CLASS, "INTEGER") : null;
+  public static final Object HEALTH_DISPLAY_HEARTS = HEALTH_DISPLAY_CLASS != null ? ReflectUtil.getEnumInstance(HEALTH_DISPLAY_CLASS, "HEARTS") : null;
+
+  private static final boolean IS_AT_LEAST_1_8 = HEALTH_DISPLAY_INTEGER != null;
+  private static final boolean IS_AT_LEAST_1_9 = ReflectUtil.getOptionalClass(LegacyMinecraftClasses.server("ScoreboardTeamBase$EnumTeamPush")) != null;
+
+  public static final Class<?> OBJECTIVE_CLASS =
+    ReflectUtil.getClassOrThrow(LegacyMinecraftClasses.server("PacketPlayOutScoreboardObjective"));
+  public static final ConstructorAccessor<?> OBJECTIVE_CONSTRUCTOR = ReflectUtil.findConstructor(OBJECTIVE_CLASS);
+  public static final FieldAccessor<Object, Integer> OBJECTIVE_MODE_FIELD =
+    ReflectUtil.findFieldUnchecked(OBJECTIVE_CLASS, 0, int.class);
+  public static final FieldAccessor<Object, String> OBJECTIVE_NAME_FIELD =
+    ReflectUtil.findFieldUnchecked(OBJECTIVE_CLASS, 0, String.class);
+  public static final FieldAccessor<Object, String> OBJECTIVE_DISPLAY_NAME_FIELD =
+    ReflectUtil.findFieldUnchecked(OBJECTIVE_CLASS, 1, String.class);
+  public static final FieldAccessor<Object, Object> OBJECTIVE_HEALTH_DISPLAY_FIELD =
+    HEALTH_DISPLAY_CLASS != null ? ReflectUtil.findFieldUnchecked(OBJECTIVE_CLASS, 0, HEALTH_DISPLAY_CLASS) : null;
+
+  public static final Class<?> DISPLAY_OBJECTIVE_CLASS =
+    ReflectUtil.getClassOrThrow(LegacyMinecraftClasses.server("PacketPlayOutScoreboardDisplayObjective"));
+  public static final ConstructorAccessor<?> DISPLAY_OBJECTIVE_CONSTRUCTOR = ReflectUtil.findConstructor(DISPLAY_OBJECTIVE_CLASS);
+  public static final FieldAccessor<Object, Integer> DISPLAY_OBJECTIVE_POSITION =
+    ReflectUtil.findFieldUnchecked(DISPLAY_OBJECTIVE_CLASS, 0, int.class);
+  public static final FieldAccessor<Object, String> DISPLAY_OBJECTIVE_NAME =
+    ReflectUtil.findFieldUnchecked(DISPLAY_OBJECTIVE_CLASS, 0, String.class);
+
+  public static final Class<?> SCORE_CLASS =
+    ReflectUtil.getClassOrThrow(LegacyMinecraftClasses.server("PacketPlayOutScoreboardScore"));
+  public static final ConstructorAccessor<?> SCORE_CONSTRUCTOR = ReflectUtil.findConstructor(SCORE_CLASS, String.class);
+  public static final FieldAccessor<Object, String> SCORE_OBJECTIVE_NAME_FIELD =
+    ReflectUtil.findFieldUnchecked(SCORE_CLASS, 1, String.class);
+  public static final FieldAccessor<Object, Integer> SCORE_VALUE_FIELD =
+    ReflectUtil.findFieldUnchecked(SCORE_CLASS, 0, int.class);
+  public static final Class<?> SCORE_ACTION_CLASS =
+    ReflectUtil.getOptionalClass(LegacyMinecraftClasses.server("PacketPlayOutScoreboardScore$EnumScoreboardAction"));
+  public static final FieldAccessor<Object, Object> SCORE_ACTION_FIELD_1_8 =
+    SCORE_ACTION_CLASS != null ? ReflectUtil.findFieldUnchecked(SCORE_CLASS, 0, SCORE_ACTION_CLASS) : null;
+  public static final Object SCORE_ACTION_CHANGE_1_8 = SCORE_ACTION_FIELD_1_8 != null ? ReflectUtil.getEnumInstance(SCORE_ACTION_CLASS, "CHANGE") : null;
+  public static final FieldAccessor<Object, Integer> SCORE_ACTION_FIELD_1_7 =
+    SCORE_ACTION_CLASS == null ? ReflectUtil.findFieldUnchecked(SCORE_CLASS, 1, int.class) : null;
+
+  public static final Class<?> TEAM_CLASS =
+    ReflectUtil.getClassOrThrow(LegacyMinecraftClasses.server("PacketPlayOutScoreboardTeam"));
+  public static final ConstructorAccessor<?> TEAM_CONSTRUCTOR = ReflectUtil.findConstructor(TEAM_CLASS);
+  public static final FieldAccessor<Object, String> TEAM_NAME_FIELD =
+    ReflectUtil.findFieldUnchecked(TEAM_CLASS, 0, String.class);
+  public static final FieldAccessor<Object, String> TEAM_DISPLAY_NAME_FIELD =
+    ReflectUtil.findFieldUnchecked(TEAM_CLASS, 1, String.class);
+  public static final FieldAccessor<Object, String> TEAM_PREFIX_FIELD =
+    ReflectUtil.findFieldUnchecked(TEAM_CLASS, 2, String.class);
+  public static final FieldAccessor<Object, String> TEAM_SUFFIX_FIELD =
+    ReflectUtil.findFieldUnchecked(TEAM_CLASS, 3, String.class);
+  public static final FieldAccessor<Object, String> TEAM_NAME_TAG_VISIBILITY_FIELD =
+    IS_AT_LEAST_1_8 ? ReflectUtil.findFieldUnchecked(TEAM_CLASS, 4, String.class) : null;
+  public static final FieldAccessor<Object, String> TEAM_COLLISION_RULE_FIELD =
+    IS_AT_LEAST_1_9 ? ReflectUtil.findFieldUnchecked(TEAM_CLASS, 5, String.class) : null;
+  public static final FieldAccessor<Object, Integer> TEAM_COLOR_FIELD =
+    IS_AT_LEAST_1_8 ? ReflectUtil.findFieldUnchecked(TEAM_CLASS, 0, int.class) : null;
+  @SuppressWarnings("rawtypes")
+  public static final FieldAccessor<Object, Collection> TEAM_ENTRIES_FIELD =
+    ReflectUtil.findFieldUnchecked(TEAM_CLASS, 0, Collection.class);
+  public static final FieldAccessor<Object, Integer> TEAM_MODE_FIELD =
+    ReflectUtil.findFieldUnchecked(TEAM_CLASS, IS_AT_LEAST_1_8 ? 1 : 0, int.class);
+  public static final FieldAccessor<Object, Integer> TEAM_RULES_FIELD =
+    ReflectUtil.findFieldUnchecked(TEAM_CLASS, IS_AT_LEAST_1_8 ? 2 : 1, int.class);
+
+  private PacketAccessors() {
+  }
+}

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/legacy/PacketAdapterProviderImpl.java

@@ -1,34 +1,29 @@
-package net.megavex.scoreboardlibrary.implementation.packetAdapter.v1_8_R3;
+package net.megavex.scoreboardlibrary.implementation.packetAdapter.legacy;
 
 import net.megavex.scoreboardlibrary.implementation.commons.LineRenderingStrategy;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.objective.ObjectivePacketAdapter;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.PacketAdapterProvider;
-import net.megavex.scoreboardlibrary.implementation.packetAdapter.PacketSender;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.team.TeamsPacketAdapter;
-import net.minecraft.server.v1_8_R3.Packet;
-import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
 import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
 
 @SuppressWarnings("unused")
-public class PacketAdapterProviderImpl implements PacketAdapterProvider, PacketSender<Packet<?>> {
+public final class PacketAdapterProviderImpl implements PacketAdapterProvider {
+  public PacketAdapterProviderImpl(Plugin plugin) {}
+
   @Override
   public @NotNull TeamsPacketAdapter createTeamPacketAdapter(@NotNull String teamName) {
-    return new TeamsPacketAdapterImpl(this, teamName);
+    return new TeamsPacketAdapterImpl(teamName);
   }
 
   @Override
   public @NotNull ObjectivePacketAdapter createObjectiveAdapter(@NotNull String objectiveName) {
-    return new ObjectivePacketAdapterImpl(this, objectiveName);
+    return new ObjectivePacketAdapterImpl(objectiveName);
   }
 
   @Override
   public @NotNull LineRenderingStrategy lineRenderingStrategy(@NotNull Player player) {
     return LineRenderingStrategy.LEGACY;
   }
-
-  @Override
-  public void sendPacket(@NotNull Player player, @NotNull Packet<?> packet) {
-    ((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet);
-  }
 }

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/legacy/TeamsPacketAdapterImpl.java

@@ -1,49 +1,32 @@
-package net.megavex.scoreboardlibrary.implementation.packetAdapter.v1_8_R3;
+package net.megavex.scoreboardlibrary.implementation.packetAdapter.legacy;
 
+import com.google.common.collect.ImmutableList;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.megavex.scoreboardlibrary.implementation.commons.LegacyFormatUtil;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.ImmutableTeamProperties;
-import net.megavex.scoreboardlibrary.implementation.packetAdapter.PacketSender;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.PropertiesPacketType;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.team.EntriesPacketType;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.team.TeamConstants;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.team.TeamDisplayPacketAdapter;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.team.TeamsPacketAdapter;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.util.LocalePacketUtil;
-import net.minecraft.server.v1_8_R3.EnumChatFormat;
-import net.minecraft.server.v1_8_R3.Packet;
-import net.minecraft.server.v1_8_R3.PacketPlayOutScoreboardTeam;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
 import java.util.Locale;
-import java.util.Objects;
 
 import static net.megavex.scoreboardlibrary.implementation.commons.LegacyFormatUtil.limitLegacyText;
 
-public class TeamsPacketAdapterImpl implements TeamsPacketAdapter {
-  private final PacketSender<Packet<?>> sender;
+public final class TeamsPacketAdapterImpl implements TeamsPacketAdapter {
   private final String teamName;
-  private PacketPlayOutScoreboardTeam removePacket;
+  private Object removePacket;
 
-  public TeamsPacketAdapterImpl(@NotNull PacketSender<Packet<?>> sender, @NotNull String teamName) {
-    this.sender = sender;
+  public TeamsPacketAdapterImpl(@NotNull String teamName) {
     this.teamName = teamName;
   }
 
-  @Override
-  public void removeTeam(@NotNull Iterable<Player> players) {
-    if (removePacket == null) {
-      removePacket = new PacketPlayOutScoreboardTeam();
-      PacketAccessors.TEAM_NAME_FIELD.set(removePacket, teamName);
-      PacketAccessors.TEAM_MODE_FIELD.set(removePacket, TeamConstants.MODE_REMOVE);
-    }
-
-    sender.sendPacket(players, removePacket);
-  }
-
   @Override
   public @NotNull TeamDisplayPacketAdapter createTeamDisplayAdapter(@NotNull ImmutableTeamProperties<Component> properties) {
     return new AdventureTeamDisplayPacketAdapter(properties);
@@ -61,42 +44,59 @@ public class TeamsPacketAdapterImpl implements TeamsPacketAdapter {
       this.properties = properties;
     }
 
+    @Override
+    public void removeTeam(@NotNull Iterable<Player> players) {
+      if (removePacket == null) {
+        removePacket = PacketAccessors.TEAM_CONSTRUCTOR.invoke();
+        PacketAccessors.TEAM_NAME_FIELD.set(removePacket, teamName);
+        PacketAccessors.TEAM_MODE_FIELD.set(removePacket, TeamConstants.MODE_REMOVE);
+      }
+
+      LegacyPacketSender.INSTANCE.sendPacket(players, removePacket);
+    }
+
     @Override
     public void sendEntries(@NotNull EntriesPacketType packetType, @NotNull Collection<Player> players, @NotNull Collection<String> entries) {
-      PacketPlayOutScoreboardTeam packet = new PacketPlayOutScoreboardTeam();
+      Object packet = PacketAccessors.TEAM_CONSTRUCTOR.invoke();
       PacketAccessors.TEAM_NAME_FIELD.set(packet, teamName);
       PacketAccessors.TEAM_MODE_FIELD.set(packet, TeamConstants.mode(packetType));
       PacketAccessors.TEAM_ENTRIES_FIELD.set(packet, entries);
-      sender.sendPacket(players, packet);
+      LegacyPacketSender.INSTANCE.sendPacket(players, packet);
     }
 
     @Override
     public void sendProperties(@NotNull PropertiesPacketType packetType, @NotNull Collection<Player> players) {
       LocalePacketUtil.sendLocalePackets(
-        sender,
+        LegacyPacketSender.INSTANCE,
         players,
         locale -> {
-          String displayName = limitLegacyText(toLegacy(properties.displayName(), locale), TeamConstants.LEGACY_CHAR_LIMIT);
-          String prefix = limitLegacyText(toLegacy(properties.prefix(), locale), TeamConstants.LEGACY_CHAR_LIMIT);
-          String suffix = limitLegacyText(toLegacy(properties.suffix(), locale), TeamConstants.LEGACY_CHAR_LIMIT);
+          String displayName = limitLegacyText(toLegacy(properties.displayName(), locale), TeamConstants.DISPLAY_NAME_LEGACY_LIMIT);
+          String prefix = limitLegacyText(toLegacy(properties.prefix(), locale), TeamConstants.PREFIX_SUFFIX_LEGACY_LIMIT);
+          String suffix = limitLegacyText(toLegacy(properties.suffix(), locale), TeamConstants.PREFIX_SUFFIX_LEGACY_LIMIT);
 
-          PacketPlayOutScoreboardTeam packet = new PacketPlayOutScoreboardTeam();
+          Object packet = PacketAccessors.TEAM_CONSTRUCTOR.invoke();
           PacketAccessors.TEAM_NAME_FIELD.set(packet, teamName);
           PacketAccessors.TEAM_MODE_FIELD.set(packet, TeamConstants.mode(packetType));
           PacketAccessors.TEAM_DISPLAY_NAME_FIELD.set(packet, displayName);
           PacketAccessors.TEAM_PREFIX_FIELD.set(packet, prefix);
           PacketAccessors.TEAM_SUFFIX_FIELD.set(packet, suffix);
-          PacketAccessors.TEAM_NAME_TAG_VISIBILITY_FIELD.set(packet, properties.nameTagVisibility().key());
-
-          NamedTextColor color = properties.playerColor();
-          if (color != null) {
-            String name = NamedTextColor.NAMES.key(color);
-            PacketAccessors.TEAM_COLOR_FIELD.set(packet, Objects.requireNonNull(EnumChatFormat.b(name)).b());
+          PacketAccessors.TEAM_RULES_FIELD.set(packet, properties.packOptions());
+          if (PacketAccessors.TEAM_NAME_TAG_VISIBILITY_FIELD != null) {
+            PacketAccessors.TEAM_NAME_TAG_VISIBILITY_FIELD.set(packet, properties.nameTagVisibility().key());
+          }
+
+          NamedTextColor color = properties.playerColor();
+          if (PacketAccessors.TEAM_COLOR_FIELD != null && color != null) {
+            int teamColorField = ChatColorUtil.getColorIndex(color);
+            PacketAccessors.TEAM_COLOR_FIELD.set(packet, teamColorField);
+          }
+
+          if (PacketAccessors.TEAM_COLLISION_RULE_FIELD != null) {
+            PacketAccessors.TEAM_COLLISION_RULE_FIELD.set(packet, properties.collisionRule().key());
           }
 
-          PacketAccessors.TEAM_RULES_FIELD.set(packet, properties.packOptions());
           if (packetType == PropertiesPacketType.CREATE) {
-            PacketAccessors.TEAM_ENTRIES_FIELD.set(packet, properties.entries());
+            PacketAccessors.TEAM_ENTRIES_FIELD.set(packet, ImmutableList.copyOf(properties.syncedEntries()));
           }
 
           return packet;

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/modern/PacketAccessors.java

@@ -0,0 +1,361 @@
+package net.megavex.scoreboardlibrary.implementation.packetAdapter.modern;
+
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.megavex.scoreboardlibrary.api.team.enums.CollisionRule;
+import net.megavex.scoreboardlibrary.api.team.enums.NameTagVisibility;
+import net.megavex.scoreboardlibrary.implementation.commons.LegacyFormatUtil;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.util.reflect.*;
+import org.bukkit.Bukkit;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.invoke.MethodType;
+import java.util.*;
+
+public final class PacketAccessors {
+  private PacketAccessors() {
+  }
+
+  public static final boolean IS_1_17_OR_ABOVE, IS_1_20_2_OR_ABOVE, IS_1_20_3_OR_ABOVE, IS_1_20_5_OR_ABOVE, IS_1_21_5_OR_ABOVE, IS_1_21_6_OR_ABOVE;
+  private static final String OLD_NMS_VERSION_STRING;
+
+  static {
+    boolean is1_17OrAbove = false;
+    try {
+      Class.forName("net.minecraft.world.item.BundleItem");
+      is1_17OrAbove = true;
+    } catch (ClassNotFoundException ignored) {
+    }
+    IS_1_17_OR_ABOVE = is1_17OrAbove;
+
+    if (!is1_17OrAbove) {
+      OLD_NMS_VERSION_STRING = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
+    } else {
+      OLD_NMS_VERSION_STRING = null;
+    }
+
+    boolean is1_20_2OrAbove = false;
+    try {
+      Class.forName("net.minecraft.world.scores.DisplaySlot");
+      is1_20_2OrAbove = true;
+    } catch (ClassNotFoundException ignored) {
+    }
+    IS_1_20_2_OR_ABOVE = is1_20_2OrAbove;
+
+    boolean is1_20_3OrAbove = false;
+    try {
+      Class.forName("net.minecraft.network.chat.numbers.NumberFormat");
+      is1_20_3OrAbove = true;
+    } catch (ClassNotFoundException ignored) {
+    }
+    IS_1_20_3_OR_ABOVE = is1_20_3OrAbove;
+
+    boolean is1_20_5OrAbove = false;
+    try {
+      Class.forName("net.minecraft.network.protocol.common.ClientboundTransferPacket");
+      is1_20_5OrAbove = true;
+    } catch (ClassNotFoundException ignored) {
+    }
+    IS_1_20_5_OR_ABOVE = is1_20_5OrAbove;
+
+    boolean is1_21_5OrAbove = false;
+    try {
+      Class.forName("net.minecraft.world.item.component.BlocksAttacks");
+      is1_21_5OrAbove = true;
+    } catch (ClassNotFoundException ignored) {
+    }
+    IS_1_21_5_OR_ABOVE = is1_21_5OrAbove;
+
+    boolean is1_21_6OrAbove = false;
+    try {
+      Class.forName("net.minecraft.server.dialog.Dialog");
+      is1_21_6OrAbove = true;
+    } catch (ClassNotFoundException ignored) {
+    }
+    IS_1_21_6_OR_ABOVE = is1_21_6OrAbove;
+  }
+
+  public static final Class<?> PKT_CLASS,
+    SET_OBJECTIVE_PKT_CLASS,
+    SET_DISPLAY_OBJECTIVE_PKT_CLASS,
+    SET_SCORE_PKT_CLASS,
+    RESET_SCORE_PKT_CLASS,
+    SET_PLAYER_TEAM_PKT_CLASS,
+    TEAM_PARAMETERS_PKT_CLASS, // 1.17
+    COMPONENT_CLASS,
+    CHAT_SERIALIZER_CLASS,
+    COMPONENT_SERIALIZATION_CLASS,
+    STYLE_CLASS,
+    STYLE_SERIALIZER_CLASS,
+    NUMBER_FORMAT_CLASS,
+    DISPLAY_SLOT_CLASS, // 1.20.2
+    OBJECTIVE_CLASS,
+    TEAM_VISIBILITY_CLASS,
+    TEAM_COLLISION_RULE_CLASS,
+    CHAT_FORMATTING_CLASS,
+    OBJECTIVE_CRITERIA_RENDER_TYPE_CLASS,
+    DATA_RESULT_CLASS,
+    DYNAMIC_OPS_CLASS,
+    JSON_OPS_CLASS,
+    CODEC_CLASS,
+    SERVER_PLAYER_CLASS,
+    PLAYER_CONNECTION_CLASS,
+    ADVENTURE_COMPONENT_CLASS;
+
+  static {
+    PKT_CLASS = ReflectUtil.getClassOrThrow("net.minecraft.network.protocol.Packet", oldSpigotClassName("Packet"));
+    SET_OBJECTIVE_PKT_CLASS = ReflectUtil.getClassOrThrow("net.minecraft.network.protocol.game.ClientboundSetObjectivePacket", "net.minecraft.network.protocol.game.PacketPlayOutScoreboardObjective", oldSpigotClassName("PacketPlayOutScoreboardObjective"));
+    SET_DISPLAY_OBJECTIVE_PKT_CLASS = ReflectUtil.getClassOrThrow("net.minecraft.network.protocol.game.ClientboundSetDisplayObjectivePacket", "net.minecraft.network.protocol.game.PacketPlayOutScoreboardDisplayObjective", oldSpigotClassName("PacketPlayOutScoreboardDisplayObjective"));
+    SET_SCORE_PKT_CLASS = ReflectUtil.getClassOrThrow("net.minecraft.network.protocol.game.ClientboundSetScorePacket", "net.minecraft.network.protocol.game.PacketPlayOutScoreboardScore", oldSpigotClassName("PacketPlayOutScoreboardScore"));
+    RESET_SCORE_PKT_CLASS = ReflectUtil.getOptionalClass("net.minecraft.network.protocol.game.ClientboundResetScorePacket", "net.minecraft.network.protocol.game.ClientboundResetScorePacket");
+    SET_PLAYER_TEAM_PKT_CLASS = ReflectUtil.getClassOrThrow("net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket", "net.minecraft.network.protocol.game.PacketPlayOutScoreboardTeam", oldSpigotClassName("PacketPlayOutScoreboardTeam"));
+    TEAM_PARAMETERS_PKT_CLASS = ReflectUtil.getOptionalClass("net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket$Parameters", "net.minecraft.network.protocol.game.PacketPlayOutScoreboardTeam$b");
+    COMPONENT_CLASS = ReflectUtil.getClassOrThrow("net.minecraft.network.chat.Component", "net.minecraft.network.chat.IChatBaseComponent", oldSpigotClassName("IChatBaseComponent"));
+    CHAT_SERIALIZER_CLASS = ReflectUtil.getOptionalClass("net.minecraft.network.chat.Component$Serializer", "net.minecraft.network.chat.IChatBaseComponent$ChatSerializer", oldSpigotClassName("IChatBaseComponent$ChatSerializer"));
+    COMPONENT_SERIALIZATION_CLASS = ReflectUtil.getOptionalClass("net.minecraft.network.chat.ComponentSerialization");
+    STYLE_CLASS = ReflectUtil.getClassOrThrow("net.minecraft.network.chat.Style", "net.minecraft.network.chat.ChatModifier", oldSpigotClassName("ChatModifier"));
+    STYLE_SERIALIZER_CLASS = ReflectUtil.getClassOrThrow("net.minecraft.network.chat.Style$Serializer", "net.minecraft.network.chat.ChatModifier$ChatModifierSerializer", oldSpigotClassName("ChatModifier$ChatModifierSerializer"));
+    NUMBER_FORMAT_CLASS = ReflectUtil.getOptionalClass("net.minecraft.network.chat.numbers.NumberFormat");
+    DISPLAY_SLOT_CLASS = ReflectUtil.getOptionalClass("net.minecraft.world.scores.DisplaySlot");
+    OBJECTIVE_CLASS = ReflectUtil.getClassOrThrow("net.minecraft.world.scores.Objective", "net.minecraft.world.scores.ScoreboardObjective", oldSpigotClassName("ScoreboardObjective"));
+    TEAM_VISIBILITY_CLASS = ReflectUtil.getClassOrThrow("net.minecraft.world.scores.Team$Visibility", "net.minecraft.world.scores.ScoreboardTeamBase$EnumNameTagVisibility", oldSpigotClassName("ScoreboardTeamBase$EnumNameTagVisibility"));
+    TEAM_COLLISION_RULE_CLASS = ReflectUtil.getClassOrThrow("net.minecraft.world.scores.Team$CollisionRule", "net.minecraft.world.scores.ScoreboardTeamBase$EnumTeamPush", oldSpigotClassName("ScoreboardTeamBase$EnumTeamPush"));
+    CHAT_FORMATTING_CLASS = ReflectUtil.getClassOrThrow("net.minecraft.ChatFormatting", "net.minecraft.EnumChatFormat", oldSpigotClassName("EnumChatFormat"));
+    OBJECTIVE_CRITERIA_RENDER_TYPE_CLASS = ReflectUtil.getClassOrThrow("net.minecraft.world.scores.criteria.ObjectiveCriteria$RenderType", "net.minecraft.world.scores.criteria.IScoreboardCriteria$EnumScoreboardHealthDisplay", oldSpigotClassName("IScoreboardCriteria$EnumScoreboardHealthDisplay"));
+    DATA_RESULT_CLASS = ReflectUtil.getOptionalClass("com.mojang.serialization.DataResult");
+    DYNAMIC_OPS_CLASS = ReflectUtil.getOptionalClass("com.mojang.serialization.DynamicOps");
+    JSON_OPS_CLASS = ReflectUtil.getOptionalClass("com.mojang.serialization.JsonOps");
+    CODEC_CLASS = ReflectUtil.getOptionalClass("com.mojang.serialization.Codec");
+    SERVER_PLAYER_CLASS = ReflectUtil.getClassOrThrow("net.minecraft.server.level.ServerPlayer", "net.minecraft.server.level.EntityPlayer", oldSpigotClassName("EntityPlayer"));
+    PLAYER_CONNECTION_CLASS = ReflectUtil.getClassOrThrow("net.minecraft.server.network.ServerGamePacketListenerImpl", "net.minecraft.server.network.PlayerConnection", oldSpigotClassName("PlayerConnection"));
+    ADVENTURE_COMPONENT_CLASS = ReflectUtil.getOptionalClass("io.papermc.paper.adventure.AdventureComponent");
+  }
+
+  static {
+    if (IS_1_20_3_OR_ABOVE) {
+      RESET_SCORE_CONSTRUCTOR = ReflectUtil.findConstructor(Objects.requireNonNull(RESET_SCORE_PKT_CLASS), String.class, String.class);
+    } else {
+      RESET_SCORE_CONSTRUCTOR = null;
+    }
+
+    if (IS_1_20_5_OR_ABOVE) {
+      OBJECTIVE_NUMBER_FORMAT_FIELD = ReflectUtil.findFieldUnchecked(SET_OBJECTIVE_PKT_CLASS, 0, Optional.class);
+      SCORE_CONSTRUCTOR = ReflectUtil.findConstructor(SET_SCORE_PKT_CLASS, String.class, String.class, int.class, Optional.class, Optional.class);
+      SCORE_1_20_2_METHOD_CHANGE = null;
+      SCORE_1_20_2_METHOD_REMOVE = null;
+    } else if (IS_1_20_3_OR_ABOVE) {
+      assert NUMBER_FORMAT_CLASS != null;
+      OBJECTIVE_NUMBER_FORMAT_FIELD = ReflectUtil.findFieldUnchecked(SET_OBJECTIVE_PKT_CLASS, 0, NUMBER_FORMAT_CLASS);
+      SCORE_CONSTRUCTOR = ReflectUtil.findConstructor(SET_SCORE_PKT_CLASS, String.class, String.class, int.class, COMPONENT_CLASS, NUMBER_FORMAT_CLASS);
+      SCORE_1_20_2_METHOD_CHANGE = null;
+      SCORE_1_20_2_METHOD_REMOVE = null;
+    } else {
+      OBJECTIVE_NUMBER_FORMAT_FIELD = null;
+
+      Class<?> methodClass = ReflectUtil.getClassOrThrow("net.minecraft.server.ServerScoreboard$Method", "net.minecraft.server.ScoreboardServer$Action", oldSpigotClassName("ScoreboardServer$Action"));
+      SCORE_1_20_2_METHOD_CHANGE = ReflectUtil.getEnumInstance(methodClass, "CHANGE", "a");
+      SCORE_1_20_2_METHOD_REMOVE = ReflectUtil.getEnumInstance(methodClass, "REMOVE", "b");
+      SCORE_CONSTRUCTOR = ReflectUtil.findConstructor(SET_SCORE_PKT_CLASS, methodClass, String.class, String.class, int.class);
+    }
+
+    if (PacketAccessors.DATA_RESULT_CLASS != null) {
+      RESULT_UNWRAP_METHOD = ReflectUtil.findMethod(PacketAccessors.DATA_RESULT_CLASS, false, MethodType.methodType(Optional.class), "result");
+      try {
+        JSON_OPS = PacketAccessors.JSON_OPS_CLASS.getField("INSTANCE").get(null);
+      } catch (IllegalAccessException | NoSuchFieldException e) {
+        throw new RuntimeException(e);
+      }
+      CODEC_PARSE = ReflectUtil.findMethod(PacketAccessors.CODEC_CLASS, false, MethodType.methodType(PacketAccessors.DATA_RESULT_CLASS, PacketAccessors.DYNAMIC_OPS_CLASS, Object.class), "parse");
+    } else {
+      RESULT_UNWRAP_METHOD = null;
+      JSON_OPS = null;
+      CODEC_PARSE = null;
+    }
+  }
+
+  public static final MethodAccessor RESULT_UNWRAP_METHOD;
+  public static final MethodAccessor CODEC_PARSE;
+  public static final Object JSON_OPS;
+
+  public static final Map<NamedTextColor, Object> NMS_CHAT_FORMATTING_MAP = new HashMap<>();
+
+  static {
+    Object[] chatFormattings = CHAT_FORMATTING_CLASS.getEnumConstants();
+    FieldAccessor<Object, Object> charField = ReflectUtil.findFieldUnchecked(CHAT_FORMATTING_CLASS, 0, char.class);
+
+    outer:
+    for (NamedTextColor color : NamedTextColor.NAMES.values()) {
+      char c = LegacyFormatUtil.getChar(color);
+      for (Object chatFormatting : chatFormattings) {
+        if (c == (char) charField.get(chatFormatting)) {
+          NMS_CHAT_FORMATTING_MAP.put(color, chatFormatting);
+          continue outer;
+        }
+      }
+      throw new RuntimeException("No chat formatting enum constant found for " + color.toString());
+    }
+  }
+
+  public static final Object NAME_TAG_VISIBILITY_ALWAYS = ReflectUtil.getEnumInstance(TEAM_VISIBILITY_CLASS, "ALWAYS");
+  public static final Object NAME_TAG_VISIBILITY_NEVER = ReflectUtil.getEnumInstance(TEAM_VISIBILITY_CLASS, "NEVER");
+  public static final Object NAME_TAG_VISIBILITY_HIDE_FOR_OTHER_TEAMS = ReflectUtil.getEnumInstance(TEAM_VISIBILITY_CLASS, "HIDE_FOR_OTHER_TEAMS");
+  public static final Object NAME_TAG_VISIBILITY_HIDE_FOR_OWN_TEAM = ReflectUtil.getEnumInstance(TEAM_VISIBILITY_CLASS, "HIDE_FOR_OWN_TEAM");
+
+  public static final Object COLLISION_RULE_ALWAYS = ReflectUtil.getEnumInstance(TEAM_COLLISION_RULE_CLASS, "ALWAYS");
+  public static final Object COLLISION_RULE_NEVER = ReflectUtil.getEnumInstance(TEAM_COLLISION_RULE_CLASS, "NEVER");
+  public static final Object COLLISION_RULE_PUSH_OTHER_TEAMS = ReflectUtil.getEnumInstance(TEAM_COLLISION_RULE_CLASS, "PUSH_OTHER_TEAMS");
+  public static final Object COLLISION_RULE_PUSH_OWN_TEAM = ReflectUtil.getEnumInstance(TEAM_COLLISION_RULE_CLASS, "PUSH_OWN_TEAM");
+
+  public static final Object RENDER_TYPE_INTEGER = ReflectUtil.getEnumInstance(OBJECTIVE_CRITERIA_RENDER_TYPE_CLASS, "INTEGER");
+  public static final Object RENDER_TYPE_HEARTS = ReflectUtil.getEnumInstance(OBJECTIVE_CRITERIA_RENDER_TYPE_CLASS, "HEARTS");
+
+  public static final List<Object> DISPLAY_SLOT_VALUES = DISPLAY_SLOT_CLASS == null ? null : Arrays.asList(DISPLAY_SLOT_CLASS.getEnumConstants());
+
+  public static final ConstructorAccessor<?> ADVENTURE_COMPONENT_CONSTRUCTOR =
+    ADVENTURE_COMPONENT_CLASS != null ? ReflectUtil.findOptionalConstructor(ADVENTURE_COMPONENT_CLASS, Component.class) : null;
+
+  // --- OBJECTIVES ---
+
+  public static final PacketConstructor<?> OBJECTIVE_PACKET_CONSTRUCTOR =
+    ReflectUtil.getEmptyConstructor(SET_OBJECTIVE_PKT_CLASS);
+  public static final FieldAccessor<Object, String> OBJECTIVE_NAME_FIELD =
+    ReflectUtil.findFieldUnchecked(SET_OBJECTIVE_PKT_CLASS, 0, String.class);
+  public static final FieldAccessor<Object, Object> OBJECTIVE_VALUE_FIELD =
+    ReflectUtil.findFieldUnchecked(SET_OBJECTIVE_PKT_CLASS, 0, COMPONENT_CLASS);
+  public static final FieldAccessor<Object, Object> OBJECTIVE_RENDER_TYPE_FIELD =
+    ReflectUtil.findFieldUnchecked(SET_OBJECTIVE_PKT_CLASS, 0, OBJECTIVE_CRITERIA_RENDER_TYPE_CLASS);
+  // Optional<NumberFormat> for 1.20.5+, NumberFormat for below
+  public static final FieldAccessor<Object, Object> OBJECTIVE_NUMBER_FORMAT_FIELD;
+  public static final FieldAccessor<Object, Integer> OBJECTIVE_MODE_FIELD =
+    ReflectUtil.findFieldUnchecked(SET_OBJECTIVE_PKT_CLASS, 0, int.class);
+
+  public static final ConstructorAccessor<?> DISPLAY_CONSTRUCTOR;
+  public static final FieldAccessor<Object, String> DISPLAY_OBJECTIVE_NAME =
+    ReflectUtil.findFieldUnchecked(SET_DISPLAY_OBJECTIVE_PKT_CLASS, 0, String.class);
+  public static final FieldAccessor<Object, Object> DISPLAY_SLOT;
+
+  static {
+    if (IS_1_20_2_OR_ABOVE) {
+      assert DISPLAY_SLOT_CLASS != null;
+      DISPLAY_CONSTRUCTOR = ReflectUtil.findConstructor(SET_DISPLAY_OBJECTIVE_PKT_CLASS, DISPLAY_SLOT_CLASS, OBJECTIVE_CLASS);
+      DISPLAY_SLOT = null;
+    } else if (IS_1_17_OR_ABOVE) {
+      DISPLAY_CONSTRUCTOR = ReflectUtil.findConstructor(SET_DISPLAY_OBJECTIVE_PKT_CLASS, int.class, OBJECTIVE_CLASS);
+      DISPLAY_SLOT = null;
+    } else {
+      DISPLAY_CONSTRUCTOR = ReflectUtil.findConstructor(SET_DISPLAY_OBJECTIVE_PKT_CLASS);
+      DISPLAY_SLOT = ReflectUtil.findFieldUnchecked(SET_DISPLAY_OBJECTIVE_PKT_CLASS, 0, int.class);
+    }
+  }
+
+  public static final ConstructorAccessor<?> RESET_SCORE_CONSTRUCTOR; // 1.20.3+
+
+  public static final ConstructorAccessor<?> SCORE_CONSTRUCTOR;
+
+  public static final Object SCORE_1_20_2_METHOD_CHANGE, SCORE_1_20_2_METHOD_REMOVE;
+
+  // --- TEAMS ---
+
+  public static final PacketConstructor<?> PARAMETERS_CONSTRUCTOR;
+  public static final ConstructorAccessor<?> TEAM_PACKET_CONSTRUCTOR;
+
+  public static final FieldAccessor<Object, String> TEAM_NAME_FIELD;
+  public static final FieldAccessor<Object, Integer> TEAM_MODE_FIELD;
+  public static final FieldAccessor<Object, Collection<String>> TEAM_ENTRIES_FIELD;
+
+  public static final FieldAccessor<Object, Object> DISPLAY_NAME_FIELD;
+  public static final FieldAccessor<Object, Object> PREFIX_FIELD;
+  public static final FieldAccessor<Object, Object> SUFFIX_FIELD;
+
+  public static final FieldAccessor<Object, Object> NAME_TAG_VISIBILITY_FIELD;
+  public static final FieldAccessor<Object, Object> COLLISION_RULE_FIELD;
+
+  public static final FieldAccessor<Object, Object> COLOR_FIELD;
+  public static final FieldAccessor<Object, Integer> OPTIONS_FIELD;
+
+  static {
+    if (IS_1_17_OR_ABOVE) {
+      assert TEAM_PARAMETERS_PKT_CLASS != null;
+      PARAMETERS_CONSTRUCTOR = ReflectUtil.getEmptyConstructor(TEAM_PARAMETERS_PKT_CLASS);
+      TEAM_PACKET_CONSTRUCTOR = ReflectUtil.findConstructor(SET_PLAYER_TEAM_PKT_CLASS, String.class, int.class, Optional.class, Collection.class);
+
+      TEAM_NAME_FIELD = null;
+      TEAM_MODE_FIELD = null;
+      TEAM_ENTRIES_FIELD = null;
+
+      DISPLAY_NAME_FIELD = ReflectUtil.findFieldUnchecked(TEAM_PARAMETERS_PKT_CLASS, 0, COMPONENT_CLASS);
+      PREFIX_FIELD = ReflectUtil.findFieldUnchecked(TEAM_PARAMETERS_PKT_CLASS, 1, COMPONENT_CLASS);
+      SUFFIX_FIELD = ReflectUtil.findFieldUnchecked(TEAM_PARAMETERS_PKT_CLASS, 2, COMPONENT_CLASS);
+
+      if (IS_1_21_5_OR_ABOVE) {
+        NAME_TAG_VISIBILITY_FIELD = ReflectUtil.findFieldUnchecked(TEAM_PARAMETERS_PKT_CLASS, 0, TEAM_VISIBILITY_CLASS);
+        COLLISION_RULE_FIELD = ReflectUtil.findFieldUnchecked(TEAM_PARAMETERS_PKT_CLASS, 0, TEAM_COLLISION_RULE_CLASS);
+      } else {
+        NAME_TAG_VISIBILITY_FIELD = ReflectUtil.findFieldUnchecked(TEAM_PARAMETERS_PKT_CLASS, 0, String.class);
+        COLLISION_RULE_FIELD = ReflectUtil.findFieldUnchecked(TEAM_PARAMETERS_PKT_CLASS, 1, String.class);
+      }
+
+      COLOR_FIELD = ReflectUtil.findFieldUnchecked(TEAM_PARAMETERS_PKT_CLASS, 0, CHAT_FORMATTING_CLASS);
+      OPTIONS_FIELD = ReflectUtil.findFieldUnchecked(TEAM_PARAMETERS_PKT_CLASS, 0, int.class);
+    } else {
+      PARAMETERS_CONSTRUCTOR = null;
+      TEAM_PACKET_CONSTRUCTOR = ReflectUtil.findConstructor(SET_PLAYER_TEAM_PKT_CLASS);
+
+      TEAM_NAME_FIELD = ReflectUtil.findFieldUnchecked(SET_PLAYER_TEAM_PKT_CLASS, 0, String.class);
+      TEAM_MODE_FIELD = ReflectUtil.findFieldUnchecked(SET_PLAYER_TEAM_PKT_CLASS, 0, int.class);
+      TEAM_ENTRIES_FIELD = ReflectUtil.findFieldUnchecked(SET_PLAYER_TEAM_PKT_CLASS, 0, Collection.class);
+
+      DISPLAY_NAME_FIELD = ReflectUtil.findFieldUnchecked(SET_PLAYER_TEAM_PKT_CLASS, 0, COMPONENT_CLASS);
+      PREFIX_FIELD = ReflectUtil.findFieldUnchecked(SET_PLAYER_TEAM_PKT_CLASS, 1, COMPONENT_CLASS);
+      SUFFIX_FIELD = ReflectUtil.findFieldUnchecked(SET_PLAYER_TEAM_PKT_CLASS, 2, COMPONENT_CLASS);
+
+      NAME_TAG_VISIBILITY_FIELD = ReflectUtil.findFieldUnchecked(SET_PLAYER_TEAM_PKT_CLASS, 1, String.class);
+      COLLISION_RULE_FIELD = ReflectUtil.findFieldUnchecked(SET_PLAYER_TEAM_PKT_CLASS, 2, String.class);
+
+      COLOR_FIELD = ReflectUtil.findFieldUnchecked(SET_PLAYER_TEAM_PKT_CLASS, 0, CHAT_FORMATTING_CLASS);
+      OPTIONS_FIELD = ReflectUtil.findFieldUnchecked(SET_PLAYER_TEAM_PKT_CLASS, 1, int.class);
+    }
+  }
+
+  public static Object nameTagVisibility(NameTagVisibility value) {
+    switch (value) {
+      case NEVER:
+        return PacketAccessors.NAME_TAG_VISIBILITY_NEVER;
+      case ALWAYS:
+        return PacketAccessors.NAME_TAG_VISIBILITY_ALWAYS;
+      case HIDE_FOR_OTHER_TEAMS:
+        return PacketAccessors.NAME_TAG_VISIBILITY_HIDE_FOR_OTHER_TEAMS;
+      case HIDE_FOR_OWN_TEAM:
+        return PacketAccessors.NAME_TAG_VISIBILITY_HIDE_FOR_OWN_TEAM;
+      default:
+        throw new IllegalStateException("unknown name tag visibility " + value.name());
+    }
+  }
+
+  public static Object collisionRule(CollisionRule value) {
+    switch (value) {
+      case NEVER:
+        return PacketAccessors.COLLISION_RULE_NEVER;
+      case ALWAYS:
+        return PacketAccessors.COLLISION_RULE_ALWAYS;
+      case PUSH_OTHER_TEAMS:
+        return PacketAccessors.COLLISION_RULE_PUSH_OTHER_TEAMS;
+      case PUSH_OWN_TEAM:
+        return PacketAccessors.COLLISION_RULE_PUSH_OWN_TEAM;
+      default:
+        throw new IllegalStateException("unknown collision rule " + value.name());
+    }
+  }
+
+  public static @NotNull Object fromAdventureComponent(@NotNull Component component) {
+    return Objects.requireNonNull(PacketAccessors.ADVENTURE_COMPONENT_CONSTRUCTOR).invoke(component);
+  }
+
+  public static @Nullable String oldSpigotClassName(String clazz) {
+    if (OLD_NMS_VERSION_STRING != null) {
+      return "net.minecraft.server." + OLD_NMS_VERSION_STRING + "." + clazz;
+    }
+    return null;
+  }
+}

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/modern/PacketAdapterProviderImpl.java

@@ -0,0 +1,80 @@
+package net.megavex.scoreboardlibrary.implementation.packetAdapter.modern;
+
+import com.viaversion.viaversion.api.Via;
+import com.viaversion.viaversion.api.ViaAPI;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
+import net.megavex.scoreboardlibrary.implementation.commons.LineRenderingStrategy;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.PacketAdapterProvider;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.objective.PaperObjectivePacketAdapter;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.objective.SpigotObjectivePacketAdapter;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.team.PaperTeamsPacketAdapterImpl;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.team.SpigotTeamsPacketAdapter;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.util.ModernComponentProvider;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.util.ModernPacketSender;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.objective.ObjectivePacketAdapter;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.team.TeamsPacketAdapter;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.WeakHashMap;
+
+@SuppressWarnings("unused")
+public final class PacketAdapterProviderImpl implements PacketAdapterProvider {
+  private final ViaAPI<Player> via;
+  private final ModernPacketSender packetSender;
+  private final WeakHashMap<Player, Integer> viaTeamPacketIds = new WeakHashMap<>();
+
+  public PacketAdapterProviderImpl(Plugin plugin) {
+    final String viaPlugin = "ViaVersion";
+    boolean isViaEnabled = plugin.getServer().getPluginManager().isPluginEnabled(viaPlugin);
+    boolean isViaAllowed = plugin.getDescription().getSoftDepend().contains(viaPlugin) || plugin.getDescription().getDepend().contains(viaPlugin);
+    if (isViaEnabled && isViaAllowed) {
+      //noinspection unchecked
+      this.via = (ViaAPI<Player>) Via.getAPI();
+    } else {
+      this.via = null;
+    }
+    this.packetSender = new ModernPacketSender(this.via);
+  }
+
+  @Override
+  public @NotNull ObjectivePacketAdapter createObjectiveAdapter(@NotNull String objectiveName) {
+    return ModernComponentProvider.IS_NATIVE_ADVENTURE
+      ? new PaperObjectivePacketAdapter(this, objectiveName)
+      : new SpigotObjectivePacketAdapter(this, objectiveName);
+  }
+
+  @Override
+  public @NotNull TeamsPacketAdapter createTeamPacketAdapter(@NotNull String teamName) {
+    return ModernComponentProvider.IS_NATIVE_ADVENTURE
+      ? new PaperTeamsPacketAdapterImpl(this, teamName)
+      : new SpigotTeamsPacketAdapter(this, teamName);
+  }
+
+  @Override
+  public @NotNull LineRenderingStrategy lineRenderingStrategy(@NotNull Player player) {
+    if (this.via != null) {
+      final ProtocolVersion ver = this.via.getPlayerProtocolVersion(player);
+      if (ver.olderThan(ProtocolVersion.v1_13)) {
+        //System.out.println("[DEBUG] " + player.getName() + " is legacy player");
+        return LineRenderingStrategy.LEGACY;
+      }
+    }
+    //System.out.println("[DEBUG] is modern player");
+    return LineRenderingStrategy.MODERN;
+  }
+
+  public @Nullable ViaAPI<Player> via() {
+    return via;
+  }
+
+  public @NotNull ModernPacketSender packetSender() {
+    return packetSender;
+  }
+
+  public @NotNull WeakHashMap<Player, Integer> viaTeamPacketIds() {
+    return viaTeamPacketIds;
+  }
+}

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/modern/RelocatedGson.java

@@ -0,0 +1,46 @@
+package net.megavex.scoreboardlibrary.implementation.packetAdapter.modern;
+
+import com.google.gson.JsonElement;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.util.reflect.MethodAccessor;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.util.reflect.ReflectUtil;
+
+import java.lang.invoke.MethodType;
+import java.lang.reflect.InvocationTargetException;
+
+public final class RelocatedGson {
+  public static final String SERVER_GSON_PKG = "com.go".concat("ogle.gson");
+  public static final boolean IS_GSON_RELOCATED;
+  public static final Object JSON_PARSER;
+  public static final MethodAccessor PARSE_STRING_METHOD;
+
+  private RelocatedGson() {
+  }
+
+  static {
+    IS_GSON_RELOCATED = !JsonElement.class.getName().equals(SERVER_GSON_PKG + ".JsonElement");
+
+    if (IS_GSON_RELOCATED) {
+      try {
+        Class<?> jsonElementClass = Class.forName(SERVER_GSON_PKG + ".JsonElement");
+        Class<?> jsonParserClass = Class.forName(SERVER_GSON_PKG + ".JsonParser");
+        JSON_PARSER = jsonParserClass.getConstructors()[0].newInstance();
+        PARSE_STRING_METHOD = ReflectUtil.findMethod(jsonParserClass, false, MethodType.methodType(jsonElementClass, String.class), "parse");
+      } catch (ClassNotFoundException | InvocationTargetException | InstantiationException | IllegalAccessException e) {
+        throw new RuntimeException(e);
+      }
+    } else {
+      JSON_PARSER = null;
+      PARSE_STRING_METHOD = null;
+    }
+    //System.out.println("GSON RELOCATED = " + IS_GSON_RELOCATED);
+  }
+
+  public static Object convertToServerGson(final JsonElement element) {
+    if (IS_GSON_RELOCATED) {
+      assert PARSE_STRING_METHOD != null;
+      //System.out.println("fixed");
+      return PARSE_STRING_METHOD.invoke(JSON_PARSER, element.toString());
+    }
+    return element;
+  }
+}

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/modern/objective/AbstractObjectivePacketAdapter.java

@@ -2,21 +2,11 @@ package net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.object
 
 import net.megavex.scoreboardlibrary.api.objective.ObjectiveDisplaySlot;
 import net.megavex.scoreboardlibrary.api.objective.ObjectiveRenderType;
-import net.megavex.scoreboardlibrary.implementation.packetAdapter.PacketSender;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.PropertiesPacketType;
-import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.ComponentProvider;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.PacketAccessors;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.PacketAdapterProviderImpl;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.objective.ObjectiveConstants;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.objective.ObjectivePacketAdapter;
-import net.megavex.scoreboardlibrary.implementation.packetAdapter.util.reflect.ReflectUtil;
-import net.minecraft.network.chat.numbers.NumberFormat;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.network.protocol.game.ClientboundResetScorePacket;
-import net.minecraft.network.protocol.game.ClientboundSetDisplayObjectivePacket;
-import net.minecraft.network.protocol.game.ClientboundSetObjectivePacket;
-import net.minecraft.network.protocol.game.ClientboundSetScorePacket;
-import net.minecraft.server.ServerScoreboard;
-import net.minecraft.world.scores.criteria.ObjectiveCriteria;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -26,80 +16,90 @@ import java.util.Objects;
 import java.util.Optional;
 
 public abstract class AbstractObjectivePacketAdapter implements ObjectivePacketAdapter {
-  protected final PacketSender<Packet<?>> sender;
-  protected final ComponentProvider componentProvider;
+  protected final PacketAdapterProviderImpl provider;
   protected final String objectiveName;
-  private ClientboundSetObjectivePacket removePacket;
+  private Object removePacket;
 
-  public AbstractObjectivePacketAdapter(@NotNull PacketSender<Packet<?>> sender, @NotNull ComponentProvider componentProvider, @NotNull String objectiveName) {
-    this.sender = sender;
-    this.componentProvider = componentProvider;
+  public AbstractObjectivePacketAdapter(@NotNull PacketAdapterProviderImpl provider, @NotNull String objectiveName) {
+    this.provider = provider;
     this.objectiveName = objectiveName;
   }
 
+  @Override
+  public @NotNull String objectiveName() {
+    return objectiveName;
+  }
+
   @Override
   public void display(@NotNull Collection<Player> players, @NotNull ObjectiveDisplaySlot slot) {
-    sender.sendPacket(players, createDisplayPacket(slot));
+    provider.packetSender().sendPacket(players, createDisplayPacket(slot));
   }
 
   @Override
   public void remove(@NotNull Collection<Player> players) {
     if (removePacket == null) {
-      this.removePacket = ReflectUtil.getEmptyConstructor(ClientboundSetObjectivePacket.class).invoke();
+      this.removePacket = PacketAccessors.OBJECTIVE_PACKET_CONSTRUCTOR.invoke();
       PacketAccessors.OBJECTIVE_NAME_FIELD.set(removePacket, objectiveName);
       PacketAccessors.OBJECTIVE_MODE_FIELD.set(removePacket, ObjectiveConstants.MODE_REMOVE);
     }
-    sender.sendPacket(players, removePacket);
+    provider.packetSender().sendPacket(players, removePacket);
   }
 
   @Override
   public void removeScore(@NotNull Collection<Player> players, @NotNull String entry) {
-    Packet<?> packet;
+    Object packet;
     if (PacketAccessors.IS_1_20_3_OR_ABOVE) {
-      packet = new ClientboundResetScorePacket(entry, objectiveName);
+      packet = Objects.requireNonNull(PacketAccessors.RESET_SCORE_CONSTRUCTOR)
+        .invoke(entry, objectiveName);
     } else {
-      packet = Objects.requireNonNull(PacketAccessors.SCORE_1_20_2_CONSTRUCTOR)
-        .invoke(ServerScoreboard.Method.REMOVE, objectiveName, entry, 0);
+      packet = Objects.requireNonNull(PacketAccessors.SCORE_CONSTRUCTOR)
+        .invoke(PacketAccessors.SCORE_1_20_2_METHOD_REMOVE, objectiveName, entry, 0);
     }
-    sender.sendPacket(players, packet);
+    provider.packetSender().sendPacket(players, packet);
   }
 
-  protected @NotNull ClientboundSetDisplayObjectivePacket createDisplayPacket(@NotNull ObjectiveDisplaySlot displaySlot) {
-    ClientboundSetDisplayObjectivePacket packet;
+  protected @NotNull Object createDisplayPacket(@NotNull ObjectiveDisplaySlot displaySlot) {
+    Object packet;
     if (PacketAccessors.IS_1_20_2_OR_ABOVE) {
-      packet = new ClientboundSetDisplayObjectivePacket(DisplaySlotProvider.toNms(displaySlot), null);
-    } else {
-      packet = Objects.requireNonNull(PacketAccessors.DISPLAY_1_20_1_CONSTRUCTOR)
+      packet = Objects.requireNonNull(PacketAccessors.DISPLAY_CONSTRUCTOR)
+        .invoke(PacketAccessors.DISPLAY_SLOT_VALUES.get(ObjectiveConstants.displaySlotIndex(displaySlot)), null);
+    } else if (PacketAccessors.IS_1_17_OR_ABOVE){
+      packet = Objects.requireNonNull(PacketAccessors.DISPLAY_CONSTRUCTOR)
         .invoke(ObjectiveConstants.displaySlotIndex(displaySlot), null);
+    } else {
+      assert PacketAccessors.DISPLAY_SLOT != null;
+      packet = Objects.requireNonNull(PacketAccessors.DISPLAY_CONSTRUCTOR).invoke();
+      PacketAccessors.DISPLAY_SLOT.set(packet, ObjectiveConstants.displaySlotIndex(displaySlot));
     }
     PacketAccessors.DISPLAY_OBJECTIVE_NAME.set(packet, objectiveName);
     return packet;
   }
 
-  protected @NotNull ClientboundSetScorePacket createScorePacket(
+  protected @NotNull Object createScorePacket(
     @NotNull String entry,
     int value,
-    @Nullable net.minecraft.network.chat.Component nmsDisplay,
+    @Nullable Object nmsDisplay,
     @Nullable Object numberFormat
   ) {
     if (PacketAccessors.IS_1_20_5_OR_ABOVE) {
-      return new ClientboundSetScorePacket(entry, objectiveName, value, Optional.ofNullable(nmsDisplay), Optional.ofNullable((NumberFormat) numberFormat));
+      return Objects.requireNonNull(PacketAccessors.SCORE_CONSTRUCTOR)
+        .invoke(entry, objectiveName, value, Optional.ofNullable(nmsDisplay), Optional.ofNullable(numberFormat));
     } else if (PacketAccessors.IS_1_20_3_OR_ABOVE) {
-      return Objects.requireNonNull(PacketAccessors.SCORE_1_20_3_CONSTRUCTOR)
+      return Objects.requireNonNull(PacketAccessors.SCORE_CONSTRUCTOR)
         .invoke(entry, objectiveName, value, nmsDisplay, numberFormat);
     } else {
-      return Objects.requireNonNull(PacketAccessors.SCORE_1_20_2_CONSTRUCTOR)
-        .invoke(ServerScoreboard.Method.CHANGE, objectiveName, entry, value);
+      return Objects.requireNonNull(PacketAccessors.SCORE_CONSTRUCTOR)
+        .invoke(PacketAccessors.SCORE_1_20_2_METHOD_CHANGE, objectiveName, entry, value);
     }
   }
 
-  protected @NotNull ClientboundSetObjectivePacket createObjectivePacket(
+  protected @NotNull Object createObjectivePacket(
     @NotNull PropertiesPacketType packetType,
-    @NotNull net.minecraft.network.chat.Component nmsValue,
+    @NotNull Object nmsValue,
     @NotNull ObjectiveRenderType renderType,
     @Nullable Object numberFormat
   ) {
-    ClientboundSetObjectivePacket packet = PacketAccessors.OBJECTIVE_PACKET_CONSTRUCTOR.invoke();
+    Object packet = PacketAccessors.OBJECTIVE_PACKET_CONSTRUCTOR.invoke();
     PacketAccessors.OBJECTIVE_MODE_FIELD.set(packet, ObjectiveConstants.mode(packetType));
     PacketAccessors.OBJECTIVE_NAME_FIELD.set(packet, objectiveName);
     PacketAccessors.OBJECTIVE_VALUE_FIELD.set(packet, nmsValue);
@@ -115,16 +115,16 @@ public abstract class AbstractObjectivePacketAdapter implements ObjectivePacketA
       PacketAccessors.OBJECTIVE_NUMBER_FORMAT_FIELD.set(packet, value);
     }
 
-    ObjectiveCriteria.RenderType nmsRenderType;
+    Object nmsRenderType;
     switch (renderType) {
       case INTEGER:
-        nmsRenderType = ObjectiveCriteria.RenderType.INTEGER;
+        nmsRenderType = PacketAccessors.RENDER_TYPE_INTEGER;
         break;
       case HEARTS:
-        nmsRenderType = ObjectiveCriteria.RenderType.HEARTS;
+        nmsRenderType = PacketAccessors.RENDER_TYPE_HEARTS;
         break;
       default:
-        throw new IllegalStateException();
+        throw new IllegalStateException("unknown render type " + renderType);
     }
 
     PacketAccessors.OBJECTIVE_RENDER_TYPE_FIELD.set(packet, nmsRenderType);

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/modern/objective/PaperObjectivePacketAdapter.java

@@ -1,32 +1,29 @@
 package net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.objective;
 
-import io.papermc.paper.adventure.AdventureComponent;
 import net.kyori.adventure.text.Component;
 import net.megavex.scoreboardlibrary.api.objective.ObjectiveRenderType;
 import net.megavex.scoreboardlibrary.api.objective.ScoreFormat;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.PropertiesPacketType;
-import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.ComponentProvider;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.PacketAccessors;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.PacketAdapterProviderImpl;
-import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.util.NativeAdventureUtil;
-import net.minecraft.network.protocol.game.ClientboundSetObjectivePacket;
-import net.minecraft.network.protocol.game.ClientboundSetScorePacket;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.util.ModernComponentProvider;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
 
-public class PaperObjectivePacketAdapter extends AbstractObjectivePacketAdapter {
-  public PaperObjectivePacketAdapter(@NotNull PacketAdapterProviderImpl packetAdapter, @NotNull ComponentProvider componentProvider, @NotNull String objectiveName) {
-    super(packetAdapter, componentProvider, objectiveName);
+public final class PaperObjectivePacketAdapter extends AbstractObjectivePacketAdapter {
+  public PaperObjectivePacketAdapter(@NotNull PacketAdapterProviderImpl provider, @NotNull String objectiveName) {
+    super(provider, objectiveName);
   }
 
   @Override
   public void sendScore(@NotNull Collection<Player> players, @NotNull String entry, int value, @Nullable Component display, @Nullable ScoreFormat scoreFormat) {
-    net.minecraft.network.chat.Component nmsDisplay = display == null ? null : componentProvider.fromAdventure(display, null);
-    Object numberFormat = ScoreFormatConverter.convert(componentProvider, null, scoreFormat);
-    ClientboundSetScorePacket packet = createScorePacket(entry, value, nmsDisplay, numberFormat);
-    sender.sendPacket(players, packet);
+    Object nmsDisplay = display == null ? null : ModernComponentProvider.fromAdventure(display, null);
+    Object numberFormat = ScoreFormatConverter.convert(null, scoreFormat);
+    Object packet = createScorePacket(entry, value, nmsDisplay, numberFormat);
+    provider.packetSender().sendPacket(players, packet);
   }
 
   @Override
@@ -37,9 +34,9 @@ public class PaperObjectivePacketAdapter extends AbstractObjectivePacketAdapter
     @NotNull ObjectiveRenderType renderType,
     @Nullable ScoreFormat scoreFormat
   ) {
-    AdventureComponent nmsValue = NativeAdventureUtil.fromAdventureComponent(value);
-    Object numberFormat = ScoreFormatConverter.convert(componentProvider, null, scoreFormat);
-    ClientboundSetObjectivePacket packet = createObjectivePacket(packetType, nmsValue, renderType, numberFormat);
-    sender.sendPacket(players, packet);
+    Object nmsValue = PacketAccessors.fromAdventureComponent(value);
+    Object numberFormat = ScoreFormatConverter.convert(null, scoreFormat);
+    Object packet = createObjectivePacket(packetType, nmsValue, renderType, numberFormat);
+    provider.packetSender().sendPacket(players, packet);
   }
 }

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/modern/objective/ScoreFormatConverter.java

@@ -0,0 +1,64 @@
+package net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.objective;
+
+import net.megavex.scoreboardlibrary.api.objective.ScoreFormat;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.PacketAccessors;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.RelocatedGson;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.util.ModernComponentProvider;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.util.reflect.ConstructorAccessor;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.util.reflect.ReflectUtil;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Locale;
+import java.util.Optional;
+
+import static net.kyori.adventure.text.serializer.gson.GsonComponentSerializer.gson;
+
+public final class ScoreFormatConverter {
+  private static final Object STYLE_CODEC;
+  private static final Object BLANK;
+  private static final ConstructorAccessor<?> STYLED_CONSTRUCTOR;
+  private static final ConstructorAccessor<?> FIXED_CONSTRUCTOR;
+
+  static {
+    if (PacketAccessors.IS_1_20_3_OR_ABOVE) {
+      STYLE_CODEC = ReflectUtil.findFieldUnchecked(PacketAccessors.STYLE_SERIALIZER_CLASS, 0, PacketAccessors.CODEC_CLASS, true).get(null);
+
+      Class<?> blankFormatClass = ReflectUtil.getClassOrThrow("net.minecraft.network.chat.numbers.BlankFormat");
+      BLANK = ReflectUtil.findFieldUnchecked(blankFormatClass, 0, blankFormatClass, true).get(null);
+
+      Class<?> styledFormatClass = ReflectUtil.getClassOrThrow("net.minecraft.network.chat.numbers.StyledFormat");
+      STYLED_CONSTRUCTOR = ReflectUtil.findConstructor(styledFormatClass, PacketAccessors.STYLE_CLASS);
+
+      Class<?> fixedFormatClass = ReflectUtil.getClassOrThrow("net.minecraft.network.chat.numbers.FixedFormat");
+      FIXED_CONSTRUCTOR = ReflectUtil.findConstructor(fixedFormatClass, PacketAccessors.COMPONENT_CLASS);
+    } else {
+      STYLE_CODEC = null;
+      BLANK = null;
+      STYLED_CONSTRUCTOR = null;
+      FIXED_CONSTRUCTOR = null;
+    }
+  }
+
+  private ScoreFormatConverter() {
+  }
+
+  public static @Nullable Object convert(@Nullable Locale locale, @Nullable ScoreFormat format) {
+    if (format == null || !PacketAccessors.IS_1_20_3_OR_ABOVE) {
+      return null;
+    }
+
+    if (format == ScoreFormat.blank()) {
+      return BLANK;
+    } else if (format instanceof ScoreFormat.Styled) {
+      Object json = RelocatedGson.convertToServerGson(gson().serializer().toJsonTree(((ScoreFormat.Styled) format).style()));
+      Object result = PacketAccessors.CODEC_PARSE.invoke(STYLE_CODEC, PacketAccessors.JSON_OPS, json);
+      //noinspection OptionalGetWithoutIsPresent
+      Object style = ((Optional<?>) PacketAccessors.RESULT_UNWRAP_METHOD.invoke(result)).get();
+      return STYLED_CONSTRUCTOR.invoke(style);
+    } else if (format instanceof ScoreFormat.Fixed) {
+      return FIXED_CONSTRUCTOR.invoke(ModernComponentProvider.fromAdventure(((ScoreFormat.Fixed) format).content(), locale));
+    } else {
+      throw new IllegalArgumentException("Invalid score format: " + format);
+    }
+  }
+}

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/modern/objective/SpigotObjectivePacketAdapter.java

@@ -4,8 +4,8 @@ import net.kyori.adventure.text.Component;
 import net.megavex.scoreboardlibrary.api.objective.ObjectiveRenderType;
 import net.megavex.scoreboardlibrary.api.objective.ScoreFormat;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.PropertiesPacketType;
-import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.ComponentProvider;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.PacketAdapterProviderImpl;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.util.ModernComponentProvider;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.util.LocalePacketUtil;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
@@ -13,16 +13,16 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
 
-public class SpigotObjectivePacketAdapter extends AbstractObjectivePacketAdapter {
-  public SpigotObjectivePacketAdapter(@NotNull PacketAdapterProviderImpl packetAdapter, @NotNull ComponentProvider componentProvider, @NotNull String objectiveName) {
-    super(packetAdapter, componentProvider, objectiveName);
+public final class SpigotObjectivePacketAdapter extends AbstractObjectivePacketAdapter {
+  public SpigotObjectivePacketAdapter(@NotNull PacketAdapterProviderImpl provider, @NotNull String objectiveName) {
+    super(provider, objectiveName);
   }
 
   @Override
   public void sendScore(@NotNull Collection<Player> players, @NotNull String entry, int value, @Nullable Component display, @Nullable ScoreFormat scoreFormat) {
-    LocalePacketUtil.sendLocalePackets(sender, players, locale -> {
-      net.minecraft.network.chat.Component nmsDisplay = display == null ? null : componentProvider.fromAdventure(display, locale);
-      Object numberFormat = ScoreFormatConverter.convert(componentProvider, locale, scoreFormat);
+    LocalePacketUtil.sendLocalePackets(provider.packetSender(), players, locale -> {
+      Object nmsDisplay = display == null ? null : ModernComponentProvider.fromAdventure(display, locale);
+      Object numberFormat = ScoreFormatConverter.convert(locale, scoreFormat);
       return createScorePacket(entry, value, nmsDisplay, numberFormat);
     });
   }
@@ -36,11 +36,11 @@ public class SpigotObjectivePacketAdapter extends AbstractObjectivePacketAdapter
     @Nullable ScoreFormat scoreFormat
   ) {
     LocalePacketUtil.sendLocalePackets(
-      sender,
+      provider.packetSender(),
       players,
       locale -> {
-        Object numberFormat = ScoreFormatConverter.convert(componentProvider, locale, scoreFormat);
-        return createObjectivePacket(packetType, componentProvider.fromAdventure(value, locale), renderType, numberFormat);
+        Object numberFormat = ScoreFormatConverter.convert(locale, scoreFormat);
+        return createObjectivePacket(packetType, ModernComponentProvider.fromAdventure(value, locale), renderType, numberFormat);
       }
     );
   }

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/modern/team/AbstractTeamsPacketAdapterImpl.java

@@ -0,0 +1,102 @@
+package net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.team;
+
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.ImmutableTeamProperties;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.PacketAccessors;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.PacketAdapterProviderImpl;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.team.EntriesPacketType;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.team.TeamConstants;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.team.TeamDisplayPacketAdapter;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.team.TeamsPacketAdapter;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.UnknownNullability;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Locale;
+import java.util.Optional;
+
+public abstract class AbstractTeamsPacketAdapterImpl implements TeamsPacketAdapter {
+  protected final PacketAdapterProviderImpl provider;
+  protected final String teamName;
+  private Object removePacket;
+
+  public AbstractTeamsPacketAdapterImpl(@NotNull PacketAdapterProviderImpl provider, @NotNull String teamName) {
+    this.provider = provider;
+    this.teamName = teamName;
+  }
+
+  @Override
+  public @NotNull TeamDisplayPacketAdapter createLegacyTeamDisplayAdapter(@NotNull ImmutableTeamProperties<String> properties) {
+    return new LegacyTeamDisplayPacketAdapter(provider, teamName, properties);
+  }
+
+  public abstract class TeamDisplayPacketAdapterImpl implements TeamDisplayPacketAdapter {
+    protected final ImmutableTeamProperties<Component> properties;
+
+    public TeamDisplayPacketAdapterImpl(ImmutableTeamProperties<Component> properties) {
+      this.properties = properties;
+    }
+
+    @Override
+    public void removeTeam(@NotNull Iterable<Player> players) {
+      if (removePacket == null) {
+        if (PacketAccessors.IS_1_17_OR_ABOVE) {
+          removePacket = PacketAccessors.TEAM_PACKET_CONSTRUCTOR.invoke(
+            teamName,
+            TeamConstants.MODE_REMOVE,
+            null,
+            Collections.emptyList()
+          );
+        } else {
+          assert PacketAccessors.TEAM_NAME_FIELD != null;
+          assert PacketAccessors.TEAM_MODE_FIELD != null;
+
+          removePacket = PacketAccessors.TEAM_PACKET_CONSTRUCTOR.invoke();
+          PacketAccessors.TEAM_NAME_FIELD.set(removePacket, teamName);
+          PacketAccessors.TEAM_MODE_FIELD.set(removePacket, TeamConstants.MODE_REMOVE);
+        }
+      }
+      provider.packetSender().sendPacket(players, removePacket);
+    }
+
+    @Override
+    public void sendEntries(@NotNull EntriesPacketType packetType, @NotNull Collection<Player> players, @NotNull Collection<String> entries) {
+      if (PacketAccessors.IS_1_17_OR_ABOVE) {
+        Object packet = PacketAccessors.TEAM_PACKET_CONSTRUCTOR.invoke(
+          teamName,
+          TeamConstants.mode(packetType),
+          Optional.empty(),
+          entries
+        );
+        provider.packetSender().sendPacket(players, packet);
+      } else {
+        assert PacketAccessors.TEAM_NAME_FIELD != null;
+        assert PacketAccessors.TEAM_MODE_FIELD != null;
+        assert PacketAccessors.TEAM_ENTRIES_FIELD != null;
+
+        Object packet = PacketAccessors.TEAM_PACKET_CONSTRUCTOR.invoke();
+        PacketAccessors.TEAM_NAME_FIELD.set(packet, teamName);
+        PacketAccessors.TEAM_MODE_FIELD.set(packet, TeamConstants.mode(packetType));
+        PacketAccessors.TEAM_ENTRIES_FIELD.set(packet, entries);
+        provider.packetSender().sendPacket(players, packet);
+      }
+    }
+
+    protected void fillParameters(@NotNull Object parameters, @UnknownNullability Locale locale) {
+      if (PacketAccessors.IS_1_21_5_OR_ABOVE) {
+        PacketAccessors.NAME_TAG_VISIBILITY_FIELD.set(parameters, PacketAccessors.nameTagVisibility(properties.nameTagVisibility()));
+        PacketAccessors.COLLISION_RULE_FIELD.set(parameters, PacketAccessors.collisionRule(properties.collisionRule()));
+      } else {
+        PacketAccessors.NAME_TAG_VISIBILITY_FIELD.set(parameters, properties.nameTagVisibility().key());
+        PacketAccessors.COLLISION_RULE_FIELD.set(parameters, properties.collisionRule().key());
+      }
+
+      Object color = PacketAccessors.NMS_CHAT_FORMATTING_MAP.get(properties.playerColor() != null ? properties.playerColor() : NamedTextColor.WHITE);
+      PacketAccessors.COLOR_FIELD.set(parameters, color);
+      PacketAccessors.OPTIONS_FIELD.set(parameters, properties.packOptions());
+    }
+  }
+}

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/modern/team/LegacyTeamDisplayPacketAdapter.java

@@ -0,0 +1,162 @@
+package net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.team;
+
+import com.viaversion.viaversion.api.ViaAPI;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.api.protocol.packet.PacketType;
+import com.viaversion.viaversion.api.protocol.packet.State;
+import com.viaversion.viaversion.api.protocol.packet.provider.PacketTypeMap;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
+import com.viaversion.viaversion.api.type.Types;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import net.megavex.scoreboardlibrary.implementation.commons.LegacyFormatUtil;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.ImmutableTeamProperties;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.PropertiesPacketType;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.PacketAdapterProviderImpl;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.team.EntriesPacketType;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.team.TeamConstants;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.team.TeamDisplayPacketAdapter;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+
+import static net.megavex.scoreboardlibrary.implementation.commons.LegacyFormatUtil.limitLegacyText;
+
+public final class LegacyTeamDisplayPacketAdapter implements TeamDisplayPacketAdapter {
+  private final PacketAdapterProviderImpl provider;
+  private final String teamName;
+  private final ImmutableTeamProperties<String> properties;
+
+  public LegacyTeamDisplayPacketAdapter(final PacketAdapterProviderImpl provider, final String teamName, final ImmutableTeamProperties<String> properties) {
+    this.provider = provider;
+    this.teamName = teamName;
+    this.properties = properties;
+  }
+
+  // have to send every team packet from viaversion otherwise it won't work on 1.7 players
+  // because ViaRewind's 1.8->1.7 conversion cancels team packets it doesn't recognize and fucks everything up
+  // https://github.com/ViaVersion/ViaRewind/blob/e0c1f5311521bf062bbdae9f96dc9149d8c13e28/common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/rewriter/ScoreboardPacketRewriter1_8.java#L179
+
+  @Override
+  public void removeTeam(@NotNull Iterable<Player> players) {
+    ViaAPI<Player> via = provider.via();
+    assert via != null;
+    for (final Player player : players) {
+      final UserConnection conn = via.getConnection(player.getUniqueId());
+      if (conn == null) continue;
+
+      final ByteBuf buf = Unpooled.buffer(128);
+      Types.VAR_INT.writePrimitive(buf, teamsPacketId(player, conn));
+      Types.STRING.write(buf, teamName);
+      Types.BYTE.writePrimitive(buf, (byte) TeamConstants.MODE_REMOVE);
+
+      via.sendRawPacket(player.getUniqueId(), buf);
+    }
+  }
+
+  @Override
+  public void sendEntries(@NotNull EntriesPacketType packetType, @NotNull Collection<Player> players, @NotNull Collection<String> entries) {
+    ViaAPI<Player> via = provider.via();
+    assert via != null;
+    for (final Player player : players) {
+      final UserConnection conn = via.getConnection(player.getUniqueId());
+      if (conn == null) continue;
+
+      final ByteBuf buf = Unpooled.buffer(128);
+      Types.VAR_INT.writePrimitive(buf, teamsPacketId(player, conn));
+
+      Types.STRING.write(buf, teamName);
+
+      Types.BYTE.writePrimitive(buf, (byte) TeamConstants.mode(packetType));
+
+      if (conn.getProtocolInfo().protocolVersion().olderThanOrEqualTo(ProtocolVersion.v1_7_6)) {
+        Types.SHORT.writePrimitive(buf, (short) properties.syncedEntries().size());
+      } else {
+        Types.VAR_INT.writePrimitive(buf, properties.syncedEntries().size());
+      }
+
+      for (final String entry : entries) {
+        Types.STRING.write(buf, entry);
+      }
+
+      via.sendRawPacket(player.getUniqueId(), buf);
+    }
+  }
+
+  @Override
+  public void sendProperties(@NotNull PropertiesPacketType packetType, @NotNull Collection<Player> players) {
+    ViaAPI<Player> via = provider.via();
+    assert via != null;
+    for (final Player player : players) {
+      final UserConnection conn = via.getConnection(player.getUniqueId());
+      if (conn == null) continue;
+
+      final ByteBuf buf = Unpooled.buffer(128);
+      Types.VAR_INT.writePrimitive(buf, teamsPacketId(player, conn));
+
+      Types.STRING.write(buf, teamName);
+
+      Types.BYTE.writePrimitive(buf, (byte) TeamConstants.mode(packetType));
+
+      final String displayName = limitLegacyText(properties.displayName(), TeamConstants.DISPLAY_NAME_LEGACY_LIMIT);
+      final String prefix = limitLegacyText(properties.prefix(), TeamConstants.PREFIX_SUFFIX_LEGACY_LIMIT);
+      final String suffix = limitLegacyText(properties.suffix(), TeamConstants.PREFIX_SUFFIX_LEGACY_LIMIT);
+      Types.STRING.write(buf, displayName);
+      Types.STRING.write(buf, prefix);
+      Types.STRING.write(buf, suffix);
+
+      Types.BYTE.writePrimitive(buf, (byte) properties.packOptions());
+
+      final boolean is1_7 = conn.getProtocolInfo().protocolVersion().olderThanOrEqualTo(ProtocolVersion.v1_7_6);
+      if (!is1_7) {
+        Types.STRING.write(buf, properties.nameTagVisibility().key());
+      }
+
+      if (conn.getProtocolInfo().protocolVersion().newerThanOrEqualTo(ProtocolVersion.v1_9)) {
+        Types.STRING.write(buf, properties.collisionRule().key());
+      }
+
+      if (!is1_7) {
+        Types.BYTE.writePrimitive(buf, (byte) LegacyFormatUtil.getIndex(properties.playerColor()));
+      }
+
+      if (packetType == PropertiesPacketType.CREATE) {
+        if (is1_7) {
+          Types.SHORT.writePrimitive(buf, (short) properties.syncedEntries().size());
+        } else {
+          Types.VAR_INT.writePrimitive(buf, properties.syncedEntries().size());
+        }
+
+        for (final String entry : properties.syncedEntries()) {
+          Types.STRING.write(buf, entry);
+        }
+      }
+
+      via.sendRawPacket(player.getUniqueId(), buf);
+    }
+  }
+
+  private @NotNull Integer teamsPacketId(final Player player, final UserConnection conn) {
+    ViaAPI<Player> via = provider.via();
+    assert via != null;
+
+    Integer teamsPacketId = this.provider.viaTeamPacketIds().get(player);
+    if (teamsPacketId != null) return teamsPacketId;
+
+    for (final Protocol<?, ?, ?, ?> proto : conn.getProtocolInfo().getPipeline().pipes()) {
+      final PacketTypeMap<?> map = proto.getPacketTypesProvider().mappedClientboundPacketTypes().get(State.PLAY);
+      if (map == null) continue;
+      final PacketType type = map.typeByName("SET_PLAYER_TEAM");
+      if (type == null) continue;
+      teamsPacketId = type.getId();
+      break;
+    }
+    if (teamsPacketId == null) {
+      throw new IllegalStateException("team packet id for " + conn.getProtocolInfo().protocolVersion() + " not found");
+    }
+    this.provider.viaTeamPacketIds().put(player, teamsPacketId);
+    return teamsPacketId;
+  }
+}

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/modern/team/PaperTeamsPacketAdapterImpl.java

@@ -0,0 +1,106 @@
+package net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.team;
+
+import com.google.common.collect.ImmutableList;
+import net.kyori.adventure.text.Component;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.ImmutableTeamProperties;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.PropertiesPacketType;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.PacketAccessors;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.PacketAdapterProviderImpl;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.team.TeamConstants;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.team.TeamDisplayPacketAdapter;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.UnknownNullability;
+
+import java.util.Collection;
+import java.util.Locale;
+import java.util.Optional;
+
+public final class PaperTeamsPacketAdapterImpl extends AbstractTeamsPacketAdapterImpl {
+  public PaperTeamsPacketAdapterImpl(PacketAdapterProviderImpl provider, @NotNull String teamName) {
+    super(provider, teamName);
+  }
+
+  @Override
+  public @NotNull TeamDisplayPacketAdapter createTeamDisplayAdapter(@NotNull ImmutableTeamProperties<Component> properties) {
+    return new TeamDisplayPacketAdapterImpl(properties);
+  }
+
+  private class TeamDisplayPacketAdapterImpl extends AbstractTeamsPacketAdapterImpl.TeamDisplayPacketAdapterImpl {
+    private final Object parameters;
+    private Object createPacket = null;
+    private Object updatePacket = null;
+
+    public TeamDisplayPacketAdapterImpl(@NotNull ImmutableTeamProperties<Component> properties) {
+      super(properties);
+      if (PacketAccessors.IS_1_17_OR_ABOVE) {
+        this.parameters = PacketAccessors.PARAMETERS_CONSTRUCTOR.invoke();
+      } else {
+        this.parameters = null;
+      }
+    }
+
+    @Override
+    public void updateTeamPackets() {
+      if (parameters != null) {
+        fillParameters(parameters, null);
+      }
+      createPacket = null;
+      updatePacket = null;
+    }
+
+    @Override
+    public void sendProperties(@NotNull PropertiesPacketType packetType, @NotNull Collection<Player> players) {
+      if (createPacket == null || updatePacket == null) {
+        Collection<String> entries = ImmutableList.copyOf(properties.syncedEntries());
+        if (parameters != null) {
+          createPacket = PacketAccessors.TEAM_PACKET_CONSTRUCTOR.invoke(
+            teamName,
+            TeamConstants.MODE_CREATE,
+            Optional.of(parameters),
+            entries
+          );
+
+          updatePacket = PacketAccessors.TEAM_PACKET_CONSTRUCTOR.invoke(
+            teamName,
+            TeamConstants.MODE_UPDATE,
+            Optional.of(parameters),
+            entries
+          );
+        } else {
+          assert PacketAccessors.TEAM_NAME_FIELD != null;
+          assert PacketAccessors.TEAM_MODE_FIELD != null;
+
+          createPacket = PacketAccessors.TEAM_PACKET_CONSTRUCTOR.invoke();
+          PacketAccessors.TEAM_NAME_FIELD.set(createPacket, teamName);
+          PacketAccessors.TEAM_MODE_FIELD.set(createPacket, TeamConstants.MODE_CREATE);
+          PacketAccessors.TEAM_ENTRIES_FIELD.set(createPacket, entries);
+          fillParameters(createPacket, null);
+
+          updatePacket = PacketAccessors.TEAM_PACKET_CONSTRUCTOR.invoke();
+          PacketAccessors.TEAM_NAME_FIELD.set(updatePacket, teamName);
+          PacketAccessors.TEAM_MODE_FIELD.set(updatePacket, TeamConstants.MODE_UPDATE);
+          PacketAccessors.TEAM_ENTRIES_FIELD.set(updatePacket, entries);
+          fillParameters(updatePacket, null);
+        }
+      }
+
+      switch (packetType) {
+        case CREATE:
+          provider.packetSender().sendPacket(players, createPacket);
+          break;
+        case UPDATE:
+          provider.packetSender().sendPacket(players, updatePacket);
+          break;
+      }
+    }
+
+    @Override
+    protected void fillParameters(@NotNull Object parameters, @UnknownNullability Locale locale) {
+      super.fillParameters(parameters, locale);
+      PacketAccessors.DISPLAY_NAME_FIELD.set(parameters, PacketAccessors.fromAdventureComponent(properties.displayName()));
+      PacketAccessors.PREFIX_FIELD.set(parameters, PacketAccessors.fromAdventureComponent(properties.prefix()));
+      PacketAccessors.SUFFIX_FIELD.set(parameters, PacketAccessors.fromAdventureComponent(properties.suffix()));
+    }
+  }
+}

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/modern/team/SpigotTeamsPacketAdapter.java

@@ -0,0 +1,80 @@
+package net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.team;
+
+import com.google.common.collect.ImmutableList;
+import net.kyori.adventure.text.Component;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.ImmutableTeamProperties;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.PropertiesPacketType;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.PacketAccessors;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.PacketAdapterProviderImpl;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.util.ModernComponentProvider;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.team.TeamConstants;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.team.TeamDisplayPacketAdapter;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.util.LocalePacketUtil;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.UnknownNullability;
+
+import java.util.Collection;
+import java.util.Locale;
+import java.util.Optional;
+
+public final class SpigotTeamsPacketAdapter extends AbstractTeamsPacketAdapterImpl {
+  public SpigotTeamsPacketAdapter(PacketAdapterProviderImpl provider, @NotNull String teamName) {
+    super(provider, teamName);
+  }
+
+  @Override
+  public @NotNull TeamDisplayPacketAdapter createTeamDisplayAdapter(@NotNull ImmutableTeamProperties<Component> properties) {
+    return new TeamDisplayPacketAdapterImpl(properties);
+  }
+
+  private class TeamDisplayPacketAdapterImpl extends AbstractTeamsPacketAdapterImpl.TeamDisplayPacketAdapterImpl {
+    public TeamDisplayPacketAdapterImpl(ImmutableTeamProperties<Component> properties) {
+      super(properties);
+    }
+
+    @Override
+    public void sendProperties(@NotNull PropertiesPacketType packetType, @NotNull Collection<Player> players) {
+      Collection<String> entries = ImmutableList.copyOf(properties.syncedEntries());
+      LocalePacketUtil.sendLocalePackets(
+        provider.packetSender(),
+        players,
+        locale -> {
+
+          if (PacketAccessors.IS_1_17_OR_ABOVE) {
+            assert PacketAccessors.PARAMETERS_CONSTRUCTOR != null;
+            Object parameters = PacketAccessors.PARAMETERS_CONSTRUCTOR.invoke();
+            fillParameters(parameters, locale);
+
+            return PacketAccessors.TEAM_PACKET_CONSTRUCTOR.invoke(
+              teamName,
+              TeamConstants.mode(packetType),
+              Optional.of(parameters),
+              entries
+            );
+          } else {
+            assert PacketAccessors.TEAM_NAME_FIELD != null;
+            assert PacketAccessors.TEAM_MODE_FIELD != null;
+            assert PacketAccessors.TEAM_ENTRIES_FIELD != null;
+
+            Object packet = PacketAccessors.TEAM_PACKET_CONSTRUCTOR.invoke();
+            PacketAccessors.TEAM_NAME_FIELD.set(packet, teamName);
+            PacketAccessors.TEAM_MODE_FIELD.set(packet, TeamConstants.mode(packetType));
+            PacketAccessors.TEAM_ENTRIES_FIELD.set(packet, entries);
+            fillParameters(packet, locale);
+            return packet;
+          }
+        }
+      );
+    }
+
+    @Override
+    protected void fillParameters(@NotNull Object parameters, @UnknownNullability Locale locale) {
+      super.fillParameters(parameters, locale);
+
+      PacketAccessors.DISPLAY_NAME_FIELD.set(parameters, ModernComponentProvider.fromAdventure(properties.displayName(), locale));
+      PacketAccessors.PREFIX_FIELD.set(parameters, ModernComponentProvider.fromAdventure(properties.prefix(), locale));
+      PacketAccessors.SUFFIX_FIELD.set(parameters, ModernComponentProvider.fromAdventure(properties.suffix(), locale));
+    }
+  }
+}

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/modern/util/ModernComponentProvider.java

@@ -0,0 +1,117 @@
+package net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.util;
+
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.translation.GlobalTranslator;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.PacketAccessors;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.RelocatedGson;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.util.reflect.MinecraftClasses;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.util.reflect.ReflectUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Locale;
+import java.util.Optional;
+
+import static net.kyori.adventure.text.serializer.gson.GsonComponentSerializer.gson;
+
+public final class ModernComponentProvider {
+  public static final boolean IS_NATIVE_ADVENTURE;
+
+  private static final Object MINECRAFT_REGISTRY;
+  private static final Object CODEC;
+
+  private static final MethodHandle FROM_JSON_METHOD;
+
+  private ModernComponentProvider() {
+  }
+
+  static {
+    // Hide from relocation checkers
+    String notRelocatedPackage = "net.ky".concat("ori.adventure.text");
+
+    // The native adventure optimisations only work when the adventure library isn't relocated
+    IS_NATIVE_ADVENTURE = PacketAccessors.ADVENTURE_COMPONENT_CLASS != null && Component.class.getPackage().getName().equals(notRelocatedPackage);
+
+    if (PacketAccessors.IS_1_20_5_OR_ABOVE) {
+      Class<?> craftRegistry;
+      try {
+        craftRegistry = Class.forName(MinecraftClasses.craftBukkit("CraftRegistry"));
+      } catch (ClassNotFoundException e) {
+        throw new ExceptionInInitializerError(e);
+      }
+
+      try {
+        Method method = craftRegistry.getMethod("getMinecraftRegistry");
+        MINECRAFT_REGISTRY = method.invoke(null);
+      } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
+        throw new RuntimeException(e);
+      }
+    } else {
+      MINECRAFT_REGISTRY = null;
+    }
+
+    if (PacketAccessors.IS_1_21_6_OR_ABOVE) {
+      CODEC = ReflectUtil.findFieldUnchecked(PacketAccessors.COMPONENT_SERIALIZATION_CLASS, 0, PacketAccessors.CODEC_CLASS, true).get(null);
+      FROM_JSON_METHOD = null;
+    } else {
+      MethodHandle handle = null;
+      for (Method method : PacketAccessors.CHAT_SERIALIZER_CLASS.getMethods()) {
+        if (method.getParameterCount() >= 1 &&
+          method.getParameterCount() <= 2 &&
+          method.getParameterTypes()[0].getName().equals(RelocatedGson.SERVER_GSON_PKG + ".JsonElement")
+        ) {
+          try {
+            handle = MethodHandles.lookup().unreflect(method);
+            break;
+          } catch (IllegalAccessException e) {
+            throw new ExceptionInInitializerError(e);
+          }
+        }
+      }
+
+      if (handle == null) {
+        throw new ExceptionInInitializerError("failed to find chat component fromJson method");
+      }
+
+      FROM_JSON_METHOD = handle;
+      CODEC = null;
+    }
+  }
+
+  public static @NotNull Object fromAdventure(@NotNull Component adventure, @Nullable Locale locale) {
+    if (IS_NATIVE_ADVENTURE) {
+      return PacketAccessors.fromAdventureComponent(adventure);
+    }
+
+    Component translated = adventure;
+    if (locale != null) {
+      translated = GlobalTranslator.render(adventure, locale);
+    }
+
+    Object json = RelocatedGson.convertToServerGson(gson().serializeToTree(translated));
+
+    if (FROM_JSON_METHOD == null) {
+      // 1.21.6+
+      Object result = PacketAccessors.CODEC_PARSE.invoke(CODEC, PacketAccessors.JSON_OPS, json);
+      //noinspection OptionalGetWithoutIsPresent
+      return ((Optional<?>) PacketAccessors.RESULT_UNWRAP_METHOD.invoke(result)).get();
+    }
+
+    Object[] args;
+    if (MINECRAFT_REGISTRY != null) {
+      args = new Object[]{json, MINECRAFT_REGISTRY};
+    } else {
+      args = new Object[]{json};
+    }
+
+    try {
+      return FROM_JSON_METHOD.invokeWithArguments(args);
+    } catch (Throwable e) {
+      throw new RuntimeException(e);
+    }
+  }
+}

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/modern/util/ModernPacketSender.java

@@ -0,0 +1,106 @@
+package net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.util;
+
+import com.viaversion.viaversion.api.ViaAPI;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import io.netty.channel.Channel;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.PacketSender;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.modern.PacketAccessors;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.util.reflect.MinecraftClasses;
+import org.bukkit.entity.Player;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.reflect.Field;
+
+public final class ModernPacketSender implements PacketSender<Object> {
+  private static final MethodHandle GET_HANDLE;
+  private static final MethodHandle PLAYER_CONNECTION;
+  private static final MethodHandle SEND_PACKET;
+
+  private final ViaAPI<Player> via;
+
+  public ModernPacketSender(final ViaAPI<Player> via) {
+    this.via = via;
+  }
+
+  static {
+    Class<?> craftPlayer;
+    try {
+      craftPlayer = Class.forName(MinecraftClasses.craftBukkit("entity.CraftPlayer"));
+    } catch (ClassNotFoundException e) {
+      throw new ExceptionInInitializerError(e);
+    }
+
+    MethodHandles.Lookup lookup = MethodHandles.publicLookup();
+    MethodType methodType = MethodType.methodType(PacketAccessors.SERVER_PLAYER_CLASS);
+    try {
+      GET_HANDLE = lookup.findVirtual(craftPlayer, "getHandle", methodType);
+    } catch (NoSuchMethodException | IllegalAccessException e) {
+      throw new ExceptionInInitializerError(e);
+    }
+
+    MethodHandle playerConnection = null;
+    for (Field field : PacketAccessors.SERVER_PLAYER_CLASS.getFields()) {
+      if (field.getType() == PacketAccessors.PLAYER_CONNECTION_CLASS) {
+        try {
+          playerConnection = lookup.unreflectGetter(field);
+        } catch (IllegalAccessException e) {
+          throw new ExceptionInInitializerError(e);
+        }
+      }
+    }
+
+    if (playerConnection == null) {
+      throw new ExceptionInInitializerError("failed to find player connection field");
+    }
+    PLAYER_CONNECTION = playerConnection;
+
+    MethodType sendMethodType = MethodType.methodType(void.class, PacketAccessors.PKT_CLASS);
+    MethodHandle sendPacket = null;
+
+    String[] sendPacketNames = {"a", "sendPacket", "b", "send"};
+    for (String name : sendPacketNames) {
+      try {
+        sendPacket = lookup.findVirtual(PacketAccessors.PLAYER_CONNECTION_CLASS, name, sendMethodType);
+      } catch (NoSuchMethodException ignored) {
+      } catch (IllegalAccessException e) {
+        throw new ExceptionInInitializerError(e);
+      }
+    }
+
+    if (sendPacket == null) {
+      throw new ExceptionInInitializerError(new RuntimeException("Couldn't find send packet method"));
+    }
+
+    SEND_PACKET = sendPacket;
+  }
+
+  @Override
+  public void sendPacket(Player player, Object packet) {
+    if (this.via != null) {
+      final UserConnection conn = this.via.getConnection(player.getUniqueId());
+      if (conn != null) {
+        final Channel channel = conn.getChannel();
+        if (channel != null) {
+          // Paper has some "network optimization" patch that makes the NMS sendPacket method
+          // not always send the packet immediately to the player's netty channel,
+          // and this is a problem when we send some packets using ViaVersion API because it always sends
+          // the packet to the channel immediately, so the packet order between NMS and ViaVersion API can
+          // get messed up. So for ViaVersion players we send the packet directly to the player's channel
+          // bypassing Paper logic to work around this. Fortunately ViaVersion provides easy access to the player's channel.
+          channel.eventLoop().execute(() -> channel.writeAndFlush(packet));
+          return;
+        }
+      }
+    }
+
+    try {
+      Object handle = GET_HANDLE.invoke(player);
+      Object connection = PLAYER_CONNECTION.invoke(handle);
+      SEND_PACKET.invoke(connection, packet);
+    } catch (Throwable e) {
+      throw new IllegalStateException("couldn't send packet to player", e);
+    }
+  }
+}

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/objective/ObjectiveConstants.java

@@ -28,11 +28,15 @@ public final class ObjectiveConstants {
   }
 
   public static int displaySlotIndex(@NotNull ObjectiveDisplaySlot slot) {
+    return displaySlotIndex(slot, true);
+  }
+
+  public static int displaySlotIndex(@NotNull ObjectiveDisplaySlot slot, boolean isAbove1_8) {
     if (slot instanceof ObjectiveDisplaySlot.PlayerList) {
       return 0;
     }
 
-    if (slot instanceof ObjectiveDisplaySlot.Sidebar) {
+    if (slot instanceof ObjectiveDisplaySlot.Sidebar || (!isAbove1_8 && slot instanceof ObjectiveDisplaySlot.TeamSidebar)) {
       return 1;
     }
 

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/objective/ObjectivePacketAdapter.java

@@ -12,6 +12,8 @@ import org.jetbrains.annotations.Nullable;
 import java.util.Collection;
 
 public interface ObjectivePacketAdapter {
+  @NotNull String objectiveName();
+
   void display(@NotNull Collection<Player> players, @NotNull ObjectiveDisplaySlot slot);
 
   void sendProperties(

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/team/TeamConstants.java

@@ -4,7 +4,8 @@ import net.megavex.scoreboardlibrary.implementation.packetAdapter.PropertiesPack
 import org.jetbrains.annotations.NotNull;
 
 public final class TeamConstants {
-  public static final int LEGACY_CHAR_LIMIT = 16;
+  public static final int DISPLAY_NAME_LEGACY_LIMIT = 32;
+  public static final int PREFIX_SUFFIX_LEGACY_LIMIT = 16;
 
   public static final int MODE_CREATE = 0,
     MODE_REMOVE = 1,

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/team/TeamDisplayPacketAdapter.java

@@ -7,7 +7,9 @@ import org.jetbrains.annotations.NotNull;
 import java.util.Collection;
 
 public interface TeamDisplayPacketAdapter {
-  default void updateTeamPackets(@NotNull Collection<String> entries) {
+  void removeTeam(@NotNull Iterable<Player> players);
+
+  default void updateTeamPackets() {
   }
 
   void sendEntries(@NotNull EntriesPacketType packetType, @NotNull Collection<Player> players, @NotNull Collection<String> entries);

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/team/TeamsPacketAdapter.java

@@ -6,8 +6,6 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 public interface TeamsPacketAdapter {
-  void removeTeam(@NotNull Iterable<Player> players);
-
   @NotNull TeamDisplayPacketAdapter createTeamDisplayAdapter(@NotNull ImmutableTeamProperties<Component> properties);
 
   default @NotNull TeamDisplayPacketAdapter createLegacyTeamDisplayAdapter(@NotNull ImmutableTeamProperties<String> properties) {

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/util/LocalePacketUtil.java

@@ -1,12 +1,12 @@
 package net.megavex.scoreboardlibrary.implementation.packetAdapter.util;
 
-import net.megavex.scoreboardlibrary.implementation.commons.CollectionProvider;
 import net.megavex.scoreboardlibrary.implementation.commons.LocaleProvider;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.PacketSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.function.Function;
@@ -31,7 +31,7 @@ public final class LocalePacketUtil {
       return;
     }
 
-    Map<Locale, P> map = CollectionProvider.map(1);
+    Map<Locale, P> map = new HashMap<>(1);
     for (Player player : players) {
       Locale locale = LocaleProvider.locale(player);
       P packet = map.computeIfAbsent(locale, i -> packetFunction.apply(locale));

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/util/reflect/ConstructorAccessor.java

@@ -5,7 +5,7 @@ import org.jetbrains.annotations.UnknownNullability;
 
 import java.lang.invoke.MethodHandle;
 
-public class ConstructorAccessor<T> {
+public final class ConstructorAccessor<T> {
   private final MethodHandle handle;
 
   public ConstructorAccessor(@NotNull MethodHandle handle) {

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/util/reflect/FieldAccessor.java

@@ -0,0 +1,39 @@
+package net.megavex.scoreboardlibrary.implementation.packetAdapter.util.reflect;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.UnknownNullability;
+
+import java.lang.invoke.MethodHandle;
+
+public final class FieldAccessor<T, V> {
+  private final MethodHandle getter, setter;
+
+  public FieldAccessor(@NotNull MethodHandle getter, @Nullable MethodHandle setter) {
+    this.getter = getter;
+    this.setter = setter;
+  }
+
+  public Object get(@Nullable T instance) {
+    try {
+      if (instance == null) {
+        return getter.invoke();
+      } else {
+        return getter.invoke(instance);
+      }
+    } catch (Throwable e) {
+      throw new IllegalStateException("couldn't set value of field", e);
+    }
+  }
+
+  public void set(T instance, @UnknownNullability V value) {
+    if (this.setter == null) {
+      throw new IllegalStateException("cannot set static final field");
+    }
+    try {
+      setter.invokeExact(instance, value);
+    } catch (Throwable e) {
+      throw new IllegalStateException("couldn't set value of field", e);
+    }
+  }
+}

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/util/reflect/MethodAccessor.java

@@ -5,16 +5,16 @@ import org.jetbrains.annotations.UnknownNullability;
 
 import java.lang.invoke.MethodHandle;
 
-public class FieldAccessor<T, V> {
-  private final MethodHandle setter;
+public final class MethodAccessor {
+  private final MethodHandle handle;
 
-  public FieldAccessor(@NotNull MethodHandle setter) {
-    this.setter = setter;
+  public MethodAccessor(@NotNull MethodHandle handle) {
+    this.handle = handle;
   }
 
-  public void set(@NotNull T instance, @UnknownNullability V value) {
+  public Object invoke(@UnknownNullability Object... args) {
     try {
-      setter.invokeExact(instance, value);
+      return handle.invokeExact(args);
     } catch (Throwable e) {
       throw new IllegalStateException("couldn't set value of field", e);
     }

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/util/reflect/MinecraftClasses.java

@@ -0,0 +1,15 @@
+package net.megavex.scoreboardlibrary.implementation.packetAdapter.util.reflect;
+
+import org.bukkit.Bukkit;
+import org.jetbrains.annotations.NotNull;
+
+public final class MinecraftClasses {
+  private static final String CB_PACKAGE = Bukkit.getServer().getClass().getPackage().getName();
+
+  private MinecraftClasses() {
+  }
+
+  public static @NotNull String craftBukkit(String className) {
+    return CB_PACKAGE + '.' + className;
+  }
+}

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/packetAdapter/util/reflect/ReflectUtil.java

@@ -9,7 +9,7 @@ import java.lang.invoke.MethodType;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 
-public class ReflectUtil {
+public final class ReflectUtil {
   // Inspired by
   // https://github.com/dmulloy2/ProtocolLib/blob/02e917cd08cf5b37a52052e22b223272a040e0df/src/main/java/com/comphenix/protocol/reflect/accessors/MethodHandleHelper.java
 
@@ -54,17 +54,52 @@ public class ReflectUtil {
   private ReflectUtil() {
   }
 
-  public static <T, V> @NotNull FieldAccessor<T, V> findField(@NotNull Class<T> clazz, int index, @NotNull Class<V> valueClass) {
+  public static @NotNull Class<?> getClassOrThrow(String... names) {
+    Class<?> c = getOptionalClass(names);
+    if (c == null) {
+      throw new IllegalStateException("Class with names either of " + String.join(", ", names) + " not found");
+    }
+    return c;
+  }
+
+  public static @Nullable Class<?> getOptionalClass(String... names) {
+    for (String name : names) {
+      if (name == null) continue;
+      try {
+        return Class.forName(name);
+      } catch (ClassNotFoundException ignored) {
+      }
+    }
+    return null;
+  }
+
+  public static @NotNull Object getEnumInstance(@NotNull Class<?> clazz, @NotNull String... names) {
+    for (String name : names) {
+      try {
+        //noinspection unchecked,rawtypes
+        return Enum.valueOf((Class<? extends Enum>) clazz, name);
+      } catch (IllegalArgumentException ignored) {
+      }
+    }
+    throw new IllegalStateException("Enum " + clazz.getName() + " instance with names either of  " + String.join(",", names) + " not found");
+  }
+
+  public static <T, V> @NotNull FieldAccessor<T, V> findFieldUnchecked(@NotNull Class<?> clazz, int index, @NotNull Class<?> valueClass) {
+    return findFieldUnchecked(clazz, index, valueClass, false);
+  }
+
+  public static <T, V> @NotNull FieldAccessor<T, V> findFieldUnchecked(@NotNull Class<?> clazz, int index, @NotNull Class<?> valueClass, boolean isStatic) {
     int i = 0;
     for (Field field : clazz.getDeclaredFields()) {
-      if (Modifier.isStatic(field.getModifiers()) || field.getType() != valueClass) {
+      if (Modifier.isStatic(field.getModifiers()) != isStatic || field.getType() != valueClass) {
         continue;
       }
 
       if (i == index) {
         try {
-          MethodHandle setter = LOOKUP.unreflectSetter(field);
-          return new FieldAccessor<>(setter.asType(VIRTUAL_FIELD_SETTER));
+          MethodHandle getter = LOOKUP.unreflectGetter(field);
+          MethodHandle setter = !isStatic || !Modifier.isFinal(field.getModifiers()) ? LOOKUP.unreflectSetter(field).asType(VIRTUAL_FIELD_SETTER) : null;
+          return new FieldAccessor<>(getter, setter);
         } catch (IllegalAccessException e) {
           throw new RuntimeException("failed to unreflect field setter", e);
         }
@@ -78,16 +113,7 @@ public class ReflectUtil {
     );
   }
 
-  public static <T> @NotNull ConstructorAccessor<T> findConstructorOrThrow(@NotNull Class<T> clazz, @NotNull Class<?>... args) {
-    ConstructorAccessor<T> accessor = findConstructorOrNull(clazz, args);
-    if (accessor == null) {
-      throw new IllegalStateException("couldn't get constructor accessor for class " + clazz.getSimpleName());
-    }
-
-    return accessor;
-  }
-
-  public static <T> @Nullable ConstructorAccessor<T> findConstructorOrNull(@NotNull Class<T> clazz, @NotNull Class<?>... args) {
+  public static <T> @Nullable ConstructorAccessor<T> findOptionalConstructor(@NotNull Class<T> clazz, @NotNull Class<?>... args) {
     try {
       MethodHandle handle = LOOKUP.findConstructor(clazz, MethodType.methodType(void.class, args));
       return new ConstructorAccessor<>(convertToGeneric(handle));
@@ -96,6 +122,14 @@ public class ReflectUtil {
     }
   }
 
+  public static <T> @NotNull ConstructorAccessor<T> findConstructor(@NotNull Class<T> clazz, @NotNull Class<?>... args) {
+    ConstructorAccessor<T> accessor = findOptionalConstructor(clazz, args);
+    if (accessor == null) {
+      throw new RuntimeException("Constructor for class " + clazz.getName() + " not found");
+    }
+    return accessor;
+  }
+
   public static <T> @NotNull PacketConstructor<T> getEmptyConstructor(@NotNull Class<T> packetClass) {
     try {
       MethodHandle constructor = LOOKUP.findConstructor(packetClass, VOID_METHOD_TYPE);
@@ -120,6 +154,35 @@ public class ReflectUtil {
     };
   }
 
+  public static @NotNull MethodAccessor findMethod(@NotNull Class<?> clazz, boolean isStatic, @NotNull MethodType methodType, @NotNull String... names) {
+    MethodAccessor accessor = findOptionalMethod(clazz, isStatic, methodType, names);
+    if (accessor == null) {
+      throw new RuntimeException("Method with the names either of " + String.join(",", names) + " for class " + clazz.getName() + " not found");
+    }
+    return accessor;
+  }
+
+  public static <T> @Nullable MethodAccessor findOptionalMethod(@NotNull Class<T> clazz, boolean isStatic, @NotNull MethodType methodType, @NotNull String... names) {
+    if (names.length == 0) {
+      throw new IllegalArgumentException("no method names passed");
+    }
+    for (String name : names) {
+      MethodHandle handle;
+      try {
+        if (isStatic) {
+          handle = LOOKUP.findStatic(clazz, name, methodType);
+        } else {
+          handle = LOOKUP.findVirtual(clazz, name, methodType);
+        }
+        return new MethodAccessor(convertToGeneric(handle));
+      } catch (NoSuchMethodException ignored) {
+      } catch (IllegalAccessException e) {
+        throw new RuntimeException(e);
+      }
+    }
+    return null;
+  }
+
   private static @NotNull MethodHandle convertToGeneric(@NotNull MethodHandle handle) {
     MethodHandle target = handle.asFixedArity();
     MethodType methodType = MethodType.genericMethodType(0, true);

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/player/DisplayableQueue.java

@@ -1,60 +1,66 @@
 package net.megavex.scoreboardlibrary.implementation.player;
 
-import net.megavex.scoreboardlibrary.implementation.commons.CollectionProvider;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
-public class DisplayableQueue<T extends PlayerDisplayable> {
+public final class DisplayableQueue<T extends PlayerDisplayable> {
   private final UUID playerUuid;
-  private final List<T> queue = CollectionProvider.list(1);
+  private final List<T> queue = new ArrayList<>(1);
 
   public DisplayableQueue(@NotNull UUID playerUuid) {
     this.playerUuid = playerUuid;
   }
 
-  public synchronized @Nullable T current() {
-    if (queue.isEmpty()) {
-      return null;
-    } else {
-      return queue.get(0);
-    }
-  }
-
-  public synchronized void add(@NotNull T displayable) {
-    if (queue.contains(displayable)) {
-      throw new IllegalStateException("displayable already registered");
-    }
-
-    queue.add(displayable);
-
-    if (current() == displayable) {
-      Player player = Bukkit.getPlayer(playerUuid);
-      if (player != null) {
-        displayable.display(player);
+  public @Nullable T current() {
+    synchronized (this) {
+      if (queue.isEmpty()) {
+        return null;
+      } else {
+        return queue.get(0);
       }
     }
   }
 
-  public synchronized void remove(@NotNull T displayable) {
-    boolean wasCurrent = displayable == current();
-    if (!queue.remove(displayable)) {
-      throw new IllegalStateException("displayable not registered");
-    }
+  public void add(@NotNull T displayable) {
+    synchronized (this) {
+      if (queue.contains(displayable)) {
+        throw new IllegalStateException("displayable already registered");
+      }
 
-    if (!wasCurrent) {
-      return;
-    }
+      queue.add(displayable);
 
-    T newDisplayable = current();
-    if (newDisplayable != null) {
-      Player player = Bukkit.getPlayer(playerUuid);
-      if (player != null) {
-        newDisplayable.display(player);
+      if (current() == displayable) {
+        Player player = Bukkit.getPlayer(playerUuid);
+        if (player != null) {
+          displayable.display(player);
+        }
+      }
+    }
+  }
+
+  public void remove(@NotNull T displayable) {
+    synchronized (this) {
+      boolean wasCurrent = displayable == current();
+      if (!queue.remove(displayable)) {
+        throw new IllegalStateException("displayable not registered");
+      }
+
+      if (!wasCurrent) {
+        return;
+      }
+
+      T newDisplayable = current();
+      if (newDisplayable != null) {
+        Player player = Bukkit.getPlayer(playerUuid);
+        if (player != null) {
+          newDisplayable.display(player);
+        }
       }
     }
   }

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/player/LocaleListener.java

@@ -15,7 +15,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerLocaleChangeEvent;
 import org.jetbrains.annotations.NotNull;
 
-public class LocaleListener implements Listener {
+public final class LocaleListener implements Listener {
   private final ScoreboardLibraryImpl scoreboardLibrary;
 
   public LocaleListener(@NotNull ScoreboardLibraryImpl scoreboardLibrary) {

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/player/ScoreboardLibraryPlayer.java

@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.UUID;
 
-public class ScoreboardLibraryPlayer {
+public final class ScoreboardLibraryPlayer {
   private final DisplayableQueue<TeamManagerImpl> teamManagerQueue;
   private final DisplayableQueue<ObjectiveManagerImpl> objectiveManagerQueue;
   private final DisplayableQueue<AbstractSidebar> sidebarQueue;

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/scheduler/BukkitTaskScheduler.java

@@ -3,7 +3,7 @@ package net.megavex.scoreboardlibrary.implementation.scheduler;
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
 
-class BukkitTaskScheduler implements TaskScheduler {
+final class BukkitTaskScheduler implements TaskScheduler {
   private final Plugin plugin;
 
   public BukkitTaskScheduler(@NotNull Plugin plugin) {

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/scheduler/FoliaTaskScheduler.java

@@ -11,7 +11,7 @@ import java.lang.invoke.MethodType;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
-class FoliaTaskScheduler implements TaskScheduler {
+final class FoliaTaskScheduler implements TaskScheduler {
   private static final Class<?> asyncSchedulerClass;
   private static final Class<?> scheduledTaskClass;
   private static final Class<?> cancelledStateClass;

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/sidebar/AbstractSidebar.java

@@ -1,54 +1,48 @@
 package net.megavex.scoreboardlibrary.implementation.sidebar;
 
 import com.google.common.base.Preconditions;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.ComponentLike;
-import net.kyori.adventure.translation.GlobalTranslator;
 import net.megavex.scoreboardlibrary.api.objective.ObjectiveDisplaySlot;
 import net.megavex.scoreboardlibrary.api.objective.ObjectiveRenderType;
 import net.megavex.scoreboardlibrary.api.objective.ScoreFormat;
 import net.megavex.scoreboardlibrary.api.sidebar.Sidebar;
 import net.megavex.scoreboardlibrary.implementation.ScoreboardLibraryImpl;
-import net.megavex.scoreboardlibrary.implementation.commons.CollectionProvider;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.PropertiesPacketType;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.objective.ObjectivePacketAdapter;
 import net.megavex.scoreboardlibrary.implementation.player.PlayerDisplayable;
 import net.megavex.scoreboardlibrary.implementation.player.ScoreboardLibraryPlayer;
 import net.megavex.scoreboardlibrary.implementation.sidebar.line.GlobalLineInfo;
 import net.megavex.scoreboardlibrary.implementation.sidebar.line.LocaleLineHandler;
-import net.megavex.scoreboardlibrary.implementation.sidebar.line.PlayerNameProvider;
-import org.apache.commons.lang.RandomStringUtils;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.Range;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.function.Consumer;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.ComponentLike;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+import net.kyori.adventure.translation.GlobalTranslator;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.Range;
 
 import static net.kyori.adventure.text.Component.empty;
 
 public abstract class AbstractSidebar implements Sidebar, PlayerDisplayable {
   private final ScoreboardLibraryImpl scoreboardLibrary;
   private final ObjectivePacketAdapter packetAdapter;
-  private final List<String> linePlayerNames;
 
   private final GlobalLineInfo[] lines;
   private Component title = empty();
 
-  private final Set<Player> players = CollectionProvider.set(8);
+  private final Set<Player> players = new HashSet<>(8);
 
   private boolean closed;
 
   private final Queue<SidebarTask> taskQueue = new ConcurrentLinkedQueue<>();
 
-  public AbstractSidebar(@NotNull ScoreboardLibraryImpl scoreboardLibrary, int maxLines) {
+  public AbstractSidebar(@NotNull ScoreboardLibraryImpl scoreboardLibrary, int maxLines, @NotNull String objectiveName) {
     this.scoreboardLibrary = scoreboardLibrary;
-
-    String objectiveName = RandomStringUtils.randomAlphanumeric(16);
     this.packetAdapter = scoreboardLibrary.packetAdapter().createObjectiveAdapter(objectiveName);
-    this.linePlayerNames = PlayerNameProvider.provideLinePlayerNames(maxLines);
     this.lines = new GlobalLineInfo[maxLines];
   }
 
@@ -109,6 +103,11 @@ public abstract class AbstractSidebar implements Sidebar, PlayerDisplayable {
     return lines.length;
   }
 
+  @Override
+  public @NotNull String objectiveName() {
+    return packetAdapter.objectiveName();
+  }
+
   @Override
   public final void line(@Range(from = 0, to = MAX_LINES - 1) int index, @Nullable ComponentLike value, @Nullable ScoreFormat scoreFormat) {
     checkClosed();
@@ -126,6 +125,17 @@ public abstract class AbstractSidebar implements Sidebar, PlayerDisplayable {
     }
   }
 
+  @Override
+  public void refreshLine(@Range(from = 0, to = Integer.MAX_VALUE - 1) final int index) {
+    checkClosed();
+    GlobalLineInfo line = lines[index];
+    if (line != null) {
+      boolean updateValue = line.value() != null;
+      boolean updateScore = line.scoreFormat() != null;
+      taskQueue.add(new SidebarTask.UpdateLine(index, updateValue, updateScore));
+    }
+  }
+
   @Override
   public final @Nullable Component line(@Range(from = 0, to = MAX_LINES - 1) int line) {
     checkClosed();
@@ -151,6 +161,12 @@ public abstract class AbstractSidebar implements Sidebar, PlayerDisplayable {
     }
   }
 
+  @Override
+  public void refreshTitle() {
+    checkClosed();
+    taskQueue.add(SidebarTask.UpdateTitle.INSTANCE);
+  }
+
   public final @NotNull ScoreboardLibraryImpl scoreboardLibrary() {
     return scoreboardLibrary;
   }
@@ -280,7 +296,10 @@ public abstract class AbstractSidebar implements Sidebar, PlayerDisplayable {
   private @NotNull GlobalLineInfo getLineInfo(int line) {
     GlobalLineInfo globalLineInfo = lines[line];
     if (globalLineInfo == null) {
-      globalLineInfo = lines[line] = new GlobalLineInfo(this, linePlayerNames.get(line), line);
+      char c = Character.toChars(128 + line)[0];
+      String playerName = "" + LegacyComponentSerializer.SECTION_CHAR + c;
+
+      globalLineInfo = lines[line] = new GlobalLineInfo(this, playerName, line);
       updateScores();
     }
 

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/sidebar/PlayerDependantLocaleSidebar.java

@@ -13,12 +13,12 @@ import java.util.Map;
 import java.util.Set;
 import java.util.function.Consumer;
 
-public class PlayerDependantLocaleSidebar extends AbstractSidebar {
+public final class PlayerDependantLocaleSidebar extends AbstractSidebar {
   private final Map<Player, LocaleLineHandler> playerMap = new HashMap<>();
   private final Map<Locale, LocaleLineHandler> localeMap = new HashMap<>();
 
-  public PlayerDependantLocaleSidebar(@NotNull ScoreboardLibraryImpl scoreboardLibrary, int maxLines) {
-    super(scoreboardLibrary, maxLines);
+  public PlayerDependantLocaleSidebar(@NotNull ScoreboardLibraryImpl scoreboardLibrary, int maxLines, @NotNull String objectiveName) {
+    super(scoreboardLibrary, maxLines, objectiveName);
   }
 
   @Override

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/sidebar/SidebarUpdaterTask.java

@@ -7,7 +7,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.Iterator;
 import java.util.logging.Level;
 
-public class SidebarUpdaterTask implements Runnable {
+public final class SidebarUpdaterTask implements Runnable {
   private final ScoreboardLibraryImpl scoreboardLibrary;
   private final RunningTask task;
   private final Object lock = new Object();

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/sidebar/SingleLocaleSidebar.java

@@ -1,26 +1,25 @@
 package net.megavex.scoreboardlibrary.implementation.sidebar;
 
 import net.megavex.scoreboardlibrary.implementation.ScoreboardLibraryImpl;
-import net.megavex.scoreboardlibrary.implementation.commons.CollectionProvider;
 import net.megavex.scoreboardlibrary.implementation.sidebar.line.LocaleLineHandler;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
 import java.util.function.Consumer;
 
-public class SingleLocaleSidebar extends AbstractSidebar {
+public final class SingleLocaleSidebar extends AbstractSidebar {
   private final Locale locale;
   private final LocaleLineHandler sidebar;
-  private final Set<Player> internalPlayers;
+  private final Set<Player> internalPlayers = new HashSet<>(8);
 
-  public SingleLocaleSidebar(@NotNull ScoreboardLibraryImpl scoreboardLibrary, int size, @NotNull Locale locale) {
-    super(scoreboardLibrary, size);
+  public SingleLocaleSidebar(@NotNull ScoreboardLibraryImpl scoreboardLibrary, int size, @NotNull String objectiveName, @NotNull Locale locale) {
+    super(scoreboardLibrary, size, objectiveName);
     this.locale = locale;
     this.sidebar = new LocaleLineHandler(this, locale);
-    this.internalPlayers = CollectionProvider.set(8);
   }
 
   @Override

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/sidebar/line/GlobalLineInfo.java

@@ -7,7 +7,7 @@ import net.megavex.scoreboardlibrary.implementation.sidebar.AbstractSidebar;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public class GlobalLineInfo {
+public final class GlobalLineInfo {
   private final String player;
   private final int line;
   private final TeamsPacketAdapter packetAdapter;

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/sidebar/line/LocaleLineHandler.java

@@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.Collections;
 import java.util.Locale;
 
-public class LocaleLineHandler {
+public final class LocaleLineHandler {
   private final AbstractSidebar sidebar;
   private final Locale locale;
   private final SidebarLineHandler[] lineHandlers;

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/sidebar/line/PlayerNameProvider.java

@@ -1,41 +0,0 @@
-package net.megavex.scoreboardlibrary.implementation.sidebar.line;
-
-import net.megavex.scoreboardlibrary.api.sidebar.Sidebar;
-import org.bukkit.ChatColor;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Unmodifiable;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class PlayerNameProvider {
-  private static final ChatColor[] CHAT_COLORS = ChatColor.values();
-  private static final List<String> DEFAULT_NAMES = createLinePlayerNames(Sidebar.MAX_LINES);
-
-  private PlayerNameProvider() {
-  }
-
-  public static @NotNull @Unmodifiable List<String> provideLinePlayerNames(int maxLines) {
-    return maxLines <= Sidebar.MAX_LINES ? DEFAULT_NAMES : createLinePlayerNames(maxLines);
-  }
-
-  private static @NotNull @Unmodifiable List<String> createLinePlayerNames(int maxLines) {
-    List<String> result = new ArrayList<>(maxLines);
-
-    int i = 0;
-    while (result.size() < maxLines) {
-      for (ChatColor color : CHAT_COLORS) {
-        String legacy = color.toString();
-        String newStr = i == 0 ? legacy : result.get(i - 1) + legacy;
-
-        if (!result.contains(newStr)) {
-          result.add(newStr);
-        }
-      }
-      i++;
-    }
-
-    return Collections.unmodifiableList(result);
-  }
-}

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/sidebar/line/SidebarLineHandler.java

@@ -2,7 +2,6 @@ package net.megavex.scoreboardlibrary.implementation.sidebar.line;
 
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.translation.GlobalTranslator;
-import net.megavex.scoreboardlibrary.implementation.commons.CollectionProvider;
 import net.megavex.scoreboardlibrary.implementation.commons.LineRenderingStrategy;
 import net.megavex.scoreboardlibrary.implementation.sidebar.line.locale.LegacyLocaleLine;
 import net.megavex.scoreboardlibrary.implementation.sidebar.line.locale.LocaleLine;
@@ -12,12 +11,13 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.Set;
 
-public class SidebarLineHandler {
+public final class SidebarLineHandler {
   private final LineRenderingStrategy strategy;
   private final LocaleLineHandler localeLineHandler;
-  private final Set<Player> players = CollectionProvider.set(1);
+  private final Set<Player> players = new HashSet<>(1);
   private final LocaleLine[] lines;
 
   public SidebarLineHandler(@NotNull LineRenderingStrategy strategy, @NotNull LocaleLineHandler localeLineHandler) {
@@ -53,7 +53,9 @@ public class SidebarLineHandler {
 
   public void updateScore(int line) {
     LocaleLine localeLine = lines[line];
-    localeLine.sendScore(players);
+    if (localeLine != null) {
+      localeLine.sendScore(players);
+    }
   }
 
   public void setLine(int line, Component renderedLine) {

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/sidebar/line/locale/LegacyLocaleLine.java

@@ -1,5 +1,6 @@
 package net.megavex.scoreboardlibrary.implementation.sidebar.line.locale;
 
+import com.google.common.collect.ImmutableList;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.ImmutableTeamProperties;
@@ -20,7 +21,7 @@ import java.util.Set;
 import static net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection;
 
 // Implementation for versions below 1.13
-public class LegacyLocaleLine implements LocaleLine, ImmutableTeamProperties<String> {
+public final class LegacyLocaleLine implements LocaleLine, ImmutableTeamProperties<String> {
   private final GlobalLineInfo info;
   private final SidebarLineHandler handler;
   private final TeamDisplayPacketAdapter packetAdapter;
@@ -33,7 +34,7 @@ public class LegacyLocaleLine implements LocaleLine, ImmutableTeamProperties<Str
     this.handler = handler;
     this.player = info.player();
     this.packetAdapter = info.packetAdapter().createLegacyTeamDisplayAdapter(this);
-    packetAdapter.updateTeamPackets(entries());
+    packetAdapter.updateTeamPackets();
   }
 
   public @NotNull GlobalLineInfo info() {
@@ -56,8 +57,8 @@ public class LegacyLocaleLine implements LocaleLine, ImmutableTeamProperties<Str
   }
 
   @Override
-  public @NotNull Collection<String> entries() {
-    return Collections.singleton(player);
+  public @NotNull Collection<String> syncedEntries() {
+    return ImmutableList.of(player);
   }
 
   @Override
@@ -81,7 +82,7 @@ public class LegacyLocaleLine implements LocaleLine, ImmutableTeamProperties<Str
       this.prefix = legacyValue.substring(0, prefixEnd);
 
       String last = prefix + LegacyComponentSerializer.SECTION_CHAR + (endsWithSection ? legacyValue.charAt(16) : "");
-      this.player = info.player() + ChatColor.RESET + ChatColor.getLastColors(last);
+      this.player = info.player() + ChatColor.getLastColors(last);
 
       int playerEnd = prefixEnd;
       if (legacyValue.length() > 32) {
@@ -92,11 +93,10 @@ public class LegacyLocaleLine implements LocaleLine, ImmutableTeamProperties<Str
         player += legacyValue.substring(prefixEnd, playerEnd);
       }
 
-      this.suffix = legacyValue.substring(playerEnd + (endsWithSection ? 2 : 0));
+      this.suffix = ChatColor.getLastColors(this.player) + legacyValue.substring(playerEnd + (endsWithSection ? 2 : 0));
       if (suffix.length() > 16) {
         String newSuffix = suffix.substring(0, 16);
-        if (newSuffix.endsWith(String.valueOf(LegacyComponentSerializer.SECTION_CHAR)) &&
-          ChatColor.getByChar(suffix.charAt(16)) != null) {
+        if (newSuffix.endsWith(String.valueOf(LegacyComponentSerializer.SECTION_CHAR))) {
           newSuffix = newSuffix.substring(0, 15);
         }
 
@@ -157,7 +157,7 @@ public class LegacyLocaleLine implements LocaleLine, ImmutableTeamProperties<Str
     }
 
     pd.removeScore(players, player);
-    info.packetAdapter().removeTeam(players);
+    packetAdapter.removeTeam(players);
   }
 }
 

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/sidebar/line/locale/ModernLocaleLine.java

@@ -1,5 +1,6 @@
 package net.megavex.scoreboardlibrary.implementation.sidebar.line.locale;
 
+import com.google.common.collect.ImmutableList;
 import net.kyori.adventure.text.Component;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.ImmutableTeamProperties;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.PropertiesPacketType;
@@ -10,12 +11,11 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
-import java.util.Collections;
 
 import static net.kyori.adventure.text.Component.empty;
 
 // Implementation for versions above 1.13
-public class ModernLocaleLine implements LocaleLine, ImmutableTeamProperties<Component> {
+public final class ModernLocaleLine implements LocaleLine, ImmutableTeamProperties<Component> {
   private final GlobalLineInfo info;
   private final SidebarLineHandler handler;
   private final Collection<String> entries;
@@ -24,9 +24,9 @@ public class ModernLocaleLine implements LocaleLine, ImmutableTeamProperties<Com
   public ModernLocaleLine(GlobalLineInfo info, SidebarLineHandler handler) {
     this.info = info;
     this.handler = handler;
-    this.entries = Collections.singleton(info.player());
+    this.entries = ImmutableList.of(info.player());
     this.packetAdapter = info.packetAdapter().createTeamDisplayAdapter(this);
-    packetAdapter.updateTeamPackets(entries);
+    packetAdapter.updateTeamPackets();
   }
 
   @Override
@@ -40,7 +40,7 @@ public class ModernLocaleLine implements LocaleLine, ImmutableTeamProperties<Com
 
   @Override
   public void updateTeam() {
-    packetAdapter.updateTeamPackets(entries);
+    packetAdapter.updateTeamPackets();
     packetAdapter.sendProperties(PropertiesPacketType.UPDATE, handler.players());
   }
 
@@ -61,11 +61,11 @@ public class ModernLocaleLine implements LocaleLine, ImmutableTeamProperties<Com
   @Override
   public void hide(@NotNull Collection<Player> players) {
     handler.localeLineHandler().sidebar().packetAdapter().removeScore(players, info.player());
-    info.packetAdapter().removeTeam(players);
+    packetAdapter.removeTeam(players);
   }
 
   @Override
-  public @NotNull Collection<String> entries() {
+  public @NotNull Collection<String> syncedEntries() {
     return entries;
   }
 

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/sidebar/line/locale/PostModernLocaleLine.java

@@ -11,7 +11,7 @@ import java.util.Collection;
 // Implementation for versions 1.20.3+
 // This is not yet being used as it might break on servers with plugins such as ViaBackwards,
 // however it will once Mojang decides to remove legacy chat format support
-public class PostModernLocaleLine implements LocaleLine {
+public final class PostModernLocaleLine implements LocaleLine {
   private final GlobalLineInfo info;
   private final SidebarLineHandler handler;
 

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/team/ScoreboardTeamImpl.java

@@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
-public class ScoreboardTeamImpl implements ScoreboardTeam {
+public final class ScoreboardTeamImpl implements ScoreboardTeam {
   private final TeamManagerImpl teamManager;
   private final String name;
   private final TeamsPacketAdapter packetAdapter;
@@ -97,7 +97,7 @@ public class ScoreboardTeamImpl implements ScoreboardTeam {
   public void removePlayer(@NotNull Player player) {
     TeamDisplayImpl teamDisplay = Objects.requireNonNull(displayMap.remove(player));
     if (teamDisplay.players().remove(player)) {
-      packetAdapter.removeTeam(Collections.singleton(player));
+      teamDisplay.packetAdapter().removeTeam(Collections.singleton(player));
     }
   }
 
@@ -111,8 +111,8 @@ public class ScoreboardTeamImpl implements ScoreboardTeam {
     Collection<Player> singleton = Collections.singleton(player);
     newTeamDisplay.packetAdapter().sendProperties(PropertiesPacketType.UPDATE, singleton);
 
-    Collection<String> oldEntries = oldTeamDisplay.entries();
-    Collection<String> newEntries = newTeamDisplay.entries();
+    Collection<String> oldEntries = oldTeamDisplay.syncedEntries();
+    Collection<String> newEntries = newTeamDisplay.syncedEntries();
 
     if (oldEntries.isEmpty()) {
       newTeamDisplay.packetAdapter().sendEntries(EntriesPacketType.ADD, singleton, newEntries);

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/team/TeamDisplayImpl.java

@@ -8,8 +8,9 @@ import net.megavex.scoreboardlibrary.api.team.ScoreboardTeam;
 import net.megavex.scoreboardlibrary.api.team.TeamDisplay;
 import net.megavex.scoreboardlibrary.api.team.enums.CollisionRule;
 import net.megavex.scoreboardlibrary.api.team.enums.NameTagVisibility;
-import net.megavex.scoreboardlibrary.implementation.commons.CollectionProvider;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.ImmutableTeamProperties;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.PropertiesPacketType;
+import net.megavex.scoreboardlibrary.implementation.packetAdapter.team.EntriesPacketType;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.team.TeamDisplayPacketAdapter;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
@@ -19,11 +20,12 @@ import java.util.*;
 
 import static net.kyori.adventure.text.Component.empty;
 
-public class TeamDisplayImpl implements TeamDisplay, ImmutableTeamProperties<Component> {
+public final class TeamDisplayImpl implements TeamDisplay, ImmutableTeamProperties<Component> {
   private final ScoreboardTeamImpl team;
   private final TeamDisplayPacketAdapter packetAdapter;
-  private final Set<Player> players = CollectionProvider.set(4);
-  private final Set<String> entries = CollectionProvider.set(4);
+  private final Set<Player> players = new HashSet<>(4);
+  private final List<String> entries = new ArrayList<>(4);
+  private final List<String> syncedEntries = new ArrayList<>(4);
   private Component displayName = empty(),
     prefix = empty(),
     suffix = empty();
@@ -35,7 +37,7 @@ public class TeamDisplayImpl implements TeamDisplay, ImmutableTeamProperties<Com
   public TeamDisplayImpl(@NotNull ScoreboardTeamImpl team) {
     this.team = team;
     this.packetAdapter = team.packetAdapter().createTeamDisplayAdapter(this);
-    updateTeamPackets();
+    packetAdapter.updateTeamPackets();
   }
 
   @Override
@@ -45,12 +47,18 @@ public class TeamDisplayImpl implements TeamDisplay, ImmutableTeamProperties<Com
 
   @Override
   public @NotNull Collection<String> entries() {
-    return Collections.unmodifiableSet(entries);
+    return Collections.unmodifiableCollection(entries);
+  }
+
+  @Override
+  public @NotNull Collection<String> syncedEntries() {
+    return syncedEntries;
   }
 
   @Override
   public boolean addEntry(@NotNull String entry) {
-    if (entries.add(entry)) {
+    if (!entries.contains(entry)) {
+      entries.add(entry);
       team.teamManager().taskQueue().add(new TeamManagerTask.AddEntries(this, Collections.singleton(entry)));
       return true;
     }
@@ -58,6 +66,20 @@ public class TeamDisplayImpl implements TeamDisplay, ImmutableTeamProperties<Com
     return false;
   }
 
+  @Override
+  public boolean addEntries(@NotNull Collection<String> entries) {
+    Set<String> existing = new HashSet<>(this.entries);
+    List<String> toAdd = new ArrayList<>(entries);
+    toAdd.removeIf(existing::contains);
+    if (!toAdd.isEmpty()) {
+      this.entries.addAll(toAdd);
+      team.teamManager().taskQueue().add(new TeamManagerTask.AddEntries(this, toAdd));
+      return true;
+    }
+
+    return false;
+  }
+
   @Override
   public boolean removeEntry(@NotNull String entry) {
     if (entries.remove(entry)) {
@@ -68,6 +90,19 @@ public class TeamDisplayImpl implements TeamDisplay, ImmutableTeamProperties<Com
     return false;
   }
 
+  @Override
+  public boolean removeEntries(@NotNull Collection<String> entries) {
+    List<String> toRemove = new ArrayList<>(entries);
+    toRemove.retainAll(this.entries);
+    if (!toRemove.isEmpty()) {
+      this.entries.removeAll(toRemove);
+      team.teamManager().taskQueue().add(new TeamManagerTask.RemoveEntries(this, toRemove));
+      return true;
+    }
+
+    return false;
+  }
+
   @Override
   public @NotNull Component displayName() {
     return displayName;
@@ -201,6 +236,11 @@ public class TeamDisplayImpl implements TeamDisplay, ImmutableTeamProperties<Com
     return this;
   }
 
+  @Override
+  public void refresh() {
+    scheduleUpdate();
+  }
+
   public @NotNull TeamDisplayPacketAdapter packetAdapter() {
     return packetAdapter;
   }
@@ -209,8 +249,21 @@ public class TeamDisplayImpl implements TeamDisplay, ImmutableTeamProperties<Com
     return players;
   }
 
-  public void updateTeamPackets() {
-    packetAdapter.updateTeamPackets(entries);
+  public void handleUpdateDisplay() {
+    packetAdapter.updateTeamPackets();
+    packetAdapter().sendProperties(PropertiesPacketType.UPDATE, players());
+  }
+
+  public void handleAddEntries(@NotNull Collection<String> newEntries) {
+    packetAdapter.sendEntries(EntriesPacketType.ADD, players(), newEntries);
+    syncedEntries.addAll(newEntries);
+    packetAdapter.updateTeamPackets();
+  }
+
+  public void handleRemoveEntries(@NotNull Collection<String> oldEntries) {
+    packetAdapter.sendEntries(EntriesPacketType.REMOVE, players(), oldEntries);
+    syncedEntries.removeAll(oldEntries);
+    packetAdapter.updateTeamPackets();
   }
 
   private void scheduleUpdate() {

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/team/TeamManagerImpl.java

@@ -5,9 +5,7 @@ import net.megavex.scoreboardlibrary.api.team.ScoreboardTeam;
 import net.megavex.scoreboardlibrary.api.team.TeamDisplay;
 import net.megavex.scoreboardlibrary.api.team.TeamManager;
 import net.megavex.scoreboardlibrary.implementation.ScoreboardLibraryImpl;
-import net.megavex.scoreboardlibrary.implementation.commons.CollectionProvider;
 import net.megavex.scoreboardlibrary.implementation.packetAdapter.PropertiesPacketType;
-import net.megavex.scoreboardlibrary.implementation.packetAdapter.team.EntriesPacketType;
 import net.megavex.scoreboardlibrary.implementation.player.PlayerDisplayable;
 import net.megavex.scoreboardlibrary.implementation.player.ScoreboardLibraryPlayer;
 import org.bukkit.entity.Player;
@@ -15,15 +13,18 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
-public class TeamManagerImpl implements TeamManager, PlayerDisplayable {
+public final class TeamManagerImpl implements TeamManager, PlayerDisplayable {
   private final ScoreboardLibraryImpl scoreboardLibrary;
 
-  private final Set<Player> players = CollectionProvider.set(8);
+  private final Set<Player> players = new HashSet<>(8);
+  private final List<Player> internalPlayers = new ArrayList<>(8);
+
   private final Map<String, ScoreboardTeamImpl> teams = new ConcurrentHashMap<>();
   private final Queue<TeamManagerTask> taskQueue = new ConcurrentLinkedQueue<>();
   private boolean closed;
@@ -143,11 +144,26 @@ public class TeamManagerImpl implements TeamManager, PlayerDisplayable {
       return false;
     }
 
-    TeamManagerTask.RemovePlayer task = new TeamManagerTask.RemovePlayer(player);
+    TeamManagerTask.RemovePlayer task = new TeamManagerTask.RemovePlayer(player, null);
     taskQueue.add(task);
     return true;
   }
 
+  @Override
+  public CompletableFuture<Void> removePlayerFuture(@NotNull Player player) {
+    Preconditions.checkNotNull(player);
+    checkClosed();
+
+    if (!players.remove(player)) {
+      return CompletableFuture.completedFuture(null);
+    }
+
+    CompletableFuture<Void> future = new CompletableFuture<>();
+    TeamManagerTask.RemovePlayer task = new TeamManagerTask.RemovePlayer(player, future);
+    taskQueue.add(task);
+    return future;
+  }
+
   public @NotNull ScoreboardLibraryImpl scoreboardLibrary() {
     return scoreboardLibrary;
   }
@@ -156,6 +172,7 @@ public class TeamManagerImpl implements TeamManager, PlayerDisplayable {
     return taskQueue;
   }
 
+  @Override
   public void display(@NotNull Player player) {
     for (ScoreboardTeamImpl team : teams.values()) {
       team.addPlayer(player);
@@ -171,14 +188,12 @@ public class TeamManagerImpl implements TeamManager, PlayerDisplayable {
 
       if (task instanceof TeamManagerTask.Close) {
         for (ScoreboardTeamImpl team : teams.values()) {
-          Set<Player> removePlayers = CollectionProvider.set(players.size());
           for (TeamDisplayImpl value : team.displayMap().values()) {
-            removePlayers.addAll(value.players());
+            value.packetAdapter().removeTeam(value.players());
           }
-          team.packetAdapter().removeTeam(removePlayers);
         }
 
-        for (Player player : players) {
+        for (Player player : internalPlayers) {
           Objects.requireNonNull(scoreboardLibrary.getPlayer(player)).teamManagerQueue().remove(this);
         }
         return false;
@@ -186,13 +201,18 @@ public class TeamManagerImpl implements TeamManager, PlayerDisplayable {
         TeamManagerTask.AddPlayer addPlayerTask = (TeamManagerTask.AddPlayer) task;
         @NotNull ScoreboardLibraryPlayer slPlayer = scoreboardLibrary.getOrCreatePlayer(addPlayerTask.player());
         slPlayer.teamManagerQueue().add(this);
+        internalPlayers.add(addPlayerTask.player());
       } else if (task instanceof TeamManagerTask.RemovePlayer) {
         TeamManagerTask.RemovePlayer removePlayerTask = (TeamManagerTask.RemovePlayer) task;
         for (ScoreboardTeamImpl team : teams.values()) {
           team.removePlayer(removePlayerTask.player());
         }
 
+        internalPlayers.remove(removePlayerTask.player());
         Objects.requireNonNull(scoreboardLibrary.getPlayer(removePlayerTask.player())).teamManagerQueue().remove(this);
+        if (removePlayerTask.future() != null) {
+          removePlayerTask.future().complete(null);
+        }
       } else if (task instanceof TeamManagerTask.ReloadPlayer) {
         TeamManagerTask.ReloadPlayer reloadPlayerTask = (TeamManagerTask.ReloadPlayer) task;
         for (ScoreboardTeamImpl team : teams.values()) {
@@ -212,29 +232,21 @@ public class TeamManagerImpl implements TeamManager, PlayerDisplayable {
         }
       } else if (task instanceof TeamManagerTask.RemoveTeam) {
         TeamManagerTask.RemoveTeam removeTeamTask = (TeamManagerTask.RemoveTeam) task;
-        List<Player> playersInTeam = CollectionProvider.list(removeTeamTask.team().displayMap().size());
-        for (Map.Entry<Player, TeamDisplayImpl> entry : removeTeamTask.team().displayMap().entrySet()) {
-          Player player = entry.getKey();
-          TeamDisplayImpl teamDisplay = entry.getValue();
-          if (teamDisplay.players().contains(player)) {
-            playersInTeam.add(player);
-          }
+        for (TeamDisplayImpl value : removeTeamTask.team().displayMap().values()) {
+          value.packetAdapter().removeTeam(value.players());
         }
-
-        removeTeamTask.team().packetAdapter().removeTeam(playersInTeam);
       } else if (task instanceof TeamManagerTask.UpdateTeamDisplay) {
         TeamManagerTask.UpdateTeamDisplay updateTeamDisplayTask = (TeamManagerTask.UpdateTeamDisplay) task;
         @NotNull TeamDisplayImpl teamDisplay = updateTeamDisplayTask.teamDisplay();
-        teamDisplay.updateTeamPackets();
-        teamDisplay.packetAdapter().sendProperties(PropertiesPacketType.UPDATE, teamDisplay.players());
+        teamDisplay.handleUpdateDisplay();
       } else if (task instanceof TeamManagerTask.AddEntries) {
         TeamManagerTask.AddEntries addEntriesTask = (TeamManagerTask.AddEntries) task;
         @NotNull TeamDisplayImpl teamDisplay = addEntriesTask.teamDisplay();
-        teamDisplay.packetAdapter().sendEntries(EntriesPacketType.ADD, teamDisplay.players(), addEntriesTask.entries());
+        teamDisplay.handleAddEntries(addEntriesTask.entries());
       } else if (task instanceof TeamManagerTask.RemoveEntries) {
         TeamManagerTask.RemoveEntries removeEntriesTask = (TeamManagerTask.RemoveEntries) task;
         @NotNull TeamDisplayImpl teamDisplay = removeEntriesTask.teamDisplay();
-        teamDisplay.packetAdapter().sendEntries(EntriesPacketType.REMOVE, teamDisplay.players(), removeEntriesTask.entries());
+        teamDisplay.handleRemoveEntries(removeEntriesTask.entries());
       } else if (task instanceof TeamManagerTask.ChangeTeamDisplay) {
         TeamManagerTask.ChangeTeamDisplay changeTeamDisplayTask = (TeamManagerTask.ChangeTeamDisplay) task;
         changeTeamDisplayTask.team().changeTeamDisplay(changeTeamDisplayTask.player(), changeTeamDisplayTask.oldTeamDisplay(), changeTeamDisplayTask.newTeamDisplay());

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/team/TeamManagerTask.java

@@ -2,8 +2,10 @@ package net.megavex.scoreboardlibrary.implementation.team;
 
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
+import java.util.concurrent.CompletableFuture;
 
 public class TeamManagerTask {
   private TeamManagerTask() {
@@ -30,14 +32,20 @@ public class TeamManagerTask {
 
   public static final class RemovePlayer extends TeamManagerTask {
     private final Player player;
+    private final CompletableFuture<Void> future;
 
-    public RemovePlayer(@NotNull Player player) {
+    public RemovePlayer(@NotNull Player player, @Nullable CompletableFuture<Void> future) {
       this.player = player;
+      this.future = future;
     }
 
     public @NotNull Player player() {
       return player;
     }
+
+    public @Nullable CompletableFuture<Void> future() {
+      return future;
+    }
   }
 
   public static final class ReloadPlayer extends TeamManagerTask {

implementation/src/main/java/net/megavex/scoreboardlibrary/implementation/team/TeamUpdaterTask.java

@@ -7,7 +7,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.Iterator;
 import java.util.logging.Level;
 
-public class TeamUpdaterTask implements Runnable {
+public final class TeamUpdaterTask implements Runnable {
   private final ScoreboardLibraryImpl scoreboardLibrary;
   private final RunningTask task;
   private final Object lock = new Object();