Code clean up & small fixes

LICENSE

@@ -1,21 +1,339 @@
-MIT License
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
-Copyright (c) 2024 Alihan
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+                            Preamble
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

README.md

@@ -1,8 +1,564 @@
-# ProAntiTab
+# **A**BOUT
+ProAntiTab is an advanced **plugin hider** with **many features** and a very simple to understand system. It prevents your server from **plugin spoofers** used by hack clients, manipulates the **tab-completion**, blocks unwanted **suggestions** and much more!
+#####
 
-### About
-ProAntiTab is a Spigot/Bungeecord Minecraft plugin that helps you to hide unwanted commands from your players.
+# **I**N ACTION
+![https://www.rayzs.de/proantitab/assets/beforeafter5.png](https://www.rayzs.de/proantitab/assets/beforeafter5.png)
 
-### Support versions
-Spigot (+ Forks): 1.8x - 1.20x (latest)
-Bungeecord (+ Forks) | Waterfall recommended
+######
+# **C**USTOM SERVER BRAND (F3)
+Create your own animated custom server brand on your Spigot, Bungeecord and Velocity server!
+*![https://www.rayzs.de/proantitab/assets/csbr.gif](https://www.rayzs.de/proantitab/assets/csbr.gif)![https://www.rayzs.de/proantitab/assets/edc.gif](https://www.rayzs.de/proantitab/assets/edc.gif)*
+<details>
+<summary>open config.yml section</summary>
+
+
+```yaml
+# This feature allows you to customize your server-brand you see when you press F3.
+# Normally there stands something like 'Purpur', or 'Spigot'.
+# With this feature you are able to change and even animate it! ^^
+custom-server-brand:
+  enabled: false
+
+#   Determines the speed in that the animation goes
+  repeat-delay: 3
+
+#   This here is the list of the animation
+#   Possible placeholders:
+#   %player%        - name of the player
+#   %displayname%   - displayname of the player
+#   %world%         - name of world where the player is
+#   and the other placeholders from PlaceholderAPI
+  brands:
+    - '&f&lP&froAntiTab |'
+    - '&fP&lr&foAntiTab /'
+    - '&fPr&lo&fAntiTab -'
+    - '&fPro&lA&fntiTab |'
+    - '&fProA&ln&ftiTab \'
+    - '&fProAn&lt&fiTab |'
+    - '&fProAnt&li&fTab /'
+    - '&fProAnti&lT&fab -'
+    - '&fProAnti&lT&fab \'
+    - '&fProAntiT&la&fb |'
+    - '&fProAntiTa&lb&f /'
+    - '&fProAntiTab -'
+    - '&fProAntiTab \'
+```
+</details>
+
+######
+# **U**SE BLACKLIST AS WHITELIST
+You have way too many commands to block? Don't worry.
+There's a section in the config.yml located pretty much high that allows you to turn the blacklist into a whitelist instead. This will block every command on your server except for those that are listed.
+<details>
+<summary>section in config.yml</summary>
+
+
+```yaml
+# This is a very necessary feature if you have way too many commands to block and instead decide
+# to whitelist specific commands.
+# Enabling this will disable ALL commands except for those that are in the (group-)list.
+turn-blacklist-to-whitelist: false
+```
+</details>
+
+######
+# **A**NTI PLUGIN SPOOFING
+##### ProAntiTab is able to detect and block plugin spoofing attempts used by hack clients.
+*![https://www.rayzs.de/proantitab/assets/noplspoof.png](https://www.rayzs.de/proantitab/assets/noplspoof.png)*
+
+######
+# **B**LOCK SUB ARGUMENTS
+We all know the problem when players should be able to use some of the commands but should not see literally EVERY sub-argument in a command. Well, then just blend them out? ProAntiTab can do this for you and it's very easy to setup as well! (See some examples below)
+
+![https://www.rayzs.de/proantitab/assets/subargs.png](https://www.rayzs.de/proantitab/assets/subargs.png)
+<details>
+<summary>example</summary>
+
+
+```yaml
+# Let's say you just want to allow "/help Minecraft" only and not "/help apple".
+# It will also automatically allow everything after "/help Minecraft ..."
+- help Minecraft
+
+# [CMD] = Allow the execution of the command
+# [TAB] = Allow the tab-completion of the command
+- "[CMD]cmi tpa" # Only executable. Not tab-completable
+- tpa            # Executable & Tab-Completable
+
+# %hidden_online_players% = Online players (Removed from tab-completion)
+# %online_players%        = Online players
+# %hidden_players%        = Registered players (Removed from tab-completion)
+# %players%               = Registered players
+# %numbers%               = Numbers, such as 1000 or 1.000
+# _-                      = Block everything after
+- "tpa %online_players%"
+- "sell %numbers%"
+
+# Using the operator _- at the end cancels every argument afterwards and blocks it.
+# This will allow the player to use "/help Minecraft" but not "/help Minecraft xyz"
+- help Minecraft _-
+```
+</details>
+
+######
+# **B**LOCK COLLON COMMANDS
+It's annyoing after some time to block all commands including collons like essentials:spawn. With this option you can disable them entirely for good! Only people with the proantitab.namespace permission can see these commands again.
+
+![https://www.rayzs.de/proantitab/assets/namespace.png](https://www.rayzs.de/proantitab/assets/namespace.png)
+<details>
+<summary>open config.yml section</summary>
+
+
+```yaml
+#>> HTP (Overwritten)
+# Here you can disable all namespace commands.
+# Namespace commands are commands like plugin:command (e.g: essentials:warp)
+# You can bypass this restriction with the proantitab.namespace permission.
+block-namespace-commands:
+enabled: false
+```
+</details>
+
+######
+# **C**USTOM PLUGINS LIST
+Just blocking the /plugins command is pretty boring after some time. This feature here allows you to make it more interesting by faking a /plugins message with, for example, fake plugins! ^^
+
+![https://www.rayzs.de/proantitab/assets/fakeplugins2.PNG](https://www.rayzs.de/proantitab/assets/fakeplugins2.PNG)
+<details>
+<summary>open config.yml section</summary>
+
+
+```yaml
+#>> HTP (Overwritten)
+# Here you can customize your own fake '/plugins' command.
+custom-plugins:
+enabled: true
+commands:
+- pl
+- plugins
+- bukkit:pl
+- bukkit:plugins
+message:
+- '&fPlugins (0):'
+```
+</details>
+
+######
+# **C**USTOM VERSION COMMAND
+Who wouldn't like to pretend to own a custom server-jar? Have fun customizing your very own /version command to your personal liking. ^^
+
+![https://www.rayzs.de/proantitab/assets/custom-version.png](https://www.rayzs.de/proantitab/assets/custom-version.png)
+<details>
+<summary>open config.yml section</summary>
+
+
+```yaml
+#>> HTP (Overwritten)
+# Here you can customize your own fake '/version' command.
+custom-version:
+enabled: true
+commands:
+- version
+- ver
+- icanhasbukkit
+- bukkit:ver
+- bukkit:version
+message:
+- '&fThis server is running CraftBukkit version git-NasaSpigot-294 (MC: X)'
+```
+</details>
+
+######
+# **C**USTOM UNKNOWN COMMAND MESSAGE
+The Bukkit/Spigot version of ProAntiTab gives your the possibility to create your own unknown-command message to align it with the blocked-command message for example.
+
+![https://www.rayzs.de/proantitab/assets/customunknowncommand.PNG](https://www.rayzs.de/proantitab/assets/customunknowncommand.PNG)
+<details>
+<summary>open config.yml section</summary>
+
+
+```yaml
+# Now there we come to the good stuff! ^^
+# If ProAntiTab is loaded on a Spigot server, you will see this option right here.
+# With that you can also customize your own "Unknown Command"-message.
+custom-unknown-command:
+  enabled: true
+  message:
+    - '&cThis command does not exist!'
+```
+</details>
+
+
+######
+# **C**USTOM PROTOCOL PING
+Do you know the red text message at the players count when you ping a server with the wrong version? Exactly this holds the information of what kind of server your proxy server is running at. This feature hides the version of the proxy with a custom made one. It's enabled by default but doesn't show the text. The text can be seen when someone pings the server with the wrong version or uses a resolver. This picture shows you what someone with the wrong version would see, unless the "always-show" is enabled. If this option is enabled, this text will always appear.
+
+![https://www.rayzs.de/proantitab/assets/custom-protol-ping.png](https://www.rayzs.de/proantitab/assets/custom-protol-ping.png) <details>
+<summary>open config.yml section</summary>
+
+
+```yaml
+# Change the protocol for the version name when the server is being pinged
+# (!) Warning: It's required to use Paper or Purpur to use this feature!
+# (!) Supported server versions: 1.12.2 - latest
+custom-protocol-ping:
+  enabled: false
+
+  # Normally it would only display when someone pings the server with the wrong version.
+  # Enabling this will always display the protocol and replace it with the normal player count.
+  always-show: false
+
+  # This number here determines the outcome for the %online_extended% placeholder.
+  # It's the current amount of players increased by this number.
+  # For example: 5/20 becomes 6/20
+  extend-online-count: 1
+  # true: Use new calculated online-count (%online_extended%) as max-players count.
+  # false: Use the default max-players count.
+  use-as-maxplayers: false
+
+  # Enabling this option hides the list of players on your server,
+  # when you hover over the player count.
+  hide-players: true
+
+  # The displayed protocol message
+  # Available placeholders:
+  # %online%            - current online player count
+  # %online_extended%   - manipulated online player count
+  # %max%               - max player count
+  protocol: '&f&lProAntiTab &7(&a%online%&7/&c%max%&7)'
+```
+</details>
+
+######
+# **C**USTOM RESPONSE ACTIONS
+For some, it's important to determine how the response message should be or what should happen. You can customize that factor to your personal liking and use different actions to have full control over your blocked commands.
+
+![https://www.rayzs.de/proantitab/assets/custom-response-title-smaller-2.png](https://www.rayzs.de/proantitab/assets/custom-response-title-smaller-2.png)
+
+![https://www.rayzs.de/proantitab/assets/custom-response-down-smaller-3.png](https://www.rayzs.de/proantitab/assets/custom-response-down-smaller-3.png)
+<details>
+<summary>Bukkit/Spigot examples</summary>
+
+
+```yaml
+#      ____             ___          __  _ ______      __
+#     / __ \_________  /   |  ____  / /_(_)_  __/___ _/ /_
+#    / /_/ / ___/ __ \/ /| | / __ \/ __/ / / / / __ `/ __ \
+#   / ____/ /  / /_/ / ___ |/ / / / /_/ / / / / /_/ / /_/ /
+#  /_/   /_/   \____/_/  |_/_/ /_/\__/_/ /_/  \__,_/_.___/
+#  custom-responses.yml
+#
+# Here you can configure a few of the blocked commands a bit further.
+#  But what exactly is this here? Every command that would normally respond with the typical "command is blocked" message, can be configured in here!
+#  And how does it work? It's simple. You just provide the a trigger of the command that would be normally blocked.
+#  Commands that would normally work won't send the messages you have set here.
+#  This way PAT can offer you full control over certain commands and their normal responses.
+# What are these action section at each block?
+#  This is an additional feature to make your responses much more alive.
+#  Example actions that can be used are the following:
+#   Execute console command:
+#        Syntax:  console::command
+#        Example: console::say %player% is an evil player
+#   Execute player command:
+#        Syntax:  execute::command
+#        Example: execute::help
+#   Send actionbar:
+#        Syntax:  actionbar::text
+#        Example: actionbar::&cThis is not cool %player%!
+#   Send title:
+#        Syntax:  title::title::subtitle::5::20::5
+#        Example: title::&aTest title::&cHello %player%!
+#   Play sound:
+#        Syntax:  sound::soundName::volume::pitch
+#        Example: sound::ENTITY_ENDER_DRAGON_GROWL::1.0::1.0
+#   Give potion effect:
+#        Syntax:  effect::potionEffect::duration::amplifier
+#        Example: effect::BLINDNESS::45::1
+
+# Here are a few examples:
+
+# Example with kits.
+# In here we only trigger the given message, if the player would type "/kit ...".
+# If this command would work through sub-arguments, then the player would only able to execute the command with the
+# listed sub-arguments assigned to it. Everything else will result with the set message in there.
+# --
+#example-with-kits:
+#  triggers:
+#    - "kit *"
+#  message:
+#    - "&cThis kit does not exist!"
+#  actions:
+#    - "actionbar::&cSorry %player%, but this kit does not exist!"
+
+# Here another example with an auctionhouse plugin.
+# In here we only trigger the given message, if the player would type "/ah plugin".
+# Normally it would print out the "command is blocked" message, because PAT would have blocked it in our case.
+# Therefore, we can also assign a custom response message to it.
+# ---
+#example-with-auctionhouse:
+#  triggers:
+#    - "ah plugin"
+#  message:
+#    - "&cThis sub-command does not exist. Please type: &e/ah help"
+#  actions:
+#    - "console::say That's not nice %player%!"
+#    - "effect::BLINDNESS::45::1"
+#    - "sound::ENTITY_ENDER_DRAGON_GROWL::1.0::1.0"
+#    - "title::&cHey!::&cYou can't do that %player%!::5::20::5"
+#    - "actionbar::&cNop, sorry %player%"
+```
+</details>
+
+<details>
+<summary>Proxy examples</summary>
+
+
+```yaml
+#      ____             ___          __  _ ______      __
+#     / __ \_________  /   |  ____  / /_(_)_  __/___ _/ /_
+#    / /_/ / ___/ __ \/ /| | / __ \/ __/ / / / / __ `/ __ \
+#   / ____/ /  / /_/ / ___ |/ / / / /_/ / / / / /_/ / /_/ /
+#  /_/   /_/   \____/_/  |_/_/ /_/\__/_/ /_/  \__,_/_.___/
+#  custom-responses.yml
+#
+# Here you can configure a few of the blocked commands a bit further.
+#  But what exactly is this here? Every command that would normally respond with the typical "command is blocked" message, can be configured in here!
+#  And how does it work? It's simple. You just provide the a trigger of the command that would be normally blocked.
+#  Commands that would normally work won't send the messages you have set here.
+#  This way PAT can offer you full control over certain commands and their normal responses.
+# What are these action section at each block?
+#  This is an additional feature to make your responses much more alive.
+#  Example actions that can be used are the following:
+#   Execute console command:
+#        Syntax:  console::command
+#        Example: console::send %player% fallback
+#   Execute player command:
+#        Syntax:  execute::command
+#        Example: execute::help
+#   Send actionbar:
+#        Syntax:  actionbar::text
+#        Example: actionbar::&cThis is not cool %player%!
+#   Send title:
+#        Syntax:  title::title::subtitle::5::20::5
+#        Example: title::&aTest title::&cHello %player%!
+
+# Here are a few examples:
+
+# Example with kits.
+# In here we only trigger the given message, if the player would type "/kit ...".
+# If this command would work through sub-arguments, then the player would only able to execute the command with the
+# listed sub-arguments assigned to it. Everything else will result with the set message in there.
+# --
+#example-with-kits:
+#  triggers:
+#    - "kit *"
+#  message:
+#    - "&cThis kit does not exist!"
+#  actions:
+#    - "actionbar::&cSorry %player%, but this kit does not exist!"
+
+# Here another example with an auctionhouse plugin.
+# In here we only trigger the given message, if the player would type "/ah plugin".
+# Normally it would print out the "command is blocked" message, because PAT would have blocked it in our case.
+# Therefore, we can also assign a custom response message to it.
+# ---
+#example-with-auctionhouse:
+#  triggers:
+#    - "ah plugin"
+#  message:
+#    - "&cThis sub-command does not exist. Please type: &e/ah help"
+#  actions:
+#    - "console::say That's not nice %player%!"
+#    - "title::Hey!::You can't do that %player%!::30::3000::30"
+#    - "actionbar::Nop, sorry %player%"
+```
+</details>
+
+##### 
+# **N**EGATE COMMANDS
+It's not a must to write each and every possible sub-argument by hand. The same goes for commands in general.
+You can negate them with the help of the negation operator (``!``).
+
+*![https://www.rayzs.de/proantitab/assets/neg.png](https://www.rayzs.de/proantitab/assets/neg.png)*
+
+<details>
+<summary>example</summary>
+
+```yaml
+# Allows /gamemode and all of its sub-arguments
+# except "/gamemode creative"
+- "gamemode"
+- "!gamemode creative"
+- '!gamemode toggle'
+```
+
+```yaml
+# Allows all commands, except /anvil
+- "*"
+- "!anvil"
+```
+</details>
+
+#####
+# **A**UTO-ADD ALL PLUGIN COMMANDS
+Sometimes it's so annoying to add all commands from a certain plugin by hand. That's why ProAntiTab offers the possebility to simply add all commands from a certain plugin with a simple shortcut.
+
+You can simply add ``plugin=<plugin-name>`` to add all commands from a plugin automatically.
+**Only works for standalone Spigot (+Forks) servers**
+
+<details>
+<summary>example</summary>
+
+```yaml
+# Allows all Essentials commands except /anvil.
+# /gamemode is limited to only two sub-arguments
+- "plugin=essentials"
+- "!anvil"
+- "gamemode creative"
+- "gamemode survival"
+```
+</details>
+
+######
+# **B**LOCK ON SPECIFIC SERVERS
+If you use ProAntiTab on a network, you can pretty easily manage on what servers what commands should exist. Everything can be handled via the proxy and does not require additional maintenance on the backend servers.
+
+For this, just follow the official [setup](https://github.com/RayzsYT/ProAntiTab/wiki/How-to-setup#proxy--spigot-eg-bungeecord--spigot) and [how-to](https://github.com/RayzsYT/ProAntiTab/wiki/How-to#introduction) guide, which can be both found on the [Github wiki](https://github.com/RayzsYT/ProAntiTab/wiki).
+
+######
+# **G**ROUP SYSYTEM
+The PAT group system allows you to allow certain commands only for a certain group of people. PAT group commands are mainly for **whitelisting** commands, can merge with other groups, and so on.
+
+They can also be used to blacklist commands by negating the commands inside there. But for this to work, the option `allow-group-overruling` inside the `config.yml` needs to be enabled.
+
+How to use the PAT group system in general can be seen on the [Github wiki](https://github.com/RayzsYT/ProAntiTab/wiki/How-to#use-the-group-system).
+
+######
+# **P**LACEHOLDERAPI & PAPIPROXYBRIDGE SUPPORT
+Customization and uniqueness is an important factor for many server owners. That's why PAT offers you the possebility to edit and use many of its placeholders with the widely spreaded plugin [PlaceholderAPI](https://www.spigotmc.org/resources/6245/). Accessing those placeholders on the proxy isn't a problem either. With the support of the addtional plugin [PAPIProxyBridge](https://www.spigotmc.org/resources/108415/), PAT's placeholders are even accessable on your proxy server.
+<details>
+<summary>Available placeholders</summary>
+
+```yaml
+# Some general Placeholders to work with:
+#   %pat_general_user%                      = Get the name of the user who receives this message.
+#   %pat_general_version_current%           = Get current version name of PAT.
+#   %pat_general_version_newest%            = Get newest version name of PAT.
+
+# Placeholders of some of the messages in the config.yml:
+#   %pat_message_unknowncommand%            = Get the "unknown command"-message from the config.yml of PAT. [cancel-blocked-command]
+#   %pat_message_blocked%                   = Get the "command blocked"-message from the config.yml of PAT. [custom-unknown-command]
+
+# Placeholders to list all commands:
+#   %pat_list_size_commands%                = Get the amount of all listed commands.
+#   %pat_list_commands%                     = Get all listed commands.
+#   %pat_list_sorted_commands%              = Get all listed commands in alphabetic order. (A-Z)
+#   %pat_list_reversed_groups%              = Get all listed commands in reversed alphabetic order. (Z-A)
+
+# Placeholders to list all commands of a group: (replace 'xxx' with the group-name)
+#   %pat_list_size_commands_group_xxx%      = Get the amount of all commands of a group.
+#   %pat_list_commands_group_xxx%           = Get all commands of a group.
+#   %pat_list_sorted_commands_group_xxx%    = Get all commands of a group in alphabetic order. (A-Z)
+#   %pat_list_reversed_commands_group_xxx%  = Get all commands of a group in reversed alphabetic order. (Z-A)
+
+# Placeholders to list all groups:
+#   %pat_list_size_groups%                  = Get the amount of all available groups.
+#   %pat_list_groups%                       = Get all groups.
+#   %pat_list_sorted_groups%                = Get all groups in alphabetic order. (A-Z)
+#   %pat_list_reversed_groups%              = Get all groups in reversed alphabetic order. (Z-A)
+```
+</details>
+
+###
+
+# **M**INIMESSAGE SUPPORT
+## ![https://www.rayzs.de/proantitab/assets/possibilites.png](https://www.rayzs.de/proantitab/assets/possibilites.png)
+##### You want to design your messages more unique? We got you covered! *(works on 1.17 server and above)*
+*([Click here to see the documentation for the format](https://docs.advntr.dev/minimessage/format.html#)*)
+
+Look at those few examples to see what kind of possibilities awaits you:
+<details>
+<summary>example 1</summary>
+
+
+```yaml
+cancel-blocked-commands:
+  enabled: true
+  message: '<hover:show_text:"&cBlocked command: &4&o%command%">&cThis command is &4&lBLOCKED&c!'
+```
+
+
+![https://www.rayzs.de/proantitab/assets/example1.png](https://www.rayzs.de/proantitab/assets/example1.png)
+
+</details>
+
+<details>
+<summary>example 2</summary>
+
+
+```yaml
+cancel-blocked-commands:
+  enabled: true
+  message: '&cThis command is blocked! <click:suggest_command:/help>&7Click here to get a view of all available commands instead.'
+```
+
+
+![https://www.rayzs.de/proantitab/assets/example2.png](https://www.rayzs.de/proantitab/assets/example2.png)
+
+</details>
+
+
+######
+# **H**OW TO SETUP?
+Despite of the fact that ProAntiTab is pretty easy to use, the setup is slidely different for each server engine.
+It normally is already enough to simply load ProAntiTab on the certain server you wanna use it, but in order to use ProAntiTab with all its features, its recommended to follow the [official setup guide on the Github wiki](https://github.com/RayzsYT/ProAntiTab/wiki/How-to-setup).
+
+**Please feel free to join the [Discord](https://www.rayzs.de/discord) server to request for help if the instruction is unclear or too complicated. ^^**
+
+
+#
+# **H**OW TO ALLOW COMMANDS?
+[Please check out the wiki to get an idea on how PAT works and can be used.](https://github.com/RayzsYT/ProAntiTab/wiki/How-to)
+
+If you want to bypass all blocked commands, simply give yourself the following permission: **proantitab.bypass**
+
+Following permission is required to execute all listed commands within a certain group: **proantitab.group.<command>**
+
+######
+# **C**OMMANDS & PERMISSIONS
+All commands and their permissions are listed on the [documentation](https://www.spigotmc.org/resources/113172/field?field=documentation) page at the very buttom.
+
+######
+# **C**ONFIGURATION FILE
+
+<details>
+<summary>Bukkit/Spigot</summary>
+
+[config.yml](https://github.com/RayzsYT/ProAntiTab/blob/v2.0.1/src/main/resources/files/bukkit-config.yml)
+<br>
+[storage.yml](https://github.com/RayzsYT/ProAntiTab/blob/v2.0.1/src/main/resources/files/bukkit-storage.yml)
+
+</details>
+
+
+<details>
+<summary>Proxy (Bungeecord/Velocity)</summary>
+
+[config.yml](https://github.com/RayzsYT/ProAntiTab/blob/v2.0.1/src/main/resources/files/proxy-config.yml)
+<br>
+[storage.yml](https://github.com/RayzsYT/ProAntiTab/blob/v2.0.1/src/main/resources/files/proxy-storage.yml)
+
+</details>
+
+######
+## **bStats**
+[![https://bstats.org/signatures/bukkit/ProAntiTab%20-%20Spigot.svg](https://bstats.org/signatures/bukkit/ProAntiTab%20-%20Spigot.svg)](https://bstats.org/plugin/bukkit/proantitab%20-%20spigot/20089)
+
+[![https://bstats.org/signatures/bungeecord/ProAntiTab%20-%20Bungeecord.svg](https://bstats.org/signatures/bungeecord/ProAntiTab%20-%20Bungeecord.svg)](https://bstats.org/plugin/bungeecord/proantitab%20-%20bungeecord/20090)
+
+[![https://bstats.org/signatures/velocity/ProAntiTab%20-%20Velocity.svg](https://bstats.org/signatures/velocity/ProAntiTab%20-%20Velocity.svg)](https://bstats.org/plugin/velocity/proantitab%20-%20velocity/21638)
+
+<center>
+
+[![https://www.rayzs.de/rayzsshield/assets/support.png](https://www.rayzs.de/rayzsshield/assets/support.png)](https://www.rayzs.de/discord)

pom.xml

@@ -6,11 +6,11 @@
 
     <groupId>de.rayzs.pat</groupId>
     <artifactId>ProAntiTab</artifactId>
-    <version>1.8.0</version>
+    <version>2.2.0</version>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
 
     <repositories>
@@ -76,6 +76,13 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>dev.folia</groupId>
+            <artifactId>folia-api</artifactId>
+            <version>1.20.1-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
@@ -86,7 +93,7 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
-            <version>4.0.23.Final</version>
+            <version>4.2.0.Final</version>
             <scope>provided</scope>
         </dependency>
 
@@ -112,6 +119,13 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.github.ElgarL</groupId>
+            <artifactId>groupmanager</artifactId>
+            <version>3.2</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>com.mojang</groupId>
             <artifactId>brigadier</artifactId>
@@ -178,7 +192,7 @@
         <dependency>
             <groupId>com.velocitypowered</groupId>
             <artifactId>velocity-api</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.3.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -213,35 +227,35 @@
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-minimessage</artifactId>
-            <version>4.15.0</version>
+            <version>4.25.0</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-api</artifactId>
-            <version>4.17.0</version>
+            <version>4.25.0</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-api</artifactId>
-            <version>4.3.2</version>
+            <version>4.4.1</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-bungeecord</artifactId>
-            <version>4.3.2</version>
+            <version>4.4.1</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-bukkit</artifactId>
-            <version>4.3.2</version>
+            <version>4.4.1</version>
             <scope>compile</scope>
         </dependency>
 
@@ -262,7 +276,7 @@
         <dependency>
             <groupId>com.viaversion</groupId>
             <artifactId>viaversion-api</artifactId>
-            <version>LATEST</version>
+            <version>5.7.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -277,6 +291,16 @@
 
     <build>
         <finalName>IgnoreThisJar</finalName>
+
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <exclude>*.txt</exclude>
+                </excludes>
+            </resource>
+        </resources>
+
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -299,6 +323,14 @@
                     </artifactSet>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>17</source>
+                    <target>17</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

src/main/java/de/rayzs/pat/api/brand/CustomServerBrand.java

@@ -1,7 +1,9 @@
 package de.rayzs.pat.api.brand;
 
-import de.rayzs.pat.utils.Reflection;
 import de.rayzs.pat.api.brand.impl.*;
+import de.rayzs.pat.api.storage.Storage;
+import de.rayzs.pat.utils.PacketUtils;
+import de.rayzs.pat.utils.Reflection;
 
 public class CustomServerBrand {
 
@@ -12,4 +14,11 @@ public class CustomServerBrand {
     public static void refreshTask() { SERVER_BRAND.initializeTask(); }
     public static void preparePlayer(Object playerObj) { SERVER_BRAND.preparePlayer(playerObj); }
     public static void sendBrandToPlayer(Object playerObj) { SERVER_BRAND.send(playerObj); }
+
+    public static PacketUtils.BrandManipulate createBrandPacket(Object playerObj) { return SERVER_BRAND.createPacket(playerObj); }
+    public static boolean isEnabled() { return Storage.ConfigSections.Settings.CUSTOM_BRAND.ENABLED; }
+
+    public static boolean isBrandTag(String tag) {
+        return tag.equals("MC|Brand") || tag.equals("minecraft:brand");
+    }
 }

src/main/java/de/rayzs/pat/api/brand/ServerBrand.java

@@ -1,7 +1,10 @@
 package de.rayzs.pat.api.brand;
 
+import de.rayzs.pat.utils.PacketUtils;
+
 public interface ServerBrand {
     void preparePlayer(Object playerObj);
     void send(Object playerObj);
+    PacketUtils.BrandManipulate createPacket(Object playerObj);
     void initializeTask();
 }

src/main/java/de/rayzs/pat/api/brand/impl/BukkitServerBrand.java

@@ -1,12 +1,15 @@
 package de.rayzs.pat.api.brand.impl;
 
+import de.rayzs.pat.api.brand.CustomServerBrand;
 import de.rayzs.pat.api.netty.bukkit.BukkitPacketAnalyzer;
+import de.rayzs.pat.api.brand.ServerBrand;
 import de.rayzs.pat.utils.message.MessageTranslator;
 import java.util.concurrent.atomic.AtomicInteger;
 import de.rayzs.pat.api.storage.Storage;
 import de.rayzs.pat.plugin.BukkitLoader;
+import de.rayzs.pat.utils.scheduler.PATScheduler;
+import de.rayzs.pat.utils.scheduler.PATSchedulerTask;
 import io.netty.channel.Channel;
-import de.rayzs.pat.api.brand.*;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import de.rayzs.pat.utils.*;
@@ -16,17 +19,19 @@ import java.util.*;
 
 public class BukkitServerBrand implements ServerBrand {
 
-    private static final List<Player> MODIFIED_BRAND_PLAYERS = new ArrayList<>();
     private static final Server SERVER = Bukkit.getServer();
     private static String BRAND = Storage.ConfigSections.Settings.CUSTOM_BRAND.BRANDS.getLines().get(0);
-    private static int TASK = -1;
-    private static boolean INITIALIZED = false;
+    private static PATSchedulerTask  TASK;
+    private static boolean INITIALIZED = false, NO_PREP_CHANNELS = false;
     private static Class<?> brandPayloadClass, clientBoundCustomPacketPayloadPacketClass, customPacketPayloadPacketClass;
 
     @Override
     public void initializeTask() {
 
-        if(Reflection.isWeird()) {
+        if (Reflection.isWeird()) {
+
+            NO_PREP_CHANNELS = Reflection.getMinor() >= 22 || (Reflection.getMinor() == 21 && Reflection.getRelease() >= 7);
+
             if (brandPayloadClass == null)
                 brandPayloadClass = Reflection.getClass("net.minecraft.network.protocol.common.custom.BrandPayload");
 
@@ -38,7 +43,7 @@ public class BukkitServerBrand implements ServerBrand {
         }
 
         Bukkit.getOnlinePlayers().forEach(this::preparePlayer);
-        if(!INITIALIZED)
+        if (!INITIALIZED)
             try {
                 Method method = Reflection.getMethodsByParameterAndName(SERVER.getMessenger(), "addToOutgoing", Plugin.class, String.class).get(0);
                 Reflection.invokeMethode(method, SERVER.getMessenger(), BukkitLoader.getPlugin(), CustomServerBrand.CHANNEL_NAME);
@@ -48,22 +53,23 @@ public class BukkitServerBrand implements ServerBrand {
                 exception.printStackTrace();
             }
 
-        if(TASK != -1) {
-            Bukkit.getScheduler().cancelTask(TASK);
-            TASK = -1;
-            MODIFIED_BRAND_PLAYERS.clear();
+        if(TASK != null && TASK.isActive()) {
+            TASK.cancelTask();
+            TASK = null;
         }
 
         if(!Storage.ConfigSections.Settings.CUSTOM_BRAND.ENABLED) return;
 
         if(Storage.ConfigSections.Settings.CUSTOM_BRAND.REPEAT_DELAY == -1) {
             BRAND = Storage.ConfigSections.Settings.CUSTOM_BRAND.BRANDS.getLines().get(0) + "§r";
-            TASK = Bukkit.getScheduler().scheduleAsyncRepeatingTask(BukkitLoader.getPlugin(), () -> {
+
+            PATScheduler.createAsyncScheduler(() -> {
                 Bukkit.getOnlinePlayers().forEach(this::send);
-            }, 1, Storage.ConfigSections.Settings.CUSTOM_BRAND.REPEAT_DELAY);
+            }, 1, 1);
+
         } else {
             AtomicInteger animationState = new AtomicInteger(0);
-            TASK = Bukkit.getScheduler().scheduleAsyncRepeatingTask(BukkitLoader.getPlugin(), () -> {
+            TASK = PATScheduler.createAsyncScheduler(() -> {
                 if (animationState.getAndIncrement() >= Storage.ConfigSections.Settings.CUSTOM_BRAND.BRANDS.getLines().size() - 1)
                     animationState.set(0);
                 BRAND = Storage.ConfigSections.Settings.CUSTOM_BRAND.BRANDS.getLines().get(animationState.get()) + "§r";
@@ -77,12 +83,16 @@ public class BukkitServerBrand implements ServerBrand {
         if(!(playerObj instanceof Player) || !Storage.ConfigSections.Settings.CUSTOM_BRAND.ENABLED) return;
         Player player = (Player) playerObj;
 
+        if (NO_PREP_CHANNELS) {
+            return;
+        }
+
         try {
             Field channelsField = Reflection.getFieldByName(player.getClass(), "channels");
             Set<String> channels = (Set<String>) channelsField.get(player);
             channels.add(CustomServerBrand.CHANNEL_NAME);
             Reflection.closeAccess(channelsField);
-            if(!MODIFIED_BRAND_PLAYERS.contains(player)) MODIFIED_BRAND_PLAYERS.add(player);
+
         } catch (Exception exception) {
             exception.printStackTrace();
         }
@@ -108,6 +118,7 @@ public class BukkitServerBrand implements ServerBrand {
 
             Object brandPayloadObj = brandPayloadClass.getDeclaredConstructor(String.class).newInstance(MessageTranslator.replaceMessage(player, customBrand)),
                     customPacketPayloadPacket = clientBoundCustomPacketPayloadPacketClass.getDeclaredConstructor(customPacketPayloadPacketClass).newInstance(brandPayloadObj);
+
             channel.pipeline().writeAndFlush(customPacketPayloadPacket);
 
         } catch (Exception exception) {
@@ -115,12 +126,8 @@ public class BukkitServerBrand implements ServerBrand {
         }
     }
 
-    private boolean isModified(Player player) {
-        if(!Storage.ConfigSections.Settings.CUSTOM_BRAND.ENABLED || Storage.ConfigSections.Settings.CUSTOM_BRAND.REPEAT_DELAY != -1) return false;
-        return MODIFIED_BRAND_PLAYERS.contains(player);
-    }
-
-    public static void removeFromModified(Player player) {
-        MODIFIED_BRAND_PLAYERS.remove(player);
+    @Override
+    public PacketUtils.BrandManipulate createPacket(Object playerObj) {
+        return null;
     }
 }

src/main/java/de/rayzs/pat/api/brand/impl/BungeeServerBrand.java

@@ -57,4 +57,17 @@ public class BungeeServerBrand implements ServerBrand {
         String brand = player.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:brand" : "MC|Brand";
         player.sendData(brand, serverBrand.getBytes());
     }
+
+    @Override
+    public PacketUtils.BrandManipulate createPacket(Object playerObj) {
+        if (!(playerObj instanceof ProxiedPlayer) || !Storage.ConfigSections.Settings.CUSTOM_BRAND.ENABLED) return null;
+        ProxiedPlayer player = (ProxiedPlayer) playerObj;
+
+        String serverName = "", playerName = player.getName(), customBrand;
+        Server server = player.getServer();
+        if(server != null) serverName = server.getInfo().getName();
+        customBrand = BRAND.replace("%player%", playerName).replace("%server%", serverName);
+
+        return new PacketUtils.BrandManipulate(customBrand);
+    }
 }

src/main/java/de/rayzs/pat/api/brand/impl/VelocityServerBrand.java

@@ -80,4 +80,25 @@ public class VelocityServerBrand implements ServerBrand {
             exception.printStackTrace();
         }
     }
+
+    @Override
+    public PacketUtils.BrandManipulate createPacket(Object playerObj) {
+        if (!(playerObj instanceof Player) || !Storage.ConfigSections.Settings.CUSTOM_BRAND.ENABLED) return null;
+
+        try {
+            Player player = (Player) playerObj;
+
+            String serverName = "", playerName = player.getUsername(), customBrand;
+            Optional<ServerConnection> serverConnection = player.getCurrentServer();
+
+            if(serverConnection.isPresent()) serverName = serverConnection.get().getServerInfo().getName();
+            customBrand = BRAND.replace("%player%", playerName).replace("%server%", serverName).replace("%ping%", String.valueOf(player.getPing()));
+
+            return new PacketUtils.BrandManipulate(customBrand, false);
+        } catch (Exception exception) {
+            exception.printStackTrace();
+        }
+
+        return null;
+    }
 }

src/main/java/de/rayzs/pat/api/command/ProCommand.java

@@ -0,0 +1,47 @@
+package de.rayzs.pat.api.command;
+
+import de.rayzs.pat.utils.*;
+import de.rayzs.pat.utils.sender.CommandSender;
+
+import java.util.*;
+
+public abstract class ProCommand {
+
+    private final String name;
+    private final List<String> aliases;
+
+    protected boolean proxyOnly = false, serverCommand  = false;
+
+    public ProCommand(String name, String... aliases) {
+        this.name = name.toLowerCase();
+        this.aliases = aliases != null && !aliases[0].isBlank() ? Arrays.asList(aliases) : new ArrayList<>();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public boolean isProxyOnly() {
+        return proxyOnly;
+    }
+
+    public boolean isServerCommand() {
+        return serverCommand;
+    }
+
+    public List<String> getAliases() {
+        return aliases;
+    }
+
+    public boolean isCommand(String label) {
+        String commandName = StringUtils.getFirstArg(label);
+
+        if (name.equalsIgnoreCase(commandName))
+            return true;
+
+        return !aliases.isEmpty() && aliases.stream().anyMatch(commandName::equalsIgnoreCase);
+    }
+
+    public abstract boolean execute(CommandSender sender, String[] args);
+    public abstract List<String> tabComplete(CommandSender sender, String[] args);
+}

src/main/java/de/rayzs/pat/api/communication/BackendUpdater.java

@@ -1,12 +1,12 @@
 package de.rayzs.pat.api.communication;
 
 import de.rayzs.pat.api.storage.Storage;
-import de.rayzs.pat.plugin.BukkitLoader;
+import de.rayzs.pat.utils.scheduler.*;
 import org.bukkit.Bukkit;
 
 public class BackendUpdater {
 
-    private static int TASK = -1;
+    private static PATSchedulerTask TASK;
 
     public static void handle() {
         if(isRunning() || !shouldRun() || !Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED) return;
@@ -14,23 +14,24 @@ public class BackendUpdater {
     }
 
     public static boolean isRunning() {
-        return TASK != -1;
+        return TASK != null && TASK.isActive();
     }
 
     public static void start() {
-        if(TASK != -1) return;
+        if(isRunning() || !Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED) return;
 
-        TASK = Bukkit.getScheduler().scheduleSyncRepeatingTask(BukkitLoader.getPlugin(), () -> {
-            if(shouldRun()) Communicator.sendRequest();
-            else stop();
+        TASK = PATScheduler.createScheduler(() -> {
+            if (shouldRun())
+                Communicator.sendRequest();
+            else
+                stop();
         }, 5, 20);
     }
 
     public static void stop() {
-        if(TASK == -1) return;
-
-        Bukkit.getScheduler().cancelTask(TASK);
-        TASK = -1;
+        if(TASK == null || !TASK.isActive()) return;
+        TASK.cancelTask();
+        TASK = null;
     }
 
     private static boolean shouldRun() {

src/main/java/de/rayzs/pat/api/communication/Communicator.java

@@ -1,25 +1,42 @@
 package de.rayzs.pat.api.communication;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
 import de.rayzs.pat.api.communication.client.ClientInfo;
-import de.rayzs.pat.api.communication.client.impl.*;
-import de.rayzs.pat.utils.permission.PermissionUtil;
-import de.rayzs.pat.api.storage.blacklist.impl.*;
-import de.rayzs.pat.api.communication.impl.*;
-import de.rayzs.pat.plugin.BukkitLoader;
+import de.rayzs.pat.api.communication.client.impl.BungeeClientInfo;
+import de.rayzs.pat.api.communication.client.impl.VelocityClientInfo;
+import de.rayzs.pat.api.communication.impl.BukkitClient;
+import de.rayzs.pat.api.communication.impl.BungeeClient;
+import de.rayzs.pat.api.communication.impl.VelocityClient;
+import de.rayzs.pat.api.event.PATEventHandler;
 import de.rayzs.pat.api.storage.Storage;
-import java.util.concurrent.TimeUnit;
-import de.rayzs.pat.utils.group.*;
-import de.rayzs.pat.utils.*;
-import java.util.*;
+import de.rayzs.pat.api.storage.blacklist.impl.GeneralBlacklist;
+import de.rayzs.pat.api.storage.blacklist.impl.GroupBlacklist;
+import de.rayzs.pat.plugin.BukkitLoader;
+import de.rayzs.pat.utils.CommunicationPackets;
+import de.rayzs.pat.utils.Reflection;
+import de.rayzs.pat.utils.group.Group;
+import de.rayzs.pat.utils.group.GroupManager;
+import de.rayzs.pat.utils.group.TinyGroup;
+import de.rayzs.pat.utils.permission.PermissionUtil;
 
 public class Communicator {
 
-    private static final Client CLIENT = Reflection.isVelocityServer() ? new VelocityClient() : Reflection.isProxyServer() ? new BungeeClient() : new BukkitClient();
+    private static final Client CLIENT =
+            Reflection.isVelocityServer() ? new VelocityClient()
+            : Reflection.isProxyServer() ? new BungeeClient()
+            : new BukkitClient();
+
     private static final UUID SERVER_ID = UUID.randomUUID();
+
     public static final List<ClientInfo> CLIENTS = new ArrayList<>();
-    private static final ExpireCache<String, ClientInfo> QUEUE_CLIENTS = new ExpireCache<>(15, TimeUnit.SECONDS);
-    public static long LAST_DATA_UPDATE = System.currentTimeMillis(), LAST_SENT_REQUEST = 0, LAST_BUKKIT_SYNC = System.currentTimeMillis();
+
     public static int SERVER_DATA_SYNC_COUNT = 0;
+    public static long LAST_DATA_UPDATE = System.currentTimeMillis(),
+                        LAST_SENT_REQUEST = 0,
+                        LAST_BUKKIT_SYNC = System.currentTimeMillis();
 
     public static void sendPacket(Object packet) {
         CLIENT.send(packet);
@@ -30,52 +47,84 @@ public class Communicator {
     }
 
     public static void receiveInformation(String serverName, Object packet) {
-        if(packet instanceof CommunicationPackets.RequestPacket) {
-            CommunicationPackets.RequestPacket requestPacket = (CommunicationPackets.RequestPacket) packet;
-            if (!requestPacket.isToken(Storage.TOKEN)) return;
+        ClientInfo client = getClientByName(serverName);
+
+        if (packet instanceof CommunicationPackets.RequestPacket) {
+
+            CommunicationPackets.RequestPacket requestPacket = (CommunicationPackets.RequestPacket) packet;
+
+            if (!requestPacket.isToken(Storage.TOKEN))
+                return;
 
-            ClientInfo client = getClientByName(serverName);
             if (client == null) {
-                client = Reflection.isVelocityServer() ? new VelocityClientInfo(requestPacket.getServerId(), serverName) : new BungeeClientInfo(requestPacket.getServerId(), serverName);
+                client = Reflection.isVelocityServer()
+                        ? new VelocityClientInfo(requestPacket.getServerId(), serverName)
+                        : new BungeeClientInfo(requestPacket.getServerId(), serverName);
+
                 CLIENTS.add(client);
             }
 
-            if (!client.compareId(requestPacket.getServerId())) client.setId(requestPacket.getServerId());
+            if (!client.compareId(requestPacket.getServerId()))
+                client.setId(requestPacket.getServerId());
 
             syncData(client.getId());
             return;
         }
 
-        if(packet instanceof CommunicationPackets.ForcePermissionResetPacket) {
-            if(Reflection.isProxyServer()) return;
-            CommunicationPackets.ForcePermissionResetPacket permissionResetPacket = (CommunicationPackets.ForcePermissionResetPacket) packet;
-            if(!permissionResetPacket.isToken(Storage.TOKEN)) return;
+        if (packet instanceof CommunicationPackets.UpdateCommandsPacket) {
+            if (Reflection.isProxyServer())
+                return;
+
+            CommunicationPackets.UpdateCommandsPacket updateCommandsPacket = (CommunicationPackets.UpdateCommandsPacket) packet;
+            BukkitLoader.handleUpdateCommandsPacket(updateCommandsPacket);
+        }
+
+        if (packet instanceof CommunicationPackets.ForcePermissionResetPacket) {
+            if (Reflection.isProxyServer())
+                return;
+
+            CommunicationPackets.ForcePermissionResetPacket permissionResetPacket = (CommunicationPackets.ForcePermissionResetPacket) packet;
+            if (!permissionResetPacket.isToken(Storage.TOKEN))
+                return;
+
+            if (permissionResetPacket.hasTarget())
+                PermissionUtil.setPlayerPermissions(permissionResetPacket.getTargetUUID());
+            else
+                PermissionUtil.reloadPermissions();
 
-            if(permissionResetPacket.hasTarget()) PermissionUtil.setPlayerPermissions(permissionResetPacket.getTargetUUID());
-            else PermissionUtil.reloadPermissions();
             return;
         }
 
-        if(packet instanceof CommunicationPackets.BackendDataPacket) {
+        if (packet instanceof CommunicationPackets.BackendDataPacket) {
             CommunicationPackets.BackendDataPacket backendDataPacket = (CommunicationPackets.BackendDataPacket) packet;
-            if (!backendDataPacket.isToken(Storage.TOKEN)) return;
+            if (!backendDataPacket.isToken(Storage.TOKEN))
+                return;
+
             Storage.SERVER_NAME = backendDataPacket.getServerName();
             return;
         }
 
-        if(packet instanceof CommunicationPackets.FeedbackPacket) {
+        if (packet instanceof CommunicationPackets.FeedbackPacket) {
             CommunicationPackets.FeedbackPacket feedbackPacket = (CommunicationPackets.FeedbackPacket) packet;
-            if (!feedbackPacket.isToken(Storage.TOKEN)) return;
+            if (!feedbackPacket.isToken(Storage.TOKEN))
+                return;
+
             String serverId = feedbackPacket.getServerId();
 
-            ClientInfo client = getClientByName(serverName);
             if (client == null) {
-                client = Reflection.isVelocityServer() ? new VelocityClientInfo(feedbackPacket.getServerId(), serverName) : new BungeeClientInfo(feedbackPacket.getServerId(), serverName);
+                client = Reflection.isVelocityServer()
+                        ? new VelocityClientInfo(feedbackPacket.getServerId(), serverName)
+                        : new BungeeClientInfo(feedbackPacket.getServerId(), serverName);
+
                 CLIENTS.add(client);
             }
 
-            if (!client.compareId(feedbackPacket.getServerId())) client.setId(feedbackPacket.getServerId());
-            if (client.hasSentFeedback()) return;
+            if (!client.compareId(feedbackPacket.getServerId()))
+                client.setId(feedbackPacket.getServerId());
+
+            if (client.hasSentFeedback())
+                return;
+
             client.setFeedback(true);
             client.syncTime();
             SERVER_DATA_SYNC_COUNT++;
@@ -85,9 +134,10 @@ public class Communicator {
             return;
         }
 
-        if(packet instanceof CommunicationPackets.PacketBundle) {
+        if (packet instanceof CommunicationPackets.PacketBundle) {
             CommunicationPackets.PacketBundle packetBundle =  (CommunicationPackets.PacketBundle) packet;
-            if(!packetBundle.isToken(Storage.TOKEN) || !packetBundle.isId(SERVER_ID.toString())) return;
+            if (!packetBundle.isToken(Storage.TOKEN) || !packetBundle.isId(SERVER_ID.toString()))
+                return;
 
             Storage.USE_VELOCITY = packetBundle.isVelocity();
             LAST_BUKKIT_SYNC = System.currentTimeMillis();
@@ -100,18 +150,24 @@ public class Communicator {
     }
 
     public static void syncData(String serverId) {
+        if (!Reflection.isProxyServer() || Storage.ConfigSections.Settings.DISABLE_SYNC.DISABLED)
+            return;
+
         LAST_DATA_UPDATE = System.currentTimeMillis();
         ClientInfo clientInfo;
+
         if(serverId == null) {
             SERVER_DATA_SYNC_COUNT = 0;
             CLIENTS.forEach(currentClient -> syncData(currentClient.getId()));
             return;
+
         } else {
             clientInfo = getClientById(serverId);
-            if(clientInfo != null) clientInfo.setFeedback(false);
 
-            SERVER_DATA_SYNC_COUNT = SERVER_DATA_SYNC_COUNT -1;
-            if(SERVER_DATA_SYNC_COUNT <= 0) SERVER_DATA_SYNC_COUNT = 0;
+            if (clientInfo != null)
+                clientInfo.setFeedback(false);
+
+            SERVER_DATA_SYNC_COUNT = Math.max(0, SERVER_DATA_SYNC_COUNT -1);
         }
 
         CommunicationPackets.CommandsPacket commandsPacket = new CommunicationPackets.CommandsPacket();
@@ -120,13 +176,18 @@ public class Communicator {
         List<String> commands = new ArrayList<>();
         String tempServerName = "";
 
-        if(clientInfo != null && clientInfo.getName() != null) {
-            tempServerName = clientInfo.getName().toLowerCase();
-            if(!Storage.Blacklist.isOnIgnoredServer(tempServerName))
+        if (clientInfo != null && clientInfo.getName() != null) {
+            tempServerName = clientInfo.getName();
+
+            if (!Storage.Blacklist.isIgnoredServer(tempServerName))
                 commands.addAll(Storage.Blacklist.getBlacklist().getCommands());
 
-            List<GeneralBlacklist> serverBlacklists = Storage.Blacklist.getBlacklists(clientInfo.getName());
-            serverBlacklists.stream().filter(serverBlacklist -> serverBlacklist != null && serverBlacklist.getCommands() != null).forEach(serverBlacklist -> commands.addAll(serverBlacklist.getCommands()));
+            List<GeneralBlacklist> serverBlacklists = Storage.Blacklist.getServerBlacklists(clientInfo.getName());
+            serverBlacklists.stream().filter(serverBlacklist ->
+                    serverBlacklist != null && serverBlacklist.getCommands() != null
+            ).forEach(serverBlacklist ->
+                    commands.addAll(serverBlacklist.getCommands())
+            );
         }
 
         final String serverName = tempServerName;
@@ -134,7 +195,8 @@ public class Communicator {
 
         TinyGroup tinyGroup;
         for (Group group : GroupManager.getGroups()) {
-            if(groups.stream().anyMatch(cTG -> cTG.getGroupName().equals(group.getGroupName()))) continue;
+            if (groups.stream().anyMatch(cTG -> cTG.getGroupName().equals(group.getGroupName())))
+                continue;
 
             tinyGroup = new TinyGroup(group.getGroupName(), group.getPriority(), group.getAllCommands(serverName));
             for (GroupBlacklist groupBlacklist : group.getAllServerGroupBlacklist(serverName))
@@ -149,6 +211,8 @@ public class Communicator {
 
         bundle = new CommunicationPackets.PacketBundle(Storage.TOKEN, serverId, commandsPacket, groupsPacket);
         clientInfo.sendBytes(CommunicationPackets.convertToBytes(bundle));
+
+        PATEventHandler.callSentSyncEvents(bundle, serverName);
     }
 
     public static void sendRequest() {
@@ -163,9 +227,12 @@ public class Communicator {
             sendPacket(new CommunicationPackets.ForcePermissionResetPacket(Storage.TOKEN));
     }
 
-    public static void sendFeedback(UUID targetUUID) {
-        if(Reflection.isProxyServer())
-            sendPacket(new CommunicationPackets.ForcePermissionResetPacket(Storage.TOKEN, targetUUID));
+    public static void sendUpdateCommand() {
+        sendPacket(new CommunicationPackets.UpdateCommandsPacket(Storage.TOKEN));
+    }
+
+    public static void sendUpdateCommand(UUID targetUUID) {
+        sendPacket(new CommunicationPackets.UpdateCommandsPacket(Storage.TOKEN, targetUUID));
     }
 
     public static void sendFeedback() {
@@ -183,18 +250,4 @@ public class Communicator {
     public static ClientInfo getClientByName(String name) {
         return CLIENTS.isEmpty() ? null : CLIENTS.stream().filter(client -> client != null && client.getName().equalsIgnoreCase(name)).findFirst().orElse(null);
     }
-
-    public static ClientInfo getQueueClientById(String id) {
-        return QUEUE_CLIENTS.get(id);
-    }
-
-    public static void resetAllFeedbacks() {
-        CLIENTS.forEach(client -> client.setFeedback(false));
-    }
-
-    public static List<String> getRegisteredServerNames() {
-        List<String> result = new ArrayList<>();
-        CLIENTS.stream().filter(client -> client != null && client.getName() != null).forEach(client -> result.add(client.getName()));
-        return result;
-    }
 }

src/main/java/de/rayzs/pat/api/communication/client/ClientInfo.java

@@ -18,6 +18,8 @@ public abstract class ClientInfo {
         this.name = name;
     }
 
+    public abstract void sendBytes(byte[] bytes);
+
     public void setName(String name) {
         this.name = name;
     }
@@ -26,8 +28,6 @@ public abstract class ClientInfo {
         this.id = serverId;
     }
 
-    public abstract void sendBytes(byte[] bytes);
-
     public String getName() {
         return name;
     }

src/main/java/de/rayzs/pat/api/communication/client/impl/BungeeClientInfo.java

@@ -2,6 +2,8 @@ package de.rayzs.pat.api.communication.client.impl;
 
 import de.rayzs.pat.api.communication.client.ClientInfo;
 import de.rayzs.pat.api.communication.Client;
+import de.rayzs.pat.plugin.BungeeLoader;
+import de.rayzs.pat.plugin.logger.Logger;
 import net.md_5.bungee.api.ProxyServer;
 
 public class BungeeClientInfo extends ClientInfo {
@@ -16,37 +18,18 @@ public class BungeeClientInfo extends ClientInfo {
 
     @Override
     public void sendBytes(byte[] bytes) {
-        ProxyServer.getInstance().getServers().entrySet().stream().filter(entry -> entry.getKey().equalsIgnoreCase(getName())).forEach(entry -> entry.getValue().sendData(Client.CHANNEL_NAME, bytes));
-    }
+        try {
+            ProxyServer server = BungeeLoader.getPlugin().getProxy();
 
-    @Override
-    public String getId() {
-        return super.getId();
-    }
+            server.getServers().entrySet().stream().filter(entry ->
+                    entry.getKey().equalsIgnoreCase(getName())
+            ).forEach(entry ->
+                    entry.getValue().sendData(Client.CHANNEL_NAME, bytes)
+            );
 
-    @Override
-    public String getName() {
-        return super.getName();
-    }
-
-    @Override
-    public String getSyncTime() {
-        return super.getSyncTime();
-    }
-
-    @Override
-    public void setFeedback(boolean state) {
-        super.setFeedback(state);
-    }
-
-    @Override
-    public void setId(String serverId) {
-        super.setId(serverId);
-    }
-
-    @Override
-    public void setName(String name) {
-        super.setName(name);
+        } catch (NoClassDefFoundError exception) {
+            Logger.warning("Failed to send data to backend servers! :c");
+        }
     }
 }
 

src/main/java/de/rayzs/pat/api/communication/client/impl/VelocityClientInfo.java

@@ -16,36 +16,10 @@ public class VelocityClientInfo extends ClientInfo {
 
     @Override
     public void sendBytes(byte[] bytes) {
-        VelocityLoader.getServer().getAllServers().stream().filter(server -> server.getServerInfo().getName().equalsIgnoreCase(getName())).forEach(server -> server.sendPluginMessage(VelocityClient.getIdentifier(), bytes));
-    }
-
-    @Override
-    public String getId() {
-        return super.getId();
-    }
-
-    @Override
-    public String getName() {
-        return super.getName();
-    }
-
-    @Override
-    public String getSyncTime() {
-        return super.getSyncTime();
-    }
-
-    @Override
-    public void setFeedback(boolean state) {
-        super.setFeedback(state);
-    }
-
-    @Override
-    public void setId(String serverId) {
-        super.setId(serverId);
-    }
-
-    @Override
-    public void setName(String name) {
-        super.setName(name);
+        VelocityLoader.getServer().getAllServers().stream().filter(server ->
+                server.getServerInfo().getName().equalsIgnoreCase(getName())
+        ).forEach(server ->
+                server.sendPluginMessage(VelocityClient.getIdentifier(), bytes)
+        );
     }
 }

src/main/java/de/rayzs/pat/api/communication/impl/BukkitClient.java

@@ -1,5 +1,7 @@
 package de.rayzs.pat.api.communication.impl;
 
+import de.rayzs.pat.api.storage.Storage;
+import de.rayzs.pat.utils.scheduler.PATScheduler;
 import org.bukkit.plugin.messaging.PluginMessageListener;
 import de.rayzs.pat.utils.CommunicationPackets;
 import de.rayzs.pat.plugin.BukkitLoader;
@@ -12,24 +14,42 @@ public class BukkitClient implements Client, PluginMessageListener {
     private static final Server SERVER = Bukkit.getServer();
 
     public BukkitClient() {
+
+        if (!Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED) {
+            return;
+        }
+
         SERVER.getMessenger().registerIncomingPluginChannel(BukkitLoader.getPlugin(), CHANNEL_NAME, this);
         SERVER.getMessenger().registerOutgoingPluginChannel(BukkitLoader.getPlugin(), CHANNEL_NAME);
     }
 
     @Override
     public void send(Object packet) {
-        try { SERVER.sendPluginMessage(BukkitLoader.getPlugin(), CHANNEL_NAME, CommunicationPackets.convertToBytes(packet));
-        } catch (Throwable throwable) { throwable.printStackTrace(); }
+        try {
+
+            SERVER.sendPluginMessage(BukkitLoader.getPlugin(), CHANNEL_NAME, CommunicationPackets.convertToBytes(packet));
+
+        } catch (Throwable throwable) {
+            throwable.printStackTrace();
+        }
     }
 
     @Override
     public void onPluginMessageReceived(String channel, Player player, byte[] bytes) {
-        if(!channel.equals(CHANNEL_NAME)) return;
+
+        if (!channel.equals(CHANNEL_NAME))
+            return;
+
         try {
             Object packetObj = CommunicationPackets.buildFromBytes(bytes);
-            if(!CommunicationPackets.isPacket(packetObj)) return;
 
-            Bukkit.getScheduler().scheduleSyncDelayedTask(BukkitLoader.getPlugin(), () -> Communicator.receiveInformation("proxy", packetObj));
-        } catch (Throwable throwable) { throwable.printStackTrace(); }
+            if (!CommunicationPackets.isPacket(packetObj))
+                return;
+
+            PATScheduler.createScheduler(() -> Communicator.receiveInformation("proxy", packetObj));
+
+        } catch (Throwable throwable) {
+            throwable.printStackTrace();
+        }
     }
 }

src/main/java/de/rayzs/pat/api/communication/impl/BungeeClient.java

@@ -1,5 +1,6 @@
 package de.rayzs.pat.api.communication.impl;
 
+import de.rayzs.pat.api.storage.Storage;
 import net.md_5.bungee.api.event.PluginMessageEvent;
 import de.rayzs.pat.utils.CommunicationPackets;
 import net.md_5.bungee.api.connection.Server;
@@ -15,27 +16,48 @@ public class BungeeClient implements Client, Listener {
     private static final ProxyServer SERVER = ProxyServer.getInstance();
 
     public BungeeClient() {
+
+        if (Storage.ConfigSections.Settings.DISABLE_SYNC.DISABLED) {
+            return;
+        }
+
         SERVER.registerChannel(CHANNEL_NAME);
         SERVER.getPluginManager().registerListener(BungeeLoader.getPlugin(), this);
     }
 
     @Override
     public void send(Object packet) {
-        for(ServerInfo serverInfo : ProxyServer.getInstance().getServers().values()) {
-            try { serverInfo.sendData(CHANNEL_NAME, CommunicationPackets.convertToBytes(packet));
-            } catch (Throwable throwable) { throwable.printStackTrace(); }
+        for (ServerInfo serverInfo : ProxyServer.getInstance().getServers().values()) {
+
+            try {
+
+                serverInfo.sendData(CHANNEL_NAME, CommunicationPackets.convertToBytes(packet));
+
+            } catch (Throwable throwable) {
+                throwable.printStackTrace();
+            }
+
         }
     }
 
     @EventHandler
     public void onQueryReceive(PluginMessageEvent event) {
-        if (!event.getTag().equalsIgnoreCase(CHANNEL_NAME)) return;
+        if (!event.getTag().equalsIgnoreCase(CHANNEL_NAME))
+            return;
+
         try {
+
             Object packetObj = CommunicationPackets.buildFromBytes(event.getData());
-            if(!CommunicationPackets.isPacket(packetObj)) return;
+
+            if (!CommunicationPackets.isPacket(packetObj))
+                return;
 
             Server server = (Server) event.getSender();
-            Communicator.receiveInformation(server.getInfo().getName().toLowerCase(), packetObj);
-        } catch (Throwable throwable) { throwable.printStackTrace(); }
+            Communicator.receiveInformation(server.getInfo().getName(), packetObj);
+
+        } catch (Throwable throwable) {
+            throwable.printStackTrace();
+        }
+
     }
 }

src/main/java/de/rayzs/pat/api/communication/impl/VelocityClient.java

@@ -3,6 +3,7 @@ package de.rayzs.pat.api.communication.impl;
 import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier;
 import com.velocitypowered.api.event.connection.PluginMessageEvent;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
+import de.rayzs.pat.api.storage.Storage;
 import de.rayzs.pat.utils.CommunicationPackets;
 import com.velocitypowered.api.event.Subscribe;
 import de.rayzs.pat.plugin.VelocityLoader;
@@ -15,6 +16,11 @@ public class VelocityClient implements Client {
     private static final MinecraftChannelIdentifier IDENTIFIER = MinecraftChannelIdentifier.from(CHANNEL_NAME);
 
     public VelocityClient() {
+
+        if (Storage.ConfigSections.Settings.DISABLE_SYNC.DISABLED) {
+            return;
+        }
+
         SERVER.getChannelRegistrar().register(IDENTIFIER);
         SERVER.getEventManager().register(VelocityLoader.getInstance(), this);
     }
@@ -22,19 +28,30 @@ public class VelocityClient implements Client {
     @Override
     public void send(Object packet) {
         for (RegisteredServer registeredServer : SERVER.getAllServers()) {
-            try { registeredServer.sendPluginMessage(IDENTIFIER, CommunicationPackets.convertToBytes(packet));
-            } catch (Throwable throwable) { throwable.printStackTrace(); }
+
+            try {
+
+                registeredServer.sendPluginMessage(IDENTIFIER, CommunicationPackets.convertToBytes(packet));
+
+            } catch (Throwable throwable) {
+                throwable.printStackTrace();
+            }
+
         }
     }
 
     @Subscribe
     public void onQueryReceive(PluginMessageEvent event) {
-        if (event.getIdentifier() != IDENTIFIER) return;
+        if (event.getIdentifier() != IDENTIFIER)
+            return;
+
         Object packetObj = CommunicationPackets.buildFromBytes(event.getData());
-        if(!CommunicationPackets.isPacket(packetObj)) return;
+
+        if (!CommunicationPackets.isPacket(packetObj))
+            return;
 
         ServerConnection server = (ServerConnection) event.getSource();
-        Communicator.receiveInformation(server.getServerInfo().getName().toLowerCase(), packetObj);
+        Communicator.receiveInformation(server.getServerInfo().getName(), packetObj);
     }
 
     public static MinecraftChannelIdentifier getIdentifier() {

src/main/java/de/rayzs/pat/api/event/PATEvent.java

@@ -1,14 +1,12 @@
 package de.rayzs.pat.api.event;
 
-import java.util.UUID;
-
 public abstract class PATEvent<T> {
 
-    private final UUID senderUniqueId;
+    private final Object senderObj;
     private boolean cancelled = false;
 
-    public PATEvent(UUID senderUniqueId) {
-        this.senderUniqueId = senderUniqueId;
+    public PATEvent(Object senderObj) {
+        this.senderObj = senderObj;
     }
 
     public abstract void handle(T t);
@@ -16,9 +14,8 @@ public abstract class PATEvent<T> {
     public void setCancelled(boolean cancelled) {
         this.cancelled = cancelled;
     }
-
-    public UUID getSenderUniqueId() {
-        return senderUniqueId;
+    public Object getSenderObj() {
+        return senderObj;
     }
 
     public boolean isCancelled() {

src/main/java/de/rayzs/pat/api/event/PATEventHandler.java

@@ -1,14 +1,17 @@
 package de.rayzs.pat.api.event;
 
 import de.rayzs.pat.api.event.events.*;
+import de.rayzs.pat.utils.CommunicationPackets;
+import de.rayzs.pat.utils.Reflection;
+
 import java.util.*;
 
 public class PATEventHandler {
 
     private static List<PATEvent> EVENTS = new ArrayList<>();
 
-    public static ExecuteCommandEvent call(UUID senderUniqueId, String command, boolean blocked) {
-        ExecuteCommandEvent event = EmptyEvent.createEmptyExecuteCommandEvent(senderUniqueId, command, blocked);
+    public static ExecuteCommandEvent callExecuteCommandEvents(Object senderObj, String command, boolean blocked, boolean notify) {
+        ExecuteCommandEvent event = EmptyEvent.createEmptyExecuteCommandEvent(senderObj, command, blocked, notify);
 
         for (PATEvent patEvent : EVENTS) {
             if(patEvent instanceof ExecuteCommandEvent) {
@@ -20,8 +23,8 @@ public class PATEventHandler {
         return event;
     }
 
-    public static FilteredSuggestionEvent call(UUID senderUniqueId, List<String> suggestions) {
-        FilteredSuggestionEvent event = EmptyEvent.createEmptyFilteredSuggestionEvent(senderUniqueId, suggestions);
+    public static FilteredSuggestionEvent callFilteredSuggestionEvents(Object senderObj, List<String> suggestions) {
+        FilteredSuggestionEvent event = EmptyEvent.createEmptyFilteredSuggestionEvent(senderObj, suggestions);
 
         for (PATEvent patEvent : EVENTS) {
             if(patEvent instanceof FilteredSuggestionEvent) {
@@ -33,8 +36,8 @@ public class PATEventHandler {
         return event;
     }
 
-    public static FilteredTabCompletionEvent call(UUID senderUniqueId, String cursor, List<String> completion) {
-        FilteredTabCompletionEvent event = EmptyEvent.createEmptyFilteredTabCompletion(senderUniqueId, cursor, completion);
+    public static FilteredTabCompletionEvent callFilteredTabCompletionEvents(Object senderObj, String cursor, List<String> completion) {
+        FilteredTabCompletionEvent event = EmptyEvent.createEmptyFilteredTabCompletion(senderObj, cursor, completion);
 
         for (PATEvent patEvent : EVENTS) {
             if(patEvent instanceof FilteredTabCompletionEvent) {
@@ -46,6 +49,71 @@ public class PATEventHandler {
         return event;
     }
 
+    public static ServerPlayersChangeEvent callServerPlayersChangeEvents(Object senderObj, ServerPlayersChangeEvent.Type type) {
+        ServerPlayersChangeEvent event = EmptyEvent.createEmptyServerPlayersChangeEvent(senderObj, type);
+
+        for (PATEvent patEvent : EVENTS) {
+            if(patEvent instanceof ServerPlayersChangeEvent) {
+                ServerPlayersChangeEvent serverPlayersChangeEvent = (ServerPlayersChangeEvent) patEvent;
+                serverPlayersChangeEvent.handle(event);
+            }
+        }
+
+        return event;
+    }
+
+    public static UpdatePluginEvent callUpdatePluginEvents() {
+        UpdatePluginEvent event = EmptyEvent.createEmptyUpdatePluginEvent();
+
+        for (PATEvent patEvent : EVENTS) {
+            if(patEvent instanceof UpdatePluginEvent) {
+                UpdatePluginEvent updatePluginEvent = (UpdatePluginEvent) patEvent;
+                updatePluginEvent.handle(event);
+            }
+        }
+
+        return event;
+    }
+
+    public static UpdatePlayerCommandsEvent callUpdatePlayerCommandsEvents(Object playerObj, List<String> commands, boolean serverBased) {
+        UpdatePlayerCommandsEvent event = EmptyEvent.createEmptyUpdatePlayerCommandsEvent(playerObj, commands, serverBased);
+
+        for (PATEvent patEvent : EVENTS) {
+            if(patEvent instanceof UpdatePlayerCommandsEvent) {
+                UpdatePlayerCommandsEvent updatePlayerCommandsEvent = (UpdatePlayerCommandsEvent) patEvent;
+                updatePlayerCommandsEvent.handle(event);
+            }
+        }
+
+        return event;
+    }
+
+    public static SentSyncEvent callSentSyncEvents(CommunicationPackets.PacketBundle packetBundle, String serverName) {
+        SentSyncEvent event = EmptyEvent.createEmptySentSyncEvent(packetBundle, serverName);
+
+        for (PATEvent patEvent : EVENTS) {
+            if(patEvent instanceof SentSyncEvent) {
+                SentSyncEvent sentSyncEvent = (SentSyncEvent) patEvent;
+                sentSyncEvent.handle(event);
+            }
+        }
+
+        return event;
+    }
+
+    public static ReceiveSyncEvent callReceiveSyncEvents(CommunicationPackets.PacketBundle packetBundle) {
+        ReceiveSyncEvent event = EmptyEvent.createEmptyReceiveSyncEvent(packetBundle);
+
+        for (PATEvent patEvent : EVENTS) {
+            if(patEvent instanceof ReceiveSyncEvent) {
+                ReceiveSyncEvent proxySyncEvent = (ReceiveSyncEvent) patEvent;
+                proxySyncEvent.handle(event);
+            }
+        }
+
+        return event;
+    }
+
     public static void register(PATEvent event) {
         EVENTS.add(event);
     }
@@ -56,8 +124,53 @@ public class PATEventHandler {
 
     public static class EmptyEvent {
 
-        public static ExecuteCommandEvent createEmptyExecuteCommandEvent(UUID senderUniqueId, String command, boolean blocked) {
-            return new ExecuteCommandEvent(senderUniqueId, command, blocked) {
+        public static ServerPlayersChangeEvent createEmptyServerPlayersChangeEvent(Object senderObj, ServerPlayersChangeEvent.Type type) {
+            return new ServerPlayersChangeEvent(senderObj, type) {
+                @Override
+                public void handle(ServerPlayersChangeEvent event) {
+
+                }
+            };
+        }
+
+        public static SentSyncEvent createEmptySentSyncEvent(CommunicationPackets.PacketBundle packetBundle, String serverName) {
+            return new SentSyncEvent(null, packetBundle, serverName) {
+                @Override
+                public void handle(SentSyncEvent event) {
+
+                }
+            };
+        }
+
+        public static ReceiveSyncEvent createEmptyReceiveSyncEvent(CommunicationPackets.PacketBundle packetBundle) {
+            return new ReceiveSyncEvent(null, packetBundle) {
+                @Override
+                public void handle(ReceiveSyncEvent event) {
+
+                }
+            };
+        }
+
+        public static UpdatePlayerCommandsEvent createEmptyUpdatePlayerCommandsEvent(Object playerObj, List<String> commands, boolean serverBased) {
+            return new UpdatePlayerCommandsEvent(playerObj, commands, serverBased) {
+                @Override
+                public void handle(UpdatePlayerCommandsEvent event) {
+
+                }
+            };
+        }
+
+        public static UpdatePluginEvent createEmptyUpdatePluginEvent() {
+            return new UpdatePluginEvent(null) {
+                @Override
+                public void handle(UpdatePluginEvent event) {
+
+                }
+            };
+        }
+
+        public static ExecuteCommandEvent createEmptyExecuteCommandEvent(Object senderObj, String command, boolean blocked, boolean notify) {
+            return new ExecuteCommandEvent(senderObj, command, blocked, notify) {
                 @Override
                 public void handle(ExecuteCommandEvent event) {
 
@@ -65,8 +178,8 @@ public class PATEventHandler {
             };
         }
 
-        public static FilteredSuggestionEvent createEmptyFilteredSuggestionEvent(UUID senderUniqueId, List<String> suggestions) {
-            return new FilteredSuggestionEvent(senderUniqueId, suggestions) {
+        public static FilteredSuggestionEvent createEmptyFilteredSuggestionEvent(Object senderObj, List<String> suggestions) {
+            return new FilteredSuggestionEvent(senderObj, suggestions) {
                 @Override
                 public void handle(FilteredSuggestionEvent event) {
 
@@ -74,8 +187,8 @@ public class PATEventHandler {
             };
         }
 
-        public static FilteredTabCompletionEvent createEmptyFilteredTabCompletion(UUID senderUniqueId, String cursor, List<String> completion) {
-            return new FilteredTabCompletionEvent(senderUniqueId, cursor, completion) {
+        public static FilteredTabCompletionEvent createEmptyFilteredTabCompletion(Object senderObj, String cursor, List<String> completion) {
+            return new FilteredTabCompletionEvent(senderObj, cursor, completion) {
                 @Override
                 public void handle(FilteredTabCompletionEvent event) {
 

src/main/java/de/rayzs/pat/api/event/events/ExecuteCommandEvent.java

@@ -1,38 +1,42 @@
 package de.rayzs.pat.api.event.events;
 
 import de.rayzs.pat.api.event.PATEvent;
-import java.util.UUID;
 
 public abstract class ExecuteCommandEvent extends PATEvent<ExecuteCommandEvent> {
 
     private final String command;
-    private boolean blocked;
+    private boolean blocked, notify;
 
     public ExecuteCommandEvent() {
         super(null);
         this.blocked = false;
+        this.notify = false;
         this.command = null;
     }
 
-    public ExecuteCommandEvent(UUID senderUniqueId, String command, boolean blocked) {
-        super(senderUniqueId);
+    public ExecuteCommandEvent(Object senderObj, String command, boolean blocked, boolean notify) {
+        super(senderObj);
         this.blocked = blocked;
         this.command = command;
+        this.notify = notify;
+    }
+
+    public void setDoesNotify(boolean notify) {
+        this.notify = notify;
     }
 
     public String getCommand() {
         return command;
     }
 
-    @Override
-    public UUID getSenderUniqueId() {
-        return super.getSenderUniqueId();
-    }
-
     public boolean isBlocked() {
         return blocked;
     }
 
+    public boolean doesNotify() {
+        return notify;
+    }
+
     public void setBlocked(boolean blocked) {
         this.blocked = blocked;
     }

src/main/java/de/rayzs/pat/api/event/events/FilteredSuggestionEvent.java

@@ -12,8 +12,8 @@ public abstract class FilteredSuggestionEvent extends PATEvent<FilteredSuggestio
         this.suggestions = null;
     }
 
-    public FilteredSuggestionEvent(UUID senderUniqueId, List<String> suggestions) {
-        super(senderUniqueId);
+    public FilteredSuggestionEvent(Object senderObj, List<String> suggestions) {
+        super(senderObj);
         this.suggestions = suggestions;
     }
 
@@ -21,11 +21,6 @@ public abstract class FilteredSuggestionEvent extends PATEvent<FilteredSuggestio
         return suggestions;
     }
 
-    @Override
-    public UUID getSenderUniqueId() {
-        return super.getSenderUniqueId();
-    }
-
     public void setSuggestions(List<String> suggestions) {
         this.suggestions = suggestions;
     }

src/main/java/de/rayzs/pat/api/event/events/FilteredTabCompletionEvent.java

@@ -14,8 +14,8 @@ public abstract class FilteredTabCompletionEvent extends PATEvent<FilteredTabCom
         this.completion = null;
     }
 
-    public FilteredTabCompletionEvent(UUID senderUniqueId, String cursor, List<String> completion) {
-        super(senderUniqueId);
+    public FilteredTabCompletionEvent(Object senderObj, String cursor, List<String> completion) {
+        super(senderObj);
         this.cursor = cursor;
         this.completion = completion;
     }
@@ -30,11 +30,6 @@ public abstract class FilteredTabCompletionEvent extends PATEvent<FilteredTabCom
         return completion;
     }
 
-    @Override
-    public UUID getSenderUniqueId() {
-        return super.getSenderUniqueId();
-    }
-
     public void setCompletion(List<String> completion) {
         this.completion = completion;
     }

src/main/java/de/rayzs/pat/api/event/events/ReceiveSyncEvent.java

@@ -0,0 +1,23 @@
+package de.rayzs.pat.api.event.events;
+
+import de.rayzs.pat.utils.CommunicationPackets;
+import de.rayzs.pat.api.event.PATEvent;
+
+public abstract class ReceiveSyncEvent extends PATEvent<ReceiveSyncEvent> {
+
+    private final CommunicationPackets.PacketBundle packetBundle;
+
+    public ReceiveSyncEvent() {
+        super(null);
+        this.packetBundle = null;
+    }
+
+    public ReceiveSyncEvent(Object senderObj, CommunicationPackets.PacketBundle packetBundle) {
+        super(senderObj);
+        this.packetBundle = packetBundle;
+    }
+
+    public CommunicationPackets.PacketBundle getPacketBundle() {
+        return packetBundle;
+    }
+}

src/main/java/de/rayzs/pat/api/event/events/SentSyncEvent.java

@@ -0,0 +1,30 @@
+package de.rayzs.pat.api.event.events;
+
+import de.rayzs.pat.utils.CommunicationPackets;
+import de.rayzs.pat.api.event.PATEvent;
+
+public abstract class SentSyncEvent extends PATEvent<SentSyncEvent> {
+
+    private final CommunicationPackets.PacketBundle packetBundle;
+    private final String serverName;
+
+    public SentSyncEvent() {
+        super(null);
+        this.packetBundle = null;
+        this.serverName = null;
+    }
+
+    public SentSyncEvent(Object senderObj, CommunicationPackets.PacketBundle packetBundle, String serverName) {
+        super(senderObj);
+        this.packetBundle = packetBundle;
+        this.serverName = serverName;
+    }
+
+    public String getServerName() {
+        return serverName;
+    }
+
+    public CommunicationPackets.PacketBundle getPacketBundle() {
+        return packetBundle;
+    }
+}

src/main/java/de/rayzs/pat/api/event/events/ServerPlayersChangeEvent.java

@@ -0,0 +1,20 @@
+package de.rayzs.pat.api.event.events;
+
+import de.rayzs.pat.api.event.PATEvent;
+
+public abstract class ServerPlayersChangeEvent extends PATEvent<ServerPlayersChangeEvent> {
+
+    private final Type type;
+
+    public ServerPlayersChangeEvent(Object senderObj, Type type) {
+        super(senderObj);
+        this.type = type;
+    }
+
+    public ServerPlayersChangeEvent() {
+        super(null);
+        this.type = Type.UNKNOWN;
+    }
+
+    public enum Type { JOINED, LEFT, UNKNOWN }
+}

src/main/java/de/rayzs/pat/api/event/events/UpdatePlayerCommandsEvent.java

@@ -0,0 +1,28 @@
+package de.rayzs.pat.api.event.events;
+
+import de.rayzs.pat.api.event.PATEvent;
+import java.util.List;
+
+public abstract class UpdatePlayerCommandsEvent extends PATEvent<UpdatePlayerCommandsEvent> {
+
+    private List<String> commands;
+    private boolean serverBased;
+
+    public UpdatePlayerCommandsEvent() {
+        super(null);;
+    }
+
+    public UpdatePlayerCommandsEvent(Object senderObj, List<String> commands, boolean serverBased) {
+        super(senderObj);
+        this.commands = commands;
+        this.serverBased = serverBased;
+    }
+
+    public List<String> getCommands() {
+        return commands;
+    }
+
+    public boolean isServerBased() {
+        return serverBased;
+    }
+}

src/main/java/de/rayzs/pat/api/event/events/UpdatePluginEvent.java

@@ -0,0 +1,14 @@
+package de.rayzs.pat.api.event.events;
+
+import de.rayzs.pat.api.event.PATEvent;
+
+public abstract class UpdatePluginEvent extends PATEvent<UpdatePluginEvent> {
+
+    public UpdatePluginEvent() {
+        super(null);;
+    }
+
+    public UpdatePluginEvent(Object senderObj) {
+        super(senderObj);
+    }
+}

src/main/java/de/rayzs/pat/api/event/events/bukkit/ExecuteCommandEvent.java

@@ -0,0 +1,43 @@
+package de.rayzs.pat.api.event.events.bukkit;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+
+public abstract class ExecuteCommandEvent extends Event implements Cancellable {
+
+    private final String command;
+    private boolean blocked;
+
+    public ExecuteCommandEvent() {
+        this.blocked = false;
+        this.command = null;
+    }
+
+    public ExecuteCommandEvent(Player player, String command, boolean blocked) {
+        this.blocked = blocked;
+        this.command = command;
+    }
+
+    public String getCommand() {
+        return command;
+    }
+
+    public boolean isBlocked() {
+        return blocked;
+    }
+
+    public void setBlocked(boolean blocked) {
+        this.blocked = blocked;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return blocked;
+    }
+
+    @Override
+    public void setCancelled(boolean cancel) {
+        this.blocked = cancel;
+    }
+}

src/main/java/de/rayzs/pat/api/event/events/bukkit/FilteredSuggestionEvent.java

@@ -0,0 +1,26 @@
+package de.rayzs.pat.api.event.events.bukkit;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import java.util.List;
+
+public abstract class FilteredSuggestionEvent extends Event {
+
+    private List<String> suggestions;
+
+    public FilteredSuggestionEvent() {
+        this.suggestions = null;
+    }
+
+    public FilteredSuggestionEvent(Player player, List<String> suggestions) {
+        this.suggestions = suggestions;
+    }
+
+    public List<String> getSuggestions() {
+        return suggestions;
+    }
+
+    public void setSuggestions(List<String> suggestions) {
+        this.suggestions = suggestions;
+    }
+}

src/main/java/de/rayzs/pat/api/event/events/bukkit/FilteredTabCompletionEvent.java

@@ -0,0 +1,35 @@
+package de.rayzs.pat.api.event.events.bukkit;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import java.util.List;
+
+public abstract class FilteredTabCompletionEvent extends Event {
+
+    private String cursor;
+    private List<String> completion;
+
+    public FilteredTabCompletionEvent() {
+        this.cursor = null;
+        this.completion = null;
+    }
+
+    public FilteredTabCompletionEvent(Player player, String cursor, List<String> completion) {
+        this.cursor = cursor;
+        this.completion = completion;
+    }
+
+    public abstract void handle(FilteredTabCompletionEvent event);
+
+    public String getCursor() {
+        return cursor;
+    }
+
+    public List<String> getCompletion() {
+        return completion;
+    }
+
+    public void setCompletion(List<String> completion) {
+        this.completion = completion;
+    }
+}

src/main/java/de/rayzs/pat/api/netty/bukkit/BukkitPacketAnalyzer.java

@@ -1,10 +1,16 @@
 package de.rayzs.pat.api.netty.bukkit;
 
+import de.rayzs.pat.plugin.logger.Logger;
 import de.rayzs.pat.utils.permission.PermissionUtil;
 import de.rayzs.pat.api.netty.bukkit.handlers.*;
 import java.util.concurrent.ConcurrentHashMap;
 import de.rayzs.pat.api.storage.Storage;
+import de.rayzs.pat.utils.ExpireCache;
 import de.rayzs.pat.utils.Reflection;
+import java.util.concurrent.TimeUnit;
+
+import de.rayzs.pat.utils.sender.CommandSender;
+import de.rayzs.pat.utils.sender.CommandSenderHandler;
 import org.bukkit.entity.Player;
 import io.netty.channel.*;
 import org.bukkit.Bukkit;
@@ -13,9 +19,13 @@ import java.util.*;
 public class BukkitPacketAnalyzer {
 
     public static final ConcurrentHashMap<UUID, Channel> INJECTED_PLAYERS = new ConcurrentHashMap<>();
+    private static final ExpireCache<UUID, Object> SENT_PACKET = new ExpireCache<>(2, TimeUnit.SECONDS);
 
     private static final String HANDLER_NAME = "pat-bukkit-handler", PIPELINE_NAME = "packet_handler";
+
     private static final BukkitPacketHandler PACKET_HANDLER = Reflection.getMinor() >= 16 ? new ModernPacketHandler() : new LegacyPacketHandler();
+    private static final BukkitPacketHandler COMMANDS_NODE_HANDLER = new ModernCommandsNodeHandler();
+
     private static final HashMap<Player, String> PLAYER_INPUT_CACHE = new HashMap<>();
 
     public static void injectAll() {
@@ -27,43 +37,75 @@ public class BukkitPacketAnalyzer {
         BukkitPacketAnalyzer.INJECTED_PLAYERS.clear();
     }
 
+    public static void sendPacket(UUID uuid, Object object) {
+        Channel channel = INJECTED_PLAYERS.get(uuid);
+
+        if (channel == null)
+            return;
+
+        SENT_PACKET.put(uuid, object);
+        channel.pipeline().writeAndFlush(object);
+    }
+
     public static boolean inject(Player player) {
-        if(Storage.USE_VELOCITY) return true;
+        if (Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED)
+            return true;
 
         try {
             Channel channel = Reflection.getPlayerChannel(player);
-            if(channel == null) {
-                System.err.println("Failed to inject " + player.getName() + "! Channel is null.");
+
+            if (channel == null) {
                 return false;
             }
 
-            if(channel.pipeline().names().contains(BukkitPacketAnalyzer.HANDLER_NAME))
+            if (channel.pipeline().names().contains(BukkitPacketAnalyzer.HANDLER_NAME))
                 uninject(channel);
 
             channel.pipeline().addBefore(BukkitPacketAnalyzer.PIPELINE_NAME, BukkitPacketAnalyzer.HANDLER_NAME, new PacketDecoder(player));
             BukkitPacketAnalyzer.INJECTED_PLAYERS.put(player.getUniqueId(), channel);
-        } catch (Throwable throwable) {
-            throwable.printStackTrace();
+        } catch (IndexOutOfBoundsException indexOutOfBoundsException) {
+            Reflection.toggleInjectionMethod();
+
+            Logger.info("Injection failed. Switching to secondary injection method.");
+            boolean success = inject(player);
+
+            if (success) {
+                Logger.info("Secondary injection method was successful.");
+            } else {
+                Logger.warning("Secondary injection method failed!");
+            }
+
+            return success;
+
+        } catch (Exception exception) {
+            exception.printStackTrace();
             return false;
-        } return true;
+
+        }
+
+        return true;
     }
 
     public static void uninject(UUID uuid) {
-        if(Storage.USE_VELOCITY) return;
+        if (Storage.SEND_CONSOLE_NOTIFICATION)
+            return;
 
-        if(BukkitPacketAnalyzer.INJECTED_PLAYERS.containsKey(uuid)) {
+        if (BukkitPacketAnalyzer.INJECTED_PLAYERS.containsKey(uuid)) {
             Channel channel = BukkitPacketAnalyzer.INJECTED_PLAYERS.get(uuid);
             uninject(channel);
         }
     }
 
     public static void uninject(Channel channel) {
-        if(Storage.USE_VELOCITY) return;
+        if (Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED)
+            return;
 
-        if(channel != null) {
+        if (channel != null) {
             channel.eventLoop().submit(() -> {
                 ChannelPipeline pipeline = channel.pipeline();
-                if (pipeline.names().contains(BukkitPacketAnalyzer.HANDLER_NAME)) pipeline.remove(BukkitPacketAnalyzer.HANDLER_NAME);
+
+                if (pipeline.names().contains(BukkitPacketAnalyzer.HANDLER_NAME))
+                    pipeline.remove(BukkitPacketAnalyzer.HANDLER_NAME);
             });
         }
     }
@@ -81,21 +123,35 @@ public class BukkitPacketAnalyzer {
     private static class PacketDecoder extends ChannelDuplexHandler {
 
         private final Player player;
+        private final CommandSender sender;
+
         private PacketDecoder(Player player) {
             this.player = player;
+            this.sender = CommandSenderHandler.from(player);
         }
 
         @Override
         public void channelRead(ChannelHandlerContext channel, Object packetObj) {
             try {
-                if (!PermissionUtil.hasBypassPermission(player) && packetObj.getClass() != null) {
-                    String packetName = packetObj.getClass().getSimpleName();
-
-                    if (packetName.equals("PacketPlayInTabComplete") || packetName.equals("ServerboundCommandSuggestionPacket")) {
-                        if(!PACKET_HANDLER.handleIncomingPacket(player, packetObj)) return;
-                    }
+                if (packetObj.getClass() == null || Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED) {
+                    super.channelRead(channel, packetObj);
+                    return;
                 }
 
+                String packetName = packetObj.getClass().getSimpleName();
+
+                if (!packetName.equals("PacketPlayInTabComplete") && !packetName.equals("ServerboundCommandSuggestionPacket")) {
+                    super.channelRead(channel, packetObj);
+                    return;
+                }
+
+                if (!PermissionUtil.hasBypassPermission(sender)) {
+
+                    if (!PACKET_HANDLER.handleIncomingPacket(player, sender, packetObj))
+                        return;
+                }
+
+
                 super.channelRead(channel, packetObj);
             } catch (Throwable exception) { exception.printStackTrace(); }
         }
@@ -103,16 +159,47 @@ public class BukkitPacketAnalyzer {
         @Override
         public void write(ChannelHandlerContext channel, Object packetObj, ChannelPromise promise) {
             try {
-                if(packetObj.getClass() != null)
-                    if (!PermissionUtil.hasBypassPermission(player)) {
-                        String packetName = packetObj.getClass().getSimpleName();
-                        if (packetName.equals("PacketPlayOutTabComplete") || packetName.equals("ClientboundCommandSuggestionsPacket")) {
-                            if(!PACKET_HANDLER.handleOutgoingPacket(player, packetObj)) return;
-                        }
+
+                if(packetObj.getClass() == null || Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED) {
+                    super.write(channel, packetObj, promise);
+                    return;
+                }
+
+                final String packetName = packetObj.getClass().getSimpleName();
+                final boolean isCommandsPacket = packetName.equals("ClientboundCommandsPacket");
+                final boolean isTabCompletePacket = packetName.equals("PacketPlayOutTabComplete") || packetName.equals("ClientboundCommandSuggestionsPacket");
+
+                if (!isCommandsPacket && !isTabCompletePacket || PermissionUtil.hasBypassPermission(sender)) {
+                    super.write(channel, packetObj, promise);
+                    return;
+                }
+
+                if (isCommandsPacket) {
+                    COMMANDS_NODE_HANDLER.handleOutgoingPacket(player, sender, packetObj);
+
+                    super.write(channel, packetObj, promise);
+                    return;
+                }
+
+                UUID uuid = player.getUniqueId();
+                Object sentPacketObj = SENT_PACKET.get(uuid);
+
+                if (sentPacketObj != null) {
+                    if (sentPacketObj == packetObj) {
+                        SENT_PACKET.remove(uuid);
+                        super.write(channel, sentPacketObj, promise);
+                        return;
                     }
+                }
+
+                if (!PACKET_HANDLER.handleOutgoingPacket(player, sender, packetObj))
+                    return;
 
                 super.write(channel, packetObj, promise);
-            } catch (Throwable exception) { exception.printStackTrace(); }
+
+            } catch (Throwable exception) {
+                exception.printStackTrace();
+            }
         }
     }
 }

src/main/java/de/rayzs/pat/api/netty/bukkit/BukkitPacketHandler.java

@@ -1,8 +1,9 @@
 package de.rayzs.pat.api.netty.bukkit;
 
+import de.rayzs.pat.utils.sender.CommandSender;
 import org.bukkit.entity.Player;
 
 public interface BukkitPacketHandler {
-    boolean handleIncomingPacket(Player player, Object packetObj) throws Exception;
-    boolean handleOutgoingPacket(Player player, Object packetObj) throws Exception;
+    boolean handleIncomingPacket(Player player, CommandSender sender, Object packetObj) throws Exception;
+    boolean handleOutgoingPacket(Player player, CommandSender sender, Object packetObj) throws Exception;
 }

src/main/java/de/rayzs/pat/api/netty/bukkit/handlers/LegacyPacketHandler.java

@@ -1,18 +1,28 @@
 package de.rayzs.pat.api.netty.bukkit.handlers;
 
-import de.rayzs.pat.plugin.logger.Logger;
-import de.rayzs.pat.api.storage.Storage;
-import de.rayzs.pat.plugin.BukkitLoader;
-import de.rayzs.pat.api.netty.bukkit.*;
-import org.bukkit.entity.Player;
 import java.lang.reflect.Field;
-import de.rayzs.pat.utils.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import de.rayzs.pat.utils.StringUtils;
+import de.rayzs.pat.utils.group.Group;
+import de.rayzs.pat.utils.group.GroupManager;
+import de.rayzs.pat.utils.sender.CommandSender;
+import org.bukkit.entity.Player;
+
+import de.rayzs.pat.api.event.PATEventHandler;
+import de.rayzs.pat.api.event.events.FilteredTabCompletionEvent;
+import de.rayzs.pat.api.netty.bukkit.BukkitPacketAnalyzer;
+import de.rayzs.pat.api.netty.bukkit.BukkitPacketHandler;
+import de.rayzs.pat.api.storage.Storage;
+import de.rayzs.pat.plugin.logger.Logger;
+import de.rayzs.pat.utils.Reflection;
 
 public class LegacyPacketHandler implements BukkitPacketHandler {
 
     @Override
-    public boolean handleIncomingPacket(Player player, Object packetObj) throws Exception {
+    public boolean handleIncomingPacket(Player player, CommandSender sender, Object packetObj) throws Exception {
         Field stringField = Reflection.getFirstFieldByType(packetObj.getClass(), "String", Reflection.SearchOption.ENDS);
         if(stringField == null) {
             Logger.warning("Failed PacketAnalyze process! (#1)");
@@ -25,54 +35,82 @@ public class LegacyPacketHandler implements BukkitPacketHandler {
     }
 
     @Override
-    public boolean handleOutgoingPacket(Player player, Object packetObj) throws Exception {
-        String input = BukkitPacketAnalyzer.getPlayerInput(player);
+    public boolean handleOutgoingPacket(Player player, CommandSender sender, Object packetObj) throws Exception {
+        final String rawInput = BukkitPacketAnalyzer.getPlayerInput(player);
 
-        if(input == null) return false;
+        if(rawInput == null) {
+            return false;
+        }
 
-        boolean cancelsBeforeHand;
-        int spaces = 0;
+        final List<Group> groups = GroupManager.getPlayerGroups(sender);
 
-        if(input.startsWith("/")) {
-            input = input.replace("/", "");
-            if(input.contains(" ")) {
-                String[] split = input.split(" ");
-                spaces = split.length;
-                if(spaces > 0) input = split[0];
-            }
+        String input = rawInput;
+        boolean cancelsBeforeHand = false;
 
-            cancelsBeforeHand = Storage.Blacklist.isBlocked(player, input, !Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED);
-            if(!cancelsBeforeHand) cancelsBeforeHand = Storage.ConfigSections.Settings.CUSTOM_VERSION.isCommand(input);
-        } else return true;
+        if (!input.startsWith("/")) {
+            return true;
+        }
+
+        input = input.substring(1);
+
+        final boolean doesBypassNamespace = Storage.ConfigSections.Settings.BLOCK_NAMESPACE_COMMANDS.doesBypass(sender);
+        final boolean spaces = input.contains(" ");
+
+        if (Storage.ConfigSections.Settings.BLOCK_NAMESPACE_COMMANDS.isCommand(input) && !doesBypassNamespace) {
+            cancelsBeforeHand = true;
+        }
+
+        if (!cancelsBeforeHand && !input.isEmpty()) {
+            cancelsBeforeHand = !Storage.Blacklist.canPlayerAccessTab(sender, groups, StringUtils.getFirstArg(input));
+        }
+
+        if (!cancelsBeforeHand) {
+            cancelsBeforeHand = Storage.ConfigSections.Settings.CUSTOM_PLUGIN.isCommand(input) || Storage.ConfigSections.Settings.CUSTOM_VERSION.isCommand(input);
+        }
 
         for (Field field : Reflection.getFields(packetObj)) {
             field.setAccessible(true);
             Object result = field.get(packetObj);
 
-            if (!(result instanceof String[])) continue;
-            List<String> newResultList = new ArrayList<>();
-            String[] tR = (String[]) result;
-
-            String tempName;
-
-            if(spaces == 0) {
-                for (String s : tR) {
-                    if(!BukkitLoader.isLoaded()) continue;
-                    if(!s.startsWith("/")) {
-                        newResultList.add(s);
-                        continue;
-                    }
-
-                    tempName = s.replaceFirst("/", "");
-
-                    if (!Storage.Blacklist.isBlocked(player, tempName, !Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED))
-                        newResultList.add(s);
-                }
-            } else {
-                if(!cancelsBeforeHand) newResultList.addAll(Arrays.asList(tR));
+            if (!(result instanceof String[])) {
+                continue;
             }
 
-            field.set(packetObj, newResultList.toArray(new String[0]));
+            String[] tR = (String[]) result;
+            List<String> suggestions = new ArrayList<>(Arrays.asList(tR));
+
+            if (spaces) {
+
+                if (cancelsBeforeHand) {
+                    suggestions.clear();
+                    field.set(packetObj, suggestions.toArray(new String[0]));
+                    return true;
+                }
+
+                FilteredTabCompletionEvent filteredTabCompletionEvent = PATEventHandler.callFilteredTabCompletionEvents(player.getUniqueId(), rawInput, new ArrayList<>(suggestions));
+
+                if (filteredTabCompletionEvent.isCancelled()) {
+                    suggestions.clear();
+                } else {
+                    suggestions.removeIf(s -> !filteredTabCompletionEvent.getCompletion().contains(s));
+                }
+
+            } else {
+                suggestions.removeIf(s -> {
+                    String cpy = s;
+                    if (cpy.startsWith("/")) {
+                        cpy = cpy.substring(1);
+                    }
+
+                    if (Storage.ConfigSections.Settings.CUSTOM_PLUGIN.isTabCompletable(cpy) || Storage.ConfigSections.Settings.CUSTOM_VERSION.isTabCompletable(cpy)) {
+                        return false;
+                    }
+
+                    return !Storage.Blacklist.canPlayerAccessTab(sender, groups, cpy);
+                });
+            }
+
+            field.set(packetObj, suggestions.toArray(new String[0]));
         }
 
         return true;

src/main/java/de/rayzs/pat/api/netty/bukkit/handlers/ModernCommandsNodeHandler.java

@@ -0,0 +1,22 @@
+package de.rayzs.pat.api.netty.bukkit.handlers;
+
+import de.rayzs.pat.api.netty.bukkit.BukkitPacketHandler;
+import de.rayzs.pat.plugin.subarguments.SubArguments;
+import de.rayzs.pat.utils.node.BukkitCommandNodeHelper;
+import de.rayzs.pat.utils.sender.CommandSender;
+import org.bukkit.entity.Player;
+public class ModernCommandsNodeHandler implements BukkitPacketHandler {
+
+    public boolean handleIncomingPacket(Player player, CommandSender sender, Object packetObj) throws Exception {
+        // Ignored
+        return true;
+    }
+
+    @Override
+    public boolean handleOutgoingPacket(Player player, CommandSender sender, Object packetObj) throws Exception {
+        final BukkitCommandNodeHelper helper = new BukkitCommandNodeHelper(packetObj);
+
+        SubArguments.handleCommandNode(player.getUniqueId(), helper);
+        return true;
+    }
+}

src/main/java/de/rayzs/pat/api/netty/bukkit/handlers/ModernPacketHandler.java

@@ -1,18 +1,37 @@
 package de.rayzs.pat.api.netty.bukkit.handlers;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
+import de.rayzs.pat.utils.group.Group;
+import de.rayzs.pat.utils.group.GroupManager;
+import de.rayzs.pat.utils.sender.CommandSender;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+import com.mojang.brigadier.suggestion.Suggestion;
 import com.mojang.brigadier.suggestion.Suggestions;
-import de.rayzs.pat.plugin.logger.Logger;
+
+import de.rayzs.pat.api.event.PATEventHandler;
+import de.rayzs.pat.api.event.events.FilteredTabCompletionEvent;
+import de.rayzs.pat.api.netty.bukkit.BukkitPacketAnalyzer;
+import de.rayzs.pat.api.netty.bukkit.BukkitPacketHandler;
 import de.rayzs.pat.api.storage.Storage;
 import de.rayzs.pat.plugin.BukkitLoader;
-import de.rayzs.pat.api.netty.bukkit.*;
-import org.bukkit.entity.Player;
-import de.rayzs.pat.utils.*;
-import java.lang.reflect.*;
+import de.rayzs.pat.plugin.logger.Logger;
+import de.rayzs.pat.utils.Reflection;
+import de.rayzs.pat.utils.StringUtils;
+import de.rayzs.pat.utils.message.MessageTranslator;
+import de.rayzs.pat.utils.scheduler.PATScheduler;
 
 public class ModernPacketHandler implements BukkitPacketHandler {
 
+    private static boolean modifiable = true;
+
     @Override
-    public boolean handleIncomingPacket(Player player, Object packetObj) throws Exception {
+    public boolean handleIncomingPacket(Player player, CommandSender sender, Object packetObj) throws Exception {
         Field stringField = Reflection.getFirstFieldByType(packetObj.getClass(), "String", Reflection.SearchOption.ENDS);
 
         if(stringField == null) {
@@ -21,20 +40,41 @@ public class ModernPacketHandler implements BukkitPacketHandler {
         }
 
         String text = (String) stringField.get(packetObj);
+        if (Storage.ConfigSections.Settings.PATCH_EXPLOITS.isMalicious(text)) {
+            MessageTranslator.send(
+                    Bukkit.getConsoleSender(),
+                    Storage.ConfigSections.Settings.PATCH_EXPLOITS.ALERT_MESSAGE.get().replace("%player%", player.getName())
+            );
+
+            PATScheduler.createScheduler(() ->
+                    player.kickPlayer(
+                            StringUtils.replace(Storage.ConfigSections.Settings.PATCH_EXPLOITS.KICK_MESSAGE.get(), "&", "§")
+                    )
+            );
+
+            return false;
+        }
+
         BukkitPacketAnalyzer.insertPlayerInput(player, text);
         return true;
     }
 
     @Override
-    public boolean handleOutgoingPacket(Player player, Object packetObj) throws Exception {
+    public boolean handleOutgoingPacket(Player player, CommandSender sender, Object packetObj) throws Exception {
         Object suggestionObj;
+        String rawInput = BukkitPacketAnalyzer.getPlayerInput(player), input = rawInput;
 
-        String input = BukkitPacketAnalyzer.getPlayerInput(player);
-        if(input == null) return false;
+        if(input == null) {
+            return false;
+        }
+
+        final List<Group> groups = GroupManager.getPlayerGroups(sender);
+
+        boolean is121Packet = packetObj.getClass().getSimpleName().equals("ClientboundCommandSuggestionsPacket"),
+                cancelsBeforeHand = false;
 
-        boolean cancelsBeforeHand = false;
         int spaces = 0;
-        if(input.startsWith("/")) {
+        if(input.startsWith("/") || is121Packet) {
             input = input.replace("/", "");
             if(input.contains(" ")) {
                 String[] split = input.split(" ");
@@ -42,40 +82,191 @@ public class ModernPacketHandler implements BukkitPacketHandler {
                 if(spaces > 0) input = split[0];
             }
 
-            cancelsBeforeHand = Storage.Blacklist.isBlocked(player, input, !Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED);
-            if(!cancelsBeforeHand) cancelsBeforeHand = Storage.ConfigSections.Settings.CUSTOM_VERSION.isCommand(input);
+            cancelsBeforeHand = !Storage.Blacklist.canPlayerAccessTab(sender, groups, input);
+
+            if (!cancelsBeforeHand)
+                cancelsBeforeHand = Storage.ConfigSections.Settings.CUSTOM_VERSION.isTabCompletable(input) || Storage.ConfigSections.Settings.CUSTOM_PLUGIN.isTabCompletable(input);
         }
 
-        if(packetObj.getClass().getSimpleName().equals("ClientboundCommandSuggestionsPacket")) {
+        if (is121Packet || Reflection.isFoliaServer() && packetObj.getClass().getSimpleName().equals("PacketPlayOutTabComplete")) {
+            try {
+                Field suggestionsField = Reflection.getFieldsByTypeNormal(packetObj.getClass(), "List", Reflection.SearchOption.ENDS).get(0);
+                List<?> suggestionsTmp = (List<?>) suggestionsField.get(packetObj),
+                suggestions = new ArrayList<>(suggestionsTmp);
+
+                List<Field> intFields = Reflection.getFieldsByTypeNormal(packetObj.getClass(), "int", Reflection.SearchOption.ENDS);
+                int id = (int) intFields.get(0).get(packetObj),
+                        start = (int) intFields.get(1).get(packetObj),
+                        length = (int) intFields.get(2).get(packetObj);
+
+                Class<?> clientboundCommandSuggestionsPacketClass = Class.forName("net.minecraft.network.protocol.game."  + (packetObj.getClass().getSimpleName().equals("PacketPlayOutTabComplete") ? "PacketPlayOutTabComplete" : "ClientboundCommandSuggestionsPacket"));
+                if ((input.isEmpty() || cancelsBeforeHand) && Reflection.isWeird())
+                    return false;
+
+                if (spaces >= 1 && cancelsBeforeHand || !BukkitLoader.isLoaded()) {
+                    suggestions.clear();
+                    return true;
+                }
+
+                if (spaces == 0) {
+                    suggestions.removeIf(suggestion -> {
+                        String command = getSuggestionFromEntry(suggestion);
+                        return !Storage.Blacklist.canPlayerAccessTab(sender, groups, command);
+                    });
+
+                    return true;
+
+                } else {
+                    List<String> suggestionsAsString = new ArrayList<>();
+                    for (Object suggestion : suggestions)
+                        suggestionsAsString.add(getSuggestionFromEntry(suggestion));
+
+                    FilteredTabCompletionEvent filteredTabCompletionEvent = PATEventHandler.callFilteredTabCompletionEvents(player.getUniqueId(), rawInput, suggestionsAsString);
+                    if (filteredTabCompletionEvent.isCancelled()) suggestions.clear();
+
+                    for (int i = 0; i < suggestions.size(); i++) {
+                        Object csO = suggestions.get(i);
+
+                        String suggestionAsString = getSuggestionFromEntry(csO);
+                        if (!filteredTabCompletionEvent.getCompletion().contains(suggestionAsString))
+                            suggestions.remove(csO);
+                    }
+
+                    suggestions.removeIf(suggestion -> !filteredTabCompletionEvent.getCompletion().contains(getSuggestionFromEntry(suggestion)));
+                }
+
+                if(!suggestions.isEmpty()) {
+
+                    Object clientboundCommandSuggestionsPacketObj = clientboundCommandSuggestionsPacketClass
+                            .getConstructor(int.class, int.class, int.class, List.class)
+                            .newInstance(id, start, length, suggestions);
+
+                    BukkitPacketAnalyzer.sendPacket(player.getUniqueId(), clientboundCommandSuggestionsPacketObj);
+                }
+
+                return false;
+
+            } catch (Throwable throwable) {
+                throwable.printStackTrace();
+            }
+
             return !cancelsBeforeHand;
         }
 
+
         if (Reflection.getMinor() < 17) {
             Field suggestionsField = Reflection.getFieldsByType(packetObj.getClass(), "Suggestions", Reflection.SearchOption.ENDS).get(0);
             if (suggestionsField == null) return false;
             suggestionObj = suggestionsField.get(packetObj);
         } else {
-            Method suggestionsMethod = Reflection.getMethodsByReturnType(packetObj.getClass(), "Suggestions", Reflection.SearchOption.ENDS).get(0);
-            if (suggestionsMethod == null) return false;
+            List<Method> methods = Reflection.getMethodsByReturnType(packetObj.getClass(), "Suggestions", Reflection.SearchOption.ENDS);
+
+            if (methods.isEmpty()) return false;
+            Method suggestionsMethod = methods.get(0);
+
+            if (suggestionsMethod == null)
+                return false;
+
             suggestionObj = suggestionsMethod.invoke(packetObj);
         }
 
         Suggestions suggestions = (Suggestions) suggestionObj;
 
-        if((input.length() < 1 || cancelsBeforeHand) && Reflection.isWeird()) return false;
+        if((input.isEmpty() || cancelsBeforeHand) && Reflection.isWeird()) {
+            return false;
+        }
+
         if(spaces >= 1 && cancelsBeforeHand || !BukkitLoader.isLoaded()) {
             suggestions.getList().clear();
             return true;
         }
 
         if(spaces == 0) {
+
             suggestions.getList().removeIf(suggestion -> {
                 String command = suggestion.getText();
-                return Storage.Blacklist.isBlocked(player, command);
+                return !Storage.Blacklist.canPlayerAccessTab(sender, groups, command);
             });
+
             return true;
+
+        } else {
+            List<String> suggestionsAsString = new ArrayList<>();
+            for (Suggestion suggestion : suggestions.getList())
+                suggestionsAsString.add(suggestion.getText());
+
+            FilteredTabCompletionEvent filteredTabCompletionEvent = PATEventHandler.callFilteredTabCompletionEvents(player.getUniqueId(), rawInput, suggestionsAsString);
+
+            if (modifiable) {
+
+                try {
+
+                    if (filteredTabCompletionEvent.isCancelled())
+                        suggestions.getList().clear();
+                    else
+                        suggestions.getList().removeIf(suggestion -> !filteredTabCompletionEvent.getCompletion().contains(suggestion.getText()));
+
+                    return !suggestions.getList().isEmpty();
+
+                } catch (UnsupportedOperationException exception) {
+                    modifiable = false;
+                }
+            }
+
+            return handleUnmodifiableTabCompletion(player, packetObj, suggestions, filteredTabCompletionEvent);
+        }
+    }
+
+    private boolean handleUnmodifiableTabCompletion(Player player, Object packetObj, Suggestions suggestions, FilteredTabCompletionEvent filteredTabCompletionEvent) {
+        List<Suggestion> filteredSuggestionsList = new ArrayList<>();
+
+        if (!filteredTabCompletionEvent.isCancelled())
+            for (Suggestion suggestion : suggestions.getList()) {
+                if (filteredTabCompletionEvent.getCompletion().contains(suggestion.getText())) {
+                    filteredSuggestionsList.add(suggestion);
+                }
+            }
+
+        Suggestions filteredSuggestions = new Suggestions(suggestions.getRange(), filteredSuggestionsList);
+
+        try {
+            int val = -1;
+
+            Method method = Reflection.getMethodByName(packetObj.getClass(), "e");
+            if (method != null) {
+                val = (int) method.invoke(packetObj);
+            }
+
+            if (val == -1) {
+                Logger.warning("Failed to read packet input!");
+                return false;
+            }
+
+            Object packet = Reflection.getConstructor(packetObj.getClass(), int.class, Suggestions.class)
+                    .newInstance(val, filteredSuggestions);
+
+            BukkitPacketAnalyzer.sendPacket(player.getUniqueId(), packet);
+
+        } catch (Exception exception) {
+            exception.printStackTrace();
         }
 
-        return true;
+        return false;
+    }
+
+    private String getSuggestionFromEntry(Object suggestionObj) {
+        try {
+            List<Field> fields = Reflection.getFieldsByTypeNormal(suggestionObj.getClass(), "String", Reflection.SearchOption.ENDS);
+            if(fields.isEmpty()) return "";
+
+            Field field = fields.get(0);
+            String result = (String) field.get(suggestionObj);
+            field.setAccessible(false);
+            return result;
+        } catch (Throwable throwable) {
+            throwable.printStackTrace();
+        }
+
+        return "";
     }
 }

src/main/java/de/rayzs/pat/api/netty/proxy/BungeePacketAnalyzer.java

@@ -1,23 +1,36 @@
 package de.rayzs.pat.api.netty.proxy;
 
-import com.mojang.brigadier.arguments.StringArgumentType;
-import de.rayzs.pat.api.communication.client.ClientInfo;
-import io.netty.handler.codec.MessageToMessageDecoder;
-import de.rayzs.pat.utils.permission.PermissionUtil;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
-import de.rayzs.pat.api.communication.Communicator;
-import net.md_5.bungee.protocol.PacketWrapper;
-import java.util.concurrent.ConcurrentHashMap;
-import com.mojang.brigadier.tree.CommandNode;
-import net.md_5.bungee.api.plugin.Command;
-import net.md_5.bungee.protocol.packet.*;
-import de.rayzs.pat.api.storage.Storage;
-import net.md_5.bungee.api.ProxyServer;
-import com.mojang.brigadier.builder.*;
 import java.lang.reflect.Field;
-import de.rayzs.pat.utils.*;
-import io.netty.channel.*;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+
+import com.mojang.brigadier.tree.CommandNode;
+
+import com.mojang.brigadier.tree.RootCommandNode;
+import de.rayzs.pat.api.brand.CustomServerBrand;
+import de.rayzs.pat.api.storage.Storage;
+import de.rayzs.pat.plugin.logger.Logger;
+import de.rayzs.pat.plugin.subarguments.SubArguments;
+import de.rayzs.pat.utils.CommandsCache;
+import de.rayzs.pat.utils.ExpireCache;
+import de.rayzs.pat.utils.group.Group;
+import de.rayzs.pat.utils.group.GroupManager;
+import de.rayzs.pat.utils.node.ProxyCommandNodeHelper;
+import de.rayzs.pat.utils.Reflection;
+import de.rayzs.pat.utils.permission.PermissionUtil;
+import de.rayzs.pat.utils.sender.CommandSender;
+import de.rayzs.pat.utils.sender.CommandSenderHandler;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.MessageToMessageDecoder;
+import net.md_5.bungee.api.ProxyServer;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.plugin.Command;
+import net.md_5.bungee.protocol.PacketWrapper;
+import net.md_5.bungee.protocol.packet.Commands;
+import net.md_5.bungee.protocol.packet.PluginMessage;
 
 public class BungeePacketAnalyzer {
 
@@ -25,13 +38,26 @@ public class BungeePacketAnalyzer {
 
     private static final String HANDLER_NAME = "pat-bungee-handler", PIPELINE_NAME = "packet-decoder";
     private static final HashMap<ProxiedPlayer, Boolean> PLAYER_MODIFIED = new HashMap<>();
-    private static final HashMap<ProxiedPlayer, String> PLAYER_INPUT_CACHE = new HashMap<>();
+    private static final ExpireCache<UUID, String> PLAYER_INPUT_CACHE = new ExpireCache<>(5, TimeUnit.SECONDS);
 
-    private static final com.mojang.brigadier.Command DUMMY_COMMAND = (context) -> 0;
     private static final List<String> PLUGIN_COMMANDS = new ArrayList<>();
 
     private static Class<?> channelWrapperClass, serverConnectionClass;
 
+    private static List<String> PROXY_COMMANDS;
+
+    static {
+        ProxyCommandNodeHelper.setDefaultSuggestionProvider(Commands.SuggestionRegistry.ASK_SERVER);
+        loadProxyCommands();
+    }
+
+    public static void loadProxyCommands() {
+        PROXY_COMMANDS = ProxyServer.getInstance().getPluginManager().getCommands().stream().map(entry -> {
+            String key = entry.getKey();
+            return key.startsWith("/") ? key.substring(1) : key;
+        }).toList();
+    }
+
     public static void injectAll() {
         ProxyServer.getInstance().getPlayers().forEach(BungeePacketAnalyzer::inject);
     }
@@ -64,25 +90,29 @@ public class BungeePacketAnalyzer {
             channel = (Channel) Reflection.getFieldsByType(channelWrapperClass, "Channel", Reflection.SearchOption.ENDS).get(0).get(channelWrapperObj);
 
             if(channel == null) {
-                System.err.println("Failed to inject " + player.getName() + "! Channel is null.");
+                Logger.warning("Failed to inject " + player.getName() + "! Channel is null.");
                 return false;
             }
 
             channelField.setAccessible(false);
 
-            if(channel.pipeline().names().contains(BungeePacketAnalyzer.HANDLER_NAME))
+            if (channel.pipeline().names().contains(BungeePacketAnalyzer.HANDLER_NAME))
                 uninject(player);
 
             channel.pipeline().addAfter(BungeePacketAnalyzer.PIPELINE_NAME, BungeePacketAnalyzer.HANDLER_NAME, new PacketDecoder(player));
             BungeePacketAnalyzer.INJECTED_PLAYERS.put(player, channel);
+
         } catch (Throwable throwable) {
             throwable.printStackTrace();
             return false;
-        } return true;
+
+        }
+
+        return true;
     }
 
     public static void uninject(ProxiedPlayer player) {
-        BungeePacketAnalyzer.PLAYER_INPUT_CACHE.remove(player);
+        BungeePacketAnalyzer.PLAYER_INPUT_CACHE.remove(player.getUniqueId());
         BungeePacketAnalyzer.PLAYER_MODIFIED.remove(player);
 
         if(BungeePacketAnalyzer.INJECTED_PLAYERS.containsKey(player)) {
@@ -91,65 +121,127 @@ public class BungeePacketAnalyzer {
                 BungeePacketAnalyzer.INJECTED_PLAYERS.remove(player);
                 channel.eventLoop().submit(() -> {
                     ChannelPipeline pipeline = channel.pipeline();
-                    if (pipeline.names().contains(BungeePacketAnalyzer.HANDLER_NAME)) pipeline.remove(BungeePacketAnalyzer.HANDLER_NAME);
+
+                    if (pipeline.names().contains(BungeePacketAnalyzer.HANDLER_NAME))
+                        pipeline.remove(BungeePacketAnalyzer.HANDLER_NAME);
                 });
             }
         }
     }
 
+    public static void setPlayerInput(ProxiedPlayer player, String input) {
+        PLAYER_INPUT_CACHE.putIgnoreIfContains(player.getUniqueId(), input);
+    }
+
     public static String getPlayerInput(ProxiedPlayer player) {
-        String input = PLAYER_INPUT_CACHE.get(player);
-        PLAYER_INPUT_CACHE.remove(player);
+        String input = PLAYER_INPUT_CACHE.get(player.getUniqueId());
+        PLAYER_INPUT_CACHE.remove(player.getUniqueId());
         return input;
     }
 
-    public static void insertPlayerInput(ProxiedPlayer player, String text) {
-        PLAYER_INPUT_CACHE.put(player, text.toLowerCase());
-    }
+    private static void modifyCommands(ProxiedPlayer player, CommandSender sender, Commands commands) {
+        String serverName = sender.getServerName();
 
-    private static void modifyCommands(ProxiedPlayer player, Commands commands, List<String> list) {
-        final String serverName = player.getServer().getInfo().getName();
-        final boolean turn = Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED;
-        list.clear();
+        final boolean ignore = PermissionUtil.hasBypassPermission(sender) || Storage.Blacklist.isDisabledServer(serverName);
+
+        ProxyCommandNodeHelper helper = new ProxyCommandNodeHelper<CommandNode>(commands.getRoot());
+
+        List<String> commandsAsString = new ArrayList<>(PROXY_COMMANDS);
+        commandsAsString.addAll(helper.getChildrenNames());
+
+        List<String> playerCommands = new ArrayList<>();
+
+        if (!ignore) {
+            final List<Group> groups = GroupManager.getPlayerGroups(sender);
+
+            final Map<String, CommandsCache> cache = Storage.getLoader().getCommandsCacheMap();
+            if (!cache.containsKey(serverName)) {
+                cache.put(serverName, new CommandsCache());
+            }
+
+            final CommandsCache commandsCache = cache.get(serverName);
+            commandsCache.handleCommands(commandsAsString, serverName);
+
+            final List<String> tmpPlayerCommands = commandsCache.getPlayerCommands(commandsAsString, sender, groups, serverName);
+
+            if (commands.getRoot().getChildren().size() != 0) {
+                helper.removeIf(str -> !tmpPlayerCommands.contains(str));
+            }
+
+            if (Storage.ConfigSections.Settings.CUSTOM_VERSION.ALWAYS_TAB_COMPLETABLE) {
+                Storage.ConfigSections.Settings.CUSTOM_VERSION.COMMANDS.getLines().forEach(input -> helper.add(input, false));
+            }
+
+            if (Storage.ConfigSections.Settings.CUSTOM_PLUGIN.ALWAYS_TAB_COMPLETABLE) {
+                Storage.ConfigSections.Settings.CUSTOM_PLUGIN.COMMANDS.getLines().forEach(input -> helper.add(input, false));
+            }
+
+            playerCommands = tmpPlayerCommands;
+        }
 
         for (Map.Entry<String, Command> command : ProxyServer.getInstance().getPluginManager().getCommands()) {
-            if (!ProxyServer.getInstance().getDisabledCommands().contains(command.getKey()) && commands.getRoot().getChild(command.getKey()) == null && command.getValue().hasPermission(player)) {
 
-                List<String> commandsToCheck =
-                        new ArrayList<>(Arrays.asList(command.getValue().getAliases()));
-                if(!commandsToCheck.contains(command.getValue().getName()))
-                    commandsToCheck.add(command.getValue().getName());
-                if(!commandsToCheck.contains(command.getKey()))
-                    commandsToCheck.add(command.getKey());
+            if (ProxyServer.getInstance().getDisabledCommands().contains(command.getKey()))
+                continue;
 
-                commandsToCheck.removeAll(list);
-                commandsToCheck.removeIf(commandName -> commandName.startsWith("/"));
+            if (commands.getRoot().getChild(command.getKey()) != null)
+                continue;
 
-                for (String commandName : commandsToCheck) {
-                    if (!list.contains(commandName)) {
-                        if (!Storage.Blacklist.isBlocked(player, commandName, !turn, serverName)) {
-                            list.add(commandName);
-                            CommandNode dummy = LiteralArgumentBuilder.literal(commandName)
-                                    .executes(DUMMY_COMMAND)
-                                    .then(RequiredArgumentBuilder.argument("args", StringArgumentType.greedyString())
-                                            .suggests(Commands.SuggestionRegistry.ASK_SERVER).executes(DUMMY_COMMAND))
-                                    .build();
+            if (!command.getValue().hasPermission(player)) {
+                continue;
+            }
 
-                            commands.getRoot().addChild(dummy);
-                        }
-                    }
+            String commandName = command.getKey();
+            commandName = commandName.startsWith("/") ? commandName.substring(1) : commandName;
+
+            if (!ignore) {
+                boolean tabablePluginCommand = Storage.ConfigSections.Settings.CUSTOM_PLUGIN.isTabCompletable(commandName);
+                boolean tabableVersionCommand = Storage.ConfigSections.Settings.CUSTOM_VERSION.isTabCompletable(commandName);
+
+                if (!tabablePluginCommand && !tabableVersionCommand && !playerCommands.contains(commandName)) {
+                    continue;
                 }
             }
+
+            CommandNode dummy = ProxyCommandNodeHelper.createDummyCommandNode(command.getKey());
+            commands.getRoot().addChild(dummy);
+        }
+
+
+        for (String command : PROXY_COMMANDS) {
+            if (ignore || playerCommands.contains(command)) {
+                helper.add(command, true);
+            }
+        }
+
+        if (!ignore) {
+            SubArguments.handleCommandNode(player.getUniqueId(), helper);
+        }
+    }
+
+    public static void sendCommandsPacket() {
+        for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) {
+            if (player.getPendingConnection().getVersion() < 754)
+                continue;
+
+            final CommandSender sender = CommandSenderHandler.from(player);
+
+            RootCommandNode root = new RootCommandNode();
+            Commands packet = new Commands(root);
+
+            modifyCommands(player, sender, packet);
+            player.unsafe().sendPacket(packet);
         }
     }
 
     private static class PacketDecoder extends MessageToMessageDecoder<PacketWrapper> {
 
         private final ProxiedPlayer player;
-        private final List<String> commands = new ArrayList<>();
+        private final CommandSender sender;
 
         private PacketDecoder(ProxiedPlayer player) {
             this.player = player;
+            this.sender = CommandSenderHandler.from(player);
         }
 
         @Override
@@ -159,52 +251,70 @@ public class BungeePacketAnalyzer {
                 return;
             }
 
-            if (wrapper.packet instanceof Commands) {
+            if (wrapper.packet instanceof PluginMessage) {
+                PluginMessage pluginMessage = (PluginMessage) wrapper.packet;
+                if(CustomServerBrand.isEnabled() && CustomServerBrand.isBrandTag(pluginMessage.getTag()))
+                    return;
+
+            } else if (wrapper.packet instanceof Commands) {
                 Commands response = (Commands) wrapper.packet;
-                modifyCommands(player, response, commands);
+                modifyCommands(player, sender, response);
+
                 player.unsafe().sendPacket(response);
                 return;
 
+                /*
             } else if (wrapper.packet instanceof TabCompleteResponse) {
                 TabCompleteResponse response = (TabCompleteResponse) wrapper.packet;
+                String serverName = player.getServer().getInfo().getName();
 
-                if(player.getPendingConnection().getVersion() < 754) {
-                    if(!PermissionUtil.hasBypassPermission(player)) {
+                System.out.println("damn");
 
-                        ClientInfo clientInfo = Communicator.getClientByName(player.getServer().getInfo().getName());
-                        if (clientInfo == null || !PLAYER_INPUT_CACHE.containsKey(player))
+                if (!Storage.Blacklist.isDisabledServer(serverName) && player.getPendingConnection().getVersion() < 754) {
+                    if (!PermissionUtil.hasBypassPermission(player)) {
+
+                        System.out.println("Further!");
+                        System.out.println("Got: " + PLAYER_INPUT_CACHE.get(player.getUniqueId()));
+
+                        if (!PLAYER_INPUT_CACHE.contains(player.getUniqueId()))
                             return;
 
                         boolean cancelsBeforeHand = false;
-                        String playerInput = getPlayerInput(player), server = player.getServer().getInfo().getName();
-                        int spaces = 0;
 
-                        if(playerInput.contains(" ")) {
-                            String[] split = playerInput.split(" ");
-                            spaces = split.length;
-                            if(spaces > 0) playerInput = split[0];
+                        String rawPlayerInput = PLAYER_INPUT_CACHE.get(player.getUniqueId());
+                        int spaces = rawPlayerInput.contains(" ") ? rawPlayerInput.split(" ").length : 0;
+
+                        String playerInput = StringUtils.getFirstArg(rawPlayerInput),
+                                server = player.getServer().getInfo().getName();
+
+                        System.out.println("NETTY -> " + playerInput);
+
+                        if (!playerInput.equals("/")) {
+                            cancelsBeforeHand = !Storage.Blacklist.canPlayerAccessTab(player, StringUtils.replaceFirst(playerInput, "/", ""), server);
+
+                            if (!cancelsBeforeHand)
+                                cancelsBeforeHand = !Storage.ConfigSections.Settings.CUSTOM_VERSION.isTabCompletable(StringUtils.replaceFirst(playerInput, "/", "")) || Storage.ConfigSections.Settings.CUSTOM_PLUGIN.isTabCompletable(StringUtils.replaceFirst(playerInput, "/", ""));
                         }
 
-                        if(!playerInput.equals("/")) {
-                            cancelsBeforeHand = Storage.Blacklist.isBlocked(player, StringUtils.replaceFirst(playerInput, "/", ""), !Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED, server);
-                            if(!cancelsBeforeHand) cancelsBeforeHand = Storage.ConfigSections.Settings.CUSTOM_VERSION.isCommand(StringUtils.replaceFirst(playerInput, "/", ""));
-                        }
                         final String cursor = playerInput;
-                        if(cursor.startsWith("/")) {
-                            if(spaces == 0) {
+
+                        if (cursor.startsWith("/")) {
+                            if (spaces == 0) {
                                 List<String> suggestions = new ArrayList<>(response.getCommands());
 
                                 if (Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED) {
                                     setPluginCommands();
 
-                                    Storage.Blacklist.getAllBlacklists(server).forEach(blacklist -> blacklist.getCommands().stream().filter(command -> !suggestions.contains("/" + command)).forEach(command -> {
+                                    Storage.Blacklist.getServerBlacklists(server).forEach(blacklist -> blacklist.getCommands().stream().filter(command -> !suggestions.contains("/" + command)).forEach(command -> {
                                         if (BungeePacketAnalyzer.PLUGIN_COMMANDS.contains(command))
                                             suggestions.add("/" + command);
                                     }));
 
                                     BungeePacketAnalyzer.PLUGIN_COMMANDS.stream().filter(command -> !suggestions.contains(command)).forEach(command -> {
-                                        if(command.startsWith("/")) command = StringUtils.replaceFirst(command, "/", "");
-                                        if(PermissionUtil.hasBypassPermission(player, command, server)) {
+                                        if (command.startsWith("/")) 
+                                            command = StringUtils.replaceFirst(command, "/", "");
+                                        
+                                        if (Storage.Blacklist.canPlayerAccessTab(player, command, server)) {
                                             suggestions.add("/" + command);
                                         }
                                     });
@@ -213,23 +323,30 @@ public class BungeePacketAnalyzer {
 
                                 } else {
                                     BungeePacketAnalyzer.PLUGIN_COMMANDS.stream().filter(command -> !suggestions.contains(command)).forEach(suggestions::add);
+
                                     suggestions.removeIf(command -> {
-                                        if(command.startsWith("/")) command = StringUtils.replaceFirst(command, "/", "");
-                                        return Storage.Blacklist.isBlocked(player, command, true, server, true);
+                                        if (command.startsWith("/"))
+                                            command = StringUtils.replaceFirst(command, "/", "");
+
+                                        return !Storage.Blacklist.canPlayerAccessTab(player, command, server);
                                     });
+
                                     response.getCommands().clear();
                                     suggestions.forEach(command -> response.getCommands().add(command));
                                 }
 
-                                if (response.getCommands().isEmpty()) return;
+                                if (response.getCommands().isEmpty())
+                                    return;
+
                             } else {
-                                if(cancelsBeforeHand) return;
+                                if (cancelsBeforeHand)
+                                    return;
                             }
 
                             player.unsafe().sendPacket(new TabCompleteResponse(response.getCommands()));
                         }
                     }
-                }
+                }*/
             }
 
             list.add(wrapper);

src/main/java/de/rayzs/pat/api/netty/proxy/VelocityPacketAnalyzer.java

@@ -1,26 +1,78 @@
 package de.rayzs.pat.api.netty.proxy;
 
-import com.velocitypowered.proxy.protocol.MinecraftPacket;
-import de.rayzs.pat.plugin.logger.Logger;
-import de.rayzs.pat.utils.permission.PermissionUtil;
-import com.velocitypowered.proxy.protocol.packet.*;
-import java.util.concurrent.ConcurrentHashMap;
-import com.velocitypowered.api.proxy.Player;
-import de.rayzs.pat.plugin.VelocityLoader;
-import de.rayzs.pat.api.storage.Storage;
-import de.rayzs.pat.utils.*;
-import io.netty.channel.*;
+import java.lang.reflect.Field;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.mojang.brigadier.suggestion.SuggestionProvider;
+import com.velocitypowered.api.command.CommandSource;
+import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.proxy.protocol.MinecraftPacket;
+import com.velocitypowered.proxy.protocol.packet.AvailableCommandsPacket;
+import com.velocitypowered.proxy.protocol.packet.PluginMessagePacket;
+import com.velocitypowered.proxy.protocol.packet.TabCompleteRequestPacket;
+import com.velocitypowered.proxy.protocol.packet.TabCompleteResponsePacket;
+import com.velocitypowered.proxy.protocol.packet.chat.session.UnsignedPlayerCommandPacket;
+
+import de.rayzs.pat.api.brand.CustomServerBrand;
+import de.rayzs.pat.api.event.PATEventHandler;
+import de.rayzs.pat.api.event.events.FilteredTabCompletionEvent;
+import de.rayzs.pat.api.storage.Storage;
+import de.rayzs.pat.plugin.VelocityLoader;
+import de.rayzs.pat.plugin.listeners.velocity.VelocityBlockCommandListener;
+import de.rayzs.pat.plugin.logger.Logger;
+import de.rayzs.pat.plugin.subarguments.SubArguments;
+import de.rayzs.pat.utils.CommandsCache;
+import de.rayzs.pat.utils.PacketUtils;
+import de.rayzs.pat.utils.Reflection;
+import de.rayzs.pat.utils.StringUtils;
+import de.rayzs.pat.utils.group.Group;
+import de.rayzs.pat.utils.group.GroupManager;
+import de.rayzs.pat.utils.message.MessageTranslator;
+import de.rayzs.pat.utils.node.ProxyCommandNodeHelper;
+import de.rayzs.pat.utils.permission.PermissionUtil;
+import de.rayzs.pat.utils.sender.CommandSender;
+import de.rayzs.pat.utils.sender.CommandSenderHandler;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPromise;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 
 public class VelocityPacketAnalyzer {
 
+    private static boolean FAILED = false;
+
+    static {
+        try {
+            final String name = "minecraft:ask_server";
+
+            final Object availableCommandsPacket = AvailableCommandsPacket.class.newInstance();
+            final Class<?> packetInstanceObjClass = availableCommandsPacket.getClass();
+
+            for (Class<?> clazz : packetInstanceObjClass.getClasses()) {
+                if (clazz.getSimpleName().equals("ProtocolSuggestionProvider")) {
+                    final Object suggestionProviderObj = clazz.getConstructor(String.class).newInstance(name);
+                    final SuggestionProvider<?> suggestionProvider = (SuggestionProvider<?>) suggestionProviderObj;
+
+                    ProxyCommandNodeHelper.setDefaultSuggestionProvider(suggestionProvider);
+                    break;
+                }
+            }
+
+        } catch (Exception exception) {
+            exception.printStackTrace();
+            FAILED = true;
+        }
+    }
+
     public static final ConcurrentHashMap<Player, Channel> INJECTED_PLAYERS = new ConcurrentHashMap<>();
 
     private static final String PIPELINE_NAME = "pat-velocity-handler", HANDLER_NAME = "handler";
     private static final HashMap<Player, String> PLAYER_INPUT_CACHE = new HashMap<>();
-    private static HashMap<String, CommandsCache> COMMANDS_CACHE_MAP = new HashMap<>();
 
-    private static Class<?> minecraftConnectionClass, connectedPlayerConnectionClass;
+    private static Class<?> minecraftConnectionClass, connectedPlayerConnectionClass, signedChatCommandPacketClass;
 
     public static void injectAll() {
         VelocityLoader.getServer().getAllPlayers().forEach(VelocityPacketAnalyzer::inject);
@@ -51,20 +103,27 @@ public class VelocityPacketAnalyzer {
 
             channel = (Channel) Reflection.getMethodsByName(minecraftConnectionClass, "getChannel").get(0).invoke(minecraftConnectionObj);
 
-            if(channel == null) {
-                System.out.println("Failed to inject " + player.getUsername() + "! Channel is null.");
+            if (channel == null) {
+                Logger.warning("Failed to inject " + player.getUsername() + "! Channel is null.");
                 return false;
             }
 
-            if(channel.pipeline().names().contains(VelocityPacketAnalyzer.PIPELINE_NAME))
+            if (channel.pipeline().names().contains(VelocityPacketAnalyzer.PIPELINE_NAME))
                 uninject(player);
 
             channel.pipeline().addBefore(VelocityPacketAnalyzer.HANDLER_NAME, VelocityPacketAnalyzer.PIPELINE_NAME, new PacketDecoder(player));
             VelocityPacketAnalyzer.INJECTED_PLAYERS.put(player, channel);
+
+        } catch (NoSuchElementException e) {
+            Logger.warning("Failed to find 'handler' inside player pipeline! (name=" + player.getUsername() + ", uuid=" + player.getUniqueId() + ", version=" + player.getProtocolVersion() + ", brand=" + player.getClientBrand() + " )");
+            return false;
+
         } catch (Throwable throwable) {
             throwable.printStackTrace();
             return false;
-        } return true;
+        }
+
+        return true;
     }
 
     public static void uninject(Player player) {
@@ -92,12 +151,67 @@ public class VelocityPacketAnalyzer {
         PLAYER_INPUT_CACHE.put(player, text.toLowerCase());
     }
 
+    private static void modifyCommands(Player player, CommandSender sender, AvailableCommandsPacket commands) {
+
+        if (commands.getRootNode().getChildren().size() == 1
+                && player.getProtocolVersion().getProtocol() > 340
+                && commands.getRootNode().getChild("args") != null
+                && commands.getRootNode().getChild("args").getChildren().isEmpty()) {
+
+            return;
+        }
+
+
+        String serverName = sender.getServerName();
+
+        final boolean ignore = PermissionUtil.hasBypassPermission(sender) || Storage.Blacklist.isDisabledServer(serverName);
+        final ProxyCommandNodeHelper<CommandSource> helper = new ProxyCommandNodeHelper<>(commands.getRootNode());
+
+        final List<String> commandsAsString = new ArrayList<>();
+        commandsAsString.addAll(helper.getChildrenNames());
+
+        if (ignore) {
+            return;
+        }
+
+        final List<Group> groups = GroupManager.getPlayerGroups(sender);
+
+        final Map<String, CommandsCache> cache = Storage.getLoader().getCommandsCacheMap();
+        if (!cache.containsKey(serverName)) {
+            cache.put(serverName, new CommandsCache());
+        }
+
+        final CommandsCache commandsCache = cache.get(serverName);
+        commandsCache.handleCommands(commandsAsString, serverName);
+
+        final List<String> playerCommands = commandsCache.getPlayerCommands(commandsAsString, sender, groups, serverName);
+        helper.removeIf(str -> {
+            if (str.equals("args")) {
+                return false;
+            }
+
+            return !playerCommands.contains(str);
+        });
+
+        if (Storage.ConfigSections.Settings.CUSTOM_VERSION.ALWAYS_TAB_COMPLETABLE) {
+            Storage.ConfigSections.Settings.CUSTOM_VERSION.COMMANDS.getLines().forEach(input -> helper.add(input, false));
+        }
+
+        if (Storage.ConfigSections.Settings.CUSTOM_PLUGIN.ALWAYS_TAB_COMPLETABLE) {
+            Storage.ConfigSections.Settings.CUSTOM_PLUGIN.COMMANDS.getLines().forEach(input -> helper.add(input, false));
+        }
+
+        SubArguments.handleCommandNode(player.getUniqueId(), helper);
+    }
+
     private static class PacketDecoder extends ChannelDuplexHandler {
 
         private final Player player;
+        private final CommandSender sender;
 
         private PacketDecoder(Player player) {
             this.player = player;
+            this.sender = CommandSenderHandler.from(player);
         }
 
         @Override
@@ -109,11 +223,39 @@ public class VelocityPacketAnalyzer {
 
             MinecraftPacket packet = (MinecraftPacket) msg;
 
-            if(packet instanceof TabCompleteRequestPacket) {
-                TabCompleteRequestPacket request = (TabCompleteRequestPacket) msg;
-                if(request.getCommand() != null) {
-                    insertPlayerInput(player, request.getCommand());
-                    super.channelRead(ctx, msg);
+            if (packet.getClass().getSimpleName().equals("SignedChatCommand")) {
+
+                try {
+                    if (signedChatCommandPacketClass == null)
+                        signedChatCommandPacketClass = Class.forName("com.velocitypowered.proxy.crypto.SignedChatCommand");
+
+                    Object signedChatCommandPacket = signedChatCommandPacketClass.cast(packet);
+                    Field commandField = signedChatCommandPacket.getClass().getField("command");
+                    String command = (String) commandField.get(signedChatCommandPacket);
+
+                    if (!VelocityBlockCommandListener.handleCommand(player, command).getResult().isAllowed())
+                        return;
+
+                } catch (Exception exception) {
+                    exception.printStackTrace();
+                }
+            }
+
+            if (packet instanceof UnsignedPlayerCommandPacket unsignedPlayerCommandPacket) {
+                if (!VelocityBlockCommandListener.handleCommand(player, unsignedPlayerCommandPacket.getCommand()).getResult().isAllowed())
+                    return;
+            }
+
+            if (packet instanceof TabCompleteRequestPacket request) {
+                if (request.getCommand() != null) {
+
+                    if (Storage.ConfigSections.Settings.PATCH_EXPLOITS.isMalicious(request.getCommand())) {
+                        MessageTranslator.send(VelocityLoader.getServer().getConsoleCommandSource(), Storage.ConfigSections.Settings.PATCH_EXPLOITS.ALERT_MESSAGE.get().replace("%player%", player.getUsername()));
+                        player.disconnect(LegacyComponentSerializer.legacyAmpersand().deserialize(Storage.ConfigSections.Settings.PATCH_EXPLOITS.KICK_MESSAGE.get()));
+                    } else {
+                        insertPlayerInput(player, request.getCommand());
+                        super.channelRead(ctx, msg);
+                    }
                 }
             } else super.channelRead(ctx, msg);
         }
@@ -127,65 +269,144 @@ public class VelocityPacketAnalyzer {
 
             MinecraftPacket packet = (MinecraftPacket) msg;
 
-            if(packet instanceof TabCompleteResponsePacket) {
-                if (!PermissionUtil.hasBypassPermission(player) && player.getCurrentServer().isPresent()) {
-                    TabCompleteResponsePacket response = (TabCompleteResponsePacket) packet;
+            if (packet instanceof PluginMessagePacket pluginMessagePacket) {
+                if(CustomServerBrand.isEnabled() && CustomServerBrand.isBrandTag(pluginMessagePacket.getChannel()) && !player.getCurrentServer().isPresent()) {
+                    PacketUtils.BrandManipulate brandManipulatePacket = CustomServerBrand.createBrandPacket(player);
+                    super.write(ctx, new PluginMessagePacket(pluginMessagePacket.getChannel(), brandManipulatePacket.getByteBuf()), promise);
+                    return;
+                }
+
+            } else if (packet instanceof TabCompleteResponsePacket response) {
+
+                String serverName = player.getCurrentServer().get().getServer().getServerInfo().getName();
+
+                if (Storage.Blacklist.isDisabledServer(serverName)) {
+                    super.write(ctx, msg, promise);
+                    return;
+                }
+
+                if (!PermissionUtil.hasBypassPermission(sender) && player.getCurrentServer().isPresent()) {
+                    final List<Group> groups = GroupManager.getPlayerGroups(sender);
 
                     boolean cancelsBeforeHand = false;
-                    String playerInput = getPlayerInput(player), server = player.getCurrentServer().get().getServerInfo().getName();
+                    String playerInput = getPlayerInput(player), rawPlayerInput = playerInput, server = player.getCurrentServer().get().getServerInfo().getName();
                     int spaces = 0;
 
-                    if(playerInput.contains(" ")) {
+                    if (playerInput.contains(" ")) {
                         String[] split = playerInput.split(" ");
                         spaces = split.length;
-                        if(spaces > 0) playerInput = split[0];
+                        if (spaces > 0) playerInput = split[0];
                     }
 
-                    if(!playerInput.equals("/")) {
-                        cancelsBeforeHand = Storage.Blacklist.isBlocked(player, StringUtils.replaceFirst(playerInput, "/", ""), !Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED, server);
-                        if(!cancelsBeforeHand) cancelsBeforeHand = Storage.ConfigSections.Settings.CUSTOM_VERSION.isCommand(StringUtils.replaceFirst(playerInput, "/", ""));
+                    if (!playerInput.equals("/")) {
+                        cancelsBeforeHand = !Storage.Blacklist.canPlayerAccessTab(sender, groups, StringUtils.replaceFirst(playerInput, "/", ""), server);
+
+                        if (!cancelsBeforeHand)
+                            cancelsBeforeHand = Storage.ConfigSections.Settings.CUSTOM_VERSION.isTabCompletable(StringUtils.replaceFirst(playerInput, "/", "")) || Storage.ConfigSections.Settings.CUSTOM_PLUGIN.isTabCompletable(StringUtils.replaceFirst(playerInput, "/", ""));
                     }
 
                     final String cursor = playerInput;
 
-                    if(!cursor.startsWith("/") && spaces < 2 && player.getProtocolVersion().getProtocol() >= 754) {
-                        Logger.debug("Player won't receive TabCompleteResponsePacket because the client protocol id is " + player.getProtocolVersion().getProtocol() + "! This doesn't makes sense, that's why.");
+                    if (!cursor.startsWith("/") && spaces < 2 && player.getProtocolVersion().getProtocol() >= 754) {
                         return;
                     }
 
-                    if(cursor.startsWith("/")) {
+                    if (cursor.startsWith("/")) {
                         if (spaces == 0) {
                             response.getOffers().removeIf(offer -> {
                                 String command = offer.getText();
                                 if (command.startsWith("/")) command = StringUtils.replaceFirst(command, "/", "");
 
-                                return Storage.Blacklist.isBlocked(player, command, !Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED, player.getCurrentServer().get().getServerInfo().getName(), !Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED);
+                                if (Storage.ConfigSections.Settings.CUSTOM_PLUGIN.isTabCompletable(command) || Storage.ConfigSections.Settings.CUSTOM_VERSION.isTabCompletable(command)) {
+                                    return false;
+                                }
+
+                                return !Storage.Blacklist.canPlayerAccessTab(sender, groups, command, player.getCurrentServer().get().getServerInfo().getName());
                             });
                         } else {
                             if (cancelsBeforeHand) return;
+
+                            List<String> suggestionsAsString = new ArrayList<>();
+
+                            response.getOffers().forEach(offer -> suggestionsAsString.add(offer.getText()));
+
+                            FilteredTabCompletionEvent filteredTabCompletionEvent = PATEventHandler.callFilteredTabCompletionEvents(player.getUniqueId(), rawPlayerInput, suggestionsAsString);
+                            if (filteredTabCompletionEvent.isCancelled()) {
+                                return;
+                            }
+
+                            response.getOffers().removeIf(offer -> !filteredTabCompletionEvent.getCompletion().contains(offer.getText()));
+
+                            if (response.getOffers().isEmpty()) return;
                         }
                     }
                 }
 
-            } else if(packet instanceof AvailableCommandsPacket) {
-                if (!PermissionUtil.hasBypassPermission(player) && player.getCurrentServer().isPresent()) {
-                    AvailableCommandsPacket commands = (AvailableCommandsPacket) packet;
-                    if(commands.getRootNode().getChildren().isEmpty() || !player.getCurrentServer().isPresent()) return;
+            } else if (packet instanceof AvailableCommandsPacket commands) {
 
-                    String serverName = player.getCurrentServer().get().getServer().getServerInfo().getName();
+                if (player.getCurrentServer().isPresent()) {
 
-                    if(!COMMANDS_CACHE_MAP.containsKey(serverName))
-                        COMMANDS_CACHE_MAP.put(serverName, new CommandsCache().reverse());
-                    CommandsCache commandsCache = COMMANDS_CACHE_MAP.get(serverName);
+                    if (!FAILED) {
+                        modifyCommands(player, sender, commands);
+                        super.write(ctx, msg, promise);
+                        return;
+                    }
 
-                    List<String> commandsAsString = new ArrayList<>();
-                    commands.getRootNode().getChildren().stream().filter(command -> command != null && command.getName() != null).forEach(command -> commandsAsString.add(command.getName()));
-                    commandsCache.handleCommands(commandsAsString, serverName);
+                    if (!PermissionUtil.hasBypassPermission(player)) {
+                        super.write(ctx, msg, promise);
+                        return;
+                    }
 
-                    if(PermissionUtil.hasBypassPermission(player)) return;
+                    final String serverName = player.getCurrentServer().get().getServer().getServerInfo().getName();
 
-                    final List<String> playerCommands = commandsCache.getPlayerCommands(commandsAsString, player, player.getUniqueId(), serverName);
-                    commands.getRootNode().getChildren().removeIf(command -> command == null || command.getName() == null || playerCommands.contains(command.getName()));
+
+
+                    if (Storage.Blacklist.isDisabledServer(serverName)) {
+                        super.write(ctx, msg, promise);
+                        return;
+                    }
+
+                    final List<Group> groups = GroupManager.getPlayerGroups(sender);
+
+                    if(!commands.getRootNode().getChildren().isEmpty()) {
+                        Map<String, CommandsCache> cache = Storage.getLoader().getCommandsCacheMap();
+
+                        if (!cache.containsKey(serverName))
+                            cache.put(serverName, new CommandsCache());
+
+                        CommandsCache commandsCache = cache.get(serverName);
+
+                        List<String> commandsAsString = new ArrayList<>();
+                        commands.getRootNode().getChildren().stream().filter(command -> command != null && command.getName() != null).forEach(command -> commandsAsString.add(command.getName()));
+                        commandsCache.handleCommands(commandsAsString, serverName);
+
+                        if (PermissionUtil.hasBypassPermission(player)) return;
+
+                        final boolean newer = player.getProtocolVersion().getProtocol() > 340;
+                        final List<String> playerCommands = commandsCache.getPlayerCommands(commandsAsString, sender, groups, serverName);
+
+                        if (commands.getRootNode().getChildren().size() == 1 && newer
+                                && commands.getRootNode().getChild("args") != null
+                                && commands.getRootNode().getChild("args").getChildren().isEmpty()) {
+
+                            super.write(ctx, msg, promise);
+                            return;
+                        }
+
+                        commands.getRootNode().getChildren().removeIf(command -> {
+                            if (command == null || command.getName() == null)
+                                return true;
+
+                            if (command.getName().equals("args"))
+                                return false;
+
+                            if (Storage.ConfigSections.Settings.CUSTOM_PLUGIN.isTabCompletable(command.getName()) || Storage.ConfigSections.Settings.CUSTOM_VERSION.isTabCompletable(command.getName())) {
+                                return false;
+                            }
+
+                            return !playerCommands.contains(command.getName());
+                        });
+                    }
                 }
             }
 

src/main/java/de/rayzs/pat/api/storage/Storage.java

@@ -1,42 +1,160 @@
 package de.rayzs.pat.api.storage;
 
-import de.rayzs.pat.api.storage.placeholders.commands.general.*;
-import de.rayzs.pat.api.storage.placeholders.commands.group.*;
-import de.rayzs.pat.api.storage.blacklist.BlacklistCreator;
-import de.rayzs.pat.api.storage.storages.ConfigStorage;
-import de.rayzs.pat.api.storage.placeholders.general.*;
-import de.rayzs.pat.api.storage.placeholders.groups.*;
-import de.rayzs.pat.utils.permission.PermissionUtil;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+import de.rayzs.pat.api.brand.CustomServerBrand;
+import de.rayzs.pat.api.communication.BackendUpdater;
+import de.rayzs.pat.api.communication.Communicator;
+import de.rayzs.pat.api.netty.proxy.BungeePacketAnalyzer;
 import de.rayzs.pat.api.storage.config.messages.*;
 import de.rayzs.pat.api.storage.config.settings.*;
-import de.rayzs.pat.api.storage.blacklist.impl.*;
-import de.rayzs.pat.api.storage.storages.*;
-import de.rayzs.pat.utils.configuration.*;
-import java.util.concurrent.TimeUnit;
-import de.rayzs.pat.utils.group.*;
+import de.rayzs.pat.plugin.listeners.bukkit.BukkitAntiTabListener;
+import de.rayzs.pat.plugin.logger.Logger;
+import de.rayzs.pat.plugin.subarguments.SubArguments;
+import de.rayzs.pat.utils.configuration.updater.ConfigUpdater;
+import de.rayzs.pat.utils.group.Group;
+import de.rayzs.pat.utils.permission.PermissionPlugin;
+import de.rayzs.pat.utils.sender.CommandSender;
 import org.bukkit.entity.Player;
-import de.rayzs.pat.plugin.*;
-import de.rayzs.pat.utils.*;
-import java.util.*;
+
+import de.rayzs.pat.api.event.PATEventHandler;
+import de.rayzs.pat.api.storage.blacklist.BlacklistCreator;
+import de.rayzs.pat.api.storage.blacklist.impl.GeneralBlacklist;
+import de.rayzs.pat.api.storage.blacklist.impl.GeneralIgnoredServers;
+import de.rayzs.pat.api.storage.placeholders.commands.general.ListCommandsPlaceholder;
+import de.rayzs.pat.api.storage.placeholders.commands.general.ListReversedCommandsPlaceholder;
+import de.rayzs.pat.api.storage.placeholders.commands.general.ListSizeCommandsPlaceholder;
+import de.rayzs.pat.api.storage.placeholders.commands.general.ListSortedCommandsPlaceholder;
+import de.rayzs.pat.api.storage.placeholders.commands.group.ListGroupCommandsPlaceholder;
+import de.rayzs.pat.api.storage.placeholders.commands.group.ListGroupReversedCommandsPlaceholder;
+import de.rayzs.pat.api.storage.placeholders.commands.group.ListGroupSizeCommandsPlaceholder;
+import de.rayzs.pat.api.storage.placeholders.commands.group.ListGroupSortedCommandsPlaceholder;
+import de.rayzs.pat.api.storage.placeholders.general.GeneralCurrentVersionPlaceholder;
+import de.rayzs.pat.api.storage.placeholders.general.GeneralNewestVersionPlaceholder;
+import de.rayzs.pat.api.storage.placeholders.general.GeneralPrefixPlaceholder;
+import de.rayzs.pat.api.storage.placeholders.general.GeneralUserPlaceholder;
+import de.rayzs.pat.api.storage.placeholders.groups.ListGroupsPlaceholder;
+import de.rayzs.pat.api.storage.placeholders.groups.ListGroupsReversedPlaceholder;
+import de.rayzs.pat.api.storage.placeholders.groups.ListGroupsSortedPlaceholder;
+import de.rayzs.pat.api.storage.placeholders.groups.ListSizeGroupsPlaceholder;
+import de.rayzs.pat.api.storage.placeholders.messages.BlockedBaseCommandPlaceholder;
+import de.rayzs.pat.api.storage.placeholders.messages.BlockedSubCommandPlaceholder;
+import de.rayzs.pat.api.storage.placeholders.messages.UnknownCommandPlaceholder;
+import de.rayzs.pat.api.storage.storages.ConfigStorage;
+import de.rayzs.pat.api.storage.storages.DisabledServersStorage;
+import de.rayzs.pat.api.storage.storages.IgnoredServersStorage;
+import de.rayzs.pat.api.storage.storages.PlaceholderStorage;
+import de.rayzs.pat.plugin.PluginLoader;
+import de.rayzs.pat.utils.ExpireCache;
+import de.rayzs.pat.utils.Reflection;
+import de.rayzs.pat.utils.configuration.ConfigurationBuilder;
+import de.rayzs.pat.utils.configuration.Configurator;
+import de.rayzs.pat.utils.group.GroupManager;
+import de.rayzs.pat.utils.message.replacer.PlaceholderReplacer;
+import de.rayzs.pat.utils.permission.PermissionUtil;
 
 public class Storage {
 
+    private static PluginLoader LOADER;
+
     public static final List<UUID> NOTIFY_PLAYERS = new ArrayList<>();
 
     public static String TOKEN = "", SERVER_NAME = null, CURRENT_VERSION = "", NEWER_VERSION = "";
     public static boolean OUTDATED = false, SEND_CONSOLE_NOTIFICATION = true;
     public static Object PLUGIN_OBJECT;
-    public static boolean USE_LUCKPERMS = false, USE_PLACEHOLDERAPI = false, USE_PAPIPROXYBRIDGE = false, USE_VIAVERSION = false, USE_VELOCITY = false, USE_SIMPLECLOUD;
+    public static boolean USE_PLACEHOLDERAPI = false, USE_PAPIPROXYBRIDGE = false, USE_VIAVERSION = false, USE_VELOCITY = false, USE_SIMPLECLOUD;
     public static long LAST_SYNC = System.currentTimeMillis();
 
+    private static PermissionPlugin PERMISSION_PLUGIN = PermissionPlugin.NONE;
+
+    public static void initialize(PluginLoader loader, String currentVersion) {
+        LOADER = loader;
+        CURRENT_VERSION = currentVersion;
+    }
+
+    public static void setPermissionPlugin(PermissionPlugin permissionPlugin) {
+        if (PERMISSION_PLUGIN == PermissionPlugin.LUCKPERMS) {
+            return;
+        }
+
+        PERMISSION_PLUGIN = permissionPlugin;
+    }
+
+    public static void broadcastPermissionsPluginNotice() {
+        if (Storage.getPermissionPlugin() != PermissionPlugin.NONE) {
+            return;
+        }
+
+        Logger.warning("No known permissions plugin found, so some features may be disabled.");
+        Logger.warning("Read more about it here: https://rayzs.de/products/proantitab/nkppf");
+    }
+
+    public static PermissionPlugin getPermissionPlugin() {
+        return PERMISSION_PLUGIN;
+    }
+
     public static void loadAll(boolean loadBlacklist) {
         loadConfig();
         loadToken();
-        if(loadBlacklist) Blacklist.loadAll();
+
+        if (TOKEN != null && !TOKEN.isEmpty()) {
+            int tokenLength = TOKEN.length(), cutIndex = Math.max(1, tokenLength - 3);
+            String censoredTokenDisplay = "*".repeat(cutIndex) + TOKEN.substring(cutIndex);
+            Logger.info("Token found! (" + censoredTokenDisplay + ")");
+        }
+
+        if (loadBlacklist) Blacklist.loadAll();
+
+        PATEventHandler.callUpdatePluginEvents();
     }
 
     public static void loadToken() {
-        TOKEN = Reflection.isProxyServer() ? (String) Files.TOKEN.getOrSet("token", UUID.randomUUID().toString()) : ConfigSections.Settings.HANDLE_THROUGH_PROXY.TOKEN;
+        Files.TOKEN.reload();
+
+        boolean invalidEnv = false;
+
+        if (Reflection.isProxyServer()) {
+            boolean loadFromEnv = (Boolean) Files.TOKEN.getOrSet("load-from-env.enabled", false);
+            String envVariable = (String) Files.TOKEN.getOrSet("load-from-env.name", "PAT_TOKEN");
+
+            if (loadFromEnv) {
+                Logger.info("Looking up token from environment variable: " + envVariable);
+                TOKEN = System.getenv(envVariable);
+
+                if (TOKEN != null) {
+                    return;
+                } else invalidEnv = true;
+            }
+
+            TOKEN = (String) Files.TOKEN.getOrSet("token", UUID.randomUUID().toString());
+
+            if (invalidEnv)
+                Logger.warning("Environment variable not found! Using default Token from the token.yml instead.");
+
+            return;
+        }
+
+        if (!ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED) {
+            return;
+        }
+
+        boolean loadFromEnv = ConfigSections.Settings.HANDLE_THROUGH_PROXY.LOAD_FROM_ENV;
+        String envVariable = ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENV_NAME;
+
+        if (loadFromEnv) {
+            TOKEN = System.getenv(envVariable);
+
+            if (TOKEN != null) {
+                return;
+            } else invalidEnv = true;
+
+        }
+
+        TOKEN = ConfigSections.Settings.HANDLE_THROUGH_PROXY.TOKEN;
+
+        if (invalidEnv)
+            Logger.warning("Environment variable not found! Using default Token from the config.yml instead.");
     }
 
     public static void loadConfig() {
@@ -44,34 +162,154 @@ public class Storage {
         ConfigSections.Messages.initialize();
         ConfigSections.SECTIONS.forEach(ConfigStorage::load);
 
-        if(USE_PLACEHOLDERAPI)
+        if (USE_PLACEHOLDERAPI)
             ConfigSections.PLACEHOLDERS.forEach(PlaceholderStorage::load);
     }
 
+    public static void reload() {
+        boolean proxy = Reflection.isProxyServer();
+        boolean backend = Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED && !proxy;
+
+        ConfigUpdater.initialize();
+        Storage.loadAll(Reflection.isProxyServer() || !backend);
+
+        CustomServerBrand.initialize();
+        GroupManager.clearAllGroups();
+        GroupManager.initialize();
+
+        if (!proxy) {
+            BackendUpdater.stop();
+            BackendUpdater.start();
+        }
+
+        if (!backend) {
+            Storage.handleChange();
+        }
+
+        ConfigUpdater.broadcastMissingParts();
+        Storage.getLoader().handleReload();
+    }
+
+    public static void handleChange() {
+        handleChange(null);
+    }
+
+    public static void handleChange(String server) {
+
+        if (Reflection.isProxyServer()) {
+
+            boolean isVelocity = Reflection.isVelocityServer();
+
+            if (server != null) {
+
+                Storage.Blacklist.clearServerBlacklists(server);
+                Storage.Blacklist.loadCachedServerBlacklists(server);
+
+                List<String> associatedServers = getServers()
+                        .stream()
+                        .filter(s -> !s.equals(server) && isServer(server, s))
+                        .toList();
+
+                associatedServers.forEach(s -> {
+                    Storage.Blacklist.clearServerBlacklists(s);
+                    Storage.Blacklist.loadCachedServerBlacklists(s);
+                });
+
+                if (isVelocity) {
+
+                    associatedServers.forEach(s -> {
+                        List<UUID> playerIds = Storage.getLoader().getPlayerIdsByServer(s);
+                        List<String> commands = new ArrayList<>(SubArguments.getServerCommands(s));
+
+                        playerIds.forEach(playerId -> {
+                            List<String> playerCommands = new ArrayList<>(commands);
+                            playerCommands.addAll(SubArguments.getGroupCommands(playerId, s));
+
+                            PATEventHandler.callUpdatePlayerCommandsEvents(playerId, playerCommands, true);
+                        });
+
+                    });
+                }
+
+            } else {
+
+                Storage.Blacklist.Experimental.forceCacheReset();
+
+                if (isVelocity) {
+                    List<UUID> playerIds = Storage.getLoader().getPlayerIds();
+
+                    playerIds.forEach(playerId -> {
+                        List<String> playerCommands = new ArrayList<>(SubArguments.getServerCommands(playerId));
+                        playerCommands.addAll(SubArguments.getGroupCommands(playerId));
+
+                        PATEventHandler.callUpdatePlayerCommandsEvents(playerId, playerCommands, false);
+                    });
+                }
+
+            }
+
+            GroupManager.clearServerGroupBlacklists();
+            Communicator.syncData();
+
+            Storage.getLoader().updateCommandCache();
+            Communicator.sendPermissionReset();
+
+            if (!Reflection.isVelocityServer()) {
+                BungeePacketAnalyzer.sendCommandsPacket();
+            }
+
+            return;
+        }
+
+        getLoader().handleReload();
+        PermissionUtil.reloadPermissions();
+
+        if (Reflection.getMinor() < 13) {
+            final List<UUID> playerIds = Storage.getLoader().getPlayerIds();
+            final List<String> commands = new ArrayList<>(Blacklist.BLACKLIST.getCommands());
+
+            playerIds.forEach(playerId -> {
+                List<String> playerCommands = new ArrayList<>(commands);
+                playerCommands.addAll(SubArguments.getGroupCommands(playerId));
+
+                PATEventHandler.callUpdatePlayerCommandsEvents(playerId, playerCommands, true);
+            });
+        } else {
+            BukkitAntiTabListener.handleTabCompletion();
+        }
+    }
+
+    // Quickly updates all player subarguments.
+    public static void quickSubArgumentUpdate(UUID uuid) {
+        List<String> playerCommands = new ArrayList<>(SubArguments.getServerCommands(uuid));
+        playerCommands.addAll(SubArguments.getGroupCommands(uuid));
+
+        PATEventHandler.callUpdatePlayerCommandsEvents(uuid, playerCommands, false);
+    }
+
+    public static PluginLoader getLoader() {
+        return LOADER;
+    }
+
     public static List<String> getServers() {
         return getServers(false);
     }
 
-    public static List<String> getServers(boolean withBlacklist) {
-        List<String> servers = new ArrayList<>();
-        if(Reflection.isVelocityServer())
-            servers.addAll(VelocityLoader.getServerNames());
-        else if(Reflection.isProxyServer())
-            servers.addAll(BungeeLoader.getServerNames());
+    public static List<String> getServers(boolean includingServerSpecifics) {
+        List<String> servers = LOADER.getServerNames();
+
+        if(includingServerSpecifics) {
+            servers.addAll(Blacklist.getBlacklists().stream().map(Map.Entry::getKey).toList());
+        }
 
-        if(withBlacklist) Blacklist.getBlacklistServers().stream().filter(server -> !servers.contains(server.toLowerCase())).forEach(server -> servers.add(server.toLowerCase()));
         return servers;
     }
 
-    public static boolean isServer(String originServer, Set<String> targetServers) {
-        List<String> list = new ArrayList<>(targetServers);
-        return isServer(originServer, list);
-    }
-
     public static boolean isServer(String targetServers, List<String> servers) {
         for (String originServer : servers)
             if(isServer(originServer, targetServers))
                 return true;
+
         return false;
     }
 
@@ -79,10 +317,11 @@ public class Storage {
         originServer = originServer.toLowerCase();
         targetServer = targetServer.toLowerCase();
 
-        if(originServer.endsWith("*")) {
-            originServer = originServer.replace("*", "");
+        if (originServer.endsWith("*")) {
+            originServer = originServer.substring(0, originServer.length() - 2);
             return targetServer.startsWith(originServer);
         }
+
         return originServer.equalsIgnoreCase(targetServer);
     }
 
@@ -91,6 +330,7 @@ public class Storage {
                 CONFIGURATION = Configurator.get("config"),
                 STORAGE = Configurator.get("storage"),
                 PLACEHOLDERS = Configurator.get("placeholders"),
+                CUSTOM_RESPONSES = Configurator.get("custom-responses"),
                 TOKEN = Configurator.get("token");
 
         public static void initialize() {}
@@ -103,15 +343,23 @@ public class Storage {
 
         public static class Settings {
 
+            public static AllowGroupOverrulingSection ALLOW_GROUP_OVERRULING = new AllowGroupOverrulingSection();
+            public static AutoLowercaseCommandsSection AUTO_LOWERCASE_COMMANDS = new AutoLowercaseCommandsSection();
             public static BlockNamespaceCommandsSection BLOCK_NAMESPACE_COMMANDS = new BlockNamespaceCommandsSection();
             public static HandleThroughProxySection HANDLE_THROUGH_PROXY = new HandleThroughProxySection();
+            public static PatchExploitSection PATCH_EXPLOITS = new PatchExploitSection();
             public static CustomBrandSection CUSTOM_BRAND = new CustomBrandSection();
             public static CancelCommandSection CANCEL_COMMAND = new CancelCommandSection();
             public static CustomPluginsSection CUSTOM_PLUGIN = new CustomPluginsSection();
             public static CustomVersionSection CUSTOM_VERSION = new CustomVersionSection();
+            public static DisableSyncSection DISABLE_SYNC = new DisableSyncSection();
             public static CustomProtocolPingSection CUSTOM_PROTOCOL_PING = new CustomProtocolPingSection();
             public static CustomUnknownCommandSection CUSTOM_UNKNOWN_COMMAND = new CustomUnknownCommandSection();
             public static TurnBlacklistToWhitelistSection TURN_BLACKLIST_TO_WHITELIST = new TurnBlacklistToWhitelistSection();
+            public static BaseCommandCaseSensitiveSection BASE_COMMAND_CASE_SENSITIVE = new BaseCommandCaseSensitiveSection();
+            public static UpdateGroupsPerWorldSection UPDATE_GROUPS_PER_WORLD = new UpdateGroupsPerWorldSection();
+            public static UpdateGroupsPerServerSection UPDATE_GROUPS_PER_SERVER = new UpdateGroupsPerServerSection();
+
             public static UpdateSection UPDATE = new UpdateSection();
 
             public static void initialize() {}
@@ -122,11 +370,14 @@ public class Storage {
             public static PrefixSection PREFIX = new PrefixSection();
             public static BlacklistSection BLACKLIST = new BlacklistSection();
             public static CommandFailedSection COMMAND_FAILED = new CommandFailedSection();
+            public static ConvertSection CONVERT = new ConvertSection();
+            public static ExtractSection EXTRACT = new ExtractSection();
             public static GroupSection GROUP = new GroupSection();
             public static HelpSection HELP = new HelpSection();
             public static InfoSection INFO = new InfoSection();
             public static NoPermissionSection NO_PERMISSION = new NoPermissionSection();
             public static NotificationSection NOTIFICATION = new NotificationSection();
+            public static PermsCheckSection PERMS_CHECK = new PermsCheckSection();
             public static PostDebugSection POST_DEBUG = new PostDebugSection();
             public static OnlyForProxySection NO_PROXY = new OnlyForProxySection();
             public static ReloadSection RELOAD = new ReloadSection();
@@ -139,10 +390,15 @@ public class Storage {
 
         public static class Placeholders {
 
+            public static GeneralPrefixPlaceholder PREFIX = new GeneralPrefixPlaceholder();
             public static GeneralUserPlaceholder USER = new GeneralUserPlaceholder();
             public static GeneralCurrentVersionPlaceholder CURRENT_VERSION = new GeneralCurrentVersionPlaceholder();
             public static GeneralNewestVersionPlaceholder NEWEST_VERSION = new GeneralNewestVersionPlaceholder();
 
+            public static BlockedBaseCommandPlaceholder BLOCKED_BASE_COMMAND = new BlockedBaseCommandPlaceholder();
+            public static BlockedSubCommandPlaceholder BLOCKED_SUB_COMMAND = new BlockedSubCommandPlaceholder();
+            public static UnknownCommandPlaceholder UNKNOWN_COMMAND = new UnknownCommandPlaceholder();
+
             public static ListGroupsPlaceholder LIST_GROUP = new ListGroupsPlaceholder();
             public static ListGroupsReversedPlaceholder LIST_GROUP_REVERSED = new ListGroupsReversedPlaceholder();
             public static ListGroupsSortedPlaceholder LIST_GROUP_SORTED = new ListGroupsSortedPlaceholder();
@@ -163,20 +419,26 @@ public class Storage {
             public static String findAndReplace(Player player, String request) {
                 String result = null, param = "";
 
-                if(USE_PLACEHOLDERAPI)
+                if(USE_PLACEHOLDERAPI) {
                     for (PlaceholderStorage storage : PLACEHOLDERS) {
-                        if(!storage.getRequest().startsWith(request)) continue;
+                        if (!storage.getRequest().startsWith(request)) continue;
 
-                        if(storage.getRequest().endsWith("group_") && request.contains("group_"))
+                        if (storage.getRequest().endsWith("group_") && request.contains("group_"))
                             param = request.split("group_")[1];
 
                         result = storage.onRequest(player, param);
-                        if(result == null) continue;
+                        if (result == null) continue;
                         else result = result.replace("\\n", "\n");
 
                         break;
                     }
 
+                    // Second time because of nested placeholders
+                    if (result != null && result.contains("%")) {
+                        result = PlaceholderReplacer.replace(player, result);
+                    }
+                }
+
                 return result;
             }
         }
@@ -184,9 +446,47 @@ public class Storage {
 
     public static class Blacklist {
 
-        private static HashMap<String, GeneralBlacklist> SERVER_BLACKLISTS = new HashMap<>();
+        public static class Experimental {
+
+            public static void forceCacheReset() {
+                for (Object o : CACHED_SERVER_BLACKLIST.getCache().asMap().keySet()) {
+                    String s = (String) o;
+
+                    clearServerBlacklists(s);
+                    loadCachedServerBlacklists(s);
+                }
+            }
+
+        }
+
+        public enum BlockType {
+            CHAT("[CMD]"),
+            TAB("[TAB]"),
+            NEGATE("!"),
+
+            BOTH("");
+
+            private final String text;
+
+            BlockType(String text) {
+                this.text = text;
+            }
+
+            @Override
+            public String toString() {
+                return this.text;
+            }
+        }
+
+        private static final BlockType[] BLOCK_TYPES = BlockType.values();
+
         private static final GeneralBlacklist BLACKLIST = BlacklistCreator.createGeneralBlacklist();
         private static final IgnoredServersStorage IGNORED_SERVERS = new GeneralIgnoredServers();
+        private static final DisabledServersStorage DISABLED_SERVERS = new DisabledServersStorage();
+
+        // General server-specific list (e.g: server-*)
+        private static final HashMap<String, GeneralBlacklist> SERVER_BLACKLISTS = new HashMap<>();
+        // Temporary list for all servers (e.g: server-1)
         private static final ExpireCache<String, List<GeneralBlacklist>> CACHED_SERVER_BLACKLIST = new ExpireCache<>(1, TimeUnit.HOURS);
 
         public static void loadAll() {
@@ -194,262 +494,262 @@ public class Storage {
             SERVER_BLACKLISTS.clear();
             BLACKLIST.load();
 
-            if(!Reflection.isProxyServer()) return;
+            if(!Reflection.isProxyServer())
+                return;
+
             IGNORED_SERVERS.load();
+            DISABLED_SERVERS.load();
+
             BLACKLIST.getConfig().getKeys("global.servers", true).forEach(key -> {
                 GeneralBlacklist blacklist = BlacklistCreator.createGeneralBlacklist(key);
                 blacklist.load();
                 SERVER_BLACKLISTS.put(key, blacklist);
             });
+
+            getServers().forEach(Blacklist::loadCachedServerBlacklists);
         }
 
-        public static boolean isOnIgnoredServer(String server) {
-            return IGNORED_SERVERS.isListed(server);
+        private static void loadCachedServerBlacklists(String server) {
+            List<GeneralBlacklist> blacklists = SERVER_BLACKLISTS.entrySet().stream()
+                    .filter(entry ->
+                            isServer(entry.getKey(), server)
+                    ).map(Map.Entry::getValue).toList();
+
+            CACHED_SERVER_BLACKLIST.put(server, blacklists);
         }
 
-        public static boolean isBlockedGloballyOnServer(boolean blocked, String server, boolean turn) {
-            if(isOnIgnoredServer(server)) return turn;
-            else return blocked;
+        public static GeneralBlacklist getServerBlacklist(String server) {
+            GeneralBlacklist blacklist = SERVER_BLACKLISTS.get(server);
+            if(blacklist != null) {
+                return blacklist;
+            }
+
+            blacklist = BlacklistCreator.createGeneralBlacklist(server);
+            blacklist.load();
+
+            SERVER_BLACKLISTS.put(server, blacklist);
+            return blacklist;
         }
 
-        public static List<String> getBlacklistServers() {
-            return new ArrayList<>(SERVER_BLACKLISTS.keySet());
+        public static Set<Map.Entry<String, GeneralBlacklist>> getBlacklists() {
+            return SERVER_BLACKLISTS.entrySet();
         }
 
         public static GeneralBlacklist getBlacklist() {
             return BLACKLIST;
         }
 
-        public static GeneralBlacklist getBlacklist(String server) {
-            GeneralBlacklist blacklist;
+        public static List<GeneralBlacklist> getServerBlacklists(String server) {
+            if (!CACHED_SERVER_BLACKLIST.contains(server)) {
+                loadCachedServerBlacklists(server);
+            }
 
-            if(!SERVER_BLACKLISTS.containsKey(server)) {
-                blacklist = BlacklistCreator.createGeneralBlacklist(server);
-                blacklist.load();
-                SERVER_BLACKLISTS.put(server, blacklist);
-            } else blacklist = SERVER_BLACKLISTS.get(server);
-
-            return SERVER_BLACKLISTS.getOrDefault(server, blacklist);
-        }
-
-        public static List<GeneralBlacklist> getAllBlacklists(String server) {
-            List<GeneralBlacklist> blacklists = getBlacklists(server);
-            if (isOnIgnoredServer(server)) return blacklists;
-
-            blacklists.add(Storage.Blacklist.getBlacklist());
-            return blacklists;
+            return CACHED_SERVER_BLACKLIST.get(server);
         }
 
         public static void clearServerBlacklists(String server) {
-            CACHED_SERVER_BLACKLIST.remove(server.toLowerCase());
+            CACHED_SERVER_BLACKLIST.remove(server);
         }
 
-        public static List<GeneralBlacklist> getBlacklists(String server) {
-            final String finalServer = server.toLowerCase();
-            if(CACHED_SERVER_BLACKLIST.contains(finalServer)) return CACHED_SERVER_BLACKLIST.get(finalServer);
-
-            List<GeneralBlacklist> blacklists = new ArrayList<>();
-            SERVER_BLACKLISTS.entrySet()
-                    .stream().filter(entry -> entry.getKey().endsWith("*")
-                    ? isServer(entry.getKey(), finalServer)
-                    : entry.getKey().equalsIgnoreCase(finalServer))
-                    .forEach(entry -> blacklists.add(entry.getValue()));
-
-            return CACHED_SERVER_BLACKLIST.putAndGet(finalServer, blacklists);
+        public static boolean isDisabledServer(String server) {
+            return DISABLED_SERVERS.isListed(server);
         }
 
-        public static boolean isListed(String command, String server) {
-            boolean turn = ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED,
-                    blocked = isBlockedGloballyOnServer(isBlocked(command, server), server, turn);
+        public static boolean isIgnoredServer(String server) {
+            return IGNORED_SERVERS.isListed(server);
+        }
 
-            if(!blocked) for (GeneralBlacklist blacklist : getBlacklists(server)) {
-                blocked = blacklist.isBlocked(command, server, !turn);
-                if(blocked) break;
+        public static boolean canPlayerAccess(CommandSender sender, List<Group> groups, String command, BlockType type) {
+            return canPlayerAccess(sender, groups, command, type, null);
+        }
+
+        public static boolean canPlayerAccessChat(CommandSender sender, List<Group> groups, String command) {
+            return canPlayerAccess(sender, groups, command, BlockType.CHAT, null);
+        }
+
+
+        public static boolean canPlayerAccessChat(CommandSender sender, List<Group> groups, String command, String server) {
+            return canPlayerAccess(sender, groups, command, BlockType.CHAT, server);
+        }
+
+        public static boolean canPlayerAccessTab(CommandSender sender, List<Group> groups, String command) {
+            return canPlayerAccess(sender, groups, command, BlockType.TAB, null);
+        }
+
+        public static boolean canPlayerAccessTab(CommandSender sender, List<Group> groups, String command, String server) {
+            return canPlayerAccess(sender, groups, command, BlockType.TAB, server);
+        }
+
+        public static boolean canPlayerAccess(CommandSender sender, List<Group> groups, String command, BlockType type, String server) {
+            final boolean allowGroupOverruling = ConfigSections.Settings.ALLOW_GROUP_OVERRULING.ENABLED;
+            final boolean blocked = isBlocked(command, type, server);
+
+            if (allowGroupOverruling) {
+                GroupManager.AccessResult groupResult = GroupManager.canAccessCommand(groups, command, type, server);
+                if (groupResult == GroupManager.AccessResult.NEGATED) {
+                    return false;
+                }
+
+                if (!blocked) {
+                    return true;
+                }
+
+                if (Storage.getPermissionPlugin() != PermissionPlugin.NONE) {
+                    if (PermissionUtil.hasBypassPermission(sender, command)) {
+                        return true;
+                    }
+                }
+
+                return groupResult.asBoolean();
             }
 
-            return blocked;
-        }
 
-        public static boolean isListed(String command, boolean intensive, String server) {
-            boolean turn = ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED,
-                    blocked = isBlockedGloballyOnServer(isListed(command, intensive), server, turn);
-
-            if(!blocked) for (GeneralBlacklist blacklist : getBlacklists(server)) {
-                blocked = blacklist.isListed(command, intensive);
-                if(blocked) break;
+            if (!blocked) {
+                return true;
             }
-            return blocked;
-        }
 
-        public static boolean doesGroupBypass(Object playerObj, String command, boolean intensive, String server) {
-            int priority = -1;
-            for (Group group : GroupManager.getGroups()) {
-                for (GroupBlacklist groupBlacklist : group.getAllServerGroupBlacklist(server)) {
-
-                    if(priority == -1 || group.getPriority() <= priority)
-                        if(group.hasPermission(playerObj)) {
-                            priority = group.getPriority();
-                            if (groupBlacklist.isListed(command, intensive)) return true;
-                        }
+            if (Storage.getPermissionPlugin() != PermissionPlugin.NONE) {
+                if (PermissionUtil.hasBypassPermission(sender, command)) {
+                    return true;
                 }
             }
 
-            return false;
+            return GroupManager.canAccessCommand(groups, command, type, server).asBoolean();
         }
 
-        public static boolean doesGroupBypass(Object playerObj, String command, boolean intensive, boolean convert, boolean slash, String server) {
-            int priority = -1;
-            for (Group group : GroupManager.getGroups()) {
-                for (GroupBlacklist groupBlacklist : group.getAllServerGroupBlacklist(server, true)) {
-                    if(priority == -1 || group.getPriority() <= priority)
-                        if(group.hasPermission(playerObj)) {
-                            priority = group.getPriority();
-                            if (groupBlacklist.isListed(command, intensive, convert, slash)) return true;
-                        }
+        public static boolean isBlockedChat(String command) {
+            return isBlocked(command, BlockType.CHAT, null);
+        }
+
+        public static boolean isBlockedTab(String command) {
+            return isBlocked(command, BlockType.TAB, null);
+        }
+
+        public static boolean isBlockedChat(String command, String server) {
+            return isBlocked(command, BlockType.CHAT, server);
+        }
+
+        public static boolean isBlockedTab(String command, String server) {
+            return isBlocked(command, BlockType.TAB, server);
+        }
+
+        public static boolean isBlocked(String command, BlockType type) {
+            return isBlocked(command, type, null);
+        }
+
+        public static boolean isBlocked(String command, BlockType type, String server) {
+
+            BlockType negation = BlockType.NEGATE;
+            String negatedCommand = negation + command;
+
+            boolean all = isListed("*", type, server),
+                    listed = isListed(command, type, server),
+                    negatedListed = isListed(negatedCommand, type, server),
+                    turn = ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED;
+
+            if (all) {
+                // Only listens to negated commands
+                if (negatedListed) {
+                    return turn;
                 }
+
+                return !turn;
             }
 
-            return false;
+            return turn != listed; // Shorter version of above's code
+
         }
 
-        public static boolean isListed(Object playerObj, String command, boolean intensive, String server) {
-            if(GroupManager.getGroupsByServer(server).stream().anyMatch(group -> isInListed(command, group.getAllCommands(server), intensive) && group.hasPermission(playerObj)))
+        private static boolean isListed(String unmodifiedCommand, BlockType type, String server) {
+            if (server != null && isDisabledServer(server)) {
                 return false;
-
-            boolean listed = isListed(command, intensive);
-
-            if(!listed) for (GeneralBlacklist blacklist : getBlacklists(server)) {
-                listed = blacklist.isListed(command, intensive);
-                if(listed) break;
             }
-            return listed;
-        }
 
-        public static boolean isListed(Object playerObj, String command, boolean intensive, boolean listed, String server) {
-            if(GroupManager.getGroupsByServer(server).stream().anyMatch(group -> isInListed(command, group.getAllCommands(server), intensive) && group.hasPermission(playerObj)))
-                return false;
+            boolean listed = false;
 
-            if(!listed) for (GeneralBlacklist blacklist : getBlacklists(server)) {
-                listed = blacklist.isListed(command, intensive);
-                if(listed) break;
+            String command = type.toString() + unmodifiedCommand;
+
+            if (server == null || !isIgnoredServer(server)) {
+                listed = BLACKLIST.isListed(command, false);
             }
-            return listed;
-        }
 
-        public static boolean isListed(Object playerObj, String command, boolean intensive, boolean listed, boolean slash, String server) {
-            if(GroupManager.getGroupsByServer(server).stream().anyMatch(group -> isInListed(command, group.getAllCommands(server), intensive) && group.hasPermission(playerObj)))
-                return false;
+            if (server == null) {
 
-            if(!listed) for (GeneralBlacklist blacklist : getBlacklists(server)) {
-                listed = blacklist.isListed(command, intensive, true, slash);
-                if(listed) break;
-            }
-            return listed;
-        }
-
-        public static boolean isBlocked(String command, boolean intensive, String server) {
-            return isBlocked(command, intensive, server, false);
-        }
-
-        public static boolean isBlocked(Object targetObj, String command, boolean intensive, String server) {
-            return isBlocked(targetObj, command, intensive, server, false);
-        }
-
-        public static boolean isBlocked(String command, boolean intensive, String server, boolean focusOnBlock) {
-            server = server.toLowerCase();
-
-            boolean turn = ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED,
-                    blocked,
-                    blockedGlobal = isBlockedGloballyOnServer(BLACKLIST.isBlockedIgnorePermission(command, intensive), server, turn),
-                    blockedServer = false;
-
-            if(focusOnBlock && blockedGlobal) return true;
-
-            for (GeneralBlacklist blacklist : getBlacklists(server)) {
-                if(!focusOnBlock) {
-                    blockedServer = blacklist.isBlockedIgnorePermission(command, intensive);
-                    if (blockedServer) break;
-                } else {
-                    if(blacklist.isBlocked(command, intensive)) return true;
+                if (!listed && type != BlockType.BOTH) {
+                    return isListed(unmodifiedCommand, BlockType.BOTH, null);
                 }
+
+                return listed;
             }
 
-            blocked = turn ? blockedGlobal && blockedServer : blockedServer || blockedGlobal;
-            if(!blocked
-                    && CACHED_SERVER_BLACKLIST.contains(server)
-                    && CACHED_SERVER_BLACKLIST.get(server).size() == 0)
-                if(turn) blocked = true;
+            List<GeneralBlacklist> blacklists = new ArrayList<>(getServerBlacklists(server));
+            if (blacklists.isEmpty())
+                blacklists.add(BLACKLIST);
 
-            return blocked;
+            for (GeneralBlacklist blacklist : blacklists) {
+                if (listed) {
+                    break;
+                }
+
+                listed = blacklist.isListed(command, false);
+            }
+
+            if (!listed && type != BlockType.BOTH) {
+                return isListed(unmodifiedCommand, BlockType.BOTH, server);
+            }
+
+            return listed;
         }
 
-        public static boolean isBlocked(Object targetObj, String command, boolean intensive, String server, boolean focusOnBlock) {
-            if(server != null) server = server.toLowerCase();
+        public static class BlockTypeFetcher {
 
-            if(doesGroupBypass(targetObj, command, intensive, server))
-                return false;
+            public static boolean isNegated(String command) {
+                if (command.isEmpty()) {
+                    return false;
+                }
 
-            boolean blocked = isBlocked(command, intensive, server, focusOnBlock);
+                boolean negated = command.charAt(0) == '!';
 
-            if(blocked)
-                if(PermissionUtil.hasBypassPermission(targetObj, command))
-                    blocked = false;
+                if (!negated && command.length() > 5)
+                    negated = command.charAt(5) == '!';
 
-            return blocked;
-        }
+                return negated;
+            }
 
-        public static boolean isListed(String command) {
-            return BLACKLIST.isListed(command);
-        }
+            public static BlockType getType(String command) {
+                for (BlockType blockType : BLOCK_TYPES) {
+                    if (!command.startsWith(blockType.toString()))
+                        continue;
 
-        public static boolean isListed(String command, boolean intensive) {
-            return BLACKLIST.isListed(command, intensive);
-        }
+                    return blockType;
+                }
 
-        public static boolean isListed(String command, boolean intensive, boolean convert) {
-            return BLACKLIST.isListed(command, intensive, convert);
-        }
+                return null;
+            }
 
-        public static boolean isListed(String command, boolean intensive, boolean convert, boolean slash) {
-            return BLACKLIST.isListed(command, intensive, convert, slash);
-        }
+            public static String modify(String command) {
+                BlockType type = getType(command);
+                return modify(command, type);
+            }
 
-        public static boolean isBlocked(Object targetObj, String command) {
-            return BLACKLIST.isBlocked(targetObj, command);
-        }
+            public static String modify(String command, BlockType type) {
+                if (type == null || type == BlockType.BOTH || command.length() <= type.toString().length() || !command.startsWith(type.toString()))
+                    return command;
 
-        public static boolean isBlocked(Object targetObj, String command, boolean intensive) {
-            return BLACKLIST.isBlocked(targetObj, command, intensive);
-        }
+                return command.substring(type.toString().length());
+            }
 
-        public static boolean isBlocked(Object targetObj, String command, boolean intensive, boolean convert, boolean slash) {
-            return BLACKLIST.isBlocked(targetObj, command, intensive, convert, slash);
-        }
+            // Remove all BlockType elements from String
+            public static String cleanse(String command) {
+                BlockType type = getType(command);
 
-        public static boolean isBlocked(String command, boolean intensive, boolean convert) {
-            return BLACKLIST.isBlocked(command, intensive, convert);
-        }
+                if (type == null || type == BlockType.BOTH) {
+                    return command;
+                }
 
-        public static boolean isBlocked(String command, boolean intensive, boolean convert, boolean slash) {
-            return BLACKLIST.isBlocked(command, intensive, convert);
-        }
+                return modify(command, type);
+            }
 
-        public static String convertCommand(String command, boolean intensive, boolean lowercase) {
-            return BLACKLIST.convertCommand(command, intensive, lowercase);
-        }
-
-        public static String convertCommand(String command, boolean intensive, boolean lowercase, boolean slash) {
-            return BLACKLIST.convertCommand(command, intensive, lowercase, slash);
-        }
-
-        public static boolean isInListed(String command, List<String> commandList, boolean intensive) {
-            command = StringUtils.replaceFirst(command, "/", "");
-            command = convertCommand(command, intensive, false);
-
-            for (String commands : commandList)
-                if(commands.equals(command)) return true;
-
-            return false;
         }
     }
-}
+}

src/main/java/de/rayzs/pat/api/storage/blacklist/BlacklistCreator.java

@@ -10,7 +10,6 @@ public class BlacklistCreator {
     }
 
     public static GeneralBlacklist createGeneralBlacklist(String server) {
-        server = server.toLowerCase();
         return new GeneralBlacklist("servers." + server + ".commands");
     }
 
@@ -19,20 +18,18 @@ public class BlacklistCreator {
     }
 
     public static GroupBlacklist createGroupBlacklist(String group, String server, boolean ignoreExist) {
-        server = server.toLowerCase();
         if (!exist(group, server) && !ignoreExist)
             return null;
+
         return new GroupBlacklist(group, "servers." + server + ".commands");
     }
 
     public static boolean exist(String server) {
-        server = server.toLowerCase();
         Object obj = Storage.Blacklist.getBlacklist().getConfig().get("global.servers." + server);
         return obj != null;
     }
 
     public static boolean exist(String group, String server) {
-        server = server.toLowerCase();
         Object obj = Storage.Blacklist.getBlacklist().getConfig().get("groups." + group + ".servers." + server);
         return obj != null;
     }

src/main/java/de/rayzs/pat/api/storage/config/messages/BlacklistSection.java

@@ -7,7 +7,7 @@ import de.rayzs.pat.utils.Reflection;
 public class BlacklistSection extends ConfigStorage {
 
     public String CLEAR, CLEAR_CONFIRM, CLEAR_SERVER, CLEAR_SERVER_CONFIRM, CLEAR_SERVER_NOT_FOUND;
-    public String LIST_MESSAGE, LIST_SPLITTER, LIST_COMMAND, LIST_SERVER_MESSAGE, LIST_SERVER_SPLITTER, LIST_SERVER_COMMAND;
+    public String LIST_MESSAGE, LIST_SPLITTER, LIST_SERVER_MESSAGE, LIST_SERVER_SPLITTER;
 
     public String ADD_SUCCESS, ADD_FAILED;
     public String REMOVE_SUCCESS, REMOVE_FAILED;
@@ -26,8 +26,7 @@ public class BlacklistSection extends ConfigStorage {
         CLEAR_CONFIRM = new ConfigSectionHelper<String>(this, "clear-confirmation", "&4Warning! &7This command will &cclear the entire list&7! &7Repeat the &esame command &7to confirm this action.").getOrSet();
 
         LIST_MESSAGE = new ConfigSectionHelper<String>(this, "list.message", "&7Listed commands (&f%size%&7)&8: &f%commands%").getOrSet();
-        LIST_SPLITTER = new ConfigSectionHelper<String>(this, "list.splitter", "&7, ").getOrSet();
-        LIST_COMMAND = new ConfigSectionHelper<String>(this, "list.command", "&f%command%").getOrSet();
+        LIST_SPLITTER = new ConfigSectionHelper<String>(this, "list.splitter", "&7, &f").getOrSet();
 
         ADD_SUCCESS = new ConfigSectionHelper<String>(this, "add.success", "&aSuccessfully added %command% into the list!").getOrSet();
         ADD_FAILED = new ConfigSectionHelper<String>(this, "add.failed", "&c%command% is already in the list!").getOrSet();
@@ -41,8 +40,7 @@ public class BlacklistSection extends ConfigStorage {
         CLEAR_SERVER_NOT_FOUND = new ConfigSectionHelper<String>(this, "clear-server-not-found", "&cThe server %server% does not have any commands!").getOrSet();
 
         LIST_SERVER_MESSAGE = new ConfigSectionHelper<String>(this, "list.message-server", "&7Listed commands of %server% (&f%size%&7)&8: &f%commands%").getOrSet();
-        LIST_SERVER_SPLITTER = new ConfigSectionHelper<String>(this, "list.splitter-server", "&7, ").getOrSet();
-        LIST_SERVER_COMMAND = new ConfigSectionHelper<String>(this, "list.command-server", "&f%command%").getOrSet();
+        LIST_SERVER_SPLITTER = new ConfigSectionHelper<String>(this, "list.splitter-server", "&7, &f").getOrSet();
 
         ADD_SERVER_SUCCESS = new ConfigSectionHelper<String>(this, "add.success-server", "&aSuccessfully added %command% into the list of %server%!").getOrSet();
         ADD_SERVER_FAILED = new ConfigSectionHelper<String>(this, "add.failed-server", "&c%command% is already in the list of %server%!").getOrSet();

src/main/java/de/rayzs/pat/api/storage/config/messages/ConvertSection.java

@@ -0,0 +1,25 @@
+package de.rayzs.pat.api.storage.config.messages;
+
+import de.rayzs.pat.api.storage.storages.ConfigStorage;
+import de.rayzs.pat.utils.configuration.helper.ConfigSectionHelper;
+import de.rayzs.pat.utils.configuration.helper.MultipleMessagesHelper;
+
+public class ConvertSection extends ConfigStorage {
+
+    public MultipleMessagesHelper MESSAGE;
+
+    public ConvertSection() {
+        super("convert");
+    }
+
+    public String INVALID_CONVERTER, SUCCESS;
+
+    @Override
+    public void load() {
+        super.load();
+
+        INVALID_CONVERTER = new ConfigSectionHelper<String>(this, "converter-not-found", "&cConverter or necessary files could not be found!").getOrSet();
+        SUCCESS = new ConfigSectionHelper<String>(this, "success", "&aSuccessfully converted &e%converter% &ainto the PAT storage.yml!").getOrSet();
+
+    }
+}

src/main/java/de/rayzs/pat/api/storage/config/messages/ExtractSection.java

@@ -0,0 +1,31 @@
+package de.rayzs.pat.api.storage.config.messages;
+
+import de.rayzs.pat.api.storage.storages.ConfigStorage;
+import de.rayzs.pat.utils.Reflection;
+import de.rayzs.pat.utils.configuration.helper.ConfigSectionHelper;
+import de.rayzs.pat.utils.configuration.helper.MultipleMessagesHelper;
+
+public class ExtractSection extends ConfigStorage {
+
+    public MultipleMessagesHelper MESSAGE;
+
+    public ExtractSection() {
+        super("extract");
+    }
+
+    public String USAGE, PLUGIN_NOT_FOUND, SUCCESS;
+
+    @Override
+    public void load() {
+        super.load();
+
+        if (Reflection.isProxyServer()) {
+            return;
+        }
+
+        USAGE = new ConfigSectionHelper<String>(this, "usage", "&7Usage: &f/pat extract (plugin) <option> &7or &f(group) <option>").getOrSet();
+        PLUGIN_NOT_FOUND = new ConfigSectionHelper<String>(this, "plugin-not-found", "&cPlugin %plugin% not found!").getOrSet();
+        SUCCESS = new ConfigSectionHelper<String>(this, "success", "&aSuccessfully extracted &e%amount% &anew commands from %plugin%!").getOrSet();
+
+    }
+}

src/main/java/de/rayzs/pat/api/storage/config/messages/GroupSection.java

@@ -10,8 +10,8 @@ public class GroupSection extends ConfigStorage {
     public String CLEAR, CLEAR_CONFIRM, CLEAR_SERVER, CLEAR_SERVER_CONFIRM;
     public String PRIORITY_SUCCESS, PRIORITY_FAILED;
 
-    public String LIST_MESSAGE, LIST_SPLITTER, LIST_COMMAND, LIST_SERVER_MESSAGE, LIST_SERVER_SPLITTER, LIST_SERVER_COMMAND;
-    public String LIST_GROUP_MESSAGE, LIST_GROUP_SPLITTER, LIST_GROUP_GROUPS, LIST_GROUP_SERVER_MESSAGE, LIST_GROUP_SERVER_SPLITTER, LIST_GROUP_SERVER_GROUPS;
+    public String LIST_MESSAGE, LIST_SPLITTER, LIST_SERVER_MESSAGE, LIST_SERVER_SPLITTER;
+    public String LIST_GROUP_MESSAGE, LIST_GROUP_SPLITTER, LIST_GROUP_SERVER_MESSAGE, LIST_GROUP_SERVER_SPLITTER;
     public String LIST_PRIORITY_MESSAGE, LIST_PRIORITY_SPLITTER, LIST_PRIORITY_GROUPS;
 
     public String ADD_SUCCESS, ADD_FAILED;
@@ -41,16 +41,14 @@ public class GroupSection extends ConfigStorage {
         PRIORITY_FAILED = new ConfigSectionHelper<String>(this, "priority.failed", "&cInvalid priority! Please choose a number which is greater than 0.").getOrSet();
 
         LIST_MESSAGE = new ConfigSectionHelper<String>(this, "list.message", "&7Listed commands of group %group% (&f%size%&7)&8: &f%commands%").getOrSet();
-        LIST_SPLITTER = new ConfigSectionHelper<String>(this, "list.splitter", "&7, ").getOrSet();
-        LIST_COMMAND = new ConfigSectionHelper<String>(this, "list.command", "&f").getOrSet();
+        LIST_SPLITTER = new ConfigSectionHelper<String>(this, "list.splitter", "&7, &f").getOrSet();
 
         LIST_PRIORITY_MESSAGE = new ConfigSectionHelper<String>(this, "list-priorities.message", "&7List of all group priorities (&f%size%&7)&8: &f%groups%").getOrSet();
         LIST_PRIORITY_SPLITTER = new ConfigSectionHelper<String>(this, "list-priorities.splitter", "\\n").getOrSet();
-        LIST_PRIORITY_GROUPS = new ConfigSectionHelper<String>(this, "list-priorities.group", "&8- &e%priority%&8: &f%group%").getOrSet();
+        LIST_PRIORITY_GROUPS = new ConfigSectionHelper<String>(this, "list-priorities.group", "&8- &e%priority%&8: &e%group%").getOrSet();
 
         LIST_GROUP_MESSAGE = new ConfigSectionHelper<String>(this, "list-groups.message", "&7All groups (&f%size%&7)&8: &f%groups%").getOrSet();
-        LIST_GROUP_SPLITTER = new ConfigSectionHelper<String>(this, "list-groups.splitter", "&7, ").getOrSet();
-        LIST_GROUP_GROUPS = new ConfigSectionHelper<String>(this, "list-groups.command", "&f").getOrSet();
+        LIST_GROUP_SPLITTER = new ConfigSectionHelper<String>(this, "list-groups.splitter", "&7, &f").getOrSet();
 
         ADD_SUCCESS = new ConfigSectionHelper<String>(this, "add.success", "&aSuccessfully added %command% into the list of group %group%!").getOrSet();
         ADD_FAILED = new ConfigSectionHelper<String>(this, "add.failed", "&c%command% is already in the list of group %group%!").getOrSet();
@@ -69,12 +67,10 @@ public class GroupSection extends ConfigStorage {
         CLEAR_SERVER_CONFIRM = new ConfigSectionHelper<String>(this, "clear-confirmation-server", "&4Warning! &7This command will &cclear the entire list&7 of this group for %server%! &7Repeat the &esame command &7to confirm this action.").getOrSet();
 
         LIST_SERVER_MESSAGE = new ConfigSectionHelper<String>(this, "list.message-server", "&7Listed commands of group %group% from %server% (&f%size%&7)&8: &f%commands%").getOrSet();
-        LIST_SERVER_SPLITTER = new ConfigSectionHelper<String>(this, "list.splitter-server", "&7, ").getOrSet();
-        LIST_SERVER_COMMAND = new ConfigSectionHelper<String>(this, "list.command-server", "&f%group%").getOrSet();
+        LIST_SERVER_SPLITTER = new ConfigSectionHelper<String>(this, "list.splitter-server", "&7, &f").getOrSet();
 
         LIST_GROUP_SERVER_MESSAGE = new ConfigSectionHelper<String>(this, "list-groups.message-server", "&7All groups from %server% (&f%size%&7)&8: &f%groups%").getOrSet();
-        LIST_GROUP_SERVER_SPLITTER = new ConfigSectionHelper<String>(this, "list-groups.splitter-server", "&7, ").getOrSet();
-        LIST_GROUP_SERVER_GROUPS = new ConfigSectionHelper<String>(this, "list-groups.command-server", "&f%group%").getOrSet();
+        LIST_GROUP_SERVER_SPLITTER = new ConfigSectionHelper<String>(this, "list-groups.splitter-server", "&7, &f").getOrSet();
 
         ADD_SERVER_SUCCESS = new ConfigSectionHelper<String>(this, "add.success-server", "&aSuccessfully added %command% into the list of group %group% for %server%!").getOrSet();
         ADD_SERVER_FAILED = new ConfigSectionHelper<String>(this, "add.failed-server", "&c%command% is already in the list of group %group% of %server%!").getOrSet();

src/main/java/de/rayzs/pat/api/storage/config/messages/HelpSection.java

@@ -16,6 +16,7 @@ public class HelpSection extends ConfigStorage {
     @Override
     public void load() {
         super.load();
+
         MESSAGE = new MultipleMessagesHelper(this, null, Reflection.isProxyServer() ?
                 Arrays.asList(
                         "&7Available commands are: &f/%label%&7..."
@@ -25,6 +26,9 @@ public class HelpSection extends ConfigStorage {
                         , "&f  info &7to get a few information"
                         , "&f  postdebug &7to post the PAT logs"
                         , "&f  update <player> &7to update player(s) permissions"
+                        , "&f  perms <player> &7to check a player's permissions"
+                        , "&f  extract (plugin) &7to extract all plugin commands"
+                        , "&f  convert (plugin) &7converts into a PAT storage.yml"
                         , "&f  creategroup (group) &7Create a group"
                         , "&f  deletegroup (group) &7Delete a group"
                         , "&f  setpriority (group) (priority) &7to set the priority"
@@ -42,6 +46,8 @@ public class HelpSection extends ConfigStorage {
                         , "&f  info &7to get a few information"
                         , "&f  postdebug &7to post the PAT logs"
                         , "&f  update <player> &7to update player(s) permissions"
+                        , "&f  perms <player> &7to check a player's permissions"
+                        , "&f  extract (plugin) &7to extract all plugin commands"
                         , "&f  creategroup (group) &7Create a group"
                         , "&f  deletegroup (group) &7Delete a group"
                         , "&f  setpriority (group) (priority) &7to set the priority"

src/main/java/de/rayzs/pat/api/storage/config/messages/PermsCheckSection.java

@@ -0,0 +1,21 @@
+package de.rayzs.pat.api.storage.config.messages;
+
+import de.rayzs.pat.api.storage.storages.ConfigStorage;
+import de.rayzs.pat.utils.configuration.helper.*;
+
+public class PermsCheckSection extends ConfigStorage {
+
+    public String MESSAGE, PLAYER_MISSING, PLAYER_NOT_ONLINE;
+
+    public PermsCheckSection() {
+        super("perms-check");
+    }
+
+    @Override
+    public void load() {
+        super.load();
+        MESSAGE = new ConfigSectionHelper<String>(this, "message", "&7All of &e%player%'s &7PAT-related permission: &e%permissions%").getOrSet();
+        PLAYER_MISSING = new ConfigSectionHelper<String>(this, "player-is-missing", "&cPlease specify the player whose permission you want to check.").getOrSet();
+        PLAYER_NOT_ONLINE = new ConfigSectionHelper<String>(this, "player-not-online", "&c%player% is not online!").getOrSet();
+    }
+}

src/main/java/de/rayzs/pat/api/storage/config/messages/ServerListSection.java

@@ -7,7 +7,7 @@ import de.rayzs.pat.utils.Reflection;
 public class ServerListSection extends ConfigStorage {
 
     public String SERVER_DOES_NOT_EXIST, GROUP_DOES_NOT_EXIST;
-    public String LIST_SERVER_MESSAGE, LIST_SERVER_SPLITTER, LIST_SERVER_COMMAND, LIST_GROUP_MESSAGE, LIST_GROUP_SPLITTER, LIST_GROUP_COMMAND;
+    public String LIST_SERVER_MESSAGE, LIST_SERVER_SPLITTER, LIST_GROUP_MESSAGE, LIST_GROUP_SPLITTER;
 
     public ServerListSection() {
         super("server-list");
@@ -22,11 +22,9 @@ public class ServerListSection extends ConfigStorage {
         GROUP_DOES_NOT_EXIST = new ConfigSectionHelper<String>(this, "group-does-not-exist", "&cGroup %group% does not exist for %server%!").getOrSet();
 
         LIST_SERVER_MESSAGE = new ConfigSectionHelper<String>(this, "list.server.message", "&7Listed commands of %server% (&f%size%&7)&8: &f%commands%").getOrSet();
-        LIST_SERVER_SPLITTER = new ConfigSectionHelper<String>(this, "list.server.splitter", "&7, ").getOrSet();
-        LIST_SERVER_COMMAND = new ConfigSectionHelper<String>(this, "list.server.command", "&f%command%").getOrSet();
+        LIST_SERVER_SPLITTER = new ConfigSectionHelper<String>(this, "list.server.splitter", "&7, &f").getOrSet();
 
         LIST_GROUP_MESSAGE = new ConfigSectionHelper<String>(this, "list.group.message", "&7Listed commands of %group% from %server% (&f%size%&7)&8: &f%commands%").getOrSet();
-        LIST_GROUP_SPLITTER = new ConfigSectionHelper<String>(this, "list.group.splitter", "&7, ").getOrSet();
-        LIST_GROUP_COMMAND = new ConfigSectionHelper<String>(this, "list.group.command", "&f%command%").getOrSet();
+        LIST_GROUP_SPLITTER = new ConfigSectionHelper<String>(this, "list.group.splitter", "&7, &f").getOrSet();
     }
 }

src/main/java/de/rayzs/pat/api/storage/config/settings/AllowGroupOverrulingSection.java

@@ -0,0 +1,19 @@
+package de.rayzs.pat.api.storage.config.settings;
+
+import de.rayzs.pat.api.storage.storages.ConfigStorage;
+import de.rayzs.pat.utils.configuration.helper.ConfigSectionHelper;
+
+public class AllowGroupOverrulingSection extends ConfigStorage {
+
+    public boolean ENABLED;
+
+    public AllowGroupOverrulingSection() {
+        super("allow-group-overruling");
+    }
+
+    @Override
+    public void load() {
+        super.load();
+        ENABLED = new ConfigSectionHelper<Boolean>(this, null, false).getOrSet();
+    }
+}

src/main/java/de/rayzs/pat/api/storage/config/settings/AutoLowercaseCommandsSection.java

@@ -0,0 +1,31 @@
+package de.rayzs.pat.api.storage.config.settings;
+
+import de.rayzs.pat.api.storage.storages.ConfigStorage;
+import de.rayzs.pat.utils.Reflection;
+import de.rayzs.pat.utils.StringUtils;
+import de.rayzs.pat.utils.configuration.helper.ConfigSectionHelper;
+
+public class AutoLowercaseCommandsSection extends ConfigStorage {
+
+    public boolean ENABLED;
+
+    public AutoLowercaseCommandsSection() {
+        super("auto-lowercase-commands");
+    }
+
+    @Override
+    public void load() {
+        super.load();
+
+        if (Reflection.isProxyServer())
+            return;
+
+        ENABLED = new ConfigSectionHelper<Boolean>(this, "enabled", true).getOrSet();
+    }
+
+    public boolean isCommand(String command) {
+        if(!ENABLED) return false;
+
+        return !StringUtils.isLowercased(command);
+    }
+}

src/main/java/de/rayzs/pat/api/storage/config/settings/BaseCommandCaseSensitiveSection.java

@@ -0,0 +1,22 @@
+package de.rayzs.pat.api.storage.config.settings;
+
+import de.rayzs.pat.api.storage.storages.ConfigStorage;
+import de.rayzs.pat.utils.configuration.helper.ConfigSectionHelper;
+import de.rayzs.pat.utils.configuration.helper.MultipleMessagesHelper;
+
+import java.util.Collections;
+
+public class BaseCommandCaseSensitiveSection extends ConfigStorage {
+
+    public boolean ENABLED;
+
+    public BaseCommandCaseSensitiveSection() {
+        super("base-command-case-sensitive");
+    }
+
+    @Override
+    public void load() {
+        super.load();
+        ENABLED = new ConfigSectionHelper<Boolean>(this, null, true).getOrSet();
+    }
+}

src/main/java/de/rayzs/pat/api/storage/config/settings/BlockNamespaceCommandsSection.java

@@ -1,16 +1,13 @@
 package de.rayzs.pat.api.storage.config.settings;
 
-import de.rayzs.pat.utils.configuration.helper.ConfigSectionHelper;
 import de.rayzs.pat.api.storage.storages.ConfigStorage;
-import de.rayzs.pat.api.storage.Storage;
 import de.rayzs.pat.utils.StringUtils;
-import de.rayzs.pat.utils.permission.PermissionUtil;
-
-import java.util.UUID;
+import de.rayzs.pat.utils.configuration.helper.ConfigSectionHelper;
+import de.rayzs.pat.utils.sender.CommandSender;
 
 public class BlockNamespaceCommandsSection extends ConfigStorage {
 
-    public boolean ENABLED;
+    public boolean ENABLED, ALWAYS_BLOCK_COMMAND;
 
     public BlockNamespaceCommandsSection() {
         super("block-namespace-commands");
@@ -20,15 +17,22 @@ public class BlockNamespaceCommandsSection extends ConfigStorage {
     public void load() {
         super.load();
         ENABLED = new ConfigSectionHelper<Boolean>(this, "enabled", true).getOrSet();
+        ALWAYS_BLOCK_COMMAND = new ConfigSectionHelper<Boolean>(this, "always-block-command", true).getOrSet();
+    }
+
+    public boolean doesAlwaysBlock(String command) {
+        return ALWAYS_BLOCK_COMMAND && isCommand(command);
     }
 
     public boolean isCommand(String command) {
-        if(!ENABLED || Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED) return false;
+        if (!ENABLED) {
+            return false;
+        }
+
         return StringUtils.getFirstArg(command).contains(":");
     }
 
-    public boolean doesBypass(Object targetObj) {
-
-        return !ENABLED || PermissionUtil.hasPermission(targetObj, "namespace");
+    public boolean doesBypass(CommandSender sender) {
+        return !ENABLED || sender.hasPermission("namespace");
     }
 }

src/main/java/de/rayzs/pat/api/storage/config/settings/CancelCommandSection.java

@@ -7,7 +7,7 @@ import java.util.Collections;
 public class CancelCommandSection extends ConfigStorage {
 
     public boolean ENABLED;
-    public MultipleMessagesHelper MESSAGE;
+    public MultipleMessagesHelper BASE_COMMAND_RESPONSE, SUB_COMMAND_RESPONSE;
 
     public CancelCommandSection() {
         super("cancel-blocked-commands");
@@ -17,6 +17,7 @@ public class CancelCommandSection extends ConfigStorage {
     public void load() {
         super.load();
         ENABLED = new ConfigSectionHelper<Boolean>(this, "enabled", true).getOrSet();
-        MESSAGE = new MultipleMessagesHelper(this, "message", Collections.singletonList("&cThe command %command% is blocked!"));
+        BASE_COMMAND_RESPONSE = new MultipleMessagesHelper(this, "base-command-message", Collections.singletonList("&cThe command %command% is blocked!"));
+        SUB_COMMAND_RESPONSE = new MultipleMessagesHelper(this, "sub-command-message", Collections.singletonList("&cThis sub-argument is blocked!"));
     }
 }

src/main/java/de/rayzs/pat/api/storage/config/settings/CustomPluginsSection.java

@@ -1,12 +1,13 @@
 package de.rayzs.pat.api.storage.config.settings;
 
 import de.rayzs.pat.api.storage.storages.ConfigStorage;
+import de.rayzs.pat.utils.StringUtils;
 import de.rayzs.pat.utils.configuration.helper.*;
 import java.util.*;
 
 public class CustomPluginsSection extends ConfigStorage {
 
-    public boolean ENABLED;
+    public boolean ENABLED, ALWAYS_TAB_COMPLETABLE;
     public MultipleMessagesHelper MESSAGE, COMMANDS;
 
     public CustomPluginsSection() {
@@ -17,21 +18,24 @@ public class CustomPluginsSection extends ConfigStorage {
     public void load() {
         super.load();
         ENABLED = new ConfigSectionHelper<Boolean>(this, "enabled", true).getOrSet();
-        COMMANDS = new MultipleMessagesHelper(this, "commands", Arrays.asList("pl", "plugins", "bukkit:pl", "bukkit:plugins"));
+        ALWAYS_TAB_COMPLETABLE = new ConfigSectionHelper<Boolean>(this, "always-tab-completable", false).getOrSet();
+        COMMANDS = new MultipleMessagesHelper(this, "commands", Arrays.asList("pl", "plugins"));
         MESSAGE = new MultipleMessagesHelper(this, "message", Collections.singletonList("&fPlugins (0):"));
     }
 
+    public boolean isTabCompletable(String command) {
+        if (!isCommand(command))
+            return false;
+
+        return ALWAYS_TAB_COMPLETABLE;
+    }
+
     public boolean isCommand(String command) {
         if(!ENABLED) return false;
+        command = StringUtils.getFirstArg(command);
 
-        if (command.contains(" ")) {
-            String[] split = command.split(" ");
-            if (split.length > 0)
-                command = split[0];
-            command = command.split(" ")[0];
-        }
         for (String currentCommand : COMMANDS.getLines()) {
-            if (currentCommand.equals(command.toLowerCase()))
+            if (currentCommand.equalsIgnoreCase(command))
                 return true;
         }
         return false;

src/main/java/de/rayzs/pat/api/storage/config/settings/CustomProtocolPingSection.java

@@ -1,13 +1,20 @@
 package de.rayzs.pat.api.storage.config.settings;
 
+import de.rayzs.pat.plugin.logger.Logger;
 import de.rayzs.pat.utils.configuration.helper.ConfigSectionHelper;
 import de.rayzs.pat.api.storage.storages.ConfigStorage;
 import de.rayzs.pat.utils.Reflection;
+import de.rayzs.pat.utils.configuration.helper.MultipleMessagesHelper;
+
+import java.util.Arrays;
 
 public class CustomProtocolPingSection extends ConfigStorage {
 
-    public boolean ENABLED, ALWAYS_SHOW, HIDE_PLAYERS, USE_EXTEND_AS_MAX_COUNT;
+    public boolean ENABLED, ALWAYS_SHOW, HIDE_PLAYERS, USE_EXTEND_AS_MAX_COUNT, USE_CUSTOM_PLAYERLIST;
     public String PROTOCOL;
+
+    public MultipleMessagesHelper PLAYERLIST;
+
     public int EXTEND_COUNT;
 
     public CustomProtocolPingSection() {
@@ -17,17 +24,30 @@ public class CustomProtocolPingSection extends ConfigStorage {
     @Override
     public void load() {
         super.load();
-        if(!Reflection.isProxyServer()) {
-            if(!Reflection.isPaper() || Reflection.getMinor() < 12)
+
+        if (!Reflection.isProxyServer() && (!Reflection.isPaper() || Reflection.getMinor() < 12))
             return;
-        }
 
         ENABLED = new ConfigSectionHelper<Boolean>(this, "enabled", true).getOrSet();
         ALWAYS_SHOW = new ConfigSectionHelper<Boolean>(this, "always-show", Reflection.isProxyServer() || Reflection.isPaper()).getOrSet();
         USE_EXTEND_AS_MAX_COUNT = new ConfigSectionHelper<Boolean>(this, "use-as-maxplayers", false).getOrSet();
         PROTOCOL = new ConfigSectionHelper<String>(this, "protocol", "&f&lProAntiTab &7(&a%online%&7/&c%max%&7)").getOrSet();
         EXTEND_COUNT = new ConfigSectionHelper<Integer>(this, "extend-online-count", 1).getOrSet();
-        if(Reflection.isProxyServer()) return;
+
         HIDE_PLAYERS = new ConfigSectionHelper<Boolean>(this, "hide-players", true).getOrSet();
+
+        USE_CUSTOM_PLAYERLIST = new ConfigSectionHelper<Boolean>(this, "custom-playerlist.enabled", false).getOrSet();
+        PLAYERLIST = new MultipleMessagesHelper(this, "custom-playerlist.list", Arrays.asList(
+                "&8> &7Online players: &f%online%&7/&c%max%",
+                "&8> &7Using &fProAntiTab"
+        ));
+
+
+
+        if (HIDE_PLAYERS && USE_CUSTOM_PLAYERLIST) {
+            Logger.warning("You can't use both 'hide-players' and 'custom-playerlist' at the same time! (Section: custom-protocol-ping)");
+            Logger.warning("You gotta choose what feature from those two you want to use.");
+            Logger.warning("In order to avoid any problems, the 'custom-playerlist' feature has been temporarily disabled.");
+        }
     }
 }

src/main/java/de/rayzs/pat/api/storage/config/settings/CustomVersionSection.java

@@ -7,7 +7,7 @@ import java.util.*;
 
 public class CustomVersionSection extends ConfigStorage {
 
-    public boolean ENABLED;
+    public boolean ENABLED, ALWAYS_TAB_COMPLETABLE;
     public MultipleMessagesHelper MESSAGE, COMMANDS;
 
     public CustomVersionSection() {
@@ -18,16 +18,24 @@ public class CustomVersionSection extends ConfigStorage {
     public void load() {
         super.load();
         ENABLED = new ConfigSectionHelper<Boolean>(this, "enabled", true).getOrSet();
-        COMMANDS = new MultipleMessagesHelper(this, "commands", Arrays.asList("icanhasbukkit", "ver", "version", "bukkit:ver", "bukkit:version"));
+        ALWAYS_TAB_COMPLETABLE = new ConfigSectionHelper<Boolean>(this, "always-tab-completable", false).getOrSet();
+        COMMANDS = new MultipleMessagesHelper(this, "commands", Arrays.asList("icanhasbukkit", "about", "ver", "version"));
         MESSAGE = new MultipleMessagesHelper(this, "message", Collections.singletonList("&fThis server is running CraftBukkit version git-NasaSpigot-294 (MC: X)"));
     }
 
+    public boolean isTabCompletable(String command) {
+        if (!isCommand(command))
+            return false;
+
+        return ALWAYS_TAB_COMPLETABLE;
+    }
+
     public boolean isCommand(String command) {
         if(!ENABLED) return false;
         command = StringUtils.getFirstArg(command);
 
         for (String currentCommand : COMMANDS.getLines()) {
-            if (currentCommand.equals(command.toLowerCase()))
+            if (currentCommand.equalsIgnoreCase(command))
                 return true;
         }
         return false;

src/main/java/de/rayzs/pat/api/storage/config/settings/DisableSyncSection.java

@@ -0,0 +1,22 @@
+package de.rayzs.pat.api.storage.config.settings;
+
+import de.rayzs.pat.utils.Reflection;
+import de.rayzs.pat.api.storage.storages.ConfigStorage;
+import de.rayzs.pat.utils.configuration.helper.ConfigSectionHelper;
+
+public class DisableSyncSection extends ConfigStorage {
+
+    public boolean DISABLED;
+
+    public DisableSyncSection() {
+        super("disable-sync");
+    }
+
+    @Override
+    public void load() {
+        super.load();
+
+        if(!Reflection.isProxyServer()) return;
+        DISABLED = new ConfigSectionHelper<Boolean>(this, null, false).getOrSet();
+    }
+}

src/main/java/de/rayzs/pat/api/storage/config/settings/HandleThroughProxySection.java

@@ -7,6 +7,10 @@ import de.rayzs.pat.utils.Reflection;
 public class HandleThroughProxySection extends ConfigStorage {
 
     public boolean ENABLED;
+
+    public boolean LOAD_FROM_ENV;
+    public String ENV_NAME;
+
     public String TOKEN;
 
     public HandleThroughProxySection() {
@@ -20,5 +24,8 @@ public class HandleThroughProxySection extends ConfigStorage {
 
         ENABLED = new ConfigSectionHelper<Boolean>(this, "enabled", false).getOrSet();
         TOKEN = new ConfigSectionHelper<String>(this, "token", "insert-token-of-proxy-here").getOrSet();
+
+        LOAD_FROM_ENV = new ConfigSectionHelper<Boolean>(this, "load-from-env.enabled", false).getOrSet();
+        ENV_NAME = new ConfigSectionHelper<String>(this, "load-from-env.name", "PAT_TOKEN").getOrSet();
     }
 }

src/main/java/de/rayzs/pat/api/storage/config/settings/PatchExploitSection.java

@@ -0,0 +1,32 @@
+package de.rayzs.pat.api.storage.config.settings;
+
+import de.rayzs.pat.api.storage.storages.ConfigStorage;
+import de.rayzs.pat.utils.configuration.helper.*;
+import de.rayzs.pat.utils.StringUtils;
+import java.util.Collections;
+
+public class PatchExploitSection extends ConfigStorage {
+
+    public boolean ENABLED;
+    public ConfigSectionHelper<String> ALERT_MESSAGE, KICK_MESSAGE;
+
+    public PatchExploitSection() {
+        super("patch-exploits");
+    }
+
+    @Override
+    public void load() {
+        super.load();
+        ENABLED = new ConfigSectionHelper<Boolean>(this, "enabled", true).getOrSet();
+        ALERT_MESSAGE = new ConfigSectionHelper<>(this, "alert-message", "%prefix% &4%player% &ctried to crash/lag the server.");
+        KICK_MESSAGE = new ConfigSectionHelper(this, "kick-message", "&cFailed to read packet! Please reconnect.");
+    }
+
+    public boolean isMalicious(String text) {
+        if(!ENABLED) return false;
+
+        return text.length() > 256
+                || text.contains("nbt")
+                && (StringUtils.countMatches('[', text) > 15 || StringUtils.countMatches('{', text) > 25);
+    }
+}

src/main/java/de/rayzs/pat/api/storage/config/settings/UpdateGroupsPerServerSection.java

@@ -0,0 +1,27 @@
+package de.rayzs.pat.api.storage.config.settings;
+
+import de.rayzs.pat.api.storage.storages.ConfigStorage;
+import de.rayzs.pat.utils.Reflection;
+import de.rayzs.pat.utils.configuration.helper.ConfigSectionHelper;
+
+public class UpdateGroupsPerServerSection extends ConfigStorage {
+
+    // Disabled for now
+    public boolean ENABLED = false;
+
+    public UpdateGroupsPerServerSection() {
+        super("update-groups-per-server");
+    }
+
+    @Override
+    public void load() {
+        super.load();
+
+        /*
+        if (!Reflection.isProxyServer())
+            return;
+
+        ENABLED = new ConfigSectionHelper<Boolean>(this, null, false).getOrSet();
+        */
+    }
+}

src/main/java/de/rayzs/pat/api/storage/config/settings/UpdateGroupsPerWorldSection.java

@@ -0,0 +1,24 @@
+package de.rayzs.pat.api.storage.config.settings;
+
+import de.rayzs.pat.api.storage.storages.ConfigStorage;
+import de.rayzs.pat.utils.Reflection;
+import de.rayzs.pat.utils.configuration.helper.ConfigSectionHelper;
+
+public class UpdateGroupsPerWorldSection extends ConfigStorage {
+
+    public boolean ENABLED;
+
+    public UpdateGroupsPerWorldSection() {
+        super("update-groups-per-world");
+    }
+
+    @Override
+    public void load() {
+        super.load();
+
+        if (Reflection.isProxyServer())
+            return;
+
+        ENABLED = new ConfigSectionHelper<Boolean>(this, null, false).getOrSet();
+    }
+}

src/main/java/de/rayzs/pat/api/storage/config/settings/UpdateSection.java

@@ -6,7 +6,7 @@ import java.util.*;
 
 public class UpdateSection extends ConfigStorage {
 
-    public boolean ENABLED;
+    public boolean ENABLED, AUTO_UPDATE_CONFIG;
     public int PERIOD;
     public MultipleMessagesHelper OUTDATED, UPDATED;
 
@@ -19,6 +19,7 @@ public class UpdateSection extends ConfigStorage {
         super.load();
         ENABLED = new ConfigSectionHelper<Boolean>(this, "enabled", true).getOrSet();
         PERIOD = new ConfigSectionHelper<Integer>(this, "period", 10000).getOrSet();
+        AUTO_UPDATE_CONFIG = new ConfigSectionHelper<Boolean>(this, "auto-update-config", true).getOrSet();
         UPDATED = new MultipleMessagesHelper(this, "updated", Collections.singletonList("&aYou are using the newest version! ^^"));
         OUTDATED = new MultipleMessagesHelper(this, "outdated", Arrays.asList(
                 "&8[&4ProAntiTab&8] &cThere is a new version available! (%newest_version%)",

src/main/java/de/rayzs/pat/api/storage/placeholders/commands/general/ListCommandsPlaceholder.java

@@ -4,28 +4,23 @@ import de.rayzs.pat.utils.configuration.helper.ConfigSectionHelper;
 import de.rayzs.pat.api.storage.storages.PlaceholderStorage;
 import de.rayzs.pat.api.storage.Storage;
 import de.rayzs.pat.utils.StringUtils;
+import de.rayzs.pat.utils.group.GroupManager;
 import org.bukkit.entity.Player;
 
 public class ListCommandsPlaceholder extends PlaceholderStorage {
 
     public ListCommandsPlaceholder() { super("list_commands"); }
 
-    public String COMMAND, SPLITTER;
+    public String SPLITTER;
 
     @Override
     public String onRequest(Player player, String param) {
-        return StringUtils.buildStringList(
-                Storage.Blacklist.getBlacklist().getCommands(),
-                SPLITTER,
-                COMMAND,
-                "%command%"
-        );
+        return StringUtils.getStringList(Storage.Blacklist.getBlacklist().getCommands(), SPLITTER);
     }
 
     @Override
     public void load() {
         super.load();
-        SPLITTER = new ConfigSectionHelper<String>(this, "splitter", "&7-> ").getOrSet();
-        COMMAND = new ConfigSectionHelper<String>(this, "command", "&f%command%\\n").getOrSet();
+        SPLITTER = new ConfigSectionHelper<String>(this, "splitter", "&7, &e").getOrSet();
     }
 }

src/main/java/de/rayzs/pat/api/storage/placeholders/commands/general/ListReversedCommandsPlaceholder.java

@@ -10,23 +10,16 @@ public class ListReversedCommandsPlaceholder extends PlaceholderStorage {
 
     public ListReversedCommandsPlaceholder() { super("list_reversed_commands"); }
 
-    public String COMMAND, SPLITTER;
+    public String SPLITTER;
 
     @Override
     public String onRequest(Player player, String param) {
-        return StringUtils.buildSortedStringList(
-                Storage.Blacklist.getBlacklist().getCommands(),
-                SPLITTER,
-                COMMAND,
-                "%command%",
-                true
-        );
+        return StringUtils.getReversedStringList(Storage.Blacklist.getBlacklist().getCommands(), SPLITTER);
     }
 
     @Override
     public void load() {
         super.load();
-        SPLITTER = new ConfigSectionHelper<String>(this, "splitter", "&7-> ").getOrSet();
-        COMMAND = new ConfigSectionHelper<String>(this, "command", "&f%command%\\n").getOrSet();
+        SPLITTER = new ConfigSectionHelper<String>(this, "splitter", "&7, &e").getOrSet();
     }
 }

src/main/java/de/rayzs/pat/api/storage/placeholders/commands/general/ListSortedCommandsPlaceholder.java

@@ -10,23 +10,16 @@ public class ListSortedCommandsPlaceholder extends PlaceholderStorage {
 
     public ListSortedCommandsPlaceholder() { super("list_sorted_commands"); }
 
-    public String COMMAND, SPLITTER;
+    public String SPLITTER;
 
     @Override
     public String onRequest(Player player, String param) {
-        return StringUtils.buildSortedStringList(
-                Storage.Blacklist.getBlacklist().getCommands(),
-                SPLITTER,
-                COMMAND,
-                "%command%",
-                false
-        );
+        return StringUtils.getSortedStringList(Storage.Blacklist.getBlacklist().getCommands(), SPLITTER);
     }
 
     @Override
     public void load() {
         super.load();
-        SPLITTER = new ConfigSectionHelper<String>(this, "splitter", "&7-> ").getOrSet();
-        COMMAND = new ConfigSectionHelper<String>(this, "command", "&f%command%\\n").getOrSet();
+        SPLITTER = new ConfigSectionHelper<String>(this, "splitter", "&7, &e").getOrSet();
     }
 }

src/main/java/de/rayzs/pat/api/storage/placeholders/commands/group/ListGroupCommandsPlaceholder.java

@@ -10,25 +10,19 @@ public class ListGroupCommandsPlaceholder extends PlaceholderStorage {
 
     public ListGroupCommandsPlaceholder() { super("list_commands_group_"); }
 
-    public String COMMAND, SPLITTER;
+    public String SPLITTER;
 
     @Override
     public String onRequest(Player player, String param) {
         Group group = GroupManager.getGroupByName(param);
         if(group == null) return null;
 
-        return StringUtils.buildStringList(
-                group.getCommands(),
-                SPLITTER,
-                COMMAND,
-                "%command%"
-        );
+        return StringUtils.getStringList(group.getCommands(), SPLITTER);
     }
 
     @Override
     public void load() {
         super.load();
-        SPLITTER = new ConfigSectionHelper<String>(this, "splitter", "&7-> ").getOrSet();
-        COMMAND = new ConfigSectionHelper<String>(this, "command", "&f%command%\\n").getOrSet();
+        SPLITTER = new ConfigSectionHelper<String>(this, "splitter", "&7, &e").getOrSet();
     }
 }

src/main/java/de/rayzs/pat/api/storage/placeholders/commands/group/ListGroupReversedCommandsPlaceholder.java

@@ -10,26 +10,19 @@ public class ListGroupReversedCommandsPlaceholder extends PlaceholderStorage {
 
     public ListGroupReversedCommandsPlaceholder() { super("list_reversed_commands_group_"); }
 
-    public String COMMAND, SPLITTER;
+    public String SPLITTER;
 
     @Override
     public String onRequest(Player player, String param) {
         Group group = GroupManager.getGroupByName(param);
         if(group == null) return null;
 
-        return StringUtils.buildSortedStringList(
-                group.getCommands(),
-                SPLITTER,
-                COMMAND,
-                "%command%",
-                true
-        );
+        return StringUtils.getReversedStringList(group.getCommands(), SPLITTER);
     }
 
     @Override
     public void load() {
         super.load();
-        SPLITTER = new ConfigSectionHelper<String>(this, "splitter", "&7-> ").getOrSet();
-        COMMAND = new ConfigSectionHelper<String>(this, "command", "&f%command%\\n").getOrSet();
+        SPLITTER = new ConfigSectionHelper<String>(this, "splitter", "&7, &e").getOrSet();
     }
 }

src/main/java/de/rayzs/pat/api/storage/placeholders/commands/group/ListGroupSortedCommandsPlaceholder.java

@@ -10,26 +10,19 @@ public class ListGroupSortedCommandsPlaceholder extends PlaceholderStorage {
 
     public ListGroupSortedCommandsPlaceholder() { super("list_sorted_commands_group_"); }
 
-    public String COMMAND, SPLITTER;
+    public String SPLITTER;
 
     @Override
     public String onRequest(Player player, String param) {
         Group group = GroupManager.getGroupByName(param);
         if(group == null) return null;
 
-        return StringUtils.buildSortedStringList(
-                group.getCommands(),
-                SPLITTER,
-                COMMAND,
-                "%command%",
-                false
-        );
+        return StringUtils.getSortedStringList(group.getCommands(), SPLITTER);
     }
 
     @Override
     public void load() {
         super.load();
-        SPLITTER = new ConfigSectionHelper<String>(this, "splitter", "&7-> ").getOrSet();
-        COMMAND = new ConfigSectionHelper<String>(this, "command", "&f%command%\\n").getOrSet();
+        SPLITTER = new ConfigSectionHelper<String>(this, "splitter", "&7, &e").getOrSet();
     }
 }

src/main/java/de/rayzs/pat/api/storage/placeholders/general/GeneralPrefixPlaceholder.java

@@ -0,0 +1,16 @@
+package de.rayzs.pat.api.storage.placeholders.general;
+
+import de.rayzs.pat.api.storage.Storage;
+import de.rayzs.pat.api.storage.storages.PlaceholderStorage;
+import org.bukkit.entity.Player;
+
+public class GeneralPrefixPlaceholder extends PlaceholderStorage {
+
+    public GeneralPrefixPlaceholder() { super("general_prefix"); }
+
+    @Override
+    public String onRequest(Player player, String param) {
+        if (Storage.ConfigSections.Messages.PREFIX == null) return null;
+        return Storage.ConfigSections.Messages.PREFIX.PREFIX;
+    }
+}

src/main/java/de/rayzs/pat/api/storage/placeholders/groups/ListGroupsPlaceholder.java

@@ -10,25 +10,16 @@ public class ListGroupsPlaceholder extends PlaceholderStorage {
 
     public ListGroupsPlaceholder() { super("list_groups"); }
 
-    public String COMMAND, SPLITTER;
+    public String SPLITTER;
 
     @Override
     public String onRequest(Player player, String param) {
-        Group group = GroupManager.getGroupByName(param);
-        if(group == null) return null;
-
-        return StringUtils.buildStringList(
-                GroupManager.getGroupNames(),
-                SPLITTER,
-                COMMAND,
-                "%group%"
-        );
+        return StringUtils.getStringList(GroupManager.getGroupNames(), SPLITTER);
     }
 
     @Override
     public void load() {
         super.load();
-        SPLITTER = new ConfigSectionHelper<String>(this, "splitter", "&7-> ").getOrSet();
-        COMMAND = new ConfigSectionHelper<String>(this, "group", "&f%group%\\n").getOrSet();
+        SPLITTER = new ConfigSectionHelper<String>(this, "splitter", "&7, &e").getOrSet();
     }
 }

src/main/java/de/rayzs/pat/api/storage/placeholders/groups/ListGroupsReversedPlaceholder.java

@@ -10,26 +10,16 @@ public class ListGroupsReversedPlaceholder extends PlaceholderStorage {
 
     public ListGroupsReversedPlaceholder() { super("list_reversed_groups"); }
 
-    public String COMMAND, SPLITTER;
+    public String SPLITTER;
 
     @Override
     public String onRequest(Player player, String param) {
-        Group group = GroupManager.getGroupByName(param);
-        if(group == null) return null;
-
-        return StringUtils.buildSortedStringList(
-                GroupManager.getGroupNames(),
-                SPLITTER,
-                COMMAND,
-                "%group%",
-                true
-        );
+        return StringUtils.getReversedStringList(GroupManager.getGroupNames(), SPLITTER);
     }
 
     @Override
     public void load() {
         super.load();
-        SPLITTER = new ConfigSectionHelper<String>(this, "splitter", "&7-> ").getOrSet();
-        COMMAND = new ConfigSectionHelper<String>(this, "group", "&f%group%\\n").getOrSet();
+        SPLITTER = new ConfigSectionHelper<String>(this, "splitter", "&7, &e").getOrSet();
     }
 }

src/main/java/de/rayzs/pat/api/storage/placeholders/groups/ListGroupsSortedPlaceholder.java

@@ -10,26 +10,16 @@ public class ListGroupsSortedPlaceholder extends PlaceholderStorage {
 
     public ListGroupsSortedPlaceholder() { super("list_sorted_groups"); }
 
-    public String COMMAND, SPLITTER;
+    public String SPLITTER;
 
     @Override
     public String onRequest(Player player, String param) {
-        Group group = GroupManager.getGroupByName(param);
-        if(group == null) return null;
-
-        return StringUtils.buildSortedStringList(
-                GroupManager.getGroupNames(),
-                SPLITTER,
-                COMMAND,
-                "%command%",
-                false
-        );
+        return StringUtils.getSortedStringList(GroupManager.getGroupNames(), SPLITTER);
     }
 
     @Override
     public void load() {
         super.load();
-        SPLITTER = new ConfigSectionHelper<String>(this, "splitter", "&7-> ").getOrSet();
-        COMMAND = new ConfigSectionHelper<String>(this, "group", "&f%group%\\n").getOrSet();
+        SPLITTER = new ConfigSectionHelper<String>(this, "splitter", "&7, &e").getOrSet();
     }
 }

src/main/java/de/rayzs/pat/api/storage/placeholders/messages/BlockedBaseCommandPlaceholder.java

@@ -0,0 +1,17 @@
+package de.rayzs.pat.api.storage.placeholders.messages;
+
+import de.rayzs.pat.api.storage.storages.PlaceholderStorage;
+import de.rayzs.pat.api.storage.Storage;
+import de.rayzs.pat.utils.StringUtils;
+import org.bukkit.entity.Player;
+
+public class BlockedBaseCommandPlaceholder extends PlaceholderStorage {
+
+    public BlockedBaseCommandPlaceholder() { super("message_base_blocked"); }
+
+    @Override
+    public String onRequest(Player player, String param) {
+        if (Storage.ConfigSections.Settings.CANCEL_COMMAND.BASE_COMMAND_RESPONSE == null) return null;
+        return StringUtils.getStringList(Storage.ConfigSections.Settings.CANCEL_COMMAND.BASE_COMMAND_RESPONSE.getLines(), "\n");
+    }
+}

src/main/java/de/rayzs/pat/api/storage/placeholders/messages/BlockedCommandPlaceholder.java

@@ -1,16 +0,0 @@
-package de.rayzs.pat.api.storage.placeholders.messages;
-
-import de.rayzs.pat.api.storage.storages.PlaceholderStorage;
-import de.rayzs.pat.api.storage.Storage;
-import de.rayzs.pat.utils.StringUtils;
-import org.bukkit.entity.Player;
-
-public class BlockedCommandPlaceholder extends PlaceholderStorage {
-
-    public BlockedCommandPlaceholder() { super("message_blocked"); }
-
-    @Override
-    public String onRequest(Player player, String param) {
-        return StringUtils.buildStringList(Storage.ConfigSections.Settings.CANCEL_COMMAND.MESSAGE.getLines());
-    }
-}

src/main/java/de/rayzs/pat/api/storage/placeholders/messages/BlockedSubCommandPlaceholder.java

@@ -0,0 +1,17 @@
+package de.rayzs.pat.api.storage.placeholders.messages;
+
+import de.rayzs.pat.api.storage.Storage;
+import de.rayzs.pat.api.storage.storages.PlaceholderStorage;
+import de.rayzs.pat.utils.StringUtils;
+import org.bukkit.entity.Player;
+
+public class BlockedSubCommandPlaceholder extends PlaceholderStorage {
+
+    public BlockedSubCommandPlaceholder() { super("message_sub_blocked"); }
+
+    @Override
+    public String onRequest(Player player, String param) {
+        if (Storage.ConfigSections.Settings.CANCEL_COMMAND.SUB_COMMAND_RESPONSE == null) return null;
+        return StringUtils.getStringList(Storage.ConfigSections.Settings.CANCEL_COMMAND.SUB_COMMAND_RESPONSE.getLines(), "\n");
+    }
+}

src/main/java/de/rayzs/pat/api/storage/placeholders/messages/UnknownCommandPlaceholder.java

@@ -11,6 +11,7 @@ public class UnknownCommandPlaceholder extends PlaceholderStorage {
 
     @Override
     public String onRequest(Player player, String param) {
-        return StringUtils.buildStringList(Storage.ConfigSections.Settings.CUSTOM_UNKNOWN_COMMAND.MESSAGE.getLines());
+        if (Storage.ConfigSections.Settings.CUSTOM_UNKNOWN_COMMAND.MESSAGE == null) return null;
+        return StringUtils.getStringList(Storage.ConfigSections.Settings.CUSTOM_UNKNOWN_COMMAND.MESSAGE.getLines(), "\n");
     }
 }

src/main/java/de/rayzs/pat/api/storage/storages/BlacklistStorage.java

@@ -1,14 +1,15 @@
 package de.rayzs.pat.api.storage.storages;
 
-import de.rayzs.pat.utils.permission.PermissionUtil;
-import de.rayzs.pat.plugin.logger.Logger;
+import de.rayzs.pat.utils.StringUtils;
 import de.rayzs.pat.api.storage.*;
+
 import java.io.Serializable;
 import java.util.*;
 
 public class BlacklistStorage extends StorageTemplate implements Serializable {
 
     private List<String> commands = new ArrayList<>();
+    private List<String> hiddenCommands = new ArrayList<>();
 
     public BlacklistStorage(String navigatePath) {
         super(Storage.Files.STORAGE, navigatePath);
@@ -18,152 +19,60 @@ public class BlacklistStorage extends StorageTemplate implements Serializable {
         return isListed(command, false);
     }
 
-    public boolean isConverted(String command, boolean intensive) {
-        return !command.contains(" ") && (intensive && !command.contains(":"));
-    }
+    public boolean isListed(String command, boolean ignoreColons) {
+        final boolean caseSensitive = Storage.ConfigSections.Settings.BASE_COMMAND_CASE_SENSITIVE.ENABLED;
 
-    public String convertCommand(String command, boolean intensive, boolean lowerCase) {
-        return convertCommand(command, intensive, lowerCase, true);
-    }
-
-    public String convertCommand(String command, boolean intensive, boolean lowerCase, boolean slash) {
-        if(isConverted(command, intensive)) return command;
-        if(lowerCase) command = command.toLowerCase();
-
-        if(slash)
-            if(command.startsWith("/")) command = command.replaceFirst("/", "");
-
-        String[] split;
-        if(command.contains(" ")) {
-            split = command.split(" ");
-            if(split.length > 0) command = split[0];
-        }
-
-        if(intensive && command.contains(":")) {
-            split = command.split(":");
-            if(split.length > 0)
-                command = command.replaceFirst(split[0] + ":", "");
-        }
-
-        return command;
-    }
-
-    public boolean isListed(String command, boolean intensive) {
-        if(commands == null) {
-            Logger.warning("&cFailed to check command \"" + command + "\"! PAT couldn't read the commands from the storage.yml at section &4" + getNavigatePath() + "&c! Please ensure that your storage.yml isn't corrupt or contains any spaces or empty commands. If this problem still remains, please join my Discord server to ask for help there. &8(&erayzs.de/discord&8)");
+        if (commands == null || command.isEmpty()) {
             return false;
         }
 
-        if(!isConverted(command, intensive)) command = convertCommand(command, intensive, true);
+        boolean isNegated = Storage.Blacklist.BlockTypeFetcher.isNegated(command);
 
-        for (String commands : commands) {
-            if(commands == null) continue;
-            if (commands.equals(command)) return true;
+        if (!isNegated) {
+            command = StringUtils.getFirstArg(command);
+        }
+
+        for (String listedCommand : hiddenCommands) {
+            if (listedCommand == null)
+                continue;
+
+            if (ignoreColons) {
+                command = StringUtils.getFirstArg(command);
+
+                if (command.contains(":"))
+                    command = command.substring(command.indexOf(':'));
+            }
+
+            if (!isNegated) {
+                listedCommand = StringUtils.getFirstArg(listedCommand);
+            }
+
+            if (caseSensitive && listedCommand.equals(command)) {
+                return true;
+            } else if (!caseSensitive && listedCommand.equalsIgnoreCase(command)) {
+                return true;
+            }
         }
 
         return false;
     }
 
-    public boolean isListed(String command, boolean intensive, boolean convert, boolean slash) {
-        if(commands == null) {
-            Logger.warning("&cFailed to check command \"" + command + "\"! PAT couldn't read the commands from the storage.yml at section &4" + getNavigatePath() + "&c! Please ensure that your storage.yml isn't corrupt or contains any spaces or empty commands. If this problem still remains, please join my Discord server to ask for help there. &8(&erayzs.de/discord&8)");
-            return false;
-        }
-
-        if(convert)
-            if(!isConverted(command, intensive)) command = convertCommand(command, intensive, true, slash);
-
-        for (String commands : commands) {
-            if(commands == null) continue;
-            if (commands.equals(command)) return true;
-        }
-
-        return false;
-    }
-
-    public boolean isListed(String command, boolean intensive, boolean convert) {
-        if(commands == null) {
-            Logger.warning("&cFailed to check command \"" + command + "\"! PAT couldn't read the commands from the storage.yml at section &4" + getNavigatePath() + "&c! Please ensure that your storage.yml isn't corrupt or contains any spaces or empty commands. If this problem still remains, please join my Discord server to ask for help there. &8(&erayzs.de/discord&8)");
-            return false;
-        }
-
-        if(convert)
-            if(!isConverted(command, intensive)) command = convertCommand(command, intensive, true);
-
-        for (String commands : commands) {
-            if(commands == null) continue;
-            if (commands.equals(command)) return true;
-        }
-        return false;
-    }
-
-    public boolean isBlocked(Object targetObj, String command) {
-        return isBlocked(targetObj, command, false);
-    }
-
-    public boolean isBlocked(Object targetObj, String command, boolean intensive) {
-        if(Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED)
-            return !isListed(command, intensive) && !PermissionUtil.hasBypassPermission(targetObj, command);
-        else
-            return isListed(command, intensive) && !PermissionUtil.hasBypassPermission(targetObj, command);
-    }
-
-    public boolean isBlockedIgnorePermission(String command, boolean intensive) {
-        if(Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED)
-            return !isListed(command, intensive);
-        else
-            return isListed(command, intensive);
-    }
-
-    public boolean isBlocked(Object targetObj, String command, boolean intensive, boolean convert) {
-        if(Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED)
-            return !isListed(command, intensive, convert) && !PermissionUtil.hasBypassPermission(targetObj, command);
-        else
-            return isListed(command, intensive, convert) && !PermissionUtil.hasBypassPermission(targetObj, command);
-    }
-
-    public boolean isBlocked(Object targetObj, String command, boolean intensive, boolean convert, boolean slash) {
-        if(Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED)
-            return !isListed(command, intensive, convert, slash) && !PermissionUtil.hasBypassPermission(targetObj, command);
-        else
-            return isListed(command, intensive, convert, slash) && !PermissionUtil.hasBypassPermission(targetObj, command);
-    }
-
-    public boolean isBlocked(String command, boolean intensive) {
-        if(Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED)
-            return !isListed(command, intensive);
-        else
-            return isListed(command, intensive);
-    }
-
-    public boolean isBlocked(String command, boolean intensive, boolean convert) {
-        if(Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED)
-            return !isListed(command, intensive, convert);
-        else
-            return isListed(command, intensive, convert);
-    }
-
-    public boolean isBlocked(String command, boolean intensive, boolean convert, boolean slash) {
-        if(Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED)
-            return !isListed(command, intensive, convert, slash);
-        else
-            return isListed(command, intensive, convert, slash);
-    }
-
     public void setList(List<String> commands) {
         this.commands = commands;
     }
 
     public BlacklistStorage add(String command) {
-        command = command.toLowerCase();
-        if(!commands.contains(command))
+        if (!commands.contains(command)) {
             commands.add(command);
+            hiddenCommands.add(command);
+        }
+
         return this;
     }
 
     public BlacklistStorage remove(String command) {
-        command = command.toLowerCase();
         commands.remove(command);
+        hiddenCommands.remove(command);
         return this;
     }
 
@@ -176,6 +85,10 @@ public class BlacklistStorage extends StorageTemplate implements Serializable {
         return commands;
     }
 
+    public List<String> getHiddenCommands() {
+        return hiddenCommands;
+    }
+
     @Override
     public void save() {
         getConfig().setAndSave(getNavigatePath(), commands);
@@ -184,6 +97,54 @@ public class BlacklistStorage extends StorageTemplate implements Serializable {
     @Override
     public void load() {
         getConfig().reload();
+
         commands = (ArrayList<String>) getConfig().getOrSet(getNavigatePath(), commands);
+
+        final List<String> tmpCommands = commands != null ? new ArrayList<>(commands) : new ArrayList<>();
+        final Set<String> pluginListCommands = new HashSet<>(), negatedPluginListCommands = new HashSet<>();
+
+        final String pluginCommandPrefix = "plugin=";
+        final String negatedPluginCommandPrefix = Storage.Blacklist.BlockType.NEGATE + pluginCommandPrefix;
+
+        for (String command : tmpCommands) {
+            if (command.startsWith(pluginCommandPrefix)) {
+                pluginListCommands.add(command);
+            }
+
+            if (command.startsWith(negatedPluginCommandPrefix)) {
+                negatedPluginListCommands.add(command);
+            }
+        }
+
+        tmpCommands.removeAll(pluginListCommands);
+        tmpCommands.removeAll(negatedPluginListCommands);
+
+        for (String negatedPluginCommand : negatedPluginListCommands) {
+            negatedPluginCommand = negatedPluginCommand.substring(negatedPluginCommandPrefix.length());
+
+            List<String> pluginCommands = Storage.getLoader().getPluginCommands(negatedPluginCommand, false);
+
+            for (String pluginCommand : pluginCommands) {
+                tmpCommands.remove(pluginCommand);
+
+                tmpCommands.add(Storage.Blacklist.BlockType.NEGATE + pluginCommand);
+            }
+        }
+
+        for (String pluginListCommand : pluginListCommands) {
+            pluginListCommand = pluginListCommand.substring(pluginCommandPrefix.length());
+
+            List<String> pluginCommands = Storage.getLoader().getPluginCommands(pluginListCommand, false);
+
+            for (String pluginCommand : pluginCommands) {
+                final String negated = Storage.Blacklist.BlockType.NEGATE + pluginCommand;
+
+                if (!commands.contains(negated) && !tmpCommands.contains(negated)) {
+                    tmpCommands.add(pluginCommand);
+                }
+            }
+        }
+
+        hiddenCommands = tmpCommands;
     }
 }

src/main/java/de/rayzs/pat/api/storage/storages/DisabledServersStorage.java

@@ -0,0 +1,59 @@
+package de.rayzs.pat.api.storage.storages;
+
+import de.rayzs.pat.api.storage.Storage;
+import de.rayzs.pat.api.storage.StorageTemplate;
+import de.rayzs.pat.utils.Reflection;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DisabledServersStorage extends StorageTemplate {
+
+    private List<String> servers = new ArrayList<>();
+
+    public DisabledServersStorage() {
+        super(Storage.Files.STORAGE, "disabled-servers");
+    }
+
+    public DisabledServersStorage add(String server) {
+        server = server.toLowerCase();
+
+        if (!servers.contains(server)) {
+            servers.add(server);
+        }
+
+        return this;
+    }
+
+    public DisabledServersStorage remove(String server) {
+        server = server.toLowerCase();
+        servers.remove(server);
+        return this;
+    }
+
+    public boolean isListed(String server) {
+        if (servers.isEmpty()) {
+            return false;
+        }
+
+        return Storage.isServer(server, servers);
+    }
+
+    public boolean isListEmpty() {
+        return servers.isEmpty();
+    }
+
+    @Override
+    public void save() { getConfig().save(); }
+
+    @Override
+    public void load() {
+
+        if (!Reflection.isProxyServer()) {
+            return;
+        }
+
+        getConfig().reload();
+        servers = (ArrayList<String>) getConfig().getOrSet(getNavigatePath(), servers);
+   }
+}

src/main/java/de/rayzs/pat/api/storage/storages/PlaceholderStorage.java

@@ -9,6 +9,7 @@ public abstract class PlaceholderStorage extends StorageTemplate {
 
     public PlaceholderStorage(String request) {
         super(Storage.Files.PLACEHOLDERS, request);
+
         this.request = request;
         Storage.ConfigSections.PLACEHOLDERS.add(this);
     }

src/main/java/de/rayzs/pat/plugin/BukkitLoader.java

@@ -1,23 +1,33 @@
 package de.rayzs.pat.plugin;
 
-import de.rayzs.pat.utils.configuration.updater.ConfigUpdater;
+import de.rayzs.pat.api.brand.CustomServerBrand;
+import de.rayzs.pat.plugin.converter.StorageConverter;
+import de.rayzs.pat.plugin.subarguments.SubArguments;
+import de.rayzs.pat.plugin.process.CommandProcess;
 import de.rayzs.pat.api.netty.bukkit.BukkitPacketAnalyzer;
 import de.rayzs.pat.api.communication.BackendUpdater;
+import de.rayzs.pat.utils.adapter.GroupManagerAdapter;
 import de.rayzs.pat.utils.configuration.Configurator;
+import de.rayzs.pat.utils.configuration.updater.ConfigUpdater;
+import de.rayzs.pat.utils.group.TinyGroup;
 import de.rayzs.pat.utils.message.MessageTranslator;
 import de.rayzs.pat.utils.permission.PermissionUtil;
 import de.rayzs.pat.utils.adapter.ViaVersionAdapter;
 import de.rayzs.pat.api.communication.Communicator;
 import de.rayzs.pat.utils.adapter.LuckPermsAdapter;
 import de.rayzs.pat.plugin.commands.BukkitCommand;
-import de.rayzs.pat.api.brand.CustomServerBrand;
 import de.rayzs.pat.utils.hooks.PlaceholderHook;
 import de.rayzs.pat.plugin.listeners.bukkit.*;
+import de.rayzs.pat.api.event.PATEventHandler;
 import de.rayzs.pat.utils.group.GroupManager;
 import de.rayzs.pat.plugin.metrics.bStats;
 import de.rayzs.pat.plugin.logger.Logger;
+import de.rayzs.pat.utils.response.action.ActionHandler;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Entity;
 import org.bukkit.plugin.java.JavaPlugin;
 import de.rayzs.pat.api.storage.Storage;
+import de.rayzs.pat.utils.scheduler.*;
 import org.bukkit.entity.Player;
 import java.lang.reflect.Field;
 import de.rayzs.pat.utils.*;
@@ -25,20 +35,29 @@ import org.bukkit.command.*;
 import org.bukkit.plugin.*;
 import org.bukkit.Bukkit;
 import java.util.*;
+import java.util.stream.Collectors;
 
-public class BukkitLoader extends JavaPlugin {
+public class BukkitLoader extends JavaPlugin implements PluginLoader {
+
+    private static List<String> commands = new ArrayList<>(),
+            allowedCommands = new ArrayList<>(),
+            disallowedCommands = new ArrayList<>();
 
     private static Plugin plugin;
     private static java.util.logging.Logger logger;
-    private static boolean loaded = false, checkUpdate = false, suggestions = false;
+    private static boolean loaded = false, suggestions = false;
     private static Map<String, Command> commandsMap = null;
-    private int updaterTaskId;
+    private PATSchedulerTask updaterTask;
+
+    private final List<String> offlinePlayerNames = new ArrayList<>();
+    private long lastCommandsLoad = -1;
 
     @Override
     public void onLoad() {
-        Configurator.createResourcedFile(getDataFolder(), "files\\bukkit-config.yml", "config.yml", false);
-        Configurator.createResourcedFile(getDataFolder(), "files\\bukkit-storage.yml", "storage.yml", false);
-        Configurator.createResourcedFile(getDataFolder(), "files\\bukkit-placeholders.yml", "placeholders.yml", false);
+        Configurator.createResourcedFile("files\\bukkit-config.yml", "config.yml", false);
+        Configurator.createResourcedFile("files\\bukkit-storage.yml", "storage.yml", false);
+        Configurator.createResourcedFile("files\\bukkit-placeholders.yml", "placeholders.yml", false);
+        Configurator.createResourcedFile("files\\bukkit-custom-responses.yml", "custom-responses.yml", false);
     }
 
     @Override
@@ -46,16 +65,22 @@ public class BukkitLoader extends JavaPlugin {
         plugin = this;
         logger = getLogger();
 
+        for (OfflinePlayer offlinePlayerName : Bukkit.getOfflinePlayers()) {
+            offlinePlayerNames.add(offlinePlayerName.getName());
+        }
+
         loadCommandMap();
 
+        CommandProcess.initialize();
         Reflection.initialize(getServer());
         ConfigUpdater.initialize();
 
-        Storage.CURRENT_VERSION = getDescription().getVersion();
+        Storage.initialize(this, getDescription().getVersion());
+        VersionComparer.get().setCurrentVersion(Storage.CURRENT_VERSION);
 
         Storage.loadAll(true);
 
-        if(Bukkit.getServer().getPluginManager().getPlugin("PlaceholderAPI") != null)
+        if (Bukkit.getServer().getPluginManager().getPlugin("PlaceholderAPI") != null)
             new PlaceholderHook().register();
 
         MessageTranslator.initialize();
@@ -64,20 +89,21 @@ public class BukkitLoader extends JavaPlugin {
 
         PluginManager manager = getServer().getPluginManager();
 
-        if(!Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED) {
+        if (!Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED) {
             loaded = true;
             GroupManager.initialize();
             BukkitPacketAnalyzer.injectAll();
         } else BackendUpdater.handle();
 
-        manager.registerEvents(new BukkitPlayerConnectionListener(), this);
+        manager.registerEvents(new BukkitPlayerListener(), this);
         manager.registerEvents(new BukkitBlockCommandListener(), this);
-        if(Reflection.getMinor() >= 13) {
+
+        if (Reflection.getMinor() >= 13) {
             suggestions = true;
             manager.registerEvents(new BukkitAntiTabListener(), this);
         }
 
-        if(Reflection.isPaper() && Reflection.getMinor() >= 12)
+        if (Reflection.isPaper() && Reflection.getMinor() >= 12)
             manager.registerEvents(new PaperServerListPing(), this);
 
         registerCommand("proantitab", "pat");
@@ -85,18 +111,36 @@ public class BukkitLoader extends JavaPlugin {
 
         Storage.PLUGIN_OBJECT = this;
 
-        if(getServer().getPluginManager().getPlugin("LuckPerms") != null) {
+        if (getServer().getPluginManager().getPlugin("LuckPerms") != null) {
             LuckPermsAdapter.initialize();
             Bukkit.getOnlinePlayers().forEach(player -> PermissionUtil.setPlayerPermissions(player.getUniqueId()));
+        } else {
+            final Plugin groupManagerPlugin = getServer().getPluginManager().getPlugin("GroupManager");
+            if (groupManagerPlugin != null) {
+                GroupManagerAdapter.initialize(groupManagerPlugin);
+                Bukkit.getOnlinePlayers().forEach(player -> PermissionUtil.setPlayerPermissions(player.getUniqueId()));
+            }
         }
 
-        if(getServer().getPluginManager().getPlugin("ViaVersion") != null)
+        if (getServer().getPluginManager().getPlugin("ViaVersion") != null)
             ViaVersionAdapter.initialize();
 
-        if(Storage.USE_SIMPLECLOUD)
-            Logger.warning("Detected SimpleCloud and therefore MiniMessages by Kyori are disabled!");
+        if (Storage.USE_SIMPLECLOUD) {
+            Logger.warning("Detected SimpleCloud. Therefore, MiniMessages are disabled!");
+        }
 
+        Storage.broadcastPermissionsPluginNotice();
         ConfigUpdater.broadcastMissingParts();
+
+        ActionHandler.initialize();
+        SubArguments.initialize();
+
+        StorageConverter.initialize();
+
+        PATScheduler.createScheduler(() -> {
+            Storage.reload();
+            loadAllCommands();
+        });
     }
 
     @Override
@@ -115,99 +159,278 @@ public class BukkitLoader extends JavaPlugin {
         }
     }
 
-    public static List<String> getPlayerNames() {
-        List<String> result = new LinkedList<>();
-        Bukkit.getServer().getOnlinePlayers().forEach(player -> result.add(player.getName()));
-        return result;
+    @Override
+    public void handleReload() {
+        loadAllCommands();
     }
 
-    public static UUID getUUIDByName(String playerName) {
-        Player player = Bukkit.getServer().getPlayer(playerName);
+    @Override
+    public boolean doesCommandExist(String command) {
+        if (commandsMap == null)
+            return false;
+
+        loadAllCommands();
+
+        return getAllCommands().contains(command);
+    }
+
+    @Override
+    public Object getConsoleSender() {
+        return Bukkit.getConsoleSender();
+    }
+
+    @Override
+    public Object getPlayerObjByName(String name) {
+        return Bukkit.getPlayer(name);
+    }
+
+    @Override
+    public Object getPlayerObjByUUID(UUID uuid) {
+        return Bukkit.getPlayer(uuid);
+    }
+
+    @Override
+    public void updateCommandCache() {}
+
+    @Override
+    public HashMap<String, CommandsCache> getCommandsCacheMap() {
+        return null;
+    }
+
+    @Override
+    public boolean isPlayerOnline(String playerName) {
+        return Bukkit.getPlayer(playerName) != null;
+    }
+
+    @Override
+    public boolean doesPlayerExist(String playerName) {
+        return isPlayerOnline(playerName) || ArrayUtils.containsIgnoreCase(getPlayerNames(), playerName);
+    }
+
+    @Override
+    public String getPlayerServerName(UUID uuid) {
+        return null;
+    }
+
+    @Override
+    public List<UUID> getPlayerIdsByServer(String server) {
+        return null;
+    }
+
+    @Override
+    public List<String> getOnlinePlayerNames(String serverName) {
+        return getOnlinePlayerNames();
+    }
+
+    @Override
+    public List<UUID> getPlayerIds() {
+        return Bukkit.getOnlinePlayers().stream().map(Entity::getUniqueId).collect(Collectors.toList());
+    }
+
+    @Override
+    public List<String> getOnlinePlayerNames() {
+        return new ArrayList<>(Bukkit.getServer().getOnlinePlayers().stream().map(Player::getName).toList());
+    }
+
+    @Override
+    public List<String> getOfflinePlayerNames() {
+        return offlinePlayerNames;
+    }
+
+    @Override
+    public List<String> getPlayerNames() {
+        List<String> playerNames = new ArrayList<>(offlinePlayerNames);
+
+        playerNames.addAll(getOnlinePlayerNames());
+
+        return playerNames;
+    }
+
+    @Override
+    public String getNameByUUID(UUID uuid) {
+        Player player = Bukkit.getPlayer(uuid);
+        return player != null ? player.getName() : "";
+    }
+
+    @Override
+    public UUID getUUIDByName(String playerName) {
+        Player player = Bukkit.getPlayer(playerName);
         return player != null ? player.getUniqueId() : null;
     }
 
+    @Override
+    public List<String> getServerNames() {
+        return List.of();
+    }
+
+    @Override
+    public void delayedPermissionsReload() {
+        PATScheduler.createScheduler(PermissionUtil::reloadPermissions, 40);
+    }
+
     public void startUpdaterTask() {
-        if (!Storage.ConfigSections.Settings.UPDATE.ENABLED) return;
-        updaterTaskId = Bukkit.getScheduler().scheduleAsyncRepeatingTask(this, () -> {
-            String result = new ConnectionBuilder().setUrl("https://www.rayzs.de/proantitab/api/version.php")
-                    .setProperties("ProAntiTab", "4654").connect().getResponse();
+        if (!Storage.ConfigSections.Settings.UPDATE.ENABLED)
+            return;
 
-            if(result == null) result = "internet";
-            Storage.NEWER_VERSION = result;
+        updaterTask = PATScheduler.createAsyncScheduler(() -> {
+
+            if (VersionComparer.get().computeComparison())
+                updaterTask.cancelTask();
 
-            if (!Storage.NEWER_VERSION.equals(Storage.CURRENT_VERSION)) {
-                Bukkit.getScheduler().cancelTask(updaterTaskId);
-                switch (result) {
-                    case "internet":
-                        Logger.warning("Failed to build connection to website! (No internet?)");
-                        break;
-                    case "unknown":
-                        Logger.warning("Failed to build connection to website! (Firewall enabled or website down?)");
-                        break;
-                    case "exception":
-                        Logger.warning("Failed to build connection to website! (Outdated java version?)");
-                        break;
-                    default:
-                        Storage.OUTDATED = true;
-                        Storage.ConfigSections.Settings.UPDATE.OUTDATED.getLines().forEach(Logger::warning);
-                        break;
-                }
-            } else {
-                if(!checkUpdate) {
-                    checkUpdate = true;
-                    Storage.ConfigSections.Settings.UPDATE.UPDATED.getLines().forEach(Logger::warning);
-                }
-            }
         }, 20L, 20L * Storage.ConfigSections.Settings.UPDATE.PERIOD);
     }
 
+    public static void handleUpdateCommandsPacket(CommunicationPackets.UpdateCommandsPacket packet) {
+
+        if (!packet.hasTargetUUID()) {
+            Bukkit.getOnlinePlayers().forEach(Player::updateCommands);
+            return;
+        }
+
+        Player player = Bukkit.getPlayer(packet.getTargetUUID());
+        if (player != null && Reflection.getMinor() >= 13) {
+            player.updateCommands();
+        }
+    }
+
     public static void synchronize(CommunicationPackets.PacketBundle packetBundle) {
         Storage.LAST_SYNC = System.currentTimeMillis();
         Communicator.sendFeedback();
+
         CommunicationPackets.UnknownCommandPacket unknownCommandPacket = packetBundle.getUnknownCommandPacket();
+        CommunicationPackets.CommandsPacket commandsPacket = packetBundle.getCommandsPacket();
+        CommunicationPackets.GroupsPacket groupsPacket = packetBundle.getGroupsPacket();
+        CommunicationPackets.NamespaceCommandsPacket namespaceCommandsPacket = packetBundle.getNamespaceCommandsPacket();
+        CommunicationPackets.MessagePacket messagePacket = packetBundle.getMessagePacket();
 
-        if(!Storage.USE_VELOCITY) {
-            CommunicationPackets.CommandsPacket commandsPacket = packetBundle.getCommandsPacket();
-            CommunicationPackets.GroupsPacket groupsPacket = packetBundle.getGroupsPacket();
-            CommunicationPackets.NamespaceCommandsPacket namespaceCommandsPacket = packetBundle.getNamespaceCommandsPacket();
+        boolean updatedList = false;
 
-            if(Storage.ConfigSections.Settings.BLOCK_NAMESPACE_COMMANDS.ENABLED != namespaceCommandsPacket.isEnabled())
-                Storage.ConfigSections.Settings.BLOCK_NAMESPACE_COMMANDS.ENABLED = namespaceCommandsPacket.isEnabled();
+        if (!messagePacket.getBaseBlockedMessage().getLines().isEmpty())
+            Storage.ConfigSections.Settings.CANCEL_COMMAND.BASE_COMMAND_RESPONSE = messagePacket.getBaseBlockedMessage();
 
-            if (commandsPacket.getCommands() == null || commandsPacket.getCommands().isEmpty())
-                Storage.Blacklist.getBlacklist().setList(new ArrayList<>());
+        if (!messagePacket.getSubBlockedMessage().getLines().isEmpty())
+            Storage.ConfigSections.Settings.CANCEL_COMMAND.SUB_COMMAND_RESPONSE = messagePacket.getSubBlockedMessage();
 
-            else if (!ArrayUtils.compareStringArrays(Storage.Blacklist.getBlacklist().getCommands(), commandsPacket.getCommands())) {
-                BukkitAntiTabListener.setChangeStatus();
-                Storage.Blacklist.getBlacklist().setList(commandsPacket.getCommands());
+        if (!messagePacket.getPrefix().isEmpty())
+            Storage.ConfigSections.Messages.PREFIX.PREFIX = messagePacket.getPrefix();
+
+        if (Storage.ConfigSections.Settings.BLOCK_NAMESPACE_COMMANDS.ENABLED != namespaceCommandsPacket.isEnabled())
+            Storage.ConfigSections.Settings.BLOCK_NAMESPACE_COMMANDS.ENABLED = namespaceCommandsPacket.isEnabled();
+
+        if (commandsPacket.getCommands() == null || commandsPacket.getCommands().isEmpty())
+            Storage.Blacklist.getBlacklist().setList(new ArrayList<>());
+
+        else if (!ArrayUtils.compareStringArrays(Storage.Blacklist.getBlacklist().getCommands(), commandsPacket.getCommands())) {
+            updatedList = true;
+            Storage.Blacklist.getBlacklist().setList(commandsPacket.getCommands());
+        }
+
+        if (Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED != commandsPacket.turnBlacklistToWhitelistEnabled())
+            Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED = commandsPacket.turnBlacklistToWhitelistEnabled();
+
+        Map<String, List<String>> cpyCache = new HashMap<>();
+        GroupManager.getGroups().forEach(group -> {
+            cpyCache.put(group.getGroupName(), group.getCommands());
+        });
+
+        GroupManager.clearAllGroups();
+
+        for (TinyGroup group : groupsPacket.getGroups()) {
+            List<String> currentExistingList = cpyCache.get(group.getGroupName());
+            if (
+                    !updatedList
+                    && currentExistingList != null
+                    && !ArrayUtils.compareStringArrays(currentExistingList, group.getCommands())
+            ) {
+                updatedList = true;
             }
 
-            if (Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED != commandsPacket.turnBlacklistToWhitelistEnabled())
-                Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED = commandsPacket.turnBlacklistToWhitelistEnabled();
-
-            GroupManager.clearAllGroups();
-            groupsPacket.getGroups().forEach(group -> GroupManager.setGroup(group.getGroupName(), group.getPriority(), group.getCommands()));
+            GroupManager.setGroup(group.getGroupName(), group.getPriority(), group.getCommands());
         }
 
         Storage.ConfigSections.Settings.CUSTOM_UNKNOWN_COMMAND.MESSAGE = unknownCommandPacket.getMessage();
-        if(Storage.ConfigSections.Settings.CUSTOM_UNKNOWN_COMMAND.ENABLED != unknownCommandPacket.isEnabled())
+        if (Storage.ConfigSections.Settings.CUSTOM_UNKNOWN_COMMAND.ENABLED != unknownCommandPacket.isEnabled())
             Storage.ConfigSections.Settings.CUSTOM_UNKNOWN_COMMAND.ENABLED = unknownCommandPacket.isEnabled();
 
-        if(!loaded) loaded = true;
+        if (!loaded) {
+            loaded = true;
+        }
 
-        if(Reflection.getMinor() < 16) return;
-
-        if(Storage.USE_VELOCITY)
+        if (Reflection.getMinor() >= 13 && updatedList) {
             BukkitAntiTabListener.updateCommands();
+        }
 
-        Logger.debug("Force server to load all players tab-completion due to received sync!");
-        BukkitAntiTabListener.handleTabCompletion(Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED ? Storage.Blacklist.getBlacklist().getCommands() : getNotBlockedCommands());
+        PATEventHandler.callReceiveSyncEvents(packetBundle);
     }
 
-    public static boolean doesCommandExist(String command, boolean replace) {
-        if(commandsMap == null) return false;
-        if(replace) command = StringUtils.replaceFirst(command, "/", "");
-        return getAllCommands().contains(command);
+    public static List<String> getAllCommands() {
+        return new ArrayList<>(commands);
+    }
+
+    public static List<String> getAllowedCommands() {
+        return new ArrayList<>(allowedCommands);
+    }
+
+    public static List<String> getDisallowedCommands() {
+        return disallowedCommands;
+    }
+
+    @Override
+    public List<String> getPluginNames(String format) {
+        List<String> pluginNames = new ArrayList<>();
+
+        for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
+            PluginDescriptionFile description = plugin.getDescription();
+
+            pluginNames.add(
+                    format.replace("%n", description.getName())
+                            .replace("%v", description.getVersion())
+            );
+        }
+
+        return pluginNames;
+    }
+
+    @Override
+    public List<String> getAllCommands(boolean useColons) {
+        List<String> commands = new ArrayList<>();
+
+        for (Map.Entry<String, Command> entry : BukkitLoader.getCommandsMap().entrySet()) {
+            if (entry.getKey().toLowerCase().contains(":")) {
+                String command = entry.getKey().substring(entry.getKey().lastIndexOf(":") + 1);
+
+                commands.add(command);
+
+                if (useColons) {
+                    commands.add(entry.getKey());
+                }
+            }
+        }
+
+        return commands;
+    }
+
+    @Override
+    public List<String> getPluginCommands(String pluginName, boolean useColons) {
+        List<String> commands = new ArrayList<>();
+
+        if (pluginName.isBlank()) return commands;
+
+        pluginName = pluginName.toLowerCase();
+
+        for (Map.Entry<String, Command> entry : BukkitLoader.getCommandsMap().entrySet()) {
+            if (entry.getKey().toLowerCase().startsWith(pluginName + ":")) {
+                String command = entry.getKey().substring(pluginName.length() + 1);
+
+                commands.add(command);
+
+                if (useColons) {
+                    commands.add(entry.getKey());
+                }
+            }
+        }
+
+        return commands;
     }
 
     private void loadCommandMap() {
@@ -218,44 +441,66 @@ public class BukkitLoader extends JavaPlugin {
                 SimpleCommandMap simpleCommandMap = (SimpleCommandMap) commandMapField.get(Bukkit.getPluginManager());
                 Field knownCommandsField = SimpleCommandMap.class.getDeclaredField("knownCommands");
                 knownCommandsField.setAccessible(true);
-                commandsMap = (Map<String, Command>)knownCommandsField.get(simpleCommandMap);
+                commandsMap = (Map<String, Command>) knownCommandsField.get(simpleCommandMap);
             }
-        }catch (Throwable ignored) { }
+        } catch (Throwable ignored) { }
 
-        if(commandsMap == null)
+        if (commandsMap == null) {
             Logger.warning("Failed to get server commands!");
+        }
     }
 
-    public static List<String> getNotBlockedCommands() {
-        List<String> commands = new ArrayList<>();
-        Bukkit.getHelpMap().getHelpTopics().stream()
-                .filter(topic -> !topic.getName().contains(":") && topic.getName().startsWith("/") && !Storage.Blacklist.getBlacklist().isListed(topic.getName().replaceFirst("/", "")))
-                .forEach(topic -> commands.add(topic.getName().replaceFirst("/", "")));
-        return commands;
+    private void loadAllCommands() {
+
+        if (lastCommandsLoad != -1 && System.currentTimeMillis() - lastCommandsLoad < 1000)
+            return;
+
+        List<String> result = new ArrayList<>();
+
+        if (commandsMap == null) {
+            result.addAll(
+                    Bukkit.getHelpMap().getHelpTopics().stream()
+                    .map(topic -> {
+                        String name = topic.getName();
+
+                        if (name.startsWith("/"))
+                            name = name.substring(1);
+
+                        return name;
+                    }).toList()
+            );
+
+            return;
+        }
+
+        commandsMap.entrySet().forEach(entry -> {
+            String key = entry.getKey();
+            Command command = entry.getValue();
+
+            result.add(key);
+
+            if (!command.getAliases().isEmpty()) {
+                result.addAll(command.getAliases());
+            }
+        });
+
+        boolean turn = Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED;
+        List<String> allowedCommands = new ArrayList<>(result).stream().filter(command -> {
+            boolean contains = Storage.Blacklist.getBlacklist().getCommands().contains(command);
+            return turn == contains;
+        }).toList();
+
+        lastCommandsLoad = System.currentTimeMillis();
+
+        BukkitLoader.commands = result;
+        BukkitLoader.allowedCommands = allowedCommands;
+        BukkitLoader.disallowedCommands = commands.stream().filter(command -> !allowedCommands.contains(command)).toList();
     }
 
-    public static List<String> getAllCommands() {
-        if(commandsMap == null) return getNotBlockedCommands();
-
-        List<String> result = new LinkedList<>();
-        for (String command : commandsMap.keySet()) if(!result.contains(command)) result.add(command);
-
-        if(Reflection.getMinor() == 20 && Reflection.getRelease() >= 5 || Reflection.getMinor() >= 21)
-            for (String s : commandsMap.keySet())
-                    if (commandsMap.containsKey(s)) {
-                        if(!commandsMap.get(s).getAliases().isEmpty()) {
-                            for (String alias : commandsMap.get(s).getAliases())
-                                if (!result.contains(alias)) result.add(alias);
-
-                        } else if(Bukkit.getServer().getCommandAliases().get(s) != null)
-                            for (String alias : Bukkit.getServer().getCommandAliases().get(s))
-                                if (!result.contains(alias)) result.add(alias);
-                    }
-
-        return result;
+    public static Map<String, Command> getCommandsMap() {
+        return commandsMap;
     }
 
-
     public static boolean useSuggestions() {
         return suggestions;
     }

src/main/java/de/rayzs/pat/plugin/BungeeLoader.java

@@ -1,19 +1,26 @@
 package de.rayzs.pat.plugin;
 
-import de.rayzs.pat.utils.configuration.updater.ConfigUpdater;
+
+import de.rayzs.pat.api.brand.CustomServerBrand;
+import de.rayzs.pat.plugin.converter.StorageConverter;
+import de.rayzs.pat.plugin.process.CommandProcess;
+import de.rayzs.pat.plugin.subarguments.SubArguments;
 import de.rayzs.pat.api.netty.proxy.BungeePacketAnalyzer;
 import de.rayzs.pat.utils.configuration.Configurator;
+import de.rayzs.pat.utils.configuration.updater.ConfigUpdater;
 import de.rayzs.pat.utils.message.MessageTranslator;
 import de.rayzs.pat.utils.adapter.LuckPermsAdapter;
 import de.rayzs.pat.api.communication.Communicator;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
+import de.rayzs.pat.utils.permission.PermissionUtil;
+import de.rayzs.pat.utils.response.action.ActionHandler;
 import net.md_5.bungee.api.scheduler.ScheduledTask;
 import de.rayzs.pat.plugin.commands.BungeeCommand;
-import de.rayzs.pat.api.brand.CustomServerBrand;
 import de.rayzs.pat.plugin.listeners.bungee.*;
 import de.rayzs.pat.utils.group.GroupManager;
+import net.md_5.bungee.api.config.ServerInfo;
 import de.rayzs.pat.plugin.metrics.bStats;
 import de.rayzs.pat.plugin.logger.Logger;
+import net.md_5.bungee.api.connection.*;
 import de.rayzs.pat.api.storage.Storage;
 import net.md_5.bungee.api.ProxyServer;
 import java.util.concurrent.TimeUnit;
@@ -21,18 +28,21 @@ import net.md_5.bungee.api.plugin.*;
 import de.rayzs.pat.utils.*;
 import java.util.*;
 
-public class BungeeLoader extends Plugin {
+public class BungeeLoader extends Plugin implements PluginLoader {
+
+    private ScheduledTask updaterTask;
 
     private static Plugin plugin;
     private static java.util.logging.Logger logger;
-    private ScheduledTask updaterTask;
-    private static boolean checkUpdate = false;
+
+    private static final HashMap<String, CommandsCache> commandsCacheMap = new HashMap<>();
 
     @Override
     public void onLoad() {
-        Configurator.createResourcedFile(getDataFolder(), "files\\proxy-config.yml", "config.yml", false);
-        Configurator.createResourcedFile(getDataFolder(), "files\\proxy-storage.yml", "storage.yml", false);
-        Configurator.createResourcedFile(getDataFolder(), "files\\proxy-placeholders.yml", "placeholders.yml", false);
+        Configurator.createResourcedFile("files\\proxy-config.yml", "config.yml", false);
+        Configurator.createResourcedFile("files\\proxy-storage.yml", "storage.yml", false);
+        Configurator.createResourcedFile("files\\proxy-placeholders.yml", "placeholders.yml", false);
+        Configurator.createResourcedFile("files\\proxy-custom-responses.yml", "custom-responses.yml", false);
     }
 
     @Override
@@ -40,11 +50,14 @@ public class BungeeLoader extends Plugin {
         plugin = this;
         logger = getLogger();
 
+        CommandProcess.initialize();
         Reflection.initialize(getProxy());
         ConfigUpdater.initialize();
 
         Storage.USE_SIMPLECLOUD = Reflection.doesClassExist("eu.thesimplecloud.plugin.startup.CloudPlugin");
-        Storage.CURRENT_VERSION = getDescription().getVersion();
+
+        Storage.initialize(this, getDescription().getVersion());
+        VersionComparer.get().setCurrentVersion(Storage.CURRENT_VERSION);
 
         Storage.loadAll(true);
 
@@ -61,11 +74,13 @@ public class BungeeLoader extends Plugin {
         manager.registerListener(this, new BungeeBlockCommandListener());
         manager.registerListener(this, new BungeePingListener());
 
-        if(Reflection.isPaper())
+        if (Reflection.isPaper())
             manager.registerListener(this, new WaterfallAntiTabListener());
 
         startUpdaterTask();
-        ProxyServer.getInstance().getScheduler().schedule(this, Communicator::syncData, 5, TimeUnit.SECONDS);
+
+        if (!Storage.ConfigSections.Settings.DISABLE_SYNC.DISABLED)
+            ProxyServer.getInstance().getScheduler().schedule(this, Communicator::syncData, 5, TimeUnit.SECONDS);
 
         Storage.PLUGIN_OBJECT = this;
 
@@ -81,7 +96,21 @@ public class BungeeLoader extends Plugin {
             Logger.warning("Detected SimpleCloud and therefore MiniMessages by Kyori are disabled!");
 
         BungeePacketAnalyzer.injectAll();
+
+        Storage.broadcastPermissionsPluginNotice();
         ConfigUpdater.broadcastMissingParts();
+
+        ActionHandler.initialize();
+        SubArguments.initialize();
+
+        StorageConverter.initialize();
+
+        // Reload proxy commands after 1, 5, and 15 seconds.
+        for (int i : new Integer[] { 1, 5, 15 }) {
+            ProxyServer.getInstance().getScheduler().schedule(this, BungeePacketAnalyzer::loadProxyCommands, i, TimeUnit.SECONDS);
+        }
+
+        BungeePacketAnalyzer.injectAll();
     }
 
     @Override
@@ -97,43 +126,189 @@ public class BungeeLoader extends Plugin {
         }
     }
 
-    public static List<String> getPlayerNames() {
-        List<String> result = new LinkedList<>();
-        ProxyServer.getInstance().getPlayers().forEach(player -> result.add(player.getName()));
-        return result;
+    @Override
+    public void handleReload() {
+        BungeePacketAnalyzer.loadProxyCommands();
     }
 
-    public static UUID getUUIDByName(String playerName) {
-        ProxiedPlayer proxiedPlayer = ProxyServer.getInstance().getPlayer(playerName);
-        return proxiedPlayer != null ? proxiedPlayer.getUniqueId() : null;
+    @Override
+    public void delayedPermissionsReload() {
+        getProxy().getScheduler().schedule(this, () -> {
+            PermissionUtil.reloadPermissions();
+            Storage.getLoader().updateCommandCache();
+
+            Communicator.sendRequest();
+        }, 1, TimeUnit.SECONDS);
+    }
+
+    @Override
+    public boolean doesCommandExist(String command) {
+        return false;
+    }
+
+    @Override
+    public List<String> getAllCommands(boolean useColons) {
+        return List.of();
+    }
+
+    @Override
+    public Object getConsoleSender() {
+        return ProxyServer.getInstance().getConsole();
+    }
+
+    @Override
+    public Object getPlayerObjByName(String name) {
+        return plugin.getProxy().getPlayer(name);
+    }
+
+    @Override
+    public Object getPlayerObjByUUID(UUID uuid) {
+        return plugin.getProxy().getPlayer(uuid);
+    }
+
+    @Override
+    public HashMap<String, CommandsCache> getCommandsCacheMap() {
+        return commandsCacheMap;
+    }
+
+    @Override
+    public void updateCommandCache() {
+        new ArrayList<>(commandsCacheMap.values()).forEach(CommandsCache::reset);
+    }
+
+    @Override
+    public String getPlayerServerName(UUID uuid) {
+        ProxiedPlayer player = ProxyServer.getInstance().getPlayer(uuid);
+
+        if (player == null || player.getServer() == null || player.getServer().getInfo() == null)
+            return null;
+
+        return player.getServer().getInfo().getName();
+    }
+
+    @Override
+    public List<UUID> getPlayerIds() {
+        return new ArrayList<>(ProxyServer.getInstance().getPlayers().stream().map(ProxiedPlayer::getUniqueId).toList());
+    }
+
+    @Override
+    public List<UUID> getPlayerIdsByServer(String server) {
+        List<UUID> uuids = new ArrayList<>();
+
+        getServerNames().stream()
+                .filter(serverName -> Storage.isServer(server, serverName))
+                .forEach(serverName -> {
+                    ServerInfo serverInfo = ProxyServer.getInstance().getServerInfo(serverName);
+
+                    if (serverInfo == null)
+                        return;
+
+                    uuids.addAll(serverInfo.getPlayers().stream().map(ProxiedPlayer::getUniqueId).toList());
+                });
+
+        return uuids;
+    }
+
+    @Override
+    public List<String> getOnlinePlayerNames(String serverName) {
+        return new ArrayList<>(ProxyServer.getInstance().getPlayers().stream()
+                .filter(player -> {
+                    if (player == null || player.getServer() == null || player.getServer().getInfo() == null)
+                        return false;
+
+                    return player.getServer().getInfo().getName().equalsIgnoreCase(serverName);
+
+                }).map(ProxiedPlayer::getName).toList());
+    }
+
+    @Override
+    public boolean isPlayerOnline(String playerName) {
+        return ProxyServer.getInstance().getPlayer(playerName) != null;
+    }
+
+    @Override
+    public boolean doesPlayerExist(String playerName) {
+        return isPlayerOnline(playerName);
+    }
+
+    @Override
+    public List<String> getOnlinePlayerNames() {
+        return new ArrayList<>(ProxyServer.getInstance().getPlayers().stream().map(ProxiedPlayer::getName).toList());
+    }
+
+    @Override
+    public List<String> getOfflinePlayerNames() {
+        return new ArrayList<>(ProxyServer.getInstance().getPlayers().stream().map(ProxiedPlayer::getName).toList());
+    }
+
+    @Override
+    public List<String> getPlayerNames() {
+        return new ArrayList<>(ProxyServer.getInstance().getPlayers().stream().map(ProxiedPlayer::getName).toList());
+    }
+
+    @Override
+    public String getNameByUUID(UUID uuid) {
+        ProxiedPlayer player = ProxyServer.getInstance().getPlayer(uuid);
+        return player != null ? player.getName() : "";
+    }
+
+    @Override
+    public UUID getUUIDByName(String playerName) {
+        ProxiedPlayer player = ProxyServer.getInstance().getPlayer(playerName);
+        return player != null ? player.getUniqueId() : null;
+    }
+
+    @Override
+    public List<String> getServerNames() {
+        return new ArrayList<>(ProxyServer.getInstance().getServers().keySet().stream().toList());
+    }
+
+    @Override
+    public List<String> getPluginNames(String format) {
+        List<String> pluginNames = new ArrayList<>();
+
+        for (Plugin plugin : ProxyServer.getInstance().getPluginManager().getPlugins()) {
+            PluginDescription description = plugin.getDescription();
+
+            pluginNames.add(
+                    format.replace("%n", description.getName())
+                            .replace("%v", description.getVersion())
+            );
+        }
+
+        return pluginNames;
+    }
+
+    @Override
+    public List<String> getPluginCommands(String pluginName, boolean useColons) {
+        return List.of();
     }
 
     public void startUpdaterTask() {
-        if (!Storage.ConfigSections.Settings.UPDATE.ENABLED) return;
-        updaterTask = getProxy().getScheduler().schedule(this, () -> {
-            String result = new ConnectionBuilder().setUrl("https://www.rayzs.de/proantitab/api/version.php")
-                    .setProperties("ProAntiTab", "4654").connect().getResponse();
-            Storage.NEWER_VERSION = result;
+        if (!Storage.ConfigSections.Settings.UPDATE.ENABLED)
+            return;
 
-            if (!Storage.NEWER_VERSION.equals(Storage.CURRENT_VERSION)) {
+        updaterTask = getProxy().getScheduler().schedule(this, () -> {
+
+            if (VersionComparer.get().computeComparison())
                 getProxy().getScheduler().cancel(updaterTask);
-                if (result.equals("unknown")) {
-                    Logger.warning("Failed reaching web host! (firewall enabled? website down?)");
-                } else if (result.equals("exception")) {
-                    Logger.warning("Failed creating web instance! (outdated java version?)");
-                } else {
-                    Storage.OUTDATED = true;
-                    Storage.ConfigSections.Settings.UPDATE.OUTDATED.getLines().forEach(Logger::warning);
-                }
-            } else {
-                if(!checkUpdate) {
-                    checkUpdate = true;
-                    Storage.ConfigSections.Settings.UPDATE.UPDATED.getLines().forEach(Logger::warning);
-                }
-            }
+
         }, 20L, Storage.ConfigSections.Settings.UPDATE.PERIOD, TimeUnit.MILLISECONDS);
     }
 
+    public static String getServerNameByPlayerUUID(UUID uuid) {
+        ProxiedPlayer proxiedPlayer = ProxyServer.getInstance().getPlayer(uuid);
+        if(proxiedPlayer == null) return null;
+
+        Server server = proxiedPlayer.getServer();
+        if(server == null) return null;
+
+        ServerInfo serverInfo = server.getInfo();
+        if(serverInfo == null) return null;
+
+        return serverInfo.getName();
+    }
+
     public static Plugin getPlugin() {
         return plugin;
     }
@@ -141,12 +316,4 @@ public class BungeeLoader extends Plugin {
     public static java.util.logging.Logger getPluginLogger() {
         return logger;
     }
-
-    public static List<String> getServerNames() {
-        List<String> servers = new LinkedList<>();
-        for (String serverName : ProxyServer.getInstance().getServers().keySet())
-            servers.add(serverName.toLowerCase());
-
-        return servers;
-    }
 }

src/main/java/de/rayzs/pat/plugin/PluginLoader.java

@@ -0,0 +1,53 @@
+package de.rayzs.pat.plugin;
+
+import de.rayzs.pat.utils.CommandsCache;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.UUID;
+
+public interface PluginLoader {
+
+    void handleReload();
+    boolean doesCommandExist(String command);
+
+    HashMap<String, CommandsCache> getCommandsCacheMap();
+
+    void delayedPermissionsReload();
+
+    void updateCommandCache();
+
+    List<String> getServerNames();
+
+    Object getConsoleSender();
+
+    Object getPlayerObjByName(String name);
+    Object getPlayerObjByUUID(UUID uuid);
+
+    UUID getUUIDByName(String playerName);
+    String getNameByUUID(UUID uuid);
+
+    String getPlayerServerName(UUID uuid);
+
+    boolean isPlayerOnline(String playerName);
+    boolean doesPlayerExist(String playerName);
+
+    List<String> getOnlinePlayerNames(String server);
+
+    List<UUID> getPlayerIdsByServer(String server);
+    List<UUID> getPlayerIds();
+
+    List<String> getPlayerNames();
+    List<String> getOnlinePlayerNames();
+    List<String> getOfflinePlayerNames();
+
+    List<String> getAllCommands(boolean useColons);
+    List<String> getPluginCommands(String pluginName, boolean useColons);
+
+    /**
+     * <pre>
+     * %n = Plugin name
+     * %v = Plugin version
+     */
+    List<String> getPluginNames(String format);
+}

src/main/java/de/rayzs/pat/plugin/VelocityLoader.java

@@ -2,51 +2,70 @@ package de.rayzs.pat.plugin;
 
 import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
 import com.velocitypowered.api.proxy.Player;
-import de.rayzs.pat.utils.configuration.updater.ConfigUpdater;
+import com.velocitypowered.api.proxy.ServerConnection;
+import com.velocitypowered.api.proxy.server.RegisteredServer;
+import de.rayzs.pat.api.brand.CustomServerBrand;
+import de.rayzs.pat.api.event.PATEventHandler;
+import de.rayzs.pat.api.netty.proxy.VelocityPacketAnalyzer;
+import de.rayzs.pat.plugin.converter.StorageConverter;
+import de.rayzs.pat.plugin.subarguments.SubArguments;
+import de.rayzs.pat.plugin.process.CommandProcess;
+import de.rayzs.pat.utils.CommandsCache;
 import de.rayzs.pat.plugin.metrics.impl.VelocityMetrics;
 import com.velocitypowered.api.scheduler.ScheduledTask;
 import de.rayzs.pat.utils.configuration.Configurator;
+import de.rayzs.pat.utils.configuration.updater.ConfigUpdater;
 import de.rayzs.pat.utils.permission.PermissionUtil;
 import de.rayzs.pat.plugin.commands.VelocityCommand;
 import de.rayzs.pat.utils.message.MessageTranslator;
 import de.rayzs.pat.api.communication.Communicator;
 import de.rayzs.pat.utils.adapter.LuckPermsAdapter;
 import com.velocitypowered.api.proxy.ProxyServer;
-import de.rayzs.pat.api.brand.CustomServerBrand;
 import de.rayzs.pat.plugin.listeners.velocity.*;
-import de.rayzs.pat.utils.ConnectionBuilder;
 import de.rayzs.pat.utils.group.GroupManager;
+import de.rayzs.pat.utils.VersionComparer;
 import de.rayzs.pat.plugin.logger.Logger;
 import com.velocitypowered.api.plugin.*;
 import de.rayzs.pat.api.storage.Storage;
 import com.velocitypowered.api.event.*;
 import de.rayzs.pat.utils.Reflection;
 import java.util.concurrent.TimeUnit;
+
+
 import com.google.inject.Inject;
+import de.rayzs.pat.utils.response.action.ActionHandler;
+
 import java.util.*;
 
 @Plugin(name = "ProAntiTab",
 id = "proantitab",
-version = "1.8.0",
+version = "2.2.1",
 authors = "Rayzs_YT",
-description = "Hide more then just plugins. Hide almost everything!",
+description = "Hides more than just your plugins.",
+url = "https://www.rayzs.de/products/proantitab/page",
 dependencies = {
         @Dependency(id = "luckperms", optional = true),
         @Dependency(id = "papiproxybridge", optional = true)
 })
-public class VelocityLoader {
+public class VelocityLoader implements PluginLoader {
 
     private static VelocityLoader instance;
+
     private static ProxyServer server;
+    private static org.slf4j.Logger logger;
+
     private final EventManager manager;
     private final VelocityMetrics.Factory metricsFactory;
     private ScheduledTask updaterTask;
-    private static boolean checkUpdate = false;
+
+    private static final HashMap<String, CommandsCache> commandsCacheMap = new HashMap<>();
 
     @Inject
-    public VelocityLoader(ProxyServer server, VelocityMetrics.Factory metricsFactory) {
+    public VelocityLoader(ProxyServer server, org.slf4j.Logger logger, VelocityMetrics.Factory metricsFactory) {
         VelocityLoader.instance = this;
         VelocityLoader.server = server;
+        VelocityLoader.logger = logger;
+
         this.manager = server.getEventManager();
         this.metricsFactory = metricsFactory;
     }
@@ -55,91 +74,250 @@ public class VelocityLoader {
     public void onProxyInitialization(ProxyInitializeEvent event) {
         PluginContainer pluginContainer = server.getPluginManager().getPlugin("proantitab").get();
 
-        Configurator.createResourcedFile("./plugins/ProAntiTab", "files\\proxy-config.yml", "config.yml", false);
-        Configurator.createResourcedFile("./plugins/ProAntiTab", "files\\proxy-storage.yml", "storage.yml", false);
-        Configurator.createResourcedFile("./plugins/ProAntiTab", "files\\proxy-placeholders.yml", "placeholders.yml", false);
+        Configurator.createResourcedFile("files\\proxy-config.yml", "config.yml", false);
+        Configurator.createResourcedFile("files\\proxy-storage.yml", "storage.yml", false);
+        Configurator.createResourcedFile("files\\proxy-placeholders.yml", "placeholders.yml", false);
+        Configurator.createResourcedFile("files\\proxy-custom-responses.yml", "custom-responses.yml", false);
 
+        CommandProcess.initialize();
         Reflection.initialize(server);
         ConfigUpdater.initialize();
 
         Storage.USE_SIMPLECLOUD = Reflection.doesClassExist("eu.thesimplecloud.plugin.startup.CloudPlugin");
-        Storage.CURRENT_VERSION = pluginContainer.getDescription().getVersion().get();
+        Storage.initialize(this, pluginContainer.getDescription().getVersion().get());
+        VersionComparer.get().setCurrentVersion(Storage.CURRENT_VERSION);
 
         Storage.loadAll(true);
         MessageTranslator.initialize();
         CustomServerBrand.initialize();
         GroupManager.initialize();
 
-
         metricsFactory.make(this, 21638);
 
         server.getCommandManager().register("bpat", new VelocityCommand(), "bungeeproantitab");
-        server.getEventManager().register(this, new VelocityBlockCommandListener(server));
+        server.getEventManager().register(this, new VelocityBlockCommandListener());
         server.getEventManager().register(this, new VelocityAntiTabListener(server));
         server.getEventManager().register(this, new VelocityConnectionListener(server, this));
         server.getEventManager().register(this, new VelocityPingListener(server));
 
         startUpdaterTask();
-        server.getScheduler().buildTask(this, Communicator::syncData).delay(5, TimeUnit.SECONDS).schedule();
+
+        if (!Storage.ConfigSections.Settings.DISABLE_SYNC.DISABLED)
+            server.getScheduler().buildTask(this, () -> Communicator.syncData()).delay(5, TimeUnit.SECONDS).schedule();
 
         Storage.PLUGIN_OBJECT = this;
 
-        if(server.getPluginManager().getPlugin("luckperms").isPresent())
+        if (server.getPluginManager().getPlugin("luckperms").isPresent())
             LuckPermsAdapter.initialize();
 
-        if(server.getPluginManager().getPlugin("papiproxybridge").isPresent()) {
+        if (server.getPluginManager().getPlugin("papiproxybridge").isPresent()) {
             Storage.USE_PAPIPROXYBRIDGE = true;
             Logger.info("Successfully hooked into PAPIProxyBridge!");
         }
 
-        if(Storage.USE_SIMPLECLOUD)
+        if (Storage.USE_SIMPLECLOUD)
             Logger.warning("Detected SimpleCloud and therefore MiniMessages by Kyori are disabled!");
 
+        Storage.broadcastPermissionsPluginNotice();
         ConfigUpdater.broadcastMissingParts();
+
+        ActionHandler.initialize();
+        SubArguments.initialize();
+
+        StorageConverter.initialize();
+
+        VelocityPacketAnalyzer.injectAll();
     }
 
-    public static void delayedPermissionsReload() {
+    public static org.slf4j.Logger getPluginLogger() {
+        return logger;
+    }
+
+    @Override
+    public void delayedPermissionsReload() {
         server.getScheduler().buildTask(VelocityLoader.instance, () -> {
             PermissionUtil.reloadPermissions();
-            VelocityAntiTabListener.updateCommands();
+            Storage.getLoader().updateCommandCache();
         }).delay(1, TimeUnit.SECONDS).schedule();
     }
 
-    public static List<String> getPlayerNames() {
-        List<String> result = new LinkedList<>();
-        server.getAllPlayers().forEach(player -> result.add(player.getUsername()));
-        return result;
+    public static void delayedPlayerReload(UUID uuid) {
+        server.getScheduler().buildTask(VelocityLoader.instance, () -> {
+            String serverName = Storage.getLoader().getPlayerServerName(uuid);
+            List<String> commands = new ArrayList<>(SubArguments.getServerCommands(serverName));
+
+            commands.addAll(SubArguments.getGroupCommands(uuid, serverName));
+
+            PATEventHandler.callUpdatePlayerCommandsEvents(uuid, commands, true);
+        }).delay(1, TimeUnit.SECONDS).schedule();
     }
 
-    public static UUID getUUIDByName(String playerName) {
-        if (!server.getPlayer(playerName).isPresent()) return null;
-        return server.getPlayer(playerName).get().getUniqueId();
+    @Override
+    public void handleReload() {}
+
+    @Override
+    public boolean doesCommandExist(String command) {
+        return false;
+    }
+
+    @Override
+    public List<String> getAllCommands(boolean useColons) {
+        return List.of();
+    }
+
+    @Override
+    public Object getConsoleSender() {
+        return server.getConsoleCommandSource();
+    }
+
+    @Override
+    public Object getPlayerObjByName(String name) {
+        return server.getPlayer(name).orElse(null);
+    }
+
+    @Override
+    public Object getPlayerObjByUUID(UUID uuid) {
+        return server.getPlayer(uuid).orElse(null);
+    }
+
+    @Override
+    public void updateCommandCache() {
+        new ArrayList<>(commandsCacheMap.values()).forEach(CommandsCache::reset);
+    }
+
+    @Override
+    public HashMap<String, CommandsCache> getCommandsCacheMap() {
+        return commandsCacheMap;
+    }
+
+    @Override
+    public boolean isPlayerOnline(String playerName) {
+        return server.getPlayer(playerName).isPresent();
+    }
+
+    @Override
+    public boolean doesPlayerExist(String playerName) {
+        return isPlayerOnline(playerName);
+    }
+
+    @Override
+    public List<UUID> getPlayerIdsByServer(String serverName) {
+        List<UUID> uuids = new ArrayList<>();
+
+        getServerNames().stream()
+                .filter(originServerName -> Storage.isServer(serverName, originServerName))
+                .forEach(originServerName -> {
+                    Optional<RegisteredServer> optionalRegServerInfo = server.getServer(serverName);
+
+                    if (optionalRegServerInfo.isEmpty())
+                        return;
+
+                    RegisteredServer regServerInfo = optionalRegServerInfo.get();
+                    uuids.addAll(regServerInfo.getPlayersConnected().stream().map(Player::getUniqueId).toList());
+                });
+
+        return uuids;
+    }
+
+    @Override
+    public String getPlayerServerName(UUID uuid) {
+        Optional<Player> optPlayer = server.getPlayer(uuid);
+
+        if (optPlayer.isEmpty())
+            return null;
+
+        Player player = optPlayer.get();
+        Optional<ServerConnection> optConnection = player.getCurrentServer();
+
+        if (optConnection.isEmpty())
+            return null;
+
+        ServerConnection connection = optConnection.get();
+        return connection.getServer().getServerInfo().getName();
+    }
+
+    @Override
+    public List<UUID> getPlayerIds() {
+        return server.getAllPlayers().stream().map(Player::getUniqueId).toList();
+    }
+
+    @Override
+    public List<String> getOnlinePlayerNames(String serverName) {
+        return server.getAllPlayers().stream()
+                .filter(player -> {
+                    Optional<ServerConnection> optConnection = player.getCurrentServer();
+
+                    if (optConnection.isEmpty())
+                        return false;
+
+                    ServerConnection connection = optConnection.get();
+                    return connection.getServer().getServerInfo().getName().equalsIgnoreCase(serverName);
+
+                }).map(Player::getUsername).toList();
+    }
+
+    @Override
+    public List<String> getOnlinePlayerNames() {
+        return server.getAllPlayers().stream().map(Player::getUsername).toList();
+    }
+
+    @Override
+    public List<String> getOfflinePlayerNames() {
+        return server.getAllPlayers().stream().map(Player::getUsername).toList();
+    }
+
+    public List<String> getPlayerNames() {
+        return server.getAllPlayers().stream().map(Player::getUsername).toList();
+    }
+
+    @Override
+    public String getNameByUUID(UUID uuid) {
+        Player player = server.getPlayer(uuid).orElse(null);
+        return player != null ? player.getUsername() : "";
+    }
+
+    @Override
+    public UUID getUUIDByName(String playerName) {
+        Player player = server.getPlayer(playerName).orElse(null);
+        return player != null ? player.getUniqueId() : null;
+    }
+
+    @Override
+    public List<String> getServerNames() {
+        return new ArrayList<>(server.getAllServers().stream().map(registeredServer -> registeredServer.getServerInfo().getName()).toList());
+    }
+
+    @Override
+    public List<String> getPluginNames(String format) {
+        List<String> pluginNames = new ArrayList<>();
+        for (PluginContainer plugin : server.getPluginManager().getPlugins()) {
+            PluginDescription description = plugin.getDescription();
+
+            String pluginName = description.getName().orElse("/");
+            String version = description.getVersion().orElse("/");
+
+            pluginNames.add(
+                    format.replace("%n", pluginName)
+                            .replace("%v", version)
+            );
+        }
+
+        return pluginNames;
+    }
+
+    @Override
+    public List<String> getPluginCommands(String pluginName, boolean useColons) {
+        return List.of();
     }
 
     public void startUpdaterTask() {
         if (!Storage.ConfigSections.Settings.UPDATE.ENABLED) return;
 
         updaterTask = server.getScheduler().buildTask(this, () -> {
-            String result = new ConnectionBuilder().setUrl("https://www.rayzs.de/proantitab/api/version.php")
-                    .setProperties("ProAntiTab", "4654").connect().getResponse();
 
-            Storage.NEWER_VERSION = result;
-            if (!Storage.NEWER_VERSION.equals(Storage.CURRENT_VERSION)) {
+            if (VersionComparer.get().computeComparison())
+                updaterTask.cancel();
 
-                if (Storage.NEWER_VERSION.equals("unknown")) {
-                    Logger.warning("Failed reaching web host! (firewall enabled? website down?)");
-                } else if (result.equals("exception")) {
-                    Logger.warning("Failed creating web instance! (outdated java version?)");
-                } else {
-                    Storage.OUTDATED = true;
-                    MessageTranslator.send(server.getConsoleCommandSource(), Storage.ConfigSections.Settings.UPDATE.OUTDATED.getLines());
-                }
-            } else {
-                if(!checkUpdate) {
-                    checkUpdate = true;
-                    MessageTranslator.send(server.getConsoleCommandSource(), Storage.ConfigSections.Settings.UPDATE.UPDATED.getLines());
-                }
-            }
         }).delay(1, TimeUnit.SECONDS).repeat(Storage.ConfigSections.Settings.UPDATE.PERIOD, TimeUnit.SECONDS).schedule();
     }
 
@@ -150,10 +328,4 @@ public class VelocityLoader {
     public static VelocityLoader getInstance() {
         return instance;
     }
-
-    public static List<String> getServerNames() {
-        List<String> servers = new ArrayList<>();
-        server.getAllServers().forEach(server -> servers.add(server.getServerInfo().getName().toLowerCase()));
-        return servers;
-    }
 }

src/main/java/de/rayzs/pat/plugin/commands/BukkitCommand.java

@@ -8,19 +8,20 @@ import java.util.List;
 public class BukkitCommand implements CommandExecutor, TabCompleter {
 
     @Override
-    public boolean onCommand(CommandSender commandSender, Command command, String s, String[] strings) {
+    public boolean onCommand(CommandSender commandSender, Command command, String label, String[] strings) {
         if(commandSender instanceof Player) {
             Player player = (Player) commandSender;
-            CommandProcess.handleCommand(player, strings, s);
+
+            CommandProcess.handleCommand(player, strings, label);
             return true;
         }
 
-        CommandProcess.handleCommand(commandSender, strings, s);
+        CommandProcess.handleCommand(commandSender, strings, label);
         return true;
     }
 
     @Override
-    public List<String> onTabComplete(CommandSender commandSender, Command command, String s, String[] strings) {
+    public List<String> onTabComplete(CommandSender commandSender, Command command, String label, String[] strings) {
         return CommandProcess.handleTabComplete(commandSender, strings);
     }
 }

src/main/java/de/rayzs/pat/plugin/commands/BungeeCommand.java

@@ -4,7 +4,7 @@ import de.rayzs.pat.plugin.process.CommandProcess;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.plugin.*;
 
-public class BungeeCommand extends Command implements TabExecutor {
+public class  BungeeCommand extends Command implements TabExecutor {
 
     public BungeeCommand(String name) {
         super(name);

src/main/java/de/rayzs/pat/plugin/converter/Converter.java

@@ -0,0 +1,46 @@
+package de.rayzs.pat.plugin.converter;
+
+import de.rayzs.pat.api.storage.storages.BlacklistStorage;
+import de.rayzs.pat.utils.configuration.ConfigurationBuilder;
+import de.rayzs.pat.utils.configuration.Configurator;
+import de.rayzs.pat.utils.sender.CommandSender;
+
+import java.io.File;
+import java.util.List;
+
+public abstract class Converter {
+
+    private final String pluginName, fileName, folderPath;
+    protected final ConfigurationBuilder config;
+
+    public Converter(String pluginName, String folderName, String fileName) {
+        this.pluginName = pluginName;
+        this.fileName = fileName;
+        this.folderPath = "./plugins/" + folderName;
+        this.config = exists() ? Configurator.get(fileName, folderPath) : null;
+    }
+
+    public String getPluginName() {
+        return pluginName;
+    }
+
+    public boolean exists() {
+        return new File(folderPath, fileName + ".yml").exists();
+    }
+
+    protected void applyStorage(BlacklistStorage storage, List<String> commands) {
+        for (String command : commands) {
+            boolean exist = command.contains(" ")
+                    ? storage.getCommands().contains(command)
+                    : storage.isListed(command);
+
+            if (exist) continue;
+
+            storage.add(command);
+        }
+
+        storage.save();
+    }
+
+    public abstract void apply(CommandSender sender);
+}

src/main/java/de/rayzs/pat/plugin/converter/StorageConverter.java

@@ -0,0 +1,40 @@
+package de.rayzs.pat.plugin.converter;
+
+import de.rayzs.pat.plugin.converter.converters.*;
+import org.jetbrains.annotations.NotNull;
+import java.util.*;
+
+public class StorageConverter {
+
+    private StorageConverter() {}
+
+    private static final Map<String, Converter> converters = new HashMap<>();
+
+
+    public static void initialize() {
+
+        if (!converters.isEmpty()) {
+            return;
+        }
+
+        registerConverter(new AdvancedPlHideConverter());
+        registerConverter(new CommandWhitelistConverter());
+        registerConverter(new PluginHiderPlus());
+        registerConverter(new PlHideFree());
+        registerConverter(new PlHidePro());
+    }
+
+    public static Set<String> getConverters() {
+        return converters.keySet();
+    }
+
+    public static Converter getConverter(@NotNull String name) {
+        return converters.get(name);
+    }
+
+    public static void registerConverter(@NotNull Converter converter) {
+        if (!converter.exists()) return;
+
+        converters.putIfAbsent(converter.getPluginName(), converter);
+    }
+}

src/main/java/de/rayzs/pat/plugin/converter/converters/AdvancedPlHideConverter.java

@@ -0,0 +1,40 @@
+package de.rayzs.pat.plugin.converter.converters;
+
+import de.rayzs.pat.api.storage.Storage;
+import de.rayzs.pat.api.storage.storages.BlacklistStorage;
+import de.rayzs.pat.plugin.converter.Converter;
+import de.rayzs.pat.utils.group.Group;
+import de.rayzs.pat.utils.group.GroupManager;
+import de.rayzs.pat.utils.sender.CommandSender;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AdvancedPlHideConverter extends Converter {
+
+    public AdvancedPlHideConverter() {
+        super("AdvancedPlHide", "AdvancedPlHide", "config");
+    }
+
+    @Override
+    public void apply(CommandSender sender) {
+        List<String> groups = config.getKeys("groups", false).stream().toList();
+
+        for (String groupName : groups) {
+            List<String> commands = (ArrayList<String>) config.get("groups."+ groupName + ".tabcomplete");
+            BlacklistStorage storage;
+
+            if (groupName.equalsIgnoreCase("default")) {
+                storage = Storage.Blacklist.getBlacklist();
+            } else {
+                Group group = GroupManager.registerAndGetGroup(groupName);
+                storage = group.getGeneralGroupBlacklist();
+            }
+
+            applyStorage(storage, commands);
+
+        }
+
+        sender.sendMessage("&e&lNotice: &7AdvanedPlHide works based on permissions whether to whitelist or blacklist commands from a group. Due to the fact that this cannot be detected by PAT and formatted in the exact way, all commands have been interpreted as whitelisted commands instead. Also, since PAT groups are only intended to whitelist commands, all created groups based on AdvancedPlHide have been created with the intention of whitelisting commands instead. If you wish to change that, please check out the GitHub wiki on how to use the storage.yml of PAT the intended way. (https://github.com/RayzsYT/ProAntiTab/wiki/How-to#introduction)");
+    }
+}

src/main/java/de/rayzs/pat/plugin/converter/converters/CommandWhitelistConverter.java

@@ -0,0 +1,44 @@
+package de.rayzs.pat.plugin.converter.converters;
+
+import de.rayzs.pat.api.storage.Storage;
+import de.rayzs.pat.api.storage.storages.BlacklistStorage;
+import de.rayzs.pat.plugin.converter.Converter;
+import de.rayzs.pat.utils.group.Group;
+import de.rayzs.pat.utils.group.GroupManager;
+import de.rayzs.pat.utils.sender.CommandSender;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CommandWhitelistConverter extends Converter {
+
+    public CommandWhitelistConverter() {
+        super("CommandWhitelist", "CommandWhitelist", "config");
+    }
+
+    @Override
+    public void apply(CommandSender sender) {
+        List<String> groups = config.getKeys("groups", false).stream().toList();
+
+        for (String groupName : groups) {
+            List<String> commands = new ArrayList<>();
+
+            final List<String> l1 = (ArrayList<String>) config.get("groups." + groupName + ".commands");
+            final List<String> l2 = (ArrayList<String>) config.get("groups." + groupName + ".subcommands");
+
+            commands.addAll(l1);
+            commands.addAll(l2);
+
+            BlacklistStorage storage;
+
+            if (groupName.equalsIgnoreCase("default")) {
+                storage = Storage.Blacklist.getBlacklist();
+            } else {
+                Group group = GroupManager.registerAndGetGroup(groupName);
+                storage = group.getGeneralGroupBlacklist();
+            }
+
+            applyStorage(storage, commands);
+        }
+    }
+}

src/main/java/de/rayzs/pat/plugin/converter/converters/PlHideFree.java

@@ -0,0 +1,58 @@
+package de.rayzs.pat.plugin.converter.converters;
+
+import de.rayzs.pat.api.storage.Storage;
+import de.rayzs.pat.api.storage.storages.BlacklistStorage;
+import de.rayzs.pat.plugin.converter.Converter;
+import de.rayzs.pat.utils.group.Group;
+import de.rayzs.pat.utils.group.GroupManager;
+import de.rayzs.pat.utils.sender.CommandSender;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PlHideFree extends Converter {
+
+    public PlHideFree() {
+        super("PlHide", "Pl-Hide-Free", "config");
+    }
+
+    @Override
+    public void apply(CommandSender sender) {
+        List<String> groups = config.getKeys("groups", false).stream().toList();
+
+        for (String groupName : groups) {
+            List<String> execution = (ArrayList<String>) config.get("groups." + groupName + ".commands");
+            List<String> commands = execution.stream().filter(s -> !s.startsWith("!") && !s.equalsIgnoreCase("*")).map(this::translate).toList();
+
+            BlacklistStorage storage;
+
+            if (groupName.equalsIgnoreCase("default")) {
+                storage = Storage.Blacklist.getBlacklist();
+            } else {
+                Group group = GroupManager.registerAndGetGroup(groupName);
+                storage = group.getGeneralGroupBlacklist();
+            }
+
+            applyStorage(storage, commands);
+
+        }
+
+        sender.sendMessage("§e§lNotice: §7Since PAT is mainly focussed on either blocking or whitelisting commands entirely, PAT is viewing and converting the file such that commands are only working in whitelist mode. If you wish to use ProAntiTab in blacklist mode instead, then please checkout the wiki! (https://github.com/RayzsYT/ProAntiTab/wiki/How-to#introduction)");
+    }
+
+    private String translate(String input) {
+        if (input.contains(" ")) {
+            if (input.endsWith("~")) {
+                return translate(input.substring(0, input.length() - 1) + "_-");
+            }
+
+            if (input.endsWith("*")) {
+                return input.substring(0, input.length() - 2);
+            } else if (input.contains("*")) {
+                return input.substring(0, input.indexOf('*') - 1);
+            }
+        }
+
+        return input;
+    }
+}

src/main/java/de/rayzs/pat/plugin/converter/converters/PlHidePro.java

@@ -0,0 +1,99 @@
+package de.rayzs.pat.plugin.converter.converters;
+
+import de.rayzs.pat.api.storage.Storage;
+import de.rayzs.pat.api.storage.storages.BlacklistStorage;
+import de.rayzs.pat.plugin.converter.Converter;
+import de.rayzs.pat.utils.group.Group;
+import de.rayzs.pat.utils.group.GroupManager;
+import de.rayzs.pat.utils.sender.CommandSender;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class PlHidePro extends Converter {
+
+    public PlHidePro() {
+        super("PlHidePro", "Pl-Hide-Pro", "config");
+    }
+
+    @Override
+    public void apply(CommandSender sender) {
+
+        boolean updateGroupPerWorld = (boolean) config.get("per_world_group_updates");
+        Storage.ConfigSections.Settings.UPDATE_GROUPS_PER_WORLD.getConfig().setAndSave("update-groups-per-world", updateGroupPerWorld);
+
+        boolean autoLowercaseCommands = (boolean) config.get("auto_lowercase_base_commands");
+        Storage.ConfigSections.Settings.AUTO_LOWERCASE_COMMANDS.getConfig().setAndSave("auto-lowercase-commands.enabled", autoLowercaseCommands);
+
+        boolean f3brand = (boolean) config.get("replace-f3-server-brand");
+        String f3brandString = (String) config.get("f3-server-brand");
+        Storage.ConfigSections.Settings.CUSTOM_BRAND.getConfig().setAndSave("custom-server-brand.enabled", f3brand);
+
+        if (f3brand) {
+            Storage.ConfigSections.Settings.CUSTOM_BRAND.getConfig().setAndSave("custom-server-brand.repeat-delay", -1);
+            Storage.ConfigSections.Settings.CUSTOM_BRAND.getConfig().setAndSave("custom-server-brand.brands", new ArrayList<>(Collections.singletonList(f3brandString.replace("§", "&"))));
+        }
+
+        List<String> groups = config.getKeys("groups", false).stream().toList();
+
+        for (String groupName : groups) {
+            List<String> commands = new ArrayList<>();
+
+            final List<String> execution = (ArrayList<String>) config.get("groups." + groupName + ".commands");
+            final List<String> tabCompletion = (ArrayList<String>) config.get("groups." + groupName + ".tabcomplete");
+
+            for (String s : execution) {
+                if (s.equalsIgnoreCase("*")) {
+                    tabCompletion.remove("*");
+                    continue;
+                }
+
+                if (!s.contains(" ") && s.startsWith("!")) {
+                    tabCompletion.remove(s);
+                    continue;
+                }
+
+                if (tabCompletion.contains(s)) {
+                    commands.add(s);
+                    tabCompletion.remove(s);
+                    continue;
+                }
+
+                commands.add("[CMD]" + s);
+            }
+
+            commands.addAll(tabCompletion.stream().map(s -> "[TAB]" + s).toList());
+            commands = commands.stream().map(this::translate).toList();
+
+            BlacklistStorage storage;
+
+            if (groupName.equalsIgnoreCase("default")) {
+                storage = Storage.Blacklist.getBlacklist();
+            } else {
+                Group group = GroupManager.registerAndGetGroup(groupName);
+                storage = group.getGeneralGroupBlacklist();
+            }
+
+            applyStorage(storage, commands);
+        }
+
+        sender.sendMessage("§e§lNotice: §7Since PAT is mainly focussed on either blocking or whitelisting commands entirely, PAT is viewing and converting the file such that commands are only working in whitelist mode. If you wish to use ProAntiTab in blacklist mode instead, then please checkout the wiki! (https://github.com/RayzsYT/ProAntiTab/wiki/How-to#introduction)");
+    }
+
+    private String translate(String input) {
+        if (input.contains(" ")) {
+            if (input.endsWith("~")) {
+                return translate(input.substring(0, input.length() - 1) + "_-");
+            }
+
+            if (input.endsWith("*")) {
+                return input.substring(0, input.length() - 2);
+            } else if (input.contains("*")) {
+                return input.substring(0, input.indexOf('*') - 1);
+            }
+        }
+
+        return input;
+    }
+}

src/main/java/de/rayzs/pat/plugin/converter/converters/PluginHiderPlus.java

@@ -0,0 +1,32 @@
+package de.rayzs.pat.plugin.converter.converters;
+
+import de.rayzs.pat.api.storage.Storage;
+import de.rayzs.pat.plugin.converter.Converter;
+import de.rayzs.pat.utils.sender.CommandSender;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PluginHiderPlus extends Converter {
+
+    public PluginHiderPlus() {
+        super("PluginHider+", "PluginHiderPlus", "config");
+    }
+
+    @Override
+    public void apply(CommandSender sender) {
+
+        boolean blacklist = (boolean) config.get("reverse-suggestionsWhitelist");
+        Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.getConfig().setAndSave("turn-blacklist-to-whitelist", !blacklist);
+
+        List<String> commands = (ArrayList<String>) config.get("suggestionsWhitelist");
+
+        if (blacklist) {
+            List<String> blockedCommands = (ArrayList<String>) config.get("blockedCommands.everyone.commands");
+            commands.addAll(blockedCommands);
+        }
+
+        applyStorage(Storage.Blacklist.getBlacklist(), commands);
+        sender.sendMessage("&e&lNotice: &7Since PluginHider+ both blocks certain commands and whitelist a few, the conversion into PAT's storage.yml format won't be accurate. Only whitelisted commands have been added, and blocked commands for everyone if the plugin was used in blacklist mode.");
+    }
+}

src/main/java/de/rayzs/pat/plugin/listeners/bukkit/BukkitAntiTabListener.java

@@ -1,11 +1,14 @@
 package de.rayzs.pat.plugin.listeners.bukkit;
 
 import de.rayzs.pat.api.event.events.FilteredSuggestionEvent;
+import de.rayzs.pat.utils.group.Group;
+import de.rayzs.pat.utils.group.GroupManager;
+import de.rayzs.pat.utils.sender.CommandSender;
+import de.rayzs.pat.utils.sender.CommandSenderHandler;
 import org.bukkit.event.player.PlayerCommandSendEvent;
 import de.rayzs.pat.utils.permission.PermissionUtil;
 import de.rayzs.pat.utils.adapter.ViaVersionAdapter;
 import de.rayzs.pat.api.event.PATEventHandler;
-import de.rayzs.pat.plugin.logger.Logger;
 import de.rayzs.pat.api.storage.Storage;
 import de.rayzs.pat.plugin.BukkitLoader;
 import org.bukkit.entity.Player;
@@ -17,78 +20,71 @@ import java.util.*;
 public class BukkitAntiTabListener implements Listener {
 
     private static final CommandsCache COMMANDS_CACHE = new CommandsCache();
+    private static final List<UUID> knownOperators = new ArrayList<>();
 
     @EventHandler (priority = EventPriority.LOWEST)
     public void onPlayerCommandSend(PlayerCommandSendEvent event) {
-        Player player = event.getPlayer();
-        UUID uuid = player.getUniqueId();
-        String uuidSubstring = uuid.toString().substring(uuid.toString().length() - 5);
+        final Player player = event.getPlayer();
+        final CommandSender sender = CommandSenderHandler.from(player);
+        final UUID uuid = player.getUniqueId();
 
-        if(Storage.USE_VELOCITY || player.isOp()) {
-            Logger.debug("Doesn't even tried to create the commands list for player with uuid " + uuidSubstring + ". (Veloctiy? " + Storage.USE_VELOCITY + ". OP? " + player.isOp() + ")");
+
+        if (Storage.USE_VELOCITY) {
             return;
         }
 
-        if(!BukkitLoader.isLoaded()) {
+        if (player.isOp()) {
+            if (!knownOperators.contains(uuid)) {
+                knownOperators.add(uuid);
+            }
+
+            return;
+        }
+
+        if (!BukkitLoader.isLoaded()) {
             event.getCommands().clear();
-            Logger.debug("Doesn't even tried to create the commands list for player with uuid " + uuidSubstring + ". (not loaded)");
             return;
         }
 
-        if(event.getCommands().size() == 0) {
-            Logger.debug("No available commands to filter! Ignoring rest of the code until at least one command is listed in there.");
+        if (Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED) {
             return;
         }
+
+        if (event.getCommands().isEmpty()) {
+            return;
+        }
+
         List<String> allCommands = getCommands();
-
         COMMANDS_CACHE.handleCommands(allCommands);
 
-        if (PermissionUtil.hasBypassPermission(player)) {
-            Logger.debug("Player with uuid " + uuidSubstring + " skipped the commands-list creation due to its permissions.");
+        if (!player.isOp() && knownOperators.contains(uuid)) {
+            knownOperators.remove(uuid);
+            PermissionUtil.reloadPermissions(player.getUniqueId());
+        }
+
+        if (PermissionUtil.hasBypassPermission(sender)) {
             return;
         }
 
-        if(Storage.USE_VIAVERSION)
-            if(Reflection.getMinor() >= 16 && ViaVersionAdapter.getPlayerProtocol(uuid) < 754)
-                event.getCommands().clear();
+        final List<Group> groups = GroupManager.getPlayerGroups(sender);
+        final List<String> playerCommands = COMMANDS_CACHE.getPlayerCommands(new ArrayList<>(event.getCommands()), sender, groups);
+        final FilteredSuggestionEvent filteredSuggestionEvent = PATEventHandler.callFilteredSuggestionEvents(player, playerCommands);
 
-        final List<String> playerCommands = COMMANDS_CACHE.getPlayerCommands(event.getCommands(), player, player.getUniqueId());
         event.getCommands().clear();
 
-        FilteredSuggestionEvent filteredSuggestionEvent = PATEventHandler.call(uuid, playerCommands);
-        if(filteredSuggestionEvent.isCancelled()) return;
+        if (filteredSuggestionEvent.isCancelled()) {
+            return;
+        }
 
         event.getCommands().addAll(filteredSuggestionEvent.getSuggestions());
 
-        Logger.debug("Player with uuid " + uuidSubstring + " has a total of " + playerCommands.size() + " commands.");
-    }
+        if (Storage.ConfigSections.Settings.CUSTOM_PLUGIN.ALWAYS_TAB_COMPLETABLE) {
+            event.getCommands().addAll(Storage.ConfigSections.Settings.CUSTOM_PLUGIN.COMMANDS.getLines());
+        }
 
-    public static void updateCommands(Player player) {
-        if(notUpdatablePlayer(player.getUniqueId())) return;
-        if(Reflection.getMinor() >= 16) player.updateCommands();
-    }
-
-    public static void updateCommands() {
-        if(Reflection.getMinor() >= 16) Bukkit.getOnlinePlayers().forEach(BukkitAntiTabListener::updateCommands);
-    }
-
-    public static void setChangeStatus() {
-        COMMANDS_CACHE.updateChangeState();
-    }
-
-    public static void handleTabCompletion(List<String> commands) {
-        if(Storage.USE_VELOCITY) return;
-        COMMANDS_CACHE.reset();
-        Bukkit.getOnlinePlayers().forEach(player -> handleTabCompletion(player, commands));
-    }
-
-    public static void handleTabCompletion() {
-        COMMANDS_CACHE.reset();
-        Bukkit.getOnlinePlayers().forEach(BukkitAntiTabListener::handleTabCompletion);
-    }
-
-    public static void handleTabCompletion(Player player) {
-        handleTabCompletion(player, getCommands());
+        if (Storage.ConfigSections.Settings.CUSTOM_VERSION.ALWAYS_TAB_COMPLETABLE) {
+            event.getCommands().addAll(Storage.ConfigSections.Settings.CUSTOM_VERSION.COMMANDS.getLines());
+        }
     }
 
     public static List<String> getCommands() {
@@ -96,33 +92,47 @@ public class BukkitAntiTabListener implements Listener {
                 ? Storage.Blacklist.getBlacklist().getCommands() : BukkitLoader.getAllCommands();
     }
 
+    private static boolean notUpdatablePlayer(UUID uuid) {
+        return Storage.USE_VIAVERSION && Reflection.getMinor() >= 16 && ViaVersionAdapter.getPlayerProtocol(uuid) < 754;
+    }
+
+
+    // --------------- LUCKPERMS SECTIONS --------------- //
+
+    public static void updateCommands() {
+        Bukkit.getOnlinePlayers().forEach(BukkitAntiTabListener::updateCommands);
+    }
+
+    public static void updateCommands(Player player) {
+        if (Reflection.getMinor() >= 13 && !notUpdatablePlayer(player.getUniqueId()))
+            player.updateCommands();
+    }
+
+
+    // --------------- UPDATE SECTIONS --------------- //
+
+    public static void handleTabCompletion() {
+        COMMANDS_CACHE.reset();
+        Bukkit.getOnlinePlayers().forEach(BukkitAntiTabListener::handleTabCompletion);
+    }
+
     public static void handleTabCompletion(UUID uuid) {
-        if(notUpdatablePlayer(uuid)) return;
-
         Player player = Bukkit.getPlayer(uuid);
-        if(player == null) return;
-        handleTabCompletion(player);
+
+        if (player == null) {
+            return;
+        }
+
+        handleTabCompletion(player, getCommands());
     }
 
-    public static void handleTabCompletion(UUID uuid, List<String> commands) {
-        if(notUpdatablePlayer(uuid)) return;
-
-        Player player = Bukkit.getPlayer(uuid);
-        if(player == null) return;
-        handleTabCompletion(player, commands);
-    }
-
-    public static void luckpermsNetworkSync() {
-        Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(BukkitLoader.getPlugin(), PermissionUtil::reloadPermissions, 40);
-    }
-
-    public static void luckpermsNetworkUserSync(UUID uuid) {
-        Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(BukkitLoader.getPlugin(), () -> PermissionUtil.reloadPermissions(uuid));
+    public static void handleTabCompletion(Player player) {
+        handleTabCompletion(player, getCommands());
     }
 
     public static void handleTabCompletion(Player player, List<String> commands) {
-        if(Storage.USE_VELOCITY) return;
-        if(notUpdatablePlayer(player.getUniqueId())) return;
+        if (notUpdatablePlayer(player.getUniqueId()))
+            return;
 
         List<String> dummy = new ArrayList<>(commands);
         PlayerCommandSendEvent event = new PlayerCommandSendEvent(player, dummy);
@@ -130,11 +140,4 @@ public class BukkitAntiTabListener implements Listener {
         updateCommands(player);
     }
 
-    private static boolean notUpdatablePlayer(UUID uuid) {
-        if(Storage.USE_VIAVERSION)
-            return Reflection.getMinor() >= 16 && ViaVersionAdapter.getPlayerProtocol(uuid) < 754;
-
-        return false;
-    }
-
 }

src/main/java/de/rayzs/pat/plugin/listeners/bukkit/BukkitBlockCommandListener.java

@@ -1,30 +1,48 @@
 package de.rayzs.pat.plugin.listeners.bukkit;
 
+import java.util.List;
+
+import de.rayzs.pat.utils.group.Group;
+import de.rayzs.pat.utils.group.GroupManager;
+import de.rayzs.pat.utils.sender.CommandSender;
+import de.rayzs.pat.utils.sender.CommandSenderHandler;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+
+import de.rayzs.pat.api.event.PATEventHandler;
 import de.rayzs.pat.api.event.events.ExecuteCommandEvent;
+import de.rayzs.pat.api.storage.Storage;
+import de.rayzs.pat.plugin.logger.Logger;
+import de.rayzs.pat.utils.StringUtils;
 import de.rayzs.pat.utils.message.MessageTranslator;
 import de.rayzs.pat.utils.permission.PermissionUtil;
-import de.rayzs.pat.plugin.logger.Logger;
-import de.rayzs.pat.api.storage.Storage;
-import de.rayzs.pat.plugin.BukkitLoader;
-import de.rayzs.pat.utils.StringUtils;
-import org.bukkit.entity.Player;
-import de.rayzs.pat.api.event.*;
-import org.bukkit.event.*;
-import java.util.List;
-import org.bukkit.*;
 
 public class BukkitBlockCommandListener implements Listener {
 
     @EventHandler (priority = EventPriority.HIGHEST)
     public void onUnknownCommandRecognition(PlayerCommandPreprocessEvent event) {
-        Player player = event.getPlayer();
-        World world = player.getWorld();
-        String rawCommand = StringUtils.getFirstArg(event.getMessage()), command =  StringUtils.replaceFirst(rawCommand, "/", "");
+        final Player player = event.getPlayer();
+        final CommandSender sender = CommandSenderHandler.from(player);
+        final World world = player.getWorld();
 
-        if(!Storage.ConfigSections.Settings.CUSTOM_UNKNOWN_COMMAND.ENABLED || event.isCancelled()) return;
-        if(BukkitLoader.doesCommandExist(command, false)) return;
-        if(Bukkit.getHelpMap().getHelpTopic(rawCommand) != null) return;
+        String rawCommand = StringUtils.getFirstArg(event.getMessage()),
+                command =  rawCommand.substring(1);
+
+        if (!Storage.ConfigSections.Settings.CUSTOM_UNKNOWN_COMMAND.ENABLED || event.isCancelled()) return;
+
+        if (PermissionUtil.hasBypassPermission(sender))
+            return;
+
+        if (Storage.getLoader().doesCommandExist(command))
+            return;
+
+        if (Bukkit.getHelpMap().getHelpTopic(rawCommand) != null)
+            return;
 
         event.setCancelled(true);
         MessageTranslator.send(player, Storage.ConfigSections.Settings.CUSTOM_UNKNOWN_COMMAND.MESSAGE, "%command%", command, "%world%", world.getName());
@@ -32,108 +50,142 @@ public class BukkitBlockCommandListener implements Listener {
 
     @EventHandler (priority = EventPriority.LOWEST)
     public void onPlayerCommandProcess(PlayerCommandPreprocessEvent event) {
-        Player player = event.getPlayer();
+        final Player player = event.getPlayer();
+        final CommandSender sender = CommandSenderHandler.from(player);
+
+        final String commandFirstArg = StringUtils.getFirstArg(event.getMessage());
+
+        if (Storage.ConfigSections.Settings.AUTO_LOWERCASE_COMMANDS.isCommand(commandFirstArg)) {
+            String command = event.getMessage();
+
+            if (command.contains(" ")) {
+                String[] args = command.split(" ");
+                args[0] = args[0].toLowerCase();
+                command = String.join(" ", args);
+            } else command = command.toLowerCase();
+
+            if (!commandFirstArg.equals(command)) {
+                player.chat(command);
+                event.setCancelled(true);
+                return;
+            }
+        }
+
         World world = player.getWorld();
-        String rawCommand = event.getMessage(), command = rawCommand, worldName = world.getName();
+        String command = event.getMessage(),
+                worldName = world.getName();
 
-        command = StringUtils.replaceFirst(command, "/", "");
+        command = command.substring(1);
         command = StringUtils.getFirstArg(command);
-        command = StringUtils.replaceTriggers(command, "", "\\", "<", ">", "&");
-
-        List<String> notificationMessage = MessageTranslator.replaceMessageList(Storage.ConfigSections.Messages.NOTIFICATION.ALERT, "%player%", player.getName(), "%command%", command, "%world%", worldName);
-
-        if(Storage.ConfigSections.Settings.CUSTOM_PLUGIN.isCommand(command) && !PermissionUtil.hasBypassPermission(player, command)) {
-            ExecuteCommandEvent executeCommandEvent = PATEventHandler.call(player.getUniqueId(), rawCommand, true);
-            if(executeCommandEvent.isCancelled()) return;
-
-            event.setCancelled(true);
-            MessageTranslator.send(player, Storage.ConfigSections.Settings.CUSTOM_PLUGIN.MESSAGE,  "%command%", command);
-
-            if(Storage.SEND_CONSOLE_NOTIFICATION) Logger.info(notificationMessage);
-            Storage.NOTIFY_PLAYERS.stream().filter(uuid -> Bukkit.getServer().getPlayer(uuid) != null).forEach(uuid -> {
-                Player target = Bukkit.getServer().getPlayer(uuid);
-                MessageTranslator.send(target, notificationMessage);
-            });
 
+        if (Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED) {
             return;
         }
 
-        if(Storage.ConfigSections.Settings.CUSTOM_VERSION.isCommand(command) && !PermissionUtil.hasBypassPermission(player, command)) {
-            ExecuteCommandEvent executeCommandEvent = PATEventHandler.call(player.getUniqueId(), rawCommand, true);
-            if(executeCommandEvent.isCancelled()) return;
-
-            event.setCancelled(true);
-            MessageTranslator.send(player, Storage.ConfigSections.Settings.CUSTOM_VERSION.MESSAGE,  "%command%", command);
-
-            if(Storage.SEND_CONSOLE_NOTIFICATION) Logger.info(notificationMessage);
-            Storage.NOTIFY_PLAYERS.stream().filter(uuid -> Bukkit.getServer().getPlayer(uuid) != null).forEach(uuid -> {
-                Player target = Bukkit.getServer().getPlayer(uuid);
-                MessageTranslator.send(target, notificationMessage);
-            });
-
+        if (PermissionUtil.hasBypassPermission(sender, command)) {
             return;
         }
 
-        if(!Storage.ConfigSections.Settings.CANCEL_COMMAND.ENABLED || Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED || rawCommand.equals("/")) return;
-        List<String> cancelCommandMessage = MessageTranslator.replaceMessageList(Storage.ConfigSections.Settings.CANCEL_COMMAND.MESSAGE, "%command%", command);
+        final String displayCommand = StringUtils.replaceTriggers(command, "", "\\", "<", ">", "&");
 
-        if(Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED) {
+        List<String> notificationMessage = MessageTranslator.replaceMessageList(
+                Storage.ConfigSections.Messages.NOTIFICATION.ALERT,
+                "%player%", player.getName(),
+                "%command%", displayCommand,
+                "%world%", worldName);
+
+        if (Storage.ConfigSections.Settings.CUSTOM_PLUGIN.isCommand(command)) {
+
+            MessageTranslator.send(
+                    player,
+                    Storage.ConfigSections.Settings.CUSTOM_PLUGIN.MESSAGE,
+                    "%command%", StringUtils.getFirstArg(displayCommand)
+            );
+
+            if (Storage.SEND_CONSOLE_NOTIFICATION)
+                Logger.info(notificationMessage);
+
+            Storage.NOTIFY_PLAYERS.forEach(uuid -> {
+                Object p = Storage.getLoader().getPlayerObjByUUID(uuid);
+                if (p != null) {
+                    MessageTranslator.send(p, notificationMessage);
+                }
+            });
+
+            event.setCancelled(true);
+            return;
+        }
+
+        if (Storage.ConfigSections.Settings.CUSTOM_VERSION.isCommand(command)) {
+
+            MessageTranslator.send(
+                    player,
+                    Storage.ConfigSections.Settings.CUSTOM_VERSION.MESSAGE,
+                    "%command%", StringUtils.getFirstArg(displayCommand)
+            );
+
+            if (Storage.SEND_CONSOLE_NOTIFICATION)
+                Logger.info(notificationMessage);
+
+            Storage.NOTIFY_PLAYERS.forEach(uuid -> {
+                Object p = Storage.getLoader().getPlayerObjByUUID(uuid);
+                if (p != null) {
+                    MessageTranslator.send(p, notificationMessage);
+                }
+            });
+
+            event.setCancelled(true);
+            return;
+        }
+
+        final boolean cancelBlockedCommand = Storage.ConfigSections.Settings.CANCEL_COMMAND.ENABLED;
+        final List<Group> groups = GroupManager.getPlayerGroups(sender);
+
+        boolean allowed = Storage.Blacklist.canPlayerAccessChat(sender, groups, command);
+        boolean blockedNamespace = false;
+
+        if (!Storage.ConfigSections.Settings.BLOCK_NAMESPACE_COMMANDS.doesBypass(sender)) {
+            blockedNamespace = cancelBlockedCommand
+                    ? Storage.ConfigSections.Settings.BLOCK_NAMESPACE_COMMANDS.isCommand(command)
+                    : Storage.ConfigSections.Settings.BLOCK_NAMESPACE_COMMANDS.doesAlwaysBlock(command);
+
+            if (blockedNamespace) allowed = false;
+        }
+
+        if (!Storage.ConfigSections.Settings.CANCEL_COMMAND.ENABLED && !blockedNamespace) {
+            return;
+        }
+
+        if (!allowed) {
+            ExecuteCommandEvent executeCommandEvent = PATEventHandler.callExecuteCommandEvents(
+                    player,
+                    event.getMessage(),
+                    true,
+                    !Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED
+            );
+
+            if (executeCommandEvent.isBlocked()) {
+                event.setCancelled(true);
+
+                if (!executeCommandEvent.doesNotify())
+                    return;
+
+                if (Storage.SEND_CONSOLE_NOTIFICATION)
+                    Logger.info(notificationMessage);
+
+                Storage.NOTIFY_PLAYERS.stream().filter(uuid -> Bukkit.getServer().getPlayer(uuid) != null).forEach(uuid -> {
+                    Player target = Bukkit.getServer().getPlayer(uuid);
+                    MessageTranslator.send(target, notificationMessage);
+                });
 
-            if(Storage.Blacklist.isListed(command, true)) {
-                PATEventHandler.call(player.getUniqueId(), rawCommand, false);
-                return;
             }
 
-            if(PermissionUtil.hasBypassPermission(player, command, false)) {
-                PATEventHandler.call(player.getUniqueId(), rawCommand, false);
+            if (executeCommandEvent.isCancelled())
                 return;
-            }
-
-            ExecuteCommandEvent executeCommandEvent = PATEventHandler.call(player.getUniqueId(), rawCommand, true);
-            if(executeCommandEvent.isCancelled()) return;
+        }
 
+        ExecuteCommandEvent executeCommandEvent = PATEventHandler.callExecuteCommandEvents(player, event.getMessage(), false, false);
+        if (executeCommandEvent.isBlocked())
             event.setCancelled(true);
-            MessageTranslator.send(player, cancelCommandMessage);
-            return;
-        }
-
-        if(Storage.ConfigSections.Settings.BLOCK_NAMESPACE_COMMANDS.isCommand(command) && !Storage.ConfigSections.Settings.BLOCK_NAMESPACE_COMMANDS.doesBypass(player)) {
-
-            ExecuteCommandEvent executeCommandEvent = PATEventHandler.call(player.getUniqueId(), rawCommand, true);
-            if(executeCommandEvent.isCancelled()) return;
-
-            event.setCancelled(true);
-            MessageTranslator.send(player, cancelCommandMessage);
-
-            if(Storage.SEND_CONSOLE_NOTIFICATION) Logger.info(notificationMessage);
-            Storage.NOTIFY_PLAYERS.stream().filter(uuid -> Bukkit.getServer().getPlayer(uuid) != null).forEach(uuid -> {
-                Player target = Bukkit.getServer().getPlayer(uuid);
-                MessageTranslator.send(target, notificationMessage);
-            });
-
-            return;
-        }
-
-        if (!Storage.Blacklist.isListed(command, false)) {
-            PATEventHandler.call(player.getUniqueId(), rawCommand, false);
-            return;
-        }
-
-        if (PermissionUtil.hasBypassPermission(player, command, false)) {
-            PATEventHandler.call(player.getUniqueId(), rawCommand, false);
-            return;
-        }
-
-        ExecuteCommandEvent executeCommandEvent = PATEventHandler.call(player.getUniqueId(), rawCommand, true);
-        if(executeCommandEvent.isCancelled()) return;
-
-        event.setCancelled(true);
-        MessageTranslator.send(player, cancelCommandMessage);
-
-        if(Storage.SEND_CONSOLE_NOTIFICATION) Logger.info(notificationMessage);
-        Storage.NOTIFY_PLAYERS.stream().filter(uuid -> Bukkit.getServer().getPlayer(uuid) != null).forEach(uuid -> {
-            Player target = Bukkit.getServer().getPlayer(uuid);
-            MessageTranslator.send(target, notificationMessage);
-        });
     }
 }

src/main/java/de/rayzs/pat/plugin/listeners/bukkit/BukkitPlayerConnectionListener.java

@@ -1,55 +0,0 @@
-package de.rayzs.pat.plugin.listeners.bukkit;
-
-import de.rayzs.pat.api.netty.bukkit.BukkitPacketAnalyzer;
-import de.rayzs.pat.api.brand.impl.BukkitServerBrand;
-import de.rayzs.pat.api.communication.BackendUpdater;
-import de.rayzs.pat.utils.message.MessageTranslator;
-import de.rayzs.pat.utils.permission.PermissionUtil;
-import de.rayzs.pat.api.brand.CustomServerBrand;
-import de.rayzs.pat.api.storage.Storage;
-import de.rayzs.pat.plugin.BukkitLoader;
-import org.bukkit.event.player.*;
-import org.bukkit.entity.Player;
-import org.bukkit.event.*;
-import org.bukkit.Bukkit;
-
-public class BukkitPlayerConnectionListener implements Listener {
-
-    @EventHandler
-    public void onPlayerJoin(PlayerJoinEvent event) {
-        Player player = event.getPlayer();
-
-        if(Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED)
-            BackendUpdater.handle();
-
-        PermissionUtil.setPlayerPermissions(player.getUniqueId());
-        CustomServerBrand.preparePlayer(player);
-        CustomServerBrand.sendBrandToPlayer(player);
-
-        if(!BukkitPacketAnalyzer.inject(player)) player.kickPlayer("Failed to inject player!");
-
-        if(Storage.OUTDATED && PermissionUtil.hasPermission(player, "joinupdate")) {
-            Bukkit.getScheduler().runTaskLater(BukkitLoader.getPlugin(), () -> {
-                if(player.isOnline()) {
-                    MessageTranslator.send(player, Storage.ConfigSections.Settings.UPDATE.OUTDATED.getLines());
-                }
-            }, 20);
-        }
-    }
-
-    @EventHandler (priority = EventPriority.LOWEST)
-    public void onPlayerQuit(PlayerQuitEvent event) {
-        Player player = event.getPlayer();
-        BukkitPacketAnalyzer.uninject(player.getUniqueId());
-        PermissionUtil.resetPermissions(player.getUniqueId());
-        if(Storage.ConfigSections.Settings.CUSTOM_BRAND.REPEAT_DELAY != -1) return;
-        BukkitServerBrand.removeFromModified(player);
-    }
-
-    @EventHandler (priority = EventPriority.LOWEST)
-    public void onPlayerChangedWorld(PlayerChangedWorldEvent event) {
-        Player player = event.getPlayer();
-        if(Storage.ConfigSections.Settings.CUSTOM_BRAND.REPEAT_DELAY != -1) return;
-        BukkitServerBrand.removeFromModified(player);
-    }
-}

src/main/java/de/rayzs/pat/plugin/listeners/bukkit/BukkitPlayerListener.java

@@ -0,0 +1,115 @@
+package de.rayzs.pat.plugin.listeners.bukkit;
+
+import de.rayzs.pat.api.brand.CustomServerBrand;
+import de.rayzs.pat.api.event.PATEventHandler;
+import de.rayzs.pat.api.event.events.ServerPlayersChangeEvent;
+import de.rayzs.pat.api.netty.bukkit.BukkitPacketAnalyzer;
+import de.rayzs.pat.api.communication.BackendUpdater;
+import de.rayzs.pat.plugin.logger.Logger;
+import de.rayzs.pat.utils.Reflection;
+import de.rayzs.pat.utils.message.MessageTranslator;
+import de.rayzs.pat.utils.permission.PermissionPlugin;
+import de.rayzs.pat.utils.permission.PermissionUtil;
+import de.rayzs.pat.api.storage.Storage;
+import de.rayzs.pat.utils.scheduler.PATScheduler;
+import de.rayzs.pat.utils.sender.CommandSender;
+import de.rayzs.pat.utils.sender.CommandSenderHandler;
+import org.bukkit.event.player.*;
+import org.bukkit.entity.Player;
+import org.bukkit.event.*;
+import java.util.UUID;
+
+public class BukkitPlayerListener implements Listener {
+
+    @EventHandler
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        final Player player = event.getPlayer();
+        final UUID uuid = player.getUniqueId();
+
+        final CommandSender sender = CommandSenderHandler.from(player);
+        sender.updateSenderObject(player);
+
+        PATEventHandler.callServerPlayersChangeEvents(player, ServerPlayersChangeEvent.Type.JOINED);
+
+        if (Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED) {
+            BackendUpdater.handle();
+        }
+
+        CustomServerBrand.preparePlayer(player);
+        PermissionUtil.reloadPermissions(sender);
+
+        if (CustomServerBrand.isEnabled()) {
+            CustomServerBrand.sendBrandToPlayer(player);
+        }
+
+        if (!Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED) {
+            if (Storage.getPermissionPlugin() != PermissionPlugin.LUCKPERMS) {
+
+                PATScheduler.createScheduler(() -> {
+
+                    if (Storage.getPermissionPlugin() == PermissionPlugin.GROUPMANAGER) {
+                        PermissionUtil.reloadPermissions(sender);
+                    }
+
+                    if (Reflection.getMinor() >= 13) {
+                        BukkitAntiTabListener.handleTabCompletion(player);
+                    }
+                }, 20);
+
+            }
+        }
+
+        if (!BukkitPacketAnalyzer.inject(player)) {
+            PATScheduler.createScheduler(() -> {
+                if (player.isOnline()) {
+                    if (!BukkitPacketAnalyzer.inject(player)) {
+                        Logger.warning("Failed to inject into player! (" + player.getName() + ")" );
+                        player.kickPlayer("Failed to inject player!");
+                    }
+                }
+            }, 10);
+        }
+
+        // Update sub arguments for <1.12.2 servers.
+        if (Reflection.getMinor() < 13) {
+            Storage.quickSubArgumentUpdate(uuid);
+        }
+
+        if (Storage.OUTDATED && PermissionUtil.hasPermission(sender, "joinupdate")) {
+            PATScheduler.createScheduler(() -> {
+                if (player.isOnline()) {
+                    MessageTranslator.send(player, Storage.ConfigSections.Settings.UPDATE.OUTDATED.getLines());
+                }
+            }, 20);
+        }
+    }
+
+    @EventHandler (priority = EventPriority.LOWEST)
+    public void onPlayerQuit(PlayerQuitEvent event) {
+        Player player = event.getPlayer();
+        PATEventHandler.callServerPlayersChangeEvents(player, ServerPlayersChangeEvent.Type.LEFT);
+
+        BukkitPacketAnalyzer.uninject(player.getUniqueId());
+        PermissionUtil.resetPermissions(player.getUniqueId());
+    }
+
+    @EventHandler (priority = EventPriority.LOWEST)
+    public void onPlayerChangedWorld(PlayerChangedWorldEvent event) {
+        Player player = event.getPlayer();
+
+        if (Storage.ConfigSections.Settings.CUSTOM_BRAND.REPEAT_DELAY == -1) {
+            CustomServerBrand.sendBrandToPlayer(player);
+        }
+
+        if (Storage.ConfigSections.Settings.UPDATE_GROUPS_PER_WORLD.ENABLED) {
+            CommandSender sender = CommandSenderHandler.from(player);
+
+            assert sender != null;
+            PermissionUtil.reloadPermissions(sender);
+
+            if (Reflection.getMinor() >= 13) {
+                BukkitAntiTabListener.handleTabCompletion(player);
+            }
+        }
+    }
+}

src/main/java/de/rayzs/pat/plugin/listeners/bukkit/PaperServerListPing.java

@@ -1,12 +1,29 @@
 package de.rayzs.pat.plugin.listeners.bukkit;
 
 import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
+import com.destroystokyo.paper.profile.PlayerProfile;
+import com.destroystokyo.paper.profile.ProfileProperty;
 import de.rayzs.pat.api.storage.Storage;
+import de.rayzs.pat.utils.ExpireCache;
+import de.rayzs.pat.utils.StringUtils;
+import de.rayzs.pat.utils.message.replacer.PlaceholderReplacer;
 import org.bukkit.event.*;
 import org.bukkit.Bukkit;
+import org.bukkit.profile.PlayerTextures;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import javax.swing.plaf.BorderUIResource;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
 
 public class PaperServerListPing implements Listener {
 
+    private static final ExpireCache<Integer, List<ProtocolHoverLine>> CACHED_PROTOCOL_NAMES = new ExpireCache<>(1, TimeUnit.SECONDS);
+    private static final UUID RANDOM_UUID = UUID.randomUUID();
+    private static final int CACHE_KEY = 0;
+
     @EventHandler (priority = EventPriority.LOWEST)
     public void onPaperServerListPing(PaperServerListPingEvent event) {
         if(!Storage.ConfigSections.Settings.CUSTOM_PROTOCOL_PING.ENABLED) return;
@@ -16,13 +33,193 @@ public class PaperServerListPing implements Listener {
                 onlineExtend = online + Storage.ConfigSections.Settings.CUSTOM_PROTOCOL_PING.EXTEND_COUNT,
                 max = Bukkit.getMaxPlayers();
 
-        if(Storage.ConfigSections.Settings.CUSTOM_PROTOCOL_PING.USE_EXTEND_AS_MAX_COUNT)
+        if (Storage.ConfigSections.Settings.CUSTOM_PROTOCOL_PING.USE_EXTEND_AS_MAX_COUNT)
             event.setMaxPlayers(onlineExtend);
 
         String versionName = Storage.ConfigSections.Settings.CUSTOM_PROTOCOL_PING.PROTOCOL.replace("%online_extended%", String.valueOf(onlineExtend)).replace("%online%", String.valueOf(online)).replace("%max%", String.valueOf(max));
-        if(Storage.ConfigSections.Settings.CUSTOM_PROTOCOL_PING.HIDE_PLAYERS)
+        if (Storage.ConfigSections.Settings.CUSTOM_PROTOCOL_PING.HIDE_PLAYERS) {
+            event.getPlayerSample().clear();
+        }
+
+        else if (Storage.ConfigSections.Settings.CUSTOM_PROTOCOL_PING.USE_CUSTOM_PLAYERLIST) {
+            List<ProtocolHoverLine> cachedPlayerNames = CACHED_PROTOCOL_NAMES.get(CACHE_KEY);
+
             event.getPlayerSample().clear();
 
-        event.setVersion(versionName);
+            if (cachedPlayerNames != null) {
+
+                event.getPlayerSample().addAll(cachedPlayerNames);
+
+            } else {
+
+                Storage.ConfigSections.Settings.CUSTOM_PROTOCOL_PING.PLAYERLIST.getLines().forEach(line -> {
+
+                    if (line.contains("%players%")) {
+                        List<String> playerNames = Storage.getLoader().getOnlinePlayerNames();
+
+                        playerNames = playerNames.size() > 30
+                                ? playerNames.subList(0, 30)
+                                : playerNames;
+
+                        for (String currentPlayerName : playerNames) {
+                            String playerName = StringUtils.replace(line,
+                                    "%players%", currentPlayerName, "&", "§"
+                            );
+
+                            event.getPlayerSample().add(new ProtocolHoverLine(playerName, RANDOM_UUID));
+                        }
+
+                    } else {
+                        String playerName = replaceString(line, online, onlineExtend, max);
+
+                        if (playerName.contains("\n")) {
+                            String[] nameSplit = playerName.split("\n");
+                            nameSplit = nameSplit.length > 30
+                                    ? Arrays.copyOfRange(nameSplit, 0, 30)
+                                    : nameSplit;
+
+                            for (String name : nameSplit) {
+                                event.getPlayerSample().add(new ProtocolHoverLine(name, RANDOM_UUID));
+                            }
+
+                        } else {
+                            event.getPlayerSample().add(new ProtocolHoverLine(playerName, RANDOM_UUID));
+                        }
+                    }
+                });
+            }
+        }
+
+        event.setVersion(replaceString(versionName, online, onlineExtend, max));
+    }
+
+    private String replaceString(String string, int online, int onlineExtend, int max) {
+        String replaced = string
+                .replace("&", "§")
+                .replace("%online_extended%", String.valueOf(onlineExtend))
+                .replace("%online%", String.valueOf(online))
+                .replace("%max%", String.valueOf(max));
+
+        return replaced.contains("%") ? PlaceholderReplacer.replace(null, replaced) : replaced;
+    }
+
+    private static class ProtocolHoverLine implements PlayerProfile {
+
+        private String name, id;
+
+        public ProtocolHoverLine(String name, UUID id) {
+            this.name = name;
+            this.id = id.toString();
+        }
+
+        @Override
+        public @Nullable UUID getUniqueId() {
+            return UUID.fromString(id);
+        }
+
+        @Override
+        public @Nullable String getName() {
+            return name;
+        }
+
+        @Override
+        public @NotNull String setName(@Nullable String s) {
+            return "";
+        }
+
+        @Override
+        public @Nullable UUID getId() {
+            return getUniqueId();
+        }
+
+        @Override
+        public @Nullable UUID setId(@Nullable UUID uuid) {
+            return null;
+        }
+
+        @Override
+        public @NotNull PlayerTextures getTextures() {
+            return null;
+        }
+
+        @Override
+        public void setTextures(@Nullable PlayerTextures playerTextures) {
+
+        }
+
+        @Override
+        public Set<ProfileProperty> getProperties() {
+            return null;
+        }
+
+        @Override
+        public boolean hasProperty(@Nullable String s) {
+            return false;
+        }
+
+        @Override
+        public void setProperty(@NotNull ProfileProperty profileProperty) {
+
+        }
+
+        @Override
+        public void setProperties(@NotNull Collection<ProfileProperty> collection) {
+
+        }
+
+        @Override
+        public boolean removeProperty(@Nullable String s) {
+            return false;
+        }
+
+        @Override
+        public void clearProperties() {
+
+        }
+
+        @Override
+        public boolean isComplete() {
+            return false;
+        }
+
+        @Override
+        public boolean completeFromCache() {
+            return false;
+        }
+
+        @Override
+        public boolean completeFromCache(boolean b) {
+            return false;
+        }
+
+        @Override
+        public boolean completeFromCache(boolean b, boolean b1) {
+            return false;
+        }
+
+        @Override
+        public boolean complete(boolean b) {
+            return false;
+        }
+
+        @Override
+        public boolean complete(boolean b, boolean b1) {
+            return false;
+        }
+
+        @Override
+        public @NotNull CompletableFuture<PlayerProfile> update() {
+            return null;
+        }
+
+        @Override
+        public org.bukkit.profile.@NotNull PlayerProfile clone() {
+            return null;
+        }
+
+        @Override
+        public Map<String, Object> serialize() {
+            return null;
+        }
     }
 }

src/main/java/de/rayzs/pat/plugin/listeners/bungee/BungeeAntiTabListener.java

@@ -1,37 +1,113 @@
 package de.rayzs.pat.plugin.listeners.bungee;
 
 import de.rayzs.pat.api.event.PATEventHandler;
-import de.rayzs.pat.api.event.events.FilteredSuggestionEvent;
 import de.rayzs.pat.api.event.events.FilteredTabCompletionEvent;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
-import de.rayzs.pat.utils.permission.PermissionUtil;
-import net.md_5.bungee.api.plugin.Listener;
+import de.rayzs.pat.api.netty.proxy.BungeePacketAnalyzer;
 import de.rayzs.pat.api.storage.Storage;
-import net.md_5.bungee.api.event.*;
-import net.md_5.bungee.event.*;
+import de.rayzs.pat.utils.StringUtils;
+import de.rayzs.pat.utils.group.Group;
+import de.rayzs.pat.utils.group.GroupManager;
+import de.rayzs.pat.utils.permission.PermissionUtil;
+import de.rayzs.pat.utils.sender.CommandSender;
+import de.rayzs.pat.utils.sender.CommandSenderHandler;
+import net.md_5.bungee.api.config.ServerInfo;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.event.TabCompleteEvent;
+import net.md_5.bungee.api.event.TabCompleteResponseEvent;
+import net.md_5.bungee.api.plugin.Listener;
+import net.md_5.bungee.event.EventHandler;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public class BungeeAntiTabListener implements Listener {
 
     @EventHandler
-    public void onTabComplete(TabCompleteEvent event) {
-        if(!(event.getSender() instanceof ProxiedPlayer)) return;
+    public void onTabCompleteResponse(TabCompleteResponseEvent event) {
 
-        ProxiedPlayer player = (ProxiedPlayer) event.getSender();
-        if(PermissionUtil.hasBypassPermission(player)) return;
-        if(Storage.Blacklist.isBlocked(player, event.getCursor(), !Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED, player.getServer().getInfo().getName()))
-            event.getSuggestions().clear();
+        if(!(event.getReceiver() instanceof ProxiedPlayer)) return;
+
+        ProxiedPlayer player = (ProxiedPlayer) event.getReceiver();
+        CommandSender sender = CommandSenderHandler.from(player);
+
+        ServerInfo serverInfo = player.getServer().getInfo();
+        String serverName = serverInfo.getName();
+
+        String rawCursor = BungeePacketAnalyzer.getPlayerInput(player);
+
+        if (rawCursor == null) {
+            return;
+        }
+
+        if (!rawCursor.startsWith("/")) {
+            return;
+        }
+
+        String cursor = rawCursor.substring(1);
+
+        if (event.getSuggestions().isEmpty())
+            return;
+
+        if (Storage.Blacklist.isDisabledServer(serverName))
+            return;
+
+        if (PermissionUtil.hasBypassPermission(sender))
+            return;
+
+
+
+        final List<Group> groups = GroupManager.getPlayerGroups(sender);
+        final boolean doesBypassNamespace = Storage.ConfigSections.Settings.BLOCK_NAMESPACE_COMMANDS.doesBypass(sender);
+        final boolean spaces = cursor.contains(" ");
+
+        boolean cancelsBeforeHand = false;
+
+        if (Storage.ConfigSections.Settings.BLOCK_NAMESPACE_COMMANDS.isCommand(cursor) && !doesBypassNamespace) {
+            cancelsBeforeHand = true;
+        }
+
+        if (!cancelsBeforeHand && !cursor.isEmpty()) {
+            cancelsBeforeHand = !Storage.Blacklist.canPlayerAccessTab(sender, groups, StringUtils.getFirstArg(cursor), serverName);
+        }
+
+        if (!cancelsBeforeHand) {
+            cancelsBeforeHand = Storage.ConfigSections.Settings.CUSTOM_PLUGIN.isCommand(cursor) || Storage.ConfigSections.Settings.CUSTOM_VERSION.isCommand(cursor);
+        }
+
+        if (spaces) {
+            if (cancelsBeforeHand) {
+                event.getSuggestions().clear();
+                return;
+            }
+
+            FilteredTabCompletionEvent filteredTabCompletionEvent = PATEventHandler.callFilteredTabCompletionEvents(player.getUniqueId(), rawCursor, new ArrayList<>(event.getSuggestions()));
+
+            if (filteredTabCompletionEvent.isCancelled()) {
+                event.getSuggestions().clear();
+            } else {
+                event.getSuggestions().removeIf(s -> !filteredTabCompletionEvent.getCompletion().contains(s));
+            }
+
+            return;
+        }
+
+        event.getSuggestions().removeIf(s -> {
+            String cpy = s;
+            if (cpy.startsWith("/")) {
+                cpy = cpy.substring(1);
+            }
+
+            if (Storage.ConfigSections.Settings.CUSTOM_PLUGIN.isTabCompletable(cpy) || Storage.ConfigSections.Settings.CUSTOM_VERSION.isTabCompletable(cpy)) {
+                return false;
+            }
+
+            return !Storage.Blacklist.canPlayerAccessTab(sender, groups, cpy, serverName);
+        });
     }
 
     @EventHandler
-    public void onTabComplete(TabCompleteResponseEvent event) {
-        if(!(event.getSender() instanceof ProxiedPlayer)) return;
-
+    public void onTabComplete(TabCompleteEvent event) {
         ProxiedPlayer player = (ProxiedPlayer) event.getSender();
-        if(PermissionUtil.hasBypassPermission(player)) return;
-
-        event.getSuggestions().removeIf(command -> Storage.Blacklist.isBlocked(player, command, !Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED, player.getServer().getInfo().getName()));
-
-        FilteredSuggestionEvent filteredSuggestionEvent = PATEventHandler.call(player.getUniqueId(), event.getSuggestions());
-        if(filteredSuggestionEvent.isCancelled()) event.getSuggestions().clear();
+        BungeePacketAnalyzer.setPlayerInput(player, event.getCursor());
     }
 }

src/main/java/de/rayzs/pat/plugin/listeners/bungee/BungeeBlockCommandListener.java

@@ -1,147 +1,149 @@
 package de.rayzs.pat.plugin.listeners.bungee;
 
 import de.rayzs.pat.api.event.events.ExecuteCommandEvent;
+import de.rayzs.pat.utils.group.Group;
+import de.rayzs.pat.utils.group.GroupManager;
 import de.rayzs.pat.utils.permission.PermissionUtil;
 import de.rayzs.pat.utils.message.MessageTranslator;
-import net.md_5.bungee.api.config.ServerInfo;
+import de.rayzs.pat.utils.sender.CommandSender;
+import de.rayzs.pat.utils.sender.CommandSenderHandler;
 import net.md_5.bungee.api.event.ChatEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import de.rayzs.pat.plugin.logger.Logger;
 import de.rayzs.pat.api.storage.Storage;
 import net.md_5.bungee.api.connection.*;
-import net.md_5.bungee.api.ProxyServer;
 import de.rayzs.pat.utils.StringUtils;
 import de.rayzs.pat.api.event.*;
 import net.md_5.bungee.event.*;
+
 import java.util.List;
 
 public class BungeeBlockCommandListener implements Listener {
 
     @EventHandler (priority = EventPriority.HIGHEST)
     public void onChat(ChatEvent event) {
-        if(event.isCancelled()) return;
+        if (event.isCancelled()) return;
 
-        Connection connection = event.getSender();
-        if(!(connection instanceof ProxiedPlayer) || !event.getMessage().startsWith("/")) return;
+        final Connection connection = event.getSender();
+        if (! (connection instanceof ProxiedPlayer) || !event.getMessage().startsWith("/"))
+            return;
 
-        ProxiedPlayer player = (ProxiedPlayer) connection;
+        final ProxiedPlayer player = (ProxiedPlayer) connection;
+        final CommandSender sender = CommandSenderHandler.from(player);
+        final String serverName = player.getServer().getInfo().getName();
 
-        String rawCommand = event.getMessage(), command = rawCommand.toLowerCase();
+        String command = event.getMessage();
 
-        command = StringUtils.replaceFirst(command, "/", "");
+        if (PermissionUtil.hasBypassPermission(sender, command) || Storage.Blacklist.isDisabledServer(serverName))
+            return;
+
+        command = command.startsWith("/") ? command.substring(1) : command;
         command = StringUtils.getFirstArg(command);
-        command = StringUtils.replaceTriggers(command, "", "\\", "<", ">", "&");
 
-        if(PermissionUtil.hasBypassPermission(player, command, false)) return;
+        final String displayCommand = StringUtils.replaceTriggers(command, "", "\\", "<", ">", "&");
 
-        if(rawCommand.equals("/")) return;
-        ServerInfo serverInfo = player.getServer().getInfo();
-        String serverName = serverInfo != null ? serverInfo.getName() : "unknown";
-        List<String> notificationMessage = MessageTranslator.replaceMessageList(Storage.ConfigSections.Messages.NOTIFICATION.ALERT, "%player%", player.getName(), "%command%", command, "%server%", serverName);
 
-        if(Storage.ConfigSections.Settings.CUSTOM_PLUGIN.isCommand(command) && !PermissionUtil.hasBypassPermission(player, command)) {
-            ExecuteCommandEvent executeCommandEvent = PATEventHandler.call(player.getUniqueId(), rawCommand, true);
-            if(executeCommandEvent.isCancelled()) return;
+        final List<String> notificationMessage = MessageTranslator.replaceMessageList(
+                Storage.ConfigSections.Messages.NOTIFICATION.ALERT,
+                "%player%", player.getName(),
+                "%command%", displayCommand,
+                "%server%", serverName);
 
-            event.setCancelled(true);
-            MessageTranslator.send(player, Storage.ConfigSections.Settings.CUSTOM_PLUGIN.MESSAGE, "%command%", rawCommand.replaceFirst("/", ""));
+        if (Storage.ConfigSections.Settings.CUSTOM_PLUGIN.isCommand(command)) {
 
-            if(Storage.SEND_CONSOLE_NOTIFICATION) Logger.info(notificationMessage);
-            Storage.NOTIFY_PLAYERS.forEach(uuid -> {
-                ProxiedPlayer proxiedPlayer = ProxyServer.getInstance().getPlayer(uuid);
-                if(proxiedPlayer != null) MessageTranslator.send(proxiedPlayer, notificationMessage);
+            MessageTranslator.send(
+                    player,
+                    Storage.ConfigSections.Settings.CUSTOM_PLUGIN.MESSAGE,
+                    "%command%", StringUtils.getFirstArg(displayCommand)
+            );
+
+            if (Storage.SEND_CONSOLE_NOTIFICATION)
+                Logger.info(notificationMessage);
+
+            Storage.NOTIFY_PLAYERS.stream().forEach(uuid -> {
+                Object p = Storage.getLoader().getPlayerObjByUUID(uuid);
+                if (p != null) {
+                    MessageTranslator.send(p, notificationMessage);
+                }
             });
 
+            event.setCancelled(true);
             return;
         }
 
-        if(Storage.ConfigSections.Settings.CUSTOM_VERSION.isCommand(command) && !PermissionUtil.hasBypassPermission(player, command)) {
-            ExecuteCommandEvent executeCommandEvent = PATEventHandler.call(player.getUniqueId(), rawCommand, true);
-            if(executeCommandEvent.isCancelled()) return;
+        if (Storage.ConfigSections.Settings.CUSTOM_VERSION.isCommand(command)) {
 
-            event.setCancelled(true);
-            MessageTranslator.send(player, Storage.ConfigSections.Settings.CUSTOM_VERSION.MESSAGE, "%command%", rawCommand.replaceFirst("/", ""));
+            MessageTranslator.send(
+                    player,
+                    Storage.ConfigSections.Settings.CUSTOM_VERSION.MESSAGE,
+                    "%command%", StringUtils.getFirstArg(displayCommand)
+            );
+
+            if (Storage.SEND_CONSOLE_NOTIFICATION)
+                Logger.info(notificationMessage);
 
-            if(Storage.SEND_CONSOLE_NOTIFICATION) Logger.info(notificationMessage);
             Storage.NOTIFY_PLAYERS.forEach(uuid -> {
-                ProxiedPlayer proxiedPlayer = ProxyServer.getInstance().getPlayer(uuid);
-                if(proxiedPlayer != null) MessageTranslator.send(proxiedPlayer, notificationMessage);
+                Object p = Storage.getLoader().getPlayerObjByUUID(uuid);
+                if (p != null) {
+                    MessageTranslator.send(p, notificationMessage);
+                }
             });
 
+            event.setCancelled(true);
             return;
         }
 
-        if(!Storage.ConfigSections.Settings.CANCEL_COMMAND.ENABLED) return;
+        final List<Group> groups = GroupManager.getPlayerGroups(sender);
+        final boolean cancelBlockedCommand = Storage.ConfigSections.Settings.CANCEL_COMMAND.ENABLED;
 
-        List<String> cancelCommandMessage = MessageTranslator.replaceMessageList(Storage.ConfigSections.Settings.CANCEL_COMMAND.MESSAGE, "%command%", command);
+        boolean allowed = Storage.Blacklist.canPlayerAccessChat(sender, groups, command, serverName);
+        boolean blockedNamespace = false;
+
+        if (!Storage.ConfigSections.Settings.BLOCK_NAMESPACE_COMMANDS.doesBypass(sender)) {
+            blockedNamespace = cancelBlockedCommand
+                    ? Storage.ConfigSections.Settings.BLOCK_NAMESPACE_COMMANDS.isCommand(command)
+                    : Storage.ConfigSections.Settings.BLOCK_NAMESPACE_COMMANDS.doesAlwaysBlock(command);
+
+            if (blockedNamespace) allowed = false;
+        }
+
+        if (!Storage.ConfigSections.Settings.CANCEL_COMMAND.ENABLED && !blockedNamespace) {
+            return;
+        }
+
+        if (!allowed) {
+            ExecuteCommandEvent executeCommandEvent = PATEventHandler.callExecuteCommandEvents(
+                    player,
+                    event.getMessage(),
+                    true,
+                    !Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED
+            );
+
+            if (executeCommandEvent.isBlocked()) {
+                event.setCancelled(true);
+
+                if (!executeCommandEvent.doesNotify())
+                    return;
+
+                if (Storage.SEND_CONSOLE_NOTIFICATION)
+                    Logger.info(notificationMessage);
+
+                Storage.NOTIFY_PLAYERS.forEach(uuid -> {
+                    Object p = Storage.getLoader().getPlayerObjByUUID(uuid);
+
+                    if (p != null) {
+                        MessageTranslator.send(p, notificationMessage);
+                    }
+                });
 
-        boolean listed, serverListed, ignored;
-        if(Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED) {
-            if(Storage.Blacklist.doesGroupBypass(player, command, true, true, false, serverName)) {
-                PATEventHandler.call(player.getUniqueId(), rawCommand, false);
-                return;
             }
 
-            listed = Storage.Blacklist.isListed(command, false, true, false);
-            serverListed = Storage.Blacklist.isListed(player, command, false, listed, false, serverName);
-            ignored = Storage.Blacklist.isOnIgnoredServer(serverName);
-
-            if(ignored ? !listed && serverListed : serverListed) {
-                PATEventHandler.call(player.getUniqueId(), rawCommand, false);
+            if (executeCommandEvent.isCancelled())
                 return;
-            }
-
-            ExecuteCommandEvent executeCommandEvent = PATEventHandler.call(player.getUniqueId(), rawCommand, true);
-            if(executeCommandEvent.isCancelled()) return;
+        }
 
+        ExecuteCommandEvent executeCommandEvent = PATEventHandler.callExecuteCommandEvents(player, event.getMessage(), false, false);
+        if (executeCommandEvent.isBlocked())
             event.setCancelled(true);
-            MessageTranslator.send(player, cancelCommandMessage);
-            return;
-        }
-
-        if(Storage.ConfigSections.Settings.BLOCK_NAMESPACE_COMMANDS.isCommand(command) && !Storage.ConfigSections.Settings.BLOCK_NAMESPACE_COMMANDS.doesBypass(player)) {
-            ExecuteCommandEvent executeCommandEvent = PATEventHandler.call(player.getUniqueId(), rawCommand, true);
-            if(executeCommandEvent.isCancelled()) return;
-
-            event.setCancelled(true);
-            MessageTranslator.send(player, cancelCommandMessage);
-
-            if(Storage.SEND_CONSOLE_NOTIFICATION) Logger.info(notificationMessage);
-            Storage.NOTIFY_PLAYERS.forEach(uuid -> {
-                ProxiedPlayer proxiedPlayer = ProxyServer.getInstance().getPlayer(uuid);
-                if(proxiedPlayer != null) MessageTranslator.send(proxiedPlayer, notificationMessage);
-            });
-
-            return;
-        }
-
-        if(Storage.Blacklist.doesGroupBypass(player, command, true, true, false, serverName)) {
-            PATEventHandler.call(player.getUniqueId(), rawCommand, false);
-            return;
-        }
-
-        listed = Storage.Blacklist.isListed(command, true, true, false);
-        serverListed = Storage.Blacklist.isListed(player, command, true, listed, false, serverName);
-        ignored = Storage.Blacklist.isOnIgnoredServer(serverName);
-
-        if(!listed && !serverListed || listed && serverListed && ignored) {
-            PATEventHandler.call(player.getUniqueId(), rawCommand, false);
-            return;
-        }
-
-        ExecuteCommandEvent executeCommandEvent = PATEventHandler.call(player.getUniqueId(), rawCommand, true);
-        if(executeCommandEvent.isCancelled()) {
-            PATEventHandler.call(player.getUniqueId(), rawCommand, false);
-            return;
-        }
-
-        event.setCancelled(true);
-        MessageTranslator.send(player, cancelCommandMessage);
-
-        if(Storage.SEND_CONSOLE_NOTIFICATION) Logger.info(notificationMessage);
-        Storage.NOTIFY_PLAYERS.forEach(uuid -> {
-            ProxiedPlayer proxiedPlayer = ProxyServer.getInstance().getPlayer(uuid);
-            if(proxiedPlayer != null) MessageTranslator.send(proxiedPlayer, notificationMessage);
-        });
     }
 }

src/main/java/de/rayzs/pat/plugin/listeners/bungee/BungeePingListener.java

@@ -4,10 +4,12 @@ import de.rayzs.pat.plugin.logger.Logger;
 import net.md_5.bungee.api.event.ProxyPingEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import de.rayzs.pat.api.storage.Storage;
-import de.rayzs.pat.plugin.BungeeLoader;
+import de.rayzs.pat.plugin.*;
 import net.md_5.bungee.event.*;
 import net.md_5.bungee.api.*;
 
+import java.util.List;
+
 public class BungeePingListener implements Listener {
 
     @EventHandler(priority = EventPriority.LOWEST)
@@ -22,16 +24,41 @@ public class BungeePingListener implements Listener {
         try {
             max = proxyServer.getConfigurationAdapter().getListeners().iterator().next().getMaxPlayers();
         } catch (Throwable throwable) {
-            Logger.debug("Failed to read max-players count for %max% placeholder! Using -1 as default value instead.");
+            Logger.warning("Failed to read max-players count for %max% placeholder! Using -1 as default value instead.");
         }
 
         ServerPing serverPing = event.getResponse();
-        ServerPing.Protocol newProtocol = new ServerPing.Protocol(Storage.ConfigSections.Settings.CUSTOM_PROTOCOL_PING.PROTOCOL.replace("%online_extended%", String.valueOf(onlineExtend)).replace("%online%", String.valueOf(online)).replace("%max%", String.valueOf(max)), !Storage.ConfigSections.Settings.CUSTOM_PROTOCOL_PING.ALWAYS_SHOW ? serverPing.getVersion().getProtocol() : 0);
+
+        int protocol = Storage.ConfigSections.Settings.CUSTOM_PROTOCOL_PING.ALWAYS_SHOW ? -1 : serverPing.getVersion().getProtocol();
+        String version = replaceString(Storage.ConfigSections.Settings.CUSTOM_PROTOCOL_PING.PROTOCOL, online, onlineExtend, max);
+
+        ServerPing.Protocol newProtocol = new ServerPing.Protocol(version, protocol);
         serverPing.setVersion(newProtocol);
 
-        if(Storage.ConfigSections.Settings.CUSTOM_PROTOCOL_PING.USE_EXTEND_AS_MAX_COUNT)
+        if (Storage.ConfigSections.Settings.CUSTOM_PROTOCOL_PING.USE_EXTEND_AS_MAX_COUNT)
             serverPing.getPlayers().setMax(onlineExtend);
 
+        if (Storage.ConfigSections.Settings.CUSTOM_PROTOCOL_PING.HIDE_PLAYERS)
+            serverPing.getPlayers().setSample(new ServerPing.PlayerInfo[0]);
+        else if (Storage.ConfigSections.Settings.CUSTOM_PROTOCOL_PING.USE_CUSTOM_PLAYERLIST) {
+            List<String> lines = Storage.ConfigSections.Settings.CUSTOM_PROTOCOL_PING.PLAYERLIST.getLines();
+            ServerPing.PlayerInfo[] playerInfos = new ServerPing.PlayerInfo[lines.size()];
+
+            for (int i = 0; i < lines.size(); i++) {
+                playerInfos[i] = new ServerPing.PlayerInfo(replaceString(lines.get(i), online, onlineExtend, max), "");
+            }
+
+            serverPing.getPlayers().setSample(playerInfos);
+        }
+
         event.setResponse(serverPing);
     }
+
+    private String replaceString(String string, int online, int onlineExtend, int max) {
+        return string
+                .replace("&", "§")
+                .replace("%online_extended%", String.valueOf(onlineExtend))
+                .replace("%online%", String.valueOf(online))
+                .replace("%max%", String.valueOf(max));
+    }
 }

src/main/java/de/rayzs/pat/plugin/listeners/bungee/BungeePlayerConnectionListener.java

@@ -1,10 +1,14 @@
 package de.rayzs.pat.plugin.listeners.bungee;
 
+import de.rayzs.pat.api.brand.CustomServerBrand;
+import de.rayzs.pat.api.event.PATEventHandler;
+import de.rayzs.pat.api.event.events.ServerPlayersChangeEvent;
 import de.rayzs.pat.api.netty.proxy.BungeePacketAnalyzer;
 import de.rayzs.pat.utils.permission.PermissionUtil;
 import de.rayzs.pat.utils.message.MessageTranslator;
+import de.rayzs.pat.utils.sender.CommandSender;
+import de.rayzs.pat.utils.sender.CommandSenderHandler;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
-import de.rayzs.pat.api.brand.CustomServerBrand;
 import net.md_5.bungee.api.plugin.Listener;
 import de.rayzs.pat.api.storage.Storage;
 import de.rayzs.pat.plugin.BungeeLoader;
@@ -17,10 +21,20 @@ public class BungeePlayerConnectionListener implements Listener {
 
     @EventHandler (priority = EventPriority.LOWEST)
     public void onPostLogin(PostLoginEvent event) {
-        ProxiedPlayer player = event.getPlayer();
-        PermissionUtil.setPlayerPermissions(player.getUniqueId());
+        final ProxiedPlayer player = event.getPlayer();
+        final CommandSender sender = CommandSenderHandler.from(player);
+        sender.updateSenderObject(player);
 
-        if(Storage.OUTDATED && PermissionUtil.hasPermission(player, "joinupdate")) {
+        PATEventHandler.callServerPlayersChangeEvents(player, ServerPlayersChangeEvent.Type.JOINED);
+
+        if(CustomServerBrand.isEnabled())
+            ProxyServer.getInstance().getScheduler().schedule(BungeeLoader.getPlugin(), () -> {
+                if (player.isConnected()) CustomServerBrand.sendBrandToPlayer(player);
+            }, 500, TimeUnit.MILLISECONDS);
+
+        PermissionUtil.setPlayerPermissions(sender);
+
+        if (Storage.OUTDATED && PermissionUtil.hasPermission(sender, "joinupdate")) {
             ProxyServer.getInstance().getScheduler().schedule(BungeeLoader.getPlugin(), () -> {
                 if (player.isConnected()) {
                     MessageTranslator.send(player, Storage.ConfigSections.Settings.UPDATE.OUTDATED, "%player%", player.getName());
@@ -34,16 +48,33 @@ public class BungeePlayerConnectionListener implements Listener {
         ProxiedPlayer player = event.getPlayer();
 
         BungeePacketAnalyzer.inject(player);
-        if(Storage.ConfigSections.Settings.CUSTOM_BRAND.REPEAT_DELAY != -1) return;
+
+        if (Storage.ConfigSections.Settings.UPDATE_GROUPS_PER_SERVER.ENABLED) {
+            CommandSender sender = CommandSenderHandler.from(player);
+
+            assert sender != null;
+            PermissionUtil.reloadPermissions(sender);
+        }
+
+        if (Storage.ConfigSections.Settings.CUSTOM_BRAND.REPEAT_DELAY != -1) {
+            return;
+        }
+
         CustomServerBrand.sendBrandToPlayer(player);
     }
 
     @EventHandler (priority = EventPriority.LOWEST)
     public void onPlayerDisconnectEvent(PlayerDisconnectEvent event) {
         ProxiedPlayer player = event.getPlayer();
+        PATEventHandler.callServerPlayersChangeEvents(player, ServerPlayersChangeEvent.Type.LEFT);
+
         PermissionUtil.resetPermissions(player.getUniqueId());
         BungeePacketAnalyzer.uninject(player);
-        if(Storage.ConfigSections.Settings.CUSTOM_BRAND.REPEAT_DELAY != -1) return;
+
+        if (Storage.ConfigSections.Settings.CUSTOM_BRAND.REPEAT_DELAY != -1) {
+            return;
+        }
+
         CustomServerBrand.sendBrandToPlayer(player);
     }
 }

src/main/java/de/rayzs/pat/plugin/listeners/bungee/WaterfallAntiTabListener.java

@@ -1,55 +1,74 @@
 package de.rayzs.pat.plugin.listeners.bungee;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import de.rayzs.pat.api.event.PATEventHandler;
 import de.rayzs.pat.api.event.events.FilteredSuggestionEvent;
-import io.github.waterfallmc.waterfall.event.ProxyDefineCommandsEvent;
+import de.rayzs.pat.api.storage.Storage;
+import de.rayzs.pat.utils.CommandsCache;
+import de.rayzs.pat.utils.group.Group;
+import de.rayzs.pat.utils.group.GroupManager;
 import de.rayzs.pat.utils.permission.PermissionUtil;
+import de.rayzs.pat.utils.sender.CommandSender;
+import de.rayzs.pat.utils.sender.CommandSenderHandler;
+import io.github.waterfallmc.waterfall.event.ProxyDefineCommandsEvent;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Command;
 import net.md_5.bungee.api.plugin.Listener;
-import de.rayzs.pat.utils.CommandsCache;
-import net.md_5.bungee.event.*;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
+import net.md_5.bungee.event.EventHandler;
+import net.md_5.bungee.event.EventPriority;
 
 public class WaterfallAntiTabListener implements Listener {
 
-    private static final HashMap<String, CommandsCache> COMMANDS_CACHE_MAP = new HashMap<>();
-
     @EventHandler(priority = EventPriority.LOWEST)
     public void onProxyDefineCommands(ProxyDefineCommandsEvent event) {
-        if(!(event.getReceiver() instanceof ProxiedPlayer) || event.getCommands().isEmpty()) return;
+        if (!(event.getReceiver() instanceof ProxiedPlayer) || event.getCommands().isEmpty()) {
+            return;
+        }
 
-        ProxiedPlayer player = (ProxiedPlayer) event.getReceiver();
-        String serverName = player.getServer().getInfo().getName();
+        final ProxiedPlayer player = (ProxiedPlayer) event.getReceiver();
+        final CommandSender sender = CommandSenderHandler.from(player);
+        final String serverName = player.getServer().getInfo().getName();
 
-        if(!COMMANDS_CACHE_MAP.containsKey(serverName))
-            COMMANDS_CACHE_MAP.put(serverName, new CommandsCache().reverse());
+        if (Storage.Blacklist.isDisabledServer(serverName) || PermissionUtil.hasBypassPermission(sender)) {
+            return;
+        }
 
-        CommandsCache commandsCache = COMMANDS_CACHE_MAP.get(serverName);
-        List<String> commandsAsString = new ArrayList<>();
-        HashMap<String, Command> commandsMap = new HashMap<>(event.getCommands());
+        final List<Group> groups = GroupManager.getPlayerGroups(sender);
+        final Map<String, CommandsCache> cache = Storage.getLoader().getCommandsCacheMap();
+
+        if (!cache.containsKey(serverName)) {
+            cache.put(serverName, new CommandsCache());
+        }
+
+        final CommandsCache commandsCache = cache.get(serverName);
+        final List<String> commandsAsString = new ArrayList<>();
+        final HashMap<String, Command> commandsMap = new HashMap<>(event.getCommands());
 
         event.getCommands().forEach((key, value) -> commandsAsString.add(key));
         commandsCache.handleCommands(commandsAsString, serverName);
 
-        if(PermissionUtil.hasBypassPermission(player)) return;
+        List<String> playerCommands = commandsCache.getPlayerCommands(commandsAsString, sender, groups, serverName);
+        event.getCommands().entrySet().removeIf(command -> {
 
-        List<String> playerCommands = commandsCache.getPlayerCommands(commandsAsString, player, player.getUniqueId(), serverName);
-        event.getCommands().entrySet().removeIf(command -> playerCommands.contains(command.getKey()));
+            if (Storage.ConfigSections.Settings.CUSTOM_PLUGIN.isTabCompletable(command.getKey()) || Storage.ConfigSections.Settings.CUSTOM_VERSION.isTabCompletable(command.getKey())) {
+                return false;
+            }
 
-        FilteredSuggestionEvent filteredSuggestionEvent = PATEventHandler.call(player.getUniqueId(), new ArrayList<>(event.getCommands().keySet()));
-        if(filteredSuggestionEvent.isCancelled()) event.getCommands().clear();
+            return playerCommands.contains(command.getKey());
+        });
+
+        FilteredSuggestionEvent filteredSuggestionEvent = PATEventHandler.callFilteredSuggestionEvents(player, new ArrayList<>(event.getCommands().keySet()));
+        if (filteredSuggestionEvent.isCancelled()) event.getCommands().clear();
 
         for (String commandName : filteredSuggestionEvent.getSuggestions()) {
-            if(!event.getCommands().containsKey(commandName)) event.getCommands().put(commandName, commandsMap.get(commandName));
+
+            if (!event.getCommands().containsKey(commandName)) 
+                event.getCommands().put(commandName, commandsMap.get(commandName));
+        
         }
-
-        commandsMap = null;
-    }
-
-    public static void updateCommands() {
-        COMMANDS_CACHE_MAP.values().forEach(CommandsCache::reset);
     }
 }