Merge pull request #16 from Andre601/feature/improve-fakeplayers-creation

Improve handling of fake players

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+patreon: andre_601
+ko_fi: andre_601

.github/workflows/release.yml

@@ -1,23 +1,99 @@
-name: Build Jars
+#
+# Big thank you to @Kir-Antipov for providing this workflow file.
+# Check out his mc-publish action here: https://github.com/Kir-Antipov/mc-publish
+#
+
+name: Publish Assets
 
 on:
   release:
     types: [published]
 
 jobs:
-  build:
+  buildJars:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 1.11
+    - name: Set up JDK 1.16
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
         java-version: '16'
-    - name: Build jar
+        cache: 'maven'
+    - name: Build Jar files
       run: mvn clean install
-    - name: Upload jar
-      uses: AButler/upload-release-assets@v2.0
+    - name: Save BungeeCord Jar file
+      uses: actions/upload-artifact@v3
       with:
-        files: 'bungeecord/target/AdvancedServerList-*.jar;paper/target/AdvancedServerList-*.jar;spigot/target/AdvancedServerList-*.jar;velocity/target/AdvancedServerList-*.jar'
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        name: asl-bungeecord
+        path: bungeecord/target/AdvancedServerList-*.jar
+        if-no-files-found: error
+        retention-days: 1
+    - name: Save Paper Jar file
+      uses: actions/upload-artifact@v3
+      with:
+        name: asl-paper
+        path: paper/target/AdvancedServerList-*.jar
+        if-no-files-found: error
+        retention-days: 1
+    - name: Save Spigot Jar file
+      uses: actions/upload-artifact@v3
+      with:
+        name: asl-spigot
+        path: spigot/target/AdvancedServerList-*.jar
+        if-no-files-found: error
+        retention-days: 1
+    - name: Save Velocity Jar file
+      uses: actions/upload-artifact@v3
+      with:
+        name: asl-velocity
+        path: velocity/target/AdvancedServerList-*.jar
+        if-no-files-found: error
+        retention-days: 1
+  publish:
+    needs: [buildJars]
+    strategy:
+      matrix:
+        include:
+          - directory: bungeecord
+            loaders: |
+              bungeecord
+              waterfall
+          - directory: paper
+            loaders: paper
+          - directory: spigot
+            loaders: spigot
+          - directory: velocity
+            loaders: velocity
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Get Jar files
+      uses: actions/download-artifact@v3
+      with:
+        name: asl-${{ matrix.directory }}
+        path: ${{ matrix.directory }}/target
+    - name: Get Version
+      id: github-release
+      run: |
+        version=$(echo ${{ github.event.release.tag_name }} | cut -d'v' -f2)
+        echo "::set-output name=version::$version"
+    - name: Upload AdvancedServerList (${{ matrix.loaders }}) to GitHub and Modrinth
+      uses: Kir-Antipov/mc-publish@v3.2
+      with:
+        name: ${{ github.event.release.name }}
+        version: ${{ steps.github-release.outputs.version }}
+        version-type: release
+        files: ${{ matrix.directory}}/target/AdvancedServerList-*.jar
+        files-secondary: ""
+        loaders: ${{ matrix.loaders }}
+        version-resolver: releases
+        game-versions: |
+          1.19
+          1.19.1
+          1.19.2
+        java: 16
+        modrinth-id: xss83sOY
+        modrinth-featured: false
+        modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+        github-token: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -35,21 +35,26 @@ AdvancedServerList can be downloaded from the following places:
 
 [![dl-modrinth]][modrinth] [![dl-spigot]][spigot] [![dl-hangar]][hangar]
 
+## Dependencies
+
+| Dependency       | Platforms     | Required? |
+| ---------------- | ------------- | --------- |
+| [ProtocolLib]    | Spigot        | Yes       |
+| [PlaceholderAPI] | Spigot, Paper | No        |
+
 ## Statistics
 
 This plugin sends statistics to [bStats] to display.  
-You can disable this in the `config.yml` by setting `send_statistics` to `false`.
+You can disable this in the global bStats config file located in `/plugins/bstats/`
 
 - [BungeeCord][bstats-bungee]
 - [Paper/Spigot][bstats-spigot]
 - [Velocity][bstats-velocity]
 
 ## Screenshots
-Here are screenshots showing the plugin in action. Do you have your own screenshots that you would like to share? Let me know and I may add them here with proper credit.
 
-![showcase]
-
-![features]
+Please see the [Gallery Tab][gallery] for some previews.  
+If you have any own screenshots, feel free to share them with me. I may add them to the Gallery if they are good.
 
 <!-- Links -->
 [profiles]: https://github.com/Andre601/AdvancedServerList/wiki/Profiles
@@ -59,18 +64,19 @@ Here are screenshots showing the plugin in action. Do you have your own screensh
 
 [placeholderapi]: https://www.spigotmc.org/resources/6245/
 
-[modrinth]: https://modrinth.com/mod/advancedserverlist
+[modrinth]: https://modrinth.com/plugin/advancedserverlist
 [spigot]: https://www.spigotmc.org/resources/102910/
 [hangar]: https://hangar.benndorf.dev/Andre_601/AdvancedServerList
 
+[protocollib]: https://www.spigotmc.org/resources/1997/
+[placeholderapi]: https://www.spigotmc.org/resources/6245/
+
 [bstats]: https://bstats.org
 [bstats-bungee]: https://bstats.org/plugin/bungeecord/AdvancedServerList/15585
 [bstats-spigot]: https://bstats.org/plugin/bukkit/AdvancedServerList/15584
 [bstats-velocity]: https://bstats.org/plugin/velocity/AdvancedServerList/15587
 
-<!-- images -->
-[showcase]: https://cdn.discordapp.com/attachments/417019799365746690/990379003250626580/unknown.png
-[features]: https://cdn.discordapp.com/attachments/990389158944055366/1004042735973568522/2022-08-02_17.03.40.jpg
+[gallery]: https://modrinth.com/mod/advancedserverlist/gallery
 
 <!-- Badges -->
 [platform]: https://img.shields.io/badge/Platforms-Spigot%20%7C%20Paper%20%7C%20BungeeCord%20%7C%20Velocity-blue?style=for-the-badge&logo=data:image/svg%2bxml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0IiBmaWxsPSJ3aGl0ZSI+PHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBkPSJNMTEuMDYzIDEuNDU2YTEuNzUgMS43NSAwIDAxMS44NzQgMGw4LjM4MyA1LjMxNmExLjc1IDEuNzUgMCAwMTAgMi45NTZsLTguMzgzIDUuMzE2YTEuNzUgMS43NSAwIDAxLTEuODc0IDBMMi42OCA5LjcyOGExLjc1IDEuNzUgMCAwMTAtMi45NTZsOC4zODMtNS4zMTZ6bTEuMDcxIDEuMjY3YS4yNS4yNSAwIDAwLS4yNjggMEwzLjQ4MyA4LjAzOWEuMjUuMjUgMCAwMDAgLjQyMmw4LjM4MyA1LjMxNmEuMjUuMjUgMCAwMC4yNjggMGw4LjM4My01LjMxNmEuMjUuMjUgMCAwMDAtLjQyMmwtOC4zODMtNS4zMTZ6Ij48L3BhdGg+PHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBkPSJNMS44NjcgMTIuMzI0YS43NS43NSAwIDAxMS4wMzUtLjIzMmw4Ljk2NCA1LjY4NWEuMjUuMjUgMCAwMC4yNjggMGw4Ljk2NC01LjY4NWEuNzUuNzUgMCAwMS44MDQgMS4yNjdsLTguOTY1IDUuNjg1YTEuNzUgMS43NSAwIDAxLTEuODc0IDBsLTguOTY1LTUuNjg1YS43NS43NSAwIDAxLS4yMzEtMS4wMzV6Ij48L3BhdGg+PHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBkPSJNMS44NjcgMTYuMzI0YS43NS43NSAwIDAxMS4wMzUtLjIzMmw4Ljk2NCA1LjY4NWEuMjUuMjUgMCAwMC4yNjggMGw4Ljk2NC01LjY4NWEuNzUuNzUgMCAwMS44MDQgMS4yNjdsLTguOTY1IDUuNjg1YTEuNzUgMS43NSAwIDAxLTEuODc0IDBsLTguOTY1LTUuNjg1YS43NS43NSAwIDAxLS4yMzEtMS4wMzV6Ij48L3BhdGg+PC9zdmc+

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/BungeeCordCore.java

@@ -30,26 +30,31 @@ import ch.andre601.advancedserverlist.bungeecord.events.JoinEvent;
 import ch.andre601.advancedserverlist.bungeecord.events.PingEvent;
 import ch.andre601.advancedserverlist.bungeecord.logging.BungeeLogger;
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
-import ch.andre601.advancedserverlist.core.interfaces.PluginCore;
+import ch.andre601.advancedserverlist.core.interfaces.core.ProxyCore;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
+import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
 import ch.andre601.advancedserverlist.core.profiles.favicon.FaviconHandler;
+import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.Placeholders;
 import net.md_5.bungee.api.Favicon;
+import net.md_5.bungee.api.ServerPing;
 import net.md_5.bungee.api.plugin.Plugin;
 import org.bstats.bungeecord.Metrics;
 import org.bstats.charts.SimplePie;
 
 import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
 
-public class BungeeCordCore extends Plugin implements PluginCore{
+public class BungeeCordCore extends Plugin implements ProxyCore<Favicon, ServerPing.PlayerInfo>{
     
     private AdvancedServerList core;
-    private FaviconHandler<Favicon> faviconHandler;
+    private FaviconHandler<Favicon> faviconHandler = null;
     private final PluginLogger logger = new BungeeLogger(getLogger());
     
     @Override
     public void onEnable(){
         this.core = new AdvancedServerList(this);
-        this.faviconHandler = new FaviconHandler<>(core);
     }
     
     @Override
@@ -87,7 +92,7 @@ public class BungeeCordCore extends Plugin implements PluginCore{
     }
     
     @Override
-    public Path getPath(){
+    public Path getFolderPath(){
         return getDataFolder().toPath();
     }
     
@@ -96,6 +101,14 @@ public class BungeeCordCore extends Plugin implements PluginCore{
         return logger;
     }
     
+    @Override
+    public FaviconHandler<Favicon> getFaviconHandler(){
+        if(faviconHandler == null)
+            faviconHandler = new FaviconHandler<>(core);
+        
+        return faviconHandler;
+    }
+    
     @Override
     public String getPlatformName(){
         return getProxy().getName();
@@ -106,7 +119,19 @@ public class BungeeCordCore extends Plugin implements PluginCore{
         return getProxy().getVersion();
     }
     
-    public FaviconHandler<Favicon> getFaviconHandler(){
-        return faviconHandler;
+    @Override
+    public List<ServerPing.PlayerInfo> createPlayers(List<String> lines, Placeholders... placeholders){
+        List<ServerPing.PlayerInfo> players = new ArrayList<>(lines.size());
+        
+        for(String line : lines){
+            String parsed = ComponentParser.text(line)
+                .replacements(placeholders[0])
+                .replacements(placeholders[1])
+                .toString();
+            
+            players.add(new ServerPing.PlayerInfo(parsed, UUID.randomUUID()));
+        }
+        
+        return players;
     }
 }

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/events/PingEvent.java

@@ -27,7 +27,6 @@ package ch.andre601.advancedserverlist.bungeecord.events;
 
 import ch.andre601.advancedserverlist.bungeecord.BungeeCordCore;
 import ch.andre601.advancedserverlist.bungeecord.BungeePlayer;
-import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
 import ch.andre601.advancedserverlist.core.profiles.ProfileManager;
 import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
@@ -80,8 +79,8 @@ public class PingEvent implements Listener{
         if(profile == null)
             return;
         
-        if(profile.getXMore() >= 0){
-            max = online + profile.getXMore();
+        if(profile.isExtraPlayersEnabled()){
+            max = online + profile.getExtraPlayers();
             ping.getPlayers().setMax(max);
         }
         
@@ -100,15 +99,9 @@ public class PingEvent implements Listener{
         
         if(profile.shouldHidePlayers()){
             ping.setPlayers(null);
-            
-            ping.setFavicon(ping.getFaviconObject());
-            ping.setVersion(protocol);
-            
-            event.setResponse(ping);
-            return;
         }
         
-        if(!profile.getPlayerCount().isEmpty()){
+        if(!profile.getPlayerCount().isEmpty() && !profile.shouldHidePlayers()){
             protocol.setName(ComponentParser.text(profile.getPlayerCount())
                 .replacements(playerPlaceholders)
                 .replacements(serverPlaceholders)
@@ -117,13 +110,8 @@ public class PingEvent implements Listener{
             protocol.setProtocol(-1);
         }
         
-        if(!profile.getPlayers().isEmpty()){
-            String players = ComponentParser.list(profile.getPlayers())
-                .replacements(playerPlaceholders)
-                .replacements(serverPlaceholders)
-                .toString();
-            
-            ServerPing.PlayerInfo[] playerInfos = AdvancedServerList.getPlayers(ServerPing.PlayerInfo.class, players)
+        if(!profile.getPlayers().isEmpty() && !profile.shouldHidePlayers()){
+            ServerPing.PlayerInfo[] playerInfos = plugin.createPlayers(profile.getPlayers(), playerPlaceholders, serverPlaceholders)
                 .toArray(new ServerPing.PlayerInfo[0]);
             
             if(playerInfos.length > 0)
@@ -137,6 +125,7 @@ public class PingEvent implements Listener{
                 try{
                     return Favicon.create(image);
                 }catch(Exception ex){
+                    plugin.getPluginLogger().warn("Unable to create Favicon. %s", ex.getMessage());
                     return null;
                 }
             });

core/src/main/java/ch/andre601/advancedserverlist/core/AdvancedServerList.java

@@ -27,27 +27,24 @@ package ch.andre601.advancedserverlist.core;
 
 import ch.andre601.advancedserverlist.core.commands.CommandHandler;
 import ch.andre601.advancedserverlist.core.file.FileHandler;
-import ch.andre601.advancedserverlist.core.interfaces.PluginCore;
-import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
+import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import ch.andre601.advancedserverlist.core.profiles.players.PlayerHandler;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.nio.file.Path;
 import java.util.*;
 
 public class AdvancedServerList{
     
-    private final PluginCore plugin;
+    private final PluginCore<?> plugin;
     private final FileHandler fileHandler;
     private final CommandHandler commandHandler;
     private final PlayerHandler playerHandler;
     
     private String version;
     
-    public AdvancedServerList(PluginCore plugin){
+    public AdvancedServerList(PluginCore<?> plugin){
         this.plugin = plugin;
         this.fileHandler = new FileHandler(this);
         this.commandHandler = new CommandHandler(this);
@@ -56,41 +53,8 @@ public class AdvancedServerList{
         load();
     }
     
-    public static <T> List<T> getPlayers(Class<T> clazz, String text){
-        try{
-            String[] lines = text.split("\n");
-            
-            final List<T> players = new ArrayList<>(lines.length);
-            final Constructor<T> constructor = clazz.getDeclaredConstructor(String.class, UUID.class);
-            
-            constructor.setAccessible(true);
-            
-            for(String line : lines){
-                players.add(constructor.newInstance(line, UUID.randomUUID()));
-            }
-            
-            return players;
-        }catch(NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException ex){
-            return Collections.emptyList();
-        }
-    }
-    
-    public void disable(){
-        getPluginLogger().info("Saving cache.data file...");
-        getPlayerHandler().save();
-        getPluginLogger().info("AdvancedServerList disabled!");
-    }
-    
-    public void clearFaviconCache(){
-        plugin.clearFaviconCache();
-    }
-    
-    public PluginLogger getPluginLogger(){
-        return plugin.getPluginLogger();
-    }
-    
-    public Path getPath(){
-        return plugin.getPath();
+    public PluginCore<?> getPlugin(){
+        return plugin;
     }
     
     public FileHandler getFileHandler(){
@@ -109,62 +73,69 @@ public class AdvancedServerList{
         return version;
     }
     
+    public void disable(){
+        getPlugin().getPluginLogger().info("Saving cache.data file...");
+        getPlayerHandler().save();
+        getPlugin().getPluginLogger().info("AdvancedServerList disabled!");
+    }
+    
+    public void clearFaviconCache(){
+        plugin.clearFaviconCache();
+    }
+    
     private void load(){
         printBanner();
         resolveVersion();
-        
-        getPluginLogger().info("Starting AdvancedServerList v%s...", version);
-        
-        getPluginLogger().info("Platform: " + plugin.getPlatformName() + " " + plugin.getPlatformVersion());
+    
+        getPlugin().getPluginLogger().info("Starting AdvancedServerList v%s...", version);
+    
+        getPlugin().getPluginLogger().info("Platform: " + plugin.getPlatformName() + " " + plugin.getPlatformVersion());
         
         if(getFileHandler().loadConfig()){
-            getPluginLogger().info("Successfully loaded config.yml!");
+            getPlugin().getPluginLogger().info("Successfully loaded config.yml!");
         }else{
-            getPluginLogger().warn("Unable to load config.yml! Check previous lines for errors.");
+            getPlugin().getPluginLogger().warn("Unable to load config.yml! Check previous lines for errors.");
             return;
         }
         
         if(getFileHandler().loadProfiles()){
-            getPluginLogger().info("Successfully loaded " + getFileHandler().getProfiles().size() + " profiles!");
+            getPlugin().getPluginLogger().info("Successfully loaded " + getFileHandler().getProfiles().size() + " profiles!");
         }else{
-            getPluginLogger().warn("Unable to load profiles! Check previous lines for errors.");
+            getPlugin().getPluginLogger().warn("Unable to load profiles! Check previous lines for errors.");
             return;
         }
         
-        if(!getPath().resolve("favicons").toFile().exists() && getPath().resolve("favicons").toFile().mkdirs())
-            getPluginLogger().info("Successfully created favicons folder.");
-        
-        getPluginLogger().info("Loading Commands...");
+        Path folder = getPlugin().getFolderPath().resolve("favicons");
+        if(!folder.toFile().exists() && folder.toFile().mkdirs())
+            getPlugin().getPluginLogger().info("Successfully created favicons folder.");
+    
+        getPlugin().getPluginLogger().info("Loading Commands...");
         plugin.loadCommands();
-        getPluginLogger().info("Commands loaded!");
-        
-        getPluginLogger().info("Loading events...");
+        getPlugin().getPluginLogger().info("Commands loaded!");
+    
+        getPlugin().getPluginLogger().info("Loading events...");
         plugin.loadEvents();
-        getPluginLogger().info("Events loaded!");
-        
-        getPluginLogger().info("Loading cache.data...");
+        getPlugin().getPluginLogger().info("Events loaded!");
+    
+        getPlugin().getPluginLogger().info("Loading cache.data...");
         getPlayerHandler().load();
-        
-        getPluginLogger().info("Loading Metrics for bStats...");
-        if(getFileHandler().getBoolean("send_statistics")){
-            plugin.loadMetrics();
-            getPluginLogger().info("Metrics loaded!");
-        }else{
-            getPluginLogger().info("'send_statistics' disabled in config.yml. Not loading Metrics for bStats...");
-        }
-        
-        getPluginLogger().info("AdvancedServerList is ready!");
+    
+        getPlugin().getPluginLogger().info("Loading bStats metrics. Disable it in the global config under /plugins/bstats/");
+        plugin.loadMetrics();
+        getPlugin().getPluginLogger().info("Metrics loaded!");
+    
+        getPlugin().getPluginLogger().info("AdvancedServerList is ready!");
     }
     
     private void printBanner(){
-        getPluginLogger().info("");
-        getPluginLogger().info("           _____ _");
-        getPluginLogger().info("    /\\    / ____| |");
-        getPluginLogger().info("   /  \\  | (___ | |");
-        getPluginLogger().info("  / /\\ \\  \\___ \\| |");
-        getPluginLogger().info(" / ____ \\ ____) | |____");
-        getPluginLogger().info("/_/    \\_\\_____/|______|");
-        getPluginLogger().info("");
+        getPlugin().getPluginLogger().info("");
+        getPlugin().getPluginLogger().info("           _____ _");
+        getPlugin().getPluginLogger().info("    /\\    / ____| |");
+        getPlugin().getPluginLogger().info("   /  \\  | (___ | |");
+        getPlugin().getPluginLogger().info("  / /\\ \\  \\___ \\| |");
+        getPlugin().getPluginLogger().info(" / ____ \\ ____) | |____");
+        getPlugin().getPluginLogger().info("/_/    \\_\\_____/|______|");
+        getPlugin().getPluginLogger().info("");
     }
     
     private void resolveVersion(){

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

@@ -37,41 +37,45 @@ public class CommandHandler{
     }
     
     public void handle(CmdSender sender, String[] args){
+        String errorPrefix = "<grey>[<gradient:dark_red:red>AdvancedServerList</gradient>]";
+        String prefix = "<grey>[<gradient:aqua:white>AdvancedServerList</gradient>]";
+        
         if(args.length == 0 || args[0].equalsIgnoreCase("help")){
             if(sender.hasPermission("advancedserverlist.command.help")){
-                sender.sendMsg("AdvancedServerList Commands");
+                sender.sendMsg("%s - Commands", prefix);
                 sender.sendMsg();
-                sender.sendMsg("<aqua>/asl help <grey>- Shows this help.");
+                sender.sendMsg("<gradient:aqua:white>/asl help</gradient> <grey>- Shows this Help");
                 sender.sendMsg();
-                sender.sendMsg("<aqua>/asl reload <grey>- Reloads the config and profiles.");
+                sender.sendMsg("<gradient:aqua:white>/asl reload</gradient> <grey>- Reloads the plugin");
             }else{
-                sender.sendMsg("<red>You do not have the permissions to execute this command!");
+                sender.sendMsg("%s <red>You do not have permissions to execute this command!", errorPrefix);
             }
         }else
         if(args[0].equalsIgnoreCase("reload")){
             if(sender.hasPermission("advancedserverlist.command.reload")){
-                sender.sendMsg("<grey>Reloading config.yml...");
+                sender.sendMsg("%s Reloading plugin...", prefix);
+                
                 if(core.getFileHandler().reloadConfig()){
-                    sender.sendMsg("<green>Successfully reloaded <grey>config.yml</grey>!");
+                    sender.sendMsg("%s <green>Reloaded <grey>config.yml</grey>!", prefix);
                 }else{
-                    sender.sendMsg("<red>Error while reloading the config.yml.");
+                    sender.sendMsg("%s <red>Error while reloading the <grey>config.yml</grey>!", errorPrefix);
                 }
                 
-                sender.sendMsg("<grey>Reloading Profiles...");
                 if(core.getFileHandler().reloadProfiles()){
-                    sender.sendMsg("<green>Successfully loaded <grey>%d</grey> Profiles!", core.getFileHandler().getProfiles().size());
+                    sender.sendMsg("%s <green>Loaded <grey>%s Profile(s)</grey>!", prefix, core.getFileHandler().getProfiles());
                 }else{
-                    sender.sendMsg("<red>Error while reloading Profiles. No profiles have been loaded.");
+                    sender.sendMsg("%s <red>Cannot load Profiles!", errorPrefix);
                 }
                 
-                sender.sendMsg("<grey>Clearing Favicon cache...");
                 core.clearFaviconCache();
-                sender.sendMsg("<green>Successfully cleared Favicon cache!");
+                sender.sendMsg("%s <green>Successfully cleared Favicon cache!", prefix);
                 
-                sender.sendMsg("<green>Reload complete!");
+                sender.sendMsg("%s <green>Reload complete!", prefix);
+            }else{
+                sender.sendMsg("%s <red>You do not have permissions to execute this command!", errorPrefix);
             }
         }else{
-            sender.sendMsg("<red>Unknown subcommand <grey>%s</grey>. Use <grey>/asl help</grey> for a list of commands.", args[0]);
+            sender.sendMsg("%s <red>Unknown subcommand <grey>%s</grey>. Use <grey>/asl help</grey> for a list of commands.", prefix, args[0]);
         }
     }
 }

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

@@ -32,7 +32,6 @@ import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
 
 import java.io.File;
-import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
@@ -43,8 +42,6 @@ import java.util.List;
 
 public class FileHandler{
     
-    private final FilenameFilter profileFilter = (dir, name) -> name.endsWith(".yml");
-    
     private final AdvancedServerList plugin;
     private final PluginLogger logger;
     
@@ -55,12 +52,12 @@ public class FileHandler{
     
     private ConfigurationNode node = null;
     
-    public FileHandler(AdvancedServerList plugin){
-        this.plugin = plugin;
-        this.logger = plugin.getPluginLogger();
+    public FileHandler(AdvancedServerList core){
+        this.plugin = core;
+        this.logger = core.getPlugin().getPluginLogger();
         
-        this.config = plugin.getPath().resolve("config.yml");
-        this.profilesFolder = plugin.getPath().resolve("profiles");
+        this.config = core.getPlugin().getFolderPath().resolve("config.yml");
+        this.profilesFolder = core.getPlugin().getFolderPath().resolve("profiles");
     }
     
     public List<ServerListProfile> getProfiles(){
@@ -119,7 +116,7 @@ public class FileHandler{
     public boolean reloadProfiles(){
         profiles.clear();
         
-        File[] files = profilesFolder.toFile().listFiles(profileFilter);
+        File[] files = profilesFolder.toFile().listFiles(((dir, name) -> name.endsWith(".yml")));
         if(files == null || files.length == 0){
             logger.warn("Cannot load files from profiles folder! No valid YAML files present.");
             return false;
@@ -159,8 +156,4 @@ public class FileHandler{
     public String getString(String def, Object... path){
         return node.node(path).getString(def);
     }
-    
-    public boolean getBoolean(Object... path){
-        return node.node(path).getBoolean(true);
-    }
 }

core/src/main/java/ch/andre601/advancedserverlist/core/interfaces/core/PluginCore.java

@@ -23,13 +23,15 @@
  *
  */
 
-package ch.andre601.advancedserverlist.core.interfaces;
+package ch.andre601.advancedserverlist.core.interfaces.core;
 
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
+import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
+import ch.andre601.advancedserverlist.core.profiles.favicon.FaviconHandler;
 
 import java.nio.file.Path;
 
-public interface PluginCore{
+public interface PluginCore<F>{
     
     void loadCommands();
     
@@ -41,10 +43,12 @@ public interface PluginCore{
     
     AdvancedServerList getCore();
     
-    Path getPath();
+    Path getFolderPath();
     
     PluginLogger getPluginLogger();
     
+    FaviconHandler<F> getFaviconHandler();
+    
     String getPlatformName();
     
     String getPlatformVersion();

core/src/main/java/ch/andre601/advancedserverlist/core/interfaces/core/ProxyCore.java

@@ -0,0 +1,34 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 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.interfaces.core;
+
+import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.Placeholders;
+
+import java.util.List;
+
+public interface ProxyCore<F, P> extends PluginCore<F>{
+    List<P> createPlayers(List<String> lines, Placeholders... placeholders);
+}

core/src/main/java/ch/andre601/advancedserverlist/core/interfaces/core/ServerCore.java

@@ -0,0 +1,34 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 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.interfaces.core;
+
+import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.Placeholders;
+
+import java.util.List;
+
+public interface ServerCore<F, P, P2> extends PluginCore<F>{
+    List<P> createPlayers(List<String> lines, P2 player, Placeholders... placeholders);
+}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/ServerListProfile.java

@@ -45,18 +45,20 @@ public class ServerListProfile{
     private final String playerCount;
     private final String favicon;
     private final boolean hidePlayers;
-    private final int xMore;
+    private final boolean extraPlayersEnabled;
+    private final int extraPlayers;
     
     public ServerListProfile(ConfigurationNode node, PluginLogger logger){
         this.priority = node.node("priority").getInt();
-        this.expressions = createExpressions(getList(node, "conditions", false), logger);
+        this.expressions = createExpressions(getList(node, false, "conditions"), logger);
         
-        this.motd = getList(node, "motd", true);
-        this.players = getList(node, "players", false);
-        this.playerCount = node.node("playerCount").getString("");
+        this.motd = getList(node, true, "motd");
+        this.players = getList(node, false, "playerCount", "hover");
+        this.playerCount = node.node("playerCount", "text").getString("");
         this.favicon = node.node("favicon").getString("");
-        this.hidePlayers = node.node("hidePlayers").getBoolean();
-        this.xMore = node.node("xMore").getInt(-1);
+        this.hidePlayers = node.node("playerCount", "hidePlayers").getBoolean();
+        this.extraPlayersEnabled = node.node("playerCount", "extraPlayers", "enabled").getBoolean();
+        this.extraPlayers = node.node("playerCount", "extraPlayers", "amount").getInt();
     }
     
     public int getPriority(){
@@ -83,8 +85,12 @@ public class ServerListProfile{
         return hidePlayers;
     }
     
-    public int getXMore(){
-        return xMore;
+    public boolean isExtraPlayersEnabled(){
+        return extraPlayersEnabled;
+    }
+    
+    public int getExtraPlayers(){
+        return extraPlayers;
     }
     
     public boolean evalConditions(Map<String, Object> replacements){
@@ -119,10 +125,10 @@ public class ServerListProfile{
         return expressions;
     }
     
-    private List<String> getList(ConfigurationNode node, String key, boolean trim){
+    private List<String> getList(ConfigurationNode node, boolean trim, Object... path){
         List<String> list;
         try{
-            list = node.node(key).getList(String.class);
+            list = node.node(path).getList(String.class);
         }catch(SerializationException ex){
             return Collections.emptyList();
         }

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/Expression.java

@@ -98,7 +98,7 @@ public class Expression{
     }
     
     public enum Operator{
-        LESS_THAN('<', '\0'){
+        LESS('<', '\0'){
             @Override
             public boolean evaluate(String left, String right){
                 int leftInt = Operator.getInt(left);
@@ -128,7 +128,7 @@ public class Expression{
                 return !left.equals(right);
             }
         },
-        GREATER_THAN('>', '\0'){
+        GREATER('>', '\0'){
             @Override
             public boolean evaluate(String left, String right){
                 int leftInt = Operator.getInt(left);
@@ -191,32 +191,20 @@ public class Expression{
     }
     
     public enum ExpressionResult{
-        VALID{
-            @Override
-            public String getMessage(){
-                return null;
-            }
-        },
+        VALID(null),
         
-        INVALID_NO_EXPRESSION{
-            @Override
-            public String getMessage(){
-                return "Received empty condition which isn't allowed!";
-            }
-        },
-        INVALID_DOUBLE_OPERATOR{
-            @Override
-            public String getMessage(){
-                return "Condition contained two operands.";
-            }
-        },
-        INVALID_EMPTY_PARTS{
-            @Override
-            public String getMessage(){
-                return "Received condition with either left or right part being empty.";
-            }
-        };
+        INVALID_NO_EXPRESSION  ("Received empty condition which isn't allowed!"),
+        INVALID_DOUBLE_OPERATOR("Condition contained two operands."),
+        INVALID_EMPTY_PARTS    ("Received condition with either left or right part being empty.");
         
-        public abstract String getMessage();
+        private final String message;
+        
+        ExpressionResult(String message){
+            this.message = message;
+        }
+        
+        public String getMessage(){
+            return message;
+        }
     }
 }

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

@@ -42,9 +42,9 @@ import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 
-public class FaviconHandler<T>{
+public class FaviconHandler<F>{
     
-    private final Cache<String, T> favicons = Caffeine.newBuilder()
+    private final Cache<String, F> favicons = Caffeine.newBuilder()
         .expireAfterWrite(5, TimeUnit.MINUTES)
         .build();
     
@@ -54,7 +54,7 @@ public class FaviconHandler<T>{
         this.core = core;
     }
     
-    public T getFavicon(String input, Function<BufferedImage, T> function){
+    public F getFavicon(String input, Function<BufferedImage, F> function){
         return favicons.get(input, k -> {
             BufferedImage image = resolveImage(core, input);
             if(image == null)
@@ -75,9 +75,9 @@ public class FaviconHandler<T>{
             stream = getFromUrl(core, input);
         }else
         if(input.toLowerCase(Locale.ROOT).endsWith(".png")){
-            File folder = core.getPath().resolve("favicons").toFile();
+            File folder = core.getPlugin().getFolderPath().resolve("favicons").toFile();
             if(!folder.exists()){
-                core.getPluginLogger().warn("Cannot get Favicon %s from favicons folder. Folder doesn't exist!", input);
+                core.getPlugin().getPluginLogger().warn("Cannot get Favicon %s from favicons folder. Folder doesn't exist!", input);
                 return null;
             }
             
@@ -86,8 +86,8 @@ public class FaviconHandler<T>{
             try{
                 stream = new FileInputStream(file);
             }catch(IOException ex){
-                core.getPluginLogger().warn("Cannot create Favicon from File %s.", input);
-                core.getPluginLogger().warn("Cause: %s", ex.getMessage());
+                core.getPlugin().getPluginLogger().warn("Cannot create Favicon from File %s.", input);
+                core.getPlugin().getPluginLogger().warn("Cause: %s", ex.getMessage());
                 return null;
             }
         }else{
@@ -95,14 +95,14 @@ public class FaviconHandler<T>{
         }
         
         if(stream == null){
-            core.getPluginLogger().warn("Cannot create Favicon. InputStream was null.");
+            core.getPlugin().getPluginLogger().warn("Cannot create Favicon. InputStream was null.");
             return null;
         }
         
         try{
             BufferedImage original = ImageIO.read(stream);
             if(original == null){
-                core.getPluginLogger().warn("Cannot create Favicon. Unable to create BufferedImage.");
+                core.getPlugin().getPluginLogger().warn("Cannot create Favicon. Unable to create BufferedImage.");
                 return null;
             }
             
@@ -115,8 +115,8 @@ public class FaviconHandler<T>{
             
             return favicon;
         }catch(IOException ex){
-            core.getPluginLogger().warn("Unable to create Favicon. Encountered IOException during creation.");
-            core.getPluginLogger().warn("Cause: %s", ex.getMessage());
+            core.getPlugin().getPluginLogger().warn("Unable to create Favicon. Encountered IOException during creation.");
+            core.getPlugin().getPluginLogger().warn("Cause: %s", ex.getMessage());
             return null;
         }
     }
@@ -130,8 +130,8 @@ public class FaviconHandler<T>{
             
             return connection.getInputStream();
         }catch(IOException ex){
-            core.getPluginLogger().warn("Error while connecting to %s for Favicon creation.", url);
-            core.getPluginLogger().warn("Cause: %s", ex.getMessage());
+            core.getPlugin().getPluginLogger().warn("Error while connecting to %s for Favicon creation.", url);
+            core.getPlugin().getPluginLogger().warn("Cause: %s", ex.getMessage());
             return null;
         }
     }

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

@@ -46,24 +46,24 @@ public class PlayerHandler{
     
     public PlayerHandler(AdvancedServerList core){
         this.core = core;
-        this.cache = core.getPath().resolve("cache.data");
+        this.cache = core.getPlugin().getFolderPath().resolve("cache.data");
     }
     
     public void load(){
         if(!cache.toFile().exists()){
-            core.getPluginLogger().info("No cache.data present. Skipping...");
+            core.getPlugin().getPluginLogger().info("No cache.data present. Skipping...");
             return;
         }
         List<String> lines;
         try{
             lines = Files.readAllLines(cache);
         }catch(IOException ex){
-            core.getPluginLogger().warn("Encountered IOException while trying to read cache.data", ex);
+            core.getPlugin().getPluginLogger().warn("Encountered IOException while trying to read cache.data", ex);
             return;
         }
         
         if(lines.isEmpty()){
-            core.getPluginLogger().info("cache.data is empty. Skipping...");
+            core.getPlugin().getPluginLogger().info("cache.data is empty. Skipping...");
             return;
         }
         
@@ -78,12 +78,12 @@ public class PlayerHandler{
             players.add(parts[0], parts[1]);
         }
         
-        core.getPluginLogger().info("Loaded " + players.size() + " players into cache!");
+        core.getPlugin().getPluginLogger().info("Loaded " + players.size() + " players into cache!");
     }
     
     public void save(){
         if(players.isEmpty()){
-            core.getPluginLogger().info("No data to save. Skipping...");
+            core.getPlugin().getPluginLogger().info("No data to save. Skipping...");
             return;
         }
         
@@ -98,9 +98,9 @@ public class PlayerHandler{
             writer.write(joiner.toString());
             writer.close();
             
-            core.getPluginLogger().info("Successfully saved cache.data file.");
+            core.getPlugin().getPluginLogger().info("Successfully saved cache.data file.");
         }catch(IOException ex){
-            core.getPluginLogger().warn("Cannot save player data to cache.data file!", ex);
+            core.getPlugin().getPluginLogger().warn("Cannot save player data to cache.data file!", ex);
         }
     }
     

core/src/main/resources/config.yml

@@ -1,8 +1,4 @@
 #
 # Used for when AdvancedServerList doesn't have a cached player to use for ${player name}
 #
-unknown_player: "Anonymous"
-#
-# Whether statistics should be sent to bStats or not.
-#
-send_statistics: true
+unknown_player: "Anonymous"

core/src/main/resources/profiles/default.yml

@@ -28,62 +28,79 @@ motd:
   - '<grey>Line 2'
 
 #
-# Sets if players should be hidden.
-# When set to true will the player count be replaced with ???
-# Additionally will the options 'players' and 'playerCount' be ignored by the plugin.
-#
-# Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#hideplayers
-#
-hidePlayers: false
-
-#
-# Set the hover text that usually displays online players.
-# Only normal colours such as <grey> or <aqua> are supported.
-#
-# Remove this option or set it to players: [] to not alter the hover text.
-#
-# Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#players
-#
-players:
-  - '<grey>Line 1'
-  - '<grey>Line 2'
-  - '<grey>Line 3'
-
-#
-# Set the text that usually shows online players and max that can join.
-# Only normal colours such as <grey> or <aqua> are supported.
-#
-# Remove this option or set it to playerCount: '' to not alter the player count text.
-#
-# Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#playercount
-#
-playerCount: '<grey>Text'
-
-#
-# Allows you to override the default Favicon used by the Server/Proxy.
-# You can provide three specific inputs:
-# - A valid URL pointing to a PNG file.
-# - ${player name} for a per-player avatar being displayed (Uses mc-heads.net)
-# - Image file name (i.e. example.png) for a file in the "favicons" folder.
-#
-# NOTE:
-# - The favicon will be cached for 5 minutes to avoid spam and rate limits.
-# - BungeeCord/Waterfall may report issues that the plugin takes a long time to process.
-#   This is something I cannot really get improved without help.
+# Allows you to set a favicon for this server list profile.
+# You can use one of three possible options:
+#   1. A file name matching a PNG file located in the 'favicons' folder (Needs to end with .png)
+#   2. A URL pointing to a valid Image
+#   3. ${player name} to display the player's head as favicon. Uses https://mc-heads.net for this
 #
 # Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#favicon
 #
 favicon: ''
 
 #
-# When set to 0 or higher will alter the max player count to the online count + xMore.
-# Example: With 20 online players would 'xMore: 1' show 20/21 and 'xMore: 0' show 20/20
+# Contains various options to manipulate the player count (Text displaying online and max players allowed).
 #
-# Note that this will also manipulate the ${server playersMax} placeholder when used
-# in motd, players or playerCount.
+# Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#playercount
 #
-# Remove this option or set it to -1 to not alter the max player count.
-#
-# Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#xmore
-#
-xMore: -1
+playerCount:
+  #
+  # Whether AdvancedServerList should hide the player count or not.
+  # When set to true will the player count display '???' instead of <online>/<max>
+  #
+  # Note that when this is enabled will all other options, except for 'extraPlayers', be ignored.
+  #
+  # Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#hideplayers
+  #
+  hidePlayers: false
+  #
+  # Sets the text displayed when hovering over the player count.
+  # You can set this to 'hover: []' or remove the option to not modify the hover text.
+  #
+  # Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#hover
+  #
+  hover:
+    - '<grey>Line 1'
+    - '<grey>Line 2'
+    - '<grey>Line 3'
+  #
+  # Modifies the text that usually displays '<online>/<max>'
+  # 
+  # Note that when used, the Ping icon will display as 'outdated server'/'outdated client'.
+  # This is nothing that can be fixed or avoided and would require changes from Mojang.
+  #
+  # You can set this to 'count: ''' or remove the option to not modify the player count text.
+  #
+  # Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#text
+  #
+  text: ''
+  #
+  # Allows you to modify the max player count displayed.
+  # Note that this will affect ${server playersMax} (Except for when used in conditions).
+  #
+  # Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#extraPlayers
+  #
+  extraPlayers:
+    #
+    # Enables/Disables the extraPlayers option.
+    # When enabled will the total amount of players allowed be modified to the current
+    # number of online players + 'amount'
+    #
+    # Defaults to false when not present.
+    #
+    # Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#enabled
+    #
+    enabled: false
+    #
+    # Sets how much should be added/subtracted from the current number of online players
+    # to then use for the max player count.
+    #
+    # Example:
+    # When set to 1 while 10 players are online would the player count - if unmodified -
+    # display '10/11'. When -1 is used will it display '10/9'
+    #
+    # Defaults to 0 when not present.
+    #
+    # Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#amount
+    #
+    amount: 0

paper/src/main/java/ch/andre601/advancedserverlist/paper/PaperCore.java

@@ -26,22 +26,31 @@
 package ch.andre601.advancedserverlist.paper;
 
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
-import ch.andre601.advancedserverlist.core.interfaces.PluginCore;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
+import ch.andre601.advancedserverlist.core.interfaces.core.ServerCore;
+import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
 import ch.andre601.advancedserverlist.core.profiles.favicon.FaviconHandler;
+import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.Placeholders;
 import ch.andre601.advancedserverlist.paper.commands.CmdAdvancedServerList;
 import ch.andre601.advancedserverlist.paper.events.JoinEvent;
 import ch.andre601.advancedserverlist.paper.events.PingEvent;
 import ch.andre601.advancedserverlist.paper.logging.PaperLogger;
+import com.destroystokyo.paper.profile.PlayerProfile;
+import me.clip.placeholderapi.PlaceholderAPI;
 import org.bstats.bukkit.Metrics;
 import org.bstats.charts.SimplePie;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.CachedServerIcon;
 
 import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
 
-public class PaperCore extends JavaPlugin implements PluginCore{
+public class PaperCore extends JavaPlugin implements ServerCore<CachedServerIcon, PlayerProfile, OfflinePlayer>{
     
     private final PluginLogger logger = new PaperLogger(getLogger());
     
@@ -117,7 +126,7 @@ public class PaperCore extends JavaPlugin implements PluginCore{
     }
     
     @Override
-    public Path getPath(){
+    public Path getFolderPath(){
         return getDataFolder().toPath();
     }
     
@@ -126,6 +135,14 @@ public class PaperCore extends JavaPlugin implements PluginCore{
         return logger;
     }
     
+    @Override
+    public FaviconHandler<CachedServerIcon> getFaviconHandler(){
+        if(faviconHandler == null)
+            faviconHandler = new FaviconHandler<>(core);
+        
+        return faviconHandler;
+    }
+    
     @Override
     public String getPlatformName(){
         return getServer().getName();
@@ -136,12 +153,29 @@ public class PaperCore extends JavaPlugin implements PluginCore{
         return getServer().getVersion();
     }
     
-    public FaviconHandler<CachedServerIcon> getFaviconHandler(){
-        return faviconHandler;
-    }
-    
     private void enable(){
         this.core = new AdvancedServerList(this);
-        this.faviconHandler = new FaviconHandler<>(core);
+    }
+    
+    @Override
+    public List<PlayerProfile> createPlayers(List<String> lines, OfflinePlayer player, Placeholders... placeholders){
+        List<PlayerProfile> players = new ArrayList<>(lines.size());
+        
+        for(String line : lines){
+            String parsed = ComponentParser.text(line)
+                .replacements(placeholders[0])
+                .replacements(placeholders[1])
+                .modifyText(text -> {
+                    if(getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
+                        return PlaceholderAPI.setPlaceholders(player, text);
+                    
+                    return text;
+                })
+                .toString();
+            
+            players.add(Bukkit.createProfile(UUID.randomUUID(), parsed));
+        }
+        
+        return players;
     }
 }

paper/src/main/java/ch/andre601/advancedserverlist/paper/events/PingEvent.java

@@ -29,13 +29,11 @@ import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
 import ch.andre601.advancedserverlist.core.profiles.ProfileManager;
 import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
 import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
-import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.Placeholders;
 import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.PlayerPlaceholders;
 import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.ServerPlaceholders;
 import ch.andre601.advancedserverlist.paper.PaperCore;
 import ch.andre601.advancedserverlist.paper.PaperPlayer;
 import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
-import com.destroystokyo.paper.profile.PlayerProfile;
 import me.clip.placeholderapi.PlaceholderAPI;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
@@ -44,9 +42,6 @@ import org.bukkit.event.Listener;
 import org.bukkit.util.CachedServerIcon;
 
 import java.net.InetSocketAddress;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
 
 public class PingEvent implements Listener{
     
@@ -77,9 +72,9 @@ public class PingEvent implements Listener{
         
         if(profile == null)
             return;
-        
-        if(profile.getXMore() >= 0){
-            max = online + profile.getXMore();
+    
+        if(profile.isExtraPlayersEnabled()){
+            max = online + profile.getExtraPlayers();
             event.setMaxPlayers(max);
         }
         
@@ -100,10 +95,9 @@ public class PingEvent implements Listener{
         
         if(profile.shouldHidePlayers()){
             event.setHidePlayers(true);
-            return;
         }
         
-        if(!profile.getPlayerCount().isEmpty()){
+        if(!profile.getPlayerCount().isEmpty() && !profile.shouldHidePlayers()){
             event.setVersion(ComponentParser.text(profile.getPlayerCount())
                 .replacements(playerPlaceholders)
                 .replacements(serverPlaceholders)
@@ -117,10 +111,12 @@ public class PingEvent implements Listener{
             event.setProtocolVersion(-1);
         }
         
-        if(!profile.getPlayers().isEmpty()){
+        if(!profile.getPlayers().isEmpty() && !profile.shouldHidePlayers()){
             event.getPlayerSample().clear();
             
-            event.getPlayerSample().addAll(getPlayers(profile.getPlayers(), playerPlaceholders, serverPlaceholders, player.getPlayer()));
+            event.getPlayerSample().addAll(
+                plugin.createPlayers(profile.getPlayers(), player.getPlayer(), playerPlaceholders, serverPlaceholders)
+            );
         }
         
         if(!profile.getFavicon().isEmpty()){
@@ -143,22 +139,6 @@ public class PingEvent implements Listener{
         }
     }
     
-    private List<PlayerProfile> getPlayers(List<String> lines, Placeholders playerPlaceholders, Placeholders serverPlaceholders, OfflinePlayer player){
-        List<PlayerProfile> players = new ArrayList<>();
-        lines.forEach(line -> players.add(Bukkit.createProfile(UUID.randomUUID(), ComponentParser.text(line)
-            .replacements(playerPlaceholders)
-            .replacements(serverPlaceholders)
-            .modifyText(text -> {
-                if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
-                    return PlaceholderAPI.setPlaceholders(player, text);
-    
-                return text;
-            })
-            .toString())));
-        
-        return players;
-    }
-    
     private PaperPlayer resolvePlayer(InetSocketAddress address, int protocol){
         String playerName = plugin.getCore().getPlayerHandler().getPlayerByIp(address.getHostString());
         OfflinePlayer player = Bukkit.getPlayerExact(playerName);

paper/src/main/resources/plugin.yml

@@ -13,7 +13,7 @@ softdepend:
 commands: 
   advancedserverlist:
     description: 'Main command of AdvancedServerList'
-    usage: '/<command> [reload]'
+    usage: '/<command> [help|reload]'
     aliases:
       - 'asl'
     permission: 'advancedserverlist.admin'

pom.xml

@@ -12,7 +12,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         
-        <plugin.version>1.5.1</plugin.version>
+        <plugin.version>1.6.0</plugin.version>
         <plugin.description>Create multiple Server lists based on conditions.</plugin.description>
         
         <maven.compiler.source>16</maven.compiler.source>

spigot/src/main/java/ch/andre601/advancedserverlist/spigot/SpigotCore.java

@@ -26,26 +26,34 @@
 package ch.andre601.advancedserverlist.spigot;
 
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
-import ch.andre601.advancedserverlist.core.interfaces.PluginCore;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
+import ch.andre601.advancedserverlist.core.interfaces.core.ServerCore;
+import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
 import ch.andre601.advancedserverlist.core.profiles.favicon.FaviconHandler;
+import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.Placeholders;
 import ch.andre601.advancedserverlist.spigot.commands.CmdAdvancedServerList;
 import ch.andre601.advancedserverlist.spigot.events.LoadEvent;
 import ch.andre601.advancedserverlist.spigot.logging.SpigotLogger;
+import com.comphenix.protocol.wrappers.WrappedGameProfile;
 import com.comphenix.protocol.wrappers.WrappedServerPing;
+import me.clip.placeholderapi.PlaceholderAPI;
 import org.bstats.bukkit.Metrics;
 import org.bstats.charts.SimplePie;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
 
-public class SpigotCore extends JavaPlugin implements PluginCore{
+public class SpigotCore extends JavaPlugin implements ServerCore<WrappedServerPing.CompressedImage, WrappedGameProfile, OfflinePlayer>{
     
     private final PluginLogger logger = new SpigotLogger(getLogger());
     
     private AdvancedServerList core;
-    FaviconHandler<WrappedServerPing.CompressedImage> faviconHandler;
+    FaviconHandler<WrappedServerPing.CompressedImage> faviconHandler = null;
     
     @Override
     public void onEnable(){
@@ -63,7 +71,6 @@ public class SpigotCore extends JavaPlugin implements PluginCore{
         }
         
         this.core = new AdvancedServerList(this);
-        this.faviconHandler = new FaviconHandler<>(core);
     }
     
     @Override
@@ -104,7 +111,7 @@ public class SpigotCore extends JavaPlugin implements PluginCore{
     }
     
     @Override
-    public Path getPath(){
+    public Path getFolderPath(){
         return getDataFolder().toPath();
     }
     
@@ -113,6 +120,14 @@ public class SpigotCore extends JavaPlugin implements PluginCore{
         return logger;
     }
     
+    @Override
+    public FaviconHandler<WrappedServerPing.CompressedImage> getFaviconHandler(){
+        if(faviconHandler == null)
+            faviconHandler = new FaviconHandler<>(core);
+        
+        return faviconHandler;
+    }
+    
     @Override
     public String getPlatformName(){
         return getServer().getName();
@@ -123,15 +138,33 @@ public class SpigotCore extends JavaPlugin implements PluginCore{
         return getServer().getVersion();
     }
     
-    public FaviconHandler<WrappedServerPing.CompressedImage> getFaviconHandler(){
-        return faviconHandler;
+    @Override
+    public List<WrappedGameProfile> createPlayers(List<String> lines, OfflinePlayer player, Placeholders... placeholders){
+        List<WrappedGameProfile> players = new ArrayList<>(lines.size());
+        
+        for(String line : lines){
+            String parsed = ComponentParser.text(line)
+                .replacements(placeholders[0])
+                .replacements(placeholders[1])
+                .modifyText(text -> {
+                    if(getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
+                        return PlaceholderAPI.setPlaceholders(player, text);
+                    
+                    return text;
+                })
+                .toString();
+            
+            players.add(new WrappedGameProfile(UUID.randomUUID(), parsed));
+        }
+        
+        return players;
     }
     
     private void printPaperInfo(){
         getPluginLogger().warn("======================================================================================");
-        getPluginLogger().warn("You are using the Spigot version of AdvancedServerList on a PaperMC server.");
-        getPluginLogger().warn("It is recommended to use the dedicated PaperMC version, to benefit from the");
-        getPluginLogger().warn("Following improvements:");
+        getPluginLogger().warn("You are using the Spigot version of AdvancedServerList on a Paper server.");
+        getPluginLogger().warn("It is recommended to use the dedicated Paper version, to benefit from the");
+        getPluginLogger().warn("following improvements:");
         getPluginLogger().warn(" - No need to download external libraries already provided by PaperMC.");
         getPluginLogger().warn(" - No dependency on ProtocolLib thanks to provided Events.");
         getPluginLogger().warn("");

spigot/src/main/java/ch/andre601/advancedserverlist/spigot/events/LoadEvent.java

@@ -46,7 +46,7 @@ public class LoadEvent implements Listener{
         PluginManager manager = plugin.getServer().getPluginManager();
         
         if(!manager.isPluginEnabled("ProtocolLib")){
-            plugin.getCore().getPluginLogger().warn("ProtocolLib not found! AdvancedServerList requires it to work on Spigot!");
+            plugin.getCore().getPlugin().getPluginLogger().warn("ProtocolLib not found! AdvancedServerList requires it to work on Spigot!");
     
             manager.disablePlugin(plugin);
             return;

spigot/src/main/java/ch/andre601/advancedserverlist/spigot/events/PingEvent.java

@@ -39,7 +39,6 @@ import com.comphenix.protocol.events.ListenerPriority;
 import com.comphenix.protocol.events.PacketAdapter;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.wrappers.AdventureComponentConverter;
-import com.comphenix.protocol.wrappers.WrappedGameProfile;
 import com.comphenix.protocol.wrappers.WrappedServerPing;
 import me.clip.placeholderapi.PlaceholderAPI;
 import net.kyori.adventure.text.Component;
@@ -101,9 +100,9 @@ public class PingEvent implements Listener{
                 
                 if(profile == null)
                     return;
-                
-                if(profile.getXMore() >= 0){
-                    max = online + profile.getXMore();
+    
+                if(profile.isExtraPlayersEnabled()){
+                    max = online + profile.getExtraPlayers();
                     ping.setPlayersMaximum(max);
                 }
                 
@@ -125,10 +124,9 @@ public class PingEvent implements Listener{
                 
                 if(profile.shouldHidePlayers()){
                     ping.setPlayersVisible(false);
-                    return;
                 }
                 
-                if(!profile.getPlayerCount().isEmpty()){
+                if(!profile.getPlayerCount().isEmpty() && !profile.shouldHidePlayers()){
                     ping.setVersionName(ComponentParser.text(profile.getPlayerCount())
                         .replacements(playerPlaceholders)
                         .replacements(serverPlaceholders)
@@ -143,19 +141,10 @@ public class PingEvent implements Listener{
                     ping.setVersionProtocol(-1);
                 }
                 
-                if(!profile.getPlayers().isEmpty()){
-                    ping.setPlayers(getFakePlayers(
-                        ComponentParser.list(profile.getPlayers())
-                            .replacements(playerPlaceholders)
-                            .replacements(serverPlaceholders)
-                            .modifyText(text -> {
-                                if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
-                                    return PlaceholderAPI.setPlaceholders(player.getPlayer(), text);
-    
-                                return text;
-                            })
-                            .toString()
-                    ));
+                if(!profile.getPlayers().isEmpty() && !profile.shouldHidePlayers()){
+                    ping.setPlayers(
+                        spigotPlugin.createPlayers(profile.getPlayers(), player.getPlayer(), playerPlaceholders, serverPlaceholders)
+                    );
                 }
                 
                 if(!profile.getFavicon().isEmpty()){
@@ -180,17 +169,6 @@ public class PingEvent implements Listener{
         });
     }
     
-    private List<WrappedGameProfile> getFakePlayers(String text){
-        String[] lines = text.split("\n");
-        List<WrappedGameProfile> profiles = new ArrayList<>();
-        
-        for(String line : lines){
-            profiles.add(new WrappedGameProfile(UUID.randomUUID(), line));
-        }
-        
-        return profiles;
-    }
-    
     private SpigotPlayer resolvePlayer(InetSocketAddress address, int protocol){
         String playerName = plugin.getCore().getPlayerHandler().getPlayerByIp(address.getHostString());
         OfflinePlayer player = Bukkit.getPlayerExact(playerName);

spigot/src/main/resources/plugin.yml

@@ -21,7 +21,7 @@ softdepend:
 commands:
   advancedserverlist:
     description: 'Main command of AdvancedServerList'
-    usage: '/<command> [reload]'
+    usage: '/<command> [help|reload]'
     aliases:
       - 'asl'
     permission: 'advancedserverlist.admin'

velocity/src/main/java/ch/andre601/advancedserverlist/velocity/VelocityCore.java

@@ -26,9 +26,11 @@
 package ch.andre601.advancedserverlist.velocity;
 
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
-import ch.andre601.advancedserverlist.core.interfaces.PluginCore;
+import ch.andre601.advancedserverlist.core.interfaces.core.ProxyCore;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
+import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
 import ch.andre601.advancedserverlist.core.profiles.favicon.FaviconHandler;
+import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.Placeholders;
 import ch.andre601.advancedserverlist.velocity.commands.CmdAdvancedServerList;
 import ch.andre601.advancedserverlist.velocity.events.JoinEvent;
 import ch.andre601.advancedserverlist.velocity.events.PingEvent;
@@ -40,14 +42,18 @@ import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
 import com.velocitypowered.api.event.proxy.ProxyShutdownEvent;
 import com.velocitypowered.api.plugin.annotation.DataDirectory;
 import com.velocitypowered.api.proxy.ProxyServer;
+import com.velocitypowered.api.proxy.server.ServerPing;
 import com.velocitypowered.api.util.Favicon;
 import org.bstats.charts.SimplePie;
 import org.bstats.velocity.Metrics;
 import org.slf4j.LoggerFactory;
 
 import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
 
-public class VelocityCore implements PluginCore{
+public class VelocityCore implements ProxyCore<Favicon, ServerPing.SamplePlayer>{
     
     private final PluginLogger logger;
     private final ProxyServer proxy;
@@ -55,7 +61,7 @@ public class VelocityCore implements PluginCore{
     private final Metrics.Factory metrics;
     
     private AdvancedServerList core;
-    private FaviconHandler<Favicon> faviconHandler;
+    private FaviconHandler<Favicon> faviconHandler = null;
     
     @Inject
     public VelocityCore(ProxyServer proxy, @DataDirectory Path path, Metrics.Factory metrics){
@@ -69,7 +75,6 @@ public class VelocityCore implements PluginCore{
     @Subscribe
     public void init(ProxyInitializeEvent event){
         this.core = new AdvancedServerList(this);
-        this.faviconHandler = new FaviconHandler<>(core);
     }
     
     @Subscribe
@@ -111,7 +116,7 @@ public class VelocityCore implements PluginCore{
     }
     
     @Override
-    public Path getPath(){
+    public Path getFolderPath(){
         return path;
     }
     
@@ -120,6 +125,30 @@ public class VelocityCore implements PluginCore{
         return logger;
     }
     
+    @Override
+    public FaviconHandler<Favicon> getFaviconHandler(){
+        if(faviconHandler == null)
+            faviconHandler = new FaviconHandler<>(core);
+        
+        return faviconHandler;
+    }
+    
+    @Override
+    public List<ServerPing.SamplePlayer> createPlayers(List<String> lines, Placeholders... placeholders){
+        List<ServerPing.SamplePlayer> players = new ArrayList<>(lines.size());
+        
+        for(String line : lines){
+            String parsed = ComponentParser.text(line)
+                .replacements(placeholders[0])
+                .replacements(placeholders[1])
+                .toString();
+            
+            players.add(new ServerPing.SamplePlayer(parsed, UUID.randomUUID()));
+        }
+        
+        return players;
+    }
+    
     @Override
     public String getPlatformName(){
         return getProxy().getVersion().getName();
@@ -133,8 +162,4 @@ public class VelocityCore implements PluginCore{
     public ProxyServer getProxy(){
         return proxy;
     }
-    
-    public FaviconHandler<Favicon> getFaviconHandler(){
-        return faviconHandler;
-    }
 }

velocity/src/main/java/ch/andre601/advancedserverlist/velocity/events/PingEvent.java

@@ -25,7 +25,6 @@
 
 package ch.andre601.advancedserverlist.velocity.events;
 
-import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
 import ch.andre601.advancedserverlist.core.profiles.ProfileManager;
 import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
@@ -76,9 +75,9 @@ public class PingEvent{
         
         if(profile == null)
             return;
-        
-        if(profile.getXMore() >= 0){
-            max = online + profile.getXMore();
+    
+        if(profile.isExtraPlayersEnabled()){
+            max = online + profile.getExtraPlayers();
             builder.maximumPlayers(max);
         }
         
@@ -95,12 +94,9 @@ public class PingEvent{
         
         if(profile.shouldHidePlayers()){
             builder.nullPlayers();
-            
-            event.setPing(builder.build());
-            return;
         }
         
-        if(!profile.getPlayerCount().isEmpty()){
+        if(!profile.getPlayerCount().isEmpty() && !profile.shouldHidePlayers()){
             builder.version(new ServerPing.Version(
                 -1, 
                 ComponentParser.text(profile.getPlayerCount())
@@ -110,13 +106,8 @@ public class PingEvent{
             ));
         }
         
-        if(!profile.getPlayers().isEmpty()){
-            String players = ComponentParser.list(profile.getPlayers())
-                .replacements(playerPlaceholders)
-                .replacements(serverPlaceholders)
-                .toString();
-            
-            ServerPing.SamplePlayer[] playerSamples = AdvancedServerList.getPlayers(ServerPing.SamplePlayer.class, players)
+        if(!profile.getPlayers().isEmpty() && !profile.shouldHidePlayers()){
+            ServerPing.SamplePlayer[] playerSamples = plugin.createPlayers(profile.getPlayers(), playerPlaceholders, serverPlaceholders)
                 .toArray(new ServerPing.SamplePlayer[0]);
             
             if(playerSamples.length > 0)