Added m, k and b to number criteria

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>de.rayzs.pat</groupId>
     <artifactId>ProAntiTab</artifactId>
-    <version>2.0.8</version>
+    <version>2.0.10</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

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

@@ -204,6 +204,8 @@ public class Storage {
 
             } else {
 
+                Storage.Blacklist.Experimental.forceCacheReset();
+
                 if (isVelocity) {
                     List<UUID> playerIds = Storage.getLoader().getPlayerIds();
 
@@ -384,6 +386,19 @@ public class Storage {
 
     public static class Blacklist {
 
+        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]"),
@@ -428,14 +443,9 @@ public class Storage {
             BLACKLIST.getConfig().getKeys("global.servers", true).forEach(key -> {
                 GeneralBlacklist blacklist = BlacklistCreator.createGeneralBlacklist(key);
                 blacklist.load();
-
                 SERVER_BLACKLISTS.put(key, blacklist);
             });
 
-            loadAllCachedServerBlacklists();
-        }
-
-        private static void loadAllCachedServerBlacklists() {
             getServers().forEach(Blacklist::loadCachedServerBlacklists);
         }
 
@@ -443,9 +453,7 @@ public class Storage {
             List<GeneralBlacklist> blacklists = SERVER_BLACKLISTS.entrySet().stream()
                     .filter(entry ->
                             isServer(entry.getKey(), server)
-                    ).map(entry ->
-                            entry.getValue()
-                    ).toList();
+                    ).map(Map.Entry::getValue).toList();
 
             CACHED_SERVER_BLACKLIST.put(server, blacklists);
         }

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

@@ -33,7 +33,6 @@ public class BungeeLoader extends Plugin implements PluginLoader {
     private static Plugin plugin;
     private static java.util.logging.Logger logger;
 
-    private static boolean checkUpdate = false;
     private static final HashMap<String, CommandsCache> commandsCacheMap = new HashMap<>();
 
     @Override

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

@@ -38,7 +38,7 @@ import java.util.*;
 
 @Plugin(name = "ProAntiTab",
 id = "proantitab",
-version = "2.0.8",
+version = "2.0.10",
 authors = "Rayzs_YT",
 description = "Hide more than just your plugins. Hide almost everything!",
 url = "https://www.rayzs.de/products/proantitab/page",
@@ -58,7 +58,6 @@ public class VelocityLoader implements PluginLoader {
     private ScheduledTask updaterTask;
 
     private static final HashMap<String, CommandsCache> commandsCacheMap = new HashMap<>();
-    private static boolean checkUpdate = false;
 
     @Inject
     public VelocityLoader(ProxyServer server, org.slf4j.Logger logger, VelocityMetrics.Factory metricsFactory) {

src/main/java/de/rayzs/pat/plugin/process/impl/local/modify/RemoveCommand.java

@@ -60,9 +60,7 @@ public class RemoveCommand extends ProCommand {
         final int length = args.length;
 
         if (length == 1) {
-            boolean exist = command.contains(" ")
-                    ? Storage.Blacklist.getBlacklist().getCommands().contains(command)
-                    : Storage.Blacklist.getBlacklist().isListed(command);
+            boolean exist = Storage.Blacklist.getBlacklist().getCommands().contains(command);
 
             if (exist) {
                 Storage.Blacklist.getBlacklist().remove(command).save();

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

@@ -2,6 +2,7 @@ package de.rayzs.pat.plugin.process.impl.local.system;
 
 import de.rayzs.pat.api.communication.BackendUpdater;
 import de.rayzs.pat.api.brand.CustomServerBrand;
+import de.rayzs.pat.api.storage.blacklist.impl.GeneralBlacklist;
 import de.rayzs.pat.utils.configuration.updater.ConfigUpdater;
 import de.rayzs.pat.utils.group.GroupManager;
 import de.rayzs.pat.api.command.ProCommand;
@@ -26,6 +27,7 @@ public class ReloadCommand extends ProCommand {
         sender.sendMessage(Storage.ConfigSections.Messages.RELOAD.LOADING);
 
         Storage.loadAll(Reflection.isProxyServer() || !backend);
+
         CustomServerBrand.initialize();
         GroupManager.clearAllGroups();
         GroupManager.initialize();

src/main/java/de/rayzs/pat/utils/NumberUtils.java

@@ -19,7 +19,7 @@ public class NumberUtils {
 
             char c = str.charAt(i);
 
-            if (c == '.' || c == ',')
+            if (c == '.' || c == ',' || c == 'k' || c == 'm' || c == 'b')
                 continue;
 
             if (!Character.isDigit(c))

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.8
+version: 2.0.1ß
 main: de.rayzs.pat.plugin.BungeeLoader
 
 softDepends: [LuckPerms, PAPIProxyBridge]

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.8
+version: 2.0.10
 api-version: 1.13
 folia-supported: true
 main: de.rayzs.pat.plugin.BukkitLoader