Don't clear caches on reload

PAPIProxyBridge support

.github/assets/MODRINTH.md

@@ -91,10 +91,10 @@ Spanish Video by Ajneb97
 </a>
 
 <!-- Links -->
-[profiles]: https://andre601.ch/AdvancedServerList/latest/profiles
-[conditions]: https://andre601.ch/AdvancedServerList/latest/profiles/#conditions
-[placeholders]: https://andre601.ch/AdvancedServerList/latest/profiles/placeholders
-[minimessage]: https://andre601.ch/AdvancedServerList/latest/profiles/formatting
+[profiles]: https://docs.andre601.ch/AdvancedServerList/latest/profiles
+[conditions]: https://docs.andre601.ch/AdvancedServerList/latest/profiles/#conditions
+[placeholders]: https://docs.andre601.ch/AdvancedServerList/latest/profiles/placeholders
+[minimessage]: https://docs.andre601.ch/AdvancedServerList/latest/profiles/formatting
 
 [protocollib]: https://www.spigotmc.org/resources/1997/
 [placeholderapi]: https://www.spigotmc.org/resources/6245/

.github/labeler.yml

@@ -0,0 +1,14 @@
+"Target: All":
+  - all: ["bukkit/**", "bungeecord/**", "core/**", "velocity/**"]
+
+"Target: Bukkit":
+  - all: ["bukkit/**", "!bungeecord/**", "!core/**", "!velocity/**"]
+
+"Target: BungeeCord":
+  - all: ["!bukkit/**", "bungeecord/**", "!core/**", "!velocity/**"]
+
+"Target: Core":
+  - all: ["!bukkit/**", "!bungeecord/**", "core/**", "!velocity/**"]
+
+"Target: Velocity":
+  - all: ["!bukkit/**", "!bungeecord/**", "!core/**", "velocity/**"]

.github/workflows/docs-deploy.yml

@@ -31,5 +31,9 @@ jobs:
         run: |
           python -m pip install --upgrade pip setuptools
           python -m pip install -r requirements.txt
+      - name: Set up Git
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "actions@github.com"
       - name: Deploy Files
         run: mkdocs gh-deploy --force

.github/workflows/release.yml

@@ -50,14 +50,18 @@ jobs:
             loaders: |
               bungeecord
               waterfall
-          - platforms: Spigot, Paper
+            dependencies: 'papiproxybridge@1.3(optional)'
+          - platforms: Spigot, Paper, Folia
             directory: bukkit
             loaders: |
               spigot
               paper
+              folia
+            dependencies: ''
           - platforms: Velocity
             directory: velocity
             loaders: velocity
+            dependencies: 'papiproxybridge@1.3(optional)'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
@@ -77,6 +81,7 @@ jobs:
         game-version-filter: releases
         game-versions: '>=1.19'
         java: 16
+        dependencies: ${{ matrix.dependencies }}
         modrinth-id: xss83sOY
         modrinth-featured: false
         modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
@@ -93,6 +98,7 @@ jobs:
         game-version-filter: releases
         game-versions: '>=1.19'
         java: 16
+        dependencies: ${{ matrix.dependencies }}
         modrinth-id: xss83sOY
         modrinth-featured: false
         modrinth-token: ${{ secrets.MODRINTH_TOKEN }}

README.md

@@ -97,10 +97,10 @@ You can disable this in the global bStats config file located in `/plugins/bstat
 </a>
 
 <!-- Links -->
-[profiles]: https://www.andre601.ch/AdvancedServerList/profiles/
-[conditions]: https://www.andre601.ch/AdvancedServerList/profiles/#conditions
-[placeholders]: https://www.andre601.ch/AdvancedServerList/profiles/placeholders/
-[minimessage]: https://www.andre601.ch/AdvancedServerList/profiles/formatting/
+[profiles]: https://docs.andre601.ch/AdvancedServerList/profiles/
+[conditions]: https://docs.andre601.ch/AdvancedServerList/profiles/#conditions
+[placeholders]: https://docs.andre601.ch/AdvancedServerList/profiles/placeholders/
+[minimessage]: https://docs.andre601.ch/AdvancedServerList/profiles/formatting/
 
 [modrinth]: https://modrinth.com/plugin/advancedserverlist
 

bukkit/pom.xml

@@ -82,13 +82,13 @@
         <dependency>
             <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.19.3-R0.1-SNAPSHOT</version>
+            <version>1.20-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.19-R0.1-SNAPSHOT</version>
+            <version>1.20-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -143,7 +143,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.5.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <relocations>

bukkit/src/main/java/ch/andre601/advancedserverlist/bukkit/objects/placeholders/BukkitServerPlaceholders.java

@@ -29,6 +29,7 @@ import ch.andre601.advancedserverlist.api.bukkit.objects.BukkitServer;
 import ch.andre601.advancedserverlist.api.PlaceholderProvider;
 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
+import org.bukkit.Bukkit;
 import org.bukkit.World;
 
 public class BukkitServerPlaceholders extends PlaceholderProvider{
@@ -50,28 +51,39 @@ public class BukkitServerPlaceholders extends PlaceholderProvider{
         
         return switch(args[0]){
             case "playersOnline" -> {
-                if(args.length == 2){
-                    World world = bukkitServer.getWorlds().get(args[1]);
-                    if(world == null)
-                        yield null;
+                if(args.length >= 2){
+                    int players = 0;
+                    for(int i = 1; i < args.length; i++){
+                        World world = bukkitServer.getWorlds().get(args[i]);
+                        if(world == null)
+                            continue;
+                        
+                        players += world.getPlayers().size();
+                    }
                     
-                    yield String.valueOf(world.getPlayers().size());
+                    yield String.valueOf(players);
                 }
                 
                 yield String.valueOf(bukkitServer.getPlayersOnline());
             }
             case "playersMax" -> {
-                if(args.length == 2)
+                if(args.length >= 2)
                     yield null;
                 
                 yield String.valueOf(bukkitServer.getPlayersMax());
             }
             case "host" -> {
-                if(args.length == 2)
+                if(args.length >= 2)
                     yield null;
                 
                 yield bukkitServer.getHost();
             }
+            case "whitelistEnabled" -> {
+                if(args.length >= 2)
+                    yield null;
+                
+                yield String.valueOf(Bukkit.hasWhitelist());
+            }
             default -> null;
         };
     }

bukkit/src/main/resources/paper-plugin.yml

@@ -6,7 +6,7 @@ description: '${plugin.description}'
 main: 'ch.andre601.advancedserverlist.paper.PaperCore'
 loader: 'ch.andre601.advancedserverlist.paper.ASLLoader'
 
-api-version: 1.19
+api-version: '1.19'
 
 dependencies:
   server:

bungeecord/pom.xml

@@ -133,7 +133,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.5.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <relocations>

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/listeners/BungeeEventWrapper.java

@@ -31,6 +31,7 @@ import ch.andre601.advancedserverlist.bungeecord.BungeeCordCore;
 import ch.andre601.advancedserverlist.bungeecord.objects.BungeePlayerImpl;
 import ch.andre601.advancedserverlist.api.events.GenericServerListEvent;
 import ch.andre601.advancedserverlist.bungeecord.objects.BungeeProxyImpl;
+import ch.andre601.advancedserverlist.core.events.PingEventHandler;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import ch.andre601.advancedserverlist.core.interfaces.events.GenericEventWrapper;
 import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
@@ -42,6 +43,7 @@ import net.md_5.bungee.api.Favicon;
 import net.md_5.bungee.api.ServerPing;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.config.ServerInfo;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.ProxyPingEvent;
 
 import java.awt.image.BufferedImage;
@@ -153,7 +155,25 @@ public class BungeeEventWrapper implements GenericEventWrapper<Favicon, BungeePl
     
     @Override
     public String parsePAPIPlaceholders(String text, BungeePlayerImpl player){
-        return text;
+        if(plugin.getProxy().getPluginManager().getPlugin("PAPIProxyBridge") == null)
+            return text;
+        
+        if(!PingEventHandler.getPAPIUtil().isCompatible())
+            return text;
+        
+        String server = PingEventHandler.getPAPIUtil().getServer();
+        if(server == null || server.isEmpty())
+            return text;
+        
+        ServerInfo serverInfo = plugin.getProxy().getServerInfo(server);
+        if(serverInfo == null || serverInfo.getPlayers().isEmpty())
+            return text;
+        
+        ProxiedPlayer carrier = PingEventHandler.getPAPIUtil().getPlayer(serverInfo.getPlayers());
+        if(carrier == null)
+            return text;
+        
+        return PingEventHandler.getPAPIUtil().parse(text, carrier.getUniqueId(), player.getUUID());
     }
     
     @Override

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/objects/BungeeServerPlaceholders.java

@@ -52,22 +52,33 @@ public class BungeeServerPlaceholders extends PlaceholderProvider{
         
         return switch(args[0]){
             case "playersOnline" -> {
-                if(args.length == 2){
-                    ServerInfo info = proxy.getServers().get(args[1]);
+                if(args.length >= 2){
+                    int players = 0;
                     
-                    yield String.valueOf(info.getPlayers().size());
+                    for(int i = 1; i < args.length; i++){
+                        ServerInfo info = proxy.getServers().get(args[i]);
+                        if(info == null)
+                            continue;
+                        
+                        players += info.getPlayers().size();
+                    }
+                    
+                    yield String.valueOf(players);
                 }
                 
                 yield String.valueOf(proxy.getPlayersOnline());
             }
             case "playersMax" -> {
                 // ServerInfo doesn't provide the max players that could join, so we won't allow an extra argument
-                if(args.length == 2)
+                if(args.length >= 2)
                     yield null;
                 
                 yield String.valueOf(proxy.getPlayersMax());
             }
             case "host" -> {
+                if(args.length > 2)
+                    yield null;
+                
                 if(args.length == 2){
                     ServerInfo info = proxy.getServers().get(args[1]);
                     

bungeecord/src/main/resources/bungee.yml

@@ -3,4 +3,7 @@ author: 'Andre_601'
 version: '${plugin.version}'
 description: '${plugin.description}'
 
+softDepends:
+  - PAPIProxyBridge
+
 main: 'ch.andre601.advancedserverlist.bungeecord.BungeeCordCore'

core/pom.xml

@@ -48,6 +48,10 @@
             <id>flexver-repo</id>
             <url>https://repo.sleeping.town/</url>
         </repository>
+        <repository>
+            <id>papiproxybridge-repo</id>
+            <url>https://repo.william278.net/releases/</url>
+        </repository>
     </repositories>
     
     <dependencies>
@@ -96,13 +100,19 @@
         <dependency>
             <groupId>com.unascribed</groupId>
             <artifactId>flexver-java</artifactId>
-            <version>1.1.0</version>
+            <version>1.1.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>32.0.1-jre</version>
+            <version>32.1.1-jre</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.william278</groupId>
+            <artifactId>papiproxybridge</artifactId>
+            <version>1.3</version>
             <scope>provided</scope>
         </dependency>
         
@@ -132,7 +142,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.5.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <filters>

core/src/main/java/ch/andre601/advancedserverlist/core/check/UpdateCheckThread.java

@@ -32,6 +32,8 @@ import java.util.concurrent.ThreadFactory;
 public class UpdateCheckThread implements ThreadFactory{
     @Override
     public Thread newThread(@NotNull Runnable r){
-        return new Thread(r, "AdvancedServerList Update-Thread");
+        Thread t = new Thread(r, "AdvancedServerList-UpdateThread");
+        t.setDaemon(true);
+        return t;
     }
 }

core/src/main/java/ch/andre601/advancedserverlist/core/check/UpdateChecker.java

@@ -52,7 +52,7 @@ public class UpdateChecker{
     private final String url = "https://api.modrinth.com/v2/project/advancedserverlist/version?loaders=[\"%s\"]";
     private final OkHttpClient client = new OkHttpClient();
     
-    private final AdvancedServerList core;
+    private final AdvancedServerList<?> core;
     private final PluginLogger logger;
     private final String loader;
     
@@ -65,7 +65,7 @@ public class UpdateChecker{
     
     private final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(new UpdateCheckThread());
     
-    public UpdateChecker(AdvancedServerList core){
+    public UpdateChecker(AdvancedServerList<?> core){
         this.core = core;
         this.logger = core.getPlugin().getPluginLogger();
         this.loader = core.getPlugin().getLoader();

core/src/main/java/ch/andre601/advancedserverlist/core/commands/CommandHandler.java

@@ -36,7 +36,7 @@ public class CommandHandler{
     
     private final List<PluginCommand> subCommands = new ArrayList<>();
     
-    public CommandHandler(AdvancedServerList core){
+    public CommandHandler(AdvancedServerList<?> core){
         subCommands.add(new Help());
         subCommands.add(new Reload(core));
         subCommands.add(new ClearCache(core));
@@ -78,7 +78,7 @@ public class CommandHandler{
             sender.sendMsg();
             sender.sendMsg("<aqua>/asl <white>help <grey>- Shows this help");
             sender.sendMsg();
-            sender.sendMsg("<aqua>/asl <white>reload <grey>- Reloads the plugin and clears caches");
+            sender.sendMsg("<aqua>/asl <white>reload <grey>- Reloads the config.yml and profiles");
             sender.sendMsg();
             sender.sendMsg("<aqua>/asl <white>clearCache <grey>- Clears the Player and Favicon cache");
         }
@@ -86,9 +86,9 @@ public class CommandHandler{
     
     private static class Reload extends PluginCommand{
         
-        private final AdvancedServerList core;
+        private final AdvancedServerList<?> core;
         
-        public Reload(AdvancedServerList core){
+        public Reload(AdvancedServerList<?> core){
             super("reload");
             
             this.core = core;
@@ -110,21 +110,15 @@ public class CommandHandler{
                 sender.sendErrorMsg("<red>Error while loading profile(s)!");
             }
             
-            core.clearFaviconCache();
-            sender.sendPrefixedMsg("<green>Successfully cleared Favicon Cache!");
-            
-            core.clearPlayerCache();
-            sender.sendPrefixedMsg("<green>Successfully cleared Player Cache!");
-            
             sender.sendPrefixedMsg("<green>Reload complete!");
         }
     }
     
     private static class ClearCache extends PluginCommand{
         
-        private final AdvancedServerList core;
+        private final AdvancedServerList<?> core;
         
-        public ClearCache(AdvancedServerList core){
+        public ClearCache(AdvancedServerList<?> core){
             super("clearCache");
             
             this.core = core;

core/src/main/java/ch/andre601/advancedserverlist/core/events/PingEventHandler.java

@@ -31,7 +31,7 @@ import ch.andre601.advancedserverlist.api.objects.GenericServer;
 import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import ch.andre601.advancedserverlist.core.interfaces.events.GenericEventWrapper;
-import ch.andre601.advancedserverlist.core.objects.GenericServerImpl;
+import ch.andre601.advancedserverlist.core.papi.PAPIUtil;
 import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
 import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
 import ch.andre601.advancedserverlist.core.profiles.profile.ProfileManager;
@@ -39,6 +39,8 @@ import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
 
 public class PingEventHandler{
     
+    private static PAPIUtil papiUtil = null;
+    
     public static <F, P extends GenericPlayer> void handleEvent(GenericEventWrapper<F, P> event){
         if(event.isInvalidProtocol())
             return;
@@ -124,4 +126,11 @@ public class PingEventHandler{
         
         event.updateEvent();
     }
+    
+    public static PAPIUtil getPAPIUtil(){
+        if(papiUtil != null)
+            return papiUtil;
+        
+        return (papiUtil = new PAPIUtil());
+    }
 }

core/src/main/java/ch/andre601/advancedserverlist/core/file/FileHandler.java

@@ -40,6 +40,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
@@ -70,7 +73,7 @@ public class FileHandler{
     
     public boolean loadConfig(){
         logger.info("Loading config.yml...");
-        File folder = config.toFile().getParentFile();
+        File folder = plugin.getPlugin().getFolderPath().toFile();
         if(!folder.exists() && !folder.mkdirs()){
             logger.warn("Couldn't create folder for plugin. Is it missing Write permissions?");
             return false;
@@ -121,6 +124,9 @@ public class FileHandler{
             .nodeStyle(NodeStyle.BLOCK)
             .build();
         
+        if(!makeBackup())
+            return false;
+        
         try{
             node = ConfigMigrator.updateNode(loader.load(), logger);
             loader.save(node);
@@ -188,4 +194,32 @@ public class FileHandler{
     public boolean isOldConfig(){
         return node.node("configVersion").virtual() || node.node("configVersion").getInt(0) < ConfigMigrator.LATEST;
     }
+    
+    private boolean makeBackup(){
+        logger.info("Making backup of old config.yml...");
+        
+        File backups = plugin.getPlugin().getFolderPath().resolve("backups").toFile();
+        if(!backups.exists() && !backups.mkdirs()){
+            logger.warn("Cannot create backups folder for migration!");
+            return false;
+        }
+        
+        String date = DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(LocalDateTime.now());
+        
+        File configBackup = new File(backups, "config_" + date.replace(":", "_") + ".yml");
+        try{
+            if(!configBackup.exists() && !configBackup.createNewFile()){
+                logger.warn("Cannot create backup file for config.yml!");
+                return false;
+            }
+            
+            Files.copy(config, configBackup.toPath(), StandardCopyOption.REPLACE_EXISTING);
+            logger.info("Saved backup as '" + configBackup.getName() + "'!");
+            
+            return true;
+        }catch(IOException ex){
+            logger.warn("Encountered IOException while trying to create a backup.", ex);
+            return false;
+        }
+    }
 }

core/src/main/java/ch/andre601/advancedserverlist/core/papi/PAPICache.java

@@ -0,0 +1,49 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2023 Andre_601
+ *
+ * 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:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * 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.
+ *
+ */
+
+package ch.andre601.advancedserverlist.core.papi;
+
+import java.util.function.Supplier;
+
+public class PAPICache{
+    
+    private CacheValue cache = null;
+    
+    public PAPICache(){}
+    
+    public String get(Supplier<String> supplier){
+        if(cache == null || cache.isExpired())
+            cache = new CacheValue(supplier.get(), System.currentTimeMillis());
+        
+        return cache.server();
+    }
+    
+    private record CacheValue(String server, long timestamp){
+        // Consider the cache expired if it is older than 5 seconds.
+        public boolean isExpired(){
+            return (timestamp < 0L) || System.currentTimeMillis() - timestamp >= 5000L;
+        }
+    }
+}

core/src/main/java/ch/andre601/advancedserverlist/core/papi/PAPIUtil.java

@@ -0,0 +1,87 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2023 Andre_601
+ *
+ * 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:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * 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.
+ *
+ */
+
+package ch.andre601.advancedserverlist.core.papi;
+
+import net.william278.papiproxybridge.api.PlaceholderAPI;
+
+import java.util.*;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+
+public class PAPIUtil{
+    
+    private final PlaceholderAPI papi;
+    
+    private final PAPICache cache = new PAPICache();
+    
+    public PAPIUtil(){
+        this.papi = PlaceholderAPI.createInstance();
+    }
+    
+    // Make sure the version of PAPIProxyBridge we get has the required methods we need...
+    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
+    public boolean isCompatible(){
+        try{
+            papi.getClass().getMethod("findServers");
+            return true;
+        }catch(NoSuchMethodException ex){
+            return false;
+        }
+    }
+    
+    public String getServer(){
+        return cache.get(() -> {
+            List<String> servers;
+            try{
+                servers = papi.findServers().getNow(Collections.emptyList());
+            }catch(CancellationException | CompletionException ex){
+                return null;
+            }
+            
+            if(servers == null || servers.isEmpty())
+                return null;
+            
+            return servers.get(0);
+        });
+    }
+    
+    public <P> P getPlayer(Collection<P> players){
+        if(players.isEmpty())
+            return null;
+        
+        return List.copyOf(players).get(0);
+    }
+    
+    public String parse(String text, UUID carrier, UUID player){
+        try{
+            CompletableFuture<String> future = papi.formatPlaceholders(text, carrier, player);
+            return future.getNow(text);
+        }catch(IllegalArgumentException | CancellationException | CompletionException ex){
+            return text;
+        }
+    }
+}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/favicon/FaviconHandler.java

@@ -39,32 +39,27 @@ import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.Locale;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 import java.util.function.Function;
 
 public class FaviconHandler<F>{
     
-    private final Cache<String, F> favicons = CacheBuilder.newBuilder()
+    private final Cache<String, CompletableFuture<F>> favicons = CacheBuilder.newBuilder()
         .expireAfterWrite(5, TimeUnit.MINUTES)
         .build();
     
-    private final AdvancedServerList core;
+    private final AdvancedServerList<F> core;
+    private final ThreadPoolExecutor faviconThreadPool;
     
-    public FaviconHandler(AdvancedServerList core){
+    public FaviconHandler(AdvancedServerList<F> core){
         this.core = core;
+        this.faviconThreadPool = createFaviconThreadPool();
     }
     
     public F getFavicon(String input, Function<BufferedImage, F> function){
         try{
-            return favicons.get(input, () -> {
-                BufferedImage image = resolveImage(core, input);
-                if(image == null)
-                    return null;
-                
-                return function.apply(image);
-            });
-        }catch(ExecutionException ignored){
+            return favicons.get(input, () -> convert(input, function)).getNow(null);
+        }catch(ExecutionException e){
             return null;
         }
     }
@@ -73,7 +68,17 @@ public class FaviconHandler<F>{
         favicons.invalidateAll();
     }
     
-    private BufferedImage resolveImage(AdvancedServerList core, String input){
+    private CompletableFuture<F> convert(String input, Function<BufferedImage, F> function){
+        return CompletableFuture.supplyAsync(() -> {
+            BufferedImage img = resolveImage(core, input);
+            if(img == null)
+                return null;
+            
+            return function.apply(img);
+        }, faviconThreadPool);
+    }
+    
+    private BufferedImage resolveImage(AdvancedServerList<F> core, String input){
         InputStream stream;
         
         if(input.toLowerCase(Locale.ROOT).startsWith("https://")){
@@ -126,7 +131,7 @@ public class FaviconHandler<F>{
         }
     }
     
-    private InputStream getFromUrl(AdvancedServerList core, String url){
+    private InputStream getFromUrl(AdvancedServerList<F> core, String url){
         try{
             URL faviconUrl = new URL(url);
             URLConnection connection = faviconUrl.openConnection();
@@ -140,4 +145,12 @@ public class FaviconHandler<F>{
             return null;
         }
     }
+    
+    private ThreadPoolExecutor createFaviconThreadPool(){
+        return new ThreadPoolExecutor(3, 3, 60L, TimeUnit.SECONDS, new LinkedBlockingDeque<>(1024), r -> {
+            Thread t = new Thread(r, "AdvancedServerList-FaviconThread");
+            t.setDaemon(true);
+            return t;
+        });
+    }
 }

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/players/PlayerHandler.java

@@ -31,23 +31,20 @@ import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
 import com.google.gson.Gson;
 import io.leangen.geantyref.TypeToken;
 
+import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.IOException;
-import java.io.Reader;
 import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 public class PlayerHandler{
     
     private final AdvancedServerList<?> core;
     private final PluginLogger logger;
     private final Path cache;
-    private List<CachedPlayer> cachedPlayers = new ArrayList<>();
     
     private final Type listType = new TypeToken<ArrayList<CachedPlayer>>(){}.getType();
     private final Gson gson = new Gson();
@@ -55,6 +52,7 @@ public class PlayerHandler{
     // UUID of MHF_Question
     private final UUID defaultUUID = UUID.fromString("606e2ff0-ed77-4842-9d6c-e1d3321c7838");
     
+    private List<CachedPlayer> cachedPlayers = new ArrayList<>();
     private CachedPlayer defaultPlayer = null;
     
     public PlayerHandler(AdvancedServerList<?> core){
@@ -75,7 +73,7 @@ public class PlayerHandler{
         }
     
         try{
-            Reader reader = Files.newBufferedReader(cache);
+            BufferedReader reader = Files.newBufferedReader(cache);
             
             cachedPlayers = gson.fromJson(reader, listType);
             
@@ -85,6 +83,14 @@ public class PlayerHandler{
             return;
         }
         
+        // In case Gson messes up... I guess.
+        if(cachedPlayers == null){
+            logger.warn("Couldn't load players from playercache.json file. Is the JSON valid?");
+            // Create new ArrayList instance to avoid further issues.
+            cachedPlayers = new ArrayList<>();
+            return;
+        }
+        
         logger.info("Loaded %d players into cache!", cachedPlayers.size());
     }
     

core/src/main/resources/config.yml

@@ -37,4 +37,4 @@ checkUpdates: true
 # This is used internally to determine if the config needs to be migrated.
 # Changing or even removing this option could result in your config being broken.
 #
-config-version: 2
+config-version: 2

docs/api/changelog.md

@@ -13,9 +13,9 @@ They are ordered newest to oldest.
 ### :octicons-plus-circle-24:{ .changelog-added title="Added" } Added { #v3-added }
 
 - New platform-specific `GenericServer` instances with their own methods to use.
-  - `BukkitServer` - Contains a `getWorlds()` method that returns a `Map<String, World>` of all loaded worlds in the server.
-  - `BungeeProxy` - Contains a `getServers()` method that returns a `Map<String, ServerInfo>` of all known Servers for BungeeCord.
-  - `VelocityProxy` - Contains a `getServers()` method that returns a `Map<String, RegisteredServer>` of all known Servers for Velocity.
+    - `BukkitServer` - Contains a `getWorlds()` method that returns a `Map<String, World>` of all loaded worlds in the server.
+    - `BungeeProxy` - Contains a `getServers()` method that returns a `Map<String, ServerInfo>` of all known Servers for BungeeCord.
+    - `VelocityProxy` - Contains a `getServers()` method that returns a `Map<String, RegisteredServer>` of all known Servers for Velocity.
 
 ### :octicons-trash-24:{ .changelog-removed title="Removed" } Removed { #v-removed }
 
@@ -75,4 +75,4 @@ Templates for changelog
 ### :octicons-pencil-24:{ .changelog-changed title="Changed" } Changed { #v-changed }
 ### :octicons-trash-24:{ .changelog-removed title="Removed" } Removed { #v-removed }
 
--->
+-->

docs/api/index.md

@@ -20,8 +20,8 @@ Add the following to your `build.gradle` or `pom.xml` file to use the API:
         implementation 'ch.andre601.asl-api:api:{version}'
         
         // Optional platform dependencies
+        implementation 'ch.andre601.asl-api:platform-bukkit:{version}'
         implementation 'ch.andre601.asl-api:platform-bungeecord:{version}'
-        implementation 'ch.andre601.asl-api:platform-spigot:{version}'
         implementation 'ch.andre601.asl-api:platform-velocity:{version}'
     }
     ```
@@ -48,12 +48,12 @@ Add the following to your `build.gradle` or `pom.xml` file to use the API:
       <!-- Optional platform dependencies -->
       <dependency>
         <groupId>ch.andre601.asl-api</groupId>
-        <artifactId>platform-bungeecord</artifactId>
+        <artifactId>platform-bukkit</artifactId>
         <version>{version}</version>
       </dependency>
       <dependency>
         <groupId>ch.andre601.asl-api</groupId>
-        <artifactId>platform-spigot</artifactId>
+        <artifactId>platform-bungeecord</artifactId>
         <version>{version}</version>
       </dependency>
       <dependency>

docs/examples.md

@@ -9,14 +9,14 @@ Feel free to suggest additional examples on my [Discord Server](https://discord.
 ## Table of Contents
 
 - [Versions](#versions)
-  - [Different List for outdated Clients](#different-list-for-outdated-clients)
-  - [Different MOTD for < 1.16](#different-motd-for-116)
+    - [Different List for outdated Clients](#different-list-for-outdated-clients)
+    - [Different MOTD for < 1.16](#different-motd-for-116)
 - [Spigot/PaperMC](#spigotpapermc)
-  - [Different profile for banned Player](#different-profile-for-banned-player)
+    - [Different profile for banned Player](#different-profile-for-banned-player)
 - [Other](#other)
-  - [Different profile for different host](#different-profile-for-different-host)
-  - [Different profile for known player](#different-profile-for-known-player)
-  - [Random MOTD but same hover](#random-motd-but-same-hover)
+    - [Different profile for different host](#different-profile-for-different-host)
+    - [Different profile for known player](#different-profile-for-known-player)
+    - [Random MOTD but same hover](#random-motd-but-same-hover)
 
 ----
 ## Versions
@@ -147,4 +147,4 @@ playerCount:
     - 'This player count hover always'
     - 'stays the same, no matter what'
     - 'MOTD is being used here.'
-```
+```

docs/profiles/index.md

@@ -52,9 +52,10 @@ The following operants are available and can be used in the conditions.
 
 ## Profiles
 
-The profiles option allows you to add multiple combinations of all the other options (Except for [`Priority`](#priority) and [`Conditions`](#conditions)) to have randomized MOTDs, player counts, etc.
+!!! warning "Priority and Conditions are NOT supported!"
 
-If an option is not present in an entry will AdvancedServerList try to use one defined in the file or use whatever default value would be for that option.
+The `profiles` option allows you to set multiple MOTDs, player counts, etc. which the plugin would randomly choose from.  
+If an option such as motd is not present in an entry will it check the file for the option and use that if present.
 
 ??? example "Example"
     ```yaml title="YAML file"
@@ -250,4 +251,4 @@ As an example, setting this to `1` while `10` players are online will display `1
 
     ![hover-example](../assets/images/examples/extraplayers-example.jpg)
 
-    </div>
+    </div>

docs/profiles/placeholders.md

@@ -21,7 +21,9 @@ These placeholders use the player who pinged the server, to return values. They
 | `${player isBanned}`        | Boolean for whether the player has been banned from the server. | Spigot/Paper | Yes                         |
 | `${player isWhitelisted}`   | Boolean for whether the player is whitelisted on the server.    | Spigot/Paper | Yes                         |
 
-[^1]: Whether this placeholder requires the player to have joined before while AdvancedServerList was running. When `disableCache` is enabled will these placeholders not work.
+[^1]:
+    Whether this placeholder requires the player to have joined before while AdvancedServerList was running.  
+    When `disableCache` is enabled will these placeholders not work.
 [^2]: Will default to whatever name has been provided in the `unknownPlayer -> name` option of the config.yml, when the player isn't cached yet.
 [^3]: Will default to whatever name has been provided in the `unknownPlayer -> uuid` option of the config.yml, when the player isn't cached yet.
 
@@ -29,19 +31,22 @@ These placeholders use the player who pinged the server, to return values. They
 
 These placeholders use values given by the server/proxy AdvancedServerList runs on.
 
-| Placeholder               | Description                                                |
-|---------------------------|------------------------------------------------------------|
-| `${server playersOnline}` | The number of players online on this proxy/server.[^4]     |
-| `${server playersMax}`    | The total number of players that can join this server.[^5] |
-| `${server host}`          | The domain/IP the player pinged.[^6]                       |
+| Placeholder                  | Description                                                             |
+|------------------------------|-------------------------------------------------------------------------|
+| `${server playersOnline}`    | The number of players online on this proxy/server.[^4]                  |
+| `${server playersMax}`       | The total number of players that can join this server.[^5]              |
+| `${server host}`             | The domain/IP the player pinged.[^6]                                    |
+| `${server whitelistEnabled}` | Whether the whitelist is enabled or not. Only available on Spigot/Paper |
 
 [^4]:
-    An optional World (For Spigot/Paper) or Server (For BungeeCord/Velocity) can be provided to display the number of players online on said world/server.  
-    Full format is `${server playersOnline [world/server]}` (Replace `[world/server]` with a valid world or server name).
-[^5]: This placeholder is affected by the [`Amount` option](../#amount) in a server list profile, with the exception being when used in [`Conditions`](../#conditions).
+    An space-separated list of worlds (Spigot/Paper) or Servers (BungeeCord/Velocity) can be provided to display the number of players in these worlds/servers.  
+    Example: `${server playersOnline lobby1 lobby2}` will display the numbers of players online on the servers `lobby1` and `lobby2`.
+[^5]:
+    When the [`amount` option](../#amount) is used will this placeholder display the modified max players count.  
+    The only exception is [`conditions`](../#conditions) where it uses the actual max players of the server/proxy.
 [^6]:
     An optional server name can be provided to display the IP/Domain associated with that server. Only works on BungeeCord/Velocity.
-    Full format is `${server host [server]}` (Replace `[server]` with a valid server name).
+    Example: `${server host survival}` would display the IP/Domain associated with the `survival` server.
 
 ## PlaceholderAPI
 
@@ -55,4 +60,4 @@ Depending on the placeholder used is a cached player required (i.e. `%player_nam
 Since version 2 of AdvancedServerList are developers able to provide their own placeholders to be used in a server list profile.  
 The format follows the same one as the [built-in placeholders](#built-in-placeholders), meaning it is `${<identifier> <placeholder>}`.
 
-If you're a developer and want to integrate your own placeholders into AdvancedServerList, read about it [here](../../api).
+If you're a developer and want to integrate your own placeholders into AdvancedServerList, read about it [here](../../api).

hangar-uploader/src/main/java/ch/andre601/advancedserverlist/hangaruploader/HangarUploader.java

@@ -77,9 +77,10 @@ public class HangarUploader{
         boolean isPreRelease = args[2].equalsIgnoreCase("true");
         String body = System.getenv("GITHUB_RELEASE_BODY");
         
-        LOGGER.info("Version: {}", version);
-        LOGGER.info("Is Prerelease: {}", isPreRelease);
-        LOGGER.info("Release Message: {}", body);
+        LOGGER.info("Version:         {}", version);
+        LOGGER.info("Is Prerelease:   {}", isPreRelease);
+        LOGGER.info("Release Message:");
+        LOGGER.info(body);
         
         final List<Path> filePaths = List.of(
             new File("bukkit/target/AdvancedServerList-Bukkit-" + version + ".jar").toPath(),
@@ -98,6 +99,21 @@ public class HangarUploader{
                 "https://www.spigotmc.org/resources/6245/"
             )
         );
+        final List<VersionUpload.PluginDependency> bungeeDependencies = List.of(
+            VersionUpload.PluginDependency.createWithHangarNamespace(
+                "PAPIProxyBridge",
+                false,
+                new VersionUpload.Namespace("William278", "PAPIProxyBridge")
+            )
+        );
+        final List<VersionUpload.PluginDependency> velocityDependencies = List.of(
+            VersionUpload.PluginDependency.createWithHangarNamespace(
+                "PAPIProxyBridge",
+                false,
+                new VersionUpload.Namespace("William278", "PAPIProxyBridge")
+            )
+        );
+        
         final List<VersionUpload.MultipartFileOrUrl> fileInfo = List.of(
             new VersionUpload.MultipartFileOrUrl(List.of(VersionUpload.Platform.PAPER), null),
             new VersionUpload.MultipartFileOrUrl(List.of(VersionUpload.Platform.WATERFALL), null),
@@ -108,13 +124,13 @@ public class HangarUploader{
             version,
             Map.of(
                 VersionUpload.Platform.PAPER, paperDependencies,
-                VersionUpload.Platform.WATERFALL, List.of(),
-                VersionUpload.Platform.VELOCITY, List.of()
+                VersionUpload.Platform.WATERFALL, bungeeDependencies,
+                VersionUpload.Platform.VELOCITY, velocityDependencies
             ),
             Map.of(
-                VersionUpload.Platform.PAPER, List.of("1.19.x"),
-                VersionUpload.Platform.WATERFALL, List.of("1.19.x"),
-                VersionUpload.Platform.VELOCITY, List.of("3.1")
+                VersionUpload.Platform.PAPER, List.of("1.19.x", "1.20.x"),
+                VersionUpload.Platform.WATERFALL, List.of("1.19.x", "1.20.x"),
+                VersionUpload.Platform.VELOCITY, List.of("3.2")
             ),
             body,
             fileInfo,

pom.xml

@@ -38,7 +38,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.build.commit/>
         
-        <plugin.version>3.1.0</plugin.version>
+        <plugin.version>3.3.0</plugin.version>
         <plugin.description>Create multiple Server lists based on conditions.</plugin.description>
         
         <api.version>v3.0.0</api.version>

requirements.txt

@@ -1,2 +1,2 @@
-mkdocs-material==9.1.15
+mkdocs-material==9.1.21
 mkdocs-glightbox==0.3.4

velocity/pom.xml

@@ -106,7 +106,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.5.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <relocations>

velocity/src/main/java/ch/andre601/advancedserverlist/velocity/listeners/VelocityEventWrapper.java

@@ -28,6 +28,7 @@ package ch.andre601.advancedserverlist.velocity.listeners;
 import ch.andre601.advancedserverlist.api.events.GenericServerListEvent;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
 import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
+import ch.andre601.advancedserverlist.core.events.PingEventHandler;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import ch.andre601.advancedserverlist.core.interfaces.events.GenericEventWrapper;
 import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
@@ -37,6 +38,7 @@ import ch.andre601.advancedserverlist.velocity.VelocityCore;
 import ch.andre601.advancedserverlist.velocity.objects.VelocityPlayerImpl;
 import ch.andre601.advancedserverlist.velocity.objects.VelocityProxyImpl;
 import com.velocitypowered.api.event.proxy.ProxyPingEvent;
+import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import com.velocitypowered.api.proxy.server.ServerPing;
 import com.velocitypowered.api.util.Favicon;
@@ -152,7 +154,25 @@ public class VelocityEventWrapper implements GenericEventWrapper<Favicon, Veloci
     
     @Override
     public String parsePAPIPlaceholders(String text, VelocityPlayerImpl player){
-        return text;
+        if(!plugin.getProxy().getPluginManager().isLoaded("papiproxybridge"))
+            return text;
+        
+        if(!PingEventHandler.getPAPIUtil().isCompatible())
+            return text;
+        
+        String server = PingEventHandler.getPAPIUtil().getServer();
+        if(server == null || server.isEmpty())
+            return text;
+        
+        RegisteredServer registeredServer = plugin.getProxy().getServer(server).orElse(null);
+        if(registeredServer == null || registeredServer.getPlayersConnected().isEmpty())
+            return text;
+        
+        Player carrier = PingEventHandler.getPAPIUtil().getPlayer(registeredServer.getPlayersConnected());
+        if(carrier == null)
+            return text;
+        
+        return PingEventHandler.getPAPIUtil().parse(text, carrier.getUniqueId(), player.getUUID());
     }
     
     @Override

velocity/src/main/java/ch/andre601/advancedserverlist/velocity/objects/VelocityServerPlaceholders.java

@@ -50,24 +50,32 @@ public class VelocityServerPlaceholders extends PlaceholderProvider{
         
         return switch(args[0]){
             case "playersOnline" -> {
-                if(args.length == 2){
-                    RegisteredServer info = proxy.getServers().get(args[1]);
-                    if(info == null)
-                        yield null;
+                if(args.length >= 2){
+                    int players = 0;
                     
-                    yield String.valueOf(info.getPlayersConnected().size());
+                    for(int i = 1; i < args.length; i++){
+                        RegisteredServer registeredServer = proxy.getServers().get(args[i]);
+                        if(registeredServer == null)
+                            continue;
+                        
+                        players += registeredServer.getPlayersConnected().size();
+                    }
+                    
+                    yield String.valueOf(players);
                 }
                 
                 yield String.valueOf(proxy.getPlayersOnline());
             }
             case "playersMax" -> {
-                if(args.length == 2){
+                if(args.length >= 2)
                     yield null;
-                }
                 
                 yield String.valueOf(proxy.getPlayersMax());
             }
             case "host" -> {
+                if(args.length > 2)
+                    yield null;
+                
                 if(args.length == 2){
                     RegisteredServer info = proxy.getServers().get(args[1]);
                     if(info == null)

velocity/src/main/resources/velocity-plugin.json

@@ -6,5 +6,11 @@
   "authors": [
     "Andre_601"
   ],
+  "dependencies": [
+    {
+      "id": "papiproxybridge",
+      "optional": true
+    }
+  ],
   "main": "ch.andre601.advancedserverlist.velocity.VelocityCore"
 }