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
752 changed files with 48627 additions and 84630 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,63 +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
@@ -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,45 +0,0 @@
-name: Build
-on:
-  push:
-    branches:
-      - master
-      - v4
-  pull_request:
-    types: [opened, synchronize, reopened]
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3.3.0 #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 17
-        uses: actions/setup-java@v3.9.0 #https://github.com/actions/setup-java/releases
-        with:
-          distribution: 'temurin'
-          java-version: 17
-      - 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: Jar
-          path: jar/build/libs/TAB-**.jar
@@ -6,5 +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 of usage of functions.
-* [Buy a copy](https://builtbybit.com/resources/14009/) of the plugin or [send a donation](https://paypal.me/neznamy1) to keep the plugin active.
+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,70 +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, compatibility and support.  
-More information can be found at [Why TAB?](https://github.com/NEZNAMY/TAB/wiki/Why-TAB%3F) wiki page.
+# TAB-OG

-# Distribution
-As of TAB 3.0.0, released with MC 1.18 (November 30th, 2021), there is no free / premium
-version anymore. Only one version of the plugin exists now, which contains all implemented features
-and is available to everyone for free. However, customer support is only provided to 
-customers who have purchased the plugin (see [Customer support](#customer-support)).  
+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`.

-# Compiling
-Compilation requires JDK 17 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.
+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.

-# Customer support
-Unlike with other projects where requirements and level of support provided are unclear,
-we provide a clear answer to what kind of service you will or will not receive. Some projects don't
-even clearly state if they are free or paid. While they are listed as paid on spigot, they have
-a free download link in description, which can be confusing.  
-Support is also quite often "we have a discord server, but don't ping devs for support", suggesting
-there is no official support, just the community.
-
-In TAB, everything is clearly defined. **Downloads are free, but services are paid.**  
-The plugin is free to download for everyone. The only exception might be occasional update delays
-for free users once a year.  
-Customer support, however, is only provided to customers who have formally purchased a copy 
-of the plugin on any of the websites the plugin is being sold on:  
-* [BuiltByBit](https://builtbybit.com/resources/14009/)
-* [Polymart](https://polymart.org/resource/484)
-  
-After purchasing, you can request assistance via either private messages on the website where you
-have purchased it, or using [TAB's Discord server](https://discord.gg/EaSvdk6) (which is highly 
-preferred, since the communication will be much faster thanks to notifications and more).  
-* We use a ticket system, which allows us to effectively track any amount of unresolved problems.
-No more questions getting lost in the sea of messages from other people asking. Tickets are only closed
-after user confirmed all of their questions were answered and then receive a transcript of the ticket
-from the bot after ticket is closed into private messages (unless user is blocking them).
-* We do not rely on the community helping, which often makes things even worse. We know people have
-better things to do than helping random people with a random plugin, especially when most people only
-have a very basic knowledge of the plugin, not being able to answer more complicated problems.
-* We have notifications enabled and reply as soon as possible. We do not have the server muted unlike
-most mods on most servers who only check it when they are really bored, give a wiki link and 
-disappear again.
-* As the developer, I do not rely on helpers providing support instead of me. They are handy as
-I am obviously not available 24/7, but I do not intentionally leave anything to them. I reply
-whenever I am available without any intentional delays.
-
-# Other links
-Download the plugin for free: 
-* [GitHub releases](https://github.com/NEZNAMY/TAB/releases)
-* [BuiltByBit](https://builtbybit.com/resources/20631/)
-* [Modrinth](https://modrinth.com/plugin/tab-was-taken)
-  
-[Wiki](https://github.com/NEZNAMY/TAB/wiki)
-
-# Issues
-The [Issues](https://github.com/NEZNAMY/TAB/issues) section is **only** available for cases included in templates.
-In other words, they **are not available for**:  
-* **Support** - support is provided on discord for buyers, where roles are given to verified users
-allowing us to know who bought it and who didn't. It also serves as a much faster way of communication.
-* **Feature requests** - closed indefinitely.
-  
-**If you're a customer, please use discord for reporting bugs, especially if you aren't good at making bug reports. 
-You will be provided with a much faster and higher quality service.**
-
-# Contributing
-See [CONTRIBUTING.md](https://github.com/NEZNAMY/TAB/blob/master/CONTRIBUTING.md)
+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.0.1")
+    compileOnlyApi("org.jetbrains:annotations:26.0.2")
 }

 tasks.javadoc {
@@ -1,5 +1,6 @@
 package me.neznamy.tab.api;

+import lombok.NonNull;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -8,6 +9,7 @@ import java.util.UUID;
 /**
 * An interface representing a player
 */
+@SuppressWarnings("unused") // API class
 public interface TabPlayer {

    /**
@@ -15,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  an instance of bukkit/bungee player depending on platform
+     * @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)
@@ -45,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.
@@ -66,4 +72,54 @@ public interface TabPlayer {
     * @see     #setTemporaryGroup(String)
     */
    boolean hasTemporaryGroup();
+
+    /**
+     * 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 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.
+     *
+     * @param   profileName
+     *          New expected profile name
+     */
+    void setExpectedProfileName(@NonNull String profileName);
+
+    /**
+     * Returns player's expected profile name. This defaults to player's username, but may
+     * get changed by other plugins and then detected by TAB.
+     *
+     * @return  Player's expected profile name
+     */
+    @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();
 }
@@ -4,6 +4,27 @@ package me.neznamy.tab.api.bossbar;
 * An enum representing all available BossBar colors.
 * Calling ordinal() will return color's network ID.
 */
+@SuppressWarnings("unused") // API class
 public enum BarColor {
-    PINK, BLUE, RED, GREEN, YELLOW, PURPLE, WHITE
+
+    /** Pink color */
+    PINK,
+
+    /** Blue color */
+    BLUE,
+
+    /** Red color */
+    RED,
+
+    /** Green color */
+    GREEN,
+
+    /** Yellow color */
+    YELLOW,
+
+    /** Purple color */
+    PURPLE,
+
+    /** White color */
+    WHITE
 }
@@ -1,22 +1,24 @@
 package me.neznamy.tab.api.bossbar;

-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
 /**
 * An enum representing all available BossBar styles.
 * Calling ordinal() will return style's network ID.
- * Style names are equal to NMS names.
 */
-@AllArgsConstructor
+@SuppressWarnings("unused") // API class
 public enum BarStyle {

-    PROGRESS("SOLID"),
-    NOTCHED_6("SEGMENTED_6"),
-    NOTCHED_10("SEGMENTED_10"),
-    NOTCHED_12("SEGMENTED_12"),
-    NOTCHED_20("SEGMENTED_20");
+    /** Fully solid line */
+    PROGRESS,

-    /** Style's name used in Bukkit API */
-    @Getter private final String bukkitName;
+    /** Line segmented into 6 parts */
+    NOTCHED_6,
+
+    /** Line segmented into 10 parts */
+    NOTCHED_10,
+
+    /** Line segmented into 12 parts */
+    NOTCHED_12,
+
+    /** Line segmented into 20 parts */
+    NOTCHED_20
 }
@@ -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.
@@ -193,6 +189,20 @@ public interface BossBar {
     */
    @NotNull List<TabPlayer> getPlayers();

+    /**
+     * Returns {@code true} if this bossbar is visible to specified player based on
+     * display condition or adding via {@link #addPlayer(TabPlayer)}, {@code false} if not.
+     * <p>
+     * This may return {@code true} even if player cannot physically see the bossbar due to
+     * having it disabled via toggle command or {@link BossBarManager#toggleBossBar(TabPlayer, boolean)}
+     * (or {@link BossBarManager#setBossBarVisible(TabPlayer, boolean, boolean)}).
+     *
+     * @param   player
+     *          Player to check
+     * @return  {@code true} if player is allowed to see this Boss Bar, {@code false} if not.
+     */
+    boolean containsPlayer(@NonNull TabPlayer player);
+
    /**
     * Returns {@code true} if this boss bar is configured as announcement-only bar,
     * {@code false} if not.
@@ -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.
@@ -17,6 +17,7 @@ import org.jetbrains.annotations.Nullable;
 * This requires the BossBar feature to be enabled in config, otherwise the method will
 * return {@code null}.
 */
+@SuppressWarnings("unused") // API class
 public interface BossBarManager {

    /**
@@ -77,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.
     * 
@@ -116,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)
@@ -132,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)
@@ -6,6 +6,7 @@ import lombok.NonNull;
 * The event bus. This is used to register event listeners/handlers for
 * handling events that may be fired by TAB.
 */
+@SuppressWarnings("unused") // API class
 public interface EventBus {

    /**
@@ -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;

 /**
@@ -12,6 +13,7 @@ import org.jetbrains.annotations.Nullable;
 * This requires the Team feature to be enabled in config, otherwise the method will
 * return {@code null}.
 */
+@SuppressWarnings("unused") // API class
 public interface NameTagManager {

    /**
@@ -132,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);

@@ -146,30 +148,134 @@ 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);

-    @Nullable String getCustomPrefix(@NonNull TabPlayer player);
+    /**
+     * Returns custom prefix assigned using {@link #setPrefix(TabPlayer, String)}.
+     * If no custom prefix is set, returns {@code null}.
+     *
+     * @param   player
+     *          Player to get custom prefix of
+     * @return  Custom prefix assigned using the API.
+     * @see     #setPrefix(TabPlayer, String)
+     * @see     #getOriginalRawPrefix(TabPlayer)
+     */
+    @Nullable
+    String getCustomPrefix(@NonNull TabPlayer player);

-    @Nullable String getCustomSuffix(@NonNull TabPlayer player);
+    /**
+     * Returns custom suffix assigned using {@link #setSuffix(TabPlayer, String)}.
+     * If no custom suffix is set, returns {@code null}.
+     *
+     * @param   player
+     *          Player to get custom suffix of
+     * @return  Custom suffix assigned using the API.
+     * @see     #setSuffix(TabPlayer, String)
+     * @see     #getOriginalRawSuffix(TabPlayer)
+     */
+    @Nullable
+    String getCustomSuffix(@NonNull TabPlayer player);

-    @NonNull String getOriginalPrefix(@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);

-    @NonNull String getOriginalSuffix(@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 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,128 +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.
- */
-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,11 +8,14 @@ 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
 * obtained using {@link TabAPI#getPlaceholderManager()}
 */
+@SuppressWarnings("unused") // API class
 public interface PlaceholderManager {

    /**
@@ -29,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)
@@ -45,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)
@@ -62,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
@@ -2,6 +2,7 @@ package me.neznamy.tab.api.placeholder;

 import lombok.NonNull;
 import me.neznamy.tab.api.TabPlayer;
+import org.jetbrains.annotations.Nullable;

 /**
 * Interface for player placeholders (placeholders returning different value for each player)
@@ -18,7 +19,7 @@ public interface PlayerPlaceholder extends Placeholder {
     * @param   value
     *          New value
     */
-    void updateValue(@NonNull TabPlayer player, @NonNull Object value);
+    void updateValue(@NonNull TabPlayer player, @Nullable String value);

    /**
     * Force-updates placeholder value using previously provided update function.
@@ -2,10 +2,12 @@ package me.neznamy.tab.api.placeholder;

 import lombok.NonNull;
 import me.neznamy.tab.api.TabPlayer;
+import org.jetbrains.annotations.Nullable;

 /**
 * An interface for relational placeholders (returning different value for each player duo)
 */
+@SuppressWarnings("unused") // API class
 public interface RelationalPlaceholder extends Placeholder {

    /**
@@ -20,7 +22,7 @@ public interface RelationalPlaceholder extends Placeholder {
     * @param   value
     *          New value
     */
-    void updateValue(@NonNull TabPlayer viewer, @NonNull TabPlayer target, @NonNull Object value);
+    void updateValue(@NonNull TabPlayer viewer, @NonNull TabPlayer target, @Nullable String value);

    /**
     * Force-updates placeholder value using previously provided update function.
@@ -1,6 +1,6 @@
 package me.neznamy.tab.api.placeholder;

-import lombok.NonNull;
+import org.jetbrains.annotations.Nullable;

 /**
 * An interface for server placeholders (returning same value for all players)
@@ -15,7 +15,7 @@ public interface ServerPlaceholder extends Placeholder {
     * @param   value
     *          New value
     */
-    void updateValue(@NonNull Object value);
+    void updateValue(@Nullable String value);

    /**
     * Force-updates placeholder value using previously provided update function.
@@ -11,12 +11,13 @@ import java.util.List;
 * {@link ScoreboardManager#createScoreboard(String, String, List)},
 * for scoreboards from config {@link ScoreboardManager#getRegisteredScoreboards()}.
 */
+@SuppressWarnings("unused") // API class
 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
     */
@@ -83,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,11 +1,12 @@
 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,
@@ -15,6 +16,7 @@ import org.jetbrains.annotations.NotNull;
 * This requires the scoreboard feature to be enabled in config,
 * the method will return {@code null} otherwise.
 */
+@SuppressWarnings("unused") // API class
 public interface ScoreboardManager {

    /**
@@ -52,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
@@ -164,5 +189,5 @@ public interface ScoreboardManager {
     *          player to get active scoreboard of
     * @return  player's active scoreboard or {@code null} if player has no scoreboard
     */
-    @NotNull Scoreboard getActiveScoreboard(@NonNull TabPlayer player);
+    @Nullable Scoreboard getActiveScoreboard(@NonNull TabPlayer player);
 }
@@ -12,6 +12,7 @@ import org.jetbrains.annotations.Nullable;
 * This requires the Header/footer feature to be enabled in config, otherwise
 * the method will return {@code null}.
 */
+@SuppressWarnings("unused") // API class
 public interface HeaderFooterManager {

    /**
@@ -1,10 +1,18 @@
 package me.neznamy.tab.api.tablist;

 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 managing player sorting by directly configuring
+ * team names of players. Instance can be obtained using
+ * {@link TabAPI#getSortingManager()}. If the feature is disabled,
+ * it will return {@code null}.
+ */
+@SuppressWarnings("unused") // API class
 public interface SortingManager {

    /**
@@ -14,6 +14,7 @@ import org.jetbrains.annotations.Nullable;
 * This requires the feature to be enabled in config, otherwise the method will
 * return {@code null}.
 */
+@SuppressWarnings("unused") // API class
 public interface TabListFormatManager {

    /**
@@ -26,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);

@@ -40,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);

@@ -54,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);

@@ -66,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);

@@ -103,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.
@@ -115,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.
@@ -127,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);
 }
@@ -7,6 +7,7 @@ import org.jetbrains.annotations.Nullable;
 /**
 * Interface representing a layout.
 */
+@SuppressWarnings("unused") // API class
 public interface Layout {

    /**
@@ -64,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;

 /**
@@ -10,6 +11,7 @@ import org.jetbrains.annotations.Nullable;
 * {@link TabAPI#getLayoutManager()}. If the feature is disabled in
 * config, it will return {@code null}.
 */
+@SuppressWarnings("unused") // API class
 public interface LayoutManager {

    /**
@@ -19,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.0.1")
-    implementation("fabric-loom:fabric-loom.gradle.plugin:1.1-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,7 +24,7 @@ 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"))
    }
 }
@@ -32,5 +32,6 @@ tasks {
 java {
    toolchain {
        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.0.2"
+    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.krypton,
-    projects.velocity,
-    projects.sponge7,
-    projects.sponge8,
-    projects.fabric
-).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,8 +1,14 @@
 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")
+    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")
+        exclude("com.github.dmulloy2", "ProtocolLib")
+        exclude("org.ow2.asm", "asm")
+        exclude("net.md-5", "bungeecord-chat")
+    }
+    compileOnly("com.github.LeonMangler:PremiumVanishAPI:2.8.8")
 }
@@ -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,8 @@
 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;
 import me.neznamy.tab.shared.platform.TabPlayer;
 import org.bukkit.entity.Player;
@@ -7,37 +10,60 @@ 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;

 /**
 * The core for bukkit forwarding events into all enabled features
 */
-public class BukkitEventListener extends EventListener<Player> implements Listener {
+@RequiredArgsConstructor
+public class BukkitEventListener implements EventListener<Player>, Listener {

+    /** Platform reference */
+    private final BukkitPlatform platform;
+
+    /**
+     * Listens to player quit event.
+     *
+     * @param   e
+     *          Disconnect event
+     */
    @EventHandler(priority = EventPriority.HIGHEST)
    public void onQuit(PlayerQuitEvent e) {
        quit(e.getPlayer().getUniqueId());
    }

-    @EventHandler(priority = EventPriority.LOWEST)
+    /**
+     * Listens to player join event.
+     *
+     * @param   e
+     *          Join event
+     */
+    @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());
    }

+    /**
+     * Listens to world change event.
+     *
+     * @param   e
+     *          World change event
+     */
    @EventHandler(priority = EventPriority.LOWEST)
    public void onWorldChange(PlayerChangedWorldEvent e) {
        worldChange(e.getPlayer().getUniqueId(), e.getPlayer().getWorld().getName());
    }

-    @EventHandler
-    public void onCommand(PlayerCommandPreprocessEvent e) {
-        if (command(e.getPlayer().getUniqueId(), e.getMessage())) e.setCancelled(true);
-    }
-
    @Override
-    public TabPlayer createPlayer(Player player) {
-        return new BukkitTabPlayer(player);
+    @NotNull
+    public TabPlayer createPlayer(@NotNull Player player) {
+        return new BukkitTabPlayer(platform, player);
    }
-}
+}
@@ -1,25 +1,13 @@
 package me.neznamy.tab.platforms.bukkit;

-import com.mojang.authlib.GameProfile;
 import io.netty.channel.Channel;
-import lombok.SneakyThrows;
-import me.neznamy.tab.platforms.bukkit.scoreboard.PacketScoreboard;
-import me.neznamy.tab.shared.TabConstants;
-import me.neznamy.tab.shared.features.nametags.NameTag;
-import me.neznamy.tab.shared.platform.TabList;
-import me.neznamy.tab.shared.platform.TabPlayer;
-import me.neznamy.tab.shared.chat.IChatBaseComponent;
-import me.neznamy.tab.platforms.bukkit.nms.storage.nms.NMSStorage;
-import me.neznamy.tab.shared.TAB;
+import me.neznamy.tab.platforms.bukkit.platform.BukkitPlatform;
 import me.neznamy.tab.shared.features.injection.NettyPipelineInjector;
-import me.neznamy.tab.shared.features.sorting.Sorting;
+import me.neznamy.tab.shared.platform.TabPlayer;
 import org.jetbrains.annotations.NotNull;

-import java.util.*;
-import java.util.stream.Collectors;
-
 /**
- * Pipeline injection for bukkit
+ * Pipeline injection for Bukkit 1.8+.
 */
 public class BukkitPipelineInjector extends NettyPipelineInjector {

@@ -31,123 +19,8 @@ public class BukkitPipelineInjector extends NettyPipelineInjector {
    }

    @Override
+    @NotNull
    protected Channel getChannel(@NotNull TabPlayer player) {
-        BukkitTabPlayer bukkit = (BukkitTabPlayer) player;
-        NMSStorage nms = NMSStorage.getInstance();
-        try {
-            if (nms.CHANNEL != null) return (Channel) nms.CHANNEL.get(nms.NETWORK_MANAGER.get(bukkit.getPlayerConnection()));
-        } catch (IllegalAccessException exception) {
-            TAB.getInstance().getErrorManager().printError("Failed to get channel of " + bukkit.getName(), exception);
-        }
-        return null;
-    }
-
-    @Override
-    @SneakyThrows
-    public void onDisplayObjective(@NotNull TabPlayer player, @NotNull Object packet) {
-        TAB.getInstance().getFeatureManager().onDisplayObjective(player,
-                PacketScoreboard.DisplayObjective_POSITION.getInt(packet),
-                (String) PacketScoreboard.DisplayObjective_OBJECTIVE_NAME.get(packet));
-    }
-
-    @Override
-    @SneakyThrows
-    public void onObjective(@NotNull TabPlayer player, @NotNull Object packet) {
-        TAB.getInstance().getFeatureManager().onObjective(player,
-                PacketScoreboard.Objective_METHOD.getInt(packet),
-                (String) PacketScoreboard.Objective_OBJECTIVE_NAME.get(packet));
-    }
-
-    @Override
-    public boolean isDisplayObjective(@NotNull Object packet) {
-        return PacketScoreboard.DisplayObjectiveClass.isInstance(packet);
-    }
-
-    @Override
-    public boolean isObjective(@NotNull Object packet) {
-        return PacketScoreboard.ObjectivePacketClass.isInstance(packet);
-    }
-
-    @Override
-    public boolean isTeam(@NotNull Object packet) {
-        return PacketScoreboard.TeamPacketClass.isInstance(packet);
-    }
-
-    @Override
-    public boolean isPlayerInfo(@NotNull Object packet) {
-        return BukkitTabList.PacketPlayOutPlayerInfoClass.isInstance(packet);
-    }
-
-    @Override
-    @SneakyThrows
-    public void onPlayerInfo(@NotNull TabPlayer receiver, @NotNull Object packet) {
-        NMSStorage nms = NMSStorage.getInstance();
-        List<String> actions;
-        if (BukkitTabList.ClientboundPlayerInfoRemovePacket != null) {
-            //1.19.3+
-            actions = ((EnumSet<?>)BukkitTabList.ACTION.get(packet)).stream().map(Enum::name).collect(Collectors.toList());
-        } else {
-            //1.19.2-
-            actions = Collections.singletonList(BukkitTabList.ACTION.get(packet).toString());
-        }
-        List<Object> updatedList = new ArrayList<>();
-        for (Object nmsData : (List<?>) BukkitTabList.PLAYERS.get(packet)) {
-            GameProfile profile = (GameProfile) BukkitTabList.PlayerInfoData_getProfile.invoke(nmsData);
-            Object displayName = null;
-            if (actions.contains(TabList.Action.UPDATE_DISPLAY_NAME.name()) || actions.contains(TabList.Action.ADD_PLAYER.name())) {
-                displayName = BukkitTabList.PlayerInfoData_DisplayName.get(nmsData);
-                IChatBaseComponent newDisplayName = TAB.getInstance().getFeatureManager().onDisplayNameChange(receiver, profile.getId());
-                if (newDisplayName != null) displayName = nms.toNMSComponent(newDisplayName, receiver.getVersion());
-                if (!nms.is1_19_3Plus()) BukkitTabList.PlayerInfoData_DisplayName.set(nmsData, displayName);
-            }
-            if (nms.is1_19_3Plus()) {
-                // 1.19.3 is using records, which do not allow changing final fields, need to rewrite the list entirely
-                updatedList.add(BukkitTabList.newPlayerInfoData.newInstance(
-                        profile.getId(),
-                        profile,
-                        BukkitTabList.PlayerInfoData_Listed.getBoolean(nmsData),
-                        BukkitTabList.PlayerInfoData_Latency.getInt(nmsData),
-                        BukkitTabList.PlayerInfoData_GameMode.get(nmsData),
-                        displayName,
-                        BukkitTabList.PlayerInfoData_RemoteChatSession.get(nmsData)));
-            }
-        }
-        if (nms.is1_19_3Plus()) {
-            BukkitTabList.PLAYERS.set(packet, updatedList);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    @SneakyThrows
-    public void modifyPlayers(@NotNull Object packetPlayOutScoreboardTeam) {
-        if (TAB.getInstance().getNameTagManager() == null) return;
-        int action = PacketScoreboard.TeamPacket_ACTION.getInt(packetPlayOutScoreboardTeam);
-        if (action == 1 || action == 2 || action == 4) return;
-        Collection<String> players = (Collection<String>) PacketScoreboard.TeamPacket_PLAYERS.get(packetPlayOutScoreboardTeam);
-        String teamName = (String) PacketScoreboard.TeamPacket_NAME.get(packetPlayOutScoreboardTeam);
-        if (players == null) return;
-        //creating a new list to prevent NoSuchFieldException in minecraft packet encoder when a player is removed
-        Collection<String> newList = new ArrayList<>();
-        for (String entry : players) {
-            TabPlayer p = TAB.getInstance().getPlayer(entry);
-            if (p == null) {
-                newList.add(entry);
-                continue;
-            }
-            Sorting sorting = TAB.getInstance().getFeatureManager().getFeature(TabConstants.Feature.SORTING);
-            String expectedTeam = sorting.getShortTeamName(p);
-            if (expectedTeam == null) {
-                newList.add(entry);
-                continue;
-            }
-            if (!((NameTag)TAB.getInstance().getNameTagManager()).getDisableChecker().isDisabledPlayer(p) &&
-                    !TAB.getInstance().getNameTagManager().hasTeamHandlingPaused(p) && !teamName.equals(expectedTeam)) {
-                logTeamOverride(teamName, p.getName(), expectedTeam);
-            } else {
-                newList.add(entry);
-            }
-        }
-        PacketScoreboard.TeamPacket_PLAYERS.set(packetPlayOutScoreboardTeam, newList);
+        return ((BukkitPlatform)player.getPlatform()).getImplementationProvider().getChannel(((BukkitTabPlayer) player).getPlayer());
    }
 }
@@ -1,82 +0,0 @@
-package me.neznamy.tab.platforms.bukkit;
-
-import me.neznamy.tab.shared.TabConstants;
-import me.neznamy.tab.api.placeholder.PlaceholderManager;
-import me.neznamy.tab.shared.placeholders.UniversalPlaceholderRegistry;
-import net.milkbowl.vault.chat.Chat;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.RegisteredServiceProvider;
-import org.jetbrains.annotations.NotNull;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-/**
- * Bukkit registry to register bukkit-only and universal placeholders
- */
-public class BukkitPlaceholderRegistry extends UniversalPlaceholderRegistry {
-
-    private Chat chat;
-
-    /** NMS server to get TPS from on spigot */
-    private Object server;
-
-    /** TPS field*/
-    private Field recentTps;
-
-    /** Detection for presence of Paper's TPS getter */
-    private Method paperTps;
-
-    /** Detection for presence of Paper's MSPT getter */
-    private Method paperMspt;
-
-    /**
-     * Constructs new instance and loads hooks
-     */
-    public BukkitPlaceholderRegistry() {
-        try {
-            server = Bukkit.getServer().getClass().getMethod("getServer").invoke(Bukkit.getServer());
-            recentTps = server.getClass().getField("recentTps");
-        } catch (ReflectiveOperationException e) {
-            //not spigot
-        }
-        try { paperTps = Bukkit.class.getMethod("getTPS"); } catch (NoSuchMethodException ignored) {}
-        try { paperMspt = Bukkit.class.getMethod("getAverageTickTime"); } catch (NoSuchMethodException ignored) {}
-        if (Bukkit.getPluginManager().isPluginEnabled("Vault")) {
-            RegisteredServiceProvider<Chat> rspChat = Bukkit.getServicesManager().getRegistration(Chat.class);
-            if (rspChat != null) chat = rspChat.getProvider();
-        }
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public void registerPlaceholders(@NotNull PlaceholderManager manager) {
-        manager.registerPlayerPlaceholder(TabConstants.Placeholder.DISPLAY_NAME, 500, p -> ((Player) p.getPlayer()).getDisplayName());
-        if (paperTps != null) {
-            manager.registerServerPlaceholder(TabConstants.Placeholder.TPS, 1000, () -> formatTPS(Bukkit.getTPS()[0]));
-        } else if (recentTps != null) {
-            manager.registerServerPlaceholder(TabConstants.Placeholder.TPS, 1000, () -> {
-                try {
-                    return formatTPS(((double[]) recentTps.get(server))[0]);
-                } catch (IllegalAccessException e) {
-                    return -1;
-                }
-            });
-        } else {
-            manager.registerServerPlaceholder(TabConstants.Placeholder.TPS, -1, () -> -1);
-        }
-        if (paperMspt != null) {
-            manager.registerServerPlaceholder(TabConstants.Placeholder.MSPT, 1000, () -> format(Bukkit.getAverageTickTime()));
-        }
-        manager.registerPlayerPlaceholder(TabConstants.Placeholder.HEALTH, 100, p -> (int) Math.ceil(((Player) p.getPlayer()).getHealth()));
-        if (chat != null) {
-            manager.registerPlayerPlaceholder("%vault-prefix%", 1000, p -> chat.getPlayerPrefix((Player) p.getPlayer()));
-            manager.registerPlayerPlaceholder("%vault-suffix%", 1000, p -> chat.getPlayerSuffix((Player) p.getPlayer()));
-        } else {
-            manager.registerServerPlaceholder("%vault-prefix%", -1, () -> "");
-            manager.registerServerPlaceholder("%vault-suffix%", -1, () -> "");
-        }
-        super.registerPlaceholders(manager);
-    }
-}
@@ -1,168 +0,0 @@
-package me.neznamy.tab.platforms.bukkit;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import lombok.Setter;
-import lombok.SneakyThrows;
-import me.clip.placeholderapi.PlaceholderAPI;
-import me.neznamy.tab.shared.GroupManager;
-import me.neznamy.tab.shared.TabConstants;
-import me.neznamy.tab.shared.chat.IChatBaseComponent;
-import me.neznamy.tab.shared.chat.rgb.RGBUtils;
-import me.neznamy.tab.shared.features.injection.PipelineInjector;
-import me.neznamy.tab.shared.features.types.TabFeature;
-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.platforms.bukkit.nms.storage.nms.NMSStorage;
-import me.neznamy.tab.shared.TAB;
-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.placeholders.PlayerPlaceholderImpl;
-import me.neznamy.tab.shared.placeholders.expansion.EmptyTabExpansion;
-import me.neznamy.tab.shared.placeholders.expansion.TabExpansion;
-import me.neznamy.tab.shared.util.ReflectionUtils;
-import net.milkbowl.vault.permission.Permission;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.RegisteredServiceProvider;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Collection;
-
-/**
- * Implementation of Platform interface for Bukkit platform
- */
-@RequiredArgsConstructor
-@Getter
-public class BukkitPlatform implements BackendPlatform {
-
-    /** Plugin instance for registering tasks and events */
-    private final JavaPlugin plugin;
-
-    /** Variables checking presence of other plugins to hook into */
-    private final boolean placeholderAPI = ReflectionUtils.classExists("me.clip.placeholderapi.PlaceholderAPI");
-    @Setter private boolean libsDisguisesEnabled = ReflectionUtils.classExists("me.libraryaddict.disguise.DisguiseAPI");
-
-    public @NotNull BossBarManagerImpl getLegacyBossBar() {
-        return new WitherBossBar(plugin);
-    }
-
-    @Override
-    public void loadPlayers() {
-        for (Player p : getOnlinePlayers()) {
-            TAB.getInstance().addPlayer(new BukkitTabPlayer(p));
-        }
-    }
-
-    @Override
-    public void registerPlaceholders() {
-        new BukkitPlaceholderRegistry().registerPlaceholders(TAB.getInstance().getPlaceholderManager());
-    }
-
-    @Override
-    public @Nullable PipelineInjector createPipelineInjector() {
-        return NMSStorage.getInstance().getMinorVersion() >= 8 ? new BukkitPipelineInjector() : null;
-    }
-
-    @Override
-    public @NotNull NameTag getUnlimitedNameTags() {
-        return new BukkitNameTagX(plugin);
-    }
-
-    @Override
-    public @NotNull TabExpansion createTabExpansion() {
-        if (placeholderAPI) {
-            BukkitTabExpansion expansion = new BukkitTabExpansion();
-            expansion.register();
-            return expansion;
-        }
-        return new EmptyTabExpansion();
-    }
-
-    @Override
-    public @Nullable TabFeature getPerWorldPlayerList() {
-        return new PerWorldPlayerList(plugin);
-    }
-
-    /**
-     * Returns online players from Bukkit API
-     *
-     * @return  online players from Bukkit API
-     */
-    @SuppressWarnings("unchecked")
-    @SneakyThrows
-    private @NotNull 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]);
-        }
-    }
-
-    @Override
-    public void registerUnknownPlaceholder(@NotNull String identifier) {
-        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) ->
-                    placeholderAPI ? PlaceholderAPI.setRelationalPlaceholders((Player) viewer.getPlayer(), (Player) target.getPlayer(), identifier) : identifier);
-        } else if (identifier.startsWith("%sync:")) {
-            String syncedPlaceholder = "%" + identifier.substring(6, identifier.length()-1) + "%";
-            PlayerPlaceholderImpl[] ppl = new PlayerPlaceholderImpl[1];
-            ppl[0] = pl.registerPlayerPlaceholder(identifier, refresh, p -> {
-                try {
-                    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);
-                    });
-                    return null;
-                } catch (UnsupportedOperationException e) {
-                    return "<Folia does not support sync placeholders>";
-                }
-            });
-        } else if (identifier.startsWith("%server_")) {
-            TAB.getInstance().getPlaceholderManager().registerServerPlaceholder(identifier, refresh, () ->
-                    placeholderAPI ? PlaceholderAPI.setPlaceholders(null, identifier) : identifier);
-        } else {
-            TAB.getInstance().getPlaceholderManager().registerPlayerPlaceholder(identifier, refresh, p ->
-                    placeholderAPI ? PlaceholderAPI.setPlaceholders((Player) p.getPlayer(), identifier) : identifier);
-        }
-    }
-
-    @Override
-    public void sendConsoleMessage(@NotNull IChatBaseComponent message) {
-        Bukkit.getConsoleSender().sendMessage("[TAB] " + RGBUtils.getInstance().convertToBukkitFormat(message.toFlatText(),
-                TAB.getInstance().getServerVersion().getMinorVersion() >= 16));
-    }
-
-    @Override
-    public String getServerVersionInfo() {
-        return "[Bukkit] " + Bukkit.getName() + " - " + Bukkit.getBukkitVersion().split("-")[0] + " (" + NMSStorage.getInstance().getServerPackage() + ")";
-    }
-
-    @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);
-    }
-}
@@ -1,98 +1,36 @@
 package me.neznamy.tab.platforms.bukkit;

-import me.neznamy.tab.shared.ProtocolVersion;
-import me.neznamy.tab.shared.TabConstants;
-import me.neznamy.tab.shared.chat.EnumChatFormat;
-import me.neznamy.tab.platforms.bukkit.nms.storage.nms.*;
+import me.neznamy.tab.platforms.bukkit.platform.BukkitPlatform;
+import me.neznamy.tab.platforms.bukkit.platform.FoliaPlatform;
 import me.neznamy.tab.shared.TAB;
-import org.bstats.bukkit.Metrics;
-import org.bstats.charts.SimplePie;
+import me.neznamy.tab.shared.util.ReflectionUtils;
 import org.bukkit.Bukkit;
-import org.bukkit.command.*;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.Callable;

 /**
- * Main class for Bukkit platform
+ * Main class for Bukkit.
 */
 public class BukkitTAB extends JavaPlugin {

    @Override
    public void onEnable() {
-        String version = Bukkit.getBukkitVersion().split("-")[0];
-        String serverPackage = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
-        Bukkit.getConsoleSender().sendMessage(EnumChatFormat.color("[TAB] Server version: " + version + " (" + serverPackage + ")"));
-        if (!isVersionSupported()) {
-            Bukkit.getPluginManager().disablePlugin(this);
-            return;
+        boolean folia = ReflectionUtils.classExists("io.papermc.paper.threadedregions.RegionizedServer");
+        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] ================================================================================");
        }
-        BukkitPlatform platform = new BukkitPlatform(this);
-        TAB.setInstance(new TAB(platform, ProtocolVersion.fromFriendlyName(version), getDataFolder()));
-        if (TAB.getInstance().getServerVersion() == ProtocolVersion.UNKNOWN_SERVER_VERSION) {
-            Bukkit.getConsoleSender().sendMessage(EnumChatFormat.color("&c[TAB] Unknown server version: " + Bukkit.getBukkitVersion() + "! Plugin may not work correctly."));
-        }
-        Bukkit.getPluginManager().registerEvents(new BukkitEventListener(), this);
-        TAB.getInstance().load();
-        Metrics metrics = new Metrics(this, 5304);
-        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.PLACEHOLDER_API, () -> platform.isPlaceholderAPI() ? "Yes" : "No"));
-        metrics.addCustomChart(new SimplePie(TabConstants.MetricsChart.PERMISSION_SYSTEM, () -> TAB.getInstance().getGroupManager().getPermissionPlugin()));
-        metrics.addCustomChart(new SimplePie(TabConstants.MetricsChart.SERVER_VERSION, () -> "1." + TAB.getInstance().getServerVersion().getMinorVersion() + ".x"));
-        PluginCommand cmd = Bukkit.getPluginCommand(TabConstants.COMMAND_BACKEND);
-        if (cmd == null) return;
-        BukkitTabCommand command = new BukkitTabCommand();
-        cmd.setExecutor(command);
-        cmd.setTabCompleter(command);
    }

    @Override
    public void onDisable() {
-        //null check due to compatibility check making instance not get set on unsupported versions
-        if (TAB.getInstance() != null) TAB.getInstance().unload();
-    }
-    
-    /**
-     * Initializes all used NMS classes, constructors, fields and methods.
-     * Returns {@code true} if everything went successfully,
-     * {@code false} if anything went wrong.
-     *
-     * @return  {@code true} if server version is compatible, {@code false} if not
-     */
-    private boolean isVersionSupported() {
-        try {
-            long time = System.currentTimeMillis();
-            NMSStorage.setInstance(getNMSLoader());
-            Bukkit.getConsoleSender().sendMessage(EnumChatFormat.color("[TAB] Loaded NMS hook in " + (System.currentTimeMillis()-time) + "ms"));
-            return true;
-        } catch (IllegalStateException ex) {
-            if (ProtocolVersion.fromFriendlyName(Bukkit.getBukkitVersion().split("-")[0]) == ProtocolVersion.UNKNOWN_SERVER_VERSION) {
-                Bukkit.getConsoleSender().sendMessage(EnumChatFormat.color("&c[TAB] Your server version is not compatible. " +
-                        "This plugin version was made for " + ProtocolVersion.values()[ProtocolVersion.values().length-1].getFriendlyName() +
-                        " - " + ProtocolVersion.values()[3].getFriendlyName() + ". Disabling."));
-            } else {
-                Bukkit.getConsoleSender().sendMessage(EnumChatFormat.color("&c[TAB] A compatibility issue " +
-                        "with your server was found. Unless you are running some really weird server software, this is a bug."));
-            }
-            return false;
-        }
-    }
-
-    private @NotNull NMSStorage getNMSLoader() {
-        List<Callable<NMSStorage>> loaders = Arrays.asList(
-                BukkitLegacyNMSStorage::new,
-                BukkitModernNMSStorage::new,
-                MojangModernNMSStorage::new,
-                ThermosNMSStorage::new
-        );
-        for (Callable<NMSStorage> loader : loaders) {
-            try {
-                return loader.call();
-            } catch (Exception ignored) {}
-        }
-        throw new IllegalStateException("Unsupported server version");
+        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;
@@ -11,7 +12,7 @@ import org.bukkit.command.TabCompleter;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;

-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;

 /**
@@ -20,10 +21,10 @@ import java.util.List;
 public class BukkitTabCommand implements CommandExecutor, TabCompleter {

    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
+    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;
@@ -37,11 +38,12 @@ public class BukkitTabCommand implements CommandExecutor, TabCompleter {
    }

    @Override
-    public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, String[] args) {
+    @NotNull
+    public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
        TabPlayer p = null;
        if (sender instanceof Player) {
            p = TAB.getInstance().getPlayer(((Player)sender).getUniqueId());
-            if (p == null) return new ArrayList<>(); //player not loaded correctly
+            if (p == null) return Collections.emptyList(); //player not loaded correctly
        }
        return TAB.getInstance().getCommand().complete(p, args);
    }
@@ -1,201 +0,0 @@
-package me.neznamy.tab.platforms.bukkit;
-
-import com.mojang.authlib.GameProfile;
-import com.mojang.authlib.properties.Property;
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-import me.neznamy.tab.platforms.bukkit.nms.storage.nms.NMSStorage;
-import me.neznamy.tab.shared.ProtocolVersion;
-import me.neznamy.tab.shared.chat.IChatBaseComponent;
-import me.neznamy.tab.shared.platform.TabList;
-import me.neznamy.tab.shared.util.ReflectionUtils;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.lang.reflect.Array;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.*;
-
-/**
- * TabList which support modifying many entries at once
- * for significantly better performance. For 1.7 players,
- * ViaVersion properly splits the packet into multiple, so
- * we don't need to worry about that here.
- * <p>
- * This class does not support server versions of 1.7 and
- * below, because of the massive differences in tab list
- * and packet fields.
- */
-@RequiredArgsConstructor
-@SuppressWarnings({"unchecked", "rawtypes"})
-public class BukkitTabList implements TabList {
-
-    // NMS Fields
-    public static Class<?> PacketPlayOutPlayerListHeaderFooterClass;
-    public static Constructor<?> newPacketPlayOutPlayerListHeaderFooter;
-    public static Field HEADER;
-    public static Field FOOTER;
-
-    public static Class<?> PacketPlayOutPlayerInfoClass;
-    public static Constructor<?> newPacketPlayOutPlayerInfo;
-    public static Field ACTION;
-    public static Field PLAYERS;
-    public static Class<Enum> EnumPlayerInfoActionClass;
-    public static Class<Enum> EnumGamemodeClass;
-    public static Class<?> ClientboundPlayerInfoRemovePacket;
-    public static Class<?> RemoteChatSession$Data;
-    public static Constructor<?> newClientboundPlayerInfoRemovePacket;
-
-    public static Class<?> PlayerInfoDataClass;
-    public static Constructor<?> newPlayerInfoData;
-    public static Method PlayerInfoData_getProfile;
-    public static Field PlayerInfoData_Latency;
-    public static Field PlayerInfoData_GameMode;
-    public static Field PlayerInfoData_DisplayName;
-    public static Field PlayerInfoData_Listed;
-    public static Field PlayerInfoData_RemoteChatSession;
-
-    /** Player this TabList belongs to */
-    private final BukkitTabPlayer player;
-
-    public static void load(NMSStorage nms) throws NoSuchMethodException {
-        if (nms.getMinorVersion() >= 17) {
-            newPacketPlayOutPlayerListHeaderFooter = PacketPlayOutPlayerListHeaderFooterClass.getConstructor(nms.IChatBaseComponent, nms.IChatBaseComponent);
-        } else {
-            newPacketPlayOutPlayerListHeaderFooter = PacketPlayOutPlayerListHeaderFooterClass.getConstructor();
-            HEADER = ReflectionUtils.getFields(PacketPlayOutPlayerListHeaderFooterClass, nms.IChatBaseComponent).get(0);
-            FOOTER = ReflectionUtils.getFields(PacketPlayOutPlayerListHeaderFooterClass, nms.IChatBaseComponent).get(1);
-        }
-        if (nms.is1_19_3Plus()) {
-            newClientboundPlayerInfoRemovePacket = ClientboundPlayerInfoRemovePacket.getConstructor(List.class);
-            newPacketPlayOutPlayerInfo = PacketPlayOutPlayerInfoClass.getConstructor(EnumSet.class, Collection.class);
-            ACTION = ReflectionUtils.getOnlyField(PacketPlayOutPlayerInfoClass, EnumSet.class);
-        } else {
-            newPacketPlayOutPlayerInfo = PacketPlayOutPlayerInfoClass.getConstructor(EnumPlayerInfoActionClass, Array.newInstance(nms.EntityPlayer, 0).getClass());
-            ACTION = ReflectionUtils.getOnlyField(PacketPlayOutPlayerInfoClass, EnumPlayerInfoActionClass);
-        }
-        PLAYERS = ReflectionUtils.getOnlyField(PacketPlayOutPlayerInfoClass, List.class);
-        newPlayerInfoData = ReflectionUtils.getOnlyConstructor(PlayerInfoDataClass);
-        PlayerInfoData_getProfile = ReflectionUtils.getOnlyMethod(PlayerInfoDataClass, GameProfile.class);
-        PlayerInfoData_Latency = ReflectionUtils.getOnlyField(PlayerInfoDataClass, int.class);
-        PlayerInfoData_GameMode = ReflectionUtils.getOnlyField(PlayerInfoDataClass, EnumGamemodeClass);
-        PlayerInfoData_DisplayName = ReflectionUtils.getOnlyField(PlayerInfoDataClass, nms.IChatBaseComponent);
-        if (nms.is1_19_3Plus()) {
-            PlayerInfoData_Listed = ReflectionUtils.getOnlyField(PlayerInfoDataClass, boolean.class);
-            PlayerInfoData_RemoteChatSession = ReflectionUtils.getOnlyField(PlayerInfoDataClass, RemoteChatSession$Data);
-        }
-    }
-
-    @Override
-    @SneakyThrows
-    public void removeEntry(@NotNull UUID entry) {
-        if (ClientboundPlayerInfoRemovePacket != null) {
-            //1.19.3+
-            player.sendPacket(newClientboundPlayerInfoRemovePacket.newInstance(Collections.singletonList(entry)));
-        } else {
-            //1.19.2-
-            player.sendPacket(createPacket(Action.REMOVE_PLAYER, new Entry.Builder(entry).build(), player.getVersion()));
-        }
-    }
-
-    @Override
-    public void updateDisplayName(@NotNull UUID entry, @Nullable IChatBaseComponent displayName) {
-        player.sendPacket(createPacket(Action.UPDATE_DISPLAY_NAME,
-                new Entry.Builder(entry).displayName(displayName).build(), player.getVersion())
-        );
-    }
-
-    @Override
-    public void updateLatency(@NotNull UUID entry, int latency) {
-        player.sendPacket(createPacket(Action.UPDATE_LATENCY,
-                new Entry.Builder(entry).latency(latency).build(), player.getVersion())
-        );
-    }
-
-    @Override
-    public void updateGameMode(@NotNull UUID entry, int gameMode) {
-        player.sendPacket(createPacket(Action.UPDATE_GAME_MODE,
-                new Entry.Builder(entry).gameMode(gameMode).build(), player.getVersion())
-        );
-    }
-
-    @Override
-    public void addEntry(@NotNull Entry entry) {
-        player.sendPacket(createPacket(Action.ADD_PLAYER, entry, player.getVersion()));
-    }
-
-    @Override
-    @SneakyThrows
-    public void setPlayerListHeaderFooter(@NotNull IChatBaseComponent header, @NotNull IChatBaseComponent footer) {
-        if (PacketPlayOutPlayerListHeaderFooterClass == null) return;
-        NMSStorage nms = NMSStorage.getInstance();
-        Object packet;
-        if (nms.getMinorVersion() >= 17) {
-            packet = newPacketPlayOutPlayerListHeaderFooter.newInstance(
-                    nms.toNMSComponent(header, player.getVersion()), nms.toNMSComponent(footer, player.getVersion()));
-        } else {
-            packet = newPacketPlayOutPlayerListHeaderFooter.newInstance();
-            HEADER.set(packet, nms.toNMSComponent(header, player.getVersion()));
-            FOOTER.set(packet, nms.toNMSComponent(footer, player.getVersion()));
-        }
-        player.sendPacket(packet);
-    }
-
-    @SneakyThrows
-    private Object createPacket(TabList.Action action, TabList.Entry entry, ProtocolVersion clientVersion) {
-        NMSStorage nms = NMSStorage.getInstance();
-        if (nms.getMinorVersion() < 8) return null;
-        Object packet;
-        List<Object> players = new ArrayList<>();
-        if (NMSStorage.getInstance().is1_19_3Plus()) {
-            EnumSet<?> actions;
-            if (action == TabList.Action.ADD_PLAYER) {
-                actions = EnumSet.allOf(EnumPlayerInfoActionClass);
-            } else {
-                actions = EnumSet.of(Enum.valueOf(EnumPlayerInfoActionClass, action.name()));
-            }
-            packet = newPacketPlayOutPlayerInfo.newInstance(actions, Collections.emptyList());
-            GameProfile profile = new GameProfile(entry.getUniqueId(), entry.getName());
-            if (entry.getSkin() != null) profile.getProperties().put(TabList.TEXTURES_PROPERTY,
-                    new Property(TabList.TEXTURES_PROPERTY, entry.getSkin().getValue(), entry.getSkin().getSignature()));
-            players.add(newPlayerInfoData.newInstance(
-                    entry.getUniqueId(),
-                    profile,
-                    true,
-                    entry.getLatency(),
-                    int2GameMode(entry.getGameMode()),
-                    entry.getDisplayName() == null ? null : nms.toNMSComponent(entry.getDisplayName(), clientVersion),
-                    null
-            ));
-        } else {
-            packet = newPacketPlayOutPlayerInfo.newInstance(Enum.valueOf(EnumPlayerInfoActionClass, action.name()),
-                    Array.newInstance(NMSStorage.getInstance().EntityPlayer, 0));
-            GameProfile profile = new GameProfile(entry.getUniqueId(), entry.getName());
-            if (entry.getSkin() != null) profile.getProperties().put(TabList.TEXTURES_PROPERTY,
-                    new Property(TabList.TEXTURES_PROPERTY, entry.getSkin().getValue(), entry.getSkin().getSignature()));
-            List<Object> parameters = new ArrayList<>();
-            if (newPlayerInfoData.getParameterTypes()[0] == PacketPlayOutPlayerInfoClass) {
-                parameters.add(packet);
-            }
-            parameters.add(profile);
-            parameters.add(entry.getLatency());
-            parameters.add(int2GameMode(entry.getGameMode()));
-            parameters.add(entry.getDisplayName() == null ? null : nms.toNMSComponent(entry.getDisplayName(), clientVersion));
-            if (nms.getMinorVersion() >= 19) parameters.add(null);
-            players.add(newPlayerInfoData.newInstance(parameters.toArray()));
-        }
-        PLAYERS.set(packet, players);
-        return packet;
-    }
-
-    private Object int2GameMode(int gameMode) {
-        switch (gameMode) {
-            case 1: return Enum.valueOf(EnumGamemodeClass, "CREATIVE");
-            case 2: return Enum.valueOf(EnumGamemodeClass, "ADVENTURE");
-            case 3: return Enum.valueOf(EnumGamemodeClass, "SPECTATOR");
-            default: return Enum.valueOf(EnumGamemodeClass, "SURVIVAL");
-        }
-    }
-}
@@ -1,66 +1,31 @@
 package me.neznamy.tab.platforms.bukkit;

-import com.mojang.authlib.GameProfile;
-import com.mojang.authlib.properties.Property;
-import lombok.Getter;
-import lombok.SneakyThrows;
-import me.neznamy.tab.platforms.bukkit.scoreboard.PacketScoreboard;
-import me.neznamy.tab.shared.chat.rgb.RGBUtils;
-import me.neznamy.tab.shared.hook.ViaVersionHook;
-import me.neznamy.tab.shared.platform.bossbar.BossBar;
-import me.neznamy.tab.shared.chat.IChatBaseComponent;
-import me.neznamy.tab.shared.platform.TabList;
-import me.neznamy.tab.platforms.bukkit.bossbar.EntityBossBar;
-import me.neznamy.tab.platforms.bukkit.bossbar.BukkitBossBar;
-import me.neznamy.tab.platforms.bukkit.bossbar.ViaBossBar;
-import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcher;
-import me.neznamy.tab.platforms.bukkit.nms.storage.nms.NMSStorage;
-import me.neznamy.tab.platforms.bukkit.nms.storage.packet.*;
-import me.neznamy.tab.shared.platform.Scoreboard;
-import me.neznamy.tab.shared.TAB;
+import me.neznamy.tab.platforms.bukkit.hook.LibsDisguisesHook;
+import me.neznamy.tab.platforms.bukkit.platform.BukkitPlatform;
 import me.neznamy.tab.shared.backend.BackendTabPlayer;
-import me.neznamy.tab.shared.backend.EntityData;
-import me.neznamy.tab.shared.backend.Location;
-import org.bukkit.entity.Entity;
+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;
-
-import java.util.Collection;
-import java.util.UUID;

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

-    /** Player's NMS handle (EntityPlayer), preloading for speed */
-    private final Object handle;
-
-    /** Player's connection for sending packets, preloading for speed */
-    private final Object playerConnection;
-
-    private final Scoreboard<BukkitTabPlayer> scoreboard = new PacketScoreboard(this);
-    private final TabList tabList = new BukkitTabList(this);
-    private final BossBar bossBar = TAB.getInstance().getServerVersion().getMinorVersion() >= 9 ?
-            new BukkitBossBar(this) : getVersion().getMinorVersion() >= 9 ? new ViaBossBar(this) : new EntityBossBar(this);
-
    /**
-     * Constructs new instance with given bukkit player and protocol version
+     * Constructs new instance with given bukkit player
     *
+     * @param   platform
+     *          Server platform
     * @param   p
     *          bukkit player
     */
-    @SneakyThrows
-    public BukkitTabPlayer(Player p) {
-        super(p, p.getUniqueId(), p.getName(), TAB.getInstance().getConfiguration().getServerName(),
-                p.getWorld().getName(), ViaVersionHook.getInstance().getPlayerVersion(p.getUniqueId(), p.getName()));
-        handle = NMSStorage.getInstance().getHandle.invoke(player);
-        playerConnection = NMSStorage.getInstance().PLAYER_CONNECTION.get(handle);
+    public BukkitTabPlayer(@NotNull BukkitPlatform platform, @NotNull Player p) {
+        super(platform, p, p.getUniqueId(), p.getName(), p.getWorld().getName(), platform.getServerVersion().getNetworkId());
    }

    @Override
@@ -70,26 +35,12 @@ public class BukkitTabPlayer extends BackendTabPlayer {

    @Override
    public int getPing() {
-        if (TAB.getInstance().getServerVersion().getMinorVersion() >= 17) {
-            return getPlayer().getPing();
-        }
-        try {
-            return NMSStorage.getInstance().PING.getInt(handle);
-        } catch (IllegalAccessException e) {
-            return -1;
-        }
-    }
-
-    @SneakyThrows
-    public void sendPacket(@Nullable Object nmsPacket) {
-        if (nmsPacket == null || !getPlayer().isOnline()) return;
-        NMSStorage.getInstance().sendPacket.invoke(playerConnection, nmsPacket);
+        return getPlatform().getImplementationProvider().getPing(this);
    }

    @Override
-    public void sendMessage(@NotNull IChatBaseComponent message) {
-        getPlayer().sendMessage(RGBUtils.getInstance().convertToBukkitFormat(message.toFlatText(),
-                getVersion().getMinorVersion() >= 16 && TAB.getInstance().getServerVersion().getMinorVersion() >= 16));
+    public void sendMessage(@NotNull TabComponent message) {
+        getPlayer().sendMessage(getPlatform().toBukkitFormat(message));
    }

    @Override
@@ -99,39 +50,31 @@ public class BukkitTabPlayer extends BackendTabPlayer {

    @Override
    public boolean isDisguised() {
-        try {
-            if (!((BukkitPlatform)TAB.getInstance().getPlatform()).isLibsDisguisesEnabled()) return false;
-            return (boolean) Class.forName("me.libraryaddict.disguise.DisguiseAPI").getMethod("isDisguised", Entity.class).invoke(null, getPlayer());
-        } catch (LinkageError | ReflectiveOperationException e) {
-            //java.lang.NoClassDefFoundError: Could not initialize class me.libraryaddict.disguise.DisguiseAPI
-            TAB.getInstance().getErrorManager().printError("Failed to check disguise status using LibsDisguises", e);
-            ((BukkitPlatform)TAB.getInstance().getPlatform()).setLibsDisguisesEnabled(false);
-            return false;
-        }
+        return LibsDisguisesHook.isDisguised(this);
    }

    @Override
-    @SneakyThrows
-    public TabList.Skin getSkin() {
-        Collection<Property> col = ((GameProfile)NMSStorage.getInstance().getProfile.invoke(handle)).getProperties().get(TabList.TEXTURES_PROPERTY);
-        if (col.isEmpty()) return null; //offline mode
-        Property property = col.iterator().next();
-        return new TabList.Skin(property.getValue(), property.getSignature());
-    }
-
-    @Override
-    public @NotNull Player getPlayer() {
+    @NotNull
+    public Player getPlayer() {
        return (Player) player;
    }

    @Override
-    public boolean isOnline() {
-        return getPlayer().isOnline();
+    public BukkitPlatform getPlatform() {
+        return (BukkitPlatform) platform;
    }

    @Override
-    public boolean isVanished() {
-        return getPlayer().getMetadata("vanished").stream().anyMatch(MetadataValue::asBoolean);
+    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
@@ -140,39 +83,13 @@ public class BukkitTabPlayer extends BackendTabPlayer {
    }

    @Override
-    public void spawnEntity(int entityId, @NotNull UUID id, @NotNull Object entityType, @NotNull Location location, @NotNull EntityData data) {
-        sendPacket(PacketPlayOutSpawnEntityLivingStorage.build(entityId, id, entityType, location, data));
-        if (TAB.getInstance().getServerVersion().getMinorVersion() >= 15) {
-            updateEntityMetadata(entityId, data);
-        }
+    public double getHealth() {
+        return getPlayer().getHealth();
    }

    @Override
-    @SneakyThrows
-    public void updateEntityMetadata(int entityId, @NotNull EntityData data) {
-        if (PacketPlayOutEntityMetadataStorage.CONSTRUCTOR.getParameterCount() == 2) {
-            //1.19.3+
-            sendPacket(PacketPlayOutEntityMetadataStorage.CONSTRUCTOR.newInstance(entityId, DataWatcher.packDirty.invoke(data.build())));
-        } else {
-            sendPacket(PacketPlayOutEntityMetadataStorage.CONSTRUCTOR.newInstance(entityId, data.build(), true));
-        }
-    }
-
-    @Override
-    public void teleportEntity(int entityId, @NotNull Location location) {
-        sendPacket(PacketPlayOutEntityTeleportStorage.build(entityId, location));
-    }
-
-    @Override
-    @SneakyThrows
-    public void destroyEntities(int... entities) {
-        if (PacketPlayOutEntityDestroyStorage.CONSTRUCTOR.getParameterTypes()[0] != int.class) {
-            sendPacket(PacketPlayOutEntityDestroyStorage.CONSTRUCTOR.newInstance(new Object[]{entities}));
-        } else {
-            //1.17.0 Mojank
-            for (int entity : entities) {
-                sendPacket(PacketPlayOutEntityDestroyStorage.CONSTRUCTOR.newInstance(entity));
-            }
-        }
+    @NotNull
+    public String getDisplayName() {
+        return getPlayer().getDisplayName();
    }
 }
@@ -1,17 +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.platform.bossbar.BossBar;
-import me.neznamy.tab.shared.chat.rgb.RGBUtils;
 import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
-import me.neznamy.tab.shared.TAB;
+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;

 /**
@@ -19,50 +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;

    /** Player this handler belongs to */
+    @NotNull
    private final BukkitTabPlayer player;

-    /** Bukkit BossBars the player can currently see */
-    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(
-                RGBUtils.getInstance().convertToBukkitFormat(title,
-                        player.getVersion().getMinorVersion() >= 16 && TAB.getInstance().getServerVersion().getMinorVersion() >= 16),
+    @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()),
-                org.bukkit.boss.BarStyle.valueOf(style.getBukkitName()));
+                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(RGBUtils.getInstance().convertToBukkitFormat(title,
-                player.getVersion().getMinorVersion() >= 16 && TAB.getInstance().getServerVersion().getMinorVersion() >= 16));
+    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(org.bukkit.boss.BarStyle.valueOf(style.getBukkitName()));
+    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,64 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.bossbar;
-
-import lombok.RequiredArgsConstructor;
-import me.neznamy.tab.shared.platform.bossbar.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.nms.datawatcher.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 {
-
-    /** Player this handler belongs to */
-    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 = 300*progress;
-        if (health == 0) health = 1;
-        w.getHelper().setHealth(health);
-        w.getHelper().setCustomName(title, player.getVersion());
-        w.getHelper().setEntityFlags((byte) 32);
-        w.getHelper().setWitherInvulnerableTime(880); // Magic number
-        player.spawnEntity(id.hashCode(), new UUID(0, 0), EntityType.WITHER, new Location(0, 0, 0, 0, 0), w);
-    }
-
-    @Override
-    public void update(@NotNull UUID id, @NotNull String title) {
-        DataWatcher w = new DataWatcher();
-        w.getHelper().setCustomName(title, player.getVersion());
-        player.updateEntityMetadata(id.hashCode(), w);
-    }
-
-    @Override
-    public void update(@NotNull UUID id, float progress) {
-        DataWatcher w = new DataWatcher();
-        float health = 300*progress;
-        if (health == 0) health = 1;
-        w.getHelper().setHealth(health);
-        player.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.destroyEntities(id.hashCode());
-    }
-}
@@ -1,67 +1,70 @@
 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.platform.bossbar.BossBar;
 import me.neznamy.tab.api.bossbar.BarColor;
 import me.neznamy.tab.api.bossbar.BarStyle;
-import me.neznamy.tab.shared.chat.rgb.RGBUtils;
 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();
+    
    /** Player this handler belongs to */
+    @NotNull
    private final BukkitTabPlayer player;

-    /** ViaVersion BossBars this 1.9+ player can see on 1.8 server */
-    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(
-                RGBUtils.getInstance().convertToBukkitFormat(title, player.getVersion().getMinorVersion() >= 16),
+    @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()),
-                BossStyle.valueOf(style.getBukkitName()));
-        viaBossBars.put(id, bar);
-        bar.addPlayer(player.getPlayer().getUniqueId());
+                styles[style.ordinal()]
+        );
    }

    @Override
-    public void update(@NotNull UUID id, @NotNull String title) {
-        viaBossBars.get(id).setTitle(RGBUtils.getInstance().convertToBukkitFormat(title,
-                player.getVersion().getMinorVersion() >= 16));
+    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(BossStyle.valueOf(style.getBukkitName()));
+    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,193 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.features;
-
-import lombok.SneakyThrows;
-import me.neznamy.tab.shared.TAB;
-import me.neznamy.tab.shared.TabConstants;
-import me.neznamy.tab.shared.platform.TabPlayer;
-import me.neznamy.tab.shared.features.types.PacketSendListener;
-import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcher;
-import me.neznamy.tab.platforms.bukkit.nms.storage.nms.NMSStorage;
-import me.neznamy.tab.platforms.bukkit.nms.storage.packet.PacketPlayOutEntityDestroyStorage;
-import me.neznamy.tab.platforms.bukkit.nms.storage.packet.PacketPlayOutEntityTeleportStorage;
-import me.neznamy.tab.shared.backend.BackendTabPlayer;
-import me.neznamy.tab.shared.backend.EntityData;
-import me.neznamy.tab.shared.backend.features.unlimitedtags.BackendNameTagX;
-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.stream.Collectors;
-
-/**
- * The core class for unlimited NameTag mode on Bukkit
- */
-public class BukkitNameTagX extends BackendNameTagX implements Listener, PacketSendListener {
-
-    /** Reference to NMS storage for quick access */
-    private final NMSStorage nms = NMSStorage.getInstance();
-
-    public BukkitNameTagX(@NotNull JavaPlugin plugin) {
-        Bukkit.getPluginManager().registerEvents(this, plugin);
-    }
-
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onSneak(PlayerToggleSneakEvent e) {
-        TabPlayer p = TAB.getInstance().getPlayer(e.getPlayer().getUniqueId());
-        if (p == null || isPlayerDisabled(p)) return;
-        TAB.getInstance().getCPUManager().runMeasuredTask(featureName, TabConstants.CpuUsageCategory.PLAYER_SNEAK,
-                () -> getArmorStandManager(p).sneak(e.isSneaking()));
-    }
-
-    @EventHandler
-    public void onRespawn(PlayerRespawnEvent e) {
-        TabPlayer respawned = TAB.getInstance().getPlayer(e.getPlayer().getUniqueId());
-        if (respawned == null || isPlayerDisabled(respawned)) return;
-        TAB.getInstance().getCPUManager().runMeasuredTask(featureName, TabConstants.CpuUsageCategory.PLAYER_RESPAWN,
-                () -> getArmorStandManager(respawned).teleport());
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    @SneakyThrows
-    public void onPacketSend(@NotNull TabPlayer receiver, @NotNull Object packet) {
-        if (receiver.getVersion().getMinorVersion() < 8) return;
-        if (!receiver.isLoaded() || getDisableChecker().isDisabledPlayer(receiver) || getUnlimitedDisableChecker().isDisabledPlayer(receiver)) return;
-        if (nms.PacketPlayOutEntity.isInstance(packet) && !nms.PacketPlayOutEntityLook.isInstance(packet)) { //ignoring head rotation only packets
-            packetListener.onEntityMove((BackendTabPlayer) receiver, nms.PacketPlayOutEntity_ENTITYID.getInt(packet));
-        } else if (PacketPlayOutEntityTeleportStorage.CLASS.isInstance(packet)) {
-            packetListener.onEntityMove((BackendTabPlayer) receiver, PacketPlayOutEntityTeleportStorage.ENTITY_ID.getInt(packet));
-        } else if (nms.PacketPlayOutNamedEntitySpawn.isInstance(packet)) {
-            packetListener.onEntitySpawn((BackendTabPlayer) receiver, nms.PacketPlayOutNamedEntitySpawn_ENTITYID.getInt(packet));
-        } else if (PacketPlayOutEntityDestroyStorage.CLASS.isInstance(packet)) {
-            if (nms.getMinorVersion() >= 17) {
-                Object entities = PacketPlayOutEntityDestroyStorage.ENTITIES.get(packet);
-                if (entities instanceof List) {
-                    packetListener.onEntityDestroy((BackendTabPlayer) receiver, (List<Integer>) entities);
-                } else {
-                    //1.17.0
-                    packetListener.onEntityDestroy((BackendTabPlayer) receiver, (int) entities);
-                }
-            } else {
-                packetListener.onEntityDestroy((BackendTabPlayer) receiver, (int[]) PacketPlayOutEntityDestroyStorage.ENTITIES.get(packet));
-            }
-        }
-    }
-
-    @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
-    public @NotNull List<Integer> getPassengers(@NotNull Object entity) {
-        Entity vehicle = (Entity) entity;
-        if (TAB.getInstance().getServerVersion().getMinorVersion() >= 11) {
-            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
-    public @Nullable Object getVehicle(@NotNull TabPlayer player) {
-        return ((Player)player.getPlayer()).getVehicle();
-    }
-
-    @Override
-    public int getEntityId(@NotNull Object entity) {
-        return ((Entity)entity).getEntityId();
-    }
-
-    @Override
-    public @NotNull String getEntityType(@NotNull Object entity) {
-        return ((Entity) entity).getType().toString().toLowerCase();
-    }
-
-    @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 (TAB.getInstance().getServerVersion().getMinorVersion() >= 14 && p.getPose() == Pose.SWIMMING) return true;
-        return TAB.getInstance().getServerVersion().getMinorVersion() == 13 && p.isSwimming();
-    }
-
-    @Override
-    public boolean isGliding(@NotNull TabPlayer player) {
-        return TAB.getInstance().getServerVersion().getMinorVersion() >= 9 && ((Player)player.getPlayer()).isGliding();
-    }
-
-    @Override
-    public boolean isSleeping(@NotNull TabPlayer player) {
-        return ((Player)player.getPlayer()).isSleeping();
-    }
-
-    @Override
-    public @NotNull 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
-    public EntityData createDataWatcher(@NotNull TabPlayer viewer, byte flags, @NotNull String displayName, boolean nameVisible) {
-        DataWatcher datawatcher = new DataWatcher();
-        datawatcher.getHelper().setEntityFlags(flags);
-        datawatcher.getHelper().setCustomName(displayName, viewer.getVersion());
-        datawatcher.getHelper().setCustomNameVisible(nameVisible);
-        datawatcher.getHelper().setArmorStandFlags((byte)16);
-        return datawatcher;
-    }
-}
@@ -3,30 +3,49 @@ 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.HashMap;
-import java.util.Map;
-import java.util.WeakHashMap;
+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 {
+public class BukkitTabExpansion extends PlaceholderExpansion implements TabExpansion, Relational {

-    /** Map holding all values for all players for easy and high-performance access */
-    private final WeakHashMap<Player, Map<String, String>> values = new WeakHashMap<>();
-
-    private final String author = TabConstants.PLUGIN_AUTHOR;
-    private final String identifier = TabConstants.PLUGIN_ID;
-    private final String version = TabConstants.PLUGIN_VERSION;
+    /** List of all placeholders offered by the plugin for command suggestions */
+    @NotNull
+    private final List<String> placeholders = Collections.unmodifiableList(Arrays.asList(
+            "%tab_tabprefix%",
+            "%tab_tabsuffix%",
+            "%tab_tagprefix%",
+            "%tab_tagsuffix%",
+            "%tab_customtabname%",
+            "%tab_tabprefix_raw%",
+            "%tab_tabsuffix_raw%",
+            "%tab_tagprefix_raw%",
+            "%tab_tagsuffix_raw%",
+            "%tab_customtabname_raw%",
+            "%tab_scoreboard_name%",
+            "%tab_scoreboard_visible%",
+            "%tab_bossbar_visible%",
+            "%tab_nametag_visibility%",
+            "%tab_replace_<placeholder>%",
+            "%tab_placeholder_<placeholder>%"
+    ));

    @Override
    public boolean persist() {
@@ -34,27 +53,96 @@ public class BukkitTabExpansion extends PlaceholderExpansion implements TabExpan
    }

    @Override
+    @NotNull
+    public String getAuthor() {
+        return ProjectVariables.PLUGIN_AUTHOR;
+    }
+
+    @Override
+    @NotNull
+    public String getIdentifier() {
+        return ProjectVariables.PLUGIN_ID;
+    }
+
+    @Override
+    @NotNull
+    public String getVersion() {
+        return ProjectVariables.PLUGIN_VERSION;
+    }
+
+    @Override
+    @NotNull
+    public List<String> getPlaceholders() {
+        return placeholders;
+    }
+
+    @Override
+    @Nullable
    public String onPlaceholderRequest(@Nullable Player player, @NotNull String identifier) {
        if (identifier.startsWith("replace_")) {
            String text = "%" + identifier.substring(8) + "%";
            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 (player == null) return "<Player cannot be null>";
+        TabPlayer p = TAB.getInstance().getPlayer(player.getUniqueId());
+        if (p == null) return "<Player is not loaded>";
        if (identifier.startsWith("placeholder_")) {
-            TAB.getInstance().getPlaceholderManager().addUsedPlaceholder("%" + identifier.substring(12) + "%", TAB.getInstance().getPlaceholderManager());
+            String requestedPlaceholder = "%" + identifier.substring("placeholder_".length()) + "%";
+            PlaceholderManagerImpl pm = TAB.getInstance().getPlaceholderManager();
+            pm.addUsedPlaceholder(requestedPlaceholder, pm);
+            return pm.getPlaceholder(requestedPlaceholder).parse(p);
        }
-        return values.get(player).get(identifier);
+        return p.expansionData.getValue(identifier);
    }

    @Override
-    public void setValue(@NotNull TabPlayer player, @NotNull String key, @NotNull String value) {
-        values.computeIfAbsent((Player) player.getPlayer(), 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
+    @SuppressWarnings({"UnstableApiUsage", "deprecation"})
+    public void unregisterExpansion() {
+        if (ReflectionUtils.methodExists(PlaceholderExpansion.class, "unregister")) {
+            // Added in 2.10.7 (Jul 28, 2020)
+            unregister();
+        } else {
+            PlaceholderAPI.unregisterExpansion(this);
+        }
    }
 }
@@ -1,14 +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 lombok.Getter;
-import lombok.RequiredArgsConstructor;
+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;
@@ -16,58 +17,88 @@ 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")
-@RequiredArgsConstructor
-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 = TAB.getInstance().getConfig().getBoolean("per-world-playerlist.allow-bypass-permission", false);
-    private final List<String> ignoredWorlds = TAB.getInstance().getConfig().getStringList("per-world-playerlist.ignore-effect-in-worlds", Arrays.asList("ignored_world", "build"));
-    private final Map<String, List<String>> sharedWorlds = TAB.getInstance().getConfig().getConfigurationSection("per-world-playerlist.shared-playerlist-world-groups");
+    @NotNull
+    private final PerWorldPlayerListConfiguration configuration;

-    /** Plugin reference*/
-    @NotNull private final JavaPlugin plugin;
+    /** 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);

-    @Getter private final String featureName = "Per world PlayerList";
-
-    @Override
-    public void load() {
-        Bukkit.getOnlinePlayers().forEach(this::checkPlayer);
+    /**
+     * Constructs new instance and registers events.
+     *
+     * @param   plugin
+     *          Plugin instance to register events
+     * @param   platform
+     *          Platform reference
+     * @param   configuration
+     *          Feature configuration
+     */
+    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 : platform.getOnlinePlayers()) {
+            checkPlayer(p);
+        }
+    }
+
    @Override
    public void unload() {
-        for (Player p : Bukkit.getOnlinePlayers()) {
-            for (Player pl : Bukkit.getOnlinePlayers()) {
-                p.showPlayer(pl);
+        for (Player p : platform.getOnlinePlayers()) {
+            for (Player pl : platform.getOnlinePlayers()) {
+                showPlayer(p, pl);
            }
        }
        HandlerList.unregisterAll(this);
    }

+    /**
+     * Join event listener to synchronously perform hiding.
+     *
+     * @param   e
+     *          Join event
+     */
    @EventHandler
    public void onJoin(PlayerJoinEvent e) {
        long time = System.nanoTime();
        checkPlayer(e.getPlayer());
-        TAB.getInstance().getCPUManager().addTime(featureName, TabConstants.CpuUsageCategory.PLAYER_JOIN, System.nanoTime()-time);
+        TAB.getInstance().getCPUManager().addTime(getFeatureName(), TabConstants.CpuUsageCategory.PLAYER_JOIN, System.nanoTime()-time);
    }

+    /**
+     * World change listener to synchronously perform player showing/hiding.
+     *
+     * @param   e
+     *          World change event
+     */
    @EventHandler
    public void onWorldChange(PlayerChangedWorldEvent e) {
        long time = System.nanoTime();
        checkPlayer(e.getPlayer());
-        TAB.getInstance().getCPUManager().addTime(featureName, TabConstants.CpuUsageCategory.WORLD_SWITCH, System.nanoTime()-time);
+        TAB.getInstance().getCPUManager().addTime(getFeatureName(), TabConstants.CpuUsageCategory.WORLD_SWITCH, System.nanoTime()-time);
    }

    /**
@@ -79,12 +110,34 @@ public class PerWorldPlayerList extends TabFeature implements Listener, Loadable
     *          Player to update
     */
    private void checkPlayer(@NotNull Player p) {
-        for (Player all : Bukkit.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);
        }
    }

@@ -98,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();
@@ -109,4 +165,15 @@ public class PerWorldPlayerList extends TabFeature implements Listener, Loadable
        }
        return viewerWorldGroup.equals(targetWorldGroup);
    }
+
+    @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,83 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.features;
-
-import lombok.RequiredArgsConstructor;
-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.entity.Player;
-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;
-
-    /** Reference to plugin for registering listener */
-    private final @NotNull JavaPlugin plugin;
-
-    @Override
-    public void load() {
-        Bukkit.getPluginManager().registerEvents(this, plugin);
-        //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,
-                featureName, 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.getPlayers().contains(p)) continue;
-                Location loc = ((Player) p.getPlayer()).getEyeLocation().add(((Player) p.getPlayer()).getEyeLocation().getDirection().normalize().multiply(WITHER_DISTANCE));
-                if (loc.getY() < 1) loc.setY(1);
-                ((BackendTabPlayer)p).teleportEntity(line.getUniqueId().hashCode(), new me.neznamy.tab.shared.backend.Location(loc.getX(), loc.getY(), loc.getZ(), 0, 0));
-            }
-        }
-    }
-    
-    @Override
-    public void unload() {
-        super.unload();
-        HandlerList.unregisterAll(this);
-    }
-    
-    /**
-     * Respawning wither as respawn screen destroys all entities in client
-     */
-    @EventHandler
-    public void onRespawn(PlayerRespawnEvent e) {
-        TabPlayer player = TAB.getInstance().getPlayer(e.getPlayer().getUniqueId());
-        if (player == null) return;
-        TAB.getInstance().getCPUManager().runMeasuredTask(featureName, 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);
-    }
-}
@@ -0,0 +1,23 @@
+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 org.jetbrains.annotations.NotNull;
+
+/**
+ * PremiumVanish hook for Bukkit.
+ */
+public class BukkitPremiumVanishHook extends PremiumVanishHook {
+
+    @Override
+    public boolean canSee(@NotNull TabPlayer viewer, @NotNull TabPlayer target) {
+        return VanishAPI.canSee(((BukkitTabPlayer)viewer).getPlayer(), ((BukkitTabPlayer)target).getPlayer());
+    }
+
+    @Override
+    public boolean isVanished(@NotNull TabPlayer player) {
+        return VanishAPI.isInvisible(((BukkitTabPlayer)player).getPlayer());
+    }
+}
@@ -0,0 +1,33 @@
+package me.neznamy.tab.platforms.bukkit.hook;
+
+import me.libraryaddict.disguise.DisguiseAPI;
+import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
+import me.neznamy.tab.shared.platform.TabPlayer;
+import me.neznamy.tab.shared.util.ReflectionUtils;
+
+/**
+ * Class for hooking into LibsDisguises to get disguise status of players.
+ */
+public class LibsDisguisesHook {
+
+    /** Flag tracking if LibsDisguises is installed or not */
+    private static boolean installed = ReflectionUtils.classExists("me.libraryaddict.disguise.DisguiseAPI");
+
+    /**
+     * Returns {@code true} if LibsDisguises is installed and player is disguised,
+     * {@code false} otherwise.
+     *
+     * @param   player
+     *          Player to check
+     * @return  {@code true} if disguised, {@code false} otherwise
+     */
+    public static boolean isDisguised(TabPlayer player) {
+        try {
+            return installed && DisguiseAPI.isDisguised(((BukkitTabPlayer)player).getPlayer());
+        } catch (LinkageError e) {
+            //java.lang.NoClassDefFoundError: Could not initialize class me.libraryaddict.disguise.DisguiseAPI
+            installed = false;
+            return false;
+        }
+    }
+}
@@ -1,81 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.nms.datawatcher;
-
-import lombok.Getter;
-import lombok.SneakyThrows;
-import lombok.ToString;
-import me.neznamy.tab.platforms.bukkit.nms.storage.nms.NMSStorage;
-import me.neznamy.tab.shared.backend.EntityData;
-import me.neznamy.tab.shared.util.ReflectionUtils;
-import org.jetbrains.annotations.NotNull;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * A class representing the n.m.s.DataWatcher class to make work with it much easier
- */
-@ToString
-public class DataWatcher implements EntityData {
-
-    /** NMS Fields */
-    public static Class<?> CLASS;
-    public static Constructor<?> CONSTRUCTOR;
-    public static Method REGISTER;
-    public static Method markDirty;
-    public static Method packDirty;
-    
-    /** Watched data */
-    private final Map<Integer, DataWatcherItem> dataValues = new HashMap<>();
-
-    /** Helper for easier data write */
-    @Getter private final DataWatcherHelper helper = new DataWatcherHelper(this);
-
-    /**
-     * Loads all required Fields and throws Exception if something went wrong
-     *
-     * @param   nms
-     *          NMS storage reference
-     */
-    public static void load(NMSStorage nms) {
-        CONSTRUCTOR = ReflectionUtils.getOnlyConstructor(CLASS);
-        if (nms.is1_19_3Plus()) {
-            markDirty = ReflectionUtils.getOnlyMethod(CLASS, void.class, DataWatcherObject.CLASS);
-        }
-    }
-    
-    /**
-     * Sets value into data values
-     *
-     * @param   type
-     *          type of value
-     * @param   value
-     *          value
-     */
-    public void setValue(@NotNull DataWatcherObject type, @NotNull Object value) {
-        dataValues.put(type.getPosition(), new DataWatcherItem(type, value));
-    }
-
-    /**
-     * Converts the class into an instance of NMS.DataWatcher
-     *
-     * @return  an instance of NMS.DataWatcher with same data
-     */
-    @SneakyThrows
-    public @NotNull Object build() {
-        NMSStorage nms = NMSStorage.getInstance();
-        Object nmsWatcher;
-        if (CONSTRUCTOR.getParameterCount() == 1) { //1.7+
-            nmsWatcher = CONSTRUCTOR.newInstance(new Object[] {null});
-        } else {
-            nmsWatcher = CONSTRUCTOR.newInstance();
-        }
-        for (DataWatcherItem item : dataValues.values()) {
-            Object nmsObject = item.getType().build();
-            REGISTER.invoke(nmsWatcher, nmsObject, item.getValue());
-            if (nms.is1_19_3Plus()) markDirty.invoke(nmsWatcher, nmsObject);
-        }
-        return nmsWatcher;
-    }
-}
@@ -1,138 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.nms.datawatcher;
-
-import lombok.AllArgsConstructor;
-import me.neznamy.tab.shared.ProtocolVersion;
-import me.neznamy.tab.shared.chat.IChatBaseComponent;
-import me.neznamy.tab.platforms.bukkit.nms.storage.nms.NMSStorage;
-import me.neznamy.tab.shared.TAB;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Optional;
-
-/**
- * A class to help to assign DataWatcher items as positions often change per-version
- */
-@AllArgsConstructor
-public class DataWatcherHelper {
-
-    /** NMS Fields */
-    public static Class<?> DataWatcherRegistry;
-    public static Class<?> DataWatcherSerializer;
-    public static Object DataWatcherSerializer_BYTE;
-    public static Object DataWatcherSerializer_FLOAT;
-    public static Object DataWatcherSerializer_STRING;
-    public static Object DataWatcherSerializer_OPTIONAL_COMPONENT;
-    public static Object DataWatcherSerializer_BOOLEAN;
-
-    /** Instance fields */
-    private final int armorStandFlagsPosition = getArmorStandFlagsPosition();
-    @NotNull private final DataWatcher data;
-
-    /**
-     * Returns armor stand flags position based on server version
-     *
-     * @return  armor stand flags position based on server version
-     */
-    private int getArmorStandFlagsPosition() {
-        if (TAB.getInstance().getServerVersion().getMinorVersion() >= 17) {
-            //1.17.x, 1.18.x, 1.19.x
-            return 15;
-        } else if (TAB.getInstance().getServerVersion().getMinorVersion() >= 15) {
-            //1.15.x, 1.16.x
-            return 14;
-        } else if (TAB.getInstance().getServerVersion().getMinorVersion() >= 14) {
-            //1.14.x
-            return 13;
-        } else if (TAB.getInstance().getServerVersion().getMinorVersion() >= 10) {
-            //1.10.x - 1.13.x
-            return 11;
-        } else {
-            //1.8.x - 1.9.x
-            return 10;
-        }
-    }
-
-    /**
-     * Writes entity byte flags
-     *
-     * @param   flags
-     *          flags to write
-     */
-    public void setEntityFlags(byte flags) {
-        data.setValue(new DataWatcherObject(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 (TAB.getInstance().getServerVersion().getMinorVersion() >= 13) {
-            data.setValue(new DataWatcherObject(2, DataWatcherSerializer_OPTIONAL_COMPONENT),
-                    Optional.ofNullable(NMSStorage.getInstance().toNMSComponent(IChatBaseComponent.optimizedComponent(customName), clientVersion)));
-        } else if (TAB.getInstance().getServerVersion().getMinorVersion() >= 8) {
-            data.setValue(new DataWatcherObject(2, DataWatcherSerializer_STRING), customName);
-        } else {
-            //name length is limited to 64 characters on <1.8
-            String cutName = (customName.length() > 64 ? customName.substring(0, 64) : customName);
-            if (TAB.getInstance().getServerVersion().getMinorVersion() >= 6) {
-                data.setValue(new DataWatcherObject(10, null), cutName);
-            } else {
-                data.setValue(new DataWatcherObject(5, null), cutName);
-            }
-        }
-    }
-
-    /**
-     * Writes custom name visibility boolean
-     *
-     * @param   visible
-     *          if visible or not
-     */
-    public void setCustomNameVisible(boolean visible) {
-        if (TAB.getInstance().getServerVersion().getMinorVersion() >= 9) {
-            data.setValue(new DataWatcherObject(3, DataWatcherSerializer_BOOLEAN), visible);
-        } else {
-            data.setValue(new DataWatcherObject(3, null), (byte)(visible?1:0));
-        }
-    }
-
-    /**
-     * Writes entity health
-     *
-     * @param   health
-     *          health of entity
-     */
-    public void setHealth(float health) {
-        if (TAB.getInstance().getServerVersion().getMinorVersion() >= 6) {
-            data.setValue(new DataWatcherObject(6, DataWatcherSerializer_FLOAT), health);
-        } else {
-            data.setValue(new DataWatcherObject(16, null), (int)health);
-        }
-    }
-
-    /**
-     * Writes armor stand flags
-     *
-     * @param   flags
-     *          flags to write
-     */
-    public void setArmorStandFlags(byte flags) {
-        data.setValue(new DataWatcherObject(armorStandFlagsPosition, DataWatcherSerializer_BYTE), flags);
-    }
-
-    /**
-     * Writes wither invulnerable time
-     * @param   time
-     *          Time, apparently
-     */
-    public void setWitherInvulnerableTime(int time) {
-        if (TAB.getInstance().getServerVersion().getMinorVersion() > 8)
-            throw new UnsupportedOperationException("Not supported on 1.9+");
-        data.setValue(new DataWatcherObject(20, null), time);
-    }
-}
@@ -1,39 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.nms.datawatcher;
-
-import lombok.Data;
-import me.neznamy.tab.platforms.bukkit.nms.storage.nms.NMSStorage;
-import me.neznamy.tab.shared.util.ReflectionUtils;
-import org.jetbrains.annotations.NotNull;
-
-import java.lang.reflect.Field;
-
-/**
- * Class representing NMS Data Watcher Item
- */
-@Data
-public class DataWatcherItem {
-
-    /** NMS Fields */
-    public static Class<?> CLASS;
-    public static Field TYPE;
-    public static Field VALUE;
-
-    /** Instance fields */
-    @NotNull private final DataWatcherObject type;
-    @NotNull private final Object value;
-
-    /**
-     * Loads all required Fields
-     *
-     * @param   nms
-     *          NMS storage reference
-     */
-    public static void load(NMSStorage nms) {
-        VALUE = ReflectionUtils.getFields(CLASS, Object.class).get(0);
-        if (nms.getMinorVersion() >= 9) {
-            TYPE = ReflectionUtils.getOnlyField(CLASS, DataWatcherObject.CLASS);
-        } else {
-            TYPE = ReflectionUtils.getFields(CLASS, int.class).get(1);
-        }
-    }
-}
@@ -1,54 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.nms.datawatcher;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.SneakyThrows;
-import me.neznamy.tab.platforms.bukkit.nms.storage.nms.NMSStorage;
-import me.neznamy.tab.shared.util.ReflectionUtils;
-import org.jetbrains.annotations.Nullable;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-
-/**
- * A class representing the n.m.s.DataWatcherObject class to make work with it much easier
- */
-@Data @AllArgsConstructor
-public class DataWatcherObject {
-
-    /** NMS Fields */
-    public static Class<?> CLASS;
-    public static Constructor<?> CONSTRUCTOR;
-    public static Field SLOT;
-    public static Field SERIALIZER;
-    
-    /** Instance fields */
-    private final int position;
-    @Nullable private final Object serializer;
-
-    /**
-     * Loads all required Fields and throws Exception if something went wrong
-     *
-     * @throws  NoSuchMethodException
-     *          If something fails
-     */
-    public static void load() throws NoSuchMethodException {
-        CONSTRUCTOR = CLASS.getConstructor(int.class, DataWatcherHelper.DataWatcherSerializer);
-        SLOT = ReflectionUtils.getOnlyField(CLASS, int.class);
-        SERIALIZER = ReflectionUtils.getOnlyField(CLASS, DataWatcherHelper.DataWatcherSerializer);
-    }
-
-    /**
-     * Converts the object into NMS object
-     *
-     * @return  NMS object
-     */
-    @SneakyThrows
-    public Object build() {
-        if (NMSStorage.getInstance().getMinorVersion() >= 9) {
-            return DataWatcherObject.CONSTRUCTOR.newInstance(position, serializer);
-        } else {
-            return position;
-        }
-    }
-}
@@ -1,139 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.nms.storage.nms;
-
-import me.neznamy.tab.platforms.bukkit.BukkitTabList;
-import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcher;
-import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcherHelper;
-import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcherItem;
-import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcherObject;
-import me.neznamy.tab.platforms.bukkit.nms.storage.packet.*;
-import me.neznamy.tab.platforms.bukkit.scoreboard.PacketScoreboard;
-import me.neznamy.tab.shared.util.ReflectionUtils;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Arrays;
-
-/**
- * NMS loader for Minecraft 1.5.2 - 1.16.5 using Bukkit mapping.
- */
-@SuppressWarnings({"unchecked", "rawtypes"})
-public class BukkitLegacyNMSStorage extends NMSStorage {
-
-    /**
-     * Returns class with given potential names in same order
-     *
-     * @param   names
-     *          possible class names
-     * @return  class for specified names
-     * @throws  ClassNotFoundException
-     *          if class does not exist
-     */
-    private Class<?> getLegacyClass(@NotNull String... names) throws ClassNotFoundException {
-        for (String name : names) {
-            try {
-                return getLegacyClass(name);
-            } catch (ClassNotFoundException e) {
-                //not the first class name in array
-            }
-        }
-        throw new ClassNotFoundException("No class found with possible names " + Arrays.toString(names));
-    }
-
-    /**
-     * Returns class from given name
-     *
-     * @param   name
-     *          class name
-     * @return  class from given name
-     * @throws  ClassNotFoundException
-     *          if class was not found
-     */
-    public Class<?> getLegacyClass(@NotNull String name) throws ClassNotFoundException {
-        return Class.forName("net.minecraft.server." + serverPackage + "." + name);
-    }
-
-    @Override
-    public void loadNamedFieldsAndMethods() throws ReflectiveOperationException {
-        PacketScoreboard.ScoreboardScore_setScore = ReflectionUtils.getMethod(PacketScoreboard.ScoreboardScoreClass, new String[] {"setScore", "c"}, int.class); // 1.5.1+, 1.5
-        PacketScoreboard.ScoreboardTeam_setAllowFriendlyFire = ReflectionUtils.getMethod(PacketScoreboard.ScoreboardTeam, new String[] {"setAllowFriendlyFire", "a"}, boolean.class); // 1.5.1+, 1.5
-        PacketScoreboard.ScoreboardTeam_setCanSeeFriendlyInvisibles = ReflectionUtils.getMethod(PacketScoreboard.ScoreboardTeam, new String[] {"setCanSeeFriendlyInvisibles", "b"}, boolean.class); // 1.5.1+, 1.5
-        if (minorVersion >= 7) {
-            ChatSerializer_DESERIALIZE = ChatSerializer.getMethod("a", String.class);
-        }
-        if (minorVersion >= 8) {
-            PacketScoreboard.ScoreboardTeam_setNameTagVisibility = ReflectionUtils.getMethod(PacketScoreboard.ScoreboardTeam, new String[] {"setNameTagVisibility", "a"}, PacketScoreboard.EnumNameTagVisibility); // {1.8.1+, 1.8}
-        }
-        if (minorVersion >= 9) {
-            DataWatcher.REGISTER = DataWatcher.CLASS.getMethod("register", DataWatcherObject.CLASS, Object.class);
-            DataWatcherHelper.DataWatcherSerializer_BYTE = DataWatcherHelper.DataWatcherRegistry.getDeclaredField("a").get(null);
-            DataWatcherHelper.DataWatcherSerializer_FLOAT = DataWatcherHelper.DataWatcherRegistry.getDeclaredField("c").get(null);
-            DataWatcherHelper.DataWatcherSerializer_STRING = DataWatcherHelper.DataWatcherRegistry.getDeclaredField("d").get(null);
-            if (getMinorVersion() >= 13) {
-                DataWatcherHelper.DataWatcherSerializer_OPTIONAL_COMPONENT = DataWatcherHelper.DataWatcherRegistry.getDeclaredField("f").get(null);
-                DataWatcherHelper.DataWatcherSerializer_BOOLEAN = DataWatcherHelper.DataWatcherRegistry.getDeclaredField("i").get(null);
-            } else {
-                DataWatcherHelper.DataWatcherSerializer_BOOLEAN = DataWatcherHelper.DataWatcherRegistry.getDeclaredField("h").get(null);
-            }
-        } else {
-            DataWatcher.REGISTER = DataWatcher.CLASS.getMethod("a", int.class, Object.class);
-        }
-        if (minorVersion >= 13) {
-            PacketScoreboard.ScoreboardTeam_setPrefix = PacketScoreboard.ScoreboardTeam.getMethod("setPrefix", IChatBaseComponent);
-            PacketScoreboard.ScoreboardTeam_setSuffix = PacketScoreboard.ScoreboardTeam.getMethod("setSuffix", IChatBaseComponent);
-        } else {
-            PacketScoreboard.ScoreboardTeam_setPrefix = ReflectionUtils.getMethod(PacketScoreboard.ScoreboardTeam, new String[] {"setPrefix", "b"}, String.class); // 1.5.1+, 1.5
-            PacketScoreboard.ScoreboardTeam_setSuffix = ReflectionUtils.getMethod(PacketScoreboard.ScoreboardTeam, new String[] {"setSuffix", "c"}, String.class); // 1.5.1+, 1.5
-        }
-    }
-
-    @Override
-    public void loadClasses() throws ClassNotFoundException {
-        EntityHuman = getLegacyClass("EntityHuman");
-        World = getLegacyClass("World");
-        Packet = getLegacyClass("Packet");
-        EnumChatFormat = (Class<Enum>) getLegacyClass("EnumChatFormat");
-        EntityPlayer = getLegacyClass("EntityPlayer");
-        Entity = getLegacyClass("Entity");
-        EntityLiving = getLegacyClass("EntityLiving");
-        PlayerConnection = getLegacyClass("PlayerConnection");
-        NetworkManager = getLegacyClass("NetworkManager");
-        DataWatcher.CLASS = getLegacyClass("DataWatcher");
-        DataWatcherItem.CLASS = getLegacyClass("DataWatcher$Item", "DataWatcher$WatchableObject", "WatchableObject");
-        PacketPlayOutSpawnEntityLivingStorage.CLASS = getLegacyClass("PacketPlayOutSpawnEntityLiving", "Packet24MobSpawn");
-        PacketPlayOutEntityTeleportStorage.CLASS = getLegacyClass("PacketPlayOutEntityTeleport", "Packet34EntityTeleport");
-        PacketPlayOutEntity = getLegacyClass("PacketPlayOutEntity", "Packet30Entity");
-        PacketPlayOutEntityDestroyStorage.CLASS = getLegacyClass("PacketPlayOutEntityDestroy", "Packet29DestroyEntity");
-        PacketPlayOutEntityLook = getLegacyClass("PacketPlayOutEntity$PacketPlayOutEntityLook", "PacketPlayOutEntityLook", "Packet32EntityLook");
-        PacketPlayOutEntityMetadataStorage.CLASS = getLegacyClass("PacketPlayOutEntityMetadata", "Packet40EntityMetadata");
-        PacketPlayOutNamedEntitySpawn = getLegacyClass("PacketPlayOutNamedEntitySpawn", "Packet20NamedEntitySpawn");
-        PacketScoreboard.DisplayObjectiveClass = getLegacyClass("PacketPlayOutScoreboardDisplayObjective", "Packet208SetScoreboardDisplayObjective");
-        PacketScoreboard.ObjectivePacketClass = getLegacyClass("PacketPlayOutScoreboardObjective", "Packet206SetScoreboardObjective");
-        PacketScoreboard.TeamPacketClass = getLegacyClass("PacketPlayOutScoreboardTeam", "Packet209SetScoreboardTeam");
-        PacketScoreboard.ScorePacketClass = getLegacyClass("PacketPlayOutScoreboardScore", "Packet207SetScoreboardScore");
-        PacketScoreboard.Scoreboard = getLegacyClass("Scoreboard");
-        PacketScoreboard.ScoreboardObjective = getLegacyClass("ScoreboardObjective");
-        PacketScoreboard.ScoreboardScoreClass = getLegacyClass("ScoreboardScore");
-        PacketScoreboard.IScoreboardCriteria = getLegacyClass("IScoreboardCriteria", "IObjective"); // 1.5.1+, 1.5
-        PacketScoreboard.ScoreboardTeam = getLegacyClass("ScoreboardTeam");
-        if (minorVersion >= 7) {
-            IChatBaseComponent = getLegacyClass("IChatBaseComponent");
-            ChatSerializer = getLegacyClass("IChatBaseComponent$ChatSerializer", "ChatSerializer");
-        }
-        if (minorVersion >= 8) {
-            BukkitTabList.PacketPlayOutPlayerListHeaderFooterClass = getLegacyClass("PacketPlayOutPlayerListHeaderFooter");
-            EntityArmorStand = getLegacyClass("EntityArmorStand");
-            BukkitTabList.PacketPlayOutPlayerInfoClass = getLegacyClass("PacketPlayOutPlayerInfo");
-            BukkitTabList.EnumPlayerInfoActionClass = (Class<Enum>) getLegacyClass("PacketPlayOutPlayerInfo$EnumPlayerInfoAction", "EnumPlayerInfoAction");
-            BukkitTabList.PlayerInfoDataClass = getLegacyClass("PacketPlayOutPlayerInfo$PlayerInfoData", "PlayerInfoData");
-            BukkitTabList.EnumGamemodeClass = (Class<Enum>) getLegacyClass("EnumGamemode", "WorldSettings$EnumGamemode");
-            PacketScoreboard.EnumScoreboardHealthDisplay = (Class<Enum>) getLegacyClass("IScoreboardCriteria$EnumScoreboardHealthDisplay", "EnumScoreboardHealthDisplay");
-            PacketScoreboard.EnumScoreboardAction = (Class<Enum>) getLegacyClass("ScoreboardServer$Action", "PacketPlayOutScoreboardScore$EnumScoreboardAction", "EnumScoreboardAction");
-            PacketScoreboard.EnumNameTagVisibility = (Class<Enum>) getLegacyClass("ScoreboardTeamBase$EnumNameTagVisibility", "EnumNameTagVisibility");
-        }
-        if (minorVersion >= 9) {
-            DataWatcherObject.CLASS = getLegacyClass("DataWatcherObject");
-            DataWatcherHelper.DataWatcherRegistry = getLegacyClass("DataWatcherRegistry");
-            DataWatcherHelper.DataWatcherSerializer = getLegacyClass("DataWatcherSerializer");
-            PacketScoreboard.EnumTeamPush = (Class<Enum>) getLegacyClass("ScoreboardTeamBase$EnumTeamPush");
-        }
-    }
-}
@@ -1,107 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.nms.storage.nms;
-
-import me.neznamy.tab.platforms.bukkit.BukkitTabList;
-import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcher;
-import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcherHelper;
-import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcherItem;
-import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcherObject;
-import me.neznamy.tab.platforms.bukkit.nms.storage.packet.*;
-import me.neznamy.tab.platforms.bukkit.scoreboard.PacketScoreboard;
-import me.neznamy.tab.shared.util.ReflectionUtils;
-
-/**
- * NMS loader for minecraft 1.17+ using Mojang packaging and bukkit names.
- */
-@SuppressWarnings({"unchecked", "rawtypes"})
-public class BukkitModernNMSStorage extends NMSStorage {
-
-    @Override
-    public void loadNamedFieldsAndMethods() throws ReflectiveOperationException {
-        ChatSerializer_DESERIALIZE = ChatSerializer.getMethod("a", String.class);
-        DataWatcher.REGISTER = ReflectionUtils.getMethod(DataWatcher.CLASS, new String[]{"register", "a"}, DataWatcherObject.CLASS, Object.class); // {Bukkit, Bukkit 1.18+}
-        PacketScoreboard.ScoreboardScore_setScore = ReflectionUtils.getMethod(PacketScoreboard.ScoreboardScoreClass, new String[]{"setScore", "b"}, int.class); // {Bukkit, Bukkit 1.18+}
-        PacketScoreboard.ScoreboardTeam_setAllowFriendlyFire = ReflectionUtils.getMethod(PacketScoreboard.ScoreboardTeam, new String[]{"setAllowFriendlyFire", "a"}, boolean.class); // {Bukkit, Bukkit 1.18+}
-        PacketScoreboard.ScoreboardTeam_setCanSeeFriendlyInvisibles = ReflectionUtils.getMethod(PacketScoreboard.ScoreboardTeam, new String[]{"setCanSeeFriendlyInvisibles", "b"}, boolean.class); // {Bukkit, Bukkit 1.18+}
-        PacketScoreboard.ScoreboardTeam_setPrefix = ReflectionUtils.getMethod(PacketScoreboard.ScoreboardTeam, new String[]{"setPrefix", "b"}, IChatBaseComponent); // {Bukkit, Bukkit 1.18+}
-        PacketScoreboard.ScoreboardTeam_setSuffix = ReflectionUtils.getMethod(PacketScoreboard.ScoreboardTeam, new String[]{"setSuffix", "c"}, IChatBaseComponent); // {Bukkit, Bukkit 1.18+}
-        PacketScoreboard.ScoreboardTeam_setNameTagVisibility = ReflectionUtils.getMethod(PacketScoreboard.ScoreboardTeam, new String[]{"setNameTagVisibility", "a"}, PacketScoreboard.EnumNameTagVisibility); // {Bukkit, Bukkit 1.18+}
-        DataWatcherHelper.DataWatcherSerializer_BYTE = DataWatcherHelper.DataWatcherRegistry.getDeclaredField("a").get(null);
-        DataWatcherHelper.DataWatcherSerializer_FLOAT = DataWatcherHelper.DataWatcherRegistry.getDeclaredField("c").get(null);
-        DataWatcherHelper.DataWatcherSerializer_STRING = DataWatcherHelper.DataWatcherRegistry.getDeclaredField("d").get(null);
-        if (is1_19_3Plus()) {
-            DataWatcherHelper.DataWatcherSerializer_OPTIONAL_COMPONENT = DataWatcherHelper.DataWatcherRegistry.getDeclaredField("g").get(null);
-            if (is1_19_4Plus()) {
-                DataWatcherHelper.DataWatcherSerializer_BOOLEAN = DataWatcherHelper.DataWatcherRegistry.getDeclaredField("k").get(null);
-            } else {
-                DataWatcherHelper.DataWatcherSerializer_BOOLEAN = DataWatcherHelper.DataWatcherRegistry.getDeclaredField("j").get(null);
-            }
-         } else {
-            DataWatcherHelper.DataWatcherSerializer_OPTIONAL_COMPONENT = DataWatcherHelper.DataWatcherRegistry.getDeclaredField("f").get(null);
-            DataWatcherHelper.DataWatcherSerializer_BOOLEAN = DataWatcherHelper.DataWatcherRegistry.getDeclaredField("i").get(null);
-        }
-        if (minorVersion >= 19) {
-            PacketPlayOutSpawnEntityLivingStorage.EntityTypes_ARMOR_STAND = PacketPlayOutSpawnEntityLivingStorage.EntityTypes.getDeclaredField("d").get(null);
-            (PacketPlayOutSpawnEntityLivingStorage.ENTITY_TYPE = PacketPlayOutSpawnEntityLivingStorage.CLASS.getDeclaredField("e")).setAccessible(true);
-            DataWatcher.packDirty = DataWatcher.CLASS.getMethod("b");
-        }
-    }
-
-    @Override
-    public void loadClasses() throws ClassNotFoundException {
-        ChatSerializer = Class.forName("net.minecraft.network.chat.IChatBaseComponent$ChatSerializer");
-        World = Class.forName("net.minecraft.world.level.World");
-        EntityArmorStand = Class.forName("net.minecraft.world.entity.decoration.EntityArmorStand");
-        EntityHuman = Class.forName("net.minecraft.world.entity.player.EntityHuman");
-        NetworkManager = Class.forName("net.minecraft.network.NetworkManager");
-        IChatBaseComponent = Class.forName("net.minecraft.network.chat.IChatBaseComponent");
-        Packet = Class.forName("net.minecraft.network.protocol.Packet");
-        EnumChatFormat = (Class<Enum>) Class.forName("net.minecraft.EnumChatFormat");
-        EntityPlayer = Class.forName("net.minecraft.server.level.EntityPlayer");
-        Entity = Class.forName("net.minecraft.world.entity.Entity");
-        EntityLiving = Class.forName("net.minecraft.world.entity.EntityLiving");
-        PlayerConnection = Class.forName("net.minecraft.server.network.PlayerConnection");
-        BukkitTabList.PacketPlayOutPlayerListHeaderFooterClass = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutPlayerListHeaderFooter");
-        PacketScoreboard.DisplayObjectiveClass = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutScoreboardDisplayObjective");
-        PacketScoreboard.ObjectivePacketClass = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutScoreboardObjective");
-        PacketScoreboard.Scoreboard = Class.forName("net.minecraft.world.scores.Scoreboard");
-        PacketScoreboard.ScorePacketClass = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutScoreboardScore");
-        PacketScoreboard.ScoreboardObjective = Class.forName("net.minecraft.world.scores.ScoreboardObjective");
-        PacketScoreboard.ScoreboardScoreClass = Class.forName("net.minecraft.world.scores.ScoreboardScore");
-        PacketScoreboard.IScoreboardCriteria = Class.forName("net.minecraft.world.scores.criteria.IScoreboardCriteria");
-        PacketScoreboard.EnumScoreboardHealthDisplay = (Class<Enum>) Class.forName("net.minecraft.world.scores.criteria.IScoreboardCriteria$EnumScoreboardHealthDisplay");
-        PacketScoreboard.EnumScoreboardAction = (Class<Enum>) Class.forName("net.minecraft.server.ScoreboardServer$Action");
-        PacketScoreboard.TeamPacketClass = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutScoreboardTeam");
-        PacketScoreboard.ScoreboardTeam = Class.forName("net.minecraft.world.scores.ScoreboardTeam");
-        PacketScoreboard.EnumNameTagVisibility = (Class<Enum>) Class.forName("net.minecraft.world.scores.ScoreboardTeamBase$EnumNameTagVisibility");
-        PacketScoreboard.EnumTeamPush = (Class<Enum>) Class.forName("net.minecraft.world.scores.ScoreboardTeamBase$EnumTeamPush");
-        DataWatcher.CLASS = Class.forName("net.minecraft.network.syncher.DataWatcher");
-        DataWatcherItem.CLASS = Class.forName("net.minecraft.network.syncher.DataWatcher$Item");
-        DataWatcherObject.CLASS = Class.forName("net.minecraft.network.syncher.DataWatcherObject");
-        DataWatcherHelper.DataWatcherRegistry = Class.forName("net.minecraft.network.syncher.DataWatcherRegistry");
-        DataWatcherHelper.DataWatcherSerializer = Class.forName("net.minecraft.network.syncher.DataWatcherSerializer");
-        PacketPlayOutEntityTeleportStorage.CLASS = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutEntityTeleport");
-        PacketPlayOutEntity = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutEntity");
-        PacketPlayOutEntityDestroyStorage.CLASS = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutEntityDestroy");
-        PacketPlayOutEntityLook = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutEntity$PacketPlayOutEntityLook");
-        PacketPlayOutEntityMetadataStorage.CLASS = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutEntityMetadata");
-        PacketPlayOutNamedEntitySpawn = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutNamedEntitySpawn");
-        BukkitTabList.EnumGamemodeClass = (Class<Enum>) Class.forName("net.minecraft.world.level.EnumGamemode");
-        if (minorVersion >= 19) {
-            PacketPlayOutSpawnEntityLivingStorage.EntityTypes = Class.forName("net.minecraft.world.entity.EntityTypes");
-            PacketPlayOutSpawnEntityLivingStorage.CLASS = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutSpawnEntity");
-        } else {
-            PacketPlayOutSpawnEntityLivingStorage.CLASS = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutSpawnEntityLiving");
-        }
-        if (is1_19_3Plus()) {
-            BukkitTabList.ClientboundPlayerInfoRemovePacket = Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoRemovePacket");
-            BukkitTabList.PacketPlayOutPlayerInfoClass = Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket");
-            BukkitTabList.EnumPlayerInfoActionClass = (Class<Enum>) Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket$a");
-            BukkitTabList.PlayerInfoDataClass = Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket$b");
-            BukkitTabList.RemoteChatSession$Data = Class.forName("net.minecraft.network.chat.RemoteChatSession$a");
-        } else {
-            BukkitTabList.PacketPlayOutPlayerInfoClass = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutPlayerInfo");
-            BukkitTabList.EnumPlayerInfoActionClass = (Class<Enum>) Class.forName("net.minecraft.network.protocol.game.PacketPlayOutPlayerInfo$EnumPlayerInfoAction");
-            BukkitTabList.PlayerInfoDataClass = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutPlayerInfo$PlayerInfoData");
-        }
-    }
-}
@@ -1,97 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.nms.storage.nms;
-
-import me.neznamy.tab.platforms.bukkit.BukkitTabList;
-import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcher;
-import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcherHelper;
-import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcherItem;
-import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcherObject;
-import me.neznamy.tab.platforms.bukkit.nms.storage.packet.*;
-import me.neznamy.tab.platforms.bukkit.scoreboard.PacketScoreboard;
-
-/**
- * NMS loader for minecraft 1.17+ using Mojang packaging and names.
- */
-@SuppressWarnings({"unchecked", "rawtypes"})
-public class MojangModernNMSStorage extends NMSStorage {
-
-    @Override
-    public void loadNamedFieldsAndMethods() throws ReflectiveOperationException {
-        ChatSerializer_DESERIALIZE = ChatSerializer.getMethod("fromJson", String.class);
-        DataWatcher.REGISTER = DataWatcher.CLASS.getMethod("define", DataWatcherObject.CLASS, Object.class);
-        PacketScoreboard.ScoreboardScore_setScore = PacketScoreboard.ScoreboardScoreClass.getMethod("setScore", int.class);
-        PacketScoreboard.ScoreboardTeam_setAllowFriendlyFire = PacketScoreboard.ScoreboardTeam.getMethod("setAllowFriendlyFire", boolean.class);
-        PacketScoreboard.ScoreboardTeam_setCanSeeFriendlyInvisibles = PacketScoreboard.ScoreboardTeam.getMethod("setSeeFriendlyInvisibles", boolean.class);
-        PacketScoreboard.ScoreboardTeam_setPrefix = PacketScoreboard.ScoreboardTeam.getMethod("setPlayerPrefix", IChatBaseComponent);
-        PacketScoreboard.ScoreboardTeam_setSuffix = PacketScoreboard.ScoreboardTeam.getMethod("setPlayerSuffix", IChatBaseComponent);
-        PacketScoreboard.ScoreboardTeam_setNameTagVisibility = PacketScoreboard.ScoreboardTeam.getMethod("setNameTagVisibility", PacketScoreboard.EnumNameTagVisibility);
-        DataWatcherHelper.DataWatcherSerializer_BYTE = DataWatcherHelper.DataWatcherRegistry.getDeclaredField("BYTE").get(null);
-        DataWatcherHelper.DataWatcherSerializer_FLOAT = DataWatcherHelper.DataWatcherRegistry.getDeclaredField("FLOAT").get(null);
-        DataWatcherHelper.DataWatcherSerializer_STRING = DataWatcherHelper.DataWatcherRegistry.getDeclaredField("STRING").get(null);
-        DataWatcherHelper.DataWatcherSerializer_OPTIONAL_COMPONENT = DataWatcherHelper.DataWatcherRegistry.getDeclaredField("OPTIONAL_COMPONENT").get(null);
-        DataWatcherHelper.DataWatcherSerializer_BOOLEAN = DataWatcherHelper.DataWatcherRegistry.getDeclaredField("BOOLEAN").get(null);
-        if (minorVersion >= 19) {
-            PacketPlayOutSpawnEntityLivingStorage.EntityTypes_ARMOR_STAND = PacketPlayOutSpawnEntityLivingStorage.EntityTypes.getDeclaredField("ARMOR_STAND").get(null);
-            (PacketPlayOutSpawnEntityLivingStorage.ENTITY_TYPE = PacketPlayOutSpawnEntityLivingStorage.CLASS.getDeclaredField("type")).setAccessible(true);
-            DataWatcher.packDirty = DataWatcher.CLASS.getMethod("packDirty");
-        }
-    }
-
-    @Override
-    public void loadClasses() throws ClassNotFoundException {
-        IChatBaseComponent = Class.forName("net.minecraft.network.chat.Component");
-        ChatSerializer = Class.forName("net.minecraft.network.chat.Component$Serializer");
-        World = Class.forName("net.minecraft.world.level.Level");
-        EntityArmorStand = Class.forName("net.minecraft.world.entity.decoration.ArmorStand");
-        EntityHuman = Class.forName("net.minecraft.world.entity.player.Player");
-        NetworkManager = Class.forName("net.minecraft.network.Connection");
-        Packet = Class.forName("net.minecraft.network.protocol.Packet");
-        EnumChatFormat = (Class<Enum>) Class.forName("net.minecraft.ChatFormatting");
-        EntityPlayer = Class.forName("net.minecraft.server.level.ServerPlayer");
-        Entity = Class.forName("net.minecraft.world.entity.Entity");
-        EntityLiving = Class.forName("net.minecraft.world.entity.LivingEntity");
-        PlayerConnection = Class.forName("net.minecraft.server.network.ServerGamePacketListenerImpl");
-        BukkitTabList.PacketPlayOutPlayerListHeaderFooterClass = Class.forName("net.minecraft.network.protocol.game.ClientboundTabListPacket");
-        DataWatcher.CLASS = Class.forName("net.minecraft.network.syncher.SynchedEntityData");
-        DataWatcherItem.CLASS = Class.forName("net.minecraft.network.syncher.SynchedEntityData$DataItem");
-        DataWatcherObject.CLASS = Class.forName("net.minecraft.network.syncher.EntityDataAccessor");
-        DataWatcherHelper.DataWatcherRegistry = Class.forName("net.minecraft.network.syncher.EntityDataSerializers");
-        DataWatcherHelper.DataWatcherSerializer = Class.forName("net.minecraft.network.syncher.EntityDataSerializer");
-        PacketPlayOutEntityTeleportStorage.CLASS = Class.forName("net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket");
-        PacketPlayOutEntity = Class.forName("net.minecraft.network.protocol.game.ClientboundMoveEntityPacket");
-        PacketPlayOutEntityDestroyStorage.CLASS = Class.forName("net.minecraft.network.protocol.game.ClientboundRemoveEntitiesPacket");
-        PacketPlayOutEntityLook = Class.forName("net.minecraft.network.protocol.game.ClientboundMoveEntityPacket$Rot");
-        PacketPlayOutEntityMetadataStorage.CLASS = Class.forName("net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket");
-        PacketPlayOutNamedEntitySpawn = Class.forName("net.minecraft.network.protocol.game.ClientboundAddPlayerPacket");
-        BukkitTabList.EnumGamemodeClass = (Class<Enum>) Class.forName("net.minecraft.world.level.GameType");
-        PacketScoreboard.DisplayObjectiveClass = Class.forName("net.minecraft.network.protocol.game.ClientboundSetDisplayObjectivePacket");
-        PacketScoreboard.ObjectivePacketClass = Class.forName("net.minecraft.network.protocol.game.ClientboundSetObjectivePacket");
-        PacketScoreboard.Scoreboard = Class.forName("net.minecraft.world.scores.Scoreboard");
-        PacketScoreboard.ScorePacketClass = Class.forName("net.minecraft.network.protocol.game.ClientboundSetScorePacket");
-        PacketScoreboard.ScoreboardObjective = Class.forName("net.minecraft.world.scores.Objective");
-        PacketScoreboard.ScoreboardScoreClass = Class.forName("net.minecraft.world.scores.Score");
-        PacketScoreboard.IScoreboardCriteria = Class.forName("net.minecraft.world.scores.criteria.ObjectiveCriteria");
-        PacketScoreboard.EnumScoreboardHealthDisplay = (Class<Enum>) Class.forName("net.minecraft.world.scores.criteria.ObjectiveCriteria$RenderType");
-        PacketScoreboard.EnumScoreboardAction = (Class<Enum>) Class.forName("net.minecraft.server.ServerScoreboard$Method");
-        PacketScoreboard.TeamPacketClass = Class.forName("net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket");
-        PacketScoreboard.ScoreboardTeam = Class.forName("net.minecraft.world.scores.PlayerTeam");
-        PacketScoreboard.EnumNameTagVisibility = (Class<Enum>) Class.forName("net.minecraft.world.scores.Team$Visibility");
-        PacketScoreboard.EnumTeamPush = (Class<Enum>) Class.forName("net.minecraft.world.scores.Team$CollisionRule");
-        if (minorVersion >= 19) {
-            PacketPlayOutSpawnEntityLivingStorage.EntityTypes = Class.forName("net.minecraft.world.entity.EntityType");
-            PacketPlayOutSpawnEntityLivingStorage.CLASS = Class.forName("net.minecraft.network.protocol.game.ClientboundAddEntityPacket");
-        } else {
-            PacketPlayOutSpawnEntityLivingStorage.CLASS = Class.forName("net.minecraft.network.protocol.game.ClientboundAddMobPacket");
-        }
-        if (is1_19_3Plus()) {
-            BukkitTabList.ClientboundPlayerInfoRemovePacket = Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoRemovePacket");
-            BukkitTabList.PacketPlayOutPlayerInfoClass = Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket");
-            BukkitTabList.EnumPlayerInfoActionClass = (Class<Enum>) Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket$Action");
-            BukkitTabList.PlayerInfoDataClass = Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket$Entry");
-            BukkitTabList.RemoteChatSession$Data = Class.forName("net.minecraft.network.chat.RemoteChatSession$Data");
-        } else {
-            BukkitTabList.PacketPlayOutPlayerInfoClass = Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket");
-            BukkitTabList.EnumPlayerInfoActionClass = (Class<Enum>) Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket$Action");
-            BukkitTabList.PlayerInfoDataClass = Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket$PlayerUpdate");
-        }
-    }
-}
@@ -1,162 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.nms.storage.nms;
-
-import com.mojang.authlib.GameProfile;
-import io.netty.channel.Channel;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.SneakyThrows;
-import me.neznamy.tab.platforms.bukkit.BukkitTabList;
-import me.neznamy.tab.platforms.bukkit.scoreboard.PacketScoreboard;
-import me.neznamy.tab.shared.ProtocolVersion;
-import me.neznamy.tab.shared.chat.IChatBaseComponent;
-import me.neznamy.tab.shared.util.ComponentCache;
-import me.neznamy.tab.shared.util.ReflectionUtils;
-import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcher;
-import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcherItem;
-import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcherObject;
-import me.neznamy.tab.platforms.bukkit.nms.storage.packet.*;
-import org.bukkit.Bukkit;
-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;
-
-/**
- * Class holding all NMS classes, methods, fields and constructors used by TAB.
- */
-@SuppressWarnings("rawtypes")
-public abstract class NMSStorage {
-
-    /** Instance of this class */
-    @Getter @Setter private static NMSStorage instance;
-
-    /** Server's NMS/CraftBukkit package */
-    @Getter protected final String serverPackage = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
-
-    /** Server's minor version */
-    @Getter protected final int minorVersion = Integer.parseInt(serverPackage.split("_")[1]);
-
-    /** Flag determining whether the server version is at least 1.19.3 or not */
-    @Getter private final boolean is1_19_3Plus = ReflectionUtils.classExists("net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket");
-    @Getter private final boolean is1_19_4Plus = is1_19_3Plus && !serverPackage.equals("v1_19_R2");
-
-    /** Basic universal values */
-    protected Class<?> Packet;
-    protected Class<?> NetworkManager;
-    protected Class<?> EntityArmorStand;
-    protected Class<?> World;
-    public Class<Enum> EnumChatFormat;
-    public Class<?> EntityPlayer;
-    protected Class<?> EntityHuman;
-    public Class<?> Entity;
-    public Class<?> EntityLiving;
-    protected Class<?> PlayerConnection;
-
-    // Ping field for 1.5.2 - 1.16.5, 1.17+ has Player#getPing()
-    public Field PING;
-
-    public Field PLAYER_CONNECTION;
-    public Field NETWORK_MANAGER;
-    public Field CHANNEL;
-    public Method getHandle;
-    public Method sendPacket;
-    public Method getProfile;
-
-    /** Chat components */
-    public Class<?> IChatBaseComponent;
-    protected Class<?> ChatSerializer;
-    public Method ChatSerializer_DESERIALIZE;
-
-    /** Other entity packets */
-    public Class<?> PacketPlayOutEntity;
-    public Field PacketPlayOutEntity_ENTITYID;
-
-    public Class<?> PacketPlayOutEntityLook;
-
-    public Class<?> PacketPlayOutNamedEntitySpawn;
-    public Field PacketPlayOutNamedEntitySpawn_ENTITYID;
-
-    public Object dummyEntity;
-
-    private final ComponentCache<IChatBaseComponent, Object> componentCache = new ComponentCache<>(10000,
-            (component, clientVersion) -> ChatSerializer_DESERIALIZE.invoke(null, component.toString(clientVersion)));
-
-    /**
-     * Constructs new instance and attempts to load all fields, methods and constructors.
-     */
-    @SneakyThrows
-    public NMSStorage() {
-        ProtocolVersion.UNKNOWN_SERVER_VERSION.setMinorVersion(minorVersion); //fixing compatibility with forks that set version field value to "Unknown"
-        loadClasses();
-        if (minorVersion >= 7) {
-            NETWORK_MANAGER = ReflectionUtils.getOnlyField(PlayerConnection, NetworkManager);
-            sendPacket = ReflectionUtils.getMethods(PlayerConnection, void.class, Packet).get(0);
-        } else {
-            sendPacket = ReflectionUtils.getMethod(PlayerConnection, new String[]{"sendPacket"}, Packet);
-        }
-        if (minorVersion >= 8) {
-            CHANNEL = ReflectionUtils.getOnlyField(NetworkManager, Channel.class);
-            getProfile = ReflectionUtils.getOnlyMethod(EntityHuman, GameProfile.class);
-            Constructor<?> newEntityArmorStand = EntityArmorStand.getConstructor(World, double.class, double.class, double.class);
-            Method World_getHandle = Class.forName("org.bukkit.craftbukkit." + serverPackage + ".CraftWorld").getMethod("getHandle");
-            dummyEntity = newEntityArmorStand.newInstance(World_getHandle.invoke(Bukkit.getWorlds().get(0)), 0, 0, 0);
-            BukkitTabList.load(this);
-        }
-        if (minorVersion >= 9) {
-            DataWatcherObject.load();
-        }
-        PLAYER_CONNECTION = ReflectionUtils.getOnlyField(EntityPlayer, PlayerConnection);
-        getHandle = Class.forName("org.bukkit.craftbukkit." + serverPackage + ".entity.CraftPlayer").getMethod("getHandle");
-        DataWatcher.load(this);
-        DataWatcherItem.load(this);
-        PacketPlayOutEntityDestroyStorage.load();
-        PacketPlayOutEntityMetadataStorage.load(this);
-        PacketPlayOutEntityTeleportStorage.load(this);
-        PacketPlayOutSpawnEntityLivingStorage.load(this);
-        PacketScoreboard.load(this);
-        PacketPlayOutEntity_ENTITYID = ReflectionUtils.getFields(PacketPlayOutEntity, int.class).get(0);
-        PacketPlayOutNamedEntitySpawn_ENTITYID = ReflectionUtils.getFields(PacketPlayOutNamedEntitySpawn, int.class).get(0);
-        loadNamedFieldsAndMethods();
-        if (minorVersion < 17) {
-            try {
-                (PING = EntityPlayer.getDeclaredField("ping")).setAccessible(true); // 1.5.2 - 1.16.5
-            } catch (NoSuchFieldException e) {
-                (PING = EntityPlayer.getDeclaredField("field_71138_i")).setAccessible(true); // 1.7.10 Thermos
-            }
-        }
-    }
-
-    /**
-     * Loads all classes used by the plugin
-     *
-     * @throws  ClassNotFoundException
-     *          If a class was not found
-     */
-    public abstract void loadClasses() throws ClassNotFoundException;
-
-    /**
-     * Loads all fields and methods which must be loaded by their name due to
-     * lack of other methods of reliably retrieving them.
-     *
-     * @throws  ReflectiveOperationException
-     *          If a field or method was not found
-     */
-    public abstract void loadNamedFieldsAndMethods() throws ReflectiveOperationException;
-
-    /**
-     * Converts TAB's IChatBaseComponent into minecraft's component using String deserialization.
-     * If the requested component is found in cache, it is returned. If not, it is created, added into cache and returned.
-     * If {@code component} is {@code null}, returns {@code null}
-     *
-     * @param   component
-     *          component to convert
-     * @param   clientVersion
-     *          client version used to decide RGB conversion
-     * @return  converted component or {@code null} if {@code component} is {@code null}
-     */
-    public @Nullable Object toNMSComponent(@NotNull IChatBaseComponent component, @NotNull ProtocolVersion clientVersion) {
-        return componentCache.get(component, clientVersion);
-    }
-}
@@ -1,31 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.nms.storage.nms;
-
-import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcher;
-import me.neznamy.tab.platforms.bukkit.scoreboard.PacketScoreboard;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * NMS loader for Thermos 1.7.10.
- */
-public class ThermosNMSStorage extends BukkitLegacyNMSStorage {
-
-    @Override
-    public Class<?> getLegacyClass(@NotNull String name) throws ClassNotFoundException {
-        try {
-            return getClass().getClassLoader().loadClass("net.minecraft.server." + serverPackage + "." + name);
-        } catch (NullPointerException e) {
-            // nested class not found
-            throw new ClassNotFoundException(name);
-        }
-    }
-
-    @Override
-    public void loadNamedFieldsAndMethods() throws ReflectiveOperationException {
-        PacketScoreboard.ScoreboardScore_setScore = PacketScoreboard.ScoreboardScoreClass.getMethod("func_96647_c", int.class);
-        PacketScoreboard.ScoreboardTeam_setAllowFriendlyFire = PacketScoreboard.ScoreboardTeam.getMethod("func_96660_a", boolean.class);
-        PacketScoreboard.ScoreboardTeam_setCanSeeFriendlyInvisibles = PacketScoreboard.ScoreboardTeam.getMethod("func_98300_b", boolean.class);
-        DataWatcher.REGISTER = DataWatcher.CLASS.getMethod("func_75682_a", int.class, Object.class);
-        PacketScoreboard.ScoreboardTeam_setPrefix = PacketScoreboard.ScoreboardTeam.getMethod("func_96666_b", String.class);
-        PacketScoreboard.ScoreboardTeam_setSuffix = PacketScoreboard.ScoreboardTeam.getMethod("func_96662_c", String.class);
-    }
-}
@@ -1,33 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.nms.storage.packet;
-
-import me.neznamy.tab.shared.util.ReflectionUtils;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-
-/**
- * Custom class for holding data used in PacketPlayOutEntityDestroy minecraft packet.
- */
-public class PacketPlayOutEntityDestroyStorage {
-
-    /** NMS Fields */
-    public static Class<?> CLASS;
-    public static Constructor<?> CONSTRUCTOR;
-    public static Field ENTITIES;
-
-    /**
-     * Loads all required Fields and throws Exception if something went wrong
-     *
-     * @throws  NoSuchMethodException
-     *          If something fails
-     */
-    public static void load() throws NoSuchMethodException {
-        ENTITIES = ReflectionUtils.getOnlyField(CLASS);
-        try {
-            CONSTRUCTOR = CLASS.getConstructor(int[].class);
-        } catch (NoSuchMethodException e) {
-            //1.17.0
-            CONSTRUCTOR = CLASS.getConstructor(int.class);
-        }
-    }
-}
@@ -1,33 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.nms.storage.packet;
-
-import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcher;
-import me.neznamy.tab.platforms.bukkit.nms.storage.nms.NMSStorage;
-
-import java.lang.reflect.Constructor;
-import java.util.List;
-
-/**
- * Custom class for holding data used in PacketPlayOutEntityMetadata minecraft packet.
- */
-public class PacketPlayOutEntityMetadataStorage {
-
-    /** NMS Fields */
-    public static Class<?> CLASS;
-    public static Constructor<?> CONSTRUCTOR;
-
-    /**
-     * Loads all required Fields and throws Exception if something went wrong
-     *
-     * @param   nms
-     *          NMS storage reference
-     * @throws  NoSuchMethodException
-     *          If something fails
-     */
-    public static void load(NMSStorage nms) throws NoSuchMethodException {
-        if (nms.is1_19_3Plus()) {
-            CONSTRUCTOR = CLASS.getConstructor(int.class, List.class);
-        } else {
-            CONSTRUCTOR = CLASS.getConstructor(int.class, DataWatcher.CLASS, boolean.class);
-        }
-    }
-}
@@ -1,87 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.nms.storage.packet;
-
-import lombok.SneakyThrows;
-import me.neznamy.tab.platforms.bukkit.nms.storage.nms.NMSStorage;
-import me.neznamy.tab.shared.backend.Location;
-import me.neznamy.tab.shared.util.ReflectionUtils;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-
-/**
- * Custom class for holding data used in PacketPlayOutEntityTeleport minecraft packet.
- */
-public class PacketPlayOutEntityTeleportStorage {
-
-    /** NMS Fields */
-    public static Class<?> CLASS;
-    public static Constructor<?> CONSTRUCTOR;
-    public static Field ENTITY_ID;
-    public static Field X;
-    public static Field Y;
-    public static Field Z;
-    public static Field YAW;
-    public static Field PITCH;
-
-    /**
-     * Loads all required Fields and throws Exception if something went wrong
-     *
-     * @param   nms
-     *          NMS storage reference
-     * @throws  NoSuchMethodException
-     *          If something fails
-     */
-    public static void load(NMSStorage nms) throws NoSuchMethodException {
-        ENTITY_ID = ReflectionUtils.getFields(CLASS, int.class).get(0);
-        YAW = ReflectionUtils.getFields(CLASS, byte.class).get(0);
-        PITCH = ReflectionUtils.getFields(CLASS, byte.class).get(1);
-        if (nms.getMinorVersion() >= 17) {
-            CONSTRUCTOR = CLASS.getConstructor(nms.Entity);
-        } else {
-            CONSTRUCTOR = CLASS.getConstructor();
-        }
-        if (nms.getMinorVersion() >= 9) {
-            X = ReflectionUtils.getFields(CLASS, double.class).get(0);
-            Y = ReflectionUtils.getFields(CLASS, double.class).get(1);
-            Z = ReflectionUtils.getFields(CLASS, double.class).get(2);
-        } else {
-            X = ReflectionUtils.getFields(CLASS, int.class).get(1);
-            Y = ReflectionUtils.getFields(CLASS, int.class).get(2);
-            Z = ReflectionUtils.getFields(CLASS, int.class).get(3);
-        }
-    }
-
-    /**
-     * Converts this class into NMS packet
-     *
-     * @return  NMS packet
-     */
-    @SneakyThrows
-    public static Object build(int entityId, Location location) {
-        NMSStorage nms = NMSStorage.getInstance();
-        Object nmsPacket;
-        if (nms.getMinorVersion() >= 17) {
-            nmsPacket = CONSTRUCTOR.newInstance(nms.dummyEntity);
-        } else {
-            nmsPacket = CONSTRUCTOR.newInstance();
-        }
-        ENTITY_ID.set(nmsPacket, entityId);
-        if (nms.getMinorVersion() >= 9) {
-            X.set(nmsPacket, location.getX());
-            Y.set(nmsPacket, location.getY());
-            Z.set(nmsPacket, location.getZ());
-        } else {
-            X.set(nmsPacket, floor(location.getX()*32));
-            Y.set(nmsPacket, floor(location.getY()*32));
-            Z.set(nmsPacket, floor(location.getZ()*32));
-        }
-        YAW.set(nmsPacket, (byte) (location.getYaw()/360*256));
-        PITCH.set(nmsPacket, (byte) (location.getPitch()/360*256));
-        return nmsPacket;
-    }
-
-    private static int floor(double paramDouble) {
-        int i = (int)paramDouble;
-        return paramDouble < i ? i - 1 : i;
-    }
-}
@@ -1,133 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.nms.storage.packet;
-
-import lombok.SneakyThrows;
-import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcher;
-import me.neznamy.tab.platforms.bukkit.nms.storage.nms.NMSStorage;
-import me.neznamy.tab.shared.backend.EntityData;
-import me.neznamy.tab.shared.backend.Location;
-import me.neznamy.tab.shared.util.ReflectionUtils;
-import org.bukkit.entity.EntityType;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.util.EnumMap;
-import java.util.UUID;
-
-/**
- * Custom class for holding data used in PacketPlayOutSpawnEntityLiving minecraft packet.
- */
-public class PacketPlayOutSpawnEntityLivingStorage {
-
-    /** NMS Fields */
-    public static Class<?> CLASS;
-    public static Class<?> EntityTypes;
-    public static Constructor<?> CONSTRUCTOR;
-    public static Field ENTITY_ID;
-    public static Field ENTITY_TYPE;
-    public static Field YAW;
-    public static Field PITCH;
-    public static Field UUID;
-    public static Field X;
-    public static Field Y;
-    public static Field Z;
-    public static Field DATA_WATCHER;
-    public static Object EntityTypes_ARMOR_STAND;
-
-    /** Entity types */
-    public static final EnumMap<EntityType, Integer> entityIds = new EnumMap<>(EntityType.class);
-
-    /**
-     * Loads all required Fields and throws Exception if something went wrong
-     *
-     * @param   nms
-     *          NMS storage reference
-     * @throws  NoSuchMethodException
-     *          If something fails
-     */
-    public static void load(NMSStorage nms) throws NoSuchMethodException {
-        if (nms.getMinorVersion() >= 19) {
-            entityIds.put(EntityType.ARMOR_STAND, 2);
-        } else if (nms.getMinorVersion() >= 13) {
-            entityIds.put(EntityType.ARMOR_STAND, 1);
-        } else {
-            entityIds.put(EntityType.WITHER, 64);
-            if (nms.getMinorVersion() >= 8) {
-                entityIds.put(EntityType.ARMOR_STAND, 30);
-            }
-        }
-        
-        if (nms.getMinorVersion() >= 17) {
-            CONSTRUCTOR = CLASS.getConstructor(nms.is1_19_3Plus() ? nms.Entity : nms.EntityLiving);
-        } else {
-            CONSTRUCTOR = CLASS.getConstructor();
-        }
-        ENTITY_ID = ReflectionUtils.getFields(CLASS, int.class).get(0);
-        YAW = ReflectionUtils.getFields(CLASS, byte.class).get(0);
-        PITCH = ReflectionUtils.getFields(CLASS, byte.class).get(1);
-        if (nms.getMinorVersion() >= 9) {
-            UUID = ReflectionUtils.getOnlyField(CLASS, UUID.class);
-            if (nms.getMinorVersion() >= 19) {
-                X = ReflectionUtils.getFields(CLASS, double.class).get(2);
-                Y = ReflectionUtils.getFields(CLASS, double.class).get(3);
-                Z = ReflectionUtils.getFields(CLASS, double.class).get(4);
-            } else {
-                X = ReflectionUtils.getFields(CLASS, double.class).get(0);
-                Y = ReflectionUtils.getFields(CLASS, double.class).get(1);
-                Z = ReflectionUtils.getFields(CLASS, double.class).get(2);
-            }
-        } else {
-            X = ReflectionUtils.getFields(CLASS, int.class).get(2);
-            Y = ReflectionUtils.getFields(CLASS, int.class).get(3);
-            Z = ReflectionUtils.getFields(CLASS, int.class).get(4);
-        }
-        if (nms.getMinorVersion() < 19) {
-            ENTITY_TYPE = ReflectionUtils.getFields(CLASS, int.class).get(1);
-        }
-        if (nms.getMinorVersion() <= 14) {
-            DATA_WATCHER = ReflectionUtils.getOnlyField(CLASS, DataWatcher.CLASS);
-        }
-    }
-
-    /**
-     * Converts this class into NMS packet
-     *
-     * @return  NMS packet
-     */
-    @SneakyThrows
-    public static Object build(int entityId, UUID id, Object entityType, Location location, EntityData data) {
-        NMSStorage nms = NMSStorage.getInstance();
-        Object nmsPacket;
-        if (nms.getMinorVersion() >= 17) {
-            nmsPacket = CONSTRUCTOR.newInstance(nms.dummyEntity);
-        } else {
-            nmsPacket = CONSTRUCTOR.newInstance();
-        }
-        ENTITY_ID.set(nmsPacket, entityId);
-        YAW.set(nmsPacket, (byte)(location.getYaw() * 256.0f / 360.0f));
-        PITCH.set(nmsPacket, (byte)(location.getPitch() * 256.0f / 360.0f));
-        if (nms.getMinorVersion() <= 14) {
-            DATA_WATCHER.set(nmsPacket, data.build());
-        }
-        if (nms.getMinorVersion() >= 9) {
-            UUID.set(nmsPacket, id);
-            X.set(nmsPacket, location.getX());
-            Y.set(nmsPacket, location.getY());
-            Z.set(nmsPacket, location.getZ());
-        } else {
-            X.set(nmsPacket, floor(location.getX()*32));
-            Y.set(nmsPacket, floor(location.getY()*32));
-            Z.set(nmsPacket, floor(location.getZ()*32));
-        }
-        if (nms.getMinorVersion() >= 19) {
-            ENTITY_TYPE.set(nmsPacket, EntityTypes_ARMOR_STAND); // :(
-        } else {
-            ENTITY_TYPE.set(nmsPacket, entityIds.get((EntityType) entityType));
-        }
-        return nmsPacket;
-    }
-
-    private static int floor(double paramDouble) {
-        int i = (int)paramDouble;
-        return paramDouble < i ? i - 1 : i;
-    }
-}
@@ -0,0 +1,502 @@
+package me.neznamy.tab.platforms.bukkit.platform;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.SneakyThrows;
+import me.clip.placeholderapi.PlaceholderAPI;
+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.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.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.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.Plugin;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
+import java.util.*;
+import java.util.function.BiConsumer;
+
+/**
+ * Implementation of Platform interface for Bukkit platform
+ */
+@Getter
+public class BukkitPlatform implements BackendPlatform {
+
+    /** Plugin instance for registering tasks and events */
+    @NotNull
+    private final JavaPlugin plugin;
+
+    /** Server version */
+    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");
+
+    /** 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");
+
+    /** 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;
+        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 {
+            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")) {
+            new BukkitPremiumVanishHook().register();
+        }
+        commandMap = (SimpleCommandMap) Bukkit.getServer().getClass().getMethod("getCommandMap").invoke(Bukkit.getServer());
+        knownCommands = (Map<String, Command>) ReflectionUtils.getField(SimpleCommandMap.class, "knownCommands").get(commandMap);
+    }
+
+    /**
+     * Finds implementation provider for current server software and version.
+     *
+     * @return  Implementation provider for current server
+     * @throws  IllegalStateException
+     *          If no implementation was found
+     */
+    @NotNull
+    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 : getOnlinePlayers()) {
+            TAB.getInstance().addPlayer(new BukkitTabPlayer(this, p));
+        }
+    }
+
+    @Override
+    @Nullable
+    public PipelineInjector createPipelineInjector() {
+        return ReflectionUtils.classExists("io.netty.channel.Channel") ? new BukkitPipelineInjector() : null;
+    }
+
+    @Override
+    @NotNull
+    public TabExpansion createTabExpansion() {
+        if (placeholderAPI) {
+            BukkitTabExpansion expansion = new BukkitTabExpansion();
+            expansion.register();
+            return expansion;
+        }
+        return new EmptyTabExpansion();
+    }
+
+    @Override
+    @Nullable
+    public TabFeature getPerWorldPlayerList(@NotNull PerWorldPlayerListConfiguration configuration) {
+        return new PerWorldPlayerList(plugin, this, configuration);
+    }
+
+    @Override
+    public void registerUnknownPlaceholder(@NotNull String identifier) {
+        if (!placeholderAPI) {
+            registerDummyPlaceholder(identifier);
+            return;
+        }
+        if (identifier.startsWith("%rel_")) {
+            //relational placeholder
+            TAB.getInstance().getPlaceholderManager().registerRelationalPlaceholder(identifier, (viewer, target) ->
+                    PlaceholderAPI.setRelationalPlaceholders((Player) viewer.getPlayer(), (Player) target.getPlayer(), identifier));
+        } else if (identifier.startsWith("%sync:")) {
+            registerSyncPlaceholder(identifier);
+        } else if (identifier.startsWith("%server_")) {
+            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,
+                    p -> PlaceholderAPI.setPlaceholders((Player) p.getPlayer(), identifier));
+        }
+    }
+
+    /**
+     * Registers a sync placeholder with given identifier and automatically decided refresh.
+     *
+     * @param   identifier
+     *          Placeholder identifier
+     */
+    public void registerSyncPlaceholder(@NotNull String identifier) {
+        String syncedPlaceholder = "%" + identifier.substring(6);
+        PlayerPlaceholderImpl[] ppl = new PlayerPlaceholderImpl[1];
+        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);
+                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;
+        });
+    }
+
+    @Override
+    public void logInfo(@NotNull TabComponent message) {
+        Bukkit.getConsoleSender().sendMessage("[TAB] " + toBukkitFormat(message));
+    }
+
+    @Override
+    public void logWarn(@NotNull TabComponent message) {
+        Bukkit.getConsoleSender().sendMessage("§c[TAB] [WARN] " + toBukkitFormat(message));
+    }
+
+    @Override
+    public void registerListener() {
+        Bukkit.getPluginManager().registerEvents(new BukkitEventListener(this), plugin);
+    }
+
+    @Override
+    public void registerCommand() {
+        PluginCommand command = Bukkit.getPluginCommand(getCommand());
+        if (command != null) {
+            BukkitTabCommand cmd = new BukkitTabCommand();
+            command.setExecutor(cmd);
+            command.setTabCompleter(cmd);
+        } else {
+            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.PERMISSION_SYSTEM,
+                () -> TAB.getInstance().getGroupManager().getPermissionPlugin()));
+        metrics.addCustomChart(new SimplePie("tab_6_0_0_servers", serverVersion::getFriendlyName));
+    }
+
+    @Override
+    @NotNull
+    public File getDataFolder() {
+        return plugin.getDataFolder();
+    }
+
+    @Override
+    @NotNull
+    public Object convertComponent(@NotNull TabComponent component) {
+        return implementationProvider.getComponentConverter().convert(component);
+    }
+
+    @Override
+    @NotNull
+    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
+    public double getTPS() {
+        if (recentTps != null) {
+            return recentTps[0];
+        } else if (paperTps) {
+            return Bukkit.getTPS()[0];
+        } else {
+            return -1;
+        }
+    }
+
+    @Override
+    public double getMSPT() {
+        if (paperMspt) return Bukkit.getAverageTickTime();
+        return -1;
+    }
+
+    /**
+     * Runs task in the main thread for given entity.
+     *
+     * @param   entity
+     *          Entity's main thread
+     * @param   task
+     *          Task to run
+     */
+    public void runSync(@NotNull Entity entity, @NotNull Runnable task) {
+        Bukkit.getScheduler().runTask(plugin, task);
+    }
+
+    /**
+     * 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
+     * @return  Converted string using bukkit color format
+     */
+    @NotNull
+    public String toBukkitFormat(@NotNull TabComponent component) {
+        StringBuilder sb = new StringBuilder();
+        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('§').append(component.getModifier().getColor().getLegacyColor().getCharacter());
+            }
+        }
+        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;
+    }
+}