4.1.5

[Bukkit] Add support for latest 1.21 snapshot
[Sorting] Fix number compression bug (#1297 )
2024-05-27 15:58:52 +02:00 · 2024-05-27 13:46:47 +02:00 · 2024-05-26 12:38:28 +02:00 · 2024-05-22 10:14:52 +02:00 · 2024-05-20 12:41:07 +02:00 · 2024-05-20 11:08:08 +02:00
558 changed files with 37254 additions and 91914 deletions
@@ -0,0 +1,7 @@
+* text=auto
+
+*.sh text eol=lf
+gradlew text eol=lf
+*.bat text eol=crlf
+
+*.jar binary
@@ -1,28 +0,0 @@
---
-name: Bug report
-about: Report a bug
-title: ''
-labels: ''
-assignees: ''
-
---
-
-**Server version**
-
-
-**Plugin version** ("latest" is not a version)
-
-
-**Describe the bug**
-
-
-**How to reproduce**
-
-
-**Expected behavior**
-
-
-**Actual behavior**
-
-
-**Additional info** (errors, screenshots, ...)
@@ -0,0 +1,73 @@
+name: Bug Report
+description: Plugin does not work as described.
+labels: ["Type: Bug"]
+body:
+  - type: input
+    attributes:
+      label: Server version
+      description: Version and type of used server software where TAB is installed.
+      placeholder: Spigot 1.18.1
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: TAB version
+      description: Full version in numbers, "latest" is not a version.
+      placeholder: 3.0.2
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Plugin list
+      description: Full list of plugins (output of /plugins)
+      placeholder: ...
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Describe the bug
+      description: How the plugin behaves
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Expected behavior
+      description: How the plugin is supposed to behave instead with your configuration.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      description: What to do in order to reproduce this issue
+      placeholder: |
+        Step 1: ..
+        Step 2: ..
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Additional info
+      description: Anything else you want to provide that will help in resolving the issue faster, such as screenshots or videos.
+    validations:
+      required: false
+  - type: checkboxes
+    attributes:
+      label: Checklist
+      description: Let's make sure this report is valid
+      options:
+        - label: I am running latest version of the plugin
+          required: true
+        - label: I have read the wiki to make sure it's not an issue with configuration
+          required: true
+        - label: I ticked all of the boxes without actually reading them
+          required: false
+        - label: I have read the Compatibility wiki page and am not trying to run the plugin on an unsupported server version / platform
+          required: true
+        - label: I am willing to cooperate to get this issue resolved faster, including providing any additional information requested or testing new builds
+          required: true
@@ -0,0 +1,38 @@
+name: Compatibility issue
+description: A compatibility issue with another plugin/mod or a specific version of a platform marked as supported
+labels: ["Type: Compatibility issue"]
+body:
+  - type: input
+    attributes:
+      label: TAB version
+      description: Full version in numbers, "latest" is not a version.
+      placeholder: 4.0.0
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Software causing compatibility issue
+      description: plugin/mod/platform version causing the issue
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Additional info
+      description: Anything else you want to provide that will help in resolving the issue faster.
+    validations:
+      required: false
+  - type: checkboxes
+    attributes:
+      label: Checklist
+      description: Let's make sure this report is valid
+      options:
+        - label: I am running latest version of the plugin
+          required: true
+        - label: I ticked all of the boxes without actually reading them
+          required: false
+        - label: The compatibility wiki page does not mention this incompatibility
+          required: true
+        - label: I am willing to cooperate to get this issue resolved faster, including providing any additional information requested or testing new builds
+          required: true
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Support
+    url: https://discord.gg/YPqXt63YQj
+    about: Fresh new community discord providing support with all plugins, including TAB
@@ -0,0 +1,57 @@
+name: Error
+description: Error message with a stack trace in console or error file.
+labels: ["Type: Error"]
+body:
+  - type: input
+    attributes:
+      label: Server version
+      description: Version and type of used server software where TAB is installed.
+      placeholder: Spigot 1.18.1
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: TAB version
+      description: Full version in numbers, "latest" is not a version.
+      placeholder: 3.0.2
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Stack trace
+      description: The error message and stack trace you received in console or errors.log file.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Steps to reproduce (if known)
+      description: What to do in order to reproduce this issue
+      placeholder: |
+        Step 1: ..
+        Step 2: ..
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Additional info
+      description: Any other info you want to provide.
+    validations:
+      required: false
+
+  - type: checkboxes
+    attributes:
+      label: Checklist
+      description: Let's make sure this report is valid
+      options:
+        - label: I am running latest version of the plugin
+          required: true
+        - label: I have included a paste of the error
+          required: true
+        - label: I ticked all of the boxes without actually reading them
+          required: false
+        - label: I have read the Compatibility wiki page and am not trying to run the plugin on an unsupported server version / platform
+          required: true
@@ -0,0 +1,56 @@
+name: Memory leak
+description: Memory leak caused by TAB.
+labels: ["Type: Memory leak"]
+body:
+  - type: input
+    attributes:
+      label: Server version
+      description: Version and type of used server software where TAB is installed.
+      placeholder: Spigot 1.18.1
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: TAB version
+      description: Full version in numbers, "latest" is not a version.
+      placeholder: 3.0.2
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Heap dump
+      description: Link to uploaded memory dump which I can look into.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Uncleared object(s)
+      description: Objects you believe should have been removed from the memory but are not
+      placeholder: |
+        There is only 1 player online, but heap dump has 100 instances of TabPlayer
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Additional info
+      description: Any other info you want to provide.
+    validations:
+      required: false
+
+  - type: checkboxes
+    attributes:
+      label: Checklist
+      description: Let's make sure this report is valid
+      options:
+        - label: I am running latest version of the plugin
+          required: true
+        - label: I have included download link of my heap dump
+          required: true
+        - label: I ticked all of the boxes without actually reading them
+          required: false
+        - label: I have explained what I believe is wrong with the heap dump
+          required: true
@@ -0,0 +1,55 @@
+name: Performance issue
+description: Performance issue in TAB or in server caused by TAB
+labels: ["Type: Performance"]
+body:
+  - type: input
+    attributes:
+      label: Server version
+      description: Version and type of used server software where TAB is installed.
+      placeholder: Spigot 1.18.1
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: TAB version
+      description: Full version in numbers, "latest" is not a version.
+      placeholder: 3.0.2
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Evidence
+      description: Any evidence proving the performance issue, such as output of /tab cpu or timings.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Steps to reproduce (if known)
+      description: What to do in order to reproduce this issue
+      placeholder: |
+        Step 1: ..
+        Step 2: ..
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Additional info
+      description: Any other info you want to provide.
+    validations:
+      required: false
+
+  - type: checkboxes
+    attributes:
+      label: Checklist
+      description: Let's make sure this report is valid
+      options:
+        - label: I am running latest version of the plugin
+          required: true
+        - label: I have included sufficient evidence of the issue
+          required: true
+        - label: I ticked all of the boxes without actually reading them
+          required: false
@@ -0,0 +1,29 @@
+name: Wiki change
+description: Change to text on a wiki page or adding a new section.
+labels: ["Type: Wiki change"]
+body:
+  - type: input
+    attributes:
+      label: Page link
+      description: Link to the page that should receive the change.
+      placeholder: https://github.com/NEZNAMY/TAB/wiki/Installation
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Current text (if applicable)
+      description: Current version of the text (if modifying), ignore in case of new section.
+      placeholder: |
+        Installation on Bukkit/Spigot/Paper is as simple as it can be. Just put the plugin into plugins folder and restart the server. You can also run `/plugman load tab` to load the plugin while server is running.
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: New text
+      description: What the text should be changed to / how should new section look
+      placeholder: |
+        Put the plugin into plugins folder and restart the server. In case you don't want to restart your server, loading with plugins like PlugMan is supported.
+    validations:
+      required: true
@@ -3,29 +3,27 @@ on:
  push:
    branches:
      - master
-      - v3
-  pull_request:
-    types: [opened, synchronize, reopened]
 jobs:
  build:
    name: Build
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4 #https://github.com/actions/checkout/releases
        with:
          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4 #https://github.com/actions/setup-java/releases
        with:
-          java-version: 11
+          distribution: 'temurin'
+          java-version: 21
      - name: Cache SonarCloud packages
-        uses: actions/cache@v1
+        uses: actions/cache@v3.2.3 #https://github.com/actions/cache/releases
        with:
          path: ~/.sonar/cache
          key: ${{ runner.os }}-sonar
          restore-keys: ${{ runner.os }}-sonar
      - name: Cache Gradle
-        uses: actions/cache@v2
+        uses: actions/cache@v3.2.3 #https://github.com/actions/cache/releases
        with:
          path: |
            ~/.gradle/caches
@@ -38,7 +36,7 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
        run: ./gradlew clean build
      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v2.3.1
+        uses: actions/upload-artifact@v3.1.2 #https://github.com/actions/upload-artifact/releases
        with:
-          name: Jar
+          name: Click here to download
          path: jar/build/libs/TAB-**.jar
@@ -33,7 +33,6 @@ hs_err_pid*
 .idea/

 # other
-.gitattributes
 *.iml
 run/

@@ -0,0 +1,9 @@
+If this plugin has helped you in any way, and you would like to return something back 
+to make the plugin even better, there is a lot of ways to contribute:  
+* Open a **pull request** containing a new feature or a bug fix, which you believe many users will benefit from.
+* Make detailed high-quality **bug reports**. The difference between a bug getting fixed in 1 week vs 1 hour 
+is in quality of the report (typically providing correct steps to reproduce that actually work).
+* Test **experimental builds**, which can be found in [GitHub Actions](https://github.com/NEZNAMY/TAB/actions) for problems of any kind including bugs. 
+This way you will help make the actual releases more stable / help get stable releases sooner.
+* Help improve the wiki by opening a [Wiki change issue](https://github.com/NEZNAMY/TAB/issues/new?assignees=&labels=Wiki&template=wiki_change.yml), 
+where you can improve existing descriptions, add information you found missing, fix typos / grammar mistakes or add more examples.
@@ -1,4 +1,4 @@
-Apache License
+                                 Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/

@@ -172,30 +172,3 @@ Apache License
      defend, and hold each Contributor harmless for any liability
      incurred by, or claims asserted against, such Contributor by reason
      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
@@ -1,41 +1,58 @@
 # About
 TAB aims to be a superior all-in-one minecraft plugin for displaying information that outperforms all 
-similar plugins in terms of features, performance, compatibility and support.  
+similar plugins in terms of features, performance and compatibility.  
 More information can be found at [Why TAB?](https://github.com/NEZNAMY/TAB/wiki/Why-TAB%3F) wiki page.

-# Distribution
-As of TAB 3.0.0, released with MC 1.18 (November 30th, 2021), there is no free / premium
-version anymore. Only one version of the plugin exists now, which contains all implemented features
-and is available to everyone for free. However, official support on discord is only provided to 
-those who have purchased the plugin.  
+# Download
+### Releases
+You can download full releases from [GitHub releases](https://github.com/NEZNAMY/TAB/releases), 
+[SpigotMC](https://www.spigotmc.org/resources/57806/), [Modrinth](https://modrinth.com/plugin/tab-was-taken) or [BuiltByBit](https://builtbybit.com/resources/20631).
+
+### Dev builds
+Plugin's development is continuous and contains lots of small changes/fixes not worthy of being called a full
+update, therefore development builds are being created and eventually a full update is released when enough changes are made.  
+If you want to benefit from a recent change in the code before official release, you can download development builds
+from [GitHub actions](https://github.com/NEZNAMY/TAB/actions) (you must be logged into GitHub to be able to download it).  

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

-# Links
-The precompiled JAR can be downloaded for free from 
-[github releases](https://github.com/NEZNAMY/TAB/releases)
-and [MC-Market](https://www.mc-market.org/resources/20631/).  
-  
-If you want to show your appreciation for my work, you can purchase the plugin on 
-[MC-Market](https://www.mc-market.org/resources/14009/),
-[Polymart](https://polymart.org/resource/484) or just [send a donation](https://paypal.me/neznamy1).
-  
-Support is provided to buyers on [discord](https://discord.gg/EaSvdk6).  
-
-A detailed explanation of all the plugin's functions can be found on the 
-[wiki](https://github.com/NEZNAMY/TAB/wiki).
+# Documentation
+You can find everything about the plugin on the [Wiki](https://github.com/NEZNAMY/TAB/wiki). This includes a detailed description
+of all features, as well as information regarding compatibility or limitations of each feature.  

 # Issues
-The [Issues](https://github.com/NEZNAMY/TAB/issues) section is **only** available for **bug reports**
-or other issues which are not directly a bug (performance issues, errors, etc.).
-Support is provided on discord and feature requests are currently not accepted due to high demand and
-being busy with bug reports, which take priority over new features. 
-We are not looking to add any new major features anymore. 
-We would rather spend time improving existing features instead.  
+The [Issues](https://github.com/NEZNAMY/TAB/issues) section is an issue tracker for all the kind of problems covered in issue templates.
+Please refrain from attempting to use it to receive help with your server, such issues will be closed immediately.  
+When opening an issue, provide as much information as possible. The difference between a bug getting fixed in 1 week vs 1 hour
+is in quality of the report. Bug reports where steps to reproduce are "idk" have no value and will not help to get the bug fixed at all.  
+
+# Contributing
+See [CONTRIBUTING.md](https://github.com/NEZNAMY/TAB/blob/master/CONTRIBUTING.md)
+
+# Provided services
+The plugin is being used by a large amount of servers, which also means the demand for my attention is high. Unfortunately, 
+I am no longer able to keep up with the demand since I don't want to dedicate my whole existence to a free plugin. 
+In order to provide the best quality of all provided services, the amount of services provided may vary over time. 
+Here is the full list of potential services and their status:
+
+| Service type                  | Availability |
+|-------------------------------|--------------|
+| Updates for new MC versions   | ✔            |
+| Bug fixes                     | ✔            |
+| Wiki updates<sup>1</sup>      | ✔            |
+| Feature requests              | ❌            |
+| Customer support<sup>2</sup>  | ✔            |
+| Free user support<sup>3</sup> | ❌*           |
+| Optimization<sup>4</sup>      | ✔            |
+
+<sup>1</sup> - Adding new examples, guides and other kind of useful information people ask about.  
+<sup>2</sup> - Unrestricted assistance with the plugin for those, who bought a copy of the plugin when it was purchasable.  
+<sup>3</sup> - Unlimited access to my free time for everyone in the world.  
+<sup>4</sup> - Improving plugin's performance while not losing out on any features. This was done 
+proactively a lot in the past, so there isn't much to do anymore, only if someone actually finds and reports something.  
  
-When opening a bug report, make sure you provide all necessary information to reproduce the bug,
-otherwise we will not able to fix it. Saying "it only occurs randomly" or "I don't know how to 
-reproduce it" has no value and cannot be converted into actual code.
+*Instead, you can use [this fresh new community discord](https://discord.gg/YPqXt63YQj) made by a nice person who will provide this service.  
@@ -0,0 +1,2 @@
+# Security Policy
+If you found a security issue, send me a private message anywhere.
@@ -1,9 +1,7 @@
 dependencies {
-    compileOnlyApi(libs.netty)
-    api(libs.jsonSimple) {
-        exclude("junit", "junit")
-    }
-    compileOnlyApi(libs.snakeyaml)
-    api(libs.yamlAssist)
-    compileOnlyApi(libs.gson)
+    compileOnlyApi("org.jetbrains:annotations:24.1.0")
+}
+
+tasks.javadoc {
+    enabled = project.hasProperty("enable-javadoc")
 }
@@ -1,82 +0,0 @@
-package me.neznamy.tab.api;
-
-public interface ArmorStand {
-
-	/**
-	 * Returns true if offset is static, false if not
-	 * @return true if static, false if dynamic
-	 */
-	boolean hasStaticOffset();
-	
-	/**
-	 * Changes offset of the armor stand
-	 * @param offset - new offset
-	 */
-	void setOffset(double offset);
-
-	/**
-	 * Returns offset of the armor stand
-	 * @return offset from base
-	 */
-	double getOffset();
-	
-	/**
-	 * Returns property for armor stand's name
-	 * @return property for armor stand's name
-	 */
-	Property getProperty();
-	
-	/**
-	 * Teleports armor stand to owner's current location for everyone in range
-	 */
-	void teleport();
-	
-	/**
-	 * Teleports armor stand to owner's current location for specified player
-	 * @param viewer - player to send packet to
-	 */
-	void teleport(TabPlayer viewer);
-	
-	/**
-	 * Changes sneaking flag and sends packets to everyone in range
-	 * @param	sneaking
-	 * 			new sneaking status
-	 */
-	void sneak(boolean sneaking);
-	
-	/**
-	 * DeSpawns armor stand for everyone
-	 */
-	void destroy();
-	
-	/**
-	 * DeSpawns armor stand for specified player
-	 * @param viewer - player to send packet to
-	 */
-	void destroy(TabPlayer viewer);
-	
-	/**
-	 * Updates armor stand's name if needed
-	 */
-	void refresh();
-	
-	/**
-	 * Updates visibility if needed
-	 * @param force - if refresh should be forced
-	 */
-	void updateVisibility(boolean force);
-	
-	/**
-	 * Returns entity ID of this armor stand
-	 * @return entity ID of this armor stand
-	 */
-	int getEntityId();
-	
-	/**
-	 * Spawns armor stand for specified player
-	 * @param viewer - player to spawn for
-	 */
-	void spawn(TabPlayer viewer);
-	
-	void respawn(TabPlayer viewer);
-}
@@ -1,170 +0,0 @@
-package me.neznamy.tab.api;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * A helper class for easy management of armor stands of a player
- */
-public class ArmorStandManager {
-
-	//map of registered armor stands
-	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
-	private ArmorStand[] armorStandArray = new ArmorStand[0];
-	
-	private TabPlayer[] nearbyPlayerArray = new TabPlayer[0];
-	
-	/**
-	 * Adds armor stand into list
-	 * @param name - key name of the armor stand
-	 * @param as - armor stand to add
-	 */
-	public void addArmorStand(String name, ArmorStand as) {
-		armorStands.put(name, as);
-		armorStandArray = armorStands.values().toArray(new ArmorStand[0]);
-		for (TabPlayer p : nearbyPlayerArray) as.spawn(p);
-	}
-	
-	/**
-	 * Returns armor stand with given name or null if not present
-	 * @param name - name of armor stand registered with
-	 * @return armor stand with given name
-	 */
-	public ArmorStand getArmorStand(String name) {
-		return armorStands.get(name);
-	}
-
-	/**
-	 * Removes armor stand from list. It is not automatically destroyed for players
-	 * @param name - name of armor stand to remove
-	 */
-	public void removeArmorStand(String name) {
-		armorStands.get(name).destroy();
-		armorStands.remove(name);
-		armorStandArray = armorStands.values().toArray(new ArmorStand[0]);
-	}
-
-	/**
-	 * Spawns all armor stands for specified viewer and adds them into nearby players
-	 * @param viewer - player to spawn armor stands for
-	 */
-	public void spawn(TabPlayer viewer) {
-		nearbyPlayers.add(viewer);
-		nearbyPlayerArray = nearbyPlayers.toArray(new TabPlayer[0]);
-		if (viewer.getVersion().getMinorVersion() < 8) return;
-		for (ArmorStand a : armorStandArray) a.spawn(viewer);
-	}
-
-	/**
-	 * Sets sneak value of armor stands to specified value
-	 * @param sneaking - new sneaking status
-	 */
-	public void sneak(boolean sneaking) {
-		for (ArmorStand a : armorStandArray) a.sneak(sneaking);
-	}
-
-	/**
-	 * Teleports armor stands to player's current location for all nearby players
-	 */
-	public void teleport() {
-		for (ArmorStand a : armorStandArray) a.teleport();
-	}
-
-	/**
-	 * Teleports armor stands to player's current location for specified viewer
-	 * @param viewer - player to teleport armor stands for
-	 */
-	public void teleport(TabPlayer viewer) {
-		for (ArmorStand a : armorStandArray) a.teleport(viewer);
-	}
-
-	/**
-	 * Refreshes name of all armor stands for all nearby players
-	 */
-	public void refresh() {
-		for (ArmorStand a : armorStandArray) a.refresh();
-	}
-
-	/**
-	 * Updates armor stand visibility for all armor stands
-	 * @param force - true if packets should be sent despite seemingly not needed
-	 */
-	public void updateVisibility(boolean force) {
-		for (ArmorStand a : armorStandArray) a.updateVisibility(force);
-	}
-
-	/**
-	 * Removes specified player from list of nearby players
-	 * @param viewer - player to remove
-	 */
-	public void unregisterPlayer(TabPlayer viewer) {
-		if (nearbyPlayers.remove(viewer)) nearbyPlayerArray = nearbyPlayers.toArray(new TabPlayer[0]);
-	}
-
-	/**
-	 * Sends destroy packet of all armor stands to everyone and clears nearby players list
-	 */
-	public void destroy() {
-		for (ArmorStand a : armorStandArray) a.destroy();
-		nearbyPlayers.clear();
-		nearbyPlayerArray = new TabPlayer[0];
-	}
-
-	/**
-	 * Sends destroy packet of all armor stands to specified player and removes them from nearby players list
-	 * @param viewer - player to destroy armor stands for
-	 */
-	public void destroy(TabPlayer viewer) {
-		for (ArmorStand a : armorStandArray) a.destroy(viewer);
-		unregisterPlayer(viewer);
-	}
-
-	/**
-	 * Returns true if manager contains armor stand with specified entity id, false if not
-	 * @param entityId - entity id
-	 * @return true if armor stand with specified entity id exists, false if not
-	 */
-	public boolean hasArmorStandWithID(int entityId) {
-		for (ArmorStand a : armorStandArray) {
-			if (a.getEntityId() == entityId) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Returns array of all registered armor stands
-	 * @return armor stand array
-	 */
-	public ArmorStand[] getArmorStands(){
-		return armorStandArray;
-	}
-
-	/**
-	 * Returns array of nearby players
-	 * @return array of nearby players
-	 */
-	public TabPlayer[] getNearbyPlayers(){
-		return nearbyPlayerArray;
-	}
-	
-	public boolean isNearby(TabPlayer viewer) {
-		return nearbyPlayers.contains(viewer);
-	}
-	
-	public void respawn() {
-		for (ArmorStand a : armorStandArray) {
-			for (TabPlayer viewer : nearbyPlayerArray) {
-				a.respawn(viewer);
-			}
-		}
-	}
-}
@@ -1,35 +0,0 @@
-package me.neznamy.tab.api;
-
-public interface FeatureManager {
-
-	/**
-	 * Registers a feature, which will start receiving events
-	 * 
-	 * @param name - name of feature
-	 * @param feature - the handler
-	 */
-	void registerFeature(String name, TabFeature feature);
-	
-	/**
-	 * Unregisters feature making it no longer receive events. This does not run unload method nor cancel
-	 * tasks created by the feature
-	 * @param name - feature name defined in registerFeature
-	 */
-	void unregisterFeature(String name);
-	
-	/**
-	 * Returns whether a feature with said name is registered or not
-	 * 
-	 * @param name - name of feature defined in registerFeature method
-	 * @return true if feature exists, false if not
-	 */
-	boolean isFeatureEnabled(String name);
-
-	/**
-	 * Returns feature handler by its name
-	 * 
-	 * @param name - name of feature defined in registerFeature method
-	 * @return the feature or null if feature does not exist
-	 */
-	TabFeature getFeature(String name);
-}
@@ -1,16 +0,0 @@
-package me.neznamy.tab.api;
-
-public interface HeaderFooterManager {
-
-	void setHeader(TabPlayer player, String header);
-	
-	void setFooter(TabPlayer player, String footer);
-	
-	void setHeaderAndFooter(TabPlayer player, String header, String footer);
-	
-	void resetHeader(TabPlayer player);
-	
-	void resetFooter(TabPlayer player);
-	
-	void resetHeaderAndFooter(TabPlayer player);
-}
@@ -1,60 +0,0 @@
-package me.neznamy.tab.api;
-
-public interface Property {
-
-	/**
-	 * Changes raw value to new one
-	 * @param rawValue - new value to be used
-	 */
-	void changeRawValue(String rawValue);
-
-	/**
-	 * Returns original raw value ignoring API calls
-	 * @return original raw value
-	 */
-	String getOriginalRawValue();
-
-	/**
-	 * Temporarily overrides current raw value with an API call
-	 * @param temporaryValue - temporary value to be assigned
-	 */
-	void setTemporaryValue(String temporaryValue);
-	
-	/**
-	 * Returns current temporary value
-	 * @return temporary value or null if not set
-	 */
-	String getTemporaryValue();
-
-	/**
-	 * Returns temporary value (via API) if present, raw value otherwise
-	 * @return current raw value
-	 */
-	String getCurrentRawValue();
-
-	/**
-	 * Returns last known value
-	 * @return last known value
-	 */
-	String get();
-
-	/**
-	 * Replaces all placeholders in current raw value, colorizes it, removes remove-strings and returns whether value changed or not
-	 * @return if updating changed value or not
-	 */
-	boolean update();
-	
-	/**
-	 * Replaces all placeholders in current raw value, colorizes it, removes remove-strings and returns it.
-	 * Equal to calling update() and then get().
-	 * @return updated value
-	 */
-	String updateAndGet();
-
-	/**
-	 * Returns value for defined viewer by applying relational placeholders to last known value
-	 * @param viewer - the viewer
-	 * @return format for the viewer
-	 */
-	String getFormat(TabPlayer viewer);
-}
@@ -1,10 +0,0 @@
-package me.neznamy.tab.api;
-
-public interface PropertyConfiguration {
-
-	void setProperty(String name, String property, String server, String world, String value);
-	
-	String[] getProperty(String name, String property, String server, String world);
-	
-	void remove(String name);
-}
@@ -1,152 +0,0 @@
-package me.neznamy.tab.api;
-
-/**
- * Enum class representing all possibly used protocol versions
- */
-public enum ProtocolVersion {
-
-	UNKNOWN	("Unknown"),
-	PROXY	("Proxy"),
-	V1_18_1	(757),
-	V1_18	(757),
-	V1_17_1	(756),
-	V1_17	(755),
-	V1_16_5 (754),
-	V1_16_4	(754),
-	V1_16_3	(753),
-	V1_16_2	(751),
-	V1_16_1	(736),
-	V1_16	(735),
-	V1_15_2	(578),
-	V1_15_1	(575),
-	V1_15	(573),
-	V1_14_4	(498),
-	V1_14_3	(490),
-	V1_14_2	(485),
-	V1_14_1	(480),
-	V1_14	(477),
-	V1_13_2	(404),
-	V1_13_1	(401),
-	V1_13	(393),
-	V1_12_2	(340),
-	V1_12_1	(338),
-	V1_12	(335),
-	V1_11_2	(316),
-	V1_11_1	(316),
-	V1_11	(315),
-	V1_10_2	(210),
-	V1_10_1	(210),
-	V1_10	(210),
-	V1_9_4	(110),
-	V1_9_3	(110),
-	V1_9_2	(109),
-	V1_9_1	(108),
-	V1_9	(107),
-	V1_8	(47),
-	V1_7_10	(5),
-	V1_7_9	(5),
-	V1_7_8	(5),
-	V1_7_7	(5),
-	V1_7_6	(5),
-	V1_7_5	(4),
-	V1_7_4	(4),
-	V1_7_2	(4),
-	V1_6_4	(78),
-	V1_6_2	(74),
-	V1_6_1	(73),
-	V1_5_2	(61),
-	V1_5_1	(60),
-	V1_5	(60),
-	V1_4_7	(51),
-	V1_4_6	(51);
-
-	//version's network id found at https://wiki.vg/Protocol_version_numbers
-	private final int networkId;
-	
-	//minor version, such as 16
-	private int minorVersion;
-	
-	//friendly name displayed in %player-version% placeholder
-	private final String friendlyName;
-
-	/**
-	 * Constructs new instance with given network id
-	 * @param networkId - network id of this version
-	 */
-	ProtocolVersion(int networkId){
-		this.networkId = networkId;
-		this.minorVersion = Integer.parseInt(toString().split("_")[1]);
-		this.friendlyName = toString().substring(1).replace("_", ".");
-	}
-	
-	/**
-	 * Constructs new instance with given friendly name
-	 * @param friendlyName - friendly name to display
-	 */
-	ProtocolVersion(String friendlyName){
-		this.networkId = 999;
-		this.minorVersion = 18;
-		this.friendlyName = friendlyName;
-	}
-
-	/**
-	 * Returns the version's network id
-	 * @return version's network id
-	 */
-	public int getNetworkId() {
-		return networkId;
-	}
-
-	/**
-	 * Returns user-friendly name of the version (such as 1.16.2 instead of V1_16_2)
-	 * @return	user-friendly name of the version
-	 */
-	public String getFriendlyName() {
-		return friendlyName;
-	}
-
-	/**
-	 * Returns minor version of this release, such as 8 for 1.8.x or 13 for 1.13.x
-	 * @return version's minor version
-	 */
-	public int getMinorVersion() {
-		return minorVersion;
-	}
-
-	/**
-	 * Overrides minor version of the version instance. This is used internally to
-	 * set minor version of UNKNOWN value to value from package to fix compatibility
-	 * with server forks that set bukkit version field value to "Unknown".
-	 * @param	minorVersion
-	 * 			minor version to change value to
-	 */
-	public void setMinorVersion(int minorVersion) {
-		this.minorVersion = minorVersion;
-	}
-
-	/**
-	 * Returns enum constant of entered version or UNKNOWN if unknown version
-	 * @param friendlyName - friendly name of the version
-	 * @return version or UNKNOWN if version is unknown
-	 */
-	public static ProtocolVersion fromFriendlyName(String friendlyName) {
-		if (friendlyName.startsWith("1.8")) return V1_8;
-		try {
-			return valueOf("V" + friendlyName.replace(".", "_"));
-		} catch (IllegalArgumentException e) {
-			return UNKNOWN;
-		}
-	}
-
-	/**
-	 * Returns version from given network id
-	 * @param networkId - network id of protocol version
-	 * @return version from given network id
-	 */
-	public static ProtocolVersion fromNetworkId(int networkId) {
-		for (ProtocolVersion v : values()) {
-			if (networkId == v.getNetworkId()) return v;
-		}
-		return UNKNOWN;
-	}
-}
@@ -2,114 +2,134 @@ package me.neznamy.tab.api;

 import java.util.UUID;

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

 /**
 * The primary API class to get instances of other API classes
 */
 public abstract class TabAPI {

-	private static TabAPI instance;
-	
-	public static TabAPI getInstance() {
-		return instance;
-	}
-	
-	public static void setInstance(TabAPI instance) {
-		TabAPI.instance = instance;
-	}
+    /** Instance of the API */
+    @Setter private static TabAPI instance;

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

-	/**
-	 * Returns player object from given name
-	 * @return player object from given name
-	 * @param name - Player name
-	 */
-	public abstract TabPlayer getPlayer(String name);
-	
-	/**
-	 * Returns collection of all online players. Will return empty list if plugin is disabled (due to a broken configuration file for example).
-	 * @return collection of online players
-	 */
-	public abstract TabPlayer[] getOnlinePlayers();
+    /**
+     * Returns player object from given UUID
+     *
+     * @param   id
+     *          Player UUID
+     * @return  player object from given UUID
+     */
+    public abstract @Nullable TabPlayer getPlayer(@NonNull UUID id);

-	/**
-	 * Return BossBar manager instance if the feature is enabled. Returns null otherwise.
-	 * @return BossBar manager
-	 */
-	public abstract BossBarManager getBossBarManager();
-	
-	/**
-	 * Returns scoreboard manager instance if the feature is enabled. Returns null otherwise.
-	 * @return scoreboard manager
-	 */
-	public abstract ScoreboardManager getScoreboardManager();
-	
-	/**
-	 * Returns team manager instance if the feature is enabled, false otherwise
-	 * @return team manager
-	 */
-	public abstract TeamManager getTeamManager();
-	
-	public abstract HeaderFooterManager getHeaderFooterManager();
-	
-	/**
-	 * Returns PlaceholderManager instance
-	 * @return PlaceholderManager instance
-	 */
-	public abstract PlaceholderManager getPlaceholderManager();
+    /**
+     * Returns player object from given name
+     *
+     * @param   name
+     *          Player name
+     * @return  player object from given name
+     */
+    public abstract @Nullable TabPlayer getPlayer(@NonNull String name);

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

-	/**
-	 * Gets the event bus for registering listeners for TAB events.
-	 *
-	 * @return the event bus
-	 */
-	public abstract EventBus getEventBus();
+    /**
+     * Return BossBar manager instance if the feature is enabled. If not, returns {@code null}.
+     *
+     * @return  BossBar manager
+     */
+    public abstract @Nullable BossBarManager getBossBarManager();

-	/**
-	 * Returns server version. On proxy installation returns PROXY.
-	 * @return server version
-	 */
-	public abstract ProtocolVersion getServerVersion();
-	
-	/**
-	 * Prints message into console
-	 * @param message - message to print
-	 * @param translateColors - true if colors should be translated, false if not
-	 */
-	public abstract void sendConsoleMessage(String message, boolean translateColors);
-	
-	public abstract ThreadManager getThreadManager();
-	
-	public abstract ConfigurationFile getPlayerCache();
-	
-	public abstract ConfigurationFile getConfig();
-	
-	public abstract PropertyConfiguration getGroups();
-	
-	public abstract PropertyConfiguration getUsers();
-	
-	public abstract void debug(String message);
-	
-	public abstract void logError(String message, Throwable t);
+    /**
+     * Returns scoreboard manager instance if the feature is enabled. If not, returns {@code null}.
+     *
+     * @return  scoreboard manager
+     */
+    public abstract @Nullable ScoreboardManager getScoreboardManager();
+
+    /**
+     * Returns team manager instance if the feature is enabled. If not, returns {@code null}.
+     *
+     * @return  team manager
+     */
+    public abstract @Nullable NameTagManager getNameTagManager();
+
+    /**
+     * Returns header/footer manager instance if the feature is enabled. If not, returns {@code null}.
+     *
+     * @return  Header/footer manager
+     */
+    public abstract @Nullable HeaderFooterManager getHeaderFooterManager();
+
+    /**
+     * Returns PlaceholderManager instance
+     *
+     * @return  PlaceholderManager instance
+     */
+    public abstract @NotNull PlaceholderManager getPlaceholderManager();
+
+    /**
+     * Returns TabList name format manager instance if the feature is enabled. If not, returns {@code null}.
+     *
+     * @return  TabList name format manager
+     */
+    public abstract @Nullable TabListFormatManager getTabListFormatManager();
+
+    /**
+     * Returns Layout manager instance if the feature is enabled. If not, returns {@code null}.
+     *
+     * @return  Layout manager
+     */
+    public abstract @Nullable LayoutManager getLayoutManager();
+
+    /**
+     * Returns Sorting manager instance if at least one feature capable of sorting players is enabled.
+     * If not, returns {@code null}.
+     *
+     * @return  Sorting manager
+     */
+    public abstract @Nullable SortingManager getSortingManager();
+
+    /**
+     * Gets the event bus for registering listeners for TAB events.
+     *
+     * @return  the event bus
+     */
+    public abstract @Nullable EventBus getEventBus();
 }
@@ -1,261 +0,0 @@
-package me.neznamy.tab.api;
-
-import java.util.*;
-
-import me.neznamy.tab.api.protocol.PacketPlayOutPlayerInfo;
-import me.neznamy.tab.api.protocol.PacketPlayOutScoreboardDisplayObjective;
-import me.neznamy.tab.api.protocol.PacketPlayOutScoreboardObjective;
-
-public abstract class TabFeature {
-
-	private final String featureName;
-	private final String refreshDisplayName;
-	protected final String[] disabledServers;
-	private final boolean serverWhitelistMode;
-	protected final String[] disabledWorlds;
-	private final boolean worldWhitelistMode;
-	private final Set<TabPlayer> disabledPlayers = Collections.newSetFromMap(new WeakHashMap<>());
-	private final List<String> methodOverrides = new ArrayList<>();
-	
-	protected TabFeature(String featureName, String refreshDisplayName) {
-		this(featureName, refreshDisplayName, null, null);
-	}
-	
-	protected TabFeature(String featureName, String refreshDisplayName, List<String> disabledServers, List<String> disabledWorlds) {
-		this.featureName = featureName;
-		this.refreshDisplayName = refreshDisplayName;
-		if (disabledServers != null) {
-			this.disabledServers = disabledServers.toArray(new String[0]);
-			serverWhitelistMode = disabledServers.contains("WHITELIST");
-		} else {
-			this.disabledServers = new String[0];
-			serverWhitelistMode = false;
-		}
-		if (disabledWorlds != null) {
-			this.disabledWorlds = disabledWorlds.toArray(new String[0]);
-			worldWhitelistMode = disabledWorlds.contains("WHITELIST");
-		} else {
-			this.disabledWorlds = new String[0];
-			worldWhitelistMode = false;
-		}
-		try {
-			if (getClass().getMethod("onCommand", TabPlayer.class, String.class).getDeclaringClass() != TabFeature.class)
-				methodOverrides.add("onCommand");
-			if (getClass().getMethod("onJoin", TabPlayer.class).getDeclaringClass() != TabFeature.class)
-				methodOverrides.add("onJoin");
-			if (getClass().getMethod("onQuit", TabPlayer.class).getDeclaringClass() != TabFeature.class)
-				methodOverrides.add("onQuit");
-			if (getClass().getMethod("onWorldChange", TabPlayer.class, String.class, String.class).getDeclaringClass() != TabFeature.class)
-				methodOverrides.add("onWorldChange");
-			if (getClass().getMethod("onServerChange", TabPlayer.class, String.class, String.class).getDeclaringClass() != TabFeature.class)
-				methodOverrides.add("onServerChange");
-			if (getClass().getMethod("onDisplayObjective", TabPlayer.class, PacketPlayOutScoreboardDisplayObjective.class).getDeclaringClass() != TabFeature.class) 
-				methodOverrides.add("onDisplayObjective");
-			if (getClass().getMethod("onLoginPacket", TabPlayer.class).getDeclaringClass() != TabFeature.class) 
-				methodOverrides.add("onLoginPacket");
-			if (getClass().getMethod("onObjective", TabPlayer.class, PacketPlayOutScoreboardObjective.class).getDeclaringClass() != TabFeature.class)
-				methodOverrides.add("onObjective");
-			if (getClass().getMethod("onPlayerInfo", TabPlayer.class, PacketPlayOutPlayerInfo.class).getDeclaringClass() != TabFeature.class)
-				methodOverrides.add("onPlayerInfo");
-			if (getClass().getMethod("onPacketReceive", TabPlayer.class, Object.class).getDeclaringClass() != TabFeature.class)
-				methodOverrides.add("onPacketReceive");
-			if (getClass().getMethod("onPacketSend", TabPlayer.class, Object.class).getDeclaringClass() != TabFeature.class)
-				methodOverrides.add("onPacketSend");
-			if (getClass().getMethod("refresh", TabPlayer.class, boolean.class).getDeclaringClass() != TabFeature.class)
-				methodOverrides.add("refresh");
-		} catch (NoSuchMethodException e) {
-			//this will never happen
-		}
-	}
-	
-	/**
-	 * Loads all players and sends packets
-	 */
-	public void load() {
-		//empty by default
-	}
-	
-	/**
-	 * Unloads all players and sends clear packets
-	 */
-	public void unload() {
-		//empty by default
-	}
-	
-	/**
-	 * Processes command from player
-	 * @param sender - command sender
-	 * @param message - command line
-	 * @return true if event should be cancelled, false if not
-	 */
-	public boolean onCommand(TabPlayer sender, String message) {
-		return false;
-	}
-	
-	/**
-	 * Processes join event
-	 * @param connectedPlayer - player who connected
-	 */
-	public void onJoin(TabPlayer connectedPlayer) {
-		//empty by default
-	}
-	
-	/**
-	 * Processes quit event
-	 * @param disconnectedPlayer - player who disconnected
-	 */
-	public void onQuit(TabPlayer disconnectedPlayer) {
-	}
-	
-	/**
-	 * Processes world switch
-	 * @param changed - player who switched world
-	 * @param from - world player changed from
-	 * @param to - world player changed to
-	 */
-	public void onWorldChange(TabPlayer changed, String from, String to) {
-		//empty by default
-	}
-	
-	/**
-	 * Processes server switch
-	 * @param changed - player who switched server
-	 * @param from - server player changed from
-	 * @param to - server player changed to
-	 */
-	public void onServerChange(TabPlayer changed, String from, String to) {
-		//empty by default
-	}
-	
-	/**
-	 * Processes the packet send and returns true if packet should be cancelled
-	 * @param receiver - player receiving packet
-	 * @param packet - received packet
-	 */
-	public void onDisplayObjective(TabPlayer receiver, PacketPlayOutScoreboardDisplayObjective packet) {
-		//empty by default
-	}
-	
-	/**
-	 * Processes login packet, only available on BungeeCord
-	 * @param packetReceiver - player receiving client reset packet
-	 */
-	public void onLoginPacket(TabPlayer packetReceiver) {
-		//empty by default
-	}
-	
-	/**
-	 * Processes the packet send
-	 * @param receiver - player receiving packet
-	 * @param packet - received packet
-	 */
-	public void onObjective(TabPlayer receiver, PacketPlayOutScoreboardObjective packet) {
-		//empty by default
-	}
-	
-	/**
-	 * Processes the packet send and possibly modifies it
-	 * @param receiver - player receiving packet
-	 * @param info - received packet
-	 */
-	public void onPlayerInfo(TabPlayer receiver, PacketPlayOutPlayerInfo info) {
-		//empty by default
-	}
-	
-	/**
-	 * Processes raw packet sent by client
-	 * @param sender - packet sender
-	 * @param packet - packet received
-	 * @return true if false should be cancelled, false if not
-	 * @throws	ReflectiveOperationException
-	 * 			if thrown by reflective operation
-	 */
-	public boolean onPacketReceive(TabPlayer sender, Object packet) throws ReflectiveOperationException {
-		return false;
-	}
-	
-	/**
-	 * Processes raw packet sent to client
-	 * @param receiver - packet receiver
-	 * @param packet - the packet
-	 * @throws	ReflectiveOperationException
-	 * 			if thrown by reflective operation
-	 */
-	public void onPacketSend(TabPlayer receiver, Object packet) throws ReflectiveOperationException {
-		//empty by default
-	}
-
-	/**
-	 * Performs refresh of specified player
-	 * @param refreshed - player to refresh
-	 * @param force - if refresh should be forced despite refresh seemingly not needed
-	 */
-	public void refresh(TabPlayer refreshed, boolean force) {
-		//empty by default
-	}
-
-	/**
-	 * Registers this feature as one using specified placeholders
-	 * @param placeholders - placeholders to add as used in this feature
-	 */
-	public void addUsedPlaceholders(Collection<String> placeholders) {
-		if (placeholders.isEmpty()) return;
-		placeholders.forEach(p -> TabAPI.getInstance().getPlaceholderManager().addUsedPlaceholder(p, this));
-	}
-	
-	/**
-	 * Returns true if world or server is disabled, false if not
-	 * @param world - world to check
-	 * @param server - server to check
-	 * @return true if feature should be disabled, false if not
-	 */
-	public boolean isDisabled(String server, String world) {
-		boolean contains = contains(disabledWorlds, world);
-		if (worldWhitelistMode) contains = !contains;
-		if (contains) return true;
-		contains = contains(disabledServers, server);
-		if (serverWhitelistMode) contains = !contains;
-		return contains;
-	}
-	
-	protected boolean contains(String[] list, String element) {
-		if (element == null) return false;
-		for (String s : list) {
-			if (s.endsWith("*")) {
-				if (element.toLowerCase().startsWith(s.substring(0, s.length()-1).toLowerCase())) return true;
-			} else {
-				if (element.equalsIgnoreCase(s)) return true;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * Returns name of the feature displayed in /tab cpu.
-	 * @return name of the feature displayed in /tab cpu
-	 */
-	public String getFeatureName() {
-		return featureName;
-	}
-
-	public boolean overridesMethod(String method) {
-		return methodOverrides.contains(method);
-	}
-
-	public boolean isDisabledPlayer(TabPlayer p) {
-		return disabledPlayers.contains(p);
-	}
-	
-	public void addDisabledPlayer(TabPlayer p) {
-		if (disabledPlayers.contains(p)) return;
-		disabledPlayers.add(p);
-	}
-	
-	public void removeDisabledPlayer(TabPlayer p) {
-		disabledPlayers.remove(p);
-	}
-
-	public String getRefreshDisplayName() {
-		return refreshDisplayName;
-	}
-}
@@ -1,263 +1,94 @@
 package me.neznamy.tab.api;

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

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

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

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

-	/**
-	 * Returns player's name
-	 * @return Player's name
-	 */
-	String getName();
+    /**
+     * Returns player's UUID
+     *
+     * @return  Player's UUID
+     */
+    @NotNull UUID getUniqueId();

-	/**
-	 * Returns player's UUID
-	 * @return Player's UUID
-	 */
-	UUID getUniqueId();
+    /**
+     * Returns platform-specific entity
+     *
+     * @return  platform's player object
+     */
+    @NotNull Object getPlayer();

-	/**
-	 * Returns player's uuid used in TabList. This may only be different from real uuid if
-	 * TAB is installed on velocity with some specific velocity setup
-	 * @return player's uuid in TabList
-	 */
-	UUID getTablistUUID();
+    /**
+     * Returns true once the player is successfully loaded (onJoin method ran through all methods)
+     *
+     * @return  {@code true} if player is fully loaded, {@code false} otherwise
+     */
+    boolean isLoaded();

-	/**
-	 * Returns player's protocol version
-	 * @return player's protocol version
-	 */
-	ProtocolVersion getVersion();
+    /**
+     * Returns player's primary permission group. If group has been changed using
+     * {@link #setTemporaryGroup(String)}, returns that value. Otherwise, returns group
+     * detected by standard group assign logic
+     *
+     * @return  player's primary permission group
+     */
+    @NotNull String getGroup();

-	/**
-	 * Returns platform-specific entity
-	 * @return an instance of bukkit/bungee player depending on platform
-	 */
-	Object getPlayer();
+    /**
+     * Temporarily overrides player's group and applies all changes coming from new group.
+     * This includes all properties and sorting, if used.
+     * Set to {@code null} to reset back.
+     *
+     * @param   group
+     *          New group to use
+     * @see     #hasTemporaryGroup()
+     */
+    void setTemporaryGroup(@Nullable String group);

-	/**
-	 * Returns player's current world name (on BungeeCord this requires bridge installed)
-	 * @return name of world where player is currently in, null on BungeeCord if bridge is not installed
-	 */
-	String getWorld();
-	
-	/**
-	 * Returns player's current server name on BungeeCord (on bukkit this returns null)
-	 * @return name of server where player is currently in, null on bukkit
-	 */
-	String getServer();
+    /**
+     * Returns {@code true} if a temporary group was applied to the player using {@link #setTemporaryGroup(String)}.
+     * If no group was set, returns {@code false}
+     *
+     * @return  {@code true} if group is set, {@code false} if not
+     * @see     #setTemporaryGroup(String)
+     */
+    boolean hasTemporaryGroup();

-	/**
-	 * Performs platform-specific API call to check for permission and returns the result
-	 * @param permission - the permission to check for
-	 * @return - true if player has permission, false if not
-	 */
-	boolean hasPermission(String permission);
+    /**
+     * Changes expected profile name of the player. This adapts all name-bound features
+     * to use this new profile name if another plugin changed profile name of the player. <p>
+     * Automatic profile name change detection is available on Bukkit, BungeeCord and Fabric,
+     * therefore using this is redundant there. This function is only needed on Sponge and Velocity,
+     * where the detection is not available. <p>
+     * Warning: This function does NOT change player's profile name, it only updates the tracked
+     * name inside the plugin.
+     *
+     * @param   profileName
+     *          New expected profile name
+     */
+    void setExpectedProfileName(@NonNull String profileName);

-	/**
-	 * Sends the player a custom universal packet
-	 * @param packet - packet to send
-	 */
-	void sendCustomPacket(TabPacket packet);
-
-	/**
-	 * Sends the player a custom universal packet and adds that packet into counter that
-	 * is displayed in /tab cpu
-	 * @param packet - packet to send
-	 * @param feature - feature to increment sent packet counter of 
-	 */
-	void sendCustomPacket(TabPacket packet, TabFeature feature);
-	
-	/**
-	 * Sends the player a custom universal packet and adds that packet into counter that
-	 * is displayed in /tab cpu
-	 * @param packet - packet to send
-	 * @param feature - feature to increment sent packet counter of 
-	 */
-	void sendCustomPacket(TabPacket packet, String feature);
-
-	/**
-	 * Sends the player a platform-specific packet
-	 * @param packet - an instance of packet depending on platform
-	 */
-	void sendPacket(Object packet);
-
-	/**
-	 * Sends the player a platform-specific packet and adds that packet into counter that
-	 * is displayed in /tab cpu
-	 * @param packet - an instance of packet depending on platform
-	 * @param feature - feature to increment sent packet counter of 
-	 */
-	void sendPacket(Object packet, TabFeature feature);
-
-	/**
-	 * Sends the player a platform-specific packet and adds that packet into counter that
-	 * is displayed in /tab cpu
-	 * @param packet - an instance of packet depending on platform
-	 * @param feature - feature to increment sent packet counter of
-	 */
-	void sendPacket(Object packet, String feature);
-
-	/**
-	 * Returns player's property by name
-	 * @param name - name of property
-	 * @return the property or null if not found
-	 */
-	Property getProperty(String name);
-
-	/**
-	 * Sends a message to the player
-	 * @param message - message to be sent
-	 * @param translateColors - whether colors should be translated or not
-	 */
-	void sendMessage(String message, boolean translateColors);
-
-	/**
-	 * Sends specified component as a chat message
-	 * @param message - message to send
-	 */
-	void sendMessage(IChatBaseComponent message);
-
-	/**
-	 * Returns player's primary permission group
-	 * @return player's group depending on configuration
-	 */
-	String getGroup();
-
-	/**
-	 * Toggles armor stands preview mode for the player
-	 */
-	void toggleNametagPreview();
-
-	/**
-	 * Returns whether player is previewing NameTag or not
-	 * @return true if previewing, false if not
-	 */
-	boolean isPreviewingNametag();
-
-	/**
-	 * Returns player's channel or null if server is 1.7 or older
-	 * @return player's channel
-	 */
-	Channel getChannel();
-
-	/**
-	 * Returns player's ping calculated by server
-	 * @return player's ping
-	 */
-	int getPing();
-
-	/**
-	 * Returns player's platform-specific skin data
-	 * @return player's skin
-	 */
-	Object getSkin();
-
-	/**
-	 * Returns true once the player is successfully loaded (onJoin method ran through all methods)
-	 * @return true if player is fully loaded, false otherwise
-	 */
-	boolean isLoaded();
-
-	/**
-	 * Sets property with specified name to new value. If property did not exist before, it is
-	 * created and true is returned. If it existed, it is overridden and true is returned. False is returned otherwise.
-	 * @param feature - feature using this property to get placeholders registered
-	 * @param identifier - property name
-	 * @param rawValue - new raw value
-	 * @return true if value changed / did not exist, false if value did not change
-	 */
-	boolean setProperty(TabFeature feature, String identifier, String rawValue);
-
-	/**
-	 * Loads property from config using standard property loading algorithm
-	 * @param property - property name to load
-	 * @return true if value did not exist or changed, false otherwise
-	 */
-	boolean loadPropertyFromConfig(TabFeature feature, String property);
-
-	/**
-	 * Loads property from config using standard property loading algorithm. If the property is
-	 * not set in config, sets it to ifNotSet value
-	 * @param property - property name to load
-	 * @param ifNotSet - value to use if property is not defined in config
-	 * @return true if value did not exist or changed, false otherwise
-	 */
-	boolean loadPropertyFromConfig(TabFeature feature, String property, String ifNotSet);
-
-	/**
-	 * Returns name of player's scoreboard team or null if NameTag feature is disabled
-	 * @return name of player's team
-	 */
-	String getTeamName();
-
-	/**
-	 * Returns user-friendly explanation of team name
-	 * @return explanation behind team name
-	 */
-	String getTeamNameNote();
-
-	/**
-	 * Returns true if player is disguised using LibsDisguises
-	 * @return true if player is disguised, false if not
-	 */
-	boolean isDisguised();
-
-	/**
-	 * Returns true if player has invisibility potion, false if not. For bukkit, API is used, for BungeeCord
-	 * bukkit bridge is used
-	 * @return true if player has invisibility potion, false if not
-	 */
-	boolean hasInvisibilityPotion();
-
-	/**
-	 * Currently only PV hook on BungeeCord for global PlayerList function. Looking to expand this
-	 * in the future
-	 * @return true if vanished with PV on BungeeCord
-	 */
-	boolean isVanished();
-
-	/**
-	 * Returns true if player is online according to server
-	 * @return true if online, false if not
-	 */
-	boolean isOnline();
-
-	/**
-	 * Returns player's armor stand manager if unlimited GameMode mode is enabled, null if disabled
-	 * @return player's armor stand manager
-	 */
-	ArmorStandManager getArmorStandManager();
-
-	/**
-	 * Sets player's armor stands manager to new instance
-	 * @param armorStandManager - new instance
-	 */
-	void setArmorStandManager(ArmorStandManager armorStandManager);
-	
-	/**
-	 * Returns GameMode of the player (0 for survival, 1 creative, 2 adventure, 3 spectator)
-	 * @return GameMode of the player
-	 */
-	int getGamemode();
-	
-	boolean isBedrockPlayer();
-
-	void setTemporaryGroup(String group);
-
-	boolean hasTemporaryGroup();
-
-	void resetTemporaryGroup();
+    /**
+     * Returns player's expected profile name. This defaults to player's username, but may
+     * get changed by other plugins and then detected by TAB.
+     *
+     * @return  Player's expected profile name
+     */
+    @NotNull
+    String getExpectedProfileName();
 }
@@ -1,29 +0,0 @@
-package me.neznamy.tab.api;
-
-public interface TablistFormatManager {
-
-	void setPrefix(TabPlayer player, String prefix);
-	
-	void setName(TabPlayer player, String customName);
-	
-	void setSuffix(TabPlayer player, String suffix);
-	
-	void resetPrefix(TabPlayer player);
-	
-	void resetName(TabPlayer player);
-	
-	void resetSuffix(TabPlayer player);
-	
-	String getCustomPrefix(TabPlayer player);
-	
-	String getCustomName(TabPlayer player);
-	
-	String getCustomSuffix(TabPlayer player);
-	
-	String getOriginalPrefix(TabPlayer player);
-	
-	String getOriginalName(TabPlayer player);
-	
-	String getOriginalSuffix(TabPlayer player);
-	
-}
@@ -4,13 +4,27 @@ package me.neznamy.tab.api.bossbar;
 * An enum representing all available BossBar colors.
 * Calling ordinal() will return color's network ID.
 */
+@SuppressWarnings("unused") // API class
 public enum BarColor {

-	PINK,
-	BLUE,
-	RED,
-	GREEN,
-	YELLOW,
-	PURPLE,
-	WHITE
+    /** Pink color */
+    PINK,
+
+    /** Blue color */
+    BLUE,
+
+    /** Red color */
+    RED,
+
+    /** Green color */
+    GREEN,
+
+    /** Yellow color */
+    YELLOW,
+
+    /** Purple color */
+    PURPLE,
+
+    /** White color */
+    WHITE
 }
@@ -3,34 +3,22 @@ package me.neznamy.tab.api.bossbar;
 /**
 * An enum representing all available BossBar styles.
 * Calling ordinal() will return style's network ID.
- * Style names are equal to NMS names.
 */
+@SuppressWarnings("unused") // API class
 public enum BarStyle {

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

-	/** Style's name used in Bukkit API */
-	private final String bukkitName;
+    /** Line segmented into 6 parts */
+    NOTCHED_6,

-	/**
-	 * Initializes enum constant with given bukkit name
-	 * 
-	 * @param 	bukkitName
-	 * 			Name of color to be returned in {@code getBukkitName()}
-	 */
-	BarStyle(String bukkitName){
-		this.bukkitName = bukkitName;
-	}
+    /** Line segmented into 10 parts */
+    NOTCHED_10,

-	/**
-	 * Returns name of this style in Bukkit API
-	 * @return	name of this style in Bukkit API
-	 */
-	public String getBukkitName() {
-		return bukkitName;
-	}
+    /** Line segmented into 12 parts */
+    NOTCHED_12,
+
+    /** Line segmented into 20 parts */
+    NOTCHED_20
 }
@@ -3,7 +3,9 @@ package me.neznamy.tab.api.bossbar;
 import java.util.List;
 import java.util.UUID;

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

 /**
 * An interface representing a BossBar line.
@@ -19,167 +21,197 @@ import me.neznamy.tab.api.TabPlayer;
 */
 public interface BossBar {

-	/**
-	 * Returns name of this BossBar. If it was defined in config, returns
-	 * the name specified in config. If it was made using the API, returns
-	 * randomly generated ID given to this BossBar when creating.
-	 * @return	name of BossBar
-	 */
-	String getName();
+    /**
+     * Returns name of this BossBar. If it was defined in config, returns
+     * the name specified in config. If it was made using the API, returns
+     * randomly generated ID given to this BossBar when creating.
+     *
+     * @return  name of BossBar
+     */
+    @NotNull String getName();

-	/**
-	 * Returns randomly generated uuid of this BossBar used internally to match
-	 * the BossBar in client with packets or with Bukkit API BossBar instances.
-	 * @return	uuid of this BossBar
-	 */
-	UUID getUniqueId();
+    /**
+     * Returns randomly generated uuid of this BossBar used internally to match
+     * the BossBar in client with packets or with Bukkit API BossBar instances.
+     *
+     * @return  uuid of this BossBar
+     */
+    @NotNull UUID getUniqueId();

-	/**
-	 * Changes BossBar title to specified string, supporting placeholders.
-	 * <p>
-	 * If title contains new placeholders not used before, they are registered using
-	 * standard registration logic and refreshed periodically. No need to call
-	 * this method to try to keep placeholder values up to date.
-	 * <p>
-	 * If specified title is equal to the current one, nothing happens.
-	 * 
-	 * @param	title
-	 * 			New title to display in this BossBar
-	 */
-	void setTitle(String title);
+    /**
+     * Changes BossBar title to specified string, supporting placeholders.
+     * <p>
+     * If title contains new placeholders not used before, they are registered using
+     * standard registration logic and refreshed periodically. No need to call
+     * this method to try to keep placeholder values up to date.
+     * <p>
+     * If specified title is equal to the current one, nothing happens.
+     *
+     * @param   title
+     *          New title to display in this BossBar
+     */
+    void setTitle(@NonNull String title);

-	/**
-	 * Changes BossBar progress to specified string, supporting placeholders.
-	 * The string must be a string version of a float value, or a placeholder that 
-	 * outputs a float value with range 0-100.
-	 * <p>
-	 * If progress contains new placeholders not used before, they are registered using
-	 * standard registration logic and refreshed periodically. No need to call
-	 * this method to try to keep placeholder values up to date.
-	 * <p>
-	 * If specified progress is equal to the current one, nothing happens.
-	 * 
-	 * @param	progress
-	 * 			New progress to use in this BossBar
-	 */
-	void setProgress(String progress);
+    /**
+     * Changes BossBar progress to specified string, supporting placeholders.
+     * The string must be a string version of a float value, or a placeholder that
+     * outputs a float value with range 0-100.
+     * <p>
+     * If progress contains new placeholders not used before, they are registered using
+     * standard registration logic and refreshed periodically. No need to call
+     * this method to try to keep placeholder values up to date.
+     * <p>
+     * If specified progress is equal to the current one, nothing happens.
+     *
+     * @param   progress
+     *          New progress to use in this BossBar
+     */
+    void setProgress(@NonNull String progress);

-	/**
-	 * Changes BossBar progress to specified value ranging from 0 to 100.
-	 * <p>
-	 * If specified progress is equal to the current one, nothing happens.
-	 * @param	progress
-	 * 			New progress to use in this BossBar
-	 */
-	void setProgress(float progress);
+    /**
+     * Changes BossBar progress to specified value ranging from 0 to 100.
+     * <p>
+     * If specified progress is equal to the current one, nothing happens.
+     *
+     * @param   progress
+     *          New progress to use in this BossBar
+     */
+    void setProgress(float progress);

-	/**
-	 * Changes BossBar color to specified string, supporting placeholders.
-	 * The string must be a string version of one of the supported values, 
-	 * or a placeholder that outputs one of them.
-	 * <p>
-	 * If color contains new placeholders not used before, they are registered using
-	 * standard registration logic and refreshed periodically. No need to call
-	 * this method to try to keep placeholder values up to date.
-	 * <p>
-	 * If specified color is equal to the current one, nothing happens.
-	 * 
-	 * @param	color
-	 * 			New color to use in this BossBar
-	 */
-	void setColor(String color);
+    /**
+     * Changes BossBar color to specified string, supporting placeholders.
+     * The string must be a string version of one of the supported values,
+     * or a placeholder that outputs one of them.
+     * <p>
+     * If color contains new placeholders not used before, they are registered using
+     * standard registration logic and refreshed periodically. No need to call
+     * this method to try to keep placeholder values up to date.
+     * <p>
+     * If specified color is equal to the current one, nothing happens.
+     *
+     * @param   color
+     *          New color to use in this BossBar
+     */
+    void setColor(@NonNull String color);

-	/**
-	 * Changes BossBar color to specified enum constant.
-	 * <p>
-	 * If specified color is equal to the current one, nothing happens.
-	 * 
-	 * @param	color
-	 * 			New color to use in this BossBar
-	 */
-	void setColor(BarColor color);
+    /**
+     * Changes BossBar color to specified enum constant.
+     * <p>
+     * If specified color is equal to the current one, nothing happens.
+     *
+     * @param   color
+     *          New color to use in this BossBar
+     */
+    void setColor(@NonNull BarColor color);

-	/**
-	 * Changes BossBar style to specified string, supporting placeholders.
-	 * The string must be a string version of one of the supported values, 
-	 * or a placeholder that outputs one of them.
-	 * <p>
-	 * If style contains new placeholders not used before, they are registered using
-	 * standard registration logic and refreshed periodically. No need to call
-	 * this method to try to keep placeholder values up to date.
-	 * <p>
-	 * If specified style is equal to the current one, nothing happens.
-	 * 
-	 * @param	style
-	 * 			New style to use in this BossBar
-	 */
-	void setStyle(String style);
+    /**
+     * Changes BossBar style to specified string, supporting placeholders.
+     * The string must be a string version of one of the supported values,
+     * or a placeholder that outputs one of them.
+     * <p>
+     * If style contains new placeholders not used before, they are registered using
+     * standard registration logic and refreshed periodically. No need to call
+     * this method to try to keep placeholder values up to date.
+     * <p>
+     * If specified style is equal to the current one, nothing happens.
+     *
+     * @param   style
+     *          New style to use in this BossBar
+     */
+    void setStyle(@NonNull String style);

-	/**
-	 * Changes BossBar style to specified enum constant.
-	 * <p>
-	 * If specified style is equal to the current one, nothing happens.
-	 * 
-	 * @param	style
-	 * 			New style to use in this BossBar
-	 */
-	void setStyle(BarStyle style);
+    /**
+     * Changes BossBar style to specified enum constant.
+     * <p>
+     * If specified style is equal to the current one, nothing happens.
+     *
+     * @param   style
+     *          New style to use in this BossBar
+     */
+    void setStyle(@NonNull BarStyle style);

-	/**
-	 * Returns current title of the BossBar in raw format. If it contains placeholders,
-	 * their raw identifiers are used in the result.
-	 * @return	title of the BossBar
-	 */
-	String getTitle();
+    /**
+     * Returns current title of the BossBar in raw format. If it contains placeholders,
+     * their raw identifiers are used in the result.
+     *
+     * @return  title of the BossBar
+     */
+    @NotNull String getTitle();

-	/**
-	 * Returns progress of the BossBar as a string, which is either entered string
-	 * containing placeholders or entered number converted to string
-	 * @return	entered progress as a string
-	 */
-	String getProgress();
+    /**
+     * Returns progress of the BossBar as a string, which is either entered string
+     * containing placeholders or entered number converted to string
+     *
+     * @return  entered progress as a string
+     */
+    @NotNull String getProgress();

-	/**
-	 * Returns color of the BossBar as a string, which is either entered string
-	 * containing placeholders or entered enum value converted to string
-	 * @return	entered color as a string
-	 */
-	String getColor();
+    /**
+     * Returns color of the BossBar as a string, which is either entered string
+     * containing placeholders or entered enum value converted to string
+     *
+     * @return  entered color as a string
+     */
+    @NotNull String getColor();

-	/**
-	 * Returns style of the BossBar as a string, which is either entered string
-	 * containing placeholders or entered enum value converted to string
-	 * @return	entered style as a string
-	 */
-	String getStyle();
+    /**
+     * Returns style of the BossBar as a string, which is either entered string
+     * containing placeholders or entered enum value converted to string
+     *
+     * @return  entered style as a string
+     */
+    @NotNull String getStyle();

-	/**
-	 * Registers this BossBar to specified player.
-	 * <p>
-	 * If the player already sees this BossBar, nothing happens.
-	 * 
-	 * @param	player
-	 * 			Player to register this BossBar to
-	 */
-	void addPlayer(TabPlayer player);
+    /**
+     * Registers this BossBar to specified player.
+     * <p>
+     * If the player already sees this BossBar, nothing happens.
+     *
+     * @param   player
+     *          Player to register this BossBar to
+     */
+    void addPlayer(@NonNull TabPlayer player);

-	/**
-	 * Unregisters this BossBar from specified player.
-	 * <p>
-	 * If the player does not see this BossBar, nothing happens.
-	 * 
-	 * @param	player
-	 * 			Player to unregister this BossBar from
-	 */
-	void removePlayer(TabPlayer player);
+    /**
+     * Unregisters this BossBar from specified player.
+     * <p>
+     * If the player does not see this BossBar, nothing happens.
+     *
+     * @param   player
+     *          Player to unregister this BossBar from
+     */
+    void removePlayer(@NonNull TabPlayer player);

-	/**
-	 * Returns list of players who can see this BossBar.
-	 * <p>
-	 * The returned list can only be used to read. Writing
-	 * will not work properly. For adding/removing players see {@link #addPlayer(TabPlayer)}
-	 * and {@link #removePlayer(TabPlayer)}.
-	 * @return	List of players seeing this BossBar
-	 */
-	List<TabPlayer> getPlayers();
+    /**
+     * Returns list of players who can see this BossBar.
+     * <p>
+     * The returned list can only be used to read. Writing
+     * will not work properly. For adding/removing players see {@link #addPlayer(TabPlayer)}
+     * and {@link #removePlayer(TabPlayer)}.
+     *
+     * @return  List of players seeing this BossBar
+     */
+    @NotNull List<TabPlayer> getPlayers();
+
+    /**
+     * Returns {@code true} if this bossbar is visible to specified player based on
+     * display condition or adding via {@link #addPlayer(TabPlayer)}, {@code false} if not.
+     * <p>
+     * This may return {@code true} even if player cannot physically see the bossbar due to
+     * having it disabled via toggle command or {@link BossBarManager#toggleBossBar(TabPlayer, boolean)}
+     * (or {@link BossBarManager#setBossBarVisible(TabPlayer, boolean, boolean)}).
+     *
+     * @param   player
+     *          Player to check
+     * @return  {@code true} if player is allowed to see this Boss Bar, {@code false} if not.
+     */
+    boolean containsPlayer(@NonNull TabPlayer player);
+
+    /**
+     * Returns {@code true} if this boss bar is configured as announcement-only bar,
+     * {@code false} if not.
+     *
+     * @return  {@code true} if bar is announcement only, {@code false} if not
+     */
+    boolean isAnnouncementBar();
 }
@@ -2,166 +2,156 @@ package me.neznamy.tab.api.bossbar;

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

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

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

-	/**
-	 * Creates BossBar with specified parameters and registers it to BossBar manager,
-	 * allowing to retrieve it later.
-	 * 
-	 * @param	title
-	 * 			Title to display, supports placeholders
-	 * 
-	 * @param	progress
-	 * 			Progress to use. Must be between 0 and 100
-	 * 
-	 * @param	color
-	 * 			Color to use
-	 * 
-	 * @param	style
-	 * 			Style to use
-	 * @return	The newly created BossBar
-	 */
-	BossBar createBossBar(String title, float progress, BarColor color, BarStyle style);
+    /**
+     * Creates BossBar with specified parameters and registers it to BossBar manager,
+     * allowing to retrieve it later.
+     * 
+     * @param   title
+     *          Title to display, supports placeholders
+     * @param   progress
+     *          Progress to use. Must be between 0 and 100
+     * @param   color
+     *          Color to use
+     * @param   style
+     *          Style to use
+     * @return  The newly created BossBar
+     */
+    @NotNull BossBar createBossBar(@NonNull String title, float progress, @NonNull BarColor color, @NonNull BarStyle style);

-	/**
-	 * Creates BossBar with specified parameters and registers it to BossBar manager,
-	 * allowing to retrieve it later.
-	 * 
-	 * @param	title
-	 * 			Title to display, supports placeholders
-	 * 
-	 * @param	progress
-	 * 			Progress to use. Must be a string version of a number, or
-	 * 			a placeholder that returns a number
-	 * 
-	 * @param	color
-	 * 			Color to use. Must be a string version of one of enum constants, or
-	 * 			a placeholder that returns one of them
-	 * 
-	 * @param	style
-	 * 			Style to use. Must be a string version of one of enum constants, or
-	 * 			a placeholder that returns one of them
-	 * @return	The newly created BossBar
-	 */
-	BossBar createBossBar(String title, String progress, String color, String style);
+    /**
+     * Creates BossBar with specified parameters and registers it to BossBar manager,
+     * allowing to retrieve it later.
+     * 
+     * @param   title
+     *          Title to display, supports placeholders
+     * @param   progress
+     *          Progress to use. Must be a string version of a number, or
+     *          a placeholder that returns a number
+     * @param   color
+     *          Color to use. Must be a string version of one of enum constants, or
+     *          a placeholder that returns one of them
+     * @param   style
+     *          Style to use. Must be a string version of one of enum constants, or
+     *          a placeholder that returns one of them
+     * @return  The newly created BossBar
+     */
+    @NotNull BossBar createBossBar(@NonNull String title, @NonNull String progress, @NonNull String color, @NonNull String style);

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

-	/**
-	 * Returns registered BossBar with specified UUID. This UUID is randomly generated when
-	 * BossBar is created and used in packets / to match which the one from Bukkit API.
-	 * Returns null if no such BossBar exists.
-	 * 
-	 * @param	id
-	 * 			UUID to return BossBar by
-	 * @return	BossBar with specified uuid
-	 */
-	BossBar getBossBar(UUID id);
+    /**
+     * Returns a map of all registered BossBars. This includes both BossBars from config
+     * and those registered via API.
+     * <p>
+     * Map key is BossBar's name available in {@link me.neznamy.tab.api.bossbar.BossBar#getName()},
+     * map value is the BossBar interface.
+     *
+     * @return  all registered BossBars
+     */
+    @NotNull Map<String, BossBar> getRegisteredBossBars();

-	/**
-	 * Returns a map of all registered BossBars. This includes both BossBars from config
-	 * and those registered via API.
-	 * <p>
-	 * Map key is BossBar's name available in {@link me.neznamy.tab.api.bossbar.BossBar#getName()},
-	 * map value is the BossBar interface.
-	 * @return	all registered BossBars
-	 */
-	Map<String, BossBar> getRegisteredBossBars();
+    /**
+     * Toggles BossBar for this player and sends toggle message if {@code sendToggleMessage} is true.
+     * 
+     * @param   player
+     *          Player to toggle BossBar for
+     * @param   sendToggleMessage
+     *          {@code true} if toggle message should be sent, {@code false} if not
+     * @see     #hasBossBarVisible(TabPlayer)
+     * @see     #setBossBarVisible(TabPlayer, boolean, boolean)
+     */
+    void toggleBossBar(@NonNull TabPlayer player, boolean sendToggleMessage);

-	/**
-	 * Toggles BossBar for this player and sends toggle message if {@code sendToggleMessage} is true.
-	 * 
-	 * @param	player
-	 * 			Player to toggle BossBar for
-	 * 
-	 * @param	sendToggleMessage
-	 * 			{@code true} if toggle message should be sent, {@code false} if not
-	 * @see #hasBossBarVisible(TabPlayer)
-	 * @see #setBossBarVisible(TabPlayer, boolean, boolean)
-	 */
-	void toggleBossBar(TabPlayer player, boolean sendToggleMessage);
+    /**
+     * Returns true if player can see BossBars, false if toggled via command or API.
+     * 
+     * @param   player
+     *          Player to check toggle status of
+     * @return  {@code true} if visible, {@code false} if disabled (toggled)
+     * @see     #toggleBossBar(TabPlayer, boolean)
+     * @see     #setBossBarVisible(TabPlayer, boolean, boolean)
+     */
+    boolean hasBossBarVisible(@NonNull TabPlayer player);

-	/**
-	 * Returns true if player can see BossBars, false if toggled via command or API.
-	 * 
-	 * @param	player
-	 * 			Player to check toggle status of
-	 * @return	{@code true} if visible, {@code false} if disabled (toggled)
-	 * @see #toggleBossBar(TabPlayer, boolean)
-	 * @see #setBossBarVisible(TabPlayer, boolean, boolean)
-	 */
-	boolean hasBossBarVisible(TabPlayer player);
+    /**
+     * Sets BossBar visibility of player to set value. If value did not change, nothing happens.
+     * If visibility changed, toggle message is sent if {@code sendToggleMessage} is {@code true}.
+     * 
+     * @param   player
+     *          Player to set BossBar visibility of
+     * @param   visible
+     *          {@code true} if BossBar should be visible, {@code false} if not
+     * @param   sendToggleMessage
+     *          {@code true} if toggle message should be sent if value changed, {@code false} if not
+     * @see #toggleBossBar(TabPlayer, boolean)
+     * @see #hasBossBarVisible(TabPlayer)
+     */
+    void setBossBarVisible(@NonNull TabPlayer player, boolean visible, boolean sendToggleMessage);

-	/**
-	 * Sets BossBar visibility of player to set value. If value did not change, nothing happens.
-	 * If visibility changed, toggle message is sent if {@code sendToggleMessage} is {@code true}.
-	 * 
-	 * @param	player
-	 * 			Player to set BossBar visibility of
-	 * @param	visible
-	 * 			{@code true} if BossBar should be visible, {@code false} if not
-	 * @param	sendToggleMessage
-	 * 			{@code true} if toggle message should be sent if value changed, {@code false} if not
-	 * @see #toggleBossBar(TabPlayer, boolean)
-	 * @see #hasBossBarVisible(TabPlayer)
-	 */
-	void setBossBarVisible(TabPlayer player, boolean visible, boolean sendToggleMessage);
+    /**
+     * Temporarily displays registered BossBar to player for specified amount of time in milliseconds.
+     *
+     * @param   player
+     *          Player to show BossBar to
+     * @param   bossBar
+     *          Name of registered BossBar to show
+     * @param   duration
+     *          In milliseconds for how long should BossBar be displayed
+     * @throws  IllegalArgumentException
+     *          if no BossBar with specified name exists
+     * @see     #announceBossBar(String, int)
+     * @see     #getAnnouncedBossBars()
+     */
+    void sendBossBarTemporarily(@NonNull TabPlayer player, @NonNull String bossBar, int duration);

-	/**
-	 * Temporarily displays registered BossBar to player for specified amount of time in milliseconds.
-	 * @param	player
-	 * 			Player to show BossBar to
-	 * @param	bossBar
-	 * 			Name of registered BossBar to show
-	 * @param	duration
-	 * 			In milliseconds for how long should BossBar be displayed
-	 * @throws	IllegalArgumentException
-	 * 			if no BossBar with specified name exists
-	 * @see #announceBossBar(String, int)
-	 * @see #getAnnouncedBossBars()
-	 */
-	void sendBossBarTemporarily(TabPlayer player, String bossBar, int duration);
+    /**
+     * Temporarily displays registered BossBar to all players for specified amount of time in milliseconds.
+     *
+     * @param   bossBar
+     *          Name of registered BossBar to show
+     * @param   duration
+     *          In milliseconds for how long should BossBar be displayed
+     * @throws  IllegalArgumentException
+     *          if no BossBar with specified name exists
+     * @see     #sendBossBarTemporarily(TabPlayer, String, int)
+     * @see     #getAnnouncedBossBars()
+     */
+    void announceBossBar(@NonNull String bossBar, int duration);

-	/**
-	 * Temporarily displays registered BossBar to all players for specified amount of time in milliseconds.
-	 * @param	bossBar
-	 * 			Name of registered BossBar to show
-	 * @param	duration
-	 * 			In milliseconds for how long should BossBar be displayed
-	 * @throws	IllegalArgumentException
-	 * 			if no BossBar with specified name exists
-	 * @see #sendBossBarTemporarily(TabPlayer, String, int)
-	 * @see #getAnnouncedBossBars()
-	 */
-	void announceBossBar(String bossBar, int duration);
-
-	/**
-	 * Returns list of BossBars which are currently being announced.
-	 * @return	list of currently active BossBar announcements
-	 * @see #sendBossBarTemporarily(TabPlayer, String, int)
-	 * @see #announceBossBar(String, int)
-	 */
-	List<BossBar> getAnnouncedBossBars();
+    /**
+     * Returns list of BossBars which are currently being announced.
+     *
+     * @return  list of currently active BossBar announcements
+     * @see     #sendBossBarTemporarily(TabPlayer, String, int)
+     * @see     #announceBossBar(String, int)
+     */
+    @NotNull List<BossBar> getAnnouncedBossBars();
 }
@@ -1,59 +0,0 @@
-package me.neznamy.tab.api.chat;
-
-import me.neznamy.tab.api.util.Preconditions;
-
-/**
- * Class for click event action in chat component
- */
-public class ChatClickable {
-
-	/** Click action */
-	private final EnumClickAction action;
-
-	/** Click value */
-	private final String value;
-
-	/**
-	 * Constructs new instance with given action and value.
-	 * @param	action
-	 * 			click event action
-	 * @param	value
-	 * 			click event value
-	 * @throws	IllegalArgumentException
-	 * 			if {@code action} is null or {@code value} is null
-	 */
-	public ChatClickable(EnumClickAction action, String value) {
-		Preconditions.checkNotNull(action, "hover action cannot be null");
-		Preconditions.checkNotNull(value, "hover value cannot be null");
-		this.action = action;
-		this.value = value;
-	}
-
-	/**
-	 * Returns click action defined in constructor
-	 * @return	click action
-	 */
-	public EnumClickAction getAction() {
-		return action;
-	}
-
-	/**
-	 * Returns click action defined in constructor
-	 * @return	click action
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * Enum for all possible click actions
-	 */
-	public enum EnumClickAction {
-		
-		OPEN_URL,
-		RUN_COMMAND,
-		CHANGE_PAGE, //since 1.8
-		SUGGEST_COMMAND,
-		COPY_TO_CLIPBOARD //since 1.15
-	}
-}
@@ -1,38 +0,0 @@
-package me.neznamy.tab.api.chat;
-
-import java.util.UUID;
-
-import com.google.gson.JsonObject;
-
-public class ChatComponentEntity extends IChatBaseComponent {
-
-	private final String type;
-	private final UUID id;
-	private final String name;
-	
-	public ChatComponentEntity(String type, UUID id, String name) {
-		this.type = type;
-		this.id = id;
-		this.name = name;
-	}
-
-	@Override
-	public String toRawText() {
-		return toString();
-	}
-	
-	@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;
-	}
-}
@@ -1,57 +0,0 @@
-package me.neznamy.tab.api.chat;
-
-import me.neznamy.tab.api.util.Preconditions;
-
-/**
- * Class for hover event action in chat component
- */
-public class ChatHoverable {
-
-	/** Hover action */
-	private final EnumHoverAction action;
-
-	/** Hover value */
-	private final IChatBaseComponent value;
-
-	/**
-	 * Constructs new instance with given action and value.
-	 * @param	action
-	 * 			hover event action
-	 * @param	value
-	 * 			hover event value
-	 * @throws	IllegalArgumentException
-	 * 			if {@code action} is null or {@code value} is null
-	 */
-	public ChatHoverable(EnumHoverAction action, IChatBaseComponent value) {
-		Preconditions.checkNotNull(action, "hover action cannot be null");
-		Preconditions.checkNotNull(value, "hover value cannot be null");
-		this.action = action;
-		this.value = value;
-	}
-
-	/**
-	 * Returns hover action defined in constructor
-	 * @return	hover action
-	 */
-	public EnumHoverAction getAction() {
-		return action;
-	}
-
-	/**
-	 * Returns hover value defined in constructor
-	 * @return	hover value
-	 */
-	public IChatBaseComponent getValue() {
-		return value;
-	}
-
-	/**
-	 * Enum for all possible hover actions
-	 */
-	public enum EnumHoverAction {
-
-		SHOW_TEXT,
-		SHOW_ITEM,
-		SHOW_ENTITY
-	}
-}
@@ -1,289 +0,0 @@
-package me.neznamy.tab.api.chat;
-
-import java.util.UUID;
-
-import org.json.simple.JSONObject;
-
-import me.neznamy.tab.api.ProtocolVersion;
-import me.neznamy.tab.api.TabAPI;
-import me.neznamy.tab.api.chat.ChatClickable.EnumClickAction;
-import me.neznamy.tab.api.chat.ChatHoverable.EnumHoverAction;
-
-public class ChatModifier {
-
-	private TextColor color;
-
-	private Boolean bold;
-	private Boolean italic;
-	private Boolean underlined;
-	private Boolean strikethrough;
-	private Boolean obfuscated;
-
-	private ChatClickable clickEvent;
-	private ChatHoverable hoverEvent;
-	
-	private String font;
-	
-	private ProtocolVersion targetVersion;
-	
-	public ChatModifier() {
-	}
-	
-	public ChatModifier(ChatModifier modifier) {
-		this.color = modifier.color == null ? null : new TextColor(modifier.color);
-		this.bold = modifier.bold;
-		this.italic = modifier.italic;
-		this.underlined = modifier.underlined;
-		this.strikethrough = modifier.strikethrough;
-		this.obfuscated = modifier.obfuscated;
-		this.clickEvent = modifier.clickEvent == null ? null : new ChatClickable(modifier.clickEvent.getAction(), modifier.clickEvent.getValue());
-		this.hoverEvent = modifier.hoverEvent == null ? null : new ChatHoverable(modifier.hoverEvent.getAction(), modifier.hoverEvent.getValue());
-		this.font = modifier.font;
-		this.targetVersion = modifier.targetVersion;
-	}
-
-	public TextColor getColor() {
-		return color;
-	}
-	
-	public void setColor(TextColor color) {
-		this.color = color;
-	}
-
-	public Boolean getBold() {
-		return bold;
-	}
-
-	public void setBold(Boolean bold) {
-		this.bold = bold;
-	}
-
-	public Boolean getItalic() {
-		return italic;
-	}
-
-	public void setItalic(Boolean italic) {
-		this.italic = italic;
-	}
-
-	public Boolean getUnderlined() {
-		return underlined;
-	}
-
-	public void setUnderlined(Boolean underlined) {
-		this.underlined = underlined;
-	}
-
-	public Boolean getStrikethrough() {
-		return strikethrough;
-	}
-
-	public void setStrikethrough(Boolean strikethrough) {
-		this.strikethrough = strikethrough;
-	}
-
-	public Boolean getObfuscated() {
-		return obfuscated;
-	}
-
-	public void setObfuscated(Boolean obfuscated) {
-		this.obfuscated = obfuscated;
-	}
-	
-	/**
-	 * Returns true if bold is defined and set to true, false otherwise
-	 * @return true if bold is defined and set to true, false otherwise
-	 */
-	public boolean isBold(){
-		return Boolean.TRUE.equals(bold);
-	}
-
-	/**
-	 * Returns true if italic is defined and set to true, false otherwise
-	 * @return true if italic is defined and set to true, false otherwise
-	 */
-	public boolean isItalic(){
-		return Boolean.TRUE.equals(italic);
-	}
-
-	/**
-	 * Returns true if underlined is defined and set to true, false otherwise
-	 * @return true if underlined is defined and set to true, false otherwise
-	 */
-	public boolean isUnderlined(){
-		return Boolean.TRUE.equals(underlined);
-	}
-
-	/**
-	 * Returns true if strikethrough is defined and set to true, false otherwise
-	 * @return true if strikethrough is defined and set to true, false otherwise
-	 */
-	public boolean isStrikethrough(){
-		return Boolean.TRUE.equals(strikethrough);
-	}
-
-	/**
-	 * Returns true if obfuscation is defined and set to true, false otherwise
-	 * @return true if obfuscation is defined and set to true, false otherwise
-	 */
-	public boolean isObfuscated(){
-		return Boolean.TRUE.equals(obfuscated);
-	}
-
-	public ChatClickable getClickEvent() {
-		return clickEvent;
-	}
-
-	public void setClickEvent(ChatClickable clickEvent) {
-		this.clickEvent = clickEvent;
-	}
-
-	public ChatHoverable getHoverEvent() {
-		return hoverEvent;
-	}
-
-	public void setHoverEvent(ChatHoverable hoverEvent) {
-		this.hoverEvent = hoverEvent;
-	}
-	
-	/**
-	 * Sets click action to OPEN_URL and url to given value
-	 * @param url - url to open
-	 */
-	public void onClickOpenUrl(String url) {
-		clickEvent = new ChatClickable(EnumClickAction.OPEN_URL, url);
-	}
-
-	/**
-	 * Sets click action to RUN_COMMAND and command to given value
-	 * @param command - command to perform, might be without / to send a chat message
-	 */
-	public void onClickRunCommand(String command) {
-		clickEvent = new ChatClickable(EnumClickAction.RUN_COMMAND, command);
-	}
-
-	/**
-	 * Sets click action to SUGGEST_COMMAND and command to given value
-	 * @param command - command to suggest
-	 */
-	public void onClickSuggestCommand(String command) {
-		clickEvent = new ChatClickable(EnumClickAction.SUGGEST_COMMAND, command);
-	}
-
-	/**
-	 * Sets click action to CHANGE_PAGE and page id to given value
-	 * @param newPage - id of new page
-	 */
-	public void onClickChangePage(int newPage) {
-		if (TabAPI.getInstance().getServerVersion().getMinorVersion() < 8) throw new UnsupportedOperationException("change_page click action is not supported on <1.8");
-		clickEvent = new ChatClickable(EnumClickAction.CHANGE_PAGE, String.valueOf(newPage));
-	}
-
-	/**
-	 * Sets click action to COPY_TO_CLIPBOARD and text to provided value
-	 * @param text - text to copy to clipboard on click
-	 */
-	public void onClickCopyToClipBoard(String text) {
-		clickEvent = new ChatClickable(EnumClickAction.COPY_TO_CLIPBOARD, text);
-	}
-	
-	public void onClick(EnumClickAction action, String value) {
-		clickEvent = new ChatClickable(action, value);
-	}
-
-	/**
-	 * Sets hover action to SHOW_TEXT and text to given value
-	 * @param text - text to show
-	 */
-	public void onHoverShowText(IChatBaseComponent text) {
-		hoverEvent = new ChatHoverable(EnumHoverAction.SHOW_TEXT, text);
-	}
-
-	/**
-	 * Sets hover action to SHOW_ITEM and item to given value
-	 * @param serializedItem - item to show
-	 */
-	public void onHoverShowItem(String serializedItem) {
-		hoverEvent = new ChatHoverable(EnumHoverAction.SHOW_ITEM, new IChatBaseComponent(serializedItem));
-	}
-
-	/**
-	 * Sets hover action to SHOW_ENTITY and entity data to given values
-	 * @param type - entity type
-	 * @param id - entity uuid
-	 * @param name - entity custom name
-	 */
-	public void onHoverShowEntity(String type, UUID id, String name) {
-		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");
-		}
-	}
-	
-	public void onHover(EnumHoverAction action, IChatBaseComponent value) {
-		hoverEvent = new ChatHoverable(action, value);
-	}
-
-	public String getFont() {
-		return font;
-	}
-
-	public void setFont(String font) {
-		this.font = font;
-	}
-	
-	@SuppressWarnings("unchecked")
-	public JSONObject serialize() {
-		JSONObject json = new JSONObject();
-		if (color != null) json.put("color", targetVersion.getMinorVersion() >= 16 ? color.toString() : color.getLegacyColor().toString().toLowerCase());
-		if (bold != null) json.put("bold", bold);
-		if (italic != null) json.put("italic", italic);
-		if (underlined != null) json.put("underlined", underlined);
-		if (strikethrough != null) json.put("strikethrough", strikethrough);
-		if (obfuscated != null) json.put("obfuscated", obfuscated);
-		if (clickEvent != null) {
-			JSONObject click = new JSONObject();
-			click.put("action", clickEvent.getAction().toString().toLowerCase());
-			click.put("value", clickEvent.getValue());
-			json.put("clickEvent", click);
-		}
-		if (hoverEvent != null) {
-			JSONObject hover = new JSONObject();
-			hover.put("action", hoverEvent.getAction().toString().toLowerCase());
-			if (TabAPI.getInstance().getServerVersion().getMinorVersion() >= 16) {
-				hover.put("contents", hoverEvent.getValue());
-			} else {
-				hover.put("value", TabAPI.getInstance().getServerVersion().getMinorVersion() >= 9 ?
-						hoverEvent.getValue() : hoverEvent.getValue().toRawText());
-			}
-			json.put("hoverEvent", hover);
-		}
-		if (font != null) json.put("font", font);
-		return json;
-	}
-	
-	public String getMagicCodes() {
-		StringBuilder builder = new StringBuilder();
-		if (isBold()) builder.append(EnumChatFormat.BOLD.getFormat());
-		if (isItalic()) builder.append(EnumChatFormat.ITALIC.getFormat());
-		if (isUnderlined()) builder.append(EnumChatFormat.UNDERLINE.getFormat());
-		if (isStrikethrough()) builder.append(EnumChatFormat.STRIKETHROUGH.getFormat());
-		if (isObfuscated()) builder.append(EnumChatFormat.OBFUSCATED.getFormat());
-		return builder.toString();
-	}
-	
-	public void setTargetVersion(ProtocolVersion targetVersion) {
-		this.targetVersion = targetVersion;
-	}
-	
-	public ProtocolVersion getTargetVersion() {
-		return targetVersion;
-	}
-}
@@ -1,245 +0,0 @@
-package me.neznamy.tab.api.chat;
-
-import me.neznamy.tab.api.chat.rgb.RGBUtils;
-
-/**
- * An enum containing all possible legacy color codes and magic codes. Also contains handy color-related methods.
- */
-public enum EnumChatFormat {
-
-	BLACK('0', "000000"),
-	DARK_BLUE('1', "0000AA"),
-	DARK_GREEN('2', "00AA00"),
-	DARK_AQUA('3', "00AAAA"),
-	DARK_RED('4', "AA0000"),
-	DARK_PURPLE('5', "AA00AA"),
-	GOLD('6', "FFAA00"),
-	GRAY('7', "AAAAAA"),
-	DARK_GRAY('8', "555555"),
-	BLUE('9', "5555FF"),
-	GREEN('a', "55FF55"),
-	AQUA('b', "55FFFF"),
-	RED('c', "FF5555"),
-	LIGHT_PURPLE('d', "FF55FF"),
-	YELLOW('e', "FFFF55"),
-	WHITE('f', "FFFFFF"),
-	OBFUSCATED('k'),
-	BOLD('l'),
-	STRIKETHROUGH('m'),
-	UNDERLINE('n'),
-	ITALIC('o'),
-	RESET('r');
-
-	/** Creating a constant to avoid memory allocations on each request */
-	private static final EnumChatFormat[] VALUES = values();
-
-	/** The symbol minecraft uses to colorize text */
-	public static final char COLOR_CHAR = 0x00a7;
-
-	/** The color symbol in form of a string */
-	public static final String COLOR_STRING = String.valueOf(COLOR_CHAR);
-
-	/** Character representing the color or magic code */
-	private final char character;
-	
-	/** Red value of this constant, 0 for magic codes */
-	private final short red;
-
-	/** Green value of this constant, 0 for magic codes */
-	private final short green;
-
-	/** Blue value of this constant, 0 for magic codes */
-	private final short blue;
-	
-	/** Color as 6-digit hex code, null for magic codes */
-	private final String hexCode;
-	
-	/** Color symbol followed by constant's character */
-	private final String chatFormat;
-
-	/**
-	 * Constructs new color instance with given character and hex code
-	 * @param	character
-	 * 			character which the color goes by
-	 * @param	hexCode
-	 * 			6-digit hex code of the color
-	 */
-	EnumChatFormat(char character, String hexCode) {
-		this.character = character;
-		this.chatFormat = String.valueOf(COLOR_CHAR) + character;
-		this.hexCode = hexCode;
-		int hexColor = Integer.parseInt(hexCode, 16);
-		red = (short) ((hexColor >> 16) & 0xFF);
-		green = (short) ((hexColor >> 8) & 0xFF);
-		blue = (short) (hexColor & 0xFF);
-	}
-	
-	/**
-	 * Constructs new magic code instance with given character
-	 * @param	character
-	 * 			character representing the magic code
-	 */
-	EnumChatFormat(char character) {
-		this.character = character;
-		this.chatFormat = String.valueOf(COLOR_CHAR) + character;
-		red = 0;
-		green = 0;
-		blue = 0;
-		hexCode = null;
-	}
-
-	/**
-	 * Returns red value of this color code
-	 * @return	red value
-	 */
-	public short getRed() {
-		return red;
-	}
-	
-	/**
-	 * Returns green value of this color code
-	 * @return	green value
-	 */
-	public short getGreen() {
-		return green;
-	}
-	
-	/**
-	 * Returns blue value of this color code
-	 * @return	blue value
-	 */
-	public short getBlue() {
-		return blue;
-	}
-	
-	/**
-	 * Returns enum value based on provided character or null if character is not valid
-	 * @param	c
-	 * 			color code character (0-9, a-f, k-o, r)
-	 * @return	instance from the character or null if character is not valid
-	 */
-	public static EnumChatFormat getByChar(char c) {
-		for (EnumChatFormat format : VALUES) {
-			if (format.character == c) return format;
-		}
-		return null;
-	}
-	
-	/**
-	 * Returns enum value of last colors used in given string.
-	 * If it's null, empty or does not contain color codes, WHITE is returned.
-	 * @param	string
-	 * 			string to check last colors of
-	 * @return	last used color code in given string or WHITE if nothing is found
-	 */
-	public static EnumChatFormat lastColorsOf(String string) {
-		if (string == null || string.length() == 0) return EnumChatFormat.WHITE;
-		String legacyText = RGBUtils.getInstance().convertRGBtoLegacy(string);
-		String last = getLastColors(legacyText);
-		if (last.length() > 0) {
-			char c = last.toCharArray()[1];
-			for (EnumChatFormat e : VALUES) {
-				if (e.character == c) return e;
-			}
-		}
-		return EnumChatFormat.WHITE;
-	}
-	
-	/**
-	 * Returns color char followed by color's character
-	 * @return color char followed by color's character
-	 */
-	public String getFormat() {
-		return chatFormat;
-	}
-	
-	/**
-	 * Returns character representing this color
-	 * @return character representing this color
-	 */
-	public char getCharacter() {
-		return character;
-	}
-	
-	/**
-	 * Returns hex code of this format, null if this is a magic code
-	 * @return hex code of this format
-	 */
-	public String getHexCode() {
-		return hexCode;
-	}
-	
-	/**
-	 * Returns enum value with exact red, green and blue values or null if no match was found
-	 * @param	red
-	 * 			exact red value
-	 * @param	green
-	 * 			exact green value
-	 * @param	blue
-	 * 			exact blue value
-	 * @return	enum value or null if no such combination exists
-	 */
-	public static EnumChatFormat fromRGBExact(int red, int green, int blue){
-		for (EnumChatFormat format : VALUES) {
-			if (format.red == red && format.green == green && format.blue == blue) return format;
-		}
-		return null;
-	}
-
-	/**
-	 * Color translation method taken from bukkit, which converts '&' symbol into
-	 * the actual color character if followed by a valid color character.
-	 * @param	textToTranslate
-	 * 			text to replace color symbol in
-	 * @return	colorized string from provided text
-	 */
-	public static String color(String textToTranslate){
-		if (textToTranslate == null) return null;
-		if (!textToTranslate.contains("&")) return textToTranslate;
-		char[] b = textToTranslate.toCharArray();
-		for (int i = 0; i < b.length - 1; i++) {
-			if ((b[i] == '&') && ("0123456789AaBbCcDdEeFfKkLlMmNnOoRrXx".indexOf(b[(i + 1)]) > -1)){
-				b[i] = COLOR_CHAR;
-				b[(i + 1)] = Character.toLowerCase(b[(i + 1)]);
-			}
-		}
-		return new String(b);
-	}
-
-	/**
-	 * Turns back the color symbol into '&' symbol in provided text.
-	 * @param	text
-	 * 			text to revert colors in
-	 * @return	reverted text
-	 */
-	public static String decolor(String text) {
-		if (text == null) return null;
-		if (!text.contains(COLOR_STRING)) return text;
-		return text.replace(COLOR_CHAR, '&');
-	}
-
-	/**
-	 * Code taken from bukkit, which returns last color codes used in provided text.
-	 * @param	input
-	 * 			text to get last colors from
-	 * @return	last colors used in provided text or empty string if nothing was found
-	 */
-	public static String getLastColors(String input) {
-		StringBuilder result = new StringBuilder();
-		int length = input.length();
-		for (int index = length - 1; index > -1; index--){
-			char section = input.charAt(index);
-			if ((section == COLOR_CHAR || section == '&') && (index < length - 1)){
-				char c = input.charAt(index + 1);
-				if ("0123456789AaBbCcDdEeFfKkLlMmNnOoRr".contains(String.valueOf(c))) {
-					result.insert(0, COLOR_CHAR);
-					result.insert(1, c);
-					if ("0123456789AaBbCcDdEeFfRr".contains(String.valueOf(c))) {
-						break;
-					}
-				}
-			}
-		}
-		return result.toString();
-	}
-}
@@ -1,476 +0,0 @@
-package me.neznamy.tab.api.chat;
-
-import java.util.*;
-
-import me.neznamy.tab.api.util.Preconditions;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-
-import me.neznamy.tab.api.ProtocolVersion;
-import me.neznamy.tab.api.TabAPI;
-import me.neznamy.tab.api.chat.ChatClickable.EnumClickAction;
-import me.neznamy.tab.api.chat.ChatHoverable.EnumHoverAction;
-import me.neznamy.tab.api.chat.rgb.RGBUtils;
-import org.json.simple.parser.ParseException;
-
-/**
- * A class representing the n.m.s.IChatBaseComponent class to make work with it much easier
- */
-@SuppressWarnings("unchecked")
-public class IChatBaseComponent {
-
-	/**
-	 * Component cache maps to avoid large memory allocations as well as
-	 * higher CPU usage when using animations which send the same text on repeat.
-	 */
-	private static final Map<String, IChatBaseComponent> componentCache = new HashMap<>();
-	private static final Map<IChatBaseComponent, String> serializeCacheModern = new HashMap<>();
-	private static final Map<IChatBaseComponent, String> serializeCacheLegacy = new HashMap<>();
-
-	/** Text of the component */
-	private String text;
-
-	/** Chat modifier containing color, magic codes, hover and click event */
-	private ChatModifier modifier = new ChatModifier();
-
-	/** Extra components used in "extra" field */
-	private List<IChatBaseComponent> extra;
-
-	/**
-	 * Constructs a new empty component
-	 */
-	public IChatBaseComponent() {
-	}
-	
-	/**
-	 * Constructs a new component which is a clone of provided component
-	 * @param	component
-	 * 			component to clone
-	 */
-	public IChatBaseComponent(IChatBaseComponent component) {
-		this.text = component.text;
-		this.modifier = new ChatModifier(component.modifier);
-		for (IChatBaseComponent child : component.getExtra()) {
-			addExtra(new IChatBaseComponent(child));
-		}
-	}
-
-	/**
-	 * Constructs new instance with given text
-	 * @param	text
-	 * 			text to display
-	 */
-	public IChatBaseComponent(String text) {
-		this.text = text;
-	}
-
-	/**
-	 * Returns list of extra components. If no extra components are defined, returns empty list.
-	 * @return	list of extra components
-	 */
-	public List<IChatBaseComponent> getExtra(){
-		if (extra == null) return Collections.emptyList();
-		return extra;
-	}
-
-	/**
-	 * Sets full list of extra components to given list. Does not allow empty list.
-	 * @param	components
-	 * 			components to use as extra
-	 * @return	self
-	 * @throws	IllegalArgumentException
-	 * 			if {@code components} is an empty list
-	 */
-	public IChatBaseComponent setExtra(List<IChatBaseComponent> components){
-		if (components.isEmpty()) throw new IllegalArgumentException("Unexpected empty array of components"); //exception taken from minecraft
-		this.extra = components;
-		return this;
-	}
-
-	/**
-	 * Appends provided component as extra component
-	 * @param	child
-	 *			component to append
-	 */
-	public void addExtra(IChatBaseComponent child) {
-		if (extra == null) extra = new ArrayList<>();
-		extra.add(child);
-	}
-
-	/**
-	 * Returns text of this component
-	 * @return	text of this component
-	 */
-	public String getText() {
-		return text;
-	}
-
-	/**
-	 * Returns chat modifier of this component
-	 * @return	chat modifier of this component
-	 */
-	public ChatModifier getModifier() {
-		return modifier;
-	}
-
-	/**
-	 * Sets modifier to provided value
-	 * @param	modifier
-	 * 			modifier to set value to
-	 * @throws	IllegalArgumentException
-	 * 			if {@code modifier} is null
-	 */
-	public void setModifier(ChatModifier modifier) {
-		Preconditions.checkNotNull(modifier, "modifier");
-		this.modifier = modifier;
-	}
-
-	/**
-	 * Changes text of this component
-	 * @param	text
-	 * 			text to show
-	 */
-	public void setText(String text) {
-		this.text = text;
-	}
-
-	/**
-	 * Deserializes string and returns created component. If provided string is null, returns null.
-	 * @param	json
-	 * 			serialized string
-	 * @return	Deserialized component or null if input is null
-	 */
-	public static IChatBaseComponent deserialize(String json) {
-		if (json == null) return null;
-		if (json.startsWith("\"") && json.endsWith("\"") && json.length() > 1) {
-			//simple component with only text used, minecraft serializer outputs the text in quotes instead of full json
-			return new IChatBaseComponent(json.substring(1, json.length()-1));
-		}
-		JSONObject jsonObject;
-		try {
-			jsonObject = (JSONObject) new JSONParser().parse(json);
-		} catch (ParseException e) {
-			TabAPI.getInstance().logError("Failed to deserialize json component " + json, e);
-			return null;
-		}
-		IChatBaseComponent component;
-		if (jsonObject.containsKey("type")) {
-			return new ChatComponentEntity((String) jsonObject.get("type"), UUID.fromString((String) jsonObject.get("id")), IChatBaseComponent.deserialize(jsonObject.get("name").toString()).toFlatText());
-		}
-		component = new IChatBaseComponent();
-		component.setText((String) jsonObject.get("text"));
-		component.modifier.setBold(getBoolean(jsonObject, "bold"));
-		component.modifier.setItalic(getBoolean(jsonObject, "italic"));
-		component.modifier.setUnderlined(getBoolean(jsonObject, "underlined"));
-		component.modifier.setStrikethrough(getBoolean(jsonObject, "strikethrough"));
-		component.modifier.setObfuscated(getBoolean(jsonObject, "obfuscated"));
-		component.modifier.setColor(TextColor.fromString(((String) jsonObject.get("color"))));
-		if (jsonObject.containsKey("clickEvent")) {
-			JSONObject clickEvent = (JSONObject) jsonObject.get("clickEvent");
-			String action = (String) clickEvent.get("action");
-			String value = clickEvent.get("value").toString();
-			component.modifier.onClick(EnumClickAction.valueOf(action.toUpperCase()), value);
-		}
-		if (jsonObject.containsKey("hoverEvent")) {
-			JSONObject hoverEvent = (JSONObject) jsonObject.get("hoverEvent");
-			String action = (String) hoverEvent.get("action");
-			String value = (String) hoverEvent.get("value");
-			component.modifier.onHover(EnumHoverAction.valueOf(action.toUpperCase()), deserialize(value));
-		}
-		if (jsonObject.containsKey("extra")) {
-			List<Object> list = (List<Object>) jsonObject.get("extra");
-			for (Object extra : list) {
-				String string = extra.toString();
-				//reverting .toString() removing "" for simple text
-				if (!string.startsWith("{")) string = "\"" + string + "\"";
-				component.addExtra(deserialize(string));
-			}
-		}
-		return component;
-	}
-
-	/**
-	 * Returns boolean value of requested key from map
-	 * @param	jsonObject
-	 * 			map to get value from
-	 * @param	key
-	 * 			name of key
-	 * @return	value from json object or null if not present
-	 */
-	private static Boolean getBoolean(JSONObject jsonObject, String key) {
-		String value = String.valueOf(jsonObject.getOrDefault(key, null));
-		return "null".equals(value) ? null : Boolean.parseBoolean(value);
-	}
-
-	/**
-	 * Converts the component to a string representing the serialized component.
-	 * This method is only used internally by json library since it's missing
-	 * protocol version field used by the method.
-	 * @return	serialized component in string form
-	 * @see #toString(ProtocolVersion)
-	 */
-	@Override
-	public String toString() {
-		JSONObject json = new JSONObject();
-		if (text != null) json.put("text", text);
-		if (modifier.getTargetVersion() == null) modifier.setTargetVersion(TabAPI.getInstance().getServerVersion()); //packet.toString() was called as a part of a debug message
-		json.putAll(modifier.serialize());
-		if (extra != null) json.put("extra", extra);
-		return json.toString();
-	}
-
-	/**
-	 * Serializes this component with colors based on client version.
-	 * If client version is <1.16, HEX colors will be converted to legacy colors.
-	 * @param	clientVersion
-	 * 			client version to adapt component for
-	 * @return	serialized string
-	 */
-	public String toString(ProtocolVersion clientVersion) {
-		return toString(clientVersion, false);
-	}
-
-	/**
-	 * Serializes this component with colors based on client version.
-	 * If client version is <1.16, HEX colors will be converted to legacy colors.
-	 * @param	clientVersion
-	 * 			client version to adapt component for
-	 * @param	sendTranslatableIfEmpty
-	 * 			whether empty translatable should be sent if text is empty or not
-	 * @return	serialized string
-	 */
-	public String toString(ProtocolVersion clientVersion, boolean sendTranslatableIfEmpty) {
-		if (extra == null) {
-			if (text == null) return null;
-			if (text.length() == 0) {
-				if (sendTranslatableIfEmpty) {
-					return "{\"translate\":\"\"}";
-				} else {
-					return "{\"text\":\"\"}";
-				}
-			}
-		}
-		modifier.setTargetVersion(clientVersion);
-		for (IChatBaseComponent child : getExtra()) {
-			child.modifier.setTargetVersion(clientVersion);
-		}
-		String string;
-		if (clientVersion.getMinorVersion() >= 16) {
-			if (serializeCacheModern.containsKey(this)) return serializeCacheModern.get(this);
-			string = toString();
-			if (serializeCacheModern.size() > 10000) serializeCacheModern.clear();
-			serializeCacheModern.put(this, string);
-		} else {
-			if (serializeCacheLegacy.containsKey(this)) return serializeCacheLegacy.get(this);
-			string = toString();
-			if (serializeCacheLegacy.size() > 10000) serializeCacheLegacy.clear();
-			serializeCacheLegacy.put(this, string);
-		}
-		return string;
-	}
-
-	/**
-	 * Returns organized component from colored text
-	 * @param	originalText
-	 * 			text to convert
-	 * @return	organized component from colored text
-	 */
-	public static IChatBaseComponent fromColoredText(String originalText){
-		String text = RGBUtils.getInstance().applyFormats(EnumChatFormat.color(originalText), false);
-		List<IChatBaseComponent> components = new ArrayList<>();
-		StringBuilder builder = new StringBuilder();
-		IChatBaseComponent component = new IChatBaseComponent();
-		for (int i = 0; i < text.length(); i++){
-			char c = text.charAt(i);
-			if (c == EnumChatFormat.COLOR_CHAR){
-				i++;
-				if (i >= text.length()) {
-					break;
-				}
-				c = text.charAt(i);
-				if ((c >= 'A') && (c <= 'Z')) {
-					c = (char)(c + ' ');
-				}
-				EnumChatFormat format = EnumChatFormat.getByChar(c);
-				if (format != null){
-					if (builder.length() > 0) {
-						component.setText(builder.toString());
-						components.add(component);
-						component = new IChatBaseComponent(component);
-						component.text = null;
-						builder = new StringBuilder();
-					}
-					switch (format){
-					case BOLD: 
-						component.modifier.setBold(true);
-						break;
-					case ITALIC: 
-						component.modifier.setItalic(true);
-						break;
-					case UNDERLINE: 
-						component.modifier.setUnderlined(true);
-						break;
-					case STRIKETHROUGH: 
-						component.modifier.setStrikethrough(true);
-						break;
-					case OBFUSCATED: 
-						component.modifier.setObfuscated(true);
-						break;
-					case RESET: 
-						component = new IChatBaseComponent();
-						component.modifier.setColor(new TextColor(EnumChatFormat.WHITE));
-						break;
-					default:
-						component = new IChatBaseComponent();
-						component.modifier.setColor(new TextColor(format));
-						break;
-					}
-				}
-			} else if (c == '#' && text.length() > i+6){
-				String hex = text.substring(i+1, i+7);
-				if (RGBUtils.getInstance().isHexCode(hex)) {
-					TextColor color;
-					if (containsLegacyCode(text, i)) {
-						color = new TextColor(hex, EnumChatFormat.getByChar(text.charAt(i+8)));
-						i += 8;
-					} else {
-						color = new TextColor(hex);
-						i += 6;
-					}
-					if (builder.length() > 0){
-						component.setText(builder.toString());
-						components.add(component);
-						builder = new StringBuilder();
-					}
-					component = new IChatBaseComponent();
-					component.modifier.setColor(color);
-				} else {
-					builder.append(c);
-				}
-			} else {
-				builder.append(c);
-			}
-		}
-		component.setText(builder.toString());
-		components.add(component);
-		return new IChatBaseComponent("").setExtra(components);
-	}
-
-	/**
-	 * Returns true if text contains legacy color request at defined RGB index start
-	 * @param	text
-	 * 			text to check
-	 * @param	i
-	 * 			current index start
-	 * @return	true if legacy color is defined, false if not
-	 */
-	private static boolean containsLegacyCode(String text, int i) {
-		if (text.length() - i < 9 || text.charAt(i+7) != '|') return false;
-		return EnumChatFormat.getByChar(text.charAt(i+8)) != null;
-	}
-
-	/**
-	 * Converts this component into a simple text with legacy colors (the closest match if color is set to RGB)
-	 * @return	The simple text format
-	 */
-	public String toLegacyText() {
-		StringBuilder builder = new StringBuilder();
-		append(builder, "");
-		return builder.toString();
-	}
-
-	/**
-	 * Appends text to string builder, might also add color and magic codes if they are different
-	 * from previous component in chain.
-	 * @param	builder
-	 * 			builder to append text to
-	 * @param	previousFormatting
-	 * 			colors and magic codes in previous component
-	 * @return	wew formatting, might be identical to previous one
-	 */
-	private String append(StringBuilder builder, String previousFormatting) {
-		String formatting = previousFormatting;
-		if (text != null) {
-			formatting = getFormatting();
-			if (!formatting.equals(previousFormatting)) {
-				builder.append(formatting);
-			}
-			builder.append(text);
-
-		}
-		for (IChatBaseComponent component : getExtra()) {
-			formatting = component.append(builder, formatting);
-		}
-		return formatting;
-	}
-
-	/**
-	 * Returns colors and magic codes of this component
-	 * @return	used colors and magic codes
-	 */
-	private String getFormatting() {
-		StringBuilder builder = new StringBuilder();
-		if (modifier.getColor() != null) {
-			if (modifier.getColor().getLegacyColor() == EnumChatFormat.WHITE) {
-				//preventing unwanted &r -> &f conversion and stopping the <1.13 client bug fix from working
-				builder.append(EnumChatFormat.RESET.getFormat());
-			} else {
-				builder.append(modifier.getColor().getLegacyColor().getFormat());
-			}
-		}
-		builder.append(modifier.getMagicCodes());
-		return builder.toString();
-	}
-
-	/**
-	 * Returns raw text without colors, only works correctly when component is organized
-	 * @return	raw text in this component and all child components
-	 */
-	public String toRawText() {
-		StringBuilder builder = new StringBuilder();
-		if (text != null) builder.append(text);
-		for (IChatBaseComponent child : getExtra()) {
-			if (child.text != null) builder.append(child.text);
-		}
-		return builder.toString();
-	}
-
-	/**
-	 * Converts the component into flat text with used colors (including rgb) and magic codes
-	 * @return	converted text
-	 */
-	public String toFlatText() {
-		StringBuilder builder = new StringBuilder();
-		if (modifier.getColor() != null) builder.append("#").append(modifier.getColor().getHexCode());
-		builder.append(modifier.getMagicCodes());
-		if (text != null) builder.append(text);
-		for (IChatBaseComponent child : getExtra()) {
-			builder.append(child.toFlatText());
-		}
-		return builder.toString();
-	}
-
-	/**
-	 * Returns the most optimized component based on text. Returns null if text is null,
-	 * organized component if RGB colors are used or simple component with only text field
-	 * containing the whole text when no RGB colors are used
-	 * @param	text
-	 * 			text to create component from
-	 * @return	The most performance-optimized component based on text
-	 */
-	public static IChatBaseComponent optimizedComponent(String text){
-		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")){
-			//contains RGB colors
-			component = IChatBaseComponent.fromColoredText(text);
-		} else {
-			//no RGB
-			component = new IChatBaseComponent(text);
-		}
-		if (componentCache.size() > 10000) componentCache.clear();
-		componentCache.put(text, component);
-		return component;
-	}
-}
@@ -1,209 +0,0 @@
-package me.neznamy.tab.api.chat;
-
-import me.neznamy.tab.api.util.Preconditions;
-
-/**
- * A class representing a component color, which can be either RGB or legacy code.
- */
-public class TextColor {
-
-	/**
-	 * RGB values as a single number of 3 8-bit numbers (0-255).
-	 * It is only initialized if colors are actually used to avoid
-	 * unnecessary memory allocations with string operations.
-	 */
-	private int rgb = -1;
-	
-	/** Closest legacy color to this color object. */
-	private EnumChatFormat legacyColor;
-	
-	/** HEX code of this color as a 6-digit hexadecimal string without "#" prefix. */
-	private String hexCode;
-	
-	/**
-	 * Boolean value whether the legacy color was forced with constructor or should be
-	 * automatically assigned as closest color.
-	 * This value is used in gradients when converting text for legacy players. */
-	private boolean legacyColorForced;
-
-	/**
-	 * Constructs new instance as a clone of the provided color.
-	 * @param	color
-	 * 			color to create a clone of
-	 * @throws	IllegalArgumentException
-	 * 			if color is {@code null}
-	 */
-	public TextColor(TextColor color) {
-		Preconditions.checkNotNull(color, "color cannot be null");
-		rgb = color.rgb;
-		legacyColor = color.legacyColor;
-		hexCode = color.hexCode;
-		legacyColorForced = color.legacyColorForced;
-	}
-	
-	/**
-	 * Constructs new instance from provided 6-digit hex code string
-	 * @param	hexCode
-	 * 			a 6-digit combination of hex numbers as a string
-	 * @throws	IllegalArgumentException
-	 * 			if hexCode is {@code null}
-	 */
-	public TextColor(String hexCode) {
-		Preconditions.checkNotNull(hexCode, "hex code cannot be null");
-		this.hexCode = hexCode;
-	}
-	
-	/**
-	 * Constructs new instance from provided 6-digit hex code and forced legacy color
-	 * @param	hexCode
-	 * 			6-digit combination of hex numbers as a string
-	 * @param	legacyColor
-	 * 			color to use for legacy clients instead of using the closest legacy color
-	 * @throws	IllegalArgumentException
-	 * 			if {@code hexCode} is {@code null} or {@code legacyColor} is {@code null}
-	 */
-	public TextColor(String hexCode, EnumChatFormat legacyColor) {
-		Preconditions.checkNotNull(hexCode, "hex code cannot be null");
-		Preconditions.checkNotNull(legacyColor, "legacy color cannot be null");
-		this.hexCode = hexCode;
-		this.legacyColorForced = true;
-		this.legacyColor = legacyColor;
-	}
-	
-	/**
-	 * Constructs new instance from provided legacy color
-	 * @param	legacyColor
-	 * 			legacy color to construct the instance from
-	 * @throws	IllegalArgumentException
-	 * 			if {@code legacyColor} is {@code null}
-	 */
-	public TextColor(EnumChatFormat legacyColor) {
-		Preconditions.checkNotNull(legacyColor, "legacy color cannot be null");
-		this.rgb = (legacyColor.getRed() << 16) + (legacyColor.getGreen() << 8) + legacyColor.getBlue();
-		this.hexCode = legacyColor.getHexCode();
-	}
-	
-	/**
-	 * Constructs new instance with red, green and blue values
-	 * @param	red
-	 * 			red value
-	 * @param	green
-	 * 			green value
-	 * @param	blue
-	 * 			blue value
-	 * @throws	IllegalArgumentException
-	 * 			if {@code red}, {@code green} or {@code blue} is out of range ({@code 0-255})
-	 */
-	public TextColor(int red, int green, int blue) {
-		Preconditions.checkRange(red, 0, 255, "red color");
-		Preconditions.checkRange(green, 0, 255, "green color");
-		Preconditions.checkRange(blue, 0, 255, "blue color");
-		this.rgb = (red << 16) + (green << 8) + blue;
-	}
-	
-	/**
-	 * Loads the closest legacy color based currently provided values
-	 */
-	private EnumChatFormat loadClosestColor() {
-		double minMaxDist = 9999;
-		double maxDist;
-		EnumChatFormat closestColor = EnumChatFormat.WHITE;
-		for (EnumChatFormat color : EnumChatFormat.values()) {
-			int rDiff = Math.abs(color.getRed() - getRed());
-			int gDiff = Math.abs(color.getGreen() - getGreen());
-			int bDiff = Math.abs(color.getBlue() - getBlue());
-			maxDist = rDiff;
-			if (gDiff > maxDist) maxDist = gDiff;
-			if (bDiff > maxDist) maxDist = bDiff;
-			if (maxDist < minMaxDist) {
-				minMaxDist = maxDist;
-				closestColor = color;
-			}
-		}
-		return closestColor;
-	}
-	
-	/**
-	 * Returns {@code red} value
-	 * @return	red value
-	 */
-	public int getRed() {
-		if (rgb == -1) rgb = Integer.parseInt(hexCode, 16);
-		return (rgb >> 16) & 0xFF;
-	}
-
-	/**
-	 * Returns {@code green} value
-	 * @return	green value
-	 */
-	public int getGreen() {
-		if (rgb == -1) rgb = Integer.parseInt(hexCode, 16);
-		return (rgb >> 8) & 0xFF;
-	}
-
-	/**
-	 * Returns {@code blue} value
-	 * @return	blue value
-	 */
-	public int getBlue() {
-		if (rgb == -1) rgb = Integer.parseInt(hexCode, 16);
-		return rgb & 0xFF;
-	}
-
-	/**
-	 * Returns the closest legacy color of this color object.
-	 * If the color was defined in constructor, it's returned.
-	 * Otherwise, the closest color is calculated the then returned.
-	 * @return	closest legacy color
-	 */
-	public EnumChatFormat getLegacyColor() {
-		if (legacyColor == null) legacyColor = loadClosestColor();
-		return legacyColor;
-	}
-	
-	/**
-	 * Returns the rgb combination as a 6-digit hex code string
-	 * @return	the rgb combination as a 6-digit hex code string
-	 */
-	public String getHexCode() {
-		if (hexCode == null) hexCode = String.format("%06X", rgb);
-		return hexCode;
-	}
-	
-	/**
-	 * Converts the color into a valid color value used in color field in chat component.
-	 * That is either 6-digit hex code prefixed with '#', or lowercase legacy color.
-	 * @return	the color serialized for use in chat component
-	 */
-	public String toString() {
-		EnumChatFormat legacyEquivalent = EnumChatFormat.fromRGBExact(getRed(), getGreen(), getBlue());
-		if (legacyEquivalent != null) {
-			//not sending old colors as RGB to 1.16 clients if not needed as <1.16 servers will fail to apply color
-			return legacyEquivalent.toString().toLowerCase();
-		}
-		return "#" + getHexCode();
-	}
-	
-	/**
-	 * Returns true if legacy color was forced with a constructor, false if not
-	 * @return	true if forced, false if not
-	 */
-	public boolean isLegacyColorForced() {
-		return legacyColorForced;
-	}
-
-	/**
-	 * Reads the string as it appears in chat component and turns it into the color object.
-	 * If the entered string is null, returns null.
-	 * If it's prefixed with '#', it's considered as a hex code.
-	 * Otherwise, it is considered being a lowercase legacy color.
-	 * @param	string
-	 * 			string from color field in chat component
-	 * @return	An instance from specified string or null if string is null
-	 */
-	public static TextColor fromString(String string) {
-		if (string == null) return null;
-		if (string.startsWith("#")) return new TextColor(string.substring(1));
-		return new TextColor(EnumChatFormat.valueOf(string.toUpperCase()));
-	}
-}
@@ -1,183 +0,0 @@
-package me.neznamy.tab.api.chat.rgb;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import me.neznamy.tab.api.chat.EnumChatFormat;
-import me.neznamy.tab.api.chat.TextColor;
-import me.neznamy.tab.api.chat.rgb.format.BukkitFormat;
-import me.neznamy.tab.api.chat.rgb.format.CMIFormat;
-import me.neznamy.tab.api.chat.rgb.format.HtmlFormat;
-import me.neznamy.tab.api.chat.rgb.format.RGBFormatter;
-import me.neznamy.tab.api.chat.rgb.format.UnnamedFormat1;
-import me.neznamy.tab.api.chat.rgb.gradient.CMIGradient;
-import me.neznamy.tab.api.chat.rgb.gradient.CommonGradient;
-import me.neznamy.tab.api.chat.rgb.gradient.GradientPattern;
-import me.neznamy.tab.api.chat.rgb.gradient.KyoriGradient;
-
-/**
- * A helper class to reformat all RGB formats into the default #RRGGBB and apply gradients
- */
-public class RGBUtils {
-
-	/** Instance of the class */
-	private static final RGBUtils instance = new RGBUtils();
-	
-	/** Registered RGB formatters */
-	private final RGBFormatter[] formats;
-	
-	/** Registered gradient patterns */
-	private final GradientPattern[] gradients;
-	
-	/** TAB's RGB pattern, used to convert text to bukkit format for boss bar */
-	private final Pattern tabPattern = Pattern.compile("#[0-9a-fA-F]{6}");
-
-	/** RGB pattern for legacy codes */
-	private final Pattern tabPatternLegacy = Pattern.compile("#[0-9a-fA-F]{6}\\|.");
-
-	/**
-	 * Constructs new instance and loads all RGB patterns and gradients
-	 */
-	public RGBUtils() {
-		formats = new RGBFormatter[] {
-				new BukkitFormat(),
-				new CMIFormat(),
-				new UnnamedFormat1(),
-				new HtmlFormat()
-		};
-		gradients = new GradientPattern[] {
-				//{#RRGGBB>}text{#RRGGBB<}
-				new CMIGradient(),
-				//<#RRGGBB>Text</#RRGGBB>
-				new CommonGradient(Pattern.compile("<#[0-9a-fA-F]{6}>[^<]*</#[0-9a-fA-F]{6}>"), 
-						Pattern.compile("<#[0-9a-fA-F]{6}\\|.>[^<]*</#[0-9a-fA-F]{6}>"), 
-						"<#", 9, 2, 9, 7),
-				//<$#RRGGBB>Text<$#RRGGBB>
-				new CommonGradient(Pattern.compile("<\\$#[0-9a-fA-F]{6}>[^<]*<\\$#[0-9a-fA-F]{6}>"), 
-						Pattern.compile("<\\$#[0-9a-fA-F]{6}\\|.>[^<]*<\\$#[0-9a-fA-F]{6}>"), 
-						"<$", 10, 3, 10, 7),
-				new KyoriGradient()
-		};
-	}
-	
-	/**
-	 * Returns instance of this class
-	 * @return	instance
-	 */
-	public static RGBUtils getInstance() {
-		return instance;
-	}
-	
-	/**
-	 * Applies all RGB formats and gradients to text and returns it.
-	 * This method is called on every property initialization to convert formats
-	 * once instead of on every refresh, if possible. Because of that, parameter
-	 * {@code ignorePlaceholders} exists to not break raw placeholder identifiers
-	 * @param	text
-	 * 			original text
-	 * @param	ignorePlaceholders
-	 * 			whether placeholders should be ignored or not
-	 * @return	text where everything is converted to #RRGGBB
-	 */
-	public String applyFormats(String text, boolean ignorePlaceholders) {
-		String replaced = text;
-		for (GradientPattern pattern : gradients) {
-			replaced = pattern.applyPattern(replaced, ignorePlaceholders);
-		}
-		for (RGBFormatter formatter : formats) {
-			replaced = formatter.reformat(replaced);
-		}
-		return replaced;
-	}
-
-	/**
-	 * Converts TAB's RGB format (#RRGGBB) into bukkit one (&x&r&r&g&g&b&b)
-	 * for modern clients (1.16+), for legacy clients it will use the closest color.
-	 * @param	text
-	 * 			text to convert
-	 * @param	rgbClient
-	 * 			whether client accepts RGB or not
-	 * @return	converted text
-	 */
-	public String convertToBukkitFormat(String text, boolean rgbClient) {
-		if (text == null) return null;
-		if (!text.contains("#")) return text; //no rgb codes
-		if (rgbClient) {
-			//converting random formats to TAB one
-			String replaced = applyFormats(text, false);
-			for (Pattern p : new Pattern[]{tabPatternLegacy, tabPattern}) {
-				Matcher m = p.matcher(replaced);
-				while (m.find()) {
-					String hexCode = m.group();
-					String fixed = "&x&" + hexCode.charAt(1) + "&" + hexCode.charAt(2) + "&" + hexCode.charAt(3) + "&" + hexCode.charAt(4) + "&" + hexCode.charAt(5) + "&" + hexCode.charAt(6);
-					replaced = replaced.replace(hexCode, EnumChatFormat.color(fixed));
-				}
-			}
-			return replaced;
-		} else {
-			return convertRGBtoLegacy(text);
-		}
-	}
-
-	/**
-	 * Converts all hex codes in given string to legacy codes
-	 * @param	text
-	 * 			text to convert
-	 * @return	translated text
-	 */
-	public String convertRGBtoLegacy(String text) {
-		if (text == null) return null;
-		if (!text.contains("#")) return EnumChatFormat.color(text);
-		String applied = applyFormats(text, false);
-		StringBuilder sb = new StringBuilder();
-		for (int i = 0; i < applied.length(); i++){
-			char c = applied.charAt(i);
-			if (c == '#' && applied.length() > i+6) {
-				String hexCode = applied.substring(i+1, i+7);
-				if (isHexCode(hexCode)) {
-					if (containsLegacyCode(applied, i)) {
-						sb.append(new TextColor(hexCode, EnumChatFormat.getByChar(applied.charAt(i+8))).getLegacyColor().getFormat());
-						i += 8;
-					} else {
-						sb.append(new TextColor(hexCode).getLegacyColor().getFormat());
-						i += 6;
-					}
-				} else {
-					sb.append(c);
-				}
-			} else {
-				sb.append(c);
-			}
-		}
-		return sb.toString();
-	}
-
-	/**
-	 * Returns true if entered string is a valid 6-digit combination of
-	 * hexadecimal numbers, false if not
-	 * @param	string
-	 * 			string to check
-	 * @return	{@code true} if valid, {@code false} if not
-	 */
-	public boolean isHexCode(String string) {
-		if (string.length() != 6) return false;
-		for (int i=0; i<6; i++) {
-			char c = string.charAt(i);
-			if (c < 48 || (c > 57 && c < 65) || (c > 70 && c < 97) || c > 102) return false;
-		}
-		return true;
-	}
-	
-	/**
-	 * Returns true if text contains legacy color request at defined RGB index start
-	 * @param	text
-	 * 			text to check
-	 * @param	i
-	 * 			current index start
-	 * @return	{@code true} if legacy color is defined and valid, {@code false} otherwise
-	 */
-	private static boolean containsLegacyCode(String text, int i) {
-		if (text.length() - i < 9 || text.charAt(i+7) != '|') return false;
-		return EnumChatFormat.getByChar(text.charAt(i+8)) != null;
-	}
-}
@@ -1,27 +0,0 @@
-package me.neznamy.tab.api.chat.rgb.format;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import me.neznamy.tab.api.chat.EnumChatFormat;
-
-/**
- * Formatter for &x&R&R&G&G&B&B
- */
-public class BukkitFormat implements RGBFormatter {
-
-	private final Pattern pattern = Pattern.compile("[" + EnumChatFormat.COLOR_CHAR + "&]x[" + EnumChatFormat.COLOR_CHAR + "&\\p{XDigit}]{12}");
-	
-	@Override
-	public String reformat(String text) {
-		if (!text.contains("&") && !text.contains(EnumChatFormat.COLOR_CHAR + "x")) return text;
-		String replaced = text;
-		Matcher m = pattern.matcher(replaced);
-		while (m.find()) {
-			String hexCode = m.group();
-			String fixed = new String(new char[] {'#', hexCode.charAt(3), hexCode.charAt(5), hexCode.charAt(7), hexCode.charAt(9), hexCode.charAt(11), hexCode.charAt(13)});
-			replaced = replaced.replace(hexCode, fixed);
-		}
-		return replaced;
-	}
-}
@@ -1,25 +0,0 @@
-package me.neznamy.tab.api.chat.rgb.format;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Formatter for {#RRGGBB}
- */
-public class CMIFormat implements RGBFormatter {
-
-	private final Pattern pattern = Pattern.compile("\\{#[0-9a-fA-F]{6}}");
-	
-	@Override
-	public String reformat(String text) {
-		if (!text.contains("{#")) return text;
-		String replaced = text;
-		Matcher m = pattern.matcher(replaced);
-		while (m.find()) {
-			String hexCode = m.group();
-			String fixed = hexCode.substring(2, 8);
-			replaced = replaced.replace(hexCode, "#" + fixed);
-		}
-		return replaced;
-	}
-}
@@ -1,25 +0,0 @@
-package me.neznamy.tab.api.chat.rgb.format;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Formatter for #<RRGGBB>
- */
-public class HtmlFormat implements RGBFormatter {
-
-	private final Pattern pattern = Pattern.compile("#<[0-9a-fA-F]{6}>");
-	
-	@Override
-	public String reformat(String text) {
-		if (!text.contains("#<")) return text;
-		Matcher m = pattern.matcher(text);
-		String replaced = text;
-		while (m.find()) {
-			String hexCode = m.group();
-			String fixed = hexCode.substring(2, 8);
-			replaced = replaced.replace(hexCode, "#" + fixed);
-		}
-		return replaced;
-	}
-}
@@ -1,14 +0,0 @@
-package me.neznamy.tab.api.chat.rgb.format;
-
-/**
- * Abstract class for different RGB patterns
- */
-public interface RGBFormatter {
-
-	/**
-	 * Reformats RGB codes in provided text into #RRGGBB format
-	 * @param text - text to format
-	 * @return reformatted text
-	 */
-	String reformat(String text);
-}
@@ -1,12 +0,0 @@
-package me.neznamy.tab.api.chat.rgb.format;
-
-/**
- * Formatter for &#RRGGBB
- */
-public class UnnamedFormat1 implements RGBFormatter {
-
-	@Override
-	public String reformat(String text) {
-		return text.contains("&#") ? text.replace("&#", "#") : text;
-	}
-}
@@ -1,30 +0,0 @@
-package me.neznamy.tab.api.chat.rgb.gradient;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class CMIGradient extends CommonGradient {
-
-	//pattern for {#RRGGBB<>}
-	private final Pattern shortcutPattern = Pattern.compile("\\{#[0-9a-fA-F]{6}<>}");
-	
-	public CMIGradient() {
-		super(Pattern.compile("\\{#[0-9a-fA-F]{6}>}[^{]*\\{#[0-9a-fA-F]{6}<}"),
-				Pattern.compile("\\{#[0-9a-fA-F]{6}\\|.>}[^{]*\\{#[0-9a-fA-F]{6}<}"),
-				"{#", 9, 2, 10, 8);
-	}
-	
-	@Override
-	public String applyPattern(String text, boolean ignorePlaceholders) {
-		String replaced = text;
-		if (replaced.contains("<>}")) {
-			Matcher m = shortcutPattern.matcher(replaced);
-			while (m.find()) {
-				String format = m.group();
-				String code = format.substring(2, 8);
-				replaced = replaced.replace(format, "{#" + code + "<}{#" + code + ">}");
-			}
-		}
-		return super.applyPattern(replaced, ignorePlaceholders);
-	}
-}
@@ -1,57 +0,0 @@
-package me.neznamy.tab.api.chat.rgb.gradient;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import me.neznamy.tab.api.chat.EnumChatFormat;
-import me.neznamy.tab.api.chat.TextColor;
-
-public class CommonGradient implements GradientPattern {
-
-	private final Pattern pattern;
-	private final Pattern legacyPattern;
-	private final String containCheck;
-	private final int legacyCharPosition;
-	private final int startColorStart;
-	private final int messageStart;
-	private final int endColorStartSub;
-	
-	public CommonGradient(Pattern pattern, Pattern legacyPattern, String containCheck, int legacyCharPosition,
-			int startColorStart, int messageStart, int endColorStartSub) {
-		this.pattern = pattern;
-		this.legacyPattern = legacyPattern;
-		this.containCheck = containCheck;
-		this.legacyCharPosition = legacyCharPosition;
-		this.startColorStart = startColorStart;
-		this.messageStart = messageStart;
-		this.endColorStartSub = endColorStartSub;
-	}
-	
-	@Override
-	public String applyPattern(String text, boolean ignorePlaceholders) {
-		if (!text.contains(containCheck)) return text;
-		String replaced = text;
-		Matcher m = legacyPattern.matcher(replaced);
-		while (m.find()) {
-			String format = m.group();
-			EnumChatFormat legacyColor = EnumChatFormat.getByChar(format.charAt(legacyCharPosition));
-			if ((ignorePlaceholders && format.contains("%")) || legacyColor == null) continue;
-			TextColor start = new TextColor(format.substring(startColorStart, startColorStart+6), legacyColor);
-			String message = format.substring(messageStart+2, format.length()-10);
-			TextColor end = new TextColor(format.substring(format.length()-endColorStartSub, format.length()-endColorStartSub+6));
-			String applied = asGradient(start, message, end);
-			replaced = replaced.replace(format, applied);
-		}
-		m = pattern.matcher(replaced);
-		while (m.find()) {
-			String format = m.group();
-			if (ignorePlaceholders && format.contains("%")) continue;
-			TextColor start = new TextColor(format.substring(startColorStart, startColorStart+6));
-			String message = format.substring(messageStart, format.length()-10);
-			TextColor end = new TextColor(format.substring(format.length()-endColorStartSub, format.length()-endColorStartSub+6));
-			String applied = asGradient(start, message, end);
-			replaced = replaced.replace(format, applied);
-		}
-		return replaced;
-	}
-}
@@ -1,51 +0,0 @@
-package me.neznamy.tab.api.chat.rgb.gradient;
-
-import me.neznamy.tab.api.chat.EnumChatFormat;
-import me.neznamy.tab.api.chat.TextColor;
-
-/**
- * Abstract class for applying different gradient patterns
- */
-public interface GradientPattern {
-
-	/**
-	 * Applies gradients in provided text and returns text using only #RRGGBB
-	 * @param text - text to be reformatted
-	 * @return reformatted text
-	 */
-	String applyPattern(String text, boolean ignorePlaceholders);
-	
-	/**
-	 * Returns gradient text based on start color, text and end color
-	 * @param start - start color
-	 * @param text - text to be reformatted
-	 * @param end - end color
-	 * @return reformatted text
-	 */	
-	default String asGradient(TextColor start, String text, TextColor end) {
-		//lazy support for magic codes in gradients
-		String magicCodes = EnumChatFormat.getLastColors(text);
-		String deColorized = text.substring(magicCodes.length());
-		StringBuilder sb = new StringBuilder();
-		int length = deColorized.length();
-		if (length == 1) {
-			sb.append("#");
-			sb.append(new TextColor(start.getRed(), start.getGreen(), start.getBlue()).getHexCode());
-			if (start.isLegacyColorForced()) sb.append("|").append(start.getLegacyColor().getCharacter());
-			sb.append(magicCodes);
-			sb.append(deColorized);
-			return sb.toString();
-		}
-		for (int i=0; i<length; i++) {
-			int red = (int) (start.getRed() + (float)(end.getRed() - start.getRed())/(length-1)*i);
-			int green = (int) (start.getGreen() + (float)(end.getGreen() - start.getGreen())/(length-1)*i);
-			int blue = (int) (start.getBlue() + (float)(end.getBlue() - start.getBlue())/(length-1)*i);
-			sb.append("#");
-			sb.append(new TextColor(red, green, blue).getHexCode());
-			if (start.isLegacyColorForced()) sb.append("|").append(start.getLegacyColor().getCharacter());
-			sb.append(magicCodes);
-			sb.append(deColorized.charAt(i));
-		}
-		return sb.toString();
-	}
-}
@@ -1,45 +0,0 @@
-package me.neznamy.tab.api.chat.rgb.gradient;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import me.neznamy.tab.api.chat.EnumChatFormat;
-import me.neznamy.tab.api.chat.TextColor;
-
-/**
- * Gradient applier for <gradient:#RRGGBB:#RRGGBB>Text</gradient> and <gradient:#RRGGBB|L:#RRGGBB>Text</gradient>
- */
-public class KyoriGradient implements GradientPattern {
-
-	private final Pattern pattern = Pattern.compile("<gradient:#[0-9a-fA-F]{6}:#[0-9a-fA-F]{6}>[^<]*</gradient>");
-
-	private final Pattern patternLegacy = Pattern.compile("<gradient:#[0-9a-fA-F]{6}\\|.:#[0-9a-fA-F]{6}>[^<]*</gradient>");
-	
-	@Override
-	public String applyPattern(String text, boolean ignorePlaceholders) {
-		if (!text.contains("<grad")) return text;
-		String replaced = text;
-		Matcher m = patternLegacy.matcher(replaced);
-		while (m.find()) {
-			String format = m.group();
-			EnumChatFormat legacyColor = EnumChatFormat.getByChar(format.charAt(18));
-			if ((ignorePlaceholders && format.contains("%")) || legacyColor == null) continue;
-			TextColor start = new TextColor(format.substring(11, 17), legacyColor);
-			String message = format.substring(28, format.length()-11);
-			TextColor end = new TextColor(format.substring(21, 27));
-			String applied = asGradient(start, message, end);
-			replaced = replaced.replace(format, applied);
-		}
-		m = pattern.matcher(replaced);
-		while (m.find()) {
-			String format = m.group();
-			if (ignorePlaceholders && format.contains("%")) continue;
-			TextColor start = new TextColor(format.substring(11, 17));
-			String message = format.substring(26, format.length()-11);
-			TextColor end = new TextColor(format.substring(19, 25));
-			String applied = asGradient(start, message, end);
-			replaced = replaced.replace(format, applied);
-		}
-		return replaced;
-	}
-}
@@ -1,427 +0,0 @@
-package me.neznamy.tab.api.config;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import me.neznamy.tab.api.TabAPI;
-
-/**
- * Abstract class for configuration file
- */
-@SuppressWarnings("unchecked")
-public abstract class ConfigurationFile {
-
-	/** Comments on top of the file */
-	protected List<String> header;
-
-	/** Configuration file content */
-	protected Map<String, Object> values;
-
-	/** File to use */
-	protected final File file;
-
-	/**
-	 * Constructs new instance and attempts to load specified configuration file.
-	 * If file does not exist, default file is copied from {@code source}.
-	 * 
-	 * @param	source
-	 * 			Source to copy file from if it does not exist
-	 * @param	destination
-	 * 			File destination to use
-	 * @throws	IllegalArgumentException
-	 * 			if {@code destination} is null
-	 * @throws	IllegalStateException
-	 * 			if file does not exist and source is null
-	 * @throws	IOException
-	 * 			if I/O operation with the file unexpectedly fails
-	 */
-	protected ConfigurationFile(InputStream source, File destination) throws IOException {
-		if (destination == null) throw new IllegalArgumentException("Destination cannot be null");
-		this.file = destination;
-		if (file.getParentFile() != null) Files.createDirectories(file.getParentFile().toPath());
-		if (!file.exists() && source == null) throw new IllegalStateException("File does not exist and source is null");
-		if (file.createNewFile()) {
-//			Files.copy(source, file.toPath());
-			//avoiding MalformedInputException thrown on fabric due to file not having UTF8 encoding by default
-			//also automatically using the encoding so users don't have to worry about it anymore
-			try (BufferedReader reader = new BufferedReader(new InputStreamReader(source, StandardCharsets.UTF_8));
-				BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8))){
-				String line;
-				while ((line = reader.readLine()) != null) {
-					writer.write(line + "\n");
-				}
-			}
-		}
-		detectHeader();
-	}
-
-	/**
-	 * Saves values from map to the file
-	 */
-	public abstract void save();
-
-	/**
-	 * Returns simple name of the file
-	 * @return	simple name of the file
-	 */
-	public String getName() {
-		return file.getName();
-	}
-
-	/**
-	 * Returns the root value map
-	 * @return	the root value map
-	 */
-	public Map<String, Object> getValues(){
-		return values;
-	}
-
-	public void setValues(Map<String, Object> values) {
-		this.values = values;
-	}
-
-	/**
-	 * Gets config option with specified path. If the option is not present and 
-	 * {@code defaultValue} is not {@code null}, value is inserted, {@link #save()} 
-	 * called and {@code defaultValue} returned.
-	 * 
-	 * @param	path
-	 * 			Path to the option with sections separated with "{@code .}"
-	 * @param	defaultValue
-	 * 			Value to be inserted and returned if option is not present
-	 * @return	value from configuration file
-	 */
-	public Object getObject(String path, Object defaultValue) {
-		Object value = values;
-		for (String section : path.contains(".") ? path.split("\\.") : new String[] {path}) {
-			if (!(value instanceof Map)) {
-				if (defaultValue != null) set(path, defaultValue);
-				return defaultValue;
-			}
-			value = getIgnoreCase((Map<Object, Object>) value, section);
-		}
-		if (value == null && defaultValue != null) {
-			TabAPI.getInstance().debug("Inserting missing config option \"" + path + "\" with value \"" + defaultValue + "\" into " + file.getName());
-			set(path, defaultValue);
-			return defaultValue;
-		}
-		return value;
-	}
-
-	/**
-	 * Returns config option with specified path. If option is not present,
-	 * {@code null} is returned.
-	 * 
-	 * @param	path	
-	 * 			Path to the option with sections separated with "{@code .}"
-	 * @return	value from configuration file or null if not present
-	 */
-	public Object getObject(String path) {
-		return getObject(path, null);
-	}
-	
-	public Object getObject(String[] path) {
-		Object value = values;
-		for (String section : path) {
-			if (!(value instanceof Map)) {
-				return null;
-			}
-			value = getIgnoreCase((Map<Object, Object>) value, section);
-		}
-		return value;
-	}
-
-	/**
-	 * Returns value from map without case sensitivity of the key. Returns
-	 * {@code null} if no such key is found.
-	 * 
-	 * @param	map
-	 * 			map to get value from
-	 * @param	key
-	 * 			case-insensitive key name
-	 * @return	map value from case-insensitive key
-	 */
-	private Object getIgnoreCase(Map<Object, Object> map, String key) {
-		for (Entry<Object, Object> entry : map.entrySet()) {
-			if (entry.getKey().toString().equalsIgnoreCase(key)) return entry.getValue();
-		}
-		return map.get(key);
-	}
-
-	/**
-	 * Returns config option with specified path as {@code String}. Returns {@code null} if
-	 * option is not present.
-	 * 
-	 * @param	path	
-	 * 			Path to the option with sections separated with "{@code .}"
-	 * @return	value from file or null if not present
-	 */
-	public String getString(String path) {
-		return getString(path, null);
-	}
-
-	/**
-	 * Returns config option with specified path as {@code String}. If the option is not present 
-	 * and {@code defaultValue} is not {@code null}, value is inserted, {@link #save()} called 
-	 * and {@code defaultValue} returned.
-	 * 
-	 * @param	path	
-	 * 			Path to the option with sections separated with "{@code .}"
-	 * @param	defaultValue
-	 * 			Value to be inserted and returned if option is not present
-	 * @return	value from configuration file as {@code String}
-	 */
-	public String getString(String path, String defaultValue) {
-		Object value = getObject(path, defaultValue);
-		if (value == null) return defaultValue;
-		return String.valueOf(value);
-	}
-
-	/**
-	 * Returns config option with specified path as {@code List<String>}. Returns {@code null} if
-	 * option is not present.
-	 * 
-	 * @param	path
-	 * 			Path to the option with sections separated with "{@code .}"
-	 * @return	value from file or null if not present
-	 */
-	public List<String> getStringList(String path) {
-		return getStringList(path, null);
-	}
-
-	/**
-	 * Returns config option with specified path as {@code List<String>}. If the option is not present 
-	 * and {@code defaultValue} is not {@code null}, value is inserted, {@link #save()} called 
-	 * and {@code defaultValue} returned.
-	 * 
-	 * @param	path	
-	 * 			Path of the option with sections separated with "{@code .}"
-	 * @param	defaultValue
-	 * 			Value to be inserted and returned if option is not present
-	 * @return	value from configuration file as {@code List<String>}
-	 */
-	public List<String> getStringList(String path, List<String> defaultValue) {
-		Object value = getObject(path, defaultValue);
-		if (value == null) return defaultValue;
-		if (!(value instanceof List)) {
-			return new ArrayList<>();
-		}
-		List<String> fixedList = new ArrayList<>();
-		for (Object key : (List<Object>)value) {
-			fixedList.add(key.toString());
-		}
-		return fixedList;
-	}
-
-	/**
-	 * Returns config option with specified path as {@code Integer}. Returns {@code null} if
-	 * option is not present.
-	 * 
-	 * @param	path
-	 * 			Path to the option with sections separated with "{@code .}"
-	 * @return	value from file or null if not present
-	 */
-	public Integer getInt(String path) {
-		return getInt(path, null);
-	}
-
-	/**
-	 * Returns config option with specified path as {@code Integer}. If the option is not present 
-	 * and {@code defaultValue} is not {@code null}, value is inserted, {@link #save()} called 
-	 * and {@code defaultValue} returned.
-	 * 
-	 * @param	path	
-	 * 			Path to the option with sections separated with "{@code .}"
-	 * @param	defaultValue
-	 * 			Value to be inserted and returned if option is not present
-	 * @return	value from configuration file as {@code Integer}
-	 */
-	public Integer getInt(String path, Integer defaultValue) {
-		Object value = getObject(path, defaultValue);
-		if (value == null) return defaultValue;
-		try{
-			return Integer.parseInt(value.toString());
-		} catch (NumberFormatException e) {
-			return defaultValue;
-		}
-	}
-
-	/**
-	 * Returns config option with specified path as {@code Boolean}. If the option is not present 
-	 * and {@code defaultValue} is not {@code null}, value is inserted, {@link #save()} called 
-	 * and {@code defaultValue} returned.
-	 * 
-	 * @param	path	
-	 * 			Path to the option with sections separated with "{@code .}"
-	 * @param	defaultValue
-	 * 			Value to be inserted and returned if option is not present
-	 * @return	value from configuration file as {@code Boolean}
-	 */
-	public boolean getBoolean(String path, boolean defaultValue) {
-		Object value = getObject(path, defaultValue);
-		if (value == null) return defaultValue;
-		return Boolean.parseBoolean(value.toString());
-	}
-
-	/**
-	 * Returns config option with specified path as {@code Double}. If the option is not present 
-	 * and {@code defaultValue} is not {@code null}, value is inserted, {@link #save()} called 
-	 * and {@code defaultValue} returned.
-	 * 
-	 * @param	path	
-	 * 			Path to the option with sections separated with "{@code .}"
-	 * @param	defaultValue
-	 * 			Value to be inserted and returned if option is not present
-	 * @return	value from configuration file as {@code Double}
-	 */
-	public Double getDouble(String path, double defaultValue) {
-		Object value = getObject(path, defaultValue);
-		if (value == null) return defaultValue;
-		try {
-			return Double.parseDouble(value.toString());
-		} catch (NumberFormatException e) {
-			return defaultValue;
-		}
-	}
-
-	/**
-	 * Returns config option with specified path as {@code Map<K, V>}. If the option 
-	 * is not present or value is not a {@code Map}, new empty {@code Map} is returned.
-	 * 
-	 * @param	path	
-	 * 			Path to the option with sections separated with "{@code .}"
-	 * @return	value from configuration file as {@code Map<K, V>}
-	 */
-	public <K, V> Map<K, V> getConfigurationSection(String path) {
-		if (path == null || path.length() == 0) return (Map<K, V>) values;
-		Object value = getObject(path, null);
-		if (value instanceof Map) {
-			return (Map<K, V>) value;
-		} else {
-			return new LinkedHashMap<>();
-		}
-	}
-
-	/**
-	 * Returns {@code true} if the file has option with specified path, {@code false}
-	 * if not.
-	 * 
-	 * @param	path
-	 * 			Path to the option with sections separated with "{@code .}"
-	 * @return	{@code true} if present, {@code false} if not
-	 */
-	public boolean hasConfigOption(String path) {
-		return getObject(path) != null;
-	}
-
-	/**
-	 * Sets value to the specified path and saves the file to disk by calling {@link #save()}.
-	 * 
-	 * @param	path
-	 * 			Path to the option with sections separated with "{@code .}"
-	 * @param	value
-	 * 			Value to save
-	 */
-	public void set(String path, Object value) {
-		set(values, path, value);
-		save();
-	}
-
-	/**
-	 * Sets value to the specified map with specified path and value. This is an internal method
-	 * that correctly creates maps to separate sections using "{@code .}".
-	 * 
-	 * @param	map
-	 * 			Map to insert value to
-	 * @param	path
-	 * 			Path to the option with sections separated with "{@code .}"
-	 * @param	value
-	 * 			Value to save
-	 * @return	the first argument to allow chaining
-	 */
-	private Map<String, Object> set(Map<String, Object> map, String path, Object value) {
-		if (path.contains(".")) {
-			String keyWord = getRealKey(map, path.split("\\.")[0]);
-			Object subMap = map.get(keyWord);
-			if (!(subMap instanceof Map)) {
-				subMap = new LinkedHashMap<>();
-			}
-			map.put(keyWord, set((Map<String, Object>) subMap, path.substring(keyWord.length()+1), value));
-		} else {
-			if (value == null) {
-				map.remove(getRealKey(map, path));
-			} else {
-				map.put(path, value);
-			}
-		}
-		return map;
-	}
-
-	/**
-	 * Returns the real key name without case sensitivity from map. If not found, inserted key
-	 * is returned.
-	 * 
-	 * @param	map
-	 * 			Map to check keys of
-	 * @param	key
-	 * 			Key to find
-	 * @return	The real key name
-	 */
-	private String getRealKey(Map<?, ?> map, String key) {
-		for (Object mapKey : map.keySet()) {
-			if (mapKey.toString().equalsIgnoreCase(key)) return mapKey.toString();
-		}
-		return key;
-	}
-
-	/**
-	 * Detects header of a file (first lines of file starting with #).
-	 *
-	 * @throws	IOException
-	 * 			if I/O operation fails
-	 */
-	private void detectHeader() throws IOException {
-		header = new ArrayList<>();
-		for (String line : Files.readAllLines(file.toPath())) {
-			if (line.startsWith("#")) {
-				header.add(line);
-			} else {
-				break;
-			}
-		}
-	}
-
-	/**
-	 * Inserts header back into file. This is required after calling {@link #save()}, because
-	 * it destroys the header.
-	 * 
-	 * @throws	IOException
-	 * 			if I/O operation fails
-	 */
-	public void fixHeader() throws IOException {
-		if (header == null) return;
-		List<String> content = new ArrayList<>(header);
-		content.addAll(Files.readAllLines(file.toPath()));
-		Files.delete(file.toPath());
-		if (file.createNewFile()) {
-			Files.write(file.toPath(), content);
-		}
-	}
-
-	public File getFile() {
-		return file;
-	}
-}
@@ -1,87 +0,0 @@
-package me.neznamy.tab.api.config;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.nio.charset.StandardCharsets;
-import java.util.LinkedHashMap;
-import java.util.List;
-
-import org.yaml.snakeyaml.DumperOptions;
-import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.error.YAMLException;
-
-import me.neznamy.tab.api.TabAPI;
-import me.neznamy.yamlassist.YamlAssist;
-
-/**
- * YAML implementation of ConfigurationFile
- */
-public class YamlConfigurationFile extends ConfigurationFile {
-
-	/** SnakeYAML instance */
-	private static final Yaml yaml;
-	
-	static {
-		DumperOptions options = new DumperOptions();
-		options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
-		yaml = new Yaml(options);
-	}
-
-	/**
-	 * Constructs new instance and attempts to load specified configuration file.
-	 * If file does not exist, default file is copied from {@code source}.
-	 * 
-	 * @param	source
-	 * 			Source to copy file from if it does not exist
-	 * @param	destination
-	 * 			File destination to use
-	 * @throws	IllegalArgumentException
-	 * 			if {@code destination} is null
-	 * @throws	IllegalStateException
-	 * 			if file does not exist and source is null
-	 * @throws	YAMLException
-	 * 			if file has invalid YAML syntax
-	 * @throws	IOException
-	 * 			if I/O operation with the file unexpectedly fails
-	 */
-	public YamlConfigurationFile(InputStream source, File destination) throws YAMLException, IOException {
-		super(source, destination);
-		FileInputStream input = null;
-		try {
-			input = new FileInputStream(file);
-			values = yaml.load(input);
-			if (values == null) values = new LinkedHashMap<>();
-			input.close();
-		} catch (YAMLException e) {
-			if (input != null) input.close();
-			TabAPI tab = TabAPI.getInstance();
-			tab.sendConsoleMessage("&c[TAB] File " + destination + " has broken syntax.", true);
-			tab.sendConsoleMessage("&6[TAB] Error message from yaml parser: " + e.getMessage(), true);
-			List<String> suggestions = YamlAssist.getSuggestions(file);
-			if (!suggestions.isEmpty()) {
-				tab.sendConsoleMessage("&d[TAB] Suggestions to fix yaml syntax:", true);
-				for (String suggestion : suggestions) {
-					tab.sendConsoleMessage("&d[TAB] - " + suggestion, true);
-				}
-			}
-			throw e;
-		}
-	}
-
-	@Override
-	public void save() {
-		try {
-			Writer writer = new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8);
-			yaml.dump(values, writer);
-			writer.close();
-			fixHeader();
-		} catch (IOException e) {
-			TabAPI.getInstance().sendConsoleMessage("&c[TAB] Failed to save yaml file " + file.getPath() + " with content " + values.toString(), true);
-		}
-	}
-}
@@ -1,16 +1,19 @@
 package me.neznamy.tab.api.event;

+import lombok.NonNull;
+
 /**
 * The event bus. This is used to register event listeners/handlers for
 * handling events that may be fired by TAB.
 */
+@SuppressWarnings("unused") // API class
 public interface EventBus {

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

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

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

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

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

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

    /**
-     * Returns true if player was loaded because they joined,
-     * false if the player was loaded because tab reload command was executed
-     * @return true if player joined, false if plugin was reloaded
+     * Returns {@code true} if player was loaded because they joined,
+     * {@code false} if the player was loaded because tab reload command was executed
+     *
+     * @return  {@code true} if player joined, {@code false} if plugin was reloaded
     */
    boolean isJoin();
 }
@@ -1,11 +1,48 @@
 package me.neznamy.tab.api.event.plugin;

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

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

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

-    void setPlaceholder(Placeholder placeholder);
+    /**
+     * Sets placeholder to specified server placeholder implementation.
+     *
+     * @param   supplier
+     *          Placeholder replacer
+     */
+    void setServerPlaceholder(@NonNull Supplier<Object> supplier);
+
+    /**
+     * Sets placeholder to specified player placeholder implementation.
+     *
+     * @param   function
+     *          Placeholder replacer
+     */
+    void setPlayerPlaceholder(@NonNull Function<TabPlayer, Object> function);
+
+    /**
+     * Sets placeholder to specified relational placeholder implementation.
+     *
+     * @param   function
+     *          Placeholder replacer
+     */
+    void setRelationalPlaceholder(@NonNull BiFunction<TabPlayer, TabPlayer, Object> function);
 }
@@ -0,0 +1,222 @@
+package me.neznamy.tab.api.nametag;
+
+import lombok.NonNull;
+import me.neznamy.tab.api.TabAPI;
+import me.neznamy.tab.api.TabPlayer;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Interface for manipulating player name tags.
+ * <p>
+ * Instance can be obtained using {@link TabAPI#getNameTagManager()}.
+ * This requires the Team feature to be enabled in config, otherwise the method will
+ * return {@code null}.
+ */
+@SuppressWarnings("unused") // API class
+public interface NameTagManager {
+
+    /**
+     * Makes player's NameTag globally invisible
+     *
+     * @param   player
+     *          player to hide name tag of
+     * @see     #showNameTag(TabPlayer)
+     * @see     #hasHiddenNameTag(TabPlayer)
+     */
+    void hideNameTag(@NonNull TabPlayer player);
+
+    /**
+     * Hides player's NameTag for specified player until it's shown again
+     *
+     * @param   player
+     *          player to hide name tag of
+     * @param   viewer
+     *          player to hide name tag for
+     */
+    void hideNameTag(@NonNull TabPlayer player, @NonNull TabPlayer viewer);
+
+    /**
+     * Makes player's NameTag visible again
+     *
+     * @param   player
+     *          player to show name tag of
+     * @see     #hideNameTag(TabPlayer)
+     * @see     #hasHiddenNameTag(TabPlayer)
+     */
+    void showNameTag(@NonNull TabPlayer player);
+
+    /**
+     * Shows player's NameTag for specified viewer if it was hidden before
+     *
+     * @param   player
+     *          player to show name tag of
+     * @param   viewer
+     *          player to show NameTag back for
+     */
+    void showNameTag(@NonNull TabPlayer player, @NonNull TabPlayer viewer);
+
+    /**
+     * Return whether player has hidden NameTag or not
+     *
+     * @param   player
+     *          player to check name tag visibility status of
+     * @return  Whether player has hidden NameTag or not
+     * @see     #hideNameTag(TabPlayer)
+     * @see     #showNameTag(TabPlayer)
+     */
+    boolean hasHiddenNameTag(@NonNull TabPlayer player);
+
+    /**
+     * Returns true if NameTag is hidden for specified viewer, false if not
+     *
+     * @param   player
+     *          player to check visibility status of
+     * @param   viewer
+     *          player to check visibility status for
+     * @return  true if hidden, false if not
+     */
+    boolean hasHiddenNameTag(@NonNull TabPlayer player, @NonNull TabPlayer viewer);
+
+    /**
+     * Unregisters player's team and no longer handles it, as well as disables anti-override for teams.
+     * This can be resumed using resumeTeamHandling(). If team handling was paused already, nothing happens.
+     *
+     * @param   player
+     *          player to pause team handling of
+     */
+    void pauseTeamHandling(@NonNull TabPlayer player);
+
+    /**
+     * Resumes team handling if it was before paused using pauseTeamHandling(), if not, nothing happens
+     *
+     * @param   player
+     *          player to resume team handling of
+     */
+    void resumeTeamHandling(@NonNull TabPlayer player);
+
+    /**
+     * Returns true if team handling is paused for this player using pauseTeamHandling(), false if not, or
+     * it was resumed already using resumeTeamHandling
+     *
+     * @param   player
+     *          player to check handling status of
+     * @return  true if paused, false if not
+     */
+    boolean hasTeamHandlingPaused(@NonNull TabPlayer player);
+
+    /**
+     * Forces collision rule for the player. Setting it to null will remove forced value
+     *
+     * @param   player
+     *          player to set collision rule of
+     * @param   collision
+     *          forced collision rule
+     */
+    void setCollisionRule(@NonNull TabPlayer player, @Nullable Boolean collision);
+
+    /**
+     * Returns forced collision rule or null if collision is not forced using setCollisionRule
+     *
+     * @param   player
+     *          player to get forced collision of
+     * @return  forced value or null if not forced
+     */
+    @Nullable Boolean getCollisionRule(@NonNull TabPlayer player);
+
+    /**
+     * Changes player's prefix to provided value. Supports placeholders,
+     * as well as any supported RGB formats. Use {@code null} to reset
+     * value back to original.
+     *
+     * @param   player
+     *          player to change prefix of
+     * @param   prefix
+     *          new prefix value
+     * @see     #getCustomPrefix(TabPlayer)
+     * @see     #getOriginalPrefix(TabPlayer)
+     */
+    void setPrefix(@NonNull TabPlayer player, @Nullable String prefix);
+
+    /**
+     * Changes player's suffix to provided value. Supports placeholders,
+     * as well as any supported RGB formats. Use {@code null} to reset
+     * value back to original.
+     *
+     * @param   player
+     *          player to change prefix of
+     * @param   suffix
+     *          new suffix value
+     * @see     #getCustomSuffix(TabPlayer)
+     * @see     #getOriginalSuffix(TabPlayer)
+     */
+    void setSuffix(@NonNull TabPlayer player, @Nullable String suffix);
+
+    /**
+     * Returns custom prefix assigned using {@link #setPrefix(TabPlayer, String)}.
+     * If no custom prefix is set, returns {@code null}.
+     *
+     * @param   player
+     *          Player to get custom prefix of
+     * @return  Custom prefix assigned using the API.
+     * @see     #setPrefix(TabPlayer, String)
+     * @see     #getOriginalPrefix(TabPlayer)
+     */
+    @Nullable
+    String getCustomPrefix(@NonNull TabPlayer player);
+
+    /**
+     * Returns custom suffix assigned using {@link #setSuffix(TabPlayer, String)}.
+     * If no custom suffix is set, returns {@code null}.
+     *
+     * @param   player
+     *          Player to get custom suffix of
+     * @return  Custom suffix assigned using the API.
+     * @see     #setSuffix(TabPlayer, String)
+     * @see     #getOriginalSuffix(TabPlayer)
+     */
+    @Nullable
+    String getCustomSuffix(@NonNull TabPlayer player);
+
+    /**
+     * Returns original prefix assigned by the plugin using internal logic.
+     * @param   player
+     *          Player to get original prefix of
+     * @return  Original prefix assigned by the plugin's internal logic.
+     * @see     #getCustomPrefix(TabPlayer)
+     */
+    @NonNull
+    String getOriginalPrefix(@NonNull TabPlayer player);
+
+    /**
+     * Returns original suffix assigned by the plugin using internal logic.
+     * @param   player
+     *          Player to get original suffix of
+     * @return  Original suffix assigned by the plugin's internal logic.
+     * @see     #getCustomSuffix(TabPlayer)
+     */
+    @NonNull
+    String getOriginalSuffix(@NonNull TabPlayer player);
+
+    /**
+     * Toggles name tag visibility view on all players for specified player.
+     * On first call, name tags of all players will become invisible for specified
+     * player. On second call, they will become visible again.
+     *
+     * @param   player
+     *          player to toggle name tag visibility view for
+     * @param   sendToggleMessage
+     *          {@code true} if configured toggle message should be sent, {@code false} if not
+     */
+    void toggleNameTagVisibilityView(@NonNull TabPlayer player, boolean sendToggleMessage);
+
+    /**
+     * Returns {@code true} if player has hidden name tags by either calling
+     * {@link #toggleNameTagVisibilityView(TabPlayer, boolean)} or using a command,
+     * {@code false} if not.
+     *
+     * @param   player
+     *          player to check
+     * @return  {@code true} if hidden, {@code false} if not
+     */
+    boolean hasHiddenNameTagVisibilityView(@NonNull TabPlayer player);
+}
@@ -0,0 +1,129 @@
+package me.neznamy.tab.api.nametag;
+
+import java.util.List;
+
+import lombok.NonNull;
+import me.neznamy.tab.api.TabAPI;
+import me.neznamy.tab.api.TabPlayer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Interface for manipulating player name tags.
+ * <p>
+ * Instance can be obtained using {@link TabAPI#getNameTagManager()} and then casting it.
+ * This requires both Team and Unlimited name tag features to be enabled in config, otherwise the method will
+ * return {@code null} or not be an instance of this class.
+ */
+@SuppressWarnings("unused") // API class
+public interface UnlimitedNameTagManager extends NameTagManager {
+
+    /**
+     * Disables armor stands of specified player and displays vanilla name tags instead.
+     *
+     * @param   player
+     *          Player to disable armor stands of
+     * @see     #enableArmorStands(TabPlayer)
+     * @see     #hasDisabledArmorStands(TabPlayer)
+     */
+    void disableArmorStands(@NonNull TabPlayer player);
+
+    /**
+     * Enabled back armor stands of player, who was disabled previously using
+     * {@link #disableArmorStands(TabPlayer)}.
+     *
+     * @param   player
+     *          Player to enable back
+     * @see     #disableArmorStands(TabPlayer)
+     * @see     #hasDisabledArmorStands(TabPlayer)
+     */
+    void enableArmorStands(@NonNull TabPlayer player);
+
+    /**
+     * Returns {@code true} if player has armor stands disabled using
+     * {@link #disableArmorStands(TabPlayer)}, {@code false} otherwise.
+     *
+     * @param   player
+     *          Player to check
+     * @return  {@code true} if disabled, {@code false} if not.
+     * @see     #disableArmorStands(TabPlayer)
+     * @see     #enableArmorStands(TabPlayer)
+     */
+    boolean hasDisabledArmorStands(@NonNull TabPlayer player);
+
+    /**
+     * Changes name to specified value. Set to {@code null} to
+     * reset back to original value.
+     *
+     * @param   player
+     *          Player to change name of
+     * @param   customName
+     *          New name, or {@code null} to reset to original value
+     */
+    void setName(@NonNull TabPlayer player, @Nullable String customName);
+
+    /**
+     * Changes line to specified value. Set to {@code null} to reset back to original value.
+     *
+     * @param   player
+     *          Player to change line of
+     * @param   line
+     *          Name of defined line
+     * @param   value
+     *          Value to use, or {@code null} to reset back to original value
+     * @see     #getDefinedLines()
+     */
+    void setLine(@NonNull TabPlayer player, @NonNull String line, @Nullable String value);
+
+    /**
+     * Returns custom name value set using {@link #setName(TabPlayer, String)}.
+     *
+     * @param   player
+     *          Player to check
+     * @return  Custom name set previously or {@code null} if not set
+     * @see     #setName(TabPlayer, String)
+     */
+    @Nullable String getCustomName(@NonNull TabPlayer player);
+
+    /**
+     * Returns custom line value set using {@link #setLine(TabPlayer, String, String)}.
+     *
+     * @param   player
+     *          Player to check
+     * @param   line
+     *          Defined line
+     * @return  Custom name set previously or {@code null} if not set
+     * @see     #setName(TabPlayer, String)
+     * @see     #getDefinedLines()
+     */
+    @Nullable String getCustomLineValue(@NonNull TabPlayer player, @NonNull String line);
+
+    /**
+     * Returns original name value configured in files.
+     *
+     * @param   player
+     *          Player to check
+     * @return  Original configured name
+     * @see     #setName(TabPlayer, String)
+     */
+    @NotNull String getOriginalName(@NonNull TabPlayer player);
+
+    /**
+     * Returns original line value configured in files.
+     *
+     * @param   player
+     *          Player to check
+     * @param   line
+     *          Line name
+     * @return  Original configured line
+     * @see     #setLine(TabPlayer, String, String)
+     */
+    @NotNull String getOriginalLineValue(@NonNull TabPlayer player, @NonNull String line);
+
+    /**
+     * Returns list of all defined lines in config, both static and dynamic lines.
+     *
+     * @return  List of all defined lines in config
+     */
+    @NotNull List<String> getDefinedLines();
+}
@@ -1,16 +1,23 @@
 package me.neznamy.tab.api.placeholder;

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

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

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

-import java.util.List;
+import lombok.NonNull;
+import me.neznamy.tab.api.TabAPI;
+import me.neznamy.tab.api.TabPlayer;
+import org.jetbrains.annotations.NotNull;
+
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Supplier;

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

-	/**
-	 * Registers a server placeholder (placeholder with same output for all players)
-	 */
-	ServerPlaceholder registerServerPlaceholder(String identifier, int refresh, Supplier<Object> supplier);
-	
-	/**
-	 * Registers a player placeholder (placeholder with player-specific output)
-	 */
-	PlayerPlaceholder registerPlayerPlaceholder(String identifier, int refresh, Function<TabPlayer, Object> function);
+    /**
+     * Registers a server placeholder (placeholder with same output for all players)
+     *
+     * @param   identifier
+     *          Placeholder identifier
+     * @param   refresh
+     *          Refresh interval
+     * @param   supplier
+     *          Supplier for placeholder output
+     * @return  Registered placeholder for further use
+     * @throws  IllegalArgumentException
+     *          If {@code identifier} does not start and end with {@code %} or
+     *          {@code refresh} is not divisible by 50
+     */
+    @NotNull ServerPlaceholder registerServerPlaceholder(@NonNull String identifier, int refresh, @NonNull Supplier<Object> supplier);

-	/**
-	 * Registers a relational placeholder (different output for each player pair)
-	 */
-	RelationalPlaceholder registerRelationalPlaceholder(String identifier, int refresh, BiFunction<TabPlayer, TabPlayer, Object> function);
-	
-	/**
-	 * Detects placeholders in text using %% pattern and returns list of all detected identifiers
-	 * @param text - text to detect placeholders in
-	 * @return list of detected identifiers
-	 */
-	List<String> detectPlaceholders(String text);
+    /**
+     * Registers a player placeholder (placeholder different output per player)
+     *
+     * @param   identifier
+     *          Placeholder identifier
+     * @param   refresh
+     *          Refresh interval
+     * @param   function
+     *          Function for placeholder output
+     * @return  Registered placeholder for further use
+     * @throws  IllegalArgumentException
+     *          If {@code identifier} does not start and end with {@code %} or
+     *          {@code refresh} is not divisible by 50
+     */
+    @NotNull PlayerPlaceholder registerPlayerPlaceholder(@NonNull String identifier, int refresh, @NonNull Function<TabPlayer, Object> function);

-	/**
-	 * Adds placeholder to list of used placeholders and assigns this feature as using it,
-	 * which will then receive refresh() if values changes
-	 * @param identifier - placeholder identifier
-	 * @param feature - feature using the placeholder
-	 */
-	void addUsedPlaceholder(String identifier, TabFeature feature);
-	
-	String findReplacement(String placeholder, String output);
+    /**
+     * Registers a relational placeholder (placeholder with output different for each player duo)
+     *
+     * @param   identifier
+     *          Placeholder identifier
+     * @param   refresh
+     *          Refresh interval
+     * @param   function
+     *          Function for placeholder output
+     * @return  Registered placeholder for further use
+     * @throws  IllegalArgumentException
+     *          If {@code identifier} does not start and end with {@code %},
+     *          does not start with {@code %rel_} or
+     *          {@code refresh} is not divisible by 50
+     */
+    @NotNull RelationalPlaceholder registerRelationalPlaceholder(@NonNull String identifier, int refresh, @NonNull BiFunction<TabPlayer, TabPlayer, Object> function);

-	List<String> getUsedPlaceholders();
+    /**
+     * Returns placeholder from specified identifier. If it does not exist, it is registered
+     * as a PlaceholderAPI placeholder and returned.
+     *
+     * @param   identifier
+     *          Placeholder identifier
+     * @return  Placeholder with specified identifier
+     */
+    @NotNull Placeholder getPlaceholder(@NonNull String identifier);
+
+    /**
+     * Unregisters placeholder and makes plugin no longer refresh it.
+     *
+     * @param   placeholder
+     *          Placeholder to unregister
+     */
+    void unregisterPlaceholder(@NonNull Placeholder placeholder);
+
+    /**
+     * Unregisters placeholder and makes plugin no longer refresh it.
+     *
+     * @param   identifier
+     *          identifier of placeholder to unregister
+     */
+    void unregisterPlaceholder(@NonNull String identifier);
 }
@@ -1,10 +1,31 @@
 package me.neznamy.tab.api.placeholder;

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

+/**
+ * Interface for player placeholders (placeholders returning different value for each player)
+ */
 public interface PlayerPlaceholder extends Placeholder {

-	void updateValue(TabPlayer player, Object value);
-	
-	Object request(TabPlayer p);
+    /**
+     * Force-updates placeholder value. It will still be overridden by periodic refresh later,
+     * so this is (only) useful for force an update when value is supposed to change, and you have
+     * a high refresh interval set.
+     *
+     * @param   player
+     *          Player to update value for
+     * @param   value
+     *          New value
+     */
+    void updateValue(@NonNull TabPlayer player, @Nullable Object value);
+
+    /**
+     * Force-updates placeholder value using previously provided update function.
+     *
+     * @param   player
+     *          Player to update value for
+     */
+    void update(@NonNull TabPlayer player);
 }
@@ -1,10 +1,36 @@
 package me.neznamy.tab.api.placeholder;

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

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

-	void updateValue(TabPlayer viewer, TabPlayer target, Object value);
-	
-	Object request(TabPlayer viewer, TabPlayer target);
+    /**
+     * Force-updates placeholder value. It will still be overridden by periodic refresh later,
+     * so this is (only) useful for force an update when value is supposed to change, and you have
+     * a high refresh interval set.
+     *
+     * @param   viewer
+     *          Placeholder viewer
+     * @param   target
+     *          Placeholder target
+     * @param   value
+     *          New value
+     */
+    void updateValue(@NonNull TabPlayer viewer, @NonNull TabPlayer target, @Nullable Object value);
+
+    /**
+     * Force-updates placeholder value using previously provided update function.
+     *
+     * @param   viewer
+     *          Placeholder viewer
+     * @param   target
+     *          Placeholder target
+     */
+    void update(@NonNull TabPlayer viewer, @NonNull TabPlayer target);
 }
@@ -1,8 +1,24 @@
 package me.neznamy.tab.api.placeholder;

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

-	void updateValue(Object value);
-	
-	Object request();
+    /**
+     * Force-updates placeholder value. It will still be overridden by periodic refresh later,
+     * so this is (only) useful for force an update when value is supposed to change, and you have
+     * a high refresh interval set.
+     *
+     * @param   value
+     *          New value
+     */
+    void updateValue(@Nullable Object value);
+
+    /**
+     * Force-updates placeholder value using previously provided update function.
+     */
+    void update();
 }
@@ -1,240 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import me.neznamy.tab.api.ProtocolVersion;
-import me.neznamy.tab.api.chat.EnumChatFormat;
-import me.neznamy.tab.api.chat.IChatBaseComponent;
-import me.neznamy.tab.api.chat.rgb.RGBUtils;
-import me.neznamy.tab.api.util.BiFunctionWithException;
-
-/**
- * An interface representing a platform-specific packet builder
- */
-public abstract class PacketBuilder {
-
-	/** Function map turning custom packet class into platform-specific packets */
-	protected final Map<Class<? extends TabPacket>, BiFunctionWithException<TabPacket, ProtocolVersion, Object>> buildMap = new HashMap<>();
-
-	/**
-	 * Constructs new instance and fills {@link #buildMap} with abstract build methods
-	 * of packets present on all platforms.
-	 */
-	protected PacketBuilder() {
-		buildMap.put(PacketPlayOutBoss.class, (packet, version) -> build((PacketPlayOutBoss)packet, version));
-		buildMap.put(PacketPlayOutChat.class, (packet, version) -> build((PacketPlayOutChat)packet, version));
-		buildMap.put(PacketPlayOutPlayerInfo.class, (packet, version) -> build((PacketPlayOutPlayerInfo)packet, version));
-		buildMap.put(PacketPlayOutPlayerListHeaderFooter.class, (packet, version) -> build((PacketPlayOutPlayerListHeaderFooter)packet, version));
-		buildMap.put(PacketPlayOutScoreboardDisplayObjective.class, (packet, version) -> build((PacketPlayOutScoreboardDisplayObjective)packet, version));
-		buildMap.put(PacketPlayOutScoreboardObjective.class, (packet, version) -> build((PacketPlayOutScoreboardObjective)packet, version));
-		buildMap.put(PacketPlayOutScoreboardScore.class, (packet, version) -> build((PacketPlayOutScoreboardScore)packet, version));
-		buildMap.put(PacketPlayOutScoreboardTeam.class, (packet, version) -> build((PacketPlayOutScoreboardTeam)packet, version));
-	}
-
-	/**
-	 * Converts custom packet into platform-specific packet by calling a function from
-	 * {@link #buildMap}.
-	 * 
-	 * @param	packet
-	 * 			Packet to build
-	 * @param	clientVersion
-	 * 			Protocol version of player to build the packet for
-	 * @return	Platform-specific packet
-	 * @throws	ReflectiveOperationException
-	 * 			if reflection fails
-	 */
-	public Object build(TabPacket packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-		return buildMap.get(packet.getClass()).apply(packet, clientVersion);
-	}
-
-	/**
-	 * Constructs platform-specific PacketPlayOutBoss class based on custom packet class
-	 * 
-	 * @param	packet
-	 * 			Custom packet to be built
-	 * @param	clientVersion
-	 * 			Protocol version of player to build the packet for
-	 * @return	Platform-specific packet
-	 * @throws	ReflectiveOperationException 
-	 * 			if thrown by reflective operation
-	 */
-	public abstract Object build(PacketPlayOutBoss packet, ProtocolVersion clientVersion) throws ReflectiveOperationException;
-
-	/**
-	 * Constructs platform-specific PacketPlayOutChat class based on custom packet class
-	 * 
-	 * @param	packet
-	 * 			Custom packet to be built
-	 * @param	clientVersion
-	 * 			Protocol version of player to build the packet for
-	 * @return	Platform-specific packet
-	 * @throws	ReflectiveOperationException 
-	 * 			if thrown by reflective operation
-	 */
-	public abstract Object build(PacketPlayOutChat packet, ProtocolVersion clientVersion) throws ReflectiveOperationException;
-
-	/**
-	 * Constructs platform-specific PacketPlayOutPlayerInfo class based on custom packet class
-	 * 
-	 * @param	packet
-	 * 			Custom packet to be built
-	 * @param	clientVersion
-	 * 			Protocol version of player to build the packet for
-	 * @return	Platform-specific packet
-	 * @throws	ReflectiveOperationException 
-	 * 			if thrown by reflective operation
-	 */
-	public abstract Object build(PacketPlayOutPlayerInfo packet, ProtocolVersion clientVersion) throws ReflectiveOperationException;
-
-	/**
-	 * Constructs platform-specific PacketPlayOutPlayerListHeaderFooter class based on custom packet class
-	 * 
-	 * @param	packet
-	 * 			Custom packet to be built
-	 * @param	clientVersion
-	 * 			Protocol version of player to build the packet for
-	 * @return	Platform-specific packet
-	 * @throws	ReflectiveOperationException 
-	 * 			if thrown by reflective operation
-	 */
-	public abstract Object build(PacketPlayOutPlayerListHeaderFooter packet, ProtocolVersion clientVersion) throws ReflectiveOperationException;
-
-	/**
-	 * Constructs platform-specific PacketPlayOutScoreboardDisplayObjective class based on custom packet class
-	 * 
-	 * @param	packet
-	 * 			Custom packet to be built
-	 * @param	clientVersion
-	 * 			Protocol version of player to build the packet for
-	 * @return	Platform-specific packet
-	 * @throws	ReflectiveOperationException 
-	 * 			if thrown by reflective operation
-	 */
-	public abstract Object build(PacketPlayOutScoreboardDisplayObjective packet, ProtocolVersion clientVersion) throws ReflectiveOperationException;
-
-	/**
-	 * Constructs platform-specific PacketPlayOutScoreboardObjective class based on custom packet class
-	 * 
-	 * @param	packet
-	 * 			Custom packet to be built
-	 * @param	clientVersion
-	 * 			Protocol version of player to build the packet for
-	 * @return	Platform-specific packet
-	 * @throws	ReflectiveOperationException 
-	 * 			if thrown by reflective operation
-	 */
-	public abstract Object build(PacketPlayOutScoreboardObjective packet, ProtocolVersion clientVersion) throws ReflectiveOperationException;
-
-	/**
-	 * Constructs platform-specific PacketPlayOutScoreboardScore class based on custom packet class
-	 * 
-	 * @param	packet
-	 * 			Custom packet to be built
-	 * @param	clientVersion
-	 * 			Protocol version of player to build the packet for
-	 * @return	Platform-specific packet
-	 * @throws	ReflectiveOperationException 
-	 * 			if thrown by reflective operation
-	 */
-	public abstract Object build(PacketPlayOutScoreboardScore packet, ProtocolVersion clientVersion) throws ReflectiveOperationException;
-
-	/**
-	 * Constructs platform-specific PacketPlayOutScoreboardTeam class based on custom packet class
-	 * 
-	 * @param	packet
-	 * 			Custom packet to be built
-	 * @param	clientVersion
-	 * 			Protocol version of player to build the packet for
-	 * @return	Platform-specific packet
-	 * @throws	ReflectiveOperationException 
-	 * 			if thrown by reflective operation
-	 */
-	public abstract Object build(PacketPlayOutScoreboardTeam packet, ProtocolVersion clientVersion) throws ReflectiveOperationException;
-
-	/**
-	 * Cuts given string to specified character length (or length-1 if last character is a color character)
-	 * and translates RGB to legacy colors. If string is not that long, the original string is returned.
-	 * RGB codes are converted into legacy, since cutting is only needed for <1.13.
-	 * If {@code string} is {@code null}, empty string is returned.
-	 * @param	string
-	 * 			String to cut
-	 * @param	length
-	 * 			Length to cut to
-	 * @return	string cut to {@code length} characters
-	 */
-	public String cutTo(String string, int length) {
-		if (string == null) return "";
-		String legacyText = string;
-		if (string.contains("#")) {
-			//converting RGB to legacy colors
-			legacyText = RGBUtils.getInstance().convertRGBtoLegacy(string);
-		}
-		if (legacyText.length() <= length) return legacyText;
-		if (legacyText.charAt(length-1) == EnumChatFormat.COLOR_CHAR) {
-			return legacyText.substring(0, length-1); //cutting one extra character to prevent prefix ending with "&"
-		} else {
-			return legacyText.substring(0, length);
-		}
-	}
-
-	/**
-	 * If {@code clientVersion} is >= 1.13, creates a component from given text and returns
-	 * it as a serialized component, which BungeeCord uses.
-	 * <p>
-	 * If {@code clientVersion} is < 1.12, the text is cut to {@code length} characters if
-	 * needed and returned.
-	 * 
-	 * @param	text
-	 * 			Text to convert
-	 * @param	clientVersion
-	 * 			Version of player to convert text for
-	 * @return	serialized component for 1.13+ clients, cut string for 1.12-
-	 */
-	public String jsonOrCut(String text, ProtocolVersion clientVersion, int length) {
-		if (text == null) return null;
-		if (clientVersion.getMinorVersion() >= 13) {
-			return IChatBaseComponent.optimizedComponent(text).toString(clientVersion);
-		} else {
-			return cutTo(text, length);
-		}
-	}
-
-	/**
-	 * Converts platform-specific instance of player info packet into 
-	 * {@link PacketPlayOutPlayerInfo} object.
-	 * 
-	 * @param	packet
-	 * 			platform-specific info packet
-	 * @param	clientVersion
-	 * 			Version of client receiving the packet
-	 * @return	The packet converted into {@link PacketPlayOutPlayerInfo}
-	 * @throws	ReflectiveOperationException 
-	 * 			if thrown by reflective operation
-	 */
-	public abstract PacketPlayOutPlayerInfo readPlayerInfo(Object packet, ProtocolVersion clientVersion) throws ReflectiveOperationException;
-
-	/**
-	 * Converts platform-specific instance of objective packet into 
-	 * {@link PacketPlayOutScoreboardObjective} object.
-	 * 
-	 * @param	packet
-	 * 			platform-specific objective packet
-	 * @return	The packet converted into {@link PacketPlayOutScoreboardObjective}
-	 * @throws	ReflectiveOperationException 
-	 * 			if thrown by reflective operation
-	 */
-	public abstract PacketPlayOutScoreboardObjective readObjective(Object packet) throws ReflectiveOperationException;
-
-	/**
-	 * Converts platform-specific instance of display objective packet into 
-	 * {@link PacketPlayOutScoreboardDisplayObjective} object.
-	 * 
-	 * @param	packet
-	 * 			platform-specific display objective packet
-	 * @return	The packet converted into {@link PacketPlayOutScoreboardDisplayObjective}
-	 * @throws	ReflectiveOperationException 
-	 * 			if thrown by reflective operation
-	 */
-	public abstract PacketPlayOutScoreboardDisplayObjective readDisplayObjective(Object packet) throws ReflectiveOperationException;
-}
@@ -1,280 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-import java.util.UUID;
-
-import me.neznamy.tab.api.bossbar.BarColor;
-import me.neznamy.tab.api.bossbar.BarStyle;
-
-/**
- * A class representing platform specific packet class
- */
-public class PacketPlayOutBoss implements TabPacket {
-
-	/** UUID of the BossBar */
-	private final UUID id;
-
-	/** Action of this packet */
-	private final Action operation;
-
-	/** BossBar title */
-	private String name;
-
-	/** BossBar progress (0-1)*/
-	private float pct;
-
-	/** BossBar color */
-	private BarColor color;
-
-	/** BossBar style */
-	private BarStyle overlay;
-
-	/** Darken screen flag */
-	private boolean darkenScreen;
-
-	/** Play music flag */
-	private boolean playMusic;
-
-	/** Create fog flag */
-	private boolean createWorldFog;
-
-	/**
-	 * Constructs new instance with given parameters and  
-	 * {@link me.neznamy.tab.api.protocol.PacketPlayOutBoss.Action}.ADD action
-	 * 
-	 * @param	id
-	 * 			BossBar uuid
-	 * @param	name
-	 * 			BossBar title
-	 * @param	pct
-	 * 			BossBar progress
-	 * @param	color
-	 * 			BossBar color
-	 * @param	overlay
-	 * 			BossBar style
-	 */
-	public PacketPlayOutBoss(UUID id, String name, float pct, BarColor color, BarStyle overlay) {
-		this.operation = Action.ADD;
-		this.id = id;
-		this.name = name;
-		this.pct = pct;
-		this.color = color;
-		this.overlay = overlay;
-	}
-
-	/**
-	 * Constructs new instance with given parameters and  
-	 * {@link me.neznamy.tab.api.protocol.PacketPlayOutBoss.Action}.REMOVE action
-	 * 
-	 * @param	id
-	 * 			BossBar uuid
-	 */
-	public PacketPlayOutBoss(UUID id) {
-		this.operation = Action.REMOVE;
-		this.id = id;
-	}
-
-	/**
-	 * Constructs new instance with given parameters and  
-	 * {@link me.neznamy.tab.api.protocol.PacketPlayOutBoss.Action}.UPDATE_PCT action
-	 * 
-	 * @param	id
-	 * 			BossBar uuid
-	 * @param	pct
-	 * 			BossBar progress
-	 */
-	public PacketPlayOutBoss(UUID id, float pct) {
-		this.operation = Action.UPDATE_PCT;
-		this.id = id;
-		this.pct = pct;
-	}
-
-	/**
-	 * Constructs new instance with given parameters and  
-	 * {@link me.neznamy.tab.api.protocol.PacketPlayOutBoss.Action}.UPDATE_NAME action
-	 * 
-	 * @param	id
-	 * 			BossBar uuid
-	 * @param	name
-	 * 			BossBar title
-	 */
-	public PacketPlayOutBoss(UUID id, String name) {
-		this.operation = Action.UPDATE_NAME;
-		this.id = id;
-		this.name = name;
-	}
-
-	/**
-	 * Constructs new instance with given parameters and  
-	 * {@link me.neznamy.tab.api.protocol.PacketPlayOutBoss.Action}.UPDATE_STYLE action
-	 * 
-	 * @param	id
-	 * 			BossBar uuid
-	 * @param	color
-	 * 			BossBar color
-	 * @param	overlay
-	 * 			BossBar style
-	 */
-	public PacketPlayOutBoss(UUID id, BarColor color, BarStyle overlay) {
-		this.operation = Action.UPDATE_STYLE;
-		this.id = id;
-		this.color = color;
-		this.overlay = overlay;
-	}
-
-	/**
-	 * Constructs new instance with given parameters and  
-	 * {@link me.neznamy.tab.api.protocol.PacketPlayOutBoss.Action}.UPDATE_PROPERTIES action
-	 * 
-	 * @param	darkenScreen
-	 * 			Darken screen flag
-	 * @param	playMusic
-	 * 			Play music flag
-	 * @param	createWorldFog
-	 * 			Create fog flag
-	 */
-	public PacketPlayOutBoss(UUID id, boolean darkenScreen, boolean playMusic, boolean createWorldFog) {
-		this.operation = Action.UPDATE_PROPERTIES;
-		this.id = id;
-		this.darkenScreen = darkenScreen;
-		this.playMusic = playMusic;
-		this.createWorldFog = createWorldFog;
-	}
-
-	/**
-	 * Returns bitmask based on {@link #darkenScreen}, {@link #playMusic} and {@link #darkenScreen} values.
-	 * <p>
-	 * {@link #darkenScreen} adds {@code 1}, {@link #playMusic} {@code 2} and {@link #darkenScreen} {@code 4}
-	 * to the final value.
-	 * 
-	 * @return the bitmask
-	 */
-	public byte getFlags(){
-		byte value = 0;
-		if (darkenScreen) value += 1;
-		if (playMusic) value += 2;
-		if (createWorldFog) value += 4;
-		return value;
-	}
-
-	@Override
-	public String toString() {
-		return String.format("PacketPlayOutBoss{id=%s,operation=%s,name=%s,pct=%s,color=%s,overlay=%s,darkenScreen=%s,playMusic=%s,createWorldFog=%s}", 
-				id, operation, name, pct, color, overlay, darkenScreen, playMusic, createWorldFog);
-	}
-
-	/**
-	 * Returns {@link #color}
-	 * @return	color
-	 */
-	public BarColor getColor() {
-		return color;
-	}
-
-	/**
-	 * Returns {@link #overlay}
-	 * @return	style
-	 */
-	public BarStyle getOverlay() {
-		return overlay;
-	}
-
-	/**
-	 * Returns {@link #name}
-	 * @return	name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Returns {@link #id}
-	 * @return	id
-	 */
-	public UUID getId() {
-		return id;
-	}
-
-	/**
-	 * Returns {@link #pct}
-	 * @return	progress
-	 */
-	public float getPct() {
-		return pct;
-	}
-
-	/**
-	 * Returns {@link #operation}
-	 * @return	packet action
-	 */
-	public Action getOperation() {
-		return operation;
-	}
-
-	/**
-	 * Returns {@link #darkenScreen}
-	 * @return	darkenScreen
-	 */
-	public boolean isDarkenScreen() {
-		return darkenScreen;
-	}
-
-	/**
-	 * Returns {@link #createWorldFog}
-	 * @return	createWorldFog
-	 */
-	public boolean isCreateWorldFog() {
-		return createWorldFog;
-	}
-
-	/**
-	 * Returns {@link #playMusic}
-	 * @return	playMusic
-	 */
-	public boolean isPlayMusic() {
-		return playMusic;
-	}
-
-	/**
-	 * Sets {@link #darkenScreen} to specified value
-	 * 
-	 * @param	darkenScreen
-	 * 			Darken screen flag
-	 */
-	public void setDarkenScreen(boolean darkenScreen) {
-		this.darkenScreen = darkenScreen;
-	}
-
-	/**
-	 * Sets {@link #createWorldFog} to specified value
-	 * 
-	 * @param	createWorldFog
-	 * 			Create fog flag
-	 */
-	public void setCreateWorldFog(boolean createWorldFog) {
-		this.createWorldFog = createWorldFog;
-	}
-
-	/**
-	 * Sets {@link #playMusic} to specified value
-	 * 
-	 * @param	playMusic
-	 * 			Play music flag
-	 */
-	public void setPlayMusic(boolean playMusic) {
-		this.playMusic = playMusic;
-	}
-
-	/**
-	 * An enum representing all valid boss packet actions.
-	 * Calling ordinal() will return action's network ID.
-	 */
-	public enum Action {
-
-		ADD,
-		REMOVE,
-		UPDATE_PCT,
-		UPDATE_NAME,
-		UPDATE_STYLE,
-		UPDATE_PROPERTIES
-	}
-}
@@ -1,60 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-import me.neznamy.tab.api.chat.IChatBaseComponent;
-
-/**
- * A class representing platform specific packet class
- */
-public class PacketPlayOutChat implements TabPacket {
-
-	/** Message to be sent */
-	private final IChatBaseComponent message;
-
-	/** Message position */
-	private final ChatMessageType type;
-
-	/**
-	 * Constructs new instance with given parameters
-	 * 
-	 * @param	message
-	 * 			Chat message to be sent
-	 * @param	type
-	 * 			Message position
-	 */
-	public PacketPlayOutChat(IChatBaseComponent message, ChatMessageType type) {
-		this.message = message;
-		this.type = type;
-	}
-
-	@Override
-	public String toString() {
-		return String.format("PacketPlayOutChat{message=%s,type=%s}", message, type);
-	}
-
-	/**
-	 * Returns {@link #message}
-	 * @return	message
-	 */
-	public IChatBaseComponent getMessage() {
-		return message;
-	}
-
-	/**
-	 * Returns {@link #type}
-	 * @return	type
-	 */
-	public ChatMessageType getType() {
-		return type;
-	}
-
-	/**
-	 * An enum representing positions of a chat message
-	 * Calling ordinal() will return type's network ID.
-	 */
-	public enum ChatMessageType {
-
-		CHAT,
-		SYSTEM,
-		GAME_INFO
-	}
-}
@@ -1,305 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
-
-import me.neznamy.tab.api.chat.IChatBaseComponent;
-
-/**
- * A class representing platform specific packet class
- */
-public class PacketPlayOutPlayerInfo implements TabPacket {
-
-	/** Packet action */
-	private final EnumPlayerInfoAction action;
-
-	/** List of affected entries */
-	private final List<PlayerInfoData> entries;
-
-	/**
-	 * Constructs new instance with given parameters.
-	 * 
-	 * @param	action
-	 * 			Packet action
-	 * @param	entries
-	 * 			Affected entries
-	 */
-	public PacketPlayOutPlayerInfo(EnumPlayerInfoAction action, PlayerInfoData... entries) {
-		this.action = action;
-		this.entries = Arrays.asList(entries);
-	}
-
-	/**
-	 * Constructs new instance with given parameters.
-	 * 
-	 * @param	action
-	 * 			Packet action
-	 * @param	entries
-	 * 			Affected entries
-	 */
-	public PacketPlayOutPlayerInfo(EnumPlayerInfoAction action, List<PlayerInfoData> entries) {
-		this.action = action;
-		this.entries = entries;
-	}
-
-	@Override
-	public String toString() {
-		return String.format("PacketPlayOutPlayerInfo{action=%s,entries=%s}", action, entries);
-	}
-
-	/**
-	 * Returns {@link #action}
-	 * @return	packet action
-	 */
-	public EnumPlayerInfoAction getAction() {
-		return action;
-	}
-
-	/**
-	 * Returns {@link #entries}
-	 * @return	affected entries
-	 */
-	public List<PlayerInfoData> getEntries() {
-		return entries;
-	}
-
-	/**
-	 * A subclass representing player list entry
-	 */
-	public static class PlayerInfoData {
-
-		/** Latency */
-		private int latency;
-
-		/** GameMode */
-		private EnumGamemode gameMode = EnumGamemode.SURVIVAL; //ProtocolLib causes NPE even when action does not use GameMode
-
-		/** 
-		 * Display name displayed in TabList. Using {@code null} results in no display name
-		 * and scoreboard team prefix/suffix being visible in TabList instead.
-		 */
-		private IChatBaseComponent displayName;
-
-		/** Real name of affected player */
-		private String name;
-
-		/** Player UUID */
-		private UUID uniqueId;
-
-		/** platform-specific skin object */
-		private Object skin;
-
-		/**
-		 * Constructs new instance with given parameters. Suitable for 
-		 * {@link EnumPlayerInfoAction}.ADD_PLAYER action
-		 * 
-		 * @param	name
-		 * 			Player's name
-		 * @param	uniqueId
-		 * 			Player's uuid
-		 * @param	skin
-		 * 			Player's platform-specific skin object
-		 * @param	latency
-		 * 			Player's ping
-		 * @param	gameMode
-		 * 			Player's GameMode
-		 * @param	displayName
-		 * 			Player's display name
-		 */
-		public PlayerInfoData(String name, UUID uniqueId, Object skin, int latency, EnumGamemode gameMode, IChatBaseComponent displayName) {
-			this.name = name;
-			this.uniqueId = uniqueId;
-			this.skin = skin;
-			this.latency = latency;
-			this.gameMode = gameMode;
-			this.displayName = displayName;
-		}
-
-		/**
-		 * Constructs new instance with given parameters. Suitable for 
-		 * {@link EnumPlayerInfoAction}.UPDATE_GAME_MODE action
-		 * 
-		 * @param	uniqueId
-		 * 			Player's uuid
-		 * @param	gameMode
-		 * 			Player's GameMode
-		 */
-		public PlayerInfoData(UUID uniqueId, EnumGamemode gameMode) {
-			this.uniqueId = uniqueId;
-			this.gameMode = gameMode;
-		}
-
-		/**
-		 * Constructs new instance with given parameters. Suitable for 
-		 * {@link EnumPlayerInfoAction}.UPDATE_LATENCY action
-		 * 
-		 * @param	uniqueId
-		 * 			Player's uuid
-		 * @param	latency
-		 * 			Player's ping
-		 */
-		public PlayerInfoData(UUID uniqueId, int latency) {
-			this.uniqueId = uniqueId;
-			this.latency = latency;
-		}
-
-		/**
-		 * Constructs new instance with given parameters. Suitable for 
-		 * {@link EnumPlayerInfoAction}.UPDATE_DISPLAY_NAME action
-		 * 
-		 * @param	uniqueId
-		 * 			Player's uuid
-		 * @param	displayName
-		 * 			Player's display name
-		 */
-		public PlayerInfoData(UUID uniqueId, IChatBaseComponent displayName) {
-			this.uniqueId = uniqueId;
-			this.displayName = displayName;
-		}
-
-		/**
-		 * Constructs new instance with given parameter. Suitable for 
-		 * {@link EnumPlayerInfoAction}.REMOVE_PLAYER action
-		 * 
-		 * @param	uniqueId
-		 * 			Player's uuid
-		 */
-		public PlayerInfoData(UUID uniqueId) {
-			this.uniqueId = uniqueId;
-		}
-
-		@Override
-		public String toString() {
-			return String.format("PlayerInfoData{latency=%s,gameMode=%s,displayName=%s,name=%s,uniqueId=%s,skin=%s}",
-					latency, gameMode, displayName, name, uniqueId, skin);
-		}
-
-		/**
-		 * Returns {@link #latency}
-		 * @return	latency
-		 */
-		public int getLatency() {
-			return latency;
-		}
-
-		/**
-		 * Sets {@link #latency} to specified value
-		 * @param	latency
-		 * 			Latency to use
-		 */
-		public void setLatency(int latency) {
-			this.latency = latency;
-		}
-
-		/**
-		 * Returns {@link #displayName}
-		 * @return	displayName
-		 */
-		public IChatBaseComponent getDisplayName() {
-			return displayName;
-		}
-
-		/**
-		 * Sets {@link #displayName} to specified value
-		 * @param	displayName
-		 * 			Display name to use
-		 */
-		public void setDisplayName(IChatBaseComponent displayName) {
-			this.displayName = displayName;
-		}
-
-		/**
-		 * Returns {@link #uniqueId}
-		 * @return	uniqueId
-		 */
-		public UUID getUniqueId() {
-			return uniqueId;
-		}
-
-		/**
-		 * Sets {@link #uniqueId} to specified value
-		 * @param	uniqueId
-		 * 			UUID to use
-		 */
-		public void setUniqueId(UUID uniqueId) {
-			this.uniqueId = uniqueId;
-		}
-
-		/**
-		 * Returns {@link #name}
-		 * @return	name
-		 */
-		public String getName() {
-			return name;
-		}
-
-		/**
-		 * Sets {@link #name} to specified value
-		 * @param	name
-		 * 			name to use
-		 */
-		public void setName(String name) {
-			this.name = name;
-		}
-
-		/**
-		 * Returns {@link #gameMode}
-		 * @return	gameMode
-		 */
-		public EnumGamemode getGameMode() {
-			return gameMode;
-		}
-
-		/**
-		 * Sets {@link #gameMode} to specified value
-		 * @param	gameMode
-		 * 			GameMode to use
-		 */
-		public void setGameMode(EnumGamemode gameMode) {
-			this.gameMode = gameMode;
-		}
-
-		/**
-		 * Returns {@link #skin}
-		 * @return	skin
-		 */
-		public Object getSkin() {
-			return skin;
-		}
-
-		/**
-		 * Sets {@link #skin} to specified value
-		 * @param	skin
-		 * 			Skin to use
-		 */
-		public void setSkin(Object skin) {
-			this.skin = skin;
-		}
-	}
-
-	/**
-	 * En enum representing packet action
-	 * Calling ordinal() will return action's network ID.
-	 */
-	public enum EnumPlayerInfoAction {
-
-		ADD_PLAYER,
-		UPDATE_GAME_MODE,
-		UPDATE_LATENCY,
-		UPDATE_DISPLAY_NAME,
-		REMOVE_PLAYER
-	}
-
-	/**
-	 * An enum representing GameMode
-	 */
-	public enum EnumGamemode {
-
-		NOT_SET,
-		SURVIVAL,
-		CREATIVE,
-		ADVENTURE,
-		SPECTATOR
-	}
-}
@@ -1,63 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-import me.neznamy.tab.api.chat.IChatBaseComponent;
-
-/**
- * A class representing platform specific packet class
- */
-public class PacketPlayOutPlayerListHeaderFooter implements TabPacket {
-
-	/** TabList header */
-	private final IChatBaseComponent header;
-
-	/** TabList footer */
-	private final IChatBaseComponent footer;
-
-	/**
-	 * Constructs new instance with given parameters. They are converted to {@link IChatBaseComponent}
-	 * using {@link IChatBaseComponent#optimizedComponent(String)} method.
-	 * 
-	 * @param	header
-	 * 			TabList header
-	 * @param	footer
-	 * 			TabList footer
-	 */
-	public PacketPlayOutPlayerListHeaderFooter(String header, String footer) {
-		this.header = IChatBaseComponent.optimizedComponent(header);
-		this.footer = IChatBaseComponent.optimizedComponent(footer);
-	}
-
-	/**
-	 * Constructs new instance with given parameters.
-	 * 
-	 * @param	header
-	 * 			TabList header
-	 * @param	footer
-	 * 			TabList footer
-	 */
-	public PacketPlayOutPlayerListHeaderFooter(IChatBaseComponent header, IChatBaseComponent footer) {
-		this.header = header;
-		this.footer = footer;
-	}
-
-	@Override
-	public String toString() {
-		return String.format("PacketPlayOutPlayerListHeaderFooter{header=%s,footer=%s}", header, footer);
-	}
-
-	/**
-	 * Returns {@link #header}
-	 * @return	header
-	 */
-	public IChatBaseComponent getHeader() {
-		return header;
-	}
-
-	/**
-	 * Returns {@link #footer}
-	 * @return	footer
-	 */
-	public IChatBaseComponent getFooter() {
-		return footer;
-	}
-}
@@ -1,55 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-/**
- * A class representing platform specific packet class
- */
-public class PacketPlayOutScoreboardDisplayObjective implements TabPacket {
-
-	/**
-	 * Display slot.
-	 * 0 = PlayerList,
-	 * 1 = SideBar,
-	 * 2 = BelowName.
-	 */
-	private final int slot;
-	
-	/** Up to 16 characters long objective name */
-	private final String objectiveName;
-
-	/**
-	 * Constructs new instance with given parameters
-	 * @param	slot
-	 * 			Display slot
-	 * @param	objectiveName
-	 * 			Internal name of the objective
-	 * @throws	IllegalArgumentException
-	 * 			if {@code objectiveName} is null or longer than 16 characters
-	 */
-	public PacketPlayOutScoreboardDisplayObjective(int slot, String objectiveName) {
-		if (objectiveName == null) throw new IllegalArgumentException("objectiveName cannot be null");
-		if (objectiveName.length() > 16) throw new IllegalArgumentException("objectiveName cannot be longer than 16 character (is " + objectiveName.length() + ")");
-		this.slot = slot;
-		this.objectiveName = objectiveName;
-	}
-
-	@Override
-	public String toString() {
-		return String.format("PacketPlayOutScoreboardDisplayObjective{slot=%s,objectiveName=%s}", slot, objectiveName);
-	}
-
-	/**
-	 * Returns {@link #slot}
-	 * @return	slot
-	 */
-	public int getSlot() {
-		return slot;
-	}
-
-	/**
-	 * Returns {@link #objectiveName}
-	 * @return	objectiveName
-	 */
-	public String getObjectiveName() {
-		return objectiveName;
-	}
-}
@@ -1,109 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-/**
- * A class representing platform specific packet class
- */
-public class PacketPlayOutScoreboardObjective implements TabPacket {
-
-	/** Up to 16 characters long objective name */
-	private final String objectiveName;
-
-	/** Display name */
-	private final String displayName;
-
-	/** Display type, only takes effect in PlayerList */
-	private final EnumScoreboardHealthDisplay renderType;
-
-	/**
-	 * Packet action.
-	 * 0 = register,
-	 * 1 = unregister,
-	 * 2 = update title
-	 */
-	private final int method;
-
-	/**
-	 * Constructs new instance with given parameters.
-	 * 
-	 * @param	method
-	 * 			Packet action (0 = add, 1 = remove, 2 = update title)
-	 * @param	objectiveName
-	 * 			objective name, up to 16 characters long
-	 * @param displayName - title
-	 * @param renderType - display type
-	 * @throws	IllegalArgumentException
-	 * 			if {@code objectiveName} is null or longer than 16 characters
-	 */
-	public PacketPlayOutScoreboardObjective(int method, String objectiveName, String displayName, EnumScoreboardHealthDisplay renderType) {
-		if (objectiveName == null) throw new IllegalArgumentException("objectiveName cannot be null");
-		if (objectiveName.length() > 16) throw new IllegalArgumentException("objectiveName cannot be longer than 16 character (is " + objectiveName.length() + ")");
-		this.objectiveName = objectiveName;
-		this.displayName = displayName;
-		this.renderType = renderType;
-		this.method = method;
-	}
-
-	/**
-	 * Constructs new packet with given objective name and 1 (unregister) action.
-	 * 
-	 * @param	objectiveName
-	 * 			objective name, up to 16 characters long
-	 * @throws	IllegalArgumentException
-	 * 			if {@code objectiveName} is null or longer than 16 characters
-	 */
-	public PacketPlayOutScoreboardObjective(String objectiveName) {
-		if (objectiveName == null) throw new IllegalArgumentException("objectiveName cannot be null");
-		if (objectiveName.length() > 16) throw new IllegalArgumentException("objectiveName cannot be longer than 16 character (is " + objectiveName.length() + ")");
-		this.objectiveName = objectiveName;
-		this.displayName = ""; //avoiding NPE on <1.7
-		this.method = 1;
-		this.renderType = null;
-	}
-
-	@Override
-	public String toString() {
-		return String.format("PacketPlayOutScoreboardObjective{objectiveName=%s,displayName=%s,renderType=%s,method=%s}",
-				objectiveName, displayName, renderType, method);
-	}
-
-	/**
-	 * Returns {@link #displayName}
-	 * @return	displayName
-	 */
-	public String getDisplayName() {
-		return displayName;
-	}
-
-	/**
-	 * Returns {@link #objectiveName}
-	 * @return	objectiveName
-	 */
-	public String getObjectiveName() {
-		return objectiveName;
-	}
-
-	/**
-	 * Returns {@link #renderType}
-	 * @return	renderType
-	 */
-	public EnumScoreboardHealthDisplay getRenderType() {
-		return renderType;
-	}
-
-	/**
-	 * Returns {@link #method}
-	 * @return	packet action
-	 */
-	public int getMethod() {
-		return method;
-	}
-
-	/**
-	 * An enum representing available display types.
-	 * They only take effect in PlayerList position.
-	 */
-	public enum EnumScoreboardHealthDisplay {
-
-		INTEGER, HEARTS
-	}
-}
@@ -1,89 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-/**
- * A class representing platform specific packet class
- */
-public class PacketPlayOutScoreboardScore implements TabPacket {
-
-	/** Packet action */
-	private final Action action;
-
-	/** Objective name */
-	private final String objectiveName;
-
-	/** Affected player */
-	private final String player;
-
-	/** Player's score */
-	private final int score;
-
-	/**
-	 * Constructs new instance with given parameters
-	 * 
-	 * @param	action
-	 * 			Packet action
-	 * @param	objectiveName
-	 * 			Objective name
-	 * @param	player
-	 * 			Affected player
-	 * @param	score
-	 * 			Player's score
-	 * @throws	IllegalArgumentException
-	 * 			if {@code objectiveName} is null or longer than 16 characters
-	 */
-	public PacketPlayOutScoreboardScore(Action action, String objectiveName, String player, int score) {
-		if (objectiveName == null) throw new IllegalArgumentException("objectiveName cannot be null");
-		if (objectiveName.length() > 16) throw new IllegalArgumentException("objectiveName cannot be longer than 16 character (is " + objectiveName.length() + ")");
-		this.action = action;
-		this.objectiveName = objectiveName;
-		this.player = player;
-		this.score = score;
-	}
-
-	@Override
-	public String toString() {
-		return String.format("PacketPlayOutScoreboardScore{action=%s,objectiveName=%s,player=%s,score=%s}", 
-				action, objectiveName, player, score);
-	}
-
-	/**
-	 * Returns {@link #action}
-	 * @return	packet action
-	 */
-	public Action getAction() {
-		return action;
-	}
-
-	/**
-	 * Returns {@link #objectiveName}
-	 * @return	objective name
-	 */
-	public String getObjectiveName() {
-		return objectiveName;
-	}
-
-	/**
-	 * Returns {@link #player}
-	 * @return	player
-	 */
-	public String getPlayer() {
-		return player;
-	}
-
-	/**
-	 * Returns {@link #score}
-	 * @return	score
-	 */
-	public int getScore() {
-		return score;
-	}
-
-	/**
-	 * An enum representing action types
-	 */
-	public enum Action {
-
-		CHANGE,
-		REMOVE
-	}
-}
@@ -1,264 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-import java.util.Collection;
-import java.util.Collections;
-
-import me.neznamy.tab.api.chat.EnumChatFormat;
-
-/**
- * A class representing platform specific packet class
- */
-public class PacketPlayOutScoreboardTeam implements TabPacket {
-
-	/**
-	 * Up to 16 characters long team name.
-	 * It is used to sort players alphabetically in TabList by team names.
-	 * Team-less players appear on top, sorted by usernames.
-	 * Players with teams are below them, players of the same team are
-	 * sorted alphabetically by usernames.
-	 */
-	private final String name;
-
-	/** Team prefix, limited to 16 characters, on <1.13 */
-	private String playerPrefix;
-
-	/** Team suffix, limited to 16 characters, on <1.13 */
-	private String playerSuffix;
-
-	/** 
-	 * NameTag visibility rule since 1.8. Possible options are:
-	 * {@code always}, {@code hideForOtherTeams}, {@code hideForOwnTeam}, {@code never}
-	 */
-	private String nameTagVisibility;
-
-	/**
-	 * Collision rule added in 1.9. Possible options are:
-	 * {@code always}, {@code pushOtherTeams}, {@code pushOwnTeam}, {@code never}
-	 */
-	private String collisionRule;
-
-	/**
-	 * Team color field added in 1.13. It determines name color,
-	 * prefix and suffix color start.
-	 */
-	private EnumChatFormat color;
-
-	/** 
-	 * Affected entities. For players, it is their name, for other entities their UUID
-	 * Player name length is limited to 16 characters for <1.8, 40 characters since 1.8.
-	 * Entity UUID option was added in 1.8.
-	 */
-	private Collection<String> players = Collections.emptyList();
-
-	/**
-	 * Packet action.
-	 * 0 = create team,
-	 * 1 = remove team,
-	 * 2 = update team info,
-	 * 3 = add entries,
-	 * 4 = remove entries
-	 */
-	private final int method;
-
-	/**
-	 * Bit mask.
-	 * 0x01: Allow friendly fire,
-	 * 0x02: Can see invisible players on the same team.
-	 */
-	private int options;
-
-	/**
-	 * Constructs new instance with given parameters. Private constructor used
-	 * internally to validate team name and set action.
-	 * 
-	 * @param	method
-	 * 			Packet action (0 = create team, 1 = remove team, 2 = update team info,
-	 * 			3 = add entries, 4 = remove entries)
-	 * @param	name
-	 * 			Team name, up to 16 characters long
-	 * @throws	IllegalArgumentException
-	 * 			if {@code name} is null, empty or longer than 16 characters
-	 */
-	private PacketPlayOutScoreboardTeam(int method, String name) {
-		if (name == null || name.length() == 0) throw new IllegalArgumentException("Team name cannot be null/empty");
-		if (name.length() > 16) throw new IllegalArgumentException("name cannot be longer than 16 character (is " + name.length() + ")");
-		this.method = method;
-		this.name = name;
-	}
-
-	/**
-	 * Constructs new instance with given parameters and 0 (CREATE) action
-	 * 
-	 * @param	team
-	 * 			Team name, up to 16 characters long
-	 * @param	prefix
-	 * 			Prefix of players in team
-	 * @param	suffix
-	 * 			Suffix of players in team
-	 * @param	visibility
-	 * 			NameTag visibility rule
-	 * @param	collision
-	 * 			Collision rule
-	 * @param	players
-	 * 			Affected entities
-	 * @param	options
-	 * 			bitmask of team options
-	 * @throws	IllegalArgumentException
-	 * 			if {@code name} is null, empty or longer than 16 characters
-	 */
-	public PacketPlayOutScoreboardTeam(String team, String prefix, String suffix, String visibility, String collision, Collection<String> players, int options) {
-		this(0, team);
-		this.playerPrefix = prefix;
-		this.playerSuffix = suffix;
-		this.nameTagVisibility = visibility;
-		this.collisionRule = collision;
-		this.players = players;
-		this.options = options;
-	}
-
-	/**
-	 * Constructs new instance with given parameters and 1 (REMOVE) action
-	 * 
-	 * @param	team
-	 * 			Team name, up to 16 characters long
-	 * @throws	IllegalArgumentException
-	 * 			if {@code name} is null, empty or longer than 16 characters
-	 */
-	public PacketPlayOutScoreboardTeam(String team) {
-		this(1, team);
-	}
-
-	/**
-	 * Constructs new instance with given parameters and 2 (UPDATE_TEAM_INFO) action
-	 * 
-	 * @param	team
-	 * 			Team name, up to 16 characters long
-	 * @param	prefix
-	 * 			Prefix of players in team
-	 * @param	suffix
-	 * 			Suffix of players in team
-	 * @param	visibility
-	 * 			NameTag visibility rule
-	 * @param	collision
-	 * 			Collision rule
-	 * @param	options
-	 * 			bitmask of team options
-	 * @throws	IllegalArgumentException
-	 * 			if {@code name} is null, empty or longer than 16 characters
-	 */
-	public PacketPlayOutScoreboardTeam(String team, String prefix, String suffix, String visibility, String collision, int options) {
-		this(2, team);
-		this.playerPrefix = prefix;
-		this.playerSuffix = suffix;
-		this.nameTagVisibility = visibility;
-		this.collisionRule = collision;
-		this.options = options;
-	}
-
-	/**
-	 * Constructs new instance with given parameters and 3 (ADD_PLAYERS) if {@code add} is {@code true}, 
-	 * 4 (REMOVE_PLAYERS) if {@code add} is {@code false} action.
-	 * 
-	 * @param	team
-	 * 			Team name, up to 16 characters long
-	 * @param	players
-	 * 			Affected entities
-	 * @param	add
-	 * 			{@code true} if players should be added, {@code false} if removed from team
-	 * @throws	IllegalArgumentException
-	 * 			if {@code name} is null, empty or longer than 16 characters
-	 */
-	public PacketPlayOutScoreboardTeam(String team, Collection<String> players, boolean add) {
-		this(add ? 3 : 4, team);
-		this.players = players;
-	}
-
-	@Override
-	public String toString() {
-		return String.format("PacketPlayOutScoreboardTeam{name=%s,playerPrefix=%s,playerSuffix=%s,nameTagVisibility=%s,"
-				+ "collisionRule=%s,color=%s,players=%s,method=%s,options=%s}",
-				name, playerPrefix, playerSuffix, nameTagVisibility, collisionRule, color, players, method, options);
-	}
-
-	/**
-	 * Returns {@link #name}
-	 * @return	team name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Returns {@link #playerPrefix}
-	 * @return	playerPrefix
-	 */
-	public String getPlayerPrefix() {
-		return playerPrefix;
-	}
-
-	/**
-	 * Returns {@link #playerSuffix}
-	 * @return	playerSuffix
-	 */
-	public String getPlayerSuffix() {
-		return playerSuffix;
-	}
-
-	/**
-	 * Returns {@link #nameTagVisibility}
-	 * @return	nameTagVisibility
-	 */
-	public String getNameTagVisibility() {
-		return nameTagVisibility;
-	}
-	
-	/**
-	 * Returns {@link #collisionRule}
-	 * @return	collisionRule
-	 */
-	public String getCollisionRule() {
-		return collisionRule;
-	}
-
-	/**
-	 * Sets {@link #color} to specified color
-	 * 
-	 * @param	color
-	 * 			color to use
-	 */
-	public void setColor(EnumChatFormat color) {
-		this.color = color;
-	}
-
-	/**
-	 * Returns {@link #color}
-	 * @return	color
-	 */
-	public EnumChatFormat getColor() {
-		return color;
-	}
-
-	/**
-	 * Returns {@link #players}
-	 * @return	players
-	 */
-	public Collection<String> getPlayers() {
-		return players;
-	}
-
-	/**
-	 * Returns {@link #options}
-	 * @return	team options
-	 */
-	public int getOptions() {
-		return options;
-	}
-	
-	/**
-	 * Returns {@link #method}
-	 * @return	packet action
-	 */
-	public int getMethod() {
-		return method;
-	}
-}
@@ -1,16 +0,0 @@
-package me.neznamy.tab.api.protocol;
-
-/**
- * Interface representing a packet that can be sent to client independently of platform.
- * It is technically empty, existence is only present to restrict type access
- * when sending packets to player, so {@link me.neznamy.tab.api.TabPlayer#sendCustomPacket(TabPacket)} cannot
- * be called with an actual packet.
- */
-public interface TabPacket {
-
-	/**
-	 * Returns user-friendly string representation of the packet
-	 * @return user-friendly string representation of the packet
-	 */
-	String toString();
-}
@@ -1,5 +1,8 @@
 package me.neznamy.tab.api.scoreboard;

+import lombok.NonNull;
+import org.jetbrains.annotations.NotNull;
+
 /**
 * An interface allowing to work with a line of
 * text in scoreboard.
@@ -7,23 +10,23 @@ package me.neznamy.tab.api.scoreboard;
 */
 public interface Line {

-	/**
-	 * Returns configured raw text of this line. Placeholders
-	 * remain in raw format.
-	 * 
-	 * @return	raw text of this line
-	 */
-	String getText();
-	
-	/**
-	 * Changes text to new value. Supports placeholders, which are
-	 * automatically registered if needed and refreshed periodically
-	 * based on configuration. No need to call this method to try to
-	 * keep placeholders up to date. If value is identical to previous 
-	 * one, nothing happens.
-	 * 
-	 * @param	text
-	 * 			Raw text to display in the line
-	 */
-	void setText(String text);
+    /**
+     * Returns configured raw text of this line. Placeholders
+     * remain in raw format.
+     * 
+     * @return  raw text of this line
+     */
+    @NotNull String getText();
+    
+    /**
+     * Changes text to new value. Supports placeholders, which are
+     * automatically registered if needed and refreshed periodically
+     * based on configuration. No need to call this method to try to
+     * keep placeholders up to date. If value is identical to previous 
+     * one, nothing happens.
+     * 
+     * @param   text
+     *          Raw text to display in the line
+     */
+    void setText(@NonNull String text);
 }
@@ -1,5 +1,8 @@
 package me.neznamy.tab.api.scoreboard;

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

 /**
@@ -8,80 +11,81 @@ import java.util.List;
 * {@link ScoreboardManager#createScoreboard(String, String, List)},
 * for scoreboards from config {@link ScoreboardManager#getRegisteredScoreboards()}.
 */
+@SuppressWarnings("unused") // API class
 public interface Scoreboard {

-	/**
-	 * Returns internal name of this scoreboard. Name is defined in registration,
-	 * scoreboards from config use name they were defined with. This value is
-	 * used internally and in /tab announce scoreboard command.
-	 * 
-	 * @return	custom name of this scoreboard
-	 */
-	String getName();
+    /**
+     * Returns internal name of this scoreboard. Name is defined in registration,
+     * scoreboards from config use name they were defined with. This value is
+     * used internally and in /tab announce scoreboard command.
+     * 
+     * @return  custom name of this scoreboard
+     */
+    @NotNull String getName();

-	/**
-	 * Returns raw title of this scoreboard. Placeholders stay in their
-	 * raw format.
-	 * 
-	 * @return	scoreboard title
-	 * @see		#setTitle(String)
-	 */
-	String getTitle();
+    /**
+     * Returns raw title of this scoreboard. Placeholders stay in their
+     * raw format.
+     * 
+     * @return  scoreboard title
+     * @see     #setTitle(String)
+     */
+    @NotNull String getTitle();

-	/**
-	 * Sets title to specified value. Placeholders are refreshed automatically
-	 * with refresh intervals defined in config. No need to call this method
-	 * to try to keep placeholders up to date. Supports RGB codes using any of 
-	 * the supported formats.
-	 * <p>
-	 * Length is limited to 32 characters on <1.13. If the limit is exceeded,
-	 * text will be cut to 32 characters.
-	 * <p>
-	 * Calling this method with same title as before will not do anything.
-	 * 
-	 * @param	title
-	 * 			New title to use with placeholder support
-	 * @see		#getTitle()
-	 */
-	void setTitle(String title);
+    /**
+     * Sets title to specified value. Placeholders are refreshed automatically
+     * with refresh intervals defined in config. No need to call this method
+     * to try to keep placeholders up to date. Supports RGB codes using any of 
+     * the supported formats.
+     * <p>
+     * Length is limited to 32 characters on &lt;1.13. If the limit is exceeded,
+     * text will be cut to 32 characters.
+     * <p>
+     * Calling this method with same title as before will not do anything.
+     * 
+     * @param   title
+     *          New title to use with placeholder support
+     * @see     #getTitle()
+     */
+    void setTitle(@NonNull String title);

-	/**
-	 * Returns list of lines in this scoreboard in the order they appear
-	 * in game (first line is on top). This list should only be used for reading,
-	 * for adding/removing lines see {@link #addLine(String)} and {@link #removeLine(int)}.
-	 * 
-	 * @return	list of lines in this scoreboard
-	 * @see		#addLine(String)
-	 * @see		#removeLine(int)
-	 */
-	List<Line> getLines();
+    /**
+     * Returns list of lines in this scoreboard in the order they appear
+     * in game (first line is on top). This list should only be used for reading,
+     * for adding/removing lines see {@link #addLine(String)} and {@link #removeLine(int)}.
+     * 
+     * @return  list of lines in this scoreboard
+     * @see     #addLine(String)
+     * @see     #removeLine(int)
+     */
+    @NotNull List<Line> getLines();

-	/**
-	 * Adds line with specified text on the bottom of scoreboard. Supports
-	 * placeholders, which will automatically be refreshed.
-	 * 
-	 * @param	text
-	 * 			Text to display
-	 * @see		#getLines()
-	 * @see		#removeLine(int)
-	 */
-	void addLine(String text);
+    /**
+     * Adds line with specified text on the bottom of scoreboard. Supports
+     * placeholders, which will automatically be refreshed.
+     * 
+     * @param   text
+     *          Text to display
+     * @see     #getLines()
+     * @see     #removeLine(int)
+     */
+    void addLine(@NonNull String text);

-	/**
-	 * Removes line with specified index. Index starts at {@code 0} and ends at 
-	 * {@link #getLines()}.size()-1.
-	 * 
-	 * @param	index
-	 * 			Index of line to remove, starting at 0
-	 * @throws	IndexOutOfBoundsException
-	 * 			if the index is out of range (index < 0 || index >= {@link #getLines()}.size())
-	 * @see		#getLines()
-	 * @see		#addLine(String)
-	 */
-	void removeLine(int index);
+    /**
+     * Removes line with specified index. Index starts at {@code 0} and ends at 
+     * {@link #getLines()}.size()-1.
+     * 
+     * @param   index
+     *          Index of line to remove, starting at 0
+     * @throws  IndexOutOfBoundsException
+     *          if the index is out of range (index &lt; 0 || index &gt;= {@link #getLines()}.size())
+     * @see     #getLines()
+     * @see     #addLine(String)
+     */
+    void removeLine(int index);

-	/**
-	 * Unregisters this scoreboard from all players who can see it.
-	 */
-	void unregister();
+    /**
+     * Unregisters this scoreboard from all players who can see it.
+     */
+    void unregister();
 }
@@ -3,7 +3,10 @@ package me.neznamy.tab.api.scoreboard;
 import java.util.List;
 import java.util.Map;

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

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

-	/**
-	 * Creates new scoreboard, registers and returns it. {@code name}
-	 * is internal name of the scoreboard, which it will be registered
-	 * with and further work where scoreboard name is used allowed.
-	 * <p>
-	 * Scoreboard {@code title} is limited to 32 characters on <1.13. If needed,
-	 * it will be cut to 32 character for those players (after replacing 
-	 * placeholders). RGB is supported using any of the supported formats.
-	 * Placeholders are supported.
-	 * <p>
-	 * {@code lines} will display in the same order as contained in the list.
-	 * Client can only see up to 15 lines at a time, however you can define
-	 * more, if some of them only consist of placeholder that might be empty.
-	 * 
-	 * @param	name
-	 * 			Internal name of the scoreboard
-	 * @param	title
-	 * 			The scoreboard title
-	 * @param	lines
-	 * 			Lines of text in scoreboard (supports placeholders)
-	 * @return	The new scoreboard with given parameters
-	 * @throws	NullPointerException
-	 * 			if {@code name} or {@code lines} is {@code null}
-	 */
-	Scoreboard createScoreboard(String name, String title, List<String> lines);
-	
-	/**
-	 * Returns map of registered scoreboards via config and API.
-	 * Map key is name of scoreboard, which is defined either in config
-	 * or using {@link #createScoreboard(String, String, List)}.
-	 * Map value is reference to the actual scoreboard.
-	 * 
-	 * @return	map of registered scoreboards
-	 */
-	Map<String, Scoreboard> getRegisteredScoreboards();
-	
-	/**
-	 * Displays scoreboard to defined player. This will disable all display
-	 * condition checks until the scoreboard is unregistered using 
-	 * {@link #resetScoreboard(TabPlayer)}. If the player already sees
-	 * this scoreboard, nothing will happen.
-	 * 
-	 * @param	player
-	 * 			Player to send scoreboard to
-	 * @param	scoreboard
-	 * 			Scoreboard to display
-	 * @throws	NullPointerException
-	 * 			if {@code player} or {@code scoreboard} is {@code null}
-	 * @see		#hasCustomScoreboard(TabPlayer)
-	 * @see		#resetScoreboard(TabPlayer)
-	 */
-	void showScoreboard(TabPlayer player, Scoreboard scoreboard);
-	
-	/**
-	 * Returns {@code true} if player has custom scoreboard set using
-	 * {@link #showScoreboard(TabPlayer, Scoreboard)}, {@code false} if not.
-	 * 
-	 * @param	player
-	 * 			Player to check
-	 * @return	{@code true} if player has custom scoreboard set using API, 
-	 * 			{@code false} if not
-	 * @see		#showScoreboard(TabPlayer, Scoreboard)
-	 * @see		#resetScoreboard(TabPlayer)
-	 */
-	boolean hasCustomScoreboard(TabPlayer player);
-	
-	/**
-	 * Hides custom scoreboard sent using {@link #showScoreboard(TabPlayer, Scoreboard)}
-	 * and re-enables internal display logic with conditions. If player does not
-	 * have any forced scoreboard, nothing happens.
-	 * 
-	 * @param	player
-	 * 			Player to hide custom scoreboard from
-	 * @see		#showScoreboard(TabPlayer, Scoreboard)
-	 * @see		#hasCustomScoreboard(TabPlayer)
-	 */
-	void resetScoreboard(TabPlayer player);
-	
-	/**
-	 * Returns {@code true} if player has scoreboard enabled, {@code false} 
-	 * if disabled (toggled) using either toggle command, 
-	 * {@link #toggleScoreboard(TabPlayer, boolean)} or
-	 * {@link #setScoreboardVisible(TabPlayer, boolean, boolean)}.
-	 * 
-	 * @param	player
-	 * 			Player to get visibility status of
-	 * @return	{@code true} if visible, {@code false} if disabled
-	 * @see		#setScoreboardVisible(TabPlayer, boolean, boolean)
-	 * @see		#toggleScoreboard(TabPlayer, boolean)
-	 */
-	boolean hasScoreboardVisible(TabPlayer player);
-	
-	/**
-	 * Sets scoreboard visibility of player to defined value. If visibility status
-	 * is same as player had before, nothing happens. If this call changes
-	 * visibility, scoreboard is toggled. If {@code sendToggleMessage} is {@code true},
-	 * toggle message defined in configuration is sent.
-	 * 
-	 * @param	player
-	 * 			Player to set visibility for
-	 * @param	visible
-	 * 			New visibility status
-	 * @param	sendToggleMessage
-	 * 			whether to send toggle message if status changed or not
-	 * @see		#toggleScoreboard(TabPlayer, boolean)
-	 * @see		#hasScoreboardVisible(TabPlayer)
-	 */
-	void setScoreboardVisible(TabPlayer player, boolean visible, boolean sendToggleMessage);
-	
-	/**
-	 * Toggles scoreboard for specified player. If player had scoreboard visible,
-	 * hides it. If hidden, shows it. If {@code sendToggleMessage} is {@code true},
-	 * toggle message defined in configuration is sent.
-	 * 
-	 * @param	player
-	 * 			Player to toggle scoreboard for
-	 * @param	sendToggleMessage
-	 * 			Whether to send toggle message or not
-	 * @see		#hasScoreboardVisible(TabPlayer)
-	 * @see		#setScoreboardVisible(TabPlayer, boolean, boolean)
-	 */
-	void toggleScoreboard(TabPlayer player, boolean sendToggleMessage);
-	
-	/**
-	 * Temporarily displays scoreboard to all players for specified amount of 
-	 * time (in milliseconds). Scoreboard name is either defined in config, or 
-	 * through API in {@link #createScoreboard(String, String, List)}.
-	 * 
-	 * @param	scoreboard
-	 * 			Scoreboard from config or registered via API
-	 * @param	duration
-	 * 			Duration in milliseconds
-	 * @throws	IllegalArgumentException
-	 * 			if no scoreboard was found with such name or {@code duration}
-	 * 			is < 0.
-	 */
-	void announceScoreboard(String scoreboard, int duration);
+    /**
+     * Creates new scoreboard, registers and returns it. {@code name}
+     * is internal name of the scoreboard, which it will be registered
+     * with and further work where scoreboard name is used allowed.
+     * <p>
+     * Scoreboard {@code title} is limited to 32 characters on &lt;1.13. If needed,
+     * it will be cut to 32 character for those players (after replacing 
+     * placeholders). RGB is supported using any of the supported formats.
+     * Placeholders are supported.
+     * <p>
+     * {@code lines} will display in the same order as contained in the list.
+     * Client can only see up to 15 lines at a time, however you can define
+     * more, if some of them only consist of placeholder that might be empty.
+     * 
+     * @param   name
+     *          Internal name of the scoreboard
+     * @param   title
+     *          The scoreboard title
+     * @param   lines
+     *          Lines of text in scoreboard (supports placeholders)
+     * @return  The new scoreboard with given parameters
+     * @throws  NullPointerException
+     *          if {@code name} or {@code lines} is {@code null}
+     */
+    @NotNull Scoreboard createScoreboard(@NonNull String name, @NonNull String title, @NonNull List<String> lines);
+    
+    /**
+     * Returns map of registered scoreboards via config and API.
+     * Map key is name of scoreboard, which is defined either in config
+     * or using {@link #createScoreboard(String, String, List)}.
+     * Map value is reference to the actual scoreboard.
+     * 
+     * @return  map of registered scoreboards
+     */
+    @NotNull Map<String, Scoreboard> getRegisteredScoreboards();
+    
+    /**
+     * Displays scoreboard to defined player. This will disable all display
+     * condition checks until the scoreboard is unregistered using 
+     * {@link #resetScoreboard(TabPlayer)}. If the player already sees
+     * this scoreboard, nothing will happen.
+     * 
+     * @param   player
+     *          Player to send scoreboard to
+     * @param   scoreboard
+     *          Scoreboard to display
+     * @throws  NullPointerException
+     *          if {@code player} or {@code scoreboard} is {@code null}
+     * @see     #hasCustomScoreboard(TabPlayer)
+     * @see     #resetScoreboard(TabPlayer)
+     */
+    void showScoreboard(@NonNull TabPlayer player, @NonNull Scoreboard scoreboard);
+    
+    /**
+     * Returns {@code true} if player has custom scoreboard set using
+     * {@link #showScoreboard(TabPlayer, Scoreboard)}, {@code false} if not.
+     * 
+     * @param   player
+     *          Player to check
+     * @return  {@code true} if player has custom scoreboard set using API,
+     *          {@code false} if not
+     * @see      #showScoreboard(TabPlayer, Scoreboard)
+     * @see     #resetScoreboard(TabPlayer)
+     */
+    boolean hasCustomScoreboard(@NonNull TabPlayer player);
+    
+    /**
+     * Hides custom scoreboard sent using {@link #showScoreboard(TabPlayer, Scoreboard)}
+     * and re-enables internal display logic with conditions. If player does not
+     * have any forced scoreboard, nothing happens.
+     * 
+     * @param   player
+     *          Player to hide custom scoreboard from
+     * @see     #showScoreboard(TabPlayer, Scoreboard)
+     * @see     #hasCustomScoreboard(TabPlayer)
+     */
+    void resetScoreboard(@NonNull TabPlayer player);
+    
+    /**
+     * Returns {@code true} if player has scoreboard enabled, {@code false} 
+     * if disabled (toggled) using either toggle command, 
+     * {@link #toggleScoreboard(TabPlayer, boolean)} or
+     * {@link #setScoreboardVisible(TabPlayer, boolean, boolean)}.
+     * 
+     * @param   player
+     *          Player to get visibility status of
+     * @return  {@code true} if visible, {@code false} if disabled
+     * @see     #setScoreboardVisible(TabPlayer, boolean, boolean)
+     * @see     #toggleScoreboard(TabPlayer, boolean)
+     */
+    boolean hasScoreboardVisible(@NonNull TabPlayer player);
+    
+    /**
+     * Sets scoreboard visibility of player to defined value. If visibility status
+     * is same as player had before, nothing happens. If this call changes
+     * visibility, scoreboard is toggled. If {@code sendToggleMessage} is {@code true},
+     * toggle message defined in configuration is sent.
+     * 
+     * @param   player
+     *          Player to set visibility for
+     * @param   visible
+     *          New visibility status
+     * @param   sendToggleMessage
+     *          whether to send toggle message if status changed or not
+     * @see     #toggleScoreboard(TabPlayer, boolean)
+     * @see     #hasScoreboardVisible(TabPlayer)
+     */
+    void setScoreboardVisible(@NonNull TabPlayer player, boolean visible, boolean sendToggleMessage);
+    
+    /**
+     * Toggles scoreboard for specified player. If player had scoreboard visible,
+     * hides it. If hidden, shows it. If {@code sendToggleMessage} is {@code true},
+     * toggle message defined in configuration is sent.
+     * 
+     * @param   player
+     *          Player to toggle scoreboard for
+     * @param   sendToggleMessage
+     *          Whether to send toggle message or not
+     * @see     #hasScoreboardVisible(TabPlayer)
+     * @see     #setScoreboardVisible(TabPlayer, boolean, boolean)
+     */
+    void toggleScoreboard(@NonNull TabPlayer player, boolean sendToggleMessage);
+    
+    /**
+     * Temporarily displays scoreboard to all players for specified amount of 
+     * time (in milliseconds). Scoreboard name is either defined in config, or 
+     * through API in {@link #createScoreboard(String, String, List)}.
+     * 
+     * @param   scoreboard
+     *          Scoreboard from config or registered via API
+     * @param   duration
+     *          Duration in milliseconds
+     * @throws  IllegalArgumentException
+     *          if no scoreboard was found with such name or {@code duration}
+     *          is &lt; 0.
+     */
+    void announceScoreboard(@NonNull String scoreboard, int duration);

-	/**
-	 * Returns player's currently displayed scoreboard. This can be either with
-	 * configuration, overridden with commands or the API. Will return {@code null}
-	 * if player does not see any scoreboard due to not meeting any display condition.
-	 * @param	player
-	 * 			player to get active scoreboard of
-	 * @return	player's active scoreboard or {@code null} if player has no scoreboard
-	 */
-	Scoreboard getActiveScoreboard(TabPlayer player);
+    /**
+     * Returns player's currently displayed scoreboard. This can be either with
+     * configuration, overridden with commands or the API. Will return {@code null}
+     * if player does not see any scoreboard due to not meeting any display condition.
+     *
+     * @param   player
+     *          player to get active scoreboard of
+     * @return  player's active scoreboard or {@code null} if player has no scoreboard
+     */
+    @Nullable Scoreboard getActiveScoreboard(@NonNull TabPlayer player);
 }
@@ -0,0 +1,58 @@
+package me.neznamy.tab.api.tablist;
+
+import lombok.NonNull;
+import me.neznamy.tab.api.TabAPI;
+import me.neznamy.tab.api.TabPlayer;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Interface allowing to send header/footer to players.
+ * <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}.
+ */
+@SuppressWarnings("unused") // API class
+public interface HeaderFooterManager {
+
+    /**
+     * Sets raw value of header to specified value. This overrides plugin
+     * configuration until reset is called. Has full placeholder support
+     * and will send update packet whenever a placeholder used inside
+     * changes its value. Use {@code null} to reset value back to original.
+     *
+     * @param   player
+     *          Player to set header for
+     * @param   header
+     *          Raw header value
+     */
+    void setHeader(@NonNull TabPlayer player, @Nullable String header);
+
+    /**
+     * Sets raw value of footer to specified value. This overrides plugin
+     * configuration until reset is called. Has full placeholder support
+     * and will send update packet whenever a placeholder used inside
+     * changes its value. Use {@code null} to reset value back to original.
+     *
+     * @param   player
+     *          Player to set header for
+     * @param   footer
+     *          Raw footer value
+     */
+    void setFooter(@NonNull TabPlayer player, @Nullable String footer);
+
+    /**
+     * Sets raw value of header and footer to specified values. This overrides plugin
+     * configuration until reset is called. Has full placeholder support
+     * and will send update packet whenever a placeholder used inside
+     * changes its value. Use {@code null} to reset value back to original.
+     *
+     * @param   player
+     *          Player to set header for
+     * @param   header
+     *          Raw header value
+     * @param   footer
+     *          Raw footer value
+     */
+    void setHeaderAndFooter(@NonNull TabPlayer player, @Nullable String header, @Nullable String footer);
+}
@@ -0,0 +1,46 @@
+package me.neznamy.tab.api.tablist;
+
+import lombok.NonNull;
+import me.neznamy.tab.api.TabAPI;
+import me.neznamy.tab.api.TabPlayer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Interface for managing player sorting by directly configuring
+ * team names of players. Instance can be obtained using
+ * {@link TabAPI#getSortingManager()}. If the feature is disabled,
+ * it will return {@code null}.
+ */
+@SuppressWarnings("unused") // API class
+public interface SortingManager {
+
+    /**
+     * Forces new team name for the player until this method is called again with null argument and
+     * performs all actions to change player's team name
+     *
+     * @param   player
+     *          player to set team name of
+     * @param   teamName
+     *          forced team name
+     */
+    void forceTeamName(@NonNull TabPlayer player, @Nullable String teamName);
+
+    /**
+     * Returns forced team name of player or null if not forced
+     *
+     * @param   player
+     *          player to check forced team name of
+     * @return  forced team name of player or null if not forced
+     */
+    @Nullable String getForcedTeamName(@NonNull TabPlayer player);
+
+    /**
+     * Returns original team name of the player set by the plugin.
+     *
+     * @param   player
+     *          Player to get team name of
+     * @return  Player's team name based on configuration.
+     */
+    @NotNull String getOriginalTeamName(@NonNull TabPlayer player);
+}
@@ -0,0 +1,133 @@
+package me.neznamy.tab.api.tablist;
+
+import lombok.NonNull;
+import me.neznamy.tab.api.TabAPI;
+import me.neznamy.tab.api.TabPlayer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * An interface allowing to modify TabList display names
+ * of players.
+ * <p>
+ * Instance can be obtained using {@link TabAPI#getTabListFormatManager()}.
+ * This requires the feature to be enabled in config, otherwise the method will
+ * return {@code null}.
+ */
+@SuppressWarnings("unused") // API class
+public interface TabListFormatManager {
+
+    /**
+     * Changes player's prefix to provided value. Supports placeholders,
+     * as well as any supported RGB formats. Use {@code null} to reset
+     * value back to original.
+     *
+     * @param   player
+     *          player to change prefix of
+     * @param   prefix
+     *          new prefix value
+     * @see     #getCustomPrefix(TabPlayer)
+     * @see     #getOriginalPrefix(TabPlayer)
+     */
+    void setPrefix(@NonNull TabPlayer player, @Nullable String prefix);
+
+    /**
+     * Changes player's name to provided value. Supports placeholders,
+     * as well as any supported RGB formats. Use {@code null} to reset
+     * value back to original.
+     *
+     * @param   player
+     *          player to change prefix of
+     * @param   customName
+     *          new customName value
+     * @see     #getCustomName(TabPlayer)
+     * @see     #getOriginalName(TabPlayer)
+     */
+    void setName(@NonNull TabPlayer player, @Nullable String customName);
+
+    /**
+     * Changes player's suffix to provided value. Supports placeholders,
+     * as well as any supported RGB formats. Use {@code null} to reset
+     * value back to original.
+     *
+     * @param   player
+     *          player to change prefix of
+     * @param   suffix
+     *          new suffix value
+     * @see     #getCustomSuffix(TabPlayer)
+     * @see     #getOriginalSuffix(TabPlayer)
+     */
+    void setSuffix(@NonNull TabPlayer player, @Nullable String suffix);
+
+    /**
+     * Returns prefix assigned using {@link #setPrefix(TabPlayer, String)} method.
+     * If the method was not used, {@code null} is returned.
+     *
+     * @param   player
+     *          player to get custom prefix of
+     * @return  player's custom prefix or {@code null} if not defined
+     * @see     #setPrefix(TabPlayer, String)
+     * @see     #getOriginalPrefix(TabPlayer)
+     */
+    @Nullable String getCustomPrefix(@NonNull TabPlayer player);
+
+    /**
+     * Returns custom name assigned using {@link #setName(TabPlayer, String)} method.
+     * If the method was not used, {@code null} is returned.
+     *
+     * @param   player
+     *          player to get custom name of
+     * @return  player's custom name or {@code null} if not defined
+     * @see     #setName(TabPlayer, String)
+     * @see     #getOriginalName(TabPlayer)
+     */
+    @Nullable String getCustomName(@NonNull TabPlayer player);
+
+    /**
+     * Returns suffix assigned using {@link #setSuffix(TabPlayer, String)} method.
+     * If the method was not used, {@code null} is returned.
+     *
+     * @param   player
+     *          player to get custom suffix of
+     * @return  player's custom suffix or {@code null} if not defined
+     * @see     #setSuffix(TabPlayer, String)
+     * @see     #getOriginalSuffix(TabPlayer)
+     */
+    @Nullable String getCustomSuffix(@NonNull TabPlayer player);
+
+    /**
+     * Returns player's original prefix applied using plugin's internal logic.
+     * This value is not affected by API calls in any way.
+     *
+     * @param   player
+     *          player to get original prefix of
+     * @return  player's original prefix
+     * @see     #setPrefix(TabPlayer, String)
+     * @see     #getCustomPrefix(TabPlayer)
+     */
+    @NotNull String getOriginalPrefix(@NonNull TabPlayer player);
+
+    /**
+     * Returns player's original name applied using plugin's internal logic.
+     * This value is not affected by API calls in any way.
+     *
+     * @param   player
+     *          player to get original name of
+     * @return  player's original name
+     * @see     #setName(TabPlayer, String)
+     * @see     #getCustomName(TabPlayer)
+     */
+    @NotNull String getOriginalName(@NonNull TabPlayer player);
+
+    /**
+     * Returns player's original suffix applied using plugin's internal logic.
+     * This value is not affected by API calls in any way.
+     *
+     * @param   player
+     *          player to get original suffix of
+     * @return  player's original suffix
+     * @see     #setSuffix(TabPlayer, String)
+     * @see     #getCustomSuffix(TabPlayer)
+     */
+    @NotNull String getOriginalSuffix(@NonNull TabPlayer player);
+}
@@ -0,0 +1,79 @@
+package me.neznamy.tab.api.tablist.layout;
+
+import lombok.NonNull;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Interface representing a layout.
+ */
+@SuppressWarnings("unused") // API class
+public interface Layout {
+
+    /**
+     * Returns name of the layout.
+     *
+     * @return  name of the layout
+     */
+    @NotNull String getName();
+
+    /**
+     * Adds fixed slot with specified parameters
+     *
+     * @param   slot
+     *          Slot (1-80)
+     * @param   text
+     *          Text to display
+     */
+    void addFixedSlot(int slot, @NonNull String text);
+
+    /**
+     * Adds fixed slot with specified parameters
+     *
+     * @param   slot
+     *          Slot (1-80)
+     * @param   text
+     *          Text to display
+     * @param   skin
+     *          Skin definition like in config
+     */
+    void addFixedSlot(int slot, @NonNull String text, @NonNull String skin);
+
+    /**
+     * Adds fixed slot with specified parameters
+     *
+     * @param   slot
+     *          Slot (1-80)
+     * @param   text
+     *          Text to display
+     * @param   ping
+     *          Slot's ping
+     */
+    void addFixedSlot(int slot, @NonNull String text, int ping);
+
+    /**
+     * Adds fixed slot with specified parameters
+     *
+     * @param   slot
+     *          Slot (1-80)
+     * @param   text
+     *          Text to display
+     * @param   skin
+     *          Skin definition like in config
+     * @param   ping
+     *          Slot's ping
+     */
+    void addFixedSlot(int slot, @NonNull String text, @NonNull String skin, int ping);
+
+    /**
+     * Adds a player group.
+     *
+     * @param   condition
+     *          Condition that must be met for player to appear in the group.
+     *          May be null for no requirement. Syntax is like in config -
+     *          either condition name or short format.
+     * @param   slots
+     *          Slots for this player group
+     */
+    void addGroup(@Nullable String condition, int[] slots);
+}
@@ -0,0 +1,45 @@
+package me.neznamy.tab.api.tablist.layout;
+
+import lombok.NonNull;
+import me.neznamy.tab.api.TabAPI;
+import me.neznamy.tab.api.TabPlayer;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Interface for working with layouts. Instance can be obtained using
+ * {@link TabAPI#getLayoutManager()}. If the feature is disabled in
+ * config, it will return {@code null}.
+ */
+@SuppressWarnings("unused") // API class
+public interface LayoutManager {
+
+    /**
+     * Creates new layout
+     *
+     * @param   name
+     *          Unique layout name
+     * @return  Created layout
+     */
+    Layout createNewLayout(String name);
+
+    /**
+     * Sends layout to player. Set to {@code null} to make player not see
+     * any layout, but default TabList instead.
+     *
+     * @param   player
+     *          Player to send layout to
+     * @param   layout
+     *          Layout to send
+     * @see     #resetLayout(TabPlayer)
+     */
+    void sendLayout(@NonNull TabPlayer player, @Nullable Layout layout);
+
+    /**
+     * Reset layout back to original one based on configuration.
+     *
+     * @param   player
+     *          Player to reset layout for
+     * @see     #sendLayout(TabPlayer, Layout)
+     */
+    void resetLayout(@NonNull TabPlayer player);
+}
@@ -1,12 +0,0 @@
-package me.neznamy.tab.api.task;
-
-public interface RepeatingTask {
-	
-	int getInterval();
-
-	void setInterval(int paramInt);
-
-	void cancel();
-
-	void setRunnable(Runnable paramRunnable);
-}
@@ -1,56 +0,0 @@
-package me.neznamy.tab.api.task;
-
-import java.util.concurrent.Future;
-
-import me.neznamy.tab.api.TabFeature;
-
-public interface ThreadManager {
-
-	/**
-	 * Starts a task in new thread and measures how long it took to process
-	 * @param errorDescription - description to use if this task throws an error
-	 * @param feature - feature to add cpu usage to
-	 * @param type - usage type to add cpu usage to
-	 * @param task - the task
-	 */
-	Future<Void> runMeasuredTask(String errorDescription, TabFeature feature, String type, Runnable task);
-
-	/**
-	 * Starts a task in new thread and measures how long it took to process
-	 * @param errorDescription - description to use if this task throws an error
-	 * @param feature - feature to add cpu usage to
-	 * @param type - usage type to add cpu usage to
-	 * @param task - the task
-	 */
-	Future<Void> runMeasuredTask(String errorDescription, String feature, String type, Runnable task);
-	
-	/**
-	 * Runs task in a new thread
-	 * @param errorDescription - description to use if this task throws an error
-	 * @param task - the task
-	 */
-	Future<Void> runTask(String errorDescription, Runnable task);
-	
-	/**
-	 * Starts a new task with defined repeat interval that measures cpu usage
-	 * @param intervalMilliseconds - task interval
-	 * @param errorDescription - description to use if this task throws an error
-	 * @param feature - feature to add cpu usage to
-	 * @param type - usage type to add cpu usage to
-	 * @param task - the task
-	 */
-	RepeatingTask startRepeatingMeasuredTask(int intervalMilliseconds, String errorDescription, TabFeature feature, String type, Runnable task);
-	
-	/**
-	 * Runs task with a delay and measures how long it took to process
-	 * @param delayMilliseconds - how long to run the task after
-	 * @param errorDescription - description to use if this task throws an error
-	 * @param feature - feature to add cpu usage to
-	 * @param type - usage type to add cpu usage to
-	 * @param task - the task
-	 * @return future allowing to cancel the task
-	 */
-	Future<?> runTaskLater(int delayMilliseconds, String errorDescription, TabFeature feature, String type, Runnable task);
-
-	Future<?> runTaskLater(int delayMilliseconds, String errorDescription, Runnable task);
-}
@@ -1,113 +0,0 @@
-package me.neznamy.tab.api.team;
-
-import me.neznamy.tab.api.TabPlayer;
-
-public interface TeamManager {
-
-	/**
-	 * Makes player's NameTag globally invisible
-	 * @see #showNametag(TabPlayer)
-	 * @see #hasHiddenNametag(TabPlayer)
-	 */
-	void hideNametag(TabPlayer player);
-
-	/**
-	 * Hides player's NameTag for specified player until it's shown again
-	 * @param viewer - player to hide NameTag for
-	 */
-	void hideNametag(TabPlayer player, TabPlayer viewer);
-
-	/**
-	 * Makes player's NameTag visible again
-	 * @see #hideNametag(TabPlayer)
-	 * @see #hasHiddenNametag(TabPlayer)
-	 */
-	void showNametag(TabPlayer player);
-
-	/**
-	 * Shows player's NameTag for specified viewer if it was hidden before
-	 * @param viewer - player to show NameTag back for
-	 */
-	void showNametag(TabPlayer player, TabPlayer viewer);
-
-	/**
-	 * Return whether player has hidden NameTag or not
-	 * @return Whether player has hidden NameTag or not
-	 * @see #hideNametag(TabPlayer)
-	 * @see #showNametag(TabPlayer)
-	 */
-	boolean hasHiddenNametag(TabPlayer player);
-
-	/**
-	 * Returns true if NameTag is hidden for specified viewer, false if not
-	 * @param viewer - player to check visibility status for
-	 * @return true if hidden, false if not
-	 */
-	boolean hasHiddenNametag(TabPlayer player, TabPlayer viewer);
-	
-	/**
-	 * Unregisters player's team and no longer handles it, as well as disables anti-override for teams.
-	 * This can be resumed using resumeTeamHandling(). If team handling was paused already, nothing happens.
-	 */
-	void pauseTeamHandling(TabPlayer player);
-
-	/**
-	 * Resumes team handling if it was before paused using pauseTeamHandling(), if not, nothing happens
-	 */
-	void resumeTeamHandling(TabPlayer player);
-
-	/**
-	 * Returns true if team handling is paused for this player using pauseTeamHandling(), false if not, or
-	 * it was resumed already using resumeTeamHandling
-	 * @return true if paused, false if not
-	 */
-	boolean hasTeamHandlingPaused(TabPlayer player);
-	
-	/**
-	 * Forces new team name for the player until this method is called again with null argument and 
-	 * performs all actions to change player's team name
-	 * @param teamName - forced team name
-	 */
-	void forceTeamName(TabPlayer player, String teamName);
-
-	/**
-	 * Returns forced team name of player or null if not forced
-	 * @return forced team name of player or null if not forced
-	 */
-	String getForcedTeamName(TabPlayer player);
-	
-
-	/**
-	 * Forces collision rule for the player. Setting it to null will remove forced value
-	 * @param collision - forced collision rule
-	 */
-	void setCollisionRule(TabPlayer player, Boolean collision);
-
-	/**
-	 * Returns forced collision rule or null if collision is not forced using setCollisionRule
-	 * @return forced value or null if not forced
-	 */
-	Boolean getCollisionRule(TabPlayer player);
-	
-	/**
-	 * Sends update team's properties packet of player's team to everyone
-	 * @param player - player to update team data of
-	 */
-	void updateTeamData(TabPlayer player);
-	
-	void setPrefix(TabPlayer player, String prefix);
-	
-	void setSuffix(TabPlayer player, String suffix);
-	
-	void resetPrefix(TabPlayer player);
-	
-	void resetSuffix(TabPlayer player);
-	
-	String getCustomPrefix(TabPlayer player);
-	
-	String getCustomSuffix(TabPlayer player);
-	
-	String getOriginalPrefix(TabPlayer player);
-	
-	String getOriginalSuffix(TabPlayer player);
-}
@@ -1,32 +0,0 @@
-package me.neznamy.tab.api.team;
-
-import java.util.List;
-
-import me.neznamy.tab.api.TabPlayer;
-
-public interface UnlimitedNametagManager extends TeamManager {
-
-	void disableArmorStands(TabPlayer player);
-	
-	void enableArmorStands(TabPlayer player);
-	
-	boolean hasDisabledArmorStands(TabPlayer player);
-
-	void setName(TabPlayer player, String customName);
-	
-	void setLine(TabPlayer player, String line, String value);
-
-	void resetName(TabPlayer player);
-	
-	void resetLine(TabPlayer player, String line);
-
-	String getCustomName(TabPlayer player);
-	
-	String getCustomLineValue(TabPlayer player, String line);
-
-	String getOriginalName(TabPlayer player);
-	
-	String getOriginalLineValue(TabPlayer player, String line);
-	
-	List<String> getDefinedLines();
-}
@@ -1,18 +0,0 @@
-package me.neznamy.tab.api.util;
-
-/**
- * An interface for BiFunction which can throw an exception.
- * Used in {@link me.neznamy.tab.api.protocol.PacketBuilder} to 
- * call build method for packet classes, which may throw an
- * exception due to reflection.
- * @param	<A>
- * 			First function argument
- * @param	<B>
- * 			Second function argument
- * @param	<C>
- * 			Function return type
- */
-public interface BiFunctionWithException<A, B, C> {
-
-	C apply(A a, B b) throws ReflectiveOperationException;
-}
@@ -1,13 +0,0 @@
-package me.neznamy.tab.api.util;
-
-public class Preconditions {
-
-    public static void checkNotNull(Object obj, String exceptionMessage){
-        if (obj == null) throw new IllegalArgumentException(exceptionMessage);
-    }
-
-    public static void checkRange(Number number, Number min, Number max, String variable){
-        if (number.doubleValue() < min.doubleValue() || number.doubleValue() > max.doubleValue())
-            throw new IllegalArgumentException("Number index out of range (" + min + " - " + max + ") for " + variable);
-    }
-}
@@ -2,11 +2,8 @@ plugins {
    `kotlin-dsl`
 }

-repositories {
-    gradlePluginPortal()
-    mavenCentral()
-}
-
 dependencies {
-    implementation("gradle.plugin.com.github.johnrengelman", "shadow", "7.1.0")
+    implementation("com.github.johnrengelman:shadow:8.1.1")
+    implementation("io.freefair.gradle:lombok-plugin:8.6")
+    implementation("fabric-loom:fabric-loom.gradle.plugin:1.6-SNAPSHOT")
 }
@@ -0,0 +1,9 @@
+rootProject.name = "build-logic"
+
+dependencyResolutionManagement {
+    repositories {
+        maven("https://maven.fabricmc.net/")
+        gradlePluginPortal()
+        mavenCentral()
+    }
+}
@@ -2,17 +2,23 @@ import org.apache.tools.ant.filters.ReplaceTokens

 plugins {
    `java-library`
+    id("io.freefair.lombok")
 }

 tasks {
    processResources {
        filter<ReplaceTokens>("tokens" to mapOf(
+            "id" to rootProject.ext.get("id")!!.toString(),
            "name" to rootProject.name,
            "version" to project.version,
-            "description" to project.description
+            "description" to project.description,
+            "website" to rootProject.ext.get("website")!!.toString(),
+            "author" to rootProject.ext.get("author")!!.toString()
        ))
    }
    javadoc {
+        // 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")
    }
@@ -25,6 +31,6 @@ tasks {

 java {
    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+        languageVersion.set(JavaLanguageVersion.of(21))
    }
 }
@@ -9,5 +9,7 @@ tasks {
        relocate("org.bstats", "me.neznamy.tab.libs.org.bstats")
        relocate("org.json.simple", "me.neznamy.tab.libs.org.json.simple")
        relocate("net.kyori.event", "me.neznamy.tab.libs.net.kyori.event")
+        relocate("me.neznamy.yamlassist", "me.neznamy.tab.libs.me.neznamy.yamlassist")
+        relocate("org.yaml.snakeyaml", "me.neznamy.tab.libs.org.yaml.snakeyaml")
    }
 }
@@ -1,9 +1,3 @@
-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`
@@ -4,15 +4,23 @@ plugins {

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

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

 val special = setOf(
@@ -1,11 +1,18 @@
 dependencies {
    implementation(projects.shared)
-    implementation(libs.bstats.bukkit)
-    compileOnly(libs.bukkit)
-    compileOnly(libs.placeholderapi)
-    compileOnly(libs.vault)
-    compileOnly(libs.via)
-    compileOnly(libs.authlib)
-    compileOnly(libs.libsDisguises)
-    compileOnly(libs.essentials)
+    implementation("org.bstats:bstats-bukkit:3.0.1")
+    compileOnly("org.purpurmc.purpur:purpur-api:1.16.5-R0.1-SNAPSHOT")
+    compileOnly("me.clip:placeholderapi:2.11.2")
+    compileOnly("com.mojang:authlib:1.5.25")
+    compileOnly("com.github.MilkBowl:VaultAPI:1.7") {
+        exclude("org.bukkit", "bukkit")
+    }
+    compileOnly("LibsDisguises:LibsDisguises:10.0.21") {
+        exclude("org.spigotmc", "spigot")
+        exclude("org.spigotmc", "spigot-api")
+        exclude("com.github.dmulloy2", "ProtocolLib")
+        exclude("org.ow2.asm", "asm")
+        exclude("net.md-5", "bungeecord-chat")
+    }
+    compileOnly("com.github.LeonMangler:PremiumVanishAPI:2.8.8")
 }
@@ -1,5 +1,10 @@
 package me.neznamy.tab.platforms.bukkit;

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

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

-	private final Main main;
-	
-	public BukkitEventListener(Main main) {
-		this.main = main;
-	}
-	
-	/**
-	 * Listener to PlayerQuitEvent to remove player data and forward the event to features
-	 * @param e quit event
-	 */
-	@EventHandler(priority = EventPriority.HIGHEST)
-	public void onQuit(PlayerQuitEvent e){
-		if (TAB.getInstance().isDisabled()) return;
-		TAB.getInstance().getCPUManager().runTask("processing PlayerQuitEvent", () -> TAB.getInstance().getFeatureManager().onQuit(TAB.getInstance().getPlayer(e.getPlayer().getUniqueId())));
-	}
-	
-	/**
-	 * Listener to PlayerJoinEvent to create player data and forward the event to features
-	 * @param e join event
-	 */
-	@EventHandler(priority = EventPriority.LOWEST)
-	public void onJoin(PlayerJoinEvent e) {
-		if (TAB.getInstance().isDisabled()) return;
-		TAB.getInstance().getCPUManager().runTask("processing PlayerJoinEvent", () -> TAB.getInstance().getFeatureManager().onJoin(new BukkitTabPlayer(e.getPlayer(), main.getProtocolVersion(e.getPlayer()))));
-	}
+    /**
+     * Listens to player quit event.
+     *
+     * @param   e
+     *          Disconnect event
+     */
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onQuit(PlayerQuitEvent e) {
+        quit(e.getPlayer().getUniqueId());
+    }

-	/**
-	 * Listener to PlayerChangedWorldEvent to forward the event to features
-	 * @param e world changed event
-	 */
-	@EventHandler(priority = EventPriority.LOWEST)
-	public void onWorldChange(PlayerChangedWorldEvent e){
-		if (TAB.getInstance().isDisabled()) return;
-		TAB.getInstance().getCPUManager().runTask("processing PlayerChangedWorldEvent", () -> TAB.getInstance().getFeatureManager().onWorldChange(e.getPlayer().getUniqueId(), e.getPlayer().getWorld().getName()));
-	}
+    /**
+     * Listens to player join event.
+     *
+     * @param   e
+     *          Join event
+     */
+    @EventHandler(priority = EventPriority.LOW)
+    public void onJoin(PlayerJoinEvent e) {
+        join(e.getPlayer());
+    }

-	/**
-	 * Listener to PlayerChangedWorldEvent to forward the event to features
-	 * @param e command preprocess event
-	 */
-	@EventHandler
-	public void onCommand(PlayerCommandPreprocessEvent e) {
-		if (TAB.getInstance().isDisabled()) return;
-		if (TAB.getInstance().getFeatureManager().onCommand(TAB.getInstance().getPlayer(e.getPlayer().getUniqueId()), e.getMessage())) e.setCancelled(true);
-	}
-}
+    /**
+     * Listens to world change event.
+     *
+     * @param   e
+     *          World change event
+     */
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void onWorldChange(PlayerChangedWorldEvent e) {
+        worldChange(e.getPlayer().getUniqueId(), e.getPlayer().getWorld().getName());
+    }
+
+    /**
+     * Listens to command event to potentially cancel it.
+     *
+     * @param   e
+     *          Command event
+     */
+    @EventHandler
+    public void onCommand(PlayerCommandPreprocessEvent e) {
+        if (command(e.getPlayer().getUniqueId(), e.getMessage())) e.setCancelled(true);
+    }
+
+    @Override
+    @NotNull
+    public TabPlayer createPlayer(@NotNull Player player) {
+        return new BukkitTabPlayer((BukkitPlatform) TAB.getInstance().getPlatform(), player);
+    }
+}
@@ -1,558 +0,0 @@
-package me.neznamy.tab.platforms.bukkit;
-
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.UUID;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.entity.EntityType;
-
-import com.google.gson.JsonObject;
-import com.mojang.authlib.GameProfile;
-import com.mojang.authlib.properties.PropertyMap;
-
-import me.neznamy.tab.api.ProtocolVersion;
-import me.neznamy.tab.api.chat.ChatClickable.EnumClickAction;
-import me.neznamy.tab.api.chat.ChatComponentEntity;
-import me.neznamy.tab.api.chat.ChatHoverable.EnumHoverAction;
-import me.neznamy.tab.api.chat.EnumChatFormat;
-import me.neznamy.tab.api.chat.IChatBaseComponent;
-import me.neznamy.tab.api.chat.TextColor;
-import me.neznamy.tab.api.protocol.PacketBuilder;
-import me.neznamy.tab.api.protocol.PacketPlayOutBoss;
-import me.neznamy.tab.api.protocol.PacketPlayOutBoss.Action;
-import me.neznamy.tab.api.protocol.PacketPlayOutChat;
-import me.neznamy.tab.api.protocol.PacketPlayOutPlayerInfo;
-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.api.protocol.PacketPlayOutPlayerListHeaderFooter;
-import me.neznamy.tab.api.protocol.PacketPlayOutScoreboardDisplayObjective;
-import me.neznamy.tab.api.protocol.PacketPlayOutScoreboardObjective;
-import me.neznamy.tab.api.protocol.PacketPlayOutScoreboardScore;
-import me.neznamy.tab.api.protocol.PacketPlayOutScoreboardTeam;
-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.datawatcher.DataWatcher;
-
-@SuppressWarnings({"unchecked", "rawtypes"})
-public class BukkitPacketBuilder extends PacketBuilder {
-
-	//nms storage
-	private final NMSStorage nms = NMSStorage.getInstance();
-
-	//entity type ids
-	private final EnumMap<EntityType, Integer> entityIds = new EnumMap<>(EntityType.class);
-
-	private final Map<IChatBaseComponent, Object> componentCacheModern = new HashMap<>();
-	private final Map<IChatBaseComponent, Object> componentCacheLegacy = new HashMap<>();
-
-	private Object emptyScoreboard;
-	private Object dummyEntity;
-
-	/**
-	 * Constructs new instance
-	 */
-	public BukkitPacketBuilder() {
-		if (nms.getMinorVersion() >= 13) {
-			entityIds.put(EntityType.ARMOR_STAND, 1);
-			entityIds.put(EntityType.WITHER, 83);
-		} else {
-			entityIds.put(EntityType.WITHER, 64);
-			if (nms.getMinorVersion() >= 8){
-				entityIds.put(EntityType.ARMOR_STAND, 30);
-			}
-		}
-		try {
-			emptyScoreboard = nms.newScoreboard.newInstance();
-		} catch (ReflectiveOperationException e) {
-			Bukkit.getConsoleSender().sendMessage(EnumChatFormat.color("&c[TAB] Failed to create instance of \"Scoreboard\""));
-		}
-		if (nms.getMinorVersion() >= 8) {
-			try {
-				dummyEntity = nms.newEntityArmorStand.newInstance(nms.World_getHandle.invoke(Bukkit.getWorlds().get(0)), 0, 0, 0);
-			} catch (ReflectiveOperationException e) {
-				Bukkit.getConsoleSender().sendMessage(EnumChatFormat.color("&c[TAB] Failed to create instance of \"EntityArmorStand\""));
-			}
-		}
-		buildMap.put(PacketPlayOutEntityMetadata.class, (packet, version) -> build((PacketPlayOutEntityMetadata)packet));
-		buildMap.put(PacketPlayOutEntityTeleport.class, (packet, version) -> build((PacketPlayOutEntityTeleport)packet));
-		buildMap.put(PacketPlayOutEntityDestroy.class, (packet, version) -> build((PacketPlayOutEntityDestroy)packet));
-		buildMap.put(PacketPlayOutSpawnEntityLiving.class, (packet, version) -> build((PacketPlayOutSpawnEntityLiving)packet));
-	}
-
-	@Override
-	public Object build(PacketPlayOutBoss packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-		if (nms.getMinorVersion() >= 9 || clientVersion.getMinorVersion() >= 9) {
-			//1.9+ server or client, handled by bukkit api or ViaVersion
-			return packet;
-		}
-		//<1.9 client and server
-		return buildBossPacketEntity(packet, clientVersion);
-	}
-
-	@Override
-	public Object build(PacketPlayOutChat packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-		Object component = toNMSComponent(packet.getMessage(), clientVersion);
-		if (nms.getMinorVersion() >= 16) {
-			return nms.newPacketPlayOutChat.newInstance(component, nms.ChatMessageType_values[packet.getType().ordinal()], UUID.randomUUID());
-		}
-		if (nms.getMinorVersion() >= 12) {
-			return nms.newPacketPlayOutChat.newInstance(component, Enum.valueOf((Class<Enum>) nms.ChatMessageType, packet.getType().toString()));
-		}
-		if (nms.getMinorVersion() >= 8) {
-			return nms.newPacketPlayOutChat.newInstance(component, (byte) packet.getType().ordinal());
-		}
-		if (nms.getMinorVersion() == 7) {
-			return nms.newPacketPlayOutChat.newInstance(component);
-		}
-		throw new IllegalStateException("Not supported on <1.7");
-	}
-
-	@Override
-	public Object build(PacketPlayOutPlayerInfo packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-		if (nms.getMinorVersion() < 8) return null;
-		Object nmsPacket = nms.newPacketPlayOutPlayerInfo.newInstance(nms.EnumPlayerInfoAction_values[packet.getAction().ordinal()], Array.newInstance(nms.EntityPlayer, 0));
-		List<Object> items = new ArrayList<>();
-		for (PlayerInfoData data : packet.getEntries()) {
-			GameProfile profile = new GameProfile(data.getUniqueId(), data.getName());
-			if (data.getSkin() != null) profile.getProperties().putAll((PropertyMap) data.getSkin());
-			List<Object> parameters = new ArrayList<>();
-			if (nms.newPlayerInfoData.getParameterCount() == 5) {
-				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));
-			items.add(nms.newPlayerInfoData.newInstance(parameters.toArray()));
-		}
-		nms.setField(nmsPacket, nms.PacketPlayOutPlayerInfo_PLAYERS, items);
-		return nmsPacket;
-	}
-
-	@Override
-	public Object build(PacketPlayOutPlayerListHeaderFooter packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-		if (nms.getMinorVersion() < 8) return null;
-		if (nms.newPacketPlayOutPlayerListHeaderFooter.getParameterCount() == 2) {
-			return nms.newPacketPlayOutPlayerListHeaderFooter.newInstance(toNMSComponent(packet.getHeader(), clientVersion), toNMSComponent(packet.getFooter(), clientVersion));
-		}
-		Object nmsPacket = nms.newPacketPlayOutPlayerListHeaderFooter.newInstance();
-		nms.setField(nmsPacket, nms.PacketPlayOutPlayerListHeaderFooter_HEADER, toNMSComponent(packet.getHeader(), clientVersion));
-		nms.setField(nmsPacket, nms.PacketPlayOutPlayerListHeaderFooter_FOOTER, toNMSComponent(packet.getFooter(), clientVersion));
-		return nmsPacket;
-	}
-
-	@Override
-	public Object build(PacketPlayOutScoreboardDisplayObjective packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-		return nms.newPacketPlayOutScoreboardDisplayObjective.newInstance(packet.getSlot(), newScoreboardObjective(packet.getObjectiveName()));
-	}
-
-	@Override
-	public Object build(PacketPlayOutScoreboardObjective packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-		String displayName = clientVersion.getMinorVersion() < 13 ? cutTo(packet.getDisplayName(), 32) : packet.getDisplayName();
-		if (nms.getMinorVersion() >= 13) {
-			return nms.newPacketPlayOutScoreboardObjective.newInstance(nms.newScoreboardObjective.newInstance(null, packet.getObjectiveName(), null, 
-					toNMSComponent(IChatBaseComponent.optimizedComponent(displayName), clientVersion), 
-					packet.getRenderType() == null ? null : nms.EnumScoreboardHealthDisplay_values[packet.getRenderType().ordinal()]), 
-					packet.getMethod());
-		}
-
-		Object nmsPacket = nms.newPacketPlayOutScoreboardObjective.newInstance();
-		nms.setField(nmsPacket, nms.PacketPlayOutScoreboardObjective_OBJECTIVENAME, packet.getObjectiveName());
-		nms.setField(nmsPacket, nms.PacketPlayOutScoreboardObjective_DISPLAYNAME, displayName);
-		if (nms.getMinorVersion() >= 8 && packet.getRenderType() != null) {
-			nms.setField(nmsPacket, nms.PacketPlayOutScoreboardObjective_RENDERTYPE, Enum.valueOf((Class<Enum>) nms.EnumScoreboardHealthDisplay, packet.getRenderType().toString()));
-		}
-		nms.setField(nmsPacket, nms.PacketPlayOutScoreboardObjective_METHOD, packet.getMethod());
-		return nmsPacket;
-	}
-
-	@Override
-	public Object build(PacketPlayOutScoreboardScore packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-		if (nms.getMinorVersion() >= 13) {
-			return nms.newPacketPlayOutScoreboardScore_1_13.newInstance(nms.EnumScoreboardAction_values[packet.getAction().ordinal()], packet.getObjectiveName(), packet.getPlayer(), packet.getScore());
-		}
-		if (packet.getAction() == PacketPlayOutScoreboardScore.Action.REMOVE) {
-			return nms.newPacketPlayOutScoreboardScore_String.newInstance(packet.getPlayer());
-		}
-		Object score = nms.newScoreboardScore.newInstance(emptyScoreboard, newScoreboardObjective(packet.getObjectiveName()), packet.getPlayer());
-		nms.ScoreboardScore_setScore.invoke(score, packet.getScore());
-		if (nms.getMinorVersion() >= 8) {
-			return nms.newPacketPlayOutScoreboardScore.newInstance(score);
-		}
-		return nms.newPacketPlayOutScoreboardScore.newInstance(score, 0);
-	}
-
-	@Override
-	public Object build(PacketPlayOutScoreboardTeam packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-		if (nms.PacketPlayOutScoreboardTeam == null) return null; //fabric
-		Object team = nms.newScoreboardTeam.newInstance(emptyScoreboard, packet.getName());
-		String prefix = packet.getPlayerPrefix();
-		String suffix = packet.getPlayerSuffix();
-		if (clientVersion.getMinorVersion() < 13) {
-			prefix = cutTo(prefix, 16);
-			suffix = cutTo(suffix, 16);
-		}
-		((Collection<String>)nms.ScoreboardTeam_getPlayerNameSet.invoke(team)).addAll(packet.getPlayers());
-		nms.ScoreboardTeam_setAllowFriendlyFire.invoke(team, (packet.getOptions() & 0x1) > 0);
-		nms.ScoreboardTeam_setCanSeeFriendlyInvisibles.invoke(team, (packet.getOptions() & 0x2) > 0);
-		if (nms.getMinorVersion() >= 13) {
-			createTeamModern(packet, clientVersion, team, prefix, suffix);
-		} else {
-			createTeamLegacy(packet, team, prefix, suffix);
-		}
-		if (nms.getMinorVersion() >= 17) {
-			switch (packet.getMethod()) {
-			case 0:
-				return nms.PacketPlayOutScoreboardTeam_ofBoolean.invoke(null, team, true);
-			case 1:
-				return nms.PacketPlayOutScoreboardTeam_of.invoke(null, team);
-			case 2:
-				return nms.PacketPlayOutScoreboardTeam_ofBoolean.invoke(null, team, false);
-			case 3:
-				return nms.PacketPlayOutScoreboardTeam_ofString.invoke(null, team, packet.getPlayers().toArray(new String[0])[0], nms.PacketPlayOutScoreboardTeam_PlayerAction_values[0]);
-			case 4:
-				return nms.PacketPlayOutScoreboardTeam_ofString.invoke(null, team, packet.getPlayers().toArray(new String[0])[0], nms.PacketPlayOutScoreboardTeam_PlayerAction_values[1]);
-			default:
-				throw new IllegalArgumentException("Invalid action: " + packet.getMethod());
-			}
-		}
-		return nms.newPacketPlayOutScoreboardTeam.newInstance(team, packet.getMethod());
-	}
-
-	/**
-	 * Builds entity destroy packet with given parameter
-	 * @return destroy packet
-	 * @throws	ReflectiveOperationException
-	 * 			if thrown by reflective operation
-	 */
-	public Object build(PacketPlayOutEntityDestroy packet) throws ReflectiveOperationException {
-		try {
-			return nms.newPacketPlayOutEntityDestroy.newInstance(new Object[]{packet.getEntities()});
-		} catch (IllegalArgumentException e) {
-			//1.17.0
-			return nms.newPacketPlayOutEntityDestroy.newInstance(packet.getEntities()[0]);
-		}
-	}
-
-	public Object build(PacketPlayOutEntityMetadata packet) throws ReflectiveOperationException {
-		return nms.newPacketPlayOutEntityMetadata.newInstance(packet.getEntityId(), packet.getDataWatcher().toNMS(), true);
-	}
-
-	/**
-	 * Builds entity spawn packet with given parameters
-	 *
-	 * @return entity spawn packet
-	 * @throws	ReflectiveOperationException
-	 * 			if thrown by reflective operation
-	 */
-	public Object build(PacketPlayOutSpawnEntityLiving packet) throws ReflectiveOperationException {
-		Object nmsPacket;
-		if (nms.getMinorVersion() >= 17) {
-			nmsPacket = nms.newPacketPlayOutSpawnEntityLiving.newInstance(dummyEntity);
-		} else {
-			nmsPacket = nms.newPacketPlayOutSpawnEntityLiving.newInstance();
-		}
-		nms.setField(nmsPacket, nms.PacketPlayOutSpawnEntityLiving_ENTITYID, packet.getEntityId());
-		nms.setField(nmsPacket, nms.PacketPlayOutSpawnEntityLiving_ENTITYTYPE, entityIds.get(packet.getEntityType()));
-		nms.setField(nmsPacket, nms.PacketPlayOutSpawnEntityLiving_YAW, (byte)(packet.getLocation().getYaw() * 256.0f / 360.0f));
-		nms.setField(nmsPacket, nms.PacketPlayOutSpawnEntityLiving_PITCH, (byte)(packet.getLocation().getPitch() * 256.0f / 360.0f));
-		if (nms.getMinorVersion() <= 14) {
-			nms.setField(nmsPacket, nms.PacketPlayOutSpawnEntityLiving_DATAWATCHER, packet.getDataWatcher().toNMS());
-		}
-		if (nms.getMinorVersion() >= 9) {
-			nms.setField(nmsPacket, nms.PacketPlayOutSpawnEntityLiving_UUID, packet.getUniqueId());
-			nms.setField(nmsPacket, nms.PacketPlayOutSpawnEntityLiving_X, packet.getLocation().getX());
-			nms.setField(nmsPacket, nms.PacketPlayOutSpawnEntityLiving_Y, packet.getLocation().getY());
-			nms.setField(nmsPacket, nms.PacketPlayOutSpawnEntityLiving_Z, packet.getLocation().getZ());
-		} else {
-			nms.setField(nmsPacket, nms.PacketPlayOutSpawnEntityLiving_X, floor(packet.getLocation().getX()*32));
-			nms.setField(nmsPacket, nms.PacketPlayOutSpawnEntityLiving_Y, floor(packet.getLocation().getY()*32));
-			nms.setField(nmsPacket, nms.PacketPlayOutSpawnEntityLiving_Z, floor(packet.getLocation().getZ()*32));
-		}
-		return nmsPacket;
-	}
-
-	/**
-	 * Builds entity teleport packet with given parameters
-	 * @return entity teleport packet
-	 * @throws	ReflectiveOperationException
-	 * 			if thrown by reflective operation
-	 */
-	public Object build(PacketPlayOutEntityTeleport packet) throws ReflectiveOperationException {
-		Object nmsPacket;
-		if (nms.getMinorVersion() >= 17) {
-			nmsPacket = nms.newPacketPlayOutEntityTeleport.newInstance(dummyEntity);
-		} else {
-			nmsPacket = nms.newPacketPlayOutEntityTeleport.newInstance();
-		}
-		nms.setField(nmsPacket, nms.PacketPlayOutEntityTeleport_ENTITYID, packet.getEntityId());
-		if (nms.getMinorVersion() >= 9) {
-			nms.setField(nmsPacket, nms.PacketPlayOutEntityTeleport_X, packet.getLocation().getX());
-			nms.setField(nmsPacket, nms.PacketPlayOutEntityTeleport_Y, packet.getLocation().getY());
-			nms.setField(nmsPacket, nms.PacketPlayOutEntityTeleport_Z, packet.getLocation().getZ());
-		} else {
-			nms.setField(nmsPacket, nms.PacketPlayOutEntityTeleport_X, floor(packet.getLocation().getX()*32));
-			nms.setField(nmsPacket, nms.PacketPlayOutEntityTeleport_Y, floor(packet.getLocation().getY()*32));
-			nms.setField(nmsPacket, nms.PacketPlayOutEntityTeleport_Z, floor(packet.getLocation().getZ()*32));
-		}
-		nms.setField(nmsPacket, nms.PacketPlayOutEntityTeleport_YAW, (byte) (packet.getLocation().getYaw()/360*256));
-		nms.setField(nmsPacket, nms.PacketPlayOutEntityTeleport_PITCH, (byte) (packet.getLocation().getPitch()/360*256));
-		return nmsPacket;
-	}
-	
-	private void createTeamModern(PacketPlayOutScoreboardTeam packet, ProtocolVersion clientVersion, Object team, String prefix, String suffix) throws ReflectiveOperationException {
-		if (prefix != null) nms.ScoreboardTeam_setPrefix.invoke(team, toNMSComponent(IChatBaseComponent.optimizedComponent(prefix), clientVersion));
-		if (suffix != null) nms.ScoreboardTeam_setSuffix.invoke(team, toNMSComponent(IChatBaseComponent.optimizedComponent(suffix), clientVersion));
-		EnumChatFormat format = packet.getColor() != null ? packet.getColor() : EnumChatFormat.lastColorsOf(prefix);
-		nms.ScoreboardTeam_setColor.invoke(team, nms.EnumChatFormat_values[format.ordinal()]);
-		nms.ScoreboardTeam_setNameTagVisibility.invoke(team, String.valueOf(packet.getNameTagVisibility()).equals("always") ? nms.EnumNameTagVisibility_values[0] : nms.EnumNameTagVisibility_values[1]);
-		nms.ScoreboardTeam_setCollisionRule.invoke(team, String.valueOf(packet.getCollisionRule()).equals("always") ? nms.EnumTeamPush_values[0] : nms.EnumTeamPush_values[1]);
-	}
-
-	private void createTeamLegacy(PacketPlayOutScoreboardTeam packet, Object team, String prefix, String suffix) throws ReflectiveOperationException {
-		if (prefix != null) nms.ScoreboardTeam_setPrefix.invoke(team, prefix);
-		if (suffix != null) nms.ScoreboardTeam_setSuffix.invoke(team, suffix);
-		if (nms.getMinorVersion() >= 8) nms.ScoreboardTeam_setNameTagVisibility.invoke(team, String.valueOf(packet.getNameTagVisibility()).equals("always") ? nms.EnumNameTagVisibility_values[0] : nms.EnumNameTagVisibility_values[1]);
-		if (nms.getMinorVersion() >= 9) nms.ScoreboardTeam_setCollisionRule.invoke(team, String.valueOf(packet.getCollisionRule()).equals("always") ? nms.EnumTeamPush_values[0] : nms.EnumTeamPush_values[1]);
-	}
-	
-	@Override
-	public PacketPlayOutPlayerInfo readPlayerInfo(Object nmsPacket, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-		if (nms.getMinorVersion() < 8) return null;
-		EnumPlayerInfoAction action = EnumPlayerInfoAction.valueOf(nms.PacketPlayOutPlayerInfo_ACTION.get(nmsPacket).toString());
-		List<PlayerInfoData> listData = new ArrayList<>();
-		for (Object nmsData : (List<?>) nms.PacketPlayOutPlayerInfo_PLAYERS.get(nmsPacket)) {
-			Object nmsGameMode = nms.PlayerInfoData_getGamemode.invoke(nmsData);
-			EnumGamemode gameMode = (nmsGameMode == null) ? null : EnumGamemode.valueOf(nmsGameMode.toString());
-			GameProfile profile = (GameProfile) nms.PlayerInfoData_getProfile.invoke(nmsData);
-			Object nmsComponent = nms.PlayerInfoData_getDisplayName.invoke(nmsData);
-			IChatBaseComponent listName = nmsComponent == null ? null : fromNMSComponent(nmsComponent);
-			PropertyMap map = new PropertyMap();
-			map.putAll(profile.getProperties());
-			listData.add(new PlayerInfoData(profile.getName(), profile.getId(), map, (int) nms.PlayerInfoData_getLatency.invoke(nmsData), gameMode, listName));
-		}
-		return new PacketPlayOutPlayerInfo(action, listData);
-	}
-
-	@Override
-	public PacketPlayOutScoreboardObjective readObjective(Object nmsPacket) throws ReflectiveOperationException {
-		return new PacketPlayOutScoreboardObjective(nms.PacketPlayOutScoreboardObjective_METHOD.getInt(nmsPacket),
-				(String) nms.PacketPlayOutScoreboardObjective_OBJECTIVENAME.get(nmsPacket), null, null
-		);
-	}
-
-	@Override
-	public PacketPlayOutScoreboardDisplayObjective readDisplayObjective(Object nmsPacket) throws ReflectiveOperationException {
-		return new PacketPlayOutScoreboardDisplayObjective(
-			nms.PacketPlayOutScoreboardDisplayObjective_POSITION.getInt(nmsPacket),
-			(String) nms.PacketPlayOutScoreboardDisplayObjective_OBJECTIVENAME.get(nmsPacket)
-		);
-	}
-
-	/**
-	 * Builds entity BossBar packet
-	 * @param packet - packet to build
-	 * @param clientVersion - client version
-	 * @return entity BossBar packet
-	 * @throws	ReflectiveOperationException
-	 * 			if thrown by reflective operation
-	 */
-	private Object buildBossPacketEntity(PacketPlayOutBoss packet, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-		if (packet.getOperation() == Action.UPDATE_STYLE) return null; //nothing to do here
-
-		int entityId = packet.getId().hashCode();
-		if (packet.getOperation() == Action.REMOVE) {
-			return build(new PacketPlayOutEntityDestroy(entityId));
-		}
-		DataWatcher w = new DataWatcher();
-		if (packet.getOperation() == Action.UPDATE_PCT || packet.getOperation() == Action.ADD) {
-			float health = 300*packet.getPct();
-			if (health == 0) health = 1;
-			w.helper().setHealth(health);
-		}
-		if (packet.getOperation() == Action.UPDATE_NAME || packet.getOperation() == Action.ADD) {
-			w.helper().setCustomName(packet.getName(), clientVersion);
-		}
-		if (packet.getOperation() == Action.ADD) {
-			w.helper().setEntityFlags((byte) 32);
-			return build(new PacketPlayOutSpawnEntityLiving(entityId, null, EntityType.WITHER, new Location(null, 0,0,0), w));
-		} else {
-			return build(new PacketPlayOutEntityMetadata(entityId, w));
-		}
-	}
-
-	/**
-	 * A method taken from minecraft code used to convert double to int
-	 * @param paramDouble double value
-	 * @return int value
-	 */
-	private int floor(double paramDouble){
-		int i = (int)paramDouble;
-		return paramDouble < i ? i - 1 : i;
-	}
-
-	/**
-	 * Converts minecraft IChatBaseComponent into TAB's component class. Currently, does not support show_item hover event on 1.16+.
-	 * @param component - component to convert
-	 * @return converted component
-	 * @throws	ReflectiveOperationException
-	 * 			if thrown by reflective operation
-	 */
-	private IChatBaseComponent fromNMSComponent(Object component) throws ReflectiveOperationException {
-		if (!nms.ChatComponentText.isInstance(component)) return null; //paper
-		IChatBaseComponent chat = new IChatBaseComponent((String) nms.ChatComponentText_text.get(component));
-		Object modifier = nms.ChatBaseComponent_modifier.get(component);
-		if (modifier != null) {
-			chat.getModifier().setColor(fromNMSColor(nms.ChatModifier_color.get(modifier)));
-			chat.getModifier().setBold((Boolean) nms.ChatModifier_bold.get(modifier));
-			chat.getModifier().setItalic((Boolean) nms.ChatModifier_italic.get(modifier));
-			chat.getModifier().setObfuscated((Boolean) nms.ChatModifier_obfuscated.get(modifier));
-			chat.getModifier().setStrikethrough((Boolean) nms.ChatModifier_strikethrough.get(modifier));
-			chat.getModifier().setUnderlined((Boolean) nms.ChatModifier_underlined.get(modifier));
-			Object clickEvent = nms.ChatModifier_clickEvent.get(modifier);
-			if (clickEvent != null) {
-				chat.getModifier().onClick(EnumClickAction.valueOf(nms.ChatClickable_action.get(clickEvent).toString().toUpperCase()), (String) nms.ChatClickable_value.get(clickEvent));
-			}
-			Object hoverEvent = nms.ChatModifier_hoverEvent.get(modifier);
-			if (hoverEvent != null) {
-				EnumHoverAction action;
-				IChatBaseComponent value;
-				if (nms.getMinorVersion() >= 16) {
-					//does not support show_item on 1.16+
-					JsonObject json = (JsonObject) nms.ChatHoverable_serialize.invoke(hoverEvent);
-					action = EnumHoverAction.valueOf(json.get("action").getAsString().toUpperCase());
-					value = IChatBaseComponent.deserialize(json.get("contents").getAsJsonObject().toString());
-				} else {
-					action = EnumHoverAction.valueOf(nms.ChatHoverable_getAction.invoke(hoverEvent).toString().toUpperCase());
-					value = fromNMSComponent(nms.ChatHoverable_getValue.invoke(hoverEvent));
-				}
-				chat.getModifier().onHover(action, value);
-			}
-		}
-		for (Object extra : (List<Object>) nms.ChatBaseComponent_extra.get(component)) {
-			chat.addExtra(fromNMSComponent(extra));
-		}
-		return chat;
-	}
-
-	private TextColor fromNMSColor(Object color) throws ReflectiveOperationException {
-		if (color == null) return null;
-		if (nms.getMinorVersion() >= 16) {
-			String name = (String) nms.ChatHexColor_name.get(color);
-			if (name != null) {
-				//legacy code
-				return new TextColor(EnumChatFormat.valueOf(name.toUpperCase(Locale.US)));
-			} else {
-				int rgb = (int) nms.ChatHexColor_rgb.get(color);
-				return new TextColor((rgb >> 16) & 0xFF, (rgb >> 8) & 0xFF, rgb & 0xFF);
-			}
-		} else {
-			return new TextColor(EnumChatFormat.valueOf(((Enum)color).name()));
-		}
-	}
-
-	/**
-	 * Converts TAB's IChatBaseComponent into minecraft's component. Currently, does not support hover event.
-	 * @param component - component to convert
-	 * @param clientVersion - client version used to decide RGB conversion
-	 * @return converted component
-	 * @throws	ReflectiveOperationException
-	 * 			if thrown by reflective operation
-	 */
-	public Object toNMSComponent(IChatBaseComponent component, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-		Object obj;
-		if (clientVersion.getMinorVersion() >= 16) {
-			if (componentCacheModern.containsKey(component)) return componentCacheModern.get(component);
-			obj = toNMSComponent0(component, clientVersion);
-			if (componentCacheModern.size() > 10000) componentCacheModern.clear();
-			componentCacheModern.put(component, obj);
-		} else {
-			if (componentCacheLegacy.containsKey(component)) return componentCacheLegacy.get(component);
-			obj = toNMSComponent0(component, clientVersion);
-			if (componentCacheLegacy.size() > 10000) componentCacheLegacy.clear();
-			componentCacheLegacy.put(component, obj);
-		}
-		return obj;
-	}
-
-	//separate method to prevent extras counting cpu again due to recursion and finally showing higher usage than real
-	private Object toNMSComponent0(IChatBaseComponent component, ProtocolVersion clientVersion) throws ReflectiveOperationException {
-		if (component == null) return null;
-		Object chat = nms.newChatComponentText.newInstance(component.getText());
-		Object modifier;
-		Object clickEvent = component.getModifier().getClickEvent() == null ? null : nms.newChatClickable.newInstance(Enum.valueOf((Class<Enum>) nms.EnumClickAction, 
-				component.getModifier().getClickEvent().getAction().toString().toUpperCase()), component.getModifier().getClickEvent().getValue());
-		if (nms.getMinorVersion() >= 16) {
-			Object color = null;
-			if (component.getModifier().getColor() != null) {
-				if (clientVersion.getMinorVersion() >= 16) {
-					color = nms.ChatHexColor_ofInt.invoke(null, (component.getModifier().getColor().getRed() << 16) + (component.getModifier().getColor().getGreen() << 8) + component.getModifier().getColor().getBlue());
-				} else {
-					color = nms.ChatHexColor_ofString.invoke(null, component.getModifier().getColor().getLegacyColor().toString().toLowerCase());
-				}
-			}
-			Object hoverEvent = null;
-			if (component.getModifier().getHoverEvent() != null) {
-				Object nmsAction = nms.EnumHoverAction_a.invoke(null, component.getModifier().getHoverEvent().getAction().toString().toLowerCase());
-				switch (component.getModifier().getHoverEvent().getAction()) {
-				case SHOW_TEXT:
-					hoverEvent = nms.newChatHoverable.newInstance(nmsAction, toNMSComponent0(component.getModifier().getHoverEvent().getValue(), clientVersion));
-					break;
-				case SHOW_ENTITY:
-					hoverEvent = nms.EnumHoverAction_fromJson.invoke(nmsAction, ((ChatComponentEntity) component.getModifier().getHoverEvent().getValue()).toJson());
-					break;
-				case SHOW_ITEM:
-					hoverEvent = nms.EnumHoverAction_fromLegacyComponent.invoke(nmsAction, toNMSComponent0(component.getModifier().getHoverEvent().getValue(), clientVersion));
-					break;
-				default:
-					break;
-				}
-			}
-			modifier = nms.newChatModifier.newInstance(
-					color,
-					component.getModifier().getBold(),
-					component.getModifier().getItalic(),
-					component.getModifier().getUnderlined(),
-					component.getModifier().getStrikethrough(),
-					component.getModifier().getObfuscated(),
-					clickEvent, hoverEvent, null, null);
-		} else {
-			modifier = nms.newChatModifier.newInstance();
-			if (component.getModifier().getColor() != null) nms.setField(modifier, nms.ChatModifier_color, Enum.valueOf((Class<Enum>) nms.EnumChatFormat, component.getModifier().getColor().getLegacyColor().toString()));
-			nms.setField(modifier, nms.ChatModifier_bold, component.getModifier().getBold());
-			nms.setField(modifier, nms.ChatModifier_italic, component.getModifier().getItalic());
-			nms.setField(modifier, nms.ChatModifier_underlined, component.getModifier().getUnderlined());
-			nms.setField(modifier, nms.ChatModifier_strikethrough, component.getModifier().getStrikethrough());
-			nms.setField(modifier, nms.ChatModifier_obfuscated, component.getModifier().getObfuscated());
-			if (clickEvent != null) nms.setField(modifier, nms.ChatModifier_clickEvent, clickEvent);
-			if (component.getModifier().getHoverEvent() != null) {
-				nms.setField(modifier, nms.ChatModifier_hoverEvent, nms.newChatHoverable.newInstance(nms.EnumHoverAction_a.invoke(null, 
-						component.getModifier().getHoverEvent().getAction().toString().toLowerCase()), toNMSComponent0(component.getModifier().getHoverEvent().getValue(), clientVersion)));
-			}
-		}
-		nms.setField(chat, nms.ChatBaseComponent_modifier, modifier);
-		for (IChatBaseComponent extra : component.getExtra()) {
-			nms.ChatComponentText_addSibling.invoke(chat, toNMSComponent0(extra, clientVersion));
-		}
-		return chat;
-	}
-
-	private Object newScoreboardObjective(String objectiveName) throws ReflectiveOperationException {
-		if (nms.getMinorVersion() >= 13) {
-			return nms.newScoreboardObjective.newInstance(null, objectiveName, null, nms.newChatComponentText.newInstance(""), null);
-		}
-		return nms.newScoreboardObjective.newInstance(null, objectiveName, nms.IScoreboardCriteria_self.get(null));
-	}
-}
@@ -1,128 +1,75 @@
 package me.neznamy.tab.platforms.bukkit;

-import java.util.ArrayList;
-import java.util.Collection;
-
-import io.netty.channel.ChannelDuplexHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelPromise;
-import me.neznamy.tab.api.TabFeature;
-import me.neznamy.tab.api.TabPlayer;
-import me.neznamy.tab.platforms.bukkit.nms.NMSStorage;
-import me.neznamy.tab.shared.TabConstants;
-import me.neznamy.tab.shared.TAB;
-import me.neznamy.tab.shared.features.NickCompatibility;
-import me.neznamy.tab.shared.features.PipelineInjector;
+import io.netty.channel.Channel;
+import lombok.SneakyThrows;
+import me.neznamy.tab.platforms.bukkit.nms.BukkitReflection;
+import me.neznamy.tab.shared.features.injection.NettyPipelineInjector;
+import me.neznamy.tab.shared.platform.TabPlayer;
+import me.neznamy.tab.shared.util.FunctionWithException;
+import me.neznamy.tab.shared.util.ReflectionUtils;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;

-public class BukkitPipelineInjector extends PipelineInjector {
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;

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

-	/**
-	 * Constructs new instance
-	 */
-	public BukkitPipelineInjector(){
-		super("packet_handler");
-		channelFunction = BukkitChannelDuplexHandler::new;
-	}
+    /** Function for getting player's channel */
+    private static FunctionWithException<TabPlayer, Channel> getChannel;

-	/**
-	 * Custom channel duplex handler override
-	 */
-	public class BukkitChannelDuplexHandler extends ChannelDuplexHandler {
-		
-		//injected player
-		private final TabPlayer player;
-		
-		/**
-		 * Constructs new instance with given player
-		 * @param player - player to inject
-		 */
-		public BukkitChannelDuplexHandler(TabPlayer player) {
-			this.player = player;
-		}
+    /**
+     * Constructs new instance
+     */
+    public BukkitPipelineInjector() {
+        super("packet_handler");
+    }

-		@Override
-		public void channelRead(@NotNull ChannelHandlerContext context, @NotNull Object packet) {
-			try {
-				if (TAB.getInstance().getFeatureManager().onPacketReceive(player, packet)) return;
-				super.channelRead(context, packet);
-			} catch (Exception e){
-				TAB.getInstance().getErrorManager().printError("An error occurred when reading packets", e);
-			}
-		}
+    /**
+     * Attempts to load required classes, fields and methods and marks class as available.
+     * If something fails, error message is printed and class is not marked as available.
+     */
+    public static void tryLoad() {
+        try {
+            Class<?> NetworkManager = BukkitReflection.getClass("network.Connection", "network.NetworkManager", "NetworkManager");
+            Class<?> PlayerConnection = BukkitReflection.getClass("server.network.ServerGamePacketListenerImpl",
+                    "server.network.PlayerConnection", "PlayerConnection");
+            Class<?> EntityPlayer = BukkitReflection.getClass("server.level.ServerPlayer", "server.level.EntityPlayer", "EntityPlayer");
+            Method getHandle = BukkitReflection.getBukkitClass("entity.CraftPlayer").getMethod("getHandle");
+            Field PLAYER_CONNECTION = ReflectionUtils.getOnlyField(EntityPlayer, PlayerConnection);
+            Field NETWORK_MANAGER;
+            if (BukkitReflection.is1_20_2Plus()) {
+                NETWORK_MANAGER = ReflectionUtils.getOnlyField(PlayerConnection.getSuperclass(), NetworkManager);
+            } else {
+                NETWORK_MANAGER = ReflectionUtils.getOnlyField(PlayerConnection, NetworkManager);
+            }
+            Field CHANNEL = ReflectionUtils.getOnlyField(NetworkManager, Channel.class);
+            getChannel = player -> (Channel) CHANNEL.get(NETWORK_MANAGER.get(PLAYER_CONNECTION.get(getHandle.invoke(player.getPlayer()))));
+        } catch (Exception e) {
+            BukkitUtils.compatibilityError(e, "network channel injection", null,
+                    "Unlimited nametag mode not working and being replaced with regular nametags",
+                    "Anti-override for tablist & nametags not working",
+                    "Compatibility with nickname plugins changing player names will not work",
+                    "Scoreboard will not be checking for other plugins");
+        }
+    }

-		@Override
-		public void write(ChannelHandlerContext context, Object packet, ChannelPromise channelPromise) {
-			try {
-				if (nms.PacketPlayOutPlayerInfo.isInstance(packet)) {
-					super.write(context, TAB.getInstance().getFeatureManager().onPacketPlayOutPlayerInfo(player, packet), channelPromise);
-					return;
-				}
-				if (antiOverrideTeams && nms.PacketPlayOutScoreboardTeam != null && nms.PacketPlayOutScoreboardTeam.isInstance(packet)) {
-					modifyPlayers(packet);
-					super.write(context, packet, channelPromise);
-					return;
-				}
-				if (nms.PacketPlayOutScoreboardDisplayObjective.isInstance(packet)){
-					TAB.getInstance().getFeatureManager().onDisplayObjective(player, packet);
-				}
-				if (nms.PacketPlayOutScoreboardObjective.isInstance(packet)) {
-					TAB.getInstance().getFeatureManager().onObjective(player, packet);
-				}
-				TAB.getInstance().getFeatureManager().onPacketSend(player, packet);
-			} catch (Exception e){
-				TAB.getInstance().getErrorManager().printError("An error occurred when reading packets", e);
-			}
-			try {
-				super.write(context, packet, channelPromise);
-			} catch (Exception e) {
-				TAB.getInstance().getErrorManager().printError("Failed to forward packet " + packet.getClass().getSimpleName() + " to " + player.getName(), e);
-			}
-		}
-		
-		/**
-		 * Removes all real players from team if packet does not come from TAB and reports this to override log
-		 * @param packetPlayOutScoreboardTeam - team packet
-		 * @throws	ReflectiveOperationException
-		 * 			nmsGameMode
-		 */
-		@SuppressWarnings("unchecked")
-		private void modifyPlayers(Object packetPlayOutScoreboardTeam) throws ReflectiveOperationException {
-			long time = System.nanoTime();
-			Collection<String> players = (Collection<String>) nms.PacketPlayOutScoreboardTeam_PLAYERS.get(packetPlayOutScoreboardTeam);
-			String teamName = (String) nms.PacketPlayOutScoreboardTeam_NAME.get(packetPlayOutScoreboardTeam);
-			if (players == null) return;
-			//creating a new list to prevent NoSuchFieldException in minecraft packet encoder when a player is removed
-			Collection<String> newList = new ArrayList<>();
-			for (String entry : players) {
-				TabPlayer p = getPlayer(entry);
-				if (p == null) {
-					newList.add(entry);
-					continue;
-				}
-				if (!((TabFeature)TAB.getInstance().getTeamManager()).isDisabledPlayer(p) && 
-						!TAB.getInstance().getTeamManager().hasTeamHandlingPaused(p) && !teamName.equals(p.getTeamName())) {
-					logTeamOverride(teamName, p.getName(), p.getTeamName());
-				} else {
-					newList.add(entry);
-				}
-			}
-			nms.setField(packetPlayOutScoreboardTeam, nms.PacketPlayOutScoreboardTeam_PLAYERS, newList);
-			TAB.getInstance().getCPUManager().addTime("NameTags", TabConstants.CpuUsageCategory.ANTI_OVERRIDE, System.nanoTime()-time);
-		}
-		
-		private TabPlayer getPlayer(String name) {
-			for (TabPlayer p : TAB.getInstance().getOnlinePlayers()) {
-				if (getName(p).equals(name)) return p;
-			}
-			return null;
-		}
+    /**
+     * Returns {@code true} if pipeline injection is available, {@code false} if not.
+     *
+     * @return  {@code true} if pipeline injection is available, {@code false} if not
+     */
+    public static boolean isAvailable() {
+        return getChannel != null;
+    }

-		private String getName(TabPlayer p) {
-			return ((NickCompatibility) TAB.getInstance().getFeatureManager().getFeature(TabConstants.Feature.NICK_COMPATIBILITY)).getNickname(p);
-		}
-	}
+    @Override
+    @Nullable
+    @SneakyThrows
+    protected Channel getChannel(@NotNull TabPlayer player) {
+        return getChannel.apply(player);
+    }
 }
@@ -1,209 +0,0 @@
-package me.neznamy.tab.platforms.bukkit;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.math.RoundingMode;
-import java.text.DecimalFormat;
-import java.text.NumberFormat;
-import java.util.Locale;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.Listener;
-import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.entity.EntityRegainHealthEvent;
-import org.bukkit.event.player.PlayerRespawnEvent;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.RegisteredServiceProvider;
-
-import com.earth2me.essentials.Essentials;
-
-import me.neznamy.tab.api.TabPlayer;
-import me.neznamy.tab.api.placeholder.PlaceholderManager;
-import me.neznamy.tab.api.placeholder.PlayerPlaceholder;
-import me.neznamy.tab.shared.TAB;
-import me.neznamy.tab.shared.TabConstants;
-import me.neznamy.tab.shared.placeholders.PlaceholderRegistry;
-import net.milkbowl.vault.chat.Chat;
-
-/**
- * Bukkit registry to register bukkit-only placeholders
- */
-public class BukkitPlaceholderRegistry implements PlaceholderRegistry {
-
-	//formatter for 2 decimal places
-	public final DecimalFormat decimal2 = ((DecimalFormat)NumberFormat.getNumberInstance(Locale.US));
-
-	private final Plugin plugin;
-
-	private Object chat;
-	private final Plugin essentials = Bukkit.getPluginManager().getPlugin("Essentials");
-	private Object server;
-	private Field recentTps;
-	private boolean paperTps;
-	private boolean paperMspt;
-	private boolean purpur;
-	private Method playerIsAfk;
-
-	private Listener healthListener = null;
-
-	/**
-	 * Constructs new instance with given parameter
-	 * @param plugin - plugin instance
-	 */
-	public BukkitPlaceholderRegistry(Plugin plugin) {
-		this.plugin = plugin;
-		decimal2.applyPattern("#.##");
-		try {
-			if (Bukkit.getPluginManager().isPluginEnabled("Vault")) {
-				RegisteredServiceProvider<?> rspChat = Bukkit.getServicesManager().getRegistration(Class.forName("net.milkbowl.vault.chat.Chat"));
-				if (rspChat != null) chat = rspChat.getProvider();
-			}
-		} catch (ClassNotFoundException e) {
-			//modded server without vault
-		}
-		try {
-			server = Bukkit.getServer().getClass().getMethod("getServer").invoke(Bukkit.getServer());
-			recentTps = server.getClass().getField("recentTps");
-		} catch (ReflectiveOperationException e) {
-			//not spigot
-		}
-		try {
-			Bukkit.class.getMethod("getTPS");
-			paperTps = true;
-		} catch (NoSuchMethodException e) {
-			//not paper
-		}
-		try {
-			Bukkit.class.getMethod("getAverageTickTime");
-			paperMspt = true;
-		} catch (NoSuchMethodException e) {
-			//not paper
-		}
-		try {
-			playerIsAfk = Player.class.getMethod("isAfk");
-			purpur = true;
-		} catch (NoSuchMethodException e) {
-			//not purpur
-		}
-	}
-
-	@SuppressWarnings("deprecation")
-	@Override
-	public void registerPlaceholders(PlaceholderManager manager) {
-		NumberFormat roundDown = NumberFormat.getNumberInstance(Locale.ENGLISH);
-		roundDown.setRoundingMode(RoundingMode.DOWN);
-		roundDown.setMaximumFractionDigits(2);
-		manager.registerPlayerPlaceholder("%displayname%", 500, p -> ((Player) p.getPlayer()).getDisplayName());
-		if (paperTps) {
-			manager.registerServerPlaceholder("%tps%", 1000, () -> formatTPS(Bukkit.getTPS()[0]));
-		} else if (recentTps != null) {
-			manager.registerServerPlaceholder("%tps%", 1000, () -> {
-				try {
-					return formatTPS(((double[]) recentTps.get(server))[0]);
-				} catch (IllegalAccessException e) {
-					return "-1";
-				}
-			});
-		} else {
-			manager.registerServerPlaceholder("%tps%", -1, () -> "-1").enableTriggerMode();
-		}
-		if (paperMspt) {
-			manager.registerServerPlaceholder("%mspt%", 1000, () -> roundDown.format(Bukkit.getAverageTickTime()));
-		}
-		manager.registerPlayerPlaceholder("%afk%", 500, p -> {
-			if (essentials != null && ((Essentials)essentials).getUser(p.getUniqueId()).isAfk()) return true;
-			if (!purpur || playerIsAfk == null) return false;
-			try {
-				return playerIsAfk.invoke(p.getPlayer());
-			} catch (final IllegalAccessException | InvocationTargetException exception) {
-				TAB.getInstance().getErrorManager().printError("Failed to invoke isAfk!", exception);
-			}
-			return false;
-		});
-		manager.registerPlayerPlaceholder("%essentialsnick%", 1000, p -> {
-			String nickname = null;
-			if (essentials != null)
-				nickname = ((Essentials)essentials).getUser(p.getUniqueId()).getNickname();
-			return nickname == null || nickname.length() == 0 ? p.getName() : nickname;
-		});
-		if (chat != null) {
-			manager.registerPlayerPlaceholder("%vault-prefix%", 500, p -> ((Chat) chat).getPlayerPrefix((Player) p.getPlayer()));
-			manager.registerPlayerPlaceholder("%vault-suffix%", 500, p -> ((Chat) chat).getPlayerSuffix((Player) p.getPlayer()));
-		} else {
-			manager.registerServerPlaceholder("%vault-prefix%", -1, () -> "").enableTriggerMode();
-			manager.registerServerPlaceholder("%vault-suffix%", -1, () -> "").enableTriggerMode();
-		}
-		registerOnlinePlaceholders(manager);
-		registerHealthPlaceholder(manager);
-	}
-
-	private String formatTPS(double tps) {
-		return decimal2.format(Math.min(20, tps));
-	}
-
-	private void registerOnlinePlaceholders(PlaceholderManager manager) {
-		manager.registerPlayerPlaceholder("%online%", 1000, p -> {
-			int count = 0;
-			for (TabPlayer all : TAB.getInstance().getOnlinePlayers()){
-				if (((Player) p.getPlayer()).canSee((Player) all.getPlayer())) count++;
-			}
-			return count;
-		});
-		manager.registerPlayerPlaceholder("%staffonline%", 2000, p -> {
-			int count = 0;
-			for (TabPlayer all : TAB.getInstance().getOnlinePlayers()){
-				if (all.hasPermission(TabConstants.Permission.STAFF) && ((Player) p.getPlayer()).canSee((Player) all.getPlayer())) count++;
-			}
-			return count;
-		});
-		manager.registerPlayerPlaceholder("%nonstaffonline%", 2000, p -> {
-			int count = 0;
-			for (TabPlayer all : TAB.getInstance().getOnlinePlayers()){
-				if (!all.hasPermission(TabConstants.Permission.STAFF) && ((Player) p.getPlayer()).canSee((Player) all.getPlayer())) count++;
-			}
-			return count;
-		});
-	}
-
-	@SuppressWarnings("deprecation")
-	private void registerHealthPlaceholder(PlaceholderManager manager) {
-		if (TAB.getInstance().getServerVersion().getMinorVersion() >= 6) {
-			PlayerPlaceholder health = manager.registerPlayerPlaceholder("%health%", -1, p -> (int) Math.ceil(((Player) p.getPlayer()).getHealth()));
-			health.enableTriggerMode(() -> {
-				healthListener = new Listener() {
-
-					@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
-					public void onDamage(EntityDamageEvent e) {
-						if (e.getEntity() instanceof Player) {
-							Player p = (Player) e.getEntity();
-							TabPlayer tabp = TAB.getInstance().getPlayer(e.getEntity().getUniqueId());
-							if (tabp == null) return;
-							health.updateValue(tabp, (int) Math.ceil(Math.max(p.getHealth() - e.getFinalDamage(), 0)));
-						}
-					}
-
-					@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
-					public void onRegain(EntityRegainHealthEvent e) {
-						if (e.getEntity() instanceof Player) {
-							Player p = (Player) e.getEntity();
-							TabPlayer tabp = TAB.getInstance().getPlayer(e.getEntity().getUniqueId());
-							if (tabp == null) return;
-							health.updateValue(tabp, (int) Math.ceil(Math.min(p.getHealth() + e.getAmount(), p.getMaxHealth())));
-						}
-					}
-
-					@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
-					public void onRespawn(PlayerRespawnEvent e) {
-						health.updateValue(TAB.getInstance().getPlayer(e.getPlayer().getUniqueId()), (int) e.getPlayer().getMaxHealth());
-					}
-				};
-				Bukkit.getPluginManager().registerEvents(healthListener, plugin);
-			}, () -> HandlerList.unregisterAll(healthListener));
-		}
-	}
-}
@@ -1,274 +0,0 @@
-package me.neznamy.tab.platforms.bukkit;
-
-import java.io.File;
-import java.util.Collection;
-import java.util.List;
-
-import me.neznamy.tab.shared.TabConstants;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-
-import com.earth2me.essentials.Essentials;
-import com.mojang.authlib.properties.Property;
-import com.mojang.authlib.properties.PropertyMap;
-
-import me.clip.placeholderapi.PlaceholderAPI;
-import me.neznamy.tab.api.TabPlayer;
-import me.neznamy.tab.api.chat.EnumChatFormat;
-import me.neznamy.tab.api.protocol.PacketBuilder;
-import me.neznamy.tab.platforms.bukkit.event.TabLoadEvent;
-import me.neznamy.tab.platforms.bukkit.event.TabPlayerLoadEvent;
-import me.neznamy.tab.platforms.bukkit.features.PerWorldPlayerList;
-import me.neznamy.tab.platforms.bukkit.features.PetFix;
-import me.neznamy.tab.platforms.bukkit.features.TabExpansion;
-import me.neznamy.tab.platforms.bukkit.features.WitherBossBar;
-import me.neznamy.tab.platforms.bukkit.features.unlimitedtags.NameTagX;
-import me.neznamy.tab.platforms.bukkit.permission.Vault;
-import me.neznamy.tab.shared.Platform;
-import me.neznamy.tab.shared.TAB;
-import me.neznamy.tab.shared.features.PlaceholderManagerImpl;
-import me.neznamy.tab.shared.features.bossbar.BossBarManagerImpl;
-import me.neznamy.tab.shared.features.nametags.NameTag;
-import me.neznamy.tab.shared.permission.LuckPerms;
-import me.neznamy.tab.shared.permission.None;
-import me.neznamy.tab.shared.permission.PermissionPlugin;
-import me.neznamy.tab.shared.permission.UltraPermissions;
-import me.neznamy.tab.shared.placeholders.PlayerPlaceholderImpl;
-import me.neznamy.tab.shared.placeholders.UniversalPlaceholderRegistry;
-import net.milkbowl.vault.permission.Permission;
-import org.bukkit.plugin.RegisteredServiceProvider;
-
-/**
- * Bukkit's implementation of Platform interface
- */
-public class BukkitPlatform implements Platform {
-
-	//plugin instance
-	private final Main plugin;
-
-	private final BukkitPacketBuilder packetBuilder = new BukkitPacketBuilder();
-
-	//booleans to check plugin presence
-	private boolean placeholderAPI;
-	private boolean libsDisguises;
-	private Plugin essentials;
-
-	/**
-	 * Constructs new instance with given parameters
-	 * @param plugin - plugin instance
-	 */
-	public BukkitPlatform(Main plugin) {
-		this.plugin = plugin;
-	}
-
-	@Override
-	public PermissionPlugin detectPermissionPlugin() {
-		if (Bukkit.getPluginManager().isPluginEnabled("LuckPerms")) {
-			return new LuckPerms(getPluginVersion("LuckPerms"));
-		} else if (Bukkit.getPluginManager().isPluginEnabled("UltraPermissions")) {
-			return new UltraPermissions(getPluginVersion("UltraPermissions"));
-		} else if (Bukkit.getPluginManager().isPluginEnabled("Vault")) {
-			RegisteredServiceProvider<Permission> provider = Bukkit.getServicesManager().getRegistration(Permission.class);
-			if (provider == null) return new None();
-			return new Vault(provider.getProvider(), getPluginVersion("Vault"));
-		} else {
-			return new None();
-		}
-	}
-
-	@Override
-	public void loadFeatures() {
-		if (Bukkit.getPluginManager().isPluginEnabled("ViaVersion")) {
-			try {
-				Class.forName("com.viaversion.viaversion.api.Via");
-			} catch (ClassNotFoundException e) {
-				TAB.getInstance().sendConsoleMessage("&c[TAB] An outdated version of ViaVersion (" + getPluginVersion("ViaVersion") + ") was detected.", true);
-				TAB.getInstance().sendConsoleMessage("&c[TAB] TAB only supports ViaVersion 4.0.0 and above. Disabling ViaVersion hook.", true);
-				TAB.getInstance().sendConsoleMessage("&c[TAB] This might cause problems, such as limitations still being present for latest MC clients as well as RGB not working.", true);
-			}
-		}
-		if (Bukkit.getPluginManager().isPluginEnabled("Tablisknu")) {
-			TAB.getInstance().sendConsoleMessage("&c[TAB] Detected plugin \"Tablisknu\", which causes TAB to not work properly. Consider removing the plugin.", true);
-		}
-		placeholderAPI = Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI");
-		libsDisguises = Bukkit.getPluginManager().isPluginEnabled("LibsDisguises");
-		essentials = Bukkit.getPluginManager().getPlugin("Essentials");
-		TAB tab = TAB.getInstance();
-		if (tab.getConfiguration().isPipelineInjection())
-			tab.getFeatureManager().registerFeature(TabConstants.Feature.PIPELINE_INJECTION, new BukkitPipelineInjector());
-		new BukkitPlaceholderRegistry(plugin).registerPlaceholders(tab.getPlaceholderManager());
-		new UniversalPlaceholderRegistry().registerPlaceholders(tab.getPlaceholderManager());
-		loadNameTagFeature(tab);
-		tab.loadUniversalFeatures();
-		if (tab.getConfiguration().getConfig().getBoolean("bossbar.enabled", false)) {
-			if (tab.getServerVersion().getMinorVersion() < 9) {
-				tab.getFeatureManager().registerFeature(TabConstants.Feature.BOSS_BAR, new WitherBossBar(plugin));
-			} else {
-				tab.getFeatureManager().registerFeature(TabConstants.Feature.BOSS_BAR, new BossBarManagerImpl());
-			}
-		}
-		if (tab.getServerVersion().getMinorVersion() >= 9 && tab.getConfiguration().getConfig().getBoolean("fix-pet-names.enabled", false))
-			tab.getFeatureManager().registerFeature(TabConstants.Feature.PET_FIX, new PetFix());
-		if (tab.getConfiguration().getConfig().getBoolean("per-world-playerlist.enabled", false))
-			tab.getFeatureManager().registerFeature(TabConstants.Feature.PER_WORLD_PLAYER_LIST, new PerWorldPlayerList(plugin));
-		if (placeholderAPI) {
-			new TabExpansion(plugin);
-		}
-		for (Player p : getOnlinePlayers()) {
-			tab.addPlayer(new BukkitTabPlayer(p, plugin.getProtocolVersion(p)));
-		}
-	}
-	
-	private String getPluginVersion(String plugin) {
-		Plugin pl = Bukkit.getPluginManager().getPlugin(plugin);
-		return pl == null ? "" : pl.getDescription().getVersion();
-	}
-
-	/**
-	 * Loads NameTag feature from config
-	 * @param tab - tab instance
-	 */
-	private void loadNameTagFeature(TAB tab) {
-		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 NameTagX(plugin));
-			} else {
-				tab.getFeatureManager().registerFeature(TabConstants.Feature.NAME_TAGS, new NameTag());
-			}
-		}
-	}
-
-	/**
-	 * Returns list of online players from Bukkit API
-	 * @return list of online players from Bukkit API
-	 */
-	@SuppressWarnings("unchecked")
-	private Player[] getOnlinePlayers() {
-		try {
-			Object players = Bukkit.class.getMethod("getOnlinePlayers").invoke(null);
-			if (players instanceof Player[]) {
-				//1.7.x
-				return (Player[]) players;
-			} else {
-				//1.8+
-				return ((Collection<Player>)players).toArray(new Player[0]); 
-			}
-		} catch (ReflectiveOperationException e) {
-			TAB.getInstance().getErrorManager().printError("Failed to get online players", e);
-			return new Player[0];
-		}
-	}
-
-	@Override
-	public void sendConsoleMessage(String message, boolean translateColors) {
-		Bukkit.getConsoleSender().sendMessage(translateColors ? EnumChatFormat.color(message) : message);
-	}
-
-	@Override
-	public void registerUnknownPlaceholder(String identifier) {
-		PlaceholderManagerImpl pl = TAB.getInstance().getPlaceholderManager();
-		if (identifier.startsWith("%rel_")) {
-			//relational placeholder
-			TAB.getInstance().getPlaceholderManager().registerRelationalPlaceholder(identifier, pl.getRelationalRefresh(identifier), (viewer, target) -> 
-				placeholderAPI ? PlaceholderAPI.setRelationalPlaceholders((Player) viewer.getPlayer(), (Player) target.getPlayer(), identifier) : identifier);
-		} else {
-			//normal placeholder
-			if (identifier.startsWith("%sync:")) {
-				int refresh = pl.getServerPlaceholderRefreshIntervals().getOrDefault(identifier,
-						pl.getPlayerPlaceholderRefreshIntervals().getOrDefault(identifier, pl.getDefaultRefresh()));
-				pl.registerPlaceholder(new PlayerPlaceholderImpl(identifier, refresh, null) {
-					
-					@Override
-					public Object request(TabPlayer p) {
-						Bukkit.getScheduler().runTask(plugin, () -> {
-
-							long time = System.nanoTime();
-							String syncedPlaceholder = identifier.substring(6, identifier.length()-1);
-							String value = placeholderAPI ? PlaceholderAPI.setPlaceholders((Player) p.getPlayer(), "%" + syncedPlaceholder + "%") : identifier;
-							getLastValues().put(p, value);
-							getForceUpdate().add(p);
-							TAB.getInstance().getCPUManager().addPlaceholderTime(getIdentifier(), System.nanoTime()-time);
-						});
-						String value = getLastValues().get(p);
-						return value == null ? identifier : value;
-					}
-				});
-				return;
-			}
-			if (pl.getServerPlaceholderRefreshIntervals().containsKey(identifier)) {
-				TAB.getInstance().getPlaceholderManager().registerServerPlaceholder(identifier, pl.getServerPlaceholderRefreshIntervals().get(identifier), () ->
-						placeholderAPI ? PlaceholderAPI.setPlaceholders(null, identifier) : identifier);
-			} else {
-				int refresh = pl.getPlayerPlaceholderRefreshIntervals().getOrDefault(identifier, pl.getDefaultRefresh());
-				TAB.getInstance().getPlaceholderManager().registerPlayerPlaceholder(identifier, refresh, p -> 
-					placeholderAPI ? PlaceholderAPI.setPlaceholders((Player) p.getPlayer(), identifier) : identifier);
-			}
-		}
-	}
-
-	@Override
-	public String getServerVersion() {
-		return Bukkit.getBukkitVersion().split("-")[0] + " (" + Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3] + ")";
-	}
-
-	@Override
-	public File getDataFolder() {
-		return plugin.getDataFolder();
-	}
-
-	@Override
-	public void callLoadEvent() {
-		Bukkit.getPluginManager().callEvent(new TabLoadEvent());
-	}
-
-	@Override
-	public void callLoadEvent(TabPlayer player) {
-		Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> Bukkit.getPluginManager().callEvent(new TabPlayerLoadEvent(player)));
-	}
-
-	@Override
-	public int getMaxPlayers() {
-		return Bukkit.getMaxPlayers();
-	}
-
-	public boolean isLibsDisguisesEnabled() {
-		return libsDisguises;
-	}
-	
-	public void setLibsDisguisesEnabled(boolean enabled) {
-		libsDisguises = enabled;
-	}
-
-	public Essentials getEssentials() {
-		return (Essentials) essentials;
-	}
-
-	@Override
-	public PacketBuilder getPacketBuilder() {
-		return packetBuilder;
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public Object getSkin(List<String> properties) {
-		PropertyMap map = new PropertyMap();
-		map.put("textures", new Property("textures", properties.get(0), properties.get(1)));
-		return map;
-	}
-	
-	@Override
-	public boolean isProxy() {
-		return false;
-	}
-
-	@Override
-	public boolean isPluginEnabled(String plugin) {
-		return Bukkit.getPluginManager().isPluginEnabled(plugin);
-	}
-
-	@Override
-	public String getConfigName() {
-		return "bukkitconfig.yml";
-	}
-}
@@ -0,0 +1,24 @@
+package me.neznamy.tab.platforms.bukkit;
+
+import me.neznamy.tab.platforms.bukkit.platform.BukkitPlatform;
+import me.neznamy.tab.platforms.bukkit.platform.FoliaPlatform;
+import me.neznamy.tab.shared.TAB;
+import me.neznamy.tab.shared.util.ReflectionUtils;
+import org.bukkit.plugin.java.JavaPlugin;
+
+/**
+ * Main class for Bukkit.
+ */
+public class BukkitTAB extends JavaPlugin {
+
+    @Override
+    public void onEnable() {
+        boolean folia = ReflectionUtils.classExists("io.papermc.paper.threadedregions.RegionizedServer");
+        TAB.create(folia ? new FoliaPlatform(this) : new BukkitPlatform(this));
+    }
+
+    @Override
+    public void onDisable() {
+        TAB.getInstance().unload();
+    }
+}
@@ -0,0 +1,49 @@
+package me.neznamy.tab.platforms.bukkit;
+
+import me.neznamy.tab.shared.TAB;
+import me.neznamy.tab.shared.TabConstants;
+import me.neznamy.tab.shared.chat.EnumChatFormat;
+import me.neznamy.tab.shared.platform.TabPlayer;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabCompleter;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Command handler for /tab command
+ */
+public class BukkitTabCommand implements CommandExecutor, TabCompleter {
+
+    @Override
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
+        if (TAB.getInstance().isPluginDisabled()) {
+            for (String message : TAB.getInstance().getDisabledCommand().execute(args, sender.hasPermission(TabConstants.Permission.COMMAND_RELOAD), sender.hasPermission(TabConstants.Permission.COMMAND_ALL))) {
+                sender.sendMessage(EnumChatFormat.color(message));
+            }
+        } else {
+            TabPlayer p = null;
+            if (sender instanceof Player) {
+                p = TAB.getInstance().getPlayer(((Player)sender).getUniqueId());
+                if (p == null) return true; //player not loaded correctly
+            }
+            TAB.getInstance().getCommand().execute(p, args);
+        }
+        return false;
+    }
+
+    @Override
+    @NotNull
+    public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
+        TabPlayer p = null;
+        if (sender instanceof Player) {
+            p = TAB.getInstance().getPlayer(((Player)sender).getUniqueId());
+            if (p == null) return Collections.emptyList(); //player not loaded correctly
+        }
+        return TAB.getInstance().getCommand().complete(p, args);
+    }
+}
@@ -1,261 +1,120 @@
 package me.neznamy.tab.platforms.bukkit;

-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.bukkit.Bukkit;
-import org.bukkit.boss.BarColor;
-import org.bukkit.boss.BarFlag;
-import org.bukkit.boss.BarStyle;
-import org.bukkit.boss.BossBar;
+import lombok.Getter;
+import me.neznamy.tab.platforms.bukkit.bossbar.BossBarLoader;
+import me.neznamy.tab.platforms.bukkit.hook.LibsDisguisesHook;
+import me.neznamy.tab.platforms.bukkit.entity.PacketEntityView;
+import me.neznamy.tab.platforms.bukkit.nms.PingRetriever;
+import me.neznamy.tab.platforms.bukkit.platform.BukkitPlatform;
+import me.neznamy.tab.platforms.bukkit.scoreboard.ScoreboardLoader;
+import me.neznamy.tab.platforms.bukkit.tablist.TabListBase;
+import me.neznamy.tab.shared.backend.entityview.DummyEntityView;
+import me.neznamy.tab.shared.backend.entityview.EntityView;
+import me.neznamy.tab.shared.platform.BossBar;
+import me.neznamy.tab.shared.chat.TabComponent;
+import me.neznamy.tab.shared.platform.TabList;
+import me.neznamy.tab.shared.platform.Scoreboard;
+import me.neznamy.tab.shared.backend.BackendTabPlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.metadata.MetadataValue;
 import org.bukkit.potion.PotionEffectType;
-
-import com.earth2me.essentials.Essentials;
-import com.mojang.authlib.GameProfile;
-import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.legacy.bossbar.BossColor;
-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.ProtocolVersion;
-import me.neznamy.tab.api.chat.rgb.RGBUtils;
-import me.neznamy.tab.api.protocol.PacketPlayOutBoss;
-import me.neznamy.tab.platforms.bukkit.nms.NMSStorage;
-import me.neznamy.tab.shared.ITabPlayer;
-import me.neznamy.tab.shared.TAB;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;

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

-	//nms handle
-	private Object handle;
+    @NotNull
+    private final Scoreboard<BukkitTabPlayer, ?> scoreboard = ScoreboardLoader.getInstance().apply(this);

-	//nms player connection
-	private Object playerConnection;
-	
-	//player's visible boss bars
-	private final Map<UUID, BossBar> bossBars = new HashMap<>();
-	private final Map<UUID, com.viaversion.viaversion.api.legacy.bossbar.BossBar> viaBossBars = new HashMap<>();
+    @NotNull
+    private final TabListBase<?> tabList = TabListBase.getInstance().apply(this);

-	/**
-	 * Constructs new instance with given parameter
-	 * @param p - bukkit player
-	 */
-	public BukkitTabPlayer(Player p, int protocolVersion){
-		super(p, p.getUniqueId(), p.getName(), "N/A", p.getWorld().getName());
-		try {
-			handle = NMSStorage.getInstance().getHandle.invoke(player);
-			playerConnection = NMSStorage.getInstance().PLAYER_CONNECTION.get(handle);
-			if (NMSStorage.getInstance().CHANNEL != null)
-				channel = (Channel) NMSStorage.getInstance().CHANNEL.get(NMSStorage.getInstance().NETWORK_MANAGER.get(playerConnection));
-		} catch (ReflectiveOperationException e) {
-			TAB.getInstance().getErrorManager().printError("Failed to get playerConnection or channel of " + p.getName(), e);
-		}
-		version = ProtocolVersion.fromNetworkId(protocolVersion);
-	}
+    @NotNull
+    private final BossBar bossBar = BossBarLoader.findInstance(this);

-	@Override
-	public boolean hasPermission(String permission) {
-		long time = System.nanoTime();
-		boolean value = getPlayer().hasPermission(permission);
-		TAB.getInstance().getCPUManager().addMethodTime("hasPermission", System.nanoTime()-time);
-		return value;
-	}
+    @NotNull
+    private final EntityView entityView = PacketEntityView.isAvailable() ? new PacketEntityView(this) : new DummyEntityView();

-	@Override
-	public int getPing() {
-		try {
-			int ping = NMSStorage.getInstance().PING.getInt(handle);
-			if (ping > 10000 || ping < 0) ping = -1;
-			return ping;
-		} catch (IllegalAccessException e) {
-			return -1;
-		}
-	}
+    /**
+     * Constructs new instance with given bukkit player
+     *
+     * @param   platform
+     *          Server platform
+     * @param   p
+     *          bukkit player
+     */
+    public BukkitTabPlayer(@NotNull BukkitPlatform platform, @NotNull Player p) {
+        super(platform, p, p.getUniqueId(), p.getName(), p.getWorld().getName(), platform.getServerVersion().getNetworkId());
+    }

-	@Override
-	public void sendPacket(Object nmsPacket) {
-		if (nmsPacket == null || !getPlayer().isOnline()) return;
-		long time = System.nanoTime();
-		try {
-			if (nmsPacket instanceof PacketPlayOutBoss) {
-				if (TAB.getInstance().getServerVersion().getMinorVersion() >= 9) {
-					handle((PacketPlayOutBoss) nmsPacket);
-				} else {
-					handleVia((PacketPlayOutBoss) nmsPacket);
-				}
-			} else {
-				NMSStorage.getInstance().sendPacket.invoke(playerConnection, nmsPacket);
-			}
-		} catch (ReflectiveOperationException e) {
-			TAB.getInstance().getErrorManager().printError("An error occurred when sending " + nmsPacket.getClass().getSimpleName(), e);
-		}
-		TAB.getInstance().getCPUManager().addMethodTime("sendPacket", System.nanoTime()-time);
-	}
-	
-	private void handle(PacketPlayOutBoss packet) {
-		BossBar bar = bossBars.get(packet.getId());
-		if (packet.getOperation() == PacketPlayOutBoss.Action.ADD) {
-			if (bossBars.containsKey(packet.getId())) return;
-			bar = Bukkit.createBossBar(RGBUtils.getInstance().convertToBukkitFormat(packet.getName(), getVersion().getMinorVersion() >= 16 && TAB.getInstance().getServerVersion().getMinorVersion() >= 16),
-					BarColor.valueOf(packet.getColor().name()),
-					BarStyle.valueOf(packet.getOverlay().getBukkitName()));
-			if (packet.isCreateWorldFog()) bar.addFlag(BarFlag.CREATE_FOG);
-			if (packet.isDarkenScreen()) bar.addFlag(BarFlag.DARKEN_SKY);
-			if (packet.isPlayMusic()) bar.addFlag(BarFlag.PLAY_BOSS_MUSIC);
-			bar.setProgress(packet.getPct());
-			bossBars.put(packet.getId(), bar);
-			bar.addPlayer(getPlayer());
-			return;
-		}
-		if (bar == null) return; //no idea how
-		switch (packet.getOperation()) {
-		case REMOVE:
-			bar.removePlayer(getPlayer());
-			bossBars.remove(packet.getId());
-			break;
-		case UPDATE_PCT:
-			bar.setProgress(packet.getPct());
-			break;
-		case UPDATE_NAME:
-			bar.setTitle(RGBUtils.getInstance().convertToBukkitFormat(packet.getName(), getVersion().getMinorVersion() >= 16 && TAB.getInstance().getServerVersion().getMinorVersion() >= 16));
-			break;
-		case UPDATE_STYLE:
-			bar.setColor(BarColor.valueOf(packet.getColor().name()));
-			bar.setStyle(BarStyle.valueOf(packet.getOverlay().getBukkitName()));
-			break;
-		case UPDATE_PROPERTIES:
-			bar = bossBars.get(packet.getId());
-			processFlag(bar, packet.isCreateWorldFog(), BarFlag.CREATE_FOG);
-			processFlag(bar, packet.isDarkenScreen(), BarFlag.DARKEN_SKY);
-			processFlag(bar, packet.isPlayMusic(), BarFlag.PLAY_BOSS_MUSIC);
-			break;
-		default:
-			break;
-		}
-	}
-	
-	private void handleVia(PacketPlayOutBoss packet) {
-		com.viaversion.viaversion.api.legacy.bossbar.BossBar bar;
-		switch (packet.getOperation()) {
-		case ADD:
-			if (viaBossBars.containsKey(packet.getId())) return;
-			bar = Via.getAPI().legacyAPI().createLegacyBossBar(RGBUtils.getInstance().convertToBukkitFormat(packet.getName(), getVersion().getMinorVersion() >= 16), 
-					packet.getPct(),
-					BossColor.valueOf(packet.getColor().name()), 
-					BossStyle.valueOf(packet.getOverlay().getBukkitName()));
-			//fog missing from via API
-			if (packet.isDarkenScreen()) bar.addFlag(BossFlag.DARKEN_SKY);
-			if (packet.isPlayMusic()) bar.addFlag(BossFlag.PLAY_BOSS_MUSIC);
-			viaBossBars.put(packet.getId(), bar);
-			bar.addPlayer(getPlayer().getUniqueId());
-			break;
-		case REMOVE:
-			viaBossBars.get(packet.getId()).removePlayer(getPlayer().getUniqueId());
-			viaBossBars.remove(packet.getId());
-			break;
-		case UPDATE_PCT:
-			viaBossBars.get(packet.getId()).setHealth(packet.getPct());
-			break;
-		case UPDATE_NAME:
-			viaBossBars.get(packet.getId()).setTitle(RGBUtils.getInstance().convertToBukkitFormat(packet.getName(), getVersion().getMinorVersion() >= 16));
-			break;
-		case UPDATE_STYLE:
-			viaBossBars.get(packet.getId()).setColor(BossColor.valueOf(packet.getColor().name()));
-			viaBossBars.get(packet.getId()).setStyle(BossStyle.valueOf(packet.getOverlay().getBukkitName()));
-			break;
-		case UPDATE_PROPERTIES:
-			bar = viaBossBars.get(packet.getId());
-			//fog missing from via API
-			processFlagVia(bar, packet.isDarkenScreen(), BossFlag.DARKEN_SKY);
-			processFlagVia(bar, packet.isPlayMusic(), BossFlag.PLAY_BOSS_MUSIC);
-			break;
-		default:
-			break;
-		}
-	}
-	
-	private void processFlag(BossBar bar, boolean targetValue, BarFlag flag) {
-		if (targetValue) {
-			if (!bar.hasFlag(flag)) {
-				bar.addFlag(flag);
-			}
-		} else {
-			if (bar.hasFlag(flag)) {
-				bar.removeFlag(flag);
-			}
-		}
-	}
-	
-	private void processFlagVia(com.viaversion.viaversion.api.legacy.bossbar.BossBar bar, boolean targetValue, BossFlag flag) {
-		if (targetValue) {
-			if (!bar.hasFlag(flag)) {
-				bar.addFlag(flag);
-			}
-		} else {
-			if (bar.hasFlag(flag)) {
-				bar.removeFlag(flag);
-			}
-		}
-	}
+    @Override
+    public boolean hasPermission(@NotNull String permission) {
+        return getPlayer().hasPermission(permission);
+    }

-	@Override
-	public boolean hasInvisibilityPotion() {
-		return getPlayer().hasPotionEffect(PotionEffectType.INVISIBILITY);
-	}
+    @Override
+    public int getPing() {
+        return PingRetriever.getPing(getPlayer());
+    }

-	@Override
-	public boolean isDisguised() {
-		try {
-			if (!((BukkitPlatform)TAB.getInstance().getPlatform()).isLibsDisguisesEnabled()) return false;
-			return DisguiseAPI.isDisguised(getPlayer());
-		} catch (LinkageError e) {
-			//java.lang.NoClassDefFoundError: Could not initialize class me.libraryaddict.disguise.DisguiseAPI
-			TAB.getInstance().getErrorManager().printError("Failed to check disguise status using LibsDisguises", e);
-			((BukkitPlatform)TAB.getInstance().getPlatform()).setLibsDisguisesEnabled(false);
-			return false;
-		}
-	}
+    @Override
+    public void sendMessage(@NotNull TabComponent message) {
+        getPlayer().sendMessage(getPlatform().toBukkitFormat(message, getVersion().supportsRGB()));
+    }

-	@Override
-	public Object getSkin() {
-		try {
-			return ((GameProfile)NMSStorage.getInstance().getProfile.invoke(handle)).getProperties();
-		} catch (ReflectiveOperationException e) {
-			TAB.getInstance().getErrorManager().printError("Failed to get skin of " + getName(), e);
-			return null;
-		}
-	}
+    @Override
+    public boolean hasInvisibilityPotion() {
+        return getPlayer().hasPotionEffect(PotionEffectType.INVISIBILITY);
+    }

-	@Override
-	public Player getPlayer() {
-		return (Player) player;
-	}
+    @Override
+    public boolean isDisguised() {
+        return LibsDisguisesHook.isDisguised(this);
+    }

-	@Override
-	public boolean isOnline() {
-		return getPlayer().isOnline();
-	}
+    @Override
+    @Nullable
+    public TabList.Skin getSkin() {
+        return tabList.getSkin();
+    }

-	@Override
-	public boolean isVanished() {
-		Essentials essentials = ((BukkitPlatform)TAB.getInstance().getPlatform()).getEssentials();
-		if (essentials != null && essentials.getUser(getUniqueId()).isVanished()) return true;
-		List<MetadataValue> metadata = getPlayer().getMetadata("vanished");
-		return !metadata.isEmpty() && metadata.get(0).asBoolean();
-	}
+    @Override
+    @NotNull
+    public Player getPlayer() {
+        return (Player) player;
+    }

-	@SuppressWarnings("deprecation")
-	@Override
-	public int getGamemode() {
-		return getPlayer().getGameMode().getValue();
-	}
+    @Override
+    public BukkitPlatform getPlatform() {
+        return (BukkitPlatform) platform;
+    }
+
+    @Override
+    public boolean isVanished() {
+        for (MetadataValue v : getPlayer().getMetadata("vanished")) {
+            if (v.asBoolean()) return true;
+        }
+        return false;
+    }
+
+    @Override
+    public int getGamemode() {
+        return getPlayer().getGameMode().getValue();
+    }
+
+    @Override
+    public double getHealth() {
+        return getPlayer().getHealth();
+    }
+
+    @Override
+    @NotNull
+    public String getDisplayName() {
+        return getPlayer().getDisplayName();
+    }
 }