3.2.0

bump org.yaml:snakeyaml to 1.33

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -57,5 +57,7 @@ body:
           required: true
         - label: I have read the wiki to make sure it's not an issue with configuration
           required: true
+        - label: I ticked all of the boxes without actually reading them
+          required: false
         - label: I have read the Compatibility wiki page and am not trying to run the plugin on an unsupported server version / platform
           required: true

.github/ISSUE_TEMPLATE/error.yml

@@ -51,5 +51,7 @@ body:
           required: true
         - label: I have included a paste of the error
           required: true
+        - label: I ticked all of the boxes without actually reading them
+          required: false
         - label: I have read the Compatibility wiki page and am not trying to run the plugin on an unsupported server version / platform
           required: true

.github/workflows/build.yml

@@ -11,15 +11,16 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
+          distribution: 'temurin'
           java-version: 11
       - name: Cache SonarCloud packages
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
@@ -38,7 +39,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
         run: ./gradlew clean build
       - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v2.3.1
+        uses: actions/upload-artifact@v3
         with:
           name: Jar
           path: jar/build/libs/TAB-**.jar

README.md

@@ -16,16 +16,15 @@ Once the plugin compiles, grab the jar from `/jar/build/libs/` folder.
 
 # Links
 The precompiled JAR can be downloaded for free from:  
-* Releases: https://github.com/NEZNAMY/TAB/releases
-* MC-Market: https://www.mc-market.org/resources/20631/
+* GitHub releases: https://github.com/NEZNAMY/TAB/releases
+* BuiltByBit: https://builtbybit.com/resources/20631/
 
-Supporting my work:  
-* MC-Market: https://www.mc-market.org/resources/14009/
+Support my work & receive official assistance with configuration:  
+* BuiltByBit: https://builtbybit.com/resources/14009/
 * Polymart: https://polymart.org/resource/484
-* Donation link: https://paypal.me/neznamy1
 
 Other links:
-* Discord: https://discord.gg/EaSvdk6  
+* Discord support for buyers: https://discord.gg/EaSvdk6  
 * Wiki: https://github.com/NEZNAMY/TAB/wiki  
 
 # Issues
@@ -45,4 +44,4 @@ is in quality of the report (typically providing correct steps to reproduce that
 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://www.mc-market.org/resources/14009/) of the plugin or [send a donation](https://paypal.me/neznamy1) to keep the plugin active.
+* [Buy a copy](https://builtbybit.com/resources/14009/) of the plugin or [send a donation](https://paypal.me/neznamy1) to keep the plugin active.

api/build.gradle.kts

@@ -1,3 +1,7 @@
+plugins {
+    id("net.kyori.blossom") version "1.2.0"
+}
+
 dependencies {
     compileOnlyApi(libs.netty)
     api(libs.jsonSimple) {
@@ -6,4 +10,16 @@ dependencies {
     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")
+}
+
+tasks.javadoc {
+    enabled = project.hasProperty("enable-javadoc")
 }

api/src/main/java/me/neznamy/tab/api/ArmorStand.java

@@ -1,28 +1,37 @@
 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
+     *
+     * @return  true if static, false if dynamic
      */
     boolean hasStaticOffset();
     
     /**
      * Changes offset of the armor stand
-     * @param offset - new offset
+     *
+     * @param   offset
+     *          new offset
      */
     void setOffset(double offset);
 
     /**
      * Returns offset of the armor stand
-     * @return offset from base
+     *
+     * @return  offset from base
      */
     double getOffset();
     
     /**
      * Returns property for armor stand's name
-     * @return property for armor stand's name
+     *
+     * @return  property for armor stand's name
      */
     Property getProperty();
     
@@ -33,14 +42,17 @@ public interface ArmorStand {
     
     /**
      * Teleports armor stand to owner's current location for specified player
-     * @param viewer - player to send packet to
+     *
+     * @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
+     *
+     * @param   sneaking
+     *          new sneaking status
      */
     void sneak(boolean sneaking);
     
@@ -51,7 +63,9 @@ public interface ArmorStand {
     
     /**
      * DeSpawns armor stand for specified player
-     * @param viewer - player to send packet to
+     *
+     * @param   viewer
+     *          player to send packet to
      */
     void destroy(TabPlayer viewer);
     
@@ -62,21 +76,33 @@ public interface ArmorStand {
     
     /**
      * Updates visibility if needed
-     * @param force - if refresh should be forced
+     *
+     * @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
+     *
+     * @return  entity ID of this armor stand
      */
     int getEntityId();
     
     /**
      * Spawns armor stand for specified player
-     * @param viewer - player to spawn for
+     *
+     * @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);
 }

api/src/main/java/me/neznamy/tab/api/ArmorStandManager.java

@@ -10,5 +10,11 @@ public interface ArmorStandManager {
      */
     void destroy();
 
+    /**
+     * Refreshes text of all armor stands for all nearby players
+     *
+     * @param   force
+     *          If refresh should be force despite no update seemingly being needed
+     */
     void refresh(boolean force);
 }

api/src/main/java/me/neznamy/tab/api/FeatureManager.java

@@ -1,35 +1,116 @@
 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
+     * @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
+     *
+     * @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
+     * @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
+     * @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();
 }

api/src/main/java/me/neznamy/tab/api/HeaderFooterManager.java

@@ -1,16 +1,82 @@
 package me.neznamy.tab.api;
 
+/**
+ * Interface allowing to send header/footer to players.
+ * <p>
+ * Instance can be obtained using {@link TabAPI#getHeaderFooterManager()}.
+ * This requires the Header/footer feature to be enabled in config, otherwise
+ * the method will return {@code null}.
+ */
 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.
+     *
+     * @param   player
+     *          Player to set header for
+     * @param   header
+     *          Raw header value
+     */
     void setHeader(TabPlayer player, 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.
+     *
+     * @param   player
+     *          Player to set header for
+     * @param   footer
+     *          Raw footer value
+     */
     void setFooter(TabPlayer player, 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.
+     *
+     * @param   player
+     *          Player to set header for
+     * @param   header
+     *          Raw header value
+     * @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);
 }

api/src/main/java/me/neznamy/tab/api/Property.java

@@ -1,54 +1,68 @@
 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
+     *
+     * @return  original raw value
      */
     String getOriginalRawValue();
 
     /**
      * Temporarily overrides current raw value with an API call
-     * @param temporaryValue - temporary value to be assigned
+     *
+     * @param   temporaryValue
+     *          temporary value to be assigned
      */
     void setTemporaryValue(String temporaryValue);
 
     /**
      * Returns current temporary value
-     * @return temporary value or null if not set
+     *
+     * @return  temporary value or null if not set
      */
     String getTemporaryValue();
 
     /**
      * Returns temporary value (via API) if present, raw value otherwise
-     * @return current raw value
+     *
+     * @return  current raw value
      */
     String getCurrentRawValue();
 
     /**
      * Returns last known value
-     * @return 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
+     *
+     * @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
+     *
+     * @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
+     *
+     * @param   viewer
+     *          the viewer
+     * @return  format for the viewer
      */
     String getFormat(TabPlayer viewer);
 }

api/src/main/java/me/neznamy/tab/api/PropertyConfiguration.java

@@ -1,30 +1,147 @@
 package me.neznamy.tab.api;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
+import java.util.stream.Collectors;
 
+/**
+ * Interface representing user or group configuration.
+ * Implementation is either using file or MySQL, if it's enabled.
+ */
 public interface PropertyConfiguration {
 
-    void setProperty(String name, String property, String server, String world, String value);
+    /**
+     * Sets property value of group or user to specified value. If {@code world} or
+     * {@code server} is not {@code null}, value will be inserted as a per-world or
+     * per-server setting. If both {@code world} and {@code server} are {@code null},
+     * value is inserted as a global setting.
+     *
+     * @param   groupOrUser
+     *          Name of group or user, depending on what this instance handles
+     * @param   property
+     *          Name of property to set
+     * @param   server
+     *          Name of server to apply setting to, {@code null} for global setting
+     * @param   world
+     *          Name of world to apply setting to, {@code null} for global setting
+     * @param   value
+     *          Value of the property
+     */
+    void setProperty(String groupOrUser, String property, String server, String world, String value);
 
-    String[] getProperty(String name, String property, String server, String world);
+    /**
+     * Gets property of group or user. If {@code server} or {@code world}
+     * are not {@code null}, per-server / per-world settings are checked first
+     * to try to find a match. If no match is found, global value is returned.
+     * Returned value is an array with 2 elements, with first argument being value
+     * and second being source. If nothing is found, empty array is returned.
+     *
+     * @param   groupOrUser
+     *          Name of group or user, depending on what this instance handles
+     * @param   property
+     *          Name of property to get
+     * @param   server
+     *          Server the player is currently in, to allow check for per-server settings
+     * @param   world
+     *          World the player is currently in, to allow check for per-world settings
+     * @return  Array with 2 elements with value being first, source second if found,
+     *          empty array if nothing was found.
+     */
+    String[] getProperty(String groupOrUser, String property, String server, String world);
 
-    void remove(String name);
+    /**
+     * Removes all data applied to specified group or user.
+     *
+     * @param   groupOrUser
+     *          Name of group or user, depending on what this instance handles
+     */
+    void remove(String groupOrUser);
 
-    Map<String, String> getGlobalSettings(String name);
+    /**
+     * Returns map of global settings applied to specified group or user.
+     * Map key is property name, value is property value.
+     *
+     * @param   groupOrUser
+     *          Name of group or user, depending on what this instance handles
+     * @return  Map of global settings of specified group or user
+     */
+    Map<String, Object> getGlobalSettings(String groupOrUser);
 
-    Map<String, Map<String, String>> getPerWorldSettings(String name);
+    /**
+     * Returns map of per-world settings of specified group or user.
+     * Map key is world name, value is property name-value map in that world.
+     *
+     * @param   groupOrUser
+     *          Name of group or user, depending on what this instance handles
+     * @return  Map of per-world settings of specified group or user
+     */
+    Map<String, Map<String, Object>> getPerWorldSettings(String groupOrUser);
 
-    Map<String, Map<String, String>> getPerServerSettings(String name);
+    /**
+     * Returns map of per-server settings of specified group or user.
+     * Map key is server name, value is property name-value map in that server.
+     *
+     * @param   groupOrUser
+     *          Name of group or user, depending on what this instance handles
+     * @return  Map of per-server settings of specified group or user
+     */
+    Map<String, Map<String, Object>> getPerServerSettings(String groupOrUser);
 
+    /**
+     * Returns set of all groups or users that have anything configured,
+     * either globally or in some world or server.
+     *
+     * @return  Set of all entries with something configured
+     */
     Set<String> getAllEntries();
 
-    default Map<String, Map<String, String>> convertMap(Map<String, Map<String, Map<String, String>>> map, String key) {
-        Map<String, Map<String, String>> converted = new HashMap<>();
-        for (Map.Entry<String, Map<String, Map<String, String>>> entry : map.entrySet()) {
-            converted.put(entry.getKey(), entry.getValue().get(key));
+    /**
+     * Converts per-world or per-server map into a per-world or per-server map
+     * with values only belonging to entered group or user. In other words, extracts
+     * settings belonging to group or user from the map.
+     *
+     * @param   map
+     *          Original per-world or per-server setting map
+     * @param   groupOrUser
+     *          Name of group or user, depending on what this instance handles
+     * @return  Converted map only containing data of specified group or user
+     */
+    default Map<String, Map<String, Object>> convertMap(Map<String, Map<String, Map<String, Object>>> map, String groupOrUser) {
+        Map<String, Map<String, Object>> converted = new HashMap<>();
+        for (Map.Entry<String, Map<String, Map<String, Object>>> entry : map.entrySet()) {
+            converted.put(entry.getKey(), entry.getValue().get(groupOrUser));
         }
         return converted;
     }
+
+    /**
+     * Converts object into string. For most objects, {@link Object#toString()} is called.
+     * For lists, entries are connected with {@code "\n"}.
+     *
+     * @param   obj
+     *          Object to convert
+     * @return  Converted string
+     */
+    @SuppressWarnings("unchecked")
+    default String toString(Object obj) {
+        if (obj instanceof List) {
+            return ((List<Object>)obj).stream().map(Object::toString).collect(Collectors.joining("\n"));
+        }
+        return obj.toString();
+    }
+
+    /**
+     * Converts string into object. If string contains {@code "\n"},
+     * a list is created using {@code "\n"} as a separator. Otherwise,
+     * inserted string is returned.
+     *
+     * @param   string
+     *          String to convert
+     * @return  Converted object
+     */
+    default Object fromString(String string) {
+        if (string != null && string.contains("\n")) {
+            return Arrays.asList(string.split("\n"));
+        }
+        return string;
+    }
 }

api/src/main/java/me/neznamy/tab/api/ProtocolVersion.java

@@ -8,6 +8,10 @@ public enum ProtocolVersion {
     UNKNOWN_SERVER_VERSION ("Unknown"),
     UNKNOWN_CLIENT_VERSION ("Unknown"),
     PROXY   ("Proxy"),
+    V1_19_3 (761),
+    V1_19_2 (760),
+    V1_19_1 (760),
+    V1_19   (759),
     V1_18_2 (758),
     V1_18_1 (757),
     V1_18   (757),
@@ -65,18 +69,20 @@ public enum ProtocolVersion {
     /** Value array to iterate over to avoid array creations on each call */
     public static final ProtocolVersion[] VALUES = values();
 
-    //version's network id found at https://wiki.vg/Protocol_version_numbers
+    /** Version's network id found at https://wiki.vg/Protocol_version_numbers */
     private final int networkId;
 
-    //minor version, such as 16
+    /** Version's minor version, such as 16 for 1.16.x */
     private int minorVersion;
 
-    //friendly name displayed in %player-version% placeholder
+    /** Version's friendly name displayed in %player-version% placeholder */
     private final String friendlyName;
 
     /**
      * Constructs new instance with given network id
-     * @param networkId - network id of this version
+     *
+     * @param   networkId
+     *          network id of this version
      */
     ProtocolVersion(int networkId){
         this.networkId = networkId;
@@ -86,7 +92,9 @@ public enum ProtocolVersion {
 
     /**
      * Constructs new instance with given friendly name
-     * @param friendlyName - friendly name to display
+     *
+     * @param   friendlyName
+     *          friendly name to display
      */
     ProtocolVersion(String friendlyName){
         this.networkId = 999;
@@ -96,7 +104,8 @@ public enum ProtocolVersion {
 
     /**
      * Returns the version's network id
-     * @return version's network id
+     *
+     * @return  version's network id
      */
     public int getNetworkId() {
         return networkId;
@@ -104,7 +113,8 @@ public enum ProtocolVersion {
 
     /**
      * Returns user-friendly name of the version (such as 1.16.2 instead of V1_16_2)
-     * @return    user-friendly name of the version
+     *
+     * @return  user-friendly name of the version
      */
     public String getFriendlyName() {
         return friendlyName;
@@ -112,7 +122,8 @@ public enum ProtocolVersion {
 
     /**
      * Returns minor version of this release, such as 8 for 1.8.x or 13 for 1.13.x
-     * @return version's minor version
+     *
+     * @return  version's minor version
      */
     public int getMinorVersion() {
         return minorVersion;
@@ -122,8 +133,9 @@ public enum ProtocolVersion {
      * Overrides minor version of the version instance. This is used internally to
      * set minor version of UNKNOWN_SERVER_VERSION value to value from package to fix compatibility
      * with server forks that set bukkit version field value to "Unknown".
-     * @param    minorVersion
-     *             minor version to change value to
+     *
+     * @param   minorVersion
+     *          minor version to change value to
      */
     public void setMinorVersion(int minorVersion) {
         this.minorVersion = minorVersion;
@@ -131,8 +143,10 @@ public enum ProtocolVersion {
 
     /**
      * Returns enum constant of entered version or UNKNOWN_SERVER_VERSION if unknown version
-     * @param friendlyName - friendly name of the version
-     * @return version or UNKNOWN_SERVER_VERSION if version is unknown
+     *
+     * @param   friendlyName
+     *          friendly name of the version
+     * @return  version or UNKNOWN_SERVER_VERSION if version is unknown
      */
     public static ProtocolVersion fromFriendlyName(String friendlyName) {
         if (friendlyName.startsWith("1.8")) return V1_8;
@@ -145,8 +159,10 @@ public enum ProtocolVersion {
 
     /**
      * Returns version from given network id
-     * @param networkId - network id of protocol version
-     * @return version from given network id
+     *
+     * @param   networkId
+     *          network id of protocol version
+     * @return  version from given network id
      */
     public static ProtocolVersion fromNetworkId(int networkId) {
         for (ProtocolVersion v : VALUES) {

api/src/main/java/me/neznamy/tab/api/TabAPI.java

@@ -15,103 +15,199 @@ import me.neznamy.tab.api.team.TeamManager;
  */
 public abstract class TabAPI {
 
+    /** Instance of the API */
     private static TabAPI instance;
 
-    public static TabAPI getInstance() {
-        return instance;
+    /**
+     * Constructs new instance and sets it as new API instance
+     */
+    public TabAPI() {
+        instance = this;
     }
 
-    public static void setInstance(TabAPI instance) {
-        TabAPI.instance = instance;
+    /**
+     * Returns API instance. If instance was not set by the plugin, throws
+     * {@code IllegalStateException}. This is usually caused by shading the API
+     * into own project, which is not allowed. Another option is calling the method
+     * before plugin was able to load.
+     *
+     * @return  API instance
+     * @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.");
+        return instance;
     }
 
     /**
      * Returns player object from given UUID
-     * @return player object from given UUID
-     * @param id - Player UUID
+     *
+     * @param   id
+     *          Player UUID
+     * @return  player object from given UUID
      */
     public abstract TabPlayer getPlayer(UUID id);
 
     /**
      * Returns player object from given name
-     * @return player object from given name
-     * @param name - Player name
+     *
+     * @param   name
+     *          Player name
+     * @return  player object from given name
      */
     public abstract TabPlayer getPlayer(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
+     *
+     * @return  collection of online players
      */
     public abstract TabPlayer[] getOnlinePlayers();
 
     /**
-     * Return BossBar manager instance if the feature is enabled. Returns null otherwise.
-     * @return BossBar manager
+     * Return BossBar manager instance if the feature is enabled. If not, returns {@code null}.
+     *
+     * @return  BossBar manager
      */
     public abstract BossBarManager getBossBarManager();
 
     /**
-     * Returns scoreboard manager instance if the feature is enabled. Returns null otherwise.
-     * @return scoreboard manager
+     * Returns scoreboard manager instance if the feature is enabled. If not, returns {@code null}.
+     *
+     * @return  scoreboard manager
      */
     public abstract ScoreboardManager getScoreboardManager();
 
     /**
-     * Returns team manager instance if the feature is enabled, false otherwise
-     * @return team manager
+     * Returns team manager instance if the feature is enabled. If not, returns {@code null}.
+     *
+     * @return  team manager
      */
     public abstract TeamManager getTeamManager();
 
+    /**
+     * Returns header/footer manager instance if the feature is enabled. If not, returns {@code null}.
+     *
+     * @return  Header/footer manager
+     */
     public abstract HeaderFooterManager getHeaderFooterManager();
 
     /**
      * Returns PlaceholderManager instance
-     * @return PlaceholderManager instance
+     *
+     * @return  PlaceholderManager instance
      */
     public abstract PlaceholderManager getPlaceholderManager();
 
     /**
      * Returns feature manager instance
-     * @return feature manager instance
+     *
+     * @return  feature manager instance
      */
     public abstract FeatureManager getFeatureManager();
 
+    /**
+     * Returns Tablist name format manager instance if the feature is enabled. If not, returns {@code null}.
+     *
+     * @return  Tablist name format manager
+     */
     public abstract TablistFormatManager getTablistFormatManager();
 
     /**
      * Gets the event bus for registering listeners for TAB events.
      *
-     * @return the event bus
+     * @return  the event bus
      */
     public abstract EventBus getEventBus();
 
     /**
      * Returns server version. On proxy installation returns PROXY.
-     * @return server version
+     *
+     * @return  server version
      */
     public abstract ProtocolVersion getServerVersion();
 
     /**
      * Prints message into console
-     * @param message - message to print
-     * @param translateColors - true if colors should be translated, false if not
+     *
+     * @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();
 }

api/src/main/java/me/neznamy/tab/api/TabConstants.java

@@ -1,4 +1,4 @@
-package me.neznamy.tab.shared;
+package me.neznamy.tab.api;
 
 /**
  * A class containing various constants used everywhere in the plugin
@@ -7,7 +7,8 @@ package me.neznamy.tab.shared;
 public class TabConstants {
 
     public static final String PLUGIN_VERSION = "@plugin_version@";
-    public static final String DEFAULT_GROUP = "NONE";
+    public static final String NO_GROUP = "NONE";
+    public static final String DEFAULT_GROUP = "_DEFAULT_";
     public static final String PLUGIN_MESSAGE_CHANNEL_NAME = "tab:bridge-2";
     public static final String REDIS_CHANNEL_NAME = "TAB";
 
@@ -31,8 +32,6 @@ public class TabConstants {
         public static final String PLAYER_RESPAWN = "Player Respawn";
         public static final String PLUGIN_MESSAGE = "PluginMessageEvent";
         public static final String REDIS_BUNGEE_MESSAGE = "PubSubMessageEvent";
-        public static final String LUCKPERMS_USER_RECALCULATE_EVENT = "UserDataRecalculateEvent";
-        public static final String LUCKPERMS_GROUP_RECALCULATE_EVENT = "GroupDataRecalculateEvent";
         public static final String VANISH_CHANGE = "Vanish status change";
         public static final String ANTI_OVERRIDE = "Anti override";
 
@@ -49,8 +48,8 @@ public class TabConstants {
         public static final String RAW_PACKET_OUT = "Packet reading (out)";
 
         public static final String PLACEHOLDER_REFRESHING = "Refreshing placeholders";
+        public static final String GROUP_REFRESHING = "Refreshing groups";
 
-        public static final String V1_8_0_BUG_COMPENSATION = "Compensating for 1.8.0 bugs";
         public static final String REFRESHING_NAME_TAG_VISIBILITY = "Refreshing NameTag visibility";
         public static final String SCOREBOARD_PACKET_CHECK = "Checking for other plugins";
         public static final String PROCESSING_PLAYER_MOVEMENT = "Processing player movement";
@@ -78,11 +77,14 @@ public class TabConstants {
 
         public static final String LAYOUT_FIXED_SLOTS = "Layout (Fixed slots)";
         public static final String LAYOUT_PLAYER_SLOTS = "Layout (Player slots)";
+        public static final String LAYOUT_LATENCY = "Layout (Updating latency)";
 
         public static final String NAMETAGS_TEAM_REGISTER = "NameTags (Team register)";
         public static final String NAMETAGS_TEAM_UNREGISTER = "NameTags (Team unregister)";
         public static final String NAMETAGS_TEAM_UPDATE = "NameTags (Team update)";
 
+        public static final String SORTING_CHANGING_TEAM_NAME = "Sorting (Changing team name)";
+
         public static final String SCOREBOARD_TITLE = "Scoreboard (Title)";
         public static final String SCOREBOARD_LINES = "Scoreboard (Lines)";
 
@@ -116,7 +118,11 @@ public class TabConstants {
         public static final String COMMAND_MYSQL_DOWNLOAD = "tab.mysql.download";
         public static final String COMMAND_MYSQL_UPLOAD = "tab.mysql.upload";
         public static final String COMMAND_NAMETAG_TOGGLE = "tab.nametag.toggle";
+
+        public static final String COMMAND_NAMETAG_TOGGLE_OTHER = "tab.nametag.toggle.other";
         public static final String COMMAND_NAMETAG_PREVIEW = "tab.nametag.preview";
+
+        public static final String COMMAND_NAMETAG_PREVIEW_OTHER = "tab.nametag.preview.other";
         public static final String COMMAND_PARSE = "tab.parse";
         public static final String COMMAND_SCOREBOARD_ANNOUNCE = "tab.announce.scoreboard";
         public static final String COMMAND_SCOREBOARD_TOGGLE = "tab.scoreboard.toggle";
@@ -225,6 +231,7 @@ public class TabConstants {
         public static final String PING_SPOOF = "PingSpoof";
         public static final String SORTING = "sorting";
         public static final String LAYOUT = "layout";
+        public static final String LAYOUT_LATENCY = "layout-latency";
         public static final String NICK_COMPATIBILITY = "nick";
         public static final String PIPELINE_INJECTION = "injection";
         public static final String BOSS_BAR = "BossBar";
@@ -259,6 +266,10 @@ public class TabConstants {
             return "scoreboard-" + line;
         }
 
+        public static String scoreboardLine(String scoreboard, int index) {
+            return "scoreboard-score-" + scoreboard + "-" + index;
+        }
+
         public static String layout(String name) {
             return "layout-" + name;
         }
@@ -278,9 +289,94 @@ public class TabConstants {
         public static String bossBarColorStyle(String name) {
             return "BossBar-color-style-" + name;
         }
+    }
 
-        public static String scoreboardLine(String scoreboard, int index) {
-            return "scoreboard-score-" + scoreboard + "-" + index;
+    /**
+     * All internal placeholders offered by the plugin
+     */
+    public static class Placeholder {
+
+        // Universal
+        public static final String DISPLAY_NAME = "%displayname%";
+        public static final String GROUP = "%group%";
+        public static final String VANISHED = "%vanished%";
+        public static final String WORLD = "%world%";
+        public static final String WORLD_ONLINE = "%worldonline%";
+        public static final String SERVER = "%server%";
+        public static final String SERVER_ONLINE = "%serveronline%";
+        public static final String PLAYER = "%player%";
+        public static final String TIME = "%time%";
+        public static final String DATE = "%date%";
+        public static final String PING = "%ping%";
+        public static final String PLAYER_VERSION = "%player-version%";
+        public static final String PLAYER_VERSION_ID = "%player-version-id%";
+        public static final String MEMORY_USED = "%memory-used%";
+        public static final String MEMORY_MAX = "%memory-max%";
+        public static final String MEMORY_USED_GB = "%memory-used-gb%";
+        public static final String MEMORY_MAX_GB = "%memory-max-gb%";
+        public static final String ONLINE = "%online%";
+        public static final String STAFF_ONLINE = "%staffonline%";
+        public static final String NON_STAFF_ONLINE = "%nonstaffonline%";
+        public static final String LUCKPERMS_PREFIX = "%luckperms-prefix%";
+        public static final String LUCKPERMS_SUFFIX = "%luckperms-suffix%";
+        public static final String COUNTDOWN = "%countdown%";
+
+        // Placeholders for internal use
+        public static final String COLLISION = "%collision%";
+        public static final String INVISIBLE = "%invisible%";
+        public static final String VEHICLE = "%vehicle%";
+
+        // Bukkit only
+        public static final String TPS = "%tps%";
+        public static final String MSPT = "%mspt%";
+        public static final String AFK = "%afk%";
+        public static final String ESSENTIALS_NICK = "%essentialsnick%";
+        public static final String VAULT_PREFIX = "%vault-prefix%";
+        public static final String VAULT_SUFFIX = "%vault-suffix%";
+        public static final String HEALTH = "%health%";
+
+        public static final int MINIMUM_REFRESH_INTERVAL = 50;
+
+
+        public static String condition(String name) {
+            return "%condition:" + name + "%";
+        }
+
+        public static String animation(String name) {
+            return "%animation:" + name + "%";
+        }
+
+        public static String globalPlayerListGroup(String group) {
+            return "%playerlist-group_" + group + "%";
         }
     }
+
+    /**
+     * All plugins TAB hooks into
+     */
+    public static class Plugin {
+
+        public static final String LUCKPERMS = "LuckPerms";
+        public static final String VAULT = "Vault";
+        public static final String PLACEHOLDER_API = "PlaceholderAPI";
+        public static final String LIBS_DISGUISES = "LibsDisguises";
+        public static final String VIAVERSION = "ViaVersion";
+        public static final String PROTOCOL_SUPPORT = "ProtocolSupport";
+        public static final String ESSENTIALS = "Essentials";
+        public static final String REDIS_BUNGEE = "RedisBungee";
+        public static final String PREMIUM_VANISH = "PremiumVanish";
+    }
+
+    /**
+     * TAB's custom metrics charts
+     */
+    public static class MetricsChart {
+
+        public static final String PERMISSION_SYSTEM = "permission_system";
+        public static final String GLOBAL_PLAYER_LIST_ENABLED = "global_playerlist_enabled";
+        public static final String PLACEHOLDER_API = "placeholderapi";
+        public static final String SERVER_VERSION = "server_version";
+        public static final String UNLIMITED_NAME_TAG_MODE_ENABLED = "unlimited_nametag_mode_enabled";
+
+    }
 }

api/src/main/java/me/neznamy/tab/api/TabFeature.java

@@ -6,38 +6,53 @@ 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;
-    protected final String[] disabledServers;
-    private final boolean serverWhitelistMode;
-    protected final String[] disabledWorlds;
-    private final boolean worldWhitelistMode;
+
+    /** 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, refreshDisplayName, null, null);
-    }
-
-    protected TabFeature(String featureName, String refreshDisplayName, List<String> disabledServers, List<String> disabledWorlds) {
         this.featureName = featureName;
         this.refreshDisplayName = refreshDisplayName;
-        if (disabledServers != null) {
-            this.disabledServers = disabledServers.toArray(new String[0]);
-            serverWhitelistMode = disabledServers.contains("WHITELIST");
-        } else {
-            this.disabledServers = new String[0];
-            serverWhitelistMode = false;
-        }
-        if (disabledWorlds != null) {
-            this.disabledWorlds = disabledWorlds.toArray(new String[0]);
-            worldWhitelistMode = disabledWorlds.contains("WHITELIST");
-        } else {
-            this.disabledWorlds = new String[0];
-            worldWhitelistMode = false;
-        }
         try {
             if (getClass().getMethod("onCommand", TabPlayer.class, String.class).getDeclaringClass() != TabFeature.class)
                 methodOverrides.add("onCommand");
@@ -49,12 +64,16 @@ public abstract class TabFeature {
                 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)
+            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)
+            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)
@@ -71,7 +90,34 @@ public abstract class TabFeature {
     }
 
     /**
-     * Loads all players and sends packets
+     * 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
@@ -85,10 +131,13 @@ public abstract class TabFeature {
     }
 
     /**
-     * Processes command from player
-     * @param sender - command sender
-     * @param message - command line
-     * @return true if event should be cancelled, false if not
+     * 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;
@@ -96,7 +145,9 @@ public abstract class TabFeature {
 
     /**
      * Processes join event
-     * @param connectedPlayer - player who connected
+     *
+     * @param   connectedPlayer
+     *          player who connected
      */
     public void onJoin(TabPlayer connectedPlayer) {
         //empty by default
@@ -104,16 +155,23 @@ public abstract class TabFeature {
 
     /**
      * Processes quit event
-     * @param disconnectedPlayer - player who disconnected
+     *
+     * @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
+     *
+     * @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
@@ -121,9 +179,13 @@ public abstract class TabFeature {
 
     /**
      * Processes server switch
-     * @param changed - player who switched server
-     * @param from - server player changed from
-     * @param to - server player changed to
+     *
+     * @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
@@ -131,8 +193,11 @@ public abstract class TabFeature {
 
     /**
      * Processes the packet send and returns true if packet should be cancelled
-     * @param receiver - player receiving packet
-     * @param packet - received packet
+     *
+     * @param   receiver
+     *          player receiving packet
+     * @param   packet
+     *          received packet
      */
     public void onDisplayObjective(TabPlayer receiver, PacketPlayOutScoreboardDisplayObjective packet) {
         //empty by default
@@ -140,7 +205,9 @@ public abstract class TabFeature {
 
     /**
      * Processes login packet, only available on BungeeCord
-     * @param packetReceiver - player receiving client reset packet
+     *
+     * @param   packetReceiver
+     *          player receiving client reset packet
      */
     public void onLoginPacket(TabPlayer packetReceiver) {
         //empty by default
@@ -148,8 +215,11 @@ public abstract class TabFeature {
 
     /**
      * Processes the packet send
-     * @param receiver - player receiving packet
-     * @param packet - received packet
+     *
+     * @param   receiver
+     *          player receiving packet
+     * @param   packet
+     *          received packet
      */
     public void onObjective(TabPlayer receiver, PacketPlayOutScoreboardObjective packet) {
         //empty by default
@@ -157,8 +227,11 @@ public abstract class TabFeature {
 
     /**
      * Processes the packet send and possibly modifies it
-     * @param receiver - player receiving packet
-     * @param info - received packet
+     *
+     * @param   receiver
+     *          player receiving packet
+     * @param   info
+     *          received packet
      */
     public void onPlayerInfo(TabPlayer receiver, PacketPlayOutPlayerInfo info) {
         //empty by default
@@ -166,11 +239,14 @@ public abstract class TabFeature {
 
     /**
      * 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
+     *
+     * @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;
@@ -178,10 +254,13 @@ public abstract class TabFeature {
 
     /**
      * Processes raw packet sent to client
-     * @param receiver - packet receiver
-     * @param packet - the packet
-     * @throws    ReflectiveOperationException
-     *             if thrown by reflective operation
+     *
+     * @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
@@ -189,20 +268,31 @@ public abstract class TabFeature {
 
     /**
      * Performs refresh of specified player
-     * @param refreshed - player to refresh
-     * @param force - if refresh should be forced despite refresh seemingly not needed
+     *
+     * @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
+     *
+     * @param   placeholders
+     *          placeholders to add as used in this feature
      */
     public void addUsedPlaceholders(Collection<String> placeholders) {
         if (placeholders.isEmpty()) return;
@@ -210,10 +300,13 @@ public abstract class TabFeature {
     }
 
     /**
-     * Returns true if world or server is disabled, false if not
-     * @param world - world to check
-     * @param server - server to check
-     * @return true if feature should be disabled, false if not
+     * 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);
@@ -224,6 +317,17 @@ public abstract class TabFeature {
         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) {
@@ -238,30 +342,67 @@ public abstract class TabFeature {
 
     /**
      * Returns name of the feature displayed in /tab cpu.
-     * @return 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);
     }
-
-    public String getRefreshDisplayName() {
-        return refreshDisplayName;
-    }
 }

api/src/main/java/me/neznamy/tab/api/TabPlayer.java

@@ -19,225 +19,302 @@ public interface TabPlayer {
 
     /**
      * Returns player's name
-     * @return Player's name
+     *
+     * @return  Player's name
      */
     String getName();
 
     /**
      * Returns player's UUID
-     * @return 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
+     *
+     * @return  player's uuid in TabList
      */
     UUID getTablistUUID();
 
     /**
      * Returns player's protocol version
-     * @return player's protocol version
+     *
+     * @return  player's protocol version
      */
     ProtocolVersion getVersion();
 
     /**
      * Returns platform-specific entity
-     * @return an instance of bukkit/bungee player depending on platform
+     *
+     * @return  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
+     *
+     * @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
+     *
+     * @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
+     *
+     * @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
+     *
+     * @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 
+     *
+     * @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 
+     *
+     * @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
+     *
+     * @param   packet
+     *          an instance of packet depending on platform
      */
     void sendPacket(Object packet);
 
-    /**
-     * Sends the player a platform-specific packet and adds that packet into counter that
-     * is displayed in /tab cpu
-     * @param packet - an instance of packet depending on platform
-     * @param feature - feature to increment sent packet counter of 
-     */
-    void sendPacket(Object packet, TabFeature feature);
-
-    /**
-     * Sends the player a platform-specific packet and adds that packet into counter that
-     * is displayed in /tab cpu
-     * @param packet - an instance of packet depending on platform
-     * @param feature - feature to increment sent packet counter of
-     */
-    void sendPacket(Object packet, String feature);
-
     /**
      * Returns player's property by name
-     * @param name - name of property
-     * @return the property or null if not found
+     *
+     * @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
+     *
+     * @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
+     *
+     * @param   message
+     *          message to send
      */
     void sendMessage(IChatBaseComponent message);
 
     /**
-     * Returns player's primary permission group
-     * @return player's group depending on configuration
-     */
-    String getGroup();
-
-    /**
-     * Returns player's channel or null if server is 1.7 or older
-     * @return player's channel
+     * 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
+     *
+     * @return  player's ping
      */
     int getPing();
 
     /**
      * Returns player's skin data
-     * @return player's skin
+     *
+     * @return  player's skin
      */
     Skin getSkin();
 
     /**
      * Returns true once the player is successfully loaded (onJoin method ran through all methods)
-     * @return true if player is fully loaded, false otherwise
+     *
+     * @return  {@code true} if player is fully loaded, {@code false} otherwise
      */
     boolean isLoaded();
 
     /**
      * Sets property with specified name to new value. If property did not exist before, it is
-     * created and true is returned. If it existed, it is overridden and true is returned. False is returned otherwise.
-     * @param feature - feature using this property to get placeholders registered
-     * @param identifier - property name
-     * @param rawValue - new raw value
-     * @return true if value changed / did not exist, false if value did not change
+     * 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 true if value did not exist or changed, false otherwise
+     *
+     * @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, sets it to ifNotSet value
-     * @param property - property name to load
-     * @param ifNotSet - value to use if property is not defined in config
-     * @return true if value did not exist or changed, false otherwise
+     * 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 null if NameTag feature is disabled
-     * @return name of player's team
+     * Returns name of player's scoreboard team or {@code null} if NameTag feature is disabled
+     *
+     * @return  name of player's team
      */
     String getTeamName();
 
     /**
-     * Returns user-friendly explanation of team name
-     * @return explanation behind team name
-     */
-    String getTeamNameNote();
-
-    /**
-     * Returns true if player is disguised using LibsDisguises
-     * @return true if player is disguised, false if not
+     * 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 true if player has invisibility potion, false if not. For bukkit, API is used, for BungeeCord
-     * bukkit bridge is used
-     * @return true if player has invisibility potion, false if not
+     * 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();
 
     /**
-     * Currently only PV hook on BungeeCord for global PlayerList function. Looking to expand this
-     * in the future
-     * @return true if vanished with PV on BungeeCord
+     * 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();
 
     /**
-     * Returns true if player is online according to server
-     * @return true if online, false if not
+     * 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
+     *
+     * @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
+     * detected by standard group assign logic
+     *
+     * @return  player's primary permission group
+     */
+    String getGroup();
+
+    /**
+     * Temporarily overrides player's group and applies all changes coming from new group.
+     * This includes all properties and sorting, if used.
+     *
+     * @param   group
+     *          New group to use
+     * @see     #hasTemporaryGroup()
+     * @see     #resetTemporaryGroup()
+     */
     void setTemporaryGroup(String group);
 
+    /**
+     * Returns temporary group applied to the player using {@link #setTemporaryGroup(String)}.
+     * If no group was set, returns {@code null}
+     *
+     * @return  Temporary group assigned to player or {@code null} if not set
+     * @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();
 }

api/src/main/java/me/neznamy/tab/api/TablistFormatManager.java

@@ -1,29 +1,168 @@
 package me.neznamy.tab.api;
 
+/**
+ * An interface allowing to modify tablist display names
+ * of players.
+ * <p>
+ * Instance can be obtained using {@link TabAPI#getTablistFormatManager()}.
+ * This requires the feature to be enabled in config, otherwise the method will
+ * return {@code null}.
+ */
 public interface TablistFormatManager {
 
+    /**
+     * Changes player's prefix to provided value. Supports placeholders,
+     * as well as any supported RGB formats.
+     *
+     * @param   player
+     *          player to change prefix of
+     * @param   prefix
+     *          new prefix value
+     * @see     #resetPrefix(TabPlayer)
+     * @see     #getCustomPrefix(TabPlayer)
+     * @see     #getOriginalPrefix(TabPlayer)
+     */
     void setPrefix(TabPlayer player, String prefix);
-    
+
+    /**
+     * Changes player's name to provided value. Supports placeholders,
+     * as well as any supported RGB formats.
+     *
+     * @param   player
+     *          player to change prefix of
+     * @param   customName
+     *          new customName value
+     * @see     #resetName(TabPlayer)
+     * @see     #getCustomName(TabPlayer)
+     * @see     #getOriginalName(TabPlayer)
+     */
     void setName(TabPlayer player, String customName);
-    
+
+    /**
+     * Changes player's suffix to provided value. Supports placeholders,
+     * as well as any supported RGB formats.
+     *
+     * @param   player
+     *          player to change prefix of
+     * @param   suffix
+     *          new suffix value
+     * @see     #resetSuffix(TabPlayer)
+     * @see     #getCustomSuffix(TabPlayer)
+     * @see     #getOriginalSuffix(TabPlayer)
+     */
     void setSuffix(TabPlayer player, String suffix);
-    
+
+    /**
+     * Resets player's prefix previously assigned using {@link #setPrefix(TabPlayer, String)}
+     * method. If nothing was set, this method will not do anything.
+     *
+     * @param   player
+     *          player to reset prefix of
+     * @see     #setPrefix(TabPlayer, String)
+     * @see     #getCustomPrefix(TabPlayer)
+     * @see     #getOriginalPrefix(TabPlayer)
+     */
     void resetPrefix(TabPlayer player);
-    
+
+    /**
+     * Resets player's custom name previously assigned using {@link #setName(TabPlayer, String)}
+     * method. If nothing was set, this method will not do anything.
+     *
+     * @param   player
+     *          player to reset name of
+     * @see     #setName(TabPlayer, String)
+     * @see     #getCustomName(TabPlayer)
+     * @see     #getOriginalName(TabPlayer)
+     */
     void resetName(TabPlayer player);
-    
+
+    /**
+     * Resets player's suffix previously assigned using {@link #setSuffix(TabPlayer, String)}
+     * method. If nothing was set, this method will not do anything.
+     *
+     * @param   player
+     *          player to reset suffix of
+     * @see     #setSuffix(TabPlayer, String)
+     * @see     #getCustomSuffix(TabPlayer)
+     * @see     #getOriginalSuffix(TabPlayer)
+     */
     void resetSuffix(TabPlayer player);
-    
+
+    /**
+     * Returns prefix assigned using {@link #setPrefix(TabPlayer, String)} method.
+     * If the method was not used, {@code null} is returned.
+     *
+     * @param   player
+     *          player to get custom prefix of
+     * @return  player's custom prefix or {@code null} if not defined
+     * @see     #setPrefix(TabPlayer, String)
+     * @see     #resetPrefix(TabPlayer)
+     * @see     #getOriginalPrefix(TabPlayer)
+     */
     String getCustomPrefix(TabPlayer player);
-    
+
+    /**
+     * Returns custom name assigned using {@link #setName(TabPlayer, String)} method.
+     * If the method was not used, {@code null} is returned.
+     *
+     * @param   player
+     *          player to get custom name of
+     * @return  player's custom name or {@code null} if not defined
+     * @see     #setName(TabPlayer, String)
+     * @see     #resetName(TabPlayer)
+     * @see     #getOriginalName(TabPlayer)
+     */
     String getCustomName(TabPlayer player);
-    
+
+    /**
+     * Returns suffix assigned using {@link #setSuffix(TabPlayer, String)} method.
+     * If the method was not used, {@code null} is returned.
+     *
+     * @param   player
+     *          player to get custom suffix of
+     * @return  player's custom suffix or {@code null} if not defined
+     * @see     #setSuffix(TabPlayer, String)
+     * @see     #resetSuffix(TabPlayer)
+     * @see     #getOriginalSuffix(TabPlayer)
+     */
     String getCustomSuffix(TabPlayer player);
-    
+
+    /**
+     * Returns player's original prefix applied using plugin's internal logic.
+     * This value is not affected by API calls in any way.
+     *
+     * @param   player
+     *          player to get original prefix of
+     * @return  player's original prefix
+     * @see     #setPrefix(TabPlayer, String)
+     * @see     #resetPrefix(TabPlayer)
+     * @see     #getCustomPrefix(TabPlayer)
+     */
     String getOriginalPrefix(TabPlayer player);
-    
+
+    /**
+     * Returns player's original name applied using plugin's internal logic.
+     * This value is not affected by API calls in any way.
+     *
+     * @param   player
+     *          player to get original name of
+     * @return  player's original name
+     * @see     #setName(TabPlayer, String)
+     * @see     #resetName(TabPlayer)
+     * @see     #getCustomName(TabPlayer)
+     */
     String getOriginalName(TabPlayer player);
-    
+
+    /**
+     * Returns player's original suffix applied using plugin's internal logic.
+     * This value is not affected by API calls in any way.
+     *
+     * @param   player
+     *          player to get original suffix of
+     * @return  player's original suffix
+     * @see     #setSuffix(TabPlayer, String)
+     * @see     #resetSuffix(TabPlayer)
+     * @see     #getCustomSuffix(TabPlayer)
+     */
     String getOriginalSuffix(TabPlayer player);
-    
 }

api/src/main/java/me/neznamy/tab/api/bossbar/BarStyle.java

@@ -19,8 +19,8 @@ public enum BarStyle {
     /**
      * Initializes enum constant with given bukkit name
      *
-     * @param     bukkitName
-     *             Name of color to be returned in {@code getBukkitName()}
+     * @param   bukkitName
+     *          Name of color to be returned in {@code getBukkitName()}
      */
     BarStyle(String bukkitName){
         this.bukkitName = bukkitName;
@@ -28,7 +28,7 @@ public enum BarStyle {
 
     /**
      * Returns name of this style in Bukkit API
-     * @return    name of this style in Bukkit API
+     * @return  name of this style in Bukkit API
      */
     public String getBukkitName() {
         return bukkitName;

api/src/main/java/me/neznamy/tab/api/bossbar/BossBar.java

@@ -23,14 +23,16 @@ public interface BossBar {
      * Returns name of this BossBar. If it was defined in config, returns
      * the name specified in config. If it was made using the API, returns
      * randomly generated ID given to this BossBar when creating.
-     * @return    name of BossBar
+     *
+     * @return  name of BossBar
      */
     String getName();
 
     /**
      * Returns randomly generated uuid of this BossBar used internally to match
      * the BossBar in client with packets or with Bukkit API BossBar instances.
-     * @return    uuid of this BossBar
+     *
+     * @return  uuid of this BossBar
      */
     UUID getUniqueId();
 
@@ -43,8 +45,8 @@ public interface BossBar {
      * <p>
      * If specified title is equal to the current one, nothing happens.
      *
-     * @param    title
-     *             New title to display in this BossBar
+     * @param   title
+     *          New title to display in this BossBar
      */
     void setTitle(String title);
 
@@ -59,8 +61,8 @@ public interface BossBar {
      * <p>
      * If specified progress is equal to the current one, nothing happens.
      *
-     * @param    progress
-     *             New progress to use in this BossBar
+     * @param   progress
+     *          New progress to use in this BossBar
      */
     void setProgress(String progress);
 
@@ -68,8 +70,9 @@ public interface BossBar {
      * Changes BossBar progress to specified value ranging from 0 to 100.
      * <p>
      * If specified progress is equal to the current one, nothing happens.
-     * @param    progress
-     *             New progress to use in this BossBar
+     *
+     * @param   progress
+     *          New progress to use in this BossBar
      */
     void setProgress(float progress);
 
@@ -84,8 +87,8 @@ public interface BossBar {
      * <p>
      * If specified color is equal to the current one, nothing happens.
      *
-     * @param    color
-     *             New color to use in this BossBar
+     * @param   color
+     *          New color to use in this BossBar
      */
     void setColor(String color);
 
@@ -94,8 +97,8 @@ public interface BossBar {
      * <p>
      * If specified color is equal to the current one, nothing happens.
      *
-     * @param    color
-     *             New color to use in this BossBar
+     * @param   color
+     *          New color to use in this BossBar
      */
     void setColor(BarColor color);
 
@@ -110,8 +113,8 @@ public interface BossBar {
      * <p>
      * If specified style is equal to the current one, nothing happens.
      *
-     * @param    style
-     *             New style to use in this BossBar
+     * @param   style
+     *          New style to use in this BossBar
      */
     void setStyle(String style);
 
@@ -120,36 +123,40 @@ public interface BossBar {
      * <p>
      * If specified style is equal to the current one, nothing happens.
      *
-     * @param    style
-     *             New style to use in this BossBar
+     * @param   style
+     *          New style to use in this BossBar
      */
     void setStyle(BarStyle style);
 
     /**
      * Returns current title of the BossBar in raw format. If it contains placeholders,
      * their raw identifiers are used in the result.
-     * @return    title of the BossBar
+     *
+     * @return  title of the BossBar
      */
     String getTitle();
 
     /**
      * Returns progress of the BossBar as a string, which is either entered string
      * containing placeholders or entered number converted to string
-     * @return    entered progress as a string
+     *
+     * @return  entered progress as a string
      */
     String getProgress();
 
     /**
      * Returns color of the BossBar as a string, which is either entered string
      * containing placeholders or entered enum value converted to string
-     * @return    entered color as a string
+     *
+     * @return  entered color as a string
      */
     String getColor();
 
     /**
      * Returns style of the BossBar as a string, which is either entered string
      * containing placeholders or entered enum value converted to string
-     * @return    entered style as a string
+     *
+     * @return  entered style as a string
      */
     String getStyle();
 
@@ -158,8 +165,8 @@ public interface BossBar {
      * <p>
      * If the player already sees this BossBar, nothing happens.
      *
-     * @param    player
-     *             Player to register this BossBar to
+     * @param   player
+     *          Player to register this BossBar to
      */
     void addPlayer(TabPlayer player);
 
@@ -168,8 +175,8 @@ public interface BossBar {
      * <p>
      * If the player does not see this BossBar, nothing happens.
      *
-     * @param    player
-     *             Player to unregister this BossBar from
+     * @param   player
+     *          Player to unregister this BossBar from
      */
     void removePlayer(TabPlayer player);
 
@@ -179,15 +186,25 @@ public interface BossBar {
      * The returned list can only be used to read. Writing
      * will not work properly. For adding/removing players see {@link #addPlayer(TabPlayer)}
      * and {@link #removePlayer(TabPlayer)}.
-     * @return    List of players seeing this BossBar
+     *
+     * @return  List of players seeing this BossBar
      */
     List<TabPlayer> getPlayers();
 
     /**
      * Returns {@code true} if specified player can see this BossBar, {@code false} if not
-     * @param    player
-     *             Player to check for
-     * @return    {@code true} if contains, {@code false} if not
+     *
+     * @param   player
+     *          Player to check for
+     * @return  {@code true} if contains, {@code false} if not
      */
     boolean containsPlayer(TabPlayer player);
+
+    /**
+     * Returns {@code true} if this bossbar in configured as announcement-only bar,
+     * {@code false} if not.
+     *
+     * @return  {@code true} if bar is announcement only, {@code false} if not
+     */
+    boolean isAnnouncementBar();
 }

api/src/main/java/me/neznamy/tab/api/bossbar/BossBarManager.java

@@ -4,15 +4,16 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
+import me.neznamy.tab.api.TabAPI;
 import me.neznamy.tab.api.TabPlayer;
 
 /**
  * An interface allowing work with BossBars such as creating, sending
  * and toggling.
  * <p>
- * Instance can be obtained using {@link me.neznamy.tab.api.TabAPI#getBossBarManager()}.
+ * Instance can be obtained using {@link TabAPI#getBossBarManager()}.
  * This requires the BossBar feature to be enabled in config, otherwise the method will
- * return null.
+ * return {@code null}.
  */
 public interface BossBarManager {
 
@@ -20,18 +21,15 @@ public interface BossBarManager {
      * Creates BossBar with specified parameters and registers it to BossBar manager,
      * allowing to retrieve it later.
      * 
-     * @param    title
-     *             Title to display, supports placeholders
-     * 
-     * @param    progress
-     *             Progress to use. Must be between 0 and 100
-     * 
-     * @param    color
-     *             Color to use
-     * 
-     * @param    style
-     *             Style to use
-     * @return    The newly created BossBar
+     * @param   title
+     *          Title to display, supports placeholders
+     * @param   progress
+     *          Progress to use. Must be between 0 and 100
+     * @param   color
+     *          Color to use
+     * @param   style
+     *          Style to use
+     * @return  The newly created BossBar
      */
     BossBar createBossBar(String title, float progress, BarColor color, BarStyle style);
 
@@ -39,21 +37,18 @@ public interface BossBarManager {
      * Creates BossBar with specified parameters and registers it to BossBar manager,
      * allowing to retrieve it later.
      * 
-     * @param    title
-     *             Title to display, supports placeholders
-     * 
-     * @param    progress
-     *             Progress to use. Must be a string version of a number, or
-     *             a placeholder that returns a number
-     * 
-     * @param    color
-     *             Color to use. Must be a string version of one of enum constants, or
-     *             a placeholder that returns one of them
-     * 
-     * @param    style
-     *             Style to use. Must be a string version of one of enum constants, or
-     *             a placeholder that returns one of them
-     * @return    The newly created BossBar
+     * @param   title
+     *          Title to display, supports placeholders
+     * @param   progress
+     *          Progress to use. Must be a string version of a number, or
+     *          a placeholder that returns a number
+     * @param   color
+     *          Color to use. Must be a string version of one of enum constants, or
+     *          a placeholder that returns one of them
+     * @param   style
+     *          Style to use. Must be a string version of one of enum constants, or
+     *          a placeholder that returns one of them
+     * @return  The newly created BossBar
      */
     BossBar createBossBar(String title, String progress, String color, String style);
 
@@ -63,9 +58,9 @@ public interface BossBarManager {
      * retrieved using {@link me.neznamy.tab.api.bossbar.BossBar#getName()}.
      * Returns null if no such BossBar exists.
      * 
-     * @param    name
-     *             Name of registered BossBar
-     * @return    BossBar with specified name
+     * @param   name
+     *          Name of registered BossBar
+     * @return  BossBar with specified name
      */
     BossBar getBossBar(String name);
 
@@ -74,9 +69,9 @@ public interface BossBarManager {
      * 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
+     * @param   id
+     *          UUID to return BossBar by
+     * @return  BossBar with specified uuid
      */
     BossBar getBossBar(UUID id);
 
@@ -86,31 +81,31 @@ public interface BossBarManager {
      * <p>
      * Map key is BossBar's name available in {@link me.neznamy.tab.api.bossbar.BossBar#getName()},
      * map value is the BossBar interface.
-     * @return    all registered BossBars
+     *
+     * @return  all registered BossBars
      */
     Map<String, BossBar> getRegisteredBossBars();
 
     /**
      * Toggles BossBar for this player and sends toggle message if {@code sendToggleMessage} is true.
      * 
-     * @param    player
-     *             Player to toggle BossBar for
-     * 
-     * @param    sendToggleMessage
-     *             {@code true} if toggle message should be sent, {@code false} if not
-     * @see #hasBossBarVisible(TabPlayer)
-     * @see #setBossBarVisible(TabPlayer, boolean, boolean)
+     * @param   player
+     *          Player to toggle BossBar for
+     * @param   sendToggleMessage
+     *          {@code true} if toggle message should be sent, {@code false} if not
+     * @see     #hasBossBarVisible(TabPlayer)
+     * @see     #setBossBarVisible(TabPlayer, boolean, boolean)
      */
     void toggleBossBar(TabPlayer player, boolean sendToggleMessage);
 
     /**
      * Returns true if player can see BossBars, false if toggled via command or API.
      * 
-     * @param    player
-     *             Player to check toggle status of
-     * @return    {@code true} if visible, {@code false} if disabled (toggled)
-     * @see #toggleBossBar(TabPlayer, boolean)
-     * @see #setBossBarVisible(TabPlayer, boolean, boolean)
+     * @param   player
+     *          Player to check toggle status of
+     * @return  {@code true} if visible, {@code false} if disabled (toggled)
+     * @see     #toggleBossBar(TabPlayer, boolean)
+     * @see     #setBossBarVisible(TabPlayer, boolean, boolean)
      */
     boolean hasBossBarVisible(TabPlayer player);
 
@@ -118,12 +113,12 @@ public interface BossBarManager {
      * Sets BossBar visibility of player to set value. If value did not change, nothing happens.
      * If visibility changed, toggle message is sent if {@code sendToggleMessage} is {@code true}.
      * 
-     * @param    player
-     *             Player to set BossBar visibility of
-     * @param    visible
-     *             {@code true} if BossBar should be visible, {@code false} if not
-     * @param    sendToggleMessage
-     *             {@code true} if toggle message should be sent if value changed, {@code false} if not
+     * @param   player
+     *          Player to set BossBar visibility of
+     * @param   visible
+     *          {@code true} if BossBar should be visible, {@code false} if not
+     * @param   sendToggleMessage
+     *          {@code true} if toggle message should be sent if value changed, {@code false} if not
      * @see #toggleBossBar(TabPlayer, boolean)
      * @see #hasBossBarVisible(TabPlayer)
      */
@@ -131,37 +126,40 @@ public interface BossBarManager {
 
     /**
      * Temporarily displays registered BossBar to player for specified amount of time in milliseconds.
-     * @param    player
-     *             Player to show BossBar to
-     * @param    bossBar
-     *             Name of registered BossBar to show
-     * @param    duration
-     *             In milliseconds for how long should BossBar be displayed
-     * @throws    IllegalArgumentException
-     *             if no BossBar with specified name exists
-     * @see #announceBossBar(String, int)
-     * @see #getAnnouncedBossBars()
+     *
+     * @param   player
+     *          Player to show BossBar to
+     * @param   bossBar
+     *          Name of registered BossBar to show
+     * @param   duration
+     *          In milliseconds for how long should BossBar be displayed
+     * @throws  IllegalArgumentException
+     *          if no BossBar with specified name exists
+     * @see     #announceBossBar(String, int)
+     * @see     #getAnnouncedBossBars()
      */
     void sendBossBarTemporarily(TabPlayer player, String bossBar, int duration);
 
     /**
      * Temporarily displays registered BossBar to all players for specified amount of time in milliseconds.
-     * @param    bossBar
-     *             Name of registered BossBar to show
-     * @param    duration
-     *             In milliseconds for how long should BossBar be displayed
-     * @throws    IllegalArgumentException
-     *             if no BossBar with specified name exists
-     * @see #sendBossBarTemporarily(TabPlayer, String, int)
-     * @see #getAnnouncedBossBars()
+     *
+     * @param   bossBar
+     *          Name of registered BossBar to show
+     * @param   duration
+     *          In milliseconds for how long should BossBar be displayed
+     * @throws  IllegalArgumentException
+     *          if no BossBar with specified name exists
+     * @see     #sendBossBarTemporarily(TabPlayer, String, int)
+     * @see     #getAnnouncedBossBars()
      */
     void announceBossBar(String bossBar, int duration);
 
     /**
      * Returns list of BossBars which are currently being announced.
-     * @return    list of currently active BossBar announcements
-     * @see #sendBossBarTemporarily(TabPlayer, String, int)
-     * @see #announceBossBar(String, int)
+     *
+     * @return  list of currently active BossBar announcements
+     * @see     #sendBossBarTemporarily(TabPlayer, String, int)
+     * @see     #announceBossBar(String, int)
      */
     List<BossBar> getAnnouncedBossBars();
 }

api/src/main/java/me/neznamy/tab/api/chat/ChatClickable.java

@@ -15,12 +15,13 @@ public class ChatClickable {
 
     /**
      * 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
+     *
+     * @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");
@@ -31,7 +32,8 @@ public class ChatClickable {
 
     /**
      * Returns click action defined in constructor
-     * @return    click action
+     *
+     * @return  click action
      */
     public EnumClickAction getAction() {
         return action;
@@ -39,7 +41,8 @@ public class ChatClickable {
 
     /**
      * Returns click action defined in constructor
-     * @return    click action
+     *
+     * @return  click action
      */
     public String getValue() {
         return value;

api/src/main/java/me/neznamy/tab/api/chat/ChatComponentEntity.java

@@ -2,21 +2,23 @@ package me.neznamy.tab.api.chat;
 
 import java.util.UUID;
 
-import com.google.gson.JsonObject;
+import me.neznamy.tab.api.TabAPI;
 import me.neznamy.tab.api.util.Preconditions;
 
 public class ChatComponentEntity extends IChatBaseComponent {
 
-    private final String type;
-    private final UUID id;
-    private final String name;
-    
+    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.type = type;
-        this.id = id;
-        this.name = name;
+        this.CONTENTS = String.format("{\"type\":\"%s\",\"id\":\"%s\",\"name\":{\"text\":\"%s\"}}", type, id, name);
+        this.VALUE_1_13 = String.format("{type:\"%s\",id:\"%s\",name:\"{\\\"text\\\":\\\"%s\\\"}\"}", type, id, name);
+        this.VALUE_1_12 = String.format("{type:\"%s\",id:\"%s\",name:\"%s\"}", type, id, name);
+        this.VALUE_1_8 = String.format("{type:%s,id:%s,name:%s}", type, id, name);
     }
 
     @Override
@@ -26,16 +28,10 @@ public class ChatComponentEntity extends IChatBaseComponent {
     
     @Override
     public String toString() {
-        return String.format("{\"type\":\"%s\",\"id\":\"%s\",\"name\":{\"text\":\"%s\"}}", type, id, name);
-    }
-    
-    public JsonObject toJson() {
-        JsonObject json = new JsonObject();
-        json.addProperty("type", type);
-        json.addProperty("id", id.toString());
-        JsonObject json2 = new JsonObject();
-        json2.addProperty("text", name);
-        json.add("name", json2);
-        return json;
+        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");
     }
 }

api/src/main/java/me/neznamy/tab/api/chat/ChatHoverable.java

@@ -15,12 +15,13 @@ public class ChatHoverable {
 
     /**
      * 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
+     *
+     * @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");
@@ -31,7 +32,8 @@ public class ChatHoverable {
 
     /**
      * Returns hover action defined in constructor
-     * @return    hover action
+     *
+     * @return  hover action
      */
     public EnumHoverAction getAction() {
         return action;
@@ -39,7 +41,8 @@ public class ChatHoverable {
 
     /**
      * Returns hover value defined in constructor
-     * @return    hover value
+     *
+     * @return  hover value
      */
     public IChatBaseComponent getValue() {
         return value;
@@ -50,8 +53,18 @@ public class ChatHoverable {
      */
     public enum EnumHoverAction {
 
-        SHOW_TEXT,
-        SHOW_ITEM,
-        SHOW_ENTITY
+        SHOW_TEXT("contents"),
+        SHOW_ITEM("value"),
+        SHOW_ENTITY("contents");
+
+        private final String preferredKey;
+
+        EnumHoverAction(String preferredKey) {
+            this.preferredKey = preferredKey;
+        }
+
+        public String getPreferredKey() {
+            return preferredKey;
+        }
     }
 }

api/src/main/java/me/neznamy/tab/api/chat/ChatModifier.java

@@ -94,7 +94,8 @@ public class ChatModifier {
 
     /**
      * Returns true if bold is defined and set to true, false otherwise
-     * @return 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);
@@ -102,7 +103,8 @@ public class ChatModifier {
 
     /**
      * Returns true if italic is defined and set to true, false otherwise
-     * @return 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);
@@ -110,7 +112,8 @@ public class ChatModifier {
 
     /**
      * Returns true if underlined is defined and set to true, false otherwise
-     * @return 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);
@@ -118,7 +121,8 @@ public class ChatModifier {
 
     /**
      * Returns true if strikethrough is defined and set to true, false otherwise
-     * @return 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);
@@ -126,7 +130,8 @@ public class ChatModifier {
 
     /**
      * Returns true if obfuscation is defined and set to true, false otherwise
-     * @return 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);
@@ -150,7 +155,9 @@ public class ChatModifier {
 
     /**
      * Sets click action to OPEN_URL and url to given value
-     * @param url - url to open
+     *
+     * @param   url
+     *          url to open
      */
     public void onClickOpenUrl(String url) {
         Preconditions.checkNotNull(url, "url");
@@ -159,7 +166,9 @@ public class ChatModifier {
 
     /**
      * Sets click action to RUN_COMMAND and command to given value
-     * @param command - command to perform, might be without / to send a chat message
+     *
+     * @param   command
+     *          command to perform, might be without / to send a chat message
      */
     public void onClickRunCommand(String command) {
         Preconditions.checkNotNull(command, "command");
@@ -168,7 +177,9 @@ public class ChatModifier {
 
     /**
      * Sets click action to SUGGEST_COMMAND and command to given value
-     * @param command - command to suggest
+     *
+     * @param   command
+     *          command to suggest
      */
     public void onClickSuggestCommand(String command) {
         Preconditions.checkNotNull(command, "command");
@@ -177,7 +188,9 @@ public class ChatModifier {
 
     /**
      * Sets click action to CHANGE_PAGE and page id to given value
-     * @param newPage - id of new page
+     *
+     * @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");
@@ -186,7 +199,9 @@ public class ChatModifier {
 
     /**
      * Sets click action to COPY_TO_CLIPBOARD and text to provided value
-     * @param text - text to copy to clipboard on click
+     *
+     * @param   text
+     *          text to copy to clipboard on click
      */
     public void onClickCopyToClipBoard(String text) {
         Preconditions.checkNotNull(text, "text");
@@ -201,7 +216,9 @@ public class ChatModifier {
 
     /**
      * Sets hover action to SHOW_TEXT and text to given value
-     * @param text - text to show
+     *
+     * @param   text
+     *          text to show
      */
     public void onHoverShowText(IChatBaseComponent text) {
         Preconditions.checkNotNull(text, "text");
@@ -210,7 +227,9 @@ public class ChatModifier {
 
     /**
      * Sets hover action to SHOW_ITEM and item to given value
-     * @param serializedItem - item to show
+     *
+     * @param   serializedItem
+     *          item to show
      */
     public void onHoverShowItem(String serializedItem) {
         Preconditions.checkNotNull(serializedItem, "item");
@@ -219,24 +238,18 @@ public class ChatModifier {
 
     /**
      * 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
+     *
+     * @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");
-        if (TabAPI.getInstance().getServerVersion().getMinorVersion() >= 16) {
-            hoverEvent = new ChatHoverable(EnumHoverAction.SHOW_ENTITY, new ChatComponentEntity(type, id, name));
-        } else if (TabAPI.getInstance().getServerVersion().getMinorVersion() >= 13) {
-            hoverEvent = new ChatHoverable(EnumHoverAction.SHOW_ENTITY, new IChatBaseComponent(String.format("{type:\"%s\",id:\"%s\",name:\"{\\\"text\\\":\\\"%s\\\"}\"}", type, id, name)));
-        } else if (TabAPI.getInstance().getServerVersion().getMinorVersion() == 12) {
-            hoverEvent = new ChatHoverable(EnumHoverAction.SHOW_ENTITY, new IChatBaseComponent(String.format("{type:\"%s\",id:\"%s\",name:\"%s\"}", type, id, name)));
-        } else if (TabAPI.getInstance().getServerVersion().getMinorVersion() >= 8) {
-            hoverEvent = new ChatHoverable(EnumHoverAction.SHOW_ENTITY, new IChatBaseComponent(String.format("{type:%s,id:%s,name:%s}", type, id, name)));
-        } else {
-            throw new IllegalStateException("show_entity hover action is not supported on <1.8");
-        }
+        hoverEvent = new ChatHoverable(EnumHoverAction.SHOW_ENTITY, new ChatComponentEntity(type, id, name));
     }
 
     public void onHover(EnumHoverAction action, IChatBaseComponent value) {
@@ -272,7 +285,7 @@ public class ChatModifier {
             JSONObject hover = new JSONObject();
             hover.put("action", hoverEvent.getAction().toString().toLowerCase());
             if (TabAPI.getInstance().getServerVersion().getMinorVersion() >= 16) {
-                hover.put("contents", hoverEvent.getValue());
+                hover.put(hoverEvent.getAction().getPreferredKey(), hoverEvent.getValue());
             } else {
                 hover.put("value", TabAPI.getInstance().getServerVersion().getMinorVersion() >= 9 ?
                         hoverEvent.getValue() : hoverEvent.getValue().toRawText());

api/src/main/java/me/neznamy/tab/api/chat/DeserializedChatComponent.java

@@ -156,11 +156,11 @@ public class DeserializedChatComponent extends IChatBaseComponent {
     /**
      * 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
+     * @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");

api/src/main/java/me/neznamy/tab/api/chat/EnumChatFormat.java

@@ -59,10 +59,11 @@ public enum EnumChatFormat {
 
     /**
      * Constructs new color instance with given character and hex code
-     * @param    character
-     *             character which the color goes by
-     * @param    hexCode
-     *             6-digit hex code of the color
+     *
+     * @param   character
+     *          character which the color goes by
+     * @param   hexCode
+     *          6-digit hex code of the color
      */
     EnumChatFormat(char character, String hexCode) {
         this.character = character;
@@ -76,8 +77,9 @@ public enum EnumChatFormat {
 
     /**
      * Constructs new magic code instance with given character
-     * @param    character
-     *             character representing the magic code
+     *
+     * @param   character
+     *          character representing the magic code
      */
     EnumChatFormat(char character) {
         this.character = character;
@@ -90,7 +92,8 @@ public enum EnumChatFormat {
 
     /**
      * Returns red value of this color code
-     * @return    red value
+     *
+     * @return  red value
      */
     public short getRed() {
         return red;
@@ -98,7 +101,8 @@ public enum EnumChatFormat {
 
     /**
      * Returns green value of this color code
-     * @return    green value
+     *
+     * @return  green value
      */
     public short getGreen() {
         return green;
@@ -106,7 +110,8 @@ public enum EnumChatFormat {
 
     /**
      * Returns blue value of this color code
-     * @return    blue value
+     *
+     * @return  blue value
      */
     public short getBlue() {
         return blue;
@@ -114,9 +119,10 @@ public enum EnumChatFormat {
 
     /**
      * Returns enum value based on provided character or null if character is not valid
-     * @param    c
-     *             color code character (0-9, a-f, k-o, r)
-     * @return    instance from the character or null if character is not valid
+     *
+     * @param   c
+     *          color code character (0-9, a-f, k-o, r)
+     * @return  instance from the character or null if character is not valid
      */
     public static EnumChatFormat getByChar(char c) {
         for (EnumChatFormat format : VALUES) {
@@ -128,9 +134,10 @@ public enum EnumChatFormat {
     /**
      * Returns enum value of last colors used in given string.
      * If it's null, empty or does not contain color codes, WHITE is returned.
-     * @param    string
-     *             string to check last colors of
-     * @return    last used color code in given string or WHITE if nothing is found
+     *
+     * @param   string
+     *          string to check last colors of
+     * @return  last used color code in given string or WHITE if nothing is found
      */
     public static EnumChatFormat lastColorsOf(String string) {
         if (string == null || string.length() == 0) return EnumChatFormat.WHITE;
@@ -147,7 +154,8 @@ public enum EnumChatFormat {
 
     /**
      * Returns color char followed by color's character
-     * @return color char followed by color's character
+     *
+     * @return  color char followed by color's character
      */
     public String getFormat() {
         return chatFormat;
@@ -155,7 +163,8 @@ public enum EnumChatFormat {
 
     /**
      * Returns character representing this color
-     * @return character representing this color
+     *
+     * @return  character representing this color
      */
     public char getCharacter() {
         return character;
@@ -163,7 +172,8 @@ public enum EnumChatFormat {
 
     /**
      * Returns hex code of this format, null if this is a magic code
-     * @return hex code of this format
+     *
+     * @return  hex code of this format
      */
     public String getHexCode() {
         return hexCode;
@@ -171,13 +181,14 @@ public enum EnumChatFormat {
 
     /**
      * Returns enum value with exact red, green and blue values or null if no match was found
-     * @param    red
-     *             exact red value
-     * @param    green
-     *             exact green value
-     * @param    blue
-     *             exact blue value
-     * @return    enum value or null if no such combination exists
+     *
+     * @param   red
+     *          exact red value
+     * @param   green
+     *          exact green value
+     * @param   blue
+     *          exact blue value
+     * @return  enum value or null if no such combination exists
      */
     public static EnumChatFormat fromRGBExact(int red, int green, int blue){
         for (EnumChatFormat format : VALUES) {
@@ -189,9 +200,10 @@ public enum EnumChatFormat {
     /**
      * Color translation method taken from bukkit, which converts '&' symbol into
      * the actual color character if followed by a valid color character.
-     * @param    textToTranslate
-     *             text to replace color symbol in
-     * @return    colorized string from provided text
+     *
+     * @param   textToTranslate
+     *          text to replace color symbol in
+     * @return  colorized string from provided text
      */
     public static String color(String textToTranslate){
         if (textToTranslate == null) return null;
@@ -208,9 +220,10 @@ public enum EnumChatFormat {
 
     /**
      * Turns back the color symbol into '&' symbol in provided text.
-     * @param    text
-     *             text to revert colors in
-     * @return    reverted text
+     *
+     * @param   text
+     *          text to revert colors in
+     * @return  reverted text
      */
     public static String decolor(String text) {
         if (text == null) return null;
@@ -220,9 +233,10 @@ public enum EnumChatFormat {
 
     /**
      * Code taken from bukkit, which returns last color codes used in provided text.
-     * @param    input
-     *             text to get last colors from
-     * @return    last colors used in provided text or empty string if nothing was found
+     *
+     * @param   input
+     *          text to get last colors from
+     * @return  last colors used in provided text or empty string if nothing was found
      */
     public static String getLastColors(String input) {
         if (input == null) return "";

api/src/main/java/me/neznamy/tab/api/chat/IChatBaseComponent.java

@@ -39,8 +39,9 @@ public class IChatBaseComponent {
     
     /**
      * Constructs a new component which is a clone of provided component
-     * @param    component
-     *             component to clone
+     *
+     * @param   component
+     *          component to clone
      */
     public IChatBaseComponent(IChatBaseComponent component) {
         Preconditions.checkNotNull(component, "component");
@@ -53,8 +54,9 @@ public class IChatBaseComponent {
 
     /**
      * Constructs new instance with given text
-     * @param    text
-     *             text to display
+     *
+     * @param   text
+     *          text to display
      */
     public IChatBaseComponent(String text) {
         this.text = text;
@@ -62,7 +64,8 @@ public class IChatBaseComponent {
 
     /**
      * Returns list of extra components. If no extra components are defined, returns empty list.
-     * @return    list of extra components
+     *
+     * @return  list of extra components
      */
     public List<IChatBaseComponent> getExtra(){
         if (extra == null) return Collections.emptyList();
@@ -71,11 +74,12 @@ public class IChatBaseComponent {
 
     /**
      * Sets full list of extra components to given list. Does not allow empty list.
-     * @param    components
-     *             components to use as extra
-     * @return    self
-     * @throws    IllegalArgumentException
-     *             if {@code components} is an empty list
+     *
+     * @param   components
+     *          components to use as extra
+     * @return  self
+     * @throws  IllegalArgumentException
+     *          if {@code components} is an empty list
      */
     public IChatBaseComponent setExtra(List<IChatBaseComponent> components){
         if (components.isEmpty()) throw new IllegalArgumentException("Unexpected empty array of components"); //exception taken from minecraft
@@ -85,8 +89,9 @@ public class IChatBaseComponent {
 
     /**
      * Appends provided component as extra component
-     * @param    child
-     *            component to append
+     *
+     * @param   child
+     *          component to append
      */
     public void addExtra(IChatBaseComponent child) {
         Preconditions.checkNotNull(child, "extra");
@@ -96,7 +101,8 @@ public class IChatBaseComponent {
 
     /**
      * Returns text of this component
-     * @return    text of this component
+     *
+     * @return  text of this component
      */
     public String getText() {
         return text;
@@ -104,7 +110,8 @@ public class IChatBaseComponent {
 
     /**
      * Returns chat modifier of this component
-     * @return    chat modifier of this component
+     *
+     * @return  chat modifier of this component
      */
     public ChatModifier getModifier() {
         return modifier;
@@ -112,10 +119,11 @@ public class IChatBaseComponent {
 
     /**
      * Sets modifier to provided value
-     * @param    modifier
-     *             modifier to set value to
-     * @throws    IllegalArgumentException
-     *             if {@code modifier} is null
+     *
+     * @param   modifier
+     *          modifier to set value to
+     * @throws  IllegalArgumentException
+     *          if {@code modifier} is null
      */
     public void setModifier(ChatModifier modifier) {
         Preconditions.checkNotNull(modifier, "modifier");
@@ -124,8 +132,9 @@ public class IChatBaseComponent {
 
     /**
      * Changes text of this component
-     * @param    text
-     *             text to show
+     *
+     * @param   text
+     *          text to show
      */
     public void setText(String text) {
         this.text = text;
@@ -133,9 +142,10 @@ public class IChatBaseComponent {
 
     /**
      * Deserializes string and returns created component. If provided string is null, returns null.
-     * @param    json
-     *             serialized string
-     * @return    Deserialized component or null if input is null
+     *
+     * @param   json
+     *          serialized string
+     * @return  Deserialized component or null if input is null
      */
     public static IChatBaseComponent deserialize(String json) {
         if (json == null) return null;
@@ -146,8 +156,9 @@ public class IChatBaseComponent {
      * Converts the component to a string representing the serialized component.
      * This method is only used internally by json library since it's missing
      * protocol version field used by the method.
-     * @return    serialized component in string form
-     * @see #toString(ProtocolVersion)
+     *
+     * @return  serialized component in string form
+     * @see     #toString(ProtocolVersion)
      */
     @Override
     public String toString() {
@@ -162,9 +173,10 @@ public class IChatBaseComponent {
     /**
      * Serializes this component with colors based on client version.
      * If client version is &lt;1.16, HEX colors will be converted to legacy colors.
-     * @param    clientVersion
-     *             client version to adapt component for
-     * @return    serialized string
+     *
+     * @param   clientVersion
+     *          client version to adapt component for
+     * @return  serialized string
      */
     public String toString(ProtocolVersion clientVersion) {
         return toString(clientVersion, false);
@@ -173,11 +185,12 @@ public class IChatBaseComponent {
     /**
      * Serializes this component with colors based on client version.
      * If client version is &lt;1.16, HEX colors will be converted to legacy colors.
-     * @param    clientVersion
-     *             client version to adapt component for
-     * @param    sendTranslatableIfEmpty
-     *             whether empty translatable should be sent if text is empty or not
-     * @return    serialized string
+     *
+     * @param   clientVersion
+     *          client version to adapt component for
+     * @param   sendTranslatableIfEmpty
+     *          whether empty translatable should be sent if text is empty or not
+     * @return  serialized string
      */
     public String toString(ProtocolVersion clientVersion, boolean sendTranslatableIfEmpty) {
         if (extra == null) {
@@ -211,13 +224,14 @@ public class IChatBaseComponent {
 
     /**
      * Returns organized component from colored text
-     * @param    originalText
-     *             text to convert
-     * @return    organized component from colored text
+     *
+     * @param   originalText
+     *          text to convert
+     * @return  organized component from colored text
      */
     public static IChatBaseComponent fromColoredText(String originalText){
         Preconditions.checkNotNull(originalText, "text");
-        String text = RGBUtils.getInstance().applyFormats(EnumChatFormat.color(originalText), false);
+        String text = RGBUtils.getInstance().applyFormats(EnumChatFormat.color(originalText));
         List<IChatBaseComponent> components = new ArrayList<>();
         StringBuilder builder = new StringBuilder();
         IChatBaseComponent component = new IChatBaseComponent();
@@ -299,11 +313,12 @@ public class IChatBaseComponent {
 
     /**
      * Returns true if text contains legacy color request at defined RGB index start
-     * @param    text
-     *             text to check
-     * @param    i
-     *             current index start
-     * @return    true if legacy color is defined, false if not
+     *
+     * @param   text
+     *          text to check
+     * @param   i
+     *          current index start
+     * @return  true if legacy color is defined, false if not
      */
     private static boolean containsLegacyCode(String text, int i) {
         if (text.length() - i < 9 || text.charAt(i+7) != '|') return false;
@@ -312,7 +327,8 @@ public class IChatBaseComponent {
 
     /**
      * Converts this component into a simple text with legacy colors (the closest match if color is set to RGB)
-     * @return    The simple text format
+     *
+     * @return  The simple text format
      */
     public String toLegacyText() {
         StringBuilder builder = new StringBuilder();
@@ -323,11 +339,12 @@ public class IChatBaseComponent {
     /**
      * Appends text to string builder, might also add color and magic codes if they are different
      * from previous component in chain.
-     * @param    builder
-     *             builder to append text to
-     * @param    previousFormatting
-     *             colors and magic codes in previous component
-     * @return    wew formatting, might be identical to previous one
+     *
+     * @param   builder
+     *          builder to append text to
+     * @param   previousFormatting
+     *          colors and magic codes in previous component
+     * @return  new formatting, might be identical to previous one
      */
     private String append(StringBuilder builder, String previousFormatting) {
         String formatting = previousFormatting;
@@ -347,7 +364,8 @@ public class IChatBaseComponent {
 
     /**
      * Returns colors and magic codes of this component
-     * @return    used colors and magic codes
+     *
+     * @return  used colors and magic codes
      */
     private String getFormatting() {
         StringBuilder builder = new StringBuilder();
@@ -365,7 +383,8 @@ public class IChatBaseComponent {
 
     /**
      * Returns raw text without colors, only works correctly when component is organized
-     * @return    raw text in this component and all child components
+     *
+     * @return  raw text in this component and all child components
      */
     public String toRawText() {
         StringBuilder builder = new StringBuilder();
@@ -378,7 +397,8 @@ public class IChatBaseComponent {
 
     /**
      * Converts the component into flat text with used colors (including rgb) and magic codes
-     * @return    converted text
+     *
+     * @return  converted text
      */
     public String toFlatText() {
         StringBuilder builder = new StringBuilder();
@@ -395,15 +415,16 @@ public class IChatBaseComponent {
      * Returns the most optimized component based on text. Returns null if text is null,
      * organized component if RGB colors are used or simple component with only text field
      * containing the whole text when no RGB colors are used
-     * @param    text
-     *             text to create component from
-     * @return    The most performance-optimized component based on text
+     *
+     * @param   text
+     *          text to create component from
+     * @return  The most performance-optimized component based on text
      */
     public static IChatBaseComponent optimizedComponent(String text){
         if (text == null) return null;
         if (componentCache.containsKey(text)) return componentCache.get(text);
         IChatBaseComponent component;
-        if (text.contains("#") || text.contains("&x") || text.contains(EnumChatFormat.COLOR_CHAR + "x")){
+        if (text.contains("#") || text.contains("&x") || text.contains(EnumChatFormat.COLOR_CHAR + "x") || text.contains("<")){
             //contains RGB colors
             component = IChatBaseComponent.fromColoredText(text);
         } else {

api/src/main/java/me/neznamy/tab/api/chat/TextColor.java

@@ -29,10 +29,10 @@ public class TextColor {
     /**
      * Constructs new instance as a clone of the provided color.
      *
-     * @param    color
-     *             color to create a clone of
-     * @throws    IllegalArgumentException
-     *             if color is {@code null}
+     * @param   color
+     *          color to create a clone of
+     * @throws  IllegalArgumentException
+     *          if color is {@code null}
      */
     public TextColor(TextColor color) {
         Preconditions.checkNotNull(color, "color");
@@ -45,10 +45,10 @@ public class TextColor {
     /**
      * Constructs new instance from provided 6-digit hex code string
      *
-     * @param    hexCode
-     *             a 6-digit combination of hex numbers as a string
-     * @throws    IllegalArgumentException
-     *             if hexCode is {@code null}
+     * @param   hexCode
+     *          a 6-digit combination of hex numbers as a string
+     * @throws  IllegalArgumentException
+     *          if hexCode is {@code null}
      */
     public TextColor(String hexCode) {
         Preconditions.checkNotNull(hexCode, "hex code");
@@ -58,12 +58,12 @@ public class TextColor {
     /**
      * Constructs new instance from provided 6-digit hex code and forced legacy color
      *
-     * @param    hexCode
-     *             6-digit combination of hex numbers as a string
-     * @param    legacyColor
-     *             color to use for legacy clients instead of using the closest legacy color
-     * @throws    IllegalArgumentException
-     *             if {@code hexCode} is {@code null} or {@code legacyColor} is {@code null}
+     * @param   hexCode
+     *          6-digit combination of hex numbers as a string
+     * @param   legacyColor
+     *          color to use for legacy clients instead of using the closest legacy color
+     * @throws  IllegalArgumentException
+     *          if {@code hexCode} is {@code null} or {@code legacyColor} is {@code null}
      */
     public TextColor(String hexCode, EnumChatFormat legacyColor) {
         Preconditions.checkNotNull(hexCode, "hex code");
@@ -76,10 +76,10 @@ public class TextColor {
     /**
      * Constructs new instance from provided legacy color
      *
-     * @param    legacyColor
-     *             legacy color to construct the instance from
-     * @throws    IllegalArgumentException
-     *             if {@code legacyColor} is {@code null}
+     * @param   legacyColor
+     *          legacy color to construct the instance from
+     * @throws  IllegalArgumentException
+     *          if {@code legacyColor} is {@code null}
      */
     public TextColor(EnumChatFormat legacyColor) {
         Preconditions.checkNotNull(legacyColor, "legacy color");
@@ -90,14 +90,14 @@ public class TextColor {
     /**
      * Constructs new instance with red, green and blue values
      *
-     * @param    red
-     *             red value
-     * @param    green
-     *             green value
-     * @param    blue
-     *             blue value
-     * @throws    IllegalArgumentException
-     *             if {@code red}, {@code green} or {@code blue} is out of range ({@code 0-255})
+     * @param   red
+     *          red value
+     * @param   green
+     *          green value
+     * @param   blue
+     *          blue value
+     * @throws  IllegalArgumentException
+     *          if {@code red}, {@code green} or {@code blue} is out of range ({@code 0-255})
      */
     public TextColor(int red, int green, int blue) {
         Preconditions.checkRange(red, 0, 255, "red");
@@ -130,7 +130,8 @@ public class TextColor {
 
     /**
      * Returns {@code red} value
-     * @return    red value
+     *
+     * @return  red value
      */
     public int getRed() {
         if (rgb == -1) rgb = Integer.parseInt(hexCode, 16);
@@ -139,7 +140,8 @@ public class TextColor {
 
     /**
      * Returns {@code green} value
-     * @return    green value
+     *
+     * @return  green value
      */
     public int getGreen() {
         if (rgb == -1) rgb = Integer.parseInt(hexCode, 16);
@@ -148,7 +150,8 @@ public class TextColor {
 
     /**
      * Returns {@code blue} value
-     * @return    blue value
+     *
+     * @return  blue value
      */
     public int getBlue() {
         if (rgb == -1) rgb = Integer.parseInt(hexCode, 16);
@@ -159,7 +162,8 @@ public class TextColor {
      * Returns the closest legacy color of this color object.
      * If the color was defined in constructor, it's returned.
      * Otherwise, the closest color is calculated the then returned.
-     * @return    closest legacy color
+     *
+     * @return  closest legacy color
      */
     public EnumChatFormat getLegacyColor() {
         if (legacyColor == null) legacyColor = loadClosestColor();
@@ -168,7 +172,8 @@ public class TextColor {
 
     /**
      * Returns the rgb combination as a 6-digit hex code string
-     * @return    the rgb combination as a 6-digit hex code string
+     *
+     * @return  the rgb combination as a 6-digit hex code string
      */
     public String getHexCode() {
         if (hexCode == null) hexCode = String.format("%06X", rgb);
@@ -178,7 +183,8 @@ public class TextColor {
     /**
      * Converts the color into a valid color value used in color field in chat component.
      * That is either 6-digit hex code prefixed with '#', or lowercase legacy color.
-     * @return    the color serialized for use in chat component
+     *
+     * @return  the color serialized for use in chat component
      */
     public String toString() {
         EnumChatFormat legacyEquivalent = EnumChatFormat.fromRGBExact(getRed(), getGreen(), getBlue());
@@ -191,7 +197,8 @@ public class TextColor {
 
     /**
      * Returns true if legacy color was forced with a constructor, false if not
-     * @return    true if forced, false if not
+     *
+     * @return  true if forced, false if not
      */
     public boolean isLegacyColorForced() {
         return legacyColorForced;
@@ -202,9 +209,10 @@ public class TextColor {
      * If the entered string is null, returns null.
      * If it's prefixed with '#', it's considered as a hex code.
      * Otherwise, it is considered being a lowercase legacy color.
-     * @param    string
-     *             string from color field in chat component
-     * @return    An instance from specified string or null if string is null
+     *
+     * @param   string
+     *          string from color field in chat component
+     * @return  An instance from specified string or null if string is null
      */
     public static TextColor fromString(String string) {
         if (string == null) return null;

api/src/main/java/me/neznamy/tab/api/chat/WrappedChatComponent.java

@@ -0,0 +1,75 @@
+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());
+    }
+}

api/src/main/java/me/neznamy/tab/api/chat/rgb/RGBUtils.java

@@ -1,15 +1,13 @@
 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.BukkitFormat;
-import me.neznamy.tab.api.chat.rgb.format.CMIFormat;
-import me.neznamy.tab.api.chat.rgb.format.HtmlFormat;
-import me.neznamy.tab.api.chat.rgb.format.RGBFormatter;
-import me.neznamy.tab.api.chat.rgb.format.UnnamedFormat1;
+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;
@@ -40,12 +38,18 @@ public class RGBUtils {
      * Constructs new instance and loads all RGB patterns and gradients
      */
     public RGBUtils() {
-        formats = new RGBFormatter[] {
-                new BukkitFormat(),
-                new CMIFormat(),
-                new UnnamedFormat1(),
-                new HtmlFormat()
-        };
+        List<RGBFormatter> list = new ArrayList<>();
+        list.add(new BukkitFormat());
+        list.add(new CMIFormat());
+        list.add(new UnnamedFormat1());
+        list.add(new HtmlFormat());
+        list.add(new KyoriFormat());
+        try {
+            Class.forName("net.kyori.adventure.text.minimessage.MiniMessage");
+            list.add(new MiniMessageFormat());
+        } catch (ClassNotFoundException ignored) {}
+        formats = list.toArray(new RGBFormatter[0]);
+
         gradients = new GradientPattern[] {
                 //{#RRGGBB>}text{#RRGGBB<}
                 new CMIGradient(),
@@ -63,7 +67,8 @@ public class RGBUtils {
 
     /**
      * Returns instance of this class
-     * @return    instance
+     *
+     * @return  instance
      */
     public static RGBUtils getInstance() {
         return instance;
@@ -71,20 +76,16 @@ public class RGBUtils {
 
     /**
      * Applies all RGB formats and gradients to text and returns it.
-     * This method is called on every property initialization to convert formats
-     * once instead of on every refresh, if possible. Because of that, parameter
-     * {@code ignorePlaceholders} exists to not break raw placeholder identifiers
-     * @param    text
-     *             original text
-     * @param    ignorePlaceholders
-     *             whether placeholders should be ignored or not
-     * @return    text where everything is converted to #RRGGBB
+     *
+     * @param   text
+     *          original text
+     * @return  text where everything is converted to #RRGGBB
      */
-    public String applyFormats(String text, boolean ignorePlaceholders) {
+    public String applyFormats(String text) {
         Preconditions.checkNotNull(text, "text");
         String replaced = text;
         for (GradientPattern pattern : gradients) {
-            replaced = pattern.applyPattern(replaced, ignorePlaceholders);
+            replaced = pattern.applyPattern(replaced, false);
         }
         for (RGBFormatter formatter : formats) {
             replaced = formatter.reformat(replaced);
@@ -92,22 +93,40 @@ public class RGBUtils {
         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
+     *
+     * @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, false);
+            String replaced = applyFormats(text);
             for (Pattern p : new Pattern[]{tabPatternLegacy, tabPattern}) {
                 Matcher m = p.matcher(replaced);
                 while (m.find()) {
@@ -124,14 +143,15 @@ public class RGBUtils {
 
     /**
      * Converts all hex codes in given string to legacy codes
-     * @param    text
-     *             text to convert
-     * @return    translated text
+     *
+     * @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, false);
+        String applied = applyFormats(text);
         StringBuilder sb = new StringBuilder();
         for (int i = 0; i < applied.length(); i++){
             char c = applied.charAt(i);
@@ -158,9 +178,10 @@ public class RGBUtils {
     /**
      * 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
+     *
+     * @param   string
+     *          string to check
+     * @return  {@code true} if valid, {@code false} if not
      */
     public boolean isHexCode(String string) {
         Preconditions.checkNotNull(string, "string");
@@ -174,11 +195,12 @@ public class RGBUtils {
 
     /**
      * 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
+     *
+     * @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;

api/src/main/java/me/neznamy/tab/api/chat/rgb/format/HtmlFormat.java

@@ -4,7 +4,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
- * Formatter for #<RRGGBB>
+ * Formatter for #&lt;RRGGBB&gt;
  */
 public class HtmlFormat implements RGBFormatter {
 

api/src/main/java/me/neznamy/tab/api/chat/rgb/format/KyoriFormat.java

@@ -0,0 +1,25 @@
+package me.neznamy.tab.api.chat.rgb.format;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Formatter for <#RRGGBB>
+ */
+public class KyoriFormat implements RGBFormatter {
+
+    private final Pattern pattern = Pattern.compile("<#[0-9a-fA-F]{6}>");
+
+    @Override
+    public String reformat(String text) {
+        if (!text.contains("<#")) return text;
+        String replaced = text;
+        Matcher m = pattern.matcher(replaced);
+        while (m.find()) {
+            String hexCode = m.group();
+            String fixed = hexCode.substring(2, 8);
+            replaced = replaced.replace(hexCode, "#" + fixed);
+        }
+        return replaced;
+    }
+}

api/src/main/java/me/neznamy/tab/api/chat/rgb/format/MiniMessageFormat.java

@@ -0,0 +1,22 @@
+package me.neznamy.tab.api.chat.rgb.format;
+
+import me.neznamy.tab.api.chat.EnumChatFormat;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+
+/**
+ * Formatter for <#RRGGBB>
+ */
+public class MiniMessageFormat implements RGBFormatter {
+
+    @Override
+    public String reformat(String text) {
+        if (!text.contains("<")) return text;
+        String format = text.replace(EnumChatFormat.RESET.getFormat(), ""); //remove &r from header/footer newline inserts
+        try {
+            return LegacyComponentSerializer.legacySection().serialize(MiniMessage.miniMessage().deserialize(format));
+        } catch (Throwable ignored) {
+            return text;
+        }
+    }
+}

api/src/main/java/me/neznamy/tab/api/chat/rgb/format/RGBFormatter.java

@@ -7,8 +7,10 @@ public interface RGBFormatter {
 
     /**
      * Reformats RGB codes in provided text into #RRGGBB format
-     * @param text - text to format
-     * @return reformatted text
+     *
+     * @param   text
+     *          text to format
+     * @return  reformatted text
      */
     String reformat(String text);
 }

api/src/main/java/me/neznamy/tab/api/chat/rgb/gradient/GradientPattern.java

@@ -10,17 +10,23 @@ public interface GradientPattern {
 
     /**
      * Applies gradients in provided text and returns text using only #RRGGBB
-     * @param text - text to be reformatted
-     * @return reformatted text
+     *
+     * @param   text
+     *          text to be reformatted
+     * @return  reformatted text
      */
     String applyPattern(String text, boolean ignorePlaceholders);
 
     /**
      * Returns gradient text based on start color, text and end color
-     * @param start - start color
-     * @param text - text to be reformatted
-     * @param end - end color
-     * @return reformatted text
+     *
+     * @param   start
+     *          start color
+     * @param   text
+     *          text to be reformatted
+     * @param   end
+     *          end color
+     * @return  reformatted text
      */
     default String asGradient(TextColor start, String text, TextColor end) {
         //lazy support for magic codes in gradients

api/src/main/java/me/neznamy/tab/api/chat/rgb/gradient/KyoriGradient.java

@@ -7,8 +7,8 @@ import me.neznamy.tab.api.chat.EnumChatFormat;
 import me.neznamy.tab.api.chat.TextColor;
 
 /**
- * Gradient applier for <gradient:#RRGGBB:#RRGGBB>Text</gradient>
- * and <gradient:#RRGGBB|L:#RRGGBB>Text</gradient>
+ * Gradient applier for <gradient:#RRGGBB:#RRGGBB>Text</gradient>
+ * and <gradient:#RRGGBB|L:#RRGGBB>Text</gradient>
  */
 public class KyoriGradient implements GradientPattern {
 

api/src/main/java/me/neznamy/tab/api/config/ConfigurationFile.java

@@ -38,16 +38,16 @@ public abstract class ConfigurationFile {
      * Constructs new instance and attempts to load specified configuration file.
      * If file does not exist, default file is copied from {@code source}.
      *
-     * @param    source
-     *             Source to copy file from if it does not exist
-     * @param    destination
-     *             File destination to use
-     * @throws    IllegalArgumentException
-     *             if {@code destination} is null
-     * @throws    IllegalStateException
-     *             if file does not exist and source is null
-     * @throws    IOException
-     *             if I/O operation with the file unexpectedly fails
+     * @param   source
+     *          Source to copy file from if it does not exist
+     * @param   destination
+     *          File destination to use
+     * @throws  IllegalArgumentException
+     *          if {@code destination} is null
+     * @throws  IllegalStateException
+     *          if file does not exist and source is null
+     * @throws  IOException
+     *          if I/O operation with the file unexpectedly fails
      */
     protected ConfigurationFile(InputStream source, File destination) throws IOException {
         Preconditions.checkNotNull(destination, "destination");
@@ -76,7 +76,8 @@ public abstract class ConfigurationFile {
 
     /**
      * Returns simple name of the file
-     * @return    simple name of the file
+     *
+     * @return  simple name of the file
      */
     public String getName() {
         return file.getName();
@@ -84,7 +85,8 @@ public abstract class ConfigurationFile {
 
     /**
      * Returns the root value map
-     * @return    the root value map
+     *
+     * @return  the root value map
      */
     public Map<String, Object> getValues(){
         return values;
@@ -99,11 +101,11 @@ public abstract class ConfigurationFile {
      * {@code defaultValue} is not {@code null}, value is inserted, {@link #save()}
      * called and {@code defaultValue} returned.
      *
-     * @param    path
-     *             Path to the option with sections separated with "{@code .}"
-     * @param    defaultValue
-     *             Value to be inserted and returned if option is not present
-     * @return    value from configuration file
+     * @param   path
+     *          Path to the option with sections separated with "{@code .}"
+     * @param   defaultValue
+     *          Value to be inserted and returned if option is not present
+     * @return  value from configuration file
      */
     public Object getObject(String path, Object defaultValue) {
         Object value = values;
@@ -126,9 +128,9 @@ public abstract class ConfigurationFile {
      * Returns config option with specified path. If option is not present,
      * {@code null} is returned.
      *
-     * @param    path
-     *             Path to the option with sections separated with "{@code .}"
-     * @return    value from configuration file or null if not present
+     * @param   path
+     *          Path to the option with sections separated with "{@code .}"
+     * @return  value from configuration file or null if not present
      */
     public Object getObject(String path) {
         return getObject(path, null);
@@ -149,11 +151,11 @@ public abstract class ConfigurationFile {
      * Returns value from map without case sensitivity of the key. Returns
      * {@code null} if no such key is found.
      *
-     * @param    map
-     *             map to get value from
-     * @param    key
-     *             case-insensitive key name
-     * @return    map value from case-insensitive key
+     * @param   map
+     *          map to get value from
+     * @param   key
+     *          case-insensitive key name
+     * @return  map value from case-insensitive key
      */
     private Object getIgnoreCase(Map<Object, Object> map, String key) {
         for (Entry<Object, Object> entry : map.entrySet()) {
@@ -166,9 +168,9 @@ public abstract class ConfigurationFile {
      * Returns config option with specified path as {@code String}. Returns {@code null} if
      * option is not present.
      *
-     * @param    path
-     *             Path to the option with sections separated with "{@code .}"
-     * @return    value from file or null if not present
+     * @param   path
+     *          Path to the option with sections separated with "{@code .}"
+     * @return  value from file or null if not present
      */
     public String getString(String path) {
         return getString(path, null);
@@ -179,11 +181,11 @@ public abstract class ConfigurationFile {
      * and {@code defaultValue} is not {@code null}, value is inserted, {@link #save()} called
      * and {@code defaultValue} returned.
      *
-     * @param    path
-     *             Path to the option with sections separated with "{@code .}"
-     * @param    defaultValue
-     *             Value to be inserted and returned if option is not present
-     * @return    value from configuration file as {@code String}
+     * @param   path
+     *          Path to the option with sections separated with "{@code .}"
+     * @param   defaultValue
+     *          Value to be inserted and returned if option is not present
+     * @return  value from configuration file as {@code String}
      */
     public String getString(String path, String defaultValue) {
         Object value = getObject(path, defaultValue);
@@ -195,9 +197,9 @@ public abstract class ConfigurationFile {
      * Returns config option with specified path as {@code List<String>}. Returns {@code null} if
      * option is not present.
      *
-     * @param    path
-     *             Path to the option with sections separated with "{@code .}"
-     * @return    value from file or null if not present
+     * @param   path
+     *          Path to the option with sections separated with "{@code .}"
+     * @return  value from file or null if not present
      */
     public List<String> getStringList(String path) {
         return getStringList(path, null);
@@ -208,11 +210,11 @@ public abstract class ConfigurationFile {
      * and {@code defaultValue} is not {@code null}, value is inserted, {@link #save()} called
      * and {@code defaultValue} returned.
      *
-     * @param    path
-     *             Path of the option with sections separated with "{@code .}"
-     * @param    defaultValue
-     *             Value to be inserted and returned if option is not present
-     * @return    value from configuration file as {@code List<String>}
+     * @param   path
+     *          Path of the option with sections separated with "{@code .}"
+     * @param   defaultValue
+     *          Value to be inserted and returned if option is not present
+     * @return  value from configuration file as {@code List<String>}
      */
     public List<String> getStringList(String path, List<String> defaultValue) {
         Object value = getObject(path, defaultValue);
@@ -222,7 +224,7 @@ public abstract class ConfigurationFile {
         }
         List<String> fixedList = new ArrayList<>();
         for (Object key : (List<Object>)value) {
-            fixedList.add(key.toString());
+            fixedList.add(String.valueOf(key));
         }
         return fixedList;
     }
@@ -231,9 +233,9 @@ public abstract class ConfigurationFile {
      * Returns config option with specified path as {@code Integer}. Returns {@code null} if
      * option is not present.
      *
-     * @param    path
-     *             Path to the option with sections separated with "{@code .}"
-     * @return    value from file or null if not present
+     * @param   path
+     *          Path to the option with sections separated with "{@code .}"
+     * @return  value from file or null if not present
      */
     public Integer getInt(String path) {
         return getInt(path, null);
@@ -244,11 +246,11 @@ public abstract class ConfigurationFile {
      * and {@code defaultValue} is not {@code null}, value is inserted, {@link #save()} called
      * and {@code defaultValue} returned.
      *
-     * @param    path
-     *             Path to the option with sections separated with "{@code .}"
-     * @param    defaultValue
-     *             Value to be inserted and returned if option is not present
-     * @return    value from configuration file as {@code Integer}
+     * @param   path
+     *          Path to the option with sections separated with "{@code .}"
+     * @param   defaultValue
+     *          Value to be inserted and returned if option is not present
+     * @return  value from configuration file as {@code Integer}
      */
     public Integer getInt(String path, Integer defaultValue) {
         Object value = getObject(path, defaultValue);
@@ -265,11 +267,11 @@ public abstract class ConfigurationFile {
      * and {@code defaultValue} is not {@code null}, value is inserted, {@link #save()} called
      * and {@code defaultValue} returned.
      *
-     * @param    path
-     *             Path to the option with sections separated with "{@code .}"
-     * @param    defaultValue
-     *             Value to be inserted and returned if option is not present
-     * @return    value from configuration file as {@code Boolean}
+     * @param   path
+     *          Path to the option with sections separated with "{@code .}"
+     * @param   defaultValue
+     *          Value to be inserted and returned if option is not present
+     * @return  value from configuration file as {@code Boolean}
      */
     public boolean getBoolean(String path, boolean defaultValue) {
         Object value = getObject(path, defaultValue);
@@ -282,11 +284,11 @@ public abstract class ConfigurationFile {
      * and {@code defaultValue} is not {@code null}, value is inserted, {@link #save()} called
      * and {@code defaultValue} returned.
      *
-     * @param    path
-     *             Path to the option with sections separated with "{@code .}"
-     * @param    defaultValue
-     *             Value to be inserted and returned if option is not present
-     * @return    value from configuration file as {@code Double}
+     * @param   path
+     *          Path to the option with sections separated with "{@code .}"
+     * @param   defaultValue
+     *          Value to be inserted and returned if option is not present
+     * @return  value from configuration file as {@code Double}
      */
     public Double getDouble(String path, double defaultValue) {
         Object value = getObject(path, defaultValue);
@@ -302,9 +304,9 @@ public abstract class ConfigurationFile {
      * Returns config option with specified path as {@code Map<K, V>}. If the option
      * is not present or value is not a {@code Map}, new empty {@code Map} is returned.
      *
-     * @param    path
-     *             Path to the option with sections separated with "{@code .}"
-     * @return    value from configuration file as {@code Map<K, V>}
+     * @param   path
+     *          Path to the option with sections separated with "{@code .}"
+     * @return  value from configuration file as {@code Map<K, V>}
      */
     public <K, V> Map<K, V> getConfigurationSection(String path) {
         if (path == null || path.length() == 0) return (Map<K, V>) values;
@@ -320,9 +322,9 @@ public abstract class ConfigurationFile {
      * Returns {@code true} if the file has option with specified path, {@code false}
      * if not.
      *
-     * @param    path
-     *             Path to the option with sections separated with "{@code .}"
-     * @return    {@code true} if present, {@code false} if not
+     * @param   path
+     *          Path to the option with sections separated with "{@code .}"
+     * @return  {@code true} if present, {@code false} if not
      */
     public boolean hasConfigOption(String path) {
         return getObject(path) != null;
@@ -331,10 +333,10 @@ public abstract class ConfigurationFile {
     /**
      * Sets value to the specified path and saves the file to disk by calling {@link #save()}.
      *
-     * @param    path
-     *             Path to the option with sections separated with "{@code .}"
-     * @param    value
-     *             Value to save
+     * @param   path
+     *          Path to the option with sections separated with "{@code .}"
+     * @param   value
+     *          Value to save
      */
     public void set(String path, Object value) {
         set(values, path, value);
@@ -345,13 +347,13 @@ public abstract class ConfigurationFile {
      * Sets value to the specified map with specified path and value. This is an internal method
      * that correctly creates maps to separate sections using "{@code .}".
      *
-     * @param    map
-     *             Map to insert value to
-     * @param    path
-     *             Path to the option with sections separated with "{@code .}"
-     * @param    value
-     *             Value to save
-     * @return    the first argument to allow chaining
+     * @param   map
+     *          Map to insert value to
+     * @param   path
+     *          Path to the option with sections separated with "{@code .}"
+     * @param   value
+     *          Value to save
+     * @return  the first argument to allow chaining
      */
     private Map<String, Object> set(Map<String, Object> map, String path, Object value) {
         if (path.contains(".")) {
@@ -375,11 +377,11 @@ public abstract class ConfigurationFile {
      * Returns the real key name without case sensitivity from map. If not found, inserted key
      * is returned.
      *
-     * @param    map
-     *             Map to check keys of
-     * @param    key
-     *             Key to find
-     * @return    The real key name
+     * @param   map
+     *          Map to check keys of
+     * @param   key
+     *          Key to find
+     * @return  The real key name
      */
     private String getRealKey(Map<?, ?> map, String key) {
         for (Object mapKey : map.keySet()) {
@@ -391,8 +393,8 @@ public abstract class ConfigurationFile {
     /**
      * Detects header of a file (first lines of file starting with #).
      *
-     * @throws    IOException
-     *             if I/O operation fails
+     * @throws  IOException
+     *          if I/O operation fails
      */
     private void detectHeader() throws IOException {
         header = new ArrayList<>();
@@ -409,8 +411,8 @@ public abstract class ConfigurationFile {
      * Inserts header back into file. This is required after calling {@link #save()}, because
      * it destroys the header.
      *
-     * @throws    IOException
-     *             if I/O operation fails
+     * @throws  IOException
+     *          if I/O operation fails
      */
     public void fixHeader() throws IOException {
         if (header == null) return;

api/src/main/java/me/neznamy/tab/api/config/YamlConfigurationFile.java

@@ -36,18 +36,18 @@ public class YamlConfigurationFile extends ConfigurationFile {
      * Constructs new instance and attempts to load specified configuration file.
      * If file does not exist, default file is copied from {@code source}.
      *
-     * @param    source
-     *             Source to copy file from if it does not exist
-     * @param    destination
-     *             File destination to use
-     * @throws    IllegalArgumentException
-     *             if {@code destination} is null
-     * @throws    IllegalStateException
-     *             if file does not exist and source is null
-     * @throws    YAMLException
-     *             if file has invalid YAML syntax
-     * @throws    IOException
-     *             if I/O operation with the file unexpectedly fails
+     * @param   source
+     *          Source to copy file from if it does not exist
+     * @param   destination
+     *          File destination to use
+     * @throws  IllegalArgumentException
+     *          if {@code destination} is null
+     * @throws  IllegalStateException
+     *          if file does not exist and source is null
+     * @throws  YAMLException
+     *          if file has invalid YAML syntax
+     * @throws  IOException
+     *          if I/O operation with the file unexpectedly fails
      */
     public YamlConfigurationFile(InputStream source, File destination) throws YAMLException, IOException {
         super(source, destination);

api/src/main/java/me/neznamy/tab/api/event/player/PlayerLoadEvent.java

@@ -11,14 +11,15 @@ public interface PlayerLoadEvent extends TabEvent {
     /**
      * Gets the player that was loaded.
      *
-     * @return the player that was loaded
+     * @return  the player that was loaded
      */
     TabPlayer getPlayer();
 
     /**
      * Returns true if player was loaded because they joined,
      * false if the player was loaded because tab reload command was executed
-     * @return true if player joined, false if plugin was reloaded
+     *
+     * @return  true if player joined, false if plugin was reloaded
      */
     boolean isJoin();
 }

api/src/main/java/me/neznamy/tab/api/placeholder/Placeholder.java

@@ -6,11 +6,9 @@ public interface Placeholder {
 
     String getIdentifier();
 
-    boolean isTriggerMode();
-
-    void enableTriggerMode();
-
     void enableTriggerMode(Runnable onActivation, Runnable onDisable);
 
     void unload();
+
+    boolean isUsed();
 }

api/src/main/java/me/neznamy/tab/api/placeholder/PlaceholderManager.java

@@ -27,20 +27,27 @@ public interface PlaceholderManager {
 
     /**
      * 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
+     *
+     * @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
+     *
+     * @param   identifier
+     *          placeholder identifier
+     * @param   feature
+     *          feature using the placeholder
      */
     void addUsedPlaceholder(String identifier, TabFeature feature);
 
     String findReplacement(String placeholder, String output);
 
     List<String> getUsedPlaceholders();
+
+    Placeholder getPlaceholder(String identifier);
 }

api/src/main/java/me/neznamy/tab/api/placeholder/PlayerPlaceholder.java

@@ -8,11 +8,21 @@ public interface PlayerPlaceholder extends Placeholder {
 
     /**
      * Calls the placeholder request function and returns the output.
-     * If the placeholder thrown an exception, it is logged in {@code placeholder-errors.log}
+     * 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
+     *
+     * @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.
+     *
+     * @param   player
+     *          player to get last value for
+     * @return  last known value for entered player
+     */
+    String getLastValue(TabPlayer player);
 }

api/src/main/java/me/neznamy/tab/api/placeholder/RelationalPlaceholder.java

@@ -6,5 +6,28 @@ 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.
+     *
+     * @param   viewer
+     *          player looking at output of the placeholder
+     * @param   target
+     *          player the placeholder is displayed on
+     * @return  value placeholder returned or "ERROR" if it threw an error
+     */
     Object request(TabPlayer viewer, TabPlayer target);
+
+    /**
+     * Returns last known value for given players. First player is viewer,
+     * second player is target.
+     *
+     * @param   viewer
+     *          viewer of the placeholder
+     * @param   target
+     *          target who is the text displayed on
+     * @return  last known value for entered player duo
+     */
+    String getLastValue(TabPlayer viewer, TabPlayer target);
 }

api/src/main/java/me/neznamy/tab/api/placeholder/ServerPlaceholder.java

@@ -4,5 +4,19 @@ public interface ServerPlaceholder extends Placeholder {
 
     void updateValue(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
+     */
     Object request();
+
+    /**
+     * Returns last known value of the placeholder.
+     *
+     * @return  last known value
+     */
+    String getLastValue();
 }

api/src/main/java/me/neznamy/tab/api/protocol/PacketBuilder.java

@@ -40,13 +40,13 @@ public class PacketBuilder {
      * 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
+     * @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");
@@ -57,13 +57,13 @@ public class PacketBuilder {
     /**
      * 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
+     * @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;
@@ -72,13 +72,13 @@ public class PacketBuilder {
     /**
      * 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
+     * @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;
@@ -87,13 +87,13 @@ public class PacketBuilder {
     /**
      * 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
+     * @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;
@@ -102,13 +102,13 @@ public class PacketBuilder {
     /**
      * 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
+     * @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;
@@ -117,13 +117,13 @@ public class PacketBuilder {
     /**
      * 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
+     * @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;
@@ -132,13 +132,13 @@ public class PacketBuilder {
     /**
      * 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
+     * @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;
@@ -147,13 +147,13 @@ public class PacketBuilder {
     /**
      * 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
+     * @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;
@@ -162,13 +162,13 @@ public class PacketBuilder {
     /**
      * 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
+     * @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;
@@ -179,11 +179,12 @@ public class PacketBuilder {
      * 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 <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
+     *
+     * @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 "";
@@ -201,17 +202,17 @@ public class PacketBuilder {
     }
 
     /**
-     * If {@code clientVersion} is >= 1.13, creates a component from given text and returns
+     * If {@code clientVersion} is >= 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-
+     * @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;
@@ -226,13 +227,13 @@ public class PacketBuilder {
      * 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
+     * @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;
@@ -242,11 +243,11 @@ public class PacketBuilder {
      * 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
+     * @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;
@@ -256,11 +257,11 @@ public class PacketBuilder {
      * 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
+     * @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;

api/src/main/java/me/neznamy/tab/api/protocol/PacketPlayOutBoss.java

@@ -42,16 +42,16 @@ public class PacketPlayOutBoss implements TabPacket {
      * 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
+     * @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");
@@ -70,8 +70,8 @@ public class PacketPlayOutBoss implements TabPacket {
      * Constructs new instance with given parameters and
      * {@link me.neznamy.tab.api.protocol.PacketPlayOutBoss.Action}.REMOVE action
      *
-     * @param    id
-     *             BossBar uuid
+     * @param   id
+     *          BossBar uuid
      */
     public PacketPlayOutBoss(UUID id) {
         Preconditions.checkNotNull(id, "uuid");
@@ -83,10 +83,10 @@ public class PacketPlayOutBoss implements TabPacket {
      * 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
+     * @param   id
+     *          BossBar uuid
+     * @param   pct
+     *          BossBar progress
      */
     public PacketPlayOutBoss(UUID id, float pct) {
         Preconditions.checkNotNull(id, "uuid");
@@ -99,10 +99,10 @@ public class PacketPlayOutBoss implements TabPacket {
      * 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
+     * @param   id
+     *          BossBar uuid
+     * @param   name
+     *          BossBar title
      */
     public PacketPlayOutBoss(UUID id, String name) {
         Preconditions.checkNotNull(id, "uuid");
@@ -116,12 +116,12 @@ public class PacketPlayOutBoss implements TabPacket {
      * 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
+     * @param   id
+     *          BossBar uuid
+     * @param   color
+     *          BossBar color
+     * @param   overlay
+     *          BossBar style
      */
     public PacketPlayOutBoss(UUID id, BarColor color, BarStyle overlay) {
         Preconditions.checkNotNull(id, "uuid");
@@ -137,12 +137,12 @@ public class PacketPlayOutBoss implements TabPacket {
      * 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
+     * @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");
@@ -159,7 +159,7 @@ public class PacketPlayOutBoss implements TabPacket {
      * {@link #darkenScreen} adds {@code 1}, {@link #playMusic} {@code 2} and {@link #darkenScreen} {@code 4}
      * to the final value.
      *
-     * @return the bitmask
+     * @return  the bitmask
      */
     public byte getFlags(){
         byte value = 0;
@@ -177,7 +177,8 @@ public class PacketPlayOutBoss implements TabPacket {
 
     /**
      * Returns {@link #color}
-     * @return    color
+     *
+     * @return  color
      */
     public BarColor getColor() {
         return color;
@@ -185,7 +186,8 @@ public class PacketPlayOutBoss implements TabPacket {
 
     /**
      * Returns {@link #overlay}
-     * @return    style
+     *
+     * @return  style
      */
     public BarStyle getOverlay() {
         return overlay;
@@ -193,7 +195,8 @@ public class PacketPlayOutBoss implements TabPacket {
 
     /**
      * Returns {@link #name}
-     * @return    name
+     *
+     * @return  name
      */
     public String getName() {
         return name;
@@ -201,7 +204,8 @@ public class PacketPlayOutBoss implements TabPacket {
 
     /**
      * Returns {@link #id}
-     * @return    id
+     *
+     * @return  id
      */
     public UUID getId() {
         return id;
@@ -209,7 +213,8 @@ public class PacketPlayOutBoss implements TabPacket {
 
     /**
      * Returns {@link #pct}
-     * @return    progress
+     *
+     * @return  progress
      */
     public float getPct() {
         return pct;
@@ -217,7 +222,8 @@ public class PacketPlayOutBoss implements TabPacket {
 
     /**
      * Returns {@link #action}
-     * @return    packet action
+     *
+     * @return  packet action
      */
     public Action getAction() {
         return action;
@@ -225,7 +231,8 @@ public class PacketPlayOutBoss implements TabPacket {
 
     /**
      * Returns {@link #darkenScreen}
-     * @return    darkenScreen
+     *
+     * @return  darkenScreen
      */
     public boolean isDarkenScreen() {
         return darkenScreen;
@@ -233,7 +240,8 @@ public class PacketPlayOutBoss implements TabPacket {
 
     /**
      * Returns {@link #createWorldFog}
-     * @return    createWorldFog
+     *
+     * @return  createWorldFog
      */
     public boolean isCreateWorldFog() {
         return createWorldFog;
@@ -241,7 +249,8 @@ public class PacketPlayOutBoss implements TabPacket {
 
     /**
      * Returns {@link #playMusic}
-     * @return    playMusic
+     *
+     * @return  playMusic
      */
     public boolean isPlayMusic() {
         return playMusic;
@@ -250,8 +259,8 @@ public class PacketPlayOutBoss implements TabPacket {
     /**
      * Sets {@link #darkenScreen} to specified value
      *
-     * @param    darkenScreen
-     *             Darken screen flag
+     * @param   darkenScreen
+     *          Darken screen flag
      */
     public void setDarkenScreen(boolean darkenScreen) {
         this.darkenScreen = darkenScreen;
@@ -260,8 +269,8 @@ public class PacketPlayOutBoss implements TabPacket {
     /**
      * Sets {@link #createWorldFog} to specified value
      *
-     * @param    createWorldFog
-     *             Create fog flag
+     * @param   createWorldFog
+     *          Create fog flag
      */
     public void setCreateWorldFog(boolean createWorldFog) {
         this.createWorldFog = createWorldFog;
@@ -270,8 +279,8 @@ public class PacketPlayOutBoss implements TabPacket {
     /**
      * Sets {@link #playMusic} to specified value
      *
-     * @param    playMusic
-     *             Play music flag
+     * @param   playMusic
+     *          Play music flag
      */
     public void setPlayMusic(boolean playMusic) {
         this.playMusic = playMusic;

api/src/main/java/me/neznamy/tab/api/protocol/PacketPlayOutChat.java

@@ -17,10 +17,10 @@ public class PacketPlayOutChat implements TabPacket {
     /**
      * Constructs new instance with given parameters
      * 
-     * @param    message
-     *             Chat message to be sent
-     * @param    type
-     *             Message position
+     * @param   message
+     *          Chat message to be sent
+     * @param   type
+     *          Message position
      */
     public PacketPlayOutChat(IChatBaseComponent message, ChatMessageType type) {
         Preconditions.checkNotNull(message, "message");
@@ -36,7 +36,8 @@ public class PacketPlayOutChat implements TabPacket {
 
     /**
      * Returns {@link #message}
-     * @return    message
+     *
+     * @return  message
      */
     public IChatBaseComponent getMessage() {
         return message;
@@ -44,7 +45,8 @@ public class PacketPlayOutChat implements TabPacket {
 
     /**
      * Returns {@link #type}
-     * @return    type
+     *
+     * @return  type
      */
     public ChatMessageType getType() {
         return type;

api/src/main/java/me/neznamy/tab/api/protocol/PacketPlayOutPlayerInfo.java

@@ -1,6 +1,7 @@
 package me.neznamy.tab.api.protocol;
 
 import java.util.Arrays;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.UUID;
 
@@ -12,8 +13,8 @@ import me.neznamy.tab.api.util.Preconditions;
  */
 public class PacketPlayOutPlayerInfo implements TabPacket {
 
-    /** Packet action */
-    private final EnumPlayerInfoAction action;
+    /** Packet actions */
+    private final EnumSet<EnumPlayerInfoAction> actions;
 
     /** List of affected entries */
     private final List<PlayerInfoData> entries;
@@ -21,49 +22,87 @@ public class PacketPlayOutPlayerInfo implements TabPacket {
     /**
      * Constructs new instance with given parameters.
      * 
-     * @param    action
-     *             Packet action
-     * @param    entries
-     *             Affected entries
+     * @param   action
+     *          Packet action
+     * @param   entries
+     *          Affected entries
      */
     public PacketPlayOutPlayerInfo(EnumPlayerInfoAction action, PlayerInfoData... entries) {
-        Preconditions.checkNotNull(action, "action");
-        Preconditions.checkNotNull(entries, "entries");
-        this.action = action;
-        this.entries = Arrays.asList(entries);
+        this(action, Arrays.asList(entries));
     }
 
     /**
      * Constructs new instance with given parameters.
      * 
-     * @param    action
-     *             Packet action
-     * @param    entries
-     *             Affected entries
+     * @param   action
+     *          Packet action
+     * @param   entries
+     *          Affected entries
      */
     public PacketPlayOutPlayerInfo(EnumPlayerInfoAction action, List<PlayerInfoData> entries) {
         Preconditions.checkNotNull(action, "action");
         Preconditions.checkNotNull(entries, "entries");
-        this.action = action;
+        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{action=%s,entries=%s}", action, entries);
+        return String.format("PacketPlayOutPlayerInfo{actions=%s,entries=%s}", actions, entries);
     }
 
     /**
-     * Returns {@link #action}
-     * @return    packet action
+     * Returns {@link #actions}
+     *
+     * @return  packet action
      */
-    public EnumPlayerInfoAction getAction() {
-        return action;
+    public EnumSet<EnumPlayerInfoAction> getActions() {
+        return actions;
     }
 
     /**
      * Returns {@link #entries}
-     * @return    affected entries
+     *
+     * @return  affected entries
      */
     public List<PlayerInfoData> getEntries() {
         return entries;
@@ -77,6 +116,9 @@ public class PacketPlayOutPlayerInfo implements TabPacket {
         /** 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
 
@@ -95,41 +137,52 @@ public class PacketPlayOutPlayerInfo implements TabPacket {
         /** 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
+         * {@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   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, int latency, EnumGamemode gameMode, IChatBaseComponent displayName) {
+        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
+         * {@link EnumPlayerInfoAction#UPDATE_GAME_MODE} action
          * 
-         * @param    uniqueId
-         *             Player's uuid
-         * @param    gameMode
-         *             Player's GameMode
+         * @param   uniqueId
+         *          Player's uuid
+         * @param   gameMode
+         *          Player's GameMode
          */
         public PlayerInfoData(UUID uniqueId, EnumGamemode gameMode) {
             Preconditions.checkNotNull(uniqueId, "uuid");
@@ -139,12 +192,12 @@ public class PacketPlayOutPlayerInfo implements TabPacket {
 
         /**
          * Constructs new instance with given parameters. Suitable for 
-         * {@link EnumPlayerInfoAction}.UPDATE_LATENCY action
+         * {@link EnumPlayerInfoAction#UPDATE_LATENCY} action
          * 
-         * @param    uniqueId
-         *             Player's uuid
-         * @param    latency
-         *             Player's ping
+         * @param   uniqueId
+         *          Player's uuid
+         * @param   latency
+         *          Player's ping
          */
         public PlayerInfoData(UUID uniqueId, int latency) {
             Preconditions.checkNotNull(uniqueId, "uuid");
@@ -154,12 +207,12 @@ public class PacketPlayOutPlayerInfo implements TabPacket {
 
         /**
          * Constructs new instance with given parameters. Suitable for 
-         * {@link EnumPlayerInfoAction}.UPDATE_DISPLAY_NAME action
+         * {@link EnumPlayerInfoAction#UPDATE_DISPLAY_NAME} action
          * 
-         * @param    uniqueId
-         *             Player's uuid
-         * @param    displayName
-         *             Player's display name
+         * @param   uniqueId
+         *          Player's uuid
+         * @param   displayName
+         *          Player's display name
          */
         public PlayerInfoData(UUID uniqueId, IChatBaseComponent displayName) {
             Preconditions.checkNotNull(uniqueId, "uuid");
@@ -169,10 +222,10 @@ public class PacketPlayOutPlayerInfo implements TabPacket {
 
         /**
          * Constructs new instance with given parameter. Suitable for 
-         * {@link EnumPlayerInfoAction}.REMOVE_PLAYER action
+         * {@link EnumPlayerInfoAction#REMOVE_PLAYER} action
          * 
-         * @param    uniqueId
-         *             Player's uuid
+         * @param   uniqueId
+         *          Player's uuid
          */
         public PlayerInfoData(UUID uniqueId) {
             this.uniqueId = uniqueId;
@@ -180,13 +233,14 @@ public class PacketPlayOutPlayerInfo implements TabPacket {
 
         @Override
         public String toString() {
-            return String.format("PlayerInfoData{latency=%s,gameMode=%s,displayName=%s,name=%s,uniqueId=%s,skin=%s}",
-                    latency, gameMode, displayName, name, uniqueId, skin);
+            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
+         *
+         * @return  latency
          */
         public int getLatency() {
             return latency;
@@ -194,16 +248,37 @@ public class PacketPlayOutPlayerInfo implements TabPacket {
 
         /**
          * Sets {@link #latency} to specified value
-         * @param    latency
-         *             Latency to use
+         *
+         * @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
+         *
+         * @return  displayName
          */
         public IChatBaseComponent getDisplayName() {
             return displayName;
@@ -211,8 +286,9 @@ public class PacketPlayOutPlayerInfo implements TabPacket {
 
         /**
          * Sets {@link #displayName} to specified value
-         * @param    displayName
-         *             Display name to use
+         *
+         * @param   displayName
+         *          Display name to use
          */
         public void setDisplayName(IChatBaseComponent displayName) {
             this.displayName = displayName;
@@ -220,7 +296,8 @@ public class PacketPlayOutPlayerInfo implements TabPacket {
 
         /**
          * Returns {@link #uniqueId}
-         * @return    uniqueId
+         *
+         * @return  uniqueId
          */
         public UUID getUniqueId() {
             return uniqueId;
@@ -228,8 +305,9 @@ public class PacketPlayOutPlayerInfo implements TabPacket {
 
         /**
          * Sets {@link #uniqueId} to specified value
-         * @param    uniqueId
-         *             UUID to use
+         *
+         * @param   uniqueId
+         *          UUID to use
          */
         public void setUniqueId(UUID uniqueId) {
             this.uniqueId = uniqueId;
@@ -237,7 +315,8 @@ public class PacketPlayOutPlayerInfo implements TabPacket {
 
         /**
          * Returns {@link #name}
-         * @return    name
+         *
+         * @return  name
          */
         public String getName() {
             return name;
@@ -245,8 +324,9 @@ public class PacketPlayOutPlayerInfo implements TabPacket {
 
         /**
          * Sets {@link #name} to specified value
-         * @param    name
-         *             name to use
+         *
+         * @param   name
+         *          name to use
          */
         public void setName(String name) {
             this.name = name;
@@ -254,7 +334,8 @@ public class PacketPlayOutPlayerInfo implements TabPacket {
 
         /**
          * Returns {@link #gameMode}
-         * @return    gameMode
+         *
+         * @return  gameMode
          */
         public EnumGamemode getGameMode() {
             return gameMode;
@@ -262,8 +343,9 @@ public class PacketPlayOutPlayerInfo implements TabPacket {
 
         /**
          * Sets {@link #gameMode} to specified value
-         * @param    gameMode
-         *             GameMode to use
+         *
+         * @param   gameMode
+         *          GameMode to use
          */
         public void setGameMode(EnumGamemode gameMode) {
             this.gameMode = gameMode;
@@ -271,7 +353,8 @@ public class PacketPlayOutPlayerInfo implements TabPacket {
 
         /**
          * Returns {@link #skin}
-         * @return    skin
+         *
+         * @return  skin
          */
         public Skin getSkin() {
             return skin;
@@ -279,22 +362,62 @@ public class PacketPlayOutPlayerInfo implements TabPacket {
 
         /**
          * Sets {@link #skin} to specified value
-         * @param    skin
-         *             Skin to use
+         *
+         * @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
-     * Calling ordinal() will return action's network ID.
      */
     public enum EnumPlayerInfoAction {
 
         ADD_PLAYER,
+        INITIALIZE_CHAT,
         UPDATE_GAME_MODE,
+        UPDATE_LISTED,
         UPDATE_LATENCY,
         UPDATE_DISPLAY_NAME,
         REMOVE_PLAYER

api/src/main/java/me/neznamy/tab/api/protocol/PacketPlayOutPlayerListHeaderFooter.java

@@ -18,10 +18,10 @@ public class PacketPlayOutPlayerListHeaderFooter implements TabPacket {
      * 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
+     * @param   header
+     *          TabList header
+     * @param   footer
+     *          TabList footer
      */
     public PacketPlayOutPlayerListHeaderFooter(String header, String footer) {
         Preconditions.checkNotNull(header, "header");
@@ -33,10 +33,10 @@ public class PacketPlayOutPlayerListHeaderFooter implements TabPacket {
     /**
      * Constructs new instance with given parameters.
      * 
-     * @param    header
-     *             TabList header
-     * @param    footer
-     *             TabList footer
+     * @param   header
+     *          TabList header
+     * @param   footer
+     *          TabList footer
      */
     public PacketPlayOutPlayerListHeaderFooter(IChatBaseComponent header, IChatBaseComponent footer) {
         Preconditions.checkNotNull(header, "header");
@@ -52,7 +52,8 @@ public class PacketPlayOutPlayerListHeaderFooter implements TabPacket {
 
     /**
      * Returns {@link #header}
-     * @return    header
+     *
+     * @return  header
      */
     public IChatBaseComponent getHeader() {
         return header;
@@ -60,7 +61,8 @@ public class PacketPlayOutPlayerListHeaderFooter implements TabPacket {
 
     /**
      * Returns {@link #footer}
-     * @return    footer
+     *
+     * @return  footer
      */
     public IChatBaseComponent getFooter() {
         return footer;

api/src/main/java/me/neznamy/tab/api/protocol/PacketPlayOutScoreboardDisplayObjective.java

@@ -20,12 +20,13 @@ public class PacketPlayOutScoreboardDisplayObjective implements TabPacket {
 
     /**
      * 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
+     *
+     * @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");
@@ -41,7 +42,8 @@ public class PacketPlayOutScoreboardDisplayObjective implements TabPacket {
 
     /**
      * Returns {@link #slot}
-     * @return    slot
+     *
+     * @return  slot
      */
     public int getSlot() {
         return slot;
@@ -49,7 +51,8 @@ public class PacketPlayOutScoreboardDisplayObjective implements TabPacket {
 
     /**
      * Returns {@link #objectiveName}
-     * @return    objectiveName
+     *
+     * @return  objectiveName
      */
     public String getObjectiveName() {
         return objectiveName;

api/src/main/java/me/neznamy/tab/api/protocol/PacketPlayOutScoreboardObjective.java

@@ -27,14 +27,16 @@ public class PacketPlayOutScoreboardObjective implements TabPacket {
     /**
      * 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
+     * @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");
@@ -50,10 +52,10 @@ public class PacketPlayOutScoreboardObjective implements TabPacket {
     /**
      * 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
+     * @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");
@@ -72,7 +74,8 @@ public class PacketPlayOutScoreboardObjective implements TabPacket {
 
     /**
      * Returns {@link #displayName}
-     * @return    displayName
+     *
+     * @return  displayName
      */
     public String getDisplayName() {
         return displayName;
@@ -80,7 +83,8 @@ public class PacketPlayOutScoreboardObjective implements TabPacket {
 
     /**
      * Returns {@link #objectiveName}
-     * @return    objectiveName
+     *
+     * @return  objectiveName
      */
     public String getObjectiveName() {
         return objectiveName;
@@ -88,7 +92,8 @@ public class PacketPlayOutScoreboardObjective implements TabPacket {
 
     /**
      * Returns {@link #renderType}
-     * @return    renderType
+     *
+     * @return  renderType
      */
     public EnumScoreboardHealthDisplay getRenderType() {
         return renderType;
@@ -96,7 +101,8 @@ public class PacketPlayOutScoreboardObjective implements TabPacket {
 
     /**
      * Returns {@link #action}
-     * @return    packet action
+     *
+     * @return  packet action
      */
     public int getAction() {
         return action;

api/src/main/java/me/neznamy/tab/api/protocol/PacketPlayOutScoreboardScore.java

@@ -22,16 +22,16 @@ public class PacketPlayOutScoreboardScore implements TabPacket {
     /**
      * 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
+     * @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");
@@ -52,7 +52,8 @@ public class PacketPlayOutScoreboardScore implements TabPacket {
 
     /**
      * Returns {@link #action}
-     * @return    packet action
+     *
+     * @return  packet action
      */
     public Action getAction() {
         return action;
@@ -60,7 +61,8 @@ public class PacketPlayOutScoreboardScore implements TabPacket {
 
     /**
      * Returns {@link #objectiveName}
-     * @return    objective name
+     *
+     * @return  objective name
      */
     public String getObjectiveName() {
         return objectiveName;
@@ -68,7 +70,8 @@ public class PacketPlayOutScoreboardScore implements TabPacket {
 
     /**
      * Returns {@link #player}
-     * @return    player
+     *
+     * @return  player
      */
     public String getPlayer() {
         return player;
@@ -76,7 +79,8 @@ public class PacketPlayOutScoreboardScore implements TabPacket {
 
     /**
      * Returns {@link #score}
-     * @return    score
+     *
+     * @return  score
      */
     public int getScore() {
         return score;

api/src/main/java/me/neznamy/tab/api/protocol/PacketPlayOutScoreboardTeam.java

@@ -20,10 +20,10 @@ public class PacketPlayOutScoreboardTeam implements TabPacket {
      */
     private final String name;
 
-    /** Team prefix, limited to 16 characters, on <1.13 */
+    /** Team prefix, limited to 16 characters, on &lt;1.13 */
     private String playerPrefix;
 
-    /** Team suffix, limited to 16 characters, on <1.13 */
+    /** Team suffix, limited to 16 characters, on &lt;1.13 */
     private String playerSuffix;
 
     /** 
@@ -46,7 +46,7 @@ public class PacketPlayOutScoreboardTeam implements TabPacket {
 
     /** 
      * Affected entities. For players, it is their name, for other entities their UUID
-     * Player name length is limited to 16 characters for <1.8, 40 characters since 1.8.
+     * 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();
@@ -72,13 +72,13 @@ public class PacketPlayOutScoreboardTeam implements TabPacket {
      * 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
+     * @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");
@@ -90,22 +90,22 @@ public class PacketPlayOutScoreboardTeam implements TabPacket {
     /**
      * 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
+     * @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);
@@ -125,10 +125,10 @@ public class PacketPlayOutScoreboardTeam implements TabPacket {
     /**
      * 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
+     * @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);
@@ -137,20 +137,20 @@ public class PacketPlayOutScoreboardTeam implements TabPacket {
     /**
      * 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
+     * @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);
@@ -170,14 +170,14 @@ public class PacketPlayOutScoreboardTeam implements TabPacket {
      * 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
+     * @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);
@@ -194,7 +194,8 @@ public class PacketPlayOutScoreboardTeam implements TabPacket {
 
     /**
      * Returns {@link #name}
-     * @return    team name
+     *
+     * @return  team name
      */
     public String getName() {
         return name;
@@ -202,7 +203,8 @@ public class PacketPlayOutScoreboardTeam implements TabPacket {
 
     /**
      * Returns {@link #playerPrefix}
-     * @return    playerPrefix
+     *
+     * @return  playerPrefix
      */
     public String getPlayerPrefix() {
         return playerPrefix;
@@ -210,7 +212,8 @@ public class PacketPlayOutScoreboardTeam implements TabPacket {
 
     /**
      * Returns {@link #playerSuffix}
-     * @return    playerSuffix
+     *
+     * @return  playerSuffix
      */
     public String getPlayerSuffix() {
         return playerSuffix;
@@ -218,7 +221,8 @@ public class PacketPlayOutScoreboardTeam implements TabPacket {
 
     /**
      * Returns {@link #nameTagVisibility}
-     * @return    nameTagVisibility
+     *
+     * @return  nameTagVisibility
      */
     public String getNameTagVisibility() {
         return nameTagVisibility;
@@ -226,7 +230,8 @@ public class PacketPlayOutScoreboardTeam implements TabPacket {
     
     /**
      * Returns {@link #collisionRule}
-     * @return    collisionRule
+     *
+     * @return  collisionRule
      */
     public String getCollisionRule() {
         return collisionRule;
@@ -235,8 +240,8 @@ public class PacketPlayOutScoreboardTeam implements TabPacket {
     /**
      * Sets {@link #color} to specified color
      * 
-     * @param    color
-     *             color to use
+     * @param   color
+     *          color to use
      */
     public void setColor(EnumChatFormat color) {
         this.color = color;
@@ -244,7 +249,8 @@ public class PacketPlayOutScoreboardTeam implements TabPacket {
 
     /**
      * Returns {@link #color}
-     * @return    color
+     *
+     * @return  color
      */
     public EnumChatFormat getColor() {
         return color;
@@ -252,7 +258,8 @@ public class PacketPlayOutScoreboardTeam implements TabPacket {
 
     /**
      * Returns {@link #players}
-     * @return    players
+     *
+     * @return  players
      */
     public Collection<String> getPlayers() {
         return players;
@@ -260,7 +267,8 @@ public class PacketPlayOutScoreboardTeam implements TabPacket {
 
     /**
      * Returns {@link #options}
-     * @return    team options
+     *
+     * @return  team options
      */
     public int getOptions() {
         return options;
@@ -268,7 +276,8 @@ public class PacketPlayOutScoreboardTeam implements TabPacket {
     
     /**
      * Returns {@link #action}
-     * @return    packet action
+     *
+     * @return  packet action
      */
     public int getAction() {
         return action;

api/src/main/java/me/neznamy/tab/api/protocol/Skin.java

@@ -10,25 +10,28 @@ public class Skin {
     /** Skin value */
     private final String value;
 
-    /** Skin signature */
+    /** 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");
-        Preconditions.checkNotNull(signature, "signature");
         this.value = value;
         this.signature = signature;
     }
 
     /**
      * Returns skin value
+     *
      * @return  skin value
      */
     public String getValue() {
@@ -37,6 +40,7 @@ public class Skin {
 
     /**
      * Returns skin signature
+     *
      * @return  skin signature
      */
     public String getSignature() {
@@ -45,6 +49,7 @@ public class Skin {
 
     /**
      * Returns user-friendly representation of this object
+     *
      * @return  user-friendly representation of this object
      */
     @Override

api/src/main/java/me/neznamy/tab/api/protocol/TabPacket.java

@@ -10,7 +10,8 @@ public interface TabPacket {
 
     /**
      * Returns user-friendly string representation of the packet
-     * @return user-friendly string representation of the packet
+     *
+     * @return  user-friendly string representation of the packet
      */
     String toString();
 }

api/src/main/java/me/neznamy/tab/api/scoreboard/Line.java

@@ -11,7 +11,7 @@ public interface Line {
      * Returns configured raw text of this line. Placeholders
      * remain in raw format.
      * 
-     * @return    raw text of this line
+     * @return  raw text of this line
      */
     String getText();
     
@@ -22,8 +22,8 @@ public interface Line {
      * keep placeholders up to date. If value is identical to previous 
      * one, nothing happens.
      * 
-     * @param    text
-     *             Raw text to display in the line
+     * @param   text
+     *          Raw text to display in the line
      */
     void setText(String text);
 }

api/src/main/java/me/neznamy/tab/api/scoreboard/Scoreboard.java

@@ -15,7 +15,7 @@ public interface Scoreboard {
      * scoreboards from config use name they were defined with. This value is
      * used internally and in /tab announce scoreboard command.
      * 
-     * @return    custom name of this scoreboard
+     * @return  custom name of this scoreboard
      */
     String getName();
 
@@ -23,8 +23,8 @@ public interface Scoreboard {
      * Returns raw title of this scoreboard. Placeholders stay in their
      * raw format.
      * 
-     * @return    scoreboard title
-     * @see        #setTitle(String)
+     * @return  scoreboard title
+     * @see     #setTitle(String)
      */
     String getTitle();
 
@@ -39,9 +39,9 @@ public interface Scoreboard {
      * <p>
      * Calling this method with same title as before will not do anything.
      * 
-     * @param    title
-     *             New title to use with placeholder support
-     * @see        #getTitle()
+     * @param   title
+     *          New title to use with placeholder support
+     * @see     #getTitle()
      */
     void setTitle(String title);
 
@@ -50,9 +50,9 @@ public interface Scoreboard {
      * in game (first line is on top). This list should only be used for reading,
      * for adding/removing lines see {@link #addLine(String)} and {@link #removeLine(int)}.
      * 
-     * @return    list of lines in this scoreboard
-     * @see        #addLine(String)
-     * @see        #removeLine(int)
+     * @return  list of lines in this scoreboard
+     * @see     #addLine(String)
+     * @see     #removeLine(int)
      */
     List<Line> getLines();
 
@@ -60,10 +60,10 @@ public interface Scoreboard {
      * Adds line with specified text on the bottom of scoreboard. Supports
      * placeholders, which will automatically be refreshed.
      * 
-     * @param    text
-     *             Text to display
-     * @see        #getLines()
-     * @see        #removeLine(int)
+     * @param   text
+     *          Text to display
+     * @see     #getLines()
+     * @see     #removeLine(int)
      */
     void addLine(String text);
 
@@ -71,12 +71,12 @@ public interface Scoreboard {
      * Removes line with specified index. Index starts at {@code 0} and ends at 
      * {@link #getLines()}.size()-1.
      * 
-     * @param    index
-     *             Index of line to remove, starting at 0
-     * @throws    IndexOutOfBoundsException
-     *             if the index is out of range (index &lt; 0 || index >= {@link #getLines()}.size())
-     * @see        #getLines()
-     * @see        #addLine(String)
+     * @param   index
+     *          Index of line to remove, starting at 0
+     * @throws  IndexOutOfBoundsException
+     *          if the index is out of range (index &lt; 0 || index &gt;= {@link #getLines()}.size())
+     * @see     #getLines()
+     * @see     #addLine(String)
      */
     void removeLine(int index);
 

api/src/main/java/me/neznamy/tab/api/scoreboard/ScoreboardManager.java

@@ -29,15 +29,15 @@ public interface ScoreboardManager {
      * Client can only see up to 15 lines at a time, however you can define
      * more, if some of them only consist of placeholder that might be empty.
      * 
-     * @param    name
-     *             Internal name of the scoreboard
-     * @param    title
-     *             The scoreboard title
-     * @param    lines
-     *             Lines of text in scoreboard (supports placeholders)
-     * @return    The new scoreboard with given parameters
-     * @throws    NullPointerException
-     *             if {@code name} or {@code lines} is {@code null}
+     * @param   name
+     *          Internal name of the scoreboard
+     * @param   title
+     *          The scoreboard title
+     * @param   lines
+     *          Lines of text in scoreboard (supports placeholders)
+     * @return  The new scoreboard with given parameters
+     * @throws  NullPointerException
+     *          if {@code name} or {@code lines} is {@code null}
      */
     Scoreboard createScoreboard(String name, String title, List<String> lines);
     
@@ -47,7 +47,7 @@ public interface ScoreboardManager {
      * or using {@link #createScoreboard(String, String, List)}.
      * Map value is reference to the actual scoreboard.
      * 
-     * @return    map of registered scoreboards
+     * @return  map of registered scoreboards
      */
     Map<String, Scoreboard> getRegisteredScoreboards();
     
@@ -57,14 +57,14 @@ public interface ScoreboardManager {
      * {@link #resetScoreboard(TabPlayer)}. If the player already sees
      * this scoreboard, nothing will happen.
      * 
-     * @param    player
-     *             Player to send scoreboard to
-     * @param    scoreboard
-     *             Scoreboard to display
-     * @throws    NullPointerException
-     *             if {@code player} or {@code scoreboard} is {@code null}
-     * @see        #hasCustomScoreboard(TabPlayer)
-     * @see        #resetScoreboard(TabPlayer)
+     * @param   player
+     *          Player to send scoreboard to
+     * @param   scoreboard
+     *          Scoreboard to display
+     * @throws  NullPointerException
+     *          if {@code player} or {@code scoreboard} is {@code null}
+     * @see     #hasCustomScoreboard(TabPlayer)
+     * @see     #resetScoreboard(TabPlayer)
      */
     void showScoreboard(TabPlayer player, Scoreboard scoreboard);
     
@@ -72,12 +72,12 @@ public interface ScoreboardManager {
      * Returns {@code true} if player has custom scoreboard set using
      * {@link #showScoreboard(TabPlayer, Scoreboard)}, {@code false} if not.
      * 
-     * @param    player
-     *             Player to check
-     * @return    {@code true} if player has custom scoreboard set using API, 
-     *             {@code false} if not
-     * @see        #showScoreboard(TabPlayer, Scoreboard)
-     * @see        #resetScoreboard(TabPlayer)
+     * @param   player
+     *          Player to check
+     * @return  {@code true} if player has custom scoreboard set using API,
+     *          {@code false} if not
+     * @see      #showScoreboard(TabPlayer, Scoreboard)
+     * @see     #resetScoreboard(TabPlayer)
      */
     boolean hasCustomScoreboard(TabPlayer player);
     
@@ -86,10 +86,10 @@ public interface ScoreboardManager {
      * and re-enables internal display logic with conditions. If player does not
      * have any forced scoreboard, nothing happens.
      * 
-     * @param    player
-     *             Player to hide custom scoreboard from
-     * @see        #showScoreboard(TabPlayer, Scoreboard)
-     * @see        #hasCustomScoreboard(TabPlayer)
+     * @param   player
+     *          Player to hide custom scoreboard from
+     * @see     #showScoreboard(TabPlayer, Scoreboard)
+     * @see     #hasCustomScoreboard(TabPlayer)
      */
     void resetScoreboard(TabPlayer player);
     
@@ -99,11 +99,11 @@ public interface ScoreboardManager {
      * {@link #toggleScoreboard(TabPlayer, boolean)} or
      * {@link #setScoreboardVisible(TabPlayer, boolean, boolean)}.
      * 
-     * @param    player
-     *             Player to get visibility status of
-     * @return    {@code true} if visible, {@code false} if disabled
-     * @see        #setScoreboardVisible(TabPlayer, boolean, boolean)
-     * @see        #toggleScoreboard(TabPlayer, boolean)
+     * @param   player
+     *          Player to get visibility status of
+     * @return  {@code true} if visible, {@code false} if disabled
+     * @see     #setScoreboardVisible(TabPlayer, boolean, boolean)
+     * @see     #toggleScoreboard(TabPlayer, boolean)
      */
     boolean hasScoreboardVisible(TabPlayer player);
     
@@ -113,14 +113,14 @@ public interface ScoreboardManager {
      * visibility, scoreboard is toggled. If {@code sendToggleMessage} is {@code true},
      * toggle message defined in configuration is sent.
      * 
-     * @param    player
-     *             Player to set visibility for
-     * @param    visible
-     *             New visibility status
-     * @param    sendToggleMessage
-     *             whether to send toggle message if status changed or not
-     * @see        #toggleScoreboard(TabPlayer, boolean)
-     * @see        #hasScoreboardVisible(TabPlayer)
+     * @param   player
+     *          Player to set visibility for
+     * @param   visible
+     *          New visibility status
+     * @param   sendToggleMessage
+     *          whether to send toggle message if status changed or not
+     * @see     #toggleScoreboard(TabPlayer, boolean)
+     * @see     #hasScoreboardVisible(TabPlayer)
      */
     void setScoreboardVisible(TabPlayer player, boolean visible, boolean sendToggleMessage);
     
@@ -129,12 +129,12 @@ public interface ScoreboardManager {
      * hides it. If hidden, shows it. If {@code sendToggleMessage} is {@code true},
      * toggle message defined in configuration is sent.
      * 
-     * @param    player
-     *             Player to toggle scoreboard for
-     * @param    sendToggleMessage
-     *             Whether to send toggle message or not
-     * @see        #hasScoreboardVisible(TabPlayer)
-     * @see        #setScoreboardVisible(TabPlayer, boolean, boolean)
+     * @param   player
+     *          Player to toggle scoreboard for
+     * @param   sendToggleMessage
+     *          Whether to send toggle message or not
+     * @see     #hasScoreboardVisible(TabPlayer)
+     * @see     #setScoreboardVisible(TabPlayer, boolean, boolean)
      */
     void toggleScoreboard(TabPlayer player, boolean sendToggleMessage);
     
@@ -143,13 +143,13 @@ public interface ScoreboardManager {
      * time (in milliseconds). Scoreboard name is either defined in config, or 
      * through API in {@link #createScoreboard(String, String, List)}.
      * 
-     * @param    scoreboard
-     *             Scoreboard from config or registered via API
-     * @param    duration
-     *             Duration in milliseconds
-     * @throws    IllegalArgumentException
-     *             if no scoreboard was found with such name or {@code duration}
-     *             is &lt; 0.
+     * @param   scoreboard
+     *          Scoreboard from config or registered via API
+     * @param   duration
+     *          Duration in milliseconds
+     * @throws  IllegalArgumentException
+     *          if no scoreboard was found with such name or {@code duration}
+     *          is &lt; 0.
      */
     void announceScoreboard(String scoreboard, int duration);
 
@@ -157,9 +157,10 @@ public interface ScoreboardManager {
      * Returns player's currently displayed scoreboard. This can be either with
      * configuration, overridden with commands or the API. Will return {@code null}
      * if player does not see any scoreboard due to not meeting any display condition.
-     * @param    player
-     *             player to get active scoreboard of
-     * @return    player's active scoreboard or {@code null} if player has no scoreboard
+     *
+     * @param   player
+     *          player to get active scoreboard of
+     * @return  player's active scoreboard or {@code null} if player has no scoreboard
      */
     Scoreboard getActiveScoreboard(TabPlayer player);
 }

api/src/main/java/me/neznamy/tab/api/task/RepeatingTask.java

@@ -1,10 +0,0 @@
-package me.neznamy.tab.api.task;
-
-public interface RepeatingTask {
-    
-    int getInterval();
-
-    void setInterval(int paramInt);
-
-    void cancel();
-}

api/src/main/java/me/neznamy/tab/api/task/ThreadManager.java

@@ -4,50 +4,93 @@ 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
+     *
+     * @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
+     *
+     * @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
+     *
+     * @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
+     *
+     * @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
      */
-    RepeatingTask startRepeatingMeasuredTask(int intervalMilliseconds, TabFeature feature, String type, Runnable task);
+    Future<?> startRepeatingMeasuredTask(int intervalMilliseconds, TabFeature feature, String type, Runnable task);
 
-    RepeatingTask startRepeatingTask(int intervalMilliseconds, 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 allowing to cancel the task
+     *
+     * @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);
 }

api/src/main/java/me/neznamy/tab/api/team/TeamManager.java

@@ -6,92 +6,138 @@ public interface TeamManager {
 
     /**
      * Makes player's NameTag globally invisible
-     * @see #showNametag(TabPlayer)
-     * @see #hasHiddenNametag(TabPlayer)
+     *
+     * @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 viewer - player to hide NameTag for
+     *
+     * @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
-     * @see #hideNametag(TabPlayer)
-     * @see #hasHiddenNametag(TabPlayer)
+     *
+     * @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 viewer - player to show NameTag back for
+     *
+     * @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
-     * @return Whether player has hidden NameTag or not
-     * @see #hideNametag(TabPlayer)
-     * @see #showNametag(TabPlayer)
+     *
+     * @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 viewer - player to check visibility status for
-     * @return true if hidden, 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
-     * @return true if paused, false if not
+     *
+     * @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 teamName - forced 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
-     * @return 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 collision - forced collision rule
+     *
+     * @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
-     * @return forced value or null if not forced
+     *
+     * @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
+     *
+     * @param   player
+     *          player to update team data of
      */
     void updateTeamData(TabPlayer player);
 
@@ -116,10 +162,10 @@ public interface TeamManager {
      * 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
+     * @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);
 
@@ -128,9 +174,9 @@ public interface TeamManager {
      * {@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
+     * @param   player
+     *          player to check
+     * @return  {@code true} if hidden, {@code false} if not
      */
     boolean hasHiddenNameTagVisibilityView(TabPlayer player);
 }

api/src/main/java/me/neznamy/tab/api/util/BiFunctionWithException.java

@@ -2,17 +2,28 @@ package me.neznamy.tab.api.util;
 
 /**
  * An interface for BiFunction which can throw an exception.
- * Used in {@link me.neznamy.tab.api.protocol.PacketBuilder} to 
+ * Used in {@link me.neznamy.tab.api.protocol.PacketBuilder} to
  * call build method for packet classes, which may throw an
  * exception due to reflection.
- * @param    <A>
- *             First function argument
- * @param    <B>
- *             Second function argument
- * @param    <C>
- *             Function return type
+ * @param   <A>
+ *          First function argument
+ * @param   <B>
+ *          Second function argument
+ * @param   <C>
+ *          Function return type
  */
 public interface BiFunctionWithException<A, B, C> {
 
+    /**
+     * Runs the function and returns the result
+     *
+     * @param   a
+     *          First argument
+     * @param   b
+     *          Second argument
+     * @return  Output from function
+     * @throws  ReflectiveOperationException
+     *          If reflective operation fails
+     */
     C apply(A a, B b) throws ReflectiveOperationException;
 }

api/src/main/java/me/neznamy/tab/api/util/Preconditions.java

@@ -1,20 +1,78 @@
 package me.neznamy.tab.api.util;
 
+import me.neznamy.tab.api.TabPlayer;
+
+/**
+ * Class with utility methods used in the plugin
+ */
 public class Preconditions {
 
-    private Preconditions(){}
+    /**
+     * Private constructor preventing the class from being instantiated
+     */
+    private Preconditions() {}
 
-    public static void checkNotNull(Object obj, String name){
+    /**
+     * 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() + ")");
     }
 
-    public static void checkRange(Number number, Number min, Number max, String variable){
+    /**
+     * 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 + ")");
+            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.");
     }
 }

build-logic/build.gradle.kts

@@ -2,11 +2,16 @@ plugins {
     `kotlin-dsl`
 }
 
-repositories {
-    gradlePluginPortal()
-    mavenCentral()
+dependencies {
+    implementation(libs.plugin.indra)
+    implementation(libs.plugin.shadow)
 }
 
 dependencies {
-    implementation("gradle.plugin.com.github.johnrengelman", "shadow", "7.1.0")
+    compileOnly(files(libs::class.java.protectionDomain.codeSource.location))
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }

build-logic/settings.gradle.kts

@@ -0,0 +1,16 @@
+rootProject.name = "build-logic"
+
+dependencyResolutionManagement {
+    repositories {
+        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"))
+        }
+    }
+}

build-logic/src/main/kotlin/tab.base-conventions.gradle.kts

@@ -1,7 +1,16 @@
 import org.apache.tools.ant.filters.ReplaceTokens
 
 plugins {
-    `java-library`
+    id("net.kyori.indra")
+}
+
+indra {
+    javaVersions {
+        target(8)
+    }
+    github("NEZNAMY", "TAB") {
+        ci(true)
+    }
 }
 
 tasks {
@@ -13,18 +22,9 @@ tasks {
         ))
     }
     javadoc {
+        // This saves a decent bit of processing power on slow machines
+        enabled = false
         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))
-    }
 }

build-logic/src/main/kotlin/tab.standard-conventions.gradle.kts

@@ -1,31 +1,12 @@
-import gradle.kotlin.dsl.accessors._4cbb0020bd75d48acc42cabded5fdbb7.publishing
-import org.gradle.api.artifacts.repositories.PasswordCredentials
-import org.gradle.api.publish.maven.MavenPublication
-import org.gradle.kotlin.dsl.get
-import org.gradle.kotlin.dsl.repositories
-
 plugins {
     id("tab.base-conventions")
-    `maven-publish`
+    id("net.kyori.indra.publishing")
 }
 
-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"])
+indra {
+    publishReleasesTo("krypton", "https://repo.kryptonmc.org/releases")
+    publishSnapshotsTo("krypton", "https://repo.kryptonmc.org/snapshots")
+    configurePublications {
+        artifactId = "tab-$artifactId"
     }
 }

bukkit/build.gradle.kts

@@ -6,6 +6,7 @@ dependencies {
     compileOnly(libs.vault)
     compileOnly(libs.via)
     compileOnly(libs.authlib)
-    compileOnly(libs.libsDisguises)
-    compileOnly(libs.essentials)
+    compileOnly(libs.essentials) {
+        exclude("org.spigotmc", "spigot-api")
+    }
 }

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/BukkitEventListener.java

@@ -1,5 +1,6 @@
 package me.neznamy.tab.platforms.bukkit;
 
+import me.neznamy.tab.api.TabAPI;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -8,56 +9,72 @@ import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
-import me.neznamy.tab.shared.TAB;
-
 /**
  * The core for bukkit forwarding events into all enabled features
  */
 public class BukkitEventListener 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
+     *
+     * @param   e
+     *          quit event
      */
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onQuit(PlayerQuitEvent e){
-        if (TAB.getInstance().isDisabled()) return;
-        TAB.getInstance().getCPUManager().runTask(() -> TAB.getInstance().getFeatureManager().onQuit(TAB.getInstance().getPlayer(e.getPlayer().getUniqueId())));
+        if (TabAPI.getInstance().isPluginDisabled()) return;
+        TabAPI.getInstance().getThreadManager().runTask(() -> TabAPI.getInstance().getFeatureManager().onQuit(TabAPI.getInstance().getPlayer(e.getPlayer().getUniqueId())));
     }
     
     /**
      * Listener to PlayerJoinEvent to create player data and forward the event to features
-     * @param e join event
+     *
+     * @param   e
+     *          join event
      */
     @EventHandler(priority = EventPriority.LOWEST)
     public void onJoin(PlayerJoinEvent e) {
-        if (TAB.getInstance().isDisabled()) return;
-        TAB.getInstance().getCPUManager().runTask(() -> TAB.getInstance().getFeatureManager().onJoin(new BukkitTabPlayer(e.getPlayer(), platform.getProtocolVersion(e.getPlayer()))));
+        if (TabAPI.getInstance().isPluginDisabled()) return;
+        TabAPI.getInstance().getThreadManager().runTask(() ->
+                TabAPI.getInstance().getFeatureManager().onJoin(new BukkitTabPlayer(e.getPlayer(), platform.getProtocolVersion(e.getPlayer()))));
     }
 
     /**
      * Listener to PlayerChangedWorldEvent to forward the event to features
-     * @param e world changed event
+     *
+     * @param   e
+     *          world changed event
      */
     @EventHandler(priority = EventPriority.LOWEST)
     public void onWorldChange(PlayerChangedWorldEvent e){
-        if (TAB.getInstance().isDisabled()) return;
-        TAB.getInstance().getCPUManager().runTask(() -> TAB.getInstance().getFeatureManager().onWorldChange(e.getPlayer().getUniqueId(), e.getPlayer().getWorld().getName()));
+        if (TabAPI.getInstance().isPluginDisabled()) return;
+        TabAPI.getInstance().getThreadManager().runTask(() ->
+                TabAPI.getInstance().getFeatureManager().onWorldChange(e.getPlayer().getUniqueId(), e.getPlayer().getWorld().getName()));
     }
 
     /**
      * Listener to PlayerChangedWorldEvent to forward the event to features
-     * @param e command preprocess event
+     *
+     * @param   e
+     *          command preprocess event
      */
     @EventHandler
     public void onCommand(PlayerCommandPreprocessEvent e) {
-        if (TAB.getInstance().isDisabled()) return;
-        if (TAB.getInstance().getFeatureManager().onCommand(TAB.getInstance().getPlayer(e.getPlayer().getUniqueId()), e.getMessage())) e.setCancelled(true);
+        if (TabAPI.getInstance().isPluginDisabled()) return;
+        if (TabAPI.getInstance().getFeatureManager().onCommand(
+                TabAPI.getInstance().getPlayer(e.getPlayer().getUniqueId()), e.getMessage())) e.setCancelled(true);
     }
 }

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/BukkitPacketBuilder.java

@@ -1,82 +1,56 @@
 package me.neznamy.tab.platforms.bukkit;
 
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.UUID;
-
-import com.mojang.authlib.properties.Property;
-import me.neznamy.tab.api.protocol.*;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.entity.EntityType;
-
-import com.google.gson.JsonObject;
 import com.mojang.authlib.GameProfile;
-
+import com.mojang.authlib.properties.Property;
 import me.neznamy.tab.api.ProtocolVersion;
-import me.neznamy.tab.api.chat.ChatClickable.EnumClickAction;
-import me.neznamy.tab.api.chat.ChatComponentEntity;
-import me.neznamy.tab.api.chat.ChatHoverable.EnumHoverAction;
+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.TextColor;
+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.NMSStorage;
-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.*;
 import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcher;
+import org.bukkit.Bukkit;
+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 storage
+    /** NMS data storage */
     private final NMSStorage nms = NMSStorage.getInstance();
 
-    //entity type ids
+    /** 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<>();
-    private final Map<IChatBaseComponent, Object> componentCacheLegacy = new HashMap<>();
 
-    private Object emptyScoreboard;
-    private Object dummyEntity;
+    /** Component cache for better performance (1.15- players) */
+    private final Map<IChatBaseComponent, Object> componentCacheLegacy = new HashMap<>();
 
     /**
      * Constructs new instance
      */
     public BukkitPacketBuilder() {
-        if (nms.getMinorVersion() >= 13) {
+        if (nms.getMinorVersion() >= 19) {
+            entityIds.put(EntityType.ARMOR_STAND, 2);
+        } else if (nms.getMinorVersion() >= 13) {
             entityIds.put(EntityType.ARMOR_STAND, 1);
-            entityIds.put(EntityType.WITHER, 83);
         } else {
             entityIds.put(EntityType.WITHER, 64);
             if (nms.getMinorVersion() >= 8){
                 entityIds.put(EntityType.ARMOR_STAND, 30);
             }
         }
-        try {
-            emptyScoreboard = nms.newScoreboard.newInstance();
-        } catch (ReflectiveOperationException e) {
-            Bukkit.getConsoleSender().sendMessage(EnumChatFormat.color("&c[TAB] Failed to create instance of \"Scoreboard\""));
-        }
-        if (nms.getMinorVersion() >= 8) {
-            try {
-                dummyEntity = nms.newEntityArmorStand.newInstance(nms.World_getHandle.invoke(Bukkit.getWorlds().get(0)), 0, 0, 0);
-            } catch (ReflectiveOperationException e) {
-                Bukkit.getConsoleSender().sendMessage(EnumChatFormat.color("&c[TAB] Failed to create instance of \"EntityArmorStand\""));
-            }
-        }
         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));
@@ -96,41 +70,77 @@ public class BukkitPacketBuilder extends PacketBuilder {
     @Override
     public Object build(PacketPlayOutChat packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
         Object component = toNMSComponent(packet.getMessage(), clientVersion);
-        if (nms.getMinorVersion() >= 16) {
-            return nms.newPacketPlayOutChat.newInstance(component, nms.ChatMessageType_values[packet.getType().ordinal()], UUID.randomUUID());
-        }
-        if (nms.getMinorVersion() >= 12) {
-            return nms.newPacketPlayOutChat.newInstance(component, Enum.valueOf((Class<Enum>) nms.ChatMessageType, packet.getType().toString()));
-        }
-        if (nms.getMinorVersion() >= 8) {
+        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) {
+        if (nms.getMinorVersion() == 7)
             return nms.newPacketPlayOutChat.newInstance(component);
-        }
-        throw new IllegalStateException("Not supported on <1.7");
+        return packet;
     }
 
     @Override
     public Object build(PacketPlayOutPlayerInfo packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
         if (nms.getMinorVersion() < 8) return null;
-        Object nmsPacket = nms.newPacketPlayOutPlayerInfo.newInstance(nms.EnumPlayerInfoAction_values[packet.getAction().ordinal()], 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.getParameterCount() == 5) {
-                parameters.add(nmsPacket);
+        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())
+                );
             }
-            parameters.add(profile);
-            parameters.add(data.getLatency());
-            parameters.add(data.getGameMode() == null ? null : nms.EnumGamemode_values[nms.EnumGamemode_values.length-EnumGamemode.VALUES.length+data.getGameMode().ordinal()]); //not_set was removed in 1.17
-            parameters.add(data.getDisplayName() == null ? null : toNMSComponent(data.getDisplayName(), clientVersion));
-            items.add(nms.newPlayerInfoData.newInstance(parameters.toArray()));
+            Enum[] array = packet.getActions().stream().map(action -> Enum.valueOf(nms.EnumPlayerInfoAction, action.toString())).toArray(Enum[]::new);
+            Object nmsPacket = nms.newPacketPlayOutPlayerInfo.newInstance(array[0], nms.getHandle.invoke(Bukkit.getOnlinePlayers().iterator().next()));
+            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_ACTION, EnumSet.of(array[0], array));
+            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;
         }
-        nms.setField(nmsPacket, nms.PacketPlayOutPlayerInfo_PLAYERS, items);
-        return nmsPacket;
     }
 
     @Override
@@ -156,7 +166,7 @@ public class BukkitPacketBuilder extends PacketBuilder {
         if (nms.getMinorVersion() >= 13) {
             return nms.newPacketPlayOutScoreboardObjective.newInstance(nms.newScoreboardObjective.newInstance(null, packet.getObjectiveName(), null, 
                     toNMSComponent(IChatBaseComponent.optimizedComponent(displayName), clientVersion), 
-                    packet.getRenderType() == null ? null : nms.EnumScoreboardHealthDisplay_values[packet.getRenderType().ordinal()]), 
+                    packet.getRenderType() == null ? null : Enum.valueOf(nms.EnumScoreboardHealthDisplay, packet.getRenderType().toString())),
                     packet.getAction());
         }
 
@@ -164,7 +174,7 @@ public class BukkitPacketBuilder extends PacketBuilder {
         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((Class<Enum>) nms.EnumScoreboardHealthDisplay, packet.getRenderType().toString()));
+            nms.setField(nmsPacket, nms.PacketPlayOutScoreboardObjective_RENDERTYPE, Enum.valueOf(nms.EnumScoreboardHealthDisplay, packet.getRenderType().toString()));
         }
         nms.setField(nmsPacket, nms.PacketPlayOutScoreboardObjective_METHOD, packet.getAction());
         return nmsPacket;
@@ -173,12 +183,12 @@ public class BukkitPacketBuilder extends PacketBuilder {
     @Override
     public Object build(PacketPlayOutScoreboardScore packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
         if (nms.getMinorVersion() >= 13) {
-            return nms.newPacketPlayOutScoreboardScore_1_13.newInstance(nms.EnumScoreboardAction_values[packet.getAction().ordinal()], packet.getObjectiveName(), packet.getPlayer(), packet.getScore());
+            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(emptyScoreboard, newScoreboardObjective(packet.getObjectiveName()), 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);
@@ -189,7 +199,7 @@ public class BukkitPacketBuilder extends PacketBuilder {
     @Override
     public Object build(PacketPlayOutScoreboardTeam packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
         if (nms.PacketPlayOutScoreboardTeam == null) return null; //fabric
-        Object team = nms.newScoreboardTeam.newInstance(emptyScoreboard, packet.getName());
+        Object team = nms.newScoreboardTeam.newInstance(nms.emptyScoreboard, packet.getName());
         String prefix = packet.getPlayerPrefix();
         String suffix = packet.getPlayerSuffix();
         if (clientVersion.getMinorVersion() < 13) {
@@ -213,9 +223,9 @@ public class BukkitPacketBuilder extends PacketBuilder {
             case 2:
                 return nms.PacketPlayOutScoreboardTeam_ofBoolean.invoke(null, team, false);
             case 3:
-                return nms.PacketPlayOutScoreboardTeam_ofString.invoke(null, team, packet.getPlayers().toArray(new String[0])[0], nms.PacketPlayOutScoreboardTeam_PlayerAction_values[0]);
+                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().toArray(new String[0])[0], nms.PacketPlayOutScoreboardTeam_PlayerAction_values[1]);
+                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());
             }
@@ -224,10 +234,13 @@ public class BukkitPacketBuilder extends PacketBuilder {
     }
 
     /**
-     * Builds entity destroy packet with given parameter
-     * @return destroy packet
-     * @throws    ReflectiveOperationException
-     *             if thrown by reflective operation
+     * 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 {
@@ -238,26 +251,41 @@ public class BukkitPacketBuilder extends PacketBuilder {
         }
     }
 
+    /**
+     * 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 {
-        return nms.newPacketPlayOutEntityMetadata.newInstance(packet.getEntityId(), packet.getDataWatcher().toNMS(), true);
+        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 with given parameters
+     * Builds entity spawn packet from custom packet class
      *
-     * @return entity spawn packet
-     * @throws    ReflectiveOperationException
-     *             if thrown by reflective operation
+     * @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(dummyEntity);
+            nmsPacket = nms.newPacketPlayOutSpawnEntityLiving.newInstance(nms.dummyEntity);
         } else {
             nmsPacket = nms.newPacketPlayOutSpawnEntityLiving.newInstance();
         }
         nms.setField(nmsPacket, nms.PacketPlayOutSpawnEntityLiving_ENTITYID, packet.getEntityId());
-        nms.setField(nmsPacket, nms.PacketPlayOutSpawnEntityLiving_ENTITYTYPE, entityIds.get(packet.getEntityType()));
         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) {
@@ -273,19 +301,28 @@ public class BukkitPacketBuilder extends PacketBuilder {
             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 with given parameters
-     * @return entity teleport packet
-     * @throws    ReflectiveOperationException
-     *             if thrown by reflective operation
+     * 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(dummyEntity);
+            nmsPacket = nms.newPacketPlayOutEntityTeleport.newInstance(nms.dummyEntity);
         } else {
             nmsPacket = nms.newPacketPlayOutEntityTeleport.newInstance();
         }
@@ -303,43 +340,114 @@ public class BukkitPacketBuilder extends PacketBuilder {
         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, nms.EnumChatFormat_values[format.ordinal()]);
-        nms.ScoreboardTeam_setNameTagVisibility.invoke(team, String.valueOf(packet.getNameTagVisibility()).equals("always") ? nms.EnumNameTagVisibility_values[0] : nms.EnumNameTagVisibility_values[1]);
-        nms.ScoreboardTeam_setCollisionRule.invoke(team, String.valueOf(packet.getCollisionRule()).equals("always") ? nms.EnumTeamPush_values[0] : nms.EnumTeamPush_values[1]);
+        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, String.valueOf(packet.getNameTagVisibility()).equals("always") ? nms.EnumNameTagVisibility_values[0] : nms.EnumNameTagVisibility_values[1]);
-        if (nms.getMinorVersion() >= 9) nms.ScoreboardTeam_setCollisionRule.invoke(team, String.valueOf(packet.getCollisionRule()).equals("always") ? nms.EnumTeamPush_values[0] : nms.EnumTeamPush_values[1]);
+        if (nms.getMinorVersion() >= 8) nms.ScoreboardTeam_setNameTagVisibility.invoke(team, Enum.valueOf(nms.EnumNameTagVisibility, packet.getNameTagVisibility().equals("always") ? "ALWAYS" : "NEVER"));
+        if (nms.getMinorVersion() >= 9) nms.ScoreboardTeam_setCollisionRule.invoke(team, Enum.valueOf(nms.EnumTeamPush, packet.getCollisionRule().equals("always") ? "ALWAYS" : "NEVER"));
     }
     
     @Override
     public PacketPlayOutPlayerInfo readPlayerInfo(Object nmsPacket, ProtocolVersion clientVersion) throws ReflectiveOperationException {
         if (nms.getMinorVersion() < 8) return null;
-        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 : fromNMSComponent(nmsComponent);
-            Skin skin = null;
-            if (!profile.getProperties().get("textures").isEmpty()) {
-                Property pr = (Property) profile.getProperties().get("textures").iterator().next();
-                skin = new Skin(pr.getValue(), pr.getSignature());
+        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())
+                );
             }
-            listData.add(new PlayerInfoData(profile.getName(), profile.getId(), skin,
-                    (int) nms.PlayerInfoData_getLatency.invoke(nmsData), gameMode, listName));
+            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);
         }
-        return new PacketPlayOutPlayerInfo(action, listData);
     }
 
     @Override
@@ -359,12 +467,15 @@ public class BukkitPacketBuilder extends PacketBuilder {
     }
 
     /**
-     * Builds entity BossBar packet
-     * @param packet - packet to build
-     * @param clientVersion - client version
-     * @return entity BossBar packet
-     * @throws    ReflectiveOperationException
-     *             if thrown by reflective operation
+     * 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
@@ -384,6 +495,7 @@ public class BukkitPacketBuilder extends PacketBuilder {
         }
         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));
@@ -392,8 +504,10 @@ public class BukkitPacketBuilder extends PacketBuilder {
 
     /**
      * A method taken from minecraft code used to convert double to int
-     * @param paramDouble double value
-     * @return int value
+     *
+     * @param   paramDouble
+     *          double value
+     * @return  int value
      */
     private int floor(double paramDouble){
         int i = (int)paramDouble;
@@ -401,154 +515,41 @@ public class BukkitPacketBuilder extends PacketBuilder {
     }
 
     /**
-     * Converts minecraft IChatBaseComponent into TAB's component class. Currently, does not support show_item hover event on 1.16+.
-     * @param component - component to convert
-     * @return converted component
-     * @throws    ReflectiveOperationException
-     *             if thrown by reflective operation
+     * 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
      */
-    private IChatBaseComponent fromNMSComponent(Object component) throws ReflectiveOperationException {
-        if (!nms.ChatComponentText.isInstance(component)) return null; //paper
-        IChatBaseComponent chat = new IChatBaseComponent((String) nms.ChatComponentText_text.get(component));
-        Object modifier = nms.ChatBaseComponent_modifier.get(component);
-        if (modifier != null) {
-            chat.getModifier().setColor(fromNMSColor(nms.ChatModifier_color.get(modifier)));
-            chat.getModifier().setBold((Boolean) nms.ChatModifier_bold.get(modifier));
-            chat.getModifier().setItalic((Boolean) nms.ChatModifier_italic.get(modifier));
-            chat.getModifier().setObfuscated((Boolean) nms.ChatModifier_obfuscated.get(modifier));
-            chat.getModifier().setStrikethrough((Boolean) nms.ChatModifier_strikethrough.get(modifier));
-            chat.getModifier().setUnderlined((Boolean) nms.ChatModifier_underlined.get(modifier));
-            Object clickEvent = nms.ChatModifier_clickEvent.get(modifier);
-            if (clickEvent != null) {
-                chat.getModifier().onClick(EnumClickAction.valueOf(nms.ChatClickable_action.get(clickEvent).toString().toUpperCase()), (String) nms.ChatClickable_value.get(clickEvent));
-            }
-            Object hoverEvent = nms.ChatModifier_hoverEvent.get(modifier);
-            if (hoverEvent != null) {
-                EnumHoverAction action;
-                IChatBaseComponent value;
-                if (nms.getMinorVersion() >= 16) {
-                    //does not support show_item on 1.16+
-                    JsonObject json = (JsonObject) nms.ChatHoverable_serialize.invoke(hoverEvent);
-                    action = EnumHoverAction.valueOf(json.get("action").getAsString().toUpperCase());
-                    value = IChatBaseComponent.deserialize(json.get("contents").getAsJsonObject().toString());
-                } else {
-                    action = EnumHoverAction.valueOf(nms.ChatHoverable_getAction.invoke(hoverEvent).toString().toUpperCase());
-                    value = fromNMSComponent(nms.ChatHoverable_getValue.invoke(hoverEvent));
-                }
-                chat.getModifier().onHover(action, value);
-            }
-        }
-        for (Object extra : (List<Object>) nms.ChatBaseComponent_extra.get(component)) {
-            chat.addExtra(fromNMSComponent(extra));
-        }
+    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;
     }
 
-    private TextColor fromNMSColor(Object color) throws ReflectiveOperationException {
-        if (color == null) return null;
-        if (nms.getMinorVersion() >= 16) {
-            String name = (String) nms.ChatHexColor_name.get(color);
-            if (name != null) {
-                //legacy code
-                return new TextColor(EnumChatFormat.valueOf(name.toUpperCase(Locale.US)));
-            } else {
-                int rgb = (int) nms.ChatHexColor_rgb.get(color);
-                return new TextColor((rgb >> 16) & 0xFF, (rgb >> 8) & 0xFF, rgb & 0xFF);
-            }
-        } else {
-            return new TextColor(EnumChatFormat.valueOf(((Enum)color).name()));
-        }
-    }
-
     /**
-     * Converts TAB's IChatBaseComponent into minecraft's component. Currently, does not support hover event.
-     * @param component - component to convert
-     * @param clientVersion - client version used to decide RGB conversion
-     * @return converted component
-     * @throws    ReflectiveOperationException
-     *             if thrown by reflective operation
+     * Creates a new Scoreboard Objective with given name.
+     *
+     * @param   objectiveName
+     *          Objective name
+     * @return  NMS Objective
+     * @throws  ReflectiveOperationException
+     *          if thrown by reflective operation
      */
-    public Object toNMSComponent(IChatBaseComponent component, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-        Object obj;
-        if (clientVersion.getMinorVersion() >= 16) {
-            if (componentCacheModern.containsKey(component)) return componentCacheModern.get(component);
-            obj = toNMSComponent0(component, clientVersion);
-            if (componentCacheModern.size() > 10000) componentCacheModern.clear();
-            componentCacheModern.put(component, obj);
-        } else {
-            if (componentCacheLegacy.containsKey(component)) return componentCacheLegacy.get(component);
-            obj = toNMSComponent0(component, clientVersion);
-            if (componentCacheLegacy.size() > 10000) componentCacheLegacy.clear();
-            componentCacheLegacy.put(component, obj);
-        }
-        return obj;
-    }
-
-    //separate method to prevent extras counting cpu again due to recursion and finally showing higher usage than real
-    private Object toNMSComponent0(IChatBaseComponent component, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-        if (component == null) return null;
-        Object chat = nms.newChatComponentText.newInstance(component.getText());
-        Object modifier;
-        Object clickEvent = component.getModifier().getClickEvent() == null ? null : nms.newChatClickable.newInstance(Enum.valueOf((Class<Enum>) nms.EnumClickAction, 
-                component.getModifier().getClickEvent().getAction().toString().toUpperCase()), component.getModifier().getClickEvent().getValue());
-        if (nms.getMinorVersion() >= 16) {
-            Object color = null;
-            if (component.getModifier().getColor() != null) {
-                if (clientVersion.getMinorVersion() >= 16) {
-                    color = nms.ChatHexColor_ofInt.invoke(null, (component.getModifier().getColor().getRed() << 16) + (component.getModifier().getColor().getGreen() << 8) + component.getModifier().getColor().getBlue());
-                } else {
-                    color = nms.ChatHexColor_ofString.invoke(null, component.getModifier().getColor().getLegacyColor().toString().toLowerCase());
-                }
-            }
-            Object hoverEvent = null;
-            if (component.getModifier().getHoverEvent() != null) {
-                Object nmsAction = nms.EnumHoverAction_a.invoke(null, component.getModifier().getHoverEvent().getAction().toString().toLowerCase());
-                switch (component.getModifier().getHoverEvent().getAction()) {
-                case SHOW_TEXT:
-                    hoverEvent = nms.newChatHoverable.newInstance(nmsAction, toNMSComponent0(component.getModifier().getHoverEvent().getValue(), clientVersion));
-                    break;
-                case SHOW_ENTITY:
-                    hoverEvent = nms.EnumHoverAction_fromJson.invoke(nmsAction, ((ChatComponentEntity) component.getModifier().getHoverEvent().getValue()).toJson());
-                    break;
-                case SHOW_ITEM:
-                    hoverEvent = nms.EnumHoverAction_fromLegacyComponent.invoke(nmsAction, toNMSComponent0(component.getModifier().getHoverEvent().getValue(), clientVersion));
-                    break;
-                default:
-                    break;
-                }
-            }
-            modifier = nms.newChatModifier.newInstance(
-                    color,
-                    component.getModifier().getBold(),
-                    component.getModifier().getItalic(),
-                    component.getModifier().getUnderlined(),
-                    component.getModifier().getStrikethrough(),
-                    component.getModifier().getObfuscated(),
-                    clickEvent, hoverEvent, null, null);
-        } else {
-            modifier = nms.newChatModifier.newInstance();
-            if (component.getModifier().getColor() != null) nms.setField(modifier, nms.ChatModifier_color, Enum.valueOf((Class<Enum>) nms.EnumChatFormat, component.getModifier().getColor().getLegacyColor().toString()));
-            nms.setField(modifier, nms.ChatModifier_bold, component.getModifier().getBold());
-            nms.setField(modifier, nms.ChatModifier_italic, component.getModifier().getItalic());
-            nms.setField(modifier, nms.ChatModifier_underlined, component.getModifier().getUnderlined());
-            nms.setField(modifier, nms.ChatModifier_strikethrough, component.getModifier().getStrikethrough());
-            nms.setField(modifier, nms.ChatModifier_obfuscated, component.getModifier().getObfuscated());
-            if (clickEvent != null) nms.setField(modifier, nms.ChatModifier_clickEvent, clickEvent);
-            if (component.getModifier().getHoverEvent() != null) {
-                nms.setField(modifier, nms.ChatModifier_hoverEvent, nms.newChatHoverable.newInstance(nms.EnumHoverAction_a.invoke(null, 
-                        component.getModifier().getHoverEvent().getAction().toString().toLowerCase()), toNMSComponent0(component.getModifier().getHoverEvent().getValue(), clientVersion)));
-            }
-        }
-        nms.setField(chat, nms.ChatBaseComponent_modifier, modifier);
-        for (IChatBaseComponent extra : component.getExtra()) {
-            nms.ChatComponentText_addSibling.invoke(chat, toNMSComponent0(extra, clientVersion));
-        }
-        return chat;
-    }
-
     private Object newScoreboardObjective(String objectiveName) throws ReflectiveOperationException {
         if (nms.getMinorVersion() >= 13) {
-            return nms.newScoreboardObjective.newInstance(null, objectiveName, null, nms.newChatComponentText.newInstance(""), null);
+            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));
     }

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/BukkitPipelineInjector.java

@@ -9,16 +9,19 @@ 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.api.util.Preconditions;
 import me.neznamy.tab.platforms.bukkit.nms.NMSStorage;
-import me.neznamy.tab.shared.TabConstants;
+import me.neznamy.tab.api.TabConstants;
 import me.neznamy.tab.shared.TAB;
 import me.neznamy.tab.shared.features.PipelineInjector;
+import me.neznamy.tab.shared.features.sorting.Sorting;
 import org.jetbrains.annotations.NotNull;
 
+/**
+ * Pipeline injection for bukkit
+ */
 public class BukkitPipelineInjector extends PipelineInjector {
 
-    //nms storage
+    /** NMS data storage */
     private final NMSStorage nms = NMSStorage.getInstance();
 
     /**
@@ -38,15 +41,16 @@ public class BukkitPipelineInjector extends PipelineInjector {
      */
     public class BukkitChannelDuplexHandler extends ChannelDuplexHandler {
 
-        //injected player
+        /** Injected player */
         private final TabPlayer player;
 
         /**
          * Constructs new instance with given player
-         * @param player - player to inject
+         *
+         * @param   player
+         *          player to inject
          */
         public BukkitChannelDuplexHandler(TabPlayer player) {
-            Preconditions.checkNotNull(player, "player");
             this.player = player;
         }
 
@@ -63,12 +67,15 @@ public class BukkitPipelineInjector extends PipelineInjector {
         @Override
         public void write(ChannelHandlerContext context, Object packet, ChannelPromise channelPromise) {
             try {
-                if (nms.PacketPlayOutPlayerInfo.isInstance(packet)) {
+                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;
                 }
@@ -91,13 +98,16 @@ public class BukkitPipelineInjector extends PipelineInjector {
 
         /**
          * 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
+         *
+         * @param   packetPlayOutScoreboardTeam
+         *          team packet
+         * @throws  ReflectiveOperationException
+         *          nmsGameMode
          */
         @SuppressWarnings("unchecked")
         private void modifyPlayers(Object packetPlayOutScoreboardTeam) throws ReflectiveOperationException {
-            long time = System.nanoTime();
+            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;
@@ -109,17 +119,26 @@ public class BukkitPipelineInjector extends PipelineInjector {
                     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(p.getTeamName())) {
-                    logTeamOverride(teamName, p.getName(), p.getTeamName());
+                        !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);
-            TAB.getInstance().getCPUManager().addTime("NameTags", TabConstants.CpuUsageCategory.ANTI_OVERRIDE, System.nanoTime()-time);
         }
 
+        /**
+         * 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;

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/BukkitPlaceholderRegistry.java

@@ -5,17 +5,25 @@ 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.TAB;
 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
@@ -25,26 +33,39 @@ public class BukkitPlaceholderRegistry extends UniversalPlaceholderRegistry {
     /** Number formatter for 2 decimal places */
     private final NumberFormat numberFormat = NumberFormat.getNumberInstance(Locale.US);
 
-    private Object chat;
-    private final Plugin essentials = Bukkit.getPluginManager().getPlugin("Essentials");
+    /** 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;
-    private boolean paperTps;
-    private boolean paperMspt;
-    private Method playerIsAfk;
+
+    /** 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
+     * Constructs new instance with given parameter and loads hooks
+     *
+     * @param   plugin
+     *          reference to the plugin's main class
      */
-    public BukkitPlaceholderRegistry() {
+    public BukkitPlaceholderRegistry(JavaPlugin plugin) {
+        this.plugin = plugin;
         numberFormat.setMaximumFractionDigits(2);
-        try {
-            if (Bukkit.getPluginManager().isPluginEnabled("Vault")) {
-                RegisteredServiceProvider<?> rspChat = Bukkit.getServicesManager().getRegistration(Class.forName("net.milkbowl.vault.chat.Chat"));
-                if (rspChat != null) chat = rspChat.getProvider();
-            }
-        } catch (ClassNotFoundException e) {
-            //modded server without vault
+        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());
@@ -52,72 +73,74 @@ public class BukkitPlaceholderRegistry extends UniversalPlaceholderRegistry {
         } catch (ReflectiveOperationException e) {
             //not spigot
         }
-        try {
-            Bukkit.class.getMethod("getTPS");
-            paperTps = true;
-        } catch (NoSuchMethodException e) {
-            //not paper
-        }
-        try {
-            Bukkit.class.getMethod("getAverageTickTime");
-            paperMspt = true;
-        } catch (NoSuchMethodException e) {
-            //not paper
-        }
-        try {
-            playerIsAfk = Player.class.getMethod("isAfk");
-        } catch (NoSuchMethodException e) {
-            //not purpur
-        }
+        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) {
-        super.registerPlaceholders(manager);
-        manager.registerPlayerPlaceholder("%displayname%", 500, p -> ((Player) p.getPlayer()).getDisplayName());
-        if (paperTps) {
-            manager.registerServerPlaceholder("%tps%", 1000, () -> formatTPS(Bukkit.getTPS()[0]));
+        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("%tps%", 1000, () -> {
+            manager.registerServerPlaceholder(TabConstants.Placeholder.TPS, 1000, () -> {
                 try {
                     return formatTPS(((double[]) recentTps.get(server))[0]);
                 } catch (IllegalAccessException e) {
-                    return "-1";
+                    return -1;
                 }
             });
         } else {
-            manager.registerServerPlaceholder("%tps%", -1, () -> "-1").enableTriggerMode();
+            manager.registerServerPlaceholder(TabConstants.Placeholder.TPS, -1, () -> -1);
         }
-        if (paperMspt) {
-            manager.registerServerPlaceholder("%mspt%", 1000, () -> numberFormat.format(Bukkit.getAverageTickTime()));
+        if (paperMspt != null) {
+            manager.registerServerPlaceholder(TabConstants.Placeholder.MSPT, 1000, () -> numberFormat.format(Bukkit.getAverageTickTime()));
         }
-        manager.registerPlayerPlaceholder("%afk%", 500, p -> {
+        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;
-            if (playerIsAfk == null) return false;
-            try {
-                return playerIsAfk.invoke(p.getPlayer());
-            } catch (ReflectiveOperationException exception) {
-                TAB.getInstance().getErrorManager().printError("Failed to get AFK status of " + p.getName() + " using Purpur", exception);
-            }
-            return false;
+            return purpurIsAfk != null && ((Player)p.getPlayer()).isAfk();
         });
-        manager.registerPlayerPlaceholder("%essentialsnick%", 1000, p -> {
-            String nickname = null;
-            if (essentials != null)
-                nickname = ((Essentials)essentials).getUser(p.getUniqueId()).getNickname();
-            return nickname == null || nickname.length() == 0 ? p.getName() : nickname;
-        });
-        if (chat != null) {
-            manager.registerPlayerPlaceholder("%vault-prefix%", 1000, p -> ((Chat) chat).getPlayerPrefix((Player) p.getPlayer()));
-            manager.registerPlayerPlaceholder("%vault-suffix%", 1000, p -> ((Chat) chat).getPlayerSuffix((Player) p.getPlayer()));
+        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.registerServerPlaceholder("%vault-prefix%", -1, () -> "").enableTriggerMode();
-            manager.registerServerPlaceholder("%vault-suffix%", -1, () -> "").enableTriggerMode();
+            manager.registerPlayerPlaceholder(TabConstants.Placeholder.ESSENTIALS_NICK, -1, TabPlayer::getName);
         }
-        manager.registerPlayerPlaceholder("%health%", 100, p -> (int) Math.ceil(((Player) p.getPlayer()).getHealth()));
+
+        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));
     }

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/BukkitPlatform.java

@@ -1,12 +1,10 @@
 package me.neznamy.tab.platforms.bukkit;
 
-import com.earth2me.essentials.Essentials;
 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.util.Preconditions;
-import me.neznamy.tab.platforms.bukkit.event.TabLoadEvent;
-import me.neznamy.tab.platforms.bukkit.event.TabPlayerLoadEvent;
+import me.neznamy.tab.api.chat.EnumChatFormat;
 import me.neznamy.tab.platforms.bukkit.features.BukkitTabExpansion;
 import me.neznamy.tab.platforms.bukkit.features.PerWorldPlayerList;
 import me.neznamy.tab.platforms.bukkit.features.PetFix;
@@ -15,10 +13,10 @@ 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.TabConstants;
 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;
@@ -41,31 +39,30 @@ public class BukkitPlatform extends Platform {
     private final JavaPlugin plugin;
 
     /** Variables checking presence of other plugins to hook into */
-    private final boolean placeholderAPI = Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI");
-    private boolean libsDisguises = Bukkit.getPluginManager().isPluginEnabled("LibsDisguises");
-    private final Plugin essentials = Bukkit.getPluginManager().getPlugin("Essentials");
+    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("ProtocolSupport");
+    private final boolean protocolSupport = Bukkit.getPluginManager().isPluginEnabled(TabConstants.Plugin.PROTOCOL_SUPPORT);
 
     /**
      * Constructs new instance with given plugin parameter
-     * @param    plugin
-     *             plugin instance
+     *
+     * @param   plugin
+     *          plugin instance
      */
     public BukkitPlatform(JavaPlugin plugin) {
         super(new BukkitPacketBuilder());
-        Preconditions.checkNotNull(plugin, "plugin");
         this.plugin = plugin;
     }
 
     @Override
     public PermissionPlugin detectPermissionPlugin() {
-        if (Bukkit.getPluginManager().isPluginEnabled("LuckPerms")) {
-            return new LuckPerms(getPluginVersion("LuckPerms"));
-        } else if (Bukkit.getPluginManager().isPluginEnabled("Vault")) {
+        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("Vault"));
+            return new Vault(provider.getProvider(), getPluginVersion(TabConstants.Plugin.VAULT));
         } else {
             return new None();
         }
@@ -73,27 +70,22 @@ public class BukkitPlatform extends Platform {
 
     @Override
     public void loadFeatures() {
-        if (Bukkit.getPluginManager().isPluginEnabled("ViaVersion")) {
+        if (Bukkit.getPluginManager().isPluginEnabled(TabConstants.Plugin.VIAVERSION)) {
             try {
                 Class.forName("com.viaversion.viaversion.api.Via");
-                viaVersion = Bukkit.getPluginManager().getPlugin("ViaVersion");
+                viaVersion = Bukkit.getPluginManager().getPlugin(TabConstants.Plugin.VIAVERSION);
             } catch (ClassNotFoundException e) {
-                TAB.getInstance().sendConsoleMessage("&cAn outdated version of ViaVersion (" + getPluginVersion("ViaVersion") + ") was detected.", true);
+                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);
             }
         }
-        if (Bukkit.getPluginManager().isPluginEnabled("Tablisknu")) {
-            TAB.getInstance().sendConsoleMessage("&cDetected plugin \"Tablisknu\", which causes TAB to not work properly. Consider removing the plugin.", true);
-        }
-        if (Bukkit.getPluginManager().isPluginEnabled("SkBee")) {
-            TAB.getInstance().sendConsoleMessage("&cDetected plugin \"SkBee\", which causes TAB's scoreboard to not show. Consider removing the plugin.", true);
-        }
         TAB tab = TAB.getInstance();
         if (tab.getConfiguration().isPipelineInjection())
             tab.getFeatureManager().registerFeature(TabConstants.Feature.PIPELINE_INJECTION, new BukkitPipelineInjector());
-        new BukkitPlaceholderRegistry().registerPlaceholders(tab.getPlaceholderManager());
+        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 {
@@ -124,14 +116,14 @@ public class BukkitPlatform extends Platform {
 
     @Override
     public String getPluginVersion(String plugin) {
-        Preconditions.checkNotNull(plugin, "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
+     *
+     * @return  online players from Bukkit API
      */
     @SuppressWarnings("unchecked")
     private Player[] getOnlinePlayers() {
@@ -152,7 +144,6 @@ public class BukkitPlatform extends Platform {
 
     @Override
     public void registerUnknownPlaceholder(String identifier) {
-        Preconditions.checkNotNull(identifier, "identifier");
         PlaceholderManagerImpl pl = TAB.getInstance().getPlaceholderManager();
         if (identifier.startsWith("%rel_")) {
             //relational placeholder
@@ -189,19 +180,10 @@ public class BukkitPlatform extends Platform {
         }
     }
 
-    @Override
-    public void callLoadEvent() {
-        Bukkit.getPluginManager().callEvent(new TabLoadEvent());
-    }
-
-    @Override
-    public void callLoadEvent(TabPlayer player) {
-        Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> Bukkit.getPluginManager().callEvent(new TabPlayerLoadEvent(player)));
-    }
-
     /**
      * Returns status of LibsDisguises plugin presence
-     * @return    {@code true} if plugin is enabled, {@code false} if not
+     *
+     * @return  {@code true} if plugin is enabled, {@code false} if not
      */
     public boolean isLibsDisguisesEnabled() {
         return libsDisguises;
@@ -211,36 +193,20 @@ public class BukkitPlatform extends Platform {
      * 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
+     *
+     * @param   enabled
+     *          New status of LibsDisguises presence
      */
     public void setLibsDisguisesEnabled(boolean enabled) {
         libsDisguises = enabled;
     }
 
-    /**
-     * Returns Essentials' main class if the plugin is installed, {@code null} if not
-     * @return    Essentials instance or {@code null} if plugin is not installed
-     */
-    public Essentials getEssentials() {
-        return (Essentials) essentials;
-    }
-
-    @Override
-    public boolean isProxy() {
-        return false;
-    }
-
-    @Override
-    public String getConfigName() {
-        return "bukkitconfig.yml";
-    }
-
     /**
      * Gets protocol version of requested player and returns it.
-     * @param    player
-     *             Player to get protocol version of
-     * @return    protocol version of the player
+     *
+     * @param   player
+     *          Player to get protocol version of
+     * @return  protocol version of the player
      */
     public int getProtocolVersion(Player player) {
         if (protocolSupport){
@@ -256,15 +222,16 @@ public class BukkitPlatform extends Platform {
 
     /**
      * Returns protocol version of requested player using ProtocolSupport
-     * @param    player
-     *             Player to get protocol version of
-     * @return    protocol version of the 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() + ")");
+            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);
@@ -274,9 +241,10 @@ public class BukkitPlatform extends Platform {
 
     /**
      * Returns protocol version of requested player using ViaVersion
-     * @param    player
-     *             Player to get protocol version of
-     * @return    protocol version of the 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 {
@@ -290,7 +258,7 @@ public class BukkitPlatform extends Platform {
                 Thread.sleep(5);
                 return getProtocolVersionVia(player, retryLevel + 1);
             }
-            TAB.getInstance().debug("ViaVersion returned protocol version " + version + " for " + player.getName() + "(online=" + player.isOnline() + ")");
+            TAB.getInstance().debug("ViaVersion returned protocol version " + version + " for " + player.getName() + " (online=" + player.isOnline() + ")");
             return version;
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
@@ -300,4 +268,18 @@ public class BukkitPlatform extends Platform {
             return TAB.getInstance().getServerVersion().getNetworkId();
         }
     }
+
+    /**
+     * Sends console message using ConsoleCommandSender, due to
+     * Paper not translating colors correctly in Logger messages
+     *
+     * @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(message) : message));
+    }
 }

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/BukkitTabPlayer.java

@@ -3,6 +3,7 @@ package me.neznamy.tab.platforms.bukkit;
 import java.util.*;
 
 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;
@@ -10,11 +11,11 @@ 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 org.bukkit.entity.Player;
 import org.bukkit.metadata.MetadataValue;
 import org.bukkit.potion.PotionEffectType;
 
-import com.earth2me.essentials.Essentials;
 import com.mojang.authlib.GameProfile;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.legacy.bossbar.BossColor;
@@ -22,7 +23,6 @@ import com.viaversion.viaversion.api.legacy.bossbar.BossFlag;
 import com.viaversion.viaversion.api.legacy.bossbar.BossStyle;
 
 import io.netty.channel.Channel;
-import me.libraryaddict.disguise.DisguiseAPI;
 import me.neznamy.tab.api.chat.rgb.RGBUtils;
 import me.neznamy.tab.api.protocol.PacketPlayOutBoss;
 import me.neznamy.tab.platforms.bukkit.nms.NMSStorage;
@@ -48,20 +48,19 @@ public class BukkitTabPlayer extends ITabPlayer {
 
     /**
      * Constructs new instance with given bukkit player and protocol version
-     * @param    p
-     *             bukkit player
-     * @param    protocolVersion
-     *             Player's protocol network id
+     *
+     * @param   p
+     *          bukkit player
+     * @param   protocolVersion
+     *          Player's protocol network id
      */
     public BukkitTabPlayer(Player p, int protocolVersion){
-        super(p, p.getUniqueId(), p.getName(), "N/A", p.getWorld().getName(), 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);
-            if (NMSStorage.getInstance().CHANNEL != null)
-                channel = (Channel) NMSStorage.getInstance().CHANNEL.get(NMSStorage.getInstance().NETWORK_MANAGER.get(playerConnection));
         } catch (ReflectiveOperationException e) {
-            TAB.getInstance().getErrorManager().printError("Failed to get playerConnection or channel of " + p.getName(), e);
+            TAB.getInstance().getErrorManager().printError("Failed to get playerConnection of " + p.getName(), e);
         }
     }
 
@@ -96,6 +95,8 @@ public class BukkitTabPlayer extends ITabPlayer {
                 } else {
                     handleVia((PacketPlayOutBoss) nmsPacket);
                 }
+            } else if (nmsPacket instanceof PacketPlayOutChat) {
+                getPlayer().sendMessage(((PacketPlayOutChat) nmsPacket).getMessage().toLegacyText());
             } else {
                 NMSStorage.getInstance().sendPacket.invoke(playerConnection, nmsPacket);
             }
@@ -109,8 +110,9 @@ public class BukkitTabPlayer extends ITabPlayer {
      * 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
+     *
+     * @param   packet
+     *          packet request to handle using Bukkit API
      */
     private void handle(PacketPlayOutBoss packet) {
         BossBar bar = bossBars.get(packet.getId());
@@ -157,8 +159,9 @@ public class BukkitTabPlayer extends ITabPlayer {
     /**
      * 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
+     *
+     * @param   packet
+     *          packet request to handle using ViaVersion API
      */
     private void handleVia(PacketPlayOutBoss packet) {
         com.viaversion.viaversion.api.legacy.bossbar.BossBar bar;
@@ -202,12 +205,13 @@ public class BukkitTabPlayer extends ITabPlayer {
 
     /**
      * 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
+     *
+     * @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);
@@ -216,12 +220,13 @@ public class BukkitTabPlayer extends ITabPlayer {
 
     /**
      * 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
+     *
+     * @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);
@@ -237,8 +242,8 @@ public class BukkitTabPlayer extends ITabPlayer {
     public boolean isDisguised() {
         try {
             if (!((BukkitPlatform)TAB.getInstance().getPlatform()).isLibsDisguisesEnabled()) return false;
-            return DisguiseAPI.isDisguised(getPlayer());
-        } catch (LinkageError e) {
+            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);
@@ -246,7 +251,6 @@ public class BukkitTabPlayer extends ITabPlayer {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public Skin getSkin() {
         try {
@@ -272,10 +276,7 @@ public class BukkitTabPlayer extends ITabPlayer {
 
     @Override
     public boolean isVanished() {
-        Essentials essentials = ((BukkitPlatform)TAB.getInstance().getPlatform()).getEssentials();
-        if (essentials != null && essentials.getUser(getUniqueId()).isVanished()) return true;
-        List<MetadataValue> metadata = getPlayer().getMetadata("vanished");
-        return !metadata.isEmpty() && metadata.get(0).asBoolean();
+        return getPlayer().getMetadata("vanished").stream().anyMatch(MetadataValue::asBoolean);
     }
 
     @SuppressWarnings("deprecation")
@@ -283,4 +284,49 @@ public class BukkitTabPlayer extends ITabPlayer {
     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;
+        }
+    }
+
+    @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;
+    }
 }

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/Main.java

@@ -5,6 +5,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Level;
 
+import me.neznamy.tab.api.TabAPI;
+import me.neznamy.tab.platforms.bukkit.nms.*;
 import org.bstats.bukkit.Metrics;
 import org.bstats.charts.SimplePie;
 import org.bukkit.Bukkit;
@@ -14,9 +16,8 @@ import org.bukkit.plugin.java.JavaPlugin;
 import me.neznamy.tab.api.ProtocolVersion;
 import me.neznamy.tab.api.TabPlayer;
 import me.neznamy.tab.api.chat.EnumChatFormat;
-import me.neznamy.tab.platforms.bukkit.nms.NMSStorage;
 import me.neznamy.tab.shared.TAB;
-import me.neznamy.tab.shared.TabConstants;
+import me.neznamy.tab.api.TabConstants;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -26,24 +27,25 @@ public class Main extends JavaPlugin {
 
     @Override
     public void onEnable(){
-        getLogger().info(EnumChatFormat.color("&7Server version: " + Bukkit.getBukkitVersion().split("-")[0] + " (" + Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3] + ")"));
+        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(Bukkit.getBukkitVersion().split("-")[0]),
-                Bukkit.getBukkitVersion().split("-")[0] + " (" + Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3] + ")", getDataFolder(), getLogger()));
+        TAB.setInstance(new TAB(platform, ProtocolVersion.fromFriendlyName(version), version + " (" + serverPackage + ")", getDataFolder(), getLogger()));
         if (TAB.getInstance().getServerVersion() == ProtocolVersion.UNKNOWN_SERVER_VERSION) {
-            getLogger().info(EnumChatFormat.color("&cUnknown server version: " + Bukkit.getBukkitVersion() + "! Plugin may not work correctly."));
+            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("unlimited_nametag_mode_enabled", () -> TAB.getInstance().getFeatureManager().isFeatureEnabled(TabConstants.Feature.UNLIMITED_NAME_TAGS) ? "Yes" : "No"));
-        metrics.addCustomChart(new SimplePie("placeholderapi", () -> Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI") ? "Yes" : "No"));
-        metrics.addCustomChart(new SimplePie("permission_system", () -> TAB.getInstance().getGroupManager().getPlugin().getName()));
-        metrics.addCustomChart(new SimplePie("server_version", () -> "1." + TAB.getInstance().getServerVersion().getMinorVersion() + ".x"));
+        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();
@@ -53,7 +55,7 @@ public class Main extends JavaPlugin {
 
     @Override
     public void onDisable() {
-        //null check due to L31 return making L34 not run
+        //null check due to compatibility check making instance not get set on unsupported versions
         if (TAB.getInstance() != null) TAB.getInstance().unload();
     }
     
@@ -61,29 +63,42 @@ public class Main extends JavaPlugin {
      * 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
+     *
+     * @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_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();
-            NMSStorage.setInstance(new NMSStorage());
+            int minorVersion = Integer.parseInt(serverPackage.split("_")[1]);
+            if (minorVersion >= 17) {
+                try {
+                    NMSStorage.setInstance(new BukkitModernNMSStorage());
+                } catch (ClassNotFoundException e) {
+                    e.printStackTrace();
+                    NMSStorage.setInstance(new MojangModernNMSStorage());
+                }
+            } else {
+                NMSStorage.setInstance(new LegacyNMSStorage());
+            }
             if (supportedVersions.contains(serverPackage)) {
-                getLogger().info(EnumChatFormat.color("&7Loaded NMS hook in " + (System.currentTimeMillis()-time) + "ms"));
+                Bukkit.getConsoleSender().sendMessage(EnumChatFormat.color("[TAB] Loaded NMS hook in " + (System.currentTimeMillis()-time) + "ms"));
                 return true;
             } else {
-                getLogger().info(EnumChatFormat.color("&cNo 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.x - 1.18.2. Disabling just to stay safe."));
+                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 (Exception ex) {
             if (supportedVersions.contains(serverPackage)) {
-                getLogger().log(Level.SEVERE, EnumChatFormat.color("&cYour server version is marked as compatible, but a compatibility issue was found. Please report the error below (include your server version & fork too)"), ex);
+                Bukkit.getConsoleSender().sendMessage(EnumChatFormat.color("&c[TAB] Your server version is marked as compatible, but a compatibility issue was found. Please report the error below (include your server version & fork too)"));
+                getLogger().log(Level.SEVERE, "", ex);
             } else {
-                getLogger().info(EnumChatFormat.color("&cYour server version is completely unsupported. This plugin version only supports 1.5.x - 1.18.2. Disabling."));
+                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;
@@ -92,11 +107,11 @@ public class Main extends JavaPlugin {
     /**
      * Command handler for /tab command
      */
-    public static class TABCommand implements CommandExecutor, TabCompleter {
+    private static class TABCommand implements CommandExecutor, TabCompleter {
 
         @Override
         public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
-            if (TAB.getInstance().isDisabled()) {
+            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));
                 }

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/event/TabLoadEvent.java

@@ -1,25 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.event;
-
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-
-/**
- * Bukkit event that is called each time TAB fully loads. This includes server startup, reload,
- * /tab reload and /plugman reload tab
- *
- * @deprecated for removal, use {@link me.neznamy.tab.api.event.plugin.TabLoadEvent}
- */
-@Deprecated
-public class TabLoadEvent extends Event {
-
-    private static final HandlerList handlers = new HandlerList();
-
-    @Override
-    public HandlerList getHandlers(){
-        return getHandlerList();
-    }
-    
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-}

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/event/TabPlayerLoadEvent.java

@@ -1,36 +0,0 @@
-package me.neznamy.tab.platforms.bukkit.event;
-
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-
-import me.neznamy.tab.api.TabPlayer;
-
-/**
- * Bukkit event that is called when player is successfully loaded after joining. This also includes plugin reloading.
- *
- * @deprecated for removal, use {@link me.neznamy.tab.api.event.player.PlayerLoadEvent}
- */
-@Deprecated
-public class TabPlayerLoadEvent extends Event {
-
-    private static final HandlerList handlers = new HandlerList();
-
-    private final TabPlayer player;
-
-    public TabPlayerLoadEvent(TabPlayer player) {
-        this.player = player;
-    }
-
-    @Override
-    public HandlerList getHandlers(){
-        return getHandlerList();
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
-    public TabPlayer getPlayer() {
-        return player;
-    }
-}

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/features/BukkitTabExpansion.java

@@ -2,9 +2,11 @@ package me.neznamy.tab.platforms.bukkit.features;
 
 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.TAB;
-import me.neznamy.tab.shared.TabConstants;
 import me.neznamy.tab.shared.features.TabExpansion;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
@@ -18,7 +20,7 @@ import java.util.WeakHashMap;
  */
 public class BukkitTabExpansion extends PlaceholderExpansion implements TabExpansion {
 
-    /** Map holding all placeholder values for all players */
+    /** Map holding all values for all players for easy and high-performance access */
     private final Map<TabPlayer, Map<String, String>> values = new WeakHashMap<>();
 
     @Override
@@ -26,11 +28,6 @@ public class BukkitTabExpansion extends PlaceholderExpansion implements TabExpan
         return true;
     }
 
-    @Override
-    public boolean canRegister(){
-        return true;
-    }
-
     @Override
     public @NotNull String getAuthor(){
         return "NEZNAMY";
@@ -48,48 +45,29 @@ public class BukkitTabExpansion extends PlaceholderExpansion implements TabExpan
 
     @Override
     public String onPlaceholderRequest(Player player, @NotNull String identifier){
-        if (player == null) return "";
-        TabPlayer p = TAB.getInstance().getPlayer(player.getUniqueId());
         if (identifier.startsWith("replace_")) {
-            String placeholder = "%" + identifier.substring(8) + "%";
-            String output = PlaceholderAPI.setPlaceholders(player, placeholder);
-            return TAB.getInstance().getPlaceholderManager().findReplacement(placeholder, output);
+            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,
+                            PlaceholderAPI.setPlaceholders(player, placeholder)));
+                }
+            } while (!textBefore.equals(text));
+            return text;
         }
-        return values.computeIfAbsent(p, pl -> new HashMap<>()).get(identifier);
+        if (identifier.startsWith("placeholder_")) {
+            TabAPI.getInstance().getPlaceholderManager().addUsedPlaceholder("%" + identifier.substring(12) + "%", (TabFeature) TabAPI.getInstance().getPlaceholderManager());
+        }
+        if (player == null) return "<Player cannot be null>";
+        TabPlayer p = TabAPI.getInstance().getPlayer(player.getUniqueId());
+        if (p == null || !p.isLoaded()) return "<Player is not loaded>";
+        return values.get(p).get(identifier);
     }
 
     @Override
-    public void setScoreboardVisible(TabPlayer player, boolean visible) {
-        values.computeIfAbsent(player, p -> new HashMap<>()).put("scoreboard_visible", visible ? "Enabled" : "Disabled");
-    }
-
-    @Override
-    public void setScoreboardName(TabPlayer player, String name) {
-        values.computeIfAbsent(player, p -> new HashMap<>()).put("scoreboard_name", name);
-    }
-
-    @Override
-    public void setBossBarVisible(TabPlayer player, boolean visible) {
-        values.computeIfAbsent(player, p -> new HashMap<>()).put("bossbar_visible", visible ? "Enabled" : "Disabled");
-    }
-
-    @Override
-    public void setNameTagPreview(TabPlayer player, boolean previewing) {
-        values.computeIfAbsent(player, p -> new HashMap<>()).put("ntpreview", previewing ? "Enabled" : "Disabled");
-    }
-
-    @Override
-    public void setPlaceholderValue(TabPlayer player, String placeholder, String value) {
-        values.computeIfAbsent(player, p -> new HashMap<>()).put("placeholder_" + placeholder.substring(1, placeholder.length()-1), value);
-    }
-
-    @Override
-    public void setPropertyValue(TabPlayer player, String property, String value) {
-        values.computeIfAbsent(player, p -> new HashMap<>()).put(property, value);
-    }
-
-    @Override
-    public void setRawPropertyValue(TabPlayer player, String property, String value) {
-        values.computeIfAbsent(player, p -> new HashMap<>()).put(property + "_raw", value);
+    public void setValue(TabPlayer player, String key, String value) {
+        values.computeIfAbsent(player, p -> new HashMap<>()).put(key, value);
     }
 }

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/features/PerWorldPlayerList.java

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import me.neznamy.tab.api.TabAPI;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -15,7 +16,7 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import me.neznamy.tab.api.TabFeature;
-import me.neznamy.tab.shared.TabConstants;
+import me.neznamy.tab.api.TabConstants;
 import me.neznamy.tab.shared.TAB;
 
 /**
@@ -24,23 +25,25 @@ import me.neznamy.tab.shared.TAB;
 @SuppressWarnings("deprecation")
 public class PerWorldPlayerList extends TabFeature implements Listener {
 
-    //plugin instance
+    /** Reference to main class */
     private final JavaPlugin plugin;
 
-    //config options
-    private final boolean allowBypass = TAB.getInstance().getConfiguration().getConfig().getBoolean("per-world-playerlist.allow-bypass-permission", false);
-    private final List<String> ignoredWorlds = TAB.getInstance().getConfiguration().getConfig().getStringList("per-world-playerlist.ignore-effect-in-worlds", Arrays.asList("ignoredworld", "build"));
-    private final Map<String, List<String>> sharedWorlds = TAB.getInstance().getConfiguration().getConfig().getConfigurationSection("per-world-playerlist.shared-playerlist-world-groups");
+    /** 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");
 
     /**
      * Constructs new instance with given parameters and loads config options
-     * @param plugin - plugin instance
+     *
+     * @param   plugin
+     *          plugin instance
      */
     public PerWorldPlayerList(JavaPlugin plugin) {
         super("Per world PlayerList", null);
         this.plugin = plugin;
-        TAB.getInstance().debug(String.format("Loaded PerWorldPlayerList feature with parameters allowBypass=%s, ignoredWorlds=%s, sharedWorlds=%s", allowBypass, ignoredWorlds, sharedWorlds));
         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
@@ -72,6 +75,14 @@ public class PerWorldPlayerList extends TabFeature implements Listener {
         TAB.getInstance().getCPUManager().addTime(getFeatureName(), TabConstants.CpuUsageCategory.WORLD_SWITCH, System.nanoTime()-time);
     }
 
+    /**
+     * Performs visibility check on the player. Shows players this player should see and does not,
+     * hides players the player should not see, shows the player to those who should see player and hides
+     * from those, who should not see.
+     *
+     * @param   p
+     *          Player to update
+     */
     private void checkPlayer(Player p) {
         for (Player all : Bukkit.getOnlinePlayers()){
             if (all == p) continue;
@@ -82,6 +93,14 @@ public class PerWorldPlayerList extends TabFeature implements Listener {
         }
     }
 
+    /**
+     * Returns {@code true} if viewer should see target player, {@code false} if not.
+     * @param   viewer
+     *          Player viewing the TabList
+     * @param   target
+     *          Target displayed in the TabList
+     * @return  {@code true} if viewer should see target, {@code false} if not.
+     */
     private boolean shouldSee(Player viewer, Player target) {
         if (target == viewer) return true;
         if ((allowBypass && viewer.hasPermission(TabConstants.Permission.PER_WORLD_PLAYERLIST_BYPASS)) || ignoredWorlds.contains(viewer.getWorld().getName())) return true;

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/features/PetFix.java

@@ -1,13 +1,16 @@
 package me.neznamy.tab.platforms.bukkit.features;
 
-import java.util.*;
-
+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.NMSStorage;
 import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcher;
 import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcherItem;
-import me.neznamy.tab.shared.TAB;
+
+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
@@ -19,13 +22,13 @@ import me.neznamy.tab.shared.TAB;
  */
 public class PetFix extends TabFeature {
 
-    //nms storage
+    /** NMS Storage reference for quick access */
     private final NMSStorage nms = NMSStorage.getInstance();
 
-    //DataWatcher position of pet owner field
+    /** DataWatcher position of pet owner field */
     private final int petOwnerPosition = getPetOwnerPosition();
 
-    //logger of last interacts to prevent feature not working on 1.16
+    /** Logger of last interacts to prevent feature not working on 1.16 */
     private final WeakHashMap<TabPlayer, Long> lastInteractFix = new WeakHashMap<>();
 
     /**
@@ -45,16 +48,17 @@ public class PetFix extends TabFeature {
      */
     public PetFix() {
         super("Pet name fix", null);
-        TAB.getInstance().debug("Loaded PetFix feature");
+        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
+     *
+     * @return  position of pet owner field based on server version
      */
     private int getPetOwnerPosition() {
         if (nms.getMinorVersion() >= 17) {
-            //1.17.x, 1.18.x
+            //1.17.x, 1.18.x, 1.19.x
             return 18;
         } else if (nms.getMinorVersion() >= 15) {
             //1.15.x, 1.16.x
@@ -72,25 +76,31 @@ public class PetFix extends TabFeature {
     }
 
     /**
-     * Cancels a packet if previous one arrived with no delay to prevent double toggle on 1.16
-     * @throws    ReflectiveOperationException
-     *             if thrown by reflective operation
+     * 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)) {
-            if (lastInteractFix.containsKey(sender) && (System.currentTimeMillis() - lastInteractFix.get(sender) < INTERACT_COOLDOWN)) {
+        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;
             }
-            if (isInteract(nms.PacketPlayInUseEntity_ACTION.get(packet))) {
-                //this is the first packet, saving player so the next packet can be cancelled
-                lastInteractFix.put(sender, System.currentTimeMillis());
-            }
+            //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);
@@ -101,8 +111,9 @@ public class PetFix extends TabFeature {
 
     /**
      * Removes pet owner field from DataWatcher
-     * @throws    ReflectiveOperationException
-     *             if thrown by reflective operation
+     *
+     * @throws  ReflectiveOperationException
+     *          if thrown by reflective operation
      */
     @SuppressWarnings("unchecked")
     @Override
@@ -114,9 +125,17 @@ public class PetFix extends TabFeature {
             try {
                 for (Object item : items) {
                     if (item == null) continue;
-                    if (nms.DataWatcherObject_SLOT.getInt(nms.DataWatcherItem_TYPE.get(item)) == petOwnerPosition) {
-                        Object value = nms.DataWatcherItem_VALUE.get(item);
-                        if (value instanceof java.util.Optional || value instanceof com.google.common.base.Optional) {
+                    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;
                         }
                     }
@@ -130,7 +149,7 @@ public class PetFix extends TabFeature {
             //<1.15
             DataWatcher watcher = DataWatcher.fromNMS(nms.PacketPlayOutSpawnEntityLiving_DATAWATCHER.get(packet));
             DataWatcherItem petOwner = watcher.getItem(petOwnerPosition);
-            if (petOwner != null && (petOwner.getValue() instanceof java.util.Optional || petOwner.getValue() instanceof com.google.common.base.Optional)) {
+            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());
             }

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/features/WitherBossBar.java

@@ -1,6 +1,5 @@
 package me.neznamy.tab.platforms.bukkit.features;
 
-import me.neznamy.tab.api.util.Preconditions;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
@@ -13,7 +12,7 @@ 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.shared.TabConstants;
+import me.neznamy.tab.api.TabConstants;
 import me.neznamy.tab.shared.TAB;
 import me.neznamy.tab.shared.features.bossbar.BossBarManagerImpl;
 
@@ -22,15 +21,16 @@ import me.neznamy.tab.shared.features.bossbar.BossBarManagerImpl;
  */
 public class WitherBossBar extends BossBarManagerImpl implements Listener {
 
-    //distance of wither in blocks
+    /** Distance of the Wither in blocks */
     private static final int WITHER_DISTANCE = 60;
     
     /**
-     * Constructs a new instance of the class
-     * @param plugin - plugin instance
+     * Constructs a new instance of the class and registers events and task
+     *
+     * @param   plugin
+     *          plugin instance
      */
     public WitherBossBar(JavaPlugin plugin) {
-        Preconditions.checkNotNull(plugin, "plugin");
         Bukkit.getPluginManager().registerEvents(this, plugin);
         //when MC is on fullscreen, BossBar disappears after 1 second of not being seen
         //when in a small window, it's about 100ms
@@ -44,6 +44,9 @@ public class WitherBossBar extends BossBarManagerImpl implements Listener {
         teleport();
     }
 
+    /**
+     * Updates Wither's 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

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/features/unlimitedtags/BukkitArmorStand.java

@@ -1,16 +1,6 @@
 package me.neznamy.tab.platforms.bukkit.features.unlimitedtags;
 
-import java.util.UUID;
-
-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 me.neznamy.tab.api.ArmorStand;
-import me.neznamy.tab.api.Property;
-import me.neznamy.tab.api.TabPlayer;
+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;
@@ -19,52 +9,72 @@ 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.shared.TabConstants;
-import me.neznamy.tab.shared.TAB;
+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 (if the feature is enabled)
+ * A class representing an armor stand attached to a player
  */
 public class BukkitArmorStand implements ArmorStand {
 
-    //entity id counter to pick unique entity IDs
+    /** Entity id counter to pick unique entity ID for each armor stand */
     private static int idCounter = 2000000000;
 
-    //NameTag feature
-    private final BukkitNameTagX manager = (BukkitNameTagX) TAB.getInstance().getFeatureManager().getFeature(TabConstants.Feature.UNLIMITED_NAME_TAGS);
+    /** 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
+    /** Owner of the armor stand */
     private final TabPlayer owner;
 
-    //instance of Bukkit player
+    /** Owner as a Bukkit player */
     private final Player player;
 
-    //offset in blocks, 0 for original height
+    /** Offset in blocks, 0 for original height */
     private double yOffset;
 
-    //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;
-
-    //property dedicated to this armor stand
-    private final Property property;
-
-    //if offset is static or dynamic based on other armor stands
+    /** If offset is static, or dynamic based on other armor stands */
     private final boolean staticOffset;
 
-    //entity destroy packet
+    /** 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;
@@ -73,6 +83,7 @@ public class BukkitArmorStand implements ArmorStand {
         this.yOffset = yOffset;
         this.property = owner.getProperty(propertyName);
         visible = getVisibility();
+        sneaking = player.isSneaking();
     }
 
     @Override
@@ -172,8 +183,10 @@ public class BukkitArmorStand implements ArmorStand {
 
     /**
      * Returns teleport packet for specified viewer
-     * @param viewer - player to get location for
-     * @return teleport packet
+     *
+     * @param   viewer
+     *          player to get location for
+     * @return  teleport packet
      */
     public PacketPlayOutEntityTeleport getTeleportPacket(TabPlayer viewer) {
         return new PacketPlayOutEntityTeleport(entityId, getArmorStandLocationFor(viewer));
@@ -190,7 +203,8 @@ public class BukkitArmorStand implements ArmorStand {
 
     /**
      * Returns general visibility rule for everyone with limited info
-     * @return true if armor stand should be visible, false if not
+     *
+     * @return  {@code true} if armor stand should be visible, {@code false} if not
      */
     public boolean getVisibility() {
         if (manager.isArmorStandsAlwaysVisible()) return true;
@@ -199,28 +213,40 @@ public class BukkitArmorStand implements ArmorStand {
     }
 
     /**
-     * Returns general location where armor stand should be at time of calling
-     * @return Location where armor stand should be for everyone
+     * 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() {
+    public Location getLocation(TabPlayer viewer) {
         double x = player.getLocation().getX();
-        double y = getY() + yOffset + 2;
+        double y = getY() + yOffset;
         double z = player.getLocation().getZ();
-        if (player.isSleeping()) {
-            y -= 1.76;
-        } else {
-            if (TAB.getInstance().getServerVersion().getMinorVersion() >= 9) {
-                y -= (sneaking ? 0.45 : 0.18);
+        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 -= (sneaking ? 0.30 : 0.18);
+                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
+     *
+     * @return  correct player's Y
      */
     protected double getY() {
         //1.14+ server sided bug
@@ -240,22 +266,29 @@ public class BukkitArmorStand implements ArmorStand {
             }
         }
         //1.13+ swimming or 1.9+ flying with elytra
-        if (isSwimming() || (TAB.getInstance().getServerVersion().getMinorVersion() >= 9 && player.isGliding())) {
+        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 (TAB.getInstance().getServerVersion().getMinorVersion() >= 14 && player.getPose() == Pose.SWIMMING) return true;
-        return TAB.getInstance().getServerVersion().getMinorVersion() == 13 && player.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
+     *
+     * @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();
@@ -279,9 +312,12 @@ public class BukkitArmorStand implements ArmorStand {
     }
 
     /**
-     * Returns true if display name is in fact empty, for example only containing color codes
-     * @param displayName - string to check
-     * @return true if it's empty, false if not
+     * 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;
@@ -293,13 +329,15 @@ public class BukkitArmorStand implements ArmorStand {
 
     /**
      * 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
+     *
+     * @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 (TAB.getInstance().getServerVersion().getMinorVersion() >= 15) {
+        if (TabAPI.getInstance().getServerVersion().getMinorVersion() >= 15) {
             return new TabPacket[] {
                     new PacketPlayOutSpawnEntityLiving(entityId, uuid, EntityType.ARMOR_STAND, getArmorStandLocationFor(viewer), null),
                     new PacketPlayOutEntityMetadata(entityId, dataWatcher)
@@ -313,22 +351,20 @@ public class BukkitArmorStand implements ArmorStand {
 
     /**
      * Returns location where armor stand should be for specified viewer
-     * @param viewer - player to get location for
-     * @return location of armor stand
+     *
+     * @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().clone().add(0,-2,0) : getLocation();
+        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);
-        Runnable spawn = () -> spawn(viewer);
-        if (viewer.getVersion().getMinorVersion() == 8) {
-            //1.8.0 client sided bug
-            TAB.getInstance().getCPUManager().runTaskLater(50, manager, TabConstants.CpuUsageCategory.V1_8_0_BUG_COMPENSATION, spawn);
-        } else {
-            spawn.run();
-        }
+        // 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);
     }
 }

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/features/unlimitedtags/BukkitArmorStandManager.java

@@ -3,7 +3,7 @@ package me.neznamy.tab.platforms.bukkit.features.unlimitedtags;
 import me.neznamy.tab.api.ArmorStand;
 import me.neznamy.tab.api.ArmorStandManager;
 import me.neznamy.tab.api.TabPlayer;
-import me.neznamy.tab.shared.TabConstants;
+import me.neznamy.tab.api.TabConstants;
 import me.neznamy.tab.shared.features.nametags.unlimited.NameTagX;
 
 import java.util.ArrayList;
@@ -16,27 +16,34 @@ import java.util.Map;
  */
 public class BukkitArmorStandManager implements ArmorStandManager {
 
-    private final NameTagX nameTagX;
-    //map of registered armor stands
+    /** Map of registered armor stands by name */
     private final Map<String, ArmorStand> armorStands = new LinkedHashMap<>();
 
-    //players in entity tracking range
-    private final List<TabPlayer> nearbyPlayers = new ArrayList<>();
-
-    //array to iterate over to avoid concurrent modification and slightly boost performance & memory
+    /** Armor stands in an array for speed while iterating */
     private ArmorStand[] armorStandArray = new ArmorStand[0];
 
+    /** Players in entity tracking range of owner */
+    private final List<TabPlayer> nearbyPlayers = new ArrayList<>();
+
+    /** Nearby players in an array for speed while iterating */
     private TabPlayer[] nearbyPlayerArray = new TabPlayer[0];
 
+    /**
+     * Constructs new instance with given parameters and loads armor stands.
+     *
+     * @param   nameTagX
+     *          Main feature
+     * @param   owner
+     *          Owner of this armor stand manager
+     */
     public BukkitArmorStandManager(NameTagX nameTagX, TabPlayer owner) {
-        this.nameTagX = nameTagX;
         owner.setProperty(nameTagX, TabConstants.Property.NAMETAG, owner.getProperty(TabConstants.Property.TAGPREFIX).getCurrentRawValue()
                 + owner.getProperty(TabConstants.Property.CUSTOMTAGNAME).getCurrentRawValue()
                 + owner.getProperty(TabConstants.Property.TAGSUFFIX).getCurrentRawValue());
         double height = 0;
         for (String line : nameTagX.getDynamicLines()) {
             addArmorStand(line, new BukkitArmorStand(this, owner, line, height, false));
-            height += nameTagX.getSpaceBetweenLines();
+            height += 0.26;
         }
         for (Map.Entry<String, Object> line : nameTagX.getStaticLines().entrySet()) {
             addArmorStand(line.getKey(), new BukkitArmorStand(this, owner, line.getKey(), Double.parseDouble(line.getValue().toString()), true));
@@ -46,15 +53,24 @@ public class BukkitArmorStandManager implements ArmorStandManager {
 
     /**
      * Teleports armor stands to player's current location for specified viewer
-     * @param viewer - player to teleport armor stands for
+     *
+     * @param   viewer
+     *          player to teleport armor stands for
      */
     public void teleport(TabPlayer viewer) {
         for (ArmorStand a : armorStandArray) a.teleport(viewer);
     }
 
+    /**
+     * Teleports armor stands to player's current location for all nearby players
+     */
+    public void teleport() {
+        for (ArmorStand a : armorStandArray) a.teleport();
+    }
+
     /**
      * Returns array of nearby players
-     * @return array of nearby players
+     * @return  array of nearby players
      */
     public TabPlayer[] getNearbyPlayers(){
         return nearbyPlayerArray;
@@ -62,18 +78,21 @@ public class BukkitArmorStandManager implements ArmorStandManager {
 
     /**
      * Returns {@code true} if requested player is nearby, {@code false} if not
-     * @param    viewer
-     *             Player to check for
-     * @return    {@code true} if player nearby, {@code false} if not
+     *
+     * @param   viewer
+     *          Player to check for
+     * @return  {@code true} if player nearby, {@code false} if not
      */
     public boolean isNearby(TabPlayer viewer) {
         return nearbyPlayers.contains(viewer);
     }
 
     /**
-     * Returns true if manager contains armor stand with specified entity id, false if not
-     * @param entityId - entity id
-     * @return true if armor stand with specified entity id exists, false if not
+     * Returns {@code true} if manager contains armor stand with specified entity id, {@code false} if not
+     *
+     * @param   entityId
+     *          entity id
+     * @return  {@code true} if armor stand with specified entity id exists, {@code false} if not
      */
     public boolean hasArmorStandWithID(int entityId) {
         for (ArmorStand a : armorStandArray) {
@@ -86,19 +105,14 @@ public class BukkitArmorStandManager implements ArmorStandManager {
 
     /**
      * Sets sneak value of armor stands to specified value
-     * @param sneaking - new sneaking status
+     *
+     * @param   sneaking
+     *          new sneaking status
      */
     public void sneak(boolean sneaking) {
         for (ArmorStand a : armorStandArray) a.sneak(sneaking);
     }
 
-    /**
-     * Teleports armor stands to player's current location for all nearby players
-     */
-    public void teleport() {
-        for (ArmorStand a : armorStandArray) a.teleport();
-    }
-
     /**
      * Performs respawn operation on all armor stands to skip teleport animation
      */
@@ -112,7 +126,9 @@ public class BukkitArmorStandManager implements ArmorStandManager {
 
     /**
      * Spawns all armor stands for specified viewer and adds them into nearby players
-     * @param viewer - player to spawn armor stands for
+     *
+     * @param   viewer
+     *          player to spawn armor stands for
      */
     public void spawn(TabPlayer viewer) {
         nearbyPlayers.add(viewer);
@@ -121,24 +137,15 @@ public class BukkitArmorStandManager implements ArmorStandManager {
         for (ArmorStand a : armorStandArray) a.spawn(viewer);
     }
 
-    /**
-     * Sends destroy packet of all armor stands to specified player and removes them from nearby players list
-     * @param viewer - player to destroy armor stands for
-     */
-    public void destroy(TabPlayer viewer) {
-        for (ArmorStand a : armorStandArray) a.destroy(viewer);
-        unregisterPlayer(viewer);
-    }
-
     /**
      * Fixes heights of all armor stands due to dynamic lines
      */
     public void fixArmorStandHeights() {
-        double currentY = -nameTagX.getSpaceBetweenLines();
+        double currentY = -0.26;
         for (ArmorStand as : armorStandArray) {
             if (as.hasStaticOffset()) continue;
             if (as.getProperty().get().length() != 0) {
-                currentY += nameTagX.getSpaceBetweenLines();
+                currentY += 0.26;
                 as.setOffset(currentY);
             }
         }
@@ -147,10 +154,10 @@ public class BukkitArmorStandManager implements ArmorStandManager {
     /**
      * Adds armor stand to list and registers it to all nearby players
      *
-     * @param    name
-     *             Unique identifier of the text line
-     * @param    as
-     *             Armor stand to add
+     * @param   name
+     *          Unique identifier of the text line
+     * @param   as
+     *          Armor stand to add
      */
     public void addArmorStand(String name, ArmorStand as) {
         armorStands.put(name, as);
@@ -158,33 +165,11 @@ public class BukkitArmorStandManager implements ArmorStandManager {
         for (TabPlayer p : nearbyPlayerArray) as.spawn(p);
     }
 
-    /**
-     * Gets armor stand by name
-     *
-     * @param    name
-     *             Name to get armor stand by
-     * @return    Armor stand with given name or null if not found
-     */
-    public ArmorStand getArmorStand(String name) {
-        return armorStands.get(name);
-    }
-
-    /**
-     * Removes armor stand by given name if exists
-     *
-     * @param    name
-     *             Name of line to remove
-     */
-    public void removeArmorStand(String name) {
-        if (!armorStands.containsKey(name)) return;
-        armorStands.get(name).destroy();
-        armorStands.remove(name);
-        armorStandArray = armorStands.values().toArray(new ArmorStand[0]);
-    }
-
     /**
      * Removes specified player from list of nearby players
-     * @param viewer - player to remove
+     *
+     * @param   viewer
+     *          player to remove
      */
     public void unregisterPlayer(TabPlayer viewer) {
         if (nearbyPlayers.remove(viewer)) nearbyPlayerArray = nearbyPlayers.toArray(new TabPlayer[0]);
@@ -194,6 +179,17 @@ public class BukkitArmorStandManager implements ArmorStandManager {
         for (ArmorStand a : armorStandArray) a.updateVisibility(force);
     }
 
+    /**
+     * Sends destroy packet of all armor stands to specified player and removes them from nearby players list
+     *
+     * @param   viewer
+     *          player to destroy armor stands for
+     */
+    public void destroy(TabPlayer viewer) {
+        for (ArmorStand a : armorStandArray) a.destroy(viewer);
+        unregisterPlayer(viewer);
+    }
+
     @Override
     public void destroy() {
         for (ArmorStand a : armorStandArray) a.destroy();

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/features/unlimitedtags/BukkitNameTagX.java

@@ -1,8 +1,8 @@
 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.TAB;
-import me.neznamy.tab.shared.TabConstants;
 import me.neznamy.tab.shared.features.nametags.unlimited.NameTagX;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -11,42 +11,49 @@ import org.bukkit.event.HandlerList;
 import org.bukkit.plugin.java.JavaPlugin;
 
 /**
- * The core class for unlimited NameTag mode
+ * The core class for unlimited NameTag mode on Bukkit
  */
 public class BukkitNameTagX extends NameTagX {
 
-    //bukkit event listener
+    /** 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 parameters and loads config options
-     * @param plugin - plugin instance
+     * 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);
-        TAB.getInstance().getFeatureManager().registerFeature(TabConstants.Feature.UNLIMITED_NAME_TAGS_PACKET_LISTENER, new PacketListener(this));
-        TAB.getInstance().getFeatureManager().registerFeature(TabConstants.Feature.UNLIMITED_NAME_TAGS_VEHICLE_REFRESHER, vehicleManager);
+        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 : TAB.getInstance().getOnlinePlayers()) {
+        for (TabPlayer all : TabAPI.getInstance().getOnlinePlayers()) {
             if (isPlayerDisabled(all)) continue;
-            for (TabPlayer viewer : TAB.getInstance().getOnlinePlayers()) {
+            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() {
-        TAB.getInstance().getCPUManager().startRepeatingMeasuredTask(500, this, TabConstants.CpuUsageCategory.REFRESHING_NAME_TAG_VISIBILITY, () -> {
+        TabAPI.getInstance().getThreadManager().startRepeatingMeasuredTask(500, this, TabConstants.CpuUsageCategory.REFRESHING_NAME_TAG_VISIBILITY, () -> {
 
-            for (TabPlayer p : TAB.getInstance().getOnlinePlayers()) {
+            for (TabPlayer p : TabAPI.getInstance().getOnlinePlayers()) {
                 if (isPlayerDisabled(p)) continue;
                 getArmorStandManager(p).updateVisibility(false);
             }
@@ -63,7 +70,7 @@ public class BukkitNameTagX extends NameTagX {
     public void onJoin(TabPlayer connectedPlayer) {
         super.onJoin(connectedPlayer);
         if (isPlayerDisabled(connectedPlayer)) return;
-        for (TabPlayer viewer : TAB.getInstance().getOnlinePlayers()) {
+        for (TabPlayer viewer : TabAPI.getInstance().getOnlinePlayers()) {
             spawnArmorStands(viewer, connectedPlayer);
             spawnArmorStands(connectedPlayer, viewer);
         }
@@ -74,12 +81,22 @@ public class BukkitNameTagX extends NameTagX {
         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) {
-            if (((Player)viewer.getPlayer()).canSee((Player)target.getPlayer()) && !target.isVanished()) getArmorStandManager(target).spawn(viewer);
-        }
+        if (getDistance(viewer, target) <= 48 && ((Player)viewer.getPlayer()).canSee((Player)target.getPlayer()) && !target.isVanished())
+            getArmorStandManager(target).spawn(viewer);
     }
 
     @Override
@@ -94,20 +111,19 @@ public class BukkitNameTagX extends NameTagX {
     @Override
     public void resumeArmorStands(TabPlayer player) {
         if (isPlayerDisabled(player)) return;
-        for (TabPlayer viewer : TAB.getInstance().getOnlinePlayers()) {
+        for (TabPlayer viewer : TabAPI.getInstance().getOnlinePlayers()) {
             spawnArmorStands(viewer, player);
         }
     }
 
     @Override
     public void pauseArmorStands(TabPlayer player) {
-        if (isPlayerDisabled(player)) return;
         getArmorStandManager(player).destroy();
     }
 
     @Override
     public void updateNameTagVisibilityView(TabPlayer player) {
-        for (TabPlayer all : TAB.getInstance().getOnlinePlayers()) {
+        for (TabPlayer all : TabAPI.getInstance().getOnlinePlayers()) {
             getArmorStandManager(all).updateVisibility(true);
         }
     }
@@ -115,11 +131,11 @@ public class BukkitNameTagX extends NameTagX {
     @Override
     public void onQuit(TabPlayer disconnectedPlayer) {
         super.onQuit(disconnectedPlayer);
-        for (TabPlayer all : TAB.getInstance().getOnlinePlayers()) {
+        for (TabPlayer all : TabAPI.getInstance().getOnlinePlayers()) {
             getArmorStandManager(all).unregisterPlayer(disconnectedPlayer);
         }
-        getArmorStandManager(disconnectedPlayer).destroy();
-        TAB.getInstance().getCPUManager().runTaskLater(500, this, TabConstants.CpuUsageCategory.PLAYER_QUIT, () -> getArmorStandManager(disconnectedPlayer).destroy());
+        armorStandManagerMap.get(disconnectedPlayer).destroy();
+        armorStandManagerMap.remove(disconnectedPlayer); // WeakHashMap doesn't clear this due to value referencing the key
     }
 
     @Override
@@ -134,13 +150,22 @@ public class BukkitNameTagX extends NameTagX {
         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
+     *
+     * @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();
@@ -153,9 +178,11 @@ public class BukkitNameTagX extends NameTagX {
         return (BukkitArmorStandManager) armorStandManagerMap.get(player);
     }
 
+    /**
+     * Returns {@link #vehicleManager}
+     * @return  {@link #vehicleManager}
+     */
     public VehicleRefresher getVehicleManager() {
         return vehicleManager;
     }
-
-
 }

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/features/unlimitedtags/EventListener.java

@@ -1,26 +1,28 @@
 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;
 
-import me.neznamy.tab.api.TabPlayer;
-import me.neznamy.tab.shared.TabConstants;
-import me.neznamy.tab.shared.TAB;
-
 /**
- * The event listener part for securing proper functionality of armor stands
+ * Class listening to Bukkit events which the feature requires and are
+ * sufficient, without packets being requires.
  */
 public class EventListener implements Listener {
 
-    //the NameTag feature handler
+    /** Reference to the main feature */
     private final BukkitNameTagX feature;
 
     /**
-     * Constructs new instance with given parameters
-     * @param feature - NameTag feature handler
+     * Constructs new instance with given parameter
+     *
+     * @param   feature
+     *          NameTag feature handler
      */
     public EventListener(BukkitNameTagX feature) {
         this.feature = feature;
@@ -28,23 +30,27 @@ public class EventListener implements Listener {
 
     /**
      * Sneak event listener to de-spawn and spawn armor stands to skip animation
-     * @param e - sneak event
+     *
+     * @param   e
+     *          sneak event
      */
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onSneak(PlayerToggleSneakEvent e) {
-        TabPlayer p = TAB.getInstance().getPlayer(e.getPlayer().getUniqueId());
+        TabPlayer p = TabAPI.getInstance().getPlayer(e.getPlayer().getUniqueId());
         if (p == null || feature.isPlayerDisabled(p)) return;
-        TAB.getInstance().getCPUManager().runMeasuredTask(feature, TabConstants.CpuUsageCategory.PLAYER_SNEAK, () -> feature.getArmorStandManager(p).sneak(e.isSneaking()));
+        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
+     *
+     * @param   e
+     *          respawn event
      */
     @EventHandler
     public void onRespawn(PlayerRespawnEvent e) {
-        TAB.getInstance().getCPUManager().runMeasuredTask(feature, TabConstants.CpuUsageCategory.PLAYER_RESPAWN, () -> {
-            TabPlayer respawned = TAB.getInstance().getPlayer(e.getPlayer().getUniqueId());
+        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();
         });

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/features/unlimitedtags/PacketListener.java

@@ -1,36 +1,40 @@
 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.NMSStorage;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-
-import me.neznamy.tab.api.TabFeature;
-import me.neznamy.tab.api.TabPlayer;
-import me.neznamy.tab.platforms.bukkit.nms.NMSStorage;
-import me.neznamy.tab.shared.TabConstants;
-import me.neznamy.tab.shared.TAB;
-
 /**
- * The packet listening part for securing proper functionality of armor stands
+ * 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 {
 
-    //main feature
+    /** Reference to the main feature */
     private final BukkitNameTagX nameTagX;
 
-    //player data by entityId, used for better performance
+    /** A player map by entity id, used for better performance */
     private final Map<Integer, TabPlayer> entityIdMap = new ConcurrentHashMap<>();
     
-    //nms storage
+    /** Reference to NMS storage for quick access */
     private final NMSStorage nms = NMSStorage.getInstance();
 
     /**
-     * Constructs new instance with given parameters and loads config options
-     * @param nameTagX - main feature
+     * Constructs new instance with given parameter
+     *
+     * @param   nameTagX
+     *          main feature
      */
     public PacketListener(BukkitNameTagX nameTagX) {
         super(nameTagX.getFeatureName(), null);
@@ -39,7 +43,7 @@ public class PacketListener extends TabFeature {
 
     @Override
     public void load() {
-        for (TabPlayer all : TAB.getInstance().getOnlinePlayers()) {
+        for (TabPlayer all : TabAPI.getInstance().getOnlinePlayers()) {
             entityIdMap.put(((Player) all.getPlayer()).getEntityId(), all);
         }
     }
@@ -59,7 +63,7 @@ public class PacketListener extends TabFeature {
         if (sender.getVersion().getMinorVersion() == 8 && nms.PacketPlayInUseEntity.isInstance(packet)) {
             int entityId = nms.PacketPlayInUseEntity_ENTITY.getInt(packet);
             TabPlayer attacked = null;
-            for (TabPlayer all : TAB.getInstance().getOnlinePlayers()) {
+            for (TabPlayer all : TabAPI.getInstance().getOnlinePlayers()) {
                 if (all.isLoaded() && nameTagX.getArmorStandManager(all).hasArmorStandWithID(entityId)) {
                     attacked = all;
                     break;
@@ -99,54 +103,98 @@ public class PacketListener extends TabFeature {
     }
 
     /**
-     * Processes entity move packet
-     * @param receiver - packet receiver
-     * @param entityId - entity that moved
+     * 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)) return;
-            TAB.getInstance().getCPUManager().runMeasuredTask(nameTagX, TabConstants.CpuUsageCategory.PACKET_ENTITY_MOVE,
+            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) {
-                    TAB.getInstance().getCPUManager().runMeasuredTask(nameTagX, TabConstants.CpuUsageCategory.PACKET_ENTITY_MOVE_PASSENGER,
+                    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)) {
-            TAB.getInstance().getCPUManager().runMeasuredTask(nameTagX, TabConstants.CpuUsageCategory.PACKET_ENTITY_SPAWN,
+            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))
-            TAB.getInstance().getCPUManager().runMeasuredTask(nameTagX, TabConstants.CpuUsageCategory.PACKET_ENTITY_DESTROY,
-                    () -> nameTagX.getArmorStandManager(deSpawnedPlayer).destroy(receiver));
+        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));
+        }
     }
 }

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/features/unlimitedtags/VehicleRefresher.java

@@ -1,57 +1,71 @@
 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;
 
-import me.neznamy.tab.shared.TabConstants;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Player;
-
-import me.neznamy.tab.api.TabFeature;
-import me.neznamy.tab.api.TabPlayer;
-import me.neznamy.tab.shared.TAB;
-
+/**
+ * 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
+    /** Map of players currently in a vehicle */
     private final WeakHashMap<TabPlayer, Entity> playersInVehicle = new WeakHashMap<>();
     
-    //map of vehicles carrying players
+    /** Map of vehicles carrying players */
     private final Map<Integer, List<Entity>> vehicles = new ConcurrentHashMap<>();
     
-    //set of players currently on boats
+    /** 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;
-        TAB.getInstance().getCPUManager().startRepeatingMeasuredTask(50,
+        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();
-//                        feature.getVehicleManager().processPassengers((Entity) inVehicle.getPlayer());
                     }
-                    for (TabPlayer p : TAB.getInstance().getOnlinePlayers()) {
+                    for (TabPlayer p : TabAPI.getInstance().getOnlinePlayers()) {
                         if (feature.isPreviewingNametag(p)) {
                             feature.getArmorStandManager(p).teleport(p);
                         }
                     }
         });
-        addUsedPlaceholders(Collections.singletonList("%vehicle%"));
-        TAB.getInstance().getPlaceholderManager().registerPlayerPlaceholder("%vehicle%", 100, p -> ((Player)p.getPlayer()).getVehicle() == null ? "" : ((Player)p.getPlayer()).getVehicle());
+        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 : TAB.getInstance().getOnlinePlayers()) {
+        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() == EntityType.BOAT) {
+                if (feature.isDisableOnBoats() && vehicle.getType().toString().contains("BOAT")) {
                     playersOnBoats.add(p);
                 }
             }
@@ -67,6 +81,9 @@ public class VehicleRefresher extends TabFeature {
     @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
@@ -88,49 +105,50 @@ public class VehicleRefresher extends TabFeature {
             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() == EntityType.BOAT) {
+            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
+     *
+     * @param   vehicle
+     *          vehicle to check passengers of
+     * @return  list of passengers
      */
     @SuppressWarnings("deprecation")
     public List<Entity> getPassengers(Entity vehicle){
-        if (TAB.getInstance().getServerVersion().getMinorVersion() >= 11) {
+        if (TabAPI.getInstance().getServerVersion().getMinorVersion() >= 11) {
             return vehicle.getPassengers();
         } else {
             if (vehicle.getPassenger() != null) {
                 return Collections.singletonList(vehicle.getPassenger());
             } else {
-                return new ArrayList<>();
+                return Collections.emptyList();
             }
         }
     }
-
-    /**
-     * Teleports armor stands of all passengers on specified vehicle
-     * @param vehicle - entity to check passengers of
-     */
-    public void processPassengers(Entity vehicle) {
-        for (Entity passenger : getPassengers(vehicle)) {
-            if (passenger instanceof Player) {
-                feature.getArmorStandManager(TAB.getInstance().getPlayer(passenger.getUniqueId())).teleport();
-            }
-            processPassengers(passenger);
-        }
-    }
 }

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/nms/BukkitModernNMSStorage.java

@@ -0,0 +1,119 @@
+package me.neznamy.tab.platforms.bukkit.nms;
+
+/**
+ * NMS loader for minecraft 1.17+ using Mojang packaging and bukkit names.
+ */
+@SuppressWarnings({"unchecked", "rawtypes"})
+public class BukkitModernNMSStorage extends ModernNMSStorage {
+
+    /**
+     * Creates new instance, initializes required NMS classes and fields
+     *
+     * @throws  ReflectiveOperationException
+     *          If any class, field or method fails to load
+     */
+    public BukkitModernNMSStorage() throws ReflectiveOperationException {
+    }
+
+    @Override
+    public void loadNamedFieldsAndMethods() throws ReflectiveOperationException {
+        PING = getField(EntityPlayer, "e");
+        ChatSerializer_DESERIALIZE = getMethod(ChatSerializer, "a", String.class);
+        DataWatcher_REGISTER = getMethod(DataWatcher, new String[]{"register", "a"}, DataWatcherObject, Object.class); // {Bukkit, Bukkit 1.18+}
+        ScoreboardScore_setScore = getMethod(ScoreboardScore, new String[]{"setScore", "b"}, int.class); // {Bukkit, Bukkit 1.18+}
+        ScoreboardTeam_setAllowFriendlyFire = getMethod(ScoreboardTeam, new String[]{"setAllowFriendlyFire", "a"}, boolean.class); // {Bukkit, Bukkit 1.18+}
+        ScoreboardTeam_setCanSeeFriendlyInvisibles = getMethod(ScoreboardTeam, new String[]{"setCanSeeFriendlyInvisibles", "b"}, boolean.class); // {Bukkit, Bukkit 1.18+}
+        ScoreboardTeam_setPrefix = getMethod(ScoreboardTeam, new String[]{"setPrefix", "b"}, IChatBaseComponent); // {Bukkit, Bukkit 1.18+}
+        ScoreboardTeam_setSuffix = getMethod(ScoreboardTeam, new String[]{"setSuffix", "c"}, IChatBaseComponent); // {Bukkit, Bukkit 1.18+}
+        ScoreboardTeam_setNameTagVisibility = getMethod(ScoreboardTeam, new String[]{"setNameTagVisibility", "a"}, EnumNameTagVisibility); // {Bukkit, Bukkit 1.18+}
+        if (minorVersion >= 19) {
+            EntityTypes_ARMOR_STAND = EntityTypes.getDeclaredField("d").get(null);
+            PacketPlayOutSpawnEntityLiving_ENTITYTYPE = getField(PacketPlayOutSpawnEntityLiving, "e");
+        }
+    }
+
+    @Override
+    public void loadClasses() throws ClassNotFoundException {
+        ChatSerializer = Class.forName("net.minecraft.network.chat.IChatBaseComponent$ChatSerializer");
+        World = Class.forName("net.minecraft.world.level.World");
+        EntityArmorStand = Class.forName("net.minecraft.world.entity.decoration.EntityArmorStand");
+        EntityHuman = Class.forName("net.minecraft.world.entity.player.EntityHuman");
+        NetworkManager = Class.forName("net.minecraft.network.NetworkManager");
+        IChatBaseComponent = Class.forName("net.minecraft.network.chat.IChatBaseComponent");
+        Packet = Class.forName("net.minecraft.network.protocol.Packet");
+        EnumChatFormat = (Class<Enum>) Class.forName("net.minecraft.EnumChatFormat");
+        EntityPlayer = Class.forName("net.minecraft.server.level.EntityPlayer");
+        Entity = Class.forName("net.minecraft.world.entity.Entity");
+        EntityLiving = Class.forName("net.minecraft.world.entity.EntityLiving");
+        PlayerConnection = Class.forName("net.minecraft.server.network.PlayerConnection");
+
+        PacketPlayOutPlayerListHeaderFooter = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutPlayerListHeaderFooter");
+        PacketPlayOutChat = getModernClass("net.minecraft.network.protocol.game.ClientboundSystemChatPacket",
+                "net.minecraft.network.protocol.game.PacketPlayOutChat");
+        if (minorVersion < 19) {
+            ChatMessageType = (Class<Enum>) Class.forName("net.minecraft.network.chat.ChatMessageType");
+        }
+
+        // DataWatcher
+        DataWatcher = Class.forName("net.minecraft.network.syncher.DataWatcher");
+        DataWatcherItem = Class.forName("net.minecraft.network.syncher.DataWatcher$Item");
+        DataWatcherObject = Class.forName("net.minecraft.network.syncher.DataWatcherObject");
+        DataWatcherRegistry = Class.forName("net.minecraft.network.syncher.DataWatcherRegistry");
+        DataWatcherSerializer = Class.forName("net.minecraft.network.syncher.DataWatcherSerializer");
+        if (is1_19_3Plus()) {
+            DataWatcher$DataValue = Class.forName("net.minecraft.network.syncher.DataWatcher$b");
+        }
+
+        // Entities
+        PacketPlayOutSpawnEntityLiving = getModernClass("net.minecraft.network.protocol.game.PacketPlayOutSpawnEntityLiving",
+                "net.minecraft.network.protocol.game.PacketPlayOutSpawnEntity");
+        PacketPlayOutEntityTeleport = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutEntityTeleport");
+        PacketPlayInUseEntity = Class.forName("net.minecraft.network.protocol.game.PacketPlayInUseEntity");
+        PacketPlayInUseEntity$d = Class.forName("net.minecraft.network.protocol.game.PacketPlayInUseEntity$d");
+        PacketPlayOutEntity = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutEntity");
+        PacketPlayOutEntityDestroy = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutEntityDestroy");
+        PacketPlayOutEntityLook = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutEntity$PacketPlayOutEntityLook");
+        PacketPlayOutEntityMetadata = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutEntityMetadata");
+        PacketPlayOutNamedEntitySpawn = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutNamedEntitySpawn");
+        EnumEntityUseAction = (Class<Enum>) Class.forName("net.minecraft.network.protocol.game.PacketPlayInUseEntity$EnumEntityUseAction");
+        if (minorVersion >= 19) {
+            EntityTypes = Class.forName("net.minecraft.world.entity.EntityTypes");
+        }
+
+        // Player Info
+        if (minorVersion >= 19) {
+            ProfilePublicKey = Class.forName("net.minecraft.world.entity.player.ProfilePublicKey");
+            ProfilePublicKey$a = Class.forName("net.minecraft.world.entity.player.ProfilePublicKey$a");
+        }
+        if (is1_19_3Plus()) {
+            //1.19.3+
+            ClientboundPlayerInfoRemovePacket = Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoRemovePacket");
+            PacketPlayOutPlayerInfo = Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket");
+            EnumPlayerInfoAction = (Class<Enum>) Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket$a");
+            PlayerInfoData = Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket$b");
+            RemoteChatSession = Class.forName("net.minecraft.network.chat.RemoteChatSession");
+            RemoteChatSession$Data = Class.forName("net.minecraft.network.chat.RemoteChatSession$a");
+        } else {
+            PacketPlayOutPlayerInfo = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutPlayerInfo");
+            EnumPlayerInfoAction = (Class<Enum>) Class.forName("net.minecraft.network.protocol.game.PacketPlayOutPlayerInfo$EnumPlayerInfoAction");
+            PlayerInfoData = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutPlayerInfo$PlayerInfoData");
+        }
+        EnumGamemode = (Class<Enum>) Class.forName("net.minecraft.world.level.EnumGamemode");
+
+        // Scoreboard
+        PacketPlayOutScoreboardDisplayObjective = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutScoreboardDisplayObjective");
+        PacketPlayOutScoreboardObjective = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutScoreboardObjective");
+        Scoreboard = Class.forName("net.minecraft.world.scores.Scoreboard");
+        PacketPlayOutScoreboardScore = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutScoreboardScore");
+        ScoreboardObjective = Class.forName("net.minecraft.world.scores.ScoreboardObjective");
+        ScoreboardScore = Class.forName("net.minecraft.world.scores.ScoreboardScore");
+        IScoreboardCriteria = Class.forName("net.minecraft.world.scores.criteria.IScoreboardCriteria");
+        EnumScoreboardHealthDisplay = (Class<Enum>) Class.forName("net.minecraft.world.scores.criteria.IScoreboardCriteria$EnumScoreboardHealthDisplay");
+        EnumScoreboardAction = (Class<Enum>) Class.forName("net.minecraft.server.ScoreboardServer$Action");
+        PacketPlayOutScoreboardTeam = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutScoreboardTeam");
+        ScoreboardTeam = Class.forName("net.minecraft.world.scores.ScoreboardTeam");
+        EnumNameTagVisibility = (Class<Enum>) Class.forName("net.minecraft.world.scores.ScoreboardTeamBase$EnumNameTagVisibility");
+        EnumTeamPush = (Class<Enum>) Class.forName("net.minecraft.world.scores.ScoreboardTeamBase$EnumTeamPush");
+        PacketPlayOutScoreboardTeam_PlayerAction = (Class<Enum>) Class.forName("net.minecraft.network.protocol.game.PacketPlayOutScoreboardTeam$a");
+    }
+}

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/nms/LegacyNMSStorage.java

@@ -0,0 +1,165 @@
+package me.neznamy.tab.platforms.bukkit.nms;
+
+import me.neznamy.tab.platforms.bukkit.Main;
+
+import java.util.Arrays;
+
+/**
+ * NMS loader for Minecraft 1.16.5 and lower using old NMS class structure.
+ */
+@SuppressWarnings({"unchecked", "rawtypes"})
+public class LegacyNMSStorage extends NMSStorage {
+
+    /**
+     * Creates new instance, initializes required NMS classes and fields
+     *
+     * @throws  ReflectiveOperationException
+     *          If any class, field or method fails to load
+     */
+    public LegacyNMSStorage() throws ReflectiveOperationException {
+    }
+
+    /**
+     * Returns class with given potential names in same order
+     *
+     * @param   names
+     *          possible class names
+     * @return  class for specified names
+     * @throws  ClassNotFoundException
+     *          if class does not exist
+     */
+    private Class<?> getLegacyClass(String... names) throws ClassNotFoundException {
+        for (String name : names) {
+            try {
+                return getLegacyClass(name);
+            } catch (ClassNotFoundException e) {
+                //not the first class name in array
+            }
+        }
+        throw new ClassNotFoundException("No class found with possible names " + Arrays.toString(names));
+    }
+
+    /**
+     * Returns class from given name
+     *
+     * @param   name
+     *          class name
+     * @return  class from given name
+     * @throws  ClassNotFoundException
+     *          if class was not found
+     */
+    private Class<?> getLegacyClass(String name) throws ClassNotFoundException {
+        try {
+            return Class.forName("net.minecraft.server." + serverPackage + "." + name);
+        } catch (ClassNotFoundException | NullPointerException e) {
+            try {
+                //modded server?
+                Class<?> clazz = Main.class.getClassLoader().loadClass("net.minecraft.server." + serverPackage + "." + name);
+                if (clazz != null) return clazz;
+            } catch (NullPointerException ignored) {}
+            throw new ClassNotFoundException(name);
+        }
+    }
+
+    @Override
+    public void loadNamedFieldsAndMethods() throws ReflectiveOperationException {
+        PING = getField(EntityPlayer, "ping", "field_71138_i"); // {Bukkit, Thermos}
+        ScoreboardScore_setScore = getMethod(ScoreboardScore, new String[]{"setScore", "func_96647_c"}, int.class); // {Bukkit, Thermos}
+        ScoreboardTeam_setAllowFriendlyFire = getMethod(ScoreboardTeam,
+                new String[]{"setAllowFriendlyFire", "func_96660_a"}, boolean.class); // {Bukkit, Thermos}
+        ScoreboardTeam_setCanSeeFriendlyInvisibles = getMethod(ScoreboardTeam,
+                new String[]{"setCanSeeFriendlyInvisibles", "func_98300_b"}, boolean.class); // {Bukkit, Thermos}
+        if (minorVersion >= 7) {
+            ChatSerializer_DESERIALIZE = getMethod(ChatSerializer, new String[]{"a", "func_150699_a"}, String.class); // {Bukkit, Thermos}
+        }
+        if (minorVersion >= 8) {
+            ScoreboardTeam_setNameTagVisibility = getMethod(ScoreboardTeam, new String[] {"setNameTagVisibility", "a"}, EnumNameTagVisibility); // {1.8.1+, 1.8}
+        }
+        if (minorVersion >= 9) {
+            DataWatcher_REGISTER = getMethod(DataWatcher, "register", DataWatcherObject, Object.class);
+        } else {
+            DataWatcher_REGISTER = getMethod(DataWatcher, new String[]{"a", "func_75682_a"}, int.class, Object.class); // {Bukkit, Thermos}
+        }
+        if (minorVersion >= 13) {
+            ScoreboardTeam_setPrefix = getMethod(ScoreboardTeam, "setPrefix", IChatBaseComponent);
+            ScoreboardTeam_setSuffix = getMethod(ScoreboardTeam, "setSuffix", IChatBaseComponent);
+        } else {
+            ScoreboardTeam_setPrefix = getMethod(ScoreboardTeam, new String[]{"setPrefix", "func_96666_b"}, String.class); // {Bukkit, Thermos}
+            ScoreboardTeam_setSuffix = getMethod(ScoreboardTeam, new String[]{"setSuffix", "func_96662_c"}, String.class); // {Bukkit, Thermos}
+        }
+    }
+
+    @Override
+    public void loadClasses() throws ClassNotFoundException {
+        EntityHuman = getLegacyClass("EntityHuman");
+        World = getLegacyClass("World");
+        Packet = getLegacyClass("Packet");
+        EnumChatFormat = (Class<Enum>) getLegacyClass("EnumChatFormat");
+        EntityPlayer = getLegacyClass("EntityPlayer");
+        Entity = getLegacyClass("Entity");
+        EntityLiving = getLegacyClass("EntityLiving");
+        PlayerConnection = getLegacyClass("PlayerConnection");
+        PacketPlayOutChat = getLegacyClass("PacketPlayOutChat", "Packet3Chat");
+        NetworkManager = getLegacyClass("NetworkManager");
+        if (minorVersion >= 7) {
+            IChatBaseComponent = getLegacyClass("IChatBaseComponent");
+            ChatSerializer = getLegacyClass("IChatBaseComponent$ChatSerializer", "ChatSerializer");
+        }
+        if (minorVersion >= 8) {
+            PacketPlayOutPlayerListHeaderFooter = getLegacyClass("PacketPlayOutPlayerListHeaderFooter");
+            EntityArmorStand = getLegacyClass("EntityArmorStand");
+        }
+        if (minorVersion >= 12) {
+            ChatMessageType = (Class<Enum>) getLegacyClass("ChatMessageType");
+        }
+
+        // DataWatcher
+        DataWatcher = getLegacyClass("DataWatcher");
+        DataWatcherItem = getLegacyClass("DataWatcher$Item", "DataWatcher$WatchableObject", "WatchableObject");
+        if (minorVersion >= 9) {
+            DataWatcherObject = getLegacyClass("DataWatcherObject");
+            DataWatcherRegistry = getLegacyClass("DataWatcherRegistry");
+            DataWatcherSerializer = getLegacyClass("DataWatcherSerializer");
+        }
+
+        // Entities
+        PacketPlayOutSpawnEntityLiving = getLegacyClass("PacketPlayOutSpawnEntityLiving", "Packet24MobSpawn");
+        PacketPlayOutEntityTeleport = getLegacyClass("PacketPlayOutEntityTeleport", "Packet34EntityTeleport");
+        PacketPlayInUseEntity = getLegacyClass("PacketPlayInUseEntity", "Packet7UseEntity");
+        PacketPlayOutEntity = getLegacyClass("PacketPlayOutEntity", "Packet30Entity");
+        PacketPlayOutEntityDestroy = getLegacyClass("PacketPlayOutEntityDestroy", "Packet29DestroyEntity");
+        PacketPlayOutEntityLook = getLegacyClass("PacketPlayOutEntity$PacketPlayOutEntityLook", "PacketPlayOutEntityLook", "Packet32EntityLook");
+        PacketPlayOutEntityMetadata = getLegacyClass("PacketPlayOutEntityMetadata", "Packet40EntityMetadata");
+        PacketPlayOutNamedEntitySpawn = getLegacyClass("PacketPlayOutNamedEntitySpawn", "Packet20NamedEntitySpawn");
+        if (minorVersion >= 7) {
+            EnumEntityUseAction = (Class<Enum>) getLegacyClass("PacketPlayInUseEntity$EnumEntityUseAction", "EnumEntityUseAction");
+        }
+
+        // Player Info
+        if (minorVersion >= 8) {
+            PacketPlayOutPlayerInfo = getLegacyClass("PacketPlayOutPlayerInfo");
+            EnumPlayerInfoAction = (Class<Enum>) getLegacyClass("PacketPlayOutPlayerInfo$EnumPlayerInfoAction", "EnumPlayerInfoAction");
+            PlayerInfoData = getLegacyClass("PacketPlayOutPlayerInfo$PlayerInfoData", "PlayerInfoData");
+            EnumGamemode = (Class<Enum>) getLegacyClass("EnumGamemode", "WorldSettings$EnumGamemode");
+        }
+
+        // Scoreboard
+        PacketPlayOutScoreboardDisplayObjective = getLegacyClass("PacketPlayOutScoreboardDisplayObjective", "Packet208SetScoreboardDisplayObjective");
+        PacketPlayOutScoreboardObjective = getLegacyClass("PacketPlayOutScoreboardObjective", "Packet206SetScoreboardObjective");
+        PacketPlayOutScoreboardTeam = getLegacyClass("PacketPlayOutScoreboardTeam", "Packet209SetScoreboardTeam");
+        PacketPlayOutScoreboardScore = getLegacyClass("PacketPlayOutScoreboardScore", "Packet207SetScoreboardScore");
+        Scoreboard = getLegacyClass("Scoreboard");
+        ScoreboardObjective = getLegacyClass("ScoreboardObjective");
+        ScoreboardScore = getLegacyClass("ScoreboardScore");
+        IScoreboardCriteria = getLegacyClass("IScoreboardCriteria");
+        ScoreboardTeam = getLegacyClass("ScoreboardTeam");
+        if (minorVersion >= 8) {
+            EnumScoreboardHealthDisplay = (Class<Enum>) getLegacyClass("IScoreboardCriteria$EnumScoreboardHealthDisplay", "EnumScoreboardHealthDisplay");
+            EnumScoreboardAction = (Class<Enum>) getLegacyClass("ScoreboardServer$Action", "PacketPlayOutScoreboardScore$EnumScoreboardAction", "EnumScoreboardAction");
+            EnumNameTagVisibility = (Class<Enum>) getLegacyClass("ScoreboardTeamBase$EnumNameTagVisibility", "EnumNameTagVisibility");
+        }
+        if (minorVersion >= 9) {
+            EnumTeamPush = (Class<Enum>) getLegacyClass("ScoreboardTeamBase$EnumTeamPush");
+        }
+    }
+}

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/nms/ModernNMSStorage.java

@@ -0,0 +1,38 @@
+package me.neznamy.tab.platforms.bukkit.nms;
+
+import java.util.Arrays;
+
+/**
+ * NMS loader for minecraft 1.17+ using Mojang packaging.
+ */
+public abstract class ModernNMSStorage extends NMSStorage {
+
+    /**
+     * Creates new instance, initializes required NMS classes and fields
+     *
+     * @throws  ReflectiveOperationException
+     *          If any class, field or method fails to load
+     */
+    public ModernNMSStorage() throws ReflectiveOperationException {
+    }
+
+    /**
+     * 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
+     */
+    protected Class<?> getModernClass(String... names) throws ClassNotFoundException {
+        for (String name : names) {
+            try {
+                return Class.forName(name);
+            } catch (ClassNotFoundException e) {
+                //not the first class name in array
+            }
+        }
+        throw new ClassNotFoundException("No class found with possible names " + Arrays.toString(names));
+    }
+}

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/nms/MojangModernNMSStorage.java

@@ -0,0 +1,117 @@
+package me.neznamy.tab.platforms.bukkit.nms;
+
+/**
+ * NMS loader for minecraft 1.17+ using Mojang packaging and names.
+ */
+@SuppressWarnings({"unchecked", "rawtypes"})
+public class MojangModernNMSStorage extends ModernNMSStorage {
+
+    /**
+     * Creates new instance, initializes required NMS classes and fields
+     *
+     * @throws  ReflectiveOperationException
+     *          If any class, field or method fails to load
+     */
+    public MojangModernNMSStorage() throws ReflectiveOperationException {
+    }
+
+    @Override
+    public void loadNamedFieldsAndMethods() throws ReflectiveOperationException {
+        PING = getField(EntityPlayer, "latency");
+        ChatSerializer_DESERIALIZE = getMethod(ChatSerializer, "fromJson", String.class);
+        DataWatcher_REGISTER = getMethod(DataWatcher, "define", DataWatcherObject, Object.class);
+        ScoreboardScore_setScore = getMethod(ScoreboardScore, "setScore", int.class);
+        ScoreboardTeam_setAllowFriendlyFire = getMethod(ScoreboardTeam, "setAllowFriendlyFire", boolean.class);
+        ScoreboardTeam_setCanSeeFriendlyInvisibles = getMethod(ScoreboardTeam, "setSeeFriendlyInvisibles", boolean.class);
+        ScoreboardTeam_setPrefix = getMethod(ScoreboardTeam, "setPlayerPrefix", IChatBaseComponent);
+        ScoreboardTeam_setSuffix = getMethod(ScoreboardTeam, "setPlayerSuffix", IChatBaseComponent);
+        ScoreboardTeam_setNameTagVisibility = getMethod(ScoreboardTeam, "setNameTagVisibility", EnumNameTagVisibility);
+        if (minorVersion >= 19) {
+            EntityTypes_ARMOR_STAND = EntityTypes.getDeclaredField("ARMOR_STAND").get(null);
+            PacketPlayOutSpawnEntityLiving_ENTITYTYPE = getField(PacketPlayOutSpawnEntityLiving, "type");
+        }
+    }
+
+    @Override
+    public void loadClasses() throws ClassNotFoundException {
+        IChatBaseComponent = Class.forName("net.minecraft.network.chat.Component");
+        ChatSerializer = Class.forName("net.minecraft.network.chat.Component$Serializer");
+        World = Class.forName("net.minecraft.world.level.Level");
+        EntityArmorStand = Class.forName("net.minecraft.world.entity.decoration.ArmorStand");
+        EntityHuman = Class.forName("net.minecraft.world.entity.player.Player");
+        NetworkManager = Class.forName("net.minecraft.network.Connection");
+        Packet = Class.forName("net.minecraft.network.protocol.Packet");
+        EnumChatFormat = (Class<Enum>) Class.forName("net.minecraft.ChatFormatting");
+        EntityPlayer = Class.forName("net.minecraft.server.level.ServerPlayer");
+        Entity = Class.forName("net.minecraft.world.entity.Entity");
+        EntityLiving = Class.forName("net.minecraft.world.entity.LivingEntity");
+        PlayerConnection = Class.forName("net.minecraft.server.network.ServerGamePacketListenerImpl");
+        PacketPlayOutPlayerListHeaderFooter = Class.forName("net.minecraft.network.protocol.game.ClientboundTabListPacket");
+        PacketPlayOutChat = getModernClass("net.minecraft.network.protocol.game.ClientboundSystemChatPacket",
+                "net.minecraft.network.protocol.game.ClientboundChatPacket");
+        if (minorVersion < 19) {
+            ChatMessageType = (Class<Enum>) Class.forName("net.minecraft.network.chat.ChatType");
+        }
+
+        // DataWatcher
+        DataWatcher = Class.forName("net.minecraft.network.syncher.SynchedEntityData");
+        DataWatcherItem = Class.forName("net.minecraft.network.syncher.SynchedEntityData$DataItem");
+        DataWatcherObject = Class.forName("net.minecraft.network.syncher.EntityDataAccessor");
+        DataWatcherRegistry = Class.forName("net.minecraft.network.syncher.EntityDataSerializers");
+        DataWatcherSerializer = Class.forName("net.minecraft.network.syncher.EntityDataSerializer");
+        if (is1_19_3Plus()) {
+            DataWatcher$DataValue = Class.forName("net.minecraft.network.syncher.SynchedEntityData$DataValue");
+        }
+
+        // Entities
+        PacketPlayOutSpawnEntityLiving = getModernClass("net.minecraft.network.protocol.game.ClientboundAddMobPacket",
+                "net.minecraft.network.protocol.game.ClientboundAddEntityPacket");
+        PacketPlayOutEntityTeleport = Class.forName("net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket");
+        PacketPlayInUseEntity = Class.forName("net.minecraft.network.protocol.game.ServerboundInteractPacket");
+        PacketPlayInUseEntity$d = Class.forName("net.minecraft.network.protocol.game.ServerboundInteractPacket$InteractionAction");
+        PacketPlayOutEntity = Class.forName("net.minecraft.network.protocol.game.ClientboundMoveEntityPacket");
+        PacketPlayOutEntityDestroy = Class.forName("net.minecraft.network.protocol.game.ClientboundRemoveEntitiesPacket");
+        PacketPlayOutEntityLook = Class.forName("net.minecraft.network.protocol.game.ClientboundMoveEntityPacket$Rot");
+        PacketPlayOutEntityMetadata = Class.forName("net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket");
+        PacketPlayOutNamedEntitySpawn = Class.forName("net.minecraft.network.protocol.game.ClientboundAddPlayerPacket");
+        EnumEntityUseAction = (Class<Enum>) Class.forName("net.minecraft.network.protocol.game.ServerboundInteractPacket$Action");
+        if (minorVersion >= 19) {
+            EntityTypes = Class.forName("net.minecraft.world.entity.EntityType");
+        }
+
+        // Player Info
+        if (minorVersion >= 19) {
+            ProfilePublicKey = Class.forName("net.minecraft.world.entity.player.ProfilePublicKey");
+            ProfilePublicKey$a = Class.forName("net.minecraft.world.entity.player.ProfilePublicKey$Data");
+        }
+        if (is1_19_3Plus()) {
+            ClientboundPlayerInfoRemovePacket = Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoRemovePacket");
+            PacketPlayOutPlayerInfo = Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket");
+            EnumPlayerInfoAction = (Class<Enum>) Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket$Action");
+            PlayerInfoData = Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket$Entry");
+            RemoteChatSession = Class.forName("net.minecraft.network.chat.RemoteChatSession");
+            RemoteChatSession$Data = Class.forName("net.minecraft.network.chat.RemoteChatSession$Data");
+        } else {
+            PacketPlayOutPlayerInfo = Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket");
+            EnumPlayerInfoAction = (Class<Enum>) Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket$Action");
+            PlayerInfoData = Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket$PlayerUpdate");
+        }
+        EnumGamemode = (Class<Enum>) Class.forName("net.minecraft.world.level.GameType");
+
+        // Scoreboard
+        PacketPlayOutScoreboardDisplayObjective = Class.forName("net.minecraft.network.protocol.game.ClientboundSetDisplayObjectivePacket");
+        PacketPlayOutScoreboardObjective = Class.forName("net.minecraft.network.protocol.game.ClientboundSetObjectivePacket");
+        Scoreboard = Class.forName("net.minecraft.world.scores.Scoreboard");
+        PacketPlayOutScoreboardScore = Class.forName("net.minecraft.network.protocol.game.ClientboundSetScorePacket");
+        ScoreboardObjective = Class.forName("net.minecraft.world.scores.Objective");
+        ScoreboardScore = Class.forName("net.minecraft.world.scores.Score");
+        IScoreboardCriteria = Class.forName("net.minecraft.world.scores.criteria.ObjectiveCriteria");
+        EnumScoreboardHealthDisplay = (Class<Enum>) Class.forName("net.minecraft.world.scores.criteria.ObjectiveCriteria$RenderType");
+        EnumScoreboardAction = (Class<Enum>) Class.forName("net.minecraft.server.ServerScoreboard$Method");
+        PacketPlayOutScoreboardTeam = Class.forName("net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket");
+        ScoreboardTeam = Class.forName("net.minecraft.world.scores.PlayerTeam");
+        EnumNameTagVisibility = (Class<Enum>) Class.forName("net.minecraft.world.scores.Team$Visibility");
+        EnumTeamPush = (Class<Enum>) Class.forName("net.minecraft.world.scores.Team$CollisionRule");
+        PacketPlayOutScoreboardTeam_PlayerAction = (Class<Enum>) Class.forName("net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket$Action");
+    }
+}

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/nms/PacketPlayOutEntityDestroy.java

@@ -4,10 +4,20 @@ import java.util.Arrays;
 
 import me.neznamy.tab.api.protocol.TabPacket;
 
+/**
+ * Custom class for holding data used in PacketPlayOutEntityDestroy minecraft packet.
+ */
 public class PacketPlayOutEntityDestroy implements TabPacket {
 
+    /** Destroyed entities */
     private final int[] entities;
 
+    /**
+     * Constructs new instance with given parameter
+     *
+     * @param   entities
+     *          Destroyed entities
+     */
     public PacketPlayOutEntityDestroy(int... entities) {
         this.entities = entities;
     }
@@ -17,6 +27,10 @@ public class PacketPlayOutEntityDestroy implements TabPacket {
         return String.format("PacketPlayOutEntityDestroy{entities=%s}", Arrays.toString(entities));
     }
 
+    /**
+     * Returns {@link #entities}
+     * @return  {@link #entities}
+     */
     public int[] getEntities() {
         return entities;
     }

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/nms/PacketPlayOutEntityMetadata.java

@@ -4,12 +4,25 @@ import me.neznamy.tab.api.protocol.TabPacket;
 import me.neznamy.tab.api.util.Preconditions;
 import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcher;
 
+/**
+ * Custom class for holding data used in PacketPlayOutEntityMetadata minecraft packet.
+ */
 public class PacketPlayOutEntityMetadata implements TabPacket {
 
+    /** Entity's id */
     private final int entityId;
 
+    /** Entity's data that changed */
     private final DataWatcher dataWatcher;
 
+    /**
+     * Constructs new instance with given parameters
+     *
+     * @param   entityId
+     *          Entity's id
+     * @param   dataWatcher
+     *          Entity's data that changed
+     */
     public PacketPlayOutEntityMetadata(int entityId, DataWatcher dataWatcher) {
         Preconditions.checkNotNull(dataWatcher, "data watcher");
         this.entityId = entityId;
@@ -21,10 +34,18 @@ public class PacketPlayOutEntityMetadata implements TabPacket {
         return String.format("PacketPlayOutEntityMetadata{entityId=%s,dataWatcher=%s}", entityId, dataWatcher);
     }
 
+    /**
+     * Returns {@link #entityId}
+     * @return  {@link #entityId}
+     */
     public int getEntityId() {
         return entityId;
     }
 
+    /**
+     * Returns {@link #dataWatcher}
+     * @return  {@link #dataWatcher}
+     */
     public DataWatcher getDataWatcher() {
         return dataWatcher;
     }

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/nms/PacketPlayOutEntityTeleport.java

@@ -5,12 +5,25 @@ import org.bukkit.Location;
 
 import me.neznamy.tab.api.protocol.TabPacket;
 
+/**
+ * Custom class for holding data used in PacketPlayOutEntityTeleport minecraft packet.
+ */
 public class PacketPlayOutEntityTeleport implements TabPacket {
 
+    /** Entity's id */
     private final int entityId;
 
+    /** Entity's new location */
     private final Location location;
 
+    /**
+     * Constructs new instance with given parameters
+     *
+     * @param   entityId
+     *          Entity's id
+     * @param   location
+     *          Entity's spawn location
+     */
     public PacketPlayOutEntityTeleport(int entityId, Location location) {
         Preconditions.checkNotNull(location, "location");
         this.entityId = entityId;
@@ -22,10 +35,18 @@ public class PacketPlayOutEntityTeleport implements TabPacket {
         return String.format("PacketPlayOutEntityTeleport{entityId=%s,location=%s}", entityId, location);
     }
 
+    /**
+     * Returns {@link #entityId}
+     * @return  {@link #entityId}
+     */
     public int getEntityId() {
         return entityId;
     }
 
+    /**
+     * Returns {@link #location}
+     * @return  {@link #location}
+     */
     public Location getLocation() {
         return location;
     }

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/nms/PacketPlayOutSpawnEntityLiving.java

@@ -9,18 +9,40 @@ import org.bukkit.entity.EntityType;
 import me.neznamy.tab.api.protocol.TabPacket;
 import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcher;
 
+/**
+ * Custom class for holding data used in PacketPlayOutSpawnEntityLiving minecraft packet.
+ */
 public class PacketPlayOutSpawnEntityLiving implements TabPacket {
 
+    /** Entity's id */
     private final int entityId;
 
+    /** Entity's UUID (for 1.9+ servers) */
     private final UUID uuid;
 
+    /** Type of entity */
     private final EntityType entityType;
 
+    /** Entity's spawn location */
     private final Location location;
 
+    /** Entity's data for 1.14- servers */
     private final DataWatcher dataWatcher;
 
+    /**
+     * Constructs new instance with given parameters
+     *
+     * @param   entityId
+     *          Entity's id
+     * @param   uuid
+     *          Entity's UUID (for 1.9+ servers)
+     * @param   entityType
+     *          Type of entity
+     * @param   location
+     *          Entity's spawn location
+     * @param   dataWatcher
+     *          Entity's data for 1.14- servers
+     */
     public PacketPlayOutSpawnEntityLiving(int entityId, UUID uuid, EntityType entityType, Location location, DataWatcher dataWatcher) {
         Preconditions.checkNotNull(uuid, "uuid");
         Preconditions.checkNotNull(entityType, "entityType");
@@ -38,22 +60,42 @@ public class PacketPlayOutSpawnEntityLiving implements TabPacket {
                 entityId, uuid, entityType, location, dataWatcher);
     }
 
+    /**
+     * Returns {@link #entityId}
+     * @return  {@link #entityId}
+     */
     public int getEntityId() {
         return entityId;
     }
 
+    /**
+     * Returns {@link #uuid}
+     * @return  {@link #uuid}
+     */
     public UUID getUniqueId() {
         return uuid;
     }
 
+    /**
+     * Returns {@link #entityType}
+     * @return  {@link #entityType}
+     */
     public EntityType getEntityType() {
         return entityType;
     }
 
+    /**
+     * Returns {@link #location}
+     * @return  {@link #location}
+     */
     public Location getLocation() {
         return location;
     }
 
+    /**
+     * Returns {@link #dataWatcher}
+     * @return  {@link #dataWatcher}
+     */
     public DataWatcher getDataWatcher() {
         return dataWatcher;
     }

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/nms/datawatcher/DataWatcher.java

@@ -12,16 +12,19 @@ import me.neznamy.tab.platforms.bukkit.nms.NMSStorage;
  */
 public class DataWatcher {
 
-    //DataWatcher data
+    /** Watched data */
     private final Map<Integer, DataWatcherItem> dataValues = new HashMap<>();
 
-    //a helper for easier data write
+    /** Helper for easier data write */
     private final DataWatcherHelper helper = new DataWatcherHelper(this);
 
     /**
      * Sets value into data values
-     * @param type - type of value
-     * @param value - value
+     *
+     * @param   type
+     *          type of value
+     * @param   value
+     *          value
      */
     public void setValue(DataWatcherObject type, Object value){
         Preconditions.checkNotNull(type, "type");
@@ -31,7 +34,9 @@ public class DataWatcher {
 
     /**
      * Removes value by position
-     * @param position - position of value to remove
+     *
+     * @param   position
+     *          position of value to remove
      */
     public void removeValue(int position) {
         dataValues.remove(position);
@@ -39,8 +44,10 @@ public class DataWatcher {
 
     /**
      * Returns item with given position
-     * @param position - position of item
-     * @return item or null if not set
+     *
+     * @param   position
+     *          position of item
+     * @return  item or null if not set
      */
     public DataWatcherItem getItem(int position) {
         return dataValues.get(position);
@@ -48,7 +55,8 @@ public class DataWatcher {
 
     /**
      * Returns helper created by this instance
-     * @return data write helper
+     *
+     * @return  data write helper
      */
     public DataWatcherHelper helper() {
         return helper;
@@ -56,37 +64,40 @@ public class DataWatcher {
 
     /**
      * Converts the class into an instance of NMS.DataWatcher
-     * @return an instance of NMS.DataWatcher with same data
-     * @throws    ReflectiveOperationException
-     *             if thrown by reflective operation
+     *
+     * @return  an instance of NMS.DataWatcher with same data
+     * @throws  ReflectiveOperationException
+     *          if thrown by reflective operation
      */
     public Object toNMS() throws ReflectiveOperationException {
         NMSStorage nms = NMSStorage.getInstance();
         Object nmsWatcher;
         if (nms.newDataWatcher.getParameterCount() == 1) { //1.7+
-            Object[] args = new Object[] {null};
-            nmsWatcher = nms.newDataWatcher.newInstance(args);
+            nmsWatcher = nms.newDataWatcher.newInstance(new Object[] {null});
         } else {
             nmsWatcher = nms.newDataWatcher.newInstance();
         }
         for (DataWatcherItem item : dataValues.values()) {
             Object position;
             if (nms.getMinorVersion() >= 9) {
-                position = nms.newDataWatcherObject.newInstance(item.getType().getPosition(), item.getType().getClassType());
+                position = nms.newDataWatcherObject.newInstance(item.getType().getPosition(), item.getType().getSerializer());
             } else {
                 position = item.getType().getPosition();
             }
             nms.DataWatcher_REGISTER.invoke(nmsWatcher, position, item.getValue());
+            if (nms.is1_19_3Plus()) nms.DataWatcher_markDirty.invoke(nmsWatcher, position);
         }
         return nmsWatcher;
     }
 
     /**
      * Reads NMS data watcher and returns and instance of this class with same data
-     * @param nmsWatcher - NMS DataWatcher to read
-     * @return an instance of this class with same values
-     * @throws    ReflectiveOperationException
-     *             if thrown by reflective operation
+     *
+     * @param   nmsWatcher
+     *          NMS DataWatcher to read
+     * @return  an instance of this class with same values
+     * @throws  ReflectiveOperationException
+     *          if thrown by reflective operation
      */
     @SuppressWarnings("unchecked")
     public static DataWatcher fromNMS(Object nmsWatcher) throws ReflectiveOperationException {

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/nms/datawatcher/DataWatcherHelper.java

@@ -1,53 +1,55 @@
 package me.neznamy.tab.platforms.bukkit.nms.datawatcher;
 
-import java.util.Optional;
-
 import me.neznamy.tab.api.ProtocolVersion;
+import me.neznamy.tab.api.TabAPI;
 import me.neznamy.tab.api.chat.IChatBaseComponent;
-import me.neznamy.tab.api.util.Preconditions;
 import me.neznamy.tab.platforms.bukkit.BukkitPacketBuilder;
 import me.neznamy.tab.platforms.bukkit.nms.NMSStorage;
 import me.neznamy.tab.shared.TAB;
 
+import java.util.Optional;
+
 /**
  * A class to help to assign DataWatcher items as positions often change per-version
  */
 public class DataWatcherHelper {
 
-    //position of armor stand flags
+    /** Position of armor stand flags */
     private final int armorStandFlagsPosition = getArmorStandFlagsPosition();
 
-    //original DataWatcher to write to
+    /** DataWatcher to write to */
     private final DataWatcher data;
 
-    //data watcher registry
+    /** Data Watcher registry reference */
     private final DataWatcherRegistry registry;
 
     /**
      * Constructs new instance of this class with given parent
-     * @param data - data to write to
+     *
+     * @param   data
+     *          data to write to
      */
     public DataWatcherHelper(DataWatcher data) {
-        Preconditions.checkNotNull(data, "dataWatcher");
         this.data = data;
         this.registry = NMSStorage.getInstance().getDataWatcherRegistry();
     }
 
     /**
      * Returns armor stand flags position based on server version
-     * @return armor stand flags position based on server version
+     *
+     * @return  armor stand flags position based on server version
      */
     private int getArmorStandFlagsPosition() {
-        if (TAB.getInstance().getServerVersion().getMinorVersion() >= 17) {
-            //1.17.x, 1.18.x
+        if (TabAPI.getInstance().getServerVersion().getMinorVersion() >= 17) {
+            //1.17.x, 1.18.x, 1.19.x
             return 15;
-        } else if (TAB.getInstance().getServerVersion().getMinorVersion() >= 15) {
+        } else if (TabAPI.getInstance().getServerVersion().getMinorVersion() >= 15) {
             //1.15.x, 1.16.x
             return 14;
-        } else if (TAB.getInstance().getServerVersion().getMinorVersion() >= 14) {
+        } else if (TabAPI.getInstance().getServerVersion().getMinorVersion() >= 14) {
             //1.14.x
             return 13;
-        } else if (TAB.getInstance().getServerVersion().getMinorVersion() >= 10) {
+        } else if (TabAPI.getInstance().getServerVersion().getMinorVersion() >= 10) {
             //1.10.x - 1.13.x
             return 11;
         } else {
@@ -58,7 +60,9 @@ public class DataWatcherHelper {
 
     /**
      * Writes entity byte flags
-     * @param flags - flags to write
+     *
+     * @param   flags
+     *          flags to write
      */
     public void setEntityFlags(byte flags) {
         data.setValue(new DataWatcherObject(0, registry.getByte()), flags);
@@ -66,61 +70,78 @@ public class DataWatcherHelper {
 
     /**
      * 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
+     *
+     * @param   customName
+     *          target custom name
+     * @param   clientVersion
+     *          client version
      */
     public void setCustomName(String customName, ProtocolVersion clientVersion) {
-        Preconditions.checkNotNull(customName, "customName");
-        Preconditions.checkNotNull(clientVersion, "clientVersion");
-        if (TAB.getInstance().getServerVersion().getMinorVersion() >= 13) {
+        if (TabAPI.getInstance().getServerVersion().getMinorVersion() >= 13) {
             try {
                 data.setValue(new DataWatcherObject(2, registry.getOptionalComponent()), Optional.ofNullable(((BukkitPacketBuilder)TAB.getInstance().getPlatform().getPacketBuilder()).toNMSComponent(IChatBaseComponent.optimizedComponent(customName), clientVersion)));
             } catch (ReflectiveOperationException e) {
                 TAB.getInstance().getErrorManager().printError("Failed to create component", e);
             }
-        } else if (TAB.getInstance().getServerVersion().getMinorVersion() >= 8){
+        } else if (TabAPI.getInstance().getServerVersion().getMinorVersion() >= 8){
             data.setValue(new DataWatcherObject(2, registry.getString()), customName);
         } else {
             //name length is limited to 64 characters on <1.8
             String cutName = (customName.length() > 64 ? customName.substring(0, 64) : customName);
-            if (TAB.getInstance().getServerVersion().getMinorVersion() >= 6){
-                data.setValue(new DataWatcherObject(10, registry.getString()), cutName);
+            if (TabAPI.getInstance().getServerVersion().getMinorVersion() >= 6){
+                data.setValue(new DataWatcherObject(10, null), cutName);
             } else {
-                data.setValue(new DataWatcherObject(5, registry.getString()), cutName);
+                data.setValue(new DataWatcherObject(5, null), cutName);
             }
         }
-
     }
 
     /**
      * Writes custom name visibility boolean
-     * @param visible - if visible or not
+     *
+     * @param   visible
+     *          if visible or not
      */
     public void setCustomNameVisible(boolean visible) {
-        if (TAB.getInstance().getServerVersion().getMinorVersion() >= 9) {
+        if (TabAPI.getInstance().getServerVersion().getMinorVersion() >= 9) {
             data.setValue(new DataWatcherObject(3, registry.getBoolean()), visible);
         } else {
-            data.setValue(new DataWatcherObject(3, registry.getByte()), (byte)(visible?1:0));
+            data.setValue(new DataWatcherObject(3, null), (byte)(visible?1:0));
         }
     }
 
     /**
      * Writes entity health
-     * @param health - health of entity
+     *
+     * @param   health
+     *          health of entity
      */
     public void setHealth(float health) {
-        if (TAB.getInstance().getServerVersion().getMinorVersion() >= 6) {
+        if (TabAPI.getInstance().getServerVersion().getMinorVersion() >= 6) {
             data.setValue(new DataWatcherObject(6, registry.getFloat()), health);
         } else {
-            data.setValue(new DataWatcherObject(16, registry.getInteger()), (int)health);
+            data.setValue(new DataWatcherObject(16, null), (int)health);
         }
     }
 
     /**
      * Writes armor stand flags
-     * @param flags - flags to write
+     *
+     * @param   flags
+     *          flags to write
      */
     public void setArmorStandFlags(byte flags) {
         data.setValue(new DataWatcherObject(armorStandFlagsPosition, registry.getByte()), flags);
     }
+
+    /**
+     * Writes wither invulnerable time
+     * @param   time
+     *          Time, apparently
+     */
+    public void setWitherInvulnerableTime(int time) {
+        if (TAB.getInstance().getServerVersion().getMinorVersion() > 8)
+            throw new UnsupportedOperationException("Not supported on 1.9+");
+        data.setValue(new DataWatcherObject(20, null), time);
+    }
 }

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/nms/datawatcher/DataWatcherItem.java

@@ -1,21 +1,27 @@
 package me.neznamy.tab.platforms.bukkit.nms.datawatcher;
 
+import me.neznamy.tab.api.TabAPI;
 import me.neznamy.tab.api.util.Preconditions;
 import me.neznamy.tab.platforms.bukkit.nms.NMSStorage;
-import me.neznamy.tab.shared.TAB;
 
+/**
+ * Class representing NMS Data Watcher Item
+ */
 public class DataWatcherItem {
     
-    //type of value (position + data type (1.9+))
+    /** Value type */
     private final DataWatcherObject type;
     
-    //actual data value
+    /** Data value */
     private final Object value;
     
     /**
      * Constructs new instance of the object with given parameters
-     * @param type - value type
-     * @param value - value
+     *
+     * @param   type
+     *          value type
+     * @param   value
+     *          value
      */
     public DataWatcherItem(DataWatcherObject type, Object value){
         Preconditions.checkNotNull(type, "type");
@@ -26,25 +32,38 @@ public class DataWatcherItem {
     
     /**
      * Returns and instance of this class from given NMS item
-     * @param nmsItem - NMS item
-     * @return instance of this class with same data
-     * @throws    ReflectiveOperationException
-     *             if thrown by reflective operation
+     *
+     * @param   nmsItem
+     *          NMS item
+     * @return  instance of this class with same data
+     * @throws  ReflectiveOperationException
+     *          if thrown by reflective operation
      */
     public static DataWatcherItem fromNMS(Object nmsItem) throws ReflectiveOperationException {
         NMSStorage nms = NMSStorage.getInstance();
-        if (TAB.getInstance().getServerVersion().getMinorVersion() >= 9) {
+        Object value = nms.DataWatcherItem_VALUE.get(nmsItem);
+        DataWatcherObject object;
+        if (TabAPI.getInstance().getServerVersion().getMinorVersion() >= 9) {
             Object nmsObject = nms.DataWatcherItem_TYPE.get(nmsItem);
-            return new DataWatcherItem(new DataWatcherObject(nms.DataWatcherObject_SLOT.getInt(nmsObject), nms.DataWatcherObject_SERIALIZER.get(nmsObject)), nms.DataWatcherItem_VALUE.get(nmsItem));
+            object = new DataWatcherObject(nms.DataWatcherObject_SLOT.getInt(nmsObject), nms.DataWatcherObject_SERIALIZER.get(nmsObject));
         } else {
-            return new DataWatcherItem(new DataWatcherObject(nms.DataWatcherItem_TYPE.getInt(nmsItem), null), nms.DataWatcherItem_VALUE.get(nmsItem));
+            object = new DataWatcherObject(nms.DataWatcherItem_TYPE.getInt(nmsItem), null);
         }
+        return new DataWatcherItem(object, value);
     }
 
+    /**
+     * Returns {@link #type}
+     * @return  {@link #type}
+     */
     public DataWatcherObject getType() {
         return type;
     }
 
+    /**
+     * Returns {@link #value}
+     * @return  {@link #value}
+     */
     public Object getValue() {
         return value;
     }

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/nms/datawatcher/DataWatcherObject.java

@@ -5,27 +5,38 @@ package me.neznamy.tab.platforms.bukkit.nms.datawatcher;
  */
 public class DataWatcherObject {
 
-    //position in DataWatcher
+    /** Object's position in DataWatcher */
     private final int position;
     
-    //value class type used since 1.9
-    private final Object classType;
+    /** Value encoder for 1.9+ */
+    private final Object serializer;
 
     /**
      * Constructs a new instance of this class with given parameters
-     * @param position - position in DataWatcher
-     * @param classType - value class type
+     *
+     * @param   position
+     *          position in DataWatcher
+     * @param   serializer
+     *          Serializer for value in this slot
      */
-    public DataWatcherObject(int position, Object classType){
+    public DataWatcherObject(int position, Object serializer){
         this.position = position;
-        this.classType = classType;
+        this.serializer = serializer;
     }
 
+    /**
+     * Returns {@link #position}
+     * @return  {@link #position}
+     */
     public int getPosition() {
         return position;
     }
 
-    public Object getClassType() {
-        return classType;
+    /**
+     * Returns {@link #serializer}
+     * @return  {@link #serializer}
+     */
+    public Object getSerializer() {
+        return serializer;
     }
 }