Update canonical Gitea links

Exclude CODEOWNERS from language statistics
2026-10-30 14:19:35 -04:00 · 2026-10-30 14:19:35 -04:00 · 2026-10-29 16:19:04 -04:00 · 2026-10-29 16:19:04 -04:00 · 2026-08-09 12:02:07 -04:00 · 2026-07-12 17:58:53 -04:00
711 changed files with 42967 additions and 21724 deletions
@@ -5,3 +5,4 @@ gradlew text eol=lf
 *.bat text eol=crlf

 *.jar binary
+.gitea/CODEOWNERS linguist-detectable=false
@@ -0,0 +1,3 @@
+# Pull requests request review from the eligible staff team(s).
+# One approval from either an Admin or Developer satisfies branch protection.
+*   @trueog/Admins @trueog/Developers
@@ -1,65 +0,0 @@
-name: Bug Report
-description: Plugin does not work as described.
-labels: ["Type: Bug"]
-body:
-  - type: input
-    attributes:
-      label: Server version
-      description: Version and type of used server software where TAB is installed.
-      placeholder: Spigot 1.18.1
-    validations:
-      required: true
-
-  - type: input
-    attributes:
-      label: TAB version
-      description: Full version in numbers, "latest" is not a version.
-      placeholder: 3.0.2
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Describe the bug
-      description: How the plugin behaves
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Expected behavior
-      description: How the plugin is supposed to behave instead with your configuration.
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Steps to reproduce
-      description: What to do in order to reproduce this issue
-      placeholder: |
-        Step 1: ..
-        Step 2: ..
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Additional info
-      description: Anything else you want to provide that will help in resolving the issue faster, such as screenshots or videos.
-    validations:
-      required: false
-  - type: checkboxes
-    attributes:
-      label: Checklist
-      description: Let's make sure this report is valid
-      options:
-        - label: I am running latest version of the plugin
-          required: true
-        - label: I have read the wiki to make sure it's not an issue with configuration
-          required: true
-        - label: I ticked all of the boxes without actually reading them
-          required: false
-        - label: I have read the Compatibility wiki page and am not trying to run the plugin on an unsupported server version / platform
-          required: true
-        - label: I am willing to cooperate to get this issue resolved faster, including providing any additional information requested or testing new builds
-          required: true
@@ -1,38 +0,0 @@
-name: Compatibility issue
-description: A compatibility issue with another plugin/mod or a specific version of a platform marked as supported
-labels: ["Type: Compatibility issue"]
-body:
-  - type: input
-    attributes:
-      label: TAB version
-      description: Full version in numbers, "latest" is not a version.
-      placeholder: 4.0.0
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Software causing compatibility issue
-      description: plugin/mod/platform version causing the issue
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Additional info
-      description: Anything else you want to provide that will help in resolving the issue faster.
-    validations:
-      required: false
-  - type: checkboxes
-    attributes:
-      label: Checklist
-      description: Let's make sure this report is valid
-      options:
-        - label: I am running latest version of the plugin
-          required: true
-        - label: I ticked all of the boxes without actually reading them
-          required: false
-        - label: The compatibility wiki page does not mention this incompatibility
-          required: true
-        - label: I am willing to cooperate to get this issue resolved faster, including providing any additional information requested or testing new builds
-          required: true
@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Support
-    url: https://discord.gg/YPqXt63YQj
-    about: Fresh new community discord providing support with all plugins, including TAB
@@ -1,57 +0,0 @@
-name: Error
-description: Error message with a stack trace in console or error file.
-labels: ["Type: Error"]
-body:
-  - type: input
-    attributes:
-      label: Server version
-      description: Version and type of used server software where TAB is installed.
-      placeholder: Spigot 1.18.1
-    validations:
-      required: true
-
-  - type: input
-    attributes:
-      label: TAB version
-      description: Full version in numbers, "latest" is not a version.
-      placeholder: 3.0.2
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Stack trace
-      description: The error message and stack trace you received in console or errors.log file.
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Steps to reproduce (if known)
-      description: What to do in order to reproduce this issue
-      placeholder: |
-        Step 1: ..
-        Step 2: ..
-    validations:
-      required: false
-
-  - type: textarea
-    attributes:
-      label: Additional info
-      description: Any other info you want to provide.
-    validations:
-      required: false
-
-  - type: checkboxes
-    attributes:
-      label: Checklist
-      description: Let's make sure this report is valid
-      options:
-        - label: I am running latest version of the plugin
-          required: true
-        - label: I have included a paste of the error
-          required: true
-        - label: I ticked all of the boxes without actually reading them
-          required: false
-        - label: I have read the Compatibility wiki page and am not trying to run the plugin on an unsupported server version / platform
-          required: true
@@ -1,56 +0,0 @@
-name: Memory leak
-description: Memory leak caused by TAB.
-labels: ["Type: Memory leak"]
-body:
-  - type: input
-    attributes:
-      label: Server version
-      description: Version and type of used server software where TAB is installed.
-      placeholder: Spigot 1.18.1
-    validations:
-      required: true
-
-  - type: input
-    attributes:
-      label: TAB version
-      description: Full version in numbers, "latest" is not a version.
-      placeholder: 3.0.2
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Heap dump
-      description: Link to uploaded memory dump which I can look into.
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Uncleared object(s)
-      description: Objects you believe should have been removed from the memory but are not
-      placeholder: |
-        There is only 1 player online, but heap dump has 100 instances of TabPlayer
-    validations:
-      required: false
-
-  - type: textarea
-    attributes:
-      label: Additional info
-      description: Any other info you want to provide.
-    validations:
-      required: false
-
-  - type: checkboxes
-    attributes:
-      label: Checklist
-      description: Let's make sure this report is valid
-      options:
-        - label: I am running latest version of the plugin
-          required: true
-        - label: I have included download link of my heap dump
-          required: true
-        - label: I ticked all of the boxes without actually reading them
-          required: false
-        - label: I have explained what I believe is wrong with the heap dump
-          required: true
@@ -1,55 +0,0 @@
-name: Performance issue
-description: Performance issue in TAB or in server caused by TAB
-labels: ["Type: Performance"]
-body:
-  - type: input
-    attributes:
-      label: Server version
-      description: Version and type of used server software where TAB is installed.
-      placeholder: Spigot 1.18.1
-    validations:
-      required: true
-
-  - type: input
-    attributes:
-      label: TAB version
-      description: Full version in numbers, "latest" is not a version.
-      placeholder: 3.0.2
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Evidence
-      description: Any evidence proving the performance issue, such as output of /tab cpu or timings.
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Steps to reproduce (if known)
-      description: What to do in order to reproduce this issue
-      placeholder: |
-        Step 1: ..
-        Step 2: ..
-    validations:
-      required: false
-
-  - type: textarea
-    attributes:
-      label: Additional info
-      description: Any other info you want to provide.
-    validations:
-      required: false
-
-  - type: checkboxes
-    attributes:
-      label: Checklist
-      description: Let's make sure this report is valid
-      options:
-        - label: I am running latest version of the plugin
-          required: true
-        - label: I have included sufficient evidence of the issue
-          required: true
-        - label: I ticked all of the boxes without actually reading them
-          required: false
@@ -1,29 +0,0 @@
-name: Wiki change
-description: Change to text on a wiki page or adding a new section.
-labels: ["Type: Wiki change"]
-body:
-  - type: input
-    attributes:
-      label: Page link
-      description: Link to the page that should receive the change.
-      placeholder: https://github.com/NEZNAMY/TAB/wiki/Installation
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Current text (if applicable)
-      description: Current version of the text (if modifying), ignore in case of new section.
-      placeholder: |
-        Installation on Bukkit/Spigot/Paper is as simple as it can be. Just put the plugin into plugins folder and restart the server. You can also run `/plugman load tab` to load the plugin while server is running.
-    validations:
-      required: false
-
-  - type: textarea
-    attributes:
-      label: New text
-      description: What the text should be changed to / how should new section look
-      placeholder: |
-        Put the plugin into plugins folder and restart the server. In case you don't want to restart your server, loading with plugins like PlugMan is supported.
-    validations:
-      required: true
@@ -1,42 +0,0 @@
-name: Build
-on:
-  push:
-    branches:
-      - master
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4 #https://github.com/actions/checkout/releases
-        with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4 #https://github.com/actions/setup-java/releases
-        with:
-          distribution: 'temurin'
-          java-version: 21
-      - name: Cache SonarCloud packages
-        uses: actions/cache@v3.2.3 #https://github.com/actions/cache/releases
-        with:
-          path: ~/.sonar/cache
-          key: ${{ runner.os }}-sonar
-          restore-keys: ${{ runner.os }}-sonar
-      - name: Cache Gradle
-        uses: actions/cache@v3.2.3 #https://github.com/actions/cache/releases
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: "${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}"
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-      - name: Build and analyze
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
-        run: ./gradlew clean build
-      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v3.1.2 #https://github.com/actions/upload-artifact/releases
-        with:
-          name: Click here to download
-          path: jar/build/libs/TAB-**.jar
@@ -6,4 +6,7 @@ is in quality of the report (typically providing correct steps to reproduce that
 * Test **experimental builds**, which can be found in [GitHub Actions](https://github.com/NEZNAMY/TAB/actions) for problems of any kind including bugs. 
 This way you will help make the actual releases more stable / help get stable releases sooner.
 * Help improve the wiki by opening a [Wiki change issue](https://github.com/NEZNAMY/TAB/issues/new?assignees=&labels=Wiki&template=wiki_change.yml), 
-where you can improve existing descriptions, add information you found missing, fix typos / grammar mistakes or add more examples.
+where you can improve existing descriptions, add information you found missing, fix typos / grammar mistakes or add more examples.
+* Create spark reports and then send them to me. I will analyze them and try to find optimizations to make the plugin run faster. Commands:
+  * `/spark profiler start --timeout 300 --thread * --interval 0.1`
+  * `/spark profiler start --timeout 300 --thread * --interval 0.1 --alloc`
@@ -1,58 +1,27 @@
-# About
-TAB aims to be a superior all-in-one minecraft plugin for displaying information that outperforms all 
-similar plugins in terms of features, performance and compatibility.  
-More information can be found at [Why TAB?](https://github.com/NEZNAMY/TAB/wiki/Why-TAB%3F) wiki page.
+# TAB-OG

-# Download
-### Releases
-You can download full releases from [GitHub releases](https://github.com/NEZNAMY/TAB/releases), 
-[SpigotMC](https://www.spigotmc.org/resources/57806/), [Modrinth](https://modrinth.com/plugin/tab-was-taken) or [BuiltByBit](https://builtbybit.com/resources/20631).
+TAB-OG is a soft fork of [TAB](https://github.com/NEZNAMY/TAB) for
+[TrueOG Network](https://true-og.net/), based on upstream commit `93cfd74`.

-### Dev builds
-Plugin's development is continuous and contains lots of small changes/fixes not worthy of being called a full
-update, therefore development builds are being created and eventually a full update is released when enough changes are made.  
-If you want to benefit from a recent change in the code before official release, you can download development builds
-from [GitHub actions](https://github.com/NEZNAMY/TAB/actions) (you must be logged into GitHub to be able to download it).  
+Differences from upstream TAB:
+- Versioned `5.9.9` (upstream is on `6.x`), targeting Purpur 1.19.4 serving 1.8–1.21.11
+  clients through ViaVersion, ViaBackwards, and ViaRewind.
+- Builds only Bukkit `v1_19_R3`, BungeeCord, and Velocity; drops Fabric, Forge, NeoForge,
+  and the unused Bukkit/Paper NMS modules.
+- Uses LuckPerms `5.5` (Vault removed) with a GraalVM JDK 17 toolchain, producing one
+  universal shaded JAR.
+- TrueOG compatibility fixes: [Vanish-OG](https://git.trueog.net/trueog/Vanish-OG), the
+  [AFK-OG](https://git.trueog.net/trueog/AFK-OG) indicator, legacy scoreboard team colors,
+  and disabled scoreboard number formats.
+- Legacy (1.8–1.12.2) nametag rendering: over-head names drop the rank brackets (the
+  tablist keeps them), sit one space after the rank in its color, bold the AFK indicator
+  for every client, and fit within the 16-character team prefix/suffix limits. A bold
+  rank is kept only when the whole tag can render bold — legacy clients width-count
+  everything after `§l` as bold and never receive a `§r`, so a plain-rendered name after
+  a bold rank pads the nametag end with phantom pixels; when it cannot fit, bold is
+  stripped over-head. Keeping bold requires `add-teamcolor-to-prefix: false` in the
+  ViaBackwards config, otherwise the appended team color un-bolds the name again.
+- Ships live TrueOG Network config values.

-# Compiling
-Compilation requires JDK 21 and up.  
-To compile the plugin, run `./gradlew build` from the terminal.  
-Once the plugin compiles, grab the jar from `/jar/build/libs/` folder.  
-The universal jar contains all modules for all supported platforms.
-
-# Documentation
-You can find everything about the plugin on the [Wiki](https://github.com/NEZNAMY/TAB/wiki). This includes a detailed description
-of all features, as well as information regarding compatibility or limitations of each feature.  
-
-# Issues
-The [Issues](https://github.com/NEZNAMY/TAB/issues) section is an issue tracker for all the kind of problems covered in issue templates.
-Please refrain from attempting to use it to receive help with your server, such issues will be closed immediately.  
-When opening an issue, provide as much information as possible. The difference between a bug getting fixed in 1 week vs 1 hour
-is in quality of the report. Bug reports where steps to reproduce are "idk" have no value and will not help to get the bug fixed at all.  
-
-# Contributing
-See [CONTRIBUTING.md](https://github.com/NEZNAMY/TAB/blob/master/CONTRIBUTING.md)
-
-# Provided services
-The plugin is being used by a large amount of servers, which also means the demand for my attention is high. Unfortunately, 
-I am no longer able to keep up with the demand since I don't want to dedicate my whole existence to a free plugin. 
-In order to provide the best quality of all provided services, the amount of services provided may vary over time. 
-Here is the full list of potential services and their status:
-
-| Service type                  | Availability |
-|-------------------------------|--------------|
-| Updates for new MC versions   | ✔            |
-| Bug fixes                     | ✔            |
-| Wiki updates<sup>1</sup>      | ✔            |
-| Feature requests              | ❌            |
-| Customer support<sup>2</sup>  | ✔            |
-| Free user support<sup>3</sup> | ❌*           |
-| Optimization<sup>4</sup>      | ✔            |
-
-<sup>1</sup> - Adding new examples, guides and other kind of useful information people ask about.  
-<sup>2</sup> - Unrestricted assistance with the plugin for those, who bought a copy of the plugin when it was purchasable.  
-<sup>3</sup> - Unlimited access to my free time for everyone in the world.  
-<sup>4</sup> - Improving plugin's performance while not losing out on any features. This was done 
-proactively a lot in the past, so there isn't much to do anymore, only if someone actually finds and reports something.  
-  
-*Instead, you can use [this fresh new community discord](https://discord.gg/YPqXt63YQj) made by a nice person who will provide this service.  
+Build with `./gradlew build` (JAR in `jar/build/libs/`). Requires LuckPerms; bold legacy
+nametags additionally require ViaBackwards with `add-teamcolor-to-prefix: false`.
@@ -1,5 +1,5 @@
 dependencies {
-    compileOnlyApi("org.jetbrains:annotations:24.1.0")
+    compileOnlyApi("org.jetbrains:annotations:26.0.2")
 }

 tasks.javadoc {
@@ -17,21 +17,24 @@ public interface TabPlayer {
     *
     * @return  Player's name
     */
-    @NotNull String getName();
+    @NotNull
+    String getName();

    /**
     * Returns player's UUID
     *
     * @return  Player's UUID
     */
-    @NotNull UUID getUniqueId();
+    @NotNull
+    UUID getUniqueId();

    /**
     * Returns platform-specific entity
     *
     * @return  platform's player object
     */
-    @NotNull Object getPlayer();
+    @NotNull
+    Object getPlayer();

    /**
     * Returns true once the player is successfully loaded (onJoin method ran through all methods)
@@ -47,7 +50,8 @@ public interface TabPlayer {
     *
     * @return  player's primary permission group
     */
-    @NotNull String getGroup();
+    @NotNull
+    String getGroup();

    /**
     * Temporarily overrides player's group and applies all changes coming from new group.
@@ -73,7 +77,7 @@ public interface TabPlayer {
     * Changes expected profile name of the player. This adapts all name-bound features
     * to use this new profile name if another plugin changed profile name of the player. <p>
     * Automatic profile name change detection is available on Bukkit, BungeeCord and Fabric,
-     * therefore using this is redundant there. This function is only needed on Sponge and Velocity,
+     * therefore using this is redundant there. This function is only needed on Velocity,
     * where the detection is not available. <p>
     * Warning: This function does NOT change player's profile name, it only updates the tracked
     * name inside the plugin.
@@ -91,4 +95,31 @@ public interface TabPlayer {
     */
    @NotNull
    String getExpectedProfileName();
+
+    /**
+     * Returns name of the server the player is connected to.
+     * This requires TAB on proxy.
+     * On backend installation, this method returns {@code "N/A"}.
+     *
+     * @return  Player's server on proxy or {@code "N/A"} on backend installation
+     */
+    @NotNull
+    String getServer();
+
+    /**
+     * Returns name of the world the player is in.
+     * On proxy installation, TAB-Bridge must be installed to forward this info to the proxy.
+     * Otherwise, it will return {@code "N/A"}.
+     *
+     * @return  Player's world or {@code "N/A"} on proxy installation without TAB-Bridge installed
+     */
+    @NotNull
+    String getWorld();
+
+    /**
+     * Returns {@code true} if this player is a bedrock player, {@code false} if not.
+     *
+     * @return  {@code true} if this player is a bedrock player, {@code false} if not
+     */
+    boolean isBedrockPlayer();
 }
@@ -10,11 +10,7 @@ import org.jetbrains.annotations.NotNull;
 /**
 * An interface representing a BossBar line.
 * <p>
- * For clients 1.8 and lower it uses wither, which only allows 1 bar 
- * to be displayed at a time. Entity packets are not available on BungeeCord,
- * where nothing will be displayed for these players.
- * <p>
- * For 1.9+ it uses the new BossBar feature, allowing configurable styles
+ * It uses 1.9+ BossBar feature, allowing configurable styles
 * and colors, as well as display several bars at once. Limit of maximum 
 * displayed BossBars depends on client resolution and GUI scale, up to
 * 9 concurrent BossBars displayed at once.
@@ -205,7 +201,7 @@ public interface BossBar {
     *          Player to check
     * @return  {@code true} if player is allowed to see this Boss Bar, {@code false} if not.
     */
-    boolean containsPlayer(TabPlayer player);
+    boolean containsPlayer(@NonNull TabPlayer player);

    /**
     * Returns {@code true} if this boss bar is configured as announcement-only bar,
@@ -1,14 +1,14 @@
 package me.neznamy.tab.api.bossbar;

-import java.util.List;
-import java.util.Map;
-
 import lombok.NonNull;
 import me.neznamy.tab.api.TabAPI;
 import me.neznamy.tab.api.TabPlayer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

+import java.util.List;
+import java.util.Map;
+
 /**
 * An interface allowing work with BossBars such as creating, sending
 * and toggling.
@@ -78,6 +78,28 @@ public interface BossBarManager {
     */
    @NotNull Map<String, BossBar> getRegisteredBossBars();

+    /**
+     * Removes BossBar with specified name from the manager, making it no longer available.
+     * If BossBar was displayed to any players, it is removed.
+     *
+     * @param   name
+     *          Name of registered BossBar to remove
+     * @throws  IllegalArgumentException
+     *          if no BossBar with specified name exists
+     */
+    void removeBossBar(@NonNull String name);
+
+    /**
+     * Removes BossBar from the manager, making it no longer available.
+     * If BossBar was displayed to any players, it is removed.
+     *
+     * @param   bossBar
+     *          BossBar to remove
+     * @throws  IllegalArgumentException
+     *          if specified BossBar is not registered
+     */
+    void removeBossBar(@NonNull BossBar bossBar);
+
    /**
     * Toggles BossBar for this player and sends toggle message if {@code sendToggleMessage} is true.
     * 
@@ -117,14 +139,14 @@ public interface BossBarManager {
    void setBossBarVisible(@NonNull TabPlayer player, boolean visible, boolean sendToggleMessage);

    /**
-     * Temporarily displays registered BossBar to player for specified amount of time in milliseconds.
+     * Temporarily displays registered BossBar to player for specified amount of time in seconds.
     *
     * @param   player
     *          Player to show BossBar to
     * @param   bossBar
     *          Name of registered BossBar to show
     * @param   duration
-     *          In milliseconds for how long should BossBar be displayed
+     *          In seconds for how long should BossBar be displayed
     * @throws  IllegalArgumentException
     *          if no BossBar with specified name exists
     * @see     #announceBossBar(String, int)
@@ -133,12 +155,12 @@ public interface BossBarManager {
    void sendBossBarTemporarily(@NonNull TabPlayer player, @NonNull String bossBar, int duration);

    /**
-     * Temporarily displays registered BossBar to all players for specified amount of time in milliseconds.
+     * Temporarily displays registered BossBar to all players for specified amount of time in seconds.
     *
     * @param   bossBar
     *          Name of registered BossBar to show
     * @param   duration
-     *          In milliseconds for how long should BossBar be displayed
+     *          In seconds for how long should BossBar be displayed
     * @throws  IllegalArgumentException
     *          if no BossBar with specified name exists
     * @see     #sendBossBarTemporarily(TabPlayer, String, int)
@@ -1,48 +0,0 @@
-package me.neznamy.tab.api.event.plugin;
-
-import lombok.NonNull;
-import me.neznamy.tab.api.TabPlayer;
-import me.neznamy.tab.api.event.TabEvent;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.function.BiFunction;
-import java.util.function.Function;
-import java.util.function.Supplier;
-
-/**
- * Called when an unknown placeholder is about to be registered.
- * It defaults to a PlaceholderAPI implementation, but can be overridden.
- */
-public interface PlaceholderRegisterEvent extends TabEvent {
-
-    /**
-     * Returns placeholder identifier starting and ending with {@code %}
-     *
-     * @return  placeholder identifier starting and ending with {@code %}
-     */
-    @NotNull String getIdentifier();
-
-    /**
-     * Sets placeholder to specified server placeholder implementation.
-     *
-     * @param   supplier
-     *          Placeholder replacer
-     */
-    void setServerPlaceholder(@NonNull Supplier<Object> supplier);
-
-    /**
-     * Sets placeholder to specified player placeholder implementation.
-     *
-     * @param   function
-     *          Placeholder replacer
-     */
-    void setPlayerPlaceholder(@NonNull Function<TabPlayer, Object> function);
-
-    /**
-     * Sets placeholder to specified relational placeholder implementation.
-     *
-     * @param   function
-     *          Placeholder replacer
-     */
-    void setRelationalPlaceholder(@NonNull BiFunction<TabPlayer, TabPlayer, Object> function);
-}
@@ -0,0 +1,85 @@
+package me.neznamy.tab.api.integration;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import me.neznamy.tab.api.TabPlayer;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Getter
+@RequiredArgsConstructor
+public abstract class VanishIntegration {
+
+    /** List of all registered VanishIntegration handlers */
+    private static final List<VanishIntegration> HANDLERS = new ArrayList<>();
+
+    /** Name of the plugin this integration is associated with */
+    @NotNull
+    private final String plugin;
+
+    /**
+     * Determines if a viewer can see a target player.
+     *
+     * @param   viewer
+     *          The player attempting to view another player
+     * @param   target
+     *          The player being viewed
+     * @return  {@code true} if the viewer can see the target, {@code false} otherwise
+     */
+    public abstract boolean canSee(@NotNull TabPlayer viewer, @NotNull TabPlayer target);
+
+    /**
+     * Checks if the specified player is in a vanished state.
+     *
+     * @param   player
+     *          The player to check
+     * @return  {@code true} if the player is vanished, {@code false} otherwise
+     */
+    public abstract boolean isVanished(@NotNull TabPlayer player);
+
+    /**
+     * Registers this integration handler to the global list of handlers.
+     */
+    public void register() {
+        registerHandler(this);
+    }
+
+    /**
+     * Unregisters this integration handler from the global list of handlers.
+     */
+    public void unregister() {
+        unregisterHandler(this);
+    }
+
+    /**
+     * Adds a VanishIntegration handler to the global list of handlers.
+     *
+     * @param handler
+     *        The handler to register
+     */
+    public static void registerHandler(@NotNull VanishIntegration handler) {
+        HANDLERS.add(handler);
+    }
+
+    /**
+     * Removes a VanishIntegration handler from the global list of handlers.
+     *
+     * @param handler
+     *        The handler to unregister
+     */
+    public static void unregisterHandler(@NotNull VanishIntegration handler) {
+        HANDLERS.remove(handler);
+    }
+
+    /**
+     * Retrieves the list of all registered VanishIntegration handlers.
+     *
+     * @return  A list of registered VanishIntegration handlers
+     */
+    @NotNull
+    public static List<VanishIntegration> getHandlers() {
+        return HANDLERS;
+    }
+}
@@ -3,6 +3,7 @@ package me.neznamy.tab.api.nametag;
 import lombok.NonNull;
 import me.neznamy.tab.api.TabAPI;
 import me.neznamy.tab.api.TabPlayer;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

 /**
@@ -133,7 +134,7 @@ public interface NameTagManager {
     * @param   prefix
     *          new prefix value
     * @see     #getCustomPrefix(TabPlayer)
-     * @see     #getOriginalPrefix(TabPlayer)
+     * @see     #getOriginalRawPrefix(TabPlayer)
     */
    void setPrefix(@NonNull TabPlayer player, @Nullable String prefix);

@@ -147,7 +148,7 @@ public interface NameTagManager {
     * @param   suffix
     *          new suffix value
     * @see     #getCustomSuffix(TabPlayer)
-     * @see     #getOriginalSuffix(TabPlayer)
+     * @see     #getOriginalRawSuffix(TabPlayer)
     */
    void setSuffix(@NonNull TabPlayer player, @Nullable String suffix);

@@ -159,7 +160,7 @@ public interface NameTagManager {
     *          Player to get custom prefix of
     * @return  Custom prefix assigned using the API.
     * @see     #setPrefix(TabPlayer, String)
-     * @see     #getOriginalPrefix(TabPlayer)
+     * @see     #getOriginalRawPrefix(TabPlayer)
     */
    @Nullable
    String getCustomPrefix(@NonNull TabPlayer player);
@@ -172,7 +173,7 @@ public interface NameTagManager {
     *          Player to get custom suffix of
     * @return  Custom suffix assigned using the API.
     * @see     #setSuffix(TabPlayer, String)
-     * @see     #getOriginalSuffix(TabPlayer)
+     * @see     #getOriginalRawSuffix(TabPlayer)
     */
    @Nullable
    String getCustomSuffix(@NonNull TabPlayer player);
@@ -184,8 +185,8 @@ public interface NameTagManager {
     * @return  Original prefix assigned by the plugin's internal logic.
     * @see     #getCustomPrefix(TabPlayer)
     */
-    @NonNull
-    String getOriginalPrefix(@NonNull TabPlayer player);
+    @NotNull
+    String getOriginalRawPrefix(@NonNull TabPlayer player);

    /**
     * Returns original suffix assigned by the plugin using internal logic.
@@ -194,21 +195,87 @@ public interface NameTagManager {
     * @return  Original suffix assigned by the plugin's internal logic.
     * @see     #getCustomSuffix(TabPlayer)
     */
-    @NonNull
+    @NotNull
+    String getOriginalRawSuffix(@NonNull TabPlayer player);
+
+    /**
+     * Returns original prefix assigned by the plugin using internal logic with all placeholders replaced.
+     * @param   player
+     *          Player to get replaced original prefix of
+     * @return  Original prefix assigned by the plugin's internal logic.
+     * @see     #getCustomPrefix(TabPlayer)
+     */
+    @NotNull
+    String getOriginalReplacedPrefix(@NonNull TabPlayer player);
+
+    /**
+     * Returns original suffix assigned by the plugin using internal logic with all placeholders replaced.
+     * @param   player
+     *          Player to get replaced original suffix of
+     * @return  Original suffix assigned by the plugin's internal logic.
+     * @see     #getCustomSuffix(TabPlayer)
+     */
+    @NotNull
+    String getOriginalReplacedSuffix(@NonNull TabPlayer player);
+
+    /**
+     * Returns original suffix assigned by the plugin using internal logic.
+     * @param   player
+     *          Player to get replaced original prefix of
+     * @return  Original prefix assigned by the plugin's internal logic.
+     * @see     #getCustomPrefix(TabPlayer)
+     * @deprecated  Use {@link #getOriginalRawPrefix(TabPlayer)} instead.
+     */
+    @Deprecated
+    @NotNull
+    String getOriginalPrefix(@NonNull TabPlayer player);
+
+    /**
+     * Returns original suffix assigned by the plugin using internal logic.
+     * @param   player
+     *          Player to get replaced original suffix of
+     * @return  Original suffix assigned by the plugin's internal logic.
+     * @see     #getCustomSuffix(TabPlayer)
+     * @deprecated  Use {@link #getOriginalRawSuffix(TabPlayer)} instead.
+     */
+    @Deprecated
+    @NotNull
    String getOriginalSuffix(@NonNull TabPlayer player);

    /**
     * Toggles name tag visibility view on all players for specified player.
     * On first call, name tags of all players will become invisible for specified
-     * player. On second call, they will become visible again.
+     * player. On the second call, they will become visible again.
     *
     * @param   player
     *          player to toggle name tag visibility view for
     * @param   sendToggleMessage
-     *          {@code true} if configured toggle message should be sent, {@code false} if not
+     *          {@code true} if the configured toggle message should be sent, {@code false} if not
     */
    void toggleNameTagVisibilityView(@NonNull TabPlayer player, boolean sendToggleMessage);

+    /**
+     * Shows back name tag visibility view on all players for specified player.
+     * If the view is not hidden, nothing happens.
+     *
+     * @param   player
+     *          player to show name tag visibility view for
+     * @param   sendToggleMessage
+     *          {@code true} if the configured toggle message should be sent, {@code false} if not
+     */
+    void showNameTagVisibilityView(@NonNull TabPlayer player, boolean sendToggleMessage);
+
+    /**
+     * Hides name tag visibility view on all players for specified player.
+     * If the view is already hidden, nothing happens.
+     *
+     * @param   player
+     *          player to show name tag visibility view for
+     * @param   sendToggleMessage
+     *          {@code true} if the configured toggle message should be sent, {@code false} if not
+     */
+    void hideNameTagVisibilityView(@NonNull TabPlayer player, boolean sendToggleMessage);
+
    /**
     * Returns {@code true} if player has hidden name tags by either calling
     * {@link #toggleNameTagVisibilityView(TabPlayer, boolean)} or using a command,
@@ -1,129 +0,0 @@
-package me.neznamy.tab.api.nametag;
-
-import java.util.List;
-
-import lombok.NonNull;
-import me.neznamy.tab.api.TabAPI;
-import me.neznamy.tab.api.TabPlayer;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Interface for manipulating player name tags.
- * <p>
- * Instance can be obtained using {@link TabAPI#getNameTagManager()} and then casting it.
- * This requires both Team and Unlimited name tag features to be enabled in config, otherwise the method will
- * return {@code null} or not be an instance of this class.
- */
-@SuppressWarnings("unused") // API class
-public interface UnlimitedNameTagManager extends NameTagManager {
-
-    /**
-     * Disables armor stands of specified player and displays vanilla name tags instead.
-     *
-     * @param   player
-     *          Player to disable armor stands of
-     * @see     #enableArmorStands(TabPlayer)
-     * @see     #hasDisabledArmorStands(TabPlayer)
-     */
-    void disableArmorStands(@NonNull TabPlayer player);
-
-    /**
-     * Enabled back armor stands of player, who was disabled previously using
-     * {@link #disableArmorStands(TabPlayer)}.
-     *
-     * @param   player
-     *          Player to enable back
-     * @see     #disableArmorStands(TabPlayer)
-     * @see     #hasDisabledArmorStands(TabPlayer)
-     */
-    void enableArmorStands(@NonNull TabPlayer player);
-
-    /**
-     * Returns {@code true} if player has armor stands disabled using
-     * {@link #disableArmorStands(TabPlayer)}, {@code false} otherwise.
-     *
-     * @param   player
-     *          Player to check
-     * @return  {@code true} if disabled, {@code false} if not.
-     * @see     #disableArmorStands(TabPlayer)
-     * @see     #enableArmorStands(TabPlayer)
-     */
-    boolean hasDisabledArmorStands(@NonNull TabPlayer player);
-
-    /**
-     * Changes name to specified value. Set to {@code null} to
-     * reset back to original value.
-     *
-     * @param   player
-     *          Player to change name of
-     * @param   customName
-     *          New name, or {@code null} to reset to original value
-     */
-    void setName(@NonNull TabPlayer player, @Nullable String customName);
-
-    /**
-     * Changes line to specified value. Set to {@code null} to reset back to original value.
-     *
-     * @param   player
-     *          Player to change line of
-     * @param   line
-     *          Name of defined line
-     * @param   value
-     *          Value to use, or {@code null} to reset back to original value
-     * @see     #getDefinedLines()
-     */
-    void setLine(@NonNull TabPlayer player, @NonNull String line, @Nullable String value);
-
-    /**
-     * Returns custom name value set using {@link #setName(TabPlayer, String)}.
-     *
-     * @param   player
-     *          Player to check
-     * @return  Custom name set previously or {@code null} if not set
-     * @see     #setName(TabPlayer, String)
-     */
-    @Nullable String getCustomName(@NonNull TabPlayer player);
-
-    /**
-     * Returns custom line value set using {@link #setLine(TabPlayer, String, String)}.
-     *
-     * @param   player
-     *          Player to check
-     * @param   line
-     *          Defined line
-     * @return  Custom name set previously or {@code null} if not set
-     * @see     #setName(TabPlayer, String)
-     * @see     #getDefinedLines()
-     */
-    @Nullable String getCustomLineValue(@NonNull TabPlayer player, @NonNull String line);
-
-    /**
-     * Returns original name value configured in files.
-     *
-     * @param   player
-     *          Player to check
-     * @return  Original configured name
-     * @see     #setName(TabPlayer, String)
-     */
-    @NotNull String getOriginalName(@NonNull TabPlayer player);
-
-    /**
-     * Returns original line value configured in files.
-     *
-     * @param   player
-     *          Player to check
-     * @param   line
-     *          Line name
-     * @return  Original configured line
-     * @see     #setLine(TabPlayer, String, String)
-     */
-    @NotNull String getOriginalLineValue(@NonNull TabPlayer player, @NonNull String line);
-
-    /**
-     * Returns list of all defined lines in config, both static and dynamic lines.
-     *
-     * @return  List of all defined lines in config
-     */
-    @NotNull List<String> getDefinedLines();
-}
@@ -8,6 +8,8 @@ import org.jetbrains.annotations.NotNull;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Supplier;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;

 /**
 * An interface allowing placeholder registration. Instance can be
@@ -30,7 +32,7 @@ public interface PlaceholderManager {
     *          If {@code identifier} does not start and end with {@code %} or
     *          {@code refresh} is not divisible by 50
     */
-    @NotNull ServerPlaceholder registerServerPlaceholder(@NonNull String identifier, int refresh, @NonNull Supplier<Object> supplier);
+    @NotNull ServerPlaceholder registerServerPlaceholder(@NonNull String identifier, int refresh, @NonNull Supplier<String> supplier);

    /**
     * Registers a player placeholder (placeholder different output per player)
@@ -46,7 +48,7 @@ public interface PlaceholderManager {
     *          If {@code identifier} does not start and end with {@code %} or
     *          {@code refresh} is not divisible by 50
     */
-    @NotNull PlayerPlaceholder registerPlayerPlaceholder(@NonNull String identifier, int refresh, @NonNull Function<TabPlayer, Object> function);
+    @NotNull PlayerPlaceholder registerPlayerPlaceholder(@NonNull String identifier, int refresh, @NonNull Function<TabPlayer, String> function);

    /**
     * Registers a relational placeholder (placeholder with output different for each player duo)
@@ -63,7 +65,15 @@ public interface PlaceholderManager {
     *          does not start with {@code %rel_} or
     *          {@code refresh} is not divisible by 50
     */
-    @NotNull RelationalPlaceholder registerRelationalPlaceholder(@NonNull String identifier, int refresh, @NonNull BiFunction<TabPlayer, TabPlayer, Object> function);
+    @NotNull RelationalPlaceholder registerRelationalPlaceholder(@NonNull String identifier, int refresh, @NonNull BiFunction<TabPlayer, TabPlayer, String> function);
+
+    void registerServerPlaceholder(@NonNull Pattern identifier, int refresh, @NonNull Function<Matcher, Supplier<String>> function);
+
+    void registerPlayerPlaceholder(@NonNull Pattern identifier, int refresh,
+                                   @NonNull Function<Matcher, Function<me.neznamy.tab.api.TabPlayer, String>> function);
+
+    void registerRelationalPlaceholder(@NonNull Pattern identifier, int refresh,
+                                       @NonNull Function<Matcher, BiFunction<me.neznamy.tab.api.TabPlayer, me.neznamy.tab.api.TabPlayer, String>> function);

    /**
     * Returns placeholder from specified identifier. If it does not exist, it is registered
@@ -19,7 +19,7 @@ public interface PlayerPlaceholder extends Placeholder {
     * @param   value
     *          New value
     */
-    void updateValue(@NonNull TabPlayer player, @Nullable Object value);
+    void updateValue(@NonNull TabPlayer player, @Nullable String value);

    /**
     * Force-updates placeholder value using previously provided update function.
@@ -22,7 +22,7 @@ public interface RelationalPlaceholder extends Placeholder {
     * @param   value
     *          New value
     */
-    void updateValue(@NonNull TabPlayer viewer, @NonNull TabPlayer target, @Nullable Object value);
+    void updateValue(@NonNull TabPlayer viewer, @NonNull TabPlayer target, @Nullable String value);

    /**
     * Force-updates placeholder value using previously provided update function.
@@ -15,7 +15,7 @@ public interface ServerPlaceholder extends Placeholder {
     * @param   value
     *          New value
     */
-    void updateValue(@Nullable Object value);
+    void updateValue(@Nullable String value);

    /**
     * Force-updates placeholder value using previously provided update function.
@@ -17,7 +17,7 @@ public interface Scoreboard {
    /**
     * Returns internal name of this scoreboard. Name is defined in registration,
     * scoreboards from config use name they were defined with. This value is
-     * used internally and in /tab announce scoreboard command.
+     * used internally and in /tab scoreboard announce command.
     * 
     * @return  custom name of this scoreboard
     */
@@ -84,8 +84,24 @@ public interface Scoreboard {
     */
    void removeLine(int index);

+    /**
+     * Replaces all current lines with the provided list.
+     * Supports placeholders, which will automatically be refreshed.
+     * Client can only see up to 15 lines at a time.
+     * If the new list is identical to the current one, nothing happens.
+     *
+     * @param   lines
+     *          New list of lines to display
+     * @throws  NullPointerException
+     *          if {@code lines} is {@code null}
+     * @see     #getLines()
+     * @see     #addLine(String)
+     * @see     #removeLine(int)
+     */
+    void setLines(@NonNull List<String> lines);
+
    /**
     * Unregisters this scoreboard from all players who can see it.
     */
    void unregister();
-}
+}
@@ -1,13 +1,13 @@
 package me.neznamy.tab.api.scoreboard;

-import java.util.List;
-import java.util.Map;
-
 import lombok.NonNull;
 import me.neznamy.tab.api.TabPlayer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

+import java.util.List;
+import java.util.Map;
+
 /**
 * Interface allowing work with scoreboards, such as creating,
 * sending, toggling and modifying.
@@ -54,6 +54,29 @@ public interface ScoreboardManager {
     * @return  map of registered scoreboards
     */
    @NotNull Map<String, Scoreboard> getRegisteredScoreboards();
+
+    /**
+     * Removes scoreboard with specified name from list of scoreboards. If it was displayed to anyone,
+     * it will be removed from their display as well. Then, those players will receive a new scoreboard based
+     * on configuration.
+     *
+     * @param   name    Name of scoreboard to remove
+     * @throws  IllegalArgumentException
+     *          if scoreboard with such name does not exist
+     */
+    void removeScoreboard(@NonNull String name);
+
+    /**
+     * Removes scoreboard from list of scoreboards. If it was displayed to anyone,
+     * it will be removed from their display as well. Then, those players will receive a new scoreboard based
+     * on configuration.
+     *
+     * @param   scoreboard
+     *          Scoreboard to remove
+     * @throws  IllegalArgumentException
+     *          if specified scoreboard is not registered
+     */
+    void removeScoreboard(@NonNull Scoreboard scoreboard);
    
    /**
     * Displays scoreboard to defined player. This will disable all display
@@ -27,7 +27,7 @@ public interface TabListFormatManager {
     * @param   prefix
     *          new prefix value
     * @see     #getCustomPrefix(TabPlayer)
-     * @see     #getOriginalPrefix(TabPlayer)
+     * @see     #getOriginalRawPrefix(TabPlayer)
     */
    void setPrefix(@NonNull TabPlayer player, @Nullable String prefix);

@@ -41,7 +41,7 @@ public interface TabListFormatManager {
     * @param   customName
     *          new customName value
     * @see     #getCustomName(TabPlayer)
-     * @see     #getOriginalName(TabPlayer)
+     * @see     #getOriginalRawName(TabPlayer)
     */
    void setName(@NonNull TabPlayer player, @Nullable String customName);

@@ -55,7 +55,7 @@ public interface TabListFormatManager {
     * @param   suffix
     *          new suffix value
     * @see     #getCustomSuffix(TabPlayer)
-     * @see     #getOriginalSuffix(TabPlayer)
+     * @see     #getOriginalRawSuffix(TabPlayer)
     */
    void setSuffix(@NonNull TabPlayer player, @Nullable String suffix);

@@ -67,7 +67,7 @@ public interface TabListFormatManager {
     *          player to get custom prefix of
     * @return  player's custom prefix or {@code null} if not defined
     * @see     #setPrefix(TabPlayer, String)
-     * @see     #getOriginalPrefix(TabPlayer)
+     * @see     #getOriginalRawPrefix(TabPlayer)
     */
    @Nullable String getCustomPrefix(@NonNull TabPlayer player);

@@ -104,8 +104,11 @@ public interface TabListFormatManager {
     * @return  player's original prefix
     * @see     #setPrefix(TabPlayer, String)
     * @see     #getCustomPrefix(TabPlayer)
+     * @deprecated  Use {@link #getOriginalRawPrefix(TabPlayer)} instead.
     */
-    @NotNull String getOriginalPrefix(@NonNull TabPlayer player);
+    @NotNull
+    @Deprecated
+    String getOriginalPrefix(@NonNull TabPlayer player);

    /**
     * Returns player's original name applied using plugin's internal logic.
@@ -116,8 +119,11 @@ public interface TabListFormatManager {
     * @return  player's original name
     * @see     #setName(TabPlayer, String)
     * @see     #getCustomName(TabPlayer)
+     * @deprecated  Use {@link #getOriginalRawName(TabPlayer)} instead.
     */
-    @NotNull String getOriginalName(@NonNull TabPlayer player);
+    @NotNull
+    @Deprecated
+    String getOriginalName(@NonNull TabPlayer player);

    /**
     * Returns player's original suffix applied using plugin's internal logic.
@@ -128,6 +134,69 @@ public interface TabListFormatManager {
     * @return  player's original suffix
     * @see     #setSuffix(TabPlayer, String)
     * @see     #getCustomSuffix(TabPlayer)
+     * @deprecated  Use {@link #getOriginalRawSuffix(TabPlayer)} instead.
     */
-    @NotNull String getOriginalSuffix(@NonNull TabPlayer player);
+    @NotNull
+    @Deprecated
+    String getOriginalSuffix(@NonNull TabPlayer player);
+
+    /**
+     * Returns original prefix assigned by the plugin using internal logic.
+     * @param   player
+     *          Player to get original prefix of
+     * @return  Original prefix assigned by the plugin's internal logic.
+     * @see     #getCustomPrefix(TabPlayer)
+     */
+    @NotNull
+    String getOriginalRawPrefix(@NonNull TabPlayer player);
+
+    /**
+     * Returns original name assigned by the plugin using internal logic.
+     * @param   player
+     *          Player to get original name of
+     * @return  Original name assigned by the plugin's internal logic.
+     * @see     #getCustomName(TabPlayer)
+     */
+    @NotNull
+    String getOriginalRawName(@NonNull TabPlayer player);
+
+    /**
+     * Returns original suffix assigned by the plugin using internal logic.
+     * @param   player
+     *          Player to get original suffix of
+     * @return  Original suffix assigned by the plugin's internal logic.
+     * @see     #getCustomSuffix(TabPlayer)
+     */
+    @NotNull
+    String getOriginalRawSuffix(@NonNull TabPlayer player);
+
+    /**
+     * Returns original prefix assigned by the plugin using internal logic with all placeholders replaced.
+     * @param   player
+     *          Player to get replaced original prefix of
+     * @return  Original prefix assigned by the plugin's internal logic.
+     * @see     #getCustomPrefix(TabPlayer)
+     */
+    @NotNull
+    String getOriginalReplacedPrefix(@NonNull TabPlayer player);
+
+    /**
+     * Returns original name assigned by the plugin using internal logic with all placeholders replaced.
+     * @param   player
+     *          Player to get replaced original name of
+     * @return  Original name assigned by the plugin's internal logic.
+     * @see     #getCustomName(TabPlayer)
+     */
+    @NotNull
+    String getOriginalReplacedName(@NonNull TabPlayer player);
+
+    /**
+     * Returns original suffix assigned by the plugin using internal logic with all placeholders replaced.
+     * @param   player
+     *          Player to get replaced original suffix of
+     * @return  Original suffix assigned by the plugin's internal logic.
+     * @see     #getCustomSuffix(TabPlayer)
+     */
+    @NotNull
+    String getOriginalReplacedSuffix(@NonNull TabPlayer player);
 }
@@ -65,6 +65,20 @@ public interface Layout {
     */
    void addFixedSlot(int slot, @NonNull String text, @NonNull String skin, int ping);

+    /**
+     * Adds fixed slot with specified parameters
+     *
+     * @param   slot
+     *          Slot (1-80)
+     * @param   text
+     *          Text to display
+     * @param   skin
+     *          Skin definition like in config
+     * @param   ping
+     *          Slot's ping, accepts placeholders that evaluate to a number
+     */
+    void addFixedSlot(int slot, @NonNull String text, @NonNull String skin, @NonNull String ping);
+
    /**
     * Adds a player group.
     *
@@ -3,6 +3,7 @@ package me.neznamy.tab.api.tablist.layout;
 import lombok.NonNull;
 import me.neznamy.tab.api.TabAPI;
 import me.neznamy.tab.api.TabPlayer;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

 /**
@@ -20,7 +21,31 @@ public interface LayoutManager {
     *          Unique layout name
     * @return  Created layout
     */
-    Layout createNewLayout(String name);
+    @NotNull
+    Layout createNewLayout(@NonNull String name);
+
+    /**
+     * Creates new layout with given name and slot count (1.19.3+ only).
+     *
+     * @param   name
+     *          Unique layout name
+     * @param   slotCount
+     *          Amount of slots to use for 1.19.3+ players
+     * @return  Created layout
+     */
+    @NotNull
+    Layout createNewLayout(@NonNull String name, int slotCount);
+
+    /**
+     * Returns defined layout from config by name. If no such layout is defined in config,
+     * {@code null} is returned.
+     *
+     * @param   name
+     *          Name of layout defined in config
+     * @return  Layout defined in config by name or {@code null} if no such layout is defined
+     */
+    @Nullable
+    Layout getLayout(@NonNull String name);

    /**
     * Sends layout to player. Set to {@code null} to make player not see
@@ -3,7 +3,6 @@ plugins {
 }

 dependencies {
-    implementation("com.github.johnrengelman:shadow:8.1.1")
-    implementation("io.freefair.gradle:lombok-plugin:8.6")
-    implementation("fabric-loom:fabric-loom.gradle.plugin:1.6-SNAPSHOT")
+    implementation("com.gradleup.shadow:shadow-gradle-plugin:9.4.0")
+    implementation("io.freefair.gradle:lombok-plugin:9.2.0")
 }
@@ -3,6 +3,9 @@ rootProject.name = "build-logic"
 dependencyResolutionManagement {
    repositories {
        maven("https://maven.fabricmc.net/")
+        maven("https://maven.architectury.dev/")
+        maven("https://maven.minecraftforge.net/")
+        maven("https://maven.neoforged.net/releases/")
        gradlePluginPortal()
        mavenCentral()
    }
@@ -24,13 +24,14 @@ tasks {
    }
    compileJava {
        options.encoding = Charsets.UTF_8.name()
-        options.release.set(8)
+        options.release.set(17)
        options.compilerArgs.addAll(listOf("-nowarn", "-Xlint:-unchecked", "-Xlint:-deprecation"))
    }
 }

 java {
    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
+        languageVersion.set(JavaLanguageVersion.of(17))
+        vendor.set(JvmVendorSpec.GRAAL_VM)
    }
 }
@@ -1,15 +1,26 @@
 plugins {
    id("tab.standard-conventions")
-    id("com.github.johnrengelman.shadow")
+    id("com.gradleup.shadow")
+}
+
+tasks.withType<Zip>().configureEach {
+    isZip64 = true
 }

 tasks {
    shadowJar {
-        archiveFileName.set("TAB-${project.name}-${project.version}.jar")
+        archiveFileName.set("${rootProject.name}-${project.name}-${project.version}.jar")
        relocate("org.bstats", "me.neznamy.tab.libs.org.bstats")
        relocate("org.json.simple", "me.neznamy.tab.libs.org.json.simple")
        relocate("net.kyori.event", "me.neznamy.tab.libs.net.kyori.event")
        relocate("me.neznamy.yamlassist", "me.neznamy.tab.libs.me.neznamy.yamlassist")
        relocate("org.yaml.snakeyaml", "me.neznamy.tab.libs.org.yaml.snakeyaml")
+        relocate("redis.clients.jedis", "me.neznamy.tab.libs.redis.clients.jedis")
+        relocate("org.apache.commons.pool2", "me.neznamy.tab.libs.org.apache.commons.pool2")
+        relocate("org.json", "me.neznamy.tab.libs.org.json")
+        relocate("com.rabbitmq", "me.neznamy.tab.libs.com.rabbitmq")
+        relocate("com.saicone.delivery4j", "me.neznamy.tab.libs.com.saicone.delivery4j")
+        relocate("com.mysql", "me.neznamy.tab.libs.com.mysql")
+        relocate("com.google.protobuf", "me.neznamy.tab.libs.com.google.protobuf")
    }
 }
@@ -1,25 +1,8 @@
 plugins {
    id("tab.base-conventions")
-    `maven-publish`
 }

 java {
    withSourcesJar()
    withJavadocJar()
-}
-
-publishing {
-    repositories {
-        maven {
-            name = "krypton"
-            url = uri("https://repo.kryptonmc.org/releases")
-            credentials(PasswordCredentials::class)
-        }
-    }
-    publications.create<MavenPublication>("mavenJava") {
-        groupId = rootProject.group as String
-        artifactId = "tab-${project.name}"
-        version = rootProject.version as String
-        from(components["java"])
-    }
-}
+}
@@ -1,36 +1,45 @@
 plugins {
+    eclipse
    id("tab.parent")
 }

 allprojects {
    group = "me.neznamy"
-    version = "4.1.3"
+    version = "5.9.9"
    description = "An all-in-one solution that works"

    ext.set("id", "tab")
-    ext.set("website", "https://github.com/NEZNAMY/TAB")
+    ext.set("website", "https://git.trueog.net/trueog/TAB-OG")
    ext.set("author", "NEZNAMY")
+    ext.set("credits", "Joseph T. McQuigg (JT122406)")
 }

-val platforms = setOf(
-    projects.bukkit,
-    projects.bungeecord,
-    projects.velocity,
-    projects.sponge7,
-    projects.sponge8,
-    projects.fabric,
-    projects.fabric.v1144
-).map { it.dependencyProject }
+val platformPaths = setOf(
+    ":bukkit",
+    ":bukkit:v1_19_R3",
+    ":bungeecord",
+    ":velocity"
+)

-val special = setOf(
-    projects.api,
-    projects.shared
-).map { it.dependencyProject }
+val specialPaths = setOf(
+    ":api",
+    ":shared"
+)

 subprojects {
-    when (this) {
-        in platforms -> plugins.apply("tab.platform-conventions")
-        in special -> plugins.apply("tab.standard-conventions")
+    when (path) {
+        in platformPaths -> plugins.apply("tab.platform-conventions")
+        in specialPaths -> plugins.apply("tab.standard-conventions")
        else -> plugins.apply("tab.base-conventions")
    }
 }
+
+val copyShadowJar by tasks.registering(Copy::class) {
+    dependsOn(":jar:shadowJar")
+    from(project(":jar").tasks.named("shadowJar"))
+    into(layout.buildDirectory.dir("libs"))
+}
+
+tasks.register("build") {
+    dependsOn(copyShadowJar)
+}
@@ -1,12 +1,8 @@
 dependencies {
-    implementation(projects.shared)
-    implementation("org.bstats:bstats-bukkit:3.0.1")
-    compileOnly("org.purpurmc.purpur:purpur-api:1.16.5-R0.1-SNAPSHOT")
-    compileOnly("me.clip:placeholderapi:2.11.2")
-    compileOnly("com.mojang:authlib:1.5.25")
-    compileOnly("com.github.MilkBowl:VaultAPI:1.7") {
-        exclude("org.bukkit", "bukkit")
-    }
+    api(projects.shared)
+    implementation("org.bstats:bstats-bukkit:3.1.0")
+    compileOnly("org.purpurmc.purpur:purpur-api:1.19.4-R0.1-SNAPSHOT")
+    compileOnly("me.clip:placeholderapi:2.11.6")
    compileOnly("LibsDisguises:LibsDisguises:10.0.21") {
        exclude("org.spigotmc", "spigot")
        exclude("org.spigotmc", "spigot-api")
@@ -0,0 +1,28 @@
+plugins {
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.19"
+}
+
+repositories {
+    maven("https://jitpack.io") // YamlAssist
+    maven("https://repo.opencollab.dev/maven-snapshots/")
+    maven("https://repo.viaversion.com/")
+    maven {
+        name = "luck-repo"
+        url = uri("https://repo.lucko.me/")
+        content {
+            includeModule("me.lucko", "spark-api")
+        }
+    }
+}
+
+val version = "1.20.6-R0.1-SNAPSHOT" // 1.20.5 has a broken dependency, but there were no changes, so it's ok
+
+dependencies {
+    implementation(projects.bukkit)
+    paperweight.paperDevBundle(version)
+    compileOnly("io.papermc.paper:paper-api:${version}")
+}
+
+tasks.compileJava {
+    options.release.set(21)
+}
@@ -0,0 +1,64 @@
+package me.neznamy.tab.platforms.bukkit.paper_1_20_5;
+
+import me.neznamy.tab.shared.chat.TabStyle;
+import me.neznamy.tab.shared.chat.component.object.TabAtlasSprite;
+import me.neznamy.tab.shared.chat.component.object.TabObjectComponent;
+import me.neznamy.tab.platforms.bukkit.provider.ComponentConverter;
+import me.neznamy.tab.shared.chat.component.object.TabPlayerSprite;
+import net.minecraft.network.chat.*;
+import net.minecraft.resources.ResourceLocation;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Component converter using direct mojang-mapped code.
+ */
+public class NMSComponentConverter extends ComponentConverter<Component> {
+
+    @Override
+    @NotNull
+    public Component newTextComponent(@NotNull String text) {
+        return Component.literal(text);
+    }
+
+    @Override
+    @NotNull
+    public Component newTranslatableComponent(@NotNull String key) {
+        return Component.translatable(key);
+    }
+
+    @Override
+    @NotNull
+    public Component newKeybindComponent(@NotNull String keybind) {
+        return Component.keybind(keybind);
+    }
+
+    @Override
+    @NotNull
+    public Component newObjectComponent(@NotNull TabAtlasSprite sprite) {
+        return Component.literal(TabObjectComponent.ERROR_MESSAGE);
+    }
+
+    @Override
+    @NotNull
+    public Component newObjectComponent(@NotNull TabPlayerSprite sprite) {
+        return Component.literal(TabObjectComponent.ERROR_MESSAGE);
+    }
+
+    @Override
+    public void applyStyle(@NotNull Component nmsComponent, @NotNull TabStyle modifier) {
+        Style style = Style.EMPTY
+                .withColor(modifier.getColor() == null ? null : TextColor.fromRgb(modifier.getColor().getRgb()))
+                .withBold(modifier.getBold())
+                .withItalic(modifier.getItalic())
+                .withUnderlined(modifier.getUnderlined())
+                .withStrikethrough(modifier.getStrikethrough())
+                .withObfuscated(modifier.getObfuscated())
+                .withFont(modifier.getFont() == null ? null : ResourceLocation.tryParse(modifier.getFont()));
+        ((MutableComponent)nmsComponent).setStyle(style);
+    }
+
+    @Override
+    public void addSibling(@NotNull Component parent, @NotNull Component child) {
+        ((MutableComponent)parent).append(child);
+    }
+}
@@ -0,0 +1,52 @@
+package me.neznamy.tab.platforms.bukkit.paper_1_20_5;
+
+import io.netty.channel.Channel;
+import lombok.Getter;
+import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
+import me.neznamy.tab.platforms.bukkit.provider.ComponentConverter;
+import me.neznamy.tab.platforms.bukkit.provider.ImplementationProvider;
+import me.neznamy.tab.shared.platform.Scoreboard;
+import me.neznamy.tab.shared.platform.TabList;
+import me.neznamy.tab.shared.platform.TabListEntryTracker;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Implementation provider using direct Mojang-mapped NMS code for paper 1.20.5 - 1.21.1.
+ */
+@Getter
+public class NMSImplementationProvider implements ImplementationProvider {
+
+    @NotNull
+    private final ComponentConverter<?> componentConverter = new NMSComponentConverter();
+    
+    @Override
+    @NotNull
+    public Scoreboard newScoreboard(@NotNull BukkitTabPlayer player) {
+        return new NMSPacketScoreboard(player);
+    }
+
+    @Override
+    @NotNull
+    public TabList newTabList(@NotNull BukkitTabPlayer player) {
+        return new NMSPacketTabList(player);
+    }
+
+    @Override
+    @NotNull
+    public Channel getChannel(@NotNull Player player) {
+        return ((CraftPlayer)player).getHandle().connection.connection.channel;
+    }
+
+    @Override
+    @NotNull
+    public TabListEntryTracker newTabListEntryTracker() {
+        return new NMSTabListEntryTracker();
+    }
+
+    @Override
+    public int getPing(@NotNull BukkitTabPlayer player) {
+        return player.getPlayer().getPing();
+    }
+}
@@ -0,0 +1,176 @@
+package me.neznamy.tab.platforms.bukkit.paper_1_20_5;
+
+import lombok.NonNull;
+import lombok.SneakyThrows;
+import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
+import me.neznamy.tab.shared.TAB;
+import me.neznamy.tab.shared.platform.decorators.SafeScoreboard;
+import me.neznamy.tab.shared.util.ReflectionUtils;
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.numbers.FixedFormat;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.*;
+import net.minecraft.world.scores.PlayerTeam;
+import net.minecraft.world.scores.Scoreboard;
+import net.minecraft.world.scores.criteria.ObjectiveCriteria;
+import net.minecraft.world.scores.criteria.ObjectiveCriteria.RenderType;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.reflect.Field;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Optional;
+
+/**
+ * Scoreboard implementation using direct mojang-mapped code.
+ */
+public class NMSPacketScoreboard extends SafeScoreboard<BukkitTabPlayer> {
+
+    private static final ChatFormatting[] formats = ChatFormatting.values();
+    private static final net.minecraft.world.scores.Team.CollisionRule[] collisions = net.minecraft.world.scores.Team.CollisionRule.values();
+    private static final net.minecraft.world.scores.Team.Visibility[] visibilities = net.minecraft.world.scores.Team.Visibility.values();
+    private static final Scoreboard dummyScoreboard = new Scoreboard();
+    private static final Field players = ReflectionUtils.getOnlyField(ClientboundSetPlayerTeamPacket.class, Collection.class);
+
+    /**
+     * Constructs new instance with given player.
+     *
+     * @param   player
+     *          Player this scoreboard will belong to
+     */
+    public NMSPacketScoreboard(@NotNull BukkitTabPlayer player) {
+        super(player);
+    }
+
+    @Override
+    public void registerObjective(@NonNull Objective objective) {
+        net.minecraft.world.scores.Objective obj = new net.minecraft.world.scores.Objective(
+                dummyScoreboard,
+                objective.getName(),
+                ObjectiveCriteria.DUMMY,
+                objective.getTitle().convert(),
+                RenderType.values()[objective.getHealthDisplay().ordinal()],
+                false,
+                objective.getNumberFormat() == null ? null : objective.getNumberFormat().toFixedFormat(FixedFormat::new)
+        );
+        objective.setPlatformObjective(obj);
+        sendPacket(new ClientboundSetObjectivePacket(obj, ObjectiveAction.REGISTER));
+    }
+
+    @Override
+    public void setDisplaySlot(@NonNull Objective objective) {
+        sendPacket(new ClientboundSetDisplayObjectivePacket(
+                net.minecraft.world.scores.DisplaySlot.values()[objective.getDisplaySlot().ordinal()],
+                (net.minecraft.world.scores.Objective) objective.getPlatformObjective()
+        ));
+    }
+
+    @Override
+    public void unregisterObjective(@NonNull Objective objective) {
+        sendPacket(new ClientboundSetObjectivePacket((net.minecraft.world.scores.Objective) objective.getPlatformObjective(), ObjectiveAction.UNREGISTER));
+    }
+
+    @Override
+    public void updateObjective(@NonNull Objective objective) {
+        net.minecraft.world.scores.Objective obj = (net.minecraft.world.scores.Objective) objective.getPlatformObjective();
+        obj.setDisplayName(objective.getTitle().convert());
+        obj.setRenderType(RenderType.values()[objective.getHealthDisplay().ordinal()]);
+        sendPacket(new ClientboundSetObjectivePacket(obj, ObjectiveAction.UPDATE));
+    }
+
+    @Override
+    public void setScore(@NonNull Score score) {
+        sendPacket(new ClientboundSetScorePacket(
+                score.getHolder(),
+                score.getObjective().getName(),
+                score.getValue(),
+                Optional.ofNullable(score.getDisplayName() == null ? null : score.getDisplayName().convert()),
+                Optional.ofNullable(score.getNumberFormat() == null ? null : score.getNumberFormat().toFixedFormat(FixedFormat::new))
+        ));
+    }
+
+    @Override
+    public void removeScore(@NonNull Score score) {
+        sendPacket(new ClientboundResetScorePacket(score.getHolder(), score.getObjective().getName()));
+    }
+
+    @Override
+    @NotNull
+    public Object createTeam(@NonNull String name) {
+        return new PlayerTeam(dummyScoreboard, name);
+    }
+
+    @Override
+    public void registerTeam(@NonNull Team team) {
+        updateTeamProperties(team);
+        PlayerTeam t = (PlayerTeam) team.getPlatformTeam();
+        t.getPlayers().addAll(team.getPlayers());
+        sendPacket(ClientboundSetPlayerTeamPacket.createAddOrModifyPacket(t, true));
+    }
+
+    @Override
+    public void unregisterTeam(@NonNull Team team) {
+        sendPacket(ClientboundSetPlayerTeamPacket.createRemovePacket((PlayerTeam) team.getPlatformTeam()));
+    }
+
+    @Override
+    public void updateTeam(@NonNull Team team) {
+        updateTeamProperties(team);
+        sendPacket(ClientboundSetPlayerTeamPacket.createAddOrModifyPacket((PlayerTeam) team.getPlatformTeam(), false));
+    }
+
+    private void updateTeamProperties(@NonNull Team team) {
+        PlayerTeam t = (PlayerTeam) team.getPlatformTeam();
+        t.setAllowFriendlyFire((team.getOptions() & 0x01) != 0);
+        t.setSeeFriendlyInvisibles((team.getOptions() & 0x02) != 0);
+        t.setColor(formats[team.getColor().ordinal()]);
+        t.setCollisionRule(collisions[team.getCollision().ordinal()]);
+        t.setNameTagVisibility(visibilities[team.getVisibility().ordinal()]);
+        t.setPlayerPrefix(team.getPrefix().convert());
+        t.setPlayerSuffix(team.getSuffix().convert());
+    }
+
+    @Override
+    @SneakyThrows
+    @NotNull
+    public Object onPacketSend(@NonNull Object packet) {
+        if (packet instanceof ClientboundSetDisplayObjectivePacket display) {
+            TAB.getInstance().getFeatureManager().onDisplayObjective(player, display.getSlot().ordinal(), display.getObjectiveName());
+        }
+        if (packet instanceof ClientboundSetObjectivePacket objective) {
+            TAB.getInstance().getFeatureManager().onObjective(player, objective.getMethod(), objective.getObjectiveName());
+        }
+        if (packet instanceof ClientboundSetPlayerTeamPacket team) {
+            int action = getMethod(team);
+            if (action != TeamAction.UPDATE) {
+                players.set(team, onTeamPacket(action, team.getName(), team.getPlayers() == null ? Collections.emptyList() : team.getPlayers()));
+            }
+        }
+        return packet;
+    }
+
+    private int getMethod(@NonNull ClientboundSetPlayerTeamPacket team) {
+        if (team.getTeamAction() == ClientboundSetPlayerTeamPacket.Action.ADD) {
+            return 0;
+        } else if (team.getTeamAction() == ClientboundSetPlayerTeamPacket.Action.REMOVE) {
+            return 1;
+        } else if (team.getPlayerAction() == ClientboundSetPlayerTeamPacket.Action.ADD) {
+            return 3;
+        } else if (team.getPlayerAction() == ClientboundSetPlayerTeamPacket.Action.REMOVE) {
+            return 4;
+        } else {
+            return 2;
+        }
+    }
+
+    /**
+     * Sends the packet to the player.
+     *
+     * @param   packet
+     *          Packet to send
+     */
+    private void sendPacket(@NotNull Packet<?> packet) {
+        ((CraftPlayer)player.getPlayer()).getHandle().connection.sendPacket(packet);
+    }
+}
@@ -0,0 +1,200 @@
+package me.neznamy.tab.platforms.bukkit.paper_1_20_5;
+
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.properties.Property;
+import lombok.NonNull;
+import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
+import me.neznamy.tab.shared.TAB;
+import me.neznamy.tab.shared.chat.component.TabComponent;
+import me.neznamy.tab.shared.platform.TabList;
+import me.neznamy.tab.shared.platform.decorators.TrackedTabList;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.ClientboundPlayerInfoRemovePacket;
+import net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket;
+import net.minecraft.network.protocol.game.ClientboundTabListPacket;
+import net.minecraft.world.level.GameType;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.*;
+
+/**
+ * TabList implementation using direct mojang-mapped code.
+ */
+public class NMSPacketTabList extends TrackedTabList<BukkitTabPlayer> {
+
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> addPlayer = EnumSet.allOf(ClientboundPlayerInfoUpdatePacket.Action.class);
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> updateDisplayName = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME);
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> updateLatency = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LATENCY);
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> updateGameMode = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE);
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> updateListed = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LISTED);
+
+    /**
+     * Constructs new instance.
+     *
+     * @param   player
+     *          Player this tablist will belong to
+     */
+    public NMSPacketTabList(@NotNull BukkitTabPlayer player) {
+        super(player);
+    }
+
+    @Override
+    public void removeEntry(@NonNull UUID entry) {
+        sendPacket(new ClientboundPlayerInfoRemovePacket(Collections.singletonList(entry)));
+    }
+
+    @Override
+    public void updateDisplayName0(@NonNull UUID entry, @Nullable TabComponent displayName) {
+        sendPacket(updateDisplayName, entry, "", null, false, 0, 0, displayName);
+    }
+
+    @Override
+    public void updateLatency(@NonNull UUID entry, int latency) {
+        sendPacket(updateLatency, entry, "", null, false, latency, 0, null);
+    }
+
+    @Override
+    public void updateGameMode(@NonNull UUID entry, int gameMode) {
+        sendPacket(updateGameMode, entry, "", null, false, 0, gameMode, null);
+    }
+
+    @Override
+    public void updateListed(@NonNull UUID entry, boolean listed) {
+        sendPacket(updateListed, entry, "", null, listed, 0, 0, null);
+    }
+
+    @Override
+    public void updateListOrder(@NonNull UUID entry, int listOrder) {
+        // Added in 1.21.2
+    }
+
+    @Override
+    public void updateHat(@NonNull UUID entry, boolean showHat) {
+        // Added in 1.21.4
+    }
+
+    @Override
+    public void addEntry0(@NonNull Entry entry) {
+        sendPacket(addPlayer, entry.getUniqueId(), entry.getName(), entry.getSkin(), entry.isListed(), entry.getLatency(),
+                entry.getGameMode(), entry.getDisplayName());
+    }
+
+    @Override
+    public void setPlayerListHeaderFooter0(@NonNull TabComponent header, @NonNull TabComponent footer) {
+        sendPacket(new ClientboundTabListPacket(header.convert(), footer.convert()));
+    }
+
+    @Override
+    @Nullable
+    public Skin getSkin() {
+        Collection<Property> properties = ((CraftPlayer)player.getPlayer()).getProfile().getProperties().get(TEXTURES_PROPERTY);
+        if (properties.isEmpty()) return null; // Offline mode
+        Property property = properties.iterator().next();
+        return new Skin(property.value(), property.signature());
+    }
+
+    @Override
+    @NotNull
+    public Object onPacketSend(@NonNull Object packet) {
+        if (packet instanceof ClientboundTabListPacket tablist) {
+            if (header == null || footer == null) return packet;
+            if (tablist.header() != header.convert() || tablist.footer() != footer.convert()) {
+                return new ClientboundTabListPacket(header.convert(), footer.convert());
+            }
+        }
+        if (packet instanceof ClientboundPlayerInfoUpdatePacket info) {
+            EnumSet<ClientboundPlayerInfoUpdatePacket.Action> actions = info.actions();
+            List<ClientboundPlayerInfoUpdatePacket.Entry> updatedList = new ArrayList<>();
+            boolean rewritePacket = false;
+            for (ClientboundPlayerInfoUpdatePacket.Entry nmsData : info.entries()) {
+                boolean rewriteEntry = false;
+                Component displayName = nmsData.displayName();
+                int latency = nmsData.latency();
+                int gameMode = nmsData.gameMode().getId();
+                boolean listed = nmsData.listed();
+                if (actions.contains(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME)) {
+                    TabComponent forcedDisplayName = getForcedDisplayNames().get(nmsData.profileId());
+                    if (forcedDisplayName != null && forcedDisplayName.convert() != displayName) {
+                        displayName = forcedDisplayName.convert();
+                        rewriteEntry = rewritePacket = true;
+                    }
+                }
+                if (actions.contains(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE)) {
+                    if (getBlockedSpectators().contains(nmsData.profileId()) && gameMode == 3) {
+                        gameMode = 0;
+                        rewriteEntry = rewritePacket = true;
+                    }
+                }
+                if (actions.contains(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LATENCY)) {
+                    if (getForcedLatency() != null) {
+                        latency = getForcedLatency();
+                        rewriteEntry = rewritePacket = true;
+                    }
+                }
+                if (actions.contains(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LISTED)) {
+                    if (allPlayersHidden && nmsData.profileId().getMostSignificantBits() != 0) { // Filter out layout entries
+                        listed = false;
+                        rewriteEntry = rewritePacket = true;
+                    }
+                }
+                if (actions.contains(ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER)) {
+                    TAB.getInstance().getFeatureManager().onEntryAdd(player, nmsData.profileId(), nmsData.profile().getName());
+                }
+                updatedList.add(rewriteEntry ? new ClientboundPlayerInfoUpdatePacket.Entry(
+                        nmsData.profileId(), nmsData.profile(), listed, latency, GameType.byId(gameMode), displayName,
+                        nmsData.chatSession()
+                ) : nmsData);
+            }
+            if (rewritePacket) return new ClientboundPlayerInfoUpdatePacket(actions, updatedList);
+        }
+        return packet;
+    }
+
+    private void sendPacket(@NonNull EnumSet<ClientboundPlayerInfoUpdatePacket.Action> action, @NonNull UUID id, @NonNull String name, @Nullable Skin skin,
+                            boolean listed, int latency, int gameMode, @Nullable TabComponent displayName) {
+        ClientboundPlayerInfoUpdatePacket packet = new ClientboundPlayerInfoUpdatePacket(action, new ClientboundPlayerInfoUpdatePacket.Entry(
+                id,
+                action.contains(ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER) ? createProfile(id, name, skin) : null,
+                listed,
+                latency,
+                GameType.byId(gameMode),
+                displayName == null ? null : displayName.convert(),
+                null
+        ));
+        sendPacket(packet);
+    }
+
+    /**
+     * Creates GameProfile from given parameters.
+     *
+     * @param   id
+     *          Profile ID
+     * @param   name
+     *          Profile name
+     * @param   skin
+     *          Player skin
+     * @return  GameProfile from given parameters
+     */
+    @NotNull
+    private GameProfile createProfile(@NonNull UUID id, @NonNull String name, @Nullable Skin skin) {
+        GameProfile profile = new GameProfile(id, name);
+        if (skin != null) {
+            profile.getProperties().put(TabList.TEXTURES_PROPERTY,
+                    new Property(TabList.TEXTURES_PROPERTY, skin.getValue(), skin.getSignature()));
+        }
+        return profile;
+    }
+
+    /**
+     * Sends the packet to the player.
+     *
+     * @param   packet
+     *          Packet to send
+     */
+    private void sendPacket(@NotNull Packet<?> packet) {
+        ((CraftPlayer)player.getPlayer()).getHandle().connection.send(packet);
+    }
+}
@@ -0,0 +1,30 @@
+package me.neznamy.tab.platforms.bukkit.paper_1_20_5;
+
+import me.neznamy.tab.shared.platform.TabListEntryTracker;
+import net.minecraft.network.protocol.game.ClientboundPlayerInfoRemovePacket;
+import net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
+
+/**
+ * Implementation of TabListEntryTracker.
+ */
+public class NMSTabListEntryTracker extends TabListEntryTracker {
+
+    @Override
+    public void onPacketSend(@NotNull Object packet) {
+        if (packet instanceof ClientboundPlayerInfoRemovePacket remove) {
+            for (UUID id : remove.profileIds()) {
+                tablistEntries.remove(id);
+            }
+        }
+        if (packet instanceof ClientboundPlayerInfoUpdatePacket update) {
+            if (update.actions().contains(ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER)) {
+                for (ClientboundPlayerInfoUpdatePacket.Entry nmsData : update.entries()) {
+                    tablistEntries.add(nmsData.profileId());
+                }
+            }
+        }
+    }
+}
@@ -0,0 +1,28 @@
+plugins {
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.19"
+}
+
+repositories {
+    maven("https://jitpack.io") // YamlAssist
+    maven("https://repo.opencollab.dev/maven-snapshots/")
+    maven("https://repo.viaversion.com/")
+    maven {
+        name = "luck-repo"
+        url = uri("https://repo.lucko.me/")
+        content {
+            includeModule("me.lucko", "spark-api")
+        }
+    }
+}
+
+val version = "1.21.11-R0.1-SNAPSHOT"
+
+dependencies {
+    implementation(projects.bukkit)
+    paperweight.paperDevBundle(version)
+    compileOnly("io.papermc.paper:paper-api:${version}")
+}
+
+tasks.compileJava {
+    options.release.set(21)
+}
@@ -0,0 +1,84 @@
+package me.neznamy.tab.platforms.bukkit.paper_1_21_11;
+
+import com.google.common.collect.ImmutableMultimap;
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.properties.Property;
+import com.mojang.authlib.properties.PropertyMap;
+import me.neznamy.tab.platforms.bukkit.provider.ComponentConverter;
+import me.neznamy.tab.shared.chat.TabStyle;
+import me.neznamy.tab.shared.chat.component.object.TabAtlasSprite;
+import me.neznamy.tab.shared.chat.component.object.TabPlayerSprite;
+import me.neznamy.tab.shared.platform.TabList;
+import net.minecraft.network.chat.*;
+import net.minecraft.network.chat.contents.objects.AtlasSprite;
+import net.minecraft.network.chat.contents.objects.PlayerSprite;
+import net.minecraft.resources.Identifier;
+import net.minecraft.world.item.component.ResolvableProfile;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Component converter using direct mojang-mapped code.
+ */
+public class NMSComponentConverter extends ComponentConverter<Component> {
+
+    @Override
+    @NotNull
+    public Component newTextComponent(@NotNull String text) {
+        return Component.literal(text);
+    }
+
+    @Override
+    @NotNull
+    public Component newTranslatableComponent(@NotNull String key) {
+        return Component.translatable(key);
+    }
+
+    @Override
+    @NotNull
+    public Component newKeybindComponent(@NotNull String keybind) {
+        return Component.keybind(keybind);
+    }
+
+    @Override
+    @NotNull
+    public Component newObjectComponent(@NotNull TabAtlasSprite sprite) {
+        return Component.object(new AtlasSprite(Identifier.parse(sprite.getAtlas()), Identifier.parse(sprite.getSprite())));
+    }
+
+    @Override
+    @NotNull
+    public Component newObjectComponent(@NotNull TabPlayerSprite sprite) {
+        ResolvableProfile profile;
+        if (sprite.getId() != null) {
+            profile = ResolvableProfile.createUnresolved(sprite.getId());
+        } else if (sprite.getName() != null) {
+            profile = ResolvableProfile.createUnresolved(sprite.getName());
+        } else if (sprite.getSkin() != null) {
+            ImmutableMultimap.Builder<String, Property> builder = ImmutableMultimap.builder();
+            builder.put(TabList.TEXTURES_PROPERTY, new Property(TabList.TEXTURES_PROPERTY, sprite.getSkin().getValue(), sprite.getSkin().getSignature()));
+            profile = ResolvableProfile.createResolved(new GameProfile(NIL_UUID, "", new PropertyMap(builder.build())));
+        } else {
+            throw new IllegalStateException("Player head component does not have id, name or skin set");
+        }
+        return Component.object(new PlayerSprite(profile, sprite.isShowHat()));
+    }
+
+    @Override
+    public void applyStyle(@NotNull Component nmsComponent, @NotNull TabStyle modifier) {
+        Style style = Style.EMPTY
+                .withColor(modifier.getColor() == null ? null : TextColor.fromRgb(modifier.getColor().getRgb()))
+                .withBold(modifier.getBold())
+                .withItalic(modifier.getItalic())
+                .withUnderlined(modifier.getUnderlined())
+                .withStrikethrough(modifier.getStrikethrough())
+                .withObfuscated(modifier.getObfuscated())
+                .withFont(modifier.getFont() == null ? null : new FontDescription.Resource(Identifier.parse(modifier.getFont())));
+        if (modifier.getShadowColor() != null) style = style.withShadowColor(modifier.getShadowColor()); // withShadowColor takes int instead of Integer, bug?
+        ((MutableComponent)nmsComponent).setStyle(style);
+    }
+
+    @Override
+    public void addSibling(@NotNull Component parent, @NotNull Component child) {
+        ((MutableComponent)parent).append(child);
+    }
+}
@@ -0,0 +1,52 @@
+package me.neznamy.tab.platforms.bukkit.paper_1_21_11;
+
+import io.netty.channel.Channel;
+import lombok.Getter;
+import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
+import me.neznamy.tab.platforms.bukkit.provider.ComponentConverter;
+import me.neznamy.tab.platforms.bukkit.provider.ImplementationProvider;
+import me.neznamy.tab.shared.platform.Scoreboard;
+import me.neznamy.tab.shared.platform.TabList;
+import me.neznamy.tab.shared.platform.TabListEntryTracker;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Implementation provider using direct Mojang-mapped NMS code for paper 1.21.11.
+ */
+@Getter
+public class NMSImplementationProvider implements ImplementationProvider {
+
+    @NotNull
+    private final ComponentConverter<?> componentConverter = new NMSComponentConverter();
+    
+    @Override
+    @NotNull
+    public Scoreboard newScoreboard(@NotNull BukkitTabPlayer player) {
+        return new NMSPacketScoreboard(player);
+    }
+
+    @Override
+    @NotNull
+    public TabList newTabList(@NotNull BukkitTabPlayer player) {
+        return new NMSPacketTabList(player);
+    }
+
+    @Override
+    @NotNull
+    public Channel getChannel(@NotNull Player player) {
+        return ((CraftPlayer)player).getHandle().connection.connection.channel;
+    }
+
+    @Override
+    @NotNull
+    public TabListEntryTracker newTabListEntryTracker() {
+        return new NMSTabListEntryTracker();
+    }
+
+    @Override
+    public int getPing(@NotNull BukkitTabPlayer player) {
+        return player.getPlayer().getPing();
+    }
+}
@@ -0,0 +1,176 @@
+package me.neznamy.tab.platforms.bukkit.paper_1_21_11;
+
+import lombok.NonNull;
+import lombok.SneakyThrows;
+import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
+import me.neznamy.tab.shared.TAB;
+import me.neznamy.tab.shared.platform.decorators.SafeScoreboard;
+import me.neznamy.tab.shared.util.ReflectionUtils;
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.numbers.FixedFormat;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.*;
+import net.minecraft.world.scores.PlayerTeam;
+import net.minecraft.world.scores.Scoreboard;
+import net.minecraft.world.scores.criteria.ObjectiveCriteria;
+import net.minecraft.world.scores.criteria.ObjectiveCriteria.RenderType;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.reflect.Field;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Optional;
+
+/**
+ * Scoreboard implementation using direct mojang-mapped code.
+ */
+public class NMSPacketScoreboard extends SafeScoreboard<BukkitTabPlayer> {
+
+    private static final ChatFormatting[] formats = ChatFormatting.values();
+    private static final net.minecraft.world.scores.Team.CollisionRule[] collisions = net.minecraft.world.scores.Team.CollisionRule.values();
+    private static final net.minecraft.world.scores.Team.Visibility[] visibilities = net.minecraft.world.scores.Team.Visibility.values();
+    private static final Scoreboard dummyScoreboard = new Scoreboard();
+    private static final Field players = ReflectionUtils.getOnlyField(ClientboundSetPlayerTeamPacket.class, Collection.class);
+
+    /**
+     * Constructs new instance with given player.
+     *
+     * @param   player
+     *          Player this scoreboard will belong to
+     */
+    public NMSPacketScoreboard(@NotNull BukkitTabPlayer player) {
+        super(player);
+    }
+
+    @Override
+    public void registerObjective(@NonNull Objective objective) {
+        net.minecraft.world.scores.Objective obj = new net.minecraft.world.scores.Objective(
+                dummyScoreboard,
+                objective.getName(),
+                ObjectiveCriteria.DUMMY,
+                objective.getTitle().convert(),
+                RenderType.values()[objective.getHealthDisplay().ordinal()],
+                false,
+                objective.getNumberFormat() == null ? null : objective.getNumberFormat().toFixedFormat(FixedFormat::new)
+        );
+        objective.setPlatformObjective(obj);
+        sendPacket(new ClientboundSetObjectivePacket(obj, ObjectiveAction.REGISTER));
+    }
+
+    @Override
+    public void setDisplaySlot(@NonNull Objective objective) {
+        sendPacket(new ClientboundSetDisplayObjectivePacket(
+                net.minecraft.world.scores.DisplaySlot.values()[objective.getDisplaySlot().ordinal()],
+                (net.minecraft.world.scores.Objective) objective.getPlatformObjective()
+        ));
+    }
+
+    @Override
+    public void unregisterObjective(@NonNull Objective objective) {
+        sendPacket(new ClientboundSetObjectivePacket((net.minecraft.world.scores.Objective) objective.getPlatformObjective(), ObjectiveAction.UNREGISTER));
+    }
+
+    @Override
+    public void updateObjective(@NonNull Objective objective) {
+        net.minecraft.world.scores.Objective obj = (net.minecraft.world.scores.Objective) objective.getPlatformObjective();
+        obj.setDisplayName(objective.getTitle().convert());
+        obj.setRenderType(RenderType.values()[objective.getHealthDisplay().ordinal()]);
+        sendPacket(new ClientboundSetObjectivePacket(obj, ObjectiveAction.UPDATE));
+    }
+
+    @Override
+    public void setScore(@NonNull Score score) {
+        sendPacket(new ClientboundSetScorePacket(
+                score.getHolder(),
+                score.getObjective().getName(),
+                score.getValue(),
+                Optional.ofNullable(score.getDisplayName() == null ? null : score.getDisplayName().convert()),
+                Optional.ofNullable(score.getNumberFormat() == null ? null : score.getNumberFormat().toFixedFormat(FixedFormat::new))
+        ));
+    }
+
+    @Override
+    public void removeScore(@NonNull Score score) {
+        sendPacket(new ClientboundResetScorePacket(score.getHolder(), score.getObjective().getName()));
+    }
+
+    @Override
+    @NotNull
+    public Object createTeam(@NonNull String name) {
+        return new PlayerTeam(dummyScoreboard, name);
+    }
+
+    @Override
+    public void registerTeam(@NonNull Team team) {
+        updateTeamProperties(team);
+        PlayerTeam t = (PlayerTeam) team.getPlatformTeam();
+        t.getPlayers().addAll(team.getPlayers());
+        sendPacket(ClientboundSetPlayerTeamPacket.createAddOrModifyPacket(t, true));
+    }
+
+    @Override
+    public void unregisterTeam(@NonNull Team team) {
+        sendPacket(ClientboundSetPlayerTeamPacket.createRemovePacket((PlayerTeam) team.getPlatformTeam()));
+    }
+
+    @Override
+    public void updateTeam(@NonNull Team team) {
+        updateTeamProperties(team);
+        sendPacket(ClientboundSetPlayerTeamPacket.createAddOrModifyPacket((PlayerTeam) team.getPlatformTeam(), false));
+    }
+
+    private void updateTeamProperties(@NonNull Team team) {
+        PlayerTeam t = (PlayerTeam) team.getPlatformTeam();
+        t.setAllowFriendlyFire((team.getOptions() & 0x01) != 0);
+        t.setSeeFriendlyInvisibles((team.getOptions() & 0x02) != 0);
+        t.setColor(formats[team.getColor().ordinal()]);
+        t.setCollisionRule(collisions[team.getCollision().ordinal()]);
+        t.setNameTagVisibility(visibilities[team.getVisibility().ordinal()]);
+        t.setPlayerPrefix(team.getPrefix().convert());
+        t.setPlayerSuffix(team.getSuffix().convert());
+    }
+
+    @Override
+    @SneakyThrows
+    @NotNull
+    public Object onPacketSend(@NonNull Object packet) {
+        if (packet instanceof ClientboundSetDisplayObjectivePacket display) {
+            TAB.getInstance().getFeatureManager().onDisplayObjective(player, display.getSlot().ordinal(), display.getObjectiveName());
+        }
+        if (packet instanceof ClientboundSetObjectivePacket objective) {
+            TAB.getInstance().getFeatureManager().onObjective(player, objective.getMethod(), objective.getObjectiveName());
+        }
+        if (packet instanceof ClientboundSetPlayerTeamPacket team) {
+            int action = getMethod(team);
+            if (action != TeamAction.UPDATE) {
+                players.set(team, onTeamPacket(action, team.getName(), team.getPlayers() == null ? Collections.emptyList() : team.getPlayers()));
+            }
+        }
+        return packet;
+    }
+
+    private int getMethod(@NonNull ClientboundSetPlayerTeamPacket team) {
+        if (team.getTeamAction() == ClientboundSetPlayerTeamPacket.Action.ADD) {
+            return 0;
+        } else if (team.getTeamAction() == ClientboundSetPlayerTeamPacket.Action.REMOVE) {
+            return 1;
+        } else if (team.getPlayerAction() == ClientboundSetPlayerTeamPacket.Action.ADD) {
+            return 3;
+        } else if (team.getPlayerAction() == ClientboundSetPlayerTeamPacket.Action.REMOVE) {
+            return 4;
+        } else {
+            return 2;
+        }
+    }
+
+    /**
+     * Sends the packet to the player.
+     *
+     * @param   packet
+     *          Packet to send
+     */
+    private void sendPacket(@NotNull Packet<?> packet) {
+        ((CraftPlayer)player.getPlayer()).getHandle().connection.send(packet);
+    }
+}
@@ -0,0 +1,204 @@
+package me.neznamy.tab.platforms.bukkit.paper_1_21_11;
+
+import com.google.common.collect.ImmutableMultimap;
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.properties.Property;
+import com.mojang.authlib.properties.PropertyMap;
+import lombok.NonNull;
+import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
+import me.neznamy.tab.shared.TAB;
+import me.neznamy.tab.shared.chat.component.TabComponent;
+import me.neznamy.tab.shared.platform.decorators.TrackedTabList;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.ClientboundPlayerInfoRemovePacket;
+import net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket;
+import net.minecraft.network.protocol.game.ClientboundTabListPacket;
+import net.minecraft.world.level.GameType;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.*;
+
+/**
+ * TabList implementation using direct mojang-mapped code.
+ */
+public class NMSPacketTabList extends TrackedTabList<BukkitTabPlayer> {
+
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> addPlayer = EnumSet.allOf(ClientboundPlayerInfoUpdatePacket.Action.class);
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> updateDisplayName = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME);
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> updateLatency = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LATENCY);
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> updateGameMode = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE);
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> updateListed = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LISTED);
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> updateListOrder = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LIST_ORDER);
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> updateHat = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_HAT);
+
+    /**
+     * Constructs new instance.
+     *
+     * @param   player
+     *          Player this tablist will belong to
+     */
+    public NMSPacketTabList(@NotNull BukkitTabPlayer player) {
+        super(player);
+    }
+
+    @Override
+    public void removeEntry(@NonNull UUID entry) {
+        sendPacket(new ClientboundPlayerInfoRemovePacket(Collections.singletonList(entry)));
+    }
+
+    @Override
+    public void updateDisplayName0(@NonNull UUID entry, @Nullable TabComponent displayName) {
+        sendPacket(updateDisplayName, entry, "", null, false, 0, 0, displayName, 0, false);
+    }
+
+    @Override
+    public void updateLatency(@NonNull UUID entry, int latency) {
+        sendPacket(updateLatency, entry, "", null, false, latency, 0, null, 0, false);
+    }
+
+    @Override
+    public void updateGameMode(@NonNull UUID entry, int gameMode) {
+        sendPacket(updateGameMode, entry, "", null, false, 0, gameMode, null, 0, false);
+    }
+
+    @Override
+    public void updateListed(@NonNull UUID entry, boolean listed) {
+        sendPacket(updateListed, entry, "", null, listed, 0, 0, null, 0, false);
+    }
+
+    @Override
+    public void updateListOrder(@NonNull UUID entry, int listOrder) {
+        sendPacket(updateListOrder, entry, "", null, false, 0, 0, null, listOrder, false);
+    }
+
+    @Override
+    public void updateHat(@NonNull UUID entry, boolean showHat) {
+        sendPacket(updateHat, entry, "", null, false, 0, 0, null, 0, showHat);
+    }
+
+    @Override
+    public void addEntry0(@NonNull Entry entry) {
+        sendPacket(addPlayer, entry.getUniqueId(), entry.getName(), entry.getSkin(), entry.isListed(), entry.getLatency(),
+                entry.getGameMode(), entry.getDisplayName(), entry.getListOrder(), entry.isShowHat());
+    }
+
+    @Override
+    public void setPlayerListHeaderFooter0(@NonNull TabComponent header, @NonNull TabComponent footer) {
+        sendPacket(new ClientboundTabListPacket(header.convert(), footer.convert()));
+    }
+
+    @Override
+    @Nullable
+    public Skin getSkin() {
+        Collection<Property> properties = ((CraftPlayer)player.getPlayer()).getProfile().properties().get(TEXTURES_PROPERTY);
+        if (properties.isEmpty()) return null; // Offline mode
+        Property property = properties.iterator().next();
+        return new Skin(property.value(), property.signature());
+    }
+
+    @Override
+    @NotNull
+    public Object onPacketSend(@NonNull Object packet) {
+        if (packet instanceof ClientboundTabListPacket tablist) {
+            if (header == null || footer == null) return packet;
+            if (tablist.header() != header.convert() || tablist.footer() != footer.convert()) {
+                return new ClientboundTabListPacket(header.convert(), footer.convert());
+            }
+        }
+        if (packet instanceof ClientboundPlayerInfoUpdatePacket info) {
+            EnumSet<ClientboundPlayerInfoUpdatePacket.Action> actions = info.actions();
+            List<ClientboundPlayerInfoUpdatePacket.Entry> updatedList = new ArrayList<>();
+            boolean rewritePacket = false;
+            for (ClientboundPlayerInfoUpdatePacket.Entry nmsData : info.entries()) {
+                boolean rewriteEntry = false;
+                Component displayName = nmsData.displayName();
+                int latency = nmsData.latency();
+                int gameMode = nmsData.gameMode().getId();
+                boolean listed = nmsData.listed();
+                if (actions.contains(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME)) {
+                    TabComponent forcedDisplayName = getForcedDisplayNames().get(nmsData.profileId());
+                    if (forcedDisplayName != null && forcedDisplayName.convert() != displayName) {
+                        displayName = forcedDisplayName.convert();
+                        rewriteEntry = rewritePacket = true;
+                    }
+                }
+                if (actions.contains(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE)) {
+                    if (getBlockedSpectators().contains(nmsData.profileId()) && gameMode == 3) {
+                        gameMode = 0;
+                        rewriteEntry = rewritePacket = true;
+                    }
+                }
+                if (actions.contains(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LATENCY)) {
+                    if (getForcedLatency() != null) {
+                        latency = getForcedLatency();
+                        rewriteEntry = rewritePacket = true;
+                    }
+                }
+                if (actions.contains(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LISTED)) {
+                    if (allPlayersHidden && nmsData.profileId().getMostSignificantBits() != 0) { // Filter out layout entries
+                        listed = false;
+                        rewriteEntry = rewritePacket = true;
+                    }
+                }
+                if (actions.contains(ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER)) {
+                    TAB.getInstance().getFeatureManager().onEntryAdd(player, nmsData.profileId(), nmsData.profile().name());
+                }
+                updatedList.add(rewriteEntry ? new ClientboundPlayerInfoUpdatePacket.Entry(
+                        nmsData.profileId(), nmsData.profile(), listed, latency, GameType.byId(gameMode), displayName,
+                        nmsData.showHat(), nmsData.listOrder(), nmsData.chatSession()
+                ) : nmsData);
+            }
+            if (rewritePacket) return new ClientboundPlayerInfoUpdatePacket(actions, updatedList);
+        }
+        return packet;
+    }
+
+    private void sendPacket(@NonNull EnumSet<ClientboundPlayerInfoUpdatePacket.Action> action, @NonNull UUID id, @NonNull String name, @Nullable Skin skin,
+                            boolean listed, int latency, int gameMode, @Nullable TabComponent displayName, int listOrder, boolean showHat) {
+        ClientboundPlayerInfoUpdatePacket packet = new ClientboundPlayerInfoUpdatePacket(action, new ClientboundPlayerInfoUpdatePacket.Entry(
+                id,
+                action.contains(ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER) ? createProfile(id, name, skin) : null,
+                listed,
+                latency,
+                GameType.byId(gameMode),
+                displayName == null ? null : displayName.convert(),
+                showHat,
+                listOrder,
+                null
+        ));
+        sendPacket(packet);
+    }
+
+    /**
+     * Creates GameProfile from given parameters.
+     *
+     * @param   id
+     *          Profile ID
+     * @param   name
+     *          Profile name
+     * @param   skin
+     *          Player skin
+     * @return  GameProfile from given parameters
+     */
+    @NotNull
+    private GameProfile createProfile(@NonNull UUID id, @NonNull String name, @Nullable Skin skin) {
+        ImmutableMultimap.Builder<String, Property> builder = ImmutableMultimap.builder();
+        if (skin != null) {
+            builder.put(TEXTURES_PROPERTY, new Property(TEXTURES_PROPERTY, skin.getValue(), skin.getSignature()));
+        }
+        return new GameProfile(id, name, new PropertyMap(builder.build()));
+    }
+
+    /**
+     * Sends the packet to the player.
+     *
+     * @param   packet
+     *          Packet to send
+     */
+    private void sendPacket(@NotNull Packet<?> packet) {
+        ((CraftPlayer)player.getPlayer()).getHandle().connection.send(packet);
+    }
+}
@@ -0,0 +1,30 @@
+package me.neznamy.tab.platforms.bukkit.paper_1_21_11;
+
+import me.neznamy.tab.shared.platform.TabListEntryTracker;
+import net.minecraft.network.protocol.game.ClientboundPlayerInfoRemovePacket;
+import net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
+
+/**
+ * Implementation of TabListEntryTracker.
+ */
+public class NMSTabListEntryTracker extends TabListEntryTracker {
+
+    @Override
+    public void onPacketSend(@NotNull Object packet) {
+        if (packet instanceof ClientboundPlayerInfoRemovePacket remove) {
+            for (UUID id : remove.profileIds()) {
+                tablistEntries.remove(id);
+            }
+        }
+        if (packet instanceof ClientboundPlayerInfoUpdatePacket update) {
+            if (update.actions().contains(ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER)) {
+                for (ClientboundPlayerInfoUpdatePacket.Entry nmsData : update.entries()) {
+                    tablistEntries.add(nmsData.profileId());
+                }
+            }
+        }
+    }
+}
@@ -0,0 +1,28 @@
+plugins {
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.19"
+}
+
+repositories {
+    maven("https://jitpack.io") // YamlAssist
+    maven("https://repo.opencollab.dev/maven-snapshots/")
+    maven("https://repo.viaversion.com/")
+    maven {
+        name = "luck-repo"
+        url = uri("https://repo.lucko.me/")
+        content {
+            includeModule("me.lucko", "spark-api")
+        }
+    }
+}
+
+val version = "1.21.3-R0.1-SNAPSHOT" // 1.21.2 causes gradle error, but the versions are interchangeable
+
+dependencies {
+    implementation(projects.bukkit)
+    paperweight.paperDevBundle(version)
+    compileOnly("io.papermc.paper:paper-api:${version}")
+}
+
+tasks.compileJava {
+    options.release.set(21)
+}
@@ -0,0 +1,67 @@
+package me.neznamy.tab.platforms.bukkit.paper_1_21_2;
+
+import me.neznamy.tab.shared.chat.TabStyle;
+import me.neznamy.tab.shared.chat.component.object.TabAtlasSprite;
+import me.neznamy.tab.shared.chat.component.object.TabObjectComponent;
+import me.neznamy.tab.platforms.bukkit.provider.ComponentConverter;
+import me.neznamy.tab.shared.chat.component.object.TabPlayerSprite;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.network.chat.Style;
+import net.minecraft.network.chat.TextColor;
+import net.minecraft.resources.ResourceLocation;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Component converter using direct mojang-mapped code.
+ */
+public class NMSComponentConverter extends ComponentConverter<Component> {
+
+    @Override
+    @NotNull
+    public Component newTextComponent(@NotNull String text) {
+        return Component.literal(text);
+    }
+
+    @Override
+    @NotNull
+    public Component newTranslatableComponent(@NotNull String key) {
+        return Component.translatable(key);
+    }
+
+    @Override
+    @NotNull
+    public Component newKeybindComponent(@NotNull String keybind) {
+        return Component.keybind(keybind);
+    }
+
+    @Override
+    @NotNull
+    public Component newObjectComponent(@NotNull TabAtlasSprite sprite) {
+        return Component.literal(TabObjectComponent.ERROR_MESSAGE);
+    }
+
+    @Override
+    @NotNull
+    public Component newObjectComponent(@NotNull TabPlayerSprite sprite) {
+        return Component.literal(TabObjectComponent.ERROR_MESSAGE);
+    }
+
+    @Override
+    public void applyStyle(@NotNull Component nmsComponent, @NotNull TabStyle modifier) {
+        Style style = Style.EMPTY
+                .withColor(modifier.getColor() == null ? null : TextColor.fromRgb(modifier.getColor().getRgb()))
+                .withBold(modifier.getBold())
+                .withItalic(modifier.getItalic())
+                .withUnderlined(modifier.getUnderlined())
+                .withStrikethrough(modifier.getStrikethrough())
+                .withObfuscated(modifier.getObfuscated())
+                .withFont(modifier.getFont() == null ? null : ResourceLocation.tryParse(modifier.getFont()));
+        ((MutableComponent)nmsComponent).setStyle(style);
+    }
+
+    @Override
+    public void addSibling(@NotNull Component parent, @NotNull Component child) {
+        ((MutableComponent)parent).append(child);
+    }
+}
@@ -0,0 +1,52 @@
+package me.neznamy.tab.platforms.bukkit.paper_1_21_2;
+
+import io.netty.channel.Channel;
+import lombok.Getter;
+import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
+import me.neznamy.tab.platforms.bukkit.provider.ComponentConverter;
+import me.neznamy.tab.platforms.bukkit.provider.ImplementationProvider;
+import me.neznamy.tab.shared.platform.Scoreboard;
+import me.neznamy.tab.shared.platform.TabList;
+import me.neznamy.tab.shared.platform.TabListEntryTracker;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Implementation provider using direct Mojang-mapped NMS code for paper 1.21.2 - 1.21.3.
+ */
+@Getter
+public class NMSImplementationProvider implements ImplementationProvider {
+
+    @NotNull
+    private final ComponentConverter<?> componentConverter = new NMSComponentConverter();
+    
+    @Override
+    @NotNull
+    public Scoreboard newScoreboard(@NotNull BukkitTabPlayer player) {
+        return new NMSPacketScoreboard(player);
+    }
+
+    @Override
+    @NotNull
+    public TabList newTabList(@NotNull BukkitTabPlayer player) {
+        return new NMSPacketTabList(player);
+    }
+
+    @Override
+    @NotNull
+    public Channel getChannel(@NotNull Player player) {
+        return ((CraftPlayer)player).getHandle().connection.connection.channel;
+    }
+
+    @Override
+    @NotNull
+    public TabListEntryTracker newTabListEntryTracker() {
+        return new NMSTabListEntryTracker();
+    }
+
+    @Override
+    public int getPing(@NotNull BukkitTabPlayer player) {
+        return player.getPlayer().getPing();
+    }
+}
@@ -0,0 +1,176 @@
+package me.neznamy.tab.platforms.bukkit.paper_1_21_2;
+
+import lombok.NonNull;
+import lombok.SneakyThrows;
+import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
+import me.neznamy.tab.shared.TAB;
+import me.neznamy.tab.shared.platform.decorators.SafeScoreboard;
+import me.neznamy.tab.shared.util.ReflectionUtils;
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.numbers.FixedFormat;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.*;
+import net.minecraft.world.scores.PlayerTeam;
+import net.minecraft.world.scores.Scoreboard;
+import net.minecraft.world.scores.criteria.ObjectiveCriteria;
+import net.minecraft.world.scores.criteria.ObjectiveCriteria.RenderType;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.reflect.Field;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Optional;
+
+/**
+ * Scoreboard implementation using direct mojang-mapped code.
+ */
+public class NMSPacketScoreboard extends SafeScoreboard<BukkitTabPlayer> {
+
+    private static final ChatFormatting[] formats = ChatFormatting.values();
+    private static final net.minecraft.world.scores.Team.CollisionRule[] collisions = net.minecraft.world.scores.Team.CollisionRule.values();
+    private static final net.minecraft.world.scores.Team.Visibility[] visibilities = net.minecraft.world.scores.Team.Visibility.values();
+    private static final Scoreboard dummyScoreboard = new Scoreboard();
+    private static final Field players = ReflectionUtils.getOnlyField(ClientboundSetPlayerTeamPacket.class, Collection.class);
+
+    /**
+     * Constructs new instance with given player.
+     *
+     * @param   player
+     *          Player this scoreboard will belong to
+     */
+    public NMSPacketScoreboard(@NotNull BukkitTabPlayer player) {
+        super(player);
+    }
+
+    @Override
+    public void registerObjective(@NonNull Objective objective) {
+        net.minecraft.world.scores.Objective obj = new net.minecraft.world.scores.Objective(
+                dummyScoreboard,
+                objective.getName(),
+                ObjectiveCriteria.DUMMY,
+                objective.getTitle().convert(),
+                RenderType.values()[objective.getHealthDisplay().ordinal()],
+                false,
+                objective.getNumberFormat() == null ? null : objective.getNumberFormat().toFixedFormat(FixedFormat::new)
+        );
+        objective.setPlatformObjective(obj);
+        sendPacket(new ClientboundSetObjectivePacket(obj, ObjectiveAction.REGISTER));
+    }
+
+    @Override
+    public void setDisplaySlot(@NonNull Objective objective) {
+        sendPacket(new ClientboundSetDisplayObjectivePacket(
+                net.minecraft.world.scores.DisplaySlot.values()[objective.getDisplaySlot().ordinal()],
+                (net.minecraft.world.scores.Objective) objective.getPlatformObjective()
+        ));
+    }
+
+    @Override
+    public void unregisterObjective(@NonNull Objective objective) {
+        sendPacket(new ClientboundSetObjectivePacket((net.minecraft.world.scores.Objective) objective.getPlatformObjective(), ObjectiveAction.UNREGISTER));
+    }
+
+    @Override
+    public void updateObjective(@NonNull Objective objective) {
+        net.minecraft.world.scores.Objective obj = (net.minecraft.world.scores.Objective) objective.getPlatformObjective();
+        obj.setDisplayName(objective.getTitle().convert());
+        obj.setRenderType(RenderType.values()[objective.getHealthDisplay().ordinal()]);
+        sendPacket(new ClientboundSetObjectivePacket(obj, ObjectiveAction.UPDATE));
+    }
+
+    @Override
+    public void setScore(@NonNull Score score) {
+        sendPacket(new ClientboundSetScorePacket(
+                score.getHolder(),
+                score.getObjective().getName(),
+                score.getValue(),
+                Optional.ofNullable(score.getDisplayName() == null ? null : score.getDisplayName().convert()),
+                Optional.ofNullable(score.getNumberFormat() == null ? null : score.getNumberFormat().toFixedFormat(FixedFormat::new))
+        ));
+    }
+
+    @Override
+    public void removeScore(@NonNull Score score) {
+        sendPacket(new ClientboundResetScorePacket(score.getHolder(), score.getObjective().getName()));
+    }
+
+    @Override
+    @NotNull
+    public Object createTeam(@NonNull String name) {
+        return new PlayerTeam(dummyScoreboard, name);
+    }
+
+    @Override
+    public void registerTeam(@NonNull Team team) {
+        updateTeamProperties(team);
+        PlayerTeam t = (PlayerTeam) team.getPlatformTeam();
+        t.getPlayers().addAll(team.getPlayers());
+        sendPacket(ClientboundSetPlayerTeamPacket.createAddOrModifyPacket(t, true));
+    }
+
+    @Override
+    public void unregisterTeam(@NonNull Team team) {
+        sendPacket(ClientboundSetPlayerTeamPacket.createRemovePacket((PlayerTeam) team.getPlatformTeam()));
+    }
+
+    @Override
+    public void updateTeam(@NonNull Team team) {
+        updateTeamProperties(team);
+        sendPacket(ClientboundSetPlayerTeamPacket.createAddOrModifyPacket((PlayerTeam) team.getPlatformTeam(), false));
+    }
+
+    private void updateTeamProperties(@NonNull Team team) {
+        PlayerTeam t = (PlayerTeam) team.getPlatformTeam();
+        t.setAllowFriendlyFire((team.getOptions() & 0x01) != 0);
+        t.setSeeFriendlyInvisibles((team.getOptions() & 0x02) != 0);
+        t.setColor(formats[team.getColor().ordinal()]);
+        t.setCollisionRule(collisions[team.getCollision().ordinal()]);
+        t.setNameTagVisibility(visibilities[team.getVisibility().ordinal()]);
+        t.setPlayerPrefix(team.getPrefix().convert());
+        t.setPlayerSuffix(team.getSuffix().convert());
+    }
+
+    @Override
+    @SneakyThrows
+    @NotNull
+    public Object onPacketSend(@NonNull Object packet) {
+        if (packet instanceof ClientboundSetDisplayObjectivePacket display) {
+            TAB.getInstance().getFeatureManager().onDisplayObjective(player, display.getSlot().ordinal(), display.getObjectiveName());
+        }
+        if (packet instanceof ClientboundSetObjectivePacket objective) {
+            TAB.getInstance().getFeatureManager().onObjective(player, objective.getMethod(), objective.getObjectiveName());
+        }
+        if (packet instanceof ClientboundSetPlayerTeamPacket team) {
+            int action = getMethod(team);
+            if (action != TeamAction.UPDATE) {
+                players.set(team, onTeamPacket(action, team.getName(), team.getPlayers() == null ? Collections.emptyList() : team.getPlayers()));
+            }
+        }
+        return packet;
+    }
+
+    private static int getMethod(@NonNull ClientboundSetPlayerTeamPacket team) {
+        if (team.getTeamAction() == ClientboundSetPlayerTeamPacket.Action.ADD) {
+            return 0;
+        } else if (team.getTeamAction() == ClientboundSetPlayerTeamPacket.Action.REMOVE) {
+            return 1;
+        } else if (team.getPlayerAction() == ClientboundSetPlayerTeamPacket.Action.ADD) {
+            return 3;
+        } else if (team.getPlayerAction() == ClientboundSetPlayerTeamPacket.Action.REMOVE) {
+            return 4;
+        } else {
+            return 2;
+        }
+    }
+
+    /**
+     * Sends the packet to the player.
+     *
+     * @param   packet
+     *          Packet to send
+     */
+    private void sendPacket(@NotNull Packet<?> packet) {
+        ((CraftPlayer)player.getPlayer()).getHandle().connection.sendPacket(packet);
+    }
+}
@@ -0,0 +1,202 @@
+package me.neznamy.tab.platforms.bukkit.paper_1_21_2;
+
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.properties.Property;
+import lombok.NonNull;
+import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
+import me.neznamy.tab.shared.TAB;
+import me.neznamy.tab.shared.chat.component.TabComponent;
+import me.neznamy.tab.shared.platform.TabList;
+import me.neznamy.tab.shared.platform.decorators.TrackedTabList;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.ClientboundPlayerInfoRemovePacket;
+import net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket;
+import net.minecraft.network.protocol.game.ClientboundTabListPacket;
+import net.minecraft.world.level.GameType;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.*;
+
+/**
+ * TabList implementation using direct mojang-mapped code.
+ */
+public class NMSPacketTabList extends TrackedTabList<BukkitTabPlayer> {
+
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> addPlayer = EnumSet.allOf(ClientboundPlayerInfoUpdatePacket.Action.class);
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> updateDisplayName = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME);
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> updateLatency = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LATENCY);
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> updateGameMode = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE);
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> updateListed = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LISTED);
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> updateListOrder = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LIST_ORDER);
+
+    /**
+     * Constructs new instance.
+     *
+     * @param   player
+     *          Player this tablist will belong to
+     */
+    public NMSPacketTabList(@NotNull BukkitTabPlayer player) {
+        super(player);
+    }
+
+    @Override
+    public void removeEntry(@NonNull UUID entry) {
+        sendPacket(new ClientboundPlayerInfoRemovePacket(Collections.singletonList(entry)));
+    }
+
+    @Override
+    public void updateDisplayName0(@NonNull UUID entry, @Nullable TabComponent displayName) {
+        sendPacket(updateDisplayName, entry, "", null, false, 0, 0, displayName, 0);
+    }
+
+    @Override
+    public void updateLatency(@NonNull UUID entry, int latency) {
+        sendPacket(updateLatency, entry, "", null, false, latency, 0, null, 0);
+    }
+
+    @Override
+    public void updateGameMode(@NonNull UUID entry, int gameMode) {
+        sendPacket(updateGameMode, entry, "", null, false, 0, gameMode, null, 0);
+    }
+
+    @Override
+    public void updateListed(@NonNull UUID entry, boolean listed) {
+        sendPacket(updateListed, entry, "", null, listed, 0, 0, null, 0);
+    }
+
+    @Override
+    public void updateListOrder(@NonNull UUID entry, int listOrder) {
+        sendPacket(updateListOrder, entry, "", null, false, 0, 0, null, listOrder);
+    }
+
+    @Override
+    public void updateHat(@NonNull UUID entry, boolean showHat) {
+        // Added in 1.21.4
+    }
+
+    @Override
+    public void addEntry0(@NonNull Entry entry) {
+        sendPacket(addPlayer, entry.getUniqueId(), entry.getName(), entry.getSkin(), entry.isListed(), entry.getLatency(),
+                entry.getGameMode(), entry.getDisplayName(), entry.getListOrder());
+    }
+
+    @Override
+    public void setPlayerListHeaderFooter0(@NonNull TabComponent header, @NonNull TabComponent footer) {
+        sendPacket(new ClientboundTabListPacket(header.convert(), footer.convert()));
+    }
+
+    @Override
+    @Nullable
+    public Skin getSkin() {
+        Collection<Property> properties = ((CraftPlayer)player.getPlayer()).getProfile().getProperties().get(TEXTURES_PROPERTY);
+        if (properties.isEmpty()) return null; // Offline mode
+        Property property = properties.iterator().next();
+        return new Skin(property.value(), property.signature());
+    }
+
+    @Override
+    @NotNull
+    public Object onPacketSend(@NonNull Object packet) {
+        if (packet instanceof ClientboundTabListPacket tablist) {
+            if (header == null || footer == null) return packet;
+            if (tablist.header() != header.convert() || tablist.footer() != footer.convert()) {
+                return new ClientboundTabListPacket(header.convert(), footer.convert());
+            }
+        }
+        if (packet instanceof ClientboundPlayerInfoUpdatePacket info) {
+            EnumSet<ClientboundPlayerInfoUpdatePacket.Action> actions = info.actions();
+            List<ClientboundPlayerInfoUpdatePacket.Entry> updatedList = new ArrayList<>();
+            boolean rewritePacket = false;
+            for (ClientboundPlayerInfoUpdatePacket.Entry nmsData : info.entries()) {
+                boolean rewriteEntry = false;
+                Component displayName = nmsData.displayName();
+                int latency = nmsData.latency();
+                int gameMode = nmsData.gameMode().getId();
+                boolean listed = nmsData.listed();
+                if (actions.contains(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME)) {
+                    TabComponent forcedDisplayName = getForcedDisplayNames().get(nmsData.profileId());
+                    if (forcedDisplayName != null && forcedDisplayName.convert() != displayName) {
+                        displayName = forcedDisplayName.convert();
+                        rewriteEntry = rewritePacket = true;
+                    }
+                }
+                if (actions.contains(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE)) {
+                    if (getBlockedSpectators().contains(nmsData.profileId()) && gameMode == 3) {
+                        gameMode = 0;
+                        rewriteEntry = rewritePacket = true;
+                    }
+                }
+                if (actions.contains(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LATENCY)) {
+                    if (getForcedLatency() != null) {
+                        latency = getForcedLatency();
+                        rewriteEntry = rewritePacket = true;
+                    }
+                }
+                if (actions.contains(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LISTED)) {
+                    if (allPlayersHidden && nmsData.profileId().getMostSignificantBits() != 0) { // Filter out layout entries
+                        listed = false;
+                        rewriteEntry = rewritePacket = true;
+                    }
+                }
+                if (actions.contains(ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER)) {
+                    TAB.getInstance().getFeatureManager().onEntryAdd(player, nmsData.profileId(), nmsData.profile().getName());
+                }
+                updatedList.add(rewriteEntry ? new ClientboundPlayerInfoUpdatePacket.Entry(
+                        nmsData.profileId(), nmsData.profile(), listed, latency, GameType.byId(gameMode), displayName,
+                        nmsData.listOrder(), nmsData.chatSession()
+                ) : nmsData);
+            }
+            if (rewritePacket) return new ClientboundPlayerInfoUpdatePacket(actions, updatedList);
+        }
+        return packet;
+    }
+
+    private void sendPacket(@NonNull EnumSet<ClientboundPlayerInfoUpdatePacket.Action> action, @NonNull UUID id, @NonNull String name, @Nullable Skin skin,
+                            boolean listed, int latency, int gameMode, @Nullable TabComponent displayName, int listOrder) {
+        ClientboundPlayerInfoUpdatePacket packet = new ClientboundPlayerInfoUpdatePacket(action, new ClientboundPlayerInfoUpdatePacket.Entry(
+                id,
+                action.contains(ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER) ? createProfile(id, name, skin) : null,
+                listed,
+                latency,
+                GameType.byId(gameMode),
+                displayName == null ? null : displayName.convert(),
+                listOrder,
+                null
+        ));
+        sendPacket(packet);
+    }
+
+    /**
+     * Creates GameProfile from given parameters.
+     *
+     * @param   id
+     *          Profile ID
+     * @param   name
+     *          Profile name
+     * @param   skin
+     *          Player skin
+     * @return  GameProfile from given parameters
+     */
+    @NotNull
+    private GameProfile createProfile(@NonNull UUID id, @NonNull String name, @Nullable Skin skin) {
+        GameProfile profile = new GameProfile(id, name);
+        if (skin != null) {
+            profile.getProperties().put(TabList.TEXTURES_PROPERTY,
+                    new Property(TabList.TEXTURES_PROPERTY, skin.getValue(), skin.getSignature()));
+        }
+        return profile;
+    }
+
+    /**
+     * Sends the packet to the player.
+     *
+     * @param   packet
+     *          Packet to send
+     */
+    private void sendPacket(@NotNull Packet<?> packet) {
+        ((CraftPlayer)player.getPlayer()).getHandle().connection.send(packet);
+    }
+}
@@ -0,0 +1,30 @@
+package me.neznamy.tab.platforms.bukkit.paper_1_21_2;
+
+import me.neznamy.tab.shared.platform.TabListEntryTracker;
+import net.minecraft.network.protocol.game.ClientboundPlayerInfoRemovePacket;
+import net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
+
+/**
+ * Implementation of TabListEntryTracker.
+ */
+public class NMSTabListEntryTracker extends TabListEntryTracker {
+
+    @Override
+    public void onPacketSend(@NotNull Object packet) {
+        if (packet instanceof ClientboundPlayerInfoRemovePacket remove) {
+            for (UUID id : remove.profileIds()) {
+                tablistEntries.remove(id);
+            }
+        }
+        if (packet instanceof ClientboundPlayerInfoUpdatePacket update) {
+            if (update.actions().contains(ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER)) {
+                for (ClientboundPlayerInfoUpdatePacket.Entry nmsData : update.entries()) {
+                    tablistEntries.add(nmsData.profileId());
+                }
+            }
+        }
+    }
+}
@@ -0,0 +1,28 @@
+plugins {
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.19"
+}
+
+repositories {
+    maven("https://jitpack.io") // YamlAssist
+    maven("https://repo.opencollab.dev/maven-snapshots/")
+    maven("https://repo.viaversion.com/")
+    maven {
+        name = "luck-repo"
+        url = uri("https://repo.lucko.me/")
+        content {
+            includeModule("me.lucko", "spark-api")
+        }
+    }
+}
+
+val version = "1.21.4-R0.1-SNAPSHOT"
+
+dependencies {
+    implementation(projects.bukkit)
+    paperweight.paperDevBundle(version)
+    compileOnly("io.papermc.paper:paper-api:${version}")
+}
+
+tasks.compileJava {
+    options.release.set(21)
+}
@@ -0,0 +1,65 @@
+package me.neznamy.tab.platforms.bukkit.paper_1_21_4;
+
+import me.neznamy.tab.shared.chat.TabStyle;
+import me.neznamy.tab.shared.chat.component.object.TabAtlasSprite;
+import me.neznamy.tab.shared.chat.component.object.TabObjectComponent;
+import me.neznamy.tab.platforms.bukkit.provider.ComponentConverter;
+import me.neznamy.tab.shared.chat.component.object.TabPlayerSprite;
+import net.minecraft.network.chat.*;
+import net.minecraft.resources.ResourceLocation;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Component converter using direct mojang-mapped code.
+ */
+public class NMSComponentConverter extends ComponentConverter<Component> {
+
+    @Override
+    @NotNull
+    public Component newTextComponent(@NotNull String text) {
+        return Component.literal(text);
+    }
+
+    @Override
+    @NotNull
+    public Component newTranslatableComponent(@NotNull String key) {
+        return Component.translatable(key);
+    }
+
+    @Override
+    @NotNull
+    public Component newKeybindComponent(@NotNull String keybind) {
+        return Component.keybind(keybind);
+    }
+
+    @Override
+    @NotNull
+    public Component newObjectComponent(@NotNull TabAtlasSprite sprite) {
+        return Component.literal(TabObjectComponent.ERROR_MESSAGE);
+    }
+
+    @Override
+    @NotNull
+    public Component newObjectComponent(@NotNull TabPlayerSprite sprite) {
+        return Component.literal(TabObjectComponent.ERROR_MESSAGE);
+    }
+
+    @Override
+    public void applyStyle(@NotNull Component nmsComponent, @NotNull TabStyle modifier) {
+        Style style = Style.EMPTY
+                .withColor(modifier.getColor() == null ? null : TextColor.fromRgb(modifier.getColor().getRgb()))
+                .withBold(modifier.getBold())
+                .withItalic(modifier.getItalic())
+                .withUnderlined(modifier.getUnderlined())
+                .withStrikethrough(modifier.getStrikethrough())
+                .withObfuscated(modifier.getObfuscated())
+                .withFont(modifier.getFont() == null ? null : ResourceLocation.tryParse(modifier.getFont()));
+        if (modifier.getShadowColor() != null) style = style.withShadowColor(modifier.getShadowColor()); // withShadowColor takes int instead of Integer, bug?
+        ((MutableComponent)nmsComponent).setStyle(style);
+    }
+
+    @Override
+    public void addSibling(@NotNull Component parent, @NotNull Component child) {
+        ((MutableComponent)parent).append(child);
+    }
+}
@@ -0,0 +1,52 @@
+package me.neznamy.tab.platforms.bukkit.paper_1_21_4;
+
+import io.netty.channel.Channel;
+import lombok.Getter;
+import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
+import me.neznamy.tab.platforms.bukkit.provider.ComponentConverter;
+import me.neznamy.tab.platforms.bukkit.provider.ImplementationProvider;
+import me.neznamy.tab.shared.platform.Scoreboard;
+import me.neznamy.tab.shared.platform.TabList;
+import me.neznamy.tab.shared.platform.TabListEntryTracker;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Implementation provider using direct Mojang-mapped NMS code for paper 1.21.4 - 1.21.8.
+ */
+@Getter
+public class NMSImplementationProvider implements ImplementationProvider {
+
+    @NotNull
+    private final ComponentConverter<?> componentConverter = new NMSComponentConverter();
+    
+    @Override
+    @NotNull
+    public Scoreboard newScoreboard(@NotNull BukkitTabPlayer player) {
+        return new NMSPacketScoreboard(player);
+    }
+
+    @Override
+    @NotNull
+    public TabList newTabList(@NotNull BukkitTabPlayer player) {
+        return new NMSPacketTabList(player);
+    }
+
+    @Override
+    @NotNull
+    public Channel getChannel(@NotNull Player player) {
+        return ((CraftPlayer)player).getHandle().connection.connection.channel;
+    }
+
+    @Override
+    @NotNull
+    public TabListEntryTracker newTabListEntryTracker() {
+        return new NMSTabListEntryTracker();
+    }
+
+    @Override
+    public int getPing(@NotNull BukkitTabPlayer player) {
+        return player.getPlayer().getPing();
+    }
+}
@@ -0,0 +1,176 @@
+package me.neznamy.tab.platforms.bukkit.paper_1_21_4;
+
+import lombok.NonNull;
+import lombok.SneakyThrows;
+import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
+import me.neznamy.tab.shared.TAB;
+import me.neznamy.tab.shared.platform.decorators.SafeScoreboard;
+import me.neznamy.tab.shared.util.ReflectionUtils;
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.numbers.FixedFormat;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.*;
+import net.minecraft.world.scores.PlayerTeam;
+import net.minecraft.world.scores.Scoreboard;
+import net.minecraft.world.scores.criteria.ObjectiveCriteria;
+import net.minecraft.world.scores.criteria.ObjectiveCriteria.RenderType;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.reflect.Field;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Optional;
+
+/**
+ * Scoreboard implementation using direct mojang-mapped code.
+ */
+public class NMSPacketScoreboard extends SafeScoreboard<BukkitTabPlayer> {
+
+    private static final ChatFormatting[] formats = ChatFormatting.values();
+    private static final net.minecraft.world.scores.Team.CollisionRule[] collisions = net.minecraft.world.scores.Team.CollisionRule.values();
+    private static final net.minecraft.world.scores.Team.Visibility[] visibilities = net.minecraft.world.scores.Team.Visibility.values();
+    private static final Scoreboard dummyScoreboard = new Scoreboard();
+    private static final Field players = ReflectionUtils.getOnlyField(ClientboundSetPlayerTeamPacket.class, Collection.class);
+
+    /**
+     * Constructs new instance with given player.
+     *
+     * @param   player
+     *          Player this scoreboard will belong to
+     */
+    public NMSPacketScoreboard(@NotNull BukkitTabPlayer player) {
+        super(player);
+    }
+
+    @Override
+    public void registerObjective(@NonNull Objective objective) {
+        net.minecraft.world.scores.Objective obj = new net.minecraft.world.scores.Objective(
+                dummyScoreboard,
+                objective.getName(),
+                ObjectiveCriteria.DUMMY,
+                objective.getTitle().convert(),
+                RenderType.values()[objective.getHealthDisplay().ordinal()],
+                false,
+                objective.getNumberFormat() == null ? null : objective.getNumberFormat().toFixedFormat(FixedFormat::new)
+        );
+        objective.setPlatformObjective(obj);
+        sendPacket(new ClientboundSetObjectivePacket(obj, ObjectiveAction.REGISTER));
+    }
+
+    @Override
+    public void setDisplaySlot(@NonNull Objective objective) {
+        sendPacket(new ClientboundSetDisplayObjectivePacket(
+                net.minecraft.world.scores.DisplaySlot.values()[objective.getDisplaySlot().ordinal()],
+                (net.minecraft.world.scores.Objective) objective.getPlatformObjective()
+        ));
+    }
+
+    @Override
+    public void unregisterObjective(@NonNull Objective objective) {
+        sendPacket(new ClientboundSetObjectivePacket((net.minecraft.world.scores.Objective) objective.getPlatformObjective(), ObjectiveAction.UNREGISTER));
+    }
+
+    @Override
+    public void updateObjective(@NonNull Objective objective) {
+        net.minecraft.world.scores.Objective obj = (net.minecraft.world.scores.Objective) objective.getPlatformObjective();
+        obj.setDisplayName(objective.getTitle().convert());
+        obj.setRenderType(RenderType.values()[objective.getHealthDisplay().ordinal()]);
+        sendPacket(new ClientboundSetObjectivePacket(obj, ObjectiveAction.UPDATE));
+    }
+
+    @Override
+    public void setScore(@NonNull Score score) {
+        sendPacket(new ClientboundSetScorePacket(
+                score.getHolder(),
+                score.getObjective().getName(),
+                score.getValue(),
+                Optional.ofNullable(score.getDisplayName() == null ? null : score.getDisplayName().convert()),
+                Optional.ofNullable(score.getNumberFormat() == null ? null : score.getNumberFormat().toFixedFormat(FixedFormat::new))
+        ));
+    }
+
+    @Override
+    public void removeScore(@NonNull Score score) {
+        sendPacket(new ClientboundResetScorePacket(score.getHolder(), score.getObjective().getName()));
+    }
+
+    @Override
+    @NotNull
+    public Object createTeam(@NonNull String name) {
+        return new PlayerTeam(dummyScoreboard, name);
+    }
+
+    @Override
+    public void registerTeam(@NonNull Team team) {
+        updateTeamProperties(team);
+        PlayerTeam t = (PlayerTeam) team.getPlatformTeam();
+        t.getPlayers().addAll(team.getPlayers());
+        sendPacket(ClientboundSetPlayerTeamPacket.createAddOrModifyPacket(t, true));
+    }
+
+    @Override
+    public void unregisterTeam(@NonNull Team team) {
+        sendPacket(ClientboundSetPlayerTeamPacket.createRemovePacket((PlayerTeam) team.getPlatformTeam()));
+    }
+
+    @Override
+    public void updateTeam(@NonNull Team team) {
+        updateTeamProperties(team);
+        sendPacket(ClientboundSetPlayerTeamPacket.createAddOrModifyPacket((PlayerTeam) team.getPlatformTeam(), false));
+    }
+
+    private void updateTeamProperties(@NonNull Team team) {
+        PlayerTeam t = (PlayerTeam) team.getPlatformTeam();
+        t.setAllowFriendlyFire((team.getOptions() & 0x01) != 0);
+        t.setSeeFriendlyInvisibles((team.getOptions() & 0x02) != 0);
+        t.setColor(formats[team.getColor().ordinal()]);
+        t.setCollisionRule(collisions[team.getCollision().ordinal()]);
+        t.setNameTagVisibility(visibilities[team.getVisibility().ordinal()]);
+        t.setPlayerPrefix(team.getPrefix().convert());
+        t.setPlayerSuffix(team.getSuffix().convert());
+    }
+
+    @Override
+    @SneakyThrows
+    @NotNull
+    public Object onPacketSend(@NonNull Object packet) {
+        if (packet instanceof ClientboundSetDisplayObjectivePacket display) {
+            TAB.getInstance().getFeatureManager().onDisplayObjective(player, display.getSlot().ordinal(), display.getObjectiveName());
+        }
+        if (packet instanceof ClientboundSetObjectivePacket objective) {
+            TAB.getInstance().getFeatureManager().onObjective(player, objective.getMethod(), objective.getObjectiveName());
+        }
+        if (packet instanceof ClientboundSetPlayerTeamPacket team) {
+            int action = getMethod(team);
+            if (action != TeamAction.UPDATE) {
+                players.set(team, onTeamPacket(action, team.getName(), team.getPlayers() == null ? Collections.emptyList() : team.getPlayers()));
+            }
+        }
+        return packet;
+    }
+
+    private int getMethod(@NonNull ClientboundSetPlayerTeamPacket team) {
+        if (team.getTeamAction() == ClientboundSetPlayerTeamPacket.Action.ADD) {
+            return 0;
+        } else if (team.getTeamAction() == ClientboundSetPlayerTeamPacket.Action.REMOVE) {
+            return 1;
+        } else if (team.getPlayerAction() == ClientboundSetPlayerTeamPacket.Action.ADD) {
+            return 3;
+        } else if (team.getPlayerAction() == ClientboundSetPlayerTeamPacket.Action.REMOVE) {
+            return 4;
+        } else {
+            return 2;
+        }
+    }
+
+    /**
+     * Sends the packet to the player.
+     *
+     * @param   packet
+     *          Packet to send
+     */
+    private void sendPacket(@NotNull Packet<?> packet) {
+        ((CraftPlayer)player.getPlayer()).getHandle().connection.send(packet);
+    }
+}
@@ -0,0 +1,204 @@
+package me.neznamy.tab.platforms.bukkit.paper_1_21_4;
+
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.properties.Property;
+import lombok.NonNull;
+import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
+import me.neznamy.tab.shared.TAB;
+import me.neznamy.tab.shared.chat.component.TabComponent;
+import me.neznamy.tab.shared.platform.TabList;
+import me.neznamy.tab.shared.platform.decorators.TrackedTabList;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.ClientboundPlayerInfoRemovePacket;
+import net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket;
+import net.minecraft.network.protocol.game.ClientboundTabListPacket;
+import net.minecraft.world.level.GameType;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.*;
+
+/**
+ * TabList implementation using direct mojang-mapped code.
+ */
+public class NMSPacketTabList extends TrackedTabList<BukkitTabPlayer> {
+
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> addPlayer = EnumSet.allOf(ClientboundPlayerInfoUpdatePacket.Action.class);
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> updateDisplayName = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME);
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> updateLatency = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LATENCY);
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> updateGameMode = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE);
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> updateListed = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LISTED);
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> updateListOrder = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LIST_ORDER);
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> updateHat = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_HAT);
+
+    /**
+     * Constructs new instance.
+     *
+     * @param   player
+     *          Player this tablist will belong to
+     */
+    public NMSPacketTabList(@NotNull BukkitTabPlayer player) {
+        super(player);
+    }
+
+    @Override
+    public void removeEntry(@NonNull UUID entry) {
+        sendPacket(new ClientboundPlayerInfoRemovePacket(Collections.singletonList(entry)));
+    }
+
+    @Override
+    public void updateDisplayName0(@NonNull UUID entry, @Nullable TabComponent displayName) {
+        sendPacket(updateDisplayName, entry, "", null, false, 0, 0, displayName, 0, false);
+    }
+
+    @Override
+    public void updateLatency(@NonNull UUID entry, int latency) {
+        sendPacket(updateLatency, entry, "", null, false, latency, 0, null, 0, false);
+    }
+
+    @Override
+    public void updateGameMode(@NonNull UUID entry, int gameMode) {
+        sendPacket(updateGameMode, entry, "", null, false, 0, gameMode, null, 0, false);
+    }
+
+    @Override
+    public void updateListed(@NonNull UUID entry, boolean listed) {
+        sendPacket(updateListed, entry, "", null, listed, 0, 0, null, 0, false);
+    }
+
+    @Override
+    public void updateListOrder(@NonNull UUID entry, int listOrder) {
+        sendPacket(updateListOrder, entry, "", null, false, 0, 0, null, listOrder, false);
+    }
+
+    @Override
+    public void updateHat(@NonNull UUID entry, boolean showHat) {
+        sendPacket(updateHat, entry, "", null, false, 0, 0, null, 0, showHat);
+    }
+
+    @Override
+    public void addEntry0(@NonNull Entry entry) {
+        sendPacket(addPlayer, entry.getUniqueId(), entry.getName(), entry.getSkin(), entry.isListed(), entry.getLatency(),
+                entry.getGameMode(), entry.getDisplayName(), entry.getListOrder(), entry.isShowHat());
+    }
+
+    @Override
+    public void setPlayerListHeaderFooter0(@NonNull TabComponent header, @NonNull TabComponent footer) {
+        sendPacket(new ClientboundTabListPacket(header.convert(), footer.convert()));
+    }
+
+    @Override
+    @Nullable
+    public Skin getSkin() {
+        Collection<Property> properties = ((CraftPlayer)player.getPlayer()).getProfile().getProperties().get(TEXTURES_PROPERTY);
+        if (properties.isEmpty()) return null; // Offline mode
+        Property property = properties.iterator().next();
+        return new Skin(property.value(), property.signature());
+    }
+
+    @Override
+    @NotNull
+    public Object onPacketSend(@NonNull Object packet) {
+        if (packet instanceof ClientboundTabListPacket tablist) {
+            if (header == null || footer == null) return packet;
+            if (tablist.header() != header.convert() || tablist.footer() != footer.convert()) {
+                return new ClientboundTabListPacket(header.convert(), footer.convert());
+            }
+        }
+        if (packet instanceof ClientboundPlayerInfoUpdatePacket info) {
+            EnumSet<ClientboundPlayerInfoUpdatePacket.Action> actions = info.actions();
+            List<ClientboundPlayerInfoUpdatePacket.Entry> updatedList = new ArrayList<>();
+            boolean rewritePacket = false;
+            for (ClientboundPlayerInfoUpdatePacket.Entry nmsData : info.entries()) {
+                boolean rewriteEntry = false;
+                Component displayName = nmsData.displayName();
+                int latency = nmsData.latency();
+                int gameMode = nmsData.gameMode().getId();
+                boolean listed = nmsData.listed();
+                if (actions.contains(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME)) {
+                    TabComponent forcedDisplayName = getForcedDisplayNames().get(nmsData.profileId());
+                    if (forcedDisplayName != null && forcedDisplayName.convert() != displayName) {
+                        displayName = forcedDisplayName.convert();
+                        rewriteEntry = rewritePacket = true;
+                    }
+                }
+                if (actions.contains(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE)) {
+                    if (getBlockedSpectators().contains(nmsData.profileId()) && gameMode == 3) {
+                        gameMode = 0;
+                        rewriteEntry = rewritePacket = true;
+                    }
+                }
+                if (actions.contains(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LATENCY)) {
+                    if (getForcedLatency() != null) {
+                        latency = getForcedLatency();
+                        rewriteEntry = rewritePacket = true;
+                    }
+                }
+                if (actions.contains(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LISTED)) {
+                    if (allPlayersHidden && nmsData.profileId().getMostSignificantBits() != 0) { // Filter out layout entries
+                        listed = false;
+                        rewriteEntry = rewritePacket = true;
+                    }
+                }
+                if (actions.contains(ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER)) {
+                    TAB.getInstance().getFeatureManager().onEntryAdd(player, nmsData.profileId(), nmsData.profile().getName());
+                }
+                updatedList.add(rewriteEntry ? new ClientboundPlayerInfoUpdatePacket.Entry(
+                        nmsData.profileId(), nmsData.profile(), listed, latency, GameType.byId(gameMode), displayName,
+                        nmsData.showHat(), nmsData.listOrder(), nmsData.chatSession()
+                ) : nmsData);
+            }
+            if (rewritePacket) return new ClientboundPlayerInfoUpdatePacket(actions, updatedList);
+        }
+        return packet;
+    }
+
+    private void sendPacket(@NonNull EnumSet<ClientboundPlayerInfoUpdatePacket.Action> action, @NonNull UUID id, @NonNull String name, @Nullable Skin skin,
+                            boolean listed, int latency, int gameMode, @Nullable TabComponent displayName, int listOrder, boolean showHat) {
+        ClientboundPlayerInfoUpdatePacket packet = new ClientboundPlayerInfoUpdatePacket(action, new ClientboundPlayerInfoUpdatePacket.Entry(
+                id,
+                action.contains(ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER) ? createProfile(id, name, skin) : null,
+                listed,
+                latency,
+                GameType.byId(gameMode),
+                displayName == null ? null : displayName.convert(),
+                showHat,
+                listOrder,
+                null
+        ));
+        sendPacket(packet);
+    }
+
+    /**
+     * Creates GameProfile from given parameters.
+     *
+     * @param   id
+     *          Profile ID
+     * @param   name
+     *          Profile name
+     * @param   skin
+     *          Player skin
+     * @return  GameProfile from given parameters
+     */
+    @NotNull
+    private GameProfile createProfile(@NonNull UUID id, @NonNull String name, @Nullable Skin skin) {
+        GameProfile profile = new GameProfile(id, name);
+        if (skin != null) {
+            profile.getProperties().put(TabList.TEXTURES_PROPERTY,
+                    new Property(TabList.TEXTURES_PROPERTY, skin.getValue(), skin.getSignature()));
+        }
+        return profile;
+    }
+
+    /**
+     * Sends the packet to the player.
+     *
+     * @param   packet
+     *          Packet to send
+     */
+    private void sendPacket(@NotNull Packet<?> packet) {
+        ((CraftPlayer)player.getPlayer()).getHandle().connection.send(packet);
+    }
+}
@@ -0,0 +1,30 @@
+package me.neznamy.tab.platforms.bukkit.paper_1_21_4;
+
+import me.neznamy.tab.shared.platform.TabListEntryTracker;
+import net.minecraft.network.protocol.game.ClientboundPlayerInfoRemovePacket;
+import net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
+
+/**
+ * Implementation of TabListEntryTracker.
+ */
+public class NMSTabListEntryTracker extends TabListEntryTracker {
+
+    @Override
+    public void onPacketSend(@NotNull Object packet) {
+        if (packet instanceof ClientboundPlayerInfoRemovePacket remove) {
+            for (UUID id : remove.profileIds()) {
+                tablistEntries.remove(id);
+            }
+        }
+        if (packet instanceof ClientboundPlayerInfoUpdatePacket update) {
+            if (update.actions().contains(ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER)) {
+                for (ClientboundPlayerInfoUpdatePacket.Entry nmsData : update.entries()) {
+                    tablistEntries.add(nmsData.profileId());
+                }
+            }
+        }
+    }
+}
@@ -0,0 +1,28 @@
+plugins {
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.19"
+}
+
+repositories {
+    maven("https://jitpack.io") // YamlAssist
+    maven("https://repo.opencollab.dev/maven-snapshots/")
+    maven("https://repo.viaversion.com/")
+    maven {
+        name = "luck-repo"
+        url = uri("https://repo.lucko.me/")
+        content {
+            includeModule("me.lucko", "spark-api")
+        }
+    }
+}
+
+val version = "1.21.9-R0.1-SNAPSHOT"
+
+dependencies {
+    implementation(projects.bukkit)
+    paperweight.paperDevBundle(version)
+    compileOnly("io.papermc.paper:paper-api:${version}")
+}
+
+tasks.compileJava {
+    options.release.set(21)
+}
@@ -0,0 +1,84 @@
+package me.neznamy.tab.platforms.bukkit.paper_1_21_9;
+
+import com.google.common.collect.ImmutableMultimap;
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.properties.Property;
+import com.mojang.authlib.properties.PropertyMap;
+import me.neznamy.tab.platforms.bukkit.provider.ComponentConverter;
+import me.neznamy.tab.shared.chat.TabStyle;
+import me.neznamy.tab.shared.chat.component.object.TabAtlasSprite;
+import me.neznamy.tab.shared.chat.component.object.TabPlayerSprite;
+import me.neznamy.tab.shared.platform.TabList;
+import net.minecraft.network.chat.*;
+import net.minecraft.network.chat.contents.objects.AtlasSprite;
+import net.minecraft.network.chat.contents.objects.PlayerSprite;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.component.ResolvableProfile;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Component converter using direct mojang-mapped code.
+ */
+public class NMSComponentConverter extends ComponentConverter<Component> {
+
+    @Override
+    @NotNull
+    public Component newTextComponent(@NotNull String text) {
+        return Component.literal(text);
+    }
+
+    @Override
+    @NotNull
+    public Component newTranslatableComponent(@NotNull String key) {
+        return Component.translatable(key);
+    }
+
+    @Override
+    @NotNull
+    public Component newKeybindComponent(@NotNull String keybind) {
+        return Component.keybind(keybind);
+    }
+
+    @Override
+    @NotNull
+    public Component newObjectComponent(@NotNull TabAtlasSprite sprite) {
+        return Component.object(new AtlasSprite(ResourceLocation.parse(sprite.getAtlas()), ResourceLocation.parse(sprite.getSprite())));
+    }
+
+    @Override
+    @NotNull
+    public Component newObjectComponent(@NotNull TabPlayerSprite sprite) {
+        ResolvableProfile profile;
+        if (sprite.getId() != null) {
+            profile = ResolvableProfile.createUnresolved(sprite.getId());
+        } else if (sprite.getName() != null) {
+            profile = ResolvableProfile.createUnresolved(sprite.getName());
+        } else if (sprite.getSkin() != null) {
+            ImmutableMultimap.Builder<String, Property> builder = ImmutableMultimap.builder();
+            builder.put(TabList.TEXTURES_PROPERTY, new Property(TabList.TEXTURES_PROPERTY, sprite.getSkin().getValue(), sprite.getSkin().getSignature()));
+            profile = ResolvableProfile.createResolved(new GameProfile(NIL_UUID, "", new PropertyMap(builder.build())));
+        } else {
+            throw new IllegalStateException("Player head component does not have id, name or skin set");
+        }
+        return Component.object(new PlayerSprite(profile, sprite.isShowHat()));
+    }
+
+    @Override
+    public void applyStyle(@NotNull Component nmsComponent, @NotNull TabStyle modifier) {
+        Style style = Style.EMPTY
+                .withColor(modifier.getColor() == null ? null : TextColor.fromRgb(modifier.getColor().getRgb()))
+                .withBold(modifier.getBold())
+                .withItalic(modifier.getItalic())
+                .withUnderlined(modifier.getUnderlined())
+                .withStrikethrough(modifier.getStrikethrough())
+                .withObfuscated(modifier.getObfuscated())
+                .withFont(modifier.getFont() == null ? null : new FontDescription.Resource(ResourceLocation.parse(modifier.getFont())));
+        if (modifier.getShadowColor() != null) style = style.withShadowColor(modifier.getShadowColor()); // withShadowColor takes int instead of Integer, bug?
+        ((MutableComponent)nmsComponent).setStyle(style);
+    }
+
+    @Override
+    public void addSibling(@NotNull Component parent, @NotNull Component child) {
+        ((MutableComponent)parent).append(child);
+    }
+}
@@ -0,0 +1,52 @@
+package me.neznamy.tab.platforms.bukkit.paper_1_21_9;
+
+import io.netty.channel.Channel;
+import lombok.Getter;
+import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
+import me.neznamy.tab.platforms.bukkit.provider.ComponentConverter;
+import me.neznamy.tab.platforms.bukkit.provider.ImplementationProvider;
+import me.neznamy.tab.shared.platform.Scoreboard;
+import me.neznamy.tab.shared.platform.TabList;
+import me.neznamy.tab.shared.platform.TabListEntryTracker;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Implementation provider using direct Mojang-mapped NMS code for paper 1.21.9 - 1.21.10.
+ */
+@Getter
+public class NMSImplementationProvider implements ImplementationProvider {
+
+    @NotNull
+    private final ComponentConverter<?> componentConverter = new NMSComponentConverter();
+    
+    @Override
+    @NotNull
+    public Scoreboard newScoreboard(@NotNull BukkitTabPlayer player) {
+        return new NMSPacketScoreboard(player);
+    }
+
+    @Override
+    @NotNull
+    public TabList newTabList(@NotNull BukkitTabPlayer player) {
+        return new NMSPacketTabList(player);
+    }
+
+    @Override
+    @NotNull
+    public Channel getChannel(@NotNull Player player) {
+        return ((CraftPlayer)player).getHandle().connection.connection.channel;
+    }
+
+    @Override
+    @NotNull
+    public TabListEntryTracker newTabListEntryTracker() {
+        return new NMSTabListEntryTracker();
+    }
+
+    @Override
+    public int getPing(@NotNull BukkitTabPlayer player) {
+        return player.getPlayer().getPing();
+    }
+}
@@ -0,0 +1,176 @@
+package me.neznamy.tab.platforms.bukkit.paper_1_21_9;
+
+import lombok.NonNull;
+import lombok.SneakyThrows;
+import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
+import me.neznamy.tab.shared.TAB;
+import me.neznamy.tab.shared.platform.decorators.SafeScoreboard;
+import me.neznamy.tab.shared.util.ReflectionUtils;
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.numbers.FixedFormat;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.*;
+import net.minecraft.world.scores.PlayerTeam;
+import net.minecraft.world.scores.Scoreboard;
+import net.minecraft.world.scores.criteria.ObjectiveCriteria;
+import net.minecraft.world.scores.criteria.ObjectiveCriteria.RenderType;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.reflect.Field;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Optional;
+
+/**
+ * Scoreboard implementation using direct mojang-mapped code.
+ */
+public class NMSPacketScoreboard extends SafeScoreboard<BukkitTabPlayer> {
+
+    private static final ChatFormatting[] formats = ChatFormatting.values();
+    private static final net.minecraft.world.scores.Team.CollisionRule[] collisions = net.minecraft.world.scores.Team.CollisionRule.values();
+    private static final net.minecraft.world.scores.Team.Visibility[] visibilities = net.minecraft.world.scores.Team.Visibility.values();
+    private static final Scoreboard dummyScoreboard = new Scoreboard();
+    private static final Field players = ReflectionUtils.getOnlyField(ClientboundSetPlayerTeamPacket.class, Collection.class);
+
+    /**
+     * Constructs new instance with given player.
+     *
+     * @param   player
+     *          Player this scoreboard will belong to
+     */
+    public NMSPacketScoreboard(@NotNull BukkitTabPlayer player) {
+        super(player);
+    }
+
+    @Override
+    public void registerObjective(@NonNull Objective objective) {
+        net.minecraft.world.scores.Objective obj = new net.minecraft.world.scores.Objective(
+                dummyScoreboard,
+                objective.getName(),
+                ObjectiveCriteria.DUMMY,
+                objective.getTitle().convert(),
+                RenderType.values()[objective.getHealthDisplay().ordinal()],
+                false,
+                objective.getNumberFormat() == null ? null : objective.getNumberFormat().toFixedFormat(FixedFormat::new)
+        );
+        objective.setPlatformObjective(obj);
+        sendPacket(new ClientboundSetObjectivePacket(obj, ObjectiveAction.REGISTER));
+    }
+
+    @Override
+    public void setDisplaySlot(@NonNull Objective objective) {
+        sendPacket(new ClientboundSetDisplayObjectivePacket(
+                net.minecraft.world.scores.DisplaySlot.values()[objective.getDisplaySlot().ordinal()],
+                (net.minecraft.world.scores.Objective) objective.getPlatformObjective()
+        ));
+    }
+
+    @Override
+    public void unregisterObjective(@NonNull Objective objective) {
+        sendPacket(new ClientboundSetObjectivePacket((net.minecraft.world.scores.Objective) objective.getPlatformObjective(), ObjectiveAction.UNREGISTER));
+    }
+
+    @Override
+    public void updateObjective(@NonNull Objective objective) {
+        net.minecraft.world.scores.Objective obj = (net.minecraft.world.scores.Objective) objective.getPlatformObjective();
+        obj.setDisplayName(objective.getTitle().convert());
+        obj.setRenderType(RenderType.values()[objective.getHealthDisplay().ordinal()]);
+        sendPacket(new ClientboundSetObjectivePacket(obj, ObjectiveAction.UPDATE));
+    }
+
+    @Override
+    public void setScore(@NonNull Score score) {
+        sendPacket(new ClientboundSetScorePacket(
+                score.getHolder(),
+                score.getObjective().getName(),
+                score.getValue(),
+                Optional.ofNullable(score.getDisplayName() == null ? null : score.getDisplayName().convert()),
+                Optional.ofNullable(score.getNumberFormat() == null ? null : score.getNumberFormat().toFixedFormat(FixedFormat::new))
+        ));
+    }
+
+    @Override
+    public void removeScore(@NonNull Score score) {
+        sendPacket(new ClientboundResetScorePacket(score.getHolder(), score.getObjective().getName()));
+    }
+
+    @Override
+    @NotNull
+    public Object createTeam(@NonNull String name) {
+        return new PlayerTeam(dummyScoreboard, name);
+    }
+
+    @Override
+    public void registerTeam(@NonNull Team team) {
+        updateTeamProperties(team);
+        PlayerTeam t = (PlayerTeam) team.getPlatformTeam();
+        t.getPlayers().addAll(team.getPlayers());
+        sendPacket(ClientboundSetPlayerTeamPacket.createAddOrModifyPacket(t, true));
+    }
+
+    @Override
+    public void unregisterTeam(@NonNull Team team) {
+        sendPacket(ClientboundSetPlayerTeamPacket.createRemovePacket((PlayerTeam) team.getPlatformTeam()));
+    }
+
+    @Override
+    public void updateTeam(@NonNull Team team) {
+        updateTeamProperties(team);
+        sendPacket(ClientboundSetPlayerTeamPacket.createAddOrModifyPacket((PlayerTeam) team.getPlatformTeam(), false));
+    }
+
+    private void updateTeamProperties(@NonNull Team team) {
+        PlayerTeam t = (PlayerTeam) team.getPlatformTeam();
+        t.setAllowFriendlyFire((team.getOptions() & 0x01) != 0);
+        t.setSeeFriendlyInvisibles((team.getOptions() & 0x02) != 0);
+        t.setColor(formats[team.getColor().ordinal()]);
+        t.setCollisionRule(collisions[team.getCollision().ordinal()]);
+        t.setNameTagVisibility(visibilities[team.getVisibility().ordinal()]);
+        t.setPlayerPrefix(team.getPrefix().convert());
+        t.setPlayerSuffix(team.getSuffix().convert());
+    }
+
+    @Override
+    @SneakyThrows
+    @NotNull
+    public Object onPacketSend(@NonNull Object packet) {
+        if (packet instanceof ClientboundSetDisplayObjectivePacket display) {
+            TAB.getInstance().getFeatureManager().onDisplayObjective(player, display.getSlot().ordinal(), display.getObjectiveName());
+        }
+        if (packet instanceof ClientboundSetObjectivePacket objective) {
+            TAB.getInstance().getFeatureManager().onObjective(player, objective.getMethod(), objective.getObjectiveName());
+        }
+        if (packet instanceof ClientboundSetPlayerTeamPacket team) {
+            int action = getMethod(team);
+            if (action != TeamAction.UPDATE) {
+                players.set(team, onTeamPacket(action, team.getName(), team.getPlayers() == null ? Collections.emptyList() : team.getPlayers()));
+            }
+        }
+        return packet;
+    }
+
+    private int getMethod(@NonNull ClientboundSetPlayerTeamPacket team) {
+        if (team.getTeamAction() == ClientboundSetPlayerTeamPacket.Action.ADD) {
+            return 0;
+        } else if (team.getTeamAction() == ClientboundSetPlayerTeamPacket.Action.REMOVE) {
+            return 1;
+        } else if (team.getPlayerAction() == ClientboundSetPlayerTeamPacket.Action.ADD) {
+            return 3;
+        } else if (team.getPlayerAction() == ClientboundSetPlayerTeamPacket.Action.REMOVE) {
+            return 4;
+        } else {
+            return 2;
+        }
+    }
+
+    /**
+     * Sends the packet to the player.
+     *
+     * @param   packet
+     *          Packet to send
+     */
+    private void sendPacket(@NotNull Packet<?> packet) {
+        ((CraftPlayer)player.getPlayer()).getHandle().connection.send(packet);
+    }
+}
@@ -0,0 +1,206 @@
+package me.neznamy.tab.platforms.bukkit.paper_1_21_9;
+
+import com.google.common.collect.ImmutableMultimap;
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.properties.Property;
+import com.mojang.authlib.properties.PropertyMap;
+import lombok.NonNull;
+import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
+import me.neznamy.tab.shared.TAB;
+import me.neznamy.tab.shared.chat.component.TabComponent;
+import me.neznamy.tab.shared.platform.TabList;
+import me.neznamy.tab.shared.platform.decorators.TrackedTabList;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.ClientboundPlayerInfoRemovePacket;
+import net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket;
+import net.minecraft.network.protocol.game.ClientboundTabListPacket;
+import net.minecraft.world.level.GameType;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.*;
+
+/**
+ * TabList implementation using direct mojang-mapped code.
+ */
+public class NMSPacketTabList extends TrackedTabList<BukkitTabPlayer> {
+
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> addPlayer = EnumSet.allOf(ClientboundPlayerInfoUpdatePacket.Action.class);
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> updateDisplayName = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME);
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> updateLatency = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LATENCY);
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> updateGameMode = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE);
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> updateListed = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LISTED);
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> updateListOrder = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LIST_ORDER);
+    private static final EnumSet<ClientboundPlayerInfoUpdatePacket.Action> updateHat = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_HAT);
+
+    /**
+     * Constructs new instance.
+     *
+     * @param   player
+     *          Player this tablist will belong to
+     */
+    public NMSPacketTabList(@NotNull BukkitTabPlayer player) {
+        super(player);
+    }
+
+    @Override
+    public void removeEntry(@NonNull UUID entry) {
+        sendPacket(new ClientboundPlayerInfoRemovePacket(Collections.singletonList(entry)));
+    }
+
+    @Override
+    public void updateDisplayName0(@NonNull UUID entry, @Nullable TabComponent displayName) {
+        sendPacket(updateDisplayName, entry, "", null, false, 0, 0, displayName, 0, false);
+    }
+
+    @Override
+    public void updateLatency(@NonNull UUID entry, int latency) {
+        sendPacket(updateLatency, entry, "", null, false, latency, 0, null, 0, false);
+    }
+
+    @Override
+    public void updateGameMode(@NonNull UUID entry, int gameMode) {
+        sendPacket(updateGameMode, entry, "", null, false, 0, gameMode, null, 0, false);
+    }
+
+    @Override
+    public void updateListed(@NonNull UUID entry, boolean listed) {
+        sendPacket(updateListed, entry, "", null, listed, 0, 0, null, 0, false);
+    }
+
+    @Override
+    public void updateListOrder(@NonNull UUID entry, int listOrder) {
+        sendPacket(updateListOrder, entry, "", null, false, 0, 0, null, listOrder, false);
+    }
+
+    @Override
+    public void updateHat(@NonNull UUID entry, boolean showHat) {
+        sendPacket(updateHat, entry, "", null, false, 0, 0, null, 0, showHat);
+    }
+
+    @Override
+    public void addEntry0(@NonNull Entry entry) {
+        sendPacket(addPlayer, entry.getUniqueId(), entry.getName(), entry.getSkin(), entry.isListed(), entry.getLatency(),
+                entry.getGameMode(), entry.getDisplayName(), entry.getListOrder(), entry.isShowHat());
+    }
+
+    @Override
+    public void setPlayerListHeaderFooter0(@NonNull TabComponent header, @NonNull TabComponent footer) {
+        sendPacket(new ClientboundTabListPacket(header.convert(), footer.convert()));
+    }
+
+    @Override
+    @Nullable
+    public Skin getSkin() {
+        Collection<Property> properties = ((CraftPlayer)player.getPlayer()).getProfile().properties().get(TEXTURES_PROPERTY);
+        if (properties.isEmpty()) return null; // Offline mode
+        Property property = properties.iterator().next();
+        return new Skin(property.value(), property.signature());
+    }
+
+    @Override
+    @NotNull
+    public Object onPacketSend(@NonNull Object packet) {
+        if (packet instanceof ClientboundTabListPacket tablist) {
+            if (header == null || footer == null) return packet;
+            if (tablist.header() != header.convert() || tablist.footer() != footer.convert()) {
+                return new ClientboundTabListPacket(header.convert(), footer.convert());
+            }
+        }
+        if (packet instanceof ClientboundPlayerInfoUpdatePacket info) {
+            EnumSet<ClientboundPlayerInfoUpdatePacket.Action> actions = info.actions();
+            List<ClientboundPlayerInfoUpdatePacket.Entry> updatedList = new ArrayList<>();
+            boolean rewritePacket = false;
+            for (ClientboundPlayerInfoUpdatePacket.Entry nmsData : info.entries()) {
+                boolean rewriteEntry = false;
+                Component displayName = nmsData.displayName();
+                int latency = nmsData.latency();
+                int gameMode = nmsData.gameMode().getId();
+                boolean listed = nmsData.listed();
+                if (actions.contains(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME)) {
+                    TabComponent forcedDisplayName = getForcedDisplayNames().get(nmsData.profileId());
+                    if (forcedDisplayName != null && forcedDisplayName.convert() != displayName) {
+                        displayName = forcedDisplayName.convert();
+                        rewriteEntry = rewritePacket = true;
+                    }
+                }
+                if (actions.contains(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE)) {
+                    if (getBlockedSpectators().contains(nmsData.profileId()) && gameMode == 3) {
+                        gameMode = 0;
+                        rewriteEntry = rewritePacket = true;
+                    }
+                }
+                if (actions.contains(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LATENCY)) {
+                    if (getForcedLatency() != null) {
+                        latency = getForcedLatency();
+                        rewriteEntry = rewritePacket = true;
+                    }
+                }
+                if (actions.contains(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LISTED)) {
+                    if (allPlayersHidden && nmsData.profileId().getMostSignificantBits() != 0) { // Filter out layout entries
+                        listed = false;
+                        rewriteEntry = rewritePacket = true;
+                    }
+                }
+                if (actions.contains(ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER)) {
+                    TAB.getInstance().getFeatureManager().onEntryAdd(player, nmsData.profileId(), nmsData.profile().name());
+                }
+                updatedList.add(rewriteEntry ? new ClientboundPlayerInfoUpdatePacket.Entry(
+                        nmsData.profileId(), nmsData.profile(), listed, latency, GameType.byId(gameMode), displayName,
+                        nmsData.showHat(), nmsData.listOrder(), nmsData.chatSession()
+                ) : nmsData);
+            }
+            if (rewritePacket) return new ClientboundPlayerInfoUpdatePacket(actions, updatedList);
+        }
+        return packet;
+    }
+
+    private void sendPacket(@NonNull EnumSet<ClientboundPlayerInfoUpdatePacket.Action> action, @NonNull UUID id, @NonNull String name, @Nullable Skin skin,
+                            boolean listed, int latency, int gameMode, @Nullable TabComponent displayName, int listOrder, boolean showHat) {
+        ClientboundPlayerInfoUpdatePacket packet = new ClientboundPlayerInfoUpdatePacket(action, new ClientboundPlayerInfoUpdatePacket.Entry(
+                id,
+                action.contains(ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER) ? createProfile(id, name, skin) : null,
+                listed,
+                latency,
+                GameType.byId(gameMode),
+                displayName == null ? null : displayName.convert(),
+                showHat,
+                listOrder,
+                null
+        ));
+        sendPacket(packet);
+    }
+
+    /**
+     * Creates GameProfile from given parameters.
+     *
+     * @param   id
+     *          Profile ID
+     * @param   name
+     *          Profile name
+     * @param   skin
+     *          Player skin
+     * @return  GameProfile from given parameters
+     */
+    @NotNull
+    private GameProfile createProfile(@NonNull UUID id, @NonNull String name, @Nullable Skin skin) {
+        ImmutableMultimap.Builder<String, Property> builder = ImmutableMultimap.builder();
+        if (skin != null) {
+            builder.put(TabList.TEXTURES_PROPERTY,
+                    new Property(TabList.TEXTURES_PROPERTY, skin.getValue(), skin.getSignature()));
+        }
+        return new GameProfile(id, name, new PropertyMap(builder.build()));
+    }
+
+    /**
+     * Sends the packet to the player.
+     *
+     * @param   packet
+     *          Packet to send
+     */
+    private void sendPacket(@NotNull Packet<?> packet) {
+        ((CraftPlayer)player.getPlayer()).getHandle().connection.send(packet);
+    }
+}
@@ -0,0 +1,30 @@
+package me.neznamy.tab.platforms.bukkit.paper_1_21_9;
+
+import me.neznamy.tab.shared.platform.TabListEntryTracker;
+import net.minecraft.network.protocol.game.ClientboundPlayerInfoRemovePacket;
+import net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
+
+/**
+ * Implementation of TabListEntryTracker.
+ */
+public class NMSTabListEntryTracker extends TabListEntryTracker {
+
+    @Override
+    public void onPacketSend(@NotNull Object packet) {
+        if (packet instanceof ClientboundPlayerInfoRemovePacket remove) {
+            for (UUID id : remove.profileIds()) {
+                tablistEntries.remove(id);
+            }
+        }
+        if (packet instanceof ClientboundPlayerInfoUpdatePacket update) {
+            if (update.actions().contains(ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER)) {
+                for (ClientboundPlayerInfoUpdatePacket.Entry nmsData : update.entries()) {
+                    tablistEntries.add(nmsData.profileId());
+                }
+            }
+        }
+    }
+}
@@ -1,5 +1,6 @@
 package me.neznamy.tab.platforms.bukkit;

+import lombok.RequiredArgsConstructor;
 import me.neznamy.tab.platforms.bukkit.platform.BukkitPlatform;
 import me.neznamy.tab.shared.TAB;
 import me.neznamy.tab.shared.platform.EventListener;
@@ -9,7 +10,6 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerChangedWorldEvent;
-import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.jetbrains.annotations.NotNull;
@@ -17,8 +17,12 @@ import org.jetbrains.annotations.NotNull;
 /**
 * The core for bukkit forwarding events into all enabled features
 */
+@RequiredArgsConstructor
 public class BukkitEventListener implements EventListener<Player>, Listener {

+    /** Platform reference */
+    private final BukkitPlatform platform;
+
    /**
     * Listens to player quit event.
     *
@@ -38,6 +42,11 @@ public class BukkitEventListener implements EventListener<Player>, Listener {
     */
    @EventHandler(priority = EventPriority.LOW)
    public void onJoin(PlayerJoinEvent e) {
+        TAB.getInstance().addTablistTracker(
+                e.getPlayer().getUniqueId(),
+                platform.getImplementationProvider().getChannel(e.getPlayer()),
+                platform.getImplementationProvider().newTabListEntryTracker()
+        );
        join(e.getPlayer());
    }

@@ -52,20 +61,9 @@ public class BukkitEventListener implements EventListener<Player>, Listener {
        worldChange(e.getPlayer().getUniqueId(), e.getPlayer().getWorld().getName());
    }

-    /**
-     * Listens to command event to potentially cancel it.
-     *
-     * @param   e
-     *          Command event
-     */
-    @EventHandler
-    public void onCommand(PlayerCommandPreprocessEvent e) {
-        if (command(e.getPlayer().getUniqueId(), e.getMessage())) e.setCancelled(true);
-    }
-
    @Override
    @NotNull
    public TabPlayer createPlayer(@NotNull Player player) {
-        return new BukkitTabPlayer((BukkitPlatform) TAB.getInstance().getPlatform(), player);
+        return new BukkitTabPlayer(platform, player);
    }
 }
@@ -1,26 +1,16 @@
 package me.neznamy.tab.platforms.bukkit;

 import io.netty.channel.Channel;
-import lombok.SneakyThrows;
-import me.neznamy.tab.platforms.bukkit.nms.BukkitReflection;
+import me.neznamy.tab.platforms.bukkit.platform.BukkitPlatform;
 import me.neznamy.tab.shared.features.injection.NettyPipelineInjector;
 import me.neznamy.tab.shared.platform.TabPlayer;
-import me.neznamy.tab.shared.util.FunctionWithException;
-import me.neznamy.tab.shared.util.ReflectionUtils;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;

 /**
 * Pipeline injection for Bukkit 1.8+.
 */
 public class BukkitPipelineInjector extends NettyPipelineInjector {

-    /** Function for getting player's channel */
-    private static FunctionWithException<TabPlayer, Channel> getChannel;
-
    /**
     * Constructs new instance
     */
@@ -28,48 +18,9 @@ public class BukkitPipelineInjector extends NettyPipelineInjector {
        super("packet_handler");
    }

-    /**
-     * Attempts to load required classes, fields and methods and marks class as available.
-     * If something fails, error message is printed and class is not marked as available.
-     */
-    public static void tryLoad() {
-        try {
-            Class<?> NetworkManager = BukkitReflection.getClass("network.Connection", "network.NetworkManager", "NetworkManager");
-            Class<?> PlayerConnection = BukkitReflection.getClass("server.network.ServerGamePacketListenerImpl",
-                    "server.network.PlayerConnection", "PlayerConnection");
-            Class<?> EntityPlayer = BukkitReflection.getClass("server.level.ServerPlayer", "server.level.EntityPlayer", "EntityPlayer");
-            Method getHandle = BukkitReflection.getBukkitClass("entity.CraftPlayer").getMethod("getHandle");
-            Field PLAYER_CONNECTION = ReflectionUtils.getOnlyField(EntityPlayer, PlayerConnection);
-            Field NETWORK_MANAGER;
-            if (BukkitReflection.is1_20_2Plus()) {
-                NETWORK_MANAGER = ReflectionUtils.getOnlyField(PlayerConnection.getSuperclass(), NetworkManager);
-            } else {
-                NETWORK_MANAGER = ReflectionUtils.getOnlyField(PlayerConnection, NetworkManager);
-            }
-            Field CHANNEL = ReflectionUtils.getOnlyField(NetworkManager, Channel.class);
-            getChannel = player -> (Channel) CHANNEL.get(NETWORK_MANAGER.get(PLAYER_CONNECTION.get(getHandle.invoke(player.getPlayer()))));
-        } catch (Exception e) {
-            BukkitUtils.compatibilityError(e, "network channel injection", null,
-                    "Unlimited nametag mode not working and being replaced with regular nametags",
-                    "Anti-override for tablist & nametags not working",
-                    "Compatibility with nickname plugins changing player names will not work",
-                    "Scoreboard will not be checking for other plugins");
-        }
-    }
-
-    /**
-     * Returns {@code true} if pipeline injection is available, {@code false} if not.
-     *
-     * @return  {@code true} if pipeline injection is available, {@code false} if not
-     */
-    public static boolean isAvailable() {
-        return getChannel != null;
-    }
-
    @Override
-    @Nullable
-    @SneakyThrows
+    @NotNull
    protected Channel getChannel(@NotNull TabPlayer player) {
-        return getChannel.apply(player);
+        return ((BukkitPlatform)player.getPlatform()).getImplementationProvider().getChannel(((BukkitTabPlayer) player).getPlayer());
    }
 }
@@ -4,6 +4,7 @@ import me.neznamy.tab.platforms.bukkit.platform.BukkitPlatform;
 import me.neznamy.tab.platforms.bukkit.platform.FoliaPlatform;
 import me.neznamy.tab.shared.TAB;
 import me.neznamy.tab.shared.util.ReflectionUtils;
+import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;

 /**
@@ -14,11 +15,22 @@ public class BukkitTAB extends JavaPlugin {
    @Override
    public void onEnable() {
        boolean folia = ReflectionUtils.classExists("io.papermc.paper.threadedregions.RegionizedServer");
-        TAB.create(folia ? new FoliaPlatform(this) : new BukkitPlatform(this));
+        try {
+            TAB.create(folia ? new FoliaPlatform(this) : new BukkitPlatform(this));
+        } catch (IllegalStateException e) {
+            Bukkit.getConsoleSender().sendMessage("§c[TAB] ================================================================================");
+            Bukkit.getConsoleSender().sendMessage("§c[TAB] Your server version (" + Bukkit.getBukkitVersion().split("-")[0] + ") is not supported.");
+            Bukkit.getConsoleSender().sendMessage("§c[TAB] This jar only supports 1.7.10, 1.8.8, 1.9.4 - 1.15.x, 1.16.5, 1.17.1, 1.18.2 - 1.21.11.");
+            Bukkit.getConsoleSender().sendMessage("§c[TAB] If you just updated to a new Minecraft version, check for TAB updates.");
+            Bukkit.getConsoleSender().sendMessage("§c[TAB] If you are using an unsupported 1.x version, use an older version of TAB (latest TAB 5.x supports all MC 1.x versions).");
+            Bukkit.getConsoleSender().sendMessage("§c[TAB] Thrown error message: " + e.getMessage());
+            Bukkit.getConsoleSender().sendMessage("§c[TAB] ================================================================================");
+        }
    }

    @Override
    public void onDisable() {
+        if (TAB.getInstance() == null) return;
        TAB.getInstance().unload();
    }
 }
@@ -1,8 +1,9 @@
 package me.neznamy.tab.platforms.bukkit;

+import me.neznamy.tab.platforms.bukkit.platform.BukkitPlatform;
 import me.neznamy.tab.shared.TAB;
 import me.neznamy.tab.shared.TabConstants;
-import me.neznamy.tab.shared.chat.EnumChatFormat;
+import me.neznamy.tab.shared.chat.component.TabComponent;
 import me.neznamy.tab.shared.platform.TabPlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -22,8 +23,8 @@ public class BukkitTabCommand implements CommandExecutor, TabCompleter {
    @Override
    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
        if (TAB.getInstance().isPluginDisabled()) {
-            for (String message : TAB.getInstance().getDisabledCommand().execute(args, sender.hasPermission(TabConstants.Permission.COMMAND_RELOAD), sender.hasPermission(TabConstants.Permission.COMMAND_ALL))) {
-                sender.sendMessage(EnumChatFormat.color(message));
+            for (TabComponent message : TAB.getInstance().getDisabledCommand().execute(args, sender.hasPermission(TabConstants.Permission.COMMAND_RELOAD), sender.hasPermission(TabConstants.Permission.COMMAND_ALL))) {
+                sender.sendMessage(((BukkitPlatform)TAB.getInstance().getPlatform()).toBukkitFormat(message));
            }
        } else {
            TabPlayer p = null;
@@ -1,45 +1,21 @@
 package me.neznamy.tab.platforms.bukkit;

-import lombok.Getter;
-import me.neznamy.tab.platforms.bukkit.bossbar.BossBarLoader;
 import me.neznamy.tab.platforms.bukkit.hook.LibsDisguisesHook;
-import me.neznamy.tab.platforms.bukkit.entity.PacketEntityView;
-import me.neznamy.tab.platforms.bukkit.nms.PingRetriever;
 import me.neznamy.tab.platforms.bukkit.platform.BukkitPlatform;
-import me.neznamy.tab.platforms.bukkit.scoreboard.ScoreboardLoader;
-import me.neznamy.tab.platforms.bukkit.tablist.TabListBase;
-import me.neznamy.tab.shared.backend.entityview.DummyEntityView;
-import me.neznamy.tab.shared.backend.entityview.EntityView;
-import me.neznamy.tab.shared.platform.BossBar;
-import me.neznamy.tab.shared.chat.TabComponent;
-import me.neznamy.tab.shared.platform.TabList;
-import me.neznamy.tab.shared.platform.Scoreboard;
 import me.neznamy.tab.shared.backend.BackendTabPlayer;
+import me.neznamy.tab.shared.chat.component.TabComponent;
+import org.bukkit.Statistic;
 import org.bukkit.entity.Player;
 import org.bukkit.metadata.MetadataValue;
 import org.bukkit.potion.PotionEffectType;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;

 /**
 * TabPlayer implementation for Bukkit platform
 */
@SuppressWarnings("deprecation")
-@Getter
 public class BukkitTabPlayer extends BackendTabPlayer {

-    @NotNull
-    private final Scoreboard<BukkitTabPlayer, ?> scoreboard = ScoreboardLoader.getInstance().apply(this);
-
-    @NotNull
-    private final TabListBase<?> tabList = TabListBase.getInstance().apply(this);
-
-    @NotNull
-    private final BossBar bossBar = BossBarLoader.findInstance(this);
-
-    @NotNull
-    private final EntityView entityView = PacketEntityView.isAvailable() ? new PacketEntityView(this) : new DummyEntityView();
-
    /**
     * Constructs new instance with given bukkit player
     *
@@ -59,12 +35,12 @@ public class BukkitTabPlayer extends BackendTabPlayer {

    @Override
    public int getPing() {
-        return PingRetriever.getPing(getPlayer());
+        return getPlatform().getImplementationProvider().getPing(this);
    }

    @Override
    public void sendMessage(@NotNull TabComponent message) {
-        getPlayer().sendMessage(getPlatform().toBukkitFormat(message, getVersion().supportsRGB()));
+        getPlayer().sendMessage(getPlatform().toBukkitFormat(message));
    }

    @Override
@@ -77,12 +53,6 @@ public class BukkitTabPlayer extends BackendTabPlayer {
        return LibsDisguisesHook.isDisguised(this);
    }

-    @Override
-    @Nullable
-    public TabList.Skin getSkin() {
-        return tabList.getSkin();
-    }
-
    @Override
    @NotNull
    public Player getPlayer() {
@@ -95,13 +65,18 @@ public class BukkitTabPlayer extends BackendTabPlayer {
    }

    @Override
-    public boolean isVanished() {
+    public boolean isVanished0() {
        for (MetadataValue v : getPlayer().getMetadata("vanished")) {
            if (v.asBoolean()) return true;
        }
        return false;
    }

+    @Override
+    public int getDeaths() {
+        return getPlayer().getStatistic(Statistic.DEATHS);
+    }
+
    @Override
    public int getGamemode() {
        return getPlayer().getGameMode().getValue();
@@ -1,88 +0,0 @@
-package me.neznamy.tab.platforms.bukkit;
-
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import lombok.SneakyThrows;
-import me.neznamy.tab.shared.ProtocolVersion;
-import me.neznamy.tab.shared.chat.EnumChatFormat;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Collection;
-
-/**
- * Class containing static util methods used on Bukkit.
- */
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public class BukkitUtils {
-
-    /** Whether compatibility exceptions should be printed or not, enabling when adding support for new versions */
-    public static final boolean PRINT_EXCEPTIONS = false;
-
-    private static boolean compatibilityIssue;
-
-    /**
-     * Returns online players from Bukkit API. This requires reflection, as return type changed in 1.8,
-     * and we want to avoid errors.
-     *
-     * @return  Online players from Bukkit API.
-     */
-    @SuppressWarnings("unchecked")
-    @SneakyThrows
-    @NotNull
-    public static Player[] getOnlinePlayers() {
-        Object players = Bukkit.class.getMethod("getOnlinePlayers").invoke(null);
-        if (players instanceof Player[]) {
-            //1.7-
-            return (Player[]) players;
-        } else {
-            //1.8+
-            return ((Collection<Player>)players).toArray(new Player[0]);
-        }
-    }
-
-    /**
-     * Prints a console warn that some compatibility issue was found.
-     *
-     * @param   exception
-     *          Exception thrown when initializing fields, if applicable
-     * @param   failedCheck
-     *          Check that failed
-     * @param   fallback
-     *          Fallback implementation, if available
-     * @param   missingFeatures
-     *          Features that will be broken because of the incompatibility
-     */
-    public static void compatibilityError(@NotNull Exception exception, @NotNull String failedCheck,
-                                          @Nullable String fallback, @NotNull String... missingFeatures) {
-        StringBuilder sb = new StringBuilder();
-        sb.append(EnumChatFormat.RED);
-        sb.append("[TAB] Failed to initialize minecraft fields for ");
-        sb.append(failedCheck);
-        sb.append(" due to a compatibility error. ");
-        if (fallback != null) {
-            sb.append("Using fallback solution using ").append(fallback).append(". ");
-        } else {
-            sb.append("No fallback solution was found. ");
-        }
-        if (missingFeatures.length > 0) sb.append("This will result in: ");
-        for (int i=0; i<missingFeatures.length; i++) {
-            sb.append("\n").append("#").append(i + 1).append(": ").append(missingFeatures[i]);
-        }
-        Bukkit.getConsoleSender().sendMessage(sb.toString());
-        if (PRINT_EXCEPTIONS) exception.printStackTrace();
-        compatibilityIssue = true;
-    }
-
-    /**
-     * Sends a message asking user to update the plugin if some compatibility issue was found.
-     */
-    public static void sendCompatibilityMessage() {
-        if (!compatibilityIssue) return;
-        Bukkit.getConsoleSender().sendMessage(EnumChatFormat.RED + "[TAB] Please update the plugin to " +
-                "a version with native support for your server version for optimal experience. This plugin version " +
-                "was made for " + ProtocolVersion.V1_5.getFriendlyName() + " - " + ProtocolVersion.LATEST_KNOWN_VERSION.getFriendlyName() + ".");
-    }
-}
@@ -1,31 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.bossbar;
-
-import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
-import me.neznamy.tab.platforms.bukkit.nms.BukkitReflection;
-import me.neznamy.tab.shared.platform.BossBar;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Class for finding BossBar implementation based on server and client version.
- */
-public class BossBarLoader {
-
-    /**
-     * Finds best available instance for given player.
-     *
-     * @param   player
-     *          Player to find instance for
-     * @return  BossBar instance for player
-     */
-    @NotNull
-    public static BossBar findInstance(@NotNull BukkitTabPlayer player) {
-        // 1.9+ server, handle using API, potential 1.8 players are handled by ViaVersion
-        if (BukkitReflection.getMinorVersion() >= 9) return new BukkitBossBar(player);
-
-        // 1.9+ player on 1.8 server, handle using ViaVersion API
-        if (player.getVersion().getMinorVersion() >= 9) return new ViaBossBar(player);
-
-        // 1.8- server and player, use wither
-        return new EntityBossBar(player);
-    }
-}
@@ -1,16 +1,17 @@
 package me.neznamy.tab.platforms.bukkit.bossbar;

+import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import me.neznamy.tab.shared.chat.component.TabComponent;
 import me.neznamy.tab.api.bossbar.BarColor;
 import me.neznamy.tab.api.bossbar.BarStyle;
-import me.neznamy.tab.shared.chat.TabComponent;
-import me.neznamy.tab.shared.platform.BossBar;
 import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
+import me.neznamy.tab.shared.platform.decorators.SafeBossBar;
+import me.neznamy.tab.shared.util.ReflectionUtils;
 import org.bukkit.Bukkit;
+import org.bukkit.boss.BossBar;
 import org.jetbrains.annotations.NotNull;

-import java.util.HashMap;
-import java.util.Map;
 import java.util.UUID;

 /**
@@ -18,54 +19,58 @@ import java.util.UUID;
 * to allow 1.8 players, it will handle the entity and teleporting by itself.
 */
@RequiredArgsConstructor
-public class BukkitBossBar implements BossBar {
+public class BukkitBossBar extends SafeBossBar<BossBar> {
+
+    /** Flag indicating whether this class is available or not */
+    @Getter
+    private static final boolean available = ReflectionUtils.classExists("org.bukkit.boss.BossBar");
+
+    /** Style array because names do not match */
+    private static final org.bukkit.boss.BarStyle[] styles = available ? org.bukkit.boss.BarStyle.values() : null;

-    /** Style array for fast access */
-    private static final org.bukkit.boss.BarStyle[] styles = org.bukkit.boss.BarStyle.values();
-    
    /** Player this handler belongs to */
    @NotNull
    private final BukkitTabPlayer player;

-    /** Bukkit BossBars the player can currently see */
-    @NotNull
-    private final Map<UUID, org.bukkit.boss.BossBar> bossBars = new HashMap<>();
-
    @Override
-    public void create(@NotNull UUID id, @NotNull String title, float progress, @NotNull BarColor color, @NotNull BarStyle style) {
-        if (bossBars.containsKey(id)) return;
-        org.bukkit.boss.BossBar bar = Bukkit.createBossBar(
-                player.getPlatform().toBukkitFormat(TabComponent.optimized(title), player.getVersion().supportsRGB()),
+    @NotNull
+    public BossBar constructBossBar(@NotNull UUID id, @NotNull TabComponent title, float progress, @NotNull BarColor color, @NotNull BarStyle style) {
+        BossBar bar = Bukkit.createBossBar(
+                player.getPlatform().toBukkitFormat(title),
                org.bukkit.boss.BarColor.valueOf(color.name()),
                styles[style.ordinal()]
        );
        bar.setProgress(progress);
-        bar.addPlayer(player.getPlayer());
-        bossBars.put(id, bar);
+        return bar;
    }

    @Override
-    public void update(@NotNull UUID id, @NotNull String title) {
-        bossBars.get(id).setTitle(player.getPlatform().toBukkitFormat(TabComponent.optimized(title), player.getVersion().supportsRGB()));
+    public void show(SafeBossBar<BossBar>.@NotNull BossBarInfo bar) {
+        bar.getBossBar().addPlayer(player.getPlayer());
    }

    @Override
-    public void update(@NotNull UUID id, float progress) {
-        bossBars.get(id).setProgress(progress);
+    public void updateTitle(SafeBossBar<BossBar>.@NotNull BossBarInfo bar) {
+        bar.getBossBar().setTitle(player.getPlatform().toBukkitFormat(bar.getTitle()));
    }

    @Override
-    public void update(@NotNull UUID id, @NotNull BarStyle style) {
-        bossBars.get(id).setStyle(styles[style.ordinal()]);
+    public void updateProgress(SafeBossBar<BossBar>.@NotNull BossBarInfo bar) {
+        bar.getBossBar().setProgress(bar.getProgress());
    }

    @Override
-    public void update(@NotNull UUID id, @NotNull BarColor color) {
-        bossBars.get(id).setColor(org.bukkit.boss.BarColor.valueOf(color.name()));
+    public void updateStyle(SafeBossBar<BossBar>.@NotNull BossBarInfo bar) {
+        bar.getBossBar().setStyle(styles[bar.getStyle().ordinal()]);
    }

    @Override
-    public void remove(@NotNull UUID id) {
-        bossBars.remove(id).removePlayer(player.getPlayer());
+    public void updateColor(SafeBossBar<BossBar>.@NotNull BossBarInfo bar) {
+        bar.getBossBar().setColor(org.bukkit.boss.BarColor.valueOf(bar.getColor().name()));
+    }
+
+    @Override
+    public void hide(SafeBossBar<BossBar>.@NotNull BossBarInfo bar) {
+        bar.getBossBar().removePlayer(player.getPlayer());
    }
 }
@@ -1,74 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.bossbar;
-
-import lombok.RequiredArgsConstructor;
-import me.neznamy.tab.shared.platform.BossBar;
-import me.neznamy.tab.api.bossbar.BarColor;
-import me.neznamy.tab.api.bossbar.BarStyle;
-import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
-import me.neznamy.tab.platforms.bukkit.entity.DataWatcher;
-import me.neznamy.tab.shared.backend.Location;
-import org.bukkit.entity.EntityType;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.UUID;
-
-/**
- * BossBar using wither entity for <1.9 players on <1.9 servers.
- * Additional logic, such as teleporting the entity must be done
- * separately, as this class does not handle it.
- */
-@RequiredArgsConstructor
-public class EntityBossBar implements BossBar {
-
-    /** Max health of wither */
-    private static final int WITHER_MAX_HEALTH = 300;
-
-    /** Ideal value for invulnerable time for minimal wither size */
-    private static final int IDEAL_INVULNERABLE_TIME = 880;
-
-    /** Flag making entity invisible */
-    private static final byte INVISIBLE_FLAG = 1 << 5;
-
-    /** Player this handler belongs to */
-    @NotNull
-    private final BukkitTabPlayer player;
-
-    @Override
-    public void create(@NotNull UUID id, @NotNull String title, float progress, @NotNull BarColor color, @NotNull BarStyle style) {
-        DataWatcher w = new DataWatcher();
-        float health = WITHER_MAX_HEALTH*progress;
-        if (health == 0) health = 1;
-        w.setHealth(health);
-        w.setCustomName(title, player.getVersion());
-        w.setEntityFlags(INVISIBLE_FLAG);
-        w.setWitherInvulnerableTime(IDEAL_INVULNERABLE_TIME);
-        player.getEntityView().spawnEntity(id.hashCode(), new UUID(0, 0), EntityType.WITHER, new Location(0, 0, 0), w);
-    }
-
-    @Override
-    public void update(@NotNull UUID id, @NotNull String title) {
-        DataWatcher w = new DataWatcher();
-        w.setCustomName(title, player.getVersion());
-        player.getEntityView().updateEntityMetadata(id.hashCode(), w);
-    }
-
-    @Override
-    public void update(@NotNull UUID id, float progress) {
-        DataWatcher w = new DataWatcher();
-        float health = WITHER_MAX_HEALTH*progress;
-        if (health == 0) health = 1;
-        w.setHealth(health);
-        player.getEntityView().updateEntityMetadata(id.hashCode(), w);
-    }
-
-    @Override
-    public void update(@NotNull UUID id, @NotNull BarStyle style) {/*Added in 1.9*/}
-
-    @Override
-    public void update(@NotNull UUID id, @NotNull BarColor color) {/*Added in 1.9*/}
-
-    @Override
-    public void remove(@NotNull UUID id) {
-        player.getEntityView().destroyEntities(id.hashCode());
-    }
-}
@@ -1,25 +1,24 @@
 package me.neznamy.tab.platforms.bukkit.bossbar;

 import com.viaversion.viaversion.api.Via;
+import com.viaversion.viaversion.api.legacy.bossbar.BossBar;
 import com.viaversion.viaversion.api.legacy.bossbar.BossColor;
 import com.viaversion.viaversion.api.legacy.bossbar.BossStyle;
 import lombok.RequiredArgsConstructor;
-import me.neznamy.tab.shared.chat.TabComponent;
-import me.neznamy.tab.shared.platform.BossBar;
 import me.neznamy.tab.api.bossbar.BarColor;
 import me.neznamy.tab.api.bossbar.BarStyle;
 import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
+import me.neznamy.tab.shared.chat.component.TabComponent;
+import me.neznamy.tab.shared.platform.decorators.SafeBossBar;
 import org.jetbrains.annotations.NotNull;

-import java.util.HashMap;
-import java.util.Map;
 import java.util.UUID;

 /**
 * Handler for 1.9+ players on 1.8 server using ViaVersion API.
 */
@RequiredArgsConstructor
-public class ViaBossBar implements BossBar {
+public class ViaBossBar extends SafeBossBar<BossBar> {

    /** Style array for fast access */
    private static final BossStyle[] styles = BossStyle.values();
@@ -28,45 +27,44 @@ public class ViaBossBar implements BossBar {
    @NotNull
    private final BukkitTabPlayer player;

-    /** ViaVersion BossBars this 1.9+ player can see on 1.8 server */
-    @NotNull
-    private final Map<UUID, com.viaversion.viaversion.api.legacy.bossbar.BossBar> viaBossBars = new HashMap<>();
-
    @Override
-    public void create(@NotNull UUID id, @NotNull String title, float progress, @NotNull BarColor color, @NotNull BarStyle style) {
-        if (viaBossBars.containsKey(id)) return;
-        com.viaversion.viaversion.api.legacy.bossbar.BossBar bar = Via.getAPI().legacyAPI().createLegacyBossBar(
-                TabComponent.optimized(title).toLegacyText(),
+    @NotNull
+    public BossBar constructBossBar(@NotNull UUID id, @NotNull TabComponent title, float progress, @NotNull BarColor color, @NotNull BarStyle style) {
+        return Via.getAPI().legacyAPI().createLegacyBossBar(
+                title.toLegacyText(),
                progress,
                BossColor.valueOf(color.name()),
                styles[style.ordinal()]
        );
-        viaBossBars.put(id, bar);
-        bar.addPlayer(player.getPlayer().getUniqueId());
    }

    @Override
-    public void update(@NotNull UUID id, @NotNull String title) {
-        viaBossBars.get(id).setTitle(TabComponent.optimized(title).toLegacyText());
+    public void show(@NotNull BossBarInfo bar) {
+        bar.getBossBar().addPlayer(player.getPlayer().getUniqueId());
    }

    @Override
-    public void update(@NotNull UUID id, float progress) {
-        viaBossBars.get(id).setHealth(progress);
+    public void updateTitle(@NotNull BossBarInfo bar) {
+        bar.getBossBar().setTitle(bar.getTitle().toLegacyText());
    }

    @Override
-    public void update(@NotNull UUID id, @NotNull BarStyle style) {
-        viaBossBars.get(id).setStyle(styles[style.ordinal()]);
+    public void updateProgress(@NotNull BossBarInfo bar) {
+        bar.getBossBar().setHealth(bar.getProgress());
    }

    @Override
-    public void update(@NotNull UUID id, @NotNull BarColor color) {
-        viaBossBars.get(id).setColor(BossColor.valueOf(color.name()));
+    public void updateStyle(@NotNull BossBarInfo bar) {
+        bar.getBossBar().setStyle(styles[bar.getStyle().ordinal()]);
    }

    @Override
-    public void remove(@NotNull UUID id) {
-        viaBossBars.remove(id).removePlayer(player.getPlayer().getUniqueId());
+    public void updateColor(@NotNull BossBarInfo bar) {
+        bar.getBossBar().setColor(BossColor.valueOf(bar.getColor().name()));
+    }
+
+    @Override
+    public void hide(@NotNull BossBarInfo bar) {
+        bar.getBossBar().removePlayer(player.getPlayer().getUniqueId());
    }
 }
@@ -1,273 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.entity;
-
-import lombok.*;
-import me.neznamy.tab.platforms.bukkit.nms.ComponentConverter;
-import me.neznamy.tab.platforms.bukkit.nms.BukkitReflection;
-import me.neznamy.tab.shared.Limitations;
-import me.neznamy.tab.shared.ProtocolVersion;
-import me.neznamy.tab.shared.backend.EntityData;
-import me.neznamy.tab.shared.chat.TabComponent;
-import me.neznamy.tab.shared.util.ReflectionUtils;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.*;
-
-/**
- * A class representing the n.m.s.DataWatcher class to make work with it much easier
- */
-@ToString
-public class DataWatcher implements EntityData {
-
-    private static Object DataWatcherSerializer_BYTE;
-    private static Object DataWatcherSerializer_FLOAT;
-    private static Object DataWatcherSerializer_STRING;
-    private static Object DataWatcherSerializer_OPTIONAL_COMPONENT;
-    private static Object DataWatcherSerializer_BOOLEAN;
-
-    private static final int armorStandFlagsPosition = EntityData.getArmorStandFlagsPosition(BukkitReflection.getMinorVersion());
-
-    /** 1.19.3+ */
-    private static Constructor<?> newDataWatcher$Item;
-
-    /** 1.19.2- */
-    public static Class<?> DataWatcher;
-    private static Constructor<?> newDataWatcher;
-    private static Method DataWatcher_register;
-    private static Constructor<?> newDataWatcherObject;
-
-    /** Watched data */
-    private final Map<Integer, Item> dataValues = new HashMap<>();
-
-    /**
-     * Loads all required Fields and throws Exception if something went wrong.
-     *
-     * @throws  ReflectiveOperationException
-     *          If something goes wrong
-     */
-    public static void load() throws ReflectiveOperationException {
-        int minorVersion = BukkitReflection.getMinorVersion();
-        if (minorVersion >= 9) {
-            loadSerializers();
-        }
-        if (BukkitReflection.is1_19_3Plus()) {
-            Class<?> dataWatcher$Item = BukkitReflection.getClass("network.syncher.SynchedEntityData$DataValue", "network.syncher.DataWatcher$c");
-            Class<?> dataWatcherSerializer = BukkitReflection.getClass("network.syncher.EntityDataSerializer",
-                    "network.syncher.DataWatcherSerializer", "DataWatcherSerializer");
-            newDataWatcher$Item = dataWatcher$Item.getConstructor(int.class, dataWatcherSerializer, Object.class);
-        } else {
-            DataWatcher = BukkitReflection.getClass("network.syncher.SynchedEntityData", "network.syncher.DataWatcher", "DataWatcher");
-            if (minorVersion >= 7) {
-                ComponentConverter.ensureAvailable();
-                newDataWatcher = DataWatcher.getConstructor(BukkitReflection.getClass("world.entity.Entity", "Entity"));
-            } else {
-                newDataWatcher = DataWatcher.getConstructor();
-            }
-            if (minorVersion >= 9) {
-                Class<?> dataWatcherObject = BukkitReflection.getClass("network.syncher.EntityDataAccessor",
-                        "network.syncher.DataWatcherObject", "DataWatcherObject");
-                Class<?> dataWatcherSerializer = BukkitReflection.getClass("network.syncher.EntityDataSerializer",
-                        "network.syncher.DataWatcherSerializer", "DataWatcherSerializer");
-                DataWatcher_register = ReflectionUtils.getMethod(
-                        DataWatcher,
-                        new String[]{"define", "register", "a", "m_135372_"}, // {Mojang, Bukkit, Bukkit 1.18+, Mohist 1.18.2}
-                        dataWatcherObject, Object.class
-                );
-                newDataWatcherObject = dataWatcherObject.getConstructor(int.class, dataWatcherSerializer);
-            } else {
-                DataWatcher_register = ReflectionUtils.getMethod(
-                        DataWatcher,
-                        new String[]{"func_75682_a", "a"}, int.class, // {Thermos 1.7.10, Bukkit}
-                        Object.class
-                );
-            }
-        }
-    }
-
-    private static void loadSerializers() throws ReflectiveOperationException {
-        Class<?> dataWatcherRegistry = BukkitReflection.getClass("network.syncher.EntityDataSerializers",
-                "network.syncher.DataWatcherRegistry", "DataWatcherRegistry");
-        DataWatcherSerializer_BYTE = ReflectionUtils.getField(dataWatcherRegistry, "BYTE", "a", "f_135027_").get(null); // Mohist 1.18.2
-        DataWatcherSerializer_FLOAT = ReflectionUtils.getField(dataWatcherRegistry, "FLOAT", "c", "f_135029_").get(null); // Mohist 1.18.2
-        DataWatcherSerializer_STRING = ReflectionUtils.getField(dataWatcherRegistry, "STRING", "d", "f_135030_").get(null); // Mohist 1.18.2
-        if (BukkitReflection.is1_19_3Plus()) {
-            DataWatcherSerializer_OPTIONAL_COMPONENT = ReflectionUtils.getField(dataWatcherRegistry, "OPTIONAL_COMPONENT", "g").get(null);
-            if (BukkitReflection.is1_19_4Plus()) {
-                DataWatcherSerializer_BOOLEAN = ReflectionUtils.getField(dataWatcherRegistry, "BOOLEAN", "k").get(null);
-            } else {
-                DataWatcherSerializer_BOOLEAN = ReflectionUtils.getField(dataWatcherRegistry, "BOOLEAN", "j").get(null);
-            }
-        } else {
-            if (BukkitReflection.getMinorVersion() >= 13) {
-                DataWatcherSerializer_OPTIONAL_COMPONENT = ReflectionUtils.getField(dataWatcherRegistry,
-                        "OPTIONAL_COMPONENT", "f", "f_135032_").get(null); // Mohist 1.18.2
-                DataWatcherSerializer_BOOLEAN = ReflectionUtils.getField(dataWatcherRegistry,
-                        "BOOLEAN", "i", "f_135035_").get(null); // Mohist 1.18.2
-            } else {
-                DataWatcherSerializer_BOOLEAN = dataWatcherRegistry.getDeclaredField("h").get(null);
-            }
-        }
-    }
-    
-    /**
-     * Sets value into data values
-     *
-     * @param   position
-     *          data position
-     * @param   serializer
-     *          Object serializer (1.9+)
-     * @param   value
-     *          value
-     */
-    public void setValue(int position, @Nullable Object serializer, @NotNull Object value) {
-        dataValues.put(position, new Item(position, serializer, value));
-    }
-
-    /**
-     * Writes entity byte flags
-     *
-     * @param   flags
-     *          flags to write
-     */
-    public void setEntityFlags(byte flags) {
-        setValue(0, DataWatcherSerializer_BYTE, flags);
-    }
-
-    /**
-     * Writes entity custom name with position based on server version and value depending on client version (RGB or not)
-     *
-     * @param   customName
-     *          target custom name
-     * @param   clientVersion
-     *          client version
-     */
-    public void setCustomName(@NotNull String customName, @NotNull ProtocolVersion clientVersion) {
-        if (BukkitReflection.getMinorVersion() >= 13) {
-            setValue(2, DataWatcherSerializer_OPTIONAL_COMPONENT, Optional.of(TabComponent.optimized(customName).convert(clientVersion)));
-        } else if (BukkitReflection.getMinorVersion() >= 8) {
-            setValue(2, DataWatcherSerializer_STRING, customName);
-        } else {
-            //name length is limited to 64 characters on <1.8
-            String cutName = (customName.length() > Limitations.BOSSBAR_NAME_LENGTH_1_7 ?
-                    customName.substring(0, Limitations.BOSSBAR_NAME_LENGTH_1_7) : customName);
-            if (BukkitReflection.getMinorVersion() >= 6) {
-                setValue(10, null, cutName);
-            } else {
-                setValue(5, null, cutName);
-            }
-        }
-    }
-
-    /**
-     * Writes custom name visibility boolean
-     *
-     * @param   visible
-     *          if visible or not
-     */
-    public void setCustomNameVisible(boolean visible) {
-        if (BukkitReflection.getMinorVersion() >= 9) {
-            setValue(3, DataWatcherSerializer_BOOLEAN, visible);
-        } else {
-            setValue(3, null, (byte)(visible?1:0));
-        }
-    }
-
-    /**
-     * Writes entity health
-     *
-     * @param   health
-     *          health of entity
-     */
-    public void setHealth(float health) {
-        if (BukkitReflection.getMinorVersion() >= 6) {
-            setValue(6, DataWatcherSerializer_FLOAT, health);
-        } else {
-            setValue(16, null, (int)health);
-        }
-    }
-
-    /**
-     * Writes armor stand flags
-     *
-     * @param   flags
-     *          flags to write
-     */
-    public void setArmorStandFlags(byte flags) {
-        setValue(armorStandFlagsPosition, DataWatcherSerializer_BYTE, flags);
-    }
-
-    /**
-     * Writes wither invulnerable time
-     * @param   time
-     *          Time, apparently
-     */
-    public void setWitherInvulnerableTime(int time) {
-        if (BukkitReflection.getMinorVersion() > 8)
-            throw new UnsupportedOperationException("Not supported on 1.9+");
-        setValue(20, null, time);
-    }
-
-    /**
-     * Converts the class into an instance of NMS.DataWatcher
-     *
-     * @return  an instance of NMS.DataWatcher with same data
-     */
-    @SneakyThrows
-    @NotNull
-    public Object build() {
-        if (BukkitReflection.is1_19_3Plus()) {
-            List<Object> items = new ArrayList<>();
-            for (Item item : dataValues.values()) {
-                items.add(newDataWatcher$Item.newInstance(item.position, item.serializer, item.value));
-            }
-            return items;
-        } else {
-            Object nmsWatcher;
-            if (newDataWatcher.getParameterCount() == 1) { //1.7+
-                nmsWatcher = newDataWatcher.newInstance(new Object[] {null});
-            } else {
-                nmsWatcher = newDataWatcher.newInstance();
-            }
-            for (Item item : dataValues.values()) {
-                Object nmsObject = item.createObject();
-                DataWatcher_register.invoke(nmsWatcher, nmsObject, item.getValue());
-            }
-            return nmsWatcher;
-        }
-    }
-
-    /**
-     * Class for specific data watcher item.
-     */
-    @RequiredArgsConstructor
-    @Getter
-    private static class Item {
-
-        /** Item position */
-        private final int position;
-
-        /** Item serializer (1.9+) */
-        @Nullable
-        private final Object serializer;
-
-        /** Item value */
-        @NonNull
-        private final Object value;
-
-        /**
-         * Creates data watcher object with position and serializer
-         *
-         * @return  NMS data watcher object
-         */
-        @SneakyThrows
-        public Object createObject() {
-            if (BukkitReflection.getMinorVersion() >= 9) {
-                return newDataWatcherObject.newInstance(position, serializer);
-            } else {
-                return position;
-            }
-        }
-    }
-}
@@ -1,432 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.entity;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
-import me.neznamy.tab.platforms.bukkit.BukkitUtils;
-import me.neznamy.tab.platforms.bukkit.nms.BukkitReflection;
-import me.neznamy.tab.platforms.bukkit.nms.PacketSender;
-import me.neznamy.tab.shared.backend.EntityData;
-import me.neznamy.tab.shared.backend.Location;
-import me.neznamy.tab.shared.backend.entityview.EntityView;
-import me.neznamy.tab.shared.util.*;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.EntityType;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.*;
-import java.util.concurrent.Callable;
-import java.util.function.Function;
-
-/**
- * EntityView implementation for Bukkit using packets.
- */
-@RequiredArgsConstructor
-@SuppressWarnings("unchecked")
-public class PacketEntityView implements EntityView {
-
-    /** Version with entity metadata being split from spawn packet */
-    private static final int SPLIT_METADATA_VERSION = 15;
-
-    private static PacketSender packetSender;
-
-    /** PacketPlayOutEntityDestroy */
-    private static Class<?> EntityDestroyClass;
-    private static BiConsumerWithException<BukkitTabPlayer, int[]> destroyEntities;
-    private static FunctionWithException<Object, int[]> getDestroyedEntities;
-
-    /** PacketPlayOutEntityMetadata */
-    private static BiFunctionWithException<Integer, EntityData, Object> newEntityMetadata;
-    
-    /** PacketPlayOutEntityTeleport */
-    private static BiFunctionWithException<Integer, Location, Object> newEntityTeleport;
-    private static Class<?> EntityTeleportClass;
-    private static Field EntityTeleport_EntityId;
-
-    /** PacketPlayOutSpawnEntityLiving */
-    private static QuintFunction<Integer, UUID, Object, Location, EntityData, Object> newSpawnEntity;
-
-    /** Other entity packets */
-    private static Class<?> PacketPlayOutEntity;
-    private static Field PacketPlayOutEntity_ENTITYID;
-    private static Field PacketPlayOutEntity_X;
-    private static Field PacketPlayOutEntity_Y;
-    private static Field PacketPlayOutEntity_Z;
-    private static Class<?> PacketPlayOutEntityLook;
-    private static QuadFunction<Integer, Long, Long, Long, Object> newMovePacket;
-    private static Class<?> PacketPlayOutNamedEntitySpawn;
-    private static Field PacketPlayOutNamedEntitySpawn_ENTITYID;
-
-    private static Constructor<?> newClientboundBundlePacket;
-    private static Field ClientboundBundlePacket_packets;
-    private static Function<Object, Boolean> isBundlePacket = packet -> false;
-    private static BiConsumerWithException<BukkitTabPlayer, Iterable<?>> sendAsBundle = (player, packets) -> {
-        for (Object packet : packets) {
-            packetSender.sendPacket(player.getPlayer(), packet);
-        }
-    };
-
-    @Getter
-    private static boolean available;
-
-    /** Player this view belongs to */
-    private final BukkitTabPlayer player;
-
-    /**
-     * Loads all required classes and fields and marks class as available.
-     * If something goes wrong, a warning is printed and class is not marked as available.
-     */
-    public static void tryLoad() {
-        try {
-            DataWatcher.load();
-            loadEntityMetadata();
-            loadEntityDestroy();
-            loadEntityTeleport();
-            loadEntityMove();
-            loadEntitySpawn();
-            if (BukkitReflection.is1_19_4Plus()) {
-                Class<?> ClientboundBundlePacket = Class.forName("net.minecraft.network.protocol.game.ClientboundBundlePacket");
-                newClientboundBundlePacket = ClientboundBundlePacket.getConstructor(Iterable.class);
-                ClientboundBundlePacket_packets = ReflectionUtils.getOnlyField(ClientboundBundlePacket.getSuperclass(), Iterable.class);
-                isBundlePacket = ClientboundBundlePacket::isInstance;
-                sendAsBundle = (player, packets) -> packetSender.sendPacket(player.getPlayer(), newClientboundBundlePacket.newInstance(packets));
-            }
-            packetSender = new PacketSender();
-            available = true;
-        } catch (Exception e) {
-            List<String> missingFeatures = new ArrayList<>();
-            if (BukkitReflection.getMinorVersion() >= 8) {
-                missingFeatures.add("Unlimited nametag mode not working and being replaced with regular nametags");
-            }
-            if (BukkitReflection.getMinorVersion() <= 8) {
-                missingFeatures.add("BossBar feature not working");
-            }
-            BukkitUtils.compatibilityError(e, "sending entity packets", null, missingFeatures.toArray(new String[0]));
-        }
-    }
-
-    @SuppressWarnings("JavaReflectionInvocation")
-    private static void loadEntityMetadata() throws ReflectiveOperationException {
-        Class<?> entityMetadataClass = BukkitReflection.getClass("network.protocol.game.ClientboundSetEntityDataPacket",
-                "network.protocol.game.PacketPlayOutEntityMetadata", "PacketPlayOutEntityMetadata", "Packet40EntityMetadata");
-        if (BukkitReflection.is1_19_3Plus()) {
-            Constructor<?> constructor = entityMetadataClass.getConstructor(int.class, List.class);
-            newEntityMetadata = (entityId, data) -> constructor.newInstance(entityId, data.build());
-        } else {
-            Constructor<?> constructor = entityMetadataClass.getConstructor(int.class, DataWatcher.DataWatcher, boolean.class);
-            newEntityMetadata = (entityId, data) -> constructor.newInstance(entityId, data.build(), true);
-        }
-    }
-
-    private static void loadEntityDestroy() throws ReflectiveOperationException {
-        EntityDestroyClass = BukkitReflection.getClass("network.protocol.game.ClientboundRemoveEntitiesPacket",
-                "network.protocol.game.PacketPlayOutEntityDestroy", "PacketPlayOutEntityDestroy", "Packet29DestroyEntity");
-        Field entities = ReflectionUtils.getOnlyField(EntityDestroyClass);
-        try {
-            Constructor<?> constructor = EntityDestroyClass.getConstructor(int[].class);
-            destroyEntities = (player, ids) -> packetSender.sendPacket(player.getPlayer(), constructor.newInstance(new Object[]{ids}));
-            if (BukkitReflection.getMinorVersion() >= 17) {
-                getDestroyedEntities = packet -> ((List<Integer>) entities.get(packet)).stream().mapToInt(i -> i).toArray();
-            } else {
-                getDestroyedEntities = packet -> (int[]) entities.get(packet);
-            }
-        } catch (NoSuchMethodException e) {
-            //1.17.0 Mojank
-            Constructor<?> constructor = EntityDestroyClass.getConstructor(int.class);
-            destroyEntities = (player, ids) -> { for (int entity : ids) packetSender.sendPacket(player.getPlayer(), constructor.newInstance(entity));};
-            getDestroyedEntities = packet -> new int[]{entities.getInt(packet)};
-        }
-    }
-
-    private static void loadEntityTeleport() throws ReflectiveOperationException {
-        EntityTeleportClass = BukkitReflection.getClass("network.protocol.game.ClientboundTeleportEntityPacket",
-                "network.protocol.game.PacketPlayOutEntityTeleport", "PacketPlayOutEntityTeleport", "Packet34EntityTeleport");
-        Callable<Object> newPacket;
-        if (BukkitReflection.getMinorVersion() >= 17) {
-            // Dummy armor stand for constructor
-            Class<?> world = BukkitReflection.getClass("world.level.Level", "world.level.World", "World");
-            Class<?> entityArmorStand = BukkitReflection.getClass("world.entity.decoration.ArmorStand",
-                    "world.entity.decoration.EntityArmorStand", "EntityArmorStand");
-            Constructor<?> newEntityArmorStand = entityArmorStand.getConstructor(world, double.class, double.class, double.class);
-            Method World_getHandle = BukkitReflection.getBukkitClass("CraftWorld").getMethod("getHandle");
-            Object dummyEntity = newEntityArmorStand.newInstance(World_getHandle.invoke(Bukkit.getWorlds().get(0)), 0, 0, 0);
-
-            Constructor<?> constructor = EntityTeleportClass.getConstructor(BukkitReflection.getClass("world.entity.Entity"));
-            newPacket = () -> constructor.newInstance(dummyEntity);
-        } else {
-            Constructor<?> constructor = EntityTeleportClass.getConstructor();
-            newPacket = constructor::newInstance;
-        }
-
-        EntityTeleport_EntityId = ReflectionUtils.getFields(EntityTeleportClass, int.class).get(0);
-        Field EntityTeleport_X;
-        Field EntityTeleport_Y;
-        Field EntityTeleport_Z;
-        if (BukkitReflection.getMinorVersion() >= 9) {
-            EntityTeleport_X = ReflectionUtils.getFields(EntityTeleportClass, double.class).get(0);
-            EntityTeleport_Y = ReflectionUtils.getFields(EntityTeleportClass, double.class).get(1);
-            EntityTeleport_Z = ReflectionUtils.getFields(EntityTeleportClass, double.class).get(2);
-        } else {
-            EntityTeleport_X = ReflectionUtils.getFields(EntityTeleportClass, int.class).get(1);
-            EntityTeleport_Y = ReflectionUtils.getFields(EntityTeleportClass, int.class).get(2);
-            EntityTeleport_Z = ReflectionUtils.getFields(EntityTeleportClass, int.class).get(3);
-        }
-        newEntityTeleport = (entityId, location) -> {
-            Object packet = newPacket.call();
-            EntityTeleport_EntityId.set(packet, entityId);
-            EntityTeleport_X.set(packet, toPosition(location.getX()));
-            EntityTeleport_Y.set(packet, toPosition(location.getY()));
-            EntityTeleport_Z.set(packet, toPosition(location.getZ()));
-            return packet;
-        };
-    }
-
-    private static void loadEntityMove() throws ReflectiveOperationException {
-        // Classes
-        PacketPlayOutEntity = BukkitReflection.getClass("network.protocol.game.ClientboundMoveEntityPacket",
-                "network.protocol.game.PacketPlayOutEntity", "PacketPlayOutEntity", "Packet30Entity");
-        PacketPlayOutEntityLook = BukkitReflection.getClass("network.protocol.game.ClientboundMoveEntityPacket$Rot",
-                "network.protocol.game.PacketPlayOutEntity$PacketPlayOutEntityLook", "PacketPlayOutEntity$PacketPlayOutEntityLook",
-                "PacketPlayOutEntityLook", "Packet32EntityLook");
-        Class<?> packetPlayOutRelEntityMove = BukkitReflection.getClass("network.protocol.game.ClientboundMoveEntityPacket$Pos",
-                "network.protocol.game.PacketPlayOutEntity$PacketPlayOutRelEntityMove", "PacketPlayOutEntity$PacketPlayOutRelEntityMove",
-                "PacketPlayOutRelEntityMove", "Packet31RelEntityMove");
-
-
-        // Fields
-        PacketPlayOutEntity_ENTITYID = ReflectionUtils.getFields(PacketPlayOutEntity, int.class).get(0);
-
-        if (BukkitReflection.getMinorVersion() >= 14) {
-            List<Field> fields = ReflectionUtils.getFields(PacketPlayOutEntity, short.class);
-            PacketPlayOutEntity_X = fields.get(0);
-            PacketPlayOutEntity_Y = fields.get(1);
-            PacketPlayOutEntity_Z = fields.get(2);
-            Constructor<?> constructor = packetPlayOutRelEntityMove.getConstructor(int.class, short.class, short.class, short.class, boolean.class);
-            newMovePacket = (entityId, x, y, z) -> constructor.newInstance(entityId, x.shortValue(), y.shortValue(), z.shortValue(), false);
-        } else if (BukkitReflection.getMinorVersion() >= 9) {
-            List<Field> fields = ReflectionUtils.getFields(PacketPlayOutEntity, int.class);
-            PacketPlayOutEntity_X = fields.get(1);
-            PacketPlayOutEntity_Y = fields.get(2);
-            PacketPlayOutEntity_Z = fields.get(3);
-            Constructor<?> constructor = packetPlayOutRelEntityMove.getConstructor(int.class, long.class, long.class, long.class, boolean.class);
-            newMovePacket = (entityId, x, y, z) -> constructor.newInstance(entityId, x, y, z, false);
-        } else if (BukkitReflection.getMinorVersion() == 8) {
-            List<Field> fields = ReflectionUtils.getFields(PacketPlayOutEntity, byte.class);
-            PacketPlayOutEntity_X = fields.get(0);
-            PacketPlayOutEntity_Y = fields.get(1);
-            PacketPlayOutEntity_Z = fields.get(2);
-            Constructor<?> constructor = packetPlayOutRelEntityMove.getConstructor(int.class, byte.class, byte.class, byte.class, boolean.class);
-            newMovePacket = (entityId, x, y, z) -> constructor.newInstance(entityId, x.byteValue(), y.byteValue(), z.byteValue(), false);
-        }
-    }
-
-    /**
-     * Loads required NMS classes, fields and methods. If it fails, exception is thrown.
-     *
-     * @throws  ReflectiveOperationException
-     *          If anything fails
-     */
-    private static void loadEntitySpawn() throws ReflectiveOperationException {
-        int minorVersion = BukkitReflection.getMinorVersion();
-
-        // Entity ids
-        EnumMap<EntityType, Integer> entityIds = new EnumMap<>(EntityType.class);
-        if (minorVersion >= 13) {
-            entityIds.put(EntityType.ARMOR_STAND, 1);
-        } else {
-            entityIds.put(EntityType.WITHER, 64);
-            if (minorVersion >= 8) {
-                entityIds.put(EntityType.ARMOR_STAND, 30);
-            }
-        }
-
-        Class<?> SpawnEntityClass = BukkitReflection.getClass("network.protocol.game.ClientboundAddEntityPacket",
-                "network.protocol.game.PacketPlayOutSpawnEntity", "PacketPlayOutSpawnEntityLiving", "Packet24MobSpawn");
-        Field SpawnEntity_EntityId = ReflectionUtils.getFields(SpawnEntityClass, int.class).get(0);
-        if (BukkitReflection.is1_20_2Plus()) {
-            PacketPlayOutNamedEntitySpawn = SpawnEntityClass;
-            PacketPlayOutNamedEntitySpawn_ENTITYID = SpawnEntity_EntityId;
-        } else {
-            PacketPlayOutNamedEntitySpawn = BukkitReflection.getClass("network.protocol.game.ClientboundAddPlayerPacket",
-                    "network.protocol.game.PacketPlayOutNamedEntitySpawn", "PacketPlayOutNamedEntitySpawn", "Packet20NamedEntitySpawn");
-            PacketPlayOutNamedEntitySpawn_ENTITYID = ReflectionUtils.getFields(PacketPlayOutNamedEntitySpawn, int.class).get(0);
-        }
-        Constructor<?> constructor;
-
-        // 1.17+ constructor using Spawn entity packet
-        if (minorVersion >= 17) {
-            Class<?> Vec3D = BukkitReflection.getClass("world.phys.Vec3", "world.phys.Vec3D");
-            Object Vec3D_Empty = ReflectionUtils.getOnlyField(Vec3D, Vec3D).get(null);
-            Class<?> EntityTypes = BukkitReflection.getClass("world.entity.EntityType", "world.entity.EntityTypes");
-            if (minorVersion >= 19) {
-                Object EntityTypes_ARMOR_STAND = ReflectionUtils.getField(EntityTypes, "ARMOR_STAND", "d").get(null);
-                constructor = SpawnEntityClass.getConstructor(int.class, UUID.class, double.class, double.class, double.class, float.class, float.class, EntityTypes, int.class, Vec3D, double.class);
-                newSpawnEntity = (id, uuid, type, l, data) -> constructor.newInstance(id, uuid, l.getX(), l.getY(), l.getZ(), 0, 0, EntityTypes_ARMOR_STAND, 0, Vec3D_Empty, 0.0d);
-            } else {
-                Object EntityTypes_ARMOR_STAND = ReflectionUtils.getField(EntityTypes, "ARMOR_STAND", "c", "f_20529_").get(null); // Mohist 1.18.2
-                constructor = SpawnEntityClass.getConstructor(int.class, UUID.class, double.class, double.class, double.class, float.class, float.class, EntityTypes, int.class, Vec3D);
-                newSpawnEntity = (id, uuid, type, l, data) -> constructor.newInstance(id, uuid, l.getX(), l.getY(), l.getZ(), 0, 0, EntityTypes_ARMOR_STAND, 0, Vec3D_Empty);
-            }
-            return;
-        }
-
-        // 1.16- constructor using spawn entity living packet
-        constructor = SpawnEntityClass.getConstructor();
-        @Nullable Field SpawnEntity_UUID;
-        Field SpawnEntity_X;
-        Field SpawnEntity_Y;
-        Field SpawnEntity_Z;
-        @Nullable Field SpawnEntity_DataWatcher;
-        Field SpawnEntity_EntityType = ReflectionUtils.getFields(SpawnEntityClass, int.class).get(1);
-        if (minorVersion >= 9) {
-            SpawnEntity_UUID = ReflectionUtils.getOnlyField(SpawnEntityClass, UUID.class);
-            SpawnEntity_X = ReflectionUtils.getFields(SpawnEntityClass, double.class).get(0);
-            SpawnEntity_Y = ReflectionUtils.getFields(SpawnEntityClass, double.class).get(1);
-            SpawnEntity_Z = ReflectionUtils.getFields(SpawnEntityClass, double.class).get(2);
-        } else {
-            SpawnEntity_UUID = null;
-            SpawnEntity_X = ReflectionUtils.getFields(SpawnEntityClass, int.class).get(2);
-            SpawnEntity_Y = ReflectionUtils.getFields(SpawnEntityClass, int.class).get(3);
-            SpawnEntity_Z = ReflectionUtils.getFields(SpawnEntityClass, int.class).get(4);
-        }
-        if (minorVersion < SPLIT_METADATA_VERSION) {
-            SpawnEntity_DataWatcher = ReflectionUtils.getOnlyField(SpawnEntityClass, DataWatcher.DataWatcher);
-        } else {
-            SpawnEntity_DataWatcher = null;
-        }
-        newSpawnEntity = (id, uuid, type, l, data) -> {
-            Object nmsPacket = constructor.newInstance();
-            SpawnEntity_EntityId.set(nmsPacket, id);
-            if (minorVersion < SPLIT_METADATA_VERSION) SpawnEntity_DataWatcher.set(nmsPacket, data.build());
-            if (minorVersion >= 9) SpawnEntity_UUID.set(nmsPacket, uuid);
-            SpawnEntity_X.set(nmsPacket, toPosition(l.getX()));
-            SpawnEntity_Y.set(nmsPacket, toPosition(l.getY()));
-            SpawnEntity_Z.set(nmsPacket, toPosition(l.getZ()));
-            SpawnEntity_EntityType.set(nmsPacket, entityIds.get((EntityType) type));
-            return nmsPacket;
-        };
-    }
-
-    private static Object toPosition(double paramDouble) {
-        if (BukkitReflection.getMinorVersion() >= 9) {
-            return paramDouble;
-        } else {
-            int i = (int) (paramDouble*32);
-            return paramDouble < i ? i - 1 : i;
-        }
-    }
-
-    @SneakyThrows
-    @Override
-    public void spawnEntity(int entityId, @NotNull UUID id, @NotNull Object entityType, @NotNull Location l, @NotNull EntityData data) {
-        if (BukkitReflection.getMinorVersion() >= SPLIT_METADATA_VERSION) {
-            sendAsBundle.accept(player, Arrays.asList(
-                    newSpawnEntity.apply(entityId, id, entityType, l, null),
-                    newEntityMetadata.apply(entityId, data)
-            ));
-        } else {
-            packetSender.sendPacket(player.getPlayer(), newSpawnEntity.apply(entityId, id, entityType, l, data));
-        }
-    }
-
-    @Override
-    @SneakyThrows
-    public void updateEntityMetadata(int entityId, @NotNull EntityData data) {
-        packetSender.sendPacket(player.getPlayer(), newEntityMetadata.apply(entityId, data));
-    }
-
-    @SneakyThrows
-    @Override
-    public void teleportEntity(int entityId, @NotNull Location location) {
-        packetSender.sendPacket(player.getPlayer(), newEntityTeleport.apply(entityId, location));
-    }
-
-    @SneakyThrows
-    @Override
-    public void destroyEntities(int... entities) {
-        destroyEntities.accept(player, entities);
-    }
-
-    @Override
-    public boolean isDestroyPacket(@NotNull Object packet) {
-        return EntityDestroyClass.isInstance(packet);
-    }
-
-    @Override
-    public boolean isTeleportPacket(@NotNull Object packet) {
-        return EntityTeleportClass.isInstance(packet);
-    }
-
-    @Override
-    public boolean isNamedEntitySpawnPacket(@NotNull Object packet) {
-        return PacketPlayOutNamedEntitySpawn.isInstance(packet);
-    }
-
-    @Override
-    public boolean isMovePacket(@NotNull Object packet) {
-        return PacketPlayOutEntity.isInstance(packet);
-    }
-
-    @Override
-    public boolean isLookPacket(@NotNull Object packet) {
-        return PacketPlayOutEntityLook.isInstance(packet);
-    }
-
-    @Override
-    @SneakyThrows
-    public int getTeleportEntityId(@NotNull Object teleportPacket) {
-        return EntityTeleport_EntityId.getInt(teleportPacket);
-    }
-
-    @Override
-    @SneakyThrows
-    public int getMoveEntityId(@NotNull Object movePacket) {
-        return PacketPlayOutEntity_ENTITYID.getInt(movePacket);
-    }
-
-    @Override
-    @SneakyThrows
-    public int getSpawnedPlayer(@NotNull Object playerSpawnPacket) {
-        return PacketPlayOutNamedEntitySpawn_ENTITYID.getInt(playerSpawnPacket);
-    }
-
-    @Override
-    @SneakyThrows
-    public int[] getDestroyedEntities(@NotNull Object destroyPacket) {
-        return getDestroyedEntities.apply(destroyPacket);
-    }
-
-    @Override
-    public boolean isBundlePacket(@NotNull Object packet) {
-        return isBundlePacket.apply(packet);
-    }
-
-    @Override
-    @SneakyThrows
-    public Iterable<Object> getPackets(@NotNull Object bundlePacket) {
-        return (Iterable<Object>) ClientboundBundlePacket_packets.get(bundlePacket);
-    }
-
-    @Override
-    @SneakyThrows
-    @NotNull
-    public Location getMoveDiff(@NotNull Object movePacket) {
-        return new Location(
-                ((Number)PacketPlayOutEntity_X.get(movePacket)).intValue(),
-                ((Number)PacketPlayOutEntity_Y.get(movePacket)).intValue(),
-                ((Number)PacketPlayOutEntity_Z.get(movePacket)).intValue()
-        );
-    }
-
-    @Override
-    @SneakyThrows
-    public void moveEntity(int entityId, @NotNull Location moveDiff) {
-        packetSender.sendPacket(player.getPlayer(), newMovePacket.apply(
-                entityId, (long) moveDiff.getX(), (long) moveDiff.getY(), (long) moveDiff.getZ()));
-    }
-}
@@ -1,195 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.features;
-
-import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
-import me.neznamy.tab.platforms.bukkit.nms.BukkitReflection;
-import me.neznamy.tab.platforms.bukkit.entity.DataWatcher;
-import me.neznamy.tab.platforms.bukkit.platform.BukkitPlatform;
-import me.neznamy.tab.shared.TAB;
-import me.neznamy.tab.shared.backend.EntityData;
-import me.neznamy.tab.shared.backend.features.unlimitedtags.BackendNameTagX;
-import me.neznamy.tab.shared.platform.TabPlayer;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Pose;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerRespawnEvent;
-import org.bukkit.event.player.PlayerToggleSneakEvent;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-import java.util.stream.Collectors;
-
-/**
- * The core class for unlimited NameTag mode on Bukkit
- */
-public class BukkitNameTagX extends BackendNameTagX implements Listener {
-
-    /** Version in which multiple passenger option was added */
-    private static final int MULTI_PASSENGER_VERSION = 11;
-
-    /**
-     * Constructs new instance and registers the class listener.
-     *
-     * @param   plugin
-     *          Plugin instance to use for registering listener
-     */
-    public BukkitNameTagX(@NotNull JavaPlugin plugin) {
-        Bukkit.getPluginManager().registerEvents(this, plugin);
-    }
-
-    /**
-     * Listener to player sneak event to sneak armor stands.
-     *
-     * @param   e
-     *          Sneak event
-     */
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onSneak(PlayerToggleSneakEvent e) {
-        sneak(e.getPlayer().getUniqueId(), e.isSneaking());
-    }
-
-    /**
-     * Listener to respawn event to resend armor stands.
-     *
-     * @param   e
-     *          Respawn event
-     */
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onRespawn(PlayerRespawnEvent e) {
-        respawn(e.getPlayer().getUniqueId());
-    }
-
-    @Override
-    public double getDistance(@NotNull TabPlayer player1, @NotNull TabPlayer player2) {
-        Location loc1 = ((Player) player1.getPlayer()).getLocation();
-        Location loc2 = ((Player) player2.getPlayer()).getLocation();
-        return Math.sqrt(Math.pow(loc1.getX()-loc2.getX(), 2) + Math.pow(loc1.getZ()-loc2.getZ(), 2));
-    }
-
-    @Override
-    public boolean areInSameWorld(@NotNull TabPlayer player1, @NotNull TabPlayer player2) {
-        return ((Player) player1.getPlayer()).getWorld() == ((Player) player2.getPlayer()).getWorld();
-    }
-
-    @Override
-    public boolean canSee(@NotNull TabPlayer viewer, @NotNull TabPlayer target) {
-        return ((Player)viewer.getPlayer()).canSee((Player) target.getPlayer());
-    }
-
-    @Override
-    public void unregisterListener() {
-        HandlerList.unregisterAll(this);
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    @NotNull
-    public List<Integer> getPassengers(@NotNull Object entity) {
-        Entity vehicle = (Entity) entity;
-        if (BukkitReflection.getMinorVersion() >= MULTI_PASSENGER_VERSION) {
-            return vehicle.getPassengers().stream().map(Entity::getEntityId).collect(Collectors.toList());
-        } else {
-            if (vehicle.getPassenger() != null) {
-                return Collections.singletonList(vehicle.getPassenger().getEntityId());
-            } else {
-                return Collections.emptyList();
-            }
-        }
-    }
-
-    @Override
-    @Nullable
-    public Object getVehicle(@NotNull TabPlayer player) {
-        return ((Player)player.getPlayer()).getVehicle();
-    }
-
-    @Override
-    public int getEntityId(@NotNull Object entity) {
-        return ((Entity)entity).getEntityId();
-    }
-
-    @Override
-    @NotNull
-    public String getEntityType(@NotNull Object entity) {
-        return ((Entity) entity).getType().toString().toLowerCase(Locale.US);
-    }
-
-    @Override
-    public boolean isSneaking(@NotNull TabPlayer player) {
-        return ((Player)player.getPlayer()).isSneaking();
-    }
-
-    @Override
-    public boolean isSwimming(@NotNull TabPlayer player) {
-        Player p = (Player) player.getPlayer();
-        if (BukkitReflection.getMinorVersion() >= 14 && p.getPose() == Pose.SWIMMING) return true;
-        return BukkitReflection.getMinorVersion() == 13 && p.isSwimming();
-    }
-
-    @Override
-    public boolean isGliding(@NotNull TabPlayer player) {
-        return BukkitReflection.getMinorVersion() >= 9 && ((Player)player.getPlayer()).isGliding();
-    }
-
-    @Override
-    public boolean isSleeping(@NotNull TabPlayer player) {
-        return ((Player)player.getPlayer()).isSleeping();
-    }
-
-    @Override
-    @NotNull
-    public Object getArmorStandType() {
-        return EntityType.ARMOR_STAND;
-    }
-
-    @Override
-    public double getX(@NotNull TabPlayer player) {
-        return ((Player)player.getPlayer()).getLocation().getX();
-    }
-
-    @Override
-    public double getY(@NotNull Object entity) {
-        return ((Entity)entity).getLocation().getY();
-    }
-
-    @Override
-    public double getZ(@NotNull TabPlayer player) {
-        return ((Player)player.getPlayer()).getLocation().getZ();
-    }
-
-    @Override
-    @NotNull
-    public EntityData createDataWatcher(@NotNull TabPlayer viewer, byte flags, @NotNull String displayName, boolean nameVisible) {
-        DataWatcher datawatcher = new DataWatcher();
-        datawatcher.setEntityFlags(flags);
-        datawatcher.setCustomName(displayName, viewer.getVersion());
-        datawatcher.setCustomNameVisible(nameVisible);
-        datawatcher.setArmorStandFlags(datawatcher.MARKER_FLAG);
-        return datawatcher;
-    }
-
-    @Override
-    public void runInEntityScheduler(@NotNull Object entity, @NotNull Runnable task) {
-        ((BukkitPlatform)TAB.getInstance().getPlatform()).runEntityTask((Entity) entity, task);
-    }
-
-    @Override
-    public boolean isDead(@NotNull TabPlayer player) {
-        return ((BukkitTabPlayer)player).getPlayer().isDead();
-    }
-
-    @Override
-    public boolean isFlying(@NotNull TabPlayer player) {
-        return ((BukkitTabPlayer)player).getPlayer().isFlying();
-    }
-}
@@ -3,26 +3,28 @@ package me.neznamy.tab.platforms.bukkit.features;
 import lombok.Getter;
 import me.clip.placeholderapi.PlaceholderAPI;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import me.neznamy.tab.shared.TabConstants;
+import me.clip.placeholderapi.expansion.Relational;
+import me.neznamy.tab.api.placeholder.Placeholder;
+import me.neznamy.tab.shared.ProjectVariables;
 import me.neznamy.tab.shared.TAB;
-import me.neznamy.tab.shared.platform.TabPlayer;
+import me.neznamy.tab.shared.features.PlaceholderManagerImpl;
 import me.neznamy.tab.shared.placeholders.expansion.TabExpansion;
+import me.neznamy.tab.shared.placeholders.types.RelationalPlaceholderImpl;
+import me.neznamy.tab.shared.platform.TabPlayer;
 import me.neznamy.tab.shared.util.ReflectionUtils;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;

 /**
 * TAB's expansion for PlaceholderAPI
 */
@Getter
-public class BukkitTabExpansion extends PlaceholderExpansion implements TabExpansion {
-
-    /** Map holding all values for all players for easy and high-performance access */
-    @NotNull
-    private final WeakHashMap<TabPlayer, Map<String, String>> values = new WeakHashMap<>();
+public class BukkitTabExpansion extends PlaceholderExpansion implements TabExpansion, Relational {

    /** List of all placeholders offered by the plugin for command suggestions */
    @NotNull
@@ -32,21 +34,14 @@ public class BukkitTabExpansion extends PlaceholderExpansion implements TabExpan
            "%tab_tagprefix%",
            "%tab_tagsuffix%",
            "%tab_customtabname%",
-            "%tab_customtagname%",
-            "%tab_belowname%",
-            "%tab_abovename%",
            "%tab_tabprefix_raw%",
            "%tab_tabsuffix_raw%",
            "%tab_tagprefix_raw%",
            "%tab_tagsuffix_raw%",
            "%tab_customtabname_raw%",
-            "%tab_customtagname_raw%",
-            "%tab_belowname_raw%",
-            "%tab_abovename_raw%",
            "%tab_scoreboard_name%",
            "%tab_scoreboard_visible%",
            "%tab_bossbar_visible%",
-            "%tab_nametag_preview%",
            "%tab_nametag_visibility%",
            "%tab_replace_<placeholder>%",
            "%tab_placeholder_<placeholder>%"
@@ -60,19 +55,19 @@ public class BukkitTabExpansion extends PlaceholderExpansion implements TabExpan
    @Override
    @NotNull
    public String getAuthor() {
-        return TabConstants.PLUGIN_AUTHOR;
+        return ProjectVariables.PLUGIN_AUTHOR;
    }

    @Override
    @NotNull
    public String getIdentifier() {
-        return TabConstants.PLUGIN_ID;
+        return ProjectVariables.PLUGIN_ID;
    }

    @Override
    @NotNull
    public String getVersion() {
-        return TabConstants.PLUGIN_VERSION;
+        return ProjectVariables.PLUGIN_VERSION;
    }

    @Override
@@ -89,25 +84,55 @@ public class BukkitTabExpansion extends PlaceholderExpansion implements TabExpan
            String textBefore;
            do {
                textBefore = text;
-                for (String placeholder : TAB.getInstance().getPlaceholderManager().detectPlaceholders(text)) {
+                for (String placeholder : PlaceholderManagerImpl.detectPlaceholders(text)) {
                    text = text.replace(placeholder, TAB.getInstance().getPlaceholderManager().findReplacement(placeholder,
                            PlaceholderAPI.setPlaceholders(player, placeholder)));
                }
            } while (!textBefore.equals(text));
            return text;
        }
-        if (identifier.startsWith("placeholder_")) {
-            TAB.getInstance().getPlaceholderManager().addUsedPlaceholder("%" + identifier.substring("placeholder_".length()) + "%", TAB.getInstance().getPlaceholderManager());
-        }
        if (player == null) return "<Player cannot be null>";
        TabPlayer p = TAB.getInstance().getPlayer(player.getUniqueId());
-        if (p == null || !p.isLoaded()) return "<Player is not loaded>";
-        return values.get(p).get(identifier);
+        if (p == null) return "<Player is not loaded>";
+        if (identifier.startsWith("placeholder_")) {
+            String requestedPlaceholder = "%" + identifier.substring("placeholder_".length()) + "%";
+            PlaceholderManagerImpl pm = TAB.getInstance().getPlaceholderManager();
+            pm.addUsedPlaceholder(requestedPlaceholder, pm);
+            return pm.getPlaceholder(requestedPlaceholder).parse(p);
+        }
+        return p.expansionData.getValue(identifier);
    }

    @Override
-    public void setValue(@NotNull TabPlayer player, @NotNull String key, @NotNull String value) {
-        values.computeIfAbsent(player, p -> new HashMap<>()).put(key, value);
+    public String onPlaceholderRequest(@NotNull Player viewer, @NotNull Player target, @NotNull String identifier) {
+        if (identifier.startsWith("replace_")) {
+            String text = "%" + identifier.substring(8) + "%";
+            String textBefore;
+            do {
+                textBefore = text;
+                for (String placeholder : PlaceholderManagerImpl.detectPlaceholders(text)) {
+                    text = text.replace(placeholder, TAB.getInstance().getPlaceholderManager().findReplacement(placeholder,
+                            PlaceholderAPI.setRelationalPlaceholders(viewer, target, placeholder)));
+                }
+            } while (!textBefore.equals(text));
+            return text;
+        }
+        if (identifier.startsWith("placeholder_")) {
+            String requestedPlaceholder = "%" + identifier.substring("placeholder_".length()) + "%";
+            PlaceholderManagerImpl pm = TAB.getInstance().getPlaceholderManager();
+            pm.addUsedPlaceholder(requestedPlaceholder, pm);
+            Placeholder placeholder = pm.getPlaceholder(requestedPlaceholder);
+            if (placeholder instanceof RelationalPlaceholderImpl) {
+                RelationalPlaceholderImpl rel = (RelationalPlaceholderImpl) placeholder;
+                TabPlayer v = TAB.getInstance().getPlayer(viewer.getUniqueId());
+                TabPlayer t = TAB.getInstance().getPlayer(target.getUniqueId());
+                if (v == null || t == null) return "<Player is not loaded>";
+                return rel.getLastValue(v, t);
+            } else {
+                return "<Not a relational placeholder: " + requestedPlaceholder + ">";
+            }
+        }
+        return "<Unknown identifier: \"" + identifier + "\">";
    }

    @Override
@@ -1,13 +1,15 @@
 package me.neznamy.tab.platforms.bukkit.features;

-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import me.neznamy.tab.platforms.bukkit.BukkitUtils;
+import me.neznamy.tab.platforms.bukkit.platform.BukkitPlatform;
+import me.neznamy.tab.shared.TAB;
+import me.neznamy.tab.shared.TabConstants;
+import me.neznamy.tab.shared.features.PerWorldPlayerListConfiguration;
 import me.neznamy.tab.shared.features.types.Loadable;
+import me.neznamy.tab.shared.features.types.TabFeature;
 import me.neznamy.tab.shared.features.types.UnLoadable;
+import me.neznamy.tab.shared.features.types.VanishListener;
+import me.neznamy.tab.shared.platform.TabPlayer;
+import me.neznamy.tab.shared.util.ReflectionUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -15,46 +17,59 @@ import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerChangedWorldEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.metadata.MetadataValue;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
-
-import me.neznamy.tab.shared.features.types.TabFeature;
-import me.neznamy.tab.shared.TabConstants;
-import me.neznamy.tab.shared.TAB;
 import org.jetbrains.annotations.NotNull;

+import java.util.List;
+import java.util.Map.Entry;
+
 /**
 * Per-world-PlayerList feature handler
 */
@SuppressWarnings("deprecation")
-public class PerWorldPlayerList extends TabFeature implements Listener, Loadable, UnLoadable {
+public class PerWorldPlayerList extends TabFeature implements Listener, Loadable, UnLoadable, VanishListener {
+
+    /** Reference to platform */
+    @NotNull
+    private final BukkitPlatform platform;

    /** Config options */
-    private final boolean allowBypass = config().getBoolean("per-world-playerlist.allow-bypass-permission", false);
-    private final List<String> ignoredWorlds = config().getStringList("per-world-playerlist.ignore-effect-in-worlds", Arrays.asList("ignored_world", "build"));
-    private final Map<String, List<String>> sharedWorlds = config().getConfigurationSection("per-world-playerlist.shared-playerlist-world-groups");
+    @NotNull
+    private final PerWorldPlayerListConfiguration configuration;
+
+    /** Check for presence of modern (1.12.2+) methods that take plugin as argument to avoid conflict */
+    private final boolean modernMethodsAvailable = ReflectionUtils.methodExists(Player.class, "hidePlayer", Plugin.class, Player.class);

    /**
-     * Constructs new instance and registers events
+     * Constructs new instance and registers events.
     *
     * @param   plugin
     *          Plugin instance to register events
+     * @param   platform
+     *          Platform reference
+     * @param   configuration
+     *          Feature configuration
     */
-    public PerWorldPlayerList(JavaPlugin plugin) {
+    public PerWorldPlayerList(@NotNull JavaPlugin plugin, @NotNull BukkitPlatform platform, @NotNull PerWorldPlayerListConfiguration configuration) {
+        this.configuration = configuration;
+        this.platform = platform;
        Bukkit.getPluginManager().registerEvents(this, plugin);
    }

    @Override
    public void load() {
-        for (Player p : BukkitUtils.getOnlinePlayers()) {
+        for (Player p : platform.getOnlinePlayers()) {
            checkPlayer(p);
        }
    }

    @Override
    public void unload() {
-        for (Player p : BukkitUtils.getOnlinePlayers()) {
-            for (Player pl : BukkitUtils.getOnlinePlayers()) {
-                p.showPlayer(pl);
+        for (Player p : platform.getOnlinePlayers()) {
+            for (Player pl : platform.getOnlinePlayers()) {
+                showPlayer(p, pl);
            }
        }
        HandlerList.unregisterAll(this);
@@ -95,12 +110,34 @@ public class PerWorldPlayerList extends TabFeature implements Listener, Loadable
     *          Player to update
     */
    private void checkPlayer(@NotNull Player p) {
-        for (Player all : BukkitUtils.getOnlinePlayers()) {
+        for (Player all : platform.getOnlinePlayers()) {
            if (all == p) continue;
-            if (!shouldSee(p, all) && p.canSee(all)) p.hidePlayer(all);
-            if (shouldSee(p, all) && !p.canSee(all)) p.showPlayer(all);
-            if (!shouldSee(all, p) && all.canSee(p)) all.hidePlayer(p);
-            if (shouldSee(all, p) && !all.canSee(p)) all.showPlayer(p);
+            if (shouldSee(p, all)) {
+                showPlayer(p, all);
+            } else {
+                hidePlayer(p, all);
+            }
+            if (shouldSee(all, p)) {
+                showPlayer(all, p);
+            } else {
+                hidePlayer(all, p);
+            }
+        }
+    }
+
+    private void hidePlayer(@NotNull Player viewer, @NotNull Player target) {
+        if (modernMethodsAvailable) {
+            viewer.hidePlayer(platform.getPlugin(), target);
+        } else {
+            viewer.hidePlayer(target);
+        }
+    }
+
+    private void showPlayer(@NotNull Player viewer, @NotNull Player target) {
+        if (modernMethodsAvailable) {
+            viewer.showPlayer(platform.getPlugin(), target);
+        } else {
+            viewer.showPlayer(target);
        }
    }

@@ -114,10 +151,13 @@ public class PerWorldPlayerList extends TabFeature implements Listener, Loadable
     */
    private boolean shouldSee(@NotNull Player viewer, @NotNull Player target) {
        if (target == viewer) return true;
-        if ((allowBypass && viewer.hasPermission(TabConstants.Permission.PER_WORLD_PLAYERLIST_BYPASS)) || ignoredWorlds.contains(viewer.getWorld().getName())) return true;
+        for (MetadataValue v : target.getMetadata("vanished")) {
+            if (v.asBoolean() && !viewer.hasPermission(TabConstants.Permission.SEE_VANISHED)) return false;
+        }
+        if ((configuration.isAllowBypassPermission() && viewer.hasPermission(TabConstants.Permission.PER_WORLD_PLAYERLIST_BYPASS)) || configuration.getIgnoredWorlds().contains(viewer.getWorld().getName())) return true;
        String viewerWorldGroup = viewer.getWorld().getName() + "-default"; //preventing unwanted behavior when some group is called exactly like a world
        String targetWorldGroup = target.getWorld().getName() + "-default";
-        for (Entry<String, List<String>> group : sharedWorlds.entrySet()) {
+        for (Entry<String, List<String>> group : configuration.getSharedWorlds().entrySet()) {
            if (group.getValue() != null) {
                if (group.getValue().contains(viewer.getWorld().getName())) viewerWorldGroup = group.getKey();
                if (group.getValue().contains(target.getWorld().getName())) targetWorldGroup = group.getKey();
@@ -126,9 +166,14 @@ public class PerWorldPlayerList extends TabFeature implements Listener, Loadable
        return viewerWorldGroup.equals(targetWorldGroup);
    }

-    @Override
    @NotNull
+    @Override
    public String getFeatureName() {
        return "Per world PlayerList";
    }
+
+    @Override
+    public void onVanishStatusChange(@NotNull TabPlayer player) {
+        platform.runSync((Player) player.getPlayer(), () -> checkPlayer((Player) player.getPlayer()));
+    }
 }
@@ -1,93 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.features;
-
-import lombok.RequiredArgsConstructor;
-import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
-import me.neznamy.tab.shared.TabConstants;
-import me.neznamy.tab.shared.platform.TabPlayer;
-import me.neznamy.tab.api.bossbar.BossBar;
-import me.neznamy.tab.shared.features.types.WorldSwitchListener;
-import me.neznamy.tab.shared.TAB;
-import me.neznamy.tab.shared.backend.BackendTabPlayer;
-import me.neznamy.tab.shared.features.bossbar.BossBarManagerImpl;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerRespawnEvent;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * An additional class with additional code for &lt;1.9 servers due to an entity being required
- */
-@RequiredArgsConstructor
-public class WitherBossBar extends BossBarManagerImpl implements Listener, WorldSwitchListener {
-
-    /** Distance of the wither in blocks */
-    private static final int WITHER_DISTANCE = 60;
-
-    /**
-     * Constructs new instance and registers events
-     *
-     * @param   plugin
-     *          Plugin instance to register events
-     */
-    public WitherBossBar(JavaPlugin plugin) {
-        Bukkit.getPluginManager().registerEvents(this, plugin);
-    }
-
-    @Override
-    public void load() {
-        //when MC is on fullscreen, BossBar disappears after 1 second of not being seen
-        //when in a small window, it's about 100ms
-        TAB.getInstance().getCPUManager().startRepeatingMeasuredTask(100,
-                getFeatureName(), TabConstants.CpuUsageCategory.TELEPORTING_WITHER, this::teleport);
-        super.load();
-        teleport();
-    }
-
-    /**
-     * Updates Wither location for all online players
-     */
-    private void teleport() {
-        for (TabPlayer p : TAB.getInstance().getOnlinePlayers()) {
-            if (p.getVersion().getMinorVersion() > 8) continue; //sending VV packets to those
-            for (BossBar line : getRegisteredBossBars().values()) {
-                if (!line.containsPlayer(p)) continue;
-                Location eyeLocation = ((BukkitTabPlayer)p).getPlayer().getEyeLocation();
-                Location loc = eyeLocation.add(eyeLocation.getDirection().normalize().multiply(WITHER_DISTANCE));
-                if (loc.getY() < 1) loc.setY(1);
-                ((BackendTabPlayer)p).getEntityView().teleportEntity(line.getUniqueId().hashCode(), new me.neznamy.tab.shared.backend.Location(loc.getX(), loc.getY(), loc.getZ()));
-            }
-        }
-    }
-    
-    @Override
-    public void unload() {
-        super.unload();
-        HandlerList.unregisterAll(this);
-    }
-    
-    /**
-     * Respawning wither as respawn screen destroys all entities in client.
-     *
-     * @param   e
-     *          Respawn event
-     */
-    @EventHandler
-    public void onRespawn(PlayerRespawnEvent e) {
-        TabPlayer player = TAB.getInstance().getPlayer(e.getPlayer().getUniqueId());
-        if (player == null) return;
-        TAB.getInstance().getCPUManager().runMeasuredTask(getFeatureName(), TabConstants.CpuUsageCategory.PLAYER_RESPAWN,
-                () -> detectBossBarsAndSend(player));
-    }
-
-    @Override
-    public void onWorldChange(@NotNull TabPlayer p, @NotNull String from, @NotNull String to) {
-        for (BossBar line : lineValues) {
-            line.removePlayer(p);
-        }
-        detectBossBarsAndSend(p);
-    }
-}
@@ -1,9 +1,9 @@
 package me.neznamy.tab.platforms.bukkit.hook;

 import de.myzelyam.api.vanish.VanishAPI;
+import me.neznamy.tab.api.TabPlayer;
 import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
 import me.neznamy.tab.shared.hook.PremiumVanishHook;
-import me.neznamy.tab.shared.platform.TabPlayer;
 import org.jetbrains.annotations.NotNull;

 /**
@@ -1,113 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.nms;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-import me.neznamy.tab.shared.util.FunctionWithException;
-import me.neznamy.tab.shared.util.ReflectionUtils;
-import org.bukkit.Bukkit;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Arrays;
-
-/**
- * Class containing main NMS-related information and methods.
- */
-public class BukkitReflection {
-
-    /** CraftBukkit package */
-    private static final String CRAFTBUKKIT_PACKAGE = Bukkit.getServer().getClass().getPackage().getName();
-
-    /** Server version data */
-    private static final ServerVersion serverVersion = detectServerVersion();
-
-    /** Flag determining whether the server version is at least 1.19.3 or not */
-    @Getter
-    private static final boolean is1_19_3Plus = ReflectionUtils.classExists("net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket");
-
-    /** Flag determining whether the server version is at least 1.19.4 or not */
-    @Getter
-    private static final boolean is1_19_4Plus = ReflectionUtils.classExists("net.minecraft.network.protocol.game.ClientboundBundlePacket");
-
-    /** Flag determining whether the server version is at least 1.20.2 or not */
-    @Getter
-    private static final boolean is1_20_2Plus = ReflectionUtils.classExists("net.minecraft.world.scores.DisplaySlot");
-
-    /** Flag determining whether the server version is at least 1.20.3 or not */
-    @Getter
-    private static final boolean is1_20_3Plus = ReflectionUtils.classExists("net.minecraft.network.protocol.game.ClientboundResetScorePacket");
-
-    private static ServerVersion detectServerVersion() {
-        FunctionWithException<String, Class<?>> classFunction = name -> Class.forName("net.minecraft." + name);
-        String[] array = Bukkit.getServer().getClass().getPackage().getName().split("\\.");
-        int minorVersion;
-        if (array.length > 3) {
-            // Normal packaging
-            String serverPackage = array[3];
-            minorVersion = Integer.parseInt(serverPackage.split("_")[1]);
-            if (minorVersion < 17) {
-                ClassLoader loader = BukkitReflection.class.getClassLoader();
-                classFunction = name -> loader.loadClass("net.minecraft.server." + serverPackage + "." + name);
-            }
-        } else {
-            // Paper without CB relocation
-            minorVersion = Integer.parseInt(Bukkit.getBukkitVersion().split("-")[0].split("\\.")[1]);
-        }
-        return new ServerVersion(classFunction, minorVersion);
-    }
-
-    /**
-     * Returns server's minor version, such as 20 for 1.20.4
-     *
-     * @return  server's minor version
-     */
-    public static int getMinorVersion() {
-        return serverVersion.getMinorVersion();
-    }
-
-    /**
-     * Returns class with given potential names in same order. For 1.17+ it takes packaged class names
-     * without "net.minecraft." prefix, for <1.17 it takes class name only.
-     *
-     * @param   names
-     *          possible class names
-     * @return  class for specified names
-     * @throws  ClassNotFoundException
-     *          if class does not exist
-     */
-    @SneakyThrows
-    public static Class<?> getClass(@NotNull String... names) throws ClassNotFoundException {
-        for (String name : names) {
-            try {
-                return serverVersion.getClass.apply(name);
-            } catch (ClassNotFoundException | NullPointerException ignored) {
-                // not the first class name in array
-            }
-        }
-        throw new ClassNotFoundException("No class found with possible names " + Arrays.toString(names));
-    }
-
-    /**
-     * Returns CraftBukkit class with given package and name.
-     *
-     * @param   name
-     *          Package and name of the class
-     * @return  CraftBukkit class
-     * @throws  ClassNotFoundException
-     *          If class does not exist
-     */
-    public static Class<?> getBukkitClass(@NotNull String name) throws ClassNotFoundException {
-        return Class.forName(CRAFTBUKKIT_PACKAGE + "." + name);
-    }
-
-    /**
-     * Class with server version information.
-     */
-    @RequiredArgsConstructor
-    @Getter
-    private static class ServerVersion {
-
-        private final FunctionWithException<String, Class<?>> getClass;
-        private final int minorVersion;
-    }
-}
@@ -1,161 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.nms;
-
-import lombok.SneakyThrows;
-import me.neznamy.tab.shared.chat.ChatModifier;
-import me.neznamy.tab.shared.chat.SimpleComponent;
-import me.neznamy.tab.shared.chat.StructuredComponent;
-import me.neznamy.tab.shared.chat.TabComponent;
-import me.neznamy.tab.shared.util.FunctionWithException;
-import me.neznamy.tab.shared.util.ReflectionUtils;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.function.BiFunction;
-
-/**
- * Class for converting TAB component into NMS components (1.7+).
- */
-@SuppressWarnings({"rawtypes", "unchecked"})
-public class ComponentConverter {
-
-    /** Instance of the class */
-    @Nullable
-    public static ComponentConverter INSTANCE;
-
-    private final FunctionWithException<String, Object> newTextComponent;
-    private final BiFunction<ChatModifier, Boolean, Object> convertModifier;
-
-    private final Class<?> ChatModifier = BukkitReflection.getClass("network.chat.ChatModifier", "ChatModifier");
-    private final Class<Enum> EnumChatFormat = (Class<Enum>) BukkitReflection.getClass("EnumChatFormat");
-    private final Constructor<?> newChatModifier;
-    private final Method ChatBaseComponent_addSibling;
-    private final Field Component_modifier;
-    private final List<Field> magicCodes = ReflectionUtils.getFields(ChatModifier, Boolean.class);
-
-    // 1.15-
-    private Method ChatModifier_setColor;
-
-    // 1.16+
-    private Method ChatHexColor_fromRGB;
-    private Constructor<?> newMinecraftKey;
-
-    /**
-     * Constructs new instance and loads all NMS classes, constructors and methods.
-     *
-     * @throws  ReflectiveOperationException
-     *          If something failed
-     */
-    private ComponentConverter() throws ReflectiveOperationException {
-        Class<?> IChatBaseComponent = BukkitReflection.getClass("network.chat.IChatBaseComponent", "IChatBaseComponent");
-        if (BukkitReflection.getMinorVersion() >= 19) {
-            Method IChatBaseComponent_b = ReflectionUtils.getMethod(IChatBaseComponent, new String[] {"b", "literal"}, String.class);
-            newTextComponent = text -> IChatBaseComponent_b.invoke(null, text);
-            Class<?> IChatMutableComponent = BukkitReflection.getClass("network.chat.IChatMutableComponent", "IChatMutableComponent");
-            Component_modifier = ReflectionUtils.getOnlyField(IChatMutableComponent, ChatModifier);
-            ChatBaseComponent_addSibling = ReflectionUtils.getOnlyMethod(IChatMutableComponent, IChatMutableComponent, IChatBaseComponent);
-        } else {
-            Class<?> ChatComponentText = BukkitReflection.getClass("network.chat.ChatComponentText", "ChatComponentText");
-            Constructor<?> newChatComponentText = ChatComponentText.getConstructor(String.class);
-            newTextComponent = newChatComponentText::newInstance;
-            Class<?> ChatBaseComponent = BukkitReflection.getClass("network.chat.ChatBaseComponent", "ChatBaseComponent");
-            Component_modifier = ReflectionUtils.getOnlyField(ChatBaseComponent, ChatModifier);
-            ChatBaseComponent_addSibling = ReflectionUtils.getOnlyMethod(ChatComponentText, IChatBaseComponent, IChatBaseComponent);
-        }
-        if (BukkitReflection.getMinorVersion() >= 16) {
-            Class<?> chatHexColor = BukkitReflection.getClass("network.chat.ChatHexColor", "ChatHexColor");
-            Class<?> MinecraftKey = BukkitReflection.getClass("resources.MinecraftKey", "MinecraftKey");
-            Class<?> chatClickable = BukkitReflection.getClass("network.chat.ChatClickable", "ChatClickable");
-            Class<?> chatHoverable = BukkitReflection.getClass("network.chat.ChatHoverable", "ChatHoverable");
-            newMinecraftKey = MinecraftKey.getConstructor(String.class);
-            ChatHexColor_fromRGB = ReflectionUtils.getOnlyMethod(chatHexColor, chatHexColor, int.class);
-            newChatModifier = ReflectionUtils.setAccessible(ChatModifier.getDeclaredConstructor(chatHexColor, Boolean.class, Boolean.class, Boolean.class,
-                    Boolean.class, Boolean.class, chatClickable, chatHoverable, String.class, MinecraftKey));
-            convertModifier = this::createModifierModern;
-        } else {
-            newChatModifier = ChatModifier.getConstructor();
-            ChatModifier_setColor = ReflectionUtils.getOnlyMethod(ChatModifier, ChatModifier, EnumChatFormat);
-            convertModifier = (modifier, protocolVersion) -> createModifierLegacy(modifier);
-        }
-    }
-
-    /**
-     * Converts TAB component to NMS component.
-     *
-     * @param   component
-     *          Component to convert
-     * @param   modern
-     *          Whether client supports RGB or not
-     * @return  Converted component
-     */
-    @SneakyThrows
-    public Object convert(@NotNull TabComponent component, boolean modern) {
-        if (component instanceof SimpleComponent) return newTextComponent.apply(((SimpleComponent) component).getText());
-
-        StructuredComponent component1 = (StructuredComponent) component;
-        Object nmsComponent = newTextComponent.apply(component1.getText());
-        Component_modifier.set(nmsComponent, convertModifier.apply(component1.getModifier(), modern));
-        for (StructuredComponent extra : component1.getExtra()) {
-            ChatBaseComponent_addSibling.invoke(nmsComponent, convert(extra, modern));
-        }
-        return nmsComponent;
-    }
-
-    @SneakyThrows
-    private Object createModifierModern(@NotNull ChatModifier modifier, boolean modern) {
-        Object color = null;
-        if (modifier.getColor() != null) {
-            if (modern) {
-                color = ChatHexColor_fromRGB.invoke(null, modifier.getColor().getRgb());
-            } else {
-                color = ChatHexColor_fromRGB.invoke(null, modifier.getColor().getLegacyColor().getRgb());
-            }
-        }
-        return newChatModifier.newInstance(
-                color,
-                modifier.isBold(),
-                modifier.isItalic(),
-                modifier.isUnderlined(),
-                modifier.isStrikethrough(),
-                modifier.isObfuscated(),
-                null,
-                null,
-                null,
-                modifier.getFont() == null ? null : newMinecraftKey.newInstance(modifier.getFont())
-        );
-    }
-
-    @SneakyThrows
-    private Object createModifierLegacy(@NotNull ChatModifier modifier) {
-        Object nmsModifier = newChatModifier.newInstance();
-        if (modifier.getColor() != null) {
-            ChatModifier_setColor.invoke(nmsModifier, Enum.valueOf(EnumChatFormat, modifier.getColor().getLegacyColor().name()));
-        }
-        if (modifier.isBold()) magicCodes.get(0).set(nmsModifier, true);
-        if (modifier.isItalic()) magicCodes.get(1).set(nmsModifier, true);
-        if (modifier.isStrikethrough()) magicCodes.get(2).set(nmsModifier, true);
-        if (modifier.isUnderlined()) magicCodes.get(3).set(nmsModifier, true);
-        if (modifier.isObfuscated()) magicCodes.get(4).set(nmsModifier, true);
-        return nmsModifier;
-    }
-
-    /**
-     * Attempts to load component converter.
-     */
-    public static void tryLoad() {
-        try {
-            INSTANCE = new ComponentConverter();
-        } catch (Exception ignored) {
-        }
-    }
-
-    /**
-     * Makes sure the component converter is available and throws an exception if not.
-     */
-    public static void ensureAvailable() {
-        if (INSTANCE == null) throw new IllegalStateException("Component converter is not available");
-    }
-}
@@ -1,56 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.nms;
-
-import lombok.SneakyThrows;
-import me.neznamy.tab.shared.util.BiConsumerWithException;
-import me.neznamy.tab.shared.util.ReflectionUtils;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-/**
- * Class for sending packets to players.
- */
-public class PacketSender {
-
-    /** Function for sending packet */
-    @NotNull
-    private final BiConsumerWithException<Player, Object> send;
-
-    /**
-     * Constructs new instance and attempts to load required classes, fields and methods.
-     * If something fails, error is thrown.
-     *
-     * @throws  ReflectiveOperationException
-     *          If something fails
-     */
-    public PacketSender() throws ReflectiveOperationException {
-        Class<?> Packet = BukkitReflection.getClass("network.protocol.Packet", "Packet");
-        Class<?> EntityPlayer = BukkitReflection.getClass("server.level.ServerPlayer", "server.level.EntityPlayer", "EntityPlayer");
-        Class<?> PlayerConnection = BukkitReflection.getClass("server.network.ServerGamePacketListenerImpl", "server.network.PlayerConnection", "PlayerConnection");
-        Method getHandle = BukkitReflection.getBukkitClass("entity.CraftPlayer").getMethod("getHandle");
-        Field PLAYER_CONNECTION = ReflectionUtils.getOnlyField(EntityPlayer, PlayerConnection);
-        Method sendPacket;
-        if (BukkitReflection.getMinorVersion() >= 7) {
-            sendPacket = ReflectionUtils.getMethods(PlayerConnection, void.class, Packet).get(0);
-        } else {
-            sendPacket = ReflectionUtils.getMethod(PlayerConnection, new String[]{"sendPacket"}, Packet);
-        }
-        send = (player, packet) -> sendPacket.invoke(PLAYER_CONNECTION.get(getHandle.invoke(player)), packet);
-    }
-
-    /**
-     * Sends packet to specified player.
-     * If something goes wrong, throws an exception.
-     *
-     * @param   player
-     *          Player to send packet to
-     * @param   packet
-     *          Packet to send
-     */
-    @SneakyThrows
-    public void sendPacket(@NotNull Player player, @NotNull Object packet) {
-        send.accept(player, packet);
-    }
-}
@@ -1,54 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.nms;
-
-import lombok.SneakyThrows;
-import me.neznamy.tab.platforms.bukkit.BukkitUtils;
-import me.neznamy.tab.shared.util.FunctionWithException;
-import me.neznamy.tab.shared.util.ReflectionUtils;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-/**
- * Class for retrieving ping of players.
- */
-public class PingRetriever {
-
-    /** Ping getter function */
-    private static FunctionWithException<Player, Integer> getPing;
-
-    /**
-     * Attempts to load required classes, fields and methods and marks class as available.
-     * If something fails, error message is printed and class is not marked as available.
-     */
-    public static void tryLoad() {
-        try {
-            if (BukkitReflection.getMinorVersion() >= 17) {
-                getPing = Player::getPing;
-            } else {
-                Method getHandle = BukkitReflection.getBukkitClass("entity.CraftPlayer").getMethod("getHandle");
-                Class<?> EntityPlayer = BukkitReflection.getClass("server.level.ServerPlayer", "server.level.EntityPlayer", "EntityPlayer");
-                Field PING = ReflectionUtils.getField(EntityPlayer, "ping", "field_71138_i"); // 1.5.2 - 1.16.5, 1.7.10 Thermos
-                getPing = player -> PING.getInt(getHandle.invoke(player));
-            }
-        } catch (Exception e) {
-            getPing = p -> -1;
-            BukkitUtils.compatibilityError(e, "getting player's ping", null, "%ping% returning -1");
-        }
-    }
-
-    /**
-     * Returns player's ping. If ping getter is not available and fields
-     * failed to load, returns {@code -1}. If an exception was throws by
-     * reflective operation, it is re-thrown.
-     *
-     * @param   player
-     *          Player to get ping of
-     * @return  Player's ping or {@code -1} if it failed
-     */
-    @SneakyThrows
-    public static int getPing(@NotNull Player player) {
-        return getPing.apply(player);
-    }
-}
@@ -1,56 +1,61 @@
 package me.neznamy.tab.platforms.bukkit.platform;

 import lombok.Getter;
+import lombok.Setter;
 import lombok.SneakyThrows;
 import me.clip.placeholderapi.PlaceholderAPI;
-import me.neznamy.tab.platforms.bukkit.*;
-import me.neznamy.tab.platforms.bukkit.entity.PacketEntityView;
-import me.neznamy.tab.platforms.bukkit.hook.BukkitPremiumVanishHook;
-import me.neznamy.tab.platforms.bukkit.nms.BukkitReflection;
-import me.neznamy.tab.platforms.bukkit.nms.ComponentConverter;
-import me.neznamy.tab.platforms.bukkit.nms.PingRetriever;
-import me.neznamy.tab.platforms.bukkit.scoreboard.ScoreboardLoader;
-import me.neznamy.tab.platforms.bukkit.tablist.TabListBase;
-import me.neznamy.tab.shared.GroupManager;
-import me.neznamy.tab.shared.ProtocolVersion;
-import me.neznamy.tab.shared.TabConstants;
-import me.neznamy.tab.shared.chat.EnumChatFormat;
-import me.neznamy.tab.shared.chat.StructuredComponent;
-import me.neznamy.tab.shared.chat.SimpleComponent;
-import me.neznamy.tab.shared.chat.TabComponent;
-import me.neznamy.tab.shared.features.injection.PipelineInjector;
-import me.neznamy.tab.shared.features.types.TabFeature;
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import me.neznamy.tab.platforms.bukkit.BukkitEventListener;
+import me.neznamy.tab.platforms.bukkit.BukkitPipelineInjector;
+import me.neznamy.tab.platforms.bukkit.BukkitTabCommand;
+import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
+import me.neznamy.tab.platforms.bukkit.bossbar.BukkitBossBar;
+import me.neznamy.tab.platforms.bukkit.bossbar.ViaBossBar;
 import me.neznamy.tab.platforms.bukkit.features.BukkitTabExpansion;
 import me.neznamy.tab.platforms.bukkit.features.PerWorldPlayerList;
-import me.neznamy.tab.platforms.bukkit.features.WitherBossBar;
-import me.neznamy.tab.platforms.bukkit.features.BukkitNameTagX;
-import me.neznamy.tab.shared.TAB;
+import me.neznamy.tab.platforms.bukkit.hook.BukkitPremiumVanishHook;
+import me.neznamy.tab.platforms.bukkit.provider.ImplementationProvider;
+import me.neznamy.tab.shared.*;
 import me.neznamy.tab.shared.backend.BackendPlatform;
-import me.neznamy.tab.shared.features.PlaceholderManagerImpl;
-import me.neznamy.tab.shared.features.bossbar.BossBarManagerImpl;
-import me.neznamy.tab.shared.features.nametags.NameTag;
-import me.neznamy.tab.shared.hook.LuckPermsHook;
-import me.neznamy.tab.shared.hook.PremiumVanishHook;
-import me.neznamy.tab.shared.placeholders.types.PlayerPlaceholderImpl;
+import me.neznamy.tab.shared.chat.TabTextColor;
+import me.neznamy.tab.shared.chat.component.TabComponent;
+import me.neznamy.tab.shared.chat.component.TabKeybindComponent;
+import me.neznamy.tab.shared.chat.component.TabTextComponent;
+import me.neznamy.tab.shared.chat.component.TabTranslatableComponent;
+import me.neznamy.tab.shared.chat.component.object.TabObjectComponent;
+import me.neznamy.tab.shared.features.PerWorldPlayerListConfiguration;
+import me.neznamy.tab.shared.features.injection.PipelineInjector;
+import me.neznamy.tab.shared.features.types.TabFeature;
 import me.neznamy.tab.shared.placeholders.expansion.EmptyTabExpansion;
 import me.neznamy.tab.shared.placeholders.expansion.TabExpansion;
+import me.neznamy.tab.shared.placeholders.types.PlayerPlaceholderImpl;
+import me.neznamy.tab.shared.platform.BossBar;
+import me.neznamy.tab.shared.platform.Scoreboard;
+import me.neznamy.tab.shared.platform.TabList;
 import me.neznamy.tab.shared.platform.TabPlayer;
+import me.neznamy.tab.shared.platform.impl.AdventureBossBar;
+import me.neznamy.tab.shared.platform.impl.DummyBossBar;
 import me.neznamy.tab.shared.util.ReflectionUtils;
-import net.milkbowl.vault.chat.Chat;
-import net.milkbowl.vault.permission.Permission;
+import net.kyori.adventure.audience.Audience;
 import org.bstats.bukkit.Metrics;
 import org.bstats.charts.SimplePie;
 import org.bukkit.Bukkit;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
 import org.bukkit.command.PluginCommand;
+import org.bukkit.command.SimpleCommandMap;
+import org.bukkit.command.defaults.BukkitCommand;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
-import org.bukkit.plugin.RegisteredServiceProvider;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

 import java.io.File;
-import java.lang.reflect.Field;
+import java.util.*;
+import java.util.function.BiConsumer;

 /**
 * Implementation of Platform interface for Bukkit platform
@@ -63,19 +68,13 @@ public class BukkitPlatform implements BackendPlatform {
    private final JavaPlugin plugin;

    /** Server version */
-    @Getter
    private final ProtocolVersion serverVersion = ProtocolVersion.fromFriendlyName(Bukkit.getBukkitVersion().split("-")[0]);

    /** Variables checking presence of other plugins to hook into */
    private final boolean placeholderAPI = ReflectionUtils.classExists("me.clip.placeholderapi.PlaceholderAPI");

-    /** NMS server to get TPS from on spigot */
-    @Nullable
-    private Object server;
-
-    /** TPS field */
-    @Nullable
-    private Field spigotTps;
+    /** Spigot field for tracking TPS, the array is final and only being modified instead of re-instantiated */
+    private double[] recentTps;

    /** Detection for presence of Paper's TPS getter */
    private final boolean paperTps = ReflectionUtils.methodExists(Bukkit.class, "getTPS");
@@ -83,83 +82,125 @@ public class BukkitPlatform implements BackendPlatform {
    /** Detection for presence of Paper's MSPT getter */
    private final boolean paperMspt = ReflectionUtils.methodExists(Bukkit.class, "getAverageTickTime");

+    /** Package name of the server implementation, null on Paper 1.20.5+ / Spigot 26+ */
+    @Nullable
+    private final String serverPackage;
+
+    /** Implementation for creating new instances using content available on the server */
+    @NotNull
+    @Setter
+    private ImplementationProvider implementationProvider;
+
+    private final boolean modernOnlinePlayers;
+
+    /** Command map for dynamic command registering */
+    private final SimpleCommandMap commandMap;
+    private final Map<String, Command> knownCommands;
+
+    /** List of custom commands registered to be able to unregister them on reload */
+    private final List<Command> customCommands = new ArrayList<>();
+
    /**
     * Constructs new instance with given plugin.
     *
     * @param   plugin
     *          Plugin
     */
+    @SneakyThrows
+    @SuppressWarnings("unchecked")
    public BukkitPlatform(@NotNull JavaPlugin plugin) {
        this.plugin = plugin;
-        long time = System.currentTimeMillis();
+        modernOnlinePlayers = Bukkit.class.getMethod("getOnlinePlayers").getReturnType() == Collection.class;
+        String CRAFTBUKKIT_PACKAGE = Bukkit.getServer().getClass().getPackage().getName();
+        String[] array = CRAFTBUKKIT_PACKAGE.split("\\.");
+        serverPackage = array.length > 3 ? array[3] : null;
+        implementationProvider = findImplementationProvider();
+        logInfo(new TabTextComponent("Found NMS implementation: " + implementationProvider.getClass().getName(), TabTextColor.GRAY));
        try {
-            server = Bukkit.getServer().getClass().getMethod("getServer").invoke(Bukkit.getServer());
-            spigotTps = server.getClass().getField("recentTps");
+            Object server = Bukkit.getServer().getClass().getMethod("getServer").invoke(Bukkit.getServer());
+            recentTps = ((double[]) server.getClass().getField("recentTps").get(server));
        } catch (ReflectiveOperationException ignored) {
            //not spigot
        }
        if (Bukkit.getPluginManager().isPluginEnabled("PremiumVanish")) {
-            PremiumVanishHook.setInstance(new BukkitPremiumVanishHook());
+            new BukkitPremiumVanishHook().register();
        }
-        ComponentConverter.tryLoad();
-        PacketEntityView.tryLoad();
-        PingRetriever.tryLoad();
-        TabListBase.findInstance();
-        ScoreboardLoader.tryLoad();
-        if (BukkitReflection.getMinorVersion() >= 8) {
-            BukkitPipelineInjector.tryLoad();
-        }
-        BukkitUtils.sendCompatibilityMessage();
-        Bukkit.getConsoleSender().sendMessage("[TAB] " + EnumChatFormat.GRAY + "Loaded NMS hook in " + (System.currentTimeMillis()-time) + "ms");
+        commandMap = (SimpleCommandMap) Bukkit.getServer().getClass().getMethod("getCommandMap").invoke(Bukkit.getServer());
+        knownCommands = (Map<String, Command>) ReflectionUtils.getField(SimpleCommandMap.class, "knownCommands").get(commandMap);
    }

-    @Override
+    /**
+     * Finds implementation provider for current server software and version.
+     *
+     * @return  Implementation provider for current server
+     * @throws  IllegalStateException
+     *          If no implementation was found
+     */
    @NotNull
-    public BossBarManagerImpl getBossBar() {
-        if (BukkitReflection.getMinorVersion() <= 8) return new WitherBossBar(plugin);
-        return new BossBarManagerImpl();
+    private ImplementationProvider findImplementationProvider() {
+        if (serverPackage != null) {
+            // Paper <1.20.5 or Spigot 1.x
+            try {
+                // Does not actually support flat 1.19, but whatever, no one is using it anyway
+                return (ImplementationProvider) Class.forName("me.neznamy.tab.platforms.bukkit." + serverPackage + ".NMSImplementationProvider").getConstructor().newInstance();
+            } catch (ReflectiveOperationException ignored) {
+                throw new IllegalStateException("Implementation for version \"" + serverPackage + "\" was not found.");
+            }
+        }
+
+        Map<ProtocolVersion, String> spigotVersions = new LinkedHashMap<>();
+        spigotVersions.put(ProtocolVersion.V26_1, "v26_1");
+
+        Map<ProtocolVersion, String> paperVersions = new LinkedHashMap<>();
+        paperVersions.put(ProtocolVersion.V1_20_5, "paper_1_20_5");
+        paperVersions.put(ProtocolVersion.V1_20_6, "paper_1_20_5");
+        paperVersions.put(ProtocolVersion.V1_21, "paper_1_20_5");
+        paperVersions.put(ProtocolVersion.V1_21_1, "paper_1_20_5");
+        paperVersions.put(ProtocolVersion.V1_21_2, "paper_1_21_2");
+        paperVersions.put(ProtocolVersion.V1_21_3, "paper_1_21_2");
+        paperVersions.put(ProtocolVersion.V1_21_4, "paper_1_21_4");
+        paperVersions.put(ProtocolVersion.V1_21_5, "paper_1_21_4");
+        paperVersions.put(ProtocolVersion.V1_21_6, "paper_1_21_4");
+        paperVersions.put(ProtocolVersion.V1_21_7, "paper_1_21_4");
+        paperVersions.put(ProtocolVersion.V1_21_8, "paper_1_21_4");
+        paperVersions.put(ProtocolVersion.V1_21_9, "paper_1_21_9");
+        paperVersions.put(ProtocolVersion.V1_21_10, "paper_1_21_9");
+        paperVersions.put(ProtocolVersion.V1_21_11, "paper_1_21_11");
+
+        String software;
+        Map<ProtocolVersion, String> versions;
+        if (paperTps) {  // This needs a better check
+            software = "Paper";
+            versions = paperVersions;
+        } else {
+            software = "Spigot";
+            versions = spigotVersions;
+        }
+        String serverVersionString = Bukkit.getBukkitVersion().split("-")[0];
+        String implementation = versions.get(serverVersion);
+        if (implementation == null) {
+            throw new IllegalStateException(String.format("No implementation is available for your server version (%s %s).", software, serverVersionString));
+        }
+        try {
+            return (ImplementationProvider) Class.forName("me.neznamy.tab.platforms.bukkit." + implementation + ".NMSImplementationProvider").getConstructor().newInstance();
+        } catch (ClassNotFoundException e) {
+            throw new IllegalStateException(String.format("Your server version (%s %s) is marked as compatible, but the implementation does not exist. This is probably a bug.", software, serverVersionString), e);
+        } catch (ReflectiveOperationException e) {
+            throw new IllegalStateException(String.format("Failed to initialize implementation for %s %s. This is probably a bug.", software, serverVersionString), e);
+        }
    }

    @Override
    public void loadPlayers() {
-        for (Player p : BukkitUtils.getOnlinePlayers()) {
+        for (Player p : getOnlinePlayers()) {
            TAB.getInstance().addPlayer(new BukkitTabPlayer(this, p));
        }
    }

-    @Override
-    public void registerPlaceholders() {
-        PlaceholderManagerImpl manager = TAB.getInstance().getPlaceholderManager();
-        manager.registerServerPlaceholder("%vault-prefix%", -1, () -> "");
-        manager.registerServerPlaceholder("%vault-suffix%", -1, () -> "");
-        if (Bukkit.getPluginManager().isPluginEnabled("Vault")) {
-            RegisteredServiceProvider<Chat> rspChat = Bukkit.getServicesManager().getRegistration(Chat.class);
-            if (rspChat != null) {
-                Chat chat = rspChat.getProvider();
-                int refresh = TAB.getInstance().getConfiguration().getPermissionRefreshInterval();
-                manager.registerPlayerPlaceholder("%vault-prefix%", refresh, p -> chat.getPlayerPrefix((Player) p.getPlayer()));
-                manager.registerPlayerPlaceholder("%vault-suffix%", refresh, p -> chat.getPlayerSuffix((Player) p.getPlayer()));
-            }
-        }
-        // Override for the PAPI placeholder to prevent console errors on unsupported server versions when ping field changes
-        manager.registerPlayerPlaceholder("%player_ping%", manager.getRefreshInterval("%player_ping%"),
-                p -> ((TabPlayer) p).getPing());
-        BackendPlatform.super.registerPlaceholders();
-    }
-
    @Override
    @Nullable
    public PipelineInjector createPipelineInjector() {
-        return BukkitReflection.getMinorVersion() >= 8 && BukkitPipelineInjector.isAvailable() ? new BukkitPipelineInjector() : null;
-    }
-
-    @Override
-    @NotNull
-    public NameTag getUnlimitedNameTags() {
-        return BukkitReflection.getMinorVersion() >= 8 &&
-                PacketEntityView.isAvailable() &&
-                BukkitPipelineInjector.isAvailable() ?
-                new BukkitNameTagX(plugin) : new NameTag();
+        return ReflectionUtils.classExists("io.netty.channel.Channel") ? new BukkitPipelineInjector() : null;
    }

    @Override
@@ -175,8 +216,8 @@ public class BukkitPlatform implements BackendPlatform {

    @Override
    @Nullable
-    public TabFeature getPerWorldPlayerList() {
-        return new PerWorldPlayerList(plugin);
+    public TabFeature getPerWorldPlayerList(@NotNull PerWorldPlayerListConfiguration configuration) {
+        return new PerWorldPlayerList(plugin, this, configuration);
    }

    @Override
@@ -185,39 +226,41 @@ public class BukkitPlatform implements BackendPlatform {
            registerDummyPlaceholder(identifier);
            return;
        }
-        PlaceholderManagerImpl pl = TAB.getInstance().getPlaceholderManager();
-        int refresh = pl.getRefreshInterval(identifier);
        if (identifier.startsWith("%rel_")) {
            //relational placeholder
-            TAB.getInstance().getPlaceholderManager().registerRelationalPlaceholder(identifier, pl.getRefreshInterval(identifier), (viewer, target) ->
+            TAB.getInstance().getPlaceholderManager().registerRelationalPlaceholder(identifier, (viewer, target) ->
                    PlaceholderAPI.setRelationalPlaceholders((Player) viewer.getPlayer(), (Player) target.getPlayer(), identifier));
        } else if (identifier.startsWith("%sync:")) {
-            registerSyncPlaceholder(identifier, refresh);
+            registerSyncPlaceholder(identifier);
        } else if (identifier.startsWith("%server_")) {
-            TAB.getInstance().getPlaceholderManager().registerServerPlaceholder(identifier, refresh,
-                    () -> PlaceholderAPI.setPlaceholders(null, identifier));
+            boolean stripLeadingAsterisk = identifier.startsWith("%server_tps");
+            TAB.getInstance().getPlaceholderManager().registerServerPlaceholder(identifier,
+                    () -> {
+                        String out = PlaceholderAPI.setPlaceholders(null, identifier);
+                        return stripLeadingAsterisk && out != null && out.startsWith("*") ? out.substring(1) : out;
+                    });
        } else {
-            TAB.getInstance().getPlaceholderManager().registerPlayerPlaceholder(identifier, refresh,
+            TAB.getInstance().getPlaceholderManager().registerPlayerPlaceholder(identifier,
                    p -> PlaceholderAPI.setPlaceholders((Player) p.getPlayer(), identifier));
        }
    }

    /**
-     * Registers a sync placeholder with given identifier and refresh.
+     * Registers a sync placeholder with given identifier and automatically decided refresh.
     *
     * @param   identifier
     *          Placeholder identifier
-     * @param   refresh
-     *          Placeholder refresh
     */
-    public void registerSyncPlaceholder(@NotNull String identifier, int refresh) {
+    public void registerSyncPlaceholder(@NotNull String identifier) {
        String syncedPlaceholder = "%" + identifier.substring(6);
        PlayerPlaceholderImpl[] ppl = new PlayerPlaceholderImpl[1];
-        ppl[0] = TAB.getInstance().getPlaceholderManager().registerPlayerPlaceholder(identifier, refresh, p -> {
+        ppl[0] = TAB.getInstance().getPlaceholderManager().registerPlayerPlaceholder(identifier, p -> {
            Bukkit.getScheduler().runTask(plugin, () -> {
                long time = System.nanoTime();
                ppl[0].updateValue(p, placeholderAPI ? PlaceholderAPI.setPlaceholders((Player) p.getPlayer(), syncedPlaceholder) : identifier);
-                TAB.getInstance().getCPUManager().addPlaceholderTime(identifier, System.nanoTime() - time);
+                long totalTime =  System.nanoTime()-time;
+                TAB.getInstance().getCPUManager().addPlaceholderTime(identifier, totalTime);
+                TAB.getInstance().getCpu().addTime(TAB.getInstance().getPlaceholderManager().getFeatureName(), TabConstants.CpuUsageCategory.PLACEHOLDER_REQUEST, totalTime);
            });
            return null;
        });
@@ -225,46 +268,37 @@ public class BukkitPlatform implements BackendPlatform {

    @Override
    public void logInfo(@NotNull TabComponent message) {
-        Bukkit.getConsoleSender().sendMessage("[TAB] " + toBukkitFormat(message, true));
+        Bukkit.getConsoleSender().sendMessage("[TAB] " + toBukkitFormat(message));
    }

    @Override
    public void logWarn(@NotNull TabComponent message) {
-        Bukkit.getConsoleSender().sendMessage(EnumChatFormat.RED + "[TAB] [WARN] " + toBukkitFormat(message, true));
-    }
-
-    @Override
-    @NotNull
-    public String getServerVersionInfo() {
-        return "[Bukkit] " + Bukkit.getName() + " - " + Bukkit.getBukkitVersion().split("-")[0];
+        Bukkit.getConsoleSender().sendMessage("§c[TAB] [WARN] " + toBukkitFormat(message));
    }

    @Override
    public void registerListener() {
-        Bukkit.getPluginManager().registerEvents(new BukkitEventListener(), plugin);
+        Bukkit.getPluginManager().registerEvents(new BukkitEventListener(this), plugin);
    }

    @Override
    public void registerCommand() {
-        PluginCommand command = Bukkit.getPluginCommand(TabConstants.COMMAND_BACKEND);
+        PluginCommand command = Bukkit.getPluginCommand(getCommand());
        if (command != null) {
            BukkitTabCommand cmd = new BukkitTabCommand();
            command.setExecutor(cmd);
            command.setTabCompleter(cmd);
        } else {
-            logWarn(new SimpleComponent("Failed to register command, is it defined in plugin.yml?"));
+            logWarn(new TabTextComponent("Failed to register command, is it defined in plugin.yml?", TabTextColor.RED));
        }
    }

    @Override
    public void startMetrics() {
        Metrics metrics = new Metrics(plugin, TabConstants.BSTATS_PLUGIN_ID_BUKKIT);
-        metrics.addCustomChart(new SimplePie(TabConstants.MetricsChart.UNLIMITED_NAME_TAG_MODE_ENABLED,
-                () -> TAB.getInstance().getFeatureManager().isFeatureEnabled(TabConstants.Feature.UNLIMITED_NAME_TAGS) ? "Yes" : "No"));
        metrics.addCustomChart(new SimplePie(TabConstants.MetricsChart.PERMISSION_SYSTEM,
                () -> TAB.getInstance().getGroupManager().getPermissionPlugin()));
-        metrics.addCustomChart(new SimplePie(TabConstants.MetricsChart.SERVER_VERSION,
-                () -> "1." + BukkitReflection.getMinorVersion() + ".x"));
+        metrics.addCustomChart(new SimplePie("tab_6_0_0_servers", serverVersion::getFriendlyName));
    }

    @Override
@@ -274,36 +308,96 @@ public class BukkitPlatform implements BackendPlatform {
    }

    @Override
-    public Object convertComponent(@NotNull TabComponent component, boolean modern) {
-        if (ComponentConverter.INSTANCE != null) {
-            return ComponentConverter.INSTANCE.convert(component, modern);
-        } else {
-            return component;
-        }
+    @NotNull
+    public Object convertComponent(@NotNull TabComponent component) {
+        return implementationProvider.getComponentConverter().convert(component);
    }

    @Override
    @NotNull
-    public GroupManager detectPermissionPlugin() {
-        if (LuckPermsHook.getInstance().isInstalled()) {
-            return new GroupManager("LuckPerms", LuckPermsHook.getInstance().getGroupFunction());
-        }
-        if (Bukkit.getPluginManager().isPluginEnabled("Vault")) {
-            RegisteredServiceProvider<Permission> provider = Bukkit.getServicesManager().getRegistration(Permission.class);
-            if (provider != null && !provider.getProvider().getName().equals("SuperPerms")) {
-                return new GroupManager(provider.getProvider().getName(), p -> provider.getProvider().getPrimaryGroup((Player) p.getPlayer()));
-            }
-        }
-        return new GroupManager("None", p -> TabConstants.NO_GROUP);
+    public Scoreboard createScoreboard(@NotNull TabPlayer player) {
+        return implementationProvider.newScoreboard((BukkitTabPlayer) player);
+    }
+
+    @Override
+    @NotNull
+    public BossBar createBossBar(@NotNull TabPlayer player) {
+        //noinspection ConstantValue
+        if (AdventureBossBar.isAvailable() && Audience.class.isAssignableFrom(Player.class)) return new AdventureBossBar(player);
+
+        // 1.9+ server, handle using API, potential 1.8 players are handled by ViaVersion
+        if (BukkitBossBar.isAvailable()) return new BukkitBossBar((BukkitTabPlayer) player);
+
+        // 1.9+ player on 1.8 server, handle using ViaVersion API
+        if (player.getVersion().getNetworkId() >= ProtocolVersion.V1_9.getNetworkId()) return new ViaBossBar((BukkitTabPlayer) player);
+
+        // 1.8- server and player, no implementation
+        return new DummyBossBar();
+    }
+
+    @Override
+    @NotNull
+    public TabList createTabList(@NotNull TabPlayer player) {
+        return implementationProvider.newTabList((BukkitTabPlayer) player);
+    }
+
+    @Override
+    public boolean supportsScoreboards() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsListed() {
+        return serverVersion.getNetworkId() >= ProtocolVersion.V1_19_3.getNetworkId();
+    }
+
+    @Override
+    public boolean supportsListOrder() {
+        return serverVersion.getNetworkId() >= ProtocolVersion.V1_21_2.getNetworkId();
+    }
+
+    @Override
+    public boolean isSafeFromPacketEventsBug() {
+        return serverVersion.getMinorVersion() >= 13;
+    }
+
+    @Override
+    public void registerCustomCommand(@NotNull String commandName, @NotNull BiConsumer<TabPlayer, String[]> function) {
+        Command cmd = new BukkitCommand(commandName) {
+
+            @Override
+            public boolean execute(@NotNull CommandSender commandSender, @NotNull String alias, @NotNull String[] args) {
+                if (commandSender instanceof Player) {
+                    TabPlayer p = TAB.getInstance().getPlayer(((Player) commandSender).getUniqueId());
+                    if (p == null) return false; //player not loaded correctly
+                    function.accept(p, args);
+                } else {
+                    commandSender.sendMessage(toBukkitFormat(
+                            TabComponent.fromColoredText(TAB.getInstance().getConfiguration().getMessages().getCommandOnlyFromGame())
+                    ));
+                }
+                return false;
+            }
+        };
+        commandMap.register(commandName, cmd);
+        customCommands.add(cmd);
+    }
+
+    @Override
+    public void unregisterAllCustomCommands() {
+        for (Command command : customCommands) {
+            knownCommands.remove(command.getName());
+            knownCommands.remove(command.getName() + ":" + command.getName());
+            command.unregister(commandMap);
+        }
    }

    @Override
-    @SneakyThrows
    public double getTPS() {
-        if (paperTps) {
+        if (recentTps != null) {
+            return recentTps[0];
+        } else if (paperTps) {
            return Bukkit.getTPS()[0];
-        } else if (spigotTps != null) {
-            return ((double[]) spigotTps.get(server))[0];
        } else {
            return -1;
        }
@@ -328,54 +422,81 @@ public class BukkitPlatform implements BackendPlatform {
    }

    /**
-     * Runs an entity task that may or may not need to use its main thread.
-     *
-     * @param   entity
-     *          Entity to work with
-     * @param   task
-     *          Task to run
-     */
-    public void runEntityTask(@NotNull Entity entity, @NotNull Runnable task) {
-        task.run();
-    }
-
-    @Override
-    public boolean canSee(@NotNull TabPlayer viewer, @NotNull TabPlayer target) {
-        if (BackendPlatform.super.canSee(viewer, target)) return true;
-        return ((BukkitTabPlayer)viewer).getPlayer().canSee(((BukkitTabPlayer)target).getPlayer());
-    }
-
-    /**
-     * Converts component to legacy string using bukkit RGB format if supported by both server and client.
+     * Converts component to string using bukkit RGB format if supported by the server.
     * If not, closest legacy color is used instead.
     *
     * @param   component
     *          Component to convert
-     * @param   rgbClient
-     *          Whether client accepts RGB colors or not.
     * @return  Converted string using bukkit color format
     */
    @NotNull
-    public String toBukkitFormat(@NotNull TabComponent component, boolean rgbClient) {
-        if (component instanceof SimpleComponent) return component.toLegacyText();
-        StructuredComponent iComponent = (StructuredComponent) component;
+    public String toBukkitFormat(@NotNull TabComponent component) {
        StringBuilder sb = new StringBuilder();
-        if (iComponent.getModifier().getColor() != null) {
-            if (serverVersion.supportsRGB() && rgbClient) {
-                String hexCode = iComponent.getModifier().getColor().getHexCode();
-                char c = EnumChatFormat.COLOR_CHAR;
-                sb.append(c).append("x").append(c).append(hexCode.charAt(0)).append(c).append(hexCode.charAt(1))
-                        .append(c).append(hexCode.charAt(2)).append(c).append(hexCode.charAt(3))
-                        .append(c).append(hexCode.charAt(4)).append(c).append(hexCode.charAt(5));
+        if (component.getModifier().getColor() != null) {
+            if (serverVersion.getNetworkId() >= ProtocolVersion.V1_16.getNetworkId()) {
+                String hexCode = component.getModifier().getColor().getHexCode();
+                sb.append('§').append("x").append('§').append(hexCode.charAt(0)).append('§').append(hexCode.charAt(1))
+                        .append('§').append(hexCode.charAt(2)).append('§').append(hexCode.charAt(3))
+                        .append('§').append(hexCode.charAt(4)).append('§').append(hexCode.charAt(5));
            } else {
-                sb.append(iComponent.getModifier().getColor().getLegacyColor());
+                sb.append('§').append(component.getModifier().getColor().getLegacyColor().getCharacter());
            }
        }
-        sb.append(iComponent.getModifier().getMagicCodes());
-        sb.append(iComponent.getText());
-        for (StructuredComponent extra : iComponent.getExtra()) {
-            sb.append(toBukkitFormat(extra, rgbClient));
+        sb.append(component.getModifier().getMagicCodes());
+        if (component instanceof TabTextComponent) {
+            sb.append(((TabTextComponent) component).getText());
+        } else if (component instanceof TabTranslatableComponent) {
+            sb.append(((TabTranslatableComponent) component).getKey());
+        } else if (component instanceof TabKeybindComponent) {
+            sb.append(((TabKeybindComponent) component).getKeybind());
+        } else if (component instanceof TabObjectComponent) {
+            sb.append(component.toLegacyText());
+        } else {
+            throw new IllegalStateException("Unexpected component type: " + component.getClass().getName());
+        }
+        for (TabComponent extra : component.getExtra()) {
+            sb.append(toBukkitFormat(extra));
        }
        return sb.toString();
    }
-}
+
+    /**
+     * Returns online players from Bukkit API.
+     * This method may use reflections, because the return type changed in 1.7.10,
+     * and we want to avoid errors.
+     *
+     * @return  Online players from Bukkit API.
+     */
+    @SneakyThrows
+    @NotNull
+    public Collection<? extends Player> getOnlinePlayers() {
+        if (modernOnlinePlayers) {
+            return Bukkit.getOnlinePlayers();
+        }
+        return Arrays.asList((Player[]) Bukkit.class.getMethod("getOnlinePlayers").invoke(null));
+    }
+
+    @Override
+    @NotNull
+    public Object dump() {
+        Map<String, Object> map = new LinkedHashMap<>();
+        map.put("server-type", "Bukkit");
+        map.put("server-name", Bukkit.getName());
+        map.put("server-version", Bukkit.getBukkitVersion().split("-")[0]);
+        map.put("craftbukkit-package", serverPackage);
+        map.put("tab-version", ProjectVariables.PLUGIN_VERSION);
+        Map<String, Object> plugins = new LinkedHashMap<>();
+        for (Plugin p : Bukkit.getPluginManager().getPlugins()) {
+            plugins.put(p.getDescription().getName(), p.getDescription().getVersion());
+        }
+        map.put("plugins", plugins);
+        if (placeholderAPI) {
+            Map<String, String> expansions = new LinkedHashMap<>();
+            for (PlaceholderExpansion p : PlaceholderAPIPlugin.getInstance().getLocalExpansionManager().getExpansions()) {
+                expansions.put(p.getIdentifier(), p.getVersion());
+            }
+            map.put("placeholderapi-expansions", expansions);
+        }
+        return map;
+    }
+}
@@ -1,13 +1,16 @@
 package me.neznamy.tab.platforms.bukkit.platform;

+import lombok.NonNull;
 import lombok.SneakyThrows;
 import me.clip.placeholderapi.PlaceholderAPI;
 import me.neznamy.tab.platforms.bukkit.features.PerWorldPlayerList;
 import me.neznamy.tab.shared.TAB;
 import me.neznamy.tab.shared.TabConstants;
-import me.neznamy.tab.shared.chat.SimpleComponent;
+import me.neznamy.tab.shared.cpu.TimedCaughtTask;
+import me.neznamy.tab.shared.data.World;
 import me.neznamy.tab.shared.placeholders.types.PlayerPlaceholderImpl;
 import me.neznamy.tab.shared.platform.TabPlayer;
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerChangedWorldEvent;
@@ -15,7 +18,10 @@ import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;

+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.util.function.Consumer;
+import java.util.function.Function;

 /**
 * Platform override for Folia.
@@ -36,40 +42,88 @@ public class FoliaPlatform extends BukkitPlatform {
    public void loadPlayers() {
        super.loadPlayers();

-        // Values are never updated in the API, warn users
-        logWarn(new SimpleComponent("Folia never updates MSPT and TPS values in the API, making " +
-                "%mspt% and %tps% return the default values (0 and 20)."));
-
        // Folia never calls PlayerChangedWorldEvent, this is a workaround
-        TAB.getInstance().getCPUManager().startRepeatingMeasuredTask(100, "Folia compatibility", "Refreshing world", () -> {
+        TAB.getInstance().getCpu().getProcessingThread().repeatTask(new TimedCaughtTask(TAB.getInstance().getCpu(), ()  -> {
            for (TabPlayer player : TAB.getInstance().getOnlinePlayers()) {
-                String bukkitWorld = ((Player)player.getPlayer()).getWorld().getName();
-                if (!player.getWorld().equals(bukkitWorld)) {
-                    TAB.getInstance().getFeatureManager().onWorldChange(player.getUniqueId(), bukkitWorld);
+                World actualWorld = World.byName(((Player) player.getPlayer()).getWorld().getName());
+                if (player.world != actualWorld) {
+                    TAB.getInstance().getFeatureManager().onWorldChange(player.getUniqueId(), actualWorld);
                    PerWorldPlayerList pwp = TAB.getInstance().getFeatureManager().getFeature(TabConstants.Feature.PER_WORLD_PLAYER_LIST);
                    if (pwp != null) {
                        runSync((Entity) player.getPlayer(), () -> pwp.onWorldChange(new PlayerChangedWorldEvent((Player) player.getPlayer(), ((Player) player.getPlayer()).getWorld())));
                    }
                }
            }
-        });
+        }, "Folia compatibility", "Refreshing world"), 100);
    }

    @Override
-    public void registerSyncPlaceholder(@NotNull String identifier, int refresh) {
+    public void registerPlaceholders() {
+        super.registerPlaceholders();
+        DecimalFormat decimal2;
+        DecimalFormatSymbols symbols = new DecimalFormatSymbols();
+        symbols.setDecimalSeparator('.');
+        decimal2 = new DecimalFormat("#.##", symbols);
+        registerInternalSyncPlaceholder(TabConstants.Placeholder.MSPT, p -> decimal2.format(Bukkit.getAverageTickTime()));
+        registerInternalSyncPlaceholder(TabConstants.Placeholder.TPS, p -> decimal2.format(Math.min(20, Bukkit.getTPS()[0])));
+    }
+
+    @Override
+    public void registerSyncPlaceholder(@NotNull String identifier) {
        String syncedPlaceholder = "%" + identifier.substring(6);
        PlayerPlaceholderImpl[] ppl = new PlayerPlaceholderImpl[1];
-        ppl[0] = TAB.getInstance().getPlaceholderManager().registerPlayerPlaceholder(identifier, refresh, p -> {
+        ppl[0] = TAB.getInstance().getPlaceholderManager().registerPlayerPlaceholder(identifier, p -> {
            runSync((Entity) p.getPlayer(), () -> {
                long time = System.nanoTime();
                String output = isPlaceholderAPI() ? PlaceholderAPI.setPlaceholders((Player) p.getPlayer(), syncedPlaceholder) : identifier;
-                TAB.getInstance().getCPUManager().addPlaceholderTime(identifier, System.nanoTime()-time);
+                long totalTime =  System.nanoTime()-time;
+                TAB.getInstance().getCPUManager().addPlaceholderTime(identifier, totalTime);
+                TAB.getInstance().getCpu().addTime(TAB.getInstance().getPlaceholderManager().getFeatureName(), TabConstants.CpuUsageCategory.PLACEHOLDER_REQUEST, totalTime);
                TAB.getInstance().getCPUManager().runTask(() -> ppl[0].updateValue(p, output)); // To ensure player is loaded
            });
            return null;
        });
    }

+    private void registerInternalSyncPlaceholder(@NonNull String identifier, @NonNull Function<TabPlayer, String> function) {
+        PlayerPlaceholderImpl[] ppl = new PlayerPlaceholderImpl[1];
+        ppl[0] = TAB.getInstance().getPlaceholderManager().registerPlayerPlaceholder(identifier, p -> {
+            runSync((Entity) p.getPlayer(), () -> {
+                long time = System.nanoTime();
+                String output = function.apply((TabPlayer) p);
+                long totalTime =  System.nanoTime()-time;
+                TAB.getInstance().getCPUManager().addPlaceholderTime(identifier, totalTime);
+                TAB.getInstance().getCpu().addTime(TAB.getInstance().getPlaceholderManager().getFeatureName(), TabConstants.CpuUsageCategory.PLACEHOLDER_REQUEST, totalTime);
+                TAB.getInstance().getCPUManager().runTask(() -> ppl[0].updateValue(p, output)); // To ensure player is loaded
+            });
+            return null;
+        });
+    }
+
+    /**
+     * Overriding the method to fix initial error caused by ServerPlaceholder implementation trying to
+     * retrieve the value in constructor, but folia does not support that. Overriding this function to avoid the
+     * MSPT function being called in the wrong thread.
+     *
+     * @return  -1
+     */
+    @Override
+    public double getMSPT() {
+        return -1;
+    }
+
+    /**
+     * Overriding the method to fix initial error caused by ServerPlaceholder implementation trying to
+     * retrieve the value in constructor, but folia does not support that. Overriding this function to avoid the
+     * TPS function being called in the wrong thread.
+     *
+     * @return  -1
+     */
+    @Override
+    public double getTPS() {
+        return -1;
+    }
+
    /**
     * Runs task using player's entity scheduler. It's using reflection, because
     * Folia uses Java 17 while TAB maintains Java 8 compatibility for compatibility
@@ -89,9 +143,4 @@ public class FoliaPlatform extends BukkitPlatform {
        entityScheduler.getClass().getMethod("run", Plugin.class, Consumer.class, Runnable.class)
                .invoke(entityScheduler, getPlugin(), consumer, null);
    }
-
-    @Override
-    public void runEntityTask(@NotNull Entity entity, @NotNull Runnable task) {
-        runSync(entity, task);
-    }
 }
@@ -0,0 +1,134 @@
+package me.neznamy.tab.platforms.bukkit.provider;
+
+import me.neznamy.tab.shared.chat.TabStyle;
+import me.neznamy.tab.shared.chat.component.TabKeybindComponent;
+import me.neznamy.tab.shared.chat.component.TabComponent;
+import me.neznamy.tab.shared.chat.component.TabTextComponent;
+import me.neznamy.tab.shared.chat.component.TabTranslatableComponent;
+import me.neznamy.tab.shared.chat.component.object.TabAtlasSprite;
+import me.neznamy.tab.shared.chat.component.object.TabObjectComponent;
+import me.neznamy.tab.shared.chat.component.object.TabPlayerSprite;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
+
+/**
+ * Interface for converting TAB components into NMS components (1.7+).
+ *
+ * @param   <T>
+ *          NMS component type
+ */
+public abstract class ComponentConverter<T> {
+
+    /** Empty UUID for creating dummy profiles */
+    protected final UUID NIL_UUID = new UUID(0, 0);
+
+    /**
+     * Converts TAB component to NMS component.
+     *
+     * @param   component
+     *          Component to convert
+     * @return  Converted component
+     */
+    @NotNull
+    public T convert(@NotNull TabComponent component) {
+        // Component type
+        T nmsComponent;
+        if (component instanceof TabTextComponent) {
+            nmsComponent = newTextComponent(((TabTextComponent) component).getText());
+        } else if (component instanceof TabTranslatableComponent) {
+            nmsComponent = newTranslatableComponent(((TabTranslatableComponent) component).getKey());
+        } else if (component instanceof TabKeybindComponent) {
+            nmsComponent = newKeybindComponent(((TabKeybindComponent)component).getKeybind());
+        } else if (component instanceof TabObjectComponent) {
+            if ((((TabObjectComponent) component).getContents() instanceof TabAtlasSprite)) {
+                nmsComponent = newObjectComponent((TabAtlasSprite) ((TabObjectComponent) component).getContents());
+            } else if ((((TabObjectComponent) component).getContents() instanceof TabPlayerSprite)) {
+                nmsComponent = newObjectComponent((TabPlayerSprite) ((TabObjectComponent) component).getContents());
+            } else {
+                throw new IllegalArgumentException("Unexpected object component type: " + ((TabObjectComponent) component).getContents().getClass().getName());
+            }
+        } else {
+            throw new IllegalArgumentException("Unexpected component type: " + component.getClass().getName());
+        }
+
+        // Component style
+        applyStyle(nmsComponent, component.getModifier());
+
+        // Extra
+        for (TabComponent extra : component.getExtra()) {
+            addSibling(nmsComponent, convert(extra));
+        }
+
+        return nmsComponent;
+    }
+
+    /**
+     * Creates a new text component with given text.
+     *
+     * @param   text
+     *          Text to display
+     * @return  Text component with given text
+     */
+    @NotNull
+    public abstract T newTextComponent(@NotNull String text);
+
+    /**
+     * Creates a new translatable component with the given key.
+     *
+     * @param   key
+     *          Key to translate
+     * @return  Translatable component with the given key
+     */
+    @NotNull
+    public abstract T newTranslatableComponent(@NotNull String key);
+
+    /**
+     * Creates a new keybind component with given keybind.
+     *
+     * @param   keybind
+     *          Keybind to show
+     * @return  Keybind component with given keybind
+     */
+    @NotNull
+    public abstract T newKeybindComponent(@NotNull String keybind);
+
+    /**
+     * Creates a new object component with given atlas and sprite.
+     *
+     * @param sprite Sprite to use
+     * @return Object component with given atlas and sprite
+     */
+    @NotNull
+    public abstract T newObjectComponent(@NotNull TabAtlasSprite sprite);
+
+    /**
+     * Creates a new head component with given skin.
+     *
+     * @param   sprite
+     *          Skin to use
+     * @return  Head component with given skin
+     */
+    @NotNull
+    public abstract T newObjectComponent(@NotNull TabPlayerSprite sprite);
+
+    /**
+     * Converts given chat modifier to minecraft style and applies it to the component.
+     *
+     * @param   nmsComponent
+     *          Component to apply style to
+     * @param   style
+     *          Style to convert and apply
+     */
+    public abstract void applyStyle(@NotNull T nmsComponent, @NotNull TabStyle style);
+
+    /**
+     * Appends child to the given parent component.
+     *
+     * @param   parent
+     *          Parent to append the child to
+     * @param   child
+     *          Child component to append
+     */
+    public abstract void addSibling(@NotNull T parent, @NotNull T child);
+}
@@ -0,0 +1,71 @@
+package me.neznamy.tab.platforms.bukkit.provider;
+
+import io.netty.channel.Channel;
+import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
+import me.neznamy.tab.shared.platform.Scoreboard;
+import me.neznamy.tab.shared.platform.TabList;
+import me.neznamy.tab.shared.platform.TabListEntryTracker;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * An interface to provide platform-specific implementations of various features in various Minecraft versions.
+ */
+public interface ImplementationProvider {
+
+    /**
+     * Creates a new instance of scoreboard for the given player.
+     *
+     * @param   player
+     *          Player to create scoreboard for
+     * @return  Newly created scoreboard
+     */
+    @NotNull
+    Scoreboard newScoreboard(@NotNull BukkitTabPlayer player);
+
+    /**
+     * Creates a new instance of tab list for the given player.
+     *
+     * @param   player
+     *          Player to create tab list for
+     * @return  Newly created tab list
+     */
+    @NotNull
+    TabList newTabList(@NotNull BukkitTabPlayer player);
+
+    /**
+     * Returns component converter to be used for converting TAB components to NMS components.
+     *
+     * @return  Component converter
+     */
+    @NotNull
+    ComponentConverter<?> getComponentConverter();
+
+    /**
+     * Gets player's channel. If not available, returns {@code null}.
+     *
+     * @param   player
+     *          Player to get channel of
+     * @return  Player's channel or {@code null} if not supported
+     */
+    @Nullable
+    Channel getChannel(@NotNull Player player);
+
+    /**
+     * Creates a new instance of tab list entry tracker.
+     *
+     * @return  Newly created tab list entry tracker
+     */
+    @NotNull
+    TabListEntryTracker newTabListEntryTracker();
+
+    /**
+     * Returns ping of the given player.
+     *
+     * @param   player
+     *          Player to get ping of
+     * @return  Player's ping
+     */
+    int getPing(@NotNull BukkitTabPlayer player);
+}
@@ -1,77 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.scoreboard;
-
-import lombok.NonNull;
-import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
-import me.neznamy.tab.shared.chat.EnumChatFormat;
-import me.neznamy.tab.shared.platform.Scoreboard;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Collection;
-
-/**
- * Dummy implementation if no scoreboard implementation is available.
- */
-public class NullScoreboard extends Scoreboard<BukkitTabPlayer, Object> {
-
-    /**
-     * Constructs new instance with given player.
-     *
-     * @param   player
-     *          Player this scoreboard will belong to
-     */
-    public NullScoreboard(@NonNull BukkitTabPlayer player) {
-        super(player);
-    }
-
-    @Override
-    protected void setDisplaySlot0(int slot, @NonNull String objective) {
-        // Do nothing
-    }
-
-    @Override
-    protected void setScore0(@NonNull String objective, @NonNull String scoreHolder, int score,
-                             @Nullable Object displayName, @Nullable Object numberFormat) {
-        // Do nothing
-    }
-
-    @Override
-    protected void removeScore0(@NonNull String objective, @NonNull String scoreHolder) {
-        // Do nothing
-    }
-
-    @Override
-    protected void registerObjective0(@NonNull String objectiveName, @NonNull String title, int display,
-                                      @Nullable Object numberFormat) {
-        // Do nothing
-    }
-
-    @Override
-    protected void unregisterObjective0(@NonNull String objectiveName) {
-        // Do nothing
-    }
-
-    @Override
-    protected void updateObjective0(@NonNull String objectiveName, @NonNull String title, int display,
-                                    @Nullable Object numberFormat) {
-        // Do nothing
-    }
-
-    @Override
-    protected void registerTeam0(@NonNull String name, @NonNull String prefix, @NonNull String suffix,
-                                 @NonNull NameVisibility visibility, @NonNull CollisionRule collision,
-                                 @NonNull Collection<String> players, int options, @NonNull EnumChatFormat color) {
-        // Do nothing
-    }
-
-    @Override
-    protected void unregisterTeam0(@NonNull String name) {
-        // Do nothing
-    }
-
-    @Override
-    protected void updateTeam0(@NonNull String name, @NonNull String prefix, @NonNull String suffix,
-                               @NonNull NameVisibility visibility, @NonNull CollisionRule collision,
-                               int options, @NonNull EnumChatFormat color) {
-        // Do nothing
-    }
-}
@@ -1,36 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.scoreboard;
-
-import lombok.Getter;
-import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
-import me.neznamy.tab.platforms.bukkit.BukkitUtils;
-import me.neznamy.tab.platforms.bukkit.scoreboard.packet.PacketScoreboard;
-import me.neznamy.tab.shared.platform.Scoreboard;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.function.Function;
-
-/**
- * Loader finding the best available Scoreboard implementation.
- */
-public class ScoreboardLoader {
-
-    /** Instance function */
-    @Getter
-    @NotNull
-    private static Function<BukkitTabPlayer, Scoreboard<BukkitTabPlayer, ?>> instance = NullScoreboard::new;
-
-    /**
-     * Tries to load Scoreboard packets.
-     */
-    public static void tryLoad() {
-        if (PacketScoreboard.isAvailable()) {
-            instance = PacketScoreboard::new;
-        } else {
-            BukkitUtils.compatibilityError(PacketScoreboard.getException(), "Scoreboards", null,
-                    "Scoreboard feature will not work",
-                    "Belowname feature will not work",
-                    "Player objective feature will not work",
-                    "Scoreboard teams feature will not work (nametags & sorting)");
-        }
-    }
-}
@@ -1,83 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.scoreboard.packet;
-
-import lombok.NonNull;
-import lombok.SneakyThrows;
-import me.neznamy.tab.platforms.bukkit.nms.BukkitReflection;
-import me.neznamy.tab.shared.TAB;
-import me.neznamy.tab.shared.platform.TabPlayer;
-import me.neznamy.tab.shared.util.FunctionWithException;
-import me.neznamy.tab.shared.util.ReflectionUtils;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-
-/**
- * Class storing NMS fields and methods of DisplayObjective packet.
- */
-public class DisplayPacketData {
-
-    private final Class<?> DisplayObjectiveClass;
-    private final Constructor<?> newDisplayObjective;
-    private final Field DisplayObjective_OBJECTIVE_NAME;
-    private final Object[] displaySlots;
-    private final FunctionWithException<Object, Integer> packetToSlot;
-
-    /**
-     * Constructs new instance and loads all required NMS fields.
-     *
-     * @throws  ReflectiveOperationException
-     *          If something fails
-     */
-    public DisplayPacketData() throws ReflectiveOperationException {
-        Class<?> ScoreboardObjective = BukkitReflection.getClass("world.scores.Objective", "world.scores.ScoreboardObjective", "ScoreboardObjective");
-        DisplayObjectiveClass = BukkitReflection.getClass(
-                "network.protocol.game.ClientboundSetDisplayObjectivePacket", // Mojang mapped
-                "network.protocol.game.PacketPlayOutScoreboardDisplayObjective", // Bukkit 1.17+
-                "PacketPlayOutScoreboardDisplayObjective", // Bukkit 1.7 - 1.16.5
-                "Packet208SetScoreboardDisplayObjective" // Bukkit 1.5 - 1.6.4
-        );
-        DisplayObjective_OBJECTIVE_NAME = ReflectionUtils.getOnlyField(DisplayObjectiveClass, String.class);
-        if (BukkitReflection.is1_20_2Plus()) {
-            Class<?> DisplaySlot = BukkitReflection.getClass("world.scores.DisplaySlot");
-            displaySlots = (Object[]) DisplaySlot.getDeclaredMethod("values").invoke(null);
-            Field DisplayObjective_POSITION = ReflectionUtils.getOnlyField(DisplayObjectiveClass, DisplaySlot);
-            newDisplayObjective = DisplayObjectiveClass.getConstructor(DisplaySlot, ScoreboardObjective);
-            packetToSlot = packet -> ((Enum<?>)DisplayObjective_POSITION.get(packet)).ordinal();
-        } else {
-            displaySlots = new Object[]{0, 1, 2};
-            Field DisplayObjective_POSITION = ReflectionUtils.getOnlyField(DisplayObjectiveClass, int.class);
-            newDisplayObjective = DisplayObjectiveClass.getConstructor(int.class, ScoreboardObjective);
-            packetToSlot = DisplayObjective_POSITION::getInt;
-        }
-    }
-
-    /**
-     * Creates a packet for setting display slot.
-     *
-     * @param   slot
-     *          Objective slot
-     * @param   objective
-     *          Objective to display
-     * @return  Packet for setting display slot
-     */
-    @SneakyThrows
-    public Object setDisplaySlot(int slot, @NonNull Object objective) {
-        return newDisplayObjective.newInstance(displaySlots[slot], objective);
-    }
-
-    /**
-     * Checks if packet is display objective packet and forwards it to enabled features.
-     *
-     * @param   player
-     *          Player who received packet
-     * @param   packet
-     *          Received packet
-     */
-    @SneakyThrows
-    public void onPacketSend(@NonNull TabPlayer player, @NonNull Object packet) {
-        if (DisplayObjectiveClass.isInstance(packet)) {
-            TAB.getInstance().getFeatureManager().onDisplayObjective(player, packetToSlot.apply(packet),
-                    (String) DisplayObjective_OBJECTIVE_NAME.get(packet));
-        }
-    }
-}
@@ -1,262 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.scoreboard.packet;
-
-import lombok.Getter;
-import lombok.NonNull;
-import lombok.SneakyThrows;
-import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
-import me.neznamy.tab.platforms.bukkit.nms.ComponentConverter;
-import me.neznamy.tab.platforms.bukkit.nms.BukkitReflection;
-import me.neznamy.tab.platforms.bukkit.nms.PacketSender;
-import me.neznamy.tab.shared.TAB;
-import me.neznamy.tab.shared.chat.EnumChatFormat;
-import me.neznamy.tab.shared.chat.TabComponent;
-import me.neznamy.tab.shared.platform.Scoreboard;
-import me.neznamy.tab.shared.util.ReflectionUtils;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Scoreboard implementation which uses packets
- * to send scoreboards to use the full potential on all versions
- * and server software without any artificial limits.
- */
-public class PacketScoreboard extends Scoreboard<BukkitTabPlayer, Object> {
-
-    @Getter
-    private static boolean available;
-
-    @Getter
-    private static Exception exception;
-
-    static Class<?> Component;
-    static Class<?> Scoreboard;
-    static Class<?> ScoreboardObjective;
-    static Object emptyScoreboard;
-    static Class<?> NumberFormat;
-    private static Constructor<?> newFixedFormat;
-
-    // Objective packet
-    private static Class<?> ObjectivePacketClass;
-    private static Constructor<?> newObjectivePacket;
-    private static Field Objective_OBJECTIVE_NAME;
-    private static Field Objective_METHOD;
-    private static Field Objective_RENDER_TYPE;
-    static Constructor<?> newScoreboardObjective;
-    private static Method ScoreboardObjective_setDisplayName;
-    private static Enum<?>[] healthDisplays;
-    static Object IScoreboardCriteria_dummy;
-
-    private static ScorePacketData scorePacketData;
-    @Getter private static TeamPacketData teamPacketData;
-    @Getter private static DisplayPacketData displayPacketData;
-    private static PacketSender packetSender;
-
-    private final Map<String, Object> teams = new HashMap<>();
-
-    static {
-        try {
-            int minorVersion = BukkitReflection.getMinorVersion();
-            Scoreboard = BukkitReflection.getClass("world.scores.Scoreboard", "Scoreboard");
-            ScoreboardObjective = BukkitReflection.getClass("world.scores.Objective", "world.scores.ScoreboardObjective", "ScoreboardObjective");
-            Class<?> IScoreboardCriteria = BukkitReflection.getClass(
-                    "world.scores.criteria.ObjectiveCriteria", // Mojang mapped
-                    "world.scores.criteria.IScoreboardCriteria", // Bukkit 1.17.+
-                    "IScoreboardCriteria", // 1.5.1 - 1.16.5
-                    "IObjective" // 1.5.0
-            );
-            ObjectivePacketClass = BukkitReflection.getClass(
-                    "network.protocol.game.ClientboundSetObjectivePacket", // Mojang mapped
-                    "network.protocol.game.PacketPlayOutScoreboardObjective", // Bukkit 1.17+
-                    "PacketPlayOutScoreboardObjective", // 1.7 - 1.16.5
-                    "Packet206SetScoreboardObjective" // 1.5 - 1.6.4
-            );
-            emptyScoreboard = Scoreboard.getConstructor().newInstance();
-            Objective_OBJECTIVE_NAME = ReflectionUtils.getFields(ObjectivePacketClass, String.class).get(0);
-            List<Field> list = ReflectionUtils.getFields(ObjectivePacketClass, int.class);
-            Objective_METHOD = list.get(list.size()-1);
-            newObjectivePacket = ObjectivePacketClass.getConstructor(ScoreboardObjective, int.class);
-            IScoreboardCriteria_dummy = ReflectionUtils.getFields(IScoreboardCriteria, IScoreboardCriteria).get(0).get(null);
-            newScoreboardObjective = ReflectionUtils.getOnlyConstructor(ScoreboardObjective);
-            if (minorVersion >= 7) {
-                Component = BukkitReflection.getClass("network.chat.Component", "network.chat.IChatBaseComponent", "IChatBaseComponent");
-                ComponentConverter.ensureAvailable();
-            }
-            if (minorVersion >= 8) {
-                Class<?> EnumScoreboardHealthDisplay = BukkitReflection.getClass(
-                        "world.scores.criteria.ObjectiveCriteria$RenderType",
-                        "world.scores.criteria.IScoreboardCriteria$EnumScoreboardHealthDisplay",
-                        "IScoreboardCriteria$EnumScoreboardHealthDisplay",
-                        "EnumScoreboardHealthDisplay");
-                healthDisplays = (Enum<?>[]) EnumScoreboardHealthDisplay.getMethod("values").invoke(null);
-                if (minorVersion < 13) {
-                    Objective_RENDER_TYPE = ReflectionUtils.getOnlyField(ObjectivePacketClass, EnumScoreboardHealthDisplay);
-                }
-            }
-            if (minorVersion < 13) {
-                ScoreboardObjective_setDisplayName = ReflectionUtils.getOnlyMethod(ScoreboardObjective, void.class, String.class);
-            }
-            if (BukkitReflection.is1_20_3Plus()) {
-                NumberFormat = BukkitReflection.getClass("network.chat.numbers.NumberFormat");
-                newFixedFormat = BukkitReflection.getClass("network.chat.numbers.FixedFormat").getConstructor(Component);
-            }
-            scorePacketData = new ScorePacketData();
-            teamPacketData = new TeamPacketData();
-            displayPacketData = new DisplayPacketData();
-            packetSender = new PacketSender();
-            available = true;
-        } catch (Exception e) {
-            exception = e;
-        }
-    }
-
-    /**
-     * Constructs new instance with given player.
-     *
-     * @param   player
-     *          Player this scoreboard will belong to
-     */
-    public PacketScoreboard(@NonNull BukkitTabPlayer player) {
-        super(player);
-    }
-
-    @Override
-    public void setDisplaySlot0(int slot, @NonNull String objective) {
-        packetSender.sendPacket(player.getPlayer(), displayPacketData.setDisplaySlot(slot, newObjective(objective, "", 0, null)));
-    }
-
-    @Override
-    public void registerObjective0(@NonNull String objectiveName, @NonNull String title, int display,
-                                   @Nullable Object numberFormat) {
-        packetSender.sendPacket(player.getPlayer(), newObjectivePacket(ObjectiveAction.REGISTER, objectiveName, title, display, numberFormat));
-    }
-
-    @Override
-    public void unregisterObjective0(@NonNull String objectiveName) {
-        packetSender.sendPacket(player.getPlayer(), newObjectivePacket(ObjectiveAction.UNREGISTER, objectiveName, "", 0, null));
-    }
-
-    @Override
-    public void updateObjective0(@NonNull String objectiveName, @NonNull String title, int display,
-                                 @Nullable Object numberFormat) {
-        packetSender.sendPacket(player.getPlayer(), newObjectivePacket(ObjectiveAction.UPDATE, objectiveName, title, display, numberFormat));
-    }
-
-    @SneakyThrows
-    private Object newObjectivePacket(int action, @NonNull String objectiveName, @NonNull String title, int display,
-                                      @Nullable Object numberFormat) {
-        Object packet = newObjectivePacket.newInstance(newObjective(objectiveName, title, display, numberFormat), action);
-        if (BukkitReflection.getMinorVersion() >= 8 && BukkitReflection.getMinorVersion() < 13) {
-            Objective_RENDER_TYPE.set(packet, healthDisplays[display]);
-        }
-        return packet;
-    }
-
-    @Override
-    public void registerTeam0(@NonNull String name, @NonNull String prefix, @NonNull String suffix,
-                              @NonNull NameVisibility visibility, @NonNull CollisionRule collision,
-                              @NonNull Collection<String> players, int options, @NonNull EnumChatFormat color) {
-        Object team = teamPacketData.createTeam(name);
-        teams.put(name, team);
-        packetSender.sendPacket(player.getPlayer(), teamPacketData.registerTeam(team, prefix, toComponent(prefix), suffix,
-                toComponent(suffix), visibility, collision, players, options, color));
-    }
-
-    @Override
-    public void unregisterTeam0(@NonNull String name) {
-        packetSender.sendPacket(player.getPlayer(), teamPacketData.unregisterTeam(teams.remove(name)));
-    }
-
-    @Override
-    public void updateTeam0(@NonNull String name, @NonNull String prefix, @NonNull String suffix,
-                            @NonNull NameVisibility visibility, @NonNull CollisionRule collision,
-                            int options, @NonNull EnumChatFormat color) {
-        packetSender.sendPacket(player.getPlayer(), teamPacketData.updateTeam(teams.get(name), prefix, toComponent(prefix), suffix,
-                toComponent(suffix), visibility, collision, options, color));
-    }
-
-    @Override
-    public void setScore0(@NonNull String objective, @NonNull String scoreHolder, int score,
-                          @Nullable Object displayName, @Nullable Object numberFormat) {
-        packetSender.sendPacket(player.getPlayer(), scorePacketData.setScore(objective, scoreHolder, score, displayName, toFixedFormat(numberFormat)));
-    }
-
-    @Override
-    public void removeScore0(@NonNull String objective, @NonNull String scoreHolder) {
-        packetSender.sendPacket(player.getPlayer(), scorePacketData.removeScore(objective, scoreHolder));
-    }
-
-    @Override
-    @SneakyThrows
-    public void onPacketSend(@NonNull Object packet) {
-        displayPacketData.onPacketSend(player, packet);
-        if (ObjectivePacketClass.isInstance(packet))  {
-            TAB.getInstance().getFeatureManager().onObjective(player,
-                    Objective_METHOD.getInt(packet), (String) Objective_OBJECTIVE_NAME.get(packet));
-        }
-        if (isAntiOverrideTeams()) teamPacketData.onPacketSend(player, packet);
-    }
-
-    /**
-     * Creates a new Scoreboard Objective with given parameters.
-     *
-     * @param   objectiveName
-     *          Objective name
-     * @param   title
-     *          Objective title
-     * @param   renderType
-     *          Render type
-     * @param   numberFormat
-     *          Default number format (1.20.3+)
-     * @return  Created objective
-     */
-    @SneakyThrows
-    public Object newObjective(@NonNull String objectiveName, @NonNull String title, int renderType,
-                               @Nullable Object numberFormat) {
-        if (BukkitReflection.is1_20_3Plus()) {
-            // 1.20.3+
-            return newScoreboardObjective.newInstance(
-                    emptyScoreboard,
-                    objectiveName,
-                    null, // Criteria
-                    toComponent(title),
-                    healthDisplays[renderType],
-                    false, // Auto update
-                    toFixedFormat(numberFormat)
-            );
-        }
-        if (BukkitReflection.getMinorVersion() >= 13) {
-            // 1.13 - 1.20.2
-            return newScoreboardObjective.newInstance(
-                    emptyScoreboard,
-                    objectiveName,
-                    null, // Criteria
-                    toComponent(title),
-                    healthDisplays[renderType]
-            );
-        }
-        // 1.5 - 1.12.2
-        Object objective = newScoreboardObjective.newInstance(emptyScoreboard, objectiveName, IScoreboardCriteria_dummy);
-        ScoreboardObjective_setDisplayName.invoke(objective, title);
-        return objective;
-    }
-
-    @NotNull
-    private Object toComponent(@NonNull String text) {
-        return TabComponent.optimized(text).convert(player.getVersion());
-    }
-
-    @Nullable
-    @SneakyThrows
-    private Object toFixedFormat(@Nullable Object numberFormat) {
-        if (numberFormat == null || newFixedFormat == null) return null;
-        return newFixedFormat.newInstance(numberFormat);
-    }
-}
@@ -1,123 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.scoreboard.packet;
-
-import lombok.NonNull;
-import lombok.SneakyThrows;
-import me.neznamy.tab.platforms.bukkit.nms.BukkitReflection;
-import me.neznamy.tab.shared.platform.Scoreboard;
-import me.neznamy.tab.shared.util.BiFunctionWithException;
-import me.neznamy.tab.shared.util.QuintFunction;
-import me.neznamy.tab.shared.util.ReflectionUtils;
-import org.jetbrains.annotations.Nullable;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.util.Optional;
-
-/**
- * Class containing data for scoreboard score set/reset packets.
- */
-public class ScorePacketData {
-
-    private final QuintFunction<String, String, Integer, Object, Object, Object> setScore;
-    private final BiFunctionWithException<String, String, Object> removeScore;
-
-    /**
-     * Constructs new instance and loads all fields. Throws exception if something went wrong.
-     *
-     * @throws  ReflectiveOperationException
-     *          If something went wrong
-     */
-    public ScorePacketData() throws ReflectiveOperationException {
-        Class<?> SetScorePacket = BukkitReflection.getClass(
-                "network.protocol.game.ClientboundSetScorePacket", // Mojang mapped
-                "network.protocol.game.PacketPlayOutScoreboardScore", // Bukkit 1.17+
-                "PacketPlayOutScoreboardScore", // 1.7 - 1.16.5
-                "Packet207SetScoreboardScore" // 1.5 - 1.6.4
-        );
-        if (BukkitReflection.is1_20_3Plus()) {
-            QuintFunction<String, String, Integer, Object, Object, Object> setScore0;
-            try {
-                // 1.20.5+
-                Constructor<?> newSetScore = SetScorePacket.getConstructor(String.class, String.class, int.class, Optional.class, Optional.class);
-                setScore0 = (objective, holder, score, displayName, numberFormat) ->
-                        newSetScore.newInstance(holder, objective, score, Optional.ofNullable(displayName), Optional.ofNullable(numberFormat));
-            } catch (ReflectiveOperationException e) {
-                // 1.20.3 - 1.20.4
-                Constructor<?> newSetScore = SetScorePacket.getConstructor(String.class, String.class, int.class, PacketScoreboard.Component, PacketScoreboard.NumberFormat);
-                setScore0 = (objective, holder, score, displayName, numberFormat) ->
-                        newSetScore.newInstance(holder, objective, score, displayName, numberFormat);
-            }
-            setScore = setScore0;
-            Constructor<?> newResetScore = BukkitReflection.getClass("network.protocol.game.ClientboundResetScorePacket").getConstructor(String.class, String.class);
-            removeScore = (objective, holder) -> newResetScore.newInstance(holder, objective);
-        } else if (BukkitReflection.getMinorVersion() >= 13) {
-            Class<?> actionClass = BukkitReflection.getClass("server.ServerScoreboard$Method", "server.ScoreboardServer$Action", "ScoreboardServer$Action");
-            Constructor<?> newSetScore = SetScorePacket.getConstructor(actionClass, String.class, String.class, int.class);
-            Enum<?>[] scoreboardActions = (Enum<?>[]) actionClass.getMethod("values").invoke(null);
-            setScore = (objective, holder, score, displayName, numberFormat) -> newSetScore.newInstance(scoreboardActions[0], objective, holder, score);
-            removeScore = (objective, holder) -> newSetScore.newInstance(scoreboardActions[1], objective, holder, 0);
-        } else {
-            Class<?> ScoreboardScore = BukkitReflection.getClass("ScoreboardScore");
-            Constructor<?> newResetScore = SetScorePacket.getConstructor(String.class);
-            Field SetScorePacket_SCORE = ReflectionUtils.getFields(SetScorePacket, int.class).get(0);
-            Constructor<?> newScoreboardScore = ScoreboardScore.getConstructor(PacketScoreboard.Scoreboard, PacketScoreboard.ScoreboardObjective, String.class);
-            Constructor<?> newSetScore;
-            if (BukkitReflection.getMinorVersion() >= 8) {
-                newSetScore = SetScorePacket.getConstructor(ScoreboardScore);
-            } else {
-                newSetScore = SetScorePacket.getConstructor(ScoreboardScore, int.class);
-            }
-            setScore = (objective, holder, score, displayName, numberFormat) -> {
-                Object scoreboardScore = newScoreboardScore.newInstance(
-                        PacketScoreboard.emptyScoreboard,
-                        PacketScoreboard.newScoreboardObjective.newInstance(PacketScoreboard.emptyScoreboard, objective, PacketScoreboard.IScoreboardCriteria_dummy),
-                        holder
-                );
-                Object packet;
-                if (BukkitReflection.getMinorVersion() >= 8) {
-                    packet = newSetScore.newInstance(scoreboardScore);
-                } else {
-                    packet = newSetScore.newInstance(scoreboardScore, Scoreboard.ScoreAction.CHANGE);
-                }
-                SetScorePacket_SCORE.set(packet, score);
-                return packet;
-            };
-            removeScore = (objective, holder) -> newResetScore.newInstance(holder);
-        }
-    }
-
-    /**
-     * Creates set score packet.
-     *
-     * @param   objective
-     *          Objective name
-     * @param   scoreHolder
-     *          Score holder
-     * @param   score
-     *          Score value
-     * @param   displayName
-     *          Score holder display name
-     * @param   numberFormat
-     *          Score value number format
-     * @return  Set score packet with given parameters
-     */
-    @SneakyThrows
-    public Object setScore(@NonNull String objective, @NonNull String scoreHolder, int score,
-                           @Nullable Object displayName, @Nullable Object numberFormat) {
-        return setScore.apply(objective, scoreHolder, score, displayName, numberFormat);
-    }
-
-    /**
-     * Creates reset score packet.
-     *
-     * @param   objective
-     *          Objective name
-     * @param   scoreHolder
-     *          Score holder
-     * @return  Reset score packet with given parameters.
-     */
-    @SneakyThrows
-    public Object removeScore(@NonNull String objective, @NonNull String scoreHolder) {
-        return removeScore.apply(objective, scoreHolder);
-    }
-}
@@ -1,312 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.scoreboard.packet;
-
-import lombok.Getter;
-import lombok.NonNull;
-import lombok.SneakyThrows;
-import me.neznamy.tab.platforms.bukkit.nms.BukkitReflection;
-import me.neznamy.tab.shared.chat.EnumChatFormat;
-import me.neznamy.tab.shared.platform.Scoreboard;
-import me.neznamy.tab.shared.platform.Scoreboard.TeamAction;
-import me.neznamy.tab.shared.platform.TabPlayer;
-import me.neznamy.tab.shared.util.BiConsumerWithException;
-import me.neznamy.tab.shared.util.ReflectionUtils;
-import org.jetbrains.annotations.Nullable;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Collection;
-
-/**
- * Class storing all team related fields and methods.
- */
-@SuppressWarnings("unchecked")
-public class TeamPacketData {
-
-    /** First version with modern team data using components */
-    private final int MODERN_TEAM_DATA_VERSION = 13;
-
-    /** First version with static constructor-like methods */
-    private final int STATIC_CONSTRUCTOR_VERSION = 17;
-
-    private Class<?> Component;
-    private final Object emptyScoreboard;
-    @Getter private final Class<?> TeamPacketClass;
-    private Constructor<?> newTeamPacket;
-    private final Constructor<?> newScoreboardTeam;
-    private Method TeamPacketConstructor_of;
-    private Method TeamPacketConstructor_ofBoolean;
-    private final Field TeamPacket_NAME;
-    private final Field TeamPacket_ACTION;
-    private final Field TeamPacket_PLAYERS;
-    private final Method ScoreboardTeam_getPlayerNameSet;
-    private final Method ScoreboardTeam_setPrefix;
-    private final Method ScoreboardTeam_setSuffix;
-    private Method ScoreboardTeam_setColor;
-    private final Method ScoreboardTeam_setAllowFriendlyFire;
-    private final Method ScoreboardTeam_setCanSeeFriendlyInvisibles;
-    private final Enum<?>[] chatFormats;
-
-    private BiConsumerWithException<Object, Scoreboard.NameVisibility> setVisibility = (team, visibility) -> {};
-    private BiConsumerWithException<Object, Scoreboard.CollisionRule> setCollision = (team, collision) -> {};
-
-    /**
-     * Constructs new instance and loads all required NMS classes, fields and methods.
-     * If anything fails, exception is thrown.
-     *
-     * @throws  ReflectiveOperationException
-     *          If anything fails
-     */
-    public TeamPacketData() throws ReflectiveOperationException {
-        int minorVersion = BukkitReflection.getMinorVersion();
-        Class<?> Scoreboard = BukkitReflection.getClass("world.scores.Scoreboard", "Scoreboard");
-        Class<?> scoreboardTeam = BukkitReflection.getClass("world.scores.PlayerTeam", "world.scores.ScoreboardTeam", "ScoreboardTeam");
-        Class<?> enumChatFormatClass = BukkitReflection.getClass("ChatFormatting", "EnumChatFormat", "EnumChatFormat");
-        TeamPacketClass = BukkitReflection.getClass(
-                "network.protocol.game.ClientboundSetPlayerTeamPacket", // Mojang mapped
-                "network.protocol.game.PacketPlayOutScoreboardTeam", // Bukkit 1.17+
-                "PacketPlayOutScoreboardTeam", // Bukkit 1.7 - 1.16.5
-                "Packet209SetScoreboardTeam" // 1.5 - 1.6.4
-        );
-        emptyScoreboard = Scoreboard.getConstructor().newInstance();
-        newScoreboardTeam = scoreboardTeam.getConstructor(Scoreboard, String.class);
-        TeamPacket_NAME = ReflectionUtils.getFields(TeamPacketClass, String.class).get(0);
-        TeamPacket_ACTION = ReflectionUtils.getInstanceFields(TeamPacketClass, int.class).get(0);
-        TeamPacket_PLAYERS = ReflectionUtils.getOnlyField(TeamPacketClass, Collection.class);
-        ScoreboardTeam_getPlayerNameSet = ReflectionUtils.getOnlyMethod(scoreboardTeam, Collection.class);
-        chatFormats = (Enum<?>[]) enumChatFormatClass.getMethod("values").invoke(null);
-        ScoreboardTeam_setAllowFriendlyFire = ReflectionUtils.getMethod(
-                scoreboardTeam,
-                new String[]{"func_96660_a", "setAllowFriendlyFire", "a", "m_83355_"}, // {Thermos, 1.5.1+, 1.5 & 1.18+, Mohist 1.18.2}
-                boolean.class
-        );
-        ScoreboardTeam_setCanSeeFriendlyInvisibles = ReflectionUtils.getMethod(
-                scoreboardTeam,
-                new String[]{"func_98300_b", "setCanSeeFriendlyInvisibles", "b", "m_83362_", "setSeeFriendlyInvisibles"}, // {Thermos, 1.5.1+, 1.5 & 1.18+, Mohist 1.18.2, 1.20.2+}
-                boolean.class
-        );
-        if (minorVersion >= 7) {
-            Component = BukkitReflection.getClass("network.chat.Component", "network.chat.IChatBaseComponent", "IChatBaseComponent");
-        }
-        if (minorVersion >= 8) loadVisibility(scoreboardTeam);
-        if (minorVersion >= 9) loadCollision(scoreboardTeam);
-        if (minorVersion >= MODERN_TEAM_DATA_VERSION) {
-            ScoreboardTeam_setColor = ReflectionUtils.getOnlyMethod(scoreboardTeam, void.class, enumChatFormatClass);
-            ScoreboardTeam_setPrefix = ReflectionUtils.getMethod(
-                    scoreboardTeam,
-                    new String[]{"setPrefix", "b", "m_83360_", "setPlayerPrefix"}, // {1.17.1-, 1.18 - 1.20.1, Mohist 1.18.2, 1.20.2+}
-                    Component
-            );
-            ScoreboardTeam_setSuffix = ReflectionUtils.getMethod(
-                    scoreboardTeam,
-                    new String[]{"setSuffix", "c", "m_83365_", "setPlayerSuffix"}, // {1.17.1-, 1.18 - 1.20.1, Mohist 1.18.2, 1.20.2+}
-                    Component
-            );
-        } else {
-            ScoreboardTeam_setPrefix = ReflectionUtils.getMethod(
-                    scoreboardTeam,
-                    new String[]{"func_96666_b", "setPrefix", "b"}, // {Thermos, 1.5.1+, 1.5}
-                    String.class
-            );
-            ScoreboardTeam_setSuffix = ReflectionUtils.getMethod(
-                    scoreboardTeam,
-                    new String[]{"func_96662_c", "setSuffix", "c"}, // {Thermos, 1.5.1+, 1.5}
-                    String.class
-            );
-        }
-        if (minorVersion >= STATIC_CONSTRUCTOR_VERSION) {
-            TeamPacketConstructor_of = ReflectionUtils.getOnlyMethod(TeamPacketClass, TeamPacketClass, scoreboardTeam);
-            TeamPacketConstructor_ofBoolean = ReflectionUtils.getOnlyMethod(TeamPacketClass, TeamPacketClass, scoreboardTeam, boolean.class);
-        } else {
-            newTeamPacket = TeamPacketClass.getConstructor(scoreboardTeam, int.class);
-        }
-    }
-
-    @SneakyThrows
-    private void loadVisibility(@NonNull Class<?> scoreboardTeam) {
-        Class<?> enumNameTagVisibility = BukkitReflection.getClass(
-                "world.scores.Team$Visibility", // Mojang mapped
-                "world.scores.ScoreboardTeamBase$EnumNameTagVisibility", // Bukkit 1.17+
-                "ScoreboardTeamBase$EnumNameTagVisibility", // Bukkit 1.8.1 - 1.16.5
-                "EnumNameTagVisibility" // Bukkit 1.8.0
-        );
-        Enum<?>[] nameVisibilities = (Enum<?>[]) enumNameTagVisibility.getMethod("values").invoke(null);
-        Method setNameTagVisibility = ReflectionUtils.getMethod(
-                scoreboardTeam,
-                new String[]{"setNameTagVisibility", "a", "m_83346_"}, // {1.8.1+, 1.8 & 1.18+, Mohist 1.18.2}
-                enumNameTagVisibility
-        );
-        setVisibility = (team, visibility) -> setNameTagVisibility.invoke(team, nameVisibilities[visibility.ordinal()]);
-    }
-
-    @SneakyThrows
-    private void loadCollision(@NonNull Class<?> scoreboardTeam) {
-        Class<?> enumTeamPush = BukkitReflection.getClass("world.scores.Team$CollisionRule",
-                "world.scores.ScoreboardTeamBase$EnumTeamPush", "ScoreboardTeamBase$EnumTeamPush");
-        Enum<?>[] collisionRules = (Enum<?>[]) enumTeamPush.getMethod("values").invoke(null);
-        Method setCollisionRule = ReflectionUtils.getOnlyMethod(scoreboardTeam, void.class, enumTeamPush);
-        setCollision = (team, collision) -> setCollisionRule.invoke(team, collisionRules[collision.ordinal()]);
-    }
-
-    /**
-     * Creates team register packet with specified parameters.
-     *
-     * @param   team
-     *          Team to register
-     * @param   prefix
-     *          Team prefix for 1.12-
-     * @param   prefixComponent
-     *          Team prefix component for 1.13+
-     * @param   suffix
-     *          Team suffix for 1.12-
-     * @param   suffixComponent
-     *          Team suffix component for 1.13+
-     * @param   visibility
-     *          Nametag visibility rule
-     * @param   collision
-     *          Player collision rule
-     * @param   players
-     *          Team members
-     * @param   options
-     *          Team flags
-     * @param   color
-     *          Team color for 1.13+
-     * @return  Register team packet with specified parameters
-     */
-    @SneakyThrows
-    public Object registerTeam(@NonNull Object team, @NonNull String prefix, @Nullable Object prefixComponent,
-                               @NonNull String suffix, @Nullable Object suffixComponent,
-                               @NonNull Scoreboard.NameVisibility visibility, @NonNull Scoreboard.CollisionRule collision,
-                               @NonNull Collection<String> players, int options, @NonNull EnumChatFormat color) {
-        updateTeamData(team, prefix, prefixComponent, suffix, suffixComponent, visibility, collision, options, color);
-        ((Collection<String>) ScoreboardTeam_getPlayerNameSet.invoke(team)).addAll(players);
-        if (BukkitReflection.getMinorVersion() >= STATIC_CONSTRUCTOR_VERSION) {
-            return TeamPacketConstructor_ofBoolean.invoke(null, team, true);
-        } else {
-            return newTeamPacket.newInstance(team, TeamAction.CREATE);
-        }
-    }
-
-    /**
-     * Creates unregister team packet with given team.
-     *
-     * @param   team
-     *          Team to unregister
-     * @return  Packet for unregistering team
-     */
-    @SneakyThrows
-    public Object unregisterTeam(@NonNull Object team) {
-        if (BukkitReflection.getMinorVersion() >= STATIC_CONSTRUCTOR_VERSION) {
-            return TeamPacketConstructor_of.invoke(null, team);
-        } else {
-            return newTeamPacket.newInstance(team, TeamAction.REMOVE);
-        }
-    }
-
-    /**
-     * Creates team update packet with specified parameters.
-     *
-     * @param   team
-     *          Team to update
-     * @param   prefix
-     *          Team prefix for 1.12-
-     * @param   prefixComponent
-     *          Team prefix component for 1.13+
-     * @param   suffix
-     *          Team suffix for 1.12-
-     * @param   suffixComponent
-     *          Team suffix component for 1.13+
-     * @param   visibility
-     *          Nametag visibility rule
-     * @param   collision
-     *          Player collision rule
-     * @param   options
-     *          Team flags
-     * @param   color
-     *          Team color for 1.13+
-     * @return  Update team packet with specified parameters
-     */
-    @SneakyThrows
-    public Object updateTeam(@NonNull Object team, @NonNull String prefix, @Nullable Object prefixComponent,
-                             @NonNull String suffix, @Nullable Object suffixComponent,
-                             @NonNull Scoreboard.NameVisibility visibility, @NonNull Scoreboard.CollisionRule collision,
-                             int options, @NonNull EnumChatFormat color) {
-        updateTeamData(team, prefix, prefixComponent, suffix, suffixComponent, visibility, collision, options, color);
-        if (BukkitReflection.getMinorVersion() >= STATIC_CONSTRUCTOR_VERSION) {
-            return TeamPacketConstructor_ofBoolean.invoke(null, team, false);
-        } else {
-            return newTeamPacket.newInstance(team, TeamAction.UPDATE);
-        }
-    }
-
-    /**
-     * Updates team properties.
-     *
-     * @param   team
-     *          Team to update
-     * @param   prefix
-     *          Team prefix for 1.12-
-     * @param   prefixComponent
-     *          Team prefix component for 1.13+
-     * @param   suffix
-     *          Team suffix for 1.12-
-     * @param   suffixComponent
-     *          Team suffix component for 1.13+
-     * @param   visibility
-     *          Nametag visibility rule
-     * @param   collision
-     *          Player collision rule
-     * @param   options
-     *          Team flags
-     * @param   color
-     *          Team color for 1.13+
-     */
-    @SneakyThrows
-    private void updateTeamData(@NonNull Object team, @NonNull String prefix, @Nullable Object prefixComponent,
-                                  @NonNull String suffix, @Nullable Object suffixComponent,
-                                  @NonNull Scoreboard.NameVisibility visibility, @NonNull Scoreboard.CollisionRule collision,
-                                  int options, @NonNull EnumChatFormat color) {
-        ScoreboardTeam_setAllowFriendlyFire.invoke(team, (options & 0x1) > 0);
-        ScoreboardTeam_setCanSeeFriendlyInvisibles.invoke(team, (options & 0x2) > 0);
-        if (BukkitReflection.getMinorVersion() >= MODERN_TEAM_DATA_VERSION) {
-            ScoreboardTeam_setPrefix.invoke(team, prefixComponent);
-            ScoreboardTeam_setSuffix.invoke(team, suffixComponent);
-            ScoreboardTeam_setColor.invoke(team, chatFormats[color.ordinal()]);
-        } else {
-            ScoreboardTeam_setPrefix.invoke(team, prefix);
-            ScoreboardTeam_setSuffix.invoke(team, suffix);
-        }
-        setVisibility.accept(team, visibility);
-        setCollision.accept(team, collision);
-    }
-
-    /**
-     * Creates a team with given name.
-     *
-     * @param   name
-     *          Team name
-     * @return  Team with specified name
-     */
-    @SneakyThrows
-    public Object createTeam(@NonNull String name) {
-        return newScoreboardTeam.newInstance(emptyScoreboard, name);
-    }
-
-    /**
-     * Checks if packet is team packet and removes all real players from team
-     * if sent by other plugins and anti-override is fully active on a player.
-     *
-     * @param   player
-     *          Player who received the packet
-     * @param   packet
-     *          Received packet
-     */
-    @SneakyThrows
-    public void onPacketSend(@NonNull TabPlayer player, @NonNull Object packet) {
-        if (!TeamPacketClass.isInstance(packet)) return;
-        int action = TeamPacket_ACTION.getInt(packet);
-        if (action == TeamAction.REMOVE || action == TeamAction.UPDATE) return;
-        TeamPacket_PLAYERS.set(packet, player.getScoreboard().onTeamPacket(
-                action, (String) TeamPacket_NAME.get(packet), (Collection<String>) TeamPacket_PLAYERS.get(packet)));
-    }
-}
@@ -1,59 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.tablist;
-
-import lombok.NonNull;
-import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
-import me.neznamy.tab.shared.chat.TabComponent;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.UUID;
-
-/**
- * TabList handler using the almighty Bukkit API.
- */
-public class BukkitTabList extends TabListBase<String> {
-
-    /**
-     * Constructs new instance with given player.
-     *
-     * @param   player
-     *          Player this tablist will belong to.
-     */
-    public BukkitTabList(@NonNull BukkitTabPlayer player) {
-        super(player);
-    }
-
-    @Override
-    public void removeEntry(@NonNull UUID entry) {
-        // Shrug
-    }
-
-    @Override
-    @SuppressWarnings("deprecation")
-    public void updateDisplayName0(@NonNull UUID entry, @Nullable String displayName) {
-        Player p = Bukkit.getPlayer(entry);
-        if (p == null) return;
-        p.setPlayerListName(displayName);
-    }
-
-    @Override
-    public void updateLatency(@NonNull UUID entry, int latency) {
-        // Shrug
-    }
-
-    @Override
-    public void updateGameMode(@NonNull UUID entry, int gameMode) {
-        // Shrug
-    }
-
-    @Override
-    public void addEntry0(@NonNull UUID id, @NonNull String name, @Nullable Skin skin, int latency, int gameMode, @Nullable String displayName) {
-        // Shrug
-    }
-
-    @Override
-    public String toComponent(@NonNull TabComponent component) {
-        return player.getPlatform().toBukkitFormat(component, true);
-    }
-}
@@ -1,65 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.tablist;
-
-import lombok.SneakyThrows;
-import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
-import me.neznamy.tab.platforms.bukkit.nms.BukkitReflection;
-import me.neznamy.tab.platforms.bukkit.nms.ComponentConverter;
-import me.neznamy.tab.platforms.bukkit.nms.PacketSender;
-import me.neznamy.tab.shared.util.BiFunctionWithException;
-import me.neznamy.tab.shared.util.ReflectionUtils;
-import org.jetbrains.annotations.NotNull;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-
-/**
- * Header/footer sender that uses NMS to send packets. Available
- * on all versions since 1.8 when the feature was added into the game.
- */
-public class PacketHeaderFooter {
-
-    private final PacketSender packetSender = new PacketSender();
-    private final BiFunctionWithException<Object, Object, Object> createPacket;
-
-    /**
-     * Constructs new instance and loads all NMS content. Throws exception if something went wrong.
-     *
-     * @throws  ReflectiveOperationException
-     *          If something went wrong
-     */
-    public PacketHeaderFooter() throws ReflectiveOperationException {
-        Class<?> Component = BukkitReflection.getClass("network.chat.Component", "network.chat.IChatBaseComponent", "IChatBaseComponent");
-        Class<?> HeaderFooterClass = BukkitReflection.getClass("network.protocol.game.ClientboundTabListPacket",
-                "network.protocol.game.PacketPlayOutPlayerListHeaderFooter", "PacketPlayOutPlayerListHeaderFooter");
-        ComponentConverter.ensureAvailable();
-        if (BukkitReflection.getMinorVersion() >= 17) {
-            Constructor<?> newHeaderFooter = HeaderFooterClass.getConstructor(Component, Component);
-            createPacket = newHeaderFooter::newInstance;
-        } else {
-            Constructor<?> newHeaderFooter = HeaderFooterClass.getConstructor();
-            Field HEADER = ReflectionUtils.getFields(HeaderFooterClass, Component).get(0);
-            Field FOOTER = ReflectionUtils.getFields(HeaderFooterClass, Component).get(1);
-            createPacket = (header, footer) -> {
-                Object packet = newHeaderFooter.newInstance();
-                HEADER.set(packet, header);
-                FOOTER.set(packet, footer);
-                return packet;
-            };
-        }
-    }
-
-    /**
-     * Sends header/footer to player.
-     *
-     * @param   player
-     *          Player to send header/footer to.
-     * @param   header
-     *          Header to use.
-     * @param   footer
-     *          Footer to use.
-     */
-    @SneakyThrows
-    public void set(@NotNull BukkitTabPlayer player, @NotNull Object header, @NotNull Object footer) {
-        packetSender.sendPacket(player.getPlayer(), createPacket.apply(header, footer));
-    }
-}
@@ -1,154 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.tablist;
-
-import com.mojang.authlib.GameProfile;
-import lombok.NonNull;
-import lombok.SneakyThrows;
-import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
-import me.neznamy.tab.platforms.bukkit.nms.BukkitReflection;
-import me.neznamy.tab.shared.TAB;
-import me.neznamy.tab.shared.util.ReflectionUtils;
-import org.jetbrains.annotations.Nullable;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.util.*;
-
-/**
- * TabList handler for 1.19.3+ servers using packets.
- */
-@SuppressWarnings({"unchecked", "rawtypes"})
-public class PacketTabList1193 extends PacketTabList18 {
-
-    /** Map of actions to prevent creating new EnumSet on each packet send */
-    private static final Map<Action, EnumSet<?>> actionToEnumSet = new EnumMap<>(Action.class);
-
-    private static Enum actionAddPlayer;
-    private static Enum actionUpdateDisplayName;
-    private static Enum actionUpdateLatency;
-
-    private static Constructor<?> newRemovePacket;
-
-    private static Field PlayerInfoData_UUID;
-    private static Field PlayerInfoData_GameMode;
-    private static Field PlayerInfoData_Listed;
-    private static Field PlayerInfoData_RemoteChatSession;
-
-    /**
-     * Constructs new instance with given player.
-     *
-     * @param   player
-     *          Player this tablist will belong to.
-     */
-    public PacketTabList1193(@NonNull BukkitTabPlayer player) {
-        super(player);
-    }
-
-    /**
-     * Attempts to load all required NMS classes, fields and methods.
-     * If anything fails, throws an exception.
-     *
-     * @throws  ReflectiveOperationException
-     *          If something goes wrong
-     */
-    public static void loadNew() throws ReflectiveOperationException {
-        Class<Enum> EnumGamemodeClass = (Class<Enum>) BukkitReflection.getClass("world.level.GameType", "world.level.EnumGamemode");
-        ActionClass = (Class<Enum>) BukkitReflection.getClass(
-                "network.protocol.game.ClientboundPlayerInfoUpdatePacket$Action", // Mojang
-                "network.protocol.game.ClientboundPlayerInfoUpdatePacket$a" // Bukkit
-        );
-        PlayerInfoClass = BukkitReflection.getClass("network.protocol.game.ClientboundPlayerInfoUpdatePacket");
-        Class<?> playerInfoDataClass = BukkitReflection.getClass(
-                "network.protocol.game.ClientboundPlayerInfoUpdatePacket$Entry", // Mojang
-                "network.protocol.game.ClientboundPlayerInfoUpdatePacket$b" // Bukkit
-        );
-
-        newPlayerInfo = PlayerInfoClass.getConstructor(EnumSet.class, Collection.class);
-        ACTION = ReflectionUtils.getOnlyField(PlayerInfoClass, EnumSet.class);
-
-        loadSharedContent(playerInfoDataClass, EnumGamemodeClass);
-
-        PlayerInfoData_Listed = ReflectionUtils.getOnlyField(playerInfoDataClass, boolean.class);
-        PlayerInfoData_GameMode = ReflectionUtils.getOnlyField(playerInfoDataClass, EnumGamemodeClass);
-        Class<?> RemoteChatSession$Data = BukkitReflection.getClass("network.chat.RemoteChatSession$Data", "network.chat.RemoteChatSession$a");
-        PlayerInfoData_RemoteChatSession = ReflectionUtils.getOnlyField(playerInfoDataClass, RemoteChatSession$Data);
-        PlayerInfoData_UUID = ReflectionUtils.getOnlyField(playerInfoDataClass, UUID.class);
-        newRemovePacket = BukkitReflection.getClass("network.protocol.game.ClientboundPlayerInfoRemovePacket").getConstructor(List.class);
-
-        actionAddPlayer = Enum.valueOf(ActionClass, Action.ADD_PLAYER.name());
-        actionUpdateDisplayName = Enum.valueOf(ActionClass, Action.UPDATE_DISPLAY_NAME.name());
-        actionUpdateLatency = Enum.valueOf(ActionClass, Action.UPDATE_LATENCY.name());
-        Enum actionUpdateGameMode = Enum.valueOf(ActionClass, Action.UPDATE_GAME_MODE.name());
-
-        actionToEnumSet.put(Action.ADD_PLAYER, EnumSet.allOf(ActionClass));
-        actionToEnumSet.put(Action.UPDATE_GAME_MODE, EnumSet.of(actionUpdateGameMode));
-        actionToEnumSet.put(Action.UPDATE_DISPLAY_NAME, EnumSet.of(actionUpdateDisplayName));
-        actionToEnumSet.put(Action.UPDATE_LATENCY, EnumSet.of(actionUpdateLatency));
-    }
-
-    @Override
-    @SneakyThrows
-    public void removeEntry(@NonNull UUID entry) {
-        packetSender.sendPacket(player.getPlayer(), newRemovePacket.newInstance(Collections.singletonList(entry)));
-    }
-
-    @SneakyThrows
-    @NonNull
-    @Override
-    public Object createPacket(@NonNull Action action, @NonNull UUID id, @NonNull String name, @Nullable Skin skin,
-                               int latency, int gameMode, @Nullable Object displayName) {
-        Object packet = newPlayerInfo.newInstance(actionToEnumSet.get(action), Collections.emptyList());
-        PLAYERS.set(packet, Collections.singletonList(newPlayerInfoData.newInstance(
-                id,
-                action == Action.ADD_PLAYER ? createProfile(id, name, skin) : null,
-                true,
-                latency,
-                gameModes[gameMode],
-                displayName,
-                null
-        )));
-        return packet;
-    }
-
-    @Override
-    @SneakyThrows
-    public void onPacketSend(@NonNull Object packet) {
-        if (!(PlayerInfoClass.isInstance(packet))) return;
-        EnumSet<?> actions = (EnumSet<?>) ACTION.get(packet);
-        List<Object> updatedList = new ArrayList<>();
-        boolean rewritePacket = false;
-        for (Object nmsData : (List<?>) PLAYERS.get(packet)) {
-            boolean rewriteEntry = false;
-            UUID id = (UUID) PlayerInfoData_UUID.get(nmsData);
-            GameProfile profile = (GameProfile) PlayerInfoData_Profile.get(nmsData);
-            Object displayName = PlayerInfoData_DisplayName.get(nmsData);
-            int latency = PlayerInfoData_Latency.getInt(nmsData);
-            if (actions.contains(actionUpdateDisplayName)) {
-                Object expectedName = getExpectedDisplayName(id);
-                if (expectedName != null && expectedName != displayName) {
-                    displayName = expectedName;
-                    rewriteEntry = rewritePacket = true;
-                }
-            }
-            if (actions.contains(actionUpdateLatency)) {
-                int newLatency = TAB.getInstance().getFeatureManager().onLatencyChange(player, id, latency);
-                if (newLatency != latency) {
-                    latency = newLatency;
-                    rewriteEntry = rewritePacket = true;
-                }
-            }
-            if (actions.contains(actionAddPlayer)) {
-                TAB.getInstance().getFeatureManager().onEntryAdd(player, id, profile.getName());
-            }
-            // 1.19.3 is using records, which do not allow changing final fields, need to rewrite the list entirely
-            updatedList.add(rewriteEntry ? newPlayerInfoData.newInstance(
-                    id,
-                    profile,
-                    PlayerInfoData_Listed.getBoolean(nmsData),
-                    latency,
-                    PlayerInfoData_GameMode.get(nmsData),
-                    displayName,
-                    PlayerInfoData_RemoteChatSession.get(nmsData)) : nmsData);
-        }
-        if (rewritePacket) PLAYERS.set(packet, updatedList);
-    }
-}