Small adjustment

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>de.rayzs.pat</groupId>
     <artifactId>ProAntiTab</artifactId>
-    <version>2.0.17</version>
+    <version>2.0.18</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -220,14 +220,14 @@
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-minimessage</artifactId>
-            <version>4.20.0</version>
+            <version>4.25.0</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-api</artifactId>
-            <version>4.20.0</version>
+            <version>4.25.0</version>
             <scope>compile</scope>
         </dependency>
 

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

@@ -291,6 +291,7 @@ public class Storage {
             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 UpdateCommandsPerWorldSection UPDATE_COMMANDS_PER_WORLD = new UpdateCommandsPerWorldSection();
             public static UpdateSection UPDATE = new UpdateSection();
 
             public static void initialize() {}

src/main/java/de/rayzs/pat/api/storage/config/settings/UpdateCommandsPerWorldSection.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 UpdateCommandsPerWorldSection extends ConfigStorage {
+
+    public boolean ENABLED;
+
+    public UpdateCommandsPerWorldSection() {
+        super("update-commands-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/plugin/BukkitLoader.java

@@ -91,7 +91,7 @@ public class BukkitLoader extends JavaPlugin implements PluginLoader {
             BukkitPacketAnalyzer.injectAll();
         } else BackendUpdater.handle();
 
-        manager.registerEvents(new BukkitPlayerConnectionListener(), this);
+        manager.registerEvents(new BukkitPlayerListener(), this);
         manager.registerEvents(new BukkitBlockCommandListener(), this);
 
         if (Reflection.getMinor() >= 13) {

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

@@ -21,7 +21,6 @@ import de.rayzs.pat.utils.adapter.LuckPermsAdapter;
 import com.velocitypowered.api.proxy.ProxyServer;
 import de.rayzs.pat.plugin.listeners.velocity.*;
 import de.rayzs.pat.utils.group.GroupManager;
-import de.rayzs.pat.utils.ConnectionBuilder;
 import de.rayzs.pat.utils.VersionComparer;
 import de.rayzs.pat.plugin.logger.Logger;
 import com.velocitypowered.api.plugin.*;
@@ -38,7 +37,7 @@ import java.util.*;
 
 @Plugin(name = "ProAntiTab",
 id = "proantitab",
-version = "2.0.17",
+version = "2.0.18",
 authors = "Rayzs_YT",
 description = "Hide more than just your plugins. Hide almost everything!",
 url = "https://www.rayzs.de/products/proantitab/page",

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

@@ -1,84 +1,93 @@
-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.message.MessageTranslator;
-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.*;
-
-public class BukkitPlayerConnectionListener implements Listener {
-
-    @EventHandler
-    public void onPlayerJoin(PlayerJoinEvent event) {
-        Player player = event.getPlayer();
-        PATEventHandler.callServerPlayersChangeEvents(player, ServerPlayersChangeEvent.Type.JOINED);
-
-        if (Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED)
-            BackendUpdater.handle();
-
-        PermissionUtil.setPlayerPermissions(player.getUniqueId());
-        CustomServerBrand.preparePlayer(player);
-
-        if (CustomServerBrand.isEnabled())
-            CustomServerBrand.sendBrandToPlayer(player);
-
-        if (!Storage.USE_LUCKPERMS && !Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED) {
-            PATScheduler.createScheduler(() -> {
-                CommandSender sender = CommandSenderHandler.from(player);
-
-                assert sender != null;
-                PermissionUtil.reloadPermissions(sender);
-                BukkitAntiTabListener.handleTabCompletion(player.getUniqueId());
-            }, 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);
-
-        }
-
-        if(Storage.OUTDATED && PermissionUtil.hasPermission(player, "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());
-        if(Storage.ConfigSections.Settings.CUSTOM_BRAND.REPEAT_DELAY != -1) return;
-    }
-
-    @EventHandler (priority = EventPriority.LOWEST)
-    public void onPlayerChangedWorld(PlayerChangedWorldEvent event) {
-        Player player = event.getPlayer();
-        if(Storage.ConfigSections.Settings.CUSTOM_BRAND.REPEAT_DELAY != -1) return;
-
-        CustomServerBrand.sendBrandToPlayer(player);
-    }
-}
+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.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.*;
+
+public class BukkitPlayerListener implements Listener {
+
+    @EventHandler
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        Player player = event.getPlayer();
+        PATEventHandler.callServerPlayersChangeEvents(player, ServerPlayersChangeEvent.Type.JOINED);
+
+        if (Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED)
+            BackendUpdater.handle();
+
+        PermissionUtil.setPlayerPermissions(player.getUniqueId());
+        CustomServerBrand.preparePlayer(player);
+
+        if (CustomServerBrand.isEnabled())
+            CustomServerBrand.sendBrandToPlayer(player);
+
+        if (!Storage.USE_LUCKPERMS && !Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED) {
+            PATScheduler.createScheduler(() -> {
+                CommandSender sender = CommandSenderHandler.from(player);
+
+                assert sender != null;
+                PermissionUtil.reloadPermissions(sender);
+                BukkitAntiTabListener.handleTabCompletion(player.getUniqueId());
+            }, 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);
+
+        }
+
+        if (Storage.OUTDATED && PermissionUtil.hasPermission(player, "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_COMMANDS_PER_WORLD.ENABLED) {
+            CommandSender sender = CommandSenderHandler.from(player);
+
+            assert sender != null;
+            PermissionUtil.reloadPermissions(sender);
+            BukkitAntiTabListener.handleTabCompletion(player);
+        }
+    }
+}

src/main/java/de/rayzs/pat/plugin/process/CommandProcess.java

@@ -9,6 +9,7 @@ import de.rayzs.pat.plugin.process.impl.local.modify.list.ListPrioritiesCommand;
 import de.rayzs.pat.plugin.process.impl.local.system.NotifyCommand;
 import de.rayzs.pat.plugin.process.impl.local.system.PostDebugCommand;
 import de.rayzs.pat.plugin.process.impl.local.system.ReloadCommand;
+import de.rayzs.pat.plugin.process.impl.local.system.UpdateCommand;
 import de.rayzs.pat.plugin.process.impl.server.ServAddCommand;
 import de.rayzs.pat.plugin.process.impl.server.ServClearCommand;
 import de.rayzs.pat.plugin.process.impl.server.ServRemoveCommand;

src/main/java/de/rayzs/pat/plugin/process/impl/local/system/UpdateCommand.java

@@ -1,4 +1,4 @@
-package de.rayzs.pat.plugin.process.impl.local.info;
+package de.rayzs.pat.plugin.process.impl.local.system;
 
 import de.rayzs.pat.plugin.listeners.bukkit.BukkitAntiTabListener;
 import de.rayzs.pat.utils.Reflection;

src/main/resources/bungee.yml

@@ -3,7 +3,7 @@ description: Hide more than just your plugins. Hide almost everything!
 website: https://www.rayzs.de/products/proantitab/page
 
 author: Rayzs_YT
-version: 2.0.17
+version: 2.0.18
 main: de.rayzs.pat.plugin.BungeeLoader
 
 softDepends: [LuckPerms, PAPIProxyBridge]

src/main/resources/files/bukkit-config.yml

@@ -48,6 +48,7 @@ handle-through-proxy:
     enabled: false
     name: "PAT_TOKEN"
 
+
 #>> HTP
 # This is a very necessary feature if you have way too many commands to block and instead decide
 # to whitelist specific commands.
@@ -63,6 +64,18 @@ turn-blacklist-to-whitelist: true
 # Pro tip: You can also just use auto-lowercase-commands feature instead. ^^
 base-command-case-sensitive: true
 
+# (!) Warning:
+#     Enabling this could lead to performance issues if many players
+#     change worlds frequently in short amount of time.
+#
+# This decides whether PAT updates the commands for a player after changing worlds.
+# Enabling this allows you to make per-world commands using PAT's group system by
+# giving a user/group the PAT group permission using a LuckPerms world as context.
+#
+# Example command:
+#   lp (...) permission set proantitab.group.<group> world=<world>
+update-commands-per-world: false
+
 # Here you can customize the server version that is displayed on a ping. (The text at the player-count)
 # (!) Warning: It's required to use Paper or Purpur to use this feature!
 # (!) Supported server versions: 1.12.2 - latest

src/main/resources/plugin.yml

@@ -3,7 +3,7 @@ description: Hide more than just your plugins. Hide almost everything!
 website: https://www.rayzs.de/products/proantitab/page
 
 author: Rayzs_YT
-version: 2.0.17
+version: 2.0.18
 api-version: 1.13
 folia-supported: true
 main: de.rayzs.pat.plugin.BukkitLoader