Add dependencies

PAPIProxyBridge support

.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 }}

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>

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/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,7 +100,7 @@
         <dependency>
             <groupId>com.unascribed</groupId>
             <artifactId>flexver-java</artifactId>
-            <version>1.1.0</version>
+            <version>1.1.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -105,6 +109,12 @@
             <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>
         
         <!-- Test dependencies -->
         <dependency>

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));
@@ -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;
@@ -122,9 +122,9 @@ public class CommandHandler{
     
     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/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/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.'
-```
+```

pom.xml

@@ -38,7 +38,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.build.commit/>
         
-        <plugin.version>3.2.1</plugin.version>
+        <plugin.version>3.3.0-b1</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.18
+mkdocs-material==9.1.21
 mkdocs-glightbox==0.3.4

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/resources/velocity-plugin.json

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