3.1.5

Updates and Velocity Deprecation Fix

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,5 +1,9 @@
 package me.neznamy.tab.api;
 
+/**
+ * Interface representing an armor stand attached to player
+ * for displaying text in game.
+ */
 public interface ArmorStand {
 
     /**
@@ -92,6 +96,13 @@ public interface ArmorStand {
      *          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,5 +1,7 @@
 package me.neznamy.tab.api;
 
+import java.util.UUID;
+
 /**
  * Feature manager allows registration and work with features.
  */
@@ -41,4 +43,74 @@ public interface FeatureManager {
      * @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/ProtocolVersion.java

@@ -8,6 +8,9 @@ public enum ProtocolVersion {
     UNKNOWN_SERVER_VERSION ("Unknown"),
     UNKNOWN_CLIENT_VERSION ("Unknown"),
     PROXY   ("Proxy"),
+    V1_19_2 (760),
+    V1_19_1 (760),
+    V1_19   (759),
     V1_18_2 (758),
     V1_18_1 (757),
     V1_18   (757),

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

@@ -18,6 +18,13 @@ public abstract class TabAPI {
     /** Instance of the API */
     private static TabAPI instance;
 
+    /**
+     * Constructs new instance and sets it as new API instance
+     */
+    public TabAPI() {
+        instance = this;
+    }
+
     /**
      * Returns API instance. If instance was not set by the plugin, throws
      * {@code IllegalStateException}. This is usually caused by shading the API
@@ -34,16 +41,6 @@ public abstract class TabAPI {
         return instance;
     }
 
-    /**
-     * Instance setter for internal use by the plugin only.
-     *
-     * @param   instance
-     *          API instance
-     */
-    public static void setInstance(TabAPI instance) {
-        TabAPI.instance = instance;
-    }
-
     /**
      * Returns player object from given UUID
      *
@@ -204,4 +201,13 @@ public abstract class TabAPI {
      *          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
@@ -116,7 +116,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";

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

@@ -64,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)

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

@@ -310,4 +310,12 @@ public interface TabPlayer {
      * @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();
 }

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

@@ -199,4 +199,12 @@ public interface BossBar {
      * @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/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

@@ -53,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

@@ -249,17 +249,7 @@ public class ChatModifier {
     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) {
@@ -295,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/IChatBaseComponent.java

@@ -424,7 +424,7 @@ public class IChatBaseComponent {
         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/rgb/RGBUtils.java

@@ -1,16 +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.KyoriFormat;
-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;
@@ -41,13 +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(),
-                new KyoriFormat()
-        };
+        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(),

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

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

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/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

@@ -224,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;
     }

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

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

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

@@ -48,4 +48,6 @@ public interface PlaceholderManager {
     String findReplacement(String placeholder, String output);
 
     List<String> getUsedPlaceholders();
+
+    Placeholder getPlaceholder(String identifier);
 }

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

@@ -202,7 +202,7 @@ 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

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

@@ -97,6 +97,9 @@ public class PacketPlayOutPlayerInfo implements TabPacket {
         /** Player's skin, null for empty skin */
         private Skin skin;
 
+        /** Player's chat signing key */
+        private Object profilePublicKey;
+
         /**
          * Constructs new instance with given parameters. Suitable for 
          * {@link EnumPlayerInfoAction}.ADD_PLAYER action
@@ -113,8 +116,10 @@ public class PacketPlayOutPlayerInfo implements TabPacket {
          *          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, int latency, EnumGamemode gameMode, IChatBaseComponent displayName, Object profilePublicKey) {
             Preconditions.checkNotNull(uniqueId, "uuid");
             this.name = name;
             this.uniqueId = uniqueId;
@@ -122,6 +127,7 @@ public class PacketPlayOutPlayerInfo implements TabPacket {
             this.latency = latency;
             this.gameMode = gameMode;
             this.displayName = displayName;
+            this.profilePublicKey = profilePublicKey;
         }
 
         /**
@@ -182,8 +188,8 @@ 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);
         }
 
         /**
@@ -299,6 +305,25 @@ public class PacketPlayOutPlayerInfo implements TabPacket {
         public void setSkin(Skin skin) {
             this.skin = skin;
         }
+
+        /**
+         * 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;
+        }
     }
 
     /**

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();

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

@@ -74,7 +74,7 @@ public interface Scoreboard {
      * @param   index
      *          Index of line to remove, starting at 0
      * @throws  IndexOutOfBoundsException
-     *          if the index is out of range (index < 0 || index >= {@link #getLines()}.size())
+     *          if the index is out of range (index < 0 || index >= {@link #getLines()}.size())
      * @see     #getLines()
      * @see     #addLine(String)
      */

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,6 +4,10 @@ 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 {
 
     /**
@@ -49,10 +53,20 @@ public interface ThreadManager {
      *          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
@@ -65,7 +79,18 @@ public interface ThreadManager {
      *          usage type to add cpu usage to
      * @param   task
      *          the task
-     * @return  future allowing to cancel 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/util/BiFunctionWithException.java

@@ -2,7 +2,7 @@ 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>
@@ -14,5 +14,16 @@ package me.neznamy.tab.api.util;
  */
 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

@@ -2,24 +2,76 @@ 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,9 @@
-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-repo", "https://repo.kryptonmc.org/releases")
+    publishSnapshotsTo("krypton-repo", "https://repo.kryptonmc.org/snapshots")
 }

build.gradle.kts

@@ -12,7 +12,7 @@ val platforms = setOf(
     projects.bukkit,
     projects.bungeecord,
 //    projects.krypton,
-//    projects.velocity
+    projects.velocity
 ).map { it.dependencyProject }
 
 val special = setOf(

bukkit/build.gradle.kts

@@ -6,7 +6,6 @@ dependencies {
     compileOnly(libs.vault)
     compileOnly(libs.via)
     compileOnly(libs.authlib)
-    compileOnly(libs.libsDisguises)
     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,8 +9,6 @@ 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
  */
@@ -36,8 +35,8 @@ public class BukkitEventListener implements Listener {
      */
     @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())));
     }
     
     /**
@@ -48,8 +47,9 @@ public class BukkitEventListener implements Listener {
      */
     @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()))));
     }
 
     /**
@@ -60,8 +60,9 @@ public class BukkitEventListener implements Listener {
      */
     @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()));
     }
 
     /**
@@ -72,7 +73,8 @@ public class BukkitEventListener implements Listener {
      */
     @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,36 +1,24 @@
 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.Map;
-import java.util.UUID;
-
-import com.mojang.authlib.properties.Property;
-import me.neznamy.tab.api.chat.WrappedChatComponent;
-import me.neznamy.tab.api.protocol.*;
-import org.bukkit.Location;
-import org.bukkit.entity.EntityType;
-
 import com.mojang.authlib.GameProfile;
-
+import com.mojang.authlib.properties.Property;
 import me.neznamy.tab.api.ProtocolVersion;
-import me.neznamy.tab.api.chat.ChatComponentEntity;
+import me.neznamy.tab.api.TabAPI;
 import me.neznamy.tab.api.chat.EnumChatFormat;
 import me.neznamy.tab.api.chat.IChatBaseComponent;
+import me.neznamy.tab.api.chat.WrappedChatComponent;
+import me.neznamy.tab.api.protocol.*;
 import me.neznamy.tab.api.protocol.PacketPlayOutBoss.Action;
 import me.neznamy.tab.api.protocol.PacketPlayOutPlayerInfo.EnumGamemode;
 import me.neznamy.tab.api.protocol.PacketPlayOutPlayerInfo.EnumPlayerInfoAction;
 import me.neznamy.tab.api.protocol.PacketPlayOutPlayerInfo.PlayerInfoData;
-import me.neznamy.tab.platforms.bukkit.nms.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.Location;
+import org.bukkit.entity.EntityType;
+
+import java.lang.reflect.Array;
+import java.util.*;
 
 @SuppressWarnings({"unchecked", "rawtypes"})
 public class BukkitPacketBuilder extends PacketBuilder {
@@ -51,9 +39,10 @@ public class BukkitPacketBuilder extends PacketBuilder {
      * 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){
@@ -79,18 +68,21 @@ 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) {
+        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, nms.ChatMessageType_values[packet.getType().ordinal()], UUID.randomUUID());
-        }
-        if (nms.getMinorVersion() >= 12) {
+        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() >= 8)
             return nms.newPacketPlayOutChat.newInstance(component, (byte) packet.getType().ordinal());
-        }
-        if (nms.getMinorVersion() == 7) {
+        if (nms.getMinorVersion() == 7)
             return nms.newPacketPlayOutChat.newInstance(component);
-        }
         return packet;
     }
 
@@ -103,13 +95,14 @@ public class BukkitPacketBuilder extends PacketBuilder {
             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) {
+            if (nms.newPlayerInfoData.getParameterTypes()[0] == nms.PacketPlayOutPlayerInfo) {
                 parameters.add(nmsPacket);
             }
             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));
+            if (nms.getMinorVersion() >= 19) parameters.add(data.getProfilePublicKey());
             items.add(nms.newPlayerInfoData.newInstance(parameters.toArray()));
         }
         nms.setField(nmsPacket, nms.PacketPlayOutPlayerInfo_PLAYERS, items);
@@ -254,7 +247,6 @@ public class BukkitPacketBuilder extends PacketBuilder {
             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) {
@@ -270,6 +262,12 @@ 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.Registry_a.invoke(nms.IRegistry_X, id));
+        } else {
+            nms.setField(nmsPacket, nms.PacketPlayOutSpawnEntityLiving_ENTITYTYPE, id);
+        }
         return nmsPacket;
     }
 
@@ -363,11 +361,12 @@ public class BukkitPacketBuilder extends PacketBuilder {
             IChatBaseComponent listName = nmsComponent == null ? null : new WrappedChatComponent(nmsComponent);
             Skin skin = null;
             if (!profile.getProperties().get("textures").isEmpty()) {
-                Property pr = (Property) profile.getProperties().get("textures").iterator().next();
+                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,
-                    (int) nms.PlayerInfoData_getLatency.invoke(nmsData), gameMode, listName));
+                    (int) nms.PlayerInfoData_getLatency.invoke(nmsData), gameMode, listName, profilePublicKey));
         }
         return new PacketPlayOutPlayerInfo(action, listData);
     }
@@ -389,7 +388,7 @@ public class BukkitPacketBuilder extends PacketBuilder {
     }
 
     /**
-     * Builds entity BossBar packet
+     * Builds entity packet representing requested BossBar packet using Wither on 1.8- clients.
      *
      * @param   packet
      *          packet to build
@@ -417,6 +416,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));
@@ -436,13 +436,15 @@ public class BukkitPacketBuilder extends PacketBuilder {
     }
 
     /**
-     * Converts TAB's IChatBaseComponent into minecraft's component.
+     * 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
+     * @return  converted component or {@code null} if {@code component} is {@code null}
      * @throws  ReflectiveOperationException
      *          if thrown by reflective operation
      */
@@ -452,62 +454,7 @@ public class BukkitPacketBuilder extends PacketBuilder {
         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.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, toNMSComponent(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, toNMSComponent(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()), toNMSComponent(component.getModifier().getHoverEvent().getValue(), clientVersion)));
-            }
-        }
-        nms.setField(chat, nms.ChatBaseComponent_modifier, modifier);
-        for (IChatBaseComponent extra : component.getExtra()) {
-            nms.ChatComponentText_addSibling.invoke(chat, toNMSComponent(extra, clientVersion));
-        }
+        Object chat = nms.ChatSerializer_DESERIALIZE.invoke(null, component.toString(clientVersion));
         cache.put(component, chat);
         return chat;
     }
@@ -523,7 +470,7 @@ public class BukkitPacketBuilder extends PacketBuilder {
      */
     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

@@ -10,7 +10,7 @@ import io.netty.channel.ChannelPromise;
 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.api.TabConstants;
 import me.neznamy.tab.shared.TAB;
 import me.neznamy.tab.shared.features.PipelineInjector;
 import org.jetbrains.annotations.NotNull;

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

@@ -5,9 +5,16 @@ import java.lang.reflect.Method;
 import java.text.NumberFormat;
 import java.util.Locale;
 
-import me.neznamy.tab.shared.TabConstants;
+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;
 
@@ -16,6 +23,7 @@ import com.earth2me.essentials.Essentials;
 import me.neznamy.tab.api.placeholder.PlaceholderManager;
 import me.neznamy.tab.shared.placeholders.UniversalPlaceholderRegistry;
 import net.milkbowl.vault.chat.Chat;
+import org.bukkit.plugin.java.JavaPlugin;
 
 /**
  * Bukkit registry to register bukkit-only and universal placeholders
@@ -25,21 +33,38 @@ public class BukkitPlaceholderRegistry extends UniversalPlaceholderRegistry {
     /** Number formatter for 2 decimal places */
     private final NumberFormat numberFormat = NumberFormat.getNumberInstance(Locale.US);
 
-    private Object chat; // Object because Fabric
-    private final Plugin essentials = Bukkit.getPluginManager().getPlugin(TabConstants.Plugin.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;
+
+    /** 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);
         if (Bukkit.getPluginManager().isPluginEnabled(TabConstants.Plugin.VAULT)) {
-            RegisteredServiceProvider<?> rspChat = Bukkit.getServicesManager().getRegistration(Chat.class);
+            RegisteredServiceProvider<Chat> rspChat = Bukkit.getServicesManager().getRegistration(Chat.class);
             if (rspChat != null) chat = rspChat.getProvider();
         }
         try {
@@ -56,7 +81,6 @@ public class BukkitPlaceholderRegistry extends UniversalPlaceholderRegistry {
     @SuppressWarnings("deprecation")
     @Override
     public void registerPlaceholders(PlaceholderManager manager) {
-        super.registerPlaceholders(manager);
         manager.registerPlayerPlaceholder(TabConstants.Placeholder.DISPLAY_NAME, 500, p -> ((Player) p.getPlayer()).getDisplayName());
         if (paperTps != null) {
             manager.registerServerPlaceholder(TabConstants.Placeholder.TPS, 1000, () -> formatTPS(Bukkit.getTPS()[0]));
@@ -74,26 +98,49 @@ public class BukkitPlaceholderRegistry extends UniversalPlaceholderRegistry {
         if (paperMspt != null) {
             manager.registerServerPlaceholder(TabConstants.Placeholder.MSPT, 1000, () -> numberFormat.format(Bukkit.getAverageTickTime()));
         }
+        Plugin essentials = Bukkit.getPluginManager().getPlugin(TabConstants.Plugin.ESSENTIALS);
         manager.registerPlayerPlaceholder(TabConstants.Placeholder.AFK, 500, p -> {
             if (essentials != null && ((Essentials)essentials).getUser(p.getUniqueId()).isAfk()) return true;
             return purpurIsAfk != null && ((Player)p.getPlayer()).isAfk();
         });
-        manager.registerPlayerPlaceholder(TabConstants.Placeholder.ESSENTIALS_NICK, 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 (essentials != null) {
+            PlayerPlaceholder nick = manager.registerPlayerPlaceholder(TabConstants.Placeholder.ESSENTIALS_NICK, -1, p -> {
+                String nickname = ((Essentials)essentials).getUser(p.getUniqueId()).getNickname();
+                return nickname == null ? p.getName() : nickname;
+            });
+            Listener nickListener = new Listener() {
+                @EventHandler
+                public void onNickChange(NickChangeEvent e) {
+                    String name = e.getValue() == null ? e.getController().getName() : e.getValue();
+                    TabPlayer player = TAB.getInstance().getPlayer(e.getController().getUUID());
+                    if (player == null) return;
+                    nick.updateValue(player, name);
+                }
+            };
+            nick.enableTriggerMode(() -> Bukkit.getPluginManager().registerEvents(nickListener, plugin),
+                    () -> HandlerList.unregisterAll(nickListener));
+        } else {
+            manager.registerPlayerPlaceholder(TabConstants.Placeholder.ESSENTIALS_NICK, -1, TabPlayer::getName);
+        }
+
         if (chat != null) {
-            manager.registerPlayerPlaceholder(TabConstants.Placeholder.VAULT_PREFIX, 1000, p -> ((Chat) chat).getPlayerPrefix((Player) p.getPlayer()));
-            manager.registerPlayerPlaceholder(TabConstants.Placeholder.VAULT_SUFFIX, 1000, p -> ((Chat) chat).getPlayerSuffix((Player) p.getPlayer()));
+            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

@@ -15,7 +15,7 @@ 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.api.TabConstants;
 import me.neznamy.tab.shared.features.PlaceholderManagerImpl;
 import me.neznamy.tab.shared.features.bossbar.BossBarManagerImpl;
 import me.neznamy.tab.shared.features.nametags.NameTag;
@@ -86,7 +86,7 @@ public class BukkitPlatform extends Platform {
         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)) {
             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));

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

@@ -11,6 +11,7 @@ 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;
@@ -23,7 +24,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;
@@ -56,7 +56,7 @@ public class BukkitTabPlayer extends ITabPlayer {
      *          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(), "N/A", p.getWorld().getName(), protocolVersion, true);
         try {
             handle = NMSStorage.getInstance().getHandle.invoke(player);
             playerConnection = NMSStorage.getInstance().PLAYER_CONNECTION.get(handle);
@@ -243,8 +243,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);
@@ -252,7 +252,6 @@ public class BukkitTabPlayer extends ITabPlayer {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public Skin getSkin() {
         try {
@@ -290,6 +289,19 @@ public class BukkitTabPlayer extends ITabPlayer {
         return getPlayer().getGameMode().getValue();
     }
 
+    @Override
+    public Object getProfilePublicKey() {
+        if (NMSStorage.getInstance().getMinorVersion() < 19) return null;
+        try {
+            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 Channel getChannel() {
         try {

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;
 
 /**
@@ -54,7 +55,7 @@ public class Main extends JavaPlugin {
 
     @Override
     public void onDisable() {
-        //null check due to L34 return making L37 not run
+        //null check due to compatibility check making instance not get set on unsupported versions
         if (TAB.getInstance() != null) TAB.getInstance().unload();
     }
     
@@ -70,23 +71,33 @@ public class Main extends JavaPlugin {
                 "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");
         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) {
+                    NMSStorage.setInstance(new MojangModernNMSStorage());
+                }
+            } else {
+                NMSStorage.setInstance(new LegacyNMSStorage());
+            }
             if (supportedVersions.contains(serverPackage)) {
                 Bukkit.getConsoleSender().sendMessage(EnumChatFormat.color("[TAB] Loaded NMS hook in " + (System.currentTimeMillis()-time) + "ms"));
                 return true;
             } else {
-                Bukkit.getConsoleSender().sendMessage(EnumChatFormat.color("&c[TAB] No compatibility issue was found, but this plugin version does not claim to support your server package (" + serverPackage + "). This jar has only been tested on 1.5.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.x - 1.19.2. Disabling just to stay safe."));
             }
         } catch (Exception ex) {
             if (supportedVersions.contains(serverPackage)) {
                 Bukkit.getConsoleSender().sendMessage(EnumChatFormat.color("&c[TAB] Your server version is marked as compatible, but a compatibility issue was found. Please report the error below (include your server version & fork too)"));
                 getLogger().log(Level.SEVERE, "", ex);
             } else {
-                Bukkit.getConsoleSender().sendMessage(EnumChatFormat.color("&c[TAB] Your 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.x - 1.19.2. Disabling."));
             }
         }
         return false;
@@ -99,7 +110,7 @@ public class Main extends JavaPlugin {
 
         @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/features/BukkitTabExpansion.java

@@ -2,9 +2,10 @@ 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 +19,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
@@ -46,13 +47,13 @@ public class BukkitTabExpansion extends PlaceholderExpansion implements TabExpan
         if (identifier.startsWith("replace_")) {
             String placeholder = "%" + identifier.substring(8) + "%";
             String output = PlaceholderAPI.setPlaceholders(player, placeholder);
-            return TAB.getInstance().getPlaceholderManager().findReplacement(placeholder, output);
+            return TabAPI.getInstance().getPlaceholderManager().findReplacement(placeholder, output);
         }
         if (identifier.startsWith("placeholder_")) {
-            TAB.getInstance().getPlaceholderManager().addUsedPlaceholder("%" + identifier.substring(12) + "%", TAB.getInstance().getPlaceholderManager());
+            TabAPI.getInstance().getPlaceholderManager().addUsedPlaceholder("%" + identifier.substring(12) + "%", (TabFeature) TabAPI.getInstance().getPlaceholderManager());
         }
         if (player == null) return "<Player cannot be null>";
-        TabPlayer p = TAB.getInstance().getPlayer(player.getUniqueId());
+        TabPlayer p = TabAPI.getInstance().getPlayer(player.getUniqueId());
         if (p == null || !p.isLoaded()) return "<Player is not loaded>";
         return values.get(p).get(identifier);
     }

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,13 +25,13 @@ 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
@@ -41,8 +42,8 @@ public class PerWorldPlayerList extends TabFeature implements Listener {
     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
@@ -74,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;
@@ -84,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,7 +48,7 @@ public class PetFix extends TabFeature {
      */
     public PetFix() {
         super("Pet name fix", null);
-        TAB.getInstance().debug("Loaded PetFix feature");
+        TabAPI.getInstance().debug("Loaded PetFix feature");
     }
 
     /**
@@ -55,7 +58,7 @@ public class PetFix extends TabFeature {
      */
     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
@@ -91,6 +94,13 @@ public class PetFix extends TabFeature {
         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);

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

@@ -12,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;
 
@@ -21,11 +21,11 @@ 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
+     * Constructs a new instance of the class and registers events and task
      *
      * @param   plugin
      *          plugin instance
@@ -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
@@ -193,7 +204,7 @@ 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;
@@ -202,22 +213,32 @@ public class BukkitArmorStand implements ArmorStand {
     }
 
     /**
-     * Returns general location where armor stand should be at time of calling
+     * Returns location where armor stand should be at time of calling.
+     * This takes into account everything that affects height, including
+     * viewer's game version.
      *
-     * @return  Location where armor stand should be for everyone
+     * @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);
     }
@@ -245,15 +266,19 @@ 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();
     }
 
     /**
@@ -287,11 +312,12 @@ public class BukkitArmorStand implements ArmorStand {
     }
 
     /**
-     * Returns true if display name is in fact empty, for example only containing color codes
+     * 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  true if it's empty, false if not
+     * @return  {@code true} if it's empty, {@code false} if not
      */
     private boolean isNameVisiblyEmpty(String displayName) {
         if (displayName.length() == 0) return true;
@@ -311,7 +337,7 @@ public class BukkitArmorStand implements ArmorStand {
     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)
@@ -331,7 +357,7 @@ public class BukkitArmorStand implements ArmorStand {
      * @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

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));
@@ -63,7 +70,7 @@ public class BukkitArmorStandManager implements ArmorStandManager {
 
     /**
      * Returns array of nearby players
-     * @return array of nearby players
+     * @return  array of nearby players
      */
     public TabPlayer[] getNearbyPlayers(){
         return nearbyPlayerArray;
@@ -81,11 +88,11 @@ public class BukkitArmorStandManager implements ArmorStandManager {
     }
 
     /**
-     * Returns true if manager contains armor stand with specified entity id, false if not
+     * Returns {@code true} if manager contains armor stand with specified entity id, {@code false} if not
      *
      * @param   entityId
      *          entity id
-     * @return  true if armor stand with specified entity id exists, false if not
+     * @return  {@code true} if armor stand with specified entity id exists, {@code false} if not
      */
     public boolean hasArmorStandWithID(int entityId) {
         for (ArmorStand a : armorStandArray) {
@@ -134,11 +141,11 @@ public class BukkitArmorStandManager implements ArmorStandManager {
      * 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);
             }
         }

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,17 +11,19 @@ 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
+     * Constructs new instance with given parameter, loads config options, registers events
+     * and registers sub-features.
      *
      * @param   plugin
      *          plugin instance
@@ -29,26 +31,29 @@ public class BukkitNameTagX extends NameTagX {
     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);
             }
@@ -65,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);
         }
@@ -76,7 +81,18 @@ 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 && ((Player)viewer.getPlayer()).canSee((Player)target.getPlayer()) && !target.isVanished())
@@ -95,7 +111,7 @@ 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);
         }
     }
@@ -107,7 +123,7 @@ public class BukkitNameTagX extends NameTagX {
 
     @Override
     public void updateNameTagVisibilityView(TabPlayer player) {
-        for (TabPlayer all : TAB.getInstance().getOnlinePlayers()) {
+        for (TabPlayer all : TabAPI.getInstance().getOnlinePlayers()) {
             getArmorStandManager(all).updateVisibility(true);
         }
     }
@@ -115,7 +131,7 @@ 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);
         }
         armorStandManagerMap.get(disconnectedPlayer).destroy();
@@ -135,7 +151,7 @@ public class BukkitNameTagX extends NameTagX {
             getArmorStandManager(p).spawn(p);
         }
         //for some reason this is needed for some users
-        for (TabPlayer viewer : TAB.getInstance().getOnlinePlayers()) {
+        for (TabPlayer viewer : TabAPI.getInstance().getOnlinePlayers()) {
             if (viewer.getWorld().equals(from)) {
                 getArmorStandManager(p).destroy(viewer);
             }
@@ -162,6 +178,10 @@ 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,25 +1,25 @@
 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
+     * Constructs new instance with given parameter
      *
      * @param   feature
      *          NameTag feature handler
@@ -36,9 +36,9 @@ public class EventListener implements Listener {
      */
     @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()));
     }
 
     /**
@@ -49,8 +49,8 @@ public class EventListener implements Listener {
      */
     @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,35 +1,37 @@
 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
+     * Constructs new instance with given parameter
      *
      * @param   nameTagX
      *          main feature
@@ -41,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);
         }
     }
@@ -61,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;
@@ -101,7 +103,10 @@ public class PacketListener extends TabFeature {
     }
 
     /**
-     * Processes entity move packet
+     * Processes entity move packet. If entity ID belongs to a player,
+     * armor stands of that player are teleported to player who received the packet.
+     * If it belongs to a vehicle carrying a player, that player's armor stands are
+     * teleported as well.
      *
      * @param   receiver
      *          packet receiver
@@ -114,45 +119,81 @@ public class PacketListener extends TabFeature {
         if (pl != null) {
             //player moved
             if (nameTagX.isPlayerDisabled(pl) || !pl.isLoaded()) return;
-            TAB.getInstance().getCPUManager().runMeasuredTask(nameTagX, TabConstants.CpuUsageCategory.PACKET_ENTITY_MOVE,
+            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)) {
             BukkitArmorStandManager asm = nameTagX.getArmorStandManager(deSpawnedPlayer);
-            TAB.getInstance().getCPUManager().runMeasuredTask(nameTagX, TabConstants.CpuUsageCategory.PACKET_ENTITY_DESTROY,
+            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();
                     }
-                    for (TabPlayer p : TAB.getInstance().getOnlinePlayers()) {
+                    for (TabPlayer p : TabAPI.getInstance().getOnlinePlayers()) {
                         if (feature.isPreviewingNametag(p)) {
                             feature.getArmorStandManager(p).teleport(p);
                         }
                     }
         });
         addUsedPlaceholders(Collections.singletonList(TabConstants.Placeholder.VEHICLE));
-        TAB.getInstance().getPlaceholderManager().registerPlayerPlaceholder(TabConstants.Placeholder.VEHICLE, 100, p -> ((Player)p.getPlayer()).getVehicle() == null ? "" : ((Player)p.getPlayer()).getVehicle());
+        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);
                 }
             }
@@ -91,17 +105,29 @@ 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;
     }
@@ -115,13 +141,13 @@ public class VehicleRefresher extends TabFeature {
      */
     @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();
             }
         }
     }

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

@@ -0,0 +1,104 @@
+package me.neznamy.tab.platforms.bukkit.nms;
+
+/**
+ * NMS loader for minecraft 1.17+ using Mojang packaging and bukkit names.
+ */
+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) {
+            Registry_a = Registry.getMethod("a", int.class);
+            IRegistry_X = IRegistry.getDeclaredField("X").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.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.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");
+
+        // 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.forName("net.minecraft.network.protocol.game.PacketPlayInUseEntity$EnumEntityUseAction");
+        if (minorVersion >= 19) {
+            Registry = Class.forName("net.minecraft.core.Registry");
+            IRegistry = Class.forName("net.minecraft.core.IRegistry");
+            ProfilePublicKey = Class.forName("net.minecraft.world.entity.player.ProfilePublicKey");
+            ProfilePublicKey$a = Class.forName("net.minecraft.world.entity.player.ProfilePublicKey$a");
+        }
+
+        // Player Info
+        PacketPlayOutPlayerInfo = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutPlayerInfo");
+        EnumPlayerInfoAction = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutPlayerInfo$EnumPlayerInfoAction");
+        PlayerInfoData = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutPlayerInfo$PlayerInfoData");
+        EnumGamemode = 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.forName("net.minecraft.world.scores.criteria.IScoreboardCriteria$EnumScoreboardHealthDisplay");
+        EnumScoreboardAction = 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.forName("net.minecraft.world.scores.ScoreboardTeamBase$EnumNameTagVisibility");
+        EnumTeamPush = Class.forName("net.minecraft.world.scores.ScoreboardTeamBase$EnumTeamPush");
+        PacketPlayOutScoreboardTeam_PlayerAction = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutScoreboardTeam$a");
+    }
+}

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

@@ -0,0 +1,164 @@
+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.
+ */
+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, "setNameTagVisibility", EnumNameTagVisibility);
+        }
+        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 = 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 = 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 = getLegacyClass("PacketPlayInUseEntity$EnumEntityUseAction", "EnumEntityUseAction");
+        }
+
+        // Player Info
+        if (minorVersion >= 8) {
+            PacketPlayOutPlayerInfo = getLegacyClass("PacketPlayOutPlayerInfo");
+            EnumPlayerInfoAction = getLegacyClass("PacketPlayOutPlayerInfo$EnumPlayerInfoAction", "EnumPlayerInfoAction");
+            PlayerInfoData = getLegacyClass("PacketPlayOutPlayerInfo$PlayerInfoData", "PlayerInfoData");
+            EnumGamemode = 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 = getLegacyClass("IScoreboardCriteria$EnumScoreboardHealthDisplay", "EnumScoreboardHealthDisplay");
+            EnumScoreboardAction = getLegacyClass("ScoreboardServer$Action", "PacketPlayOutScoreboardScore$EnumScoreboardAction", "EnumScoreboardAction");
+            EnumNameTagVisibility = getLegacyClass("ScoreboardTeamBase$EnumNameTagVisibility", "EnumNameTagVisibility");
+        }
+        if (minorVersion >= 9) {
+            EnumTeamPush = getLegacyClass("ScoreboardTeamBase$EnumTeamPush");
+        }
+    }
+}

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

@@ -0,0 +1,42 @@
+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 {
+
+    /** Additional classes used in 1.19+ */
+    protected Class<?> IRegistry;
+    protected Class<?> Registry;
+
+    /**
+     * 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,104 @@
+package me.neznamy.tab.platforms.bukkit.nms;
+
+/**
+ * NMS loader for minecraft 1.17+ using Mojang packaging and names.
+ */
+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) {
+            Registry_a = Registry.getMethod("byId", int.class);
+            IRegistry_X = IRegistry.getDeclaredField("ENTITY_TYPE").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.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.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");
+
+        // 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.forName("net.minecraft.network.protocol.game.ServerboundInteractPacket$Action");
+        if (minorVersion >= 19) {
+            Registry = Class.forName("net.minecraft.core.IdMap");
+            IRegistry = Class.forName("net.minecraft.core.Registry");
+            ProfilePublicKey = Class.forName("net.minecraft.world.entity.player.ProfilePublicKey");
+            ProfilePublicKey$a = Class.forName("net.minecraft.world.entity.player.ProfilePublicKey$Data");
+        }
+
+        // Player Info
+        PacketPlayOutPlayerInfo = Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket");
+        EnumPlayerInfoAction = Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket$Action");
+        PlayerInfoData = Class.forName("net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket$PlayerUpdate");
+        EnumGamemode = 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.forName("net.minecraft.world.scores.criteria.ObjectiveCriteria$RenderType");
+        EnumScoreboardAction = 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.forName("net.minecraft.world.scores.Team$Visibility");
+        EnumTeamPush = Class.forName("net.minecraft.world.scores.Team$CollisionRule");
+        PacketPlayOutScoreboardTeam_PlayerAction = Class.forName("net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket$Action");
+    }
+}

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

@@ -1,152 +1,137 @@
 package me.neznamy.tab.platforms.bukkit.nms;
 
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Array;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.UUID;
-
-import org.bukkit.Bukkit;
-
-import com.google.gson.JsonElement;
 import com.mojang.authlib.GameProfile;
-
 import io.netty.channel.Channel;
 import me.neznamy.tab.api.ProtocolVersion;
-import me.neznamy.tab.platforms.bukkit.Main;
 import me.neznamy.tab.platforms.bukkit.nms.datawatcher.DataWatcherRegistry;
-import me.neznamy.tab.shared.TAB;
+import org.bukkit.Bukkit;
 
+import java.lang.reflect.*;
+import java.util.*;
+
+/**
+ * Class holding all NMS classes, methods, fields and constructors used by TAB.
+ */
 @SuppressWarnings("rawtypes")
-public final class NMSStorage {
+public abstract class NMSStorage {
 
-    //instance of this class
+    /** Instance of this class */
     private static NMSStorage instance;
 
-    //server package, such as "v1_16_R3"
-    private final String serverPackage = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
+    /** Server's NMS/CraftBukkit package */
+    protected final String serverPackage = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
 
-    //server minor version such as "16"
-    private final int minorVersion = Integer.parseInt(serverPackage.split("_")[1]);
+    /** Server's minor version */
+    protected final int minorVersion = Integer.parseInt(serverPackage.split("_")[1]);
 
-    //another field due to fabric which uses 1.16 package on 1.17 server
-    private final ProtocolVersion serverVersion = ProtocolVersion.fromFriendlyName(Bukkit.getBukkitVersion().split("-")[0]);
-
-    //base
-    private final Class<?> Packet = getNMSClass("net.minecraft.network.protocol.Packet", "Packet");
-    public final Class<?> EnumChatFormat = getNMSClass("net.minecraft.EnumChatFormat", "EnumChatFormat");
-    public final Class<?> EntityPlayer = getNMSClass("net.minecraft.server.level.EntityPlayer", "EntityPlayer");
-    private final Class<?> Entity = getNMSClass("net.minecraft.world.entity.Entity", "Entity");
-    private final Class<?> EntityLiving = getNMSClass("net.minecraft.world.entity.EntityLiving", "EntityLiving");
-    private final Class<?> PlayerConnection = getNMSClass("net.minecraft.server.network.PlayerConnection", "PlayerConnection");
-    public final Field PING = getField(EntityPlayer, "ping", "latency", "field_71138_i", "field_13967", "e");
-    public final Field PLAYER_CONNECTION = getFields(EntityPlayer, PlayerConnection).get(0);
+    /** Basic universal values */
+    protected Class<?> Packet;
+    protected Class<?> NetworkManager;
+    protected Class<?> EntityArmorStand;
+    protected Class<?> World;
+    public Class<?> EnumChatFormat;
+    public Class<?> EntityPlayer;
+    protected Class<?> EntityHuman;
+    protected Class<?> Entity;
+    protected Class<?> EntityLiving;
+    protected Class<?> PlayerConnection;
+    public Field PING;
+    public Field PLAYER_CONNECTION;
     public Field NETWORK_MANAGER;
     public Field CHANNEL;
-    public final Method getHandle = Class.forName("org.bukkit.craftbukkit." + serverPackage + ".entity.CraftPlayer").getMethod("getHandle");
-    public final Method sendPacket = getMethods(PlayerConnection, void.class, Packet).get(0);
+    public Field EntityHuman_ProfilePublicKey;
+    public Method getHandle;
+    public Method sendPacket;
     public Method getProfile;
-    public final Enum[] EnumChatFormat_values = getEnumValues(EnumChatFormat);
+    public Enum[] EnumChatFormat_values;
 
-    //chat
-    public Class<?> EnumClickAction;
-    private Class<?> IChatBaseComponent;
-    public Constructor<?> newChatComponentText;
-    public Constructor<?> newChatClickable;
-    public Constructor<?> newChatModifier;
-    public Constructor<?> newChatHoverable;
-    public Field ChatBaseComponent_modifier;
-    public Field ChatModifier_bold;
-    public Field ChatModifier_italic;
-    public Field ChatModifier_underlined;
-    public Field ChatModifier_strikethrough;
-    public Field ChatModifier_obfuscated;
-    public Field ChatModifier_clickEvent;
-    public Field ChatModifier_hoverEvent;
-    public Field ChatModifier_color;
-    public Method ChatComponentText_addSibling;
-    public Method EnumHoverAction_a;
-    public Method ChatHexColor_ofInt;
-    public Method ChatHexColor_ofString;
-    public Method EnumHoverAction_fromJson;
-    public Method EnumHoverAction_fromLegacyComponent;
+    /** Chat components */
+    protected Class<?> IChatBaseComponent;
+    protected Class<?> ChatSerializer;
+    public Method ChatSerializer_DESERIALIZE;
 
-    //PacketPlayOutChat
+    /** PacketPlayOutChat */
+    protected Class<?> PacketPlayOutChat;
     public Class<?> ChatMessageType;
     public Constructor<?> newPacketPlayOutChat;
     public Enum[] ChatMessageType_values;
 
-    //DataWatcher
-    private final Class<?> DataWatcher = getNMSClass("net.minecraft.network.syncher.DataWatcher", "DataWatcher");
-    private final Class<?> DataWatcherItem = getNMSClass("net.minecraft.network.syncher.DataWatcher$Item", "DataWatcher$Item", "DataWatcher$WatchableObject", "WatchableObject");
+    /** DataWatcher */
+    protected Class<?> DataWatcher;
+    protected Class<?> DataWatcherItem;
+    protected Class<?> DataWatcherObject;
+    protected Class<?> DataWatcherSerializer;
     public Class<?> DataWatcherRegistry;
-    public final Constructor<?> newDataWatcher = DataWatcher.getConstructors()[0];
+    public Constructor<?> newDataWatcher;
     public Constructor<?> newDataWatcherObject;
     public Field DataWatcherItem_TYPE;
-    public final Field DataWatcherItem_VALUE = getFields(DataWatcherItem, Object.class).get(0);
+    public Field DataWatcherItem_VALUE;
     public Field DataWatcherObject_SLOT;
     public Field DataWatcherObject_SERIALIZER;
     public Method DataWatcher_REGISTER;
-    private DataWatcherRegistry registry;
+    private final DataWatcherRegistry registry;
 
-    //PacketPlayOutSpawnEntityLiving
-    public final Class<?> PacketPlayOutSpawnEntityLiving = getNMSClass("net.minecraft.network.protocol.game.PacketPlayOutSpawnEntityLiving", "PacketPlayOutSpawnEntityLiving", "Packet24MobSpawn");
+    /** PacketPlayOutSpawnEntityLiving */
+    public Class<?> PacketPlayOutSpawnEntityLiving;
     public Constructor<?> newPacketPlayOutSpawnEntityLiving;
-    public final Field PacketPlayOutSpawnEntityLiving_ENTITYID = getFields(PacketPlayOutSpawnEntityLiving, int.class).get(0);
-    public final Field PacketPlayOutSpawnEntityLiving_ENTITYTYPE = getFields(PacketPlayOutSpawnEntityLiving, int.class).get(1);
-    public final Field PacketPlayOutSpawnEntityLiving_YAW = getFields(PacketPlayOutSpawnEntityLiving, byte.class).get(0);
-    public final Field PacketPlayOutSpawnEntityLiving_PITCH = getFields(PacketPlayOutSpawnEntityLiving, byte.class).get(0);
+    public Field PacketPlayOutSpawnEntityLiving_ENTITYID;
+    public Field PacketPlayOutSpawnEntityLiving_ENTITYTYPE;
+    public Field PacketPlayOutSpawnEntityLiving_YAW;
+    public Field PacketPlayOutSpawnEntityLiving_PITCH;
     public Field PacketPlayOutSpawnEntityLiving_UUID;
     public Field PacketPlayOutSpawnEntityLiving_X;
     public Field PacketPlayOutSpawnEntityLiving_Y;
     public Field PacketPlayOutSpawnEntityLiving_Z;
     public Field PacketPlayOutSpawnEntityLiving_DATAWATCHER;
+    public Method Registry_a;
+    public Object IRegistry_X;
 
-    //PacketPlayOutEntityTeleport
-    public final Class<?> PacketPlayOutEntityTeleport = getNMSClass("net.minecraft.network.protocol.game.PacketPlayOutEntityTeleport", "PacketPlayOutEntityTeleport", "Packet34EntityTeleport");
+    /** PacketPlayOutEntityTeleport */
+    public Class<?> PacketPlayOutEntityTeleport;
     public Constructor<?> newPacketPlayOutEntityTeleport;
-    public final Field PacketPlayOutEntityTeleport_ENTITYID = getFields(PacketPlayOutEntityTeleport, int.class).get(0);
+    public Field PacketPlayOutEntityTeleport_ENTITYID;
     public Field PacketPlayOutEntityTeleport_X;
     public Field PacketPlayOutEntityTeleport_Y;
     public Field PacketPlayOutEntityTeleport_Z;
-    public final Field PacketPlayOutEntityTeleport_YAW = getFields(PacketPlayOutEntityTeleport, byte.class).get(0);
-    public final Field PacketPlayOutEntityTeleport_PITCH = getFields(PacketPlayOutEntityTeleport, byte.class).get(1);
+    public Field PacketPlayOutEntityTeleport_YAW;
+    public Field PacketPlayOutEntityTeleport_PITCH;
 
-    //PacketPlayOutPlayerListHeaderFooter
+    /** PacketPlayOutPlayerListHeaderFooter */
+    protected Class<?> PacketPlayOutPlayerListHeaderFooter;
     public Constructor<?> newPacketPlayOutPlayerListHeaderFooter;
     public Field PacketPlayOutPlayerListHeaderFooter_HEADER;
     public Field PacketPlayOutPlayerListHeaderFooter_FOOTER;
 
-    //other entity packets
-    public final Class<?> PacketPlayInUseEntity = getNMSClass("net.minecraft.network.protocol.game.PacketPlayInUseEntity", "PacketPlayInUseEntity", "Packet7UseEntity");
+    /** Other entity packets */
+    public Class<?> PacketPlayInUseEntity;
     public Class<?> PacketPlayInUseEntity$d;
+    protected Class<?> EnumEntityUseAction;
     public Field PacketPlayInUseEntity_ENTITY;
     public Field PacketPlayInUseEntity_ACTION;
 
-    public final Class<?> PacketPlayOutEntity = getNMSClass("net.minecraft.network.protocol.game.PacketPlayOutEntity", "PacketPlayOutEntity", "Packet30Entity");
-    public final Field PacketPlayOutEntity_ENTITYID = getFields(PacketPlayOutEntity, int.class).get(0);
+    public Class<?> PacketPlayOutEntity;
+    public Field PacketPlayOutEntity_ENTITYID;
 
-    public final Class<?> PacketPlayOutEntityDestroy = getNMSClass("net.minecraft.network.protocol.game.PacketPlayOutEntityDestroy", "PacketPlayOutEntityDestroy", "Packet29DestroyEntity");
+    public Class<?> PacketPlayOutEntityDestroy;
     public Constructor<?> newPacketPlayOutEntityDestroy;
-    public final Field PacketPlayOutEntityDestroy_ENTITIES = setAccessible(PacketPlayOutEntityDestroy.getDeclaredFields()[0]);
+    public Field PacketPlayOutEntityDestroy_ENTITIES;
 
-    public final Class<?> PacketPlayOutEntityLook = getNMSClass("net.minecraft.network.protocol.game.PacketPlayOutEntity$PacketPlayOutEntityLook", "PacketPlayOutEntity$PacketPlayOutEntityLook", "PacketPlayOutEntityLook", "Packet32EntityLook");
+    public Class<?> PacketPlayOutEntityLook;
 
-    public final Class<?> PacketPlayOutEntityMetadata = getNMSClass("net.minecraft.network.protocol.game.PacketPlayOutEntityMetadata", "PacketPlayOutEntityMetadata", "Packet40EntityMetadata");
-    public final Constructor<?> newPacketPlayOutEntityMetadata = PacketPlayOutEntityMetadata.getConstructor(int.class, DataWatcher, boolean.class);
-    public final Field PacketPlayOutEntityMetadata_LIST = getFields(PacketPlayOutEntityMetadata, List.class).get(0);
+    public Class<?> PacketPlayOutEntityMetadata;
+    public Constructor<?> newPacketPlayOutEntityMetadata;
+    public Field PacketPlayOutEntityMetadata_LIST;
 
-    public final Class<?> PacketPlayOutNamedEntitySpawn = getNMSClass("net.minecraft.network.protocol.game.PacketPlayOutNamedEntitySpawn", "PacketPlayOutNamedEntitySpawn", "Packet20NamedEntitySpawn");
-    public final Field PacketPlayOutNamedEntitySpawn_ENTITYID = getFields(PacketPlayOutNamedEntitySpawn, int.class).get(0);
+    public Class<?> PacketPlayOutNamedEntitySpawn;
+    public Field PacketPlayOutNamedEntitySpawn_ENTITYID;
 
-    //PacketPlayOutPlayerInfo
+    /** PacketPlayOutPlayerInfo */
     public Class<?> PacketPlayOutPlayerInfo;
+    protected Class<?> EnumPlayerInfoAction;
+    protected Class<?> PlayerInfoData;
+    protected Class<?> EnumGamemode;
+    protected Class<?> ProfilePublicKey;
+    protected Class<?> ProfilePublicKey$a;
     public Constructor<?> newPacketPlayOutPlayerInfo;
     public Constructor<?> newPlayerInfoData;
     public Field PacketPlayOutPlayerInfo_ACTION;
@@ -155,39 +140,46 @@ public final class NMSStorage {
     public Method PlayerInfoData_getLatency;
     public Method PlayerInfoData_getGamemode;
     public Method PlayerInfoData_getDisplayName;
+    public Method PlayerInfoData_getProfilePublicKeyRecord;
+    public Method ProfilePublicKey_getRecord;
     public Enum[] EnumPlayerInfoAction_values;
     public Enum[] EnumGamemode_values;
 
-    //scoreboard objectives
-    public final Class<?> PacketPlayOutScoreboardDisplayObjective = getNMSClass("net.minecraft.network.protocol.game.PacketPlayOutScoreboardDisplayObjective", "PacketPlayOutScoreboardDisplayObjective", "Packet208SetScoreboardDisplayObjective");
-    public final Class<?> PacketPlayOutScoreboardObjective = getNMSClass("net.minecraft.network.protocol.game.PacketPlayOutScoreboardObjective", "PacketPlayOutScoreboardObjective", "Packet206SetScoreboardObjective");
-    private final Class<?> Scoreboard = getNMSClass("net.minecraft.world.scores.Scoreboard", "Scoreboard");
-    private final Class<?> PacketPlayOutScoreboardScore = getNMSClass("net.minecraft.network.protocol.game.PacketPlayOutScoreboardScore", "PacketPlayOutScoreboardScore", "Packet207SetScoreboardScore");
-    private final Class<?> ScoreboardObjective = getNMSClass("net.minecraft.world.scores.ScoreboardObjective", "ScoreboardObjective");
-    private final Class<?> ScoreboardScore = getNMSClass("net.minecraft.world.scores.ScoreboardScore", "ScoreboardScore");
-    private final Class<?> IScoreboardCriteria = getNMSClass("net.minecraft.world.scores.criteria.IScoreboardCriteria", "IScoreboardCriteria");
+    /** Scoreboard objectives */
+    public Class<?> PacketPlayOutScoreboardDisplayObjective;
+    public Class<?> PacketPlayOutScoreboardObjective;
+    protected Class<?> Scoreboard;
+    protected Class<?> PacketPlayOutScoreboardScore;
+    protected Class<?> ScoreboardObjective;
+    protected Class<?> ScoreboardScore;
+    protected Class<?> IScoreboardCriteria;
     public Class<?> EnumScoreboardHealthDisplay;
-    public final Constructor<?> newScoreboardObjective = ScoreboardObjective.getConstructors()[0];
-    private final Constructor<?> newScoreboard = Scoreboard.getConstructor();
-    public final Constructor<?> newScoreboardScore = ScoreboardScore.getConstructor(Scoreboard, ScoreboardObjective, String.class);
-    public final Constructor<?> newPacketPlayOutScoreboardDisplayObjective = PacketPlayOutScoreboardDisplayObjective.getConstructor(int.class, ScoreboardObjective);
+    protected Class<?> EnumScoreboardAction;
+    public Constructor<?> newScoreboardObjective;
+    protected Constructor<?> newScoreboard;
+    public Constructor<?> newScoreboardScore;
+    public Constructor<?> newPacketPlayOutScoreboardDisplayObjective;
     public Constructor<?> newPacketPlayOutScoreboardObjective;
     public Constructor<?> newPacketPlayOutScoreboardScore_1_13;
     public Constructor<?> newPacketPlayOutScoreboardScore_String;
     public Constructor<?> newPacketPlayOutScoreboardScore;
-    public final Field PacketPlayOutScoreboardDisplayObjective_POSITION = getFields(PacketPlayOutScoreboardDisplayObjective, int.class).get(0);
-    public final Field PacketPlayOutScoreboardDisplayObjective_OBJECTIVENAME = getFields(PacketPlayOutScoreboardDisplayObjective, String.class).get(0);
-    public final Field PacketPlayOutScoreboardObjective_OBJECTIVENAME = getFields(PacketPlayOutScoreboardObjective, String.class).get(0);
+    public Field PacketPlayOutScoreboardDisplayObjective_POSITION;
+    public Field PacketPlayOutScoreboardDisplayObjective_OBJECTIVENAME;
+    public Field PacketPlayOutScoreboardObjective_OBJECTIVENAME;
     public Field PacketPlayOutScoreboardObjective_METHOD;
-    public final Field IScoreboardCriteria_self = getFields(IScoreboardCriteria, IScoreboardCriteria).get(0);
+    public Field IScoreboardCriteria_self;
     public Field PacketPlayOutScoreboardObjective_RENDERTYPE;
     public Field PacketPlayOutScoreboardObjective_DISPLAYNAME;
-    public final Method ScoreboardScore_setScore = getMethod(ScoreboardScore, new String[]{"setScore", "func_96647_c", "method_1128", "b"}, int.class);
+    public Method ScoreboardScore_setScore;
     public Enum[] EnumScoreboardHealthDisplay_values;
     public Enum[] EnumScoreboardAction_values;
 
-    //PacketPlayOutScoreboardTeam
+    /** PacketPlayOutScoreboardTeam */
     public Class<?> PacketPlayOutScoreboardTeam;
+    protected Class<?> ScoreboardTeam;
+    protected Class<?> EnumNameTagVisibility;
+    protected Class<?> EnumTeamPush;
+    protected Class<?> PacketPlayOutScoreboardTeam_PlayerAction;
     public Constructor<?> newScoreboardTeam;
     public Constructor<?> newPacketPlayOutScoreboardTeam;
     public Field PacketPlayOutScoreboardTeam_NAME;
@@ -208,43 +200,44 @@ public final class NMSStorage {
     public Enum[] EnumTeamPush_values;
     public Enum[] PacketPlayOutScoreboardTeam_PlayerAction_values;
 
-    //other
-    public final Object emptyScoreboard = newScoreboard.newInstance();
+    /** Other */
+    public Object emptyScoreboard;
     public Object dummyEntity;
 
     /**
-     * Creates new instance, initializes required NMS classes and fields
+     * Constructs new instance and attempts to load all fields, methods and constructors.
      *
      * @throws  ReflectiveOperationException
-     *          If any class, field or method fails to load
+     *          If some field, constructor or method was not found
      */
     public NMSStorage() throws ReflectiveOperationException {
         ProtocolVersion.UNKNOWN_SERVER_VERSION.setMinorVersion(minorVersion); //fixing compatibility with forks that set version field value to "Unknown"
-        Class<?> NetworkManager = getNMSClass("net.minecraft.network.NetworkManager", "NetworkManager");
+        loadClasses();
         if (minorVersion >= 7) {
             NETWORK_MANAGER = getFields(PlayerConnection, NetworkManager).get(0);
         }
         if (minorVersion >= 8) {
             CHANNEL = getFields(NetworkManager, Channel.class).get(0);
-            getProfile = getMethods(getNMSClass("net.minecraft.world.entity.player.EntityHuman", "EntityHuman"), GameProfile.class).get(0);
-            Constructor<?> newEntityArmorStand = getNMSClass("net.minecraft.world.entity.decoration.EntityArmorStand", "EntityArmorStand")
-                    .getConstructor(getNMSClass("net.minecraft.world.level.World", "World"), double.class, double.class, double.class);
+            getProfile = getMethods(EntityHuman, GameProfile.class).get(0);
+            Constructor<?> newEntityArmorStand = EntityArmorStand.getConstructor(World, double.class, double.class, double.class);
             Method World_getHandle = Class.forName("org.bukkit.craftbukkit." + serverPackage + ".CraftWorld").getMethod("getHandle");
             dummyEntity = newEntityArmorStand.newInstance(World_getHandle.invoke(Bukkit.getWorlds().get(0)), 0, 0, 0);
         }
-        initializeChatComponents();
-        initializeChatPacket();
-        initializeDataWatcher();
-        initializeEntityPackets();
-        initializeHeaderFooterPacket();
-        initializePlayerInfoPacket();
-        initializeScoreboardPackets();
-        try {
-            initializeTeamPackets();
-        } catch (ClassNotFoundException e) {
-            Bukkit.getConsoleSender().sendMessage(me.neznamy.tab.api.chat.EnumChatFormat.color("&c[TAB] Failed to load PacketPlayOutScoreboardTeam"));
-            //fabric with missing team packet
-        }
+        PLAYER_CONNECTION = getFields(EntityPlayer, PlayerConnection).get(0);
+        getHandle = Class.forName("org.bukkit.craftbukkit." + serverPackage + ".entity.CraftPlayer").getMethod("getHandle");
+        sendPacket = getMethods(PlayerConnection, void.class, Packet).get(0);
+        EnumChatFormat_values = getEnumValues(EnumChatFormat);
+        registry = new DataWatcherRegistry(this);
+        dataWatcher();
+        entityTeleport();
+        spawnEntityLiving();
+        chat();
+        playerListHeaderFooter();
+        playerInfo();
+        otherEntity();
+        scoreboard();
+        scoreboardTeam();
+        loadNamedFieldsAndMethods();
     }
 
     /**
@@ -266,53 +259,24 @@ public final class NMSStorage {
         return instance;
     }
 
-    private void initializeChatComponents() throws ReflectiveOperationException {
-        if (minorVersion < 7) return;
-        Class<?> ChatBaseComponent = getNMSClass("net.minecraft.network.chat.ChatBaseComponent", "ChatBaseComponent");
-        Class<?> ChatClickable = getNMSClass("net.minecraft.network.chat.ChatClickable", "ChatClickable");
-        Class<?> ChatComponentText = getNMSClass("net.minecraft.network.chat.ChatComponentText", "ChatComponentText");
-        Class<?> ChatHoverable = getNMSClass("net.minecraft.network.chat.ChatHoverable", "ChatHoverable");
-        Class<?> ChatModifier = getNMSClass("net.minecraft.network.chat.ChatModifier", "ChatModifier");
-        EnumClickAction = getNMSClass("net.minecraft.network.chat.ChatClickable$EnumClickAction", "ChatClickable$EnumClickAction", "EnumClickAction");
-        Class<?> EnumHoverAction = getNMSClass("net.minecraft.network.chat.ChatHoverable$EnumHoverAction", "ChatHoverable$EnumHoverAction", "EnumHoverAction");
-        IChatBaseComponent = getNMSClass("net.minecraft.network.chat.IChatBaseComponent", "IChatBaseComponent");
-        newChatComponentText = ChatComponentText.getConstructor(String.class);
-        newChatClickable = ChatClickable.getConstructor(EnumClickAction, String.class);
-        ChatBaseComponent_modifier = getFields(ChatBaseComponent, ChatModifier).get(0);
-        List<Field> booleans = getFields(ChatModifier, Boolean.class);
-        ChatModifier_bold = booleans.get(0);
-        ChatModifier_italic = booleans.get(1);
-        ChatModifier_underlined = booleans.get(2);
-        ChatModifier_strikethrough = booleans.get(3);
-        ChatModifier_obfuscated = booleans.get(4);
-        ChatModifier_clickEvent = getFields(ChatModifier, ChatClickable).get(0);
-        ChatModifier_hoverEvent = getFields(ChatModifier, ChatHoverable).get(0);
-        ChatComponentText_addSibling = getMethod(ChatComponentText, new String[]{"addSibling", "a", "func_150257_a", "method_10852"}, IChatBaseComponent);
-        EnumHoverAction_a = getMethod(EnumHoverAction, new String[]{"a", "func_150684_a", "method_27670"}, String.class);
-        if (minorVersion >= 16) {
-            Class<?> ChatHexColor = getNMSClass("net.minecraft.network.chat.ChatHexColor", "ChatHexColor");
-            Class<?> MinecraftKey = getNMSClass("net.minecraft.resources.MinecraftKey", "MinecraftKey");
-            newChatModifier = setAccessible(ChatModifier.getDeclaredConstructor(ChatHexColor, Boolean.class, Boolean.class, Boolean.class, Boolean.class, Boolean.class, ChatClickable, ChatHoverable, String.class, MinecraftKey));
-            newChatHoverable = ChatHoverable.getConstructor(EnumHoverAction, Object.class);
-            ChatModifier_color = getFields(ChatModifier, ChatHexColor).get(0);
-            ChatHexColor_ofInt = getMethods(ChatHexColor, ChatHexColor, int.class).get(0);
-            ChatHexColor_ofString = getMethods(ChatHexColor, ChatHexColor, String.class).get(0);
-            EnumHoverAction_fromJson = getMethods(EnumHoverAction, ChatHoverable, JsonElement.class).get(0);
-            EnumHoverAction_fromLegacyComponent = getMethods(EnumHoverAction, ChatHoverable, IChatBaseComponent).get(0);
-        } else {
-            newChatModifier = ChatModifier.getConstructor();
-            newChatHoverable = ChatHoverable.getConstructor(EnumHoverAction, IChatBaseComponent);
-            ChatModifier_color = getFields(ChatModifier, EnumChatFormat).get(0);
-        }
-    }
-
-    private void initializeChatPacket() throws ReflectiveOperationException {
-        Class<?> PacketPlayOutChat = getNMSClass("net.minecraft.network.protocol.game.PacketPlayOutChat", "PacketPlayOutChat", "Packet3Chat");
-        if (minorVersion >= 12) {
-            ChatMessageType = getNMSClass("net.minecraft.network.chat.ChatMessageType", "ChatMessageType");
+    /**
+     * Loads PacketPlayOutChat's methods, fields and constructors
+     *
+     * @throws  ReflectiveOperationException
+     *          If some method, field or constructor was not found
+     */
+    protected void chat() throws ReflectiveOperationException {
+        if (minorVersion >= 12 && minorVersion <= 18) {
             ChatMessageType_values = getEnumValues(ChatMessageType);
         }
-        if (minorVersion >= 16) {
+        if (minorVersion >= 19) {
+            try {
+                newPacketPlayOutChat = PacketPlayOutChat.getConstructor(IChatBaseComponent, boolean.class);
+            } catch (NoSuchMethodException e) {
+                //1.19.0
+                newPacketPlayOutChat = PacketPlayOutChat.getConstructor(IChatBaseComponent, int.class);
+            }
+        } else if (minorVersion >= 16) {
             newPacketPlayOutChat = PacketPlayOutChat.getConstructor(IChatBaseComponent, ChatMessageType, UUID.class);
         } else if (minorVersion >= 12) {
             newPacketPlayOutChat = PacketPlayOutChat.getConstructor(IChatBaseComponent, ChatMessageType);
@@ -323,84 +287,14 @@ public final class NMSStorage {
         }
     }
 
-    private void initializeDataWatcher() throws ReflectiveOperationException {
-        if (minorVersion >= 9) {
-            Class<?> DataWatcherObject = getNMSClass("net.minecraft.network.syncher.DataWatcherObject", "DataWatcherObject");
-            DataWatcherRegistry = getNMSClass("net.minecraft.network.syncher.DataWatcherRegistry", "DataWatcherRegistry");
-            Class<?> DataWatcherSerializer = getNMSClass("net.minecraft.network.syncher.DataWatcherSerializer", "DataWatcherSerializer");
-            newDataWatcherObject = DataWatcherObject.getConstructor(int.class, DataWatcherSerializer);
-            DataWatcherItem_TYPE = getFields(DataWatcherItem, DataWatcherObject).get(0);
-            DataWatcherObject_SLOT = getFields(DataWatcherObject, int.class).get(0);
-            DataWatcherObject_SERIALIZER = getFields(DataWatcherObject, DataWatcherSerializer).get(0);
-            DataWatcher_REGISTER = getMethod(DataWatcher, new String[]{"register", "method_12784", "a"}, DataWatcherObject, Object.class);
-        } else {
-            DataWatcherItem_TYPE = getFields(DataWatcherItem, int.class).get(1);
-            DataWatcher_REGISTER = getMethod(DataWatcher, new String[]{"a", "func_75682_a"}, int.class, Object.class);
-        }
-        registry = new DataWatcherRegistry(this);
-    }
-
-    private void initializeEntityPackets() throws ReflectiveOperationException {
-        if (minorVersion >= 17 || serverVersion.getMinorVersion() >= 17) {
-            newPacketPlayOutSpawnEntityLiving = PacketPlayOutSpawnEntityLiving.getConstructor(EntityLiving);
-            newPacketPlayOutEntityTeleport = PacketPlayOutEntityTeleport.getConstructor(Entity);
-        } else {
-            newPacketPlayOutSpawnEntityLiving = PacketPlayOutSpawnEntityLiving.getConstructor();
-            newPacketPlayOutEntityTeleport = PacketPlayOutEntityTeleport.getConstructor();
-        }
-        if (minorVersion >= 17) {
-            PacketPlayInUseEntity$d = Class.forName("net.minecraft.network.protocol.game.PacketPlayInUseEntity$d");
-        }
-        try {
-            newPacketPlayOutEntityDestroy = PacketPlayOutEntityDestroy.getConstructor(int[].class);
-        } catch (NoSuchMethodException e) {
-            //1.17.0
-            newPacketPlayOutEntityDestroy = PacketPlayOutEntityDestroy.getConstructor(int.class);
-        }
-        if (minorVersion >= 7) {
-            Class<?> EnumEntityUseAction = getNMSClass("net.minecraft.network.protocol.game.PacketPlayInUseEntity$EnumEntityUseAction", "PacketPlayInUseEntity$EnumEntityUseAction", "EnumEntityUseAction", "net.minecraft.class_2824$class_5906");
-            PacketPlayInUseEntity_ENTITY = getFields(PacketPlayInUseEntity, int.class).get(0);
-            PacketPlayInUseEntity_ACTION = getFields(PacketPlayInUseEntity, EnumEntityUseAction).get(0);
-        }
-        if (minorVersion >= 9) {
-            PacketPlayOutSpawnEntityLiving_UUID = getFields(PacketPlayOutSpawnEntityLiving, UUID.class).get(0);
-            PacketPlayOutSpawnEntityLiving_X = getFields(PacketPlayOutSpawnEntityLiving, double.class).get(0);
-            PacketPlayOutSpawnEntityLiving_Y = getFields(PacketPlayOutSpawnEntityLiving, double.class).get(1);
-            PacketPlayOutSpawnEntityLiving_Z = getFields(PacketPlayOutSpawnEntityLiving, double.class).get(2);
-            PacketPlayOutEntityTeleport_X = getFields(PacketPlayOutEntityTeleport, double.class).get(0);
-            PacketPlayOutEntityTeleport_Y = getFields(PacketPlayOutEntityTeleport, double.class).get(1);
-            PacketPlayOutEntityTeleport_Z = getFields(PacketPlayOutEntityTeleport, double.class).get(2);
-        } else {
-            PacketPlayOutSpawnEntityLiving_X = getFields(PacketPlayOutSpawnEntityLiving, int.class).get(2);
-            PacketPlayOutSpawnEntityLiving_Y = getFields(PacketPlayOutSpawnEntityLiving, int.class).get(3);
-            PacketPlayOutSpawnEntityLiving_Z = getFields(PacketPlayOutSpawnEntityLiving, int.class).get(4);
-            PacketPlayOutEntityTeleport_X = getFields(PacketPlayOutEntityTeleport, int.class).get(1);
-            PacketPlayOutEntityTeleport_Y = getFields(PacketPlayOutEntityTeleport, int.class).get(2);
-            PacketPlayOutEntityTeleport_Z = getFields(PacketPlayOutEntityTeleport, int.class).get(3);
-        }
-        if (minorVersion <= 14) {
-            PacketPlayOutSpawnEntityLiving_DATAWATCHER = getFields(PacketPlayOutSpawnEntityLiving, DataWatcher).get(0);
-        }
-    }
-
-    private void initializeHeaderFooterPacket() throws ReflectiveOperationException {
+    /**
+     * Loads PacketPlayOutPlayerInfo's methods, fields and constructors
+     *
+     * @throws  ReflectiveOperationException
+     *          If some method, field or constructor was not found
+     */
+    protected void playerInfo() throws ReflectiveOperationException {
         if (minorVersion < 8) return;
-        Class<?> PacketPlayOutPlayerListHeaderFooter = getNMSClass("net.minecraft.network.protocol.game.PacketPlayOutPlayerListHeaderFooter", "PacketPlayOutPlayerListHeaderFooter");
-        PacketPlayOutPlayerListHeaderFooter_HEADER = getFields(PacketPlayOutPlayerListHeaderFooter, IChatBaseComponent).get(0);
-        PacketPlayOutPlayerListHeaderFooter_FOOTER = getFields(PacketPlayOutPlayerListHeaderFooter, IChatBaseComponent).get(1);
-        if (minorVersion >= 17 || serverVersion.getMinorVersion() >= 17) {
-            newPacketPlayOutPlayerListHeaderFooter = PacketPlayOutPlayerListHeaderFooter.getConstructor(IChatBaseComponent, IChatBaseComponent);
-        } else {
-            newPacketPlayOutPlayerListHeaderFooter = PacketPlayOutPlayerListHeaderFooter.getConstructor();
-        }
-    }
-
-    private void initializePlayerInfoPacket() throws ReflectiveOperationException {
-        if (minorVersion < 8) return;
-        PacketPlayOutPlayerInfo = getNMSClass("net.minecraft.network.protocol.game.PacketPlayOutPlayerInfo", "PacketPlayOutPlayerInfo");
-        Class<?> EnumPlayerInfoAction = getNMSClass("net.minecraft.network.protocol.game.PacketPlayOutPlayerInfo$EnumPlayerInfoAction", "PacketPlayOutPlayerInfo$EnumPlayerInfoAction", "EnumPlayerInfoAction", "net.minecraft.class_2703$class_5893");
-        Class<?> PlayerInfoData = getNMSClass("net.minecraft.network.protocol.game.PacketPlayOutPlayerInfo$PlayerInfoData", "PacketPlayOutPlayerInfo$PlayerInfoData", "PlayerInfoData");
-        Class<?> EnumGamemode = getNMSClass("net.minecraft.world.level.EnumGamemode", "EnumGamemode", "WorldSettings$EnumGamemode");
         newPacketPlayOutPlayerInfo = PacketPlayOutPlayerInfo.getConstructor(EnumPlayerInfoAction, Array.newInstance(EntityPlayer, 0).getClass());
         newPlayerInfoData = PlayerInfoData.getConstructors()[0];
         PacketPlayOutPlayerInfo_ACTION = getFields(PacketPlayOutPlayerInfo, EnumPlayerInfoAction).get(0);
@@ -411,16 +305,158 @@ public final class NMSStorage {
         PlayerInfoData_getDisplayName = getMethods(PlayerInfoData, IChatBaseComponent).get(0);
         EnumPlayerInfoAction_values = getEnumValues(EnumPlayerInfoAction);
         EnumGamemode_values = getEnumValues(EnumGamemode);
+        if (minorVersion >= 19) {
+            EntityHuman_ProfilePublicKey = getFields(EntityHuman, ProfilePublicKey).get(0);
+            ProfilePublicKey_getRecord = getMethods(ProfilePublicKey, ProfilePublicKey$a).get(0);
+            PlayerInfoData_getProfilePublicKeyRecord = getMethods(PlayerInfoData, ProfilePublicKey$a).get(0);
+        }
     }
 
-    private void initializeScoreboardPackets() throws ReflectiveOperationException {
+    /**
+     * Loads PacketPlayOutSpawnEntityLiving's methods, fields and constructors
+     *
+     * @throws  ReflectiveOperationException
+     *          If some method, field or constructor was not found
+     */
+    protected void spawnEntityLiving() throws ReflectiveOperationException {
+        if (minorVersion >= 17) {
+            newPacketPlayOutSpawnEntityLiving = PacketPlayOutSpawnEntityLiving.getConstructor(EntityLiving);
+        } else {
+            newPacketPlayOutSpawnEntityLiving = PacketPlayOutSpawnEntityLiving.getConstructor();
+        }
+        PacketPlayOutSpawnEntityLiving_ENTITYID = getFields(PacketPlayOutSpawnEntityLiving, int.class).get(0);
+        PacketPlayOutSpawnEntityLiving_YAW = getFields(PacketPlayOutSpawnEntityLiving, byte.class).get(0);
+        PacketPlayOutSpawnEntityLiving_PITCH = getFields(PacketPlayOutSpawnEntityLiving, byte.class).get(0);
+        if (minorVersion >= 9) {
+            PacketPlayOutSpawnEntityLiving_UUID = getFields(PacketPlayOutSpawnEntityLiving, UUID.class).get(0);
+            if (minorVersion >= 19) {
+                PacketPlayOutSpawnEntityLiving_X = getFields(PacketPlayOutSpawnEntityLiving, double.class).get(2);
+                PacketPlayOutSpawnEntityLiving_Y = getFields(PacketPlayOutSpawnEntityLiving, double.class).get(3);
+                PacketPlayOutSpawnEntityLiving_Z = getFields(PacketPlayOutSpawnEntityLiving, double.class).get(4);
+            } else {
+                PacketPlayOutSpawnEntityLiving_X = getFields(PacketPlayOutSpawnEntityLiving, double.class).get(0);
+                PacketPlayOutSpawnEntityLiving_Y = getFields(PacketPlayOutSpawnEntityLiving, double.class).get(1);
+                PacketPlayOutSpawnEntityLiving_Z = getFields(PacketPlayOutSpawnEntityLiving, double.class).get(2);
+            }
+        } else {
+            PacketPlayOutSpawnEntityLiving_X = getFields(PacketPlayOutSpawnEntityLiving, int.class).get(2);
+            PacketPlayOutSpawnEntityLiving_Y = getFields(PacketPlayOutSpawnEntityLiving, int.class).get(3);
+            PacketPlayOutSpawnEntityLiving_Z = getFields(PacketPlayOutSpawnEntityLiving, int.class).get(4);
+        }
+        if (minorVersion < 19) {
+            PacketPlayOutSpawnEntityLiving_ENTITYTYPE = getFields(PacketPlayOutSpawnEntityLiving, int.class).get(1);
+        }
+        if (minorVersion <= 14) {
+            PacketPlayOutSpawnEntityLiving_DATAWATCHER = getFields(PacketPlayOutSpawnEntityLiving, DataWatcher).get(0);
+        }
+    }
+
+    /**
+     * Loads PacketPlayOutEntityTeleport's methods, fields and constructors
+     *
+     * @throws  ReflectiveOperationException
+     *          If some method, field or constructor was not found
+     */
+    protected void entityTeleport() throws ReflectiveOperationException {
+        PacketPlayOutEntityTeleport_ENTITYID = getFields(PacketPlayOutEntityTeleport, int.class).get(0);
+        PacketPlayOutEntityTeleport_YAW = getFields(PacketPlayOutEntityTeleport, byte.class).get(0);
+        PacketPlayOutEntityTeleport_PITCH = getFields(PacketPlayOutEntityTeleport, byte.class).get(1);
+        if (minorVersion >= 17) {
+            newPacketPlayOutEntityTeleport = PacketPlayOutEntityTeleport.getConstructor(Entity);
+        } else {
+            newPacketPlayOutEntityTeleport = PacketPlayOutEntityTeleport.getConstructor();
+        }
+        if (minorVersion >= 9) {
+            PacketPlayOutEntityTeleport_X = getFields(PacketPlayOutEntityTeleport, double.class).get(0);
+            PacketPlayOutEntityTeleport_Y = getFields(PacketPlayOutEntityTeleport, double.class).get(1);
+            PacketPlayOutEntityTeleport_Z = getFields(PacketPlayOutEntityTeleport, double.class).get(2);
+        } else {
+            PacketPlayOutEntityTeleport_X = getFields(PacketPlayOutEntityTeleport, int.class).get(1);
+            PacketPlayOutEntityTeleport_Y = getFields(PacketPlayOutEntityTeleport, int.class).get(2);
+            PacketPlayOutEntityTeleport_Z = getFields(PacketPlayOutEntityTeleport, int.class).get(3);
+        }
+    }
+
+    /**
+     * Loads PacketPlayOutPlayerListHeaderFooter's methods, fields and constructors
+     *
+     * @throws  ReflectiveOperationException
+     *          If some method, field or constructor was not found
+     */
+    protected void playerListHeaderFooter() throws ReflectiveOperationException {
+        if (minorVersion < 8) return;
+        PacketPlayOutPlayerListHeaderFooter_HEADER = getFields(PacketPlayOutPlayerListHeaderFooter, IChatBaseComponent).get(0);
+        PacketPlayOutPlayerListHeaderFooter_FOOTER = getFields(PacketPlayOutPlayerListHeaderFooter, IChatBaseComponent).get(1);
+        if (minorVersion >= 17) {
+            newPacketPlayOutPlayerListHeaderFooter = PacketPlayOutPlayerListHeaderFooter.getConstructor(IChatBaseComponent, IChatBaseComponent);
+        } else {
+            newPacketPlayOutPlayerListHeaderFooter = PacketPlayOutPlayerListHeaderFooter.getConstructor();
+        }
+    }
+
+    /**
+     * Loads methods, fields and constructors for other entity packets
+     *
+     * @throws  ReflectiveOperationException
+     *          If some method, field or constructor was not found
+     */
+    protected void otherEntity() throws ReflectiveOperationException {
+        PacketPlayOutEntity_ENTITYID = getFields(PacketPlayOutEntity, int.class).get(0);
+        PacketPlayOutEntityDestroy_ENTITIES = setAccessible(PacketPlayOutEntityDestroy.getDeclaredFields()[0]);
+        newPacketPlayOutEntityMetadata = PacketPlayOutEntityMetadata.getConstructor(int.class, DataWatcher, boolean.class);
+        PacketPlayOutEntityMetadata_LIST = getFields(PacketPlayOutEntityMetadata, List.class).get(0);
+        PacketPlayOutNamedEntitySpawn_ENTITYID = getFields(PacketPlayOutNamedEntitySpawn, int.class).get(0);
+        if (minorVersion >= 7) {
+            PacketPlayInUseEntity_ENTITY = getFields(PacketPlayInUseEntity, int.class).get(0);
+            PacketPlayInUseEntity_ACTION = getFields(PacketPlayInUseEntity, EnumEntityUseAction).get(0);
+        }
+        try {
+            newPacketPlayOutEntityDestroy = PacketPlayOutEntityDestroy.getConstructor(int[].class);
+        } catch (NoSuchMethodException e) {
+            //1.17.0
+            newPacketPlayOutEntityDestroy = PacketPlayOutEntityDestroy.getConstructor(int.class);
+        }
+    }
+
+    /**
+     * Loads DataWatcher's methods, fields and constructors
+     *
+     * @throws  ReflectiveOperationException
+     *          If some method, field or constructor was not found
+     */
+    protected void dataWatcher() throws ReflectiveOperationException {
+        newDataWatcher = DataWatcher.getConstructors()[0];
+        DataWatcherItem_VALUE = getFields(DataWatcherItem, Object.class).get(0);
+        if (minorVersion >= 9) {
+            newDataWatcherObject = DataWatcherObject.getConstructor(int.class, DataWatcherSerializer);
+            DataWatcherItem_TYPE = getFields(DataWatcherItem, DataWatcherObject).get(0);
+            DataWatcherObject_SLOT = getFields(DataWatcherObject, int.class).get(0);
+            DataWatcherObject_SERIALIZER = getFields(DataWatcherObject, DataWatcherSerializer).get(0);
+        } else {
+            DataWatcherItem_TYPE = getFields(DataWatcherItem, int.class).get(1);
+        }
+    }
+
+    /**
+     * Loads Scoreboard methods, fields and constructors
+     *
+     * @throws  ReflectiveOperationException
+     *          If some method, field or constructor was not found
+     */
+    protected void scoreboard() throws ReflectiveOperationException {
+        newScoreboardObjective = ScoreboardObjective.getConstructors()[0];
+        newScoreboard = Scoreboard.getConstructor();
+        emptyScoreboard = newScoreboard.newInstance();
+        newScoreboardScore = ScoreboardScore.getConstructor(Scoreboard, ScoreboardObjective, String.class);
+        newPacketPlayOutScoreboardDisplayObjective = PacketPlayOutScoreboardDisplayObjective.getConstructor(int.class, ScoreboardObjective);
+        PacketPlayOutScoreboardDisplayObjective_POSITION = getFields(PacketPlayOutScoreboardDisplayObjective, int.class).get(0);
+        PacketPlayOutScoreboardDisplayObjective_OBJECTIVENAME = getFields(PacketPlayOutScoreboardDisplayObjective, String.class).get(0);
+        PacketPlayOutScoreboardObjective_OBJECTIVENAME = getFields(PacketPlayOutScoreboardObjective, String.class).get(0);
+        IScoreboardCriteria_self = getFields(IScoreboardCriteria, IScoreboardCriteria).get(0);
         List<Field> list = getFields(PacketPlayOutScoreboardObjective, int.class);
         PacketPlayOutScoreboardObjective_METHOD = list.get(list.size()-1);
-        Class<?> EnumScoreboardAction = null;
         if (minorVersion >= 8) {
-            EnumScoreboardHealthDisplay = getNMSClass("net.minecraft.world.scores.criteria.IScoreboardCriteria$EnumScoreboardHealthDisplay", "IScoreboardCriteria$EnumScoreboardHealthDisplay", "EnumScoreboardHealthDisplay");
             EnumScoreboardHealthDisplay_values = getEnumValues(EnumScoreboardHealthDisplay);
-            EnumScoreboardAction = getNMSClass("net.minecraft.server.ScoreboardServer$Action", "ScoreboardServer$Action", "PacketPlayOutScoreboardScore$EnumScoreboardAction", "EnumScoreboardAction");
             EnumScoreboardAction_values = getEnumValues(EnumScoreboardAction);
             PacketPlayOutScoreboardObjective_RENDERTYPE = getFields(PacketPlayOutScoreboardObjective, EnumScoreboardHealthDisplay).get(0);
         }
@@ -440,36 +476,29 @@ public final class NMSStorage {
         }
     }
 
-    private void initializeTeamPackets() throws ReflectiveOperationException {
-        PacketPlayOutScoreboardTeam = getNMSClass("net.minecraft.network.protocol.game.PacketPlayOutScoreboardTeam", "PacketPlayOutScoreboardTeam", "Packet209SetScoreboardTeam");
-        Class<?> ScoreboardTeam = getNMSClass("net.minecraft.world.scores.ScoreboardTeam", "ScoreboardTeam");
+    /**
+     * Loads PacketPlayOutScoreboardTeam's methods, fields and constructors
+     *
+     * @throws  ReflectiveOperationException
+     *          If some method, field or constructor was not found
+     */
+    protected void scoreboardTeam() throws ReflectiveOperationException {
         newScoreboardTeam = ScoreboardTeam.getConstructor(Scoreboard, String.class);
         PacketPlayOutScoreboardTeam_NAME = getFields(PacketPlayOutScoreboardTeam, String.class).get(0);
         PacketPlayOutScoreboardTeam_ACTION = getInstanceFields(PacketPlayOutScoreboardTeam, int.class).get(0);
         PacketPlayOutScoreboardTeam_PLAYERS = getFields(PacketPlayOutScoreboardTeam, Collection.class).get(0);
         ScoreboardTeam_getPlayerNameSet = getMethods(ScoreboardTeam, Collection.class).get(0);
-        ScoreboardTeam_setAllowFriendlyFire = getMethod(ScoreboardTeam, new String[]{"setAllowFriendlyFire", "a", "func_96660_a"}, boolean.class);
-        ScoreboardTeam_setCanSeeFriendlyInvisibles = getMethod(ScoreboardTeam, new String[]{"setCanSeeFriendlyInvisibles", "b", "func_98300_b"}, boolean.class);
         if (minorVersion >= 8) {
-            Class<?> EnumNameTagVisibility = getNMSClass("net.minecraft.world.scores.ScoreboardTeamBase$EnumNameTagVisibility", "ScoreboardTeamBase$EnumNameTagVisibility", "EnumNameTagVisibility");
             EnumNameTagVisibility_values = getEnumValues(EnumNameTagVisibility);
-            ScoreboardTeam_setNameTagVisibility = getMethod(ScoreboardTeam, new String[]{"setNameTagVisibility", "a", "method_1149"}, EnumNameTagVisibility);
         }
         if (minorVersion >= 9) {
-            Class<?> EnumTeamPush = getNMSClass("net.minecraft.world.scores.ScoreboardTeamBase$EnumTeamPush", "ScoreboardTeamBase$EnumTeamPush");
             EnumTeamPush_values = getEnumValues(EnumTeamPush);
             ScoreboardTeam_setCollisionRule = getMethods(ScoreboardTeam, void.class, EnumTeamPush).get(0);
         }
         if (minorVersion >= 13) {
-            ScoreboardTeam_setPrefix = getMethod(ScoreboardTeam, new String[]{"setPrefix", "method_1138", "b"}, IChatBaseComponent);
-            ScoreboardTeam_setSuffix = getMethod(ScoreboardTeam, new String[]{"setSuffix", "method_1139", "c"}, IChatBaseComponent);
             ScoreboardTeam_setColor = getMethods(ScoreboardTeam, void.class, EnumChatFormat).get(0);
-        } else {
-            ScoreboardTeam_setPrefix = getMethod(ScoreboardTeam, new String[]{"setPrefix", "func_96666_b"}, String.class);
-            ScoreboardTeam_setSuffix = getMethod(ScoreboardTeam, new String[]{"setSuffix", "func_96662_c"}, String.class);
         }
-        if (minorVersion >= 17 || serverVersion.getMinorVersion() >= 17) {
-            Class<?> PacketPlayOutScoreboardTeam_PlayerAction = Class.forName("net.minecraft.network.protocol.game.PacketPlayOutScoreboardTeam$a");
+        if (minorVersion >= 17) {
             PacketPlayOutScoreboardTeam_of = getMethods(PacketPlayOutScoreboardTeam, PacketPlayOutScoreboardTeam, ScoreboardTeam).get(0);
             PacketPlayOutScoreboardTeam_ofBoolean = getMethods(PacketPlayOutScoreboardTeam, PacketPlayOutScoreboardTeam, ScoreboardTeam, boolean.class).get(0);
             PacketPlayOutScoreboardTeam_ofString = getMethods(PacketPlayOutScoreboardTeam, PacketPlayOutScoreboardTeam, ScoreboardTeam, String.class, PacketPlayOutScoreboardTeam_PlayerAction).get(0);
@@ -480,52 +509,21 @@ public final class NMSStorage {
     }
 
     /**
-     * Returns class with given potential names in same order
+     * Loads all classes used by the plugin
      *
-     * @param   names
-     *          possible class names
-     * @return  class for specified names
      * @throws  ClassNotFoundException
-     *          if class does not exist
+     *          If a class was not found
      */
-    private Class<?> getNMSClass(String fullPath_1_17, String... names) throws ClassNotFoundException {
-        if (minorVersion >= 17) {
-            return Class.forName(fullPath_1_17);
-        }
-        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 {modern = " + fullPath_1_17 + ", legacy = " + Arrays.toString(names) + "}");
-    }
+    public abstract void loadClasses() throws ClassNotFoundException;
 
     /**
-     * Returns class from given name
+     * Loads all fields and methods which must be loaded by their name due to
+     * lack of other methods of reliably retrieving them.
      *
-     * @param   name
-     *          class name
-     * @return  class from given name
-     * @throws  ClassNotFoundException
-     *          if class was not found
+     * @throws  ReflectiveOperationException
+     *          If a field or method 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;
-                throw new ClassNotFoundException(name);
-            } catch (ClassNotFoundException | NullPointerException e1) {
-                //maybe fabric?
-                return Class.forName(name);
-            }
-        }
-    }
+    public abstract void loadNamedFieldsAndMethods() throws ReflectiveOperationException;
 
     /**
      * Returns method with specified possible names and parameters. Throws exception if no such method was found
@@ -540,7 +538,7 @@ public final class NMSStorage {
      * @throws  NoSuchMethodException
      *          if no such method exists
      */
-    private Method getMethod(Class<?> clazz, String[] names, Class<?>... parameterTypes) throws NoSuchMethodException {
+    protected Method getMethod(Class<?> clazz, String[] names, Class<?>... parameterTypes) throws NoSuchMethodException {
         for (String name : names) {
             try {
                 return getMethod(clazz, name, parameterTypes);
@@ -565,7 +563,22 @@ public final class NMSStorage {
                 Arrays.toString(parameterTypes) + " in class " + clazz.getName() + ". Methods with matching parameters: " + list);
     }
 
-    private Method getMethod(Class<?> clazz, String name, Class<?>... parameterTypes) throws NoSuchMethodException {
+    /**
+     * Returns Method from class with given name and parameter types. This should be equal to
+     * simply calling Class#getMethod, which however does not work with a few specific methods on
+     * CatServer fork. This workaround works for them.
+     *
+     * @param   clazz
+     *          Class to get method from
+     * @param   name
+     *          Name of the method
+     * @param   parameterTypes
+     *          Parameter types of the method
+     * @return  Method with specified name and parameter types
+     * @throws  NoSuchMethodException
+     *          If no such method was found
+     */
+    protected Method getMethod(Class<?> clazz, String name, Class<?>... parameterTypes) throws NoSuchMethodException {
         List<Method> list = new ArrayList<>();
         for (Method m : clazz.getMethods()) {
             if (!m.getName().equals(name) || m.getParameterCount() != parameterTypes.length) continue;
@@ -583,7 +596,18 @@ public final class NMSStorage {
         throw new NoSuchMethodException("No method found with name " + name + " in class " + clazz.getName() + " with parameters " + Arrays.toString(parameterTypes));
     }
 
-    private List<Method> getMethods(Class<?> clazz, Class<?> returnType, Class<?>... parameterTypes){
+    /**
+     * Returns all methods from class which return specified class type and have specified parameter types.
+     *
+     * @param   clazz
+     *          Class to get methods from
+     * @param   returnType
+     *          Return type of methods
+     * @param   parameterTypes
+     *          Parameter types of methods
+     * @return  List of found methods matching requirements. If nothing is found, empty list is returned.
+     */
+    protected List<Method> getMethods(Class<?> clazz, Class<?> returnType, Class<?>... parameterTypes) {
         List<Method> list = new ArrayList<>();
         for (Method m : clazz.getDeclaredMethods()) {
             if (m.getReturnType() != returnType || m.getParameterCount() != parameterTypes.length || !Modifier.isPublic(m.getModifiers())) continue;
@@ -609,8 +633,7 @@ public final class NMSStorage {
      *          field type to check for
      * @return  list of all fields with specified class type
      */
-    private List<Field> getFields(Class<?> clazz, Class<?> type){
-        if (clazz == null) throw new IllegalArgumentException("Source class cannot be null");
+    protected List<Field> getFields(Class<?> clazz, Class<?> type) {
         List<Field> list = new ArrayList<>();
         for (Field field : clazz.getDeclaredFields()) {
             if (field.getType() == type) {
@@ -629,8 +652,7 @@ public final class NMSStorage {
      *          field type to check for
      * @return  list of all fields with specified class type
      */
-    public List<Field> getInstanceFields(Class<?> clazz, Class<?> type){
-        if (clazz == null) throw new IllegalArgumentException("Source class cannot be null");
+    public List<Field> getInstanceFields(Class<?> clazz, Class<?> type) {
         List<Field> list = new ArrayList<>();
         for (Field field : clazz.getDeclaredFields()) {
             if (field.getType() == type && !Modifier.isStatic(field.getModifiers())) {
@@ -651,7 +673,7 @@ public final class NMSStorage {
      * @throws  NoSuchFieldException
      *          if field was not found
      */
-    private Field getField(Class<?> clazz, String name) throws NoSuchFieldException {
+    protected Field getField(Class<?> clazz, String name) throws NoSuchFieldException {
         for (Field f : clazz.getDeclaredFields()) {
             if (f.getName().equals(name) || (f.getName().split("_").length == 3 && f.getName().split("_")[2].equals(name))) {
                 return setAccessible(f);
@@ -660,7 +682,20 @@ public final class NMSStorage {
         throw new NoSuchFieldException("Field \"" + name + "\" was not found in class " + clazz.getName());
     }
 
-    private Field getField(Class<?> clazz, String... potentialNames) throws NoSuchFieldException {
+    /**
+     * Returns field from class with specified possible names of the field.
+     * Names are checked in specified order and first match is returned.
+     * If no match is found, {@link NoSuchFieldException} is thrown.
+     *
+     * @param   clazz
+     *          Class to get field from
+     * @param   potentialNames
+     *          Potential names of the field
+     * @return  Field with specified name
+     * @throws  NoSuchFieldException
+     *          If no match is found
+     */
+    protected Field getField(Class<?> clazz, String... potentialNames) throws NoSuchFieldException {
         for (String name : potentialNames) {
             try {
                 return getField(clazz, name);
@@ -671,32 +706,85 @@ public final class NMSStorage {
         throw new NoSuchFieldException("No field found in class " + clazz.getName() + " with potential names " + Arrays.toString(potentialNames));
     }
 
-    private Enum[] getEnumValues(Class<?> enumClass) {
-        if (enumClass == null) throw new IllegalArgumentException("Class cannot be null");
+    /**
+     * Returns all Enum values of specified class
+     *
+     * @param   enumClass
+     *          Class to get values of
+     * @return  Array of all values of the enum class
+     */
+    protected Enum[] getEnumValues(Class<?> enumClass) {
         if (!enumClass.isEnum()) throw new IllegalArgumentException(enumClass.getName() + " is not an enum class");
         try {
             return (Enum[]) enumClass.getMethod("values").invoke(null);
-        } catch (ReflectiveOperationException e) {
-            //this should never happen
-            TAB.getInstance().getErrorManager().criticalError("Failed to load enum constants of " + enumClass.getName(), e);
-            return new Enum[0];
+        } catch (ReflectiveOperationException ignored) {
+            return new Enum[0]; // this will never happen
         }
     }
 
+    /**
+     * Returns server's minor version
+     * @return  server's minor version
+     */
     public int getMinorVersion() {
         return minorVersion;
     }
 
+    /**
+     * Sets value of a field in object
+     *
+     * @param   obj
+     *          Instance of object where field should be set
+     * @param   field
+     *          Field to set value of
+     * @param   value
+     *          Value to set field to
+     * @throws  IllegalAccessException
+     *          If thrown by reflective operation
+     */
     public void setField(Object obj, Field field, Object value) throws IllegalAccessException {
         field.set(obj, value);
     }
 
+    /**
+     * Returns data watcher registry
+     * @return  data watcher registry
+     */
     public DataWatcherRegistry getDataWatcherRegistry() {
         return registry;
     }
 
+    /**
+     * Makes object accessible and returns it for chaining.
+     *
+     * @param   o
+     *          Object to make accessible
+     * @return  Entered object, for chaining
+     */
     public <T extends AccessibleObject> T setAccessible(T o) {
         o.setAccessible(true);
         return o;
     }
+
+    /**
+     * Gets values of all static fields in a class
+     *
+     * @param   clazz
+     *          class to return field values from
+     * @return  map of values
+     */
+    public Map<String, Object> getStaticFields(Class<?> clazz){
+        Map<String, Object> fields = new HashMap<>();
+        for (Field field : clazz.getDeclaredFields()) {
+            if (Modifier.isStatic(field.getModifiers())) {
+                setAccessible(field);
+                try {
+                    fields.put(field.getName(), field.get(null));
+                } catch (IllegalAccessException e) {
+                    //this will never happen
+                }
+            }
+        }
+        return fields;
+    }
 }

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,10 +12,10 @@ 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);
 
     /**
@@ -73,15 +73,14 @@ public class DataWatcher {
         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();
             }

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

@@ -1,25 +1,26 @@
 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.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;
 
     /**
@@ -39,16 +40,16 @@ public class DataWatcherHelper {
      * @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 {
@@ -76,18 +77,18 @@ public class DataWatcherHelper {
      *          client version
      */
     public void setCustomName(String customName, ProtocolVersion 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){
+            if (TabAPI.getInstance().getServerVersion().getMinorVersion() >= 6){
                 data.setValue(new DataWatcherObject(10, null), cutName);
             } else {
                 data.setValue(new DataWatcherObject(5, null), cutName);
@@ -102,7 +103,7 @@ public class DataWatcherHelper {
      *          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, null), (byte)(visible?1:0));
@@ -116,7 +117,7 @@ public class DataWatcherHelper {
      *          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, null), (int)health);
@@ -132,4 +133,15 @@ public class DataWatcherHelper {
     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,15 +1,18 @@
 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;
     
     /**
@@ -38,7 +41,7 @@ public class DataWatcherItem {
      */
     public static DataWatcherItem fromNMS(Object nmsItem) throws ReflectiveOperationException {
         NMSStorage nms = NMSStorage.getInstance();
-        if (TAB.getInstance().getServerVersion().getMinorVersion() >= 9) {
+        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));
         } else {
@@ -46,10 +49,18 @@ public class DataWatcherItem {
         }
     }
 
+    /**
+     * 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,30 +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   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;
     }
 }

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

@@ -1,21 +1,27 @@
 package me.neznamy.tab.platforms.bukkit.nms.datawatcher;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.HashMap;
-import java.util.Map;
-
 import me.neznamy.tab.platforms.bukkit.nms.NMSStorage;
 
+import java.util.Map;
+
 /**
  * A class representing the n.m.s.DataWatcherRegistry class to make work with it much easier
  */
 public class DataWatcherRegistry {
 
+    /** Byte encoder */
     private Object registryByte;
+
+    /** Float encoder */
     private Object registryFloat;
+
+    /** String encoder */
     private Object registryString;
+
+    /** Encoder for optional component */
     private Object registryOptionalIChatBaseComponent;
+
+    /** Boolean encoder */
     private Object registryBoolean;
 
     /**
@@ -23,57 +29,65 @@ public class DataWatcherRegistry {
      */
     public DataWatcherRegistry(NMSStorage nms) {
         if (nms.getMinorVersion() >= 9) {
-            Map<String, Object> fields = getStaticFields(nms.DataWatcherRegistry, nms);
-            registryByte = fields.get("a");
-            registryFloat = fields.get("c");
-            registryString = fields.get("d");
-            if (nms.getMinorVersion() >= 13) {
-                registryOptionalIChatBaseComponent = fields.get("f");
-                registryBoolean = fields.get("i");
+            Map<String, Object> fields = nms.getStaticFields(nms.DataWatcherRegistry);
+            if (fields.containsKey("a")) {
+                // Bukkit mapping
+                registryByte = fields.get("a");
+                registryFloat = fields.get("c");
+                registryString = fields.get("d");
+                if (nms.getMinorVersion() >= 13) {
+                    registryOptionalIChatBaseComponent = fields.get("f");
+                    registryBoolean = fields.get("i");
+                } else {
+                    registryBoolean = fields.get("h");
+                }
             } else {
-                registryBoolean = fields.get("h");
+                // Mojang mapping
+                registryByte = fields.get("BYTE");
+                registryFloat = fields.get("FLOAT");
+                registryString = fields.get("STRING");
+                registryOptionalIChatBaseComponent = fields.get("OPTIONAL_COMPONENT");
+                registryBoolean = fields.get("BOOLEAN");
             }
         }
     }
 
     /**
-     * Gets values of all static fields in a class
-     *
-     * @param   clazz
-     *          class to return field values from
-     * @return  map of values
+     * Returns {@link #registryByte}
+     * @return  {@link #registryByte}
      */
-    private Map<String, Object> getStaticFields(Class<?> clazz, NMSStorage nms){
-        Map<String, Object> fields = new HashMap<>();
-        for (Field field : clazz.getDeclaredFields()) {
-            if (Modifier.isStatic(field.getModifiers())) {
-                nms.setAccessible(field);
-                try {
-                    fields.put(field.getName(), field.get(null));
-                } catch (IllegalAccessException e) {
-                    //this will never happen
-                }
-            }
-        }
-        return fields;
-    }
-
     public Object getByte() {
         return registryByte;
     }
 
+    /**
+     * Returns {@link #registryFloat}
+     * @return  {@link #registryFloat}
+     */
     public Object getFloat() {
         return registryFloat;
     }
 
+    /**
+     * Returns {@link #registryString}
+     * @return  {@link #registryString}
+     */
     public Object getString() {
         return registryString;
     }
 
+    /**
+     * Returns {@link #registryOptionalIChatBaseComponent}
+     * @return  {@link #registryOptionalIChatBaseComponent}
+     */
     public Object getOptionalComponent() {
         return registryOptionalIChatBaseComponent;
     }
 
+    /**
+     * Returns {@link #registryBoolean}
+     * @return  {@link #registryBoolean}
+     */
     public Object getBoolean() {
         return registryBoolean;
     }

bukkit/src/main/java/me/neznamy/tab/platforms/bukkit/permission/Vault.java

@@ -1,6 +1,6 @@
 package me.neznamy.tab.platforms.bukkit.permission;
 
-import me.neznamy.tab.shared.TabConstants;
+import me.neznamy.tab.api.TabConstants;
 import org.bukkit.entity.Player;
 
 import me.neznamy.tab.api.TabPlayer;

bukkit/src/main/resources/bukkitconfig.yml

@@ -48,6 +48,7 @@ scoreboard-teams:
     - "GROUPS:owner,admin,mod,helper,builder,vip,default"
     - "PLACEHOLDER_A_TO_Z:%player%"
   case-sensitive-sorting: true
+  can-see-friendly-invisibles: false
   disable-in-worlds:
     - disabledworld
   # https://github.com/NEZNAMY/TAB/wiki/Feature-guide:-Unlimited-nametag-mode
@@ -55,7 +56,6 @@ scoreboard-teams:
     enabled: false
     use-marker-tag-for-1-8-x-clients: false
     disable-on-boats: true
-    space-between-lines: 0.22
     disable-in-worlds:
       - disabledworld
     dynamic-lines:

bungeecord/src/main/java/me/neznamy/tab/platforms/bungeecord/BungeeEventListener.java

@@ -1,8 +1,7 @@
 package me.neznamy.tab.platforms.bungeecord;
 
-import me.neznamy.tab.shared.TAB;
-import me.neznamy.tab.shared.TabConstants;
-import me.neznamy.tab.shared.proxy.ProxyPlatform;
+import me.neznamy.tab.api.TabAPI;
+import me.neznamy.tab.api.TabConstants;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.ChatEvent;
 import net.md_5.bungee.api.event.PlayerDisconnectEvent;
@@ -16,6 +15,19 @@ import net.md_5.bungee.event.EventHandler;
  */
 public class BungeeEventListener implements Listener {
 
+    /** Reference to BungeeCord platform implementation */
+    private final BungeePlatform platform;
+
+    /**
+     * Constructs new instance with given parameter
+     *
+     * @param   platform
+     *          BungeeCord implementation of platform
+     */
+    public BungeeEventListener(BungeePlatform platform) {
+        this.platform = platform;
+    }
+
     /**
      * Disconnect event listener to forward the event to all features
      *
@@ -24,9 +36,9 @@ public class BungeeEventListener implements Listener {
      */
     @EventHandler
     public void onQuit(PlayerDisconnectEvent 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())));
     }
 
     /**
@@ -37,12 +49,12 @@ public class BungeeEventListener implements Listener {
      */
     @EventHandler
     public void onSwitch(ServerSwitchEvent e){
-        if (TAB.getInstance().isDisabled()) return;
-        TAB.getInstance().getCPUManager().runTask(() -> {
-            if (TAB.getInstance().getPlayer(e.getPlayer().getUniqueId()) == null) {
-                TAB.getInstance().getFeatureManager().onJoin(new BungeeTabPlayer(e.getPlayer()));
+        if (TabAPI.getInstance().isPluginDisabled()) return;
+        TabAPI.getInstance().getThreadManager().runTask(() -> {
+            if (TabAPI.getInstance().getPlayer(e.getPlayer().getUniqueId()) == null) {
+                TabAPI.getInstance().getFeatureManager().onJoin(new BungeeTabPlayer(e.getPlayer()));
             } else {
-                TAB.getInstance().getFeatureManager().onServerChange(e.getPlayer().getUniqueId(), e.getPlayer().getServer().getInfo().getName());
+                TabAPI.getInstance().getFeatureManager().onServerChange(e.getPlayer().getUniqueId(), e.getPlayer().getServer().getInfo().getName());
             }
         });
     }
@@ -55,8 +67,9 @@ public class BungeeEventListener implements Listener {
      */
     @EventHandler
     public void onChat(ChatEvent e) {
-        if (TAB.getInstance().isDisabled()) return;
-        if (e.isCommand() && TAB.getInstance().getFeatureManager().onCommand(TAB.getInstance().getPlayer(((ProxiedPlayer)e.getSender()).getUniqueId()), e.getMessage())) e.setCancelled(true);
+        if (TabAPI.getInstance().isPluginDisabled()) return;
+        if (e.isCommand() && TabAPI.getInstance().getFeatureManager().onCommand(TabAPI.getInstance().getPlayer(
+                ((ProxiedPlayer)e.getSender()).getUniqueId()), e.getMessage())) e.setCancelled(true);
     }
 
     /**
@@ -70,15 +83,8 @@ public class BungeeEventListener implements Listener {
         if (!event.getTag().equals(TabConstants.PLUGIN_MESSAGE_CHANNEL_NAME)) return;
         if (event.getReceiver() instanceof ProxiedPlayer) {
             event.setCancelled(true);
-            TAB.getInstance().getCPUManager().getThreadPool().submit(() -> {
-                try {
-                    while (TAB.getInstance().getPlayer(((ProxiedPlayer) event.getReceiver()).getUniqueId()) == null) {
-                        Thread.sleep(100);
-                    }
-                    ((ProxyPlatform)TAB.getInstance().getPlatform()).getPluginMessageHandler().onPluginMessage(
-                            ((ProxiedPlayer) event.getReceiver()).getUniqueId(), event.getData());
-                } catch (InterruptedException ignored) {}
-            });
+            platform.getPluginMessageHandler().onPluginMessage(
+                    ((ProxiedPlayer) event.getReceiver()).getUniqueId(), event.getData());
         }
     }
 }

bungeecord/src/main/java/me/neznamy/tab/platforms/bungeecord/BungeePacketBuilder.java

@@ -10,16 +10,11 @@ import me.neznamy.tab.api.protocol.*;
 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 net.md_5.bungee.protocol.packet.BossBar;
-import net.md_5.bungee.protocol.packet.Chat;
-import net.md_5.bungee.protocol.packet.PlayerListHeaderFooter;
-import net.md_5.bungee.protocol.packet.PlayerListItem;
+import net.md_5.bungee.protocol.PlayerPublicKey;
+import net.md_5.bungee.protocol.Property;
+import net.md_5.bungee.protocol.packet.*;
 import net.md_5.bungee.protocol.packet.PlayerListItem.Item;
-import net.md_5.bungee.protocol.packet.ScoreboardDisplay;
-import net.md_5.bungee.protocol.packet.ScoreboardObjective;
 import net.md_5.bungee.protocol.packet.ScoreboardObjective.HealthDisplay;
-import net.md_5.bungee.protocol.packet.ScoreboardScore;
-import net.md_5.bungee.protocol.packet.Team;
 
 /**
  * Packet builder for BungeeCord platform
@@ -40,7 +35,11 @@ public class BungeePacketBuilder extends PacketBuilder {
 
     @Override
     public Object build(PacketPlayOutChat packet, ProtocolVersion clientVersion) {
-        return new Chat(packet.getMessage().toString(clientVersion), (byte) packet.getType().ordinal());
+        if (clientVersion.getMinorVersion() >= 19) {
+            return new SystemChat(packet.getMessage().toString(clientVersion), (byte) packet.getType().ordinal());
+        } else {
+            return new Chat(packet.getMessage().toString(clientVersion), (byte) packet.getType().ordinal());
+        }
     }
 
     @Override
@@ -55,17 +54,18 @@ public class BungeePacketBuilder extends PacketBuilder {
                     item.setDisplayName(data.getDisplayName().toLegacyText());
                 }
             } else if (clientVersion.getMinorVersion() < 8) {
-                item.setDisplayName(data.getName()); //avoiding NPE, 1.7 client requires this, 1.8 added a leading boolean
+                item.setDisplayName(String.valueOf(data.getName())); //avoiding NPE, 1.7 client requires this, 1.8 added a leading boolean
             }
             if (data.getGameMode() != null) item.setGamemode(data.getGameMode().ordinal()-1);
             item.setPing(data.getLatency());
             if (data.getSkin() != null) {
-                item.setProperties(new String[][]{{"textures", data.getSkin().getValue(), data.getSkin().getSignature()}});
+                item.setProperties(new Property[]{new Property("textures", data.getSkin().getValue(), data.getSkin().getSignature())});
             } else {
-                item.setProperties(new String[0][0]);
+                item.setProperties(new Property[0]);
             }
             item.setUsername(data.getName());
             item.setUuid(data.getUniqueId());
+            item.setPublicKey((PlayerPublicKey) data.getProfilePublicKey());
             items.add(item);
         }
         PlayerListItem bungeePacket = new PlayerListItem();
@@ -109,8 +109,8 @@ public class BungeePacketBuilder extends PacketBuilder {
         PlayerListItem item = (PlayerListItem) bungeePacket;
         List<PlayerInfoData> listData = new ArrayList<>();
         for (Item i : item.getItems()) {
-            Skin skin = i.getProperties() == null || i.getProperties().length == 0 ? null : new Skin(i.getProperties()[0][1], i.getProperties()[0][2]);
-            listData.add(new PlayerInfoData(i.getUsername(), i.getUuid(), skin, i.getPing(), EnumGamemode.VALUES[i.getGamemode()+1], IChatBaseComponent.deserialize(i.getDisplayName())));
+            Skin skin = i.getProperties() == null || i.getProperties().length == 0 ? null : new Skin(i.getProperties()[0].getValue(), i.getProperties()[0].getSignature());
+            listData.add(new PlayerInfoData(i.getUsername(), i.getUuid(), skin, i.getPing(), EnumGamemode.VALUES[i.getGamemode()+1], IChatBaseComponent.deserialize(i.getDisplayName()), i.getPublicKey()));
         }
         return new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.valueOf(item.getAction().toString().replace("GAMEMODE", "GAME_MODE")), listData);
     }

bungeecord/src/main/java/me/neznamy/tab/platforms/bungeecord/BungeePipelineInjector.java

@@ -8,7 +8,7 @@ import io.netty.channel.ChannelPromise;
 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.api.TabConstants;
 import me.neznamy.tab.shared.features.PipelineInjector;
 import me.neznamy.tab.shared.features.redis.RedisPlayer;
 import net.md_5.bungee.api.connection.ProxiedPlayer;

bungeecord/src/main/java/me/neznamy/tab/platforms/bungeecord/BungeePlatform.java

@@ -2,7 +2,7 @@ package me.neznamy.tab.platforms.bungeecord;
 
 import com.imaginarycode.minecraft.redisbungee.RedisBungeeAPI;
 import me.neznamy.tab.shared.TAB;
-import me.neznamy.tab.shared.TabConstants;
+import me.neznamy.tab.api.TabConstants;
 import me.neznamy.tab.shared.proxy.ProxyPlatform;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
@@ -14,7 +14,7 @@ import net.md_5.bungee.api.plugin.Plugin;
 public class BungeePlatform extends ProxyPlatform {
 
     /**
-     * Constructs new instance
+     * Constructs new instance with BungeeCord packet builder
      */
     public BungeePlatform() {
         super(new BungeePacketBuilder());

bungeecord/src/main/java/me/neznamy/tab/platforms/bungeecord/BungeeTabPlayer.java

@@ -1,20 +1,23 @@
 package me.neznamy.tab.platforms.bungeecord;
 
 import de.myzelyam.api.vanish.BungeeVanishAPI;
-import io.netty.channel.Channel;
 import me.neznamy.tab.api.ProtocolVersion;
+import me.neznamy.tab.api.TabConstants;
 import me.neznamy.tab.api.protocol.Skin;
 import me.neznamy.tab.api.util.Preconditions;
 import me.neznamy.tab.shared.TAB;
-import me.neznamy.tab.shared.TabConstants;
 import me.neznamy.tab.shared.proxy.ProxyTabPlayer;
+import net.md_5.bungee.UserConnection;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.connection.InitialHandler;
+import net.md_5.bungee.connection.LoginResult;
+import net.md_5.bungee.netty.ChannelWrapper;
 import net.md_5.bungee.protocol.DefinedPacket;
+import net.md_5.bungee.protocol.Property;
 import net.md_5.bungee.protocol.Protocol;
 
 import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
 /**
@@ -23,35 +26,18 @@ import java.lang.reflect.Method;
 public class BungeeTabPlayer extends ProxyTabPlayer {
 
     /** Inaccessible bungee internals */
-    private static Method InitialHandler_getLoginProfile;
-    private static Method ChannelWrapper_getHandle;
-    private static Method LoginResult_Property_getValue;
-    private static Method LoginResult_Property_getSignature;
-    private static Method LoginResult_getProperties;
-    private static Method UserConnection_getGamemode;
     private static Field wrapperField;
     private static Object directionData;
     private static Method getId;
 
     static {
         try {
-            Class<?> initialHandler = Class.forName("net.md_5.bungee.connection.InitialHandler");
-            InitialHandler_getLoginProfile = initialHandler.getMethod("getLoginProfile");
-            Class<?> channelWrapper = Class.forName("net.md_5.bungee.netty.ChannelWrapper");
-            ChannelWrapper_getHandle = channelWrapper.getMethod("getHandle");
-            Class<?> loginResult = Class.forName("net.md_5.bungee.connection.LoginResult");
-            Class<?> loginResult_Property = Class.forName("net.md_5.bungee.connection.LoginResult$Property");
-            LoginResult_Property_getValue = loginResult_Property.getMethod("getValue");
-            LoginResult_Property_getSignature = loginResult_Property.getMethod("getSignature");
-            LoginResult_getProperties = loginResult.getMethod("getProperties");
-            Class<?> userConnection = Class.forName("net.md_5.bungee.UserConnection");
-            UserConnection_getGamemode = userConnection.getMethod("getGamemode");
             Field f = Protocol.class.getDeclaredField("TO_CLIENT");
             f.setAccessible(true);
             directionData = f.get(Protocol.GAME);
             getId = directionData.getClass().getDeclaredMethod("getId", Class.class, int.class);
             getId.setAccessible(true);
-            wrapperField = initialHandler.getDeclaredField("ch");
+            wrapperField = InitialHandler.class.getDeclaredField("ch");
             wrapperField.setAccessible(true);
         } catch (ReflectiveOperationException e) {
             TAB.getInstance().getErrorManager().criticalError("Failed to initialize bungee internal fields", e);
@@ -65,10 +51,10 @@ public class BungeeTabPlayer extends ProxyTabPlayer {
      *          BungeeCord player
      */
     public BungeeTabPlayer(ProxiedPlayer p) {
-        super(p, p.getUniqueId(), p.getName(), p.getServer() != null ? p.getServer().getInfo().getName() : "-", -1);
+        super(p, p.getUniqueId(), p.getName(), p.getServer() != null ? p.getServer().getInfo().getName() : "-", -1, true);
         try {
-            channel = (Channel) ChannelWrapper_getHandle.invoke(wrapperField.get(getPlayer().getPendingConnection()));
-        } catch (IllegalAccessException | InvocationTargetException e) {
+            channel = ((ChannelWrapper)wrapperField.get(getPlayer().getPendingConnection())).getHandle();
+        } catch (IllegalAccessException e) {
             TAB.getInstance().getErrorManager().criticalError("Failed to get channel of " + getPlayer().getName(), e);
         }
     }
@@ -96,17 +82,11 @@ public class BungeeTabPlayer extends ProxyTabPlayer {
 
     @Override
     public Skin getSkin() {
-        try {
-            Object loginResult = InitialHandler_getLoginProfile.invoke(getPlayer().getPendingConnection());
-            if (loginResult == null) return null;
-            Object[] properties = (Object[]) LoginResult_getProperties.invoke(loginResult);
-            if (properties == null || properties.length == 0) return null;
-            return new Skin((String) LoginResult_Property_getValue.invoke(properties[0]),
-                    (String) LoginResult_Property_getSignature.invoke(properties[0]));
-        } catch (ReflectiveOperationException e) {
-            TAB.getInstance().getErrorManager().printError("Failed to get skin of " + getName(), e);
-            return null;
-        }
+        LoginResult loginResult = ((InitialHandler)getPlayer().getPendingConnection()).getLoginProfile();
+        if (loginResult == null) return null;
+        Property[] properties = loginResult.getProperties();
+        if (properties == null || properties.length == 0) return null;
+        return new Skin(properties[0].getValue(), properties[0].getSignature());
     }
 
     @Override
@@ -154,12 +134,12 @@ public class BungeeTabPlayer extends ProxyTabPlayer {
 
     @Override
     public int getGamemode() {
-        try {
-            return (int) UserConnection_getGamemode.invoke(player);
-        } catch (ReflectiveOperationException e) {
-            TAB.getInstance().getErrorManager().printError("Failed to get gamemode of " + getPlayer().getName(), e);
-            return 0;
-        }
+        return ((UserConnection)player).getGamemode();
+    }
+
+    @Override
+    public Object getProfilePublicKey() {
+        return ((InitialHandler)getPlayer().getPendingConnection()).getLoginRequest().getPublicKey();
     }
 
     @Override

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

@@ -9,7 +9,7 @@ import me.neznamy.tab.api.ProtocolVersion;
 import me.neznamy.tab.api.TabPlayer;
 import me.neznamy.tab.api.chat.EnumChatFormat;
 import me.neznamy.tab.shared.TAB;
-import me.neznamy.tab.shared.TabConstants;
+import me.neznamy.tab.api.TabConstants;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.chat.TextComponent;
@@ -26,12 +26,13 @@ public class Main extends Plugin {
     @Override
     public void onEnable(){
         if (!isVersionSupported()) {
-            getLogger().info(EnumChatFormat.color("&cThe plugin requires BungeeCord build #1330 and up to work. Get it at https://ci.md-5.net/job/BungeeCord/"));
+            getLogger().info(EnumChatFormat.color("&cThe plugin requires BungeeCord build #1637 and up to work. Get it at https://ci.md-5.net/job/BungeeCord/"));
             return;
         }
+        BungeePlatform platform = new BungeePlatform();
         ProxyServer.getInstance().registerChannel(TabConstants.PLUGIN_MESSAGE_CHANNEL_NAME);
-        TAB.setInstance(new TAB(new BungeePlatform(), ProtocolVersion.PROXY, getProxy().getVersion(), getDataFolder(), getLogger()));
-        getProxy().getPluginManager().registerListener(this, new BungeeEventListener());
+        TAB.setInstance(new TAB(platform, ProtocolVersion.PROXY, getProxy().getVersion(), getDataFolder(), getLogger()));
+        getProxy().getPluginManager().registerListener(this, new BungeeEventListener(platform));
         getProxy().getPluginManager().registerCommand(this, new BTABCommand());
         TAB.getInstance().load();
         Metrics metrics = new Metrics(this, 10535);
@@ -40,13 +41,13 @@ public class Main extends Plugin {
     }
 
     /**
-     * Checks for compatibility and returns true if version is supported, false if not
+     * Checks for compatibility and returns {@code true} if version is supported, {@code false} if not
      *
-     * @return  true if version is compatible, false if not
+     * @return  {@code true} if version is compatible, {@code false} if not
      */
     private boolean isVersionSupported() {
         try {
-            Class.forName("net.md_5.bungee.protocol.packet.ScoreboardObjective$HealthDisplay");
+            Class.forName("net.md_5.bungee.protocol.Property");
             return true;
         } catch (ClassNotFoundException e) {
             return false;
@@ -72,7 +73,7 @@ public class Main extends Plugin {
 
         @Override
         public void execute(CommandSender sender, String[] args) {
-            if (TAB.getInstance().isDisabled()) {
+            if (TAB.getInstance().isPluginDisabled()) {
                 for (String message : TAB.getInstance().getDisabledCommand().execute(args, sender.hasPermission(TabConstants.Permission.COMMAND_RELOAD), sender.hasPermission(TabConstants.Permission.COMMAND_ALL))) {
                     sender.sendMessage(new TextComponent(EnumChatFormat.color(message)));
                 }

bungeecord/src/main/java/me/neznamy/tab/platforms/bungeecord/RedisBungeeSupport.java

@@ -2,7 +2,7 @@ package me.neznamy.tab.platforms.bungeecord;
 
 import com.imaginarycode.minecraft.redisbungee.RedisBungeeAPI;
 import com.imaginarycode.minecraft.redisbungee.events.PubSubMessageEvent;
-import me.neznamy.tab.shared.TabConstants;
+import me.neznamy.tab.api.TabConstants;
 import me.neznamy.tab.shared.features.redis.RedisSupport;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.plugin.Listener;

bungeecord/src/main/resources/proxyconfig.yml

@@ -52,6 +52,7 @@ scoreboard-teams:
     - "GROUPS:owner,admin,mod,helper,builder,vip,default"
     - "PLACEHOLDER_A_TO_Z:%player%"
   case-sensitive-sorting: true
+  can-see-friendly-invisibles: false
   disable-in-worlds:
     - disabledworld
   disable-in-servers:
@@ -61,7 +62,6 @@ scoreboard-teams:
     enabled: false
     use-marker-tag-for-1-8-x-clients: false
     disable-on-boats: true
-    space-between-lines: 0.22
     disable-in-worlds:
       - disabledworld
     disable-in-servers:
@@ -90,6 +90,7 @@ global-playerlist:
   display-vanished-players-as-spectators: true
   isolate-unlisted-servers: false
   update-latency: false
+  fill-profile-key: false
   spy-servers:
     - spyserver1
     - spyserver2

gradle.properties

@@ -1,5 +1,5 @@
 # Project properties - we put these here so they can be modified without causing a recompile of the build scripts
-projectVersion=3.1.1
+projectVersion=3.1.5
 
 # Gradle properties
 org.gradle.daemon=true

gradle/libs.versions.toml

@@ -3,36 +3,40 @@ metadata.format.version = "1.1"
 [versions]
 
 # API
-netty = "4.1.75.Final"
+netty = "4.1.80.Final"
 jsonSimple = "1.1.1"
 snakeyaml = "1.30"
 yamlAssist = "1.0.5"
-gson = "2.9.0"
+gson = "2.9.1"
 slf4j = "1.7.36"
+minimessage = "4.11.0"
 
 # General
 luckperms = "5.4"
 guava = "31.1-jre"
-floodgate = "2.0-SNAPSHOT"
-kotlin = "1.6.10"
+floodgate = "2.2.0-SNAPSHOT"
+kotlin = "1.7.10"
 event = "3.0.0"
 
 # Platforms
 bukkit = "1.16.5-R0.1-SNAPSHOT"
-bungeecord = "1.18-R0.1-SNAPSHOT"
+bungeecord = "1.19-R0.1-SNAPSHOT"
 krypton = "0.59.2"
-velocity = "1.1.0"
+velocity = "3.1.2-SNAPSHOT"
 
 # Platform extras
-placeholderapi = "2.10.9"
+placeholderapi = "2.11.2"
 vault = "1.7"
-via = "4.0.0"
-authlib = "1.11"
-bstats = "2.2.1"
-libsDisguises = "10.0.26"
-essentials = "2.19.2"
-premiumVanish = "2.0.3"
-redisBungee = "0.6.5-SNAPSHOT"
+via = "4.4.2"
+authlib = "1.5.25"
+bstats = "3.0.0"
+essentials = "2.19.7"
+premiumVanish = "2.7.11-2"
+redisBungee = "0.7.3"
+
+# Plugins
+indra = "2.1.1"
+shadow = "7.1.2"
 
 [libraries]
 
@@ -43,6 +47,9 @@ snakeyaml = { group = "org.yaml", name = "snakeyaml", version.ref = "snakeyaml"
 yamlAssist = { group = "me.neznamy", name = "yamlassist", version.ref = "yamlAssist" }
 gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
 slf4j = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j"}
+adventureMiniMessage = { group = "net.kyori", name = "adventure-text-minimessage", version.ref = "minimessage" }
+adventureApi = { group = "net.kyori", name = "adventure-api", version.ref = "minimessage" }
+adventureLegacy = { group = "net.kyori", name = "adventure-text-serializer-legacy", version.ref = "minimessage" }
 
 # General
 luckperms = { group = "net.luckperms", name = "api", version.ref = "luckperms" }
@@ -53,7 +60,7 @@ event = { group = "net.kyori", name = "event-method", version.ref = "event" }
 
 # Platforms
 bukkit = { group = "org.purpurmc.purpur", name = "purpur-api", version.ref = "bukkit" }
-bungeecord = { group = "net.md-5", name = "bungeecord-api", version.ref = "bungeecord" }
+bungeecord = { group = "net.md-5", name = "bungeecord-proxy", version.ref = "bungeecord" }
 krypton-api = { group = "org.kryptonmc", name = "krypton-api", version.ref = "krypton" }
 krypton-server = { group = "org.kryptonmc", name = "krypton-server", version.ref = "krypton" }
 krypton-annotationProcessor = { group = "org.kryptonmc", name = "krypton-annotation-processor", version.ref = "krypton" }
@@ -64,12 +71,15 @@ placeholderapi = { group = "me.clip", name = "placeholderapi", version.ref = "pl
 vault = { group = "com.github.MilkBowl", name = "VaultAPI", version.ref = "vault" }
 via = { group = "com.viaversion", name = "viaversion-api", version.ref = "via" }
 authlib = { group = "com.mojang", name = "authlib", version.ref = "authlib" }
-libsDisguises = { group = "LibsDisguises", name = "LibsDisguises", version.ref = "libsDisguises" }
 essentials = { group = "net.essentialsx", name = "EssentialsX", version.ref = "essentials" }
 premiumVanish = { group = "com.github.MyzelYam", name = "PremiumVanishAPI", version.ref = "premiumVanish" }
-redisBungee = { group = "com.imaginarycode.minecraft", name = "RedisBungee", version.ref = "redisBungee" }
+redisBungee = { group = "com.github.limework.redisbungee", name = "RedisBungee-Bungee", version.ref = "redisBungee" }
 
 # Metrics
 bstats-bukkit = { group = "org.bstats", name = "bstats-bukkit", version.ref = "bstats" }
 bstats-bungeecord = { group = "org.bstats", name = "bstats-bungeecord", version.ref = "bstats" }
 bstats-velocity = { group = "org.bstats", name = "bstats-velocity", version.ref = "bstats" }
+
+# Plugins
+plugin-indra = { group = "net.kyori", name = "indra-common", version.ref = "indra" }
+plugin-shadow = { group = "gradle.plugin.com.github.johnrengelman", name = "shadow", version.ref = "shadow" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

jar/build.gradle.kts

@@ -8,7 +8,7 @@ val platforms = setOf(
     rootProject.projects.bukkit,
     rootProject.projects.bungeecord,
 //    rootProject.projects.krypton,
-//    rootProject.projects.velocity
+    rootProject.projects.velocity
 ).map { it.dependencyProject }
 
 tasks {

settings.gradle.kts

@@ -3,21 +3,27 @@ enableFeaturePreview("VERSION_CATALOGS")
 
 dependencyResolutionManagement {
     repositories {
-        mavenCentral() // Netty, SnakeYaml, json-simple, Gson, slf4j, Guava, Kyori event, bStats
+        mavenCentral() // Netty, SnakeYaml, json-simple, Gson, slf4j, Guava, Kyori event, bStats, AuthLib
         maven("https://jitpack.io") // PremiumVanish
         maven("https://repo.extendedclip.com/content/repositories/placeholderapi/") // PlaceholderAPI
         maven("https://repo.viaversion.com/") // ViaVersion
         maven("https://repo.essentialsx.net/releases/") // Essentials
-        maven("https://repo.codemc.org/repository/maven-public/") // RedisBungee, BungeeCord
+        maven("https://repo.codemc.org/repository/maven-public/") // RedisBungee
         maven("https://repo.kryptonmc.org/releases") // YamlAssist, LuckPerms
+        maven("https://repo.kryptonmc.org/snapshots") // BungeeCord
         maven("https://repo.opencollab.dev/maven-snapshots/") // Floodgate
-        maven("https://repo.purpurmc.org/snapshots") // Purpur, LibsDisguises, AuthLib, Vault
+        maven("https://repo.purpurmc.org/snapshots") // Purpur, Vault
+        maven("https://repo.papermc.io/repository/maven-public/") // Velocity
     }
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
 }
 
 pluginManagement {
     includeBuild("build-logic")
+    repositories {
+        gradlePluginPortal()
+        mavenCentral()
+    }
 }
 
 rootProject.name = "TAB"
@@ -25,7 +31,7 @@ rootProject.name = "TAB"
 include(":api")
 include(":shared")
 //include(":krypton")
-//include(":velocity")
+include(":velocity")
 include(":bukkit")
 include(":bungeecord")
 include(":jar")

shared/build.gradle.kts

@@ -1,7 +1,3 @@
-plugins {
-    id("net.kyori.blossom") version "1.2.0"
-}
-
 dependencies {
     api(projects.api)
     api(libs.event) {
@@ -12,9 +8,4 @@ dependencies {
     compileOnlyApi(libs.guava)
     compileOnlyApi(libs.floodgate)
     compileOnlyApi(libs.slf4j)
-}
-
-blossom {
-    replaceToken("@plugin_version@", project.version)
-    replaceTokenIn("src/main/java/me/neznamy/tab/shared/TabConstants.java")
-}
+}

shared/src/main/java/me/neznamy/tab/shared/CpuManager.java

@@ -9,7 +9,6 @@ import java.util.concurrent.atomic.AtomicLong;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 import me.neznamy.tab.api.TabFeature;
-import me.neznamy.tab.api.task.RepeatingTask;
 import me.neznamy.tab.api.task.ThreadManager;
 
 /**
@@ -48,7 +47,7 @@ public class CpuManager implements ThreadManager {
     private ExecutorService thread = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder().setNameFormat("TAB Processing Thread").build());
 
     /** Thread pool for delayed and repeating tasks to perform sleep before submitting task to main thread */
-    private final ThreadPoolExecutor threadPool = (ThreadPoolExecutor) Executors.newCachedThreadPool(
+    private final ScheduledExecutorService threadPool = Executors.newScheduledThreadPool(20,
             new ThreadFactoryBuilder().setNameFormat("TAB Repeating / Delayed Thread %d").build());
 
     /** Tasks submitted to main thread before plugin was fully enabled */
@@ -359,34 +358,22 @@ public class CpuManager implements ThreadManager {
     }
 
     @Override
-    public RepeatingTask startRepeatingMeasuredTask(int intervalMilliseconds, TabFeature feature, String type, Runnable task) {
-        return new TabRepeatingTask(threadPool, task, feature, type, intervalMilliseconds);
+    public Future<?> startRepeatingMeasuredTask(int intervalMilliseconds, TabFeature feature, String type, Runnable task) {
+        return threadPool.scheduleAtFixedRate(() -> runMeasuredTask(feature, type, task), 0, intervalMilliseconds, TimeUnit.MILLISECONDS);
     }
 
     @Override
-    public RepeatingTask startRepeatingTask(int intervalMilliseconds, Runnable task) {
-        return new TabRepeatingTask(threadPool, task, null, null, intervalMilliseconds);
+    public Future<?> startRepeatingTask(int intervalMilliseconds, Runnable task) {
+        return threadPool.scheduleAtFixedRate(() -> runTask(task), 0, intervalMilliseconds, TimeUnit.MILLISECONDS);
     }
 
     @Override
     public Future<?> runTaskLater(int delayMilliseconds, TabFeature feature, String type, Runnable task) {
-        try {
-            return threadPool.submit(() -> {
-                try {
-                    Thread.sleep(delayMilliseconds);
-                    runMeasuredTask(feature, type, task);
-                } catch (InterruptedException pluginDisabled) {
-                    Thread.currentThread().interrupt();
-                }
-            });
-        } catch (OutOfMemoryError e) {
-            TAB.getInstance().getErrorManager().criticalError("Failed to create new delayed task, active thread count: " +
-                    threadPool.getActiveCount() + " / " + threadPool.getPoolSize(), e);
-            return null;
-        }
+        return threadPool.schedule(() -> runMeasuredTask(feature, type, task), delayMilliseconds, TimeUnit.MILLISECONDS);
     }
 
-    public ThreadPoolExecutor getThreadPool() {
-        return threadPool;
+    @Override
+    public Future<?> runTaskLater(int delayMilliseconds, Runnable task) {
+        return threadPool.schedule(() -> submit(task), delayMilliseconds, TimeUnit.MILLISECONDS);
     }
 }

shared/src/main/java/me/neznamy/tab/shared/ErrorManager.java

@@ -9,6 +9,7 @@ import java.nio.file.Files;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+import me.neznamy.tab.api.TabConstants;
 import me.neznamy.tab.api.chat.EnumChatFormat;
 import me.neznamy.tab.api.chat.IChatBaseComponent;
 

shared/src/main/java/me/neznamy/tab/shared/FeatureManagerImpl.java

@@ -5,6 +5,7 @@ import java.util.Map;
 import java.util.UUID;
 
 import me.neznamy.tab.api.FeatureManager;
+import me.neznamy.tab.api.TabConstants;
 import me.neznamy.tab.api.TabFeature;
 import me.neznamy.tab.api.TabPlayer;
 import me.neznamy.tab.api.placeholder.PlayerPlaceholder;
@@ -28,6 +29,10 @@ public class FeatureManagerImpl implements FeatureManager {
     /** All registered features in an array to avoid memory allocations on iteration */
     private TabFeature[] values = new TabFeature[0];
 
+    private boolean objectiveListeners = false;
+
+    private boolean displayObjectiveListeners = false;
+
     /**
      * Calls load() on all features.
      * This function is called on plugin startup.
@@ -94,12 +99,7 @@ public class FeatureManagerImpl implements FeatureManager {
         return pack;
     }
 
-    /**
-     * Calls onQuit(TabPlayer) on all features
-     * 
-     * @param   disconnectedPlayer
-     *          player who disconnected
-     */
+    @Override
     public void onQuit(TabPlayer disconnectedPlayer) {
         if (disconnectedPlayer == null) return;
         long millis = System.currentTimeMillis();
@@ -113,12 +113,7 @@ public class FeatureManagerImpl implements FeatureManager {
         TAB.getInstance().debug("Player quit of " + disconnectedPlayer.getName() + " processed in " + (System.currentTimeMillis()-millis) + "ms");
     }
 
-    /**
-     * Calls onJoin(TabPlayer) on all features
-     * 
-     * @param   connectedPlayer
-     *          player who connected
-     */
+    @Override
     public void onJoin(TabPlayer connectedPlayer) {
         if (!connectedPlayer.isOnline()) return;
         long millis = System.currentTimeMillis();
@@ -142,14 +137,7 @@ public class FeatureManagerImpl implements FeatureManager {
         }
     }
 
-    /**
-     * Calls onWorldChange(TabPlayer, String, String) on all features
-     * 
-     * @param   playerUUID
-     *          player who switched world
-     * @param   to
-     *          name of the new world
-     */
+    @Override
     public void onWorldChange(UUID playerUUID, String to) {
         TabPlayer changed = TAB.getInstance().getPlayer(playerUUID);
         if (changed == null) return;
@@ -164,21 +152,15 @@ public class FeatureManagerImpl implements FeatureManager {
         ((PlayerPlaceholder)TAB.getInstance().getPlaceholderManager().getPlaceholder(TabConstants.Placeholder.WORLD)).updateValue(changed, to);
     }
 
-    /**
-     * Calls onServerChange(TabPlayer, String, String) on all features
-     * 
-     * @param   playerUUID
-     *          player who switched server
-     * @param   to
-     *          name of the new server
-     */
+    @Override
     public void onServerChange(UUID playerUUID, String to) {
         TabPlayer changed = TAB.getInstance().getPlayer(playerUUID);
         if (changed == null) return;
         String from = changed.getServer();
         ((ITabPlayer)changed).setServer(to);
         ((ProxyTabPlayer)changed).sendJoinPluginMessage();
-        if (!isFeatureEnabled(TabConstants.Feature.PIPELINE_INJECTION)) onLoginPacket(changed);
+        if (!isFeatureEnabled(TabConstants.Feature.PIPELINE_INJECTION) || changed.getVersion().getMinorVersion() < 8)
+            onLoginPacket(changed);
         for (TabFeature f : values) {
             if (!f.overridesMethod("onServerChange")) continue;
             long time = System.nanoTime();
@@ -188,15 +170,7 @@ public class FeatureManagerImpl implements FeatureManager {
         ((PlayerPlaceholder)TAB.getInstance().getPlaceholderManager().getPlaceholder(TabConstants.Placeholder.SERVER)).updateValue(changed, to);
     }
 
-    /**
-     * Calls onCommand(TabPlayer, String) on all features
-     * 
-     * @param   sender
-     *          command sender
-     * @param   command
-     *          command line including /
-     * @return  {@code true} if command should be cancelled, {@code false} if not
-     */
+    @Override
     public boolean onCommand(TabPlayer sender, String command) {
         if (sender == null) return false;
         boolean cancel = false;
@@ -209,6 +183,16 @@ public class FeatureManagerImpl implements FeatureManager {
         return cancel;
     }
 
+    @Override
+    public void markObjective() {
+        objectiveListeners = true;
+    }
+
+    @Override
+    public void markDisplayObjective() {
+        displayObjectiveListeners = true;
+    }
+
     /**
      * Calls onPacketReceive(TabPlayer, Object) on all features
      * 
@@ -281,6 +265,7 @@ public class FeatureManagerImpl implements FeatureManager {
      *          if reflective operation fails
      */
     public void onDisplayObjective(TabPlayer packetReceiver, Object packet) throws ReflectiveOperationException {
+        if (!displayObjectiveListeners) return;
         long time = System.nanoTime();
         PacketPlayOutScoreboardDisplayObjective display = TAB.getInstance().getPlatform().getPacketBuilder().readDisplayObjective(packet);
         TAB.getInstance().getCPUManager().addTime(TabConstants.Feature.PACKET_DESERIALIZING, TabConstants.CpuUsageCategory.PACKET_DISPLAY_OBJECTIVE, System.nanoTime()-time);
@@ -301,6 +286,7 @@ public class FeatureManagerImpl implements FeatureManager {
      *          if reflective operation fails
      */
     public void onObjective(TabPlayer packetReceiver, Object packet) throws ReflectiveOperationException {
+        if (!objectiveListeners) return;
         long time = System.nanoTime();
         PacketPlayOutScoreboardObjective display = TAB.getInstance().getPlatform().getPacketBuilder().readObjective(packet);
         TAB.getInstance().getCPUManager().addTime(TabConstants.Feature.PACKET_DESERIALIZING, TabConstants.CpuUsageCategory.PACKET_OBJECTIVE, System.nanoTime()-time);
@@ -342,4 +328,9 @@ public class FeatureManagerImpl implements FeatureManager {
     public TabFeature getFeature(String name) {
         return features.get(name);
     }
+
+    @Override
+    public TabFeature[] getValues() {
+        return values;
+    }
 }

shared/src/main/java/me/neznamy/tab/shared/GroupManager.java

@@ -1,5 +1,6 @@
 package me.neznamy.tab.shared;
 
+import me.neznamy.tab.api.TabConstants;
 import me.neznamy.tab.api.TabFeature;
 import me.neznamy.tab.api.TabPlayer;
 import me.neznamy.tab.shared.permission.PermissionPlugin;

shared/src/main/java/me/neznamy/tab/shared/ITabPlayer.java

@@ -1,12 +1,10 @@
 package me.neznamy.tab.shared;
 
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 
 import io.netty.channel.Channel;
-import me.neznamy.tab.api.Property;
-import me.neznamy.tab.api.ProtocolVersion;
-import me.neznamy.tab.api.TabFeature;
-import me.neznamy.tab.api.TabPlayer;
+import me.neznamy.tab.api.*;
 import me.neznamy.tab.api.chat.IChatBaseComponent;
 import me.neznamy.tab.api.placeholder.PlayerPlaceholder;
 import me.neznamy.tab.api.protocol.*;
@@ -31,6 +29,9 @@ public abstract class ITabPlayer implements TabPlayer {
     /** Player's unique ID */
     private final UUID uniqueId;
 
+    /** Player's tablist UUID */
+    private final UUID tabListId;
+
     /**
      * World the player is currently in, {@code "N/A"} if TAB is
      * installed on proxy and bukkit bridge is not installed
@@ -94,8 +95,10 @@ public abstract class ITabPlayer implements TabPlayer {
      *          Player's world
      * @param   protocolVersion
      *          Player's game version
+     * @param   useRealId
+     *          Whether tablist uses real uuid or offline
      */
-    protected ITabPlayer(Object player, UUID uniqueId, String name, String server, String world, int protocolVersion) {
+    protected ITabPlayer(Object player, UUID uniqueId, String name, String server, String world, int protocolVersion, boolean useRealId) {
         this.player = player;
         this.uniqueId = uniqueId;
         this.name = name;
@@ -105,6 +108,8 @@ public abstract class ITabPlayer implements TabPlayer {
         this.version = ProtocolVersion.fromNetworkId(protocolVersion);
         this.bedrockPlayer = TAB.getInstance().isFloodgateInstalled() && FloodgateApi.getInstance() != null && FloodgateApi.getInstance().isFloodgatePlayer(uniqueId);
         this.permissionGroup = TAB.getInstance().getGroupManager().detectPermissionGroup(this);
+        UUID offlineId = UUID.nameUUIDFromBytes(("OfflinePlayer:" + name).getBytes(StandardCharsets.UTF_8));
+        this.tabListId = useRealId ? getUniqueId() : offlineId;
     }
 
     /**
@@ -241,12 +246,12 @@ public abstract class ITabPlayer implements TabPlayer {
         } else {
             component = new IChatBaseComponent(message);
         }
-        sendCustomPacket(new PacketPlayOutChat(component, ChatMessageType.CHAT));
+        sendCustomPacket(new PacketPlayOutChat(component, ChatMessageType.SYSTEM));
     }
 
     @Override
     public void sendMessage(IChatBaseComponent message) {
-        sendCustomPacket(new PacketPlayOutChat(message, ChatMessageType.CHAT));
+        sendCustomPacket(new PacketPlayOutChat(message, ChatMessageType.SYSTEM));
     }
 
     @Override
@@ -261,7 +266,7 @@ public abstract class ITabPlayer implements TabPlayer {
 
     @Override
     public UUID getTablistUUID() {
-        return uniqueId;
+        return tabListId;
     }
 
     @Override
@@ -286,7 +291,7 @@ public abstract class ITabPlayer implements TabPlayer {
     }
 
     @Override
-    public synchronized void sendCustomPacket(TabPacket packet) {
+    public void sendCustomPacket(TabPacket packet) {
         if (packet == null) return;
         //avoiding BungeeCord bug kicking all players
         if (packet instanceof PacketPlayOutScoreboardTeam) {
@@ -410,4 +415,8 @@ public abstract class ITabPlayer implements TabPlayer {
     public void setNickname(String nickname) {
         this.nickname = nickname;
     }
+
+    public void setChannel(Channel channel) {
+        this.channel = channel;
+    }
 }

shared/src/main/java/me/neznamy/tab/shared/TAB.java

@@ -114,7 +114,6 @@ public class TAB extends TabAPI {
         this.serverVersionString = serverVersionString;
         this.dataFolder = dataFolder;
         this.logger = logger;
-        TabAPI.setInstance(this);
         try {
             Class.forName("org.geysermc.floodgate.api.FloodgateApi");
             floodgate = true;
@@ -188,7 +187,7 @@ public class TAB extends TabAPI {
             if (configuration.getMysql() != null) configuration.getMysql().closeConnection();
             featureManager.unload();
             sendConsoleMessage("&aDisabled in " + (System.currentTimeMillis()-time) + "ms", true);
-        } catch (Exception e) {
+        } catch (Exception | NoClassDefFoundError e) {
             errorManager.criticalError("Failed to disable", e);
         }
         kill();
@@ -337,15 +336,6 @@ public class TAB extends TabAPI {
         return configuration;
     }
 
-    /**
-     * Returns {@link #disabled}
-     *
-     * @return  {@link #disabled}
-     */
-    public boolean isDisabled() {
-        return disabled;
-    }
-
     /**
      * Returns {@link #command}
      *
@@ -497,6 +487,11 @@ public class TAB extends TabAPI {
 
     @Override
     public void debug(String message) {
-        if (configuration.isDebugMode()) sendConsoleMessage("&9[DEBUG] " + message, true);
+        if (configuration != null && configuration.isDebugMode()) sendConsoleMessage("&9[DEBUG] " + message, true);
+    }
+
+    @Override
+    public boolean isPluginDisabled() {
+        return disabled;
     }
 }

shared/src/main/java/me/neznamy/tab/shared/TabRepeatingTask.java

@@ -1,100 +0,0 @@
-package me.neznamy.tab.shared;
-
-import me.neznamy.tab.api.TabFeature;
-import me.neznamy.tab.api.task.RepeatingTask;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-
-/**
- * Implementation of RepeatingTask interface which submits provided task
- * to TAB's processing thread in configured interval.
- */
-public class TabRepeatingTask implements RepeatingTask {
-
-    /** Executor service to submit the repeating task to */
-    private final ExecutorService exe;
-
-    /** Task to run periodically */
-    private final Runnable runnable;
-
-    /** Feature creating this task, used in cpu command output */
-    private final TabFeature feature;
-
-    /** Sub-feature creating this task, used in cpu command output */
-    private final String type;
-
-    /** Interval in milliseconds how often to submit the task to main thread */
-    private int interval;
-
-    /** Task pointer returned by executor service to allow this task to be cancelled */
-    private Future<?> task;
-
-    /**
-     * Constructs new instance with given parameters and starts the task.
-     *
-     * @param   exe
-     *          Executor service to submit the repeating task to
-     * @param   runnable
-     *          Task to run periodically
-     * @param   feature
-     *          Feature creating this task, used in cpu command output
-     * @param   type
-     *          Sub-feature creating this task, used in cpu command output
-     * @param   interval
-     *          Interval in milliseconds how often to submit the task to main thread
-     */
-    public TabRepeatingTask(ExecutorService exe, Runnable runnable, TabFeature feature, String type, int interval) {
-        if (interval < 0) throw new IllegalArgumentException("Interval cannot be negative");
-        this.exe = exe;
-        this.runnable = runnable;
-        this.feature = feature;
-        this.type = type;
-        this.interval = interval;
-        createTask();
-    }
-
-    /**
-     * Creates the repeating task and submits it to executor service.
-     */
-    private void createTask() {
-        task = exe.submit(() -> {
-            long nextLoop = System.currentTimeMillis();
-            while (true) {
-                try {
-                    nextLoop += interval;
-                    long sleep = nextLoop - System.currentTimeMillis();
-                    if (sleep > interval) sleep = interval; //servers who travel back in time
-                    if (sleep > 0) Thread.sleep(sleep);
-                    if (feature != null) {
-                        TAB.getInstance().getCPUManager().runMeasuredTask(feature, type, runnable);
-                    } else {
-                        TAB.getInstance().getCPUManager().runTask(runnable);
-                    }
-                } catch (InterruptedException pluginDisabled) {
-                    Thread.currentThread().interrupt();
-                    break;
-                }
-            } 
-        });
-    }
-
-    @Override
-    public int getInterval() {
-        return interval;
-    }
-
-    @Override
-    public void setInterval(int interval) {
-        if (interval < 0) throw new IllegalArgumentException("Interval cannot be negative");
-        //restarting task to break sleep in case of interval reduction
-        cancel();
-        this.interval = interval;
-        createTask();
-    }
-
-    @Override
-    public void cancel() {
-        task.cancel(true);
-    }
-}

shared/src/main/java/me/neznamy/tab/shared/command/BossBarCommand.java

@@ -3,7 +3,7 @@ package me.neznamy.tab.shared.command;
 import me.neznamy.tab.api.TabPlayer;
 import me.neznamy.tab.api.bossbar.BossBarManager;
 import me.neznamy.tab.shared.TAB;
-import me.neznamy.tab.shared.TabConstants;
+import me.neznamy.tab.api.TabConstants;
 
 /**
  * Handler for "/tab bossbar" subcommand

shared/src/main/java/me/neznamy/tab/shared/command/CpuCommand.java

@@ -12,7 +12,7 @@ import me.neznamy.tab.api.chat.EnumChatFormat;
 import me.neznamy.tab.api.chat.IChatBaseComponent;
 import me.neznamy.tab.api.placeholder.Placeholder;
 import me.neznamy.tab.shared.TAB;
-import me.neznamy.tab.shared.TabConstants;
+import me.neznamy.tab.api.TabConstants;
 
 /**
  * Handler for "/tab cpu" subcommand

shared/src/main/java/me/neznamy/tab/shared/command/DebugCommand.java

@@ -7,9 +7,10 @@ import java.util.Map;
 import me.neznamy.tab.api.TabFeature;
 import me.neznamy.tab.api.TabPlayer;
 import me.neznamy.tab.api.chat.EnumChatFormat;
+import me.neznamy.tab.api.config.ConfigurationFile;
 import me.neznamy.tab.shared.DynamicText;
 import me.neznamy.tab.shared.TAB;
-import me.neznamy.tab.shared.TabConstants;
+import me.neznamy.tab.api.TabConstants;
 import me.neznamy.tab.shared.features.PlayerList;
 import me.neznamy.tab.shared.features.nametags.NameTag;
 
@@ -59,6 +60,7 @@ public class DebugCommand extends SubCommand {
         sendMessage(sender, "&6Permission plugin: &b" + TAB.getInstance().getGroupManager().getPlugin().getName());
         sendMessage(sender, "&6Permission group choice logic: &b" + getGroupChoiceLogic());
         sendMessage(sender, "&6Sorting system: &b" + getSortingType());
+        sendMessage(sender, "&6Storage type: &b" + (tab.getConfiguration().getGroups() instanceof ConfigurationFile ? "File" : "MySQL"));
         sendMessage(sender, separator);
         if (analyzed == null) return;
         sendMessage(sender, "&ePlayer: &a" + analyzed.getName());

shared/src/main/java/me/neznamy/tab/shared/command/GroupCommand.java

@@ -5,7 +5,7 @@ import java.util.stream.Collectors;
 
 import me.neznamy.tab.api.TabPlayer;
 import me.neznamy.tab.shared.TAB;
-import me.neznamy.tab.shared.TabConstants;
+import me.neznamy.tab.api.TabConstants;
 
 /**
  * Handler for "/tab group" subcommand
@@ -41,11 +41,11 @@ public class GroupCommand extends PropertyCommand {
         String server = null;
         if (args[args.length-2].equals("-w")) {
             world = args[args.length-1];
-            value = value.substring(0, value.length()-world.length()-4);
+            value = value.startsWith("-w") ? "" : value.substring(0, value.length()-world.length()-4);
         }
         if (args[args.length-2].equals("-s")) {
             server = args[args.length-1];
-            value = value.substring(0, value.length()-server.length()-4);
+            value = value.startsWith("-s") ? "" : value.substring(0, value.length()-server.length()-4);
         }
         if ((value.startsWith("\"") && value.endsWith("\"")) || (value.startsWith("'") && value.endsWith("'"))) {
             value = value.substring(1, value.length()-1);

shared/src/main/java/me/neznamy/tab/shared/command/GroupsCommand.java

@@ -2,7 +2,7 @@ package me.neznamy.tab.shared.command;
 
 import me.neznamy.tab.api.TabPlayer;
 import me.neznamy.tab.shared.TAB;
-import me.neznamy.tab.shared.TabConstants;
+import me.neznamy.tab.api.TabConstants;
 
 /**
  * Handler for "/tab groups" subcommand

shared/src/main/java/me/neznamy/tab/shared/command/MySQLCommand.java

@@ -3,7 +3,7 @@ package me.neznamy.tab.shared.command;
 import me.neznamy.tab.api.PropertyConfiguration;
 import me.neznamy.tab.api.TabPlayer;
 import me.neznamy.tab.shared.TAB;
-import me.neznamy.tab.shared.TabConstants;
+import me.neznamy.tab.api.TabConstants;
 import me.neznamy.tab.shared.config.Configs;
 import me.neznamy.tab.shared.config.MySQL;
 import me.neznamy.tab.shared.config.file.YamlPropertyConfigurationFile;

shared/src/main/java/me/neznamy/tab/shared/command/NameTagCommand.java

@@ -3,12 +3,10 @@ package me.neznamy.tab.shared.command;
 import me.neznamy.tab.api.TabPlayer;
 import me.neznamy.tab.api.team.TeamManager;
 import me.neznamy.tab.shared.TAB;
-import me.neznamy.tab.shared.TabConstants;
+import me.neznamy.tab.api.TabConstants;
 import me.neznamy.tab.shared.features.nametags.unlimited.NameTagX;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
+import java.util.*;
 
 /**
  * Handler for "/tab nametag" subcommand
@@ -24,16 +22,18 @@ public class NameTagCommand extends SubCommand {
 
     @Override
     public void execute(TabPlayer sender, String[] args) {
-        if (args.length != 1) {
+        if (args.length == 0 || args.length > 3) {
             sendMessages(sender, getMessages().getNameTagHelpMenu());
             return;
         }
+        boolean silent = args.length >= 3 && args[2].equals("-s");
+
         switch (args[0].toLowerCase(Locale.US)) {
             case "preview":
-                preview(sender);
+                preview(sender,getTarget(sender, args, TabConstants.Permission.COMMAND_NAMETAG_PREVIEW_OTHER, TabConstants.Permission.COMMAND_NAMETAG_PREVIEW),silent);
                 break;
             case "toggle":
-                toggle(sender);
+                toggle(sender,getTarget(sender, args, TabConstants.Permission.COMMAND_NAMETAG_TOGGLE_OTHER, TabConstants.Permission.COMMAND_NAMETAG_TOGGLE),silent);
                 break;
             default:
                 sendMessages(sender, getMessages().getNameTagHelpMenu());
@@ -41,46 +41,54 @@ public class NameTagCommand extends SubCommand {
         }
     }
 
-    private void preview(TabPlayer sender) {
-        if (sender == null) {
-            sendMessage(null, getMessages().getCommandOnlyFromGame());
-            return;
-        }
-        if (!hasPermission(sender, TabConstants.Permission.COMMAND_NAMETAG_PREVIEW)) {
-            sendMessage(sender, getMessages().getNoPermission());
-            return;
-        }
+    private void preview(TabPlayer sender, TabPlayer target, boolean silent) {
+        if (target == null) return;
+
         NameTagX nameTagX = (NameTagX) TAB.getInstance().getFeatureManager().getFeature(TabConstants.Feature.UNLIMITED_NAME_TAGS);
         if (nameTagX == null) {
             sendMessage(sender, getMessages().getUnlimitedNametagModeNotEnabled());
             return;
         }
-        if (nameTagX.hasDisabledArmorStands(sender)) {
+        if (nameTagX.hasDisabledArmorStands(target)) {
             sendMessage(sender, getMessages().getArmorStandsDisabledCannotPreview());
             return;
         }
-        nameTagX.toggleNametagPreview(sender);
+        nameTagX.toggleNametagPreview(target, !silent);
     }
 
-    private void toggle(TabPlayer sender) {
-        if (sender == null) {
-            sendMessage(null, getMessages().getCommandOnlyFromGame());
-            return;
-        }
-        if (!hasPermission(sender, TabConstants.Permission.COMMAND_NAMETAG_TOGGLE)) {
-            sendMessage(sender, getMessages().getNoPermission());
-            return;
-        }
+    private void toggle(TabPlayer sender, TabPlayer target, boolean silent) {
+        if (target == null) return;
+
         TeamManager teams = TAB.getInstance().getTeamManager();
         if (teams == null) {
             sendMessage(sender, getMessages().getNameTagFeatureNotEnabled());
             return;
         }
-        teams.toggleNameTagVisibilityView(sender, true);
+        teams.toggleNameTagVisibilityView(target, !silent);
+    }
+
+    private TabPlayer getTarget(TabPlayer sender, String[] args, String permissionOther, String permission) {
+        if (args.length >= 2 && TAB.getInstance().getPlayer(args[1]) != null) {
+            if (hasPermission(sender, permissionOther)) {
+                return TAB.getInstance().getPlayer(args[1]);
+            } else {
+                sendMessage(sender, getMessages().getNoPermission());
+            }
+        } else {
+            if (hasPermission(sender, permission)) {
+                return sender;
+            } else {
+                sendMessage(sender, getMessages().getNoPermission());
+            }
+        }
+        return null;
     }
 
     @Override
     public List<String> complete(TabPlayer sender, String[] arguments) {
-        return getStartingArgument(Arrays.asList("preview", "toggle"), arguments[0]);
+        if (arguments.length == 1) return getStartingArgument(Arrays.asList("toggle", "preview"), arguments[0]);
+        if (arguments.length == 2) return getOnlinePlayers(arguments[1]);
+        if (arguments.length == 3) return getStartingArgument(Collections.singletonList("-s"), arguments[2]);
+        return new ArrayList<>();
     }
 }

shared/src/main/java/me/neznamy/tab/shared/command/ParseCommand.java

@@ -11,10 +11,10 @@ import me.neznamy.tab.api.chat.IChatBaseComponent;
 import me.neznamy.tab.api.placeholder.Placeholder;
 import me.neznamy.tab.shared.DynamicText;
 import me.neznamy.tab.shared.TAB;
-import me.neznamy.tab.shared.TabConstants;
+import me.neznamy.tab.api.TabConstants;
 
 /**
- * Handler for "/tab parse <player> <placeholder>" subcommand
+ * Handler for "/tab parse &lt;player&gt; &lt;placeholder&gt;" subcommand
  */
 public class ParseCommand extends SubCommand {
 

shared/src/main/java/me/neznamy/tab/shared/command/PlayerCommand.java

@@ -5,7 +5,7 @@ import java.util.List;
 
 import me.neznamy.tab.api.TabPlayer;
 import me.neznamy.tab.shared.TAB;
-import me.neznamy.tab.shared.TabConstants;
+import me.neznamy.tab.api.TabConstants;
 
 /**
  * Handler for "/tab player" subcommand
@@ -33,11 +33,11 @@ public class PlayerCommand extends PropertyCommand {
         String server = null;
         if (args[args.length-2].equals("-w")) {
             world = args[args.length-1];
-            value = value.substring(0, value.length()-world.length()-4);
+            value = value.startsWith("-w") ? "" : value.substring(0, value.length()-world.length()-4);
         }
         if (args[args.length-2].equals("-s")) {
             server = args[args.length-1];
-            value = value.substring(0, value.length()-server.length()-4);
+            value = value.startsWith("-s") ? "" : value.substring(0, value.length()-server.length()-4);
         }
         if ((value.startsWith("\"") && value.endsWith("\"")) || (value.startsWith("'") && value.endsWith("'"))) {
             value = value.substring(1, value.length()-1);