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
816 changed files with 53477 additions and 91268 deletions
@@ -0,0 +1,8 @@
+* text=auto
+
+*.sh text eol=lf
+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,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,44 +0,0 @@
-name: Build
-on:
-  push:
-    branches:
-      - master
-  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 11
-        uses: actions/setup-java@v3.9.0 #https://github.com/actions/setup-java/releases
-        with:
-          distribution: 'temurin'
-          java-version: 11
-      - 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
@@ -33,7 +33,6 @@ hs_err_pid*
 .idea/

 # other
-.gitattributes
 *.iml
 run/

@@ -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,34 +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.  
+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 8 and up.  
-To compile the plugin, run `./gradlew build` from the terminal.  
-Once the plugin compiles, grab the jar from `/jar/build/libs/` folder.
+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.

-# 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)  
-Support my work & receive customer support: [BuiltByBit](https://builtbybit.com/resources/14009/), [Polymart](https://polymart.org/resource/484)  
-Other links: [Discord support for customers](https://discord.gg/EaSvdk6), [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`.
@@ -0,0 +1,2 @@
+# Security Policy
+If you found a security issue, send me a private message anywhere.
@@ -1,26 +1,5 @@
-plugins {
-    id("net.kyori.blossom") version "1.2.0"
-}
-
 dependencies {
-    compileOnlyApi(libs.netty)
-    api(libs.jsonSimple) {
-        exclude("junit", "junit")
-    }
-    compileOnlyApi(libs.snakeyaml)
-    api(libs.yamlAssist)
-    compileOnlyApi(libs.adventureMiniMessage)
-    compileOnlyApi(libs.adventureApi)
-    compileOnlyApi(libs.adventureLegacy)
-}
-
-blossom {
-    replaceToken("@name@", rootProject.name)
-    replaceToken("@id@", rootProject.ext.get("id")!!.toString())
-    replaceToken("@version@", project.version)
-    replaceToken("@description@", project.description)
-    replaceToken("@website@", rootProject.ext.get("website")!!.toString())
-    replaceTokenIn("src/main/java/me/neznamy/tab/api/TabConstants.java")
+    compileOnlyApi("org.jetbrains:annotations:26.0.2")
 }

 tasks.javadoc {
@@ -1,108 +0,0 @@
-package me.neznamy.tab.api;
-
-/**
- * Interface representing an armor stand attached to player
- * for displaying text in game.
- */
-public interface ArmorStand {
-
-    /**
-     * Returns true if offset is static, false if not
-     *
-     * @return  true if static, false if dynamic
-     */
-    boolean isStaticOffset();
-    
-    /**
-     * Changes offset of the armor stand
-     *
-     * @param   offset
-     *          new offset
-     */
-    void setOffset(double offset);
-
-    /**
-     * Returns offset of the armor stand
-     *
-     * @return  offset from base
-     */
-    double getOffset();
-    
-    /**
-     * Returns property for armor stand's name
-     *
-     * @return  property for armor stand's name
-     */
-    Property getProperty();
-    
-    /**
-     * Teleports armor stand to owner's current location for everyone in range
-     */
-    void teleport();
-    
-    /**
-     * Teleports armor stand to owner's current location for specified player
-     *
-     * @param   viewer
-     *          player to send packet to
-     */
-    void teleport(TabPlayer viewer);
-    
-    /**
-     * Changes sneaking flag and sends packets to everyone in range
-     *
-     * @param   sneaking
-     *          new sneaking status
-     */
-    void sneak(boolean sneaking);
-    
-    /**
-     * DeSpawns armor stand for everyone
-     */
-    void destroy();
-    
-    /**
-     * DeSpawns armor stand for specified player
-     *
-     * @param   viewer
-     *          player to send packet to
-     */
-    void destroy(TabPlayer viewer);
-    
-    /**
-     * Updates armor stand's name if needed
-     */
-    void refresh();
-    
-    /**
-     * Updates visibility if needed
-     *
-     * @param   force
-     *          if refresh should be forced
-     */
-    void updateVisibility(boolean force);
-    
-    /**
-     * Returns entity ID of this armor stand
-     *
-     * @return  entity ID of this armor stand
-     */
-    int getEntityId();
-    
-    /**
-     * Spawns armor stand for specified player
-     *
-     * @param   viewer
-     *          player to spawn for
-     */
-    void spawn(TabPlayer viewer);
-
-    /**
-     * Sends respawn packets to specified player to make position
-     * change instant instead of teleport animation
-     *
-     * @param   viewer
-     *          Player to send armor stand respawn packets to
-     */
-    void respawn(TabPlayer viewer);
-}
@@ -1,20 +0,0 @@
-package me.neznamy.tab.api;
-
-/**
- * A helper class for easy management of armor stands of a player
- */
-public interface ArmorStandManager {
-
-    /**
-     * Sends destroy packet of all armor stands to everyone and clears nearby players list
-     */
-    void destroy();
-
-    /**
-     * Refreshes text of all armor stands for all nearby players
-     *
-     * @param   force
-     *          If refresh should be force despite no update seemingly being needed
-     */
-    void refresh(boolean force);
-}
@@ -1,116 +0,0 @@
-package me.neznamy.tab.api;
-
-import java.util.UUID;
-
-/**
- * Feature manager allows registration and work with features.
- */
-public interface FeatureManager {
-
-    /**
-     * Registers a feature, which will start receiving events
-     * 
-     * @param   name
-     *          name of feature
-     * @param   feature
-     *          the handler
-     */
-    void registerFeature(String name, TabFeature feature);
-    
-    /**
-     * Unregisters feature making it no longer receive events. This does not run unload method nor cancel
-     * tasks created by the feature
-     *
-     * @param   name
-     *          feature name defined in registerFeature
-     */
-    void unregisterFeature(String name);
-    
-    /**
-     * Returns whether a feature with said name is registered or not
-     * 
-     * @param   name
-     *          name of feature defined in registerFeature method
-     * @return  true if feature exists, false if not
-     */
-    boolean isFeatureEnabled(String name);
-
-    /**
-     * Returns feature handler by its name
-     * 
-     * @param   name
-     *          name of feature defined in registerFeature method
-     * @return  the feature or null if feature does not exist
-     */
-    TabFeature getFeature(String name);
-
-    /**
-     * Calls onQuit(TabPlayer) to all enabled features
-     *
-     * @param   disconnectedPlayer
-     *          player who disconnected
-     */
-    void onQuit(TabPlayer disconnectedPlayer);
-
-    /**
-     * Calls onJoin(TabPlayer) to all enabled features
-     *
-     * @param   connectedPlayer
-     *          player who connected
-     */
-    void onJoin(TabPlayer connectedPlayer);
-
-    /**
-     * Calls onServerChange(TabPlayer, String, String) to all enabled features
-     *
-     * @param   playerUUID
-     *          player who switched server
-     * @param   to
-     *          name of the new server
-     */
-    void onServerChange(UUID playerUUID, String to);
-
-    /**
-     * Calls onWorldChange(TabPlayer, String, String) to all enabled features
-     *
-     * @param   playerUUID
-     *          player who switched world
-     * @param   to
-     *          name of the new world
-     */
-    void onWorldChange(UUID playerUUID, String to);
-
-    /**
-     * Calls onCommand(TabPlayer, String) to all enabled features
-     *
-     * @param   sender
-     *          command sender
-     * @param   command
-     *          command line including /
-     * @return  {@code true} if some feature marked the command for cancel, {@code false} if not
-     */
-    boolean onCommand(TabPlayer sender, String command);
-
-    /**
-     * Internal function that marks objective packet deserialization
-     * when at least 1 feature uses it.
-     * <p>
-     * Internal use only.
-     */
-    void markObjective();
-
-    /**
-     * Internal function that marks display objective packet deserialization
-     * when at least 1 feature uses it.
-     * <p>
-     * Internal use only.
-     */
-    void markDisplayObjective();
-
-    /**
-     * Returns array of all currently enabled features
-     *
-     * @return  array of all currently enabled features
-     */
-    TabFeature[] getValues();
-}
@@ -1,68 +0,0 @@
-package me.neznamy.tab.api;
-
-/**
- * An interface representing a property assigned to a player,
- * which may contain placeholders and can be changed using the API.
- */
-public interface Property {
-
-    /**
-     * Returns original raw value ignoring API calls
-     *
-     * @return  original raw value
-     */
-    String getOriginalRawValue();
-
-    /**
-     * Temporarily overrides current raw value with an API call
-     *
-     * @param   temporaryValue
-     *          temporary value to be assigned
-     */
-    void setTemporaryValue(String temporaryValue);
-
-    /**
-     * Returns current temporary value
-     *
-     * @return  temporary value or null if not set
-     */
-    String getTemporaryValue();
-
-    /**
-     * Returns temporary value (via API) if present, raw value otherwise
-     *
-     * @return  current raw value
-     */
-    String getCurrentRawValue();
-
-    /**
-     * Returns last known value
-     *
-     * @return  last known value
-     */
-    String get();
-
-    /**
-     * Replaces all placeholders in current raw value, colorizes it, removes remove-strings and returns whether value changed or not
-     *
-     * @return  if updating changed value or not
-     */
-    boolean update();
-
-    /**
-     * Replaces all placeholders in current raw value, colorizes it, removes remove-strings and returns it.
-     * Equal to calling update() and then get().
-     *
-     * @return  updated value
-     */
-    String updateAndGet();
-
-    /**
-     * Returns value for defined viewer by applying relational placeholders to last known value
-     *
-     * @param   viewer
-     *          the viewer
-     * @return  format for the viewer
-     */
-    String getFormat(TabPlayer viewer);
-}
@@ -2,13 +2,19 @@ package me.neznamy.tab.api;

 import java.util.UUID;

+import lombok.NonNull;
+import lombok.Setter;
 import me.neznamy.tab.api.bossbar.BossBarManager;
-import me.neznamy.tab.api.config.ConfigurationFile;
 import me.neznamy.tab.api.event.EventBus;
 import me.neznamy.tab.api.placeholder.PlaceholderManager;
 import me.neznamy.tab.api.scoreboard.ScoreboardManager;
-import me.neznamy.tab.api.task.ThreadManager;
-import me.neznamy.tab.api.team.TeamManager;
+import me.neznamy.tab.api.tablist.SortingManager;
+import me.neznamy.tab.api.tablist.HeaderFooterManager;
+import me.neznamy.tab.api.tablist.TabListFormatManager;
+import me.neznamy.tab.api.nametag.NameTagManager;
+import me.neznamy.tab.api.tablist.layout.LayoutManager;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;

 /**
 * The primary API class to get instances of other API classes
@@ -16,14 +22,7 @@ import me.neznamy.tab.api.team.TeamManager;
 public abstract class TabAPI {

    /** Instance of the API */
-    private static TabAPI instance;
-
-    /**
-     * Constructs new instance and sets it as new API instance
-     */
-    public TabAPI() {
-        instance = this;
-    }
+    @Setter private static TabAPI instance;

    /**
     * Returns API instance. If instance was not set by the plugin, throws
@@ -35,10 +34,10 @@ public abstract class TabAPI {
     * @throws  IllegalStateException
     *          If instance is {@code null}
     */
-    public static TabAPI getInstance() {
+    public static @NotNull TabAPI getInstance() {
        if (instance == null) throw new IllegalStateException("The API instance is null. This can have 2 possible causes: \n" +
                "#1 - API was called before TAB was loaded. This means your plugin was loaded before TAB was. To make sure your " +
-                "plugin loads after TAB, add it as a depend or softdepend of your plugin.\n" +
+                "plugin loads after TAB, add it as a depend or soft depend of your plugin.\n" +
                "#2 - You shaded TAB's classes into your plugin, instead of only using them. This is not allowed. To verify this " +
                "is your case, unzip your plugin and check for TAB's classes. If they are there, you will need to fix your compiler " +
                "to not include them, such as scope provided for maven compilation.");
@@ -52,7 +51,7 @@ public abstract class TabAPI {
     *          Player UUID
     * @return  player object from given UUID
     */
-    public abstract TabPlayer getPlayer(UUID id);
+    public abstract @Nullable TabPlayer getPlayer(@NonNull UUID id);

    /**
     * Returns player object from given name
@@ -61,157 +60,76 @@ public abstract class TabAPI {
     *          Player name
     * @return  player object from given name
     */
-    public abstract TabPlayer getPlayer(String name);
+    public abstract @Nullable TabPlayer getPlayer(@NonNull String name);

    /**
     * Returns collection of all online players. Will return empty list if plugin is disabled (due to a broken configuration file for example).
     *
     * @return  collection of online players
     */
-    public abstract TabPlayer[] getOnlinePlayers();
+    public abstract @NotNull TabPlayer[] getOnlinePlayers();

    /**
     * Return BossBar manager instance if the feature is enabled. If not, returns {@code null}.
     *
     * @return  BossBar manager
     */
-    public abstract BossBarManager getBossBarManager();
+    public abstract @Nullable BossBarManager getBossBarManager();

    /**
     * Returns scoreboard manager instance if the feature is enabled. If not, returns {@code null}.
     *
     * @return  scoreboard manager
     */
-    public abstract ScoreboardManager getScoreboardManager();
+    public abstract @Nullable ScoreboardManager getScoreboardManager();

    /**
     * Returns team manager instance if the feature is enabled. If not, returns {@code null}.
     *
     * @return  team manager
     */
-    public abstract TeamManager getTeamManager();
+    public abstract @Nullable NameTagManager getNameTagManager();

    /**
     * Returns header/footer manager instance if the feature is enabled. If not, returns {@code null}.
     *
     * @return  Header/footer manager
     */
-    public abstract HeaderFooterManager getHeaderFooterManager();
+    public abstract @Nullable HeaderFooterManager getHeaderFooterManager();

    /**
     * Returns PlaceholderManager instance
     *
     * @return  PlaceholderManager instance
     */
-    public abstract PlaceholderManager getPlaceholderManager();
+    public abstract @NotNull PlaceholderManager getPlaceholderManager();

    /**
-     * Returns feature manager instance
+     * Returns TabList name format manager instance if the feature is enabled. If not, returns {@code null}.
     *
-     * @return  feature manager instance
+     * @return  TabList name format manager
     */
-    public abstract FeatureManager getFeatureManager();
+    public abstract @Nullable TabListFormatManager getTabListFormatManager();

    /**
-     * Returns Tablist name format manager instance if the feature is enabled. If not, returns {@code null}.
+     * Returns Layout manager instance if the feature is enabled. If not, returns {@code null}.
     *
-     * @return  Tablist name format manager
+     * @return  Layout manager
     */
-    public abstract TablistFormatManager getTablistFormatManager();
+    public abstract @Nullable LayoutManager getLayoutManager();
+
+    /**
+     * Returns Sorting manager instance if at least one feature capable of sorting players is enabled.
+     * If not, returns {@code null}.
+     *
+     * @return  Sorting manager
+     */
+    public abstract @Nullable SortingManager getSortingManager();

    /**
     * Gets the event bus for registering listeners for TAB events.
     *
     * @return  the event bus
     */
-    public abstract EventBus getEventBus();
-
-    /**
-     * Returns server version. On proxy installation returns PROXY.
-     *
-     * @return  server version
-     */
-    public abstract ProtocolVersion getServerVersion();
-
-    /**
-     * Prints message into console
-     *
-     * @param   message
-     *          message to print
-     * @param   translateColors
-     *          {@code true} if colors should be translated, {@code false} if not
-     */
-    public abstract void sendConsoleMessage(String message, boolean translateColors);
-
-    /**
-     * Returns TAB's Thread manager, which allows task submitting
-     *
-     * @return  ThreadManager instance
-     */
-    public abstract ThreadManager getThreadManager();
-
-    /**
-     * Returns TAB's cache file used to store player toggle data
-     *
-     * @return  TAB's player cache file
-     */
-    public abstract ConfigurationFile getPlayerCache();
-
-    /**
-     * Returns TAB's config.yml file
-     *
-     * @return  config.yml file
-     */
-    public abstract ConfigurationFile getConfig();
-
-    /**
-     * Returns TAB's group configuration
-     *
-     * @return  TAB's group configuration
-     */
-    public abstract PropertyConfiguration getGroups();
-
-    /**
-     * Returns TAB's user configuration
-     *
-     * @return  TAB's user configuration
-     */
-    public abstract PropertyConfiguration getUsers();
-
-    /**
-     * Sends a debug message into console if the option
-     * is enabled in config.
-     *
-     * @param   message
-     *          Message to send
-     */
-    public abstract void debug(String message);
-
-    /**
-     * Logs an error into errors.log file
-     *
-     * @param   message
-     *          Error message
-     * @param   t
-     *          Thrown error
-     */
-    public abstract void logError(String message, Throwable t);
-
-    /**
-     * Sets name of file with syntax error, which prevented
-     * the plugin from enabling. Internal use only.
-     *
-     * @param   file
-     *          Name of file with syntax error
-     */
-    public abstract void setBrokenFile(String file);
-
-    /**
-     * Returns {@code true} if the plugin is currently disabled due to an error,
-     * either a yaml syntax error or an internal startup error. Returns {@code false}
-     * if the plugin is properly running.
-     *
-     * @return  {@code true} if disabled, {@code false} if running correctly
-     */
-    public abstract boolean isPluginDisabled();
+    public abstract @Nullable EventBus getEventBus();
 }
@@ -1,370 +0,0 @@
-package me.neznamy.tab.api;
-
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-
-/**
- * A class containing various constants used everywhere in the plugin
- * to allow easier overview and modification to prevent inconsistencies.
- */
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public class TabConstants {
-
-    public static final String PLUGIN_NAME = "@name@";
-    public static final String PLUGIN_ID = "@id@";
-    public static final String PLUGIN_VERSION = "@version@";
-    public static final String PLUGIN_DESCRIPTION = "@description@";
-    public static final String PLUGIN_WEBSITE = "@website@";
-
-    public static final String NO_GROUP = "NONE";
-    public static final String DEFAULT_GROUP = "_DEFAULT_";
-    public static final String PLUGIN_MESSAGE_CHANNEL_NAME = "tab:bridge-2";
-    public static final String REDIS_CHANNEL_NAME = PLUGIN_NAME;
-    public static final String PIPELINE_HANDLER_NAME = PLUGIN_NAME;
-
-    /**
-     * Feature sub-category explaining why / when a certain feature
-     * needed CPU time to process tasks.
-     */
-    @NoArgsConstructor(access = AccessLevel.PRIVATE)
-    public static class CpuUsageCategory {
-
-        public static final String PLAYER_JOIN = "Player Join";
-        public static final String PLAYER_QUIT = "Player Quit";
-        public static final String WORLD_SWITCH = "World Switch";
-        public static final String SERVER_SWITCH = "Server Switch";
-        public static final String COMMAND_PREPROCESS = "Command Preprocess";
-        public static final String PLAYER_SNEAK = "Player Sneak";
-        public static final String PLAYER_RESPAWN = "Player Respawn";
-        public static final String PLUGIN_MESSAGE = "PluginMessageEvent";
-        public static final String REDIS_BUNGEE_MESSAGE = "PubSubMessageEvent";
-        public static final String VANISH_CHANGE = "Vanish status change";
-        public static final String ANTI_OVERRIDE = "Anti override";
-
-        public static final String BYTE_BUF = "ByteBuf";
-        public static final String PACKET_PLAYER_INFO = "PacketPlayOutPlayerInfo";
-        public static final String PACKET_DISPLAY_OBJECTIVE = "PacketPlayOutScoreboardDisplayObjective";
-        public static final String PACKET_OBJECTIVE = "PacketPlayOutScoreboardObjective";
-        public static final String PACKET_JOIN_GAME = "Login Packet";
-        public static final String PACKET_ENTITY_MOVE = "PacketPlayOutEntity";
-        public static final String PACKET_ENTITY_MOVE_PASSENGER = "PacketPlayOutEntity (passenger)";
-        public static final String PACKET_ENTITY_SPAWN = "PacketPlayOutNamedEntitySpawn";
-        public static final String PACKET_ENTITY_DESTROY = "PacketPlayOutEntityDestroy";
-        public static final String RAW_PACKET_IN = "Packet reading (in)";
-        public static final String RAW_PACKET_OUT = "Packet reading (out)";
-
-        public static final String PLACEHOLDER_REFRESHING = "Refreshing placeholders";
-        public static final String GROUP_REFRESHING = "Refreshing groups";
-
-        public static final String REFRESHING_NAME_TAG_VISIBILITY = "Refreshing NameTag visibility";
-        public static final String SCOREBOARD_PACKET_CHECK = "Checking for other plugins";
-        public static final String PROCESSING_PLAYER_MOVEMENT = "Processing player movement";
-        public static final String TELEPORTING_WITHER = "Teleporting wither";
-    }
-
-    /**
-     * Information why a specific feature sent a packet
-     * and what the packet sent is supposed to do.
-     */
-    @NoArgsConstructor(access = AccessLevel.PRIVATE)
-    public static class PacketCategory {
-
-        public static final String BOSSBAR_COLOR_STYLE = "BossBar (Color and style)";
-        public static final String BOSSBAR_PROGRESS = "BossBar (Progress)";
-        public static final String BOSSBAR_TEXT = "BossBar (Text)";
-        public static final String BOSSBAR_WITHER_TELEPORT = "BossBar (Teleporting Wither)";
-
-        public static final String GLOBAL_PLAYERLIST_LATENCY = "Global PlayerList (Updating latency)";
-        public static final String GLOBAL_PLAYERLIST_VANISH = "Global PlayerList (Vanishing)";
-
-        public static final String LAYOUT_FIXED_SLOTS = "Layout (Fixed slots)";
-        public static final String LAYOUT_PLAYER_SLOTS = "Layout (Player slots)";
-        public static final String LAYOUT_LATENCY = "Layout (Updating latency)";
-
-        public static final String NAMETAGS_TEAM_REGISTER = "NameTags (Team register)";
-        public static final String NAMETAGS_TEAM_UNREGISTER = "NameTags (Team unregister)";
-        public static final String NAMETAGS_TEAM_UPDATE = "NameTags (Team update)";
-
-        public static final String SORTING_CHANGING_TEAM_NAME = "Sorting (Changing team name)";
-
-        public static final String SCOREBOARD_TITLE = "Scoreboard (Title)";
-        public static final String SCOREBOARD_LINES = "Scoreboard (Lines)";
-
-        public static final String UNLIMITED_NAMETAGS_OFFSET_CHANGE = "Unlimited NameTags (Changing offset)";
-        public static final String UNLIMITED_NAMETAGS_SPAWN = "Unlimited NameTags (Spawning)";
-        public static final String UNLIMITED_NAMETAGS_DESPAWN = "Unlimited NameTags (Despawning)";
-        public static final String UNLIMITED_NAMETAGS_TELEPORT = "Unlimited NameTags (Teleporting)";
-        public static final String UNLIMITED_NAMETAGS_SNEAK = "Unlimited NameTags (Sneaking)";
-        public static final String UNLIMITED_NAMETAGS_METADATA = "Unlimited NameTags (Metadata)";
-    }
-
-    /**
-     * Permission nodes used by the plugin
-     */
-    @NoArgsConstructor(access = AccessLevel.PRIVATE)
-    public static class Permission {
-
-        public static final String COMMAND_ALL = "tab.admin";
-        public static final String COMMAND_RELOAD = "tab.reload";
-        public static final String COMMAND_BOSSBAR_ANNOUNCE = "tab.announce.bar";
-        public static final String COMMAND_BOSSBAR_TOGGLE = "tab.bossbar.toggle";
-        public static final String COMMAND_BOSSBAR_SEND = "tab.send.bar";
-        public static final String COMMAND_CPU = "tab.cpu";
-        public static final String COMMAND_DEBUG = "tab.debug";
-        public static final String COMMAND_GROUP_INFO = "tab.groupinfo";
-        public static final String COMMAND_GROUP_LIST = "tab.grouplist";
-        public static final String COMMAND_MYSQL_DOWNLOAD = "tab.mysql.download";
-        public static final String COMMAND_MYSQL_UPLOAD = "tab.mysql.upload";
-        public static final String COMMAND_NAMETAG_TOGGLE = "tab.nametag.toggle";
-
-        public static final String COMMAND_NAMETAG_TOGGLE_OTHER = "tab.nametag.toggle.other";
-        public static final String COMMAND_NAMETAG_PREVIEW = "tab.nametag.preview";
-
-        public static final String COMMAND_NAMETAG_PREVIEW_OTHER = "tab.nametag.preview.other";
-        public static final String COMMAND_PARSE = "tab.parse";
-        public static final String COMMAND_SCOREBOARD_ANNOUNCE = "tab.announce.scoreboard";
-        public static final String COMMAND_SCOREBOARD_TOGGLE = "tab.scoreboard.toggle";
-        public static final String COMMAND_SCOREBOARD_TOGGLE_OTHER = "tab.scoreboard.toggle.other";
-        public static final String COMMAND_SCOREBOARD_SHOW = "tab.scoreboard.show";
-        public static final String COMMAND_SCOREBOARD_SHOW_OTHER = "tab.scoreboard.show.other";
-        public static final String COMMAND_SETCOLLISION = "tab.setcollision";
-        public static final String COMMAND_AUTOCOMPLETE = "tab.tabcomplete";
-        public static final String COMMAND_DATA_REMOVE = "tab.remove";
-        public static final String COMMAND_PROPERTY_CHANGE_PREFIX = "tab.change.";
-        public static final String COMMAND_WIDTH = "tab.width";
-
-        public static final String STAFF = "tab.staff";
-
-        public static final String PER_WORLD_PLAYERLIST_BYPASS = "tab.bypass";
-        public static final String SEE_VANISHED = "tab.seevanished";
-        public static final String SPECTATOR_BYPASS = "tab.spectatorbypass";
-
-        public static final String TEST_PERMISSION = "tab.testpermission";
-
-        public static final String GROUP_PREFIX = "tab.group.";
-    }
-
-    /**
-     * Internal property names used to store text
-     * under a specific key
-     */
-    @NoArgsConstructor(access = AccessLevel.PRIVATE)
-    public static class Property {
-
-        public static final String HEADER = "header";
-        public static final String FOOTER = "footer";
-
-        public static final String TABPREFIX = "tabprefix";
-        public static final String CUSTOMTABNAME = "customtabname";
-        public static final String TABSUFFIX = "tabsuffix";
-
-        public static final String TAGPREFIX = "tagprefix";
-        public static final String CUSTOMTAGNAME = "customtagname";
-        public static final String TAGSUFFIX = "tagsuffix";
-
-        public static final String ABOVENAME = "abovename";
-        public static final String NAMETAG = "nametag";
-        public static final String BELOWNAME = "belowname";
-
-        public static final String SCOREBOARD_TITLE = "scoreboard-title";
-
-        public static final String BELOWNAME_NUMBER = "belowname-number";
-        public static final String BELOWNAME_TEXT = "belowname-text";
-
-        public static final String YELLOW_NUMBER = "yellow-number";
-
-        public static String bossbarTitle(String name) {
-            return "bossbar-title-" + name;
-        }
-
-        public static String bossbarProgress(String name) {
-            return "bossbar-progress-" + name;
-        }
-
-        public static String bossbarColor(String name) {
-            return "bossbar-color-" + name;
-        }
-
-        public static String bossbarStyle(String name) {
-            return "bossbar-style-" + name;
-        }
-
-        public static String scoreboardPrefix(String scoreboard, int lineNumber) {
-            return scoreboard + "-" + lineNumber + "-prefix";
-        }
-
-        public static String scoreboardName(String scoreboard, int lineNumber) {
-            return scoreboard + "-" + lineNumber + "-name";
-        }
-
-        public static String scoreboardSuffix(String scoreboard, int lineNumber) {
-            return scoreboard + "-" + lineNumber + "-suffix";
-        }
-    }
-
-    /**
-     * Feature names used to register features under in the
-     * feature manager which they can be retrieved by.
-     */
-    @NoArgsConstructor(access = AccessLevel.PRIVATE)
-    public static class Feature {
-
-        //universal features
-        public static final String HEADER_FOOTER = "HeaderFooter";
-        public static final String GHOST_PLAYER_FIX = "GhostPlayerFix";
-        public static final String PLAYER_LIST = "PlayerList";
-        public static final String SPECTATOR_FIX = "SpectatorFix";
-        public static final String YELLOW_NUMBER = "YellowNumber";
-        public static final String BELOW_NAME = "BelowName";
-        public static final String BELOW_NAME_TEXT = "BelowNameText";
-        public static final String SCOREBOARD = "ScoreBoard";
-        public static final String PING_SPOOF = "PingSpoof";
-        public static final String SORTING = "sorting";
-        public static final String LAYOUT = "layout";
-        public static final String LAYOUT_LATENCY = "layout-latency";
-        public static final String NICK_COMPATIBILITY = "nick";
-        public static final String PIPELINE_INJECTION = "injection";
-        public static final String BOSS_BAR = "BossBar";
-        public static final String NAME_TAGS = "NameTag16";
-        public static final String NAME_TAGS_COLLISION = "NameTagCollision";
-        public static final String NAME_TAGS_VISIBILITY = "NameTagVisibility";
-        public static final String GROUP_MANAGER = "GroupManager";
-        public static final String PLACEHOLDER_MANAGER = "PlaceholderManager";
-        public static final String PET_FIX = "PetFix";
-        public static final String UNLIMITED_NAME_TAGS = "NameTagX";
-        public static final String UNLIMITED_NAME_TAGS_PACKET_LISTENER = "nametagx-packet";
-        public static final String UNLIMITED_NAME_TAGS_VEHICLE_REFRESHER = "nametagx-vehicle";
-        public static final String UNLIMITED_NAME_TAGS_GAMEMODE_LISTENER = "nametagx-gamemode";
-
-        //Bukkit only
-        public static final String PER_WORLD_PLAYER_LIST = "PerWorldPlayerList";
-
-        //BungeeCord only
-        public static final String REDIS_BUNGEE = "RedisBungee";
-        public static final String GLOBAL_PLAYER_LIST = "GlobalPlayerList";
-        public static final String GLOBAL_PLAYER_LIST_LATENCY = "GlobalPlayerList-Latency";
-
-        //additional info displayed in cpu command
-        public static final String PACKET_SERIALIZING = "Packet serializing";
-        public static final String PACKET_DESERIALIZING = "Packet deserializing";
-
-        public static String scoreboardLine(String line) {
-            return "scoreboard-" + line;
-        }
-
-        public static String scoreboardLine(String scoreboard, int index) {
-            return "scoreboard-score-" + scoreboard + "-" + index;
-        }
-
-        public static String layout(String name) {
-            return "layout-" + name;
-        }
-
-        public static String layoutSlot(String layout, int slot) {
-            return "layout-" + layout + "-slot-" + slot;
-        }
-
-        public static String bossBarTitle(String name) {
-            return "BossBar-title-" + name;
-        }
-
-        public static String bossBarProgress(String name) {
-            return "BossBar-progress-" + name;
-        }
-
-        public static String bossBarColorStyle(String name) {
-            return "BossBar-color-style-" + name;
-        }
-    }
-
-    /**
-     * All internal placeholders offered by the plugin
-     */
-    @NoArgsConstructor(access = AccessLevel.PRIVATE)
-    public static class Placeholder {
-
-        // Universal
-        public static final String DISPLAY_NAME = "%displayname%";
-        public static final String GROUP = "%group%";
-        public static final String VANISHED = "%vanished%";
-        public static final String WORLD = "%world%";
-        public static final String WORLD_ONLINE = "%worldonline%";
-        public static final String SERVER = "%server%";
-        public static final String SERVER_ONLINE = "%serveronline%";
-        public static final String PLAYER = "%player%";
-        public static final String TIME = "%time%";
-        public static final String DATE = "%date%";
-        public static final String PING = "%ping%";
-        public static final String PLAYER_VERSION = "%player-version%";
-        public static final String PLAYER_VERSION_ID = "%player-version-id%";
-        public static final String MEMORY_USED = "%memory-used%";
-        public static final String MEMORY_MAX = "%memory-max%";
-        public static final String MEMORY_USED_GB = "%memory-used-gb%";
-        public static final String MEMORY_MAX_GB = "%memory-max-gb%";
-        public static final String ONLINE = "%online%";
-        public static final String STAFF_ONLINE = "%staffonline%";
-        public static final String NON_STAFF_ONLINE = "%nonstaffonline%";
-        public static final String LUCKPERMS_PREFIX = "%luckperms-prefix%";
-        public static final String LUCKPERMS_SUFFIX = "%luckperms-suffix%";
-        public static final String COUNTDOWN = "%countdown%";
-
-        // Placeholders for internal use
-        public static final String COLLISION = "%collision%";
-        public static final String INVISIBLE = "%invisible%";
-        public static final String VEHICLE = "%vehicle%";
-
-        // Bukkit only
-        public static final String TPS = "%tps%";
-        public static final String MSPT = "%mspt%";
-        public static final String AFK = "%afk%";
-        public static final String ESSENTIALS_NICK = "%essentialsnick%";
-        public static final String VAULT_PREFIX = "%vault-prefix%";
-        public static final String VAULT_SUFFIX = "%vault-suffix%";
-        public static final String HEALTH = "%health%";
-
-        public static final int MINIMUM_REFRESH_INTERVAL = 50;
-
-        public static String condition(String name) {
-            return "%condition:" + name + "%";
-        }
-
-        public static String animation(String name) {
-            return "%animation:" + name + "%";
-        }
-
-        public static String globalPlayerListGroup(String group) {
-            return "%playerlist-group_" + group + "%";
-        }
-    }
-
-    /**
-     * All plugins TAB hooks into
-     */
-    @NoArgsConstructor(access = AccessLevel.PRIVATE)
-    public static class Plugin {
-
-        public static final String LUCKPERMS = "LuckPerms";
-        public static final String VAULT = "Vault";
-        public static final String PLACEHOLDER_API = "PlaceholderAPI";
-        public static final String LIBS_DISGUISES = "LibsDisguises";
-        public static final String VIAVERSION = "ViaVersion";
-        public static final String PROTOCOL_SUPPORT = "ProtocolSupport";
-        public static final String ESSENTIALS = "Essentials";
-        public static final String REDIS_BUNGEE = "RedisBungee";
-        public static final String PREMIUM_VANISH = "PremiumVanish";
-    }
-
-    /**
-     * TAB's custom metrics charts
-     */
-    @NoArgsConstructor(access = AccessLevel.PRIVATE)
-    public static class MetricsChart {
-
-        public static final String PERMISSION_SYSTEM = "permission_system";
-        public static final String GLOBAL_PLAYER_LIST_ENABLED = "global_playerlist_enabled";
-        public static final String PLACEHOLDER_API = "placeholderapi";
-        public static final String SERVER_VERSION = "server_version";
-        public static final String UNLIMITED_NAME_TAG_MODE_ENABLED = "unlimited_nametag_mode_enabled";
-
-    }
-}
@@ -1,391 +0,0 @@
-package me.neznamy.tab.api;
-
-import java.util.*;
-
-import lombok.Getter;
-import me.neznamy.tab.api.protocol.PacketPlayOutPlayerInfo;
-import me.neznamy.tab.api.protocol.PacketPlayOutScoreboardDisplayObjective;
-import me.neznamy.tab.api.protocol.PacketPlayOutScoreboardObjective;
-
-/**
- * Abstract class representing a core feature of the plugin.
- * <p>
- * It receives all kinds of events and can react to them.
- */
-public abstract class TabFeature {
-
-    /** Feature's name displayed in /tab cpu */
-    @Getter private final String featureName;
-
-    /** Feature's function name displayed in place of refreshing in /tab cpu */
-    @Getter private final String refreshDisplayName;
-
-    /** Servers where the feature is disabled (or enabled if using whitelist mode) */
-    protected String[] disabledServers = new String[0];
-
-    /** Flag tracking whether disabled server list is a whitelist or blacklist */
-    private boolean serverWhitelistMode = false;
-
-    /** Worlds where the feature is disabled (or enabled if using whitelist mode) */
-    protected String[] disabledWorlds = new String[0];
-
-    /** Flag tracking whether disabled world list is a whitelist or blacklist */
-    private boolean worldWhitelistMode = false;
-
-    /** Players located in currently disabled worlds / servers */
-    private final Set<TabPlayer> disabledPlayers = Collections.newSetFromMap(new WeakHashMap<>());
-
-    /**
-     * List of methods overridden (implemented) by each feature.
-     * If a method is not overridden, it is not called at all.
-     * This avoids a massive spam for every single method
-     * in every single feature in /tab cpu output
-     */
-    private final List<String> methodOverrides = new ArrayList<>();
-
-    /**
-     * Constructs new instance with given parameters and loads method overrides
-     *
-     * @param   featureName
-     *          Feature's name in /tab cpu
-     * @param   refreshDisplayName
-     *          "refreshing" cpu display type name of the feature
-     */
-    protected TabFeature(String featureName, String refreshDisplayName) {
-        this.featureName = featureName;
-        this.refreshDisplayName = refreshDisplayName;
-        try {
-            if (getClass().getMethod("onCommand", TabPlayer.class, String.class).getDeclaringClass() != TabFeature.class)
-                methodOverrides.add("onCommand");
-            if (getClass().getMethod("onJoin", TabPlayer.class).getDeclaringClass() != TabFeature.class)
-                methodOverrides.add("onJoin");
-            if (getClass().getMethod("onQuit", TabPlayer.class).getDeclaringClass() != TabFeature.class)
-                methodOverrides.add("onQuit");
-            if (getClass().getMethod("onWorldChange", TabPlayer.class, String.class, String.class).getDeclaringClass() != TabFeature.class)
-                methodOverrides.add("onWorldChange");
-            if (getClass().getMethod("onServerChange", TabPlayer.class, String.class, String.class).getDeclaringClass() != TabFeature.class)
-                methodOverrides.add("onServerChange");
-            if (getClass().getMethod("onDisplayObjective", TabPlayer.class, PacketPlayOutScoreboardDisplayObjective.class).getDeclaringClass() != TabFeature.class) {
-                methodOverrides.add("onDisplayObjective");
-                TabAPI.getInstance().getFeatureManager().markDisplayObjective();
-            }
-            if (getClass().getMethod("onLoginPacket", TabPlayer.class).getDeclaringClass() != TabFeature.class)
-                methodOverrides.add("onLoginPacket");
-            if (getClass().getMethod("onObjective", TabPlayer.class, PacketPlayOutScoreboardObjective.class).getDeclaringClass() != TabFeature.class) {
-                methodOverrides.add("onObjective");
-                TabAPI.getInstance().getFeatureManager().markObjective();
-            }
-            if (getClass().getMethod("onPlayerInfo", TabPlayer.class, PacketPlayOutPlayerInfo.class).getDeclaringClass() != TabFeature.class)
-                methodOverrides.add("onPlayerInfo");
-            if (getClass().getMethod("onPacketReceive", TabPlayer.class, Object.class).getDeclaringClass() != TabFeature.class)
-                methodOverrides.add("onPacketReceive");
-            if (getClass().getMethod("onPacketSend", TabPlayer.class, Object.class).getDeclaringClass() != TabFeature.class)
-                methodOverrides.add("onPacketSend");
-            if (getClass().getMethod("refresh", TabPlayer.class, boolean.class).getDeclaringClass() != TabFeature.class)
-                methodOverrides.add("refresh");
-            if (getClass().getMethod("onVanishStatusChange", TabPlayer.class).getDeclaringClass() != TabFeature.class)
-                methodOverrides.add("onVanishStatusChange");
-        } catch (NoSuchMethodException e) {
-            //this will never happen
-        }
-    }
-
-    /**
-     * Constructs new instance with given parameters and loads method overrides.
-     * Also loads lists of disabled worlds and servers of this feature with config
-     * section path specified with {@code configSection} parameter.
-     *
-     * @param   featureName
-     *          Feature's name in /tab cpu
-     * @param   refreshDisplayName
-     *          "refreshing" cpu display type name of the feature
-     * @param   configSection
-     *          Configuration section of the feature to load disabled
-     *          servers / worlds from
-     */
-    protected TabFeature(String featureName, String refreshDisplayName, String configSection) {
-        this(featureName, refreshDisplayName);
-        List<String> disabledServers = TabAPI.getInstance().getConfig().getStringList(configSection + ".disable-in-servers");
-        List<String> disabledWorlds = TabAPI.getInstance().getConfig().getStringList(configSection + ".disable-in-worlds");
-        if (disabledServers != null) {
-            this.disabledServers = disabledServers.toArray(new String[0]);
-            serverWhitelistMode = disabledServers.contains("WHITELIST");
-        }
-        if (disabledWorlds != null) {
-            this.disabledWorlds = disabledWorlds.toArray(new String[0]);
-            worldWhitelistMode = disabledWorlds.contains("WHITELIST");
-        }
-    }
-
-    /**
-     * Loads all online players and sends packets
-     */
-    public void load() {
-        //empty by default
-    }
-
-    /**
-     * Unloads all players and sends clear packets
-     */
-    public void unload() {
-        //empty by default
-    }
-
-    /**
-     * Processes command from player. This is typically a toggle command.
-     *
-     * @param   sender
-     *          command sender
-     * @param   message
-     *          command line
-     * @return  {@code true} if event should be cancelled, {@code true} if not
-     */
-    public boolean onCommand(TabPlayer sender, String message) {
-        return false;
-    }
-
-    /**
-     * Processes join event
-     *
-     * @param   connectedPlayer
-     *          player who connected
-     */
-    public void onJoin(TabPlayer connectedPlayer) {
-        //empty by default
-    }
-
-    /**
-     * Processes quit event
-     *
-     * @param   disconnectedPlayer
-     *          player who disconnected
-     */
-    public void onQuit(TabPlayer disconnectedPlayer) {
-        //empty by default
-    }
-
-    /**
-     * Processes world switch
-     *
-     * @param   changed
-     *          player who switched world
-     * @param   from
-     *          world player changed from
-     * @param   to
-     *          world player changed to
-     */
-    public void onWorldChange(TabPlayer changed, String from, String to) {
-        //empty by default
-    }
-
-    /**
-     * Processes server switch
-     *
-     * @param   changed
-     *          player who switched server
-     * @param   from
-     *          server player changed from
-     * @param   to
-     *          server player changed to
-     */
-    public void onServerChange(TabPlayer changed, String from, String to) {
-        //empty by default
-    }
-
-    /**
-     * Processes the packet send and returns true if packet should be cancelled
-     *
-     * @param   receiver
-     *          player receiving packet
-     * @param   packet
-     *          received packet
-     */
-    public void onDisplayObjective(TabPlayer receiver, PacketPlayOutScoreboardDisplayObjective packet) {
-        //empty by default
-    }
-
-    /**
-     * Processes login packet, only available on BungeeCord
-     *
-     * @param   packetReceiver
-     *          player receiving client reset packet
-     */
-    public void onLoginPacket(TabPlayer packetReceiver) {
-        //empty by default
-    }
-
-    /**
-     * Processes the packet send
-     *
-     * @param   receiver
-     *          player receiving packet
-     * @param   packet
-     *          received packet
-     */
-    public void onObjective(TabPlayer receiver, PacketPlayOutScoreboardObjective packet) {
-        //empty by default
-    }
-
-    /**
-     * Processes the packet send and possibly modifies it
-     *
-     * @param   receiver
-     *          player receiving packet
-     * @param   info
-     *          received packet
-     */
-    public void onPlayerInfo(TabPlayer receiver, PacketPlayOutPlayerInfo info) {
-        //empty by default
-    }
-
-    /**
-     * Processes raw packet sent by client
-     *
-     * @param   sender
-     *          packet sender
-     * @param   packet
-     *          packet received
-     * @return  true if false should be cancelled, false if not
-     * @throws  ReflectiveOperationException
-     *          if thrown by reflective operation
-     */
-    public boolean onPacketReceive(TabPlayer sender, Object packet) throws ReflectiveOperationException {
-        return false;
-    }
-
-    /**
-     * Processes raw packet sent to client
-     *
-     * @param   receiver
-     *          packet receiver
-     * @param   packet
-     *          the packet
-     * @throws  ReflectiveOperationException
-     *          if thrown by reflective operation
-     */
-    public void onPacketSend(TabPlayer receiver, Object packet) throws ReflectiveOperationException {
-        //empty by default
-    }
-
-    /**
-     * Performs refresh of specified player
-     *
-     * @param   refreshed
-     *          player to refresh
-     * @param   force
-     *          if refresh should be forced despite refresh seemingly not needed
-     */
-    public void refresh(TabPlayer refreshed, boolean force) {
-        //empty by default
-    }
-
-    /**
-     * Processes vanish status change of player
-     *
-     * @param   player
-     *          Player who changed vanish status
-     */
-    public void onVanishStatusChange(TabPlayer player) {
-        //empty by default
-    }
-
-    /**
-     * Registers this feature as one using specified placeholders
-     *
-     * @param   placeholders
-     *          placeholders to add as used in this feature
-     */
-    public void addUsedPlaceholders(Collection<String> placeholders) {
-        if (placeholders.isEmpty()) return;
-        placeholders.forEach(p -> TabAPI.getInstance().getPlaceholderManager().addUsedPlaceholder(p, this));
-    }
-
-    /**
-     * Returns {@code true} if world or server is disabled, {@code false} if not
-     *
-     * @param   server
-     *          server to check
-     * @param   world
-     *          world to check
-     * @return  {@code true} if feature should be disabled, {@code false} if not
-     */
-    public boolean isDisabled(String server, String world) {
-        boolean contains = contains(disabledWorlds, world);
-        if (worldWhitelistMode) contains = !contains;
-        if (contains) return true;
-        contains = contains(disabledServers, server);
-        if (serverWhitelistMode) contains = !contains;
-        return contains;
-    }
-
-    /**
-     * Returns {@code true} if list contains the specified element or element
-     * ends with {@code "*"} and element meeting that requirement is present,
-     * {@code false} otherwise.
-     *
-     * @param   list
-     *          List to check
-     * @param   element
-     *          Element to find
-     * @return  {@code true} if element was found, {@code false} if not
-     */
-    protected boolean contains(String[] list, String element) {
-        if (element == null) return false;
-        for (String s : list) {
-            if (s.endsWith("*")) {
-                if (element.toLowerCase().startsWith(s.substring(0, s.length()-1).toLowerCase())) return true;
-            } else {
-                if (element.equalsIgnoreCase(s)) return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Returns {@code true} if method with specified name is overridden
-     * in the implementation, {@code false} if not
-     *
-     * @param   method
-     *          Method to check
-     * @return  {@code true} if overridden, {@code false} if not
-     */
-    public boolean overridesMethod(String method) {
-        return methodOverrides.contains(method);
-    }
-
-    /**
-     * Returns {@code true} if player is currently located in a server
-     * or world, which is marked as disabled, {@code false} if not
-     *
-     * @param   p
-     *          Player to check
-     * @return  {@code true} if player is in disabled server / world,
-     *          {@code false} if not
-     */
-    public boolean isDisabledPlayer(TabPlayer p) {
-        return disabledPlayers.contains(p);
-    }
-
-    /**
-     * Adds specified player into list of players in disabled
-     * servers / worlds.
-     *
-     * @param   p
-     *          Player to add
-     */
-    public void addDisabledPlayer(TabPlayer p) {
-        if (disabledPlayers.contains(p)) return;
-        disabledPlayers.add(p);
-    }
-
-    /**
-     * Removes specified player from list of players in disabled
-     * servers / worlds
-     *
-     * @param   p
-     *          Player to check
-     */
-    public void removeDisabledPlayer(TabPlayer p) {
-        disabledPlayers.remove(p);
-    }
-}
@@ -1,27 +1,23 @@
 package me.neznamy.tab.api;

-import java.util.UUID;
+import lombok.NonNull;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;

-import io.netty.channel.Channel;
-import me.neznamy.tab.api.chat.IChatBaseComponent;
-import me.neznamy.tab.api.protocol.Skin;
-import me.neznamy.tab.api.protocol.TabPacket;
+import java.util.UUID;

 /**
 * An interface representing a player
 */
+@SuppressWarnings("unused") // API class
 public interface TabPlayer {

-    /**
-     * Refreshes all visuals on the player
-     */
-    void forceRefresh();
-
    /**
     * Returns player's name
     *
     * @return  Player's name
     */
+    @NotNull
    String getName();

    /**
@@ -29,139 +25,17 @@ public interface TabPlayer {
     *
     * @return  Player's UUID
     */
+    @NotNull
    UUID getUniqueId();

-    /**
-     * Returns player's uuid used in TabList. This may only be different from real uuid if
-     * TAB is installed on a proxy which does not rewrite UUIDs.
-     *
-     * @return  player's uuid in TabList
-     */
-    UUID getTablistId();
-
-    /**
-     * Returns player's protocol version
-     *
-     * @return  player's protocol version
-     */
-    ProtocolVersion getVersion();
-
    /**
     * Returns platform-specific entity
     *
-     * @return  an instance of bukkit/bungee player depending on platform
+     * @return  platform's player object
     */
+    @NotNull
    Object getPlayer();

-    /**
-     * Returns player's current world name (on BungeeCord this requires bridge installed)
-     *
-     * @return  name of world where player is currently in, "N/A" on BungeeCord if bridge is not installed
-     */
-    String getWorld();
-    
-    /**
-     * Returns player's current server name on BungeeCord (on bukkit this returns "N/A")
-     *
-     * @return  name of server where player is currently in, "N/A" on bukkit
-     */
-    String getServer();
-
-    /**
-     * Performs platform-specific API call to check for permission and returns the result
-     *
-     * @param   permission
-     *          the permission to check for
-     * @return  true if player has permission, false if not
-     */
-    boolean hasPermission(String permission);
-
-    /**
-     * Sends the player a custom universal packet
-     *
-     * @param   packet
-     *          packet to send
-     */
-    void sendCustomPacket(TabPacket packet);
-
-    /**
-     * Sends the player a custom universal packet and adds that packet into counter that
-     * is displayed in /tab cpu
-     *
-     * @param   packet
-     *          packet to send
-     * @param   feature
-     *          feature to increment sent packet counter of
-     */
-    void sendCustomPacket(TabPacket packet, TabFeature feature);
-    
-    /**
-     * Sends the player a custom universal packet and adds that packet into counter that
-     * is displayed in /tab cpu
-     *
-     * @param   packet
-     *          packet to send
-     * @param   feature
-     *          feature to increment sent packet counter of
-     */
-    void sendCustomPacket(TabPacket packet, String feature);
-
-    /**
-     * Sends the player a platform-specific packet
-     *
-     * @param   packet
-     *          an instance of packet depending on platform
-     */
-    void sendPacket(Object packet);
-
-    /**
-     * Returns player's property by name
-     *
-     * @param   name
-     *          name of property
-     * @return  the property or {@code null} if not found
-     */
-    Property getProperty(String name);
-
-    /**
-     * Sends a message to the player
-     *
-     * @param   message
-     *          message to be sent
-     * @param   translateColors
-     *          whether colors should be translated or not
-     */
-    void sendMessage(String message, boolean translateColors);
-
-    /**
-     * Sends specified component as a chat message
-     *
-     * @param   message
-     *          message to send
-     */
-    void sendMessage(IChatBaseComponent message);
-
-    /**
-     * Returns player's netty channel. On servers running version 1.7 or older returns {@code null}.
-     *
-     * @return  player's channel
-     */
-    Channel getChannel();
-
-    /**
-     * Returns player's ping calculated by server
-     *
-     * @return  player's ping
-     */
-    int getPing();
-
-    /**
-     * Returns player's skin data
-     *
-     * @return  player's skin
-     */
-    Skin getSkin();
-
    /**
     * Returns true once the player is successfully loaded (onJoin method ran through all methods)
     *
@@ -169,92 +43,6 @@ public interface TabPlayer {
     */
    boolean isLoaded();

-    /**
-     * Sets property with specified name to new value. If property did not exist before, it is
-     * created and {@code true} is returned. If it existed, it is overridden and {@code true} is returned.
-     * {@code false} is returned otherwise.
-     *
-     * @param   feature
-     *          feature using this property to get placeholders registered
-     * @param   identifier
-     *          property name
-     * @param   rawValue
-     *          new raw value
-     * @return  {@code true} if value changed / did not exist, {@code false} if value did not change
-     */
-    boolean setProperty(TabFeature feature, String identifier, String rawValue);
-
-    /**
-     * Loads property from config using standard property loading algorithm
-     *
-     * @param   property
-     *          property name to load
-     * @return  {@code true} if value did not exist or changed, {@code false} otherwise
-     */
-    boolean loadPropertyFromConfig(TabFeature feature, String property);
-
-    /**
-     * Loads property from config using standard property loading algorithm. If the property is
-     * not set in config, {@code ifNotSet} value is used.
-     *
-     * @param   property
-     *          property name to load
-     * @param   ifNotSet
-     *          value to use if property is not defined in config
-     * @return  {@code true} if value did not exist or changed, {@code false} otherwise
-     */
-    boolean loadPropertyFromConfig(TabFeature feature, String property, String ifNotSet);
-
-    /**
-     * Returns name of player's scoreboard team or {@code null} if NameTag feature is disabled
-     *
-     * @return  name of player's team
-     */
-    String getTeamName();
-
-    /**
-     * Returns {@code true} if player is disguised using LibsDisguises, {@code false} if not
-     *
-     * @return  {@code true} if player is disguised, {@code false} if not
-     */
-    boolean isDisguised();
-
-    /**
-     * Returns {@code true} if player has invisibility potion, {@code false} if not.
-     * For bukkit, API is used, for BungeeCord, bridge is used.
-     *
-     * @return  {@code true} if player has invisibility potion, {@code false} if not
-     */
-    boolean hasInvisibilityPotion();
-
-    /**
-     * Checks if player is vanished using any supported vanish plugin and returns the result.
-     *
-     * @return  {@code true} if player is vanished, {@code false} if not
-     */
-    boolean isVanished();
-
-    /**
-     * Calls platform-specific method and returns the result
-     *
-     * @return  {@code true} if player is online, {@code false} if not
-     */
-    boolean isOnline();
-    
-    /**
-     * Returns GameMode of the player (0 for survival, 1 creative, 2 adventure, 3 spectator)
-     *
-     * @return  GameMode of the player
-     */
-    int getGamemode();
-
-    /**
-     * Returns {@code true} if this is a bedrock player, {@code false} if not
-     *
-     * @return  {@code true} if player is a bedrock player, {@code false} if not
-     */
-    boolean isBedrockPlayer();
-
    /**
     * Returns player's primary permission group. If group has been changed using
     * {@link #setTemporaryGroup(String)}, returns that value. Otherwise, returns group
@@ -262,45 +50,76 @@ public interface TabPlayer {
     *
     * @return  player's primary permission group
     */
+    @NotNull
    String getGroup();

    /**
     * Temporarily overrides player's group and applies all changes coming from new group.
     * This includes all properties and sorting, if used.
+     * Set to {@code null} to reset back.
     *
     * @param   group
     *          New group to use
     * @see     #hasTemporaryGroup()
-     * @see     #resetTemporaryGroup()
     */
-    void setTemporaryGroup(String group);
+    void setTemporaryGroup(@Nullable String group);

    /**
-     * Returns temporary group applied to the player using {@link #setTemporaryGroup(String)}.
-     * If no group was set, returns {@code null}
+     * Returns {@code true} if a temporary group was applied to the player using {@link #setTemporaryGroup(String)}.
+     * If no group was set, returns {@code false}
     *
-     * @return  Temporary group assigned to player or {@code null} if not set
+     * @return  {@code true} if group is set, {@code false} if not
     * @see     #setTemporaryGroup(String)
-     * @see     #resetTemporaryGroup()
     */
    boolean hasTemporaryGroup();

    /**
-     * Resets temporary group assigned using {@link #setTemporaryGroup(String)}.
-     * If no temporary group is set, doesn't do anything.
+     * 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.
     *
-     * @see     #setTemporaryGroup(String)
-     * @see     #hasTemporaryGroup()
+     * @param   profileName
+     *          New expected profile name
     */
-    void resetTemporaryGroup();
+    void setExpectedProfileName(@NonNull String profileName);

    /**
-     * Returns player's game profile name as seen by other players. By default,
-     * this returns player's name. If using a nickname / disguise plugin that changes
-     * game profile name for other players and change was successfully detected, returns
-     * that value.
+     * 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 game profile name as seen by other players
+     * @return  Player's expected profile name
     */
-    String getNickname();
+    @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();
 }
@@ -1,168 +0,0 @@
-package me.neznamy.tab.api;
-
-/**
- * An interface allowing to modify tablist display names
- * of players.
- * <p>
- * Instance can be obtained using {@link TabAPI#getTablistFormatManager()}.
- * This requires the feature to be enabled in config, otherwise the method will
- * return {@code null}.
- */
-public interface TablistFormatManager {
-
-    /**
-     * Changes player's prefix to provided value. Supports placeholders,
-     * as well as any supported RGB formats.
-     *
-     * @param   player
-     *          player to change prefix of
-     * @param   prefix
-     *          new prefix value
-     * @see     #resetPrefix(TabPlayer)
-     * @see     #getCustomPrefix(TabPlayer)
-     * @see     #getOriginalPrefix(TabPlayer)
-     */
-    void setPrefix(TabPlayer player, String prefix);
-
-    /**
-     * Changes player's name to provided value. Supports placeholders,
-     * as well as any supported RGB formats.
-     *
-     * @param   player
-     *          player to change prefix of
-     * @param   customName
-     *          new customName value
-     * @see     #resetName(TabPlayer)
-     * @see     #getCustomName(TabPlayer)
-     * @see     #getOriginalName(TabPlayer)
-     */
-    void setName(TabPlayer player, String customName);
-
-    /**
-     * Changes player's suffix to provided value. Supports placeholders,
-     * as well as any supported RGB formats.
-     *
-     * @param   player
-     *          player to change prefix of
-     * @param   suffix
-     *          new suffix value
-     * @see     #resetSuffix(TabPlayer)
-     * @see     #getCustomSuffix(TabPlayer)
-     * @see     #getOriginalSuffix(TabPlayer)
-     */
-    void setSuffix(TabPlayer player, String suffix);
-
-    /**
-     * Resets player's prefix previously assigned using {@link #setPrefix(TabPlayer, String)}
-     * method. If nothing was set, this method will not do anything.
-     *
-     * @param   player
-     *          player to reset prefix of
-     * @see     #setPrefix(TabPlayer, String)
-     * @see     #getCustomPrefix(TabPlayer)
-     * @see     #getOriginalPrefix(TabPlayer)
-     */
-    void resetPrefix(TabPlayer player);
-
-    /**
-     * Resets player's custom name previously assigned using {@link #setName(TabPlayer, String)}
-     * method. If nothing was set, this method will not do anything.
-     *
-     * @param   player
-     *          player to reset name of
-     * @see     #setName(TabPlayer, String)
-     * @see     #getCustomName(TabPlayer)
-     * @see     #getOriginalName(TabPlayer)
-     */
-    void resetName(TabPlayer player);
-
-    /**
-     * Resets player's suffix previously assigned using {@link #setSuffix(TabPlayer, String)}
-     * method. If nothing was set, this method will not do anything.
-     *
-     * @param   player
-     *          player to reset suffix of
-     * @see     #setSuffix(TabPlayer, String)
-     * @see     #getCustomSuffix(TabPlayer)
-     * @see     #getOriginalSuffix(TabPlayer)
-     */
-    void resetSuffix(TabPlayer player);
-
-    /**
-     * Returns prefix assigned using {@link #setPrefix(TabPlayer, String)} method.
-     * If the method was not used, {@code null} is returned.
-     *
-     * @param   player
-     *          player to get custom prefix of
-     * @return  player's custom prefix or {@code null} if not defined
-     * @see     #setPrefix(TabPlayer, String)
-     * @see     #resetPrefix(TabPlayer)
-     * @see     #getOriginalPrefix(TabPlayer)
-     */
-    String getCustomPrefix(TabPlayer player);
-
-    /**
-     * Returns custom name assigned using {@link #setName(TabPlayer, String)} method.
-     * If the method was not used, {@code null} is returned.
-     *
-     * @param   player
-     *          player to get custom name of
-     * @return  player's custom name or {@code null} if not defined
-     * @see     #setName(TabPlayer, String)
-     * @see     #resetName(TabPlayer)
-     * @see     #getOriginalName(TabPlayer)
-     */
-    String getCustomName(TabPlayer player);
-
-    /**
-     * Returns suffix assigned using {@link #setSuffix(TabPlayer, String)} method.
-     * If the method was not used, {@code null} is returned.
-     *
-     * @param   player
-     *          player to get custom suffix of
-     * @return  player's custom suffix or {@code null} if not defined
-     * @see     #setSuffix(TabPlayer, String)
-     * @see     #resetSuffix(TabPlayer)
-     * @see     #getOriginalSuffix(TabPlayer)
-     */
-    String getCustomSuffix(TabPlayer player);
-
-    /**
-     * Returns player's original prefix applied using plugin's internal logic.
-     * This value is not affected by API calls in any way.
-     *
-     * @param   player
-     *          player to get original prefix of
-     * @return  player's original prefix
-     * @see     #setPrefix(TabPlayer, String)
-     * @see     #resetPrefix(TabPlayer)
-     * @see     #getCustomPrefix(TabPlayer)
-     */
-    String getOriginalPrefix(TabPlayer player);
-
-    /**
-     * Returns player's original name applied using plugin's internal logic.
-     * This value is not affected by API calls in any way.
-     *
-     * @param   player
-     *          player to get original name of
-     * @return  player's original name
-     * @see     #setName(TabPlayer, String)
-     * @see     #resetName(TabPlayer)
-     * @see     #getCustomName(TabPlayer)
-     */
-    String getOriginalName(TabPlayer player);
-
-    /**
-     * Returns player's original suffix applied using plugin's internal logic.
-     * This value is not affected by API calls in any way.
-     *
-     * @param   player
-     *          player to get original suffix of
-     * @return  player's original suffix
-     * @see     #setSuffix(TabPlayer, String)
-     * @see     #resetSuffix(TabPlayer)
-     * @see     #getCustomSuffix(TabPlayer)
-     */
-    String getOriginalSuffix(TabPlayer player);
-}
@@ -4,13 +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 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
 }
@@ -3,16 +3,14 @@ package me.neznamy.tab.api.bossbar;
 import java.util.List;
 import java.util.UUID;

+import lombok.NonNull;
 import me.neznamy.tab.api.TabPlayer;
+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.
@@ -26,7 +24,7 @@ public interface BossBar {
     *
     * @return  name of BossBar
     */
-    String getName();
+    @NotNull String getName();

    /**
     * Returns randomly generated uuid of this BossBar used internally to match
@@ -34,7 +32,7 @@ public interface BossBar {
     *
     * @return  uuid of this BossBar
     */
-    UUID getUniqueId();
+    @NotNull UUID getUniqueId();

    /**
     * Changes BossBar title to specified string, supporting placeholders.
@@ -48,7 +46,7 @@ public interface BossBar {
     * @param   title
     *          New title to display in this BossBar
     */
-    void setTitle(String title);
+    void setTitle(@NonNull String title);

    /**
     * Changes BossBar progress to specified string, supporting placeholders.
@@ -64,7 +62,7 @@ public interface BossBar {
     * @param   progress
     *          New progress to use in this BossBar
     */
-    void setProgress(String progress);
+    void setProgress(@NonNull String progress);

    /**
     * Changes BossBar progress to specified value ranging from 0 to 100.
@@ -90,7 +88,7 @@ public interface BossBar {
     * @param   color
     *          New color to use in this BossBar
     */
-    void setColor(String color);
+    void setColor(@NonNull String color);

    /**
     * Changes BossBar color to specified enum constant.
@@ -100,7 +98,7 @@ public interface BossBar {
     * @param   color
     *          New color to use in this BossBar
     */
-    void setColor(BarColor color);
+    void setColor(@NonNull BarColor color);

    /**
     * Changes BossBar style to specified string, supporting placeholders.
@@ -116,7 +114,7 @@ public interface BossBar {
     * @param   style
     *          New style to use in this BossBar
     */
-    void setStyle(String style);
+    void setStyle(@NonNull String style);

    /**
     * Changes BossBar style to specified enum constant.
@@ -126,7 +124,7 @@ public interface BossBar {
     * @param   style
     *          New style to use in this BossBar
     */
-    void setStyle(BarStyle style);
+    void setStyle(@NonNull BarStyle style);

    /**
     * Returns current title of the BossBar in raw format. If it contains placeholders,
@@ -134,7 +132,7 @@ public interface BossBar {
     *
     * @return  title of the BossBar
     */
-    String getTitle();
+    @NotNull String getTitle();

    /**
     * Returns progress of the BossBar as a string, which is either entered string
@@ -142,7 +140,7 @@ public interface BossBar {
     *
     * @return  entered progress as a string
     */
-    String getProgress();
+    @NotNull String getProgress();

    /**
     * Returns color of the BossBar as a string, which is either entered string
@@ -150,7 +148,7 @@ public interface BossBar {
     *
     * @return  entered color as a string
     */
-    String getColor();
+    @NotNull String getColor();

    /**
     * Returns style of the BossBar as a string, which is either entered string
@@ -158,7 +156,7 @@ public interface BossBar {
     *
     * @return  entered style as a string
     */
-    String getStyle();
+    @NotNull String getStyle();

    /**
     * Registers this BossBar to specified player.
@@ -168,7 +166,7 @@ public interface BossBar {
     * @param   player
     *          Player to register this BossBar to
     */
-    void addPlayer(TabPlayer player);
+    void addPlayer(@NonNull TabPlayer player);

    /**
     * Unregisters this BossBar from specified player.
@@ -178,7 +176,7 @@ public interface BossBar {
     * @param   player
     *          Player to unregister this BossBar from
     */
-    void removePlayer(TabPlayer player);
+    void removePlayer(@NonNull TabPlayer player);

    /**
     * Returns list of players who can see this BossBar.
@@ -189,19 +187,24 @@ public interface BossBar {
     *
     * @return  List of players seeing this BossBar
     */
-    List<TabPlayer> getPlayers();
+    @NotNull List<TabPlayer> getPlayers();

    /**
-     * Returns {@code true} if specified player can see this BossBar, {@code false} if not
+     * 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 for
-     * @return  {@code true} if contains, {@code false} if not
+     *          Player to check
+     * @return  {@code true} if player is allowed to see this Boss Bar, {@code false} if not.
     */
-    boolean containsPlayer(TabPlayer player);
+    boolean containsPlayer(@NonNull TabPlayer player);

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

+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;
-import java.util.UUID;
-
-import me.neznamy.tab.api.TabAPI;
-import me.neznamy.tab.api.TabPlayer;

 /**
 * An interface allowing work with BossBars such as creating, sending
@@ -15,6 +17,7 @@ import me.neznamy.tab.api.TabPlayer;
 * This requires the BossBar feature to be enabled in config, otherwise the method will
 * return {@code null}.
 */
+@SuppressWarnings("unused") // API class
 public interface BossBarManager {

    /**
@@ -31,7 +34,7 @@ public interface BossBarManager {
     *          Style to use
     * @return  The newly created BossBar
     */
-    BossBar createBossBar(String title, float progress, BarColor color, BarStyle style);
+    @NotNull BossBar createBossBar(@NonNull String title, float progress, @NonNull BarColor color, @NonNull BarStyle style);

    /**
     * Creates BossBar with specified parameters and registers it to BossBar manager,
@@ -50,30 +53,19 @@ public interface BossBarManager {
     *          a placeholder that returns one of them
     * @return  The newly created BossBar
     */
-    BossBar createBossBar(String title, String progress, String color, String style);
+    @NotNull BossBar createBossBar(@NonNull String title, @NonNull String progress, @NonNull String color, @NonNull String style);

    /**
     * Returns registered BossBar with given name. For BossBars from config it is the name
     * they were created with, for API BossBars their randomly generated name, which can be
     * retrieved using {@link me.neznamy.tab.api.bossbar.BossBar#getName()}.
-     * Returns null if no such BossBar exists.
+     * Returns {@code null} if no such BossBar exists.
     * 
     * @param   name
     *          Name of registered BossBar
     * @return  BossBar with specified name
     */
-    BossBar getBossBar(String name);
-
-    /**
-     * Returns registered BossBar with specified UUID. This UUID is randomly generated when
-     * BossBar is created and used in packets / to match which the one from Bukkit API.
-     * Returns null if no such BossBar exists.
-     * 
-     * @param   id
-     *          UUID to return BossBar by
-     * @return  BossBar with specified uuid
-     */
-    BossBar getBossBar(UUID id);
+    @Nullable BossBar getBossBar(@NonNull String name);

    /**
     * Returns a map of all registered BossBars. This includes both BossBars from config
@@ -84,7 +76,29 @@ public interface BossBarManager {
     *
     * @return  all registered BossBars
     */
-    Map<String, BossBar> getRegisteredBossBars();
+    @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.
@@ -96,7 +110,7 @@ public interface BossBarManager {
     * @see     #hasBossBarVisible(TabPlayer)
     * @see     #setBossBarVisible(TabPlayer, boolean, boolean)
     */
-    void toggleBossBar(TabPlayer player, boolean sendToggleMessage);
+    void toggleBossBar(@NonNull TabPlayer player, boolean sendToggleMessage);

    /**
     * Returns true if player can see BossBars, false if toggled via command or API.
@@ -107,7 +121,7 @@ public interface BossBarManager {
     * @see     #toggleBossBar(TabPlayer, boolean)
     * @see     #setBossBarVisible(TabPlayer, boolean, boolean)
     */
-    boolean hasBossBarVisible(TabPlayer player);
+    boolean hasBossBarVisible(@NonNull TabPlayer player);

    /**
     * Sets BossBar visibility of player to set value. If value did not change, nothing happens.
@@ -122,37 +136,37 @@ public interface BossBarManager {
     * @see #toggleBossBar(TabPlayer, boolean)
     * @see #hasBossBarVisible(TabPlayer)
     */
-    void setBossBarVisible(TabPlayer player, boolean visible, boolean sendToggleMessage);
+    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)
     * @see     #getAnnouncedBossBars()
     */
-    void sendBossBarTemporarily(TabPlayer player, String bossBar, int duration);
+    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)
     * @see     #getAnnouncedBossBars()
     */
-    void announceBossBar(String bossBar, int duration);
+    void announceBossBar(@NonNull String bossBar, int duration);

    /**
     * Returns list of BossBars which are currently being announced.
@@ -161,5 +175,5 @@ public interface BossBarManager {
     * @see     #sendBossBarTemporarily(TabPlayer, String, int)
     * @see     #announceBossBar(String, int)
     */
-    List<BossBar> getAnnouncedBossBars();
+    @NotNull List<BossBar> getAnnouncedBossBars();
 }
@@ -1,29 +0,0 @@
-package me.neznamy.tab.api.chat;
-
-import lombok.Data;
-import lombok.NonNull;
-
-/**
- * Class for click event action in chat component
- */
-@Data
-public class ChatClickable {
-
-    /** Click action */
-    @NonNull private final EnumClickAction action;
-
-    /** Click value */
-    @NonNull private final String value;
-
-    /**
-     * Enum for all possible click actions
-     */
-    public enum EnumClickAction {
-
-        OPEN_URL,
-        RUN_COMMAND,
-        CHANGE_PAGE, //since 1.8
-        SUGGEST_COMMAND,
-        COPY_TO_CLIPBOARD //since 1.15
-    }
-}
@@ -1,35 +0,0 @@
-package me.neznamy.tab.api.chat;
-
-import lombok.NonNull;
-import me.neznamy.tab.api.TabAPI;
-
-import java.util.UUID;
-
-public class ChatComponentEntity extends IChatBaseComponent {
-
-    private final String CONTENTS;
-    private final String VALUE_1_13;
-    private final String VALUE_1_12;
-    private final String VALUE_1_8;
-
-    public ChatComponentEntity(@NonNull String type, @NonNull UUID id, String name) {
-        this.CONTENTS = String.format("{\"type\":\"%s\",\"id\":\"%s\",\"name\":{\"text\":\"%s\"}}", type, id, name);
-        this.VALUE_1_13 = String.format("{type:\"%s\",id:\"%s\",name:\"{\\\"text\\\":\\\"%s\\\"}\"}", type, id, name);
-        this.VALUE_1_12 = String.format("{type:\"%s\",id:\"%s\",name:\"%s\"}", type, id, name);
-        this.VALUE_1_8 = String.format("{type:%s,id:%s,name:%s}", type, id, name);
-    }
-
-    @Override
-    public String toRawText() {
-        return toString();
-    }
-    
-    @Override
-    public String toString() {
-        if (TabAPI.getInstance().getServerVersion().getMinorVersion() >= 16) return CONTENTS;
-        if (TabAPI.getInstance().getServerVersion().getMinorVersion() >= 13) return VALUE_1_13;
-        if (TabAPI.getInstance().getServerVersion().getMinorVersion() == 12) return VALUE_1_12;
-        if (TabAPI.getInstance().getServerVersion().getMinorVersion() >= 8) return VALUE_1_8;
-        throw new IllegalStateException("show_entity hover action is not supported on <1.8");
-    }
-}
@@ -1,32 +0,0 @@
-package me.neznamy.tab.api.chat;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.Getter;
-import lombok.NonNull;
-
-/**
- * Class for hover event action in chat component
- */
-@Data
-public class ChatHoverable {
-
-    /** Hover action */
-    @NonNull private final EnumHoverAction action;
-
-    /** Hover value */
-    @NonNull private final IChatBaseComponent value;
-
-    /**
-     * Enum for all possible hover actions
-     */
-    @AllArgsConstructor
-    public enum EnumHoverAction {
-
-        SHOW_TEXT("contents"),
-        SHOW_ITEM("value"),
-        SHOW_ENTITY("contents");
-
-        @Getter private final String preferredKey;
-    }
-}
@@ -1,219 +0,0 @@
-package me.neznamy.tab.api.chat;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.NonNull;
-import me.neznamy.tab.api.ProtocolVersion;
-import me.neznamy.tab.api.TabAPI;
-import me.neznamy.tab.api.chat.ChatClickable.EnumClickAction;
-import me.neznamy.tab.api.chat.ChatHoverable.EnumHoverAction;
-import org.json.simple.JSONObject;
-
-import java.util.UUID;
-
-@Data @NoArgsConstructor
-public class ChatModifier {
-
-    private TextColor color;
-    private Boolean bold;
-    private Boolean italic;
-    private Boolean underlined;
-    private Boolean strikethrough;
-    private Boolean obfuscated;
-    private ChatClickable clickEvent;
-    private ChatHoverable hoverEvent;
-    private String font;
-    private ProtocolVersion targetVersion;
-
-    public ChatModifier(@NonNull ChatModifier modifier) {
-        this.color = modifier.color == null ? null : new TextColor(modifier.color);
-        this.bold = modifier.bold;
-        this.italic = modifier.italic;
-        this.underlined = modifier.underlined;
-        this.strikethrough = modifier.strikethrough;
-        this.obfuscated = modifier.obfuscated;
-        this.clickEvent = modifier.clickEvent == null ? null : new ChatClickable(modifier.clickEvent.getAction(), modifier.clickEvent.getValue());
-        this.hoverEvent = modifier.hoverEvent == null ? null : new ChatHoverable(modifier.hoverEvent.getAction(), modifier.hoverEvent.getValue());
-        this.font = modifier.font;
-        this.targetVersion = modifier.targetVersion;
-    }
-
-
-    /**
-     * Returns true if bold is defined and set to true, false otherwise
-     *
-     * @return  true if bold is defined and set to true, false otherwise
-     */
-    public boolean isBold() {
-        return Boolean.TRUE.equals(bold);
-    }
-
-    /**
-     * Returns true if italic is defined and set to true, false otherwise
-     *
-     * @return  true if italic is defined and set to true, false otherwise
-     */
-    public boolean isItalic() {
-        return Boolean.TRUE.equals(italic);
-    }
-
-    /**
-     * Returns true if underlined is defined and set to true, false otherwise
-     *
-     * @return  true if underlined is defined and set to true, false otherwise
-     */
-    public boolean isUnderlined() {
-        return Boolean.TRUE.equals(underlined);
-    }
-
-    /**
-     * Returns true if strikethrough is defined and set to true, false otherwise
-     *
-     * @return  true if strikethrough is defined and set to true, false otherwise
-     */
-    public boolean isStrikethrough() {
-        return Boolean.TRUE.equals(strikethrough);
-    }
-
-    /**
-     * Returns true if obfuscation is defined and set to true, false otherwise
-     *
-     * @return  true if obfuscation is defined and set to true, false otherwise
-     */
-    public boolean isObfuscated() {
-        return Boolean.TRUE.equals(obfuscated);
-    }
-
-    /**
-     * Sets click action to OPEN_URL and url to given value
-     *
-     * @param   url
-     *          url to open
-     */
-    public void onClickOpenUrl(@NonNull String url) {
-        clickEvent = new ChatClickable(EnumClickAction.OPEN_URL, url);
-    }
-
-    /**
-     * Sets click action to RUN_COMMAND and command to given value
-     *
-     * @param   command
-     *          command to perform, might be without / to send a chat message
-     */
-    public void onClickRunCommand(@NonNull String command) {
-        clickEvent = new ChatClickable(EnumClickAction.RUN_COMMAND, command);
-    }
-
-    /**
-     * Sets click action to SUGGEST_COMMAND and command to given value
-     *
-     * @param   command
-     *          command to suggest
-     */
-    public void onClickSuggestCommand(@NonNull String command) {
-        clickEvent = new ChatClickable(EnumClickAction.SUGGEST_COMMAND, command);
-    }
-
-    /**
-     * Sets click action to CHANGE_PAGE and page id to given value
-     *
-     * @param   newPage
-     *          id of new page
-     */
-    public void onClickChangePage(int newPage) {
-        if (TabAPI.getInstance().getServerVersion().getMinorVersion() < 8) throw new UnsupportedOperationException("change_page click action is not supported on <1.8");
-        clickEvent = new ChatClickable(EnumClickAction.CHANGE_PAGE, String.valueOf(newPage));
-    }
-
-    /**
-     * Sets click action to COPY_TO_CLIPBOARD and text to provided value
-     *
-     * @param   text
-     *          text to copy to clipboard on click
-     */
-    public void onClickCopyToClipBoard(@NonNull String text) {
-        clickEvent = new ChatClickable(EnumClickAction.COPY_TO_CLIPBOARD, text);
-    }
-
-    public void onClick(@NonNull EnumClickAction action, @NonNull String value) {
-        clickEvent = new ChatClickable(action, value);
-    }
-
-    /**
-     * Sets hover action to SHOW_TEXT and text to given value
-     *
-     * @param   text
-     *          text to show
-     */
-    public void onHoverShowText(@NonNull IChatBaseComponent text) {
-        hoverEvent = new ChatHoverable(EnumHoverAction.SHOW_TEXT, text);
-    }
-
-    /**
-     * Sets hover action to SHOW_ITEM and item to given value
-     *
-     * @param   serializedItem
-     *          item to show
-     */
-    public void onHoverShowItem(@NonNull String serializedItem) {
-        hoverEvent = new ChatHoverable(EnumHoverAction.SHOW_ITEM, new IChatBaseComponent(serializedItem));
-    }
-
-    /**
-     * Sets hover action to SHOW_ENTITY and entity data to given values
-     *
-     * @param   type
-     *          entity type
-     * @param   id
-     *          entity uuid
-     * @param   name
-     *          entity custom name
-     */
-    public void onHoverShowEntity(@NonNull String type, @NonNull UUID id, String name) {
-        hoverEvent = new ChatHoverable(EnumHoverAction.SHOW_ENTITY, new ChatComponentEntity(type, id, name));
-    }
-
-    public void onHover(@NonNull EnumHoverAction action, @NonNull IChatBaseComponent value) {
-        hoverEvent = new ChatHoverable(action, value);
-    }
-
-    @SuppressWarnings("unchecked")
-    public JSONObject serialize() {
-        JSONObject json = new JSONObject();
-        if (color != null) json.put("color", targetVersion.getMinorVersion() >= 16 ? color.toString() : color.getLegacyColor().toString().toLowerCase());
-        if (bold != null) json.put("bold", bold);
-        if (italic != null) json.put("italic", italic);
-        if (underlined != null) json.put("underlined", underlined);
-        if (strikethrough != null) json.put("strikethrough", strikethrough);
-        if (obfuscated != null) json.put("obfuscated", obfuscated);
-        if (clickEvent != null) {
-            JSONObject click = new JSONObject();
-            click.put("action", clickEvent.getAction().toString().toLowerCase());
-            click.put("value", clickEvent.getValue());
-            json.put("clickEvent", click);
-        }
-        if (hoverEvent != null) {
-            JSONObject hover = new JSONObject();
-            hover.put("action", hoverEvent.getAction().toString().toLowerCase());
-            if (TabAPI.getInstance().getServerVersion().getMinorVersion() >= 16) {
-                hover.put(hoverEvent.getAction().getPreferredKey(), hoverEvent.getValue());
-            } else {
-                hover.put("value", TabAPI.getInstance().getServerVersion().getMinorVersion() >= 9 ?
-                        hoverEvent.getValue() : hoverEvent.getValue().toRawText());
-            }
-            json.put("hoverEvent", hover);
-        }
-        if (font != null) json.put("font", font);
-        return json;
-    }
-
-    public String getMagicCodes() {
-        StringBuilder builder = new StringBuilder();
-        if (isBold()) builder.append(EnumChatFormat.BOLD.getFormat());
-        if (isItalic()) builder.append(EnumChatFormat.ITALIC.getFormat());
-        if (isUnderlined()) builder.append(EnumChatFormat.UNDERLINE.getFormat());
-        if (isStrikethrough()) builder.append(EnumChatFormat.STRIKETHROUGH.getFormat());
-        if (isObfuscated()) builder.append(EnumChatFormat.OBFUSCATED.getFormat());
-        return builder.toString();
-    }
-}
@@ -1,161 +0,0 @@
-package me.neznamy.tab.api.chat;
-
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import me.neznamy.tab.api.ProtocolVersion;
-import me.neznamy.tab.api.TabAPI;
-import org.jetbrains.annotations.NotNull;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
-import java.util.List;
-
-/**
- * A class representing a chat component that was serialized before,
- * but deserialize was requested in PacketPlayOutPlayerInfo packet.
- * This is used to read and modify the packet and then rewrite it.
- * However, display name components must be deserialized to properly
- * forward them in the new packet, but its value is not actually
- * used anywhere.
- * <p>
- * To avoid this heavy and completely unnecessary operation, the original
- * string is saved and returned during serialization. If any read/write
- * operation is performed, the string is fully deserialized and this object
- * will act like a normal chat component.
- */
-@SuppressWarnings("unchecked")
-@RequiredArgsConstructor
-public class DeserializedChatComponent extends IChatBaseComponent {
-
-    /** The original serialized component string */
-    @NonNull private final String json;
-
-    /**
-     * Flag tracking whether this component was fully deserialized
-     * in case of a read operation to avoid repeating the deserialization
-     * process on every request.
-     */
-    private boolean deserialized;
-
-    /**
-     * Flag tracking whether this component was modified, which means
-     * a new string has to be created instead of returning the input one.
-     */
-    private boolean modified;
-
-    @Override
-    public String toString() {
-        if (modified) return super.toString();
-        return json;
-    }
-
-    @Override
-    public String toString(ProtocolVersion clientVersion) {
-        if (modified) return super.toString(clientVersion);
-        return json;
-    }
-
-    @Override
-    public List<IChatBaseComponent> getExtra() {
-        if (!deserialized) deserialize();
-        return super.getExtra();
-    }
-
-    @Override
-    public String getText() {
-        if (!deserialized) deserialize();
-        return super.getText();
-    }
-
-    @Override
-    public @NotNull ChatModifier getModifier() {
-        if (!deserialized) deserialize();
-        return super.getModifier();
-    }
-
-    @Override
-    public IChatBaseComponent setExtra(List<IChatBaseComponent> components) {
-        if (!deserialized) deserialize();
-        modified = true;
-        return super.setExtra(components);
-    }
-
-    @Override
-    public void addExtra(@NotNull IChatBaseComponent child) {
-        if (!deserialized) deserialize();
-        modified = true;
-        super.addExtra(child);
-    }
-
-    @Override
-    public void setModifier(@NotNull ChatModifier modifier) {
-        if (!deserialized) deserialize();
-        modified = true;
-        super.setModifier(modifier);
-    }
-
-    /**
-     * Performs a full deserialization process on this component.
-     */
-    void deserialize() {
-        deserialized = true;
-        if (json.startsWith("\"") && json.endsWith("\"") && json.length() > 1) {
-            //simple component with only text used, minecraft serializer outputs the text in quotes instead of full json
-            setText(json.substring(1, json.length()-1));
-            return;
-        }
-        JSONObject jsonObject;
-        try {
-            jsonObject = (JSONObject) new JSONParser().parse(json);
-        } catch (ParseException e) {
-            TabAPI.getInstance().logError("Failed to deserialize json component " + json, e);
-            return;
-        }
- /*       if (jsonObject.containsKey("type")) {
-            return new ChatComponentEntity((String) jsonObject.get("type"), UUID.fromString((String) jsonObject.get("id")), IChatBaseComponent.deserialize(jsonObject.get("name").toString()).toFlatText());
-        }*/
-        setText((String) jsonObject.get("text"));
-        getModifier().setBold(getBoolean(jsonObject, "bold"));
-        getModifier().setItalic(getBoolean(jsonObject, "italic"));
-        getModifier().setUnderlined(getBoolean(jsonObject, "underlined"));
-        getModifier().setStrikethrough(getBoolean(jsonObject, "strikethrough"));
-        getModifier().setObfuscated(getBoolean(jsonObject, "obfuscated"));
-        getModifier().setColor(TextColor.fromString(((String) jsonObject.get("color"))));
-        if (jsonObject.containsKey("clickEvent")) {
-            JSONObject clickEvent = (JSONObject) jsonObject.get("clickEvent");
-            String action = (String) clickEvent.get("action");
-            String value = clickEvent.get("value").toString();
-            getModifier().onClick(ChatClickable.EnumClickAction.valueOf(action.toUpperCase()), value);
-        }
-        if (jsonObject.containsKey("hoverEvent")) {
-            JSONObject hoverEvent = (JSONObject) jsonObject.get("hoverEvent");
-            String action = (String) hoverEvent.get("action");
-            String value = (String) hoverEvent.get("value");
-            getModifier().onHover(ChatHoverable.EnumHoverAction.valueOf(action.toUpperCase()), deserialize(value));
-        }
-        if (jsonObject.containsKey("extra")) {
-            List<Object> list = (List<Object>) jsonObject.get("extra");
-            for (Object extra : list) {
-                String string = extra.toString();
-                //reverting .toString() removing "" for simple text
-                if (!string.startsWith("{")) string = "\"" + string + "\"";
-                addExtra(IChatBaseComponent.deserialize(string));
-            }
-        }
-    }
-
-    /**
-     * Returns boolean value of requested key from map
-     *
-     * @param   jsonObject
-     *          map to get value from
-     * @param   key
-     *          name of key
-     * @return  value from json object or null if not present
-     */
-    private static Boolean getBoolean(@NonNull JSONObject jsonObject, @NonNull String key) {
-        String value = String.valueOf(jsonObject.getOrDefault(key, null));
-        return "null".equals(value) ? null : Boolean.parseBoolean(value);
-    }
-}
@@ -1,207 +0,0 @@
-package me.neznamy.tab.api.chat;
-
-import lombok.Getter;
-import me.neznamy.tab.api.chat.rgb.RGBUtils;
-
-/**
- * An enum containing all possible legacy color codes and magic codes. Also contains handy color-related methods.
- */
-public enum EnumChatFormat {
-
-    BLACK('0', "000000"),
-    DARK_BLUE('1', "0000AA"),
-    DARK_GREEN('2', "00AA00"),
-    DARK_AQUA('3', "00AAAA"),
-    DARK_RED('4', "AA0000"),
-    DARK_PURPLE('5', "AA00AA"),
-    GOLD('6', "FFAA00"),
-    GRAY('7', "AAAAAA"),
-    DARK_GRAY('8', "555555"),
-    BLUE('9', "5555FF"),
-    GREEN('a', "55FF55"),
-    AQUA('b', "55FFFF"),
-    RED('c', "FF5555"),
-    LIGHT_PURPLE('d', "FF55FF"),
-    YELLOW('e', "FFFF55"),
-    WHITE('f', "FFFFFF"),
-    OBFUSCATED('k'),
-    BOLD('l'),
-    STRIKETHROUGH('m'),
-    UNDERLINE('n'),
-    ITALIC('o'),
-    RESET('r');
-
-    /** Creating a constant to avoid memory allocations on each request */
-    public static final EnumChatFormat[] VALUES = values();
-
-    /** The symbol minecraft uses to colorize text */
-    public static final char COLOR_CHAR = 0x00a7;
-
-    /** The color symbol in form of a string */
-    public static final String COLOR_STRING = String.valueOf(COLOR_CHAR);
-
-    /** Character representing the color or magic code */
-    @Getter private final char character;
-
-    /** Red value of this constant, 0 for magic codes */
-    @Getter private final short red;
-
-    /** Green value of this constant, 0 for magic codes */
-    @Getter private final short green;
-
-    /** Blue value of this constant, 0 for magic codes */
-    @Getter private final short blue;
-
-    /** Color as 6-digit hex code, null for magic codes */
-    @Getter private final String hexCode;
-
-    /** Color symbol followed by constant's character */
-    @Getter private final String format;
-
-    /**
-     * Constructs new color instance with given character and hex code
-     *
-     * @param   character
-     *          character which the color goes by
-     * @param   hexCode
-     *          6-digit hex code of the color
-     */
-    EnumChatFormat(char character, String hexCode) {
-        this.character = character;
-        this.format = String.valueOf(COLOR_CHAR) + character;
-        this.hexCode = hexCode;
-        int hexColor = Integer.parseInt(hexCode, 16);
-        red = (short) ((hexColor >> 16) & 0xFF);
-        green = (short) ((hexColor >> 8) & 0xFF);
-        blue = (short) (hexColor & 0xFF);
-    }
-
-    /**
-     * Constructs new magic code instance with given character
-     *
-     * @param   character
-     *          character representing the magic code
-     */
-    EnumChatFormat(char character) {
-        this.character = character;
-        this.format = String.valueOf(COLOR_CHAR) + character;
-        red = 0;
-        green = 0;
-        blue = 0;
-        hexCode = null;
-    }
-
-    /**
-     * Returns enum value based on provided character or null if character is not valid
-     *
-     * @param   c
-     *          color code character (0-9, a-f, k-o, r)
-     * @return  instance from the character or null if character is not valid
-     */
-    public static EnumChatFormat getByChar(char c) {
-        for (EnumChatFormat format : VALUES) {
-            if (format.character == c) return format;
-        }
-        return null;
-    }
-
-    /**
-     * Returns enum value of last colors used in given string.
-     * If it's null, empty or does not contain color codes, WHITE is returned.
-     *
-     * @param   string
-     *          string to check last colors of
-     * @return  last used color code in given string or WHITE if nothing is found
-     */
-    public static EnumChatFormat lastColorsOf(String string) {
-        if (string == null || string.length() == 0) return EnumChatFormat.WHITE;
-        String legacyText = RGBUtils.getInstance().convertRGBtoLegacy(string);
-        String last = getLastColors(legacyText);
-        if (last.length() > 0) {
-            char c = last.toCharArray()[1];
-            for (EnumChatFormat e : VALUES) {
-                if (e.character == c) return e;
-            }
-        }
-        return EnumChatFormat.WHITE;
-    }
-
-    /**
-     * Returns enum value with exact red, green and blue values or null if no match was found
-     *
-     * @param   red
-     *          exact red value
-     * @param   green
-     *          exact green value
-     * @param   blue
-     *          exact blue value
-     * @return  enum value or null if no such combination exists
-     */
-    public static EnumChatFormat fromRGBExact(int red, int green, int blue) {
-        for (EnumChatFormat format : VALUES) {
-            if (format.red == red && format.green == green && format.blue == blue) return format;
-        }
-        return null;
-    }
-
-    /**
-     * Color translation method taken from bukkit, which converts '&amp;' symbol into
-     * the actual color character if followed by a valid color character.
-     *
-     * @param   textToTranslate
-     *          text to replace color symbol in
-     * @return  colorized string from provided text
-     */
-    public static String color(String textToTranslate) {
-        if (textToTranslate == null) return null;
-        if (!textToTranslate.contains("&")) return textToTranslate;
-        char[] b = textToTranslate.toCharArray();
-        for (int i = 0; i < b.length - 1; i++) {
-            if ((b[i] == '&') && ("0123456789AaBbCcDdEeFfKkLlMmNnOoRrXx".indexOf(b[(i + 1)]) > -1)) {
-                b[i] = COLOR_CHAR;
-                b[(i + 1)] = Character.toLowerCase(b[(i + 1)]);
-            }
-        }
-        return new String(b);
-    }
-
-    /**
-     * Turns back the color symbol into '&amp;' symbol in provided text.
-     *
-     * @param   text
-     *          text to revert colors in
-     * @return  reverted text
-     */
-    public static String decolor(String text) {
-        if (text == null) return null;
-        if (!text.contains(COLOR_STRING)) return text;
-        return text.replace(COLOR_CHAR, '&');
-    }
-
-    /**
-     * Code taken from bukkit, which returns last color codes used in provided text.
-     *
-     * @param   input
-     *          text to get last colors from
-     * @return  last colors used in provided text or empty string if nothing was found
-     */
-    public static String getLastColors(String input) {
-        if (input == null) return "";
-        StringBuilder result = new StringBuilder();
-        int length = input.length();
-        for (int index = length - 1; index > -1; index--) {
-            char section = input.charAt(index);
-            if ((section == COLOR_CHAR || section == '&') && (index < length - 1)) {
-                char c = input.charAt(index + 1);
-                if ("0123456789AaBbCcDdEeFfKkLlMmNnOoRr".contains(String.valueOf(c))) {
-                    result.insert(0, COLOR_CHAR);
-                    result.insert(1, c);
-                    if ("0123456789AaBbCcDdEeFfRr".contains(String.valueOf(c))) {
-                        break;
-                    }
-                }
-            }
-        }
-        return result.toString();
-    }
-}
@@ -1,373 +0,0 @@
-package me.neznamy.tab.api.chat;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.NonNull;
-import lombok.Setter;
-import me.neznamy.tab.api.ProtocolVersion;
-import me.neznamy.tab.api.TabAPI;
-import me.neznamy.tab.api.chat.rgb.RGBUtils;
-import me.neznamy.tab.api.util.ComponentCache;
-import org.json.simple.JSONObject;
-
-import java.util.*;
-
-/**
- * A class representing the n.m.s.IChatBaseComponent class to make work with it much easier
- */
-@SuppressWarnings("unchecked")
-@NoArgsConstructor
-public class IChatBaseComponent {
-
-    /**
-     * Component cache maps to avoid large memory allocations as well as
-     * higher CPU usage when using animations which send the same text on repeat.
-     */
-    private static final ComponentCache<String, IChatBaseComponent> stringCache = new ComponentCache<>(10000, (text, clientVersion) -> {
-                return text.contains("#") || text.contains("&x") || text.contains(EnumChatFormat.COLOR_CHAR + "x") || text.contains("<") ?
-                    IChatBaseComponent.fromColoredText(text) : //contains RGB colors
-                    new IChatBaseComponent(text); //no RGB
-            });
-    private static final ComponentCache<IChatBaseComponent, String> serializeCache = new ComponentCache<>(10000,
-            (component, clientVersion) -> component.toString());
-
-    /** Text of the component */
-    @Getter @Setter private String text;
-
-    /** Chat modifier containing color, magic codes, hover and click event */
-    @Getter @Setter @NonNull private ChatModifier modifier = new ChatModifier();
-
-    /** Extra components used in "extra" field */
-    private List<IChatBaseComponent> extra;
-
-    /**
-     * Constructs a new component which is a clone of provided component
-     *
-     * @param   component
-     *          component to clone
-     */
-    public IChatBaseComponent(@NonNull IChatBaseComponent component) {
-        this.text = component.text;
-        this.modifier = new ChatModifier(component.modifier);
-        for (IChatBaseComponent child : component.getExtra()) {
-            addExtra(new IChatBaseComponent(child));
-        }
-    }
-
-    /**
-     * Constructs new instance with given text
-     *
-     * @param   text
-     *          text to display
-     */
-    public IChatBaseComponent(String text) {
-        this.text = text;
-    }
-
-    /**
-     * Returns list of extra components. If no extra components are defined, returns empty list.
-     *
-     * @return  list of extra components
-     */
-    public List<IChatBaseComponent> getExtra() {
-        if (extra == null) return Collections.emptyList();
-        return extra;
-    }
-
-    /**
-     * Sets full list of extra components to given list. Does not allow empty list.
-     *
-     * @param   components
-     *          components to use as extra
-     * @return  self
-     * @throws  IllegalArgumentException
-     *          if {@code components} is an empty list
-     */
-    public IChatBaseComponent setExtra(List<IChatBaseComponent> components) {
-        if (components.isEmpty()) throw new IllegalArgumentException("Unexpected empty array of components"); //exception taken from minecraft
-        this.extra = components;
-        return this;
-    }
-
-    /**
-     * Appends provided component as extra component
-     *
-     * @param   child
-     *          component to append
-     */
-    public void addExtra(@NonNull IChatBaseComponent child) {
-        if (extra == null) extra = new ArrayList<>();
-        extra.add(child);
-    }
-
-    /**
-     * Deserializes string and returns created component. If provided string is null, returns null.
-     *
-     * @param   json
-     *          serialized string
-     * @return  Deserialized component or null if input is null
-     */
-    public static IChatBaseComponent deserialize(String json) {
-        if (json == null) return null;
-        return new DeserializedChatComponent(json);
-    }
-
-    /**
-     * Converts the component to a string representing the serialized component.
-     * This method is only used internally by json library since it's missing
-     * protocol version field used by the method.
-     *
-     * @return  serialized component in string form
-     * @see     #toString(ProtocolVersion)
-     */
-    @Override
-    public String toString() {
-        JSONObject json = new JSONObject();
-        if (text != null) json.put("text", text);
-        if (modifier.getTargetVersion() == null) modifier.setTargetVersion(TabAPI.getInstance().getServerVersion()); //packet.toString() was called as a part of a debug message
-        json.putAll(modifier.serialize());
-        if (extra != null) json.put("extra", extra);
-        return json.toString();
-    }
-
-    /**
-     * Serializes this component with colors based on client version.
-     * If client version is &lt;1.16, HEX colors will be converted to legacy colors.
-     *
-     * @param   clientVersion
-     *          client version to adapt component for
-     * @return  serialized string
-     */
-    public String toString(ProtocolVersion clientVersion) {
-        return toString(clientVersion, false);
-    }
-
-    /**
-     * Serializes this component with colors based on client version.
-     * If client version is &lt;1.16, HEX colors will be converted to legacy colors.
-     *
-     * @param   clientVersion
-     *          client version to adapt component for
-     * @param   sendTranslatableIfEmpty
-     *          whether empty translatable should be sent if text is empty or not
-     * @return  serialized string
-     */
-    public String toString(ProtocolVersion clientVersion, boolean sendTranslatableIfEmpty) {
-        if (extra == null) {
-            if (text == null) return null;
-            if (text.length() == 0) {
-                if (sendTranslatableIfEmpty) {
-                    return "{\"translate\":\"\"}";
-                } else {
-                    return "{\"text\":\"\"}";
-                }
-            }
-        }
-        modifier.setTargetVersion(clientVersion);
-        for (IChatBaseComponent child : getExtra()) {
-            child.modifier.setTargetVersion(clientVersion);
-        }
-        return serializeCache.get(this, clientVersion);
-    }
-
-    /**
-     * Returns organized component from colored text
-     *
-     * @param   originalText
-     *          text to convert
-     * @return  organized component from colored text
-     */
-    public static IChatBaseComponent fromColoredText(@NonNull String originalText) {
-        String text = RGBUtils.getInstance().applyFormats(EnumChatFormat.color(originalText));
-        List<IChatBaseComponent> components = new ArrayList<>();
-        StringBuilder builder = new StringBuilder();
-        IChatBaseComponent component = new IChatBaseComponent();
-        for (int i = 0; i < text.length(); i++) {
-            char c = text.charAt(i);
-            if (c == EnumChatFormat.COLOR_CHAR) {
-                i++;
-                if (i >= text.length()) {
-                    break;
-                }
-                c = text.charAt(i);
-                if ((c >= 'A') && (c <= 'Z')) {
-                    c = (char)(c + ' ');
-                }
-                EnumChatFormat format = EnumChatFormat.getByChar(c);
-                if (format != null) {
-                    if (builder.length() > 0) {
-                        component.setText(builder.toString());
-                        components.add(component);
-                        component = new IChatBaseComponent(component);
-                        component.text = null;
-                        builder = new StringBuilder();
-                    }
-                    switch (format) {
-                    case BOLD: 
-                        component.modifier.setBold(true);
-                        break;
-                    case ITALIC: 
-                        component.modifier.setItalic(true);
-                        break;
-                    case UNDERLINE: 
-                        component.modifier.setUnderlined(true);
-                        break;
-                    case STRIKETHROUGH: 
-                        component.modifier.setStrikethrough(true);
-                        break;
-                    case OBFUSCATED: 
-                        component.modifier.setObfuscated(true);
-                        break;
-                    case RESET: 
-                        component = new IChatBaseComponent();
-                        component.modifier.setColor(new TextColor(EnumChatFormat.WHITE));
-                        break;
-                    default:
-                        component = new IChatBaseComponent();
-                        component.modifier.setColor(new TextColor(format));
-                        break;
-                    }
-                }
-            } else if (c == '#' && text.length() > i+6) {
-                String hex = text.substring(i+1, i+7);
-                if (RGBUtils.getInstance().isHexCode(hex)) {
-                    TextColor color;
-                    if (containsLegacyCode(text, i)) {
-                        color = new TextColor(hex, EnumChatFormat.getByChar(text.charAt(i+8)));
-                        i += 8;
-                    } else {
-                        color = new TextColor(hex);
-                        i += 6;
-                    }
-                    if (builder.length() > 0) {
-                        component.setText(builder.toString());
-                        components.add(component);
-                        builder = new StringBuilder();
-                    }
-                    component = new IChatBaseComponent();
-                    component.modifier.setColor(color);
-                } else {
-                    builder.append(c);
-                }
-            } else {
-                builder.append(c);
-            }
-        }
-        component.setText(builder.toString());
-        components.add(component);
-        return new IChatBaseComponent("").setExtra(components);
-    }
-
-    /**
-     * Returns true if text contains legacy color request at defined RGB index start
-     *
-     * @param   text
-     *          text to check
-     * @param   i
-     *          current index start
-     * @return  true if legacy color is defined, false if not
-     */
-    private static boolean containsLegacyCode(String text, int i) {
-        if (text.length() - i < 9 || text.charAt(i+7) != '|') return false;
-        return EnumChatFormat.getByChar(text.charAt(i+8)) != null;
-    }
-
-    /**
-     * Converts this component into a simple text with legacy colors (the closest match if color is set to RGB)
-     *
-     * @return  The simple text format
-     */
-    public String toLegacyText() {
-        StringBuilder builder = new StringBuilder();
-        append(builder, "");
-        return builder.toString();
-    }
-
-    /**
-     * Appends text to string builder, might also add color and magic codes if they are different
-     * from previous component in chain.
-     *
-     * @param   builder
-     *          builder to append text to
-     * @param   previousFormatting
-     *          colors and magic codes in previous component
-     * @return  new formatting, might be identical to previous one
-     */
-    private String append(StringBuilder builder, String previousFormatting) {
-        String formatting = previousFormatting;
-        if (text != null) {
-            formatting = getFormatting();
-            if (!formatting.equals(previousFormatting)) {
-                builder.append(formatting);
-            }
-            builder.append(text);
-
-        }
-        for (IChatBaseComponent component : getExtra()) {
-            formatting = component.append(builder, formatting);
-        }
-        return formatting;
-    }
-
-    /**
-     * Returns colors and magic codes of this component
-     *
-     * @return  used colors and magic codes
-     */
-    private String getFormatting() {
-        StringBuilder builder = new StringBuilder();
-        if (modifier.getColor() != null) {
-            if (modifier.getColor().getLegacyColor() == EnumChatFormat.WHITE) {
-                //preventing unwanted &r -> &f conversion and stopping the <1.13 client bug fix from working
-                builder.append(EnumChatFormat.RESET.getFormat());
-            } else {
-                builder.append(modifier.getColor().getLegacyColor().getFormat());
-            }
-        }
-        builder.append(modifier.getMagicCodes());
-        return builder.toString();
-    }
-
-    /**
-     * Returns raw text without colors, only works correctly when component is organized
-     *
-     * @return  raw text in this component and all child components
-     */
-    public String toRawText() {
-        StringBuilder builder = new StringBuilder();
-        if (text != null) builder.append(text);
-        for (IChatBaseComponent child : getExtra()) {
-            if (child.text != null) builder.append(child.text);
-        }
-        return builder.toString();
-    }
-
-    /**
-     * Converts the component into flat text with used colors (including rgb) and magic codes
-     *
-     * @return  converted text
-     */
-    public String toFlatText() {
-        StringBuilder builder = new StringBuilder();
-        if (modifier.getColor() != null) builder.append("#").append(modifier.getColor().getHexCode());
-        builder.append(modifier.getMagicCodes());
-        if (text != null) builder.append(text);
-        for (IChatBaseComponent child : getExtra()) {
-            builder.append(child.toFlatText());
-        }
-        return builder.toString();
-    }
-
-    /**
-     * Returns the most optimized component based on text. Returns null if text is null,
-     * organized component if RGB colors are used or simple component with only text field
-     * containing the whole text when no RGB colors are used
-     *
-     * @param   text
-     *          text to create component from
-     * @return  The most performance-optimized component based on text
-     */
-    public static IChatBaseComponent optimizedComponent(String text) {
-        return stringCache.get(text, null);
-    }
-}
@@ -1,210 +0,0 @@
-package me.neznamy.tab.api.chat;
-
-import lombok.Getter;
-import lombok.NonNull;
-import me.neznamy.tab.api.util.Preconditions;
-
-/**
- * A class representing a component color, which can be either RGB or legacy code.
- */
-public class TextColor {
-
-    /**
-     * RGB values as a single number of 3 8-bit numbers (0-255).
-     * It is only initialized if colors are actually used to avoid
-     * unnecessary memory allocations with string operations.
-     */
-    private int rgb = -1;
-
-    /** Closest legacy color to this color object. */
-    private EnumChatFormat legacyColor;
-
-    /** HEX code of this color as a 6-digit hexadecimal string without "#" prefix. */
-    private String hexCode;
-
-    /**
-     * Boolean value whether the legacy color was forced with constructor or should be
-     * automatically assigned as closest color.
-     * This value is used in gradients when converting text for legacy players. */
-    @Getter private boolean legacyColorForced;
-
-    /**
-     * Constructs new instance as a clone of the provided color.
-     *
-     * @param   color
-     *          color to create a clone of
-     * @throws  IllegalArgumentException
-     *          if color is {@code null}
-     */
-    public TextColor(@NonNull TextColor color) {
-        rgb = color.rgb;
-        legacyColor = color.legacyColor;
-        hexCode = color.hexCode;
-        legacyColorForced = color.legacyColorForced;
-    }
-
-    /**
-     * Constructs new instance from provided 6-digit hex code string
-     *
-     * @param   hexCode
-     *          a 6-digit combination of hex numbers as a string
-     * @throws  IllegalArgumentException
-     *          if hexCode is {@code null}
-     */
-    public TextColor(@NonNull String hexCode) {
-        this.hexCode = hexCode;
-    }
-
-    /**
-     * Constructs new instance from provided 6-digit hex code and forced legacy color
-     *
-     * @param   hexCode
-     *          6-digit combination of hex numbers as a string
-     * @param   legacyColor
-     *          color to use for legacy clients instead of using the closest legacy color
-     * @throws  IllegalArgumentException
-     *          if {@code hexCode} is {@code null} or {@code legacyColor} is {@code null}
-     */
-    public TextColor(@NonNull String hexCode, EnumChatFormat legacyColor) {
-        this.hexCode = hexCode;
-        this.legacyColorForced = true;
-        this.legacyColor = legacyColor;
-    }
-
-    /**
-     * Constructs new instance from provided legacy color
-     *
-     * @param   legacyColor
-     *          legacy color to construct the instance from
-     * @throws  IllegalArgumentException
-     *          if {@code legacyColor} is {@code null}
-     */
-    public TextColor(@NonNull EnumChatFormat legacyColor) {
-        this.rgb = (legacyColor.getRed() << 16) + (legacyColor.getGreen() << 8) + legacyColor.getBlue();
-        this.hexCode = legacyColor.getHexCode();
-    }
-
-    /**
-     * Constructs new instance with red, green and blue values
-     *
-     * @param   red
-     *          red value
-     * @param   green
-     *          green value
-     * @param   blue
-     *          blue value
-     * @throws  IllegalArgumentException
-     *          if {@code red}, {@code green} or {@code blue} is out of range ({@code 0-255})
-     */
-    public TextColor(int red, int green, int blue) {
-        Preconditions.checkRange(red, 0, 255, "red");
-        Preconditions.checkRange(green, 0, 255, "green");
-        Preconditions.checkRange(blue, 0, 255, "blue");
-        this.rgb = (red << 16) + (green << 8) + blue;
-    }
-
-    /**
-     * Loads the closest legacy color based currently provided values
-     */
-    private EnumChatFormat loadClosestColor() {
-        double minMaxDist = 9999;
-        double maxDist;
-        EnumChatFormat closestColor = EnumChatFormat.WHITE;
-        for (EnumChatFormat color : EnumChatFormat.VALUES) {
-            int rDiff = Math.abs(color.getRed() - getRed());
-            int gDiff = Math.abs(color.getGreen() - getGreen());
-            int bDiff = Math.abs(color.getBlue() - getBlue());
-            maxDist = rDiff;
-            if (gDiff > maxDist) maxDist = gDiff;
-            if (bDiff > maxDist) maxDist = bDiff;
-            if (maxDist < minMaxDist) {
-                minMaxDist = maxDist;
-                closestColor = color;
-            }
-        }
-        return closestColor;
-    }
-
-    /**
-     * Returns {@code red} value
-     *
-     * @return  red value
-     */
-    public int getRed() {
-        if (rgb == -1) rgb = Integer.parseInt(hexCode, 16);
-        return (rgb >> 16) & 0xFF;
-    }
-
-    /**
-     * Returns {@code green} value
-     *
-     * @return  green value
-     */
-    public int getGreen() {
-        if (rgb == -1) rgb = Integer.parseInt(hexCode, 16);
-        return (rgb >> 8) & 0xFF;
-    }
-
-    /**
-     * Returns {@code blue} value
-     *
-     * @return  blue value
-     */
-    public int getBlue() {
-        if (rgb == -1) rgb = Integer.parseInt(hexCode, 16);
-        return rgb & 0xFF;
-    }
-
-    /**
-     * Returns the closest legacy color of this color object.
-     * If the color was defined in constructor, it's returned.
-     * Otherwise, the closest color is calculated the then returned.
-     *
-     * @return  closest legacy color
-     */
-    public EnumChatFormat getLegacyColor() {
-        if (legacyColor == null) legacyColor = loadClosestColor();
-        return legacyColor;
-    }
-
-    /**
-     * Returns the rgb combination as a 6-digit hex code string
-     *
-     * @return  the rgb combination as a 6-digit hex code string
-     */
-    public String getHexCode() {
-        if (hexCode == null) hexCode = String.format("%06X", rgb);
-        return hexCode;
-    }
-
-    /**
-     * Converts the color into a valid color value used in color field in chat component.
-     * That is either 6-digit hex code prefixed with '#', or lowercase legacy color.
-     *
-     * @return  the color serialized for use in chat component
-     */
-    public String toString() {
-        EnumChatFormat legacyEquivalent = EnumChatFormat.fromRGBExact(getRed(), getGreen(), getBlue());
-        if (legacyEquivalent != null) {
-            //not sending old colors as RGB to 1.16 clients if not needed as <1.16 servers will fail to apply color
-            return legacyEquivalent.toString().toLowerCase();
-        }
-        return "#" + getHexCode();
-    }
-
-    /**
-     * Reads the string as it appears in chat component and turns it into the color object.
-     * If the entered string is null, returns null.
-     * If it's prefixed with '#', it's considered as a hex code.
-     * Otherwise, it is considered being a lowercase legacy color.
-     *
-     * @param   string
-     *          string from color field in chat component
-     * @return  An instance from specified string or null if string is null
-     */
-    public static TextColor fromString(String string) {
-        if (string == null) return null;
-        if (string.startsWith("#")) return new TextColor(string.substring(1));
-        return new TextColor(EnumChatFormat.valueOf(string.toUpperCase()));
-    }
-}
@@ -1,62 +0,0 @@
-package me.neznamy.tab.api.chat;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NonNull;
-import me.neznamy.tab.api.ProtocolVersion;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.List;
-
-/**
- * A class extending IChatBaseComponent that holds the original value
- * to avoid deserializing it, which is an unnecessary operation that
- * slows down the performance, as well as makes code more complicated
- * and open to problems.
- */
-@AllArgsConstructor
-public class WrappedChatComponent extends IChatBaseComponent {
-
-    /** Original NMS component */
-    @Getter private final Object originalComponent;
-
-    @Override
-    public String toString() {
-        throw new UnsupportedOperationException("Not supported for " + getClass().getSimpleName());
-    }
-
-    @Override
-    public String toString(ProtocolVersion clientVersion) {
-        throw new UnsupportedOperationException("Not supported for " + getClass().getSimpleName());
-    }
-
-    @Override
-    public List<IChatBaseComponent> getExtra() {
-        throw new UnsupportedOperationException("Not supported for " + getClass().getSimpleName());
-    }
-
-    @Override
-    public String getText() {
-        throw new UnsupportedOperationException("Not supported for " + getClass().getSimpleName());
-    }
-
-    @Override
-    public @NotNull ChatModifier getModifier() {
-        throw new UnsupportedOperationException("Not supported for " + getClass().getSimpleName());
-    }
-
-    @Override
-    public IChatBaseComponent setExtra(List<IChatBaseComponent> components) {
-        throw new UnsupportedOperationException("Not supported for " + getClass().getSimpleName());
-    }
-
-    @Override
-    public void addExtra(@NonNull IChatBaseComponent child) {
-        throw new UnsupportedOperationException("Not supported for " + getClass().getSimpleName());
-    }
-
-    @Override
-    public void setModifier(@NotNull ChatModifier modifier) {
-        throw new UnsupportedOperationException("Not supported for " + getClass().getSimpleName());
-    }
-}
@@ -1,178 +0,0 @@
-package me.neznamy.tab.api.chat.rgb;
-
-import lombok.Getter;
-import lombok.NonNull;
-import me.neznamy.tab.api.chat.EnumChatFormat;
-import me.neznamy.tab.api.chat.IChatBaseComponent;
-import me.neznamy.tab.api.chat.rgb.format.*;
-import me.neznamy.tab.api.chat.rgb.gradient.CMIGradient;
-import me.neznamy.tab.api.chat.rgb.gradient.CommonGradient;
-import me.neznamy.tab.api.chat.rgb.gradient.GradientPattern;
-import me.neznamy.tab.api.chat.rgb.gradient.KyoriGradient;
-import me.neznamy.tab.api.util.ReflectionUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * A helper class to reformat all RGB formats into the default #RRGGBB and apply gradients
- */
-public class RGBUtils {
-
-    /** Instance of the class */
-    @Getter private static final RGBUtils instance = new RGBUtils();
-
-    /** Registered RGB formatters */
-    private final RGBFormatter[] formats;
-
-    /** Registered gradient patterns */
-    private final GradientPattern[] gradients;
-
-    /** TAB's RGB pattern, used to convert text to bukkit format for boss bar */
-    private final Pattern tabPattern = Pattern.compile("#[0-9a-fA-F]{6}");
-
-    /** RGB pattern for legacy codes */
-    private final Pattern tabPatternLegacy = Pattern.compile("#[0-9a-fA-F]{6}\\|.");
-
-    /**
-     * Constructs new instance and loads all RGB patterns and gradients
-     */
-    public RGBUtils() {
-        List<RGBFormatter> list = new ArrayList<>();
-        if (ReflectionUtils.classExists("net.kyori.adventure.text.minimessage.MiniMessage")) {
-            list.add(new MiniMessageFormat());
-        }
-        list.add(new BukkitFormat());
-        list.add(new CMIFormat());
-        list.add(new UnnamedFormat1());
-        list.add(new HtmlFormat());
-        list.add(new KyoriFormat());
-        formats = list.toArray(new RGBFormatter[0]);
-
-        gradients = new GradientPattern[] {
-                //{#RRGGBB>}text{#RRGGBB<}
-                new CMIGradient(),
-                //<#RRGGBB>Text</#RRGGBB>
-                new CommonGradient(Pattern.compile("<#[0-9a-fA-F]{6}>[^<]*</#[0-9a-fA-F]{6}>"),
-                        Pattern.compile("<#[0-9a-fA-F]{6}\\|.>[^<]*</#[0-9a-fA-F]{6}>"),
-                        "<#", 9, 2, 9, 7),
-                //<$#RRGGBB>Text<$#RRGGBB>
-                new CommonGradient(Pattern.compile("<\\$#[0-9a-fA-F]{6}>[^<]*<\\$#[0-9a-fA-F]{6}>"),
-                        Pattern.compile("<\\$#[0-9a-fA-F]{6}\\|.>[^<]*<\\$#[0-9a-fA-F]{6}>"),
-                        "<$", 10, 3, 10, 7),
-                new KyoriGradient()
-        };
-    }
-
-    /**
-     * Applies all RGB formats and gradients to text and returns it.
-     *
-     * @param   text
-     *          original text
-     * @return  text where everything is converted to #RRGGBB
-     */
-    public String applyFormats(@NonNull String text) {
-        String replaced = text;
-        for (GradientPattern pattern : gradients) {
-            replaced = pattern.applyPattern(replaced, false);
-        }
-        for (RGBFormatter formatter : formats) {
-            replaced = formatter.reformat(replaced);
-        }
-        return replaced;
-    }
-
-    /**
-     * Applies all gradient formats to text and returns it. This only affects
-     * usage where no placeholder is used inside.
-     *
-     * @param   text
-     *          original text
-     * @return  text where all gradients with static text are converted to #RRGGBB
-     */
-    public String applyCleanGradients(@NonNull String text) {
-        String replaced = text;
-        for (GradientPattern pattern : gradients) {
-            replaced = pattern.applyPattern(replaced, true);
-        }
-        return replaced;
-    }
-
-    /**
-     * Converts TAB's RGB format (#RRGGBB) into bukkit one
-     * (&amp;x&amp;r&amp;r&amp;g&amp;g&amp;b&amp;b) for modern
-     * clients (1.16+), for legacy clients it will use the closest color.
-     *
-     * @param   text
-     *          text to convert
-     * @param   rgbClient
-     *          whether client accepts RGB or not
-     * @return  converted text
-     */
-    public String convertToBukkitFormat(String text, boolean rgbClient) {
-        if (text == null) return null;
-        if (!text.contains("#")) return text; //no rgb codes
-        if (rgbClient) {
-            //converting random formats to TAB one
-            String replaced = applyFormats(text);
-            for (Pattern p : new Pattern[]{tabPatternLegacy, tabPattern}) {
-                Matcher m = p.matcher(replaced);
-                while (m.find()) {
-                    String hexCode = m.group();
-                    String fixed = "&x&" + hexCode.charAt(1) + "&" + hexCode.charAt(2) + "&" + hexCode.charAt(3) + "&" + hexCode.charAt(4) + "&" + hexCode.charAt(5) + "&" + hexCode.charAt(6);
-                    replaced = replaced.replace(hexCode, EnumChatFormat.color(fixed));
-                }
-            }
-            return replaced;
-        } else {
-            return convertRGBtoLegacy(text);
-        }
-    }
-
-    /**
-     * Converts all hex codes in given string to legacy codes.
-     * Also removes redundant color codes caused by this operation
-     * to properly fit in limits.
-     *
-     * @param   text
-     *          text to convert
-     * @return  translated text
-     */
-    public String convertRGBtoLegacy(String text) {
-        if (text == null) return null;
-        return IChatBaseComponent.fromColoredText(text).toLegacyText();
-    }
-
-    /**
-     * Returns true if entered string is a valid 6-digit combination of
-     * hexadecimal numbers, false if not
-     *
-     * @param   string
-     *          string to check
-     * @return  {@code true} if valid, {@code false} if not
-     */
-    public boolean isHexCode(@NonNull String string) {
-        if (string.length() != 6) return false;
-        for (int i=0; i<6; i++) {
-            char c = string.charAt(i);
-            if (c < 48 || (c > 57 && c < 65) || (c > 70 && c < 97) || c > 102) return false;
-        }
-        return true;
-    }
-
-    /**
-     * Returns true if text contains legacy color request at defined RGB index start
-     *
-     * @param   text
-     *          text to check
-     * @param   i
-     *          current index start
-     * @return  {@code true} if legacy color is defined and valid, {@code false} otherwise
-     */
-    private static boolean containsLegacyCode(String text, int i) {
-        if (text.length() - i < 9 || text.charAt(i+7) != '|') return false;
-        return EnumChatFormat.getByChar(text.charAt(i+8)) != null;
-    }
-}
@@ -1,27 +0,0 @@
-package me.neznamy.tab.api.chat.rgb.format;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import me.neznamy.tab.api.chat.EnumChatFormat;
-
-/**
- * Formatter for &amp;x&amp;R&amp;R&amp;G&amp;G&amp;B&amp;B
- */
-public class BukkitFormat implements RGBFormatter {
-
-    private final Pattern pattern = Pattern.compile("[" + EnumChatFormat.COLOR_CHAR + "&]x[" + EnumChatFormat.COLOR_CHAR + "&\\p{XDigit}]{12}");
-    
-    @Override
-    public String reformat(String text) {
-        if (!text.contains("&x") && !text.contains(EnumChatFormat.COLOR_CHAR + "x")) return text;
-        String replaced = text;
-        Matcher m = pattern.matcher(replaced);
-        while (m.find()) {
-            String hexCode = m.group();
-            String fixed = new String(new char[] {'#', hexCode.charAt(3), hexCode.charAt(5), hexCode.charAt(7), hexCode.charAt(9), hexCode.charAt(11), hexCode.charAt(13)});
-            replaced = replaced.replace(hexCode, fixed);
-        }
-        return replaced;
-    }
-}
@@ -1,25 +0,0 @@
-package me.neznamy.tab.api.chat.rgb.format;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Formatter for {#RRGGBB}
- */
-public class CMIFormat implements RGBFormatter {
-
-    private final Pattern pattern = Pattern.compile("\\{#[0-9a-fA-F]{6}}");
-    
-    @Override
-    public String reformat(String text) {
-        if (!text.contains("{#")) return text;
-        String replaced = text;
-        Matcher m = pattern.matcher(replaced);
-        while (m.find()) {
-            String hexCode = m.group();
-            String fixed = hexCode.substring(2, 8);
-            replaced = replaced.replace(hexCode, "#" + fixed);
-        }
-        return replaced;
-    }
-}
@@ -1,25 +0,0 @@
-package me.neznamy.tab.api.chat.rgb.format;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Formatter for #&lt;RRGGBB&gt;
- */
-public class HtmlFormat implements RGBFormatter {
-
-    private final Pattern pattern = Pattern.compile("#<[0-9a-fA-F]{6}>");
-
-    @Override
-    public String reformat(String text) {
-        if (!text.contains("#<")) return text;
-        Matcher m = pattern.matcher(text);
-        String replaced = text;
-        while (m.find()) {
-            String hexCode = m.group();
-            String fixed = hexCode.substring(2, 8);
-            replaced = replaced.replace(hexCode, "#" + fixed);
-        }
-        return replaced;
-    }
-}
@@ -1,25 +0,0 @@
-package me.neznamy.tab.api.chat.rgb.format;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Formatter for &lt;#RRGGBB&gt;
- */
-public class KyoriFormat implements RGBFormatter {
-
-    private final Pattern pattern = Pattern.compile("<#[0-9a-fA-F]{6}>");
-
-    @Override
-    public String reformat(String text) {
-        if (!text.contains("<#")) return text;
-        String replaced = text;
-        Matcher m = pattern.matcher(replaced);
-        while (m.find()) {
-            String hexCode = m.group();
-            String fixed = hexCode.substring(2, 8);
-            replaced = replaced.replace(hexCode, "#" + fixed);
-        }
-        return replaced;
-    }
-}
@@ -1,20 +0,0 @@
-package me.neznamy.tab.api.chat.rgb.format;
-
-import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
-
-/**
- * Call to MiniMessage API to reformat text to &amp;x&amp;R&amp;R&amp;G&amp;G&amp;B&amp;B
- */
-public class MiniMessageFormat implements RGBFormatter {
-
-    @Override
-    public String reformat(String text) {
-        if (!text.contains("<")) return text;
-        try {
-            return LegacyComponentSerializer.legacySection().serialize(MiniMessage.miniMessage().deserialize(text));
-        } catch (Throwable ignored) {
-            return text;
-        }
-    }
-}
@@ -1,16 +0,0 @@
-package me.neznamy.tab.api.chat.rgb.format;
-
-/**
- * Abstract class for different RGB patterns
- */
-public interface RGBFormatter {
-
-    /**
-     * Reformats RGB codes in provided text into #RRGGBB format
-     *
-     * @param   text
-     *          text to format
-     * @return  reformatted text
-     */
-    String reformat(String text);
-}
@@ -1,12 +0,0 @@
-package me.neznamy.tab.api.chat.rgb.format;
-
-/**
- * Formatter for &amp;#RRGGBB
- */
-public class UnnamedFormat1 implements RGBFormatter {
-
-    @Override
-    public String reformat(String text) {
-        return text.contains("&#") ? text.replace("&#", "#") : text;
-    }
-}
@@ -1,48 +0,0 @@
-package me.neznamy.tab.api.chat.rgb.gradient;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import lombok.AllArgsConstructor;
-import me.neznamy.tab.api.chat.EnumChatFormat;
-import me.neznamy.tab.api.chat.TextColor;
-
-@AllArgsConstructor
-public class CommonGradient implements GradientPattern {
-
-    private final Pattern pattern;
-    private final Pattern legacyPattern;
-    private final String containCheck;
-    private final int legacyCharPosition;
-    private final int startColorStart;
-    private final int messageStart;
-    private final int endColorStartSub;
-
-    @Override
-    public String applyPattern(String text, boolean ignorePlaceholders) {
-        if (!text.contains(containCheck)) return text;
-        String replaced = text;
-        Matcher m = legacyPattern.matcher(replaced);
-        while (m.find()) {
-            String format = m.group();
-            EnumChatFormat legacyColor = EnumChatFormat.getByChar(format.charAt(legacyCharPosition));
-            if ((ignorePlaceholders && format.contains("%")) || legacyColor == null) continue;
-            TextColor start = new TextColor(format.substring(startColorStart, startColorStart+6), legacyColor);
-            String message = format.substring(messageStart+2, format.length()-10);
-            TextColor end = new TextColor(format.substring(format.length()-endColorStartSub, format.length()-endColorStartSub+6));
-            String applied = asGradient(start, message, end);
-            replaced = replaced.replace(format, applied);
-        }
-        m = pattern.matcher(replaced);
-        while (m.find()) {
-            String format = m.group();
-            if (ignorePlaceholders && format.contains("%")) continue;
-            TextColor start = new TextColor(format.substring(startColorStart, startColorStart+6));
-            String message = format.substring(messageStart, format.length()-10);
-            TextColor end = new TextColor(format.substring(format.length()-endColorStartSub, format.length()-endColorStartSub+6));
-            String applied = asGradient(start, message, end);
-            replaced = replaced.replace(format, applied);
-        }
-        return replaced;
-    }
-}
@@ -1,57 +0,0 @@
-package me.neznamy.tab.api.chat.rgb.gradient;
-
-import me.neznamy.tab.api.chat.EnumChatFormat;
-import me.neznamy.tab.api.chat.TextColor;
-
-/**
- * Abstract class for applying different gradient patterns
- */
-public interface GradientPattern {
-
-    /**
-     * Applies gradients in provided text and returns text using only #RRGGBB
-     *
-     * @param   text
-     *          text to be reformatted
-     * @return  reformatted text
-     */
-    String applyPattern(String text, boolean ignorePlaceholders);
-
-    /**
-     * Returns gradient text based on start color, text and end color
-     *
-     * @param   start
-     *          start color
-     * @param   text
-     *          text to be reformatted
-     * @param   end
-     *          end color
-     * @return  reformatted text
-     */
-    default String asGradient(TextColor start, String text, TextColor end) {
-        //lazy support for magic codes in gradients
-        String magicCodes = EnumChatFormat.getLastColors(text);
-        String deColorized = text.substring(magicCodes.length());
-        StringBuilder sb = new StringBuilder();
-        int length = deColorized.length();
-        if (length == 1) {
-            sb.append("#");
-            sb.append(new TextColor(start.getRed(), start.getGreen(), start.getBlue()).getHexCode());
-            if (start.isLegacyColorForced()) sb.append("|").append(start.getLegacyColor().getCharacter());
-            sb.append(magicCodes);
-            sb.append(deColorized);
-            return sb.toString();
-        }
-        for (int i=0; i<length; i++) {
-            int red = (int) (start.getRed() + (float)(end.getRed() - start.getRed())/(length-1)*i);
-            int green = (int) (start.getGreen() + (float)(end.getGreen() - start.getGreen())/(length-1)*i);
-            int blue = (int) (start.getBlue() + (float)(end.getBlue() - start.getBlue())/(length-1)*i);
-            sb.append("#");
-            sb.append(new TextColor(red, green, blue).getHexCode());
-            if (start.isLegacyColorForced()) sb.append("|").append(start.getLegacyColor().getCharacter());
-            sb.append(magicCodes);
-            sb.append(deColorized.charAt(i));
-        }
-        return sb.toString();
-    }
-}
@@ -1,46 +0,0 @@
-package me.neznamy.tab.api.chat.rgb.gradient;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import me.neznamy.tab.api.chat.EnumChatFormat;
-import me.neznamy.tab.api.chat.TextColor;
-
-/**
- * Gradient applier for &lt;gradient:#RRGGBB:#RRGGBB&gt;Text&lt;/gradient&gt;
- * and &lt;gradient:#RRGGBB|L:#RRGGBB&gt;Text&lt;/gradient&gt;
- */
-public class KyoriGradient implements GradientPattern {
-
-    private final Pattern pattern = Pattern.compile("<gradient:#[0-9a-fA-F]{6}:#[0-9a-fA-F]{6}>[^<]*</gradient>");
-
-    private final Pattern patternLegacy = Pattern.compile("<gradient:#[0-9a-fA-F]{6}\\|.:#[0-9a-fA-F]{6}>[^<]*</gradient>");
-    
-    @Override
-    public String applyPattern(String text, boolean ignorePlaceholders) {
-        if (!text.contains("<grad")) return text;
-        String replaced = text;
-        Matcher m = patternLegacy.matcher(replaced);
-        while (m.find()) {
-            String format = m.group();
-            EnumChatFormat legacyColor = EnumChatFormat.getByChar(format.charAt(18));
-            if ((ignorePlaceholders && format.contains("%")) || legacyColor == null) continue;
-            TextColor start = new TextColor(format.substring(11, 17), legacyColor);
-            String message = format.substring(28, format.length()-11);
-            TextColor end = new TextColor(format.substring(21, 27));
-            String applied = asGradient(start, message, end);
-            replaced = replaced.replace(format, applied);
-        }
-        m = pattern.matcher(replaced);
-        while (m.find()) {
-            String format = m.group();
-            if (ignorePlaceholders && format.contains("%")) continue;
-            TextColor start = new TextColor(format.substring(11, 17));
-            String message = format.substring(26, format.length()-11);
-            TextColor end = new TextColor(format.substring(19, 25));
-            String applied = asGradient(start, message, end);
-            replaced = replaced.replace(format, applied);
-        }
-        return replaced;
-    }
-}
@@ -1,16 +1,19 @@
 package me.neznamy.tab.api.event;

+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 {

    /**
     * Scans the given listener for any method that is annotated with
     * {@link Subscribe} and registers it as a listener to this event bus.
     *
-     * All methods in this class that are annotated with {@link Subscribe}
+     * <p>All methods in this class that are annotated with {@link Subscribe}
     * must meet the following criteria:
     * <ul>
     *     <li>It must be <strong>public</strong>.</li>
@@ -24,7 +27,7 @@ public interface EventBus {
     * @param listener the listener to register
     * @throws RuntimeException if a method does not meet the criteria
     */
-    void register(Object listener);
+    void register(@NonNull Object listener);

    /**
     * Registers the given handler to this event bus.
@@ -33,7 +36,7 @@ public interface EventBus {
     * @param handler the handler to register
     * @param <E> the type of the event
     */
-    <E extends TabEvent> void register(Class<E> type, EventHandler<E> handler);
+    <E extends TabEvent> void register(@NonNull Class<E> type, @NonNull EventHandler<E> handler);

    /**
     * Scans the given listener for any method that is annotated with
@@ -41,7 +44,7 @@ public interface EventBus {
     *
     * @param listener the listener to unregister
     */
-    void unregister(Object listener);
+    void unregister(@NonNull Object listener);

    /**
     * Unregisters the given handler from this event bus.
@@ -49,5 +52,5 @@ public interface EventBus {
     * @param handler the handler to unregister
     * @param <E> the type of the event
     */
-    <E extends TabEvent> void unregister(EventHandler<E> handler);
+    <E extends TabEvent> void unregister(@NonNull EventHandler<E> handler);
 }
@@ -3,7 +3,7 @@ package me.neznamy.tab.api.event;
 /**
 * An event that may be fired by TAB when something occurs.
 *
- * This is a marker interface. All events <strong>must</strong> implement this
+ * <p>This is a marker interface. All events <strong>must</strong> implement this
 * interface.
 */
 public interface TabEvent {
@@ -2,6 +2,7 @@ package me.neznamy.tab.api.event.player;

 import me.neznamy.tab.api.TabPlayer;
 import me.neznamy.tab.api.event.TabEvent;
+import org.jetbrains.annotations.NotNull;

 /**
 * Called when the player has been fully loaded by TAB.
@@ -13,13 +14,13 @@ public interface PlayerLoadEvent extends TabEvent {
     *
     * @return  the player that was loaded
     */
-    TabPlayer getPlayer();
+    @NotNull TabPlayer getPlayer();

    /**
-     * Returns true if player was loaded because they joined,
-     * false if the player was loaded because tab reload command was executed
+     * Returns {@code true} if player was loaded because they joined,
+     * {@code false} if the player was loaded because tab reload command was executed
     *
-     * @return  true if player joined, false if plugin was reloaded
+     * @return  {@code true} if player joined, {@code false} if plugin was reloaded
     */
    boolean isJoin();
 }
@@ -1,11 +0,0 @@
-package me.neznamy.tab.api.event.plugin;
-
-import me.neznamy.tab.api.event.TabEvent;
-import me.neznamy.tab.api.placeholder.Placeholder;
-
-public interface PlaceholderRegisterEvent extends TabEvent {
-
-    String getIdentifier();
-
-    void setPlaceholder(Placeholder placeholder);
-}
@@ -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;
+    }
+}
@@ -0,0 +1,289 @@
+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;
+
+/**
+ * Interface for manipulating player name tags.
+ * <p>
+ * Instance can be obtained using {@link TabAPI#getNameTagManager()}.
+ * This requires the Team feature to be enabled in config, otherwise the method will
+ * return {@code null}.
+ */
+@SuppressWarnings("unused") // API class
+public interface NameTagManager {
+
+    /**
+     * Makes player's NameTag globally invisible
+     *
+     * @param   player
+     *          player to hide name tag of
+     * @see     #showNameTag(TabPlayer)
+     * @see     #hasHiddenNameTag(TabPlayer)
+     */
+    void hideNameTag(@NonNull TabPlayer player);
+
+    /**
+     * Hides player's NameTag for specified player until it's shown again
+     *
+     * @param   player
+     *          player to hide name tag of
+     * @param   viewer
+     *          player to hide name tag for
+     */
+    void hideNameTag(@NonNull TabPlayer player, @NonNull TabPlayer viewer);
+
+    /**
+     * Makes player's NameTag visible again
+     *
+     * @param   player
+     *          player to show name tag of
+     * @see     #hideNameTag(TabPlayer)
+     * @see     #hasHiddenNameTag(TabPlayer)
+     */
+    void showNameTag(@NonNull TabPlayer player);
+
+    /**
+     * Shows player's NameTag for specified viewer if it was hidden before
+     *
+     * @param   player
+     *          player to show name tag of
+     * @param   viewer
+     *          player to show NameTag back for
+     */
+    void showNameTag(@NonNull TabPlayer player, @NonNull TabPlayer viewer);
+
+    /**
+     * Return whether player has hidden NameTag or not
+     *
+     * @param   player
+     *          player to check name tag visibility status of
+     * @return  Whether player has hidden NameTag or not
+     * @see     #hideNameTag(TabPlayer)
+     * @see     #showNameTag(TabPlayer)
+     */
+    boolean hasHiddenNameTag(@NonNull TabPlayer player);
+
+    /**
+     * Returns true if NameTag is hidden for specified viewer, false if not
+     *
+     * @param   player
+     *          player to check visibility status of
+     * @param   viewer
+     *          player to check visibility status for
+     * @return  true if hidden, false if not
+     */
+    boolean hasHiddenNameTag(@NonNull TabPlayer player, @NonNull TabPlayer viewer);
+
+    /**
+     * Unregisters player's team and no longer handles it, as well as disables anti-override for teams.
+     * This can be resumed using resumeTeamHandling(). If team handling was paused already, nothing happens.
+     *
+     * @param   player
+     *          player to pause team handling of
+     */
+    void pauseTeamHandling(@NonNull TabPlayer player);
+
+    /**
+     * Resumes team handling if it was before paused using pauseTeamHandling(), if not, nothing happens
+     *
+     * @param   player
+     *          player to resume team handling of
+     */
+    void resumeTeamHandling(@NonNull TabPlayer player);
+
+    /**
+     * Returns true if team handling is paused for this player using pauseTeamHandling(), false if not, or
+     * it was resumed already using resumeTeamHandling
+     *
+     * @param   player
+     *          player to check handling status of
+     * @return  true if paused, false if not
+     */
+    boolean hasTeamHandlingPaused(@NonNull TabPlayer player);
+
+    /**
+     * Forces collision rule for the player. Setting it to null will remove forced value
+     *
+     * @param   player
+     *          player to set collision rule of
+     * @param   collision
+     *          forced collision rule
+     */
+    void setCollisionRule(@NonNull TabPlayer player, @Nullable Boolean collision);
+
+    /**
+     * Returns forced collision rule or null if collision is not forced using setCollisionRule
+     *
+     * @param   player
+     *          player to get forced collision of
+     * @return  forced value or null if not forced
+     */
+    @Nullable Boolean getCollisionRule(@NonNull TabPlayer player);
+
+    /**
+     * Changes player's prefix to provided value. Supports placeholders,
+     * as well as any supported RGB formats. Use {@code null} to reset
+     * value back to original.
+     *
+     * @param   player
+     *          player to change prefix of
+     * @param   prefix
+     *          new prefix value
+     * @see     #getCustomPrefix(TabPlayer)
+     * @see     #getOriginalRawPrefix(TabPlayer)
+     */
+    void setPrefix(@NonNull TabPlayer player, @Nullable String prefix);
+
+    /**
+     * Changes player's suffix to provided value. Supports placeholders,
+     * as well as any supported RGB formats. Use {@code null} to reset
+     * value back to original.
+     *
+     * @param   player
+     *          player to change prefix of
+     * @param   suffix
+     *          new suffix value
+     * @see     #getCustomSuffix(TabPlayer)
+     * @see     #getOriginalRawSuffix(TabPlayer)
+     */
+    void setSuffix(@NonNull TabPlayer player, @Nullable String suffix);
+
+    /**
+     * 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);
+
+    /**
+     * 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);
+
+    /**
+     * 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 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 the second call, they will become visible again.
+     *
+     * @param   player
+     *          player to toggle name tag visibility view for
+     * @param   sendToggleMessage
+     *          {@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,
+     * {@code false} if not.
+     *
+     * @param   player
+     *          player to check
+     * @return  {@code true} if hidden, {@code false} if not
+     */
+    boolean hasHiddenNameTagVisibilityView(@NonNull TabPlayer player);
+}
@@ -1,14 +1,23 @@
 package me.neznamy.tab.api.placeholder;

+import org.jetbrains.annotations.NotNull;
+
+/**
+ * An interface representing some kind of placeholder
+ */
 public interface Placeholder {

+    /**
+     * Returns refresh interval of this placeholder
+     *
+     * @return  refresh interval of this placeholder
+     */
    int getRefresh();

-    String getIdentifier();
-
-    void enableTriggerMode(Runnable onActivation, Runnable onDisable);
-
-    void unload();
-
-    boolean isUsed();
+    /**
+     * Returns placeholder's identifier
+     *
+     * @return  placeholder's identifier
+     */
+    @NotNull String getIdentifier();
 }
@@ -1,53 +1,103 @@
 package me.neznamy.tab.api.placeholder;

-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 java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Supplier;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;

-import me.neznamy.tab.api.TabFeature;
-import me.neznamy.tab.api.TabPlayer;
-
+/**
+ * An interface allowing placeholder registration. Instance can be
+ * obtained using {@link TabAPI#getPlaceholderManager()}
+ */
+@SuppressWarnings("unused") // API class
 public interface PlaceholderManager {

    /**
     * Registers a server placeholder (placeholder with same output for all players)
-     */
-    ServerPlaceholder registerServerPlaceholder(String identifier, int refresh, Supplier<Object> supplier);
-
-    /**
-     * Registers a player placeholder (placeholder with player-specific output)
-     */
-    PlayerPlaceholder registerPlayerPlaceholder(String identifier, int refresh, Function<TabPlayer, Object> function);
-
-    /**
-     * Registers a relational placeholder (different output for each player pair)
-     */
-    RelationalPlaceholder registerRelationalPlaceholder(String identifier, int refresh, BiFunction<TabPlayer, TabPlayer, Object> function);
-
-    /**
-     * Detects placeholders in text using %% pattern and returns list of all detected identifiers
-     *
-     * @param   text
-     *          text to detect placeholders in
-     * @return  list of detected identifiers
-     */
-    List<String> detectPlaceholders(String text);
-
-    /**
-     * Adds placeholder to list of used placeholders and assigns this feature as using it,
-     * which will then receive refresh() if values changes
     *
     * @param   identifier
-     *          placeholder identifier
-     * @param   feature
-     *          feature using the placeholder
+     *          Placeholder identifier
+     * @param   refresh
+     *          Refresh interval
+     * @param   supplier
+     *          Supplier for placeholder output
+     * @return  Registered placeholder for further use
+     * @throws  IllegalArgumentException
+     *          If {@code identifier} does not start and end with {@code %} or
+     *          {@code refresh} is not divisible by 50
     */
-    void addUsedPlaceholder(String identifier, TabFeature feature);
+    @NotNull ServerPlaceholder registerServerPlaceholder(@NonNull String identifier, int refresh, @NonNull Supplier<String> supplier);

-    String findReplacement(String placeholder, String output);
+    /**
+     * Registers a player placeholder (placeholder different output per player)
+     *
+     * @param   identifier
+     *          Placeholder identifier
+     * @param   refresh
+     *          Refresh interval
+     * @param   function
+     *          Function for placeholder output
+     * @return  Registered placeholder for further use
+     * @throws  IllegalArgumentException
+     *          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, String> function);

-    List<String> getUsedPlaceholders();
+    /**
+     * Registers a relational placeholder (placeholder with output different for each player duo)
+     *
+     * @param   identifier
+     *          Placeholder identifier
+     * @param   refresh
+     *          Refresh interval
+     * @param   function
+     *          Function for placeholder output
+     * @return  Registered placeholder for further use
+     * @throws  IllegalArgumentException
+     *          If {@code identifier} does not start and end with {@code %},
+     *          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, String> function);

-    Placeholder getPlaceholder(String identifier);
+    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
+     * as a PlaceholderAPI placeholder and returned.
+     *
+     * @param   identifier
+     *          Placeholder identifier
+     * @return  Placeholder with specified identifier
+     */
+    @NotNull Placeholder getPlaceholder(@NonNull String identifier);
+
+    /**
+     * Unregisters placeholder and makes plugin no longer refresh it.
+     *
+     * @param   placeholder
+     *          Placeholder to unregister
+     */
+    void unregisterPlaceholder(@NonNull Placeholder placeholder);
+
+    /**
+     * Unregisters placeholder and makes plugin no longer refresh it.
+     *
+     * @param   identifier
+     *          identifier of placeholder to unregister
+     */
+    void unregisterPlaceholder(@NonNull String identifier);
 }
@@ -1,28 +1,31 @@
 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)
+ */
 public interface PlayerPlaceholder extends Placeholder {

-    void updateValue(TabPlayer player, Object value);
-
    /**
-     * Calls the placeholder request function and returns the output.
-     * If the placeholder threw an exception, it is logged in {@code placeholder-errors.log}
-     * file and "ERROR" is returned.
-     *
-     * @param   p
-     *          player to get placeholder value for
-     * @return  value placeholder returned or "ERROR" if it threw an error
-     */
-    Object request(TabPlayer p);
-
-    /**
-     * Returns last known value for given player.
+     * Force-updates placeholder value. It will still be overridden by periodic refresh later,
+     * so this is (only) useful for force an update when value is supposed to change, and you have
+     * a high refresh interval set.
     *
     * @param   player
-     *          player to get last value for
-     * @return  last known value for entered player
+     *          Player to update value for
+     * @param   value
+     *          New value
     */
-    String getLastValue(TabPlayer player);
+    void updateValue(@NonNull TabPlayer player, @Nullable String value);
+
+    /**
+     * Force-updates placeholder value using previously provided update function.
+     *
+     * @param   player
+     *          Player to update value for
+     */
+    void update(@NonNull TabPlayer player);
 }
@@ -1,33 +1,36 @@
 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 {

-    void updateValue(TabPlayer viewer, TabPlayer target, Object value);
-
    /**
-     * Calls the placeholder request function and returns the output.
-     * If the placeholder threw an exception, it is logged in {@code placeholder-errors.log}
-     * file and "ERROR" is returned.
+     * Force-updates placeholder value. It will still be overridden by periodic refresh later,
+     * so this is (only) useful for force an update when value is supposed to change, and you have
+     * a high refresh interval set.
     *
     * @param   viewer
-     *          player looking at output of the placeholder
+     *          Placeholder viewer
     * @param   target
-     *          player the placeholder is displayed on
-     * @return  value placeholder returned or "ERROR" if it threw an error
+     *          Placeholder target
+     * @param   value
+     *          New value
     */
-    Object request(TabPlayer viewer, TabPlayer target);
+    void updateValue(@NonNull TabPlayer viewer, @NonNull TabPlayer target, @Nullable String value);

    /**
-     * Returns last known value for given players. First player is viewer,
-     * second player is target.
+     * Force-updates placeholder value using previously provided update function.
     *
     * @param   viewer
-     *          viewer of the placeholder
+     *          Placeholder viewer
     * @param   target
-     *          target who is the text displayed on
-     * @return  last known value for entered player duo
+     *          Placeholder target
     */
-    String getLastValue(TabPlayer viewer, TabPlayer target);
+    void update(@NonNull TabPlayer viewer, @NonNull TabPlayer target);
 }
@@ -1,22 +1,24 @@
 package me.neznamy.tab.api.placeholder;

+import org.jetbrains.annotations.Nullable;
+
+/**
+ * An interface for server placeholders (returning same value for all players)
+ */
 public interface ServerPlaceholder extends Placeholder {

-    void updateValue(Object value);
+    /**
+     * Force-updates placeholder value. It will still be overridden by periodic refresh later,
+     * so this is (only) useful for force an update when value is supposed to change, and you have
+     * a high refresh interval set.
+     *
+     * @param   value
+     *          New value
+     */
+    void updateValue(@Nullable String value);

    /**
-     * Calls the placeholder request function and returns the output.
-     * If the placeholder threw an exception, it is logged in {@code placeholder-errors.log}
-     * file and "ERROR" is returned.
-     *
-     * @return  value placeholder returned or "ERROR" if it threw an error
+     * Force-updates placeholder value using previously provided update function.
     */
-    Object request();
-
-    /**
-     * Returns last known value of the placeholder.
-     *
-     * @return  last known value
-     */
-    String getLastValue();
+    void update();
 }
@@ -1,255 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-import lombok.NonNull;
-import me.neznamy.tab.api.ProtocolVersion;
-import me.neznamy.tab.api.chat.EnumChatFormat;
-import me.neznamy.tab.api.chat.IChatBaseComponent;
-import me.neznamy.tab.api.chat.rgb.RGBUtils;
-import me.neznamy.tab.api.util.BiFunctionWithException;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * A class for packet building, methods are overridden in
- * platform-specific builders which extend this class to build actual packets.
- * Packets which don't have a method override are forwarded into
- * sendPacket method, where they are handled using platform's API instead.
- */
-public class PacketBuilder {
-
-    /** Function map turning custom packet class into platform-specific packets */
-    protected final Map<Class<? extends TabPacket>, BiFunctionWithException<TabPacket, ProtocolVersion, Object>> buildMap = new HashMap<>();
-
-    /**
-     * Constructs new instance and fills {@link #buildMap} with abstract build methods
-     * of packets present on all platforms.
-     */
-    public PacketBuilder() {
-        buildMap.put(PacketPlayOutBoss.class, (packet, version) -> build((PacketPlayOutBoss)packet, version));
-        buildMap.put(PacketPlayOutChat.class, (packet, version) -> build((PacketPlayOutChat)packet, version));
-        buildMap.put(PacketPlayOutPlayerInfo.class, (packet, version) -> build((PacketPlayOutPlayerInfo)packet, version));
-        buildMap.put(PacketPlayOutPlayerListHeaderFooter.class, (packet, version) -> build((PacketPlayOutPlayerListHeaderFooter)packet, version));
-        buildMap.put(PacketPlayOutScoreboardDisplayObjective.class, (packet, version) -> build((PacketPlayOutScoreboardDisplayObjective)packet, version));
-        buildMap.put(PacketPlayOutScoreboardObjective.class, (packet, version) -> build((PacketPlayOutScoreboardObjective)packet, version));
-        buildMap.put(PacketPlayOutScoreboardScore.class, (packet, version) -> build((PacketPlayOutScoreboardScore)packet, version));
-        buildMap.put(PacketPlayOutScoreboardTeam.class, (packet, version) -> build((PacketPlayOutScoreboardTeam)packet, version));
-    }
-
-    /**
-     * Converts custom packet into platform-specific packet by calling a function from
-     * {@link #buildMap}.
-     *
-     * @param   packet
-     *          Packet to build
-     * @param   clientVersion
-     *          Protocol version of player to build the packet for
-     * @return  Platform-specific packet
-     * @throws  ReflectiveOperationException
-     *          if reflection fails
-     */
-    public Object build(@NonNull TabPacket packet, @NonNull ProtocolVersion clientVersion) throws ReflectiveOperationException {
-        return buildMap.get(packet.getClass()).apply(packet, clientVersion);
-    }
-
-    /**
-     * Constructs platform-specific PacketPlayOutBoss class based on custom packet class
-     *
-     * @param   packet
-     *          Custom packet to be built
-     * @param   clientVersion
-     *          Protocol version of player to build the packet for
-     * @return  Platform-specific packet
-     * @throws  ReflectiveOperationException
-     *          if thrown by reflective operation
-     */
-    public Object build(PacketPlayOutBoss packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-        return packet;
-    }
-
-    /**
-     * Constructs platform-specific PacketPlayOutChat class based on custom packet class
-     *
-     * @param   packet
-     *          Custom packet to be built
-     * @param   clientVersion
-     *          Protocol version of player to build the packet for
-     * @return  Platform-specific packet
-     */
-    public Object build(PacketPlayOutChat packet, ProtocolVersion clientVersion) {
-        return packet;
-    }
-
-    /**
-     * Constructs platform-specific PacketPlayOutPlayerInfo class based on custom packet class
-     *
-     * @param   packet
-     *          Custom packet to be built
-     * @param   clientVersion
-     *          Protocol version of player to build the packet for
-     * @return  Platform-specific packet
-     * @throws  ReflectiveOperationException
-     *          if thrown by reflective operation
-     */
-    public Object build(PacketPlayOutPlayerInfo packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-        return packet;
-    }
-
-    /**
-     * Constructs platform-specific PacketPlayOutPlayerListHeaderFooter class based on custom packet class
-     *
-     * @param   packet
-     *          Custom packet to be built
-     * @param   clientVersion
-     *          Protocol version of player to build the packet for
-     * @return  Platform-specific packet
-     */
-    public Object build(PacketPlayOutPlayerListHeaderFooter packet, ProtocolVersion clientVersion) {
-        return packet;
-    }
-
-    /**
-     * Constructs platform-specific PacketPlayOutScoreboardDisplayObjective class based on custom packet class
-     *
-     * @param   packet
-     *          Custom packet to be built
-     * @param   clientVersion
-     *          Protocol version of player to build the packet for
-     * @return  Platform-specific packet
-     */
-    public Object build(PacketPlayOutScoreboardDisplayObjective packet, ProtocolVersion clientVersion) {
-        return packet;
-    }
-
-    /**
-     * Constructs platform-specific PacketPlayOutScoreboardObjective class based on custom packet class
-     *
-     * @param   packet
-     *          Custom packet to be built
-     * @param   clientVersion
-     *          Protocol version of player to build the packet for
-     * @return  Platform-specific packet
-     */
-    public Object build(PacketPlayOutScoreboardObjective packet, ProtocolVersion clientVersion) {
-        return packet;
-    }
-
-    /**
-     * Constructs platform-specific PacketPlayOutScoreboardScore class based on custom packet class
-     *
-     * @param   packet
-     *          Custom packet to be built
-     * @param   clientVersion
-     *          Protocol version of player to build the packet for
-     * @return  Platform-specific packet
-     */
-    public Object build(PacketPlayOutScoreboardScore packet, ProtocolVersion clientVersion) {
-        return packet;
-    }
-
-    /**
-     * Constructs platform-specific PacketPlayOutScoreboardTeam class based on custom packet class
-     *
-     * @param   packet
-     *          Custom packet to be built
-     * @param   clientVersion
-     *          Protocol version of player to build the packet for
-     * @return  Platform-specific packet
-     */
-    public Object build(PacketPlayOutScoreboardTeam packet, ProtocolVersion clientVersion) {
-        return packet;
-    }
-
-    /**
-     * Cuts given string to specified character length (or length-1 if last character is a color character)
-     * and translates RGB to legacy colors. If string is not that long, the original string is returned.
-     * RGB codes are converted into legacy, since cutting is only needed for &lt;1.13.
-     * If {@code string} is {@code null}, empty string is returned.
-     *
-     * @param   string
-     *          String to cut
-     * @param   length
-     *          Length to cut to
-     * @return  string cut to {@code length} characters
-     */
-    public String cutTo(String string, int length) {
-        if (string == null) return "";
-        String legacyText = string;
-        if (string.contains("#")) {
-            //converting RGB to legacy colors
-            legacyText = RGBUtils.getInstance().convertRGBtoLegacy(string);
-        }
-        if (legacyText.length() <= length) return legacyText;
-        if (legacyText.charAt(length-1) == EnumChatFormat.COLOR_CHAR) {
-            return legacyText.substring(0, length-1); //cutting one extra character to prevent prefix ending with "&"
-        } else {
-            return legacyText.substring(0, length);
-        }
-    }
-
-    /**
-     * If {@code clientVersion} is &gt;= 1.13, creates a component from given text and returns
-     * it as a serialized component, which BungeeCord uses.
-     * <p>
-     * If {@code clientVersion} is &lt; 1.12, the text is cut to {@code length} characters if
-     * needed and returned.
-     *
-     * @param   text
-     *          Text to convert
-     * @param   clientVersion
-     *          Version of player to convert text for
-     * @return  serialized component for 1.13+ clients, cut string for 1.12-
-     */
-    public String jsonOrCut(String text, ProtocolVersion clientVersion, int length) {
-        if (text == null) return null;
-        if (clientVersion.getMinorVersion() >= 13) {
-            return IChatBaseComponent.optimizedComponent(text).toString(clientVersion);
-        } else {
-            return cutTo(text, length);
-        }
-    }
-
-    /**
-     * Converts platform-specific instance of player info packet into
-     * {@link PacketPlayOutPlayerInfo} object.
-     *
-     * @param   packet
-     *          platform-specific info packet
-     * @param   clientVersion
-     *          Version of client receiving the packet
-     * @return  The packet converted into {@link PacketPlayOutPlayerInfo}
-     * @throws  ReflectiveOperationException
-     *          if thrown by reflective operation
-     */
-    public PacketPlayOutPlayerInfo readPlayerInfo(Object packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-        return null;
-    }
-
-    /**
-     * Converts platform-specific instance of objective packet into
-     * {@link PacketPlayOutScoreboardObjective} object.
-     *
-     * @param   packet
-     *          platform-specific objective packet
-     * @return  The packet converted into {@link PacketPlayOutScoreboardObjective}
-     * @throws  ReflectiveOperationException
-     *          if thrown by reflective operation
-     */
-    public PacketPlayOutScoreboardObjective readObjective(Object packet) throws ReflectiveOperationException {
-        return null;
-    }
-
-    /**
-     * Converts platform-specific instance of display objective packet into
-     * {@link PacketPlayOutScoreboardDisplayObjective} object.
-     *
-     * @param   packet
-     *          platform-specific display objective packet
-     * @return  The packet converted into {@link PacketPlayOutScoreboardDisplayObjective}
-     * @throws  ReflectiveOperationException
-     *          if thrown by reflective operation
-     */
-    public PacketPlayOutScoreboardDisplayObjective readDisplayObjective(Object packet) throws ReflectiveOperationException {
-        return null;
-    }
-}
@@ -1,175 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-import lombok.Data;
-import lombok.NonNull;
-import me.neznamy.tab.api.bossbar.BarColor;
-import me.neznamy.tab.api.bossbar.BarStyle;
-
-import java.util.UUID;
-
-/**
- * A class representing platform specific packet class
- */
-@Data
-public class PacketPlayOutBoss implements TabPacket {
-
-    /** UUID of the BossBar */
-    private final UUID id;
-
-    /** Action of this packet */
-    private Action action;
-
-    /** BossBar title */
-    private String name;
-
-    /** BossBar progress (0-1)*/
-    private float pct;
-
-    /** BossBar color */
-    private BarColor color;
-
-    /** BossBar style */
-    private BarStyle overlay;
-
-    /** Darken screen flag */
-    private boolean darkenScreen;
-
-    /** Play music flag */
-    private boolean playMusic;
-
-    /** Create fog flag */
-    private boolean createWorldFog;
-
-    /**
-     * Constructs new instance with given parameters and
-     * {@link me.neznamy.tab.api.protocol.PacketPlayOutBoss.Action}.ADD action
-     *
-     * @param   id
-     *          BossBar uuid
-     * @param   name
-     *          BossBar title
-     * @param   pct
-     *          BossBar progress
-     * @param   color
-     *          BossBar color
-     * @param   overlay
-     *          BossBar style
-     */
-    public PacketPlayOutBoss(@NonNull UUID id, @NonNull String name, float pct, @NonNull BarColor color, @NonNull BarStyle overlay) {
-        this.action = Action.ADD;
-        this.id = id;
-        this.name = name;
-        this.pct = pct;
-        this.color = color;
-        this.overlay = overlay;
-    }
-
-    /**
-     * Constructs new instance with given parameters and
-     * {@link me.neznamy.tab.api.protocol.PacketPlayOutBoss.Action#REMOVE} action
-     *
-     * @param   id
-     *          BossBar uuid
-     */
-    public PacketPlayOutBoss(@NonNull UUID id) {
-        this.action = Action.REMOVE;
-        this.id = id;
-    }
-
-    /**
-     * Constructs new instance with given parameters and
-     * {@link me.neznamy.tab.api.protocol.PacketPlayOutBoss.Action#UPDATE_PCT} action
-     *
-     * @param   id
-     *          BossBar uuid
-     * @param   pct
-     *          BossBar progress
-     */
-    public PacketPlayOutBoss(@NonNull UUID id, float pct) {
-        this.action = Action.UPDATE_PCT;
-        this.id = id;
-        this.pct = pct;
-    }
-
-    /**
-     * Constructs new instance with given parameters and
-     * {@link me.neznamy.tab.api.protocol.PacketPlayOutBoss.Action#UPDATE_NAME} action
-     *
-     * @param   id
-     *          BossBar uuid
-     * @param   name
-     *          BossBar title
-     */
-    public PacketPlayOutBoss(@NonNull UUID id, @NonNull String name) {
-        this.action = Action.UPDATE_NAME;
-        this.id = id;
-        this.name = name;
-    }
-
-    /**
-     * Constructs new instance with given parameters and
-     * {@link me.neznamy.tab.api.protocol.PacketPlayOutBoss.Action#UPDATE_STYLE} action
-     *
-     * @param   id
-     *          BossBar uuid
-     * @param   color
-     *          BossBar color
-     * @param   overlay
-     *          BossBar style
-     */
-    public PacketPlayOutBoss(@NonNull UUID id, @NonNull BarColor color, @NonNull BarStyle overlay) {
-        this.action = Action.UPDATE_STYLE;
-        this.id = id;
-        this.color = color;
-        this.overlay = overlay;
-    }
-
-    /**
-     * Constructs new instance with given parameters and
-     * {@link me.neznamy.tab.api.protocol.PacketPlayOutBoss.Action#UPDATE_PROPERTIES} action
-     *
-     * @param   darkenScreen
-     *          Darken screen flag
-     * @param   playMusic
-     *          Play music flag
-     * @param   createWorldFog
-     *          Create fog flag
-     */
-    public PacketPlayOutBoss(@NonNull UUID id, boolean darkenScreen, boolean playMusic, boolean createWorldFog) {
-        this.action = Action.UPDATE_PROPERTIES;
-        this.id = id;
-        this.darkenScreen = darkenScreen;
-        this.playMusic = playMusic;
-        this.createWorldFog = createWorldFog;
-    }
-
-    /**
-     * Returns bitmask based on {@link #darkenScreen}, {@link #playMusic} and {@link #darkenScreen} values.
-     * <p>
-     * {@link #darkenScreen} adds {@code 1}, {@link #playMusic} {@code 2} and {@link #darkenScreen} {@code 4}
-     * to the final value.
-     *
-     * @return  the bitmask
-     */
-    public byte getFlags() {
-        byte value = 0;
-        if (darkenScreen) value += 1;
-        if (playMusic) value += 2;
-        if (createWorldFog) value += 4;
-        return value;
-    }
-
-    /**
-     * An enum representing all valid boss packet actions.
-     * Calling ordinal() will return action's network ID.
-     */
-    public enum Action {
-
-        ADD,
-        REMOVE,
-        UPDATE_PCT,
-        UPDATE_NAME,
-        UPDATE_STYLE,
-        UPDATE_PROPERTIES
-    }
-}
@@ -1,29 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-import lombok.Data;
-import lombok.NonNull;
-import me.neznamy.tab.api.chat.IChatBaseComponent;
-
-/**
- * A class representing platform specific packet class
- */
-@Data
-public class PacketPlayOutChat implements TabPacket {
-
-    /** Message to be sent */
-    @NonNull private final IChatBaseComponent message;
-
-    /** Message position */
-    @NonNull private final ChatMessageType type;
-
-    /**
-     * An enum representing positions of a chat message
-     * Calling ordinal() will return type's network ID.
-     */
-    public enum ChatMessageType {
-
-        CHAT,
-        SYSTEM,
-        GAME_INFO
-    }
-}
@@ -1,190 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NonNull;
-import me.neznamy.tab.api.chat.IChatBaseComponent;
-
-import java.util.Arrays;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.UUID;
-
-/**
- * A class representing platform specific packet class
- */
-@Data @AllArgsConstructor
-public class PacketPlayOutPlayerInfo implements TabPacket {
-
-    /** Packet actions */
-    private final EnumSet<EnumPlayerInfoAction> actions;
-
-    /** List of affected entries */
-    private final List<PlayerInfoData> entries;
-
-    /**
-     * Constructs new instance with given parameters.
-     * 
-     * @param   action
-     *          Packet action
-     * @param   entries
-     *          Affected entries
-     */
-    public PacketPlayOutPlayerInfo(EnumPlayerInfoAction action, PlayerInfoData... entries) {
-        this(action, Arrays.asList(entries));
-    }
-
-    /**
-     * Constructs new instance with given parameters.
-     * 
-     * @param   action
-     *          Packet action
-     * @param   entries
-     *          Affected entries
-     */
-    public PacketPlayOutPlayerInfo(@NonNull EnumPlayerInfoAction action, @NonNull List<PlayerInfoData> entries) {
-        if (action == EnumPlayerInfoAction.ADD_PLAYER) {
-            actions = EnumSet.of(EnumPlayerInfoAction.ADD_PLAYER,
-                    EnumPlayerInfoAction.INITIALIZE_CHAT,
-                    EnumPlayerInfoAction.UPDATE_GAME_MODE,
-                    EnumPlayerInfoAction.UPDATE_LISTED,
-                    EnumPlayerInfoAction.UPDATE_LATENCY,
-                    EnumPlayerInfoAction.UPDATE_DISPLAY_NAME);
-        } else {
-            this.actions = EnumSet.of(action);
-        }
-        this.entries = entries;
-    }
-
-    /**
-     * Constructs new instance with given parameters.
-     *
-     * @param   actions
-     *          Packet actions
-     * @param   entries
-     *          Affected entries
-     */
-    public PacketPlayOutPlayerInfo(@NonNull EnumSet<EnumPlayerInfoAction> actions, @NonNull PlayerInfoData... entries) {
-        this.actions = actions;
-        this.entries = Arrays.asList(entries);
-    }
-
-    /**
-     * A subclass representing player list entry
-     */
-    @Data @AllArgsConstructor
-    public static class PlayerInfoData {
-
-        /** Real name of affected player */
-        private String name;
-
-        /** Player UUID */
-        @NonNull private UUID uniqueId;
-
-        /** Player's skin, null for empty skin */
-        private Skin skin;
-
-        /** I have no idea what this is */
-        private boolean listed;
-
-        /** Latency */
-        private int latency;
-
-        /** GameMode */
-        private EnumGamemode gameMode = EnumGamemode.SURVIVAL; //ProtocolLib causes NPE even when action does not use GameMode
-
-        /** 
-         * Display name displayed in TabList. Using {@code null} results in no display name
-         * and scoreboard team prefix/suffix being visible in TabList instead.
-         */
-        private IChatBaseComponent displayName;
-
-        /** Chat session ID */
-        private UUID chatSessionId;
-
-        /** Player's chat signing key */
-        private Object profilePublicKey;
-
-        /**
-         * Constructs new instance with given parameters. Suitable for 
-         * {@link EnumPlayerInfoAction#UPDATE_GAME_MODE} action
-         * 
-         * @param   uniqueId
-         *          Player's uuid
-         * @param   gameMode
-         *          Player's GameMode
-         */
-        public PlayerInfoData(@NonNull UUID uniqueId, EnumGamemode gameMode) {
-            this.uniqueId = uniqueId;
-            this.gameMode = gameMode;
-        }
-
-        /**
-         * Constructs new instance with given parameters. Suitable for 
-         * {@link EnumPlayerInfoAction#UPDATE_LATENCY} action
-         * 
-         * @param   uniqueId
-         *          Player's uuid
-         * @param   latency
-         *          Player's ping
-         */
-        public PlayerInfoData(@NonNull UUID uniqueId, int latency) {
-            this.uniqueId = uniqueId;
-            this.latency = latency;
-        }
-
-        /**
-         * Constructs new instance with given parameters. Suitable for 
-         * {@link EnumPlayerInfoAction#UPDATE_DISPLAY_NAME} action
-         * 
-         * @param   uniqueId
-         *          Player's uuid
-         * @param   displayName
-         *          Player's display name
-         */
-        public PlayerInfoData(@NonNull UUID uniqueId, IChatBaseComponent displayName) {
-            this.uniqueId = uniqueId;
-            this.displayName = displayName;
-        }
-
-        /**
-         * Constructs new instance with given parameter. Suitable for 
-         * {@link EnumPlayerInfoAction#REMOVE_PLAYER} action
-         * 
-         * @param   uniqueId
-         *          Player's uuid
-         */
-        public PlayerInfoData(@NonNull UUID uniqueId) {
-            this.uniqueId = uniqueId;
-        }
-    }
-
-    /**
-     * En enum representing packet action
-     */
-    public enum EnumPlayerInfoAction {
-
-        ADD_PLAYER,
-        INITIALIZE_CHAT,
-        UPDATE_GAME_MODE,
-        UPDATE_LISTED,
-        UPDATE_LATENCY,
-        UPDATE_DISPLAY_NAME,
-        REMOVE_PLAYER
-    }
-
-    /**
-     * An enum representing GameMode
-     */
-    public enum EnumGamemode {
-
-        NOT_SET,
-        SURVIVAL,
-        CREATIVE,
-        ADVENTURE,
-        SPECTATOR;
-
-        /** Value array to iterate over to avoid array creations on each call */
-        public static final EnumGamemode[] VALUES = values();
-    }
-}
@@ -1,33 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NonNull;
-import me.neznamy.tab.api.chat.IChatBaseComponent;
-
-/**
- * A class representing platform specific packet class
- */
-@Data @AllArgsConstructor
-public class PacketPlayOutPlayerListHeaderFooter implements TabPacket {
-
-    /** TabList header */
-    @NonNull private final IChatBaseComponent header;
-
-    /** TabList footer */
-    @NonNull private final IChatBaseComponent footer;
-
-    /**
-     * Constructs new instance with given parameters. They are converted to {@link IChatBaseComponent}
-     * using {@link IChatBaseComponent#optimizedComponent(String)} method.
-     * 
-     * @param   header
-     *          TabList header
-     * @param   footer
-     *          TabList footer
-     */
-    public PacketPlayOutPlayerListHeaderFooter(@NonNull String header, @NonNull String footer) {
-        this.header = IChatBaseComponent.optimizedComponent(header);
-        this.footer = IChatBaseComponent.optimizedComponent(footer);
-    }
-}
@@ -1,22 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-import lombok.Data;
-import lombok.NonNull;
-
-/**
- * A class representing platform specific packet class
- */
-@Data
-public class PacketPlayOutScoreboardDisplayObjective implements TabPacket {
-
-    /**
-     * Display slot.
-     * 0 = PlayerList,
-     * 1 = SideBar,
-     * 2 = BelowName.
-     */
-    private final int slot;
-
-    /** Up to 16 characters long objective name */
-    @NonNull private final String objectiveName;
-}
@@ -1,55 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NonNull;
-import me.neznamy.tab.api.util.Preconditions;
-
-/**
- * A class representing platform specific packet class
- */
-@Data @AllArgsConstructor
-public class PacketPlayOutScoreboardObjective implements TabPacket {
-
-    /**
-     * Packet action.
-     * 0 = register,
-     * 1 = unregister,
-     * 2 = update title
-     */
-    private final int action;
-
-    /** Up to 16 characters long objective name */
-    @NonNull private final String objectiveName;
-
-    /** Display name */
-    private final String displayName;
-
-    /** Display type, only takes effect in PlayerList */
-    private final EnumScoreboardHealthDisplay renderType;
-
-    /**
-     * Constructs new packet with given objective name and 1 (unregister) action.
-     *
-     * @param   objectiveName
-     *          objective name, up to 16 characters long
-     * @throws  IllegalArgumentException
-     *          if {@code objectiveName} is null or longer than 16 characters
-     */
-    public PacketPlayOutScoreboardObjective(@NonNull String objectiveName) {
-        Preconditions.checkMaxLength(objectiveName, 16, "objective name");
-        this.objectiveName = objectiveName;
-        this.displayName = ""; //avoiding NPE on <1.7
-        this.action = 1;
-        this.renderType = null;
-    }
-
-    /**
-     * An enum representing available display types.
-     * They only take effect in PlayerList position.
-     */
-    public enum EnumScoreboardHealthDisplay {
-
-        INTEGER, HEARTS
-    }
-}
@@ -1,32 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-import lombok.Data;
-import lombok.NonNull;
-
-/**
- * A class representing platform specific packet class
- */
-@Data
-public class PacketPlayOutScoreboardScore implements TabPacket {
-
-    /** Packet action */
-    @NonNull private final Action action;
-
-    /** Objective name */
-    @NonNull private final String objectiveName;
-
-    /** Affected player */
-    @NonNull private final String player;
-
-    /** Player's score */
-    private final int score;
-
-    /**
-     * An enum representing action types
-     */
-    public enum Action {
-
-        CHANGE,
-        REMOVE
-    }
-}
@@ -1,180 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-import lombok.Data;
-import lombok.NonNull;
-import me.neznamy.tab.api.chat.EnumChatFormat;
-import me.neznamy.tab.api.util.Preconditions;
-
-import java.util.Collection;
-import java.util.Collections;
-
-/**
- * A class representing platform specific packet class
- */
-@Data
-public class PacketPlayOutScoreboardTeam implements TabPacket {
-
-    /**
-     * Up to 16 characters long team name.
-     * It is used to sort players alphabetically in TabList by team names.
-     * Team-less players appear on top, sorted by usernames.
-     * Players with teams are below them, players of the same team are
-     * sorted alphabetically by usernames.
-     */
-    @NonNull private final String name;
-
-    /** Team prefix, limited to 16 characters, on &lt;1.13 */
-    private String playerPrefix;
-
-    /** Team suffix, limited to 16 characters, on &lt;1.13 */
-    private String playerSuffix;
-
-    /** 
-     * NameTag visibility rule since 1.8. Possible options are:
-     * {@code always}, {@code hideForOtherTeams}, {@code hideForOwnTeam}, {@code never}
-     */
-    private String nameTagVisibility;
-
-    /**
-     * Collision rule added in 1.9. Possible options are:
-     * {@code always}, {@code pushOtherTeams}, {@code pushOwnTeam}, {@code never}
-     */
-    private String collisionRule;
-
-    /**
-     * Team color field added in 1.13. It determines name color,
-     * prefix and suffix color start.
-     */
-    private EnumChatFormat color;
-
-    /** 
-     * Affected entities. For players, it is their name, for other entities their UUID
-     * Player name length is limited to 16 characters for &lt;1.8, 40 characters since 1.8.
-     * Entity UUID option was added in 1.8.
-     */
-    @NonNull private Collection<String> players = Collections.emptyList();
-
-    /**
-     * Packet action.
-     * 0 = create team,
-     * 1 = remove team,
-     * 2 = update team info,
-     * 3 = add entries,
-     * 4 = remove entries
-     */
-    private final int action;
-
-    /**
-     * Bit mask.
-     * 0x01: Allow friendly fire,
-     * 0x02: Can see invisible players on the same team.
-     */
-    private int options;
-
-    /**
-     * Constructs new instance with given parameters. Private constructor used
-     * internally to validate team name and set action.
-     * 
-     * @param   action
-     *          Packet action (0 = create team, 1 = remove team, 2 = update team info,
-     *          3 = add entries, 4 = remove entries)
-     * @param   name
-     *          Team name, up to 16 characters long
-     * @throws  IllegalArgumentException
-     *          if {@code name} is null, empty or longer than 16 characters
-     */
-    private PacketPlayOutScoreboardTeam(int action, @NonNull String name) {
-        Preconditions.checkMaxLength(name, 16, "team name");
-        this.action = action;
-        this.name = name;
-    }
-
-    /**
-     * Constructs new instance with given parameters and 0 (CREATE) action
-     * 
-     * @param   team
-     *          Team name, up to 16 characters long
-     * @param   prefix
-     *          Prefix of players in team
-     * @param   suffix
-     *          Suffix of players in team
-     * @param   visibility
-     *          NameTag visibility rule
-     * @param   collision
-     *          Collision rule
-     * @param   players
-     *          Affected entities
-     * @param   options
-     *          bitmask of team options
-     * @throws  IllegalArgumentException
-     *          if {@code name} is null, empty or longer than 16 characters
-     */
-    public PacketPlayOutScoreboardTeam(String team, @NonNull String prefix, @NonNull String suffix, String visibility,
-                                       String collision, @NonNull Collection<String> players, int options) {
-        this(0, team);
-        this.playerPrefix = prefix;
-        this.playerSuffix = suffix;
-        this.nameTagVisibility = visibility;
-        this.collisionRule = collision;
-        this.players = players;
-        this.options = options;
-    }
-
-    /**
-     * Constructs new instance with given parameters and 1 (REMOVE) action
-     * 
-     * @param   team
-     *          Team name, up to 16 characters long
-     * @throws  IllegalArgumentException
-     *          if {@code name} is null, empty or longer than 16 characters
-     */
-    public PacketPlayOutScoreboardTeam(String team) {
-        this(1, team);
-    }
-
-    /**
-     * Constructs new instance with given parameters and 2 (UPDATE_TEAM_INFO) action
-     * 
-     * @param   team
-     *          Team name, up to 16 characters long
-     * @param   prefix
-     *          Prefix of players in team
-     * @param   suffix
-     *          Suffix of players in team
-     * @param   visibility
-     *          NameTag visibility rule
-     * @param   collision
-     *          Collision rule
-     * @param   options
-     *          bitmask of team options
-     * @throws  IllegalArgumentException
-     *          if {@code name} is null, empty or longer than 16 characters
-     */
-    public PacketPlayOutScoreboardTeam(String team, @NonNull String prefix, @NonNull String suffix,
-                                       String visibility, String collision, int options) {
-        this(2, team);
-        this.playerPrefix = prefix;
-        this.playerSuffix = suffix;
-        this.nameTagVisibility = visibility;
-        this.collisionRule = collision;
-        this.options = options;
-    }
-
-    /**
-     * Constructs new instance with given parameters and 3 (ADD_PLAYERS) if {@code add} is {@code true}, 
-     * 4 (REMOVE_PLAYERS) if {@code add} is {@code false} action.
-     * 
-     * @param   team
-     *          Team name, up to 16 characters long
-     * @param   players
-     *          Affected entities
-     * @param   add
-     *          {@code true} if players should be added, {@code false} if removed from team
-     * @throws  IllegalArgumentException
-     *          if {@code name} is null, empty or longer than 16 characters
-     */
-    public PacketPlayOutScoreboardTeam(String team, @NonNull Collection<String> players, boolean add) {
-        this(add ? 3 : 4, team);
-        this.players = players;
-    }
-}
@@ -1,18 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NonNull;
-
-/**
- * Class representing a minecraft skin as a value - signature pair.
- */
-@Data @AllArgsConstructor
-public class Skin {
-
-    /** Skin value */
-    @NonNull private final String value;
-
-    /** Skin signature, can be null */
-    private final String signature;
-}
@@ -1,17 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-/**
- * Interface representing a packet that can be sent to client independently of platform.
- * It is technically empty, existence is only present to restrict type access
- * when sending packets to player, so {@link me.neznamy.tab.api.TabPlayer#sendCustomPacket(TabPacket)} cannot
- * be called with an actual packet.
- */
-public interface TabPacket {
-
-    /**
-     * Returns user-friendly string representation of the packet
-     *
-     * @return  user-friendly string representation of the packet
-     */
-    String toString();
-}
@@ -1,5 +1,8 @@
 package me.neznamy.tab.api.scoreboard;

+import lombok.NonNull;
+import org.jetbrains.annotations.NotNull;
+
 /**
 * An interface allowing to work with a line of
 * text in scoreboard.
@@ -13,7 +16,7 @@ public interface Line {
     * 
     * @return  raw text of this line
     */
-    String getText();
+    @NotNull String getText();
    
    /**
     * Changes text to new value. Supports placeholders, which are
@@ -25,5 +28,5 @@ public interface Line {
     * @param   text
     *          Raw text to display in the line
     */
-    void setText(String text);
+    void setText(@NonNull String text);
 }
@@ -1,5 +1,8 @@
 package me.neznamy.tab.api.scoreboard;

+import lombok.NonNull;
+import org.jetbrains.annotations.NotNull;
+
 import java.util.List;

 /**
@@ -8,16 +11,17 @@ 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
     */
-    String getName();
+    @NotNull String getName();

    /**
     * Returns raw title of this scoreboard. Placeholders stay in their
@@ -26,7 +30,7 @@ public interface Scoreboard {
     * @return  scoreboard title
     * @see     #setTitle(String)
     */
-    String getTitle();
+    @NotNull String getTitle();

    /**
     * Sets title to specified value. Placeholders are refreshed automatically
@@ -43,7 +47,7 @@ public interface Scoreboard {
     *          New title to use with placeholder support
     * @see     #getTitle()
     */
-    void setTitle(String title);
+    void setTitle(@NonNull String title);

    /**
     * Returns list of lines in this scoreboard in the order they appear
@@ -54,7 +58,7 @@ public interface Scoreboard {
     * @see     #addLine(String)
     * @see     #removeLine(int)
     */
-    List<Line> getLines();
+    @NotNull List<Line> getLines();

    /**
     * Adds line with specified text on the bottom of scoreboard. Supports
@@ -65,7 +69,7 @@ public interface Scoreboard {
     * @see     #getLines()
     * @see     #removeLine(int)
     */
-    void addLine(String text);
+    void addLine(@NonNull String text);

    /**
     * Removes line with specified index. Index starts at {@code 0} and ends at 
@@ -80,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,18 +1,22 @@
 package me.neznamy.tab.api.scoreboard;

+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;

-import me.neznamy.tab.api.TabPlayer;
-
 /**
 * Interface allowing work with scoreboards, such as creating,
 * sending, toggling and modifying.
 * <p>
 * Instance can be obtained using {@link me.neznamy.tab.api.TabAPI#getScoreboardManager()}.
 * This requires the scoreboard feature to be enabled in config,
- * the method will return null otherwise.
+ * the method will return {@code null} otherwise.
 */
+@SuppressWarnings("unused") // API class
 public interface ScoreboardManager {

    /**
@@ -39,7 +43,7 @@ public interface ScoreboardManager {
     * @throws  NullPointerException
     *          if {@code name} or {@code lines} is {@code null}
     */
-    Scoreboard createScoreboard(String name, String title, List<String> lines);
+    @NotNull Scoreboard createScoreboard(@NonNull String name, @NonNull String title, @NonNull List<String> lines);
    
    /**
     * Returns map of registered scoreboards via config and API.
@@ -49,7 +53,30 @@ public interface ScoreboardManager {
     * 
     * @return  map of registered scoreboards
     */
-    Map<String, Scoreboard> getRegisteredScoreboards();
+    @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
@@ -66,7 +93,7 @@ public interface ScoreboardManager {
     * @see     #hasCustomScoreboard(TabPlayer)
     * @see     #resetScoreboard(TabPlayer)
     */
-    void showScoreboard(TabPlayer player, Scoreboard scoreboard);
+    void showScoreboard(@NonNull TabPlayer player, @NonNull Scoreboard scoreboard);
    
    /**
     * Returns {@code true} if player has custom scoreboard set using
@@ -79,7 +106,7 @@ public interface ScoreboardManager {
     * @see      #showScoreboard(TabPlayer, Scoreboard)
     * @see     #resetScoreboard(TabPlayer)
     */
-    boolean hasCustomScoreboard(TabPlayer player);
+    boolean hasCustomScoreboard(@NonNull TabPlayer player);
    
    /**
     * Hides custom scoreboard sent using {@link #showScoreboard(TabPlayer, Scoreboard)}
@@ -91,7 +118,7 @@ public interface ScoreboardManager {
     * @see     #showScoreboard(TabPlayer, Scoreboard)
     * @see     #hasCustomScoreboard(TabPlayer)
     */
-    void resetScoreboard(TabPlayer player);
+    void resetScoreboard(@NonNull TabPlayer player);
    
    /**
     * Returns {@code true} if player has scoreboard enabled, {@code false} 
@@ -105,7 +132,7 @@ public interface ScoreboardManager {
     * @see     #setScoreboardVisible(TabPlayer, boolean, boolean)
     * @see     #toggleScoreboard(TabPlayer, boolean)
     */
-    boolean hasScoreboardVisible(TabPlayer player);
+    boolean hasScoreboardVisible(@NonNull TabPlayer player);
    
    /**
     * Sets scoreboard visibility of player to defined value. If visibility status
@@ -122,7 +149,7 @@ public interface ScoreboardManager {
     * @see     #toggleScoreboard(TabPlayer, boolean)
     * @see     #hasScoreboardVisible(TabPlayer)
     */
-    void setScoreboardVisible(TabPlayer player, boolean visible, boolean sendToggleMessage);
+    void setScoreboardVisible(@NonNull TabPlayer player, boolean visible, boolean sendToggleMessage);
    
    /**
     * Toggles scoreboard for specified player. If player had scoreboard visible,
@@ -136,7 +163,7 @@ public interface ScoreboardManager {
     * @see     #hasScoreboardVisible(TabPlayer)
     * @see     #setScoreboardVisible(TabPlayer, boolean, boolean)
     */
-    void toggleScoreboard(TabPlayer player, boolean sendToggleMessage);
+    void toggleScoreboard(@NonNull TabPlayer player, boolean sendToggleMessage);
    
    /**
     * Temporarily displays scoreboard to all players for specified amount of 
@@ -151,7 +178,7 @@ public interface ScoreboardManager {
     *          if no scoreboard was found with such name or {@code duration}
     *          is &lt; 0.
     */
-    void announceScoreboard(String scoreboard, int duration);
+    void announceScoreboard(@NonNull String scoreboard, int duration);

    /**
     * Returns player's currently displayed scoreboard. This can be either with
@@ -162,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
     */
-    Scoreboard getActiveScoreboard(TabPlayer player);
+    @Nullable Scoreboard getActiveScoreboard(@NonNull TabPlayer player);
 }
@@ -1,4 +1,9 @@
-package me.neznamy.tab.api;
+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.Nullable;

 /**
 * Interface allowing to send header/footer to players.
@@ -7,39 +12,40 @@ package me.neznamy.tab.api;
 * 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 {

    /**
     * Sets raw value of header to specified value. This overrides plugin
     * configuration until reset is called. Has full placeholder support
     * and will send update packet whenever a placeholder used inside
-     * changes its value.
+     * changes its value. Use {@code null} to reset value back to original.
     *
     * @param   player
     *          Player to set header for
     * @param   header
     *          Raw header value
     */
-    void setHeader(TabPlayer player, String header);
+    void setHeader(@NonNull TabPlayer player, @Nullable String header);

    /**
     * Sets raw value of footer to specified value. This overrides plugin
     * configuration until reset is called. Has full placeholder support
     * and will send update packet whenever a placeholder used inside
-     * changes its value.
+     * changes its value. Use {@code null} to reset value back to original.
     *
     * @param   player
     *          Player to set header for
     * @param   footer
     *          Raw footer value
     */
-    void setFooter(TabPlayer player, String footer);
+    void setFooter(@NonNull TabPlayer player, @Nullable String footer);

    /**
     * Sets raw value of header and footer to specified values. This overrides plugin
     * configuration until reset is called. Has full placeholder support
     * and will send update packet whenever a placeholder used inside
-     * changes its value.
+     * changes its value. Use {@code null} to reset value back to original.
     *
     * @param   player
     *          Player to set header for
@@ -48,35 +54,5 @@ public interface HeaderFooterManager {
     * @param   footer
     *          Raw footer value
     */
-    void setHeaderAndFooter(TabPlayer player, String header, String footer);
-
-    /**
-     * Resets header value previously set using {@link #setHeader(TabPlayer, String)}
-     * or {@link #setHeaderAndFooter(TabPlayer, String, String)} and restores internal
-     * logic using configuration files.
-     *
-     * @param   player
-     *          Player to reset header for
-     */
-    void resetHeader(TabPlayer player);
-
-    /**
-     * Resets footer value previously set using {@link #setFooter(TabPlayer, String)}
-     * or {@link #setHeaderAndFooter(TabPlayer, String, String)} and restores internal
-     * logic using configuration files.
-     *
-     * @param   player
-     *          Player to reset header for
-     */
-    void resetFooter(TabPlayer player);
-
-    /**
-     * Resets values previously set using {@link #setHeader(TabPlayer, String)},
-     * {@link #setFooter(TabPlayer, String)} or {@link #setHeaderAndFooter(TabPlayer, String, String)}
-     * and restores internal logic using configuration files.
-     *
-     * @param   player
-     *          Player to reset header and footer for
-     */
-    void resetHeaderAndFooter(TabPlayer player);
+    void setHeaderAndFooter(@NonNull TabPlayer player, @Nullable String header, @Nullable String footer);
 }
@@ -0,0 +1,46 @@
+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 {
+
+    /**
+     * Forces new team name for the player until this method is called again with null argument and
+     * performs all actions to change player's team name
+     *
+     * @param   player
+     *          player to set team name of
+     * @param   teamName
+     *          forced team name
+     */
+    void forceTeamName(@NonNull TabPlayer player, @Nullable String teamName);
+
+    /**
+     * Returns forced team name of player or null if not forced
+     *
+     * @param   player
+     *          player to check forced team name of
+     * @return  forced team name of player or null if not forced
+     */
+    @Nullable String getForcedTeamName(@NonNull TabPlayer player);
+
+    /**
+     * Returns original team name of the player set by the plugin.
+     *
+     * @param   player
+     *          Player to get team name of
+     * @return  Player's team name based on configuration.
+     */
+    @NotNull String getOriginalTeamName(@NonNull TabPlayer player);
+}
@@ -0,0 +1,202 @@
+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;
+
+/**
+ * An interface allowing to modify TabList display names
+ * of players.
+ * <p>
+ * Instance can be obtained using {@link TabAPI#getTabListFormatManager()}.
+ * This requires the feature to be enabled in config, otherwise the method will
+ * return {@code null}.
+ */
+@SuppressWarnings("unused") // API class
+public interface TabListFormatManager {
+
+    /**
+     * Changes player's prefix to provided value. Supports placeholders,
+     * as well as any supported RGB formats. Use {@code null} to reset
+     * value back to original.
+     *
+     * @param   player
+     *          player to change prefix of
+     * @param   prefix
+     *          new prefix value
+     * @see     #getCustomPrefix(TabPlayer)
+     * @see     #getOriginalRawPrefix(TabPlayer)
+     */
+    void setPrefix(@NonNull TabPlayer player, @Nullable String prefix);
+
+    /**
+     * Changes player's name to provided value. Supports placeholders,
+     * as well as any supported RGB formats. Use {@code null} to reset
+     * value back to original.
+     *
+     * @param   player
+     *          player to change prefix of
+     * @param   customName
+     *          new customName value
+     * @see     #getCustomName(TabPlayer)
+     * @see     #getOriginalRawName(TabPlayer)
+     */
+    void setName(@NonNull TabPlayer player, @Nullable String customName);
+
+    /**
+     * Changes player's suffix to provided value. Supports placeholders,
+     * as well as any supported RGB formats. Use {@code null} to reset
+     * value back to original.
+     *
+     * @param   player
+     *          player to change prefix of
+     * @param   suffix
+     *          new suffix value
+     * @see     #getCustomSuffix(TabPlayer)
+     * @see     #getOriginalRawSuffix(TabPlayer)
+     */
+    void setSuffix(@NonNull TabPlayer player, @Nullable String suffix);
+
+    /**
+     * Returns prefix assigned using {@link #setPrefix(TabPlayer, String)} method.
+     * If the method was not used, {@code null} is returned.
+     *
+     * @param   player
+     *          player to get custom prefix of
+     * @return  player's custom prefix or {@code null} if not defined
+     * @see     #setPrefix(TabPlayer, String)
+     * @see     #getOriginalRawPrefix(TabPlayer)
+     */
+    @Nullable String getCustomPrefix(@NonNull TabPlayer player);
+
+    /**
+     * Returns custom name assigned using {@link #setName(TabPlayer, String)} method.
+     * If the method was not used, {@code null} is returned.
+     *
+     * @param   player
+     *          player to get custom name of
+     * @return  player's custom name or {@code null} if not defined
+     * @see     #setName(TabPlayer, String)
+     * @see     #getOriginalName(TabPlayer)
+     */
+    @Nullable String getCustomName(@NonNull TabPlayer player);
+
+    /**
+     * Returns suffix assigned using {@link #setSuffix(TabPlayer, String)} method.
+     * If the method was not used, {@code null} is returned.
+     *
+     * @param   player
+     *          player to get custom suffix of
+     * @return  player's custom suffix or {@code null} if not defined
+     * @see     #setSuffix(TabPlayer, String)
+     * @see     #getOriginalSuffix(TabPlayer)
+     */
+    @Nullable String getCustomSuffix(@NonNull TabPlayer player);
+
+    /**
+     * Returns player's original prefix applied using plugin's internal logic.
+     * This value is not affected by API calls in any way.
+     *
+     * @param   player
+     *          player to get original prefix of
+     * @return  player's original prefix
+     * @see     #setPrefix(TabPlayer, String)
+     * @see     #getCustomPrefix(TabPlayer)
+     * @deprecated  Use {@link #getOriginalRawPrefix(TabPlayer)} instead.
+     */
+    @NotNull
+    @Deprecated
+    String getOriginalPrefix(@NonNull TabPlayer player);
+
+    /**
+     * Returns player's original name applied using plugin's internal logic.
+     * This value is not affected by API calls in any way.
+     *
+     * @param   player
+     *          player to get original name of
+     * @return  player's original name
+     * @see     #setName(TabPlayer, String)
+     * @see     #getCustomName(TabPlayer)
+     * @deprecated  Use {@link #getOriginalRawName(TabPlayer)} instead.
+     */
+    @NotNull
+    @Deprecated
+    String getOriginalName(@NonNull TabPlayer player);
+
+    /**
+     * Returns player's original suffix applied using plugin's internal logic.
+     * This value is not affected by API calls in any way.
+     *
+     * @param   player
+     *          player to get original suffix of
+     * @return  player's original suffix
+     * @see     #setSuffix(TabPlayer, String)
+     * @see     #getCustomSuffix(TabPlayer)
+     * @deprecated  Use {@link #getOriginalRawSuffix(TabPlayer)} instead.
+     */
+    @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);
+}
@@ -0,0 +1,93 @@
+package me.neznamy.tab.api.tablist.layout;
+
+import lombok.NonNull;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Interface representing a layout.
+ */
+@SuppressWarnings("unused") // API class
+public interface Layout {
+
+    /**
+     * Returns name of the layout.
+     *
+     * @return  name of the layout
+     */
+    @NotNull String getName();
+
+    /**
+     * Adds fixed slot with specified parameters
+     *
+     * @param   slot
+     *          Slot (1-80)
+     * @param   text
+     *          Text to display
+     */
+    void addFixedSlot(int slot, @NonNull String text);
+
+    /**
+     * Adds fixed slot with specified parameters
+     *
+     * @param   slot
+     *          Slot (1-80)
+     * @param   text
+     *          Text to display
+     * @param   skin
+     *          Skin definition like in config
+     */
+    void addFixedSlot(int slot, @NonNull String text, @NonNull String skin);
+
+    /**
+     * Adds fixed slot with specified parameters
+     *
+     * @param   slot
+     *          Slot (1-80)
+     * @param   text
+     *          Text to display
+     * @param   ping
+     *          Slot's ping
+     */
+    void addFixedSlot(int slot, @NonNull String text, 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
+     */
+    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.
+     *
+     * @param   condition
+     *          Condition that must be met for player to appear in the group.
+     *          May be null for no requirement. Syntax is like in config -
+     *          either condition name or short format.
+     * @param   slots
+     *          Slots for this player group
+     */
+    void addGroup(@Nullable String condition, int[] slots);
+}
@@ -0,0 +1,70 @@
+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;
+
+/**
+ * Interface for working with layouts. Instance can be obtained using
+ * {@link TabAPI#getLayoutManager()}. If the feature is disabled in
+ * config, it will return {@code null}.
+ */
+@SuppressWarnings("unused") // API class
+public interface LayoutManager {
+
+    /**
+     * Creates new layout
+     *
+     * @param   name
+     *          Unique layout name
+     * @return  Created layout
+     */
+    @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
+     * any layout, but default TabList instead.
+     *
+     * @param   player
+     *          Player to send layout to
+     * @param   layout
+     *          Layout to send
+     * @see     #resetLayout(TabPlayer)
+     */
+    void sendLayout(@NonNull TabPlayer player, @Nullable Layout layout);
+
+    /**
+     * Reset layout back to original one based on configuration.
+     *
+     * @param   player
+     *          Player to reset layout for
+     * @see     #sendLayout(TabPlayer, Layout)
+     */
+    void resetLayout(@NonNull TabPlayer player);
+}
@@ -1,96 +0,0 @@
-package me.neznamy.tab.api.task;
-
-import java.util.concurrent.Future;
-
-import me.neznamy.tab.api.TabFeature;
-
-/**
- * Manager for scheduling and executing tasks in TAB's
- * main thread to avoid concurrency issues.
- */
-public interface ThreadManager {
-
-    /**
-     * Starts a task in new thread and measures how long it took to process
-     *
-     * @param   feature
-     *          feature to add cpu usage to
-     * @param   type
-     *          usage type to add cpu usage to
-     * @param   task
-     *          the task
-     */
-    Future<Void> runMeasuredTask(TabFeature feature, String type, Runnable task);
-
-    /**
-     * Starts a task in new thread and measures how long it took to process
-     *
-     * @param   feature
-     *          feature to add cpu usage to
-     * @param   type
-     *          usage type to add cpu usage to
-     * @param   task
-     *          the task
-     */
-    Future<Void> runMeasuredTask(String feature, String type, Runnable task);
-
-    /**
-     * Runs task in a new thread
-     *
-     * @param   task
-     *          the task
-     */
-    Future<Void> runTask(Runnable task);
-
-    /**
-     * Starts a new task with defined repeat interval that measures cpu usage
-     *
-     * @param   intervalMilliseconds
-     *          task interval
-     * @param   feature
-     *          feature to add cpu usage to
-     * @param   type
-     *          usage type to add cpu usage to
-     * @param   task
-     *          the task
-     * @return  Future representing the submitted task
-     */
-    Future<?> startRepeatingMeasuredTask(int intervalMilliseconds, TabFeature feature, String type, Runnable task);
-
-    /**
-     * Starts a new task with defined repeat interval
-     *
-     * @param   intervalMilliseconds
-     *          task interval
-     * @param   task
-     *          the task
-     * @return  Future representing the submitted task
-     */
-    Future<?> startRepeatingTask(int intervalMilliseconds, Runnable task);
-
-    /**
-     * Runs task with a delay and measures how long it took to process
-     *
-     * @param   delayMilliseconds
-     *          how long to run the task after
-     * @param   feature
-     *          feature to add cpu usage to
-     * @param   type
-     *          usage type to add cpu usage to
-     * @param   task
-     *          the task
-     * @return  Future representing the submitted task
-     */
-    Future<?> runTaskLater(int delayMilliseconds, TabFeature feature, String type, Runnable task);
-
-    /**
-     * Runs task with a delay
-     *
-     * @param   delayMilliseconds
-     *          how long to run the task after
-     * @param   task
-     *          the task
-     * @return  Future representing the submitted task
-     */
-    Future<?> runTaskLater(int delayMilliseconds, Runnable task);
-}
@@ -1,182 +0,0 @@
-package me.neznamy.tab.api.team;
-
-import me.neznamy.tab.api.TabPlayer;
-
-public interface TeamManager {
-
-    /**
-     * Makes player's NameTag globally invisible
-     *
-     * @param   player
-     *          player to hide nametag of
-     * @see     #showNametag(TabPlayer)
-     * @see     #hasHiddenNametag(TabPlayer)
-     */
-    void hideNametag(TabPlayer player);
-
-    /**
-     * Hides player's NameTag for specified player until it's shown again
-     *
-     * @param   player
-     *          player to hide nametag of
-     * @param   viewer
-     *          player to hide NameTag for
-     */
-    void hideNametag(TabPlayer player, TabPlayer viewer);
-
-    /**
-     * Makes player's NameTag visible again
-     *
-     * @param   player
-     *          player to show nametag of
-     * @see     #hideNametag(TabPlayer)
-     * @see     #hasHiddenNametag(TabPlayer)
-     */
-    void showNametag(TabPlayer player);
-
-    /**
-     * Shows player's NameTag for specified viewer if it was hidden before
-     *
-     * @param   player
-     *          player to show nametag of
-     * @param   viewer
-     *          player to show NameTag back for
-     */
-    void showNametag(TabPlayer player, TabPlayer viewer);
-
-    /**
-     * Return whether player has hidden NameTag or not
-     *
-     * @param   player
-     *          player to check nametag visibility status of
-     * @return  Whether player has hidden NameTag or not
-     * @see     #hideNametag(TabPlayer)
-     * @see     #showNametag(TabPlayer)
-     */
-    boolean hasHiddenNametag(TabPlayer player);
-
-    /**
-     * Returns true if NameTag is hidden for specified viewer, false if not
-     *
-     * @param   player
-     *          player to check visibility status of
-     * @param   viewer
-     *          player to check visibility status for
-     * @return  true if hidden, false if not
-     */
-    boolean hasHiddenNametag(TabPlayer player, TabPlayer viewer);
-
-    /**
-     * Unregisters player's team and no longer handles it, as well as disables anti-override for teams.
-     * This can be resumed using resumeTeamHandling(). If team handling was paused already, nothing happens.
-     *
-     * @param   player
-     *          player to pause team handling of
-     */
-    void pauseTeamHandling(TabPlayer player);
-
-    /**
-     * Resumes team handling if it was before paused using pauseTeamHandling(), if not, nothing happens
-     *
-     * @param   player
-     *          player to resume team handling of
-     */
-    void resumeTeamHandling(TabPlayer player);
-
-    /**
-     * Returns true if team handling is paused for this player using pauseTeamHandling(), false if not, or
-     * it was resumed already using resumeTeamHandling
-     *
-     * @param   player
-     *          player to check handling status of
-     * @return  true if paused, false if not
-     */
-    boolean hasTeamHandlingPaused(TabPlayer player);
-
-    /**
-     * Forces new team name for the player until this method is called again with null argument and
-     * performs all actions to change player's team name
-     *
-     * @param   player
-     *          player to set team name of
-     * @param   teamName
-     *          forced team name
-     */
-    void forceTeamName(TabPlayer player, String teamName);
-
-    /**
-     * Returns forced team name of player or null if not forced
-     *
-     * @param   player
-     *          player to check forced team name of
-     * @return  forced team name of player or null if not forced
-     */
-    String getForcedTeamName(TabPlayer player);
-
-
-    /**
-     * Forces collision rule for the player. Setting it to null will remove forced value
-     *
-     * @param   player
-     *          player to set collision rule of
-     * @param   collision
-     *          forced collision rule
-     */
-    void setCollisionRule(TabPlayer player, Boolean collision);
-
-    /**
-     * Returns forced collision rule or null if collision is not forced using setCollisionRule
-     *
-     * @param   player
-     *          player to get forced collision of
-     * @return  forced value or null if not forced
-     */
-    Boolean getCollisionRule(TabPlayer player);
-
-    /**
-     * Sends update team's properties packet of player's team to everyone
-     *
-     * @param   player
-     *          player to update team data of
-     */
-    void updateTeamData(TabPlayer player);
-
-    void setPrefix(TabPlayer player, String prefix);
-
-    void setSuffix(TabPlayer player, String suffix);
-
-    void resetPrefix(TabPlayer player);
-
-    void resetSuffix(TabPlayer player);
-
-    String getCustomPrefix(TabPlayer player);
-
-    String getCustomSuffix(TabPlayer player);
-
-    String getOriginalPrefix(TabPlayer player);
-
-    String getOriginalSuffix(TabPlayer player);
-
-    /**
-     * Toggles nametag visibility view on all players for specified player.
-     * On first call, nametags of all players will become invisible for specified
-     * player. On second call, they will become visible again.
-     *
-     * @param   player
-     *          player to toggle nametag visibility view for
-     * @param   sendToggleMessage
-     *          {@code true} if configured toggle message should be sent, {@code false} if not
-     */
-    void toggleNameTagVisibilityView(TabPlayer player, boolean sendToggleMessage);
-
-    /**
-     * Returns {@code true} if player has hidden nametags by either calling
-     * {@link #toggleNameTagVisibilityView(TabPlayer, boolean)} or using a command,
-     * {@code false} if not.
-     *
-     * @param   player
-     *          player to check
-     * @return  {@code true} if hidden, {@code false} if not
-     */
-    boolean hasHiddenNameTagVisibilityView(TabPlayer player);
-}
@@ -1,32 +0,0 @@
-package me.neznamy.tab.api.team;
-
-import java.util.List;
-
-import me.neznamy.tab.api.TabPlayer;
-
-public interface UnlimitedNametagManager extends TeamManager {
-
-    void disableArmorStands(TabPlayer player);
-    
-    void enableArmorStands(TabPlayer player);
-    
-    boolean hasDisabledArmorStands(TabPlayer player);
-
-    void setName(TabPlayer player, String customName);
-    
-    void setLine(TabPlayer player, String line, String value);
-
-    void resetName(TabPlayer player);
-    
-    void resetLine(TabPlayer player, String line);
-
-    String getCustomName(TabPlayer player);
-    
-    String getCustomLineValue(TabPlayer player, String line);
-
-    String getOriginalName(TabPlayer player);
-    
-    String getOriginalLineValue(TabPlayer player, String line);
-    
-    List<String> getDefinedLines();
-}
@@ -1,29 +0,0 @@
-package me.neznamy.tab.api.util;
-
-/**
- * An interface for BiFunction which can throw an exception.
- * Used in {@link me.neznamy.tab.api.protocol.PacketBuilder} to
- * call build method for packet classes, which may throw an
- * exception due to reflection.
- * @param   <A>
- *          First function argument
- * @param   <B>
- *          Second function argument
- * @param   <C>
- *          Function return type
- */
-public interface BiFunctionWithException<A, B, C> {
-
-    /**
-     * Runs the function and returns the result
-     *
-     * @param   a
-     *          First argument
-     * @param   b
-     *          Second argument
-     * @return  Output from function
-     * @throws  ReflectiveOperationException
-     *          If reflective operation fails
-     */
-    C apply(A a, B b) throws ReflectiveOperationException;
-}
@@ -1,30 +0,0 @@
-package me.neznamy.tab.api.util;
-
-import lombok.AllArgsConstructor;
-import me.neznamy.tab.api.ProtocolVersion;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@AllArgsConstructor
-public class ComponentCache<K, V> {
-
-    private final int cacheSize;
-    private final BiFunctionWithException<K, ProtocolVersion, V> function;
-    private final Map<K, V> cacheModern = new HashMap<>();
-    private final Map<K, V> cacheLegacy = new HashMap<>();
-
-    public V get(K key, ProtocolVersion clientVersion) {
-        try {
-            if (key == null) return null;
-            Map<K, V> cache = clientVersion == null || clientVersion.getMinorVersion() >= 16 ? cacheModern : cacheLegacy;
-            if (cache.containsKey(key)) return cache.get(key);
-            V value = function.apply(key, clientVersion);
-            if (cache.size() > cacheSize) cache.clear();
-            cache.put(key, value);
-            return value;
-        } catch (ReflectiveOperationException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}
@@ -1,64 +0,0 @@
-package me.neznamy.tab.api.util;
-
-import lombok.NonNull;
-import me.neznamy.tab.api.TabPlayer;
-
-/**
- * Class with utility methods used in the plugin
- */
-public class Preconditions {
-
-    /**
-     * Private constructor preventing the class from being instantiated
-     */
-    private Preconditions() {}
-
-    /**
-     * Checks length of String and throws {@code IllegalArgumentException} if it is
-     * longer than limit.
-     *
-     * @param   string
-     *          String to check
-     * @param   maxLength
-     *          Maximum length of the string
-     * @param   name
-     *          Name of the variable to use in exception message
-     * @throws  IllegalArgumentException
-     *          if {@code string} is {@code null} or longer than {@code maxLength} characters
-     */
-    public static void checkMaxLength(@NonNull String string, int maxLength, String name) {
-        if (string.length() > maxLength) throw new IllegalArgumentException(name + " is longer than " + maxLength + " characters (" + string.length() + ")");
-    }
-
-    /**
-     * Checks number range and throws {@code IllegalArgumentException} if number
-     * is out of range.
-     *
-     * @param   number
-     *          Number to check
-     * @param   min
-     *          Minimum allowed value
-     * @param   max
-     *          Maximum allowed value
-     * @param   variable
-     *          Variable name to use in exception message
-     * @throws  IllegalArgumentException
-     *          if {@code number} is out of range ({@code number < min || number > max})
-     */
-    public static void checkRange(Number number, Number min, Number max, String variable) {
-        if (number.doubleValue() < min.doubleValue() || number.doubleValue() > max.doubleValue())
-            throw new IllegalArgumentException(variable + " index out of range (" + min + " - " + max + "), was " + number);
-    }
-
-    /**
-     * Checks if player is loaded and throws {@code IllegalStateException} if not.
-     *
-     * @param   player
-     *          Player to check
-     * @throws  IllegalStateException
-     *          If player is not loaded
-     */
-    public static void checkLoaded(TabPlayer player) {
-        if (!player.isLoaded()) throw new IllegalStateException("Player is not loaded yet. Try again later.");
-    }
-}
@@ -1,24 +0,0 @@
-package me.neznamy.tab.api.util;
-
-/**
- * Utility class storing methods working with reflection
- */
-public class ReflectionUtils {
-
-    /**
-     * Returns {@code true} if class with given full name exists,
-     * {@code false} if not.
-     *
-     * @param   path
-     *          Full class path and name
-     * @return  {@code true} if exists, {@code false} if not
-     */
-    public static boolean classExists(String path) {
-        try {
-            Class.forName(path);
-            return true;
-        } catch (ClassNotFoundException | NullPointerException e) {
-            return false;
-        }
-    }
-}
@@ -1,12 +0,0 @@
-package me.neznamy.tab.api.util;
-
-/**
- * Supplier that can throw an exception
- *
- * @param   <T>
- *          Return class type
- */
-public interface SupplierWithException<T> {
-
-    T get() throws Exception;
-}
@@ -3,15 +3,6 @@ plugins {
 }

 dependencies {
-    implementation(libs.plugin.shadow)
-    implementation(libs.plugin.lombok)
-}
-
-dependencies {
-    compileOnly(files(libs::class.java.protectionDomain.codeSource.location))
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    implementation("com.gradleup.shadow:shadow-gradle-plugin:9.4.0")
+    implementation("io.freefair.gradle:lombok-plugin:9.2.0")
 }
@@ -2,15 +2,11 @@ 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()
    }
-    // You're a great IDE IntelliJ, but sometimes you really annoy me. >:(
-//    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
-
-    versionCatalogs {
-        register("libs") {
-            from(files("../gradle/libs.versions.toml"))
-        }
-    }
 }
@@ -8,10 +8,12 @@ plugins {
 tasks {
    processResources {
        filter<ReplaceTokens>("tokens" to mapOf(
+            "id" to rootProject.ext.get("id")!!.toString(),
            "name" to rootProject.name,
            "version" to project.version,
            "description" to project.description,
-            "website" to rootProject.ext.get("website")!!.toString()
+            "website" to rootProject.ext.get("website")!!.toString(),
+            "author" to rootProject.ext.get("author")!!.toString()
        ))
    }
    javadoc {
@@ -22,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"))
    }
 }
@@ -30,5 +32,6 @@ tasks {
 java {
    toolchain {
        languageVersion.set(JavaLanguageVersion.of(17))
+        vendor.set(JvmVendorSpec.GRAAL_VM)
    }
 }
@@ -1,14 +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.yamlassist")
+        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,34 +1,45 @@
 plugins {
+    eclipse
    id("tab.parent")
 }

 allprojects {
    group = "me.neznamy"
-    version = "3.3.0"
+    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
-).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(libs.bstats.bukkit)
-    compileOnly(libs.bukkit)
-    compileOnly(libs.placeholderapi)
-    compileOnly(libs.vault)
-    compileOnly(libs.authlib)
+    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);
+    }
+}