4.0.6

Add a temporary workaround for https://github.com/SpigotMC/BungeeCord/issues/3542
Use sendPacketQueued method on BungeeCord to avoid error on 1.20.2 clients
2023-10-01 16:35:39 +02:00 · 2023-10-01 16:35:33 +02:00 · 2023-10-01 16:31:25 +02:00 · 2023-09-27 21:12:58 +02:00 · 2023-09-27 21:12:22 +02:00 · 2023-09-27 19:20:32 +02:00
436 changed files with 19762 additions and 20633 deletions
@@ -0,0 +1,7 @@
+* text=auto
+
+*.sh text eol=lf
+gradlew text eol=lf
+*.bat text eol=crlf
+
+*.jar binary
@@ -1,6 +1,6 @@
 name: Bug Report
-description: Unwanted behavior that does not match configuration.
-labels: ["Bug"]
+description: Plugin does not work as described.
+labels: ["Type: Bug"]
 body:
  - type: input
    attributes:
@@ -45,7 +45,7 @@ body:
  - type: textarea
    attributes:
      label: Additional info
-      description: Any other info you want to provide, such as screenshots.
+      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
@@ -1,6 +1,6 @@
 name: Error
 description: Error message with a stack trace in console or error file.
-labels: ["Error"]
+labels: ["Type: Error"]
 body:
  - type: input
    attributes:
@@ -0,0 +1,56 @@
+name: Memory leak
+description: Memory leak caused by TAB.
+labels: ["Type: Memory leak"]
+body:
+  - type: input
+    attributes:
+      label: Server version
+      description: Version and type of used server software where TAB is installed.
+      placeholder: Spigot 1.18.1
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: TAB version
+      description: Full version in numbers, "latest" is not a version.
+      placeholder: 3.0.2
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Heap dump
+      description: Link to uploaded memory dump which I can look into.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Uncleared object(s)
+      description: Objects you believe should have been removed from the memory but are not
+      placeholder: |
+        There is only 1 player online, but heap dump has 100 instances of TabPlayer
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Additional info
+      description: Any other info you want to provide.
+    validations:
+      required: false
+
+  - type: checkboxes
+    attributes:
+      label: Checklist
+      description: Let's make sure this report is valid
+      options:
+        - label: I am running latest version of the plugin
+          required: true
+        - label: I have included download link of my heap dump
+          required: true
+        - label: I ticked all of the boxes without actually reading them
+          required: false
+        - label: I have explained what I believe is wrong with the heap dump
+          required: true
@@ -0,0 +1,55 @@
+name: Performance issue
+description: Performance issue in TAB or in server caused by TAB
+labels: ["Type: Performance"]
+body:
+  - type: input
+    attributes:
+      label: Server version
+      description: Version and type of used server software where TAB is installed.
+      placeholder: Spigot 1.18.1
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: TAB version
+      description: Full version in numbers, "latest" is not a version.
+      placeholder: 3.0.2
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Evidence
+      description: Any evidence proving the performance issue, such as output of /tab cpu or timings.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Steps to reproduce (if known)
+      description: What to do in order to reproduce this issue
+      placeholder: |
+        Step 1: ..
+        Step 2: ..
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Additional info
+      description: Any other info you want to provide.
+    validations:
+      required: false
+
+  - type: checkboxes
+    attributes:
+      label: Checklist
+      description: Let's make sure this report is valid
+      options:
+        - label: I am running latest version of the plugin
+          required: true
+        - label: I have included sufficient evidence of the issue
+          required: true
+        - label: I ticked all of the boxes without actually reading them
+          required: false
@@ -1,6 +1,6 @@
 name: Wiki change
 description: Change to text on a wiki page or adding a new section.
-labels: ["Wiki"]
+labels: ["Type: Wiki change"]
 body:
  - type: input
    attributes:
@@ -3,7 +3,7 @@ on:
  push:
    branches:
      - master
-      - v3
+      - v4
  pull_request:
    types: [opened, synchronize, reopened]
 jobs:
@@ -14,11 +14,11 @@ jobs:
      - 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
+      - name: Set up JDK 17
        uses: actions/setup-java@v3.9.0 #https://github.com/actions/setup-java/releases
        with:
          distribution: 'temurin'
-          java-version: 11
+          java-version: 17
      - name: Cache SonarCloud packages
        uses: actions/cache@v3.2.3 #https://github.com/actions/cache/releases
        with:
@@ -33,7 +33,6 @@ hs_err_pid*
 .idea/

 # other
-.gitattributes
 *.iml
 run/

@@ -0,0 +1,9 @@
+If this plugin has helped you in any way, and you would like to return something back 
+to make the plugin even better, there is a lot of ways to contribute:  
+* Open a **pull request** containing a new feature or a bug fix, which you believe many users will benefit from.
+* Make detailed high-quality **bug reports**. The difference between a bug getting fixed in 1 week vs 1 hour 
+is in quality of the report (typically providing correct steps to reproduce that actually work).
+* 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.
@@ -0,0 +1,174 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
@@ -1,43 +1,23 @@
 # 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.  
+similar plugins in terms of features, performance and compatibility.  
 More information can be found at [Why TAB?](https://github.com/NEZNAMY/TAB/wiki/Why-TAB%3F) wiki page.

-# 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.  
-
 # Compiling
-Compilation requires JDK 8 and up.  
+Compilation requires JDK 17 and up.  
 To compile the plugin, run `./gradlew build` from the terminal.  
-Once the plugin compiles, grab the jar from `/jar/build/libs/` folder.
+Once the plugin compiles, grab the jar from `/jar/build/libs/` folder.  
+The universal jar contains all modules for all supported platforms.

-# 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)  
+# Documentation
+You can find everything about the plugin on the [Wiki](https://github.com/NEZNAMY/TAB/wiki). This includes a detailed description
+of all features, as well as information regarding compatibility or limitations of each feature.  

 # Issues
-The [Issues](https://github.com/NEZNAMY/TAB/issues) section is **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.**
+The [Issues](https://github.com/NEZNAMY/TAB/issues) section is an issue tracker for all the kind of problems covered in issue templates.
+Please refrain from attempting to use it to receive help with your server, such issues will be closed immediately.  
+When opening an issue, provide as much information as possible. The difference between a bug getting fixed in 1 week vs 1 hour
+is in quality of the report. Bug reports where steps to reproduce are "idk" have no value and will not help to get the bug fixed at all.  

 # Contributing
-If this plugin has helped you in any way, and you would like to return something back 
-to make the plugin even better, there is a lot of ways to contribute:  
-* Open a **pull request** containing a new feature or a bug fix, which you believe many users will benefit from.
-* Make detailed high-quality **bug reports**. The difference between a bug getting fixed in 1 week vs 1 hour 
-is in quality of the report (typically providing correct steps to reproduce that actually work).
-* 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.
+See [CONTRIBUTING.md](https://github.com/NEZNAMY/TAB/blob/master/CONTRIBUTING.md)
@@ -0,0 +1,2 @@
+# Security Policy
+If you found a security issue, send me a private message anywhere.
@@ -1,23 +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.gson)
-    compileOnlyApi(libs.adventureMiniMessage)
-    compileOnlyApi(libs.adventureApi)
-    compileOnlyApi(libs.adventureLegacy)
-}
-
-blossom {
-    replaceToken("@plugin_version@", project.version)
-    replaceTokenIn("src/main/java/me/neznamy/tab/api/TabConstants.java")
+    compileOnlyApi("org.jetbrains:annotations:24.0.1")
 }

 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 hasStaticOffset();
-    
-    /**
-     * 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,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,9 +34,13 @@ public abstract class TabAPI {
     * @throws  IllegalStateException
     *          If instance is {@code null}
     */
-    public static TabAPI getInstance() {
-        if (instance == null) throw new IllegalStateException("API instance is null. This likely means you shaded TAB's API into your project" +
-                " instead of only using it, which is not allowed.");
+    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 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.");
        return instance;
    }

@@ -48,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
@@ -57,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,408 +0,0 @@
-package me.neznamy.tab.api;
-
-import java.util.*;
-
-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 */
-    private final String featureName;
-
-    /** Feature's function name displayed in place of refreshing in /tab cpu */
-    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 name of the feature displayed in /tab cpu.
-     *
-     * @return  name of the feature displayed in /tab cpu
-     */
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    /**
-     * Returns text to display in /tab cpu of this feature refreshing visuals
-     *
-     * @return  Text to display as refreshing of this feature
-     */
-    public String getRefreshDisplayName() {
-        return refreshDisplayName;
-    }
-
-    /**
-     * 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,166 +1,35 @@
 package me.neznamy.tab.api;

-import java.util.UUID;
+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
 */
 public interface TabPlayer {

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

    /**
     * Returns player's UUID
     *
     * @return  Player's UUID
     */
-    UUID getUniqueId();
-
-    /**
-     * Returns player's uuid used in TabList. This may only be different from real uuid if
-     * TAB is installed on velocity with some specific velocity setup
-     *
-     * @return  player's uuid in TabList
-     */
-    UUID getTablistUUID();
-
-    /**
-     * Returns player's protocol version
-     *
-     * @return  player's protocol version
-     */
-    ProtocolVersion getVersion();
+    @NotNull UUID getUniqueId();

    /**
     * Returns platform-specific entity
     *
     * @return  an instance of bukkit/bungee player depending on platform
     */
-    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();
+    @NotNull Object getPlayer();

    /**
     * Returns true once the player is successfully loaded (onJoin method ran through all methods)
@@ -169,92 +38,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,59 +45,25 @@ public interface TabPlayer {
     *
     * @return  player's primary permission group
     */
-    String getGroup();
+    @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.
-     *
-     * @see     #setTemporaryGroup(String)
-     * @see     #hasTemporaryGroup()
-     */
-    void resetTemporaryGroup();
-
-    /**
-     * 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.
-     *
-     * @return  player's game profile name as seen by other players
-     */
-    String getNickname();
-
-    /**
-     * Returns player's chat message signing key. Returned object is a direct
-     * object from the server, which is different per platform.
-     *
-     * @return  Player's direct chat message signing key
-     */
-    Object getProfilePublicKey();
-
-    /**
-     * Return player's chat session ID
-     * @return  player's chat session ID
-     */
-    UUID getChatSessionId();
 }
@@ -5,12 +5,5 @@ package me.neznamy.tab.api.bossbar;
 * Calling ordinal() will return color's network ID.
 */
 public enum BarColor {
-
-    PINK,
-    BLUE,
-    RED,
-    GREEN,
-    YELLOW,
-    PURPLE,
-    WHITE
+    PINK, BLUE, RED, GREEN, YELLOW, PURPLE, WHITE
 }
@@ -1,10 +1,14 @@
 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
 public enum BarStyle {

    PROGRESS("SOLID"),
@@ -14,23 +18,5 @@ public enum BarStyle {
    NOTCHED_20("SEGMENTED_20");

    /** Style's name used in Bukkit API */
-    private final String bukkitName;
-
-    /**
-     * Initializes enum constant with given bukkit name
-     *
-     * @param   bukkitName
-     *          Name of color to be returned in {@code getBukkitName()}
-     */
-    BarStyle(String bukkitName){
-        this.bukkitName = bukkitName;
-    }
-
-    /**
-     * Returns name of this style in Bukkit API
-     * @return  name of this style in Bukkit API
-     */
-    public String getBukkitName() {
-        return bukkitName;
-    }
+    @Getter private final String bukkitName;
 }
@@ -3,7 +3,9 @@ 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.
@@ -26,7 +28,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 +36,7 @@ public interface BossBar {
     *
     * @return  uuid of this BossBar
     */
-    UUID getUniqueId();
+    @NotNull UUID getUniqueId();

    /**
     * Changes BossBar title to specified string, supporting placeholders.
@@ -48,7 +50,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 +66,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 +92,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 +102,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 +118,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 +128,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 +136,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 +144,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 +152,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 +160,7 @@ public interface BossBar {
     *
     * @return  entered style as a string
     */
-    String getStyle();
+    @NotNull String getStyle();

    /**
     * Registers this BossBar to specified player.
@@ -168,7 +170,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 +180,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 +191,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);

    /**
-     * 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
@@ -2,10 +2,12 @@ package me.neznamy.tab.api.bossbar;

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

+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 work with BossBars such as creating, sending
@@ -31,7 +33,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 +52,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 +75,7 @@ public interface BossBarManager {
     *
     * @return  all registered BossBars
     */
-    Map<String, BossBar> getRegisteredBossBars();
+    @NotNull Map<String, BossBar> getRegisteredBossBars();

    /**
     * Toggles BossBar for this player and sends toggle message if {@code sendToggleMessage} is true.
@@ -96,7 +87,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 +98,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,7 +113,7 @@ 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.
@@ -138,7 +129,7 @@ public interface BossBarManager {
     * @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.
@@ -152,7 +143,7 @@ public interface BossBarManager {
     * @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 +152,5 @@ public interface BossBarManager {
     * @see     #sendBossBarTemporarily(TabPlayer, String, int)
     * @see     #announceBossBar(String, int)
     */
-    List<BossBar> getAnnouncedBossBars();
+    @NotNull List<BossBar> getAnnouncedBossBars();
 }
@@ -1,62 +0,0 @@
-package me.neznamy.tab.api.chat;
-
-import me.neznamy.tab.api.util.Preconditions;
-
-/**
- * Class for click event action in chat component
- */
-public class ChatClickable {
-
-    /** Click action */
-    private final EnumClickAction action;
-
-    /** Click value */
-    private final String value;
-
-    /**
-     * Constructs new instance with given action and value.
-     *
-     * @param   action
-     *          click event action
-     * @param   value
-     *          click event value
-     * @throws  IllegalArgumentException
-     *          if {@code action} is null or {@code value} is null
-     */
-    public ChatClickable(EnumClickAction action, String value) {
-        Preconditions.checkNotNull(action, "hover action");
-        Preconditions.checkNotNull(value, "hover value");
-        this.action = action;
-        this.value = value;
-    }
-
-    /**
-     * Returns click action defined in constructor
-     *
-     * @return  click action
-     */
-    public EnumClickAction getAction() {
-        return action;
-    }
-
-    /**
-     * Returns click action defined in constructor
-     *
-     * @return  click action
-     */
-    public String getValue() {
-        return 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,37 +0,0 @@
-package me.neznamy.tab.api.chat;
-
-import java.util.UUID;
-
-import me.neznamy.tab.api.TabAPI;
-import me.neznamy.tab.api.util.Preconditions;
-
-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(String type, UUID id, String name) {
-        Preconditions.checkNotNull(type, "type");
-        Preconditions.checkNotNull(id, "id");
-        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,70 +0,0 @@
-package me.neznamy.tab.api.chat;
-
-import me.neznamy.tab.api.util.Preconditions;
-
-/**
- * Class for hover event action in chat component
- */
-public class ChatHoverable {
-
-    /** Hover action */
-    private final EnumHoverAction action;
-
-    /** Hover value */
-    private final IChatBaseComponent value;
-
-    /**
-     * Constructs new instance with given action and value.
-     *
-     * @param   action
-     *          hover event action
-     * @param   value
-     *          hover event value
-     * @throws  IllegalArgumentException
-     *          if {@code action} is null or {@code value} is null
-     */
-    public ChatHoverable(EnumHoverAction action, IChatBaseComponent value) {
-        Preconditions.checkNotNull(action, "hover action");
-        Preconditions.checkNotNull(value, "hover value");
-        this.action = action;
-        this.value = value;
-    }
-
-    /**
-     * Returns hover action defined in constructor
-     *
-     * @return  hover action
-     */
-    public EnumHoverAction getAction() {
-        return action;
-    }
-
-    /**
-     * Returns hover value defined in constructor
-     *
-     * @return  hover value
-     */
-    public IChatBaseComponent getValue() {
-        return value;
-    }
-
-    /**
-     * Enum for all possible hover actions
-     */
-    public enum EnumHoverAction {
-
-        SHOW_TEXT("contents"),
-        SHOW_ITEM("value"),
-        SHOW_ENTITY("contents");
-
-        private final String preferredKey;
-
-        EnumHoverAction(String preferredKey) {
-            this.preferredKey = preferredKey;
-        }
-
-        public String getPreferredKey() {
-            return preferredKey;
-        }
-    }
-}
@@ -1,316 +0,0 @@
-package me.neznamy.tab.api.chat;
-
-import java.util.UUID;
-
-import me.neznamy.tab.api.util.Preconditions;
-import org.json.simple.JSONObject;
-
-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;
-
-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() {
-    }
-
-    public ChatModifier(ChatModifier modifier) {
-        Preconditions.checkNotNull(modifier, "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;
-    }
-
-    public TextColor getColor() {
-        return color;
-    }
-
-    public void setColor(TextColor color) {
-        this.color = color;
-    }
-
-    public Boolean getBold() {
-        return bold;
-    }
-
-    public void setBold(Boolean bold) {
-        this.bold = bold;
-    }
-
-    public Boolean getItalic() {
-        return italic;
-    }
-
-    public void setItalic(Boolean italic) {
-        this.italic = italic;
-    }
-
-    public Boolean getUnderlined() {
-        return underlined;
-    }
-
-    public void setUnderlined(Boolean underlined) {
-        this.underlined = underlined;
-    }
-
-    public Boolean getStrikethrough() {
-        return strikethrough;
-    }
-
-    public void setStrikethrough(Boolean strikethrough) {
-        this.strikethrough = strikethrough;
-    }
-
-    public Boolean getObfuscated() {
-        return obfuscated;
-    }
-
-    public void setObfuscated(Boolean obfuscated) {
-        this.obfuscated = obfuscated;
-    }
-
-    /**
-     * 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);
-    }
-
-    public ChatClickable getClickEvent() {
-        return clickEvent;
-    }
-
-    public void setClickEvent(ChatClickable clickEvent) {
-        this.clickEvent = clickEvent;
-    }
-
-    public ChatHoverable getHoverEvent() {
-        return hoverEvent;
-    }
-
-    public void setHoverEvent(ChatHoverable hoverEvent) {
-        this.hoverEvent = hoverEvent;
-    }
-
-    /**
-     * Sets click action to OPEN_URL and url to given value
-     *
-     * @param   url
-     *          url to open
-     */
-    public void onClickOpenUrl(String url) {
-        Preconditions.checkNotNull(url, "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(String command) {
-        Preconditions.checkNotNull(command, "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(String command) {
-        Preconditions.checkNotNull(command, "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(String text) {
-        Preconditions.checkNotNull(text, "text");
-        clickEvent = new ChatClickable(EnumClickAction.COPY_TO_CLIPBOARD, text);
-    }
-
-    public void onClick(EnumClickAction action, String value) {
-        Preconditions.checkNotNull(action, "action");
-        Preconditions.checkNotNull(value, "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(IChatBaseComponent text) {
-        Preconditions.checkNotNull(text, "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(String serializedItem) {
-        Preconditions.checkNotNull(serializedItem, "item");
-        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(String type, UUID id, String name) {
-        Preconditions.checkNotNull(type, "type");
-        Preconditions.checkNotNull(id, "id");
-        hoverEvent = new ChatHoverable(EnumHoverAction.SHOW_ENTITY, new ChatComponentEntity(type, id, name));
-    }
-
-    public void onHover(EnumHoverAction action, IChatBaseComponent value) {
-        Preconditions.checkNotNull(action, "action");
-        Preconditions.checkNotNull(value, "value");
-        hoverEvent = new ChatHoverable(action, value);
-    }
-
-    public String getFont() {
-        return font;
-    }
-
-    public void setFont(String font) {
-        this.font = font;
-    }
-
-    @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();
-    }
-
-    public void setTargetVersion(ProtocolVersion targetVersion) {
-        this.targetVersion = targetVersion;
-    }
-
-    public ProtocolVersion getTargetVersion() {
-        return targetVersion;
-    }
-}
@@ -1,171 +0,0 @@
-package me.neznamy.tab.api.chat;
-
-import me.neznamy.tab.api.ProtocolVersion;
-import me.neznamy.tab.api.TabAPI;
-import me.neznamy.tab.api.util.Preconditions;
-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")
-public class DeserializedChatComponent extends IChatBaseComponent {
-
-    /** The original serialized component string */
-    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;
-
-    /**
-     * Constructs new instance with given parameter
-     *
-     * @param   json
-     *          serialized component as string
-     */
-    public DeserializedChatComponent(String json) {
-        Preconditions.checkNotNull(json, "json");
-        this.json = json;
-    }
-
-    @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 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(IChatBaseComponent child) {
-        if (!deserialized) deserialize();
-        modified = true;
-        super.addExtra(child);
-    }
-
-    @Override
-    public void setModifier(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(JSONObject jsonObject, String key) {
-        Preconditions.checkNotNull(jsonObject, "json object");
-        Preconditions.checkNotNull(key, "key");
-        String value = String.valueOf(jsonObject.getOrDefault(key, null));
-        return "null".equals(value) ? null : Boolean.parseBoolean(value);
-    }
-}
@@ -1,75 +0,0 @@
-package me.neznamy.tab.api.chat;
-
-import me.neznamy.tab.api.ProtocolVersion;
-
-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.
- */
-public class WrappedChatComponent extends IChatBaseComponent {
-
-    /** Original NMS component */
-    private final Object originalComponent;
-
-    /**
-     * Constructs new instance with given parameter
-     *
-     * @param   originalComponent
-     *          Original NMS component
-     */
-    public WrappedChatComponent(Object originalComponent) {
-        this.originalComponent = originalComponent;
-    }
-
-    /**
-     * Returns the original NMS component
-     * @return  the original NMS component
-     */
-    public Object get() {
-        return 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 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(IChatBaseComponent child) {
-        throw new UnsupportedOperationException("Not supported for " + getClass().getSimpleName());
-    }
-
-    @Override
-    public void setModifier(ChatModifier modifier) {
-        throw new UnsupportedOperationException("Not supported for " + getClass().getSimpleName());
-    }
-}
@@ -1,209 +0,0 @@
-package me.neznamy.tab.api.chat.rgb;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import me.neznamy.tab.api.chat.EnumChatFormat;
-import me.neznamy.tab.api.chat.TextColor;
-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.Preconditions;
-
-/**
- * A helper class to reformat all RGB formats into the default #RRGGBB and apply gradients
- */
-public class RGBUtils {
-
-    /** Instance of the class */
-    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<>();
-        try {
-            Class.forName("net.kyori.adventure.text.minimessage.MiniMessage");
-            list.add(new MiniMessageFormat());
-        } catch (ClassNotFoundException ignored) {}
-        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()
-        };
-    }
-
-    /**
-     * Returns instance of this class
-     *
-     * @return  instance
-     */
-    public static RGBUtils getInstance() {
-        return instance;
-    }
-
-    /**
-     * 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(String text) {
-        Preconditions.checkNotNull(text, "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(String text) {
-        Preconditions.checkNotNull(text, "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
-     *
-     * @param   text
-     *          text to convert
-     * @return  translated text
-     */
-    public String convertRGBtoLegacy(String text) {
-        if (text == null) return null;
-        if (!text.contains("#")) return EnumChatFormat.color(text);
-        String applied = applyFormats(text);
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < applied.length(); i++){
-            char c = applied.charAt(i);
-            if (c == '#' && applied.length() > i+6) {
-                String hexCode = applied.substring(i+1, i+7);
-                if (isHexCode(hexCode)) {
-                    if (containsLegacyCode(applied, i)) {
-                        sb.append(new TextColor(hexCode, EnumChatFormat.getByChar(applied.charAt(i+8))).getLegacyColor().getFormat());
-                        i += 8;
-                    } else {
-                        sb.append(new TextColor(hexCode).getLegacyColor().getFormat());
-                        i += 6;
-                    }
-                } else {
-                    sb.append(c);
-                }
-            } else {
-                sb.append(c);
-            }
-        }
-        return sb.toString();
-    }
-
-    /**
-     * 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(String string) {
-        Preconditions.checkNotNull(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,5 +1,7 @@
 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.
@@ -10,7 +12,7 @@ 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 +26,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 +35,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 +43,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 +51,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 +1,48 @@
 package me.neznamy.tab.api.event.plugin;

+import lombok.NonNull;
+import me.neznamy.tab.api.TabPlayer;
 import me.neznamy.tab.api.event.TabEvent;
-import me.neznamy.tab.api.placeholder.Placeholder;
+import org.jetbrains.annotations.NotNull;

+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+/**
+ * Called when an unknown placeholder is about to be registered.
+ * It defaults to a PlaceholderAPI implementation, but can be overridden.
+ */
 public interface PlaceholderRegisterEvent extends TabEvent {

-    String getIdentifier();
+    /**
+     * Returns placeholder identifier starting and ending with {@code %}
+     *
+     * @return  placeholder identifier starting and ending with {@code %}
+     */
+    @NotNull String getIdentifier();

-    void setPlaceholder(Placeholder placeholder);
+    /**
+     * Sets placeholder to specified server placeholder implementation.
+     *
+     * @param   supplier
+     *          Placeholder replacer
+     */
+    void setServerPlaceholder(@NonNull Supplier<Object> supplier);
+
+    /**
+     * Sets placeholder to specified player placeholder implementation.
+     *
+     * @param   function
+     *          Placeholder replacer
+     */
+    void setPlayerPlaceholder(@NonNull Function<TabPlayer, Object> function);
+
+    /**
+     * Sets placeholder to specified relational placeholder implementation.
+     *
+     * @param   function
+     *          Placeholder replacer
+     */
+    void setRelationalPlaceholder(@NonNull BiFunction<TabPlayer, TabPlayer, Object> function);
 }
@@ -0,0 +1,183 @@
+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.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}.
+ */
+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     #getOriginalPrefix(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     #getOriginalSuffix(TabPlayer)
+     */
+    void setSuffix(@NonNull TabPlayer player, @Nullable String suffix);
+
+    @Nullable String getCustomPrefix(@NonNull TabPlayer player);
+
+    @Nullable String getCustomSuffix(@NonNull TabPlayer player);
+
+    @NonNull String getOriginalPrefix(@NonNull TabPlayer player);
+
+    @NonNull String getOriginalSuffix(@NonNull TabPlayer player);
+
+    /**
+     * Toggles name tag visibility view on all players for specified player.
+     * On first call, name tags of all players will become invisible for specified
+     * player. On second call, they will become visible again.
+     *
+     * @param   player
+     *          player to toggle name tag visibility view for
+     * @param   sendToggleMessage
+     *          {@code true} if configured toggle message should be sent, {@code false} if not
+     */
+    void toggleNameTagVisibilityView(@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);
+}
@@ -0,0 +1,128 @@
+package me.neznamy.tab.api.nametag;
+
+import java.util.List;
+
+import lombok.NonNull;
+import me.neznamy.tab.api.TabAPI;
+import me.neznamy.tab.api.TabPlayer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Interface for manipulating player name tags.
+ * <p>
+ * Instance can be obtained using {@link TabAPI#getNameTagManager()} and then casting it.
+ * This requires both Team and Unlimited name tag features to be enabled in config, otherwise the method will
+ * return {@code null} or not be an instance of this class.
+ */
+public interface UnlimitedNameTagManager extends NameTagManager {
+
+    /**
+     * Disables armor stands of specified player and displays vanilla name tags instead.
+     *
+     * @param   player
+     *          Player to disable armor stands of
+     * @see     #enableArmorStands(TabPlayer)
+     * @see     #hasDisabledArmorStands(TabPlayer)
+     */
+    void disableArmorStands(@NonNull TabPlayer player);
+
+    /**
+     * Enabled back armor stands of player, who was disabled previously using
+     * {@link #disableArmorStands(TabPlayer)}.
+     *
+     * @param   player
+     *          Player to enable back
+     * @see     #disableArmorStands(TabPlayer)
+     * @see     #hasDisabledArmorStands(TabPlayer)
+     */
+    void enableArmorStands(@NonNull TabPlayer player);
+
+    /**
+     * Returns {@code true} if player has armor stands disabled using
+     * {@link #disableArmorStands(TabPlayer)}, {@code false} otherwise.
+     *
+     * @param   player
+     *          Player to check
+     * @return  {@code true} if disabled, {@code false} if not.
+     * @see     #disableArmorStands(TabPlayer)
+     * @see     #enableArmorStands(TabPlayer)
+     */
+    boolean hasDisabledArmorStands(@NonNull TabPlayer player);
+
+    /**
+     * Changes name to specified value. Set to {@code null} to
+     * reset back to original value.
+     *
+     * @param   player
+     *          Player to change name of
+     * @param   customName
+     *          New name, or {@code null} to reset to original value
+     */
+    void setName(@NonNull TabPlayer player, @Nullable String customName);
+
+    /**
+     * Changes line to specified value. Set to {@code null} to reset back to original value.
+     *
+     * @param   player
+     *          Player to change line of
+     * @param   line
+     *          Name of defined line
+     * @param   value
+     *          Value to use, or {@code null} to reset back to original value
+     * @see     #getDefinedLines()
+     */
+    void setLine(@NonNull TabPlayer player, @NonNull String line, @Nullable String value);
+
+    /**
+     * Returns custom name value set using {@link #setName(TabPlayer, String)}.
+     *
+     * @param   player
+     *          Player to check
+     * @return  Custom name set previously or {@code null} if not set
+     * @see     #setName(TabPlayer, String)
+     */
+    @Nullable String getCustomName(@NonNull TabPlayer player);
+
+    /**
+     * Returns custom line value set using {@link #setLine(TabPlayer, String, String)}.
+     *
+     * @param   player
+     *          Player to check
+     * @param   line
+     *          Defined line
+     * @return  Custom name set previously or {@code null} if not set
+     * @see     #setName(TabPlayer, String)
+     * @see     #getDefinedLines()
+     */
+    @Nullable String getCustomLineValue(@NonNull TabPlayer player, @NonNull String line);
+
+    /**
+     * Returns original name value configured in files.
+     *
+     * @param   player
+     *          Player to check
+     * @return  Original configured name
+     * @see     #setName(TabPlayer, String)
+     */
+    @NotNull String getOriginalName(@NonNull TabPlayer player);
+
+    /**
+     * Returns original line value configured in files.
+     *
+     * @param   player
+     *          Player to check
+     * @param   line
+     *          Line name
+     * @return  Original configured line
+     * @see     #setLine(TabPlayer, String, String)
+     */
+    @NotNull String getOriginalLineValue(@NonNull TabPlayer player, @NonNull String line);
+
+    /**
+     * Returns list of all defined lines in config, both static and dynamic lines.
+     *
+     * @return  List of all defined lines in config
+     */
+    @NotNull List<String> getDefinedLines();
+}
@@ -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,92 @@
 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 me.neznamy.tab.api.TabFeature;
-import me.neznamy.tab.api.TabPlayer;
-
+/**
+ * An interface allowing placeholder registration. Instance can be
+ * obtained using {@link TabAPI#getPlaceholderManager()}
+ */
 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<Object> 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, Object> 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, Object> function);

-    Placeholder getPlaceholder(String identifier);
+    /**
+     * 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,30 @@
 package me.neznamy.tab.api.placeholder;

+import lombok.NonNull;
 import me.neznamy.tab.api.TabPlayer;

+/**
+ * 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, @NonNull Object 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,34 @@
 package me.neznamy.tab.api.placeholder;

+import lombok.NonNull;
 import me.neznamy.tab.api.TabPlayer;

+/**
+ * An interface for relational placeholders (returning different value for each player duo)
+ */
 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, @NonNull Object 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 lombok.NonNull;
+
+/**
+ * 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(@NonNull 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.
-     *
-     * @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,269 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-import java.util.HashMap;
-import java.util.Map;
-
-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 me.neznamy.tab.api.util.Preconditions;
-
-/**
- * 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(TabPacket packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-        Preconditions.checkNotNull(packet, "packet");
-        Preconditions.checkNotNull(clientVersion, "clientVersion");
-        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
-     * @throws  ReflectiveOperationException
-     *          if thrown by reflective operation
-     */
-    public Object build(PacketPlayOutChat packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-        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
-     * @throws  ReflectiveOperationException
-     *          if thrown by reflective operation
-     */
-    public Object build(PacketPlayOutPlayerListHeaderFooter packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-        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
-     * @throws  ReflectiveOperationException
-     *          if thrown by reflective operation
-     */
-    public Object build(PacketPlayOutScoreboardDisplayObjective packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-        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
-     * @throws  ReflectiveOperationException
-     *          if thrown by reflective operation
-     */
-    public Object build(PacketPlayOutScoreboardObjective packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-        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
-     * @throws  ReflectiveOperationException
-     *          if thrown by reflective operation
-     */
-    public Object build(PacketPlayOutScoreboardScore packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-        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
-     * @throws  ReflectiveOperationException
-     *          if thrown by reflective operation
-     */
-    public Object build(PacketPlayOutScoreboardTeam packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-        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,302 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-import java.util.UUID;
-
-import me.neznamy.tab.api.bossbar.BarColor;
-import me.neznamy.tab.api.bossbar.BarStyle;
-import me.neznamy.tab.api.util.Preconditions;
-
-/**
- * A class representing platform specific packet class
- */
-public class PacketPlayOutBoss implements TabPacket {
-
-    /** UUID of the BossBar */
-    private final UUID id;
-
-    /** Action of this packet */
-    private final 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(UUID id, String name, float pct, BarColor color, BarStyle overlay) {
-        Preconditions.checkNotNull(id, "uuid");
-        Preconditions.checkNotNull(name, "title");
-        Preconditions.checkNotNull(color, "color");
-        Preconditions.checkNotNull(overlay, "style");
-        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(UUID id) {
-        Preconditions.checkNotNull(id, "uuid");
-        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(UUID id, float pct) {
-        Preconditions.checkNotNull(id, "uuid");
-        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(UUID id, String name) {
-        Preconditions.checkNotNull(id, "uuid");
-        Preconditions.checkNotNull(name, "title");
-        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(UUID id, BarColor color, BarStyle overlay) {
-        Preconditions.checkNotNull(id, "uuid");
-        Preconditions.checkNotNull(color, "color");
-        Preconditions.checkNotNull(overlay, "style");
-        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(UUID id, boolean darkenScreen, boolean playMusic, boolean createWorldFog) {
-        Preconditions.checkNotNull(id, "uuid");
-        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;
-    }
-
-    @Override
-    public String toString() {
-        return String.format("PacketPlayOutBoss{id=%s,operation=%s,name=%s,pct=%s,color=%s,overlay=%s,darkenScreen=%s,playMusic=%s,createWorldFog=%s}",
-                id, action, name, pct, color, overlay, darkenScreen, playMusic, createWorldFog);
-    }
-
-    /**
-     * Returns {@link #color}
-     *
-     * @return  color
-     */
-    public BarColor getColor() {
-        return color;
-    }
-
-    /**
-     * Returns {@link #overlay}
-     *
-     * @return  style
-     */
-    public BarStyle getOverlay() {
-        return overlay;
-    }
-
-    /**
-     * Returns {@link #name}
-     *
-     * @return  name
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Returns {@link #id}
-     *
-     * @return  id
-     */
-    public UUID getId() {
-        return id;
-    }
-
-    /**
-     * Returns {@link #pct}
-     *
-     * @return  progress
-     */
-    public float getPct() {
-        return pct;
-    }
-
-    /**
-     * Returns {@link #action}
-     *
-     * @return  packet action
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * Returns {@link #darkenScreen}
-     *
-     * @return  darkenScreen
-     */
-    public boolean isDarkenScreen() {
-        return darkenScreen;
-    }
-
-    /**
-     * Returns {@link #createWorldFog}
-     *
-     * @return  createWorldFog
-     */
-    public boolean isCreateWorldFog() {
-        return createWorldFog;
-    }
-
-    /**
-     * Returns {@link #playMusic}
-     *
-     * @return  playMusic
-     */
-    public boolean isPlayMusic() {
-        return playMusic;
-    }
-
-    /**
-     * Sets {@link #darkenScreen} to specified value
-     *
-     * @param   darkenScreen
-     *          Darken screen flag
-     */
-    public void setDarkenScreen(boolean darkenScreen) {
-        this.darkenScreen = darkenScreen;
-    }
-
-    /**
-     * Sets {@link #createWorldFog} to specified value
-     *
-     * @param   createWorldFog
-     *          Create fog flag
-     */
-    public void setCreateWorldFog(boolean createWorldFog) {
-        this.createWorldFog = createWorldFog;
-    }
-
-    /**
-     * Sets {@link #playMusic} to specified value
-     *
-     * @param   playMusic
-     *          Play music flag
-     */
-    public void setPlayMusic(boolean playMusic) {
-        this.playMusic = playMusic;
-    }
-
-    /**
-     * 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,65 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-import me.neznamy.tab.api.chat.IChatBaseComponent;
-import me.neznamy.tab.api.util.Preconditions;
-
-/**
- * A class representing platform specific packet class
- */
-public class PacketPlayOutChat implements TabPacket {
-
-    /** Message to be sent */
-    private final IChatBaseComponent message;
-
-    /** Message position */
-    private final ChatMessageType type;
-
-    /**
-     * Constructs new instance with given parameters
-     * 
-     * @param   message
-     *          Chat message to be sent
-     * @param   type
-     *          Message position
-     */
-    public PacketPlayOutChat(IChatBaseComponent message, ChatMessageType type) {
-        Preconditions.checkNotNull(message, "message");
-        Preconditions.checkNotNull(type, "message type");
-        this.message = message;
-        this.type = type;
-    }
-
-    @Override
-    public String toString() {
-        return String.format("PacketPlayOutChat{message=%s,type=%s}", message, type);
-    }
-
-    /**
-     * Returns {@link #message}
-     *
-     * @return  message
-     */
-    public IChatBaseComponent getMessage() {
-        return message;
-    }
-
-    /**
-     * Returns {@link #type}
-     *
-     * @return  type
-     */
-    public ChatMessageType getType() {
-        return 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,440 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-import java.util.Arrays;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.UUID;
-
-import me.neznamy.tab.api.chat.IChatBaseComponent;
-import me.neznamy.tab.api.util.Preconditions;
-
-/**
- * A class representing platform specific packet class
- */
-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(EnumPlayerInfoAction action, List<PlayerInfoData> entries) {
-        Preconditions.checkNotNull(action, "action");
-        Preconditions.checkNotNull(entries, "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(EnumSet<EnumPlayerInfoAction> actions, PlayerInfoData... entries) {
-        Preconditions.checkNotNull(actions, "action");
-        Preconditions.checkNotNull(entries, "entries");
-        this.actions = actions;
-        this.entries = Arrays.asList(entries);
-    }
-
-    /**
-     * Constructs new instance with given parameters.
-     *
-     * @param   actions
-     *          Packet actions
-     * @param   entries
-     *          Affected entries
-     */
-    public PacketPlayOutPlayerInfo(EnumSet<EnumPlayerInfoAction> actions, List<PlayerInfoData> entries) {
-        Preconditions.checkNotNull(actions, "action");
-        Preconditions.checkNotNull(entries, "entries");
-        this.actions = actions;
-        this.entries = entries;
-    }
-
-    @Override
-    public String toString() {
-        return String.format("PacketPlayOutPlayerInfo{actions=%s,entries=%s}", actions, entries);
-    }
-
-    /**
-     * Returns {@link #actions}
-     *
-     * @return  packet action
-     */
-    public EnumSet<EnumPlayerInfoAction> getActions() {
-        return actions;
-    }
-
-    /**
-     * Returns {@link #entries}
-     *
-     * @return  affected entries
-     */
-    public List<PlayerInfoData> getEntries() {
-        return entries;
-    }
-
-    /**
-     * A subclass representing player list entry
-     */
-    public static class PlayerInfoData {
-
-        /** Latency */
-        private int latency;
-
-        /** I have no idea what this is */
-        private boolean listed;
-
-        /** 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;
-
-        /** Real name of affected player */
-        private String name;
-
-        /** Player UUID */
-        private UUID uniqueId;
-
-        /** Player's skin, null for empty skin */
-        private Skin skin;
-
-        /** Chat session ID */
-        private UUID chatSessionId;
-
-        /** Player's chat signing key */
-        private Object profilePublicKey;
-
-        /**
-         * Constructs new instance with given parameters. Suitable for 
-         * {@link EnumPlayerInfoAction#ADD_PLAYER} action
-         * 
-         * @param   name
-         *          Player's name
-         * @param   uniqueId
-         *          Player's uuid
-         * @param   skin
-         *          Player's platform-specific skin object
-         * @param   latency
-         *          Player's ping
-         * @param   gameMode
-         *          Player's GameMode
-         * @param   displayName
-         *          Player's display name
-         * @param   profilePublicKey
-         *          Player's chat signing key
-         */
-        public PlayerInfoData(String name, UUID uniqueId, Skin skin, boolean listed, int latency, EnumGamemode gameMode, IChatBaseComponent displayName, UUID chatSessionId, Object profilePublicKey) {
-            Preconditions.checkNotNull(uniqueId, "uuid");
-            this.name = name;
-            this.uniqueId = uniqueId;
-            this.skin = skin;
-            this.listed = listed;
-            this.latency = latency;
-            this.gameMode = gameMode;
-            this.displayName = displayName;
-            this.chatSessionId = chatSessionId;
-            this.profilePublicKey = 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(UUID uniqueId, EnumGamemode gameMode) {
-            Preconditions.checkNotNull(uniqueId, "uuid");
-            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(UUID uniqueId, int latency) {
-            Preconditions.checkNotNull(uniqueId, "uuid");
-            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(UUID uniqueId, IChatBaseComponent displayName) {
-            Preconditions.checkNotNull(uniqueId, "uuid");
-            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(UUID uniqueId) {
-            this.uniqueId = uniqueId;
-        }
-
-        @Override
-        public String toString() {
-            return String.format("PlayerInfoData{latency=%s,gameMode=%s,displayName=%s,name=%s,uniqueId=%s,skin=%s,profilePublicKey=%s}",
-                    latency, gameMode, displayName, name, uniqueId, skin, profilePublicKey);
-        }
-
-        /**
-         * Returns {@link #latency}
-         *
-         * @return  latency
-         */
-        public int getLatency() {
-            return latency;
-        }
-
-        /**
-         * Sets {@link #latency} to specified value
-         *
-         * @param   latency
-         *          Latency to use
-         */
-        public void setLatency(int latency) {
-            this.latency = latency;
-        }
-
-        /**
-         * Returns {@link #listed}
-         *
-         * @return  listed
-         */
-        public boolean isListed() {
-            return listed;
-        }
-
-        /**
-         * Sets {@link #listed} to specified value
-         *
-         * @param   listed
-         *          Listed flag
-         */
-        public void setListed(boolean listed) {
-            this.listed = listed;
-        }
-
-        /**
-         * Returns {@link #displayName}
-         *
-         * @return  displayName
-         */
-        public IChatBaseComponent getDisplayName() {
-            return displayName;
-        }
-
-        /**
-         * Sets {@link #displayName} to specified value
-         *
-         * @param   displayName
-         *          Display name to use
-         */
-        public void setDisplayName(IChatBaseComponent displayName) {
-            this.displayName = displayName;
-        }
-
-        /**
-         * Returns {@link #uniqueId}
-         *
-         * @return  uniqueId
-         */
-        public UUID getUniqueId() {
-            return uniqueId;
-        }
-
-        /**
-         * Sets {@link #uniqueId} to specified value
-         *
-         * @param   uniqueId
-         *          UUID to use
-         */
-        public void setUniqueId(UUID uniqueId) {
-            this.uniqueId = uniqueId;
-        }
-
-        /**
-         * Returns {@link #name}
-         *
-         * @return  name
-         */
-        public String getName() {
-            return name;
-        }
-
-        /**
-         * Sets {@link #name} to specified value
-         *
-         * @param   name
-         *          name to use
-         */
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        /**
-         * Returns {@link #gameMode}
-         *
-         * @return  gameMode
-         */
-        public EnumGamemode getGameMode() {
-            return gameMode;
-        }
-
-        /**
-         * Sets {@link #gameMode} to specified value
-         *
-         * @param   gameMode
-         *          GameMode to use
-         */
-        public void setGameMode(EnumGamemode gameMode) {
-            this.gameMode = gameMode;
-        }
-
-        /**
-         * Returns {@link #skin}
-         *
-         * @return  skin
-         */
-        public Skin getSkin() {
-            return skin;
-        }
-
-        /**
-         * Sets {@link #skin} to specified value
-         *
-         * @param   skin
-         *          Skin to use
-         */
-        public void setSkin(Skin skin) {
-            this.skin = skin;
-        }
-
-        /**
-         * Returns {@link #chatSessionId}
-         *
-         * @return  chatSessionId
-         */
-        public UUID getChatSessionId() {
-            return chatSessionId;
-        }
-
-        /**
-         * Sets {@link #chatSessionId} to specified value
-         *
-         * @param   chatSessionId
-         *          chatSessionId to use
-         */
-        public void setChatSessionId(UUID chatSessionId) {
-            this.chatSessionId = chatSessionId;
-        }
-
-        /**
-         * Returns {@link #profilePublicKey}
-         *
-         * @return  profilePublicKey
-         */
-        public Object getProfilePublicKey() {
-            return profilePublicKey;
-        }
-
-        /**
-         * Sets {@link #profilePublicKey} to specified value
-         *
-         * @param   profilePublicKey
-         *          profilePublicKey to use
-         */
-        public void setProfilePublicKey(Object profilePublicKey) {
-            this.profilePublicKey = profilePublicKey;
-        }
-    }
-
-    /**
-     * 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,70 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-import me.neznamy.tab.api.chat.IChatBaseComponent;
-import me.neznamy.tab.api.util.Preconditions;
-
-/**
- * A class representing platform specific packet class
- */
-public class PacketPlayOutPlayerListHeaderFooter implements TabPacket {
-
-    /** TabList header */
-    private final IChatBaseComponent header;
-
-    /** TabList footer */
-    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(String header, String footer) {
-        Preconditions.checkNotNull(header, "header");
-        Preconditions.checkNotNull(footer, "footer");
-        this.header = IChatBaseComponent.optimizedComponent(header);
-        this.footer = IChatBaseComponent.optimizedComponent(footer);
-    }
-
-    /**
-     * Constructs new instance with given parameters.
-     * 
-     * @param   header
-     *          TabList header
-     * @param   footer
-     *          TabList footer
-     */
-    public PacketPlayOutPlayerListHeaderFooter(IChatBaseComponent header, IChatBaseComponent footer) {
-        Preconditions.checkNotNull(header, "header");
-        Preconditions.checkNotNull(footer, "footer");
-        this.header = header;
-        this.footer = footer;
-    }
-
-    @Override
-    public String toString() {
-        return String.format("PacketPlayOutPlayerListHeaderFooter{header=%s,footer=%s}", header, footer);
-    }
-
-    /**
-     * Returns {@link #header}
-     *
-     * @return  header
-     */
-    public IChatBaseComponent getHeader() {
-        return header;
-    }
-
-    /**
-     * Returns {@link #footer}
-     *
-     * @return  footer
-     */
-    public IChatBaseComponent getFooter() {
-        return footer;
-    }
-}
@@ -1,60 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-import me.neznamy.tab.api.util.Preconditions;
-
-/**
- * A class representing platform specific packet class
- */
-public class PacketPlayOutScoreboardDisplayObjective implements TabPacket {
-
-    /**
-     * Display slot.
-     * 0 = PlayerList,
-     * 1 = SideBar,
-     * 2 = BelowName.
-     */
-    private final int slot;
-
-    /** Up to 16 characters long objective name */
-    private final String objectiveName;
-
-    /**
-     * Constructs new instance with given parameters
-     *
-     * @param   slot
-     *          Display slot
-     * @param   objectiveName
-     *          Internal name of the objective
-     * @throws  IllegalArgumentException
-     *          if {@code objectiveName} is null or longer than 16 characters
-     */
-    public PacketPlayOutScoreboardDisplayObjective(int slot, String objectiveName) {
-        Preconditions.checkNotNull(objectiveName, "objective name");
-        Preconditions.checkMaxLength(objectiveName, 16, "objective name");
-        this.slot = slot;
-        this.objectiveName = objectiveName;
-    }
-
-    @Override
-    public String toString() {
-        return String.format("PacketPlayOutScoreboardDisplayObjective{slot=%s,objectiveName=%s}", slot, objectiveName);
-    }
-
-    /**
-     * Returns {@link #slot}
-     *
-     * @return  slot
-     */
-    public int getSlot() {
-        return slot;
-    }
-
-    /**
-     * Returns {@link #objectiveName}
-     *
-     * @return  objectiveName
-     */
-    public String getObjectiveName() {
-        return objectiveName;
-    }
-}
@@ -1,119 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-import me.neznamy.tab.api.util.Preconditions;
-
-/**
- * A class representing platform specific packet class
- */
-public class PacketPlayOutScoreboardObjective implements TabPacket {
-
-    /** Up to 16 characters long objective name */
-    private final String objectiveName;
-
-    /** Display name */
-    private final String displayName;
-
-    /** Display type, only takes effect in PlayerList */
-    private final EnumScoreboardHealthDisplay renderType;
-
-    /**
-     * Packet action.
-     * 0 = register,
-     * 1 = unregister,
-     * 2 = update title
-     */
-    private final int action;
-
-    /**
-     * Constructs new instance with given parameters.
-     *
-     * @param   action
-     *          Packet action (0 = add, 1 = remove, 2 = update title)
-     * @param   objectiveName
-     *          objective name, up to 16 characters long
-     * @param   displayName
-     *          title
-     * @param   renderType
-     *          display type
-     * @throws  IllegalArgumentException
-     *          if {@code objectiveName} is null or longer than 16 characters
-     */
-    public PacketPlayOutScoreboardObjective(int action, String objectiveName, String displayName, EnumScoreboardHealthDisplay renderType) {
-        Preconditions.checkRange(action, 0, 2, "action");
-        Preconditions.checkNotNull(objectiveName, "objective name");
-        Preconditions.checkMaxLength(objectiveName, 16, "objective name");
-        Preconditions.checkNotNull(renderType, "render type");
-        this.objectiveName = objectiveName;
-        this.displayName = displayName;
-        this.renderType = renderType;
-        this.action = action;
-    }
-
-    /**
-     * 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(String objectiveName) {
-        Preconditions.checkNotNull(objectiveName, "objective name");
-        Preconditions.checkMaxLength(objectiveName, 16, "objective name");
-        this.objectiveName = objectiveName;
-        this.displayName = ""; //avoiding NPE on <1.7
-        this.action = 1;
-        this.renderType = null;
-    }
-
-    @Override
-    public String toString() {
-        return String.format("PacketPlayOutScoreboardObjective{objectiveName=%s,displayName=%s,renderType=%s,method=%s}",
-                objectiveName, displayName, renderType, action);
-    }
-
-    /**
-     * Returns {@link #displayName}
-     *
-     * @return  displayName
-     */
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    /**
-     * Returns {@link #objectiveName}
-     *
-     * @return  objectiveName
-     */
-    public String getObjectiveName() {
-        return objectiveName;
-    }
-
-    /**
-     * Returns {@link #renderType}
-     *
-     * @return  renderType
-     */
-    public EnumScoreboardHealthDisplay getRenderType() {
-        return renderType;
-    }
-
-    /**
-     * Returns {@link #action}
-     *
-     * @return  packet action
-     */
-    public int getAction() {
-        return action;
-    }
-
-    /**
-     * An enum representing available display types.
-     * They only take effect in PlayerList position.
-     */
-    public enum EnumScoreboardHealthDisplay {
-
-        INTEGER, HEARTS
-    }
-}
@@ -1,97 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-import me.neznamy.tab.api.util.Preconditions;
-
-/**
- * A class representing platform specific packet class
- */
-public class PacketPlayOutScoreboardScore implements TabPacket {
-
-    /** Packet action */
-    private final Action action;
-
-    /** Objective name */
-    private final String objectiveName;
-
-    /** Affected player */
-    private final String player;
-
-    /** Player's score */
-    private final int score;
-
-    /**
-     * Constructs new instance with given parameters
-     *
-     * @param   action
-     *          Packet action
-     * @param   objectiveName
-     *          Objective name
-     * @param   player
-     *          Affected player
-     * @param   score
-     *          Player's score
-     * @throws  IllegalArgumentException
-     *          if {@code objectiveName} is null or longer than 16 characters
-     */
-    public PacketPlayOutScoreboardScore(Action action, String objectiveName, String player, int score) {
-        Preconditions.checkNotNull(action, "action");
-        Preconditions.checkNotNull(objectiveName, "objective name");
-        Preconditions.checkMaxLength(objectiveName, 16, "objective name");
-        Preconditions.checkNotNull(player, "player");
-        this.action = action;
-        this.objectiveName = objectiveName;
-        this.player = player;
-        this.score = score;
-    }
-
-    @Override
-    public String toString() {
-        return String.format("PacketPlayOutScoreboardScore{action=%s,objectiveName=%s,player=%s,score=%s}",
-                action, objectiveName, player, score);
-    }
-
-    /**
-     * Returns {@link #action}
-     *
-     * @return  packet action
-     */
-    public Action getAction() {
-        return action;
-    }
-
-    /**
-     * Returns {@link #objectiveName}
-     *
-     * @return  objective name
-     */
-    public String getObjectiveName() {
-        return objectiveName;
-    }
-
-    /**
-     * Returns {@link #player}
-     *
-     * @return  player
-     */
-    public String getPlayer() {
-        return player;
-    }
-
-    /**
-     * Returns {@link #score}
-     *
-     * @return  score
-     */
-    public int getScore() {
-        return score;
-    }
-
-    /**
-     * An enum representing action types
-     */
-    public enum Action {
-
-        CHANGE,
-        REMOVE
-    }
-}
@@ -1,285 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-import java.util.Collection;
-import java.util.Collections;
-
-import me.neznamy.tab.api.chat.EnumChatFormat;
-import me.neznamy.tab.api.util.Preconditions;
-
-/**
- * A class representing platform specific packet class
- */
-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.
-     */
-    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.
-     */
-    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, String name) {
-        Preconditions.checkNotNull(name, "team 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, String prefix, String suffix, String visibility, String collision, Collection<String> players, int options) {
-        this(0, team);
-        Preconditions.checkNotNull(prefix, "prefix");
-        Preconditions.checkNotNull(suffix, "suffix");
-        Preconditions.checkNotNull(visibility, "visibility");
-        Preconditions.checkNotNull(collision, "collision");
-        Preconditions.checkNotNull(players, "players");
-        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, String prefix, String suffix, String visibility, String collision, int options) {
-        this(2, team);
-        Preconditions.checkNotNull(prefix, "prefix");
-        Preconditions.checkNotNull(suffix, "suffix");
-        Preconditions.checkNotNull(visibility, "visibility");
-        Preconditions.checkNotNull(collision, "collision");
-        Preconditions.checkNotNull(players, "players");
-        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, Collection<String> players, boolean add) {
-        this(add ? 3 : 4, team);
-        Preconditions.checkNotNull(players, "players");
-        this.players = players;
-    }
-
-    @Override
-    public String toString() {
-        return String.format("PacketPlayOutScoreboardTeam{name=%s,playerPrefix=%s,playerSuffix=%s,nameTagVisibility=%s,"
-                + "collisionRule=%s,color=%s,players=%s,method=%s,options=%s}",
-                name, playerPrefix, playerSuffix, nameTagVisibility, collisionRule, color, players, action, options);
-    }
-
-    /**
-     * Returns {@link #name}
-     *
-     * @return  team name
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Returns {@link #playerPrefix}
-     *
-     * @return  playerPrefix
-     */
-    public String getPlayerPrefix() {
-        return playerPrefix;
-    }
-
-    /**
-     * Returns {@link #playerSuffix}
-     *
-     * @return  playerSuffix
-     */
-    public String getPlayerSuffix() {
-        return playerSuffix;
-    }
-
-    /**
-     * Returns {@link #nameTagVisibility}
-     *
-     * @return  nameTagVisibility
-     */
-    public String getNameTagVisibility() {
-        return nameTagVisibility;
-    }
-    
-    /**
-     * Returns {@link #collisionRule}
-     *
-     * @return  collisionRule
-     */
-    public String getCollisionRule() {
-        return collisionRule;
-    }
-
-    /**
-     * Sets {@link #color} to specified color
-     * 
-     * @param   color
-     *          color to use
-     */
-    public void setColor(EnumChatFormat color) {
-        this.color = color;
-    }
-
-    /**
-     * Returns {@link #color}
-     *
-     * @return  color
-     */
-    public EnumChatFormat getColor() {
-        return color;
-    }
-
-    /**
-     * Returns {@link #players}
-     *
-     * @return  players
-     */
-    public Collection<String> getPlayers() {
-        return players;
-    }
-
-    /**
-     * Returns {@link #options}
-     *
-     * @return  team options
-     */
-    public int getOptions() {
-        return options;
-    }
-    
-    /**
-     * Returns {@link #action}
-     *
-     * @return  packet action
-     */
-    public int getAction() {
-        return action;
-    }
-}
@@ -1,59 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-import me.neznamy.tab.api.util.Preconditions;
-
-/**
- * Class representing a minecraft skin as a value - signature pair.
- */
-public class Skin {
-
-    /** Skin value */
-    private final String value;
-
-    /** Skin signature, can be null */
-    private final String signature;
-
-    /**
-     * Constructs new instance with given parameters
-     *
-     * @param   value
-     *          skin value
-     * @param   signature
-     *          skin signature
-     * @throws  IllegalArgumentException
-     *          if {@code value} is {@code null}
-     */
-    public Skin(String value, String signature) {
-        Preconditions.checkNotNull(value, "value");
-        this.value = value;
-        this.signature = signature;
-    }
-
-    /**
-     * Returns skin value
-     *
-     * @return  skin value
-     */
-    public String getValue() {
-        return value;
-    }
-
-    /**
-     * Returns skin signature
-     *
-     * @return  skin signature
-     */
-    public String getSignature() {
-        return signature;
-    }
-
-    /**
-     * Returns user-friendly representation of this object
-     *
-     * @return  user-friendly representation of this object
-     */
-    @Override
-    public String toString() {
-        return String.format("Skin{value=%s,signature=%s}", value, 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;

 /**
@@ -17,7 +20,7 @@ public interface Scoreboard {
     * 
     * @return  custom name of this scoreboard
     */
-    String getName();
+    @NotNull String getName();

    /**
     * Returns raw title of this scoreboard. Placeholders stay in their
@@ -26,7 +29,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 +46,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 +57,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 +68,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 
@@ -3,7 +3,10 @@ package me.neznamy.tab.api.scoreboard;
 import java.util.List;
 import java.util.Map;

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

 /**
 * Interface allowing work with scoreboards, such as creating,
@@ -11,7 +14,7 @@ import me.neznamy.tab.api.TabPlayer;
 * <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.
 */
 public interface ScoreboardManager {

@@ -39,7 +42,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 +52,7 @@ public interface ScoreboardManager {
     * 
     * @return  map of registered scoreboards
     */
-    Map<String, Scoreboard> getRegisteredScoreboards();
+    @NotNull Map<String, Scoreboard> getRegisteredScoreboards();
    
    /**
     * Displays scoreboard to defined player. This will disable all display
@@ -66,7 +69,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 +82,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 +94,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 +108,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 +125,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 +139,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 +154,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 +165,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.
@@ -13,33 +18,33 @@ 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 +53,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,38 @@
+package me.neznamy.tab.api.tablist;
+
+import lombok.NonNull;
+import me.neznamy.tab.api.TabPlayer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+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);
+}
@@ -1,92 +1,62 @@
-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.NotNull;
+import org.jetbrains.annotations.Nullable;

 /**
- * An interface allowing to modify tablist display names
+ * An interface allowing to modify TabList display names
 * of players.
 * <p>
- * Instance can be obtained using {@link TabAPI#getTablistFormatManager()}.
+ * 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 {
+public interface TabListFormatManager {

    /**
     * Changes player's prefix to provided value. Supports placeholders,
-     * as well as any supported RGB formats.
+     * 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     #resetPrefix(TabPlayer)
     * @see     #getCustomPrefix(TabPlayer)
     * @see     #getOriginalPrefix(TabPlayer)
     */
-    void setPrefix(TabPlayer player, String prefix);
+    void setPrefix(@NonNull TabPlayer player, @Nullable String prefix);

    /**
     * Changes player's name to provided value. Supports placeholders,
-     * as well as any supported RGB formats.
+     * 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     #resetName(TabPlayer)
     * @see     #getCustomName(TabPlayer)
     * @see     #getOriginalName(TabPlayer)
     */
-    void setName(TabPlayer player, String customName);
+    void setName(@NonNull TabPlayer player, @Nullable String customName);

    /**
     * Changes player's suffix to provided value. Supports placeholders,
-     * as well as any supported RGB formats.
+     * 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     #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);
+    void setSuffix(@NonNull TabPlayer player, @Nullable String suffix);

    /**
     * Returns prefix assigned using {@link #setPrefix(TabPlayer, String)} method.
@@ -96,10 +66,9 @@ public interface TablistFormatManager {
     *          player to get custom prefix of
     * @return  player's custom prefix or {@code null} if not defined
     * @see     #setPrefix(TabPlayer, String)
-     * @see     #resetPrefix(TabPlayer)
     * @see     #getOriginalPrefix(TabPlayer)
     */
-    String getCustomPrefix(TabPlayer player);
+    @Nullable String getCustomPrefix(@NonNull TabPlayer player);

    /**
     * Returns custom name assigned using {@link #setName(TabPlayer, String)} method.
@@ -109,10 +78,9 @@ public interface TablistFormatManager {
     *          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);
+    @Nullable String getCustomName(@NonNull TabPlayer player);

    /**
     * Returns suffix assigned using {@link #setSuffix(TabPlayer, String)} method.
@@ -122,10 +90,9 @@ public interface TablistFormatManager {
     *          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);
+    @Nullable String getCustomSuffix(@NonNull TabPlayer player);

    /**
     * Returns player's original prefix applied using plugin's internal logic.
@@ -135,10 +102,9 @@ public interface TablistFormatManager {
     *          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);
+    @NotNull String getOriginalPrefix(@NonNull TabPlayer player);

    /**
     * Returns player's original name applied using plugin's internal logic.
@@ -148,10 +114,9 @@ public interface TablistFormatManager {
     *          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);
+    @NotNull String getOriginalName(@NonNull TabPlayer player);

    /**
     * Returns player's original suffix applied using plugin's internal logic.
@@ -161,8 +126,7 @@ public interface TablistFormatManager {
     *          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);
+    @NotNull String getOriginalSuffix(@NonNull TabPlayer player);
 }
@@ -0,0 +1,78 @@
+package me.neznamy.tab.api.tablist.layout;
+
+import lombok.NonNull;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Interface representing a layout.
+ */
+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 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,44 @@
+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.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}.
+ */
+public interface LayoutManager {
+
+    /**
+     * Creates new layout
+     *
+     * @param   name
+     *          Unique layout name
+     * @return  Created layout
+     */
+    Layout createNewLayout(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,78 +0,0 @@
-package me.neznamy.tab.api.util;
-
-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 object and throws {@code IllegalArgumentException} if it is {@code null}.
-     *
-     * @param   obj
-     *          Object to check
-     * @param   name
-     *          Name of the variable to use in exception message
-     * @throws  IllegalArgumentException
-     *          if {@code obj} is {@code null}
-     */
-    public static void checkNotNull(Object obj, String name) {
-        if (obj == null) throw new IllegalArgumentException(name + " cannot be null");
-    }
-
-    /**
-     * 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(String string, int maxLength, String name) {
-        checkNotNull(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,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,7 @@ plugins {
 }

 dependencies {
-    implementation(libs.plugin.indra)
-    implementation(libs.plugin.shadow)
-}
-
-dependencies {
-    compileOnly(files(libs::class.java.protectionDomain.codeSource.location))
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    implementation("com.github.johnrengelman:shadow:8.1.1")
+    implementation("io.freefair.gradle:lombok-plugin:8.0.1")
+    implementation("fabric-loom:fabric-loom.gradle.plugin:1.1-SNAPSHOT")
 }
@@ -2,15 +2,8 @@ rootProject.name = "build-logic"

 dependencyResolutionManagement {
    repositories {
+        maven("https://maven.fabricmc.net/")
        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"))
-        }
-    }
 }
@@ -1,24 +1,19 @@
 import org.apache.tools.ant.filters.ReplaceTokens

 plugins {
-    id("net.kyori.indra")
-}
-
-indra {
-    javaVersions {
-        target(8)
-    }
-    github("NEZNAMY", "TAB") {
-        ci(true)
-    }
+    `java-library`
+    id("io.freefair.lombok")
 }

 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
+            "description" to project.description,
+            "website" to rootProject.ext.get("website")!!.toString(),
+            "author" to rootProject.ext.get("author")!!.toString()
        ))
    }
    javadoc {
@@ -27,4 +22,15 @@ tasks {
        options.encoding = Charsets.UTF_8.name()
        (options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet")
    }
+    compileJava {
+        options.encoding = Charsets.UTF_8.name()
+        options.release.set(8)
+        options.compilerArgs.addAll(listOf("-nowarn", "-Xlint:-unchecked", "-Xlint:-deprecation"))
+    }
+}
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
 }
@@ -9,5 +9,7 @@ tasks {
        relocate("org.bstats", "me.neznamy.tab.libs.org.bstats")
        relocate("org.json.simple", "me.neznamy.tab.libs.org.json.simple")
        relocate("net.kyori.event", "me.neznamy.tab.libs.net.kyori.event")
+        relocate("me.neznamy.yamlassist", "me.neznamy.tab.libs.me.neznamy.yamlassist")
+        relocate("org.yaml.snakeyaml", "me.neznamy.tab.libs.org.yaml.snakeyaml")
    }
 }
@@ -1,12 +1,25 @@
 plugins {
    id("tab.base-conventions")
-    id("net.kyori.indra.publishing")
+    `maven-publish`
 }

-indra {
-    publishReleasesTo("krypton", "https://repo.kryptonmc.org/releases")
-    publishSnapshotsTo("krypton", "https://repo.kryptonmc.org/snapshots")
-    configurePublications {
-        artifactId = "tab-$artifactId"
+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"])
    }
 }
@@ -4,15 +4,21 @@ plugins {

 allprojects {
    group = "me.neznamy"
-    version = property("projectVersion") as String // from gradle.properties
+    version = "4.0.6"
    description = "An all-in-one solution that works"
+
+    ext.set("id", "tab")
+    ext.set("website", "https://github.com/NEZNAMY/TAB")
+    ext.set("author", "NEZNAMY")
 }

 val platforms = setOf(
    projects.bukkit,
    projects.bungeecord,
-//    projects.krypton,
-    projects.velocity
+    projects.velocity,
+    projects.sponge7,
+    projects.sponge8,
+    projects.fabric
 ).map { it.dependencyProject }

 val special = setOf(
@@ -1,12 +1,13 @@
 dependencies {
    implementation(projects.shared)
-    implementation(libs.bstats.bukkit)
-    compileOnly(libs.bukkit)
-    compileOnly(libs.placeholderapi)
-    compileOnly(libs.vault)
-    compileOnly(libs.via)
-    compileOnly(libs.authlib)
-    compileOnly(libs.essentials) {
-        exclude("org.spigotmc", "spigot-api")
+    implementation("org.bstats:bstats-bukkit:3.0.1")
+    compileOnly("org.purpurmc.purpur:purpur-api:1.16.5-R0.1-SNAPSHOT")
+    compileOnly("me.clip:placeholderapi:2.11.2")
+    compileOnly("com.mojang:authlib:1.5.25")
+    compileOnly("com.github.MilkBowl:VaultAPI:1.7") {
+        exclude("org.bukkit", "bukkit")
+    }
+    compileOnly("LibsDisguises:LibsDisguises:10.0.21") {
+        exclude("org.spigotmc", "spigot")
    }
 }
@@ -1,6 +1,10 @@
 package me.neznamy.tab.platforms.bukkit;

-import me.neznamy.tab.api.TabAPI;
+import me.neznamy.tab.platforms.bukkit.platform.BukkitPlatform;
+import me.neznamy.tab.shared.TAB;
+import me.neznamy.tab.shared.platform.EventListener;
+import me.neznamy.tab.shared.platform.TabPlayer;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -8,73 +12,36 @@ import org.bukkit.event.player.PlayerChangedWorldEvent;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
+import org.jetbrains.annotations.NotNull;

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

-    /** Platform instance */
-    private final BukkitPlatform platform;
-
-    /**
-     * Constructs new instance with given parameter
-     *
-     * @param   platform
-     *          Platform instance
-     */
-    public BukkitEventListener(BukkitPlatform platform) {
-        this.platform = platform;
-    }
-    
-    /**
-     * Listener to PlayerQuitEvent to remove player data and forward the event to features
-     *
-     * @param   e
-     *          quit event
-     */
    @EventHandler(priority = EventPriority.HIGHEST)
-    public void onQuit(PlayerQuitEvent e){
-        if (TabAPI.getInstance().isPluginDisabled()) return;
-        TabAPI.getInstance().getThreadManager().runTask(() -> TabAPI.getInstance().getFeatureManager().onQuit(TabAPI.getInstance().getPlayer(e.getPlayer().getUniqueId())));
+    public void onQuit(PlayerQuitEvent e) {
+        quit(e.getPlayer().getUniqueId());
    }
-    
-    /**
-     * Listener to PlayerJoinEvent to create player data and forward the event to features
-     *
-     * @param   e
-     *          join event
-     */
-    @EventHandler(priority = EventPriority.LOWEST)
+
+    @EventHandler(priority = EventPriority.LOW)
    public void onJoin(PlayerJoinEvent e) {
-        if (TabAPI.getInstance().isPluginDisabled()) return;
-        TabAPI.getInstance().getThreadManager().runTask(() ->
-                TabAPI.getInstance().getFeatureManager().onJoin(new BukkitTabPlayer(e.getPlayer(), platform.getProtocolVersion(e.getPlayer()))));
+        join(e.getPlayer());
    }

-    /**
-     * Listener to PlayerChangedWorldEvent to forward the event to features
-     *
-     * @param   e
-     *          world changed event
-     */
    @EventHandler(priority = EventPriority.LOWEST)
-    public void onWorldChange(PlayerChangedWorldEvent e){
-        if (TabAPI.getInstance().isPluginDisabled()) return;
-        TabAPI.getInstance().getThreadManager().runTask(() ->
-                TabAPI.getInstance().getFeatureManager().onWorldChange(e.getPlayer().getUniqueId(), e.getPlayer().getWorld().getName()));
+    public void onWorldChange(PlayerChangedWorldEvent e) {
+        worldChange(e.getPlayer().getUniqueId(), e.getPlayer().getWorld().getName());
    }

-    /**
-     * Listener to PlayerChangedWorldEvent to forward the event to features
-     *
-     * @param   e
-     *          command preprocess event
-     */
    @EventHandler
    public void onCommand(PlayerCommandPreprocessEvent e) {
-        if (TabAPI.getInstance().isPluginDisabled()) return;
-        if (TabAPI.getInstance().getFeatureManager().onCommand(
-                TabAPI.getInstance().getPlayer(e.getPlayer().getUniqueId()), e.getMessage())) e.setCancelled(true);
+        if (command(e.getPlayer().getUniqueId(), e.getMessage())) e.setCancelled(true);
    }
-}
+
+    @Override
+    @NotNull
+    public TabPlayer createPlayer(@NotNull Player player) {
+        return new BukkitTabPlayer((BukkitPlatform) TAB.getInstance().getPlatform(), player);
+    }
+}
@@ -1,558 +0,0 @@
-package me.neznamy.tab.platforms.bukkit;
-
-import com.mojang.authlib.GameProfile;
-import com.mojang.authlib.properties.Property;
-import me.neznamy.tab.api.ProtocolVersion;
-import me.neznamy.tab.api.TabAPI;
-import me.neznamy.tab.api.chat.EnumChatFormat;
-import me.neznamy.tab.api.chat.IChatBaseComponent;
-import me.neznamy.tab.api.chat.WrappedChatComponent;
-import me.neznamy.tab.api.protocol.*;
-import me.neznamy.tab.api.protocol.PacketPlayOutBoss.Action;
-import me.neznamy.tab.api.protocol.PacketPlayOutPlayerInfo.EnumGamemode;
-import me.neznamy.tab.api.protocol.PacketPlayOutPlayerInfo.EnumPlayerInfoAction;
-import me.neznamy.tab.api.protocol.PacketPlayOutPlayerInfo.PlayerInfoData;
-import me.neznamy.tab.platforms.bukkit.nms.PacketPlayOutEntityDestroy;
-import me.neznamy.tab.platforms.bukkit.nms.PacketPlayOutEntityMetadata;
-import me.neznamy.tab.platforms.bukkit.nms.PacketPlayOutEntityTeleport;
-import me.neznamy.tab.platforms.bukkit.nms.PacketPlayOutSpawnEntityLiving;
-import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcher;
-import me.neznamy.tab.platforms.bukkit.nms.storage.NMSStorage;
-import org.bukkit.Location;
-import org.bukkit.entity.EntityType;
-
-import java.lang.reflect.Array;
-import java.util.*;
-import java.util.stream.Collectors;
-
-@SuppressWarnings({"unchecked", "rawtypes"})
-public class BukkitPacketBuilder extends PacketBuilder {
-
-    /** NMS data storage */
-    private final NMSStorage nms = NMSStorage.getInstance();
-
-    /** Map of entity type ids for entities used by the plugin */
-    private final EnumMap<EntityType, Integer> entityIds = new EnumMap<>(EntityType.class);
-
-    /** Component cache for better performance (1.16+ players) */
-    private final Map<IChatBaseComponent, Object> componentCacheModern = new HashMap<>();
-
-    /** Component cache for better performance (1.15- players) */
-    private final Map<IChatBaseComponent, Object> componentCacheLegacy = new HashMap<>();
-
-    /**
-     * Constructs new instance
-     */
-    public BukkitPacketBuilder() {
-        if (nms.getMinorVersion() >= 19) {
-            entityIds.put(EntityType.ARMOR_STAND, 2);
-        } else if (nms.getMinorVersion() >= 13) {
-            entityIds.put(EntityType.ARMOR_STAND, 1);
-        } else {
-            entityIds.put(EntityType.WITHER, 64);
-            if (nms.getMinorVersion() >= 8){
-                entityIds.put(EntityType.ARMOR_STAND, 30);
-            }
-        }
-        buildMap.put(PacketPlayOutEntityMetadata.class, (packet, version) -> build((PacketPlayOutEntityMetadata)packet));
-        buildMap.put(PacketPlayOutEntityTeleport.class, (packet, version) -> build((PacketPlayOutEntityTeleport)packet));
-        buildMap.put(PacketPlayOutEntityDestroy.class, (packet, version) -> build((PacketPlayOutEntityDestroy)packet));
-        buildMap.put(PacketPlayOutSpawnEntityLiving.class, (packet, version) -> build((PacketPlayOutSpawnEntityLiving)packet));
-    }
-
-    @Override
-    public Object build(PacketPlayOutBoss packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-        if (nms.getMinorVersion() >= 9 || clientVersion.getMinorVersion() >= 9) {
-            //1.9+ server or client, handled by bukkit api or ViaVersion
-            return packet;
-        }
-        //<1.9 client and server
-        return buildBossPacketEntity(packet, clientVersion);
-    }
-
-    @Override
-    public Object build(PacketPlayOutChat packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-        Object component = toNMSComponent(packet.getMessage(), clientVersion);
-        if (nms.getMinorVersion() >= 19)
-            try {
-                return nms.newPacketPlayOutChat.newInstance(component, packet.getType() == PacketPlayOutChat.ChatMessageType.GAME_INFO);
-            } catch (Exception e) {
-                //1.19.0
-                return nms.newPacketPlayOutChat.newInstance(component, packet.getType().ordinal());
-            }
-        if (nms.getMinorVersion() >= 16)
-            return nms.newPacketPlayOutChat.newInstance(component, Enum.valueOf(nms.ChatMessageType, packet.getType().toString()), UUID.randomUUID());
-        if (nms.getMinorVersion() >= 12)
-            return nms.newPacketPlayOutChat.newInstance(component, Enum.valueOf(nms.ChatMessageType, packet.getType().toString()));
-        if (nms.getMinorVersion() >= 8)
-            return nms.newPacketPlayOutChat.newInstance(component, (byte) packet.getType().ordinal());
-        if (nms.getMinorVersion() == 7)
-            return nms.newPacketPlayOutChat.newInstance(component);
-        return packet;
-    }
-
-    @Override
-    public Object build(PacketPlayOutPlayerInfo packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-        if (nms.getMinorVersion() < 8) return null;
-        if (nms.ClientboundPlayerInfoRemovePacket != null) {
-            //1.19.3+
-            if (packet.getActions().contains(EnumPlayerInfoAction.REMOVE_PLAYER)) {
-                return nms.newClientboundPlayerInfoRemovePacket.newInstance(
-                        packet.getEntries().stream().map(PlayerInfoData::getUniqueId).collect(Collectors.toList())
-                );
-            }
-            Enum[] array = packet.getActions().stream().map(action -> Enum.valueOf(nms.EnumPlayerInfoAction, action.toString())).toArray(Enum[]::new);
-            Object nmsPacket = nms.newPacketPlayOutPlayerInfo.newInstance(EnumSet.of(array[0], array), Collections.emptyList());
-            List<Object> items = new ArrayList<>();
-            for (PlayerInfoData data : packet.getEntries()) {
-                GameProfile profile = new GameProfile(data.getUniqueId(), data.getName());
-                if (data.getSkin() != null) profile.getProperties().put("textures",
-                        new Property("textures", data.getSkin().getValue(), data.getSkin().getSignature()));
-                Object obj = nms.newPlayerInfoData.newInstance(
-                        data.getUniqueId(),
-                        profile,
-                        data.isListed(),
-                        data.getLatency(),
-                        data.getGameMode() == null ? null : Enum.valueOf(nms.EnumGamemode, data.getGameMode().toString()),
-                        data.getDisplayName() == null ? null : toNMSComponent(data.getDisplayName(), clientVersion),
-                        data.getProfilePublicKey() == null ? null : nms.newRemoteChatSession$Data.newInstance(data.getChatSessionId(), data.getProfilePublicKey()));
-                items.add(obj);
-            }
-            nms.setField(nmsPacket, nms.PacketPlayOutPlayerInfo_PLAYERS, items);
-            return nmsPacket;
-        } else {
-            //1.19.2-
-            EnumPlayerInfoAction action = packet.getActions().contains(EnumPlayerInfoAction.ADD_PLAYER) ?
-                    EnumPlayerInfoAction.ADD_PLAYER : packet.getActions().iterator().next();
-            Object nmsPacket = nms.newPacketPlayOutPlayerInfo.newInstance(Enum.valueOf(nms.EnumPlayerInfoAction, action.toString()), Array.newInstance(nms.EntityPlayer, 0));
-            List<Object> items = new ArrayList<>();
-            for (PlayerInfoData data : packet.getEntries()) {
-                GameProfile profile = new GameProfile(data.getUniqueId(), data.getName());
-                if (data.getSkin() != null) profile.getProperties().put("textures", new Property("textures", data.getSkin().getValue(), data.getSkin().getSignature()));
-                List<Object> parameters = new ArrayList<>();
-                if (nms.newPlayerInfoData.getParameterTypes()[0] == nms.PacketPlayOutPlayerInfo) {
-                    parameters.add(nmsPacket);
-                }
-                parameters.add(profile);
-                parameters.add(data.getLatency());
-                parameters.add(data.getGameMode() == null ? null : Enum.valueOf(nms.EnumGamemode, data.getGameMode().toString()));
-                parameters.add(data.getDisplayName() == null ? null : toNMSComponent(data.getDisplayName(), clientVersion));
-                if (nms.getMinorVersion() >= 19) parameters.add(data.getProfilePublicKey());
-                items.add(nms.newPlayerInfoData.newInstance(parameters.toArray()));
-            }
-            nms.setField(nmsPacket, nms.PacketPlayOutPlayerInfo_PLAYERS, items);
-            return nmsPacket;
-        }
-    }
-
-    @Override
-    public Object build(PacketPlayOutPlayerListHeaderFooter packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-        if (nms.getMinorVersion() < 8) return null;
-        if (nms.newPacketPlayOutPlayerListHeaderFooter.getParameterCount() == 2) {
-            return nms.newPacketPlayOutPlayerListHeaderFooter.newInstance(toNMSComponent(packet.getHeader(), clientVersion), toNMSComponent(packet.getFooter(), clientVersion));
-        }
-        Object nmsPacket = nms.newPacketPlayOutPlayerListHeaderFooter.newInstance();
-        nms.setField(nmsPacket, nms.PacketPlayOutPlayerListHeaderFooter_HEADER, toNMSComponent(packet.getHeader(), clientVersion));
-        nms.setField(nmsPacket, nms.PacketPlayOutPlayerListHeaderFooter_FOOTER, toNMSComponent(packet.getFooter(), clientVersion));
-        return nmsPacket;
-    }
-
-    @Override
-    public Object build(PacketPlayOutScoreboardDisplayObjective packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-        return nms.newPacketPlayOutScoreboardDisplayObjective.newInstance(packet.getSlot(), newScoreboardObjective(packet.getObjectiveName()));
-    }
-
-    @Override
-    public Object build(PacketPlayOutScoreboardObjective packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-        String displayName = clientVersion.getMinorVersion() < 13 ? cutTo(packet.getDisplayName(), 32) : packet.getDisplayName();
-        if (nms.getMinorVersion() >= 13) {
-            return nms.newPacketPlayOutScoreboardObjective.newInstance(nms.newScoreboardObjective.newInstance(null, packet.getObjectiveName(), null, 
-                    toNMSComponent(IChatBaseComponent.optimizedComponent(displayName), clientVersion), 
-                    packet.getRenderType() == null ? null : Enum.valueOf(nms.EnumScoreboardHealthDisplay, packet.getRenderType().toString())),
-                    packet.getAction());
-        }
-
-        Object nmsPacket = nms.newPacketPlayOutScoreboardObjective.newInstance();
-        nms.setField(nmsPacket, nms.PacketPlayOutScoreboardObjective_OBJECTIVENAME, packet.getObjectiveName());
-        nms.setField(nmsPacket, nms.PacketPlayOutScoreboardObjective_DISPLAYNAME, displayName);
-        if (nms.getMinorVersion() >= 8 && packet.getRenderType() != null) {
-            nms.setField(nmsPacket, nms.PacketPlayOutScoreboardObjective_RENDERTYPE, Enum.valueOf(nms.EnumScoreboardHealthDisplay, packet.getRenderType().toString()));
-        }
-        nms.setField(nmsPacket, nms.PacketPlayOutScoreboardObjective_METHOD, packet.getAction());
-        return nmsPacket;
-    }
-
-    @Override
-    public Object build(PacketPlayOutScoreboardScore packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-        if (nms.getMinorVersion() >= 13) {
-            return nms.newPacketPlayOutScoreboardScore_1_13.newInstance(Enum.valueOf(nms.EnumScoreboardAction, packet.getAction().toString()), packet.getObjectiveName(), packet.getPlayer(), packet.getScore());
-        }
-        if (packet.getAction() == PacketPlayOutScoreboardScore.Action.REMOVE) {
-            return nms.newPacketPlayOutScoreboardScore_String.newInstance(packet.getPlayer());
-        }
-        Object score = nms.newScoreboardScore.newInstance(nms.emptyScoreboard, newScoreboardObjective(packet.getObjectiveName()), packet.getPlayer());
-        nms.ScoreboardScore_setScore.invoke(score, packet.getScore());
-        if (nms.getMinorVersion() >= 8) {
-            return nms.newPacketPlayOutScoreboardScore.newInstance(score);
-        }
-        return nms.newPacketPlayOutScoreboardScore.newInstance(score, 0);
-    }
-
-    @Override
-    public Object build(PacketPlayOutScoreboardTeam packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-        if (nms.PacketPlayOutScoreboardTeam == null) return null; //fabric
-        Object team = nms.newScoreboardTeam.newInstance(nms.emptyScoreboard, packet.getName());
-        String prefix = packet.getPlayerPrefix();
-        String suffix = packet.getPlayerSuffix();
-        if (clientVersion.getMinorVersion() < 13) {
-            prefix = cutTo(prefix, 16);
-            suffix = cutTo(suffix, 16);
-        }
-        ((Collection<String>)nms.ScoreboardTeam_getPlayerNameSet.invoke(team)).addAll(packet.getPlayers());
-        nms.ScoreboardTeam_setAllowFriendlyFire.invoke(team, (packet.getOptions() & 0x1) > 0);
-        nms.ScoreboardTeam_setCanSeeFriendlyInvisibles.invoke(team, (packet.getOptions() & 0x2) > 0);
-        if (nms.getMinorVersion() >= 13) {
-            createTeamModern(packet, clientVersion, team, prefix, suffix);
-        } else {
-            createTeamLegacy(packet, team, prefix, suffix);
-        }
-        if (nms.getMinorVersion() >= 17) {
-            switch (packet.getAction()) {
-            case 0:
-                return nms.PacketPlayOutScoreboardTeam_ofBoolean.invoke(null, team, true);
-            case 1:
-                return nms.PacketPlayOutScoreboardTeam_of.invoke(null, team);
-            case 2:
-                return nms.PacketPlayOutScoreboardTeam_ofBoolean.invoke(null, team, false);
-            case 3:
-                return nms.PacketPlayOutScoreboardTeam_ofString.invoke(null, team, packet.getPlayers().iterator().next(), Enum.valueOf(nms.PacketPlayOutScoreboardTeam_PlayerAction, "ADD"));
-            case 4:
-                return nms.PacketPlayOutScoreboardTeam_ofString.invoke(null, team, packet.getPlayers().iterator().next(), Enum.valueOf(nms.PacketPlayOutScoreboardTeam_PlayerAction, "REMOVE"));
-            default:
-                throw new IllegalArgumentException("Invalid action: " + packet.getAction());
-            }
-        }
-        return nms.newPacketPlayOutScoreboardTeam.newInstance(team, packet.getAction());
-    }
-
-    /**
-     * Builds entity destroy packet from custom packet class
-     *
-     * @param   packet
-     *          Destroy packet
-     * @return  NMS destroy packet
-     * @throws  ReflectiveOperationException
-     *          if thrown by reflective operation
-     */
-    public Object build(PacketPlayOutEntityDestroy packet) throws ReflectiveOperationException {
-        try {
-            return nms.newPacketPlayOutEntityDestroy.newInstance(new Object[]{packet.getEntities()});
-        } catch (IllegalArgumentException e) {
-            //1.17.0
-            return nms.newPacketPlayOutEntityDestroy.newInstance(packet.getEntities()[0]);
-        }
-    }
-
-    /**
-     * Builds entity metadata packet from custom packet class
-     *
-     * @param   packet
-     *          Metadata packet
-     * @return  NMS metadata packet
-     * @throws  ReflectiveOperationException
-     *          if thrown by reflective operation
-     */
-    public Object build(PacketPlayOutEntityMetadata packet) throws ReflectiveOperationException {
-        if (nms.newPacketPlayOutEntityMetadata.getParameterCount() == 2) {
-            //1.19.3+
-            return nms.newPacketPlayOutEntityMetadata.newInstance(packet.getEntityId(), nms.DataWatcher_b.invoke(packet.getDataWatcher().toNMS()));
-        } else {
-            return nms.newPacketPlayOutEntityMetadata.newInstance(packet.getEntityId(), packet.getDataWatcher().toNMS(), true);
-        }
-    }
-
-    /**
-     * Builds entity spawn packet from custom packet class
-     *
-     * @param   packet
-     *          Spawn packet
-     * @return  NMS spawn packet
-     * @throws  ReflectiveOperationException
-     *          if thrown by reflective operation
-     */
-    public Object build(PacketPlayOutSpawnEntityLiving packet) throws ReflectiveOperationException {
-        Object nmsPacket;
-        if (nms.getMinorVersion() >= 17) {
-            nmsPacket = nms.newPacketPlayOutSpawnEntityLiving.newInstance(nms.dummyEntity);
-        } else {
-            nmsPacket = nms.newPacketPlayOutSpawnEntityLiving.newInstance();
-        }
-        nms.setField(nmsPacket, nms.PacketPlayOutSpawnEntityLiving_ENTITYID, packet.getEntityId());
-        nms.setField(nmsPacket, nms.PacketPlayOutSpawnEntityLiving_YAW, (byte)(packet.getLocation().getYaw() * 256.0f / 360.0f));
-        nms.setField(nmsPacket, nms.PacketPlayOutSpawnEntityLiving_PITCH, (byte)(packet.getLocation().getPitch() * 256.0f / 360.0f));
-        if (nms.getMinorVersion() <= 14) {
-            nms.setField(nmsPacket, nms.PacketPlayOutSpawnEntityLiving_DATAWATCHER, packet.getDataWatcher().toNMS());
-        }
-        if (nms.getMinorVersion() >= 9) {
-            nms.setField(nmsPacket, nms.PacketPlayOutSpawnEntityLiving_UUID, packet.getUniqueId());
-            nms.setField(nmsPacket, nms.PacketPlayOutSpawnEntityLiving_X, packet.getLocation().getX());
-            nms.setField(nmsPacket, nms.PacketPlayOutSpawnEntityLiving_Y, packet.getLocation().getY());
-            nms.setField(nmsPacket, nms.PacketPlayOutSpawnEntityLiving_Z, packet.getLocation().getZ());
-        } else {
-            nms.setField(nmsPacket, nms.PacketPlayOutSpawnEntityLiving_X, floor(packet.getLocation().getX()*32));
-            nms.setField(nmsPacket, nms.PacketPlayOutSpawnEntityLiving_Y, floor(packet.getLocation().getY()*32));
-            nms.setField(nmsPacket, nms.PacketPlayOutSpawnEntityLiving_Z, floor(packet.getLocation().getZ()*32));
-        }
-        int id = entityIds.get(packet.getEntityType());
-        if (nms.getMinorVersion() >= 19) {
-            nms.setField(nmsPacket, nms.PacketPlayOutSpawnEntityLiving_ENTITYTYPE, nms.EntityTypes_ARMOR_STAND); // :(
-        } else {
-            nms.setField(nmsPacket, nms.PacketPlayOutSpawnEntityLiving_ENTITYTYPE, id);
-        }
-        return nmsPacket;
-    }
-
-    /**
-     * Builds entity teleport packet from custom packet class
-     *
-     * @param   packet
-     *          Teleport packet
-     * @return  NMS teleport packet
-     * @throws  ReflectiveOperationException
-     *          if thrown by reflective operation
-     */
-    public Object build(PacketPlayOutEntityTeleport packet) throws ReflectiveOperationException {
-        Object nmsPacket;
-        if (nms.getMinorVersion() >= 17) {
-            nmsPacket = nms.newPacketPlayOutEntityTeleport.newInstance(nms.dummyEntity);
-        } else {
-            nmsPacket = nms.newPacketPlayOutEntityTeleport.newInstance();
-        }
-        nms.setField(nmsPacket, nms.PacketPlayOutEntityTeleport_ENTITYID, packet.getEntityId());
-        if (nms.getMinorVersion() >= 9) {
-            nms.setField(nmsPacket, nms.PacketPlayOutEntityTeleport_X, packet.getLocation().getX());
-            nms.setField(nmsPacket, nms.PacketPlayOutEntityTeleport_Y, packet.getLocation().getY());
-            nms.setField(nmsPacket, nms.PacketPlayOutEntityTeleport_Z, packet.getLocation().getZ());
-        } else {
-            nms.setField(nmsPacket, nms.PacketPlayOutEntityTeleport_X, floor(packet.getLocation().getX()*32));
-            nms.setField(nmsPacket, nms.PacketPlayOutEntityTeleport_Y, floor(packet.getLocation().getY()*32));
-            nms.setField(nmsPacket, nms.PacketPlayOutEntityTeleport_Z, floor(packet.getLocation().getZ()*32));
-        }
-        nms.setField(nmsPacket, nms.PacketPlayOutEntityTeleport_YAW, (byte) (packet.getLocation().getYaw()/360*256));
-        nms.setField(nmsPacket, nms.PacketPlayOutEntityTeleport_PITCH, (byte) (packet.getLocation().getPitch()/360*256));
-        return nmsPacket;
-    }
-
-    /**
-     * Writes data into NMS team from custom team packet. Used on 1.13+ servers.
-     *
-     * @param   packet
-     *          Packet to read from
-     * @param   clientVersion
-     *          Version of player
-     * @param   team
-     *          Team to write to
-     * @param   prefix
-     *          Prefix to use
-     * @param   suffix
-     *          Suffix to use
-     * @throws  ReflectiveOperationException
-     *          if thrown by reflective operation
-     */
-    private void createTeamModern(PacketPlayOutScoreboardTeam packet, ProtocolVersion clientVersion, Object team, String prefix, String suffix) throws ReflectiveOperationException {
-        if (prefix != null) nms.ScoreboardTeam_setPrefix.invoke(team, toNMSComponent(IChatBaseComponent.optimizedComponent(prefix), clientVersion));
-        if (suffix != null) nms.ScoreboardTeam_setSuffix.invoke(team, toNMSComponent(IChatBaseComponent.optimizedComponent(suffix), clientVersion));
-        EnumChatFormat format = packet.getColor() != null ? packet.getColor() : EnumChatFormat.lastColorsOf(prefix);
-        nms.ScoreboardTeam_setColor.invoke(team, Enum.valueOf(nms.EnumChatFormat, format.toString()));
-        nms.ScoreboardTeam_setNameTagVisibility.invoke(team, Enum.valueOf(nms.EnumNameTagVisibility, String.valueOf(packet.getNameTagVisibility()).equals("always") ? "ALWAYS" : "NEVER"));
-        nms.ScoreboardTeam_setCollisionRule.invoke(team, Enum.valueOf(nms.EnumTeamPush, String.valueOf(packet.getCollisionRule()).equals("always") ? "ALWAYS" : "NEVER"));
-    }
-
-    /**
-     * Writes data into NMS team from custom team packet. Used on 1.12- servers.
-     *
-     * @param   packet
-     *          Packet to read from
-     * @param   team
-     *          Team to write to
-     * @param   prefix
-     *          Prefix to use
-     * @param   suffix
-     *          Suffix to use
-     * @throws  ReflectiveOperationException
-     *          if thrown by reflective operation
-     */
-    private void createTeamLegacy(PacketPlayOutScoreboardTeam packet, Object team, String prefix, String suffix) throws ReflectiveOperationException {
-        if (prefix != null) nms.ScoreboardTeam_setPrefix.invoke(team, prefix);
-        if (suffix != null) nms.ScoreboardTeam_setSuffix.invoke(team, suffix);
-        if (nms.getMinorVersion() >= 8) nms.ScoreboardTeam_setNameTagVisibility.invoke(team, Enum.valueOf(nms.EnumNameTagVisibility, String.valueOf(packet.getNameTagVisibility()).equals("always") ? "ALWAYS" : "NEVER"));
-        if (nms.getMinorVersion() >= 9) nms.ScoreboardTeam_setCollisionRule.invoke(team, Enum.valueOf(nms.EnumTeamPush, String.valueOf(packet.getCollisionRule()).equals("always") ? "ALWAYS" : "NEVER"));
-    }
-    
-    @Override
-    public PacketPlayOutPlayerInfo readPlayerInfo(Object nmsPacket, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-        if (nms.getMinorVersion() < 8) return null;
-        if (nms.ClientboundPlayerInfoRemovePacket != null) {
-            //1.19.3+
-            if (nms.ClientboundPlayerInfoRemovePacket.isInstance(nmsPacket)) {
-                List<UUID> entries = (List<UUID>) nms.ClientboundPlayerInfoRemovePacket_getEntries.invoke(nmsPacket);
-                return new PacketPlayOutPlayerInfo(
-                        EnumPlayerInfoAction.REMOVE_PLAYER,
-                        entries.stream().map(PlayerInfoData::new).collect(Collectors.toList())
-                );
-            }
-            EnumSet<?> set = (EnumSet<?>) nms.PacketPlayOutPlayerInfo_ACTION.get(nmsPacket);
-            EnumPlayerInfoAction[] array = set.stream().map(action -> EnumPlayerInfoAction.valueOf(action.toString())).toArray(EnumPlayerInfoAction[]::new);
-            EnumSet<EnumPlayerInfoAction> actions = EnumSet.of(array[0], array);
-            List<PlayerInfoData> listData = new ArrayList<>();
-            for (Object nmsData : (List<?>) nms.PacketPlayOutPlayerInfo_PLAYERS.get(nmsPacket)) {
-                Object nmsGameMode = nms.PlayerInfoData_getGamemode.invoke(nmsData);
-                EnumGamemode gameMode = (nmsGameMode == null) ? null : EnumGamemode.valueOf(nmsGameMode.toString());
-                GameProfile profile = (GameProfile) nms.PlayerInfoData_getProfile.invoke(nmsData);
-                Object nmsComponent = nms.PlayerInfoData_getDisplayName.invoke(nmsData);
-                Skin skin = null;
-                if (!profile.getProperties().get("textures").isEmpty()) {
-                    Property pr = profile.getProperties().get("textures").iterator().next();
-                    skin = new Skin(pr.getValue(), pr.getSignature());
-                }
-                Object remoteChatSession = nms.PlayerInfoData_getProfilePublicKeyRecord.invoke(nmsData);
-                listData.add(
-                        new PlayerInfoData(
-                                profile.getName(),
-                                profile.getId(),
-                                skin,
-                                (boolean) nms.PlayerInfoData_isListed.invoke(nmsData),
-                                (int) nms.PlayerInfoData_getLatency.invoke(nmsData),
-                                gameMode,
-                                nmsComponent == null ? null : new WrappedChatComponent(nmsComponent),
-                                remoteChatSession == null ? null : (UUID) nms.RemoteChatSession$Data_getSessionId.invoke(remoteChatSession),
-                                remoteChatSession == null ? null : nms.RemoteChatSession$Data_getProfilePublicKey.invoke(remoteChatSession)));
-            }
-            return new PacketPlayOutPlayerInfo(actions, listData);
-        } else {
-            //1.19.2-
-            EnumPlayerInfoAction action = EnumPlayerInfoAction.valueOf(nms.PacketPlayOutPlayerInfo_ACTION.get(nmsPacket).toString());
-            List<PlayerInfoData> listData = new ArrayList<>();
-            for (Object nmsData : (List<?>) nms.PacketPlayOutPlayerInfo_PLAYERS.get(nmsPacket)) {
-                Object nmsGameMode = nms.PlayerInfoData_getGamemode.invoke(nmsData);
-                EnumGamemode gameMode = (nmsGameMode == null) ? null : EnumGamemode.valueOf(nmsGameMode.toString());
-                GameProfile profile = (GameProfile) nms.PlayerInfoData_getProfile.invoke(nmsData);
-                Object nmsComponent = nms.PlayerInfoData_getDisplayName.invoke(nmsData);
-                IChatBaseComponent listName = nmsComponent == null ? null : new WrappedChatComponent(nmsComponent);
-                Skin skin = null;
-                if (!profile.getProperties().get("textures").isEmpty()) {
-                    Property pr = profile.getProperties().get("textures").iterator().next();
-                    skin = new Skin(pr.getValue(), pr.getSignature());
-                }
-                Object profilePublicKey = nms.getMinorVersion() >= 19 ? nms.PlayerInfoData_getProfilePublicKeyRecord.invoke(nmsData) : null;
-                listData.add(new PlayerInfoData(profile.getName(), profile.getId(), skin, true,
-                        (int) nms.PlayerInfoData_getLatency.invoke(nmsData), gameMode, listName, null, profilePublicKey));
-            }
-            return new PacketPlayOutPlayerInfo(action, listData);
-        }
-    }
-
-    @Override
-    public PacketPlayOutScoreboardObjective readObjective(Object nmsPacket) throws ReflectiveOperationException {
-        return new PacketPlayOutScoreboardObjective(nms.PacketPlayOutScoreboardObjective_METHOD.getInt(nmsPacket),
-                (String) nms.PacketPlayOutScoreboardObjective_OBJECTIVENAME.get(nmsPacket), null,
-                PacketPlayOutScoreboardObjective.EnumScoreboardHealthDisplay.INTEGER
-        );
-    }
-
-    @Override
-    public PacketPlayOutScoreboardDisplayObjective readDisplayObjective(Object nmsPacket) throws ReflectiveOperationException {
-        return new PacketPlayOutScoreboardDisplayObjective(
-            nms.PacketPlayOutScoreboardDisplayObjective_POSITION.getInt(nmsPacket),
-            (String) nms.PacketPlayOutScoreboardDisplayObjective_OBJECTIVENAME.get(nmsPacket)
-        );
-    }
-
-    /**
-     * Builds entity packet representing requested BossBar packet using Wither on 1.8- clients.
-     *
-     * @param   packet
-     *          packet to build
-     * @param   clientVersion
-     *          client version
-     * @return  entity BossBar packet
-     * @throws  ReflectiveOperationException
-     *          if thrown by reflective operation
-     */
-    private Object buildBossPacketEntity(PacketPlayOutBoss packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-        if (packet.getAction() == Action.UPDATE_STYLE) return null; //nothing to do here
-
-        int entityId = packet.getId().hashCode();
-        if (packet.getAction() == Action.REMOVE) {
-            return build(new PacketPlayOutEntityDestroy(entityId));
-        }
-        DataWatcher w = new DataWatcher();
-        if (packet.getAction() == Action.UPDATE_PCT || packet.getAction() == Action.ADD) {
-            float health = 300*packet.getPct();
-            if (health == 0) health = 1;
-            w.helper().setHealth(health);
-        }
-        if (packet.getAction() == Action.UPDATE_NAME || packet.getAction() == Action.ADD) {
-            w.helper().setCustomName(packet.getName(), clientVersion);
-        }
-        if (packet.getAction() == Action.ADD) {
-            w.helper().setEntityFlags((byte) 32);
-            w.helper().setWitherInvulnerableTime(880); // Magic number
-            return build(new PacketPlayOutSpawnEntityLiving(entityId, new UUID(0, 0), EntityType.WITHER, new Location(null, 0,0,0), w));
-        } else {
-            return build(new PacketPlayOutEntityMetadata(entityId, w));
-        }
-    }
-
-    /**
-     * A method taken from minecraft code used to convert double to int
-     *
-     * @param   paramDouble
-     *          double value
-     * @return  int value
-     */
-    private int floor(double paramDouble){
-        int i = (int)paramDouble;
-        return paramDouble < i ? i - 1 : i;
-    }
-
-    /**
-     * Converts TAB's IChatBaseComponent into minecraft's component using String deserialization.
-     * If the requested component is found in cache, it is returned. If not, it is created, added into cache and returned.
-     * If {@code component} is {@code null}, returns {@code null}
-     *
-     * @param   component
-     *          component to convert
-     * @param   clientVersion
-     *          client version used to decide RGB conversion
-     * @return  converted component or {@code null} if {@code component} is {@code null}
-     * @throws  ReflectiveOperationException
-     *          if thrown by reflective operation
-     */
-    public Object toNMSComponent(IChatBaseComponent component, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-        if (component == null) return null;
-        if (component instanceof WrappedChatComponent) return ((WrappedChatComponent) component).get();
-        Map<IChatBaseComponent, Object> cache = clientVersion.getMinorVersion() >= 16 ? componentCacheModern : componentCacheLegacy;
-        if (cache.containsKey(component)) return cache.get(component);
-        if (cache.size() > 10000) cache.clear();
-        Object chat = nms.ChatSerializer_DESERIALIZE.invoke(null, component.toString(clientVersion));
-        cache.put(component, chat);
-        return chat;
-    }
-
-    /**
-     * Creates a new Scoreboard Objective with given name.
-     *
-     * @param   objectiveName
-     *          Objective name
-     * @return  NMS Objective
-     * @throws  ReflectiveOperationException
-     *          if thrown by reflective operation
-     */
-    private Object newScoreboardObjective(String objectiveName) throws ReflectiveOperationException {
-        if (nms.getMinorVersion() >= 13) {
-            return nms.newScoreboardObjective.newInstance(null, objectiveName, null, toNMSComponent(new IChatBaseComponent(""), TabAPI.getInstance().getServerVersion()), null);
-        }
-        return nms.newScoreboardObjective.newInstance(null, objectiveName, nms.IScoreboardCriteria_self.get(null));
-    }
-}
@@ -1,149 +1,175 @@
 package me.neznamy.tab.platforms.bukkit;

-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.function.Function;
-
-import io.netty.channel.ChannelDuplexHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelPromise;
-import me.neznamy.tab.api.TabFeature;
-import me.neznamy.tab.api.TabPlayer;
-import me.neznamy.tab.platforms.bukkit.nms.storage.NMSStorage;
-import me.neznamy.tab.api.TabConstants;
+import com.mojang.authlib.GameProfile;
+import io.netty.channel.Channel;
+import lombok.SneakyThrows;
+import me.neznamy.tab.platforms.bukkit.nms.BukkitReflection;
+import me.neznamy.tab.platforms.bukkit.scoreboard.PacketScoreboard;
+import me.neznamy.tab.shared.TabConstants;
+import me.neznamy.tab.shared.features.nametags.NameTag;
+import me.neznamy.tab.shared.platform.TabList;
+import me.neznamy.tab.shared.platform.TabPlayer;
+import me.neznamy.tab.shared.chat.IChatBaseComponent;
+import me.neznamy.tab.platforms.bukkit.nms.NMSStorage;
 import me.neznamy.tab.shared.TAB;
-import me.neznamy.tab.shared.features.PipelineInjector;
+import me.neznamy.tab.shared.features.injection.NettyPipelineInjector;
 import me.neznamy.tab.shared.features.sorting.Sorting;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.*;
+import java.util.stream.Collectors;

 /**
 * Pipeline injection for bukkit
 */
-public class BukkitPipelineInjector extends PipelineInjector {
-
-    /** NMS data storage */
-    private final NMSStorage nms = NMSStorage.getInstance();
+public class BukkitPipelineInjector extends NettyPipelineInjector {

    /**
     * Constructs new instance
     */
-    public BukkitPipelineInjector(){
+    public BukkitPipelineInjector() {
        super("packet_handler");
    }

    @Override
-    public Function<TabPlayer, ChannelDuplexHandler> getChannelFunction() {
-        return BukkitChannelDuplexHandler::new;
+    @Nullable
+    protected Channel getChannel(@NotNull TabPlayer player) {
+        BukkitTabPlayer bukkit = (BukkitTabPlayer) player;
+        NMSStorage nms = NMSStorage.getInstance();
+        try {
+            if (nms.CHANNEL != null) return (Channel) nms.CHANNEL.get(nms.NETWORK_MANAGER.get(bukkit.getPlayerConnection()));
+        } catch (IllegalAccessException exception) {
+            TAB.getInstance().getErrorManager().printError("Failed to get channel of " + bukkit.getName(), exception);
+        }
+        return null;
    }

-    /**
-     * Custom channel duplex handler override
-     */
-    public class BukkitChannelDuplexHandler extends ChannelDuplexHandler {
-
-        /** Injected player */
-        private final TabPlayer player;
-
-        /**
-         * Constructs new instance with given player
-         *
-         * @param   player
-         *          player to inject
-         */
-        public BukkitChannelDuplexHandler(TabPlayer player) {
-            this.player = player;
+    @Override
+    @SneakyThrows
+    public void onDisplayObjective(@NotNull TabPlayer player, @NotNull Object packet) {
+        int position;
+        if (BukkitReflection.is1_20_2Plus()) {
+            position = ((Enum<?>)PacketScoreboard.DisplayObjective_POSITION.get(packet)).ordinal();
+        } else {
+            position = PacketScoreboard.DisplayObjective_POSITION.getInt(packet);
        }
+        TAB.getInstance().getFeatureManager().onDisplayObjective(player, position,
+                (String) PacketScoreboard.DisplayObjective_OBJECTIVE_NAME.get(packet));
+    }

-        @Override
-        public void channelRead(@NotNull ChannelHandlerContext context, @NotNull Object packet) {
-            try {
-                if (TAB.getInstance().getFeatureManager().onPacketReceive(player, packet)) return;
-                super.channelRead(context, packet);
-            } catch (Exception e){
-                TAB.getInstance().getErrorManager().printError("An error occurred when reading packets", e);
+    @Override
+    @SneakyThrows
+    public void onObjective(@NotNull TabPlayer player, @NotNull Object packet) {
+        TAB.getInstance().getFeatureManager().onObjective(player,
+                PacketScoreboard.Objective_METHOD.getInt(packet),
+                (String) PacketScoreboard.Objective_OBJECTIVE_NAME.get(packet));
+    }
+
+    @Override
+    public boolean isDisplayObjective(@NotNull Object packet) {
+        return PacketScoreboard.DisplayObjectiveClass.isInstance(packet);
+    }
+
+    @Override
+    public boolean isObjective(@NotNull Object packet) {
+        return PacketScoreboard.ObjectivePacketClass.isInstance(packet);
+    }
+
+    @Override
+    public boolean isTeam(@NotNull Object packet) {
+        return PacketScoreboard.TeamPacketClass.isInstance(packet);
+    }
+
+    @Override
+    public boolean isPlayerInfo(@NotNull Object packet) {
+        return BukkitTabList.PlayerInfoClass.isInstance(packet);
+    }
+
+    @Override
+    @SneakyThrows
+    public void onPlayerInfo(@NotNull TabPlayer receiver, @NotNull Object packet) {
+        List<String> actions;
+        if (BukkitTabList.ClientboundPlayerInfoRemovePacket != null) {
+            //1.19.3+
+            actions = ((EnumSet<?>)BukkitTabList.ACTION.get(packet)).stream().map(Enum::name).collect(Collectors.toList());
+        } else {
+            //1.19.2-
+            actions = Collections.singletonList(BukkitTabList.ACTION.get(packet).toString());
+        }
+        List<Object> updatedList = new ArrayList<>();
+        for (Object nmsData : (List<?>) BukkitTabList.PLAYERS.get(packet)) {
+            GameProfile profile = (GameProfile) BukkitTabList.PlayerInfoData_Profile.get(nmsData);
+            UUID id;
+            if (BukkitReflection.is1_19_3Plus()) {
+                id = (UUID) BukkitTabList.PlayerInfoData_UUID.get(nmsData);
+            } else {
+                id = profile.getId();
+            }
+            Object displayName = null;
+            int latency = 0;
+            if (actions.contains(TabList.Action.UPDATE_DISPLAY_NAME.name()) || actions.contains(TabList.Action.ADD_PLAYER.name())) {
+                displayName = BukkitTabList.PlayerInfoData_DisplayName.get(nmsData);
+                IChatBaseComponent newDisplayName = TAB.getInstance().getFeatureManager().onDisplayNameChange(receiver, id);
+                if (newDisplayName != null) displayName = TAB.getInstance().getPlatform().toComponent(newDisplayName, receiver.getVersion());
+                if (!BukkitReflection.is1_19_3Plus()) BukkitTabList.PlayerInfoData_DisplayName.set(nmsData, displayName);
+            }
+            if (actions.contains(TabList.Action.UPDATE_LATENCY.name()) || actions.contains(TabList.Action.ADD_PLAYER.name())) {
+                latency = BukkitTabList.PlayerInfoData_Latency.getInt(nmsData);
+                latency = TAB.getInstance().getFeatureManager().onLatencyChange(receiver, id, latency);
+                if (!BukkitReflection.is1_19_3Plus()) BukkitTabList.PlayerInfoData_Latency.set(nmsData, latency);
+            }
+            if (actions.contains(TabList.Action.ADD_PLAYER.name())) {
+                TAB.getInstance().getFeatureManager().onEntryAdd(receiver, id, profile.getName());
+            }
+            if (BukkitReflection.is1_19_3Plus()) {
+                // 1.19.3 is using records, which do not allow changing final fields, need to rewrite the list entirely
+                updatedList.add(BukkitTabList.newPlayerInfoData.newInstance(
+                        id,
+                        profile,
+                        BukkitTabList.PlayerInfoData_Listed.getBoolean(nmsData),
+                        latency,
+                        BukkitTabList.PlayerInfoData_GameMode.get(nmsData),
+                        displayName,
+                        BukkitTabList.PlayerInfoData_RemoteChatSession.get(nmsData)));
            }
        }
+        if (BukkitReflection.is1_19_3Plus()) {
+            BukkitTabList.PLAYERS.set(packet, updatedList);
+        }
+    }

-        @Override
-        public void write(ChannelHandlerContext context, Object packet, ChannelPromise channelPromise) {
-            try {
-                if (nms.PacketPlayOutPlayerInfo.isInstance(packet) ||
-                        (nms.ClientboundPlayerInfoRemovePacket != null && nms.ClientboundPlayerInfoRemovePacket.isInstance(packet))) {
-                    super.write(context, TAB.getInstance().getFeatureManager().onPacketPlayOutPlayerInfo(player, packet), channelPromise);
-                    return;
-                }
-                if (antiOverrideTeams && nms.PacketPlayOutScoreboardTeam != null && nms.PacketPlayOutScoreboardTeam.isInstance(packet)) {
-                    long time = System.nanoTime();
-                    modifyPlayers(packet);
-                    TAB.getInstance().getCPUManager().addTime("NameTags", TabConstants.CpuUsageCategory.ANTI_OVERRIDE, System.nanoTime()-time);
-                    super.write(context, packet, channelPromise);
-                    return;
-                }
-                if (nms.PacketPlayOutScoreboardDisplayObjective.isInstance(packet)){
-                    TAB.getInstance().getFeatureManager().onDisplayObjective(player, packet);
-                }
-                if (nms.PacketPlayOutScoreboardObjective.isInstance(packet)) {
-                    TAB.getInstance().getFeatureManager().onObjective(player, packet);
-                }
-                TAB.getInstance().getFeatureManager().onPacketSend(player, packet);
-            } catch (Exception e){
-                TAB.getInstance().getErrorManager().printError("An error occurred when reading packets", e);
+    @SuppressWarnings("unchecked")
+    @Override
+    @SneakyThrows
+    public void modifyPlayers(@NotNull Object packetPlayOutScoreboardTeam) {
+        if (TAB.getInstance().getNameTagManager() == null) return;
+        int action = PacketScoreboard.TeamPacket_ACTION.getInt(packetPlayOutScoreboardTeam);
+        if (action == 1 || action == 2 || action == 4) return;
+        Collection<String> players = (Collection<String>) PacketScoreboard.TeamPacket_PLAYERS.get(packetPlayOutScoreboardTeam);
+        String teamName = (String) PacketScoreboard.TeamPacket_NAME.get(packetPlayOutScoreboardTeam);
+        if (players == null) return;
+        //creating a new list to prevent NoSuchFieldException in minecraft packet encoder when a player is removed
+        Collection<String> newList = new ArrayList<>();
+        for (String entry : players) {
+            TabPlayer p = getPlayer(entry);
+            if (p == null) {
+                newList.add(entry);
+                continue;
            }
-            try {
-                super.write(context, packet, channelPromise);
-            } catch (Exception e) {
-                TAB.getInstance().getErrorManager().printError("Failed to forward packet " + packet.getClass().getSimpleName() + " to " + player.getName(), e);
+            Sorting sorting = TAB.getInstance().getFeatureManager().getFeature(TabConstants.Feature.SORTING);
+            String expectedTeam = sorting.getShortTeamName(p);
+            if (expectedTeam == null) {
+                newList.add(entry);
+                continue;
+            }
+            if (!((NameTag)TAB.getInstance().getNameTagManager()).getDisableChecker().isDisabledPlayer(p) &&
+                    !TAB.getInstance().getNameTagManager().hasTeamHandlingPaused(p) && !teamName.equals(expectedTeam)) {
+                logTeamOverride(teamName, p.getName(), expectedTeam);
+            } else {
+                newList.add(entry);
            }
        }
-
-        /**
-         * Removes all real players from team if packet does not come from TAB and reports this to override log
-         *
-         * @param   packetPlayOutScoreboardTeam
-         *          team packet
-         * @throws  ReflectiveOperationException
-         *          nmsGameMode
-         */
-        @SuppressWarnings("unchecked")
-        private void modifyPlayers(Object packetPlayOutScoreboardTeam) throws ReflectiveOperationException {
-            int action = nms.PacketPlayOutScoreboardTeam_ACTION.getInt(packetPlayOutScoreboardTeam);
-            if (action == 1 || action == 2 || action == 4) return;
-            Collection<String> players = (Collection<String>) nms.PacketPlayOutScoreboardTeam_PLAYERS.get(packetPlayOutScoreboardTeam);
-            String teamName = (String) nms.PacketPlayOutScoreboardTeam_NAME.get(packetPlayOutScoreboardTeam);
-            if (players == null) return;
-            //creating a new list to prevent NoSuchFieldException in minecraft packet encoder when a player is removed
-            Collection<String> newList = new ArrayList<>();
-            for (String entry : players) {
-                TabPlayer p = getPlayer(entry);
-                if (p == null) {
-                    newList.add(entry);
-                    continue;
-                }
-                Sorting sorting = (Sorting) TAB.getInstance().getFeatureManager().getFeature(TabConstants.Feature.SORTING);
-                if (!((TabFeature)TAB.getInstance().getTeamManager()).isDisabledPlayer(p) &&
-                        !TAB.getInstance().getTeamManager().hasTeamHandlingPaused(p) && !teamName.equals(sorting.getShortTeamName(p))) {
-                    logTeamOverride(teamName, p.getName(), sorting.getShortTeamName(p));
-                } else {
-                    newList.add(entry);
-                }
-            }
-            nms.setField(packetPlayOutScoreboardTeam, nms.PacketPlayOutScoreboardTeam_PLAYERS, newList);
-        }
-
-        /**
-         * Returns player with matching game profile name. This is different from
-         * real name when a nick plugin changing names of players is used. If no
-         * player was found, returns {@code null}.
-         *
-         * @param   name
-         *          Game profile name
-         * @return  Player with matching game profile name
-         */
-        private TabPlayer getPlayer(String name) {
-            for (TabPlayer p : TAB.getInstance().getOnlinePlayers()) {
-                if (p.getNickname().equals(name)) return p;
-            }
-            return null;
-        }
+        PacketScoreboard.TeamPacket_PLAYERS.set(packetPlayOutScoreboardTeam, newList);
    }
 }
@@ -1,147 +0,0 @@
-package me.neznamy.tab.platforms.bukkit;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.text.NumberFormat;
-import java.util.Locale;
-
-import me.neznamy.tab.api.TabConstants;
-import me.neznamy.tab.api.TabPlayer;
-import me.neznamy.tab.api.placeholder.PlayerPlaceholder;
-import me.neznamy.tab.shared.TAB;
-import net.ess3.api.events.NickChangeEvent;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.Listener;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.RegisteredServiceProvider;
-
-import com.earth2me.essentials.Essentials;
-
-import me.neznamy.tab.api.placeholder.PlaceholderManager;
-import me.neznamy.tab.shared.placeholders.UniversalPlaceholderRegistry;
-import net.milkbowl.vault.chat.Chat;
-import org.bukkit.plugin.java.JavaPlugin;
-
-/**
- * Bukkit registry to register bukkit-only and universal placeholders
- */
-public class BukkitPlaceholderRegistry extends UniversalPlaceholderRegistry {
-
-    /** Number formatter for 2 decimal places */
-    private final NumberFormat numberFormat = NumberFormat.getNumberInstance(Locale.US);
-
-    /** JavaPlugin reference for registering events */
-    private final JavaPlugin plugin;
-
-    /** Vault Chat hook */
-    private Chat chat;
-
-    /** NMS server to get TPS from on spigot */
-    private Object server;
-
-    /** TPS field*/
-    private Field recentTps;
-
-    /** Detection for presence of Paper's TPS getter */
-    private Method paperTps;
-
-    /** Detection for presence of Paper's MSPT getter */
-    private Method paperMspt;
-
-    /** Detection for presence of Purpur's AFK getter */
-    private Method purpurIsAfk;
-
-    /**
-     * Constructs new instance with given parameter and loads hooks
-     *
-     * @param   plugin
-     *          reference to the plugin's main class
-     */
-    public BukkitPlaceholderRegistry(JavaPlugin plugin) {
-        this.plugin = plugin;
-        numberFormat.setMaximumFractionDigits(2);
-        if (Bukkit.getPluginManager().isPluginEnabled(TabConstants.Plugin.VAULT)) {
-            RegisteredServiceProvider<Chat> rspChat = Bukkit.getServicesManager().getRegistration(Chat.class);
-            if (rspChat != null) chat = rspChat.getProvider();
-        }
-        try {
-            server = Bukkit.getServer().getClass().getMethod("getServer").invoke(Bukkit.getServer());
-            recentTps = server.getClass().getField("recentTps");
-        } catch (ReflectiveOperationException e) {
-            //not spigot
-        }
-        try { paperTps = Bukkit.class.getMethod("getTPS"); } catch (NoSuchMethodException ignored) {}
-        try { paperMspt = Bukkit.class.getMethod("getAverageTickTime"); } catch (NoSuchMethodException ignored) {}
-        try { purpurIsAfk = Player.class.getMethod("isAfk"); } catch (NoSuchMethodException ignored) {}
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public void registerPlaceholders(PlaceholderManager manager) {
-        manager.registerPlayerPlaceholder(TabConstants.Placeholder.DISPLAY_NAME, 500, p -> ((Player) p.getPlayer()).getDisplayName());
-        if (paperTps != null) {
-            manager.registerServerPlaceholder(TabConstants.Placeholder.TPS, 1000, () -> formatTPS(Bukkit.getTPS()[0]));
-        } else if (recentTps != null) {
-            manager.registerServerPlaceholder(TabConstants.Placeholder.TPS, 1000, () -> {
-                try {
-                    return formatTPS(((double[]) recentTps.get(server))[0]);
-                } catch (IllegalAccessException e) {
-                    return -1;
-                }
-            });
-        } else {
-            manager.registerServerPlaceholder(TabConstants.Placeholder.TPS, -1, () -> -1);
-        }
-        if (paperMspt != null) {
-            manager.registerServerPlaceholder(TabConstants.Placeholder.MSPT, 1000, () -> numberFormat.format(Bukkit.getAverageTickTime()));
-        }
-        Plugin essentials = Bukkit.getPluginManager().getPlugin(TabConstants.Plugin.ESSENTIALS);
-        manager.registerPlayerPlaceholder(TabConstants.Placeholder.AFK, 500, p -> {
-            if (essentials != null && ((Essentials)essentials).getUser(p.getUniqueId()).isAfk()) return true;
-            return purpurIsAfk != null && ((Player)p.getPlayer()).isAfk();
-        });
-        if (essentials != null) {
-            PlayerPlaceholder nick = manager.registerPlayerPlaceholder(TabConstants.Placeholder.ESSENTIALS_NICK, -1, p -> {
-                String nickname = ((Essentials)essentials).getUser(p.getUniqueId()).getNickname();
-                return nickname == null ? p.getName() : nickname;
-            });
-            Listener nickListener = new Listener() {
-                @EventHandler
-                public void onNickChange(NickChangeEvent e) {
-                    String name = e.getValue() == null ? e.getController().getName() : e.getValue();
-                    TabPlayer player = TAB.getInstance().getPlayer(e.getController().getUUID());
-                    if (player == null) return;
-                    nick.updateValue(player, name);
-                }
-            };
-            nick.enableTriggerMode(() -> Bukkit.getPluginManager().registerEvents(nickListener, plugin),
-                    () -> HandlerList.unregisterAll(nickListener));
-        } else {
-            manager.registerPlayerPlaceholder(TabConstants.Placeholder.ESSENTIALS_NICK, -1, TabPlayer::getName);
-        }
-
-        if (chat != null) {
-            manager.registerPlayerPlaceholder(TabConstants.Placeholder.VAULT_PREFIX, 1000, p -> chat.getPlayerPrefix((Player) p.getPlayer()));
-            manager.registerPlayerPlaceholder(TabConstants.Placeholder.VAULT_SUFFIX, 1000, p -> chat.getPlayerSuffix((Player) p.getPlayer()));
-        } else {
-            manager.registerServerPlaceholder(TabConstants.Placeholder.VAULT_PREFIX, -1, () -> "");
-            manager.registerServerPlaceholder(TabConstants.Placeholder.VAULT_SUFFIX, -1, () -> "");
-        }
-        manager.registerPlayerPlaceholder(TabConstants.Placeholder.HEALTH, 100, p -> (int) Math.ceil(((Player) p.getPlayer()).getHealth()));
-        super.registerPlaceholders(manager);
-    }
-
-    /**
-     * Formats TPS using number formatter with 2 decimal places.
-     *
-     * @param   tps
-     *          TPS to format
-     * @return  Formatted TPS as a String
-     */
-    private String formatTPS(double tps) {
-        return numberFormat.format(Math.min(20, tps));
-    }
-}
@@ -1,290 +0,0 @@
-package me.neznamy.tab.platforms.bukkit;
-
-import com.viaversion.viaversion.api.Via;
-import me.clip.placeholderapi.PlaceholderAPI;
-import me.neznamy.tab.api.TabConstants;
-import me.neznamy.tab.api.TabPlayer;
-import me.neznamy.tab.api.chat.EnumChatFormat;
-import me.neznamy.tab.api.chat.rgb.RGBUtils;
-import me.neznamy.tab.platforms.bukkit.features.BukkitTabExpansion;
-import me.neznamy.tab.platforms.bukkit.features.PerWorldPlayerList;
-import me.neznamy.tab.platforms.bukkit.features.PetFix;
-import me.neznamy.tab.platforms.bukkit.features.WitherBossBar;
-import me.neznamy.tab.platforms.bukkit.features.unlimitedtags.BukkitNameTagX;
-import me.neznamy.tab.platforms.bukkit.permission.Vault;
-import me.neznamy.tab.shared.Platform;
-import me.neznamy.tab.shared.TAB;
-import me.neznamy.tab.shared.features.PlaceholderManagerImpl;
-import me.neznamy.tab.shared.features.bossbar.BossBarManagerImpl;
-import me.neznamy.tab.shared.features.nametags.NameTag;
-import me.neznamy.tab.shared.features.sorting.Sorting;
-import me.neznamy.tab.shared.permission.LuckPerms;
-import me.neznamy.tab.shared.permission.None;
-import me.neznamy.tab.shared.permission.PermissionPlugin;
-import me.neznamy.tab.shared.placeholders.PlayerPlaceholderImpl;
-import net.milkbowl.vault.permission.Permission;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.RegisteredServiceProvider;
-import org.bukkit.plugin.java.JavaPlugin;
-
-import java.util.Collection;
-
-/**
- * Implementation of Platform interface for Bukkit platform
- */
-public class BukkitPlatform extends Platform {
-
-    /** Plugin instance for registering tasks and events */
-    private final JavaPlugin plugin;
-
-    /** Variables checking presence of other plugins to hook into */
-    private final boolean placeholderAPI = Bukkit.getPluginManager().isPluginEnabled(TabConstants.Plugin.PLACEHOLDER_API);
-    private boolean libsDisguises = Bukkit.getPluginManager().isPluginEnabled(TabConstants.Plugin.LIBS_DISGUISES);
-    private Plugin viaVersion;
-    private final boolean protocolSupport = Bukkit.getPluginManager().isPluginEnabled(TabConstants.Plugin.PROTOCOL_SUPPORT);
-
-    /**
-     * Constructs new instance with given plugin parameter
-     *
-     * @param   plugin
-     *          plugin instance
-     */
-    public BukkitPlatform(JavaPlugin plugin) {
-        super(new BukkitPacketBuilder());
-        this.plugin = plugin;
-    }
-
-    @Override
-    public PermissionPlugin detectPermissionPlugin() {
-        if (Bukkit.getPluginManager().isPluginEnabled(TabConstants.Plugin.LUCKPERMS)) {
-            return new LuckPerms(getPluginVersion(TabConstants.Plugin.LUCKPERMS));
-        } else if (Bukkit.getPluginManager().isPluginEnabled(TabConstants.Plugin.VAULT)) {
-            RegisteredServiceProvider<Permission> provider = Bukkit.getServicesManager().getRegistration(Permission.class);
-            if (provider == null) return new None();
-            return new Vault(provider.getProvider(), getPluginVersion(TabConstants.Plugin.VAULT));
-        } else {
-            return new None();
-        }
-    }
-
-    @Override
-    public void loadFeatures() {
-        if (Bukkit.getPluginManager().isPluginEnabled(TabConstants.Plugin.VIAVERSION)) {
-            try {
-                Class.forName("com.viaversion.viaversion.api.Via");
-                viaVersion = Bukkit.getPluginManager().getPlugin(TabConstants.Plugin.VIAVERSION);
-            } catch (ClassNotFoundException e) {
-                TAB.getInstance().sendConsoleMessage("&cAn outdated version of ViaVersion (" + getPluginVersion(TabConstants.Plugin.VIAVERSION) + ") was detected.", true);
-                TAB.getInstance().sendConsoleMessage("&cTAB only supports ViaVersion 4.0.0 and above. Disabling ViaVersion hook.", true);
-                TAB.getInstance().sendConsoleMessage("&cThis might cause problems, such as limitations still being present for latest MC clients as well as RGB not working.", true);
-            }
-        }
-        TAB tab = TAB.getInstance();
-        if (tab.getConfiguration().isPipelineInjection())
-            tab.getFeatureManager().registerFeature(TabConstants.Feature.PIPELINE_INJECTION, new BukkitPipelineInjector());
-        new BukkitPlaceholderRegistry(plugin).registerPlaceholders(tab.getPlaceholderManager());
-        if (tab.getConfiguration().getConfig().getBoolean("scoreboard-teams.enabled", true)) {
-            tab.getFeatureManager().registerFeature(TabConstants.Feature.SORTING, new Sorting());
-            if (tab.getConfiguration().getConfig().getBoolean("scoreboard-teams.unlimited-nametag-mode.enabled", false) && tab.getServerVersion().getMinorVersion() >= 8) {
-                tab.getFeatureManager().registerFeature(TabConstants.Feature.UNLIMITED_NAME_TAGS, new BukkitNameTagX(plugin));
-            } else {
-                tab.getFeatureManager().registerFeature(TabConstants.Feature.NAME_TAGS, new NameTag());
-            }
-        }
-        tab.loadUniversalFeatures();
-        if (tab.getConfiguration().getConfig().getBoolean("bossbar.enabled", false)) {
-            if (tab.getServerVersion().getMinorVersion() < 9) {
-                tab.getFeatureManager().registerFeature(TabConstants.Feature.BOSS_BAR, new WitherBossBar(plugin));
-            } else {
-                tab.getFeatureManager().registerFeature(TabConstants.Feature.BOSS_BAR, new BossBarManagerImpl());
-            }
-        }
-        if (tab.getServerVersion().getMinorVersion() >= 9 && tab.getConfiguration().getConfig().getBoolean("fix-pet-names.enabled", false))
-            tab.getFeatureManager().registerFeature(TabConstants.Feature.PET_FIX, new PetFix());
-        if (tab.getConfiguration().getConfig().getBoolean("per-world-playerlist.enabled", false))
-            tab.getFeatureManager().registerFeature(TabConstants.Feature.PER_WORLD_PLAYER_LIST, new PerWorldPlayerList(plugin));
-        if (placeholderAPI && tab.getConfiguration().getConfig().getBoolean("placeholders.register-tab-expansion", true)) {
-            BukkitTabExpansion expansion = new BukkitTabExpansion();
-            expansion.register();
-            TAB.getInstance().getPlaceholderManager().setTabExpansion(expansion);
-        }
-        for (Player p : getOnlinePlayers()) {
-            tab.addPlayer(new BukkitTabPlayer(p, getProtocolVersion(p)));
-        }
-    }
-
-    @Override
-    public String getPluginVersion(String plugin) {
-        Plugin pl = Bukkit.getPluginManager().getPlugin(plugin);
-        return pl == null ? null : pl.getDescription().getVersion();
-    }
-
-    /**
-     * Returns online players from Bukkit API
-     *
-     * @return  online players from Bukkit API
-     */
-    @SuppressWarnings("unchecked")
-    private Player[] getOnlinePlayers() {
-        try {
-            Object players = Bukkit.class.getMethod("getOnlinePlayers").invoke(null);
-            if (players instanceof Player[]) {
-                //1.7-
-                return (Player[]) players;
-            } else {
-                //1.8+
-                return ((Collection<Player>)players).toArray(new Player[0]); 
-            }
-        } catch (ReflectiveOperationException e) {
-            TAB.getInstance().getErrorManager().printError("Failed to get online players", e);
-            return new Player[0];
-        }
-    }
-
-    @Override
-    public void registerUnknownPlaceholder(String identifier) {
-        PlaceholderManagerImpl pl = TAB.getInstance().getPlaceholderManager();
-        if (identifier.startsWith("%rel_")) {
-            //relational placeholder
-            TAB.getInstance().getPlaceholderManager().registerRelationalPlaceholder(identifier, pl.getRelationalRefresh(identifier), (viewer, target) -> 
-                placeholderAPI ? PlaceholderAPI.setRelationalPlaceholders((Player) viewer.getPlayer(), (Player) target.getPlayer(), identifier) : identifier);
-        } else {
-            //normal placeholder
-            if (identifier.startsWith("%sync:")) {
-                int refresh = pl.getServerPlaceholderRefreshIntervals().getOrDefault(identifier,
-                        pl.getPlayerPlaceholderRefreshIntervals().getOrDefault(identifier, pl.getDefaultRefresh()));
-                String syncedPlaceholder = "%" + identifier.substring(6, identifier.length()-1) + "%";
-                pl.registerPlaceholder(new PlayerPlaceholderImpl(identifier, refresh, null) {
-                    
-                    @Override
-                    public Object request(TabPlayer p) {
-                        Bukkit.getScheduler().runTask(plugin, () -> {
-                            long time = System.nanoTime();
-                            updateValue(p, placeholderAPI ? PlaceholderAPI.setPlaceholders((Player) p.getPlayer(), syncedPlaceholder) : identifier);
-                            TAB.getInstance().getCPUManager().addPlaceholderTime(getIdentifier(), System.nanoTime()-time);
-                        });
-                        return null;
-                    }
-                });
-                return;
-            }
-            if (pl.getServerPlaceholderRefreshIntervals().containsKey(identifier)) {
-                TAB.getInstance().getPlaceholderManager().registerServerPlaceholder(identifier, pl.getServerPlaceholderRefreshIntervals().get(identifier), () ->
-                        placeholderAPI ? PlaceholderAPI.setPlaceholders(null, identifier) : identifier);
-            } else {
-                int refresh = pl.getPlayerPlaceholderRefreshIntervals().getOrDefault(identifier, pl.getDefaultRefresh());
-                TAB.getInstance().getPlaceholderManager().registerPlayerPlaceholder(identifier, refresh, p -> 
-                    placeholderAPI ? PlaceholderAPI.setPlaceholders((Player) p.getPlayer(), identifier) : identifier);
-            }
-        }
-    }
-
-    /**
-     * Returns status of LibsDisguises plugin presence
-     *
-     * @return  {@code true} if plugin is enabled, {@code false} if not
-     */
-    public boolean isLibsDisguisesEnabled() {
-        return libsDisguises;
-    }
-
-    /**
-     * Sets LibsDisguises presence status to provided value. This is used
-     * to disable LibsDisguises hook in case the plugin is not correctly loaded
-     * for any reason to avoid error spam in the hook.
-     *
-     * @param   enabled
-     *          New status of LibsDisguises presence
-     */
-    public void setLibsDisguisesEnabled(boolean enabled) {
-        libsDisguises = enabled;
-    }
-
-    /**
-     * Gets protocol version of requested player and returns it.
-     *
-     * @param   player
-     *          Player to get protocol version of
-     * @return  protocol version of the player
-     */
-    public int getProtocolVersion(Player player) {
-        if (protocolSupport){
-            int version = getProtocolVersionPS(player);
-            //some PS versions return -1 on unsupported server versions instead of throwing exception
-            if (version != -1 && version < TAB.getInstance().getServerVersion().getNetworkId()) return version;
-        }
-        if (viaVersion != null) {
-            return getProtocolVersionVia(player, 0);
-        }
-        return TAB.getInstance().getServerVersion().getNetworkId();
-    }
-
-    /**
-     * Returns protocol version of requested player using ProtocolSupport
-     *
-     * @param   player
-     *          Player to get protocol version of
-     * @return  protocol version of the player using ProtocolSupport
-     */
-    private int getProtocolVersionPS(Player player){
-        try {
-            Object protocolVersion = Class.forName("protocolsupport.api.ProtocolSupportAPI").getMethod("getProtocolVersion", Player.class).invoke(null, player);
-            int version = (int) protocolVersion.getClass().getMethod("getId").invoke(protocolVersion);
-            TAB.getInstance().debug("ProtocolSupport returned protocol version " + version + " for " + player.getName() + " (online=" + player.isOnline() + ")");
-            return version;
-        } catch (ReflectiveOperationException e) {
-            TAB.getInstance().getErrorManager().printError(String.format("Failed to get protocol version of %s using ProtocolSupport", player.getName()), e);
-            return TAB.getInstance().getServerVersion().getNetworkId();
-        }
-    }
-
-    /**
-     * Returns protocol version of requested player using ViaVersion
-     *
-     * @param   player
-     *          Player to get protocol version of
-     * @return  protocol version of the player using ViaVersion
-     */
-    private int getProtocolVersionVia(Player player, int retryLevel){
-        try {
-            if (retryLevel == 10) {
-                TAB.getInstance().debug("Failed to get protocol version of " + player.getName() + " after 10 retries");
-                return TAB.getInstance().getServerVersion().getNetworkId();
-            }
-            int version = Via.getAPI().getPlayerVersion(player.getUniqueId());
-            if (version == -1) {
-                if (!player.isOnline()) return TAB.getInstance().getServerVersion().getNetworkId();
-                Thread.sleep(5);
-                return getProtocolVersionVia(player, retryLevel + 1);
-            }
-            TAB.getInstance().debug("ViaVersion returned protocol version " + version + " for " + player.getName() + " (online=" + player.isOnline() + ")");
-            return version;
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            return -1;
-        } catch (Exception | LinkageError e) {
-            TAB.getInstance().getErrorManager().printError(String.format("Failed to get protocol version of %s using ViaVersion v%s", player.getName(), viaVersion.getDescription().getVersion()), e);
-            return TAB.getInstance().getServerVersion().getNetworkId();
-        }
-    }
-
-    /**
-     * Sends console message using ConsoleCommandSender, due to
-     * Paper not translating colors correctly in Logger messages
-     * and to allow RGB (at least on Paper, doesn't work on spigot)
-     *
-     * @param   message
-     *          Message to send
-     * @param   translateColors
-     *          Whether color codes should be translated or not
-     */
-    @Override
-    public void sendConsoleMessage(String message, boolean translateColors) {
-        Bukkit.getConsoleSender().sendMessage("[TAB] " + (translateColors ?
-                EnumChatFormat.color(RGBUtils.getInstance().convertToBukkitFormat(message,
-                        TAB.getInstance().getServerVersion().getMinorVersion() >= 16))
-                : message));
-    }
-}
@@ -0,0 +1,57 @@
+package me.neznamy.tab.platforms.bukkit;
+
+import me.neznamy.tab.platforms.bukkit.nms.NMSStorage;
+import me.neznamy.tab.platforms.bukkit.platform.BukkitPlatform;
+import me.neznamy.tab.platforms.bukkit.platform.FoliaPlatform;
+import me.neznamy.tab.shared.ProtocolVersion;
+import me.neznamy.tab.shared.chat.EnumChatFormat;
+import me.neznamy.tab.shared.TAB;
+import me.neznamy.tab.shared.util.ReflectionUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.java.JavaPlugin;
+
+/**
+ * Main class for Bukkit.
+ */
+public class BukkitTAB extends JavaPlugin {
+
+    @Override
+    public void onEnable() {
+        if (!isVersionSupported()) {
+            Bukkit.getPluginManager().disablePlugin(this);
+            return;
+        }
+        TAB.create(ReflectionUtils.classExists("io.papermc.paper.threadedregions.RegionizedServer") ?
+                new FoliaPlatform(this) : new BukkitPlatform(this));
+    }
+
+    @Override
+    public void onDisable() {
+        //null check due to compatibility check making instance not get set on unsupported versions
+        if (TAB.getInstance() != null) TAB.getInstance().unload();
+    }
+    
+    /**
+     * Initializes all used NMS classes, constructors, fields and methods.
+     * Returns {@code true} if everything went successfully,
+     * {@code false} if anything went wrong.
+     *
+     * @return  {@code true} if server version is compatible, {@code false} if not
+     */
+    private boolean isVersionSupported() {
+        try {
+            NMSStorage.setInstance(new NMSStorage());
+            return true;
+        } catch (Exception ex) {
+            if (ProtocolVersion.fromFriendlyName(Bukkit.getBukkitVersion().split("-")[0]) == ProtocolVersion.UNKNOWN_SERVER_VERSION) {
+                Bukkit.getConsoleSender().sendMessage(EnumChatFormat.color("&c[TAB] Your server version is not compatible. " +
+                        "This plugin version was made for " + ProtocolVersion.values()[ProtocolVersion.values().length-1].getFriendlyName() +
+                        " - " + ProtocolVersion.values()[3].getFriendlyName() + ". Disabling."));
+            } else {
+                Bukkit.getConsoleSender().sendMessage(EnumChatFormat.color("&c[TAB] A compatibility issue " +
+                        "with your server was found. Unless you are running some really weird server software, this is a bug."));
+            }
+            return false;
+        }
+    }
+}
@@ -0,0 +1,49 @@
+package me.neznamy.tab.platforms.bukkit;
+
+import me.neznamy.tab.shared.TAB;
+import me.neznamy.tab.shared.TabConstants;
+import me.neznamy.tab.shared.chat.EnumChatFormat;
+import me.neznamy.tab.shared.platform.TabPlayer;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabCompleter;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Command handler for /tab command
+ */
+public class BukkitTabCommand implements CommandExecutor, TabCompleter {
+
+    @Override
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
+        if (TAB.getInstance().isPluginDisabled()) {
+            for (String message : TAB.getInstance().getDisabledCommand().execute(args, sender.hasPermission(TabConstants.Permission.COMMAND_RELOAD), sender.hasPermission(TabConstants.Permission.COMMAND_ALL))) {
+                sender.sendMessage(EnumChatFormat.color(message));
+            }
+        } else {
+            TabPlayer p = null;
+            if (sender instanceof Player) {
+                p = TAB.getInstance().getPlayer(((Player)sender).getUniqueId());
+                if (p == null) return true; //player not loaded correctly
+            }
+            TAB.getInstance().getCommand().execute(p, args);
+        }
+        return false;
+    }
+
+    @Override
+    @NotNull
+    public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
+        TabPlayer p = null;
+        if (sender instanceof Player) {
+            p = TAB.getInstance().getPlayer(((Player)sender).getUniqueId());
+            if (p == null) return Collections.emptyList(); //player not loaded correctly
+        }
+        return TAB.getInstance().getCommand().complete(p, args);
+    }
+}
@@ -0,0 +1,256 @@
+package me.neznamy.tab.platforms.bukkit;
+
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.properties.Property;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import me.neznamy.tab.platforms.bukkit.nms.BukkitReflection;
+import me.neznamy.tab.shared.chat.IChatBaseComponent;
+import me.neznamy.tab.shared.platform.TabList;
+import me.neznamy.tab.shared.platform.TabList.Entry.Builder;
+import me.neznamy.tab.shared.util.ReflectionUtils;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.reflect.Array;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.util.*;
+
+/**
+ * TabList which support modifying many entries at once
+ * for significantly better performance. For 1.7 players,
+ * ViaVersion properly splits the packet into multiple, so
+ * we don't need to worry about that here.
+ * <p>
+ * This class does not support server versions of 1.7 and
+ * below, because of the massive differences in tab list
+ * and packet fields.
+ */
+@RequiredArgsConstructor
+@SuppressWarnings({"unchecked", "rawtypes"})
+public class BukkitTabList implements TabList {
+
+    // NMS Fields
+    private static Class<?> HeaderFooterClass;
+    private static Constructor<?> newHeaderFooter;
+    private static Field HEADER;
+    private static Field FOOTER;
+
+    public static Class<?> PlayerInfoClass;
+    private static Constructor<?> newPlayerInfo;
+    public static Field ACTION;
+    public static Field PLAYERS;
+    private static Class<Enum> ActionClass;
+    public static Class<?> ClientboundPlayerInfoRemovePacket;
+    private static Class<?> RemoteChatSession$Data;
+    private static Constructor<?> newClientboundPlayerInfoRemovePacket;
+    private static Class<?> EntityPlayer;
+
+    public static Constructor<?> newPlayerInfoData;
+    public static Field PlayerInfoData_UUID;
+    public static Field PlayerInfoData_Profile;
+    public static Field PlayerInfoData_Latency;
+    public static Field PlayerInfoData_GameMode;
+    public static Field PlayerInfoData_DisplayName;
+    public static Field PlayerInfoData_Listed;
+    public static Field PlayerInfoData_RemoteChatSession;
+
+    private static Object[] gameModes;
+
+    @Getter
+    private static boolean available;
+
+    /** Player this TabList belongs to */
+    private final BukkitTabPlayer player;
+
+    public static void load() throws NoSuchMethodException, ClassNotFoundException {
+        if (BukkitReflection.getMinorVersion() < 8) return; // Not supported (yet?)
+
+        // Classes
+        Class<?> playerInfoDataClass;
+        Class<?> IChatBaseComponent;
+        Class<Enum> EnumGamemodeClass;
+        if (BukkitReflection.isMojangMapped()) {
+            IChatBaseComponent = Class.forName("net.minecraft.network.chat.Component");
+            EntityPlayer = Class.forName("net.minecraft.server.level.ServerPlayer");
+            EnumGamemodeClass = (Class<Enum>) Class.forName("net.minecraft.world.level.GameType");
+            HeaderFooterClass = Class.forName("net.minecraft.network.protocol.game.ClientboundTabListPacket");
+            if (BukkitReflection.is1_19_3Plus()) {
+                ClientboundPlayerInfoRemovePacket = Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoRemovePacket");
+                PlayerInfoClass = Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket");
+                ActionClass = (Class<Enum>) Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket$Action");
+                playerInfoDataClass = Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket$Entry");
+                RemoteChatSession$Data = Class.forName("net.minecraft.network.chat.RemoteChatSession$Data");
+            } else {
+                PlayerInfoClass = Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket");
+                ActionClass = (Class<Enum>) Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket$Action");
+                playerInfoDataClass = Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket$PlayerUpdate");
+            }
+        } else if (BukkitReflection.getMinorVersion() >= 17) {
+            IChatBaseComponent = Class.forName("net.minecraft.network.chat.IChatBaseComponent");
+            EntityPlayer = Class.forName("net.minecraft.server.level.EntityPlayer");
+            EnumGamemodeClass = (Class<Enum>) Class.forName("net.minecraft.world.level.EnumGamemode");
+            HeaderFooterClass = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutPlayerListHeaderFooter");
+            if (BukkitReflection.is1_19_3Plus()) {
+                ClientboundPlayerInfoRemovePacket = Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoRemovePacket");
+                PlayerInfoClass = Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket");
+                ActionClass = (Class<Enum>) Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket$a");
+                playerInfoDataClass = Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket$b");
+                RemoteChatSession$Data = Class.forName("net.minecraft.network.chat.RemoteChatSession$a");
+            } else {
+                PlayerInfoClass = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutPlayerInfo");
+                ActionClass = (Class<Enum>) Class.forName("net.minecraft.network.protocol.game.PacketPlayOutPlayerInfo$EnumPlayerInfoAction");
+                playerInfoDataClass = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutPlayerInfo$PlayerInfoData");
+            }
+        } else {
+            IChatBaseComponent = BukkitReflection.getLegacyClass("IChatBaseComponent");
+            EntityPlayer = BukkitReflection.getLegacyClass("EntityPlayer");
+            HeaderFooterClass = BukkitReflection.getLegacyClass("PacketPlayOutPlayerListHeaderFooter");
+            PlayerInfoClass = BukkitReflection.getLegacyClass("PacketPlayOutPlayerInfo");
+            ActionClass = (Class<Enum>) BukkitReflection.getLegacyClass("PacketPlayOutPlayerInfo$EnumPlayerInfoAction", "EnumPlayerInfoAction");
+            playerInfoDataClass = BukkitReflection.getLegacyClass("PacketPlayOutPlayerInfo$PlayerInfoData", "PlayerInfoData");
+            EnumGamemodeClass = (Class<Enum>) BukkitReflection.getLegacyClass("EnumGamemode", "WorldSettings$EnumGamemode");
+        }
+
+        // Header & Footer
+        if (BukkitReflection.getMinorVersion() >= 17) {
+            newHeaderFooter = HeaderFooterClass.getConstructor(IChatBaseComponent, IChatBaseComponent);
+        } else {
+            newHeaderFooter = HeaderFooterClass.getConstructor();
+            HEADER = ReflectionUtils.getFields(HeaderFooterClass, IChatBaseComponent).get(0);
+            FOOTER = ReflectionUtils.getFields(HeaderFooterClass, IChatBaseComponent).get(1);
+        }
+
+        // Info packet
+        PLAYERS = ReflectionUtils.getOnlyField(PlayerInfoClass, List.class);
+        newPlayerInfoData = ReflectionUtils.getOnlyConstructor(playerInfoDataClass);
+        PlayerInfoData_Profile = ReflectionUtils.getOnlyField(playerInfoDataClass, GameProfile.class);
+        PlayerInfoData_Latency = ReflectionUtils.getOnlyField(playerInfoDataClass, int.class);
+        PlayerInfoData_GameMode = ReflectionUtils.getOnlyField(playerInfoDataClass, EnumGamemodeClass);
+        PlayerInfoData_DisplayName = ReflectionUtils.getOnlyField(playerInfoDataClass, IChatBaseComponent);
+        if (BukkitReflection.is1_19_3Plus()) {
+            newClientboundPlayerInfoRemovePacket = ClientboundPlayerInfoRemovePacket.getConstructor(List.class);
+            newPlayerInfo = PlayerInfoClass.getConstructor(EnumSet.class, Collection.class);
+            ACTION = ReflectionUtils.getOnlyField(PlayerInfoClass, EnumSet.class);
+            PlayerInfoData_Listed = ReflectionUtils.getOnlyField(playerInfoDataClass, boolean.class);
+            PlayerInfoData_RemoteChatSession = ReflectionUtils.getOnlyField(playerInfoDataClass, RemoteChatSession$Data);
+            PlayerInfoData_UUID = ReflectionUtils.getOnlyField(playerInfoDataClass, UUID.class);
+        } else {
+            newPlayerInfo = PlayerInfoClass.getConstructor(ActionClass, Array.newInstance(EntityPlayer, 0).getClass());
+            ACTION = ReflectionUtils.getOnlyField(PlayerInfoClass, ActionClass);
+        }
+        gameModes = new Object[] {
+                Enum.valueOf(EnumGamemodeClass, "SURVIVAL"),
+                Enum.valueOf(EnumGamemodeClass, "CREATIVE"),
+                Enum.valueOf(EnumGamemodeClass, "ADVENTURE"),
+                Enum.valueOf(EnumGamemodeClass, "SPECTATOR")
+        };
+        available = true;
+    }
+
+    @Override
+    @SneakyThrows
+    public void removeEntry(@NotNull UUID entry) {
+        if (!available) return;
+        if (ClientboundPlayerInfoRemovePacket != null) {
+            //1.19.3+
+            player.sendPacket(newClientboundPlayerInfoRemovePacket.newInstance(Collections.singletonList(entry)));
+        } else {
+            //1.19.2-
+            player.sendPacket(createPacket(Action.REMOVE_PLAYER, new Builder(entry).build()));
+        }
+    }
+
+    @Override
+    public void updateDisplayName(@NotNull UUID entry, @Nullable IChatBaseComponent displayName) {
+        if (!available) return;
+        player.sendPacket(createPacket(Action.UPDATE_DISPLAY_NAME, new Builder(entry).displayName(displayName).build()));
+    }
+
+    @Override
+    public void updateLatency(@NotNull UUID entry, int latency) {
+        if (!available) return;
+        player.sendPacket(createPacket(Action.UPDATE_LATENCY, new Builder(entry).latency(latency).build()));
+    }
+
+    @Override
+    public void updateGameMode(@NotNull UUID entry, int gameMode) {
+        if (!available) return;
+        player.sendPacket(createPacket(Action.UPDATE_GAME_MODE, new Builder(entry).gameMode(gameMode).build()));
+    }
+
+    @Override
+    public void addEntry(@NotNull Entry entry) {
+        if (!available) return;
+        player.sendPacket(createPacket(Action.ADD_PLAYER, entry));
+    }
+
+    @Override
+    @SneakyThrows
+    public void setPlayerListHeaderFooter(@NotNull IChatBaseComponent header, @NotNull IChatBaseComponent footer) {
+        if (HeaderFooterClass == null) return;
+        if (BukkitReflection.getMinorVersion() >= 17) {
+            player.sendPacket(newHeaderFooter.newInstance(toComponent(header), toComponent(footer)));
+        } else {
+            Object packet = newHeaderFooter.newInstance();
+            HEADER.set(packet, toComponent(header));
+            FOOTER.set(packet, toComponent(footer));
+            player.sendPacket(packet);
+        }
+    }
+
+    @SneakyThrows
+    @NotNull
+    private Object createPacket(@NotNull Action action, @NotNull Entry entry) {
+        Object packet;
+        List<Object> players = new ArrayList<>();
+        if (BukkitReflection.is1_19_3Plus()) {
+            EnumSet<?> actions;
+            if (action == Action.ADD_PLAYER) {
+                actions = EnumSet.allOf(ActionClass);
+            } else {
+                actions = EnumSet.of(Enum.valueOf(ActionClass, action.name()));
+            }
+            packet = newPlayerInfo.newInstance(actions, Collections.emptyList());
+            players.add(newPlayerInfoData.newInstance(
+                    entry.getUniqueId(),
+                    createProfile(entry.getUniqueId(), entry.getName(), entry.getSkin()),
+                    true,
+                    entry.getLatency(),
+                    gameModes[entry.getGameMode()],
+                    entry.getDisplayName() == null ? null : toComponent(entry.getDisplayName()),
+                    null
+            ));
+        } else {
+            packet = newPlayerInfo.newInstance(Enum.valueOf(ActionClass, action.name()), Array.newInstance(EntityPlayer, 0));
+            List<Object> parameters = new ArrayList<>();
+            if (newPlayerInfoData.getParameterTypes()[0] == PlayerInfoClass) {
+                parameters.add(packet);
+            }
+            parameters.add(createProfile(entry.getUniqueId(), entry.getName(), entry.getSkin()));
+            parameters.add(entry.getLatency());
+            parameters.add(gameModes[entry.getGameMode()]);
+            parameters.add(entry.getDisplayName() == null ? null : toComponent(entry.getDisplayName()));
+            if (BukkitReflection.getMinorVersion() >= 19) parameters.add(null);
+            players.add(newPlayerInfoData.newInstance(parameters.toArray()));
+        }
+        PLAYERS.set(packet, players);
+        return packet;
+    }
+
+    private Object toComponent(IChatBaseComponent component) {
+        return player.getPlatform().toComponent(component, player.getVersion());
+    }
+
+    @NotNull
+    private GameProfile createProfile(@NotNull UUID id, @Nullable String name, @Nullable Skin skin) {
+        GameProfile profile = new GameProfile(id, name == null ? "" : name);
+        if (skin != null) {
+            profile.getProperties().put(TabList.TEXTURES_PROPERTY,
+                    new Property(TabList.TEXTURES_PROPERTY, skin.getValue(), skin.getSignature()));
+        }
+        return profile;
+    }
+}
@@ -1,236 +1,99 @@
 package me.neznamy.tab.platforms.bukkit;

-import java.util.*;
-
+import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.properties.Property;
-import me.neznamy.tab.api.protocol.PacketPlayOutChat;
-import me.neznamy.tab.api.protocol.Skin;
-import me.neznamy.tab.api.util.Preconditions;
-import org.bukkit.Bukkit;
-import org.bukkit.boss.BarColor;
-import org.bukkit.boss.BarFlag;
-import org.bukkit.boss.BarStyle;
-import org.bukkit.boss.BossBar;
-import org.bukkit.entity.Entity;
+import lombok.Getter;
+import lombok.SneakyThrows;
+import me.neznamy.tab.platforms.bukkit.hook.LibsDisguisesHook;
+import me.neznamy.tab.platforms.bukkit.nms.BukkitReflection;
+import me.neznamy.tab.platforms.bukkit.nms.PacketEntityView;
+import me.neznamy.tab.platforms.bukkit.platform.BukkitPlatform;
+import me.neznamy.tab.platforms.bukkit.scoreboard.PacketScoreboard;
+import me.neznamy.tab.shared.backend.entityview.EntityView;
+import me.neznamy.tab.shared.platform.bossbar.BossBar;
+import me.neznamy.tab.shared.chat.IChatBaseComponent;
+import me.neznamy.tab.shared.platform.TabList;
+import me.neznamy.tab.platforms.bukkit.bossbar.EntityBossBar;
+import me.neznamy.tab.platforms.bukkit.bossbar.BukkitBossBar;
+import me.neznamy.tab.platforms.bukkit.bossbar.ViaBossBar;
+import me.neznamy.tab.platforms.bukkit.nms.NMSStorage;
+import me.neznamy.tab.shared.platform.Scoreboard;
+import me.neznamy.tab.shared.TAB;
+import me.neznamy.tab.shared.backend.BackendTabPlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.metadata.MetadataValue;
 import org.bukkit.potion.PotionEffectType;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;

-import com.mojang.authlib.GameProfile;
-import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.legacy.bossbar.BossColor;
-import com.viaversion.viaversion.api.legacy.bossbar.BossFlag;
-import com.viaversion.viaversion.api.legacy.bossbar.BossStyle;
-
-import io.netty.channel.Channel;
-import me.neznamy.tab.api.chat.rgb.RGBUtils;
-import me.neznamy.tab.api.protocol.PacketPlayOutBoss;
-import me.neznamy.tab.platforms.bukkit.nms.storage.NMSStorage;
-import me.neznamy.tab.shared.ITabPlayer;
-import me.neznamy.tab.shared.TAB;
+import java.util.Collection;

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

    /** Player's NMS handle (EntityPlayer), preloading for speed */
-    private Object handle;
+    @NotNull
+    private final Object handle;

    /** Player's connection for sending packets, preloading for speed */
-    private Object playerConnection;
-    
-    /** Bukkit BossBars the player can currently see */
-    private final Map<UUID, BossBar> bossBars = new HashMap<>();
+    @NotNull
+    private final Object playerConnection;

-    /** ViaVersion BossBars this 1.9+ player can see on 1.8 server */
-    private final Map<UUID, com.viaversion.viaversion.api.legacy.bossbar.BossBar> viaBossBars = new HashMap<>();
+    @NotNull
+    private final Scoreboard<BukkitTabPlayer> scoreboard = new PacketScoreboard(this);
+
+    @NotNull
+    private final TabList tabList = new BukkitTabList(this);
+
+    @NotNull
+    private final BossBar bossBar = TAB.getInstance().getServerVersion().getMinorVersion() >= 9 ?
+            new BukkitBossBar(this) : getVersion().getMinorVersion() >= 9 ? new ViaBossBar(this) : new EntityBossBar(this);
+
+    @NotNull
+    private final EntityView entityView = new PacketEntityView(this);

    /**
-     * Constructs new instance with given bukkit player and protocol version
+     * Constructs new instance with given bukkit player
     *
+     * @param   platform
+     *          Server platform
     * @param   p
     *          bukkit player
-     * @param   protocolVersion
-     *          Player's protocol network id
     */
-    public BukkitTabPlayer(Player p, int protocolVersion){
-        super(p, p.getUniqueId(), p.getName(), TAB.getInstance().getConfiguration().getServerName(), p.getWorld().getName(), protocolVersion, true);
-        try {
-            handle = NMSStorage.getInstance().getHandle.invoke(player);
-            playerConnection = NMSStorage.getInstance().PLAYER_CONNECTION.get(handle);
-        } catch (ReflectiveOperationException e) {
-            TAB.getInstance().getErrorManager().printError("Failed to get playerConnection of " + p.getName(), e);
-        }
+    @SneakyThrows
+    public BukkitTabPlayer(@NotNull BukkitPlatform platform, @NotNull Player p) {
+        super(platform, p, p.getUniqueId(), p.getName(), p.getWorld().getName());
+        handle = NMSStorage.getInstance().getHandle.invoke(player);
+        playerConnection = NMSStorage.getInstance().PLAYER_CONNECTION.get(handle);
    }

    @Override
-    public boolean hasPermission(String permission) {
-        Preconditions.checkNotNull(permission, "permission");
-        long time = System.nanoTime();
-        boolean value = getPlayer().hasPermission(permission);
-        TAB.getInstance().getCPUManager().addMethodTime("hasPermission", System.nanoTime()-time);
-        return value;
+    public boolean hasPermission(@NotNull String permission) {
+        return getPlayer().hasPermission(permission);
    }

    @Override
+    @SneakyThrows
    public int getPing() {
-        try {
-            int ping = NMSStorage.getInstance().PING.getInt(handle);
-            if (ping > 10000 || ping < 0) ping = -1;
-            return ping;
-        } catch (IllegalAccessException e) {
-            return -1;
+        if (BukkitReflection.getMinorVersion() >= 17) {
+            return getPlayer().getPing();
        }
+        return NMSStorage.getInstance().PING.getInt(handle);
+    }
+
+    @SneakyThrows
+    public void sendPacket(@NotNull Object nmsPacket) {
+        if (!getPlayer().isOnline()) return;
+        NMSStorage.getInstance().sendPacket.invoke(playerConnection, nmsPacket);
    }

    @Override
-    public void sendPacket(Object nmsPacket) {
-        if (nmsPacket == null || !getPlayer().isOnline()) return;
-        long time = System.nanoTime();
-        try {
-            if (nmsPacket instanceof PacketPlayOutBoss) {
-                if (TAB.getInstance().getServerVersion().getMinorVersion() >= 9) {
-                    handle((PacketPlayOutBoss) nmsPacket);
-                } else {
-                    handleVia((PacketPlayOutBoss) nmsPacket);
-                }
-            } else if (nmsPacket instanceof PacketPlayOutChat) {
-                getPlayer().sendMessage(((PacketPlayOutChat) nmsPacket).getMessage().toLegacyText());
-            } else {
-                NMSStorage.getInstance().sendPacket.invoke(playerConnection, nmsPacket);
-            }
-        } catch (ReflectiveOperationException e) {
-            TAB.getInstance().getErrorManager().printError("An error occurred when sending " + nmsPacket.getClass().getSimpleName(), e);
-        }
-        TAB.getInstance().getCPUManager().addMethodTime("sendPacket", System.nanoTime()-time);
-    }
-
-    /**
-     * Handles PacketPlayOutBoss packet send request using Bukkit API,
-     * since the API offers everything we need and makes us not need to
-     * deal with NMS code at all.
-     *
-     * @param   packet
-     *          packet request to handle using Bukkit API
-     */
-    private void handle(PacketPlayOutBoss packet) {
-        BossBar bar = bossBars.get(packet.getId());
-        if (packet.getAction() == PacketPlayOutBoss.Action.ADD) {
-            if (bossBars.containsKey(packet.getId())) return;
-            bar = Bukkit.createBossBar(RGBUtils.getInstance().convertToBukkitFormat(packet.getName(), getVersion().getMinorVersion() >= 16 && TAB.getInstance().getServerVersion().getMinorVersion() >= 16),
-                    BarColor.valueOf(packet.getColor().name()),
-                    BarStyle.valueOf(packet.getOverlay().getBukkitName()));
-            if (packet.isCreateWorldFog()) bar.addFlag(BarFlag.CREATE_FOG);
-            if (packet.isDarkenScreen()) bar.addFlag(BarFlag.DARKEN_SKY);
-            if (packet.isPlayMusic()) bar.addFlag(BarFlag.PLAY_BOSS_MUSIC);
-            bar.setProgress(packet.getPct());
-            bossBars.put(packet.getId(), bar);
-            bar.addPlayer(getPlayer());
-            return;
-        }
-        if (bar == null) return; //no idea how
-        switch (packet.getAction()) {
-        case REMOVE:
-            bar.removePlayer(getPlayer());
-            bossBars.remove(packet.getId());
-            break;
-        case UPDATE_PCT:
-            bar.setProgress(packet.getPct());
-            break;
-        case UPDATE_NAME:
-            bar.setTitle(RGBUtils.getInstance().convertToBukkitFormat(packet.getName(), getVersion().getMinorVersion() >= 16 && TAB.getInstance().getServerVersion().getMinorVersion() >= 16));
-            break;
-        case UPDATE_STYLE:
-            bar.setColor(BarColor.valueOf(packet.getColor().name()));
-            bar.setStyle(BarStyle.valueOf(packet.getOverlay().getBukkitName()));
-            break;
-        case UPDATE_PROPERTIES:
-            bar = bossBars.get(packet.getId());
-            processFlag(bar, packet.isCreateWorldFog(), BarFlag.CREATE_FOG);
-            processFlag(bar, packet.isDarkenScreen(), BarFlag.DARKEN_SKY);
-            processFlag(bar, packet.isPlayMusic(), BarFlag.PLAY_BOSS_MUSIC);
-            break;
-        default:
-            break;
-        }
-    }
-
-    /**
-     * Handles PacketPlayOutBoss packet request for 1.9+ clients on
-     * 1.8 servers using ViaVersion API instead of using Wither.
-     *
-     * @param   packet
-     *          packet request to handle using ViaVersion API
-     */
-    private void handleVia(PacketPlayOutBoss packet) {
-        com.viaversion.viaversion.api.legacy.bossbar.BossBar bar;
-        switch (packet.getAction()) {
-        case ADD:
-            if (viaBossBars.containsKey(packet.getId())) return;
-            bar = Via.getAPI().legacyAPI().createLegacyBossBar(RGBUtils.getInstance().convertToBukkitFormat(packet.getName(), getVersion().getMinorVersion() >= 16), 
-                    packet.getPct(),
-                    BossColor.valueOf(packet.getColor().name()), 
-                    BossStyle.valueOf(packet.getOverlay().getBukkitName()));
-            //fog missing from via API
-            if (packet.isDarkenScreen()) bar.addFlag(BossFlag.DARKEN_SKY);
-            if (packet.isPlayMusic()) bar.addFlag(BossFlag.PLAY_BOSS_MUSIC);
-            viaBossBars.put(packet.getId(), bar);
-            bar.addPlayer(getPlayer().getUniqueId());
-            break;
-        case REMOVE:
-            viaBossBars.get(packet.getId()).removePlayer(getPlayer().getUniqueId());
-            viaBossBars.remove(packet.getId());
-            break;
-        case UPDATE_PCT:
-            viaBossBars.get(packet.getId()).setHealth(packet.getPct());
-            break;
-        case UPDATE_NAME:
-            viaBossBars.get(packet.getId()).setTitle(RGBUtils.getInstance().convertToBukkitFormat(packet.getName(), getVersion().getMinorVersion() >= 16));
-            break;
-        case UPDATE_STYLE:
-            viaBossBars.get(packet.getId()).setColor(BossColor.valueOf(packet.getColor().name()));
-            viaBossBars.get(packet.getId()).setStyle(BossStyle.valueOf(packet.getOverlay().getBukkitName()));
-            break;
-        case UPDATE_PROPERTIES:
-            bar = viaBossBars.get(packet.getId());
-            //fog missing from via API
-            processFlagVia(bar, packet.isDarkenScreen(), BossFlag.DARKEN_SKY);
-            processFlagVia(bar, packet.isPlayMusic(), BossFlag.PLAY_BOSS_MUSIC);
-            break;
-        default:
-            break;
-        }
-    }
-
-    /**
-     * Sets BossBar flag to requested target value.
-     *
-     * @param   bar
-     *          BossBar to set flag of
-     * @param   targetValue
-     *          Target value of the flag
-     * @param   flag
-     *          Flag to set value of
-     */
-    private void processFlag(BossBar bar, boolean targetValue, BarFlag flag) {
-        if (targetValue && !bar.hasFlag(flag)) bar.addFlag(flag);
-        if (!targetValue && bar.hasFlag(flag)) bar.removeFlag(flag);
-    }
-
-    /**
-     * Sets BossBar flag to requested target value.
-     *
-     * @param   bar
-     *          BossBar to set flag of
-     * @param   targetValue
-     *          Target value of the flag
-     * @param   flag
-     *          Flag to set value of
-     */
-    private void processFlagVia(com.viaversion.viaversion.api.legacy.bossbar.BossBar bar, boolean targetValue, BossFlag flag) {
-        if (targetValue && !bar.hasFlag(flag)) bar.addFlag(flag);
-        if (!targetValue && bar.hasFlag(flag)) bar.removeFlag(flag);
+    public void sendMessage(@NotNull IChatBaseComponent message) {
+        getPlayer().sendMessage(BukkitUtils.toBukkitFormat(message, getVersion().getMinorVersion() >= 16));
    }

    @Override
@@ -240,31 +103,28 @@ public class BukkitTabPlayer extends ITabPlayer {

    @Override
    public boolean isDisguised() {
-        try {
-            if (!((BukkitPlatform)TAB.getInstance().getPlatform()).isLibsDisguisesEnabled()) return false;
-            return (boolean) Class.forName("me.libraryaddict.disguise.DisguiseAPI").getMethod("isDisguised", Entity.class).invoke(null, getPlayer());
-        } catch (LinkageError | ReflectiveOperationException e) {
-            //java.lang.NoClassDefFoundError: Could not initialize class me.libraryaddict.disguise.DisguiseAPI
-            TAB.getInstance().getErrorManager().printError("Failed to check disguise status using LibsDisguises", e);
-            ((BukkitPlatform)TAB.getInstance().getPlatform()).setLibsDisguisesEnabled(false);
-            return false;
-        }
-    }
-
-    @Override
-    public Skin getSkin() {
-        try {
-            Collection<Property> col = ((GameProfile)NMSStorage.getInstance().getProfile.invoke(handle)).getProperties().get("textures");
-            if (col.isEmpty()) return null; //offline mode
-            Property property = col.iterator().next();
-            return new Skin(property.getValue(), property.getSignature());
-        } catch (ReflectiveOperationException e) {
-            TAB.getInstance().getErrorManager().printError("Failed to get skin of " + getName(), e);
-            return null;
+        return LibsDisguisesHook.isDisguised(this);
+    }
+
+    @Override
+    @SneakyThrows
+    @Nullable
+    public TabList.Skin getSkin() {
+        Collection<Property> col = ((GameProfile)NMSStorage.getInstance().getProfile.invoke(handle)).getProperties().get(TabList.TEXTURES_PROPERTY);
+        if (col.isEmpty()) return null; //offline mode
+        Property property = col.iterator().next();
+        if (BukkitReflection.is1_20_2Plus()) {
+            return new TabList.Skin(
+                    (String) property.getClass().getMethod("value").invoke(property),
+                    (String) property.getClass().getMethod("signature").invoke(property)
+            );
+        } else {
+            return new TabList.Skin(property.getValue(), property.getSignature());
        }
    }

    @Override
+    @NotNull
    public Player getPlayer() {
        return (Player) player;
    }
@@ -274,59 +134,29 @@ public class BukkitTabPlayer extends ITabPlayer {
        return getPlayer().isOnline();
    }

+    @Override
+    public BukkitPlatform getPlatform() {
+        return (BukkitPlatform) platform;
+    }
+
    @Override
    public boolean isVanished() {
        return getPlayer().getMetadata("vanished").stream().anyMatch(MetadataValue::asBoolean);
    }

-    @SuppressWarnings("deprecation")
    @Override
    public int getGamemode() {
        return getPlayer().getGameMode().getValue();
    }

    @Override
-    public Object getProfilePublicKey() {
-        if (NMSStorage.getInstance().getMinorVersion() < 19) return null;
-        try {
-            if (NMSStorage.getInstance().RemoteChatSession != null) {
-                //1.19.3+
-                Object session = NMSStorage.getInstance().EntityPlayer_RemoteChatSession.get(handle);
-                if (session == null) return null;
-                Object key = NMSStorage.getInstance().RemoteChatSession_getProfilePublicKey.invoke(session);
-                return NMSStorage.getInstance().ProfilePublicKey_getRecord.invoke(key);
-            } else {
-                Object key = NMSStorage.getInstance().EntityHuman_ProfilePublicKey.get(handle);
-                if (key == null) return null;
-                return NMSStorage.getInstance().ProfilePublicKey_getRecord.invoke(key);
-            }
-        } catch (ReflectiveOperationException e) {
-            TAB.getInstance().getErrorManager().printError("Failed to get profile key of " + getName(), e);
-            return null;
-        }
+    public double getHealth() {
+        return getPlayer().getHealth();
    }

    @Override
-    public UUID getChatSessionId() {
-        if (NMSStorage.getInstance().RemoteChatSession != null) return null;
-        try {
-            Object session = NMSStorage.getInstance().EntityPlayer_RemoteChatSession.get(handle);
-            if (session == null) return null;
-            return (UUID) NMSStorage.getInstance().RemoteChatSession_getSessionId.invoke(session);
-        } catch (ReflectiveOperationException e) {
-            TAB.getInstance().getErrorManager().printError("Failed to get chat session of " + getName(), e);
-            return null;
-        }
-    }
-
-    @Override
-    public Channel getChannel() {
-        try {
-            if (NMSStorage.getInstance().CHANNEL != null)
-                return (Channel) NMSStorage.getInstance().CHANNEL.get(NMSStorage.getInstance().NETWORK_MANAGER.get(playerConnection));
-        } catch (IllegalAccessException e) {
-            TAB.getInstance().getErrorManager().printError("Failed to get channel of " + getName(), e);
-        }
-        return null;
+    @NotNull
+    public String getDisplayName() {
+        return getPlayer().getDisplayName();
    }
 }
@@ -0,0 +1,76 @@
+package me.neznamy.tab.platforms.bukkit;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import lombok.SneakyThrows;
+import me.neznamy.tab.platforms.bukkit.nms.BukkitReflection;
+import me.neznamy.tab.shared.chat.EnumChatFormat;
+import me.neznamy.tab.shared.chat.IChatBaseComponent;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+
+/**
+ * Class containing static util methods used on Bukkit.
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class BukkitUtils {
+
+    /**
+     * Returns online players from Bukkit API. This requires reflection, as return type changed in 1.8,
+     * and we want to avoid errors.
+     *
+     * @return  Online players from Bukkit API.
+     */
+    @SuppressWarnings("unchecked")
+    @SneakyThrows
+    @NotNull
+    public static Player[] getOnlinePlayers() {
+        Object players = Bukkit.class.getMethod("getOnlinePlayers").invoke(null);
+        if (players instanceof Player[]) {
+            //1.7-
+            return (Player[]) players;
+        } else {
+            //1.8+
+            return ((Collection<Player>)players).toArray(new Player[0]);
+        }
+    }
+
+    /**
+     * Converts component to legacy string using bukkit RGB format if supported by both server and client.
+     * If not, closest legacy color is used instead.
+     *
+     * @param   component
+     *          Component to convert
+     * @param   rgbClient
+     *          Whether client accepts RGB colors or not.
+     * @return  Converted string using bukkit color format
+     */
+    @NotNull
+    public static String toBukkitFormat(@NotNull IChatBaseComponent component, boolean rgbClient) {
+        StringBuilder sb = new StringBuilder();
+        if (component.getModifier().getColor() != null) {
+            if (BukkitReflection.getMinorVersion() >= 16 && rgbClient) {
+                String hexCode = component.getModifier().getColor().getHexCode();
+                char c = EnumChatFormat.COLOR_CHAR;
+                sb.append(c).append("x").append(c).append(hexCode.charAt(0)).append(c).append(hexCode.charAt(1))
+                        .append(c).append(hexCode.charAt(2)).append(c).append(hexCode.charAt(3))
+                        .append(c).append(hexCode.charAt(4)).append(c).append(hexCode.charAt(5));
+            } else {
+                sb.append(component.getModifier().getColor().getLegacyColor().getFormat());
+            }
+        }
+        if (component.getModifier().isBold()) sb.append(EnumChatFormat.BOLD.getFormat());
+        if (component.getModifier().isStrikethrough()) sb.append(EnumChatFormat.STRIKETHROUGH.getFormat());
+        if (component.getModifier().isItalic()) sb.append(EnumChatFormat.ITALIC.getFormat());
+        if (component.getModifier().isObfuscated()) sb.append(EnumChatFormat.OBFUSCATED.getFormat());
+        if (component.getModifier().isUnderlined()) sb.append(EnumChatFormat.UNDERLINE.getFormat());
+        if (component.getText() != null) sb.append(component.getText());
+        for (IChatBaseComponent extra : component.getExtra()) {
+            sb.append(toBukkitFormat(extra, rgbClient));
+        }
+        return sb.toString();
+    }
+}
@@ -1,143 +0,0 @@
-package me.neznamy.tab.platforms.bukkit;
-
-import me.neznamy.tab.api.ProtocolVersion;
-import me.neznamy.tab.api.TabAPI;
-import me.neznamy.tab.api.TabConstants;
-import me.neznamy.tab.api.TabPlayer;
-import me.neznamy.tab.api.chat.EnumChatFormat;
-import me.neznamy.tab.api.util.SupplierWithException;
-import me.neznamy.tab.platforms.bukkit.nms.storage.*;
-import me.neznamy.tab.shared.TAB;
-import org.bstats.bukkit.Metrics;
-import org.bstats.charts.SimplePie;
-import org.bukkit.Bukkit;
-import org.bukkit.command.*;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Main class for Bukkit platform
- */
-public class Main extends JavaPlugin {
-
-    @Override
-    public void onEnable(){
-        String version = Bukkit.getBukkitVersion().split("-")[0];
-        String serverPackage = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
-        Bukkit.getConsoleSender().sendMessage(EnumChatFormat.color("[TAB] Server version: " + version + " (" + serverPackage + ")"));
-        if (!isVersionSupported()){
-            Bukkit.getPluginManager().disablePlugin(this);
-            return;
-        }
-        BukkitPlatform platform = new BukkitPlatform(this);
-        TAB.setInstance(new TAB(platform, ProtocolVersion.fromFriendlyName(version), version + " (" + serverPackage + ")", getDataFolder(), getLogger()));
-        if (TAB.getInstance().getServerVersion() == ProtocolVersion.UNKNOWN_SERVER_VERSION) {
-            Bukkit.getConsoleSender().sendMessage(EnumChatFormat.color("&c[TAB] Unknown server version: " + Bukkit.getBukkitVersion() + "! Plugin may not work correctly."));
-        }
-        Bukkit.getPluginManager().registerEvents(new BukkitEventListener(platform), this);
-        TAB.getInstance().load();
-        Metrics metrics = new Metrics(this, 5304);
-        metrics.addCustomChart(new SimplePie(TabConstants.MetricsChart.UNLIMITED_NAME_TAG_MODE_ENABLED, () -> TAB.getInstance().getFeatureManager().isFeatureEnabled(TabConstants.Feature.UNLIMITED_NAME_TAGS) ? "Yes" : "No"));
-        metrics.addCustomChart(new SimplePie(TabConstants.MetricsChart.PLACEHOLDER_API, () -> Bukkit.getPluginManager().isPluginEnabled(TabConstants.Plugin.PLACEHOLDER_API) ? "Yes" : "No"));
-        metrics.addCustomChart(new SimplePie(TabConstants.MetricsChart.PERMISSION_SYSTEM, () -> TAB.getInstance().getGroupManager().getPlugin().getName()));
-        metrics.addCustomChart(new SimplePie(TabConstants.MetricsChart.SERVER_VERSION, () -> "1." + TAB.getInstance().getServerVersion().getMinorVersion() + ".x"));
-        PluginCommand cmd = Bukkit.getPluginCommand("tab");
-        if (cmd == null) return;
-        TABCommand command = new TABCommand();
-        cmd.setExecutor(command);
-        cmd.setTabCompleter(command);
-    }
-
-    @Override
-    public void onDisable() {
-        //null check due to compatibility check making instance not get set on unsupported versions
-        if (TAB.getInstance() != null) TAB.getInstance().unload();
-    }
-    
-    /**
-     * Initializes all used NMS classes, constructors, fields and methods.
-     * Returns {@code true} if everything went successfully and version is marked as compatible,
-     * {@code false} if anything went wrong or version is not marked as compatible.
-     *
-     * @return  {@code true} if server version is compatible, {@code false} if not
-     */
-    private boolean isVersionSupported(){
-        List<String> supportedVersions = Arrays.asList(
-                "v1_5_R1", "v1_5_R2", "v1_5_R3", "v1_6_R1", "v1_6_R2", "v1_6_R3",
-                "v1_7_R1", "v1_7_R2", "v1_7_R3", "v1_7_R4", "v1_8_R1", "v1_8_R2", "v1_8_R3",
-                "v1_9_R1", "v1_9_R2", "v1_10_R1", "v1_11_R1", "v1_12_R1", "v1_13_R1", "v1_13_R2",
-                "v1_14_R1", "v1_15_R1", "v1_16_R1", "v1_16_R2", "v1_16_R3", "v1_17_R1", "v1_18_R1",
-                "v1_18_R2", "v1_19_R1", "v1_19_R2");
-        String serverPackage = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
-        try {
-            long time = System.currentTimeMillis();
-            int minorVersion = Integer.parseInt(serverPackage.split("_")[1]);
-            NMSStorage.setInstance(getNMSLoader());
-            if (supportedVersions.contains(serverPackage)) {
-                Bukkit.getConsoleSender().sendMessage(EnumChatFormat.color("[TAB] Loaded NMS hook in " + (System.currentTimeMillis()-time) + "ms"));
-                return true;
-            } else {
-                Bukkit.getConsoleSender().sendMessage(EnumChatFormat.color("&c[TAB] No compatibility issue was found, but this plugin version does not claim to support your server package (" + serverPackage + "). This jar has only been tested on 1.5.2 - 1.19.3. Disabling just to stay safe."));
-            }
-        } catch (IllegalStateException ex) {
-            if (supportedVersions.contains(serverPackage)) {
-                Bukkit.getConsoleSender().sendMessage(EnumChatFormat.color("&c[TAB] Your server version is marked as compatible, but a compatibility issue was found. Please report this issue (include your server version & fork too)"));
-            } else {
-                Bukkit.getConsoleSender().sendMessage(EnumChatFormat.color("&c[TAB] Your server version is completely unsupported. This plugin version only supports 1.5.2 - 1.19.3. Disabling."));
-            }
-        }
-        return false;
-    }
-
-    private NMSStorage getNMSLoader() {
-        List<SupplierWithException<NMSStorage>> loaders = new ArrayList<>();
-        loaders.add(BukkitLegacyNMSStorage::new);
-        loaders.add(BukkitModernNMSStorage::new);
-        loaders.add(MojangModernNMSStorage::new);
-        loaders.add(ThermosNMSStorage::new);
-        for (SupplierWithException<NMSStorage> loader : loaders) {
-            try {
-                return loader.get();
-            } catch (Exception ignored){}
-        }
-        throw new IllegalStateException("Unsupported server version");
-    }
-
-    /**
-     * Command handler for /tab command
-     */
-    private static class TABCommand implements CommandExecutor, TabCompleter {
-
-        @Override
-        public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
-            if (TabAPI.getInstance().isPluginDisabled()) {
-                for (String message : TAB.getInstance().getDisabledCommand().execute(args, sender.hasPermission(TabConstants.Permission.COMMAND_RELOAD), sender.hasPermission(TabConstants.Permission.COMMAND_ALL))) {
-                    sender.sendMessage(EnumChatFormat.color(message));
-                }
-            } else {
-                TabPlayer p = null;
-                if (sender instanceof Player) {
-                    p = TAB.getInstance().getPlayer(((Player)sender).getUniqueId());
-                    if (p == null) return true; //player not loaded correctly
-                }
-                TAB.getInstance().getCommand().execute(p, args);
-            }
-            return false;
-        }
-
-        @Override
-        public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, String[] args) {
-            TabPlayer p = null;
-            if (sender instanceof Player) {
-                p = TAB.getInstance().getPlayer(((Player)sender).getUniqueId());
-                if (p == null) return new ArrayList<>(); //player not loaded correctly
-            }
-            return TAB.getInstance().getCommand().complete(p, args);
-        }
-    }
-}
@@ -0,0 +1,68 @@
+package me.neznamy.tab.platforms.bukkit.bossbar;
+
+import lombok.RequiredArgsConstructor;
+import me.neznamy.tab.api.bossbar.BarColor;
+import me.neznamy.tab.api.bossbar.BarStyle;
+import me.neznamy.tab.platforms.bukkit.BukkitUtils;
+import me.neznamy.tab.shared.chat.IChatBaseComponent;
+import me.neznamy.tab.shared.platform.bossbar.BossBar;
+import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
+import org.bukkit.Bukkit;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * BossBar for 1.9+ servers where Bukkit API is used. If ViaVersion is used
+ * to allow 1.8 players, it will handle the entity and teleporting by itself.
+ */
+@RequiredArgsConstructor
+public class BukkitBossBar implements BossBar {
+
+    /** Player this handler belongs to */
+    @NotNull
+    private final BukkitTabPlayer player;
+
+    /** Bukkit BossBars the player can currently see */
+    @NotNull
+    private final Map<UUID, org.bukkit.boss.BossBar> bossBars = new HashMap<>();
+
+    @Override
+    public void create(@NotNull UUID id, @NotNull String title, float progress, @NotNull BarColor color, @NotNull BarStyle style) {
+        if (bossBars.containsKey(id)) return;
+        org.bukkit.boss.BossBar bar = Bukkit.createBossBar(
+                BukkitUtils.toBukkitFormat(IChatBaseComponent.optimizedComponent(title), player.getVersion().getMinorVersion() >= 16),
+                org.bukkit.boss.BarColor.valueOf(color.name()),
+                org.bukkit.boss.BarStyle.valueOf(style.getBukkitName()));
+        bar.setProgress(progress);
+        bar.addPlayer(player.getPlayer());
+        bossBars.put(id, bar);
+    }
+
+    @Override
+    public void update(@NotNull UUID id, @NotNull String title) {
+        bossBars.get(id).setTitle(BukkitUtils.toBukkitFormat(IChatBaseComponent.optimizedComponent(title), player.getVersion().getMinorVersion() >= 16));
+    }
+
+    @Override
+    public void update(@NotNull UUID id, float progress) {
+        bossBars.get(id).setProgress(progress);
+    }
+
+    @Override
+    public void update(@NotNull UUID id, @NotNull BarStyle style) {
+        bossBars.get(id).setStyle(org.bukkit.boss.BarStyle.valueOf(style.getBukkitName()));
+    }
+
+    @Override
+    public void update(@NotNull UUID id, @NotNull BarColor color) {
+        bossBars.get(id).setColor(org.bukkit.boss.BarColor.valueOf(color.name()));
+    }
+
+    @Override
+    public void remove(@NotNull UUID id) {
+        bossBars.remove(id).removePlayer(player.getPlayer());
+    }
+}
@@ -0,0 +1,65 @@
+package me.neznamy.tab.platforms.bukkit.bossbar;
+
+import lombok.RequiredArgsConstructor;
+import me.neznamy.tab.shared.platform.bossbar.BossBar;
+import me.neznamy.tab.api.bossbar.BarColor;
+import me.neznamy.tab.api.bossbar.BarStyle;
+import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
+import me.neznamy.tab.platforms.bukkit.nms.DataWatcher;
+import me.neznamy.tab.shared.backend.Location;
+import org.bukkit.entity.EntityType;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
+
+/**
+ * BossBar using wither entity for <1.9 players on <1.9 servers.
+ * Additional logic, such as teleporting the entity must be done
+ * separately, as this class does not handle it.
+ */
+@RequiredArgsConstructor
+public class EntityBossBar implements BossBar {
+
+    /** Player this handler belongs to */
+    @NotNull
+    private final BukkitTabPlayer player;
+
+    @Override
+    public void create(@NotNull UUID id, @NotNull String title, float progress, @NotNull BarColor color, @NotNull BarStyle style) {
+        DataWatcher w = new DataWatcher();
+        float health = 300*progress;
+        if (health == 0) health = 1;
+        w.setHealth(health);
+        w.setCustomName(title, player.getVersion());
+        w.setEntityFlags((byte) 32);
+        w.setWitherInvulnerableTime(880); // Magic number
+        player.getEntityView().spawnEntity(id.hashCode(), new UUID(0, 0), EntityType.WITHER, new Location(0, 0, 0), w);
+    }
+
+    @Override
+    public void update(@NotNull UUID id, @NotNull String title) {
+        DataWatcher w = new DataWatcher();
+        w.setCustomName(title, player.getVersion());
+        player.getEntityView().updateEntityMetadata(id.hashCode(), w);
+    }
+
+    @Override
+    public void update(@NotNull UUID id, float progress) {
+        DataWatcher w = new DataWatcher();
+        float health = 300*progress;
+        if (health == 0) health = 1;
+        w.setHealth(health);
+        player.getEntityView().updateEntityMetadata(id.hashCode(), w);
+    }
+
+    @Override
+    public void update(@NotNull UUID id, @NotNull BarStyle style) {/*Added in 1.9*/}
+
+    @Override
+    public void update(@NotNull UUID id, @NotNull BarColor color) {/*Added in 1.9*/}
+
+    @Override
+    public void remove(@NotNull UUID id) {
+        player.getEntityView().destroyEntities(id.hashCode());
+    }
+}
@@ -0,0 +1,68 @@
+package me.neznamy.tab.platforms.bukkit.bossbar;
+
+import com.viaversion.viaversion.api.Via;
+import com.viaversion.viaversion.api.legacy.bossbar.BossColor;
+import com.viaversion.viaversion.api.legacy.bossbar.BossStyle;
+import lombok.RequiredArgsConstructor;
+import me.neznamy.tab.shared.chat.IChatBaseComponent;
+import me.neznamy.tab.shared.platform.bossbar.BossBar;
+import me.neznamy.tab.api.bossbar.BarColor;
+import me.neznamy.tab.api.bossbar.BarStyle;
+import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * Handler for 1.9+ players on 1.8 server using ViaVersion API.
+ */
+@RequiredArgsConstructor
+public class ViaBossBar implements BossBar {
+
+    /** Player this handler belongs to */
+    @NotNull
+    private final BukkitTabPlayer player;
+
+    /** ViaVersion BossBars this 1.9+ player can see on 1.8 server */
+    @NotNull
+    private final Map<UUID, com.viaversion.viaversion.api.legacy.bossbar.BossBar> viaBossBars = new HashMap<>();
+
+    @Override
+    public void create(@NotNull UUID id, @NotNull String title, float progress, @NotNull BarColor color, @NotNull BarStyle style) {
+        if (viaBossBars.containsKey(id)) return;
+        com.viaversion.viaversion.api.legacy.bossbar.BossBar bar = Via.getAPI().legacyAPI().createLegacyBossBar(
+                IChatBaseComponent.optimizedComponent(title).toString(player.getVersion()),
+                progress,
+                BossColor.valueOf(color.name()),
+                BossStyle.valueOf(style.getBukkitName()));
+        viaBossBars.put(id, bar);
+        bar.addPlayer(player.getPlayer().getUniqueId());
+    }
+
+    @Override
+    public void update(@NotNull UUID id, @NotNull String title) {
+        viaBossBars.get(id).setTitle(IChatBaseComponent.optimizedComponent(title).toString(player.getVersion()));
+    }
+
+    @Override
+    public void update(@NotNull UUID id, float progress) {
+        viaBossBars.get(id).setHealth(progress);
+    }
+
+    @Override
+    public void update(@NotNull UUID id, @NotNull BarStyle style) {
+        viaBossBars.get(id).setStyle(BossStyle.valueOf(style.getBukkitName()));
+    }
+
+    @Override
+    public void update(@NotNull UUID id, @NotNull BarColor color) {
+        viaBossBars.get(id).setColor(BossColor.valueOf(color.name()));
+    }
+
+    @Override
+    public void remove(@NotNull UUID id) {
+        viaBossBars.remove(id).removePlayer(player.getPlayer().getUniqueId());
+    }
+}
@@ -0,0 +1,167 @@
+package me.neznamy.tab.platforms.bukkit.features;
+
+import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
+import me.neznamy.tab.platforms.bukkit.nms.DataWatcher;
+import me.neznamy.tab.platforms.bukkit.platform.BukkitPlatform;
+import me.neznamy.tab.shared.TAB;
+import me.neznamy.tab.shared.backend.EntityData;
+import me.neznamy.tab.shared.backend.features.unlimitedtags.BackendNameTagX;
+import me.neznamy.tab.shared.platform.TabPlayer;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Pose;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerRespawnEvent;
+import org.bukkit.event.player.PlayerToggleSneakEvent;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * The core class for unlimited NameTag mode on Bukkit
+ */
+public class BukkitNameTagX extends BackendNameTagX implements Listener {
+
+    public BukkitNameTagX(@NotNull JavaPlugin plugin) {
+        Bukkit.getPluginManager().registerEvents(this, plugin);
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onSneak(PlayerToggleSneakEvent e) {
+        sneak(e.getPlayer().getUniqueId(), e.isSneaking());
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onRespawn(PlayerRespawnEvent e) {
+        respawn(e.getPlayer().getUniqueId());
+    }
+
+    @Override
+    public double getDistance(@NotNull TabPlayer player1, @NotNull TabPlayer player2) {
+        Location loc1 = ((Player) player1.getPlayer()).getLocation();
+        Location loc2 = ((Player) player2.getPlayer()).getLocation();
+        return Math.sqrt(Math.pow(loc1.getX()-loc2.getX(), 2) + Math.pow(loc1.getZ()-loc2.getZ(), 2));
+    }
+
+    @Override
+    public boolean areInSameWorld(@NotNull TabPlayer player1, @NotNull TabPlayer player2) {
+        return ((Player) player1.getPlayer()).getWorld() == ((Player) player2.getPlayer()).getWorld();
+    }
+
+    @Override
+    public boolean canSee(@NotNull TabPlayer viewer, @NotNull TabPlayer target) {
+        return ((Player)viewer.getPlayer()).canSee((Player) target.getPlayer());
+    }
+
+    @Override
+    public void unregisterListener() {
+        HandlerList.unregisterAll(this);
+    }
+
+    @SuppressWarnings("deprecation")
+    @Override
+    @NotNull
+    public List<Integer> getPassengers(@NotNull Object entity) {
+        Entity vehicle = (Entity) entity;
+        if (TAB.getInstance().getServerVersion().getMinorVersion() >= 11) {
+            return vehicle.getPassengers().stream().map(Entity::getEntityId).collect(Collectors.toList());
+        } else {
+            if (vehicle.getPassenger() != null) {
+                return Collections.singletonList(vehicle.getPassenger().getEntityId());
+            } else {
+                return Collections.emptyList();
+            }
+        }
+    }
+
+    @Override
+    @Nullable
+    public Object getVehicle(@NotNull TabPlayer player) {
+        return ((Player)player.getPlayer()).getVehicle();
+    }
+
+    @Override
+    public int getEntityId(@NotNull Object entity) {
+        return ((Entity)entity).getEntityId();
+    }
+
+    @Override
+    @NotNull
+    public String getEntityType(@NotNull Object entity) {
+        return ((Entity) entity).getType().toString().toLowerCase();
+    }
+
+    @Override
+    public boolean isSneaking(@NotNull TabPlayer player) {
+        return ((Player)player.getPlayer()).isSneaking();
+    }
+
+    @Override
+    public boolean isSwimming(@NotNull TabPlayer player) {
+        Player p = (Player) player.getPlayer();
+        if (TAB.getInstance().getServerVersion().getMinorVersion() >= 14 && p.getPose() == Pose.SWIMMING) return true;
+        return TAB.getInstance().getServerVersion().getMinorVersion() == 13 && p.isSwimming();
+    }
+
+    @Override
+    public boolean isGliding(@NotNull TabPlayer player) {
+        return TAB.getInstance().getServerVersion().getMinorVersion() >= 9 && ((Player)player.getPlayer()).isGliding();
+    }
+
+    @Override
+    public boolean isSleeping(@NotNull TabPlayer player) {
+        return ((Player)player.getPlayer()).isSleeping();
+    }
+
+    @Override
+    @NotNull
+    public Object getArmorStandType() {
+        return EntityType.ARMOR_STAND;
+    }
+
+    @Override
+    public double getX(@NotNull TabPlayer player) {
+        return ((Player)player.getPlayer()).getLocation().getX();
+    }
+
+    @Override
+    public double getY(@NotNull Object entity) {
+        return ((Entity)entity).getLocation().getY();
+    }
+
+    @Override
+    public double getZ(@NotNull TabPlayer player) {
+        return ((Player)player.getPlayer()).getLocation().getZ();
+    }
+
+    @Override
+    @NotNull
+    public EntityData createDataWatcher(@NotNull TabPlayer viewer, byte flags, @NotNull String displayName, boolean nameVisible) {
+        DataWatcher datawatcher = new DataWatcher();
+        datawatcher.setEntityFlags(flags);
+        datawatcher.setCustomName(displayName, viewer.getVersion());
+        datawatcher.setCustomNameVisible(nameVisible);
+        datawatcher.setArmorStandFlags((byte)16);
+        return datawatcher;
+    }
+
+    @Override
+    public void runInEntityScheduler(@NotNull Object entity, @NotNull Runnable task) {
+        ((BukkitPlatform)TAB.getInstance().getPlatform()).runEntityTask((Entity) entity, task);
+    }
+
+    @Override
+    public boolean isDead(@NotNull TabPlayer player) {
+        return ((BukkitTabPlayer)player).getPlayer().isDead();
+    }
+}
@@ -1,73 +1,115 @@
 package me.neznamy.tab.platforms.bukkit.features;

+import lombok.Getter;
 import me.clip.placeholderapi.PlaceholderAPI;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import me.neznamy.tab.api.TabAPI;
-import me.neznamy.tab.api.TabConstants;
-import me.neznamy.tab.api.TabFeature;
-import me.neznamy.tab.api.TabPlayer;
+import me.neznamy.tab.shared.TabConstants;
 import me.neznamy.tab.shared.TAB;
-import me.neznamy.tab.shared.features.TabExpansion;
+import me.neznamy.tab.shared.platform.TabPlayer;
+import me.neznamy.tab.shared.placeholders.expansion.TabExpansion;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;

+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.WeakHashMap;

 /**
 * TAB's expansion for PlaceholderAPI
 */
+@Getter
 public class BukkitTabExpansion extends PlaceholderExpansion implements TabExpansion {

    /** Map holding all values for all players for easy and high-performance access */
-    private final Map<TabPlayer, Map<String, String>> values = new WeakHashMap<>();
+    @NotNull
+    private final WeakHashMap<TabPlayer, Map<String, String>> values = new WeakHashMap<>();
+
+    /** List of all placeholders offered by the plugin for command suggestions */
+    @NotNull
+    private final List<String> placeholders = Arrays.asList(
+            "%tab_tabprefix%",
+            "%tab_tabsuffix%",
+            "%tab_tagprefix%",
+            "%tab_tagsuffix%",
+            "%tab_customtabname%",
+            "%tab_customtagname%",
+            "%tab_belowname%",
+            "%tab_abovename%",
+            "%tab_tabprefix_raw%",
+            "%tab_tabsuffix_raw%",
+            "%tab_tagprefix_raw%",
+            "%tab_tagsuffix_raw%",
+            "%tab_customtabname_raw%",
+            "%tab_customtagname_raw%",
+            "%tab_belowname_raw%",
+            "%tab_abovename_raw%",
+            "%tab_scoreboard_name%",
+            "%tab_scoreboard_visible%",
+            "%tab_bossbar_visible%",
+            "%tab_nametag_preview%",
+            "%tab_nametag_visibility%",
+            "%tab_replace_<placeholder>%",
+            "%tab_placeholder_<placeholder>%"
+    );

    @Override
-    public boolean persist(){
+    public boolean persist() {
        return true;
    }

    @Override
-    public @NotNull String getAuthor(){
-        return "NEZNAMY";
+    @NotNull
+    public String getAuthor() {
+        return TabConstants.PLUGIN_AUTHOR;
    }

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

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

    @Override
-    public String onPlaceholderRequest(Player player, @NotNull String identifier){
+    @NotNull
+    public List<String> getPlaceholders() {
+        return placeholders;
+    }
+
+    @Override
+    @Nullable
+    public String onPlaceholderRequest(@Nullable Player player, @NotNull String identifier) {
        if (identifier.startsWith("replace_")) {
            String text = "%" + identifier.substring(8) + "%";
            String textBefore;
            do {
                textBefore = text;
                for (String placeholder : TAB.getInstance().getPlaceholderManager().detectPlaceholders(text)) {
-                    text = text.replace(placeholder, TabAPI.getInstance().getPlaceholderManager().findReplacement(placeholder,
+                    text = text.replace(placeholder, TAB.getInstance().getPlaceholderManager().findReplacement(placeholder,
                            PlaceholderAPI.setPlaceholders(player, placeholder)));
                }
            } while (!textBefore.equals(text));
            return text;
        }
        if (identifier.startsWith("placeholder_")) {
-            TabAPI.getInstance().getPlaceholderManager().addUsedPlaceholder("%" + identifier.substring(12) + "%", (TabFeature) TabAPI.getInstance().getPlaceholderManager());
+            TAB.getInstance().getPlaceholderManager().addUsedPlaceholder("%" + identifier.substring(12) + "%", TAB.getInstance().getPlaceholderManager());
        }
        if (player == null) return "<Player cannot be null>";
-        TabPlayer p = TabAPI.getInstance().getPlayer(player.getUniqueId());
+        TabPlayer p = TAB.getInstance().getPlayer(player.getUniqueId());
        if (p == null || !p.isLoaded()) return "<Player is not loaded>";
        return values.get(p).get(identifier);
    }

    @Override
-    public void setValue(TabPlayer player, String key, String value) {
+    public void setValue(@NotNull TabPlayer player, @NotNull String key, @NotNull String value) {
        values.computeIfAbsent(player, p -> new HashMap<>()).put(key, value);
    }
 }
@@ -5,7 +5,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;

-import me.neznamy.tab.api.TabAPI;
+import me.neznamy.tab.platforms.bukkit.BukkitUtils;
+import me.neznamy.tab.shared.features.types.Loadable;
+import me.neznamy.tab.shared.features.types.UnLoadable;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -15,42 +17,43 @@ import org.bukkit.event.player.PlayerChangedWorldEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.plugin.java.JavaPlugin;

-import me.neznamy.tab.api.TabFeature;
-import me.neznamy.tab.api.TabConstants;
+import me.neznamy.tab.shared.features.types.TabFeature;
+import me.neznamy.tab.shared.TabConstants;
 import me.neznamy.tab.shared.TAB;
+import org.jetbrains.annotations.NotNull;

 /**
 * Per-world-PlayerList feature handler
 */
@SuppressWarnings("deprecation")
-public class PerWorldPlayerList extends TabFeature implements Listener {
+public class PerWorldPlayerList extends TabFeature implements Listener, Loadable, UnLoadable {

    /** Config options */
-    private final boolean allowBypass = TabAPI.getInstance().getConfig().getBoolean("per-world-playerlist.allow-bypass-permission", false);
-    private final List<String> ignoredWorlds = TabAPI.getInstance().getConfig().getStringList("per-world-playerlist.ignore-effect-in-worlds", Arrays.asList("ignoredworld", "build"));
-    private final Map<String, List<String>> sharedWorlds = TabAPI.getInstance().getConfig().getConfigurationSection("per-world-playerlist.shared-playerlist-world-groups");
+    private final boolean allowBypass = TAB.getInstance().getConfig().getBoolean("per-world-playerlist.allow-bypass-permission", false);
+    private final List<String> ignoredWorlds = TAB.getInstance().getConfig().getStringList("per-world-playerlist.ignore-effect-in-worlds", Arrays.asList("ignored_world", "build"));
+    private final Map<String, List<String>> sharedWorlds = TAB.getInstance().getConfig().getConfigurationSection("per-world-playerlist.shared-playerlist-world-groups");

    /**
-     * Constructs new instance with given parameters and loads config options
+     * Constructs new instance and registers events
     *
     * @param   plugin
-     *          plugin instance
+     *          Plugin instance to register events
     */
    public PerWorldPlayerList(JavaPlugin plugin) {
-        super("Per world PlayerList", null);
        Bukkit.getPluginManager().registerEvents(this, plugin);
-        TabAPI.getInstance().debug(String.format("Loaded PerWorldPlayerList feature with parameters allowBypass=%s, ignoredWorlds=%s, sharedWorlds=%s", allowBypass, ignoredWorlds, sharedWorlds));
    }

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

    @Override
-    public void unload(){
-        for (Player p : Bukkit.getOnlinePlayers()) {
-            for (Player pl : Bukkit.getOnlinePlayers()) {
+    public void unload() {
+        for (Player p : BukkitUtils.getOnlinePlayers()) {
+            for (Player pl : BukkitUtils.getOnlinePlayers()) {
                p.showPlayer(pl);
            }
        }
@@ -61,14 +64,14 @@ public class PerWorldPlayerList extends TabFeature implements Listener {
    public void onJoin(PlayerJoinEvent e) {
        long time = System.nanoTime();
        checkPlayer(e.getPlayer());
-        TAB.getInstance().getCPUManager().addTime(getFeatureName(), TabConstants.CpuUsageCategory.PLAYER_JOIN, System.nanoTime()-time);
+        TAB.getInstance().getCPUManager().addTime(this, TabConstants.CpuUsageCategory.PLAYER_JOIN, System.nanoTime()-time);
    }

    @EventHandler
    public void onWorldChange(PlayerChangedWorldEvent e) {
        long time = System.nanoTime();
        checkPlayer(e.getPlayer());
-        TAB.getInstance().getCPUManager().addTime(getFeatureName(), TabConstants.CpuUsageCategory.WORLD_SWITCH, System.nanoTime()-time);
+        TAB.getInstance().getCPUManager().addTime(this, TabConstants.CpuUsageCategory.WORLD_SWITCH, System.nanoTime()-time);
    }

    /**
@@ -79,8 +82,8 @@ public class PerWorldPlayerList extends TabFeature implements Listener {
     * @param   p
     *          Player to update
     */
-    private void checkPlayer(Player p) {
-        for (Player all : Bukkit.getOnlinePlayers()){
+    private void checkPlayer(@NotNull Player p) {
+        for (Player all : BukkitUtils.getOnlinePlayers()) {
            if (all == p) continue;
            if (!shouldSee(p, all) && p.canSee(all)) p.hidePlayer(all);
            if (shouldSee(p, all) && !p.canSee(all)) p.showPlayer(all);
@@ -97,7 +100,7 @@ public class PerWorldPlayerList extends TabFeature implements Listener {
     *          Target displayed in the TabList
     * @return  {@code true} if viewer should see target, {@code false} if not.
     */
-    private boolean shouldSee(Player viewer, Player target) {
+    private boolean shouldSee(@NotNull Player viewer, @NotNull Player target) {
        if (target == viewer) return true;
        if ((allowBypass && viewer.hasPermission(TabConstants.Permission.PER_WORLD_PLAYERLIST_BYPASS)) || ignoredWorlds.contains(viewer.getWorld().getName())) return true;
        String viewerWorldGroup = viewer.getWorld().getName() + "-default"; //preventing unwanted behavior when some group is called exactly like a world
@@ -110,4 +113,10 @@ public class PerWorldPlayerList extends TabFeature implements Listener {
        }
        return viewerWorldGroup.equals(targetWorldGroup);
    }
+
+    @Override
+    @NotNull
+    public String getFeatureName() {
+        return "Per world PlayerList";
+    }
 }
@@ -1,158 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.features;
-
-import me.neznamy.tab.api.TabAPI;
-import me.neznamy.tab.api.TabFeature;
-import me.neznamy.tab.api.TabPlayer;
-import me.neznamy.tab.platforms.bukkit.nms.storage.NMSStorage;
-import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcher;
-import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcherItem;
-
-import java.util.ConcurrentModificationException;
-import java.util.List;
-import java.util.Optional;
-import java.util.WeakHashMap;
-
-/**
- * A feature to disable minecraft 1.9+ feature making tamed animals
- * with custom names copy NameTag properties of their owner.
- * This is achieved by listening to entity spawn (&lt;1.15) / entity metadata
- * packets and removing owner field from the DataWatcher list.
- * Since 1.16 this results in client sending entity use packet twice,
- * so we must cancel the 2nd one to prevent double toggle.
- */
-public class PetFix extends TabFeature {
-
-    /** NMS Storage reference for quick access */
-    private final NMSStorage nms = NMSStorage.getInstance();
-
-    /** DataWatcher position of pet owner field */
-    private final int petOwnerPosition = getPetOwnerPosition();
-
-    /** Logger of last interacts to prevent feature not working on 1.16 */
-    private final WeakHashMap<TabPlayer, Long> lastInteractFix = new WeakHashMap<>();
-
-    /**
-     * Since 1.16, client sends interact packet twice for entities affected
-     * by removed owner field. Because of that, we need to cancel the duplicated
-     * packet to avoid double toggle and preventing the entity from getting
-     * its pose changed. The duplicated packet is usually sent instantly in the
-     * same millisecond, however, when installing ProtocolLib with MyPet, the delay
-     * is up to 3 ticks. When holding right-click on an entity, interact is sent every
-     * 200 milliseconds, which is the value we should not go above. Optimal value is
-     * therefore between 150 and 200 milliseconds.
-     */
-    private static final int INTERACT_COOLDOWN = 160;
-
-    /**
-     * Constructs new instance with given parameter
-     */
-    public PetFix() {
-        super("Pet name fix", null);
-        TabAPI.getInstance().debug("Loaded PetFix feature");
-    }
-
-    /**
-     * Returns position of pet owner field based on server version
-     *
-     * @return  position of pet owner field based on server version
-     */
-    private int getPetOwnerPosition() {
-        if (nms.getMinorVersion() >= 17) {
-            //1.17.x, 1.18.x, 1.19.x
-            return 18;
-        } else if (nms.getMinorVersion() >= 15) {
-            //1.15.x, 1.16.x
-            return 17;
-        } else if (nms.getMinorVersion() >= 14) {
-            //1.14.x
-            return 16;
-        } else if (nms.getMinorVersion() >= 10) {
-            //1.10.x - 1.13.x
-            return 14;
-        } else {
-            //1.9.x
-            return 13;
-        }
-    }
-
-    /**
-     * Cancels a packet if previous one arrived with no delay to prevent double toggle since 1.16
-     *
-     * @throws  ReflectiveOperationException
-     *          if thrown by reflective operation
-     */
-    @Override
-    public boolean onPacketReceive(TabPlayer sender, Object packet) throws ReflectiveOperationException {
-        if (nms.PacketPlayInUseEntity.isInstance(packet) && isInteract(nms.PacketPlayInUseEntity_ACTION.get(packet))) {
-            if (System.currentTimeMillis() - lastInteractFix.getOrDefault(sender, 0L) < INTERACT_COOLDOWN) {
-                //last interact packet was sent right now, cancelling to prevent double-toggle due to this feature enabled
-                return true;
-            }
-            //this is the first packet, saving player so the next packet can be cancelled
-            lastInteractFix.put(sender, System.currentTimeMillis());
-        }
-        return false;
-    }
-
-    /**
-     * Checks if the provided entity use action is INTERACT or not.
-     *
-     * @param   action
-     *          Action to check
-     * @return {@code true} if action is INTERACT, {@code false} if not.
-     */
-    private boolean isInteract(Object action) {
-        if (nms.getMinorVersion() >= 17) {
-            return nms.PacketPlayInUseEntity$d.isInstance(action);
-        } else {
-            return action.toString().equals("INTERACT");
-        }
-    }
-
-    /**
-     * Removes pet owner field from DataWatcher
-     *
-     * @throws  ReflectiveOperationException
-     *          if thrown by reflective operation
-     */
-    @SuppressWarnings("unchecked")
-    @Override
-    public void onPacketSend(TabPlayer receiver, Object packet) throws ReflectiveOperationException {
-        if (nms.PacketPlayOutEntityMetadata.isInstance(packet)) {
-            Object removedEntry = null;
-            List<Object> items = (List<Object>) nms.PacketPlayOutEntityMetadata_LIST.get(packet);
-            if (items == null) return;
-            try {
-                for (Object item : items) {
-                    if (item == null) continue;
-                    int slot;
-                    Object value;
-                    if (nms.is1_19_3Plus()) {
-                        slot = nms.DataWatcher$DataValue_POSITION.getInt(item);
-                        value = nms.DataWatcher$DataValue_VALUE.get(item);
-                    } else {
-                        slot = nms.DataWatcherObject_SLOT.getInt(nms.DataWatcherItem_TYPE.get(item));
-                        value = nms.DataWatcherItem_VALUE.get(item);
-                    }
-                    if (slot == petOwnerPosition) {
-                        if (value instanceof Optional || value instanceof com.google.common.base.Optional) {
-                            removedEntry = item;
-                        }
-                    }
-                }
-            } catch (ConcurrentModificationException e) {
-                //no idea how can this list change in another thread since it's created for the packet but whatever, try again
-                onPacketSend(receiver, packet);
-            }
-            if (removedEntry != null) items.remove(removedEntry);
-        } else if (nms.PacketPlayOutSpawnEntityLiving.isInstance(packet) && nms.PacketPlayOutSpawnEntityLiving_DATAWATCHER != null) {
-            //<1.15
-            DataWatcher watcher = DataWatcher.fromNMS(nms.PacketPlayOutSpawnEntityLiving_DATAWATCHER.get(packet));
-            DataWatcherItem petOwner = watcher.getItem(petOwnerPosition);
-            if (petOwner != null && (petOwner.getValue() instanceof Optional || petOwner.getValue() instanceof com.google.common.base.Optional)) {
-                watcher.removeValue(petOwnerPosition);
-                nms.setField(packet, nms.PacketPlayOutSpawnEntityLiving_DATAWATCHER, watcher.toNMS());
-            }
-        }
-    }
-}
@@ -1,60 +1,61 @@
 package me.neznamy.tab.platforms.bukkit.features;

+import lombok.RequiredArgsConstructor;
+import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
+import me.neznamy.tab.shared.TabConstants;
+import me.neznamy.tab.shared.platform.TabPlayer;
+import me.neznamy.tab.api.bossbar.BossBar;
+import me.neznamy.tab.shared.features.types.WorldSwitchListener;
+import me.neznamy.tab.shared.TAB;
+import me.neznamy.tab.shared.backend.BackendTabPlayer;
+import me.neznamy.tab.shared.features.bossbar.BossBarManagerImpl;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.plugin.java.JavaPlugin;
-
-import me.neznamy.tab.api.TabPlayer;
-import me.neznamy.tab.api.bossbar.BossBar;
-import me.neznamy.tab.platforms.bukkit.nms.PacketPlayOutEntityTeleport;
-import me.neznamy.tab.api.TabConstants;
-import me.neznamy.tab.shared.TAB;
-import me.neznamy.tab.shared.features.bossbar.BossBarManagerImpl;
+import org.jetbrains.annotations.NotNull;

 /**
 * An additional class with additional code for &lt;1.9 servers due to an entity being required
 */
-public class WitherBossBar extends BossBarManagerImpl implements Listener {
+@RequiredArgsConstructor
+public class WitherBossBar extends BossBarManagerImpl implements Listener, WorldSwitchListener {

-    /** Distance of the Wither in blocks */
-    private static final int WITHER_DISTANCE = 60;
-    
    /**
-     * Constructs a new instance of the class and registers events and task
+     * Constructs new instance and registers events
     *
     * @param   plugin
-     *          plugin instance
+     *          Plugin instance to register events
     */
    public WitherBossBar(JavaPlugin plugin) {
        Bukkit.getPluginManager().registerEvents(this, plugin);
+    }
+
+    @Override
+    public void load() {
        //when MC is on fullscreen, BossBar disappears after 1 second of not being seen
        //when in a small window, it's about 100ms
        TAB.getInstance().getCPUManager().startRepeatingMeasuredTask(100,
-                this, TabConstants.CpuUsageCategory.TELEPORTING_WITHER, this::teleport);
-    }
-    
-    @Override
-    public void load() {
+                featureName, TabConstants.CpuUsageCategory.TELEPORTING_WITHER, this::teleport);
        super.load();
        teleport();
    }

    /**
-     * Updates Wither's location for all online players
+     * Updates Wither location for all online players
     */
    private void teleport() {
        for (TabPlayer p : TAB.getInstance().getOnlinePlayers()) {
            if (p.getVersion().getMinorVersion() > 8) continue; //sending VV packets to those
            for (BossBar line : getRegisteredBossBars().values()) {
-                if (!line.containsPlayer(p)) continue;
-                Location loc = ((Player) p.getPlayer()).getEyeLocation().add(((Player) p.getPlayer()).getEyeLocation().getDirection().normalize().multiply(WITHER_DISTANCE));
+                if (!line.getPlayers().contains(p)) continue;
+                Location eyeLocation = ((BukkitTabPlayer)p).getPlayer().getEyeLocation();
+                Location loc = eyeLocation.add(eyeLocation.getDirection().normalize().multiply(60)); // Wither distance
                if (loc.getY() < 1) loc.setY(1);
-                p.sendCustomPacket(new PacketPlayOutEntityTeleport(line.getUniqueId().hashCode(), loc), TabConstants.PacketCategory.BOSSBAR_WITHER_TELEPORT);
+                ((BackendTabPlayer)p).getEntityView().teleportEntity(line.getUniqueId().hashCode(), new me.neznamy.tab.shared.backend.Location(loc.getX(), loc.getY(), loc.getZ()));
            }
        }
    }
@@ -70,7 +71,17 @@ public class WitherBossBar extends BossBarManagerImpl implements Listener {
     */
    @EventHandler
    public void onRespawn(PlayerRespawnEvent e) {
-        TAB.getInstance().getCPUManager().runMeasuredTask(this, TabConstants.CpuUsageCategory.PLAYER_RESPAWN,
-                () -> detectBossBarsAndSend(TAB.getInstance().getPlayer(e.getPlayer().getUniqueId())));
+        TabPlayer player = TAB.getInstance().getPlayer(e.getPlayer().getUniqueId());
+        if (player == null) return;
+        TAB.getInstance().getCPUManager().runMeasuredTask(featureName, TabConstants.CpuUsageCategory.PLAYER_RESPAWN,
+                () -> detectBossBarsAndSend(player));
+    }
+
+    @Override
+    public void onWorldChange(@NotNull TabPlayer p, @NotNull String from, @NotNull String to) {
+        for (BossBar line : lineValues) {
+            line.removePlayer(p);
+        }
+        detectBossBarsAndSend(p);
    }
 }
@@ -1,370 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.features.unlimitedtags;
-
-import me.neznamy.tab.api.*;
-import me.neznamy.tab.api.chat.EnumChatFormat;
-import me.neznamy.tab.api.chat.IChatBaseComponent;
-import me.neznamy.tab.api.protocol.TabPacket;
-import me.neznamy.tab.platforms.bukkit.nms.PacketPlayOutEntityDestroy;
-import me.neznamy.tab.platforms.bukkit.nms.PacketPlayOutEntityMetadata;
-import me.neznamy.tab.platforms.bukkit.nms.PacketPlayOutEntityTeleport;
-import me.neznamy.tab.platforms.bukkit.nms.PacketPlayOutSpawnEntityLiving;
-import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcher;
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Pose;
-
-import java.util.UUID;
-
-/**
- * A class representing an armor stand attached to a player
- */
-public class BukkitArmorStand implements ArmorStand {
-
-    /** Entity id counter to pick unique entity ID for each armor stand */
-    private static int idCounter = 2000000000;
-
-    /** NameTag feature */
-    private final BukkitNameTagX manager = (BukkitNameTagX) TabAPI.getInstance().getFeatureManager().getFeature(TabConstants.Feature.UNLIMITED_NAME_TAGS);
-
-    /** Armor stand manager which this armor stand belongs to */
-    private final BukkitArmorStandManager asm;
-    
-    /** Owner of the armor stand */
-    private final TabPlayer owner;
-
-    /** Owner as a Bukkit player */
-    private final Player player;
-
-    /** Offset in blocks, 0 for original height */
-    private double yOffset;
-
-    /** If offset is static, or dynamic based on other armor stands */
-    private final boolean staticOffset;
-
-    /** Entity ID of this armor stand */
-    private final int entityId = idCounter++;
-
-    /** Unique ID of this armor stand */
-    private final UUID uuid = UUID.randomUUID();
-
-    /** Sneaking flag of armor stands */
-    private boolean sneaking;
-
-    /** Armor stand visibility */
-    private boolean visible;
-
-    /** Refresh property dedicated to this armor stand */
-    private final Property property;
-
-    /** Entity destroy packet */
-    private final PacketPlayOutEntityDestroy destroyPacket = new PacketPlayOutEntityDestroy(entityId);
-
-    /**
-     * Constructs new instance with given parameters.
-     *
-     * @param   asm
-     *          Armor stand manager which this armor stand belongs to
-     * @param   owner
-     *          Owner of the armor stand
-     * @param   propertyName
-     *          Name of refresh property to use
-     * @param   yOffset
-     *          Offset in blocks
-     * @param   staticOffset
-     *          {@code true} if offset is static, {@code false} if not
-     */
-    public BukkitArmorStand(BukkitArmorStandManager asm, TabPlayer owner, String propertyName, double yOffset, boolean staticOffset) {
-        this.asm = asm;
-        this.owner = owner;
-        this.staticOffset = staticOffset;
-        player = (Player) owner.getPlayer();
-        this.yOffset = yOffset;
-        this.property = owner.getProperty(propertyName);
-        visible = getVisibility();
-        sneaking = player.isSneaking();
-    }
-
-    @Override
-    public void refresh() {
-        visible = getVisibility();
-        updateMetadata();
-    }
-
-    @Override
-    public Property getProperty() {
-        return property;
-    }
-
-    @Override
-    public boolean hasStaticOffset() {
-        return staticOffset;
-    }
-
-    @Override
-    public double getOffset() {
-        return yOffset;
-    }
-
-    @Override
-    public void setOffset(double offset) {
-        if (yOffset == offset) return;
-        yOffset = offset;
-        for (TabPlayer all : asm.getNearbyPlayers()) {
-            all.sendCustomPacket(getTeleportPacket(all), TabConstants.PacketCategory.UNLIMITED_NAMETAGS_OFFSET_CHANGE);
-        }
-    }
-
-    @Override
-    public void spawn(TabPlayer viewer) {
-        for (TabPacket packet : getSpawnPackets(viewer)) {
-            viewer.sendCustomPacket(packet, TabConstants.PacketCategory.UNLIMITED_NAMETAGS_SPAWN);
-        }
-    }
-
-    @Override
-    public void destroy() {
-        for (TabPlayer all : asm.getNearbyPlayers()) all.sendCustomPacket(destroyPacket, TabConstants.PacketCategory.UNLIMITED_NAMETAGS_DESPAWN);
-    }
-    
-    @Override
-    public void destroy(TabPlayer viewer) {
-        viewer.sendCustomPacket(destroyPacket, TabConstants.PacketCategory.UNLIMITED_NAMETAGS_DESPAWN);
-    }
-
-    @Override
-    public void teleport() {
-        for (TabPlayer all : asm.getNearbyPlayers()) {
-            all.sendCustomPacket(getTeleportPacket(all), TabConstants.PacketCategory.UNLIMITED_NAMETAGS_TELEPORT);
-        }
-    }
-
-    @Override
-    public void teleport(TabPlayer viewer) {
-        if (!asm.isNearby(viewer) && viewer != owner) {
-            asm.spawn(viewer);
-        } else {
-            viewer.sendCustomPacket(getTeleportPacket(viewer), TabConstants.PacketCategory.UNLIMITED_NAMETAGS_TELEPORT);
-        }
-    }
-
-    @Override
-    public void sneak(boolean sneaking) {
-        if (this.sneaking == sneaking) return; //idk
-        this.sneaking = sneaking;
-        for (TabPlayer viewer : asm.getNearbyPlayers()) {
-            if (viewer.getVersion().getMinorVersion() == 14 && !manager.isArmorStandsAlwaysVisible()) {
-                //1.14.x client sided bug, de-spawning completely
-                if (sneaking) {
-                    viewer.sendCustomPacket(destroyPacket, TabConstants.PacketCategory.UNLIMITED_NAMETAGS_SNEAK);
-                } else {
-                    spawn(viewer);
-                }
-            } else {
-                //respawning so there's no animation and it's instant
-                respawn(viewer);
-            }
-        }
-    }
-
-    @Override
-    public void updateVisibility(boolean force) {
-        boolean visibility = getVisibility();
-        if (visible != visibility || force) {
-            refresh();
-        }
-    }
-
-    @Override
-    public int getEntityId() {
-        return entityId;
-    }
-
-    /**
-     * Returns teleport packet for specified viewer
-     *
-     * @param   viewer
-     *          player to get location for
-     * @return  teleport packet
-     */
-    public PacketPlayOutEntityTeleport getTeleportPacket(TabPlayer viewer) {
-        return new PacketPlayOutEntityTeleport(entityId, getArmorStandLocationFor(viewer));
-    }
-
-    /**
-     * Updates armor stand's metadata
-     */
-    public void updateMetadata() {
-        for (TabPlayer viewer : asm.getNearbyPlayers()) {
-            viewer.sendCustomPacket(new PacketPlayOutEntityMetadata(entityId, createDataWatcher(property.getFormat(viewer), viewer)), TabConstants.PacketCategory.UNLIMITED_NAMETAGS_METADATA);
-        }
-    }
-
-    /**
-     * Returns general visibility rule for everyone with limited info
-     *
-     * @return  {@code true} if armor stand should be visible, {@code false} if not
-     */
-    public boolean getVisibility() {
-        if (manager.isArmorStandsAlwaysVisible()) return true;
-        if (owner.isDisguised() || manager.getVehicleManager().isOnBoat(owner)) return false;
-        return !owner.hasInvisibilityPotion() && owner.getGamemode() != 3 && !manager.hasHiddenNametag(owner) && property.get().length() > 0;
-    }
-
-    /**
-     * Returns location where armor stand should be at time of calling.
-     * This takes into account everything that affects height, including
-     * viewer's game version.
-     *
-     * @param   viewer
-     *          Player looking at the armor stand
-     * @return  Location where armor stand should be for specified viewer
-     */
-    public Location getLocation(TabPlayer viewer) {
-        double x = player.getLocation().getX();
-        double y = getY() + yOffset;
-        double z = player.getLocation().getZ();
-        if (!player.isSleeping()) {
-            if (sneaking) {
-                if (viewer.getVersion().getMinorVersion() >= 15) {
-                    y += 1.37;
-                } else if (viewer.getVersion().getMinorVersion() >= 9) {
-                    y += 1.52;
-                } else {
-                    y += 1.7;
-                }
-            } else {
-                y += viewer.getVersion().getMinorVersion() >= 9 ? 1.8 : 1.84; // Normal
-            }
-        } else {
-            y += viewer.getVersion().getMinorVersion() >= 9 ? 0.2 : 0.26; // Sleeping
-        }
-        return new Location(null,x,y,z);
-    }
-
-    /**
-     * Returns Y where player is based on player's vehicle due to bukkit API bug
-     *
-     * @return  correct player's Y
-     */
-    protected double getY() {
-        //1.14+ server sided bug
-        Entity vehicle = player.getVehicle();
-        if (vehicle != null) {
-            if (vehicle.getType().toString().contains("HORSE")) { //covering all 3 horse types
-                return vehicle.getLocation().getY() + 0.85;
-            }
-            if (vehicle.getType().toString().equals("DONKEY")) { //1.11+
-                return vehicle.getLocation().getY() + 0.525;
-            }
-            if (vehicle.getType() == EntityType.PIG) {
-                return vehicle.getLocation().getY() + 0.325;
-            }
-            if (vehicle.getType().toString().equals("STRIDER")) { //1.16+
-                return vehicle.getLocation().getY() + 1.15;
-            }
-        }
-        //1.13+ swimming or 1.9+ flying with elytra
-        if (isSwimming() || (TabAPI.getInstance().getServerVersion().getMinorVersion() >= 9 && player.isGliding())) {
-            return player.getLocation().getY()-1.22;
-        }
-        return player.getLocation().getY();
-    }
-
-    /**
-     * Returns {@code true} if owner is swimming, {@code false} if not
-     * @return  {@code true} if owner is swimming, {@code false} if not
-     */
-    private boolean isSwimming() {
-        if (TabAPI.getInstance().getServerVersion().getMinorVersion() >= 14 && player.getPose() == Pose.SWIMMING) return true;
-        return TabAPI.getInstance().getServerVersion().getMinorVersion() == 13 && player.isSwimming();
-    }
-
-    /**
-     * Creates data watcher with specified display name for viewer
-     *
-     * @param   displayName
-     *          armor stand name
-     * @param   viewer
-     *          player to apply checks against
-     * @return  DataWatcher for viewer
-     */
-    public DataWatcher createDataWatcher(String displayName, TabPlayer viewer) {
-        DataWatcher datawatcher = new DataWatcher();
-
-        byte flag = 32; //invisible
-        if (sneaking) flag += (byte)2;
-        datawatcher.helper().setEntityFlags(flag);
-        datawatcher.helper().setCustomName(displayName, viewer.getVersion());
-
-        boolean visibility;
-        if (isNameVisiblyEmpty(displayName) || !((Player) viewer.getPlayer()).canSee(player) ||
-                manager.hasHiddenNametag(owner, viewer) || manager.hasHiddenNameTagVisibilityView(viewer)) {
-            visibility = false;
-        } else {
-            visibility = visible;
-        }
-        datawatcher.helper().setCustomNameVisible(visibility);
-
-        if (viewer.getVersion().getMinorVersion() > 8 || manager.isMarkerFor18x()) datawatcher.helper().setArmorStandFlags((byte)16);
-        return datawatcher;
-    }
-
-    /**
-     * Returns {@code true} if display name is in fact empty,
-     * for example only containing color codes, {@code false} if not.
-     *
-     * @param   displayName
-     *          string to check
-     * @return  {@code true} if it's empty, {@code false} if not
-     */
-    private boolean isNameVisiblyEmpty(String displayName) {
-        if (displayName.length() == 0) return true;
-        if (!displayName.startsWith(EnumChatFormat.COLOR_STRING) && !displayName.startsWith("&") && !displayName.startsWith("#")) return false;
-        String text = IChatBaseComponent.fromColoredText(displayName).toRawText();
-        if (text.contains(" ")) text = text.replace(" ", "");
-        return text.length() == 0;
-    }
-
-    /**
-     * Returns list of packets to send to make armor stand spawn with metadata
-     *
-     * @param   viewer
-     *          viewer to apply relational placeholders for
-     * @return  List of packets that spawn the armor stand
-     */
-    public TabPacket[] getSpawnPackets(TabPlayer viewer) {
-        visible = getVisibility();
-        DataWatcher dataWatcher = createDataWatcher(property.getFormat(viewer), viewer);
-        if (TabAPI.getInstance().getServerVersion().getMinorVersion() >= 15) {
-            return new TabPacket[] {
-                    new PacketPlayOutSpawnEntityLiving(entityId, uuid, EntityType.ARMOR_STAND, getArmorStandLocationFor(viewer), null),
-                    new PacketPlayOutEntityMetadata(entityId, dataWatcher)
-            };
-        } else {
-            return new TabPacket[] {
-                    new PacketPlayOutSpawnEntityLiving(entityId, uuid, EntityType.ARMOR_STAND, getArmorStandLocationFor(viewer), dataWatcher),
-            };
-        }
-    }
-
-    /**
-     * Returns location where armor stand should be for specified viewer
-     *
-     * @param   viewer
-     *          player to get location for
-     * @return  location of armor stand
-     */
-    public Location getArmorStandLocationFor(TabPlayer viewer) {
-        return viewer.getVersion().getMinorVersion() == 8 && !manager.isMarkerFor18x() ? getLocation(viewer).add(0,-2,0) : getLocation(viewer);
-    }
-
-    @Override
-    public void respawn(TabPlayer viewer) {
-        viewer.sendCustomPacket(destroyPacket, TabConstants.PacketCategory.UNLIMITED_NAMETAGS_DESPAWN);
-        // 1.8.0 will not see entity that respawned in the same tick
-        // creating new delayed task every time someone sneaks can be abused and cause OOM
-        spawn(viewer);
-    }
-}
@@ -1,188 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.features.unlimitedtags;
-
-import me.neznamy.tab.api.TabAPI;
-import me.neznamy.tab.api.TabConstants;
-import me.neznamy.tab.api.TabPlayer;
-import me.neznamy.tab.shared.features.nametags.unlimited.NameTagX;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
-import org.bukkit.event.HandlerList;
-import org.bukkit.plugin.java.JavaPlugin;
-
-/**
- * The core class for unlimited NameTag mode on Bukkit
- */
-public class BukkitNameTagX extends NameTagX {
-
-    /** Bukkit event listener */
-    private final EventListener eventListener = new EventListener(this);
-
-    /** Vehicle manager reference */
-    private final VehicleRefresher vehicleManager = new VehicleRefresher(this);
-
-    /**
-     * Constructs new instance with given parameter, loads config options, registers events
-     * and registers sub-features.
-     *
-     * @param   plugin
-     *          plugin instance
-     */
-    public BukkitNameTagX(JavaPlugin plugin) {
-        super(BukkitArmorStandManager::new);
-        Bukkit.getPluginManager().registerEvents(eventListener, plugin);
-        TabAPI.getInstance().getFeatureManager().registerFeature(TabConstants.Feature.UNLIMITED_NAME_TAGS_PACKET_LISTENER, new PacketListener(this));
-        TabAPI.getInstance().getFeatureManager().registerFeature(TabConstants.Feature.UNLIMITED_NAME_TAGS_VEHICLE_REFRESHER, vehicleManager);
-    }
-
-    @Override
-    public void load() {
-        super.load();
-        for (TabPlayer all : TabAPI.getInstance().getOnlinePlayers()) {
-            if (isPlayerDisabled(all)) continue;
-            for (TabPlayer viewer : TabAPI.getInstance().getOnlinePlayers()) {
-                spawnArmorStands(viewer, all);
-            }
-        }
-        startVisibilityRefreshTask();
-    }
-
-    /**
-     * Starts task checking for player visibility to hide armor stands of invisible players.
-     */
-    private void startVisibilityRefreshTask() {
-        TabAPI.getInstance().getThreadManager().startRepeatingMeasuredTask(500, this, TabConstants.CpuUsageCategory.REFRESHING_NAME_TAG_VISIBILITY, () -> {
-
-            for (TabPlayer p : TabAPI.getInstance().getOnlinePlayers()) {
-                if (isPlayerDisabled(p)) continue;
-                getArmorStandManager(p).updateVisibility(false);
-            }
-        });
-    }
-
-    @Override
-    public void unload() {
-        super.unload();
-        HandlerList.unregisterAll(eventListener);
-    }
-
-    @Override
-    public void onJoin(TabPlayer connectedPlayer) {
-        super.onJoin(connectedPlayer);
-        if (isPlayerDisabled(connectedPlayer)) return;
-        for (TabPlayer viewer : TabAPI.getInstance().getOnlinePlayers()) {
-            spawnArmorStands(viewer, connectedPlayer);
-            spawnArmorStands(connectedPlayer, viewer);
-        }
-    }
-
-    @Override
-    public boolean isOnBoat(TabPlayer player) {
-        return vehicleManager != null && vehicleManager.isOnBoat(player);
-    }
-
-    /**
-     * Spawns armor stands of target player to viewer if all requirements are met.
-     * These include players being in the same world, distance being less than 48 blocks
-     * and target player being visible to viewer.
-     *
-     * @param   viewer
-     *          Player viewing armor stands
-     * @param   target
-     *          Target player with armor stands
-     */
-    private void spawnArmorStands(TabPlayer viewer, TabPlayer target) {
-        if (viewer.getVersion().getMinorVersion() < 8) return;
-        if (target == viewer || isPlayerDisabled(target)) return;
-        if (((Player) viewer.getPlayer()).getWorld() != ((Player) target.getPlayer()).getWorld()) return;
-        if (getDistance(viewer, target) <= 48 && ((Player)viewer.getPlayer()).canSee((Player)target.getPlayer()) && !target.isVanished())
-            getArmorStandManager(target).spawn(viewer);
-    }
-
-    @Override
-    public void setNameTagPreview(TabPlayer player, boolean status) {
-        if (status) {
-            getArmorStandManager(player).spawn(player);
-        } else {
-            getArmorStandManager(player).destroy(player);
-        }
-    }
-
-    @Override
-    public void resumeArmorStands(TabPlayer player) {
-        if (isPlayerDisabled(player)) return;
-        for (TabPlayer viewer : TabAPI.getInstance().getOnlinePlayers()) {
-            spawnArmorStands(viewer, player);
-        }
-    }
-
-    @Override
-    public void pauseArmorStands(TabPlayer player) {
-        getArmorStandManager(player).destroy();
-    }
-
-    @Override
-    public void updateNameTagVisibilityView(TabPlayer player) {
-        for (TabPlayer all : TabAPI.getInstance().getOnlinePlayers()) {
-            getArmorStandManager(all).updateVisibility(true);
-        }
-    }
-
-    @Override
-    public void onQuit(TabPlayer disconnectedPlayer) {
-        super.onQuit(disconnectedPlayer);
-        for (TabPlayer all : TabAPI.getInstance().getOnlinePlayers()) {
-            getArmorStandManager(all).unregisterPlayer(disconnectedPlayer);
-        }
-        armorStandManagerMap.get(disconnectedPlayer).destroy();
-        armorStandManagerMap.remove(disconnectedPlayer); // WeakHashMap doesn't clear this due to value referencing the key
-    }
-
-    @Override
-    public void onWorldChange(TabPlayer p, String from, String to) {
-        super.onWorldChange(p, from, to);
-        if (isUnlimitedDisabled(p.getServer(), to)) {
-            getDisabledUnlimitedPlayers().add(p);
-            updateTeamData(p);
-        } else if (getDisabledUnlimitedPlayers().remove(p)) {
-            updateTeamData(p);
-        }
-        if (isPreviewingNametag(p)) {
-            getArmorStandManager(p).spawn(p);
-        }
-        //for some reason this is needed for some users
-        for (TabPlayer viewer : TabAPI.getInstance().getOnlinePlayers()) {
-            if (viewer.getWorld().equals(from)) {
-                getArmorStandManager(p).destroy(viewer);
-            }
-        }
-    }
-
-    /**
-     * Returns flat distance between two players ignoring Y value
-     *
-     * @param   player1
-     *          first player
-     * @param   player2
-     *          second player
-     * @return  flat distance in blocks
-     */
-    private double getDistance(TabPlayer player1, TabPlayer player2) {
-        Location loc1 = ((Player) player1.getPlayer()).getLocation();
-        Location loc2 = ((Player) player2.getPlayer()).getLocation();
-        return Math.sqrt(Math.pow(loc1.getX()-loc2.getX(), 2) + Math.pow(loc1.getZ()-loc2.getZ(), 2));
-    }
-
-    @Override
-    public BukkitArmorStandManager getArmorStandManager(TabPlayer player) {
-        return (BukkitArmorStandManager) armorStandManagerMap.get(player);
-    }
-
-    /**
-     * Returns {@link #vehicleManager}
-     * @return  {@link #vehicleManager}
-     */
-    public VehicleRefresher getVehicleManager() {
-        return vehicleManager;
-    }
-}
@@ -1,58 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.features.unlimitedtags;
-
-import me.neznamy.tab.api.TabAPI;
-import me.neznamy.tab.api.TabConstants;
-import me.neznamy.tab.api.TabPlayer;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerRespawnEvent;
-import org.bukkit.event.player.PlayerToggleSneakEvent;
-
-/**
- * Class listening to Bukkit events which the feature requires and are
- * sufficient, without packets being requires.
- */
-public class EventListener implements Listener {
-
-    /** Reference to the main feature */
-    private final BukkitNameTagX feature;
-
-    /**
-     * Constructs new instance with given parameter
-     *
-     * @param   feature
-     *          NameTag feature handler
-     */
-    public EventListener(BukkitNameTagX feature) {
-        this.feature = feature;
-    }
-
-    /**
-     * Sneak event listener to de-spawn and spawn armor stands to skip animation
-     *
-     * @param   e
-     *          sneak event
-     */
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onSneak(PlayerToggleSneakEvent e) {
-        TabPlayer p = TabAPI.getInstance().getPlayer(e.getPlayer().getUniqueId());
-        if (p == null || feature.isPlayerDisabled(p)) return;
-        TabAPI.getInstance().getThreadManager().runMeasuredTask(feature, TabConstants.CpuUsageCategory.PLAYER_SNEAK, () -> feature.getArmorStandManager(p).sneak(e.isSneaking()));
-    }
-
-    /**
-     * Respawning armor stands as respawn screen destroys all entities in client
-     *
-     * @param   e
-     *          respawn event
-     */
-    @EventHandler
-    public void onRespawn(PlayerRespawnEvent e) {
-        TabAPI.getInstance().getThreadManager().runMeasuredTask(feature, TabConstants.CpuUsageCategory.PLAYER_RESPAWN, () -> {
-            TabPlayer respawned = TabAPI.getInstance().getPlayer(e.getPlayer().getUniqueId());
-            if (feature.isPlayerDisabled(respawned)) return;
-            feature.getArmorStandManager(respawned).teleport();
-        });
-    }
-}
@@ -1,200 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.features.unlimitedtags;
-
-import me.neznamy.tab.api.TabAPI;
-import me.neznamy.tab.api.TabConstants;
-import me.neznamy.tab.api.TabFeature;
-import me.neznamy.tab.api.TabPlayer;
-import me.neznamy.tab.platforms.bukkit.nms.storage.NMSStorage;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * The packet listening part for securing proper functionality of armor stands.
- * Bukkit events are too unreliable and delayed/ahead which causes de-sync
- * if trying to listen to move event.
- * For entering/leaving tracking range there are no events and
- * periodic / move-triggered distance checks would cause high CPU usage.
- */
-public class PacketListener extends TabFeature {
-
-    /** Reference to the main feature */
-    private final BukkitNameTagX nameTagX;
-
-    /** A player map by entity id, used for better performance */
-    private final Map<Integer, TabPlayer> entityIdMap = new ConcurrentHashMap<>();
-    
-    /** Reference to NMS storage for quick access */
-    private final NMSStorage nms = NMSStorage.getInstance();
-
-    /**
-     * Constructs new instance with given parameter
-     *
-     * @param   nameTagX
-     *          main feature
-     */
-    public PacketListener(BukkitNameTagX nameTagX) {
-        super(nameTagX.getFeatureName(), null);
-        this.nameTagX = nameTagX;
-    }
-
-    @Override
-    public void load() {
-        for (TabPlayer all : TabAPI.getInstance().getOnlinePlayers()) {
-            entityIdMap.put(((Player) all.getPlayer()).getEntityId(), all);
-        }
-    }
-
-    @Override
-    public void onJoin(TabPlayer connectedPlayer) {
-        entityIdMap.put(((Player) connectedPlayer.getPlayer()).getEntityId(), connectedPlayer);
-    }
-
-    @Override
-    public void onQuit(TabPlayer disconnectedPlayer) {
-        entityIdMap.remove(((Player) disconnectedPlayer.getPlayer()).getEntityId());
-    }
-
-    @Override
-    public boolean onPacketReceive(TabPlayer sender, Object packet) throws ReflectiveOperationException {
-        if (sender.getVersion().getMinorVersion() == 8 && nms.PacketPlayInUseEntity.isInstance(packet)) {
-            int entityId = nms.PacketPlayInUseEntity_ENTITY.getInt(packet);
-            TabPlayer attacked = null;
-            for (TabPlayer all : TabAPI.getInstance().getOnlinePlayers()) {
-                if (all.isLoaded() && nameTagX.getArmorStandManager(all).hasArmorStandWithID(entityId)) {
-                    attacked = all;
-                    break;
-                }
-            }
-            if (attacked != null && attacked != sender) {
-                nms.setField(packet, nms.PacketPlayInUseEntity_ENTITY, ((Player) attacked.getPlayer()).getEntityId());
-            }
-        }
-        return false;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public void onPacketSend(TabPlayer receiver, Object packet) throws ReflectiveOperationException {
-        if (receiver.getVersion().getMinorVersion() < 8) return;
-        if (!receiver.isLoaded() || nameTagX.isDisabledPlayer(receiver) || nameTagX.getDisabledUnlimitedPlayers().contains(receiver)) return;
-        if (nms.PacketPlayOutEntity.isInstance(packet) && !nms.PacketPlayOutEntityLook.isInstance(packet)) { //ignoring head rotation only packets
-            onEntityMove(receiver, nms.PacketPlayOutEntity_ENTITYID.getInt(packet));
-        } else if (nms.PacketPlayOutEntityTeleport.isInstance(packet)) {
-            onEntityMove(receiver, nms.PacketPlayOutEntityTeleport_ENTITYID.getInt(packet));
-        } else if (nms.PacketPlayOutNamedEntitySpawn.isInstance(packet)) {
-            onEntitySpawn(receiver, nms.PacketPlayOutNamedEntitySpawn_ENTITYID.getInt(packet));
-        } else if (nms.PacketPlayOutEntityDestroy.isInstance(packet)) {
-            if (nms.getMinorVersion() >= 17) {
-                Object entities = nms.PacketPlayOutEntityDestroy_ENTITIES.get(packet);
-                if (entities instanceof List) {
-                    onEntityDestroy(receiver, (List<Integer>) entities);
-                } else {
-                    //1.17.0
-                    onEntityDestroy(receiver, (int) entities);
-                }
-            } else {
-                onEntityDestroy(receiver, (int[]) nms.PacketPlayOutEntityDestroy_ENTITIES.get(packet));
-            }
-        }
-    }
-
-    /**
-     * Processes entity move packet. If entity ID belongs to a player,
-     * armor stands of that player are teleported to player who received the packet.
-     * If it belongs to a vehicle carrying a player, that player's armor stands are
-     * teleported as well.
-     *
-     * @param   receiver
-     *          packet receiver
-     * @param   entityId
-     *          entity that moved
-     */
-    private void onEntityMove(TabPlayer receiver, int entityId) {
-        TabPlayer pl = entityIdMap.get(entityId);
-        List<Entity> vehicleList;
-        if (pl != null) {
-            //player moved
-            if (nameTagX.isPlayerDisabled(pl) || !pl.isLoaded()) return;
-            TabAPI.getInstance().getThreadManager().runMeasuredTask(nameTagX, TabConstants.CpuUsageCategory.PACKET_ENTITY_MOVE,
-                    () -> nameTagX.getArmorStandManager(pl).teleport(receiver));
-        } else if ((vehicleList = nameTagX.getVehicleManager().getVehicles().get(entityId)) != null){
-            //a vehicle carrying something moved
-            for (Entity entity : vehicleList) {
-                TabPlayer passenger = entityIdMap.get(entity.getEntityId());
-                if (passenger != null && nameTagX.getArmorStandManager(passenger) != null) {
-                    TabAPI.getInstance().getThreadManager().runMeasuredTask(nameTagX, TabConstants.CpuUsageCategory.PACKET_ENTITY_MOVE_PASSENGER,
-                            () -> nameTagX.getArmorStandManager(passenger).teleport(receiver));
-                }
-            }
-        }
-    }
-
-    /**
-     * Processes named entity spawn packet and spawns armor stands if
-     * entity ID belongs to an online player.
-     *
-     * @param   receiver
-     *          packet receiver
-     * @param   entityId
-     *          spawned entity
-     */
-    private void onEntitySpawn(TabPlayer receiver, int entityId) {
-        TabPlayer spawnedPlayer = entityIdMap.get(entityId);
-        if (spawnedPlayer != null && spawnedPlayer.isLoaded() && !nameTagX.isPlayerDisabled(spawnedPlayer)) {
-            TabAPI.getInstance().getThreadManager().runMeasuredTask(nameTagX, TabConstants.CpuUsageCategory.PACKET_ENTITY_SPAWN,
-                    () -> nameTagX.getArmorStandManager(spawnedPlayer).spawn(receiver));
-        }
-    }
-
-    /**
-     * Processes entity destroy packet and destroys armor stands if
-     * entity ID belongs to an online player.
-     *
-     * @param   receiver
-     *          packet receiver
-     * @param   entities
-     *          de-spawned entities
-     */
-    private void onEntityDestroy(TabPlayer receiver, List<Integer> entities) {
-        for (int entity : entities) {
-            onEntityDestroy(receiver, entity);
-        }
-    }
-
-    /**
-     * Processes entity destroy packet and destroys armor stands if
-     * entity ID belongs to an online player.
-     *
-     * @param   receiver
-     *          packet receiver
-     * @param   entities
-     *          de-spawned entities
-     */
-    private void onEntityDestroy(TabPlayer receiver, int... entities) {
-        for (int entity : entities) {
-            onEntityDestroy(receiver, entity);
-        }
-    }
-
-    /**
-     * Processes entity destroy packet and destroys armor stands if
-     * entity ID belongs to an online player.
-     *
-     * @param   receiver
-     *          packet receiver
-     * @param   entity
-     *          de-spawned entity
-     */
-    private void onEntityDestroy(TabPlayer receiver, int entity) {
-        TabPlayer deSpawnedPlayer = entityIdMap.get(entity);
-        if (deSpawnedPlayer != null && deSpawnedPlayer.isLoaded() && !nameTagX.isPlayerDisabled(deSpawnedPlayer)) {
-            BukkitArmorStandManager asm = nameTagX.getArmorStandManager(deSpawnedPlayer);
-            TabAPI.getInstance().getThreadManager().runMeasuredTask(nameTagX, TabConstants.CpuUsageCategory.PACKET_ENTITY_DESTROY,
-                    () -> asm.destroy(receiver));
-        }
-    }
-}
@@ -1,154 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.features.unlimitedtags;
-
-import me.neznamy.tab.api.TabAPI;
-import me.neznamy.tab.api.TabConstants;
-import me.neznamy.tab.api.TabFeature;
-import me.neznamy.tab.api.TabPlayer;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * Sub-feature for unlimited name tag mode to secure
- * proper functionality when using vehicles.
- * A config option allows to disable the feature on boats,
- * where it would cause a massive de-sync due to boat movement
- * animation.
- * Additionally, when entering a vehicle, no move packet is sent
- * and therefore manual teleporting of armor stands is required.
- */
-public class VehicleRefresher extends TabFeature {
-
-    /** Map of players currently in a vehicle */
-    private final WeakHashMap<TabPlayer, Entity> playersInVehicle = new WeakHashMap<>();
-    
-    /** Map of vehicles carrying players */
-    private final Map<Integer, List<Entity>> vehicles = new ConcurrentHashMap<>();
-    
-    /** set of players currently on boats */
-    private final Set<TabPlayer> playersOnBoats = Collections.newSetFromMap(new WeakHashMap<>());
-
-    /** Reference to the main feature */
-    private final BukkitNameTagX feature;
-
-    /**
-     * Constructs new instance with given parameter and starts tasks.
-     *
-     * @param   feature
-     *          Main feature
-     */
-    public VehicleRefresher(BukkitNameTagX feature) {
-        super(feature.getFeatureName(), "Refreshing vehicles");
-        this.feature = feature;
-        TabAPI.getInstance().getThreadManager().startRepeatingMeasuredTask(50,
-                this, TabConstants.CpuUsageCategory.PROCESSING_PLAYER_MOVEMENT, () -> {
-                    for (TabPlayer inVehicle : playersInVehicle.keySet()) {
-                        if (!inVehicle.isOnline() || feature.getArmorStandManager(inVehicle) == null) continue; // not removed from WeakHashMap yet
-                        feature.getArmorStandManager(inVehicle).teleport();
-                    }
-                    for (TabPlayer p : TabAPI.getInstance().getOnlinePlayers()) {
-                        if (feature.isPreviewingNametag(p)) {
-                            feature.getArmorStandManager(p).teleport(p);
-                        }
-                    }
-        });
-        addUsedPlaceholders(Collections.singletonList(TabConstants.Placeholder.VEHICLE));
-        TabAPI.getInstance().getPlaceholderManager().registerPlayerPlaceholder(TabConstants.Placeholder.VEHICLE, 100, p -> ((Player)p.getPlayer()).getVehicle() == null ? "" : ((Player)p.getPlayer()).getVehicle());
-    }
-
-    @Override
-    public void load() {
-        for (TabPlayer p : TabAPI.getInstance().getOnlinePlayers()) {
-            Entity vehicle = ((Player)p.getPlayer()).getVehicle();
-            if (vehicle != null) {
-                vehicles.put(vehicle.getEntityId(), getPassengers(vehicle));
-                playersInVehicle.put(p, vehicle);
-                if (feature.isDisableOnBoats() && vehicle.getType().toString().contains("BOAT")) {
-                    playersOnBoats.add(p);
-                }
-            }
-        }
-    }
-
-    @Override
-    public void onJoin(TabPlayer connectedPlayer) {
-        Entity vehicle = ((Entity) connectedPlayer.getPlayer()).getVehicle();
-        if (vehicle != null) vehicles.put(vehicle.getEntityId(), getPassengers(vehicle));
-    }
-
-    @Override
-    public void onQuit(TabPlayer disconnectedPlayer) {
-        if (playersInVehicle.containsKey(disconnectedPlayer)) vehicles.remove(playersInVehicle.get(disconnectedPlayer).getEntityId());
-        for (List<Entity> entities : vehicles.values()) {
-            entities.remove((Player) disconnectedPlayer.getPlayer());
-        }
-    }
-
-    @Override
-    public void refresh(TabPlayer p, boolean force) {
-        if (feature.isPlayerDisabled(p)) return;
-        Entity vehicle = ((Player)p.getPlayer()).getVehicle();
-        if (playersInVehicle.containsKey(p) && vehicle == null) {
-            //vehicle exit
-            vehicles.remove(playersInVehicle.get(p).getEntityId());
-            feature.getArmorStandManager(p).teleport();
-            playersInVehicle.remove(p);
-            if (feature.isDisableOnBoats() && playersOnBoats.contains(p)) {
-                playersOnBoats.remove(p);
-                feature.updateTeamData(p);
-            }
-        }
-        if (!playersInVehicle.containsKey(p) && vehicle != null) {
-            //vehicle enter
-            vehicles.put(vehicle.getEntityId(), getPassengers(vehicle));
-            feature.getArmorStandManager(p).respawn(); //making teleport instant instead of showing teleport animation
-            playersInVehicle.put(p, vehicle);
-            if (feature.isDisableOnBoats() && vehicle.getType().toString().contains("BOAT")) {
-                playersOnBoats.add(p);
-                feature.updateTeamData(p);
-            }
-        }
-    }
-
-    /**
-     * Returns {@code true} if the player is in a boat, {@code false} if not
-     *
-     * @param   p
-     *          Player to check
-     * @return  {@code true} if in a boat, {@code false} if not
-     */
-    public boolean isOnBoat(TabPlayer p) {
-        return playersOnBoats.contains(p);
-    }
-
-    /**
-     * Returns vehicle map
-     *
-     * @return  vehicle map
-     */
-    public Map<Integer, List<Entity>> getVehicles() {
-        return vehicles;
-    }
-    
-    /**
-     * Returns list of all passengers on specified vehicle
-     *
-     * @param   vehicle
-     *          vehicle to check passengers of
-     * @return  list of passengers
-     */
-    @SuppressWarnings("deprecation")
-    public List<Entity> getPassengers(Entity vehicle){
-        if (TabAPI.getInstance().getServerVersion().getMinorVersion() >= 11) {
-            return vehicle.getPassengers();
-        } else {
-            if (vehicle.getPassenger() != null) {
-                return Collections.singletonList(vehicle.getPassenger());
-            } else {
-                return Collections.emptyList();
-            }
-        }
-    }
-}
@@ -0,0 +1,33 @@
+package me.neznamy.tab.platforms.bukkit.hook;
+
+import me.libraryaddict.disguise.DisguiseAPI;
+import me.neznamy.tab.platforms.bukkit.BukkitTabPlayer;
+import me.neznamy.tab.shared.platform.TabPlayer;
+import me.neznamy.tab.shared.util.ReflectionUtils;
+
+/**
+ * Class for hooking into LibsDisguises to get disguise status of players.
+ */
+public class LibsDisguisesHook {
+
+    /** Flag tracking if LibsDisguises is installed or not */
+    private static boolean installed = ReflectionUtils.classExists("me.libraryaddict.disguise.DisguiseAPI");
+
+    /**
+     * Returns {@code true} if LibsDisguises is installed and player is disguised,
+     * {@code false} otherwise.
+     *
+     * @param   player
+     *          Player to check
+     * @return  {@code true} if disguised, {@code false} otherwise
+     */
+    public static boolean isDisguised(TabPlayer player) {
+        try {
+            return installed && DisguiseAPI.isDisguised(((BukkitTabPlayer)player).getPlayer());
+        } catch (LinkageError e) {
+            //java.lang.NoClassDefFoundError: Could not initialize class me.libraryaddict.disguise.DisguiseAPI
+            installed = false;
+            return false;
+        }
+    }
+}
@@ -0,0 +1,83 @@
+package me.neznamy.tab.platforms.bukkit.nms;
+
+import lombok.Getter;
+import me.neznamy.tab.shared.util.ReflectionUtils;
+import org.bukkit.Bukkit;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Arrays;
+
+public class BukkitReflection {
+
+    /** Server's NMS/CraftBukkit package */
+    @Getter
+    private static final String serverPackage = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
+
+    /** Server's minor version */
+    @Getter
+    private static final int minorVersion = Integer.parseInt(serverPackage.split("_")[1]);
+
+    /** Flag determining whether this server jar is mojang mapped or not */
+    @Getter
+    private static final boolean mojangMapped = checkMojangMapped();
+
+    /** Flag determining whether the server version is at least 1.19.3 or not */
+    @Getter
+    private static final boolean is1_19_3Plus = ReflectionUtils.classExists("net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket");
+
+    /** Flag determining whether the server version is at least 1.19.4 or not */
+    @Getter
+    private static final boolean is1_19_4Plus = is1_19_3Plus && !serverPackage.equals("v1_19_R2");
+
+    /** Flag determining whether the server version is at least 1.20.2 or not */
+    @Getter
+    private static final boolean is1_20_2Plus = minorVersion >= 20 && !serverPackage.equals("v1_20_R1");
+
+    private static boolean checkMojangMapped() {
+        try {
+            Class.forName("net.minecraft.network.syncher.SynchedEntityData").getMethod("define",
+                    Class.forName("net.minecraft.network.syncher.EntityDataAccessor"), Object.class);
+            return true;
+        } catch (ReflectiveOperationException | NullPointerException ex) {
+            return false;
+        }
+    }
+
+    /**
+     * Returns class with given potential names in same order
+     *
+     * @param   names
+     *          possible class names
+     * @return  class for specified names
+     * @throws  ClassNotFoundException
+     *          if class does not exist
+     */
+    public static Class<?> getLegacyClass(@NotNull String... names) throws ClassNotFoundException {
+        for (String name : names) {
+            try {
+                return getLegacyClass(name);
+            } catch (ClassNotFoundException e) {
+                //not the first class name in array
+            }
+        }
+        throw new ClassNotFoundException("No class found with possible names " + Arrays.toString(names));
+    }
+
+    /**
+     * Returns class from given name. Supports modded servers, such as Thermos.
+     *
+     * @param   name
+     *          class name
+     * @return  class from given name
+     * @throws  ClassNotFoundException
+     *          if class was not found
+     */
+    public static Class<?> getLegacyClass(@NotNull String name) throws ClassNotFoundException {
+        try {
+            return BukkitReflection.class.getClassLoader().loadClass("net.minecraft.server." + serverPackage + "." + name);
+        } catch (NullPointerException e) {
+            // nested class not found
+            throw new ClassNotFoundException(name);
+        }
+    }
+}
@@ -0,0 +1,283 @@
+package me.neznamy.tab.platforms.bukkit.nms;
+
+import lombok.*;
+import me.neznamy.tab.shared.ProtocolVersion;
+import me.neznamy.tab.shared.TAB;
+import me.neznamy.tab.shared.backend.EntityData;
+import me.neznamy.tab.shared.chat.IChatBaseComponent;
+import me.neznamy.tab.shared.util.ReflectionUtils;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ * A class representing the n.m.s.DataWatcher class to make work with it much easier
+ */
+@ToString
+public class DataWatcher implements EntityData {
+
+    /** NMS Fields */
+    public static Class<?> DataWatcher;
+    private static Constructor<?> newDataWatcher;
+    private static Method DataWatcher_register;
+    private static Method DataWatcher_markDirty;
+    public static Method DataWatcher_packDirty;
+
+    private static Class<?> DataWatcherObject;
+    private static Constructor<?> newDataWatcherObject;
+
+    private static Class<?> DataWatcherRegistry;
+    private static Class<?> DataWatcherSerializer;
+    private static Object DataWatcherSerializer_BYTE;
+    private static Object DataWatcherSerializer_FLOAT;
+    private static Object DataWatcherSerializer_STRING;
+    private static Object DataWatcherSerializer_OPTIONAL_COMPONENT;
+    private static Object DataWatcherSerializer_BOOLEAN;
+
+    private static final int armorStandFlagsPosition = getArmorStandFlagsPosition();
+    
+    /** Watched data */
+    private final Map<Integer, Item> dataValues = new HashMap<>();
+
+    /**
+     * Returns armor stand flags position based on server version
+     *
+     * @return  armor stand flags position based on server version
+     */
+    private static int getArmorStandFlagsPosition() {
+        if (BukkitReflection.getMinorVersion() >= 17) {
+            //1.17.x, 1.18.x, 1.19.x, 1.20.x
+            return 15;
+        } else if (BukkitReflection.getMinorVersion() >= 15) {
+            //1.15.x, 1.16.x
+            return 14;
+        } else if (BukkitReflection.getMinorVersion() >= 14) {
+            //1.14.x
+            return 13;
+        } else if (BukkitReflection.getMinorVersion() >= 10) {
+            //1.10.x - 1.13.x
+            return 11;
+        } else {
+            //1.8.x - 1.9.x
+            return 10;
+        }
+    }
+    
+    /**
+     * Loads all required Fields and throws Exception if something went wrong
+     */
+    public static void load() throws ReflectiveOperationException {
+        int minorVersion = BukkitReflection.getMinorVersion();
+        if (BukkitReflection.isMojangMapped()) {
+            DataWatcher = Class.forName("net.minecraft.network.syncher.SynchedEntityData");
+            DataWatcherObject = Class.forName("net.minecraft.network.syncher.EntityDataAccessor");
+            DataWatcherRegistry = Class.forName("net.minecraft.network.syncher.EntityDataSerializers");
+            DataWatcherSerializer = Class.forName("net.minecraft.network.syncher.EntityDataSerializer");
+        } else if (minorVersion >= 17) {
+            DataWatcher = Class.forName("net.minecraft.network.syncher.DataWatcher");
+            DataWatcherObject = Class.forName("net.minecraft.network.syncher.DataWatcherObject");
+            DataWatcherRegistry = Class.forName("net.minecraft.network.syncher.DataWatcherRegistry");
+            DataWatcherSerializer = Class.forName("net.minecraft.network.syncher.DataWatcherSerializer");
+        } else {
+            DataWatcher = BukkitReflection.getLegacyClass("DataWatcher");
+            if (minorVersion >= 9) {
+                DataWatcherObject = BukkitReflection.getLegacyClass("DataWatcherObject");
+                DataWatcherRegistry = BukkitReflection.getLegacyClass("DataWatcherRegistry");
+                DataWatcherSerializer = BukkitReflection.getLegacyClass("DataWatcherSerializer");
+            }
+        }
+        newDataWatcher = ReflectionUtils.getOnlyConstructor(DataWatcher);
+        if (minorVersion >= 9) {
+            DataWatcher_register = ReflectionUtils.getMethod(
+                    DataWatcher,
+                    new String[]{"define", "register", "a", "m_135372_"}, // {Bukkit 1.20.2+, Bukkit, Bukkit 1.18+, Mohist 1.18.2}
+                    DataWatcherObject, Object.class
+            );
+        } else {
+            DataWatcher_register = ReflectionUtils.getMethod(DataWatcher, new String[]{"func_75682_a", "a"}, int.class, Object.class); // {Thermos 1.7.10, Bukkit}
+        }
+        if (minorVersion >= 19) {
+            DataWatcher_packDirty = ReflectionUtils.getMethod(DataWatcher, new String[] {"packDirty", "b"}); // {Mojang | 1.20.2+, 1.20.2-}
+        }
+        if (BukkitReflection.is1_19_3Plus()) {
+            DataWatcher_markDirty = ReflectionUtils.getMethods(DataWatcher, void.class, DataWatcherObject).get(0);
+        }
+        if (minorVersion >= 9) {
+            newDataWatcherObject = DataWatcherObject.getConstructor(int.class, DataWatcherSerializer);
+            DataWatcherSerializer_BYTE = ReflectionUtils.getField(DataWatcherRegistry, "BYTE", "a", "f_135027_").get(null); // Mohist 1.18.2
+            DataWatcherSerializer_FLOAT = ReflectionUtils.getField(DataWatcherRegistry, "FLOAT", "c", "f_135029_").get(null); // Mohist 1.18.2
+            DataWatcherSerializer_STRING = ReflectionUtils.getField(DataWatcherRegistry, "STRING", "d", "f_135030_").get(null); // Mohist 1.18.2
+            if (BukkitReflection.is1_19_3Plus()) {
+                DataWatcherSerializer_OPTIONAL_COMPONENT = ReflectionUtils.getField(DataWatcherRegistry, "OPTIONAL_COMPONENT", "g").get(null);
+                if (BukkitReflection.is1_19_4Plus()) {
+                    DataWatcherSerializer_BOOLEAN = ReflectionUtils.getField(DataWatcherRegistry, "BOOLEAN", "k").get(null);
+                } else {
+                    DataWatcherSerializer_BOOLEAN = ReflectionUtils.getField(DataWatcherRegistry, "BOOLEAN", "j").get(null);
+                }
+            } else {
+                if (minorVersion >= 13) {
+                    DataWatcherSerializer_OPTIONAL_COMPONENT = ReflectionUtils.getField(DataWatcherRegistry,
+                            "OPTIONAL_COMPONENT", "f", "f_135032_").get(null); // Mohist 1.18.2
+                    DataWatcherSerializer_BOOLEAN = ReflectionUtils.getField(DataWatcherRegistry,
+                            "BOOLEAN", "i", "f_135035_").get(null); // Mohist 1.18.2
+                } else {
+                    DataWatcherSerializer_BOOLEAN = DataWatcherRegistry.getDeclaredField("h").get(null);
+                }
+            }
+        }
+    }
+    
+    /**
+     * Sets value into data values
+     *
+     * @param   position
+     *          data position
+     * @param   serializer
+     *          Object serializer (1.9+)
+     * @param   value
+     *          value
+     */
+    public void setValue(int position, @Nullable Object serializer, @NotNull Object value) {
+        dataValues.put(position, new Item(position, serializer, value));
+    }
+
+    /**
+     * Writes entity byte flags
+     *
+     * @param   flags
+     *          flags to write
+     */
+    public void setEntityFlags(byte flags) {
+        setValue(0, DataWatcherSerializer_BYTE, flags);
+    }
+
+    /**
+     * Writes entity custom name with position based on server version and value depending on client version (RGB or not)
+     *
+     * @param   customName
+     *          target custom name
+     * @param   clientVersion
+     *          client version
+     */
+    public void setCustomName(@NotNull String customName, @NotNull ProtocolVersion clientVersion) {
+        if (BukkitReflection.getMinorVersion() >= 13) {
+            setValue(2, DataWatcherSerializer_OPTIONAL_COMPONENT,
+                    Optional.of(TAB.getInstance().getPlatform().toComponent(IChatBaseComponent.optimizedComponent(customName), clientVersion)));
+        } else if (BukkitReflection.getMinorVersion() >= 8) {
+            setValue(2, DataWatcherSerializer_STRING, customName);
+        } else {
+            //name length is limited to 64 characters on <1.8
+            String cutName = (customName.length() > 64 ? customName.substring(0, 64) : customName);
+            if (BukkitReflection.getMinorVersion() >= 6) {
+                setValue(10, null, cutName);
+            } else {
+                setValue(5, null, cutName);
+            }
+        }
+    }
+
+    /**
+     * Writes custom name visibility boolean
+     *
+     * @param   visible
+     *          if visible or not
+     */
+    public void setCustomNameVisible(boolean visible) {
+        if (BukkitReflection.getMinorVersion() >= 9) {
+            setValue(3, DataWatcherSerializer_BOOLEAN, visible);
+        } else {
+            setValue(3, null, (byte)(visible?1:0));
+        }
+    }
+
+    /**
+     * Writes entity health
+     *
+     * @param   health
+     *          health of entity
+     */
+    public void setHealth(float health) {
+        if (BukkitReflection.getMinorVersion() >= 6) {
+            setValue(6, DataWatcherSerializer_FLOAT, health);
+        } else {
+            setValue(16, null, (int)health);
+        }
+    }
+
+    /**
+     * Writes armor stand flags
+     *
+     * @param   flags
+     *          flags to write
+     */
+    public void setArmorStandFlags(byte flags) {
+        setValue(armorStandFlagsPosition, DataWatcherSerializer_BYTE, flags);
+    }
+
+    /**
+     * Writes wither invulnerable time
+     * @param   time
+     *          Time, apparently
+     */
+    public void setWitherInvulnerableTime(int time) {
+        if (BukkitReflection.getMinorVersion() > 8)
+            throw new UnsupportedOperationException("Not supported on 1.9+");
+        setValue(20, null, time);
+    }
+
+    /**
+     * Converts the class into an instance of NMS.DataWatcher
+     *
+     * @return  an instance of NMS.DataWatcher with same data
+     */
+    @SneakyThrows
+    public @NotNull Object build() {
+        Object nmsWatcher;
+        if (newDataWatcher.getParameterCount() == 1) { //1.7+
+            nmsWatcher = newDataWatcher.newInstance(new Object[] {null});
+        } else {
+            nmsWatcher = newDataWatcher.newInstance();
+        }
+        for (Item item : dataValues.values()) {
+            Object nmsObject = item.createObject();
+            DataWatcher_register.invoke(nmsWatcher, nmsObject, item.getValue());
+            if (BukkitReflection.is1_19_3Plus()) DataWatcher_markDirty.invoke(nmsWatcher, nmsObject);
+        }
+        return nmsWatcher;
+    }
+
+    @RequiredArgsConstructor
+    @Getter
+    public static class Item {
+
+        /** Item position */
+        private final int position;
+
+        /** Item serializer (1.9+) */
+        @Nullable
+        private final Object serializer;
+
+        /** Item value */
+        @NotNull
+        private final Object value;
+
+        /**
+         * Creates data watcher object with position and serializer
+         *
+         * @return  NMS data watcher object
+         */
+        @SneakyThrows
+        public Object createObject() {
+            if (BukkitReflection.getMinorVersion() >= 9) {
+                return newDataWatcherObject.newInstance(position, serializer);
+            } else {
+                return position;
+            }
+        }
+    }
+}
@@ -0,0 +1,120 @@
+package me.neznamy.tab.platforms.bukkit.nms;
+
+import com.mojang.authlib.GameProfile;
+import io.netty.channel.Channel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.SneakyThrows;
+import me.neznamy.tab.platforms.bukkit.BukkitTabList;
+import me.neznamy.tab.platforms.bukkit.scoreboard.PacketScoreboard;
+import me.neznamy.tab.shared.ProtocolVersion;
+import me.neznamy.tab.shared.chat.IChatBaseComponent;
+import me.neznamy.tab.shared.util.ComponentCache;
+import me.neznamy.tab.shared.util.ReflectionUtils;
+import org.bukkit.Bukkit;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+/**
+ * Class holding all NMS classes, methods, fields and constructors used by TAB.
+ */
+public class NMSStorage {
+
+    /** Instance of this class */
+    @Getter @Setter private static NMSStorage instance;
+
+    /** Server's NMS/CraftBukkit package */
+    private final String serverPackage = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
+
+    /** Server's minor version */
+    @Getter private final int minorVersion = Integer.parseInt(serverPackage.split("_")[1]);
+
+    /** Basic universal values */
+    protected Class<?> Packet;
+    protected Class<?> NetworkManager;
+    public Class<?> EntityPlayer;
+    protected Class<?> EntityHuman;
+    protected Class<?> PlayerConnection;
+
+    // Ping field for 1.5.2 - 1.16.5, 1.17+ has Player#getPing()
+    public Field PING;
+
+    public Field PLAYER_CONNECTION;
+    public Field NETWORK_MANAGER;
+    public Field CHANNEL;
+    public Method getHandle;
+    public Method sendPacket;
+    public Method getProfile;
+
+    /** Chat components */
+    protected Class<?> ChatSerializer;
+    public Method ChatSerializer_DESERIALIZE;
+
+    public final ComponentCache<IChatBaseComponent, Object> componentCache = new ComponentCache<>(1000,
+            (component, clientVersion) -> ChatSerializer_DESERIALIZE.invoke(null, component.toString(clientVersion)));
+
+    /**
+     * Constructs new instance and attempts to load all fields, methods and constructors.
+     */
+    @SneakyThrows
+    public NMSStorage() {
+        ProtocolVersion.UNKNOWN_SERVER_VERSION.setMinorVersion(minorVersion); //fixing compatibility with forks that set version field value to "Unknown"
+        loadClasses();
+        if (minorVersion >= 7) {
+            if (BukkitReflection.is1_20_2Plus()) {
+                NETWORK_MANAGER = ReflectionUtils.getOnlyField(PlayerConnection.getSuperclass(), NetworkManager);
+            } else {
+                NETWORK_MANAGER = ReflectionUtils.getOnlyField(PlayerConnection, NetworkManager);
+            }
+            sendPacket = ReflectionUtils.getMethods(PlayerConnection, void.class, Packet).get(0);
+        } else {
+            sendPacket = ReflectionUtils.getMethod(PlayerConnection, new String[]{"sendPacket"}, Packet);
+        }
+        if (minorVersion >= 8) {
+            ChatSerializer_DESERIALIZE = ReflectionUtils.getMethods(ChatSerializer, Object.class, String.class).get(0);
+            CHANNEL = ReflectionUtils.getOnlyField(NetworkManager, Channel.class);
+            try {
+                getProfile = ReflectionUtils.getOnlyMethod(EntityHuman, GameProfile.class);
+            } catch (IllegalStateException catServer) {
+                getProfile = ReflectionUtils.getMethod(EntityHuman, new String[] {"getProfile"});
+            }
+        }
+        PLAYER_CONNECTION = ReflectionUtils.getOnlyField(EntityPlayer, PlayerConnection);
+        getHandle = Class.forName("org.bukkit.craftbukkit." + serverPackage + ".entity.CraftPlayer").getMethod("getHandle");
+        BukkitTabList.load();
+        DataWatcher.load();
+        PacketEntityView.load();
+        PacketScoreboard.load();
+        if (minorVersion < 17) {
+            PING = ReflectionUtils.getField(EntityPlayer, "ping", "field_71138_i"); // 1.5.2 - 1.16.5, 1.7.10 Thermos
+        }
+    }
+
+    private void loadClasses() throws ClassNotFoundException {
+        if (minorVersion >= 17 && ReflectionUtils.classExists("net.minecraft.ChatFormatting")) {
+            ChatSerializer = Class.forName("net.minecraft.network.chat.Component$Serializer");
+            EntityHuman = Class.forName("net.minecraft.world.entity.player.Player");
+            NetworkManager = Class.forName("net.minecraft.network.Connection");
+            Packet = Class.forName("net.minecraft.network.protocol.Packet");
+            EntityPlayer = Class.forName("net.minecraft.server.level.ServerPlayer");
+            PlayerConnection = Class.forName("net.minecraft.server.network.ServerGamePacketListenerImpl");
+        } else if (minorVersion >= 17) {
+            ChatSerializer = Class.forName("net.minecraft.network.chat.IChatBaseComponent$ChatSerializer");
+            EntityHuman = Class.forName("net.minecraft.world.entity.player.EntityHuman");
+            NetworkManager = Class.forName("net.minecraft.network.NetworkManager");
+            Packet = Class.forName("net.minecraft.network.protocol.Packet");
+            EntityPlayer = Class.forName("net.minecraft.server.level.EntityPlayer");
+            PlayerConnection = Class.forName("net.minecraft.server.network.PlayerConnection");
+        } else {
+            EntityHuman = BukkitReflection.getLegacyClass("EntityHuman");
+            Packet = BukkitReflection.getLegacyClass("Packet");
+            EntityPlayer = BukkitReflection.getLegacyClass("EntityPlayer");
+            PlayerConnection = BukkitReflection.getLegacyClass("PlayerConnection");
+            NetworkManager = BukkitReflection.getLegacyClass("NetworkManager");
+            if (minorVersion >= 7) {
+                ChatSerializer = BukkitReflection.getLegacyClass("IChatBaseComponent$ChatSerializer", "ChatSerializer");
+            }
+        }
+    }
+}