Adding Maintenance placeholders

Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/320

.woodpecker/publish_assets.yml

@@ -4,7 +4,7 @@ when:
 
 steps:
   - name: "Build Jar and Upload"
-    image: maven:3.9.6-eclipse-temurin-21
+    image: maven:3.9.8-eclipse-temurin-21
     secrets:
       - modrinth_api_token
       - hangar_api_token

README.md

@@ -86,8 +86,8 @@ Below can you find a collection of videos made for my plugin. If you made a vide
 <details><summary>Click to show/hide Videos</summary>
 <p>
 
-Spanish Video by Ajneb97
-<iframe width="560" height="auto" src="https://www.youtube.com/embed/rIbljm_4HVI" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
+Spanish Video by Ajneb97  
+[![video thumbnail](https://img.youtube.com/vi/rIbljm_4HVI/0.jpg)](https://youtube.com/watch?v=rIbljm_4HVI)
 
 </p>
 </details>

addons/banplugins/pom.xml

@@ -52,7 +52,7 @@
         </repository>
         <repository>
             <id>papermc</id>
-            <url>https://papermc.io/repo/repository/maven-public/</url>
+            <url>https://repo.papermc.io/repository/maven-public/</url>
         </repository>
         <repository>
             <id>libertybans</id>
@@ -79,7 +79,7 @@
         <dependency>
             <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.20-R0.1-SNAPSHOT</version>
+            <version>1.21-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

bungeecord/pom.xml

@@ -49,10 +49,6 @@
             <id>sonatype</id>
             <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
         </repository>
-        <repository>
-            <id>sonatype-snapshots</id>
-            <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
-        </repository>
     </repositories>
     
     <dependencies>
@@ -85,7 +81,7 @@
             <scope>provided</scope>
         </dependency>
         
-        <!-- Adventure Library. Needs to be shaded in -->
+        <!-- Adventure Library -->
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-api</artifactId>
@@ -155,7 +151,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.3</version>
+                <version>3.6.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <relocations>

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

@@ -34,8 +34,9 @@ import ch.andre601.advancedserverlist.bungeecord.objects.placeholders.BungeeServ
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
-import ch.andre601.advancedserverlist.core.profiles.favicon.FaviconHandler;
+import ch.andre601.advancedserverlist.core.profiles.handlers.FaviconHandler;
 import com.alessiodp.libby.BungeeLibraryManager;
+import com.alessiodp.libby.Library;
 import de.myzelyam.api.vanish.BungeeVanishAPI;
 import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
 import net.md_5.bungee.api.Favicon;
@@ -52,12 +53,15 @@ import java.util.List;
 
 public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
     
+    private final PluginLogger logger = new BungeeLogger(this);
+    
     private boolean successfulLoad = false;
     
     private AdvancedServerList<Favicon> core;
     private FaviconHandler<Favicon> faviconHandler = null;
     private BungeeAudiences audiences = null;
-    private final PluginLogger logger = new BungeeLogger(this);
+    
+    private BungeeLibraryManager libraryManager = null;
     
     @Override
     public void onLoad(){
@@ -119,6 +123,23 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
         faviconHandler.cleanCache();
     }
     
+    @Override
+    public void downloadLibrary(String groupId, String artifactId, String version){
+        if(libraryManager == null){
+            libraryManager = new BungeeLibraryManager(this);
+            libraryManager.addRepository("https://repo.papermc.io/repository/maven-public");
+        }
+        
+        Library lib = Library.builder()
+            .groupId(groupId)
+            .artifactId(artifactId)
+            .version(version)
+            .resolveTransitiveDependencies(true)
+            .build();
+        
+        libraryManager.loadLibrary(lib);
+    }
+    
     @Override
     public AdvancedServerList<Favicon> getCore(){
         return core;
@@ -179,7 +200,11 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
     
     private boolean loadLibs(){
         try{
-            BungeeLibraryManager libraryManager = new BungeeLibraryManager(this);
+            if(libraryManager == null){
+                libraryManager = new BungeeLibraryManager(this);
+                libraryManager.addRepository("https://repo.papermc.io/repository/maven-public");
+            }
+            
             libraryManager.configureFromJSON("dependencies.json");
             
             return true;

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

@@ -31,7 +31,8 @@ import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
 import ch.andre601.advancedserverlist.bungeecord.BungeeCordCore;
 import ch.andre601.advancedserverlist.bungeecord.objects.impl.BungeePlayerImpl;
 import ch.andre601.advancedserverlist.bungeecord.objects.impl.BungeeProxyImpl;
-import ch.andre601.advancedserverlist.core.events.PingEventHandler;
+import ch.andre601.advancedserverlist.core.compat.maintenance.MaintenanceUtil;
+import ch.andre601.advancedserverlist.core.compat.papi.PAPIUtil;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import ch.andre601.advancedserverlist.core.interfaces.events.GenericEventWrapper;
 import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
@@ -137,7 +138,7 @@ public class BungeeEventWrapper implements GenericEventWrapper<Favicon, BungeePl
         if(plugin.getProxy().getPluginManager().getPlugin("Maintenance") == null)
             return false;
         
-        return PingEventHandler.getMaintenanceUtil().isMaintenanceEnabled();
+        return MaintenanceUtil.get().isMaintenanceEnabled();
     }
     
     @Override
@@ -165,10 +166,10 @@ public class BungeeEventWrapper implements GenericEventWrapper<Favicon, BungeePl
         if(plugin.getProxy().getPluginManager().getPlugin("PAPIProxyBridge") == null)
             return text;
         
-        if(!PingEventHandler.getPAPIUtil().isCompatible())
+        if(!PAPIUtil.get().isCompatible())
             return text;
         
-        String server = PingEventHandler.getPAPIUtil().getServer();
+        String server = PAPIUtil.get().getServer();
         if(server == null || server.isEmpty())
             return text;
         
@@ -176,11 +177,11 @@ public class BungeeEventWrapper implements GenericEventWrapper<Favicon, BungeePl
         if(serverInfo == null || serverInfo.getPlayers().isEmpty())
             return text;
         
-        ProxiedPlayer carrier = PingEventHandler.getPAPIUtil().getPlayer(serverInfo.getPlayers());
+        ProxiedPlayer carrier = PAPIUtil.get().getPlayer(serverInfo.getPlayers());
         if(carrier == null)
             return text;
         
-        return PingEventHandler.getPAPIUtil().parse(text, carrier.getUniqueId(), player.getUUID());
+        return PAPIUtil.get().parse(text, carrier.getUniqueId(), player.getUUID());
     }
     
     @Override

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/objects/impl/BungeePlayerImpl.java

@@ -25,14 +25,35 @@
 
 package ch.andre601.advancedserverlist.bungeecord.objects.impl;
 
+import ch.andre601.advancedserverlist.api.bungeecord.objects.BungeePlayer;
 import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
-import ch.andre601.advancedserverlist.core.profiles.players.GenericPlayerImpl;
 
-public class BungeePlayerImpl extends GenericPlayerImpl{
+import java.util.UUID;
+
+public class BungeePlayerImpl implements BungeePlayer{
+    
+    private final String name;
+    private final int protocol;
+    private final UUID uuid;
     
     public BungeePlayerImpl(CachedPlayer player, int protocol){
         this.name = player.name();
         this.protocol = protocol;
         this.uuid = player.uuid();
     }
+    
+    @Override
+    public String getName(){
+        return name;
+    }
+    
+    @Override
+    public int getProtocol(){
+        return protocol;
+    }
+    
+    @Override
+    public UUID getUUID(){
+        return uuid;
+    }
 }

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

@@ -87,7 +87,7 @@ public class BungeeServerPlaceholders extends PlaceholderProvider{
                 if(args.length > 2)
                     yield null;
                 
-                if(args.length == 2){
+                if(args.length == 2 && args[1] != null && !args[1].isEmpty()){
                     ServerInfo info = proxy.getServers().get(args[1]);
                     if(info == null)
                         yield null;

bungeecord/src/main/resources/dependencies.json

@@ -1,7 +1,4 @@
 {
-  "repositories": [
-    "https://repo.papermc.io/repository/maven-public"
-  ],
   "libraries": [
     {
       "groupId": "net{}kyori",

core/pom.xml

@@ -77,7 +77,7 @@
         <dependency>
             <groupId>ch.andre601</groupId>
             <artifactId>expressionparser</artifactId>
-            <version>1.4.2</version>
+            <version>1.4.3</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -86,6 +86,12 @@
             <version>${dependency.configurate-yaml}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.spongepowered</groupId>
+            <artifactId>configurate-hocon</artifactId>
+            <version>4.1.2</version>
+            <scope>provided</scope>
+        </dependency>
         
         <!-- MiniMessage -->
         <dependency>
@@ -111,7 +117,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.10.1</version>
+            <version>2.11.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -123,7 +129,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>33.2.0-jre</version>
+            <version>33.2.1-jre</version>
             <scope>provided</scope>
         </dependency>
         
@@ -131,13 +137,13 @@
         <dependency>
             <groupId>net.william278</groupId>
             <artifactId>papiproxybridge</artifactId>
-            <version>1.6.1</version>
+            <version>1.6.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>eu.kennytv.maintenance</groupId>
             <artifactId>maintenance-api</artifactId>
-            <version>4.2.0-SNAPSHOT</version>
+            <version>4.2.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -151,7 +157,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.10.2</version>
+            <version>5.10.3</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -173,7 +179,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.3</version>
+                <version>3.6.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <filters>

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

@@ -29,10 +29,11 @@ import ch.andre601.advancedserverlist.api.AdvancedServerListAPI;
 import ch.andre601.advancedserverlist.api.PlaceholderProvider;
 import ch.andre601.advancedserverlist.core.check.UpdateChecker;
 import ch.andre601.advancedserverlist.core.commands.CommandHandler;
+import ch.andre601.advancedserverlist.core.compat.maintenance.MaintenancePlaceholder;
 import ch.andre601.advancedserverlist.core.file.FileHandler;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import ch.andre601.advancedserverlist.core.profiles.conditions.ProfileConditionParser;
-import ch.andre601.advancedserverlist.core.profiles.players.PlayerHandler;
+import ch.andre601.advancedserverlist.core.profiles.handlers.PlayerHandler;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -59,7 +60,16 @@ public class AdvancedServerList<F>{
         this.commandHandler = new CommandHandler(this);
         this.playerHandler = new PlayerHandler(this);
         
-        placeholders.forEach(AdvancedServerList.getApi()::addPlaceholderProvider);
+        plugin.getPluginLogger().info("Registering internal Placeholders...");
+        
+        placeholders.forEach(this::addPlaceholder);
+        
+        if(plugin.isPluginEnabled("Maintenance")){
+            plugin.getPluginLogger().info("Found Maintenance Plugin. Registering extra Placeholder...");
+            addPlaceholder(new MaintenancePlaceholder(this));
+        }
+        
+        plugin.getPluginLogger().info("Completed internal Placeholder registration!");
         
         load();
     }
@@ -68,6 +78,10 @@ public class AdvancedServerList<F>{
         return new AdvancedServerList<>(plugin, Arrays.asList(placeholders));
     }
     
+    public static AdvancedServerListAPI getApi(){
+        return api;
+    }
+    
     public PluginCore<F> getPlugin(){
         return plugin;
     }
@@ -88,10 +102,6 @@ public class AdvancedServerList<F>{
         return version;
     }
     
-    public static AdvancedServerListAPI getApi(){
-        return api;
-    }
-    
     public ProfileConditionParser getParser(){
         return parser;
     }
@@ -195,4 +205,9 @@ public class AdvancedServerList<F>{
             version = "UNKNOWN";
         }
     }
+    
+    private void addPlaceholder(PlaceholderProvider placeholderProvider){
+        getPlugin().getPluginLogger().info("Registering %s Placeholders...", placeholderProvider.getIdentifier());
+        AdvancedServerList.getApi().addPlaceholderProvider(placeholderProvider);
+    }
 }

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

@@ -51,57 +51,60 @@ import java.util.concurrent.TimeUnit;
 
 public class UpdateChecker{
     
-    @SuppressWarnings("FieldCanBeLocal")
-    // 'https://api.modrinth.com/v2/project/advancedserverlist/version?loaders=["%s"]' URL encoded.
-    private final String url = "https://api.modrinth.com/v2/project/advancedserverlist/version?loaders=%%5B%%22%s%%22%%5D";
-    private final HttpClient client = HttpClient.newHttpClient();
-    
     private final Type listType = new TypeToken<ArrayList<ModrinthVersion>>(){}.getType();
     private final Gson gson = new GsonBuilder()
         .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
         .setPrettyPrinting()
-        .setLenient()
         .create();
     
     private final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(new UpdateCheckThread());
     
-    private final CacheUtil<ModrinthVersion> cache = new CacheUtil<>(Duration.ofMinutes(5));
+    private final CacheUtil<CompletableFuture<ModrinthVersion>> cache = new CacheUtil<>(Duration.ofMinutes(5));
     
     private final AdvancedServerList<?> core;
     private final PluginLogger logger;
     private final String loader;
+    private final HttpClient client;
     
     public UpdateChecker(AdvancedServerList<?> core){
         this.core = core;
         this.logger = core.getPlugin().getPluginLogger();
         this.loader = core.getPlugin().getLoader();
+        this.client = HttpClient.newBuilder().executor(Executors.newSingleThreadExecutor(new UpdateCheckThread())).build();
         
         startUpdateChecker();
     }
     
     public void performCachedUpdateCheck(CmdSender sender){
-        ModrinthVersion version = cache.get(() -> {
-            try{
-                return performUpdateCheck().join();
-            }catch(Exception ex){
-                return null;
+        CompletableFuture<ModrinthVersion> modrinthVersion = cache.get(this::performUpdateCheck);
+        
+        modrinthVersion.whenComplete((version, throwable) -> {
+            if(throwable != null){
+                logger.warn("Encountered an Exception while checking for an update!", throwable);
+                sender.sendErrorMsg("There was an exception while checking for an update. Please check the console for details.");
+                return;
+            }
+            
+            if(version == null)
+                return;
+            
+            int result = version.compare(core.getVersion());
+            if(result == -1){
+                sender.sendPrefixedMsg("<green>A new Version of AdvancedServerList is available!");
+                sender.sendPrefixedMsg("<green>Your version: <white>%s", core.getVersion());
+                sender.sendPrefixedMsg("<green>Version on Modrinth: <white>%s", version.versionNumber());
+                sender.sendPrefixedMsg(
+                    "<click:open_url:'https://modrinth.com/plugin/advancedserverlist/version/%s'>" +
+                    "<green>[<white>Download Page</white>]" +
+                    "</click>",
+                    version.id()
+                );
+            }else
+            if(result == 1){
+                sender.sendPrefixedMsg("You seem to run a newer Version (<white>%</white>) than what is available on Modrinth (<white>%s</white>).", core.getVersion(), version.versionNumber());
+                sender.sendPrefixedMsg("Are you running a development build?");
             }
         });
-        
-        if(version == null)
-            return;
-        
-        int result = version.compare(core.getVersion());
-        if(result == -1){
-            sender.sendPrefixedMsg("<green>A new version of AdvancedServerList is available!");
-            sender.sendPrefixedMsg("<green>Your version: <white>%s", core.getVersion());
-            sender.sendPrefixedMsg("<green>Modrinth: <white>%s", version.versionNumber());
-            sender.sendPrefixedMsg("<click:open_url:'https://modrinth.com/plugin/advancedserverlist/version/%s'><green>[<white>Download Page</white>]</click>", version.id());
-        }else
-        if(result == 1){
-            sender.sendPrefixedMsg("Your version (<white>%s</white>) seems newer than the latest release on Modrinth (<white>%s</white>)", core.getVersion(), version.versionNumber);
-            sender.sendPrefixedMsg("Are you running a dev-build?");
-        }
     }
     
     public void disable(){
@@ -144,7 +147,11 @@ public class UpdateChecker{
     }
     
     private CompletableFuture<ModrinthVersion> performUpdateCheck(){
-        String finalUrl = String.format(url, loader);
+        String finalUrl = String.format(
+            // 'https://api.modrinth.com/v2/project/advancedserverlist/version?loaders=["%s"]' URL encoded.
+            "https://api.modrinth.com/v2/project/advancedserverlist/version?loaders=%%5B%%22%s%%22%%5D",
+            loader
+        );
         
         logger.debug(UpdateChecker.class, "Checking '%s' for updates...", finalUrl);
         
@@ -157,6 +164,7 @@ public class UpdateChecker{
         try{
             request = HttpRequest.newBuilder()
                 .uri(new URI(finalUrl))
+                .timeout(Duration.ofSeconds(5))
                 .header("User-Agent", "AdvancedServerList-" + loader + "/" + core.getVersion())
                 .build();
         }catch(URISyntaxException ex){

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

@@ -25,13 +25,26 @@
 
 package ch.andre601.advancedserverlist.core.commands;
 
+import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
 import ch.andre601.advancedserverlist.core.interfaces.commands.PluginCommand;
+import ch.andre601.advancedserverlist.core.migration.minimotd.MiniMOTDConfigMigrator;
 import ch.andre601.advancedserverlist.core.migration.serverlistplus.SLPConfigMigrator;
+import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
+import ch.andre601.advancedserverlist.core.profiles.profile.ProfileSerializer;
+import org.spongepowered.configurate.ConfigurationNode;
+import org.spongepowered.configurate.serialize.SerializationException;
+import org.spongepowered.configurate.yaml.NodeStyle;
+import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.List;
+import java.util.Locale;
 
 public class CommandHandler{
     
@@ -39,13 +52,18 @@ public class CommandHandler{
     
     public CommandHandler(AdvancedServerList<?> core){
         subCommands = List.of(
-            new Help(),
+            new Help(core),
             new Reload(core),
             new ClearCache(core),
-            new Migrate(core)
+            new Migrate(core),
+            new Profiles(core)
         );
     }
     
+    public List<PluginCommand> getSubCommands(){
+        return subCommands;
+    }
+    
     public void handle(CmdSender sender, String[] args){
         if(args.length == 0){
             sender.sendErrorMsg("<red>Too few arguments! Use <grey>/asl help</grey> for a list of commands.");
@@ -53,11 +71,11 @@ public class CommandHandler{
         }
         
         for(PluginCommand subCommand : subCommands){
-            if(subCommand.getArgument().equalsIgnoreCase(args[0])){
-                if(!sender.hasPermission(subCommand.getPermission())){
+            if(subCommand.name().equalsIgnoreCase(args[0])){
+                if(!sender.hasPermission(subCommand.permission())){
                     sender.sendErrorMsg(
                         "<red>You do not have the permission <grey>%s</grey> to execute this command.",
-                        subCommand.getPermission()
+                        subCommand.permission()
                     );
                     return;
                 }
@@ -72,21 +90,54 @@ public class CommandHandler{
     
     private static class Help extends PluginCommand{
         
-        public Help(){
+        private final AdvancedServerList<?> core;
+        
+        public Help(AdvancedServerList<?> core){
             super("help");
+            
+            this.core = core;
         }
     
         @Override
         public void handle(CmdSender sender, String[] args){
-            sender.sendPrefixedMsg("- Commands");
-            sender.sendMsg();
-            sender.sendMsg("<aqua>/asl <white>help <grey>- Shows this help");
-            sender.sendMsg();
-            sender.sendMsg("<aqua>/asl <white>reload <grey>- Reloads the config.yml and profiles");
-            sender.sendMsg();
-            sender.sendMsg("<aqua>/asl <white>clearCache <grey>- Clears the Player and Favicon cache");
-            sender.sendMsg();
-            sender.sendMsg("<aqua>/asl <white>migrate <grey><</grey>plugin<grey>> - Migrates configuration of another plugin");
+            sender.sendPrefixedMsg("- Commands. Hover for details.");
+            for(PluginCommand command : core.getCommandHandler().getSubCommands()){
+                sender.sendPrefixedMsg("");
+                sender.sendPrefixedMsg(
+                    "<aqua><hover:show_text:\"%s\">" +
+                    "<click:suggest_command:/asl %s>" +
+                    "/asl <white>%s</white>" +
+                    "</click>" +
+                    "</hover></aqua>",
+                    getCommandHover(command),
+                    command.name(),
+                    command.name()
+                );
+            }
+        }
+        
+        @Override
+        public String usage(){
+            return "<aqua>/asl <white>help</white></aqua>";
+        }
+        
+        @Override
+        public String description(){
+            return "Shows all available commands.";
+        }
+        
+        private String getCommandHover(PluginCommand command){
+            return String.format(
+                """
+                <grey>Usage: %s
+                Permission: <white>%s</white>
+                
+                <white>%s</white>
+                """,
+                command.usage(),
+                command.permission(),
+                command.description()
+            );
         }
     }
     
@@ -118,6 +169,16 @@ public class CommandHandler{
             
             sender.sendPrefixedMsg("<green>Reload complete!");
         }
+        
+        @Override
+        public String usage(){
+            return "<aqua>/asl <white>reload</white></aqua>";
+        }
+        
+        @Override
+        public String description(){
+            return "Reloads the main config and all profiles.";
+        }
     }
     
     private static class ClearCache extends PluginCommand{
@@ -125,7 +186,7 @@ public class CommandHandler{
         private final AdvancedServerList<?> core;
         
         public ClearCache(AdvancedServerList<?> core){
-            super("clearCache");
+            super("clearcache");
             
             this.core = core;
         }
@@ -142,6 +203,16 @@ public class CommandHandler{
             
             sender.sendPrefixedMsg("<green>Cache clearing complete!");
         }
+        
+        @Override
+        public String usage(){
+            return "<aqua>/asl <white>clearcache</white></aqua>";
+        }
+        
+        @Override
+        public String description(){
+            return "Clears the Favicon and Player Cache.";
+        }
     }
     
     private static class Migrate extends PluginCommand{
@@ -160,6 +231,7 @@ public class CommandHandler{
                 sender.sendErrorMsg("<red>Insufficient arguments! Please provide a plugin to migrate from.");
                 sender.sendErrorMsg("<red>Available options:");
                 sender.sendErrorMsg(" - ServerListPlus");
+                sender.sendErrorMsg(" - MiniMOTD");
                 return;
             }
             
@@ -178,10 +250,208 @@ public class CommandHandler{
                 }else{
                     sender.sendPrefixedMsg("<green>Migration complete!");
                 }
+            }else
+            if(args[0].equalsIgnoreCase("minimotd")){
+                sender.sendPrefixedMsg("Migrating MiniMOTD configuration file...");
+                
+                if(MiniMOTDConfigMigrator.migrate(core, sender)){
+                    sender.sendPrefixedMsg("<green>Migration complete!");
+                }else{
+                    sender.sendErrorMsg("<red>Unable to migrate MiniMOTD configuration. Check console for details!");
+                }
             }else{
                 sender.sendErrorMsg("<red>Unknown plugin <grey>%s</grey>. Available Options:", args[0]);
                 sender.sendErrorMsg(" - ServerListPlus");
+                sender.sendErrorMsg(" - MiniMOTD");
             }
         }
+        
+        @Override
+        public String usage(){
+            return "<aqua>/asl <white>migrate <grey>\\<</grey>Plugin<grey>></grey></white></aqua>";
+        }
+        
+        @Override
+        public String description(){
+            return "Migrates the configuration from supported Plugins to AdvancedServerList.";
+        }
+    }
+    
+    private static class Profiles extends PluginCommand{
+        
+        private final AdvancedServerList<?> core;
+        
+        public Profiles(AdvancedServerList<?> core){
+            super("profiles");
+            
+            this.core = core;
+        }
+        
+        @Override
+        public void handle(CmdSender sender, String[] args){
+            if(args.length == 0){
+                sender.sendErrorMsg("<red>Invalid command usage.");
+                sender.sendErrorMsg("<red>Usage:</red> %s", usage());
+                return;
+            }
+            
+            switch(args[0].toLowerCase(Locale.ROOT)){
+                case "list" -> {
+                    sender.sendPrefixedMsg("Available Profiles:");
+                    core.getFileHandler().getProfiles().stream()
+                        .sorted(Comparator.comparingInt(ServerListProfile::priority).reversed())
+                        .forEach(
+                            profile -> sender.sendPrefixedMsg("- <white><hover:show_text:\"%s\">%s</hover></white>", getHover(profile), profile.file())
+                        );
+                }
+                case "add" -> {
+                    if(args.length == 1){
+                        sender.sendErrorMsg("<red>Insufficient arguments.");
+                        sender.sendErrorMsg("<red>Usage:</red> /asl profiles add <name>");
+                        return;
+                    }
+                    
+                    String name = getProfileName(args[1]);
+                    
+                    if(core.getFileHandler().getProfiles().stream().anyMatch(profile -> profile.file().equalsIgnoreCase(name))){
+                        sender.sendErrorMsg("<red>A profile with file name</red> %s <red>already exists!", name);
+                        return;
+                    }
+                    
+                    if(core.getFileHandler().createFile(name)){
+                        sender.sendPrefixedMsg("<green>Successfully created</green> %s<green>!", name);
+                        sender.sendPrefixedMsg("<green>Load the file using</green> /asl reload");
+                    }else{
+                        sender.sendErrorMsg("<red>Error while trying to create</red> %s<red>!", name);
+                        sender.sendErrorMsg("<red>Check console for further details.");
+                    }
+                }
+                case "copy" -> {
+                    if(args.length < 3){
+                        sender.sendErrorMsg("<red>Insufficient arguments.");
+                        sender.sendErrorMsg("<red>Usage:</red> /asl profiles copy <profile> <name>");
+                        return;
+                    }
+                    
+                    String name = getProfileName(args[1]);
+                    String copy = getProfileName(args[2]);
+                    
+                    ServerListProfile targetProfile = core.getFileHandler().getProfiles().stream()
+                        .filter(file -> file.file().equalsIgnoreCase(name))
+                        .findFirst()
+                        .orElse(null);
+                    boolean copyExists = core.getFileHandler().getProfiles().stream()
+                        .anyMatch(profile -> profile.file().equals(copy));
+                    
+                    if(targetProfile == null){
+                        sender.sendErrorMsg("<red>There is no file with name</red> %s<red>!", name);
+                        return;
+                    }
+                    
+                    if(copyExists){
+                        sender.sendErrorMsg("<red>A profile with file name</red> %s <red>already exists!", copy);
+                        return;
+                    }
+                    
+                    Path profilePath = core.getPlugin().getFolderPath().resolve("profiles").resolve(copy);
+                    try{
+                        Files.createFile(profilePath);
+                    }catch(IOException ex){
+                        sender.sendErrorMsg("<red>There was an error while creating the file</red> %s<red>!", copy);
+                        sender.sendErrorMsg("<red>Check console for further details.");
+                        
+                        core.getPlugin().getPluginLogger().warn("Encountered IOException while creating file %s", ex, copy);
+                        return;
+                    }
+                    
+                    YamlConfigurationLoader loader = YamlConfigurationLoader.builder()
+                        .path(profilePath)
+                        .indent(2)
+                        .nodeStyle(NodeStyle.BLOCK)
+                        .defaultOptions(options -> options.serializers(builder -> builder.register(ProfileEntry.class, ProfileSerializer.INSTANCE)))
+                        .build();
+                    
+                    ConfigurationNode node;
+                    try{
+                        node = loader.load();
+                    }catch(IOException ex){
+                        sender.sendErrorMsg("<red>There was an error while loading the file</red> %s<red>!", copy);
+                        sender.sendErrorMsg("<red>Check console for further details.");
+                        
+                        core.getPlugin().getPluginLogger().warn("Encountered IOException while loading file %s", ex, copy);
+                        return;
+                    }
+                    
+                    if(node == null){
+                        sender.sendErrorMsg("Cannot copy</red> %s <red>to</red> %s<red>. ConfigurationNode was null.", name, copy);
+                        return;
+                    }
+                    
+                    try{
+                        node.node("priority").set(targetProfile.priority());
+                        node.node("condition").set(targetProfile.condition());
+                        
+                        node.node("profiles").setList(ProfileEntry.class, targetProfile.profiles());
+                        
+                        node.set(ProfileEntry.class, targetProfile.defaultProfile());
+                    }catch(SerializationException ex){
+                        sender.sendErrorMsg("<red>There was an Error while copying values from</red> %s <red>to</red> %s<red>.", name, copy);
+                        sender.sendErrorMsg("<red>Check console for details.");
+                        
+                        core.getPlugin().getPluginLogger().warn("Encountered SerializationException while set values for %s!", ex, copy);
+                        return;
+                    }
+                    
+                    try{
+                        loader.save(node);
+                        sender.sendPrefixedMsg("<green>Successfully created copy of</green> %s <green>as</green> %s<green>!", name, copy);
+                        sender.sendPrefixedMsg("<green>Load the file using</green> /asl reload");
+                    }catch(IOException ex){
+                        sender.sendErrorMsg("<red>There was an Error while trying to save</red> %s<red>!", copy);
+                        sender.sendErrorMsg("<red>Check console for details.");
+                        
+                        core.getPlugin().getPluginLogger().warn("Encountered IOException while saving ConfigurationNode for %s!", ex, copy);
+                    }
+                }
+                default -> {
+                    sender.sendErrorMsg("<red>Unknown argument</red> %s<red>!", args[0]);
+                    sender.sendErrorMsg("<red>Usage:</red> %s", usage());
+                }
+            }
+        }
+        
+        @Override
+        public String usage(){
+            return "<aqua>/asl <white>profiles</white> <grey>\\<" +
+                "<white>add</white> \\<<white>name</white>> | " +
+                "<white>copy</white> \\<<white>profile</white>> \\<<white>name</white>> | " +
+                "<white>list</white>" +
+                "></grey></aqua>";
+        }
+        
+        @Override
+        public String description(){
+            return "Creates a new profile, copies one from an existing file, or lists all available profiles.";
+        }
+        
+        private String getHover(ServerListProfile profile){
+            return String.format(
+                """
+                <grey>Priority: <white>%s</white>
+                Condition: <white>%s</white>
+                
+                Valid profile: %s
+                """,
+                profile.priority(),
+                profile.condition() == null || profile.condition().isEmpty() ? "<i>None</i>" : profile.condition(),
+                profile.isInvalidProfile() ? "<red>No</red>" : "<green>Yes</green>"
+            );
+        }
+        
+        private String getProfileName(String name){
+            String fileName = name.toLowerCase(Locale.ROOT);
+            
+            return fileName.endsWith(".yml") ? fileName : fileName + ".yml";
+        }
     }
 }

core/src/main/java/ch/andre601/advancedserverlist/core/compat/maintenance/MaintenancePlaceholder.java

@@ -0,0 +1,24 @@
+package ch.andre601.advancedserverlist.core.compat.maintenance;
+
+import ch.andre601.advancedserverlist.api.PlaceholderProvider;
+import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
+import ch.andre601.advancedserverlist.api.objects.GenericServer;
+import ch.andre601.advancedserverlist.core.AdvancedServerList;
+
+public class MaintenancePlaceholder extends PlaceholderProvider{
+    
+    private final AdvancedServerList<?> plugin;
+    
+    public MaintenancePlaceholder(AdvancedServerList<?> plugin){
+        super("maintenance");
+        
+        this.plugin = plugin;
+    }
+    @Override
+    public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
+        if(!placeholder.equals("maintenanceEnabled") || !plugin.getPlugin().isPluginEnabled("Maintenance"))
+            return null;
+        
+        return String.valueOf(MaintenanceUtil.get().isMaintenanceEnabled());
+    }
+}

core/src/main/java/ch/andre601/advancedserverlist/core/compat/maintenance/MaintenanceUtil.java

@@ -30,12 +30,21 @@ import eu.kennytv.maintenance.api.MaintenanceProvider;
 
 public class MaintenanceUtil{
     
+    private static MaintenanceUtil instance;
+    
     private final Maintenance api;
     
-    public MaintenanceUtil(){
+    private MaintenanceUtil(){
         this.api = MaintenanceProvider.get();
     }
     
+    public static MaintenanceUtil get(){
+        if(instance != null)
+            return instance;
+        
+        return (instance = new MaintenanceUtil());
+    }
+    
     public boolean isMaintenanceEnabled(){
         return api.isMaintenance();
     }

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

@@ -34,19 +34,26 @@ import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.CancellationException;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 
 public class PAPIUtil{
     
-    private final PlaceholderAPI papi;
+    private static PAPIUtil instance;
     
     private final CacheUtil<String> cache = new CacheUtil<>(Duration.ofSeconds(5));
+    private final PlaceholderAPI papi;
     
-    public PAPIUtil(){
+    private PAPIUtil(){
         this.papi = PlaceholderAPI.createInstance();
     }
     
+    public static PAPIUtil get(){
+        if(instance != null)
+            return instance;
+        
+        return (instance = new PAPIUtil());
+    }
+    
     // Make sure the version of PAPIProxyBridge we get has the required methods we need...
     @SuppressWarnings("BooleanMethodIsAlwaysInverted")
     public boolean isCompatible(){
@@ -88,8 +95,7 @@ public class PAPIUtil{
     
     public String parse(String text, UUID carrier, UUID player){
         try{
-            CompletableFuture<String> future = papi.formatPlaceholders(text, carrier, player);
-            return future.getNow(text);
+            return papi.formatPlaceholders(text, carrier, player).getNow(text);
         }catch(IllegalArgumentException | CancellationException | CompletionException ex){
             return text;
         }

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

@@ -29,8 +29,6 @@ import ch.andre601.advancedserverlist.api.events.GenericServerListEvent;
 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
 import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
-import ch.andre601.advancedserverlist.core.compat.maintenance.MaintenanceUtil;
-import ch.andre601.advancedserverlist.core.compat.papi.PAPIUtil;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import ch.andre601.advancedserverlist.core.interfaces.events.GenericEventWrapper;
@@ -41,9 +39,6 @@ import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
 
 public class PingEventHandler{
     
-    private static PAPIUtil papiUtil = null;
-    private static MaintenanceUtil maintenanceUtil = null;
-    
     public static <F, P extends GenericPlayer> ProfileEntry handleEvent(GenericEventWrapper<F, P> event){
         event.getPlugin().getPluginLogger().debug(PingEventHandler.class, "Received ping event. Handling it...");
         if(event.isInvalidProtocol()){
@@ -169,20 +164,6 @@ public class PingEventHandler{
         return entry;
     }
     
-    public static PAPIUtil getPAPIUtil(){
-        if(papiUtil != null)
-            return papiUtil;
-        
-        return (papiUtil = new PAPIUtil());
-    }
-    
-    public static MaintenanceUtil getMaintenanceUtil(){
-        if(maintenanceUtil != null)
-            return maintenanceUtil;
-        
-        return (maintenanceUtil = new MaintenanceUtil());
-    }
-    
     private static <F, P extends GenericPlayer> boolean ignoreMaintenance(GenericEventWrapper<F, P> event, String option){
         if(!event.isMaintenanceModeActive())
             return true;

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

@@ -99,23 +99,36 @@ public class FileHandler{
     
     public boolean loadProfiles(){
         logger.info("Loading profiles...");
-        if(!profilesFolder.toFile().exists() && profilesFolder.toFile().mkdirs()){
+        
+        if(createFile("default.yml")){
+            return reloadProfiles();
+        }else{
+            return false;
+        }
+    }
+    
+    public boolean createFile(String name){
+        if(Files.notExists(profilesFolder) && profilesFolder.toFile().mkdirs()){
             logger.info("Successfully created profiles folder.");
-            
-            try(InputStream stream = plugin.getClass().getResourceAsStream("/profiles/default.yml")){
-                if(stream == null){
-                    logger.warn("Cannot retrieve default.yml from Plugin.");
-                    return false;
-                }
-                
-                Files.copy(stream, profilesFolder.resolve("default.yml"));
-            }catch(IOException ex){
-                logger.warn("Cannot create default.yml for plugin.", ex);
-                return false;
-            }
         }
         
-        return reloadProfiles();
+        File file = new File(profilesFolder.toFile(), name);
+        if(file.exists()){
+            return true;
+        }
+        
+        try(InputStream stream = plugin.getClass().getResourceAsStream("/profiles/default.yml")){
+            if(stream == null){
+                logger.warn("Cannot retrieve content of internal default.yml file.");
+                return false;
+            }
+            
+            Files.copy(stream, profilesFolder.resolve(name));
+            return true;
+        }catch(IOException ex){
+            logger.warn("Encountered IOException while trying to create file %s", ex, name);
+            return false;
+        }
     }
     
     public boolean migrateConfig(){

core/src/main/java/ch/andre601/advancedserverlist/core/interfaces/commands/PluginCommand.java

@@ -35,13 +35,17 @@ public abstract class PluginCommand{
         this.argument = argument;
     }
     
-    public String getArgument(){
+    public String name(){
         return argument;
     }
     
-    public String getPermission(){
-        return "advancedserverlist.command." + getArgument().toLowerCase(Locale.ROOT);
+    public String permission(){
+        return "advancedserverlist.command." + name().toLowerCase(Locale.ROOT);
     }
     
     public abstract void handle(CmdSender sender, String[] args);
+    
+    public abstract String usage();
+    
+    public abstract String description();
 }

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

@@ -27,7 +27,7 @@ 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 ch.andre601.advancedserverlist.core.profiles.handlers.FaviconHandler;
 
 import java.awt.image.BufferedImage;
 import java.nio.file.Path;
@@ -44,6 +44,8 @@ public interface PluginCore<F>{
     
     void clearFaviconCache();
     
+    void downloadLibrary(String groupId, String artifactId, String version);
+    
     AdvancedServerList<F> getCore();
     
     Path getFolderPath();

core/src/main/java/ch/andre601/advancedserverlist/core/migration/minimotd/MiniMOTDConfigMigrator.java

@@ -0,0 +1,235 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 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.migration.minimotd;
+
+import ch.andre601.advancedserverlist.api.objects.NullBool;
+import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
+import ch.andre601.advancedserverlist.core.AdvancedServerList;
+import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
+import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
+import ch.andre601.advancedserverlist.core.migration.minimotd.serializing.MiniMOTDConfig;
+import ch.andre601.advancedserverlist.core.migration.minimotd.serializing.MiniMOTDSerializer;
+import ch.andre601.advancedserverlist.core.profiles.profile.ProfileSerializer;
+import org.spongepowered.configurate.ConfigurationNode;
+import org.spongepowered.configurate.hocon.HoconConfigurationLoader;
+import org.spongepowered.configurate.serialize.SerializationException;
+import org.spongepowered.configurate.yaml.NodeStyle;
+import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class MiniMOTDConfigMigrator{
+    
+    public static boolean migrate(AdvancedServerList<?> core, CmdSender sender){
+        core.getPlugin().downloadLibrary("org.spongepowered", "configurate-hocon", "4.1.2");
+        
+        PluginLogger logger = core.getPlugin().getPluginLogger();
+        String folder = core.getPlugin().getLoader().equals("velocity") ? "minimotd-velocity" : "MiniMOTD";
+        
+        Path mainConf = core.getPlugin().getFolderPath().getParent().resolve(folder).resolve("main.conf");
+        if(!Files.exists(mainConf)){
+            logger.warn("[Migrator - MiniMOTD] Cannot find a main.conf file in /plugins/%s/ folder.", folder);
+            sender.sendErrorMsg(" -> <red>No main.conf file found.");
+            return false;
+        }
+        
+        HoconConfigurationLoader loader = HoconConfigurationLoader.builder()
+            .path(mainConf)
+            .defaultOptions(options -> options.serializers(builder -> 
+                builder.register(MiniMOTDConfig.class, MiniMOTDSerializer.MINI_MOTD_SERIALIZER)
+                    .register(MiniMOTDConfig.Motd.class, MiniMOTDSerializer.MOTD_SERIALIZER)
+                    .register(MiniMOTDConfig.PlayerCount.class, MiniMOTDSerializer.PLAYER_COUNT_SERIALIZER)
+            ))
+            .build();
+        
+        MiniMOTDConfig config;
+        try{
+            ConfigurationNode node = loader.load();
+            
+            config = node.get(MiniMOTDConfig.class);
+        }catch(IOException ex){
+            logger.warn("[Migrator - MiniMOTD] Encountered IOException while loading main.conf file.", ex);
+            sender.sendErrorMsg(" -> <red>IOException while loading</red> main.conf <red>file.");
+            return false;
+        }
+        
+        if(config == null){
+            logger.warn("[Migrator - MiniMOTD] Retrieved main.conf file returned null.");
+            sender.sendErrorMsg(" -> <red>Received invalid</red> main.conf <red>file.");
+            return false;
+        }
+        
+        ProfileEntry.Builder profileBuilder = ProfileEntry.empty().builder();
+        List<ProfileEntry.Builder> profilesBuilders = new ArrayList<>();
+        
+        if(config.motdEnabled() && config.motds().size() > 1){
+            for(int i = 0; i < config.motds().size(); i++){
+                profilesBuilders.add(ProfileEntry.empty().builder());
+            }
+        }
+        
+        if(config.motdEnabled()){
+            if(config.motds().size() == 1){
+                applyMotd(profileBuilder, config.motds().get(0));
+            }else
+            if(config.motds().size() > 1){
+                for(int i = 0; i < config.motds().size(); i++){
+                    applyMotd(profilesBuilders.get(i), config.motds().get(i));
+                }
+            }
+        }
+        
+        if(config.iconEnabled()){
+            if(config.motds().size() == 1){
+                MiniMOTDConfig.Motd motd = config.motds().get(0);
+                if(!motd.icon().isEmpty() && !motd.icon().equalsIgnoreCase("random")){
+                    profileBuilder.favicon(motd.icon());
+                }
+            }else
+            if(config.motds().size() > 1){
+                for(int i = 0; i < config.motds().size(); i++){
+                    MiniMOTDConfig.Motd motd = config.motds().get(i);
+                    if(!motd.icon().isEmpty() && !motd.icon().equalsIgnoreCase("random")){
+                        profilesBuilders.get(i).favicon(motd.icon());
+                    }
+                }
+            }
+        }
+        
+        if(config.playerCount() != null){
+            MiniMOTDConfig.PlayerCount playerCount = config.playerCount();
+            
+            NullBool hidePlayers = NullBool.resolve(playerCount.hidePlayers());
+            NullBool xMoreEnabled = NullBool.resolve(playerCount.xMoreEnabled());
+            int xMore = playerCount.xMore();
+            NullBool maxPlayersEnabled = NullBool.resolve(playerCount.maxPlayersEnabled());
+            int maxPlayers = playerCount.maxPlayers();
+            
+            profileBuilder.hidePlayersEnabled(hidePlayers)
+                .extraPlayersEnabled(xMoreEnabled)
+                .extraPlayersCount(xMore)
+                .maxPlayersEnabled(maxPlayersEnabled)
+                .maxPlayersCount(maxPlayers);
+        }
+        
+        ProfileEntry entry = profileBuilder.build();
+        List<ProfileEntry> profiles = profilesBuilders.stream()
+            .map(ProfileEntry.Builder::build)
+            .toList();
+        
+        boolean profilesInvalid = profiles.isEmpty() || profiles.stream().allMatch(ProfileEntry::isInvalid);
+        if(entry.isInvalid() && profilesInvalid){
+            logger.warn("[Migrator - MiniMOTD] Main ProfileEntry was invalid and profiles were empty.");
+            sender.sendErrorMsg(" -> <red>Received invalid configuration.");
+            return false;
+        }
+        
+        Path profile = core.getPlugin().getFolderPath().resolve("profiles").resolve("minimotd_migrated.yml");
+        if(Files.exists(profile)){
+            logger.warn("[Migrator - MiniMOTD] Cannot create new file minimotd_migrated.yml. One with the same name is already present.");
+            sender.sendErrorMsg(" -> <red>File</red> minimotd_migrated.yml <red>already present.");
+            
+            return false;
+        }
+        
+        try{
+            Files.createFile(profile);
+        }catch(IOException ex){
+            logger.warn("[Migrator - MiniMOTD] Encountered an IOException while trying to create file minimotd_migrated.yml.", ex);
+            sender.sendErrorMsg(" -> <red>File creation error.");
+            
+            return false;
+        }
+        
+        YamlConfigurationLoader yamlLoader = YamlConfigurationLoader.builder()
+            .path(profile)
+            .indent(2)
+            .nodeStyle(NodeStyle.BLOCK)
+            .defaultOptions(option -> option.serializers(builder -> builder.register(ProfileEntry.class, ProfileSerializer.INSTANCE)))
+            .build();
+        
+        ConfigurationNode migrated;
+        try{
+            migrated = yamlLoader.load();
+        }catch(IOException ex){
+            logger.warn("[Migrator - MiniMOTD] Encountered an IOException while trying to load file minimotd_migrated.yml.", ex);
+            sender.sendErrorMsg(" -> <red>File loading error.");
+            
+            return false;
+        }
+        
+        if(migrated == null){
+            logger.warn("[Migrator - MiniMOTD] Cannot migrate Configuration. ConfigurationNode was null.");
+            sender.sendErrorMsg(" -> <red>File loading error.");
+            
+            return false;
+        }
+        
+        try{
+            migrated.node("priority").set(0);
+            
+            if(!profiles.isEmpty()){
+                migrated.node("profiles").setList(ProfileEntry.class, profiles);
+            }
+            
+            migrated.set(entry);
+        }catch(SerializationException ex){
+            logger.warn("[Migrator - MiniMOTD] Encountered a SerializationException while setting values.", ex);
+            sender.sendErrorMsg(" -> <red>Error while updating file</red> minimotd_migrated.yml<red>.");
+            
+            return false;
+        }
+        
+        try{
+            yamlLoader.save(migrated);
+            sender.sendPrefixedMsg(" -> <green>Completed!");
+            
+            return true;
+        }catch(IOException ex){
+            logger.warn("[Migrator - MiniMOTD] Encountered an IOException while trying to save new file minimotd_migrated.yml.", ex);
+            sender.sendErrorMsg(" -> <red>File saving error.");
+            
+            return false;
+        }
+    }
+    
+    private static void applyMotd(ProfileEntry.Builder builder, MiniMOTDConfig.Motd motd){
+        if(motd.line1().isEmpty() && !motd.line2().isEmpty()){
+            builder.motd(List.of("<grey>", motd.line2()));
+        }else
+        if(!motd.line1().isEmpty() && motd.line2().isEmpty()){
+            builder.motd(Collections.singletonList(motd.line1()));
+        }else
+        if(!motd.line1().isEmpty()){ // Line2 is by logic not empty here. So this check is not required.
+            builder.motd(List.of(motd.line1(), motd.line2()));
+        }
+    }
+}

core/src/main/java/ch/andre601/advancedserverlist/core/migration/minimotd/serializing/MiniMOTDConfig.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022-2023 Andre_601
+ * Copyright (c) 2022-2024 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
@@ -23,30 +23,13 @@
  *
  */
 
-package ch.andre601.advancedserverlist.core.profiles.players;
+package ch.andre601.advancedserverlist.core.migration.minimotd.serializing;
 
-import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
+import java.util.List;
 
-import java.util.UUID;
-
-public abstract class GenericPlayerImpl implements GenericPlayer{
+public record MiniMOTDConfig(boolean iconEnabled, boolean motdEnabled, List<Motd> motds, PlayerCount playerCount){
     
-    protected String name = null;
-    protected int protocol = 0;
-    protected UUID uuid = null;
+    public record Motd(String icon, String line1, String line2){}
     
-    @Override
-    public String getName(){
-        return name;
-    }
-    
-    @Override
-    public int getProtocol(){
-        return protocol;
-    }
-    
-    @Override
-    public UUID getUUID(){
-        return uuid;
-    }
+    public record PlayerCount(boolean hidePlayers, boolean xMoreEnabled, int xMore, boolean maxPlayersEnabled, int maxPlayers){}
 }

core/src/main/java/ch/andre601/advancedserverlist/core/migration/minimotd/serializing/MiniMOTDSerializer.java

@@ -0,0 +1,129 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 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.migration.minimotd.serializing;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.spongepowered.configurate.ConfigurationNode;
+import org.spongepowered.configurate.serialize.SerializationException;
+import org.spongepowered.configurate.serialize.TypeSerializer;
+
+import java.lang.reflect.Type;
+import java.util.Collections;
+import java.util.List;
+
+public class MiniMOTDSerializer implements TypeSerializer<MiniMOTDConfig>{
+    
+    public static final MiniMOTDSerializer MINI_MOTD_SERIALIZER = new MiniMOTDSerializer();
+    public static final MotdSerializer MOTD_SERIALIZER = new MotdSerializer();
+    public static final PlayerCountSerializer PLAYER_COUNT_SERIALIZER = new PlayerCountSerializer();
+    
+    @Override
+    public MiniMOTDConfig deserialize(Type type, ConfigurationNode node) throws SerializationException{
+        boolean iconsEnabled = node.node("icon-enabled").getBoolean();
+        boolean motdEnabled = node.node("motd-enabled").getBoolean();
+        
+        List<MiniMOTDConfig.Motd> motds = node.node("motds").getList(MiniMOTDConfig.Motd.class);
+        MiniMOTDConfig.PlayerCount playerCount = node.node("player-count-settings").get(MiniMOTDConfig.PlayerCount.class);
+        
+        return new MiniMOTDConfig(iconsEnabled, motdEnabled, motds, playerCount);
+    }
+    
+    @Override
+    public void serialize(Type type, @Nullable MiniMOTDConfig obj, ConfigurationNode node) throws SerializationException{
+        if(obj == null){
+            node.raw(null);
+            return;
+        }
+        
+        node.node("icon-enabled").set(obj.iconEnabled());
+        node.node("motd-enable").set(obj.motdEnabled());
+        node.node("motds").setList(MiniMOTDConfig.Motd.class, obj.motds());
+        node.node("player-count-settings").set(MiniMOTDConfig.PlayerCount.class, obj.playerCount());
+    }
+    
+    public static class MotdSerializer implements TypeSerializer<MiniMOTDConfig.Motd>{
+        
+        @Override
+        public MiniMOTDConfig.Motd deserialize(Type type, ConfigurationNode node) throws SerializationException{
+            String icon = node.node("icon").getString("");
+            String line1 = node.node("line1").getString("");
+            String line2 = node.node("line2").getString("");
+            
+            return new MiniMOTDConfig.Motd(icon, line1, line2);
+        }
+        
+        @Override
+        public void serialize(Type type, MiniMOTDConfig.@Nullable Motd obj, ConfigurationNode node) throws SerializationException{
+            if(obj == null){
+                node.raw(null);
+                return;
+            }
+            
+            node.node("icon").set(obj.icon());
+            node.node("line1").set(obj.line1());
+            node.node("line2").set(obj.line2());
+        }
+    }
+    
+    public static class PlayerCountSerializer implements TypeSerializer<MiniMOTDConfig.PlayerCount>{
+        
+        @Override
+        public MiniMOTDConfig.PlayerCount deserialize(Type type, ConfigurationNode node) throws SerializationException{
+            boolean hidePlayerCount = node.node("hide-player-count").getBoolean();
+            boolean xMoreEnabled = node.node("just-x-more-settings", "just-x-more-enabled").getBoolean();
+            int xMore = node.node("just-x-more-settings", "x-value").getInt();
+            boolean maxPlayersEnabled = node.node("max-players-enabled").getBoolean();
+            int maxPlayers = node.node("max-players").getInt();
+            
+            
+            return new MiniMOTDConfig.PlayerCount(hidePlayerCount, xMoreEnabled, xMore, maxPlayersEnabled, maxPlayers);
+        }
+        
+        @Override
+        public void serialize(Type type, MiniMOTDConfig.@Nullable PlayerCount obj, ConfigurationNode node) throws SerializationException{
+            if(obj == null){
+                node.raw(null);
+                return;
+            }
+            
+            node.node("allow-exceeding-maximum").set(false);
+            node.node("disable-player-list-hover").set(false);
+            
+            node.node("fake-players", "fake-players").set("25%");
+            node.node("fake-players", "fake-players-enabled").set(false);
+            
+            node.node("hide-player-count").set(obj.hidePlayers());
+            
+            node.node("just-x-more-settings", "just-x-more-enabled").set(obj.xMoreEnabled());
+            node.node("just-x-more-settings", "x-value").set(obj.xMore());
+            
+            node.node("max-players").set(obj.maxPlayers());
+            node.node("max-players-enabled").set(obj.maxPlayersEnabled());
+            
+            node.node("servers").setList(String.class, Collections.emptyList());
+        }
+    }
+}

core/src/main/java/ch/andre601/advancedserverlist/core/migration/serverlistplus/SLPConfigMigrator.java

@@ -139,7 +139,8 @@ public class SLPConfigMigrator{
             .map(ProfileEntry.Builder::build)
             .toList();
         
-        if(entry.isInvalid() && profileEntries.isEmpty()){
+        boolean profilesInvalid = profileEntries.isEmpty() || profileEntries.stream().anyMatch(ProfileEntry::isInvalid);
+        if(entry.isInvalid() && profilesInvalid){
             logger.warn("[Migrator - ServerListPlus] Unable to parse ServerListPlus configuration of type %s. Generated ProfileEntry was invalid.", type.getName());
             sender.sendErrorMsg(" -> <red>Received invalid Configuration.");
             
@@ -208,7 +209,7 @@ public class SLPConfigMigrator{
             
             node.set(entry);
         }catch(SerializationException ex){
-            logger.warn("Encountered a SerializationException while setting values.", ex);
+            logger.warn("[Migrator - ServerListPlus] Encountered a SerializationException while setting values.", ex);
             sender.sendErrorMsg(" -> <red>Error while updating file</red> %s<red>.", type.getFile());
             
             return 0;

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

@@ -28,8 +28,8 @@ package ch.andre601.advancedserverlist.core.profiles;
 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
 import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
+import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
-import ch.andre601.advancedserverlist.core.profiles.conditions.ProfileConditionParser;
 import ch.andre601.expressionparser.ParseWarnCollector;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
@@ -41,13 +41,14 @@ import java.util.Random;
 public record ServerListProfile(int priority, String condition, ProfileEntry defaultProfile, List<ProfileEntry> profiles, String file){
     private static final Random random = new Random();
     
-    public boolean evalConditions(ProfileConditionParser parser, PluginLogger logger, GenericPlayer player, GenericServer server){
+    public boolean evalConditions(AdvancedServerList<?> core, GenericPlayer player, GenericServer server){
         if(condition == null || condition.isEmpty())
             return true;
         
         ParseWarnCollector collector = new ParseWarnCollector(condition);
+        PluginLogger logger = core.getPlugin().getPluginLogger();
         
-        boolean result = parser.evaluate(condition, player, server, collector);
+        boolean result = core.getParser().evaluate(condition, player, server, collector);
         
         if(collector.hasWarnings()){
             logger.warn("Encountered %d Error(s) while parsing condition for file '%s':", collector.getWarnings().size(), file);
@@ -55,9 +56,8 @@ public record ServerListProfile(int priority, String condition, ProfileEntry def
             for(ParseWarnCollector.Context context : collector.getWarnings()){
                 logger.warn("  - At position %s:", context.position() == -1 ? "Unknown" : context.position());
                 logger.warn("    %s", condition);
-                logger.warn(" ".repeat(context.position() + 5) + "^");
+                logger.warn(" ".repeat(context.position() + 4) + "^");
                 logger.warn("    -> %s", context.message());
-                
             }
         }
         
@@ -120,13 +120,6 @@ public record ServerListProfile(int priority, String condition, ProfileEntry def
             this.logger = logger;
         }
         
-        public Builder(String filename, int priority, PluginLogger logger){
-            this.fileName = filename;
-            this.node = null;
-            this.priority = priority;
-            this.logger = logger;
-        }
-        
         public static Builder resolve(String fileName, ConfigurationNode node, PluginLogger logger){
             return new Builder(fileName, node, logger)
                 .resolveCondition()

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

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022-2023 Andre_601
+ * Copyright (c) 2022-2024 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
@@ -23,7 +23,7 @@
  *
  */
 
-package ch.andre601.advancedserverlist.core.profiles.favicon;
+package ch.andre601.advancedserverlist.core.profiles.handlers;
 
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;

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

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022-2023 Andre_601
+ * Copyright (c) 2022-2024 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
@@ -23,7 +23,7 @@
  *
  */
 
-package ch.andre601.advancedserverlist.core.profiles.players;
+package ch.andre601.advancedserverlist.core.profiles.handlers;
 
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
@@ -66,7 +66,7 @@ public class PlayerHandler{
     }
     
     public void load(){
-        if(!cache.toFile().exists()){
+        if(!Files.exists(cache)){
             logger.info("No playercache.json file present. Skipping...");
             return;
         }
@@ -82,7 +82,7 @@ public class PlayerHandler{
             logger.warn("Encountered IOException while reading the playercache.json file!", ex);
             return;
         }catch(JsonIOException | JsonSyntaxException ex){
-            logger.warn("Encountered Json exception while parsing playercache.json file!", ex);
+            logger.warn("Encountered JsonSyntaxException while parsing playercache.json file!", ex);
             return;
         }
         

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/profile/ProfileManager.java

@@ -36,6 +36,7 @@ import org.spongepowered.configurate.serialize.SerializationException;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.function.Function;
 
 public class ProfileManager{
     
@@ -44,22 +45,21 @@ public class ProfileManager{
      * If the random profile's value is not null will it be used instead of the default one.
      */
     public static ProfileEntry merge(ServerListProfile profile){
-        ProfileEntry entry = profile.getRandomProfile();
         ProfileEntry defEntry = profile.defaultProfile();
+        ProfileEntry entry = profile.getRandomProfile();
         
-        List<String> motd = resolveMOTD(entry, defEntry);
-        List<String> players = resolvePlayers(entry, defEntry);
-        String playerCountText = resolvePlayerCountText(entry, defEntry);
-        String favicon = resolveFavicon(entry, defEntry);
-        boolean isHidePlayersEnabled = resolveHidePlayersEnabled(entry, defEntry);
-        boolean isExtraPlayersEnabled = resolveExtraPlayersEnabled(entry, defEntry);
-        boolean isMaxPlayersEnabled = resolveMaxPlayersEnabled(entry, defEntry);
-        Integer extraPlayersCount = resolveExtraPlayersCount(entry, defEntry);
-        Integer maxPlayersCount = resolveMaxPlayersCount(entry, defEntry);
+        List<String> motd = resolve(defEntry, entry, ProfileEntry::motd);
+        List<String> players = resolve(defEntry, entry, ProfileEntry::players);
+        String playerCountText = resolve(defEntry, entry, ProfileEntry::playerCountText);
+        String favicon = resolve(defEntry, entry, ProfileEntry::favicon);
+        NullBool hidePlayersEnabled = resolve(defEntry, entry, ProfileEntry::hidePlayersEnabled);
+        NullBool extraPlayersEnabled = resolve(defEntry, entry, ProfileEntry::extraPlayersEnabled);
+        NullBool maxPlayersEnabled = resolve(defEntry, entry, ProfileEntry::maxPlayersEnabled);
+        Integer extraPlayersCount = resolve(defEntry, entry, ProfileEntry::extraPlayersCount);
+        Integer maxPlayersCount = resolve(defEntry, entry, ProfileEntry::maxPlayersCount);
         
-        return new ProfileEntry(motd, players, playerCountText, favicon, 
-            NullBool.resolve(isHidePlayersEnabled), NullBool.resolve(isExtraPlayersEnabled), NullBool.resolve(isMaxPlayersEnabled),
-            extraPlayersCount, maxPlayersCount);
+        return new ProfileEntry(motd, players, playerCountText, favicon, hidePlayersEnabled, extraPlayersEnabled,
+            maxPlayersEnabled, extraPlayersCount, maxPlayersCount);
     }
     
     public static ServerListProfile resolveProfile(AdvancedServerList<?> core, GenericPlayer player, GenericServer server){
@@ -67,7 +67,7 @@ public class ProfileManager{
             if(profile.isInvalidProfile())
                 continue;
             
-            if(profile.evalConditions(core.getParser(), core.getPlugin().getPluginLogger(), player, server))
+            if(profile.evalConditions(core, player, server))
                 return profile;
         }
         
@@ -115,67 +115,11 @@ public class ProfileManager{
         return false;
     }
     
-    private static List<String> resolveMOTD(ProfileEntry profile, ProfileEntry defaultProfile){
-        if(profile == null || !checkOption(profile.motd()))
-            return defaultProfile.motd();
+    private static <T> T resolve(ProfileEntry defProfile, ProfileEntry profile, Function<ProfileEntry, T> function){
+        if(profile == null || !checkOption(function.apply(profile)))
+            return function.apply(defProfile);
         
-        return profile.motd();
-    }
-    
-    private static List<String> resolvePlayers(ProfileEntry profile, ProfileEntry defaultProfile){
-        if(profile == null || !checkOption(profile.players()))
-            return defaultProfile.players();
-        
-        return profile.players();
-    }
-    
-    private static String resolvePlayerCountText(ProfileEntry profile, ProfileEntry defaultProfile){
-        if(profile == null || !checkOption(profile.playerCountText()))
-            return defaultProfile.playerCountText();
-        
-        return profile.playerCountText();
-    }
-    
-    private static String resolveFavicon(ProfileEntry profile, ProfileEntry defaultProfile){
-        if(profile == null || !checkOption(profile.favicon()))
-            return defaultProfile.favicon();
-        
-        return profile.favicon();
-    }
-    
-    private static boolean resolveHidePlayersEnabled(ProfileEntry profile, ProfileEntry defaultProfile){
-        if(profile == null || !checkOption(profile.hidePlayersEnabled()))
-            return defaultProfile.hidePlayersEnabled().getOrDefault(false);
-        
-        return profile.hidePlayersEnabled().getOrDefault(false);
-    }
-    
-    private static boolean resolveExtraPlayersEnabled(ProfileEntry profile, ProfileEntry defaultProfile){
-        if(profile == null || !checkOption(profile.extraPlayersEnabled()))
-            return defaultProfile.extraPlayersEnabled().getOrDefault(false);
-        
-        return profile.extraPlayersEnabled().getOrDefault(false);
-    }
-    
-    private static boolean resolveMaxPlayersEnabled(ProfileEntry profile, ProfileEntry defaultProfile){
-        if(profile == null || !checkOption(profile.maxPlayersEnabled()))
-            return defaultProfile.maxPlayersEnabled().getOrDefault(false);
-        
-        return profile.maxPlayersEnabled().getOrDefault(false);
-    }
-    
-    private static Integer resolveExtraPlayersCount(ProfileEntry profile, ProfileEntry defaultProfile){
-        if(profile == null || profile.extraPlayersCount() == null)
-            return defaultProfile.extraPlayersCount() == null ? 0 : defaultProfile.extraPlayersCount();
-        
-        return profile.extraPlayersCount();
-    }
-    
-    private static Integer resolveMaxPlayersCount(ProfileEntry profile, ProfileEntry defaultProfile){
-        if(profile == null || profile.maxPlayersCount() == null)
-            return defaultProfile.maxPlayersCount() == null ? 0 : defaultProfile.maxPlayersCount();
-        
-        return profile.maxPlayersCount();
+        return function.apply(profile);
     }
     
     private static List<String> resolveList(ConfigurationNode node, Object... path){

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/replacer/StringReplacer.java

@@ -64,8 +64,6 @@ public class StringReplacer{
     
     private static String parsePlaceholder0(String input, ParsePosition position, GenericPlayer player, GenericServer server, ParseWarnCollector collector){
         AdvancedServerListAPI api = AdvancedServerList.getApi();
-        
-        int placeholderStart = position.getIndex() - 2;
         int index = position.getIndex();
         
         StringBuilder identifier = new StringBuilder();
@@ -113,7 +111,7 @@ public class StringReplacer{
                 raw.append(' ').append(valuesStr);
             
             if(collector != null)
-                collector.appendWarningFormatted(placeholderStart, "Placeholder '%s' does not have a closing bracket (})", raw.toString());
+                collector.appendWarningFormatted(index, "Placeholder '%s' does not have a closing bracket (})", raw.toString());
             
             return raw.toString();
         }
@@ -128,7 +126,7 @@ public class StringReplacer{
             raw.append('}');
             
             if(collector != null)
-                collector.appendWarningFormatted(placeholderStart, "Placeholder '%s' does not have any available PlaceholderProvider", raw.toString());
+                collector.appendWarningFormatted(index, "Placeholder '%s' does not have any available PlaceholderProvider", raw.toString());
             
             return raw.toString();
         }
@@ -143,7 +141,7 @@ public class StringReplacer{
             raw.append('}');
             
             if(collector != null)
-                collector.appendWarningFormatted(placeholderStart, "Placeholder '%s' has an invalid value String '%s'", raw.toString(), valuesStr);
+                collector.appendWarningFormatted(index, "Placeholder '%s' has an invalid value String '%s'", raw.toString(), valuesStr);
             
             return raw.toString();
         }

docs/assets/js/repo-stats.js

@@ -1,5 +1,7 @@
 document$.subscribe(async () => {
-    const url = 'https://codeberg-stats-proxy.vercel.app'
+    const url = 'https://api.allorigins.win/raw?url='
+    const apiUrl = `https://api.allorigins.win/raw?url=${encodeURIComponent('https://codeberg.org/api/v1/repos/Andre601/asl-api/releases/latest')}`
+
     const repo_stats = document.querySelector('[data-md-component="source"] .md-source__repository');
     
     function loadCodebergInfo(data) {
@@ -45,10 +47,11 @@ document$.subscribe(async () => {
     }
     
     async function fetchApiInfo() {
-        const tag = await fetch(`${url}/api/latest-release`).then(_ => _.json());
+        const tag = await fetch(`${apiUrl}`)
+            .then(_ => _.json());
         
         const data = {
-            "version": tag.name
+            "version": tag.tag_name
         };
         
         __md_set("__api_tag", data, sessionStorage);
@@ -57,14 +60,14 @@ document$.subscribe(async () => {
     
     async function fetchInfo() {
         const [release, repo] = await Promise.all([
-            fetch(`${url}/repo/latest-release`).then(_ => _.json()),
-            fetch(`${url}/repo/stats`).then(_ => _.json()),
+            fetch(`${url}${encodeURIComponent('https://codeberg.org/api/v1/repos/Andre601/AdvancedServerList/releases/latest')}`).then(_ => _.json()),
+            fetch(`${url}${encodeURIComponent('https://codeberg.org/api/v1/repos/Andre601/AdvancedServerList')}`).then(_ => _.json()),
         ]);
         
         const data = {
-            "version": release.name,
-            "stars": repo.stars,
-            "forks": repo.forks
+            "version": release.tag_name,
+            "stars": repo.stars_count,
+            "forks": repo.forks_count
         };
         
         __md_set("__git_repo", data, sessionStorage);

docs/commands/index.md

@@ -19,40 +19,53 @@ The following subcommands are available (Subcommands are case-insensitive):
 - [`reload`](#reload)
 - [`clearCache`](#clearcache)
 - [`migrate <plugin>`](#migrate)
+- [`profiles <add <profile> | copy <profile> <name> | list>`](#profiles)
 
-### help
+### `help`
 
-/// info |
 **Permission:** `advancedserverlist.command.help`
 
 Shows a list of all available [subcommands](#subcommands) for AdvancedServerList.
-///
 
-### reload
+----
+
+### `reload`
 
-/// info |
 **Permission:** `advancedserverlist.command.reload`
 
 Reloads the plugin's `config.yml` and all available YAML files in the `profiles` folder.
-///
 
-### clearCache
+----
+
+### `clearcache`
 
-/// info |
 **Permission:** `advancedserverlist.command.clearcache`
 
 Clears the currently cached favicons and players.
-///
 
-### migrate &lt;plugin&gt; { #migrate }
+----
+
+### `migrate <plugin>` { #migrate }
 
-/// info |
 **Permission:** `advancedserverlist.command.migrate`
 
-**Arguments:
+**Arguments:**
 
 - `<plugin>` - The plugin to migrate from.
 
 Migrates files from one plugin over to AdvancedServerList.  
 Check the [Migration Page](../migration/index.md) for a list of supported plugins.
-///
+
+----
+
+### `profiles <add <profile> | copy <profile> <name> | list>` { #profiles }
+
+**Permission:** `advancedserverlist.command.profiles`
+
+**Arguments:**
+
+- `add <profile>` - Creates a new profile with name `<profile>` using the default profile values.
+- `copy <profile> <name>` - Creates a copy of `<profile>` and saves it as `<name>`.
+- `list` - Lists all loaded profiles. The entries have hover text for extra info.
+
+Creates, copies or shows profiles in AdvancedServerList.

docs/getting-started/index.md

@@ -502,16 +502,14 @@ motd:
 
 ### Additional profiles
 
-To add additional profiles, create a new YAML file inside the `profiles` folder. The name can be whatever you like, but it is recommended to keep it simple and only use alphanumeric characters (`a-z` and `0-9`), underlines and hyphens.
+Additional profiles can be created to display different content under specific situations. To create a new file, either manually create a YAML file in the `profiles` folder, or use [`/asl profiles add <name>`](../commands/index.md#profiles) to have one created for you. In either case is it recommended to only use alphanummeric (`a-z` abd `0-9`) characters, dashes and underscores for the file name. You should also choose a name that fits the purpose of the file (i.e. for a profile that displays stuff when someone is banned, name it `banned.yml`).
 
-Inside the file, add a priority and at least one setting, similar to the above shown example.  
-This would already be enough to have a valid profile, but depending on the priority and file name may the file not be used, or used over other profiles.
+In case you manually created a YAML file, make sure it contains the [`priority`](../profiles/index.md#priority) setting and one of the other settings, to have a valid profile.  
+You should also add a [`condition`](../profiles/index.md#condition) to ensure that the profile is only loaded when needed. The [Expressions page](../profiles/expressions.md) covers what counts as valid expressions and conditions.  
+Do note that the plugin goes through the profiles in order of priority, starting with the highest number first, picking the first one that returns a `condition` returning true.
 
-If you want to only show this file under specific situations can you use the [`condition`](../profiles/index.md#condition) option to apply conditions that need to be met to show the profile.  
-The condition option would have a single String containing one or multiple [Expressions](../profiles/expressions.md). Only if the condition would return true, would the profile be displayed, granted that it has a higher priority than any other valid file with a true condition output.
-
-/// info | Note
-Files without a condition or an empty condition will be treated as always having a true condition.
+/// info | Note about Condition
+The Condition option, if not set or empty, will always return true.
 ///
 
 Here is another example profile using conditions to show it when the player was banned on the server:

docs/migration/index.md

@@ -11,11 +11,17 @@ These pages may include important information about the migration process and wh
 
 <div class="grid cards" markdown>
 
+-   [**MiniMOTD**](minimotd.md)
+    
+    ----
+    
+    Migrate from the Plugin [MiniMOTD](https://github.com/jpenilla/MiniMOTD){ target="_blank" rel="nofollow" }
+
 -   [**ServerListPlus**](serverlistplus.md)
     
     ----
     
-    Migrate from the Plugin [ServerListPlus](https://github.com/Minecrell/ServerListPlus).
+    Migrate from the Plugin [ServerListPlus](https://github.com/Minecrell/ServerListPlus){ target="_blank" rel="nofollow" }.
 
 </div>
 

docs/migration/minimotd.md

@@ -0,0 +1,100 @@
+---
+icon: octicons/arrow-right-24
+---
+
+Version `4.10.0` added support for migrating your existing `main.conf` configuration from MiniMOTD to AdvancedServerList.
+
+## Important Notes
+
+- MiniMOTD does not need to be present on the server/proxy to migrate its files. Only the `main.conf` file needs to be available.
+- The plugin will **only** migrate the `main.conf` file. No other files will be migrated.
+
+## How to Migrate
+
+Execute the command [`/asl migrate minimotd`](../commands/index.md#migrate) to start the migration process. Make sure the `main.conf` file is present in `/plugins/MiniMOTD/` (`minimotd-velocity` on Velocity).
+
+## Example
+
+Below can you find a full example of a `main.conf` file and the corresponding migrated files from AdvancedServerList:
+
+/// tab | :octicons-file-code-24: main.conf
+```conf
+icon-enabled=true
+motd-enabled=true
+motds=[
+    {
+        icon=random
+        line1="<rainbow>MiniMOTD Default"
+        line2="MiniMessage <gradient:blue:red>Gradients"
+    },
+    {
+        icon=random
+        line1="<blue>Another <bold><red>MOTD"
+        line2="<italic><underlined><gradient:red:green>much wow"
+    }
+]
+player-count-settings {
+    allow-exceeding-maximum=false
+    disable-player-list-hover=false
+    fake-players {
+        fake-players="25%"
+        fake-players-enabled=false
+    }
+    hide-player-count=false
+    just-x-more-settings {
+        just-x-more-enabled=false
+        x-value=3
+    }
+    max-players=69
+    max-players-enabled=true
+    servers=[]
+}
+```
+///
+
+/// tab | :octicons-file-code-24: minimotd_migrated.yml
+```yaml
+priority: 0
+profiles:
+- motd:
+  - <rainbow>MiniMOTD Default
+  - MiniMessage <gradient:blue:red>Gradients
+  playerCount:
+    hover: []
+    text: ''
+    hidePlayers: false
+    extraPlayers:
+      enabled: false
+      amount: 0
+    maxPlayers:
+      enabled: false
+      amount: 0
+  favicon: ''
+- motd:
+  - <blue>Another <bold><red>MOTD
+  - <italic><underlined><gradient:red:green>much wow
+  playerCount:
+    hover: []
+    text: ''
+    hidePlayers: false
+    extraPlayers:
+      enabled: false
+      amount: 0
+    maxPlayers:
+      enabled: false
+      amount: 0
+  favicon: ''
+motd: []
+playerCount:
+  hover: []
+  text: ''
+  hidePlayers: false
+  extraPlayers:
+    enabled: false
+    amount: 3
+  maxPlayers:
+    enabled: true
+    amount: 69
+favicon: ''
+```
+///

docs/profiles/placeholders.md

@@ -11,7 +11,7 @@ It also has built-in [PlaceholderAPI support](#placeholderapi) for Spigot and Pa
 
 The following placeholders are available in AdvancedServerList itself. Please note that not all placeholders are available on all platforms.
 
-### Player Placeholders
+### Player
 
 These placeholders use the player who pinged the server, to return values. They may require the player to be cached in order to work.
 
@@ -52,6 +52,14 @@ These placeholders use values given by the server/proxy AdvancedServerList runs
     An optional server name can be provided to display the IP/Domain associated with that server. This only works on BungeeCord or Velocity.  
     **Example:** `${server host survival}` would display the IP/Domain associated with the `survival` server.
 
+### Maintenance
+
+These placeholders require the [Maintenance](https://hangar.papermc.io/kennytv/Maintenance) plugin to work.
+
+| Placeholder                         | Description                                                    |
+|-------------------------------------|----------------------------------------------------------------|
+| `${maintenance maintenanceEnabled}` | Returns whether the Global maintenance mode is enabled or not. |
+
 ## PlaceholderAPI
 
 Please visit the [PlaceholderAPI page](../placeholderapi/index.md) for how AdvancedServerList works with PlaceholderAPI.

mkdocs.yml

@@ -119,6 +119,7 @@ nav:
   - Migration:
     - migration/index.md
     - Other Plugins:
+      - MiniMOTD: migration/minimotd.md
       - ServerListPlus: migration/serverlistplus.md
     - AdvancedServerList:
       - v3.8.0 to v3.9.0: migration/v3_8_0-to-v3_9_0.md
@@ -147,7 +148,7 @@ nav:
             - api/reference/api/ch.andre601.advancedserverlist.api/objects/genericserver.md
             - api/reference/api/ch.andre601.advancedserverlist.api/objects/nullbool.md
           - profiles:
-            - '<api__record></api__record> ProfileEntry':
+            - ProfileEntry:
               - api/reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/index.md
               - api/reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md
       - platform-bukkit:

paper/pom.xml

@@ -46,7 +46,7 @@
     <repositories>
         <repository>
             <id>papermc</id>
-            <url>https://papermc.io/repo/repository/maven-public/</url>
+            <url>https://repo.papermc.io/repository/maven-public/</url>
         </repository>
         <repository>
             <id>placeholderapi-repo</id>
@@ -59,6 +59,7 @@
     </repositories>
 
     <dependencies>
+        <!-- AdvancedServerList -->
         <dependency>
             <groupId>ch.andre601.advancedserverlist</groupId>
             <artifactId>core</artifactId>
@@ -71,30 +72,44 @@
             <version>${api.version}</version>
             <scope>compile</scope>
         </dependency>
+        
+        <!-- Paper API -->
         <dependency>
             <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.20.6-R0.1-SNAPSHOT</version>
+            <version>1.21-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        
+        <!-- bStats -->
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
             <version>3.0.2</version>
             <scope>compile</scope>
         </dependency>
+
+        <!-- Plugins -->
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
-            <version>2.11.5</version>
+            <version>2.11.6</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.viaversion</groupId>
             <artifactId>viaversion-api</artifactId>
-            <version>4.10.2</version>
+            <version>5.0.3</version>
             <scope>provided</scope>
         </dependency>
+
+        <!-- Other -->
+        <dependency>
+            <groupId>com.alessiodp.libby</groupId>
+            <artifactId>libby-paper</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -117,13 +132,17 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.3</version>
+                <version>3.6.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <relocations>
                         <relocation>
                             <pattern>org.bstats</pattern>
-                            <shadedPattern>ch.andre601.advancedserverlist.spigot.depends.bstats</shadedPattern>
+                            <shadedPattern>ch.andre601.advancedserverlist.paper.depends.bstats</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>com.alessiodp.libby</pattern>
+                            <shadedPattern>ch.andre601.advancedserverlist.paper.depends.libby</shadedPattern>
                         </relocation>
                     </relocations>
                     <filters>

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

@@ -28,7 +28,7 @@ package ch.andre601.advancedserverlist.paper;
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
-import ch.andre601.advancedserverlist.core.profiles.favicon.FaviconHandler;
+import ch.andre601.advancedserverlist.core.profiles.handlers.FaviconHandler;
 import ch.andre601.advancedserverlist.paper.commands.CmdAdvancedServerList;
 import ch.andre601.advancedserverlist.paper.listeners.LoadEvent;
 import ch.andre601.advancedserverlist.paper.logging.PaperLogger;
@@ -36,6 +36,8 @@ import ch.andre601.advancedserverlist.paper.objects.WorldCache;
 import ch.andre601.advancedserverlist.paper.objects.placeholders.PAPIPlaceholders;
 import ch.andre601.advancedserverlist.paper.objects.placeholders.PaperPlayerPlaceholders;
 import ch.andre601.advancedserverlist.paper.objects.placeholders.PaperServerPlaceholders;
+import com.alessiodp.libby.Library;
+import com.alessiodp.libby.PaperLibraryManager;
 import io.papermc.paper.ServerBuildInfo;
 import org.bstats.bukkit.Metrics;
 import org.bstats.charts.SimplePie;
@@ -61,6 +63,8 @@ public class PaperCore extends JavaPlugin implements PluginCore<CachedServerIcon
     private PAPIPlaceholders papiPlaceholders = null;
     private WorldCache worldCache = null;
     
+    private PaperLibraryManager libraryManager = null;
+    
     @Override
     public void onEnable(){
         try{
@@ -128,6 +132,23 @@ public class PaperCore extends JavaPlugin implements PluginCore<CachedServerIcon
         faviconHandler.cleanCache();
     }
     
+    @Override
+    public void downloadLibrary(String groupId, String artifactId, String version){
+        if(libraryManager == null){
+            libraryManager = new PaperLibraryManager(this);
+            libraryManager.addRepository("https://repo.papermc.io/repository/maven-public");
+        }
+        
+        Library lib = Library.builder()
+            .groupId(groupId)
+            .artifactId(artifactId)
+            .version(version)
+            .resolveTransitiveDependencies(true)
+            .build();
+        
+        libraryManager.loadLibrary(lib);
+    }
+    
     @Override
     public AdvancedServerList<CachedServerIcon> getCore(){
         return core;

paper/src/main/java/ch/andre601/advancedserverlist/paper/listeners/PaperEventWrapper.java

@@ -28,7 +28,7 @@ package ch.andre601.advancedserverlist.paper.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.compat.maintenance.MaintenanceUtil;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import ch.andre601.advancedserverlist.core.interfaces.events.GenericEventWrapper;
 import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
@@ -48,6 +48,8 @@ import org.bukkit.util.CachedServerIcon;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
+import java.util.function.Function;
 
 public class PaperEventWrapper implements GenericEventWrapper<CachedServerIcon, PaperPlayerImpl>{
     
@@ -90,24 +92,13 @@ public class PaperEventWrapper implements GenericEventWrapper<CachedServerIcon,
     
     @Override
     public void setPlayers(List<String> lines, PaperPlayerImpl player, GenericServer server){
-        event.getPlayerSample().clear();
-        List<PlayerProfile> players = new ArrayList<>(lines.size());
-        
-        for(String line : lines){
-            String parsed = ComponentParser.text(line)
-                .modifyText(text -> StringReplacer.replace(text, player, server))
-                .modifyText(text -> {
-                    if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
-                        return PlaceholderAPI.setPlaceholders(player.getPlayer(), text);
-                    
-                    return text;
-                })
-                .toString();
-            
-            players.add(FakePlayerProfile.create(parsed));
+        try{
+            event.getListedPlayers();
+            setListedPlayers(lines, player, server);
+        }catch(NoSuchMethodError ex){
+            // Version before latest 1.20.6 builds(?)
+            setPlayerSample(lines, player, server);
         }
-        
-        event.getPlayerSample().addAll(players);
     }
     
     @Override
@@ -135,7 +126,7 @@ public class PaperEventWrapper implements GenericEventWrapper<CachedServerIcon,
         if(!Bukkit.getPluginManager().isPluginEnabled("Maintenance"))
             return false;
         
-        return PingEventHandler.getMaintenanceUtil().isMaintenanceEnabled();
+        return MaintenanceUtil.get().isMaintenanceEnabled();
     }
     
     @Override
@@ -187,4 +178,39 @@ public class PaperEventWrapper implements GenericEventWrapper<CachedServerIcon,
     public GenericServer createGenericServer(int playersOnline, int playersMax, String host){
         return new PaperServerImpl(plugin.getWorldCache().worlds(), playersOnline, playersMax, host);
     }
+    
+    private void setListedPlayers(List<String> lines, PaperPlayerImpl player, GenericServer server){
+        event.getListedPlayers().clear();
+        List<PaperServerListPingEvent.ListedPlayerInfo> playerList = getPlayerList(lines, player, server,
+            text -> new PaperServerListPingEvent.ListedPlayerInfo(text, UUID.randomUUID()));
+        
+        event.getListedPlayers().addAll(playerList);
+    }
+    
+    @SuppressWarnings({"Deprecation", "removal"})
+    private void setPlayerSample(List<String> lines, PaperPlayerImpl player, GenericServer server){
+        event.getPlayerSample().clear();
+        List<PlayerProfile> playerProfiles = getPlayerList(lines, player, server, FakePlayerProfile::create);
+        
+        event.getPlayerSample().addAll(playerProfiles);
+    }
+    
+    private <T> List<T> getPlayerList(List<String> lines, PaperPlayerImpl player, GenericServer server, Function<String, T> function){
+        List<T> playerList = new ArrayList<>(lines.size());
+        for(String line : lines){
+            String parsed = ComponentParser.text(line)
+                .modifyText(text -> StringReplacer.replace(text, player, server))
+                .modifyText(text -> {
+                    if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
+                        return PlaceholderAPI.setPlaceholders(player.getPlayer(), text);
+                    
+                    return text;
+                })
+                .toString();
+            
+            playerList.add(function.apply(parsed));
+        }
+        
+        return playerList;
+    }
 }

paper/src/main/java/ch/andre601/advancedserverlist/paper/objects/impl/PaperPlayerImpl.java

@@ -27,12 +27,18 @@ package ch.andre601.advancedserverlist.paper.objects.impl;
 
 import ch.andre601.advancedserverlist.api.bukkit.objects.BukkitPlayer;
 import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
-import ch.andre601.advancedserverlist.core.profiles.players.GenericPlayerImpl;
 import org.bukkit.OfflinePlayer;
 
-public class PaperPlayerImpl extends GenericPlayerImpl implements BukkitPlayer{
+import java.util.UUID;
+
+public class PaperPlayerImpl implements BukkitPlayer{
     
     private final OfflinePlayer player;
+    
+    private final String name;
+    private int protocol;
+    private final UUID uuid;
+    
     private boolean playedBefore = false;
     private boolean banned = false;
     private boolean whitelisted = false;
@@ -52,6 +58,21 @@ public class PaperPlayerImpl extends GenericPlayerImpl implements BukkitPlayer{
         this.whitelisted = player.isWhitelisted();
     }
     
+    @Override
+    public String getName(){
+        return name;
+    }
+    
+    @Override
+    public int getProtocol(){
+        return protocol;
+    }
+    
+    @Override
+    public UUID getUUID(){
+        return uuid;
+    }
+    
     @Override
     public OfflinePlayer getPlayer(){
         return player;

pom.xml

@@ -37,7 +37,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         
-        <plugin.version>4.9.2</plugin.version>
+        <plugin.version>4.13.0</plugin.version>
         <plugin.description>Create multiple Server lists based on conditions.</plugin.description>
         
         <api.version>3.3.0</api.version>
@@ -45,7 +45,7 @@
         <dependency.adventure-api>4.17.0</dependency.adventure-api>
         <dependency.adventure-text-minimessage>4.17.0</dependency.adventure-text-minimessage>
         <dependency.adventure-text-serializer-legacy>4.17.0</dependency.adventure-text-serializer-legacy>
-        <dependency.adventure-platform-bungeecord>4.3.2</dependency.adventure-platform-bungeecord>
+        <dependency.adventure-platform-bungeecord>4.3.4</dependency.adventure-platform-bungeecord>
         <dependency.configurate-yaml>4.1.2</dependency.configurate-yaml>
         
         <maven.compiler.source>16</maven.compiler.source>
@@ -61,6 +61,10 @@
             <id>codeberg</id>
             <url>https://codeberg.org/api/packages/Andre601/maven/</url>
         </repository>
+        <repository>
+            <id>sonatype-snapshots</id>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+        </repository>
     </repositories>
     
     <modules>

renovate.json

@@ -7,7 +7,7 @@
   ],
   "packageRules": [
     {
-      "description": "Use Jitpack registry for AdvancedBan",
+      "description": "Use Jitpack registry for various Libs",
       "matchPackageNames": [
         "com.github.DevLeoko:AdvancedBan",
         "com.github.LeonMangler:PremiumVanishAPI",
@@ -31,6 +31,33 @@
         "https://codeberg.org/api/packages/Andre601/maven"
       ]
     },
+    {
+      "description": "Use Paper Repo for Paper API",
+      "matchPackageNames": [
+        "io.papermc.paper:paper-api"
+      ],
+      "registryUrls": [
+        "https://papermc.io/repo/repository/maven-public"
+      ]
+    },
+    {
+      "description": "Use PlaceholderAPI Repo for PlaceholderAPI",
+      "matchPackageNames": [
+        "me.clip:placeholderapi"
+      ],
+      "registryUrls": [
+        "https://repo.extendedclip.com/content/repositories/placeholderapi"
+      ]
+    },
+    {
+      "description": "Use ViaVersion Repo for ViaVersion",
+      "matchPackageNames": [
+        "com.viaversion:viaversion-api"
+      ],
+      "registryUrls": [
+        "https://repo.viaversion.com"
+      ]
+    },
     {
       "description": "Apply label for Bukkit platform",
       "matchFileNames": ["bukkit/pom.xml"],
@@ -51,11 +78,6 @@
       "matchFileNames": ["velocity/pom.xml"],
       "addLabels": ["PR Target/Velocity"]
     },
-    {
-      "description": "Apply label for GitHub Actions",
-      "matchFileNames": [".github/workflows/*.yml"],
-      "addLabels": ["PR Target/GitHub Action"]
-    },
     {
       "description": "Apply label for MkDocs",
       "matchFileNames": ["requirements.txt"],

requirements.txt

@@ -1,3 +1,3 @@
-mkdocs-material==9.5.23
+mkdocs-material==9.5.31
 mkdocs-glightbox==0.4.0
 git+https://github.com/Andre601/mkdocs-pagenav-generator

velocity/pom.xml

@@ -46,7 +46,7 @@
     <repositories>
         <repository>
             <id>velocity-repo</id>
-            <url>https://papermc.io/repo/repository/maven-public/</url>
+            <url>https://repo.papermc.io/repository/maven-public/</url>
         </repository>
     </repositories>
     
@@ -95,6 +95,14 @@
             <version>2.9.0-4</version>
             <scope>provided</scope>
         </dependency>
+        
+        <!-- Other -->
+        <dependency>
+            <groupId>com.alessiodp.libby</groupId>
+            <artifactId>libby-velocity</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     
     <build>
@@ -114,7 +122,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.3</version>
+                <version>3.6.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <relocations>
@@ -122,6 +130,10 @@
                             <pattern>org.bstats</pattern>
                             <shadedPattern>ch.andre601.advancedserverlist.velocity.depends.bstats</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>com.alessiodp.libby</pattern>
+                            <shadedPattern>ch.andre601.advancedserverlist.velocity.depends.libby</shadedPattern>
+                        </relocation>
                     </relocations>
                     <filters>
                         <filter>

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

@@ -28,13 +28,15 @@ package ch.andre601.advancedserverlist.velocity;
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
-import ch.andre601.advancedserverlist.core.profiles.favicon.FaviconHandler;
+import ch.andre601.advancedserverlist.core.profiles.handlers.FaviconHandler;
 import ch.andre601.advancedserverlist.velocity.commands.CmdAdvancedServerList;
 import ch.andre601.advancedserverlist.velocity.listeners.JoinEvent;
 import ch.andre601.advancedserverlist.velocity.listeners.PingEvent;
 import ch.andre601.advancedserverlist.velocity.logging.VelocityLogger;
 import ch.andre601.advancedserverlist.velocity.objects.placeholders.VelocityPlayerPlaceholders;
 import ch.andre601.advancedserverlist.velocity.objects.placeholders.VelocityServerPlaceholders;
+import com.alessiodp.libby.Library;
+import com.alessiodp.libby.VelocityLibraryManager;
 import com.google.inject.Inject;
 import com.velocitypowered.api.command.CommandMeta;
 import com.velocitypowered.api.event.Subscribe;
@@ -48,6 +50,7 @@ import com.velocitypowered.api.util.Favicon;
 import de.myzelyam.api.vanish.VelocityVanishAPI;
 import org.bstats.charts.SimplePie;
 import org.bstats.velocity.Metrics;
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.awt.image.BufferedImage;
@@ -58,7 +61,9 @@ import java.util.Locale;
 
 public class VelocityCore implements PluginCore<Favicon>{
     
-    private final PluginLogger logger;
+    private final Logger logger = LoggerFactory.getLogger("AdvancedServerList");
+    
+    private final PluginLogger pluginLogger;
     private final ProxyServer proxy;
     private final Path path;
     private final Metrics.Factory metrics;
@@ -66,9 +71,11 @@ public class VelocityCore implements PluginCore<Favicon>{
     private AdvancedServerList<Favicon> core;
     private FaviconHandler<Favicon> faviconHandler = null;
     
+    private VelocityLibraryManager<VelocityCore> libraryManager = null;
+    
     @Inject
     public VelocityCore(ProxyServer proxy, @DataDirectory Path path, Metrics.Factory metrics){
-        this.logger = new VelocityLogger(this, LoggerFactory.getLogger("AdvancedServerList"));
+        this.pluginLogger = new VelocityLogger(this, this.logger);
         
         this.proxy = proxy;
         this.path = path;
@@ -121,6 +128,23 @@ public class VelocityCore implements PluginCore<Favicon>{
         faviconHandler.cleanCache();
     }
     
+    @Override
+    public void downloadLibrary(String groupId, String artifactId, String version){
+        if(libraryManager == null){
+            libraryManager = new VelocityLibraryManager<>(this, this.logger, getFolderPath(), getProxy().getPluginManager());
+            libraryManager.addRepository("https://repo.papermc.io/repository/maven-public");
+        }
+        
+        Library lib = Library.builder()
+            .groupId(groupId)
+            .artifactId(artifactId)
+            .version(version)
+            .resolveTransitiveDependencies(true)
+            .build();
+        
+        libraryManager.loadLibrary(lib);
+    }
+    
     @Override
     public AdvancedServerList<Favicon> getCore(){
         return core;
@@ -133,7 +157,7 @@ public class VelocityCore implements PluginCore<Favicon>{
     
     @Override
     public PluginLogger getPluginLogger(){
-        return logger;
+        return pluginLogger;
     }
     
     @Override

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

@@ -28,7 +28,8 @@ 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.compat.maintenance.MaintenanceUtil;
+import ch.andre601.advancedserverlist.core.compat.papi.PAPIUtil;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import ch.andre601.advancedserverlist.core.interfaces.events.GenericEventWrapper;
 import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
@@ -44,7 +45,10 @@ import com.velocitypowered.api.proxy.server.ServerPing;
 import com.velocitypowered.api.util.Favicon;
 import net.kyori.adventure.text.Component;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 
 public class VelocityEventWrapper implements GenericEventWrapper<Favicon, VelocityPlayerImpl>{
@@ -133,7 +137,7 @@ public class VelocityEventWrapper implements GenericEventWrapper<Favicon, Veloci
         if(!plugin.getProxy().getPluginManager().isLoaded("maintenance"))
             return false;
         
-        return PingEventHandler.getMaintenanceUtil().isMaintenanceEnabled();
+        return MaintenanceUtil.get().isMaintenanceEnabled();
     }
     
     @Override
@@ -165,10 +169,10 @@ public class VelocityEventWrapper implements GenericEventWrapper<Favicon, Veloci
         if(!plugin.getProxy().getPluginManager().isLoaded("papiproxybridge"))
             return text;
         
-        if(!PingEventHandler.getPAPIUtil().isCompatible())
+        if(!PAPIUtil.get().isCompatible())
             return text;
         
-        String server = PingEventHandler.getPAPIUtil().getServer();
+        String server = PAPIUtil.get().getServer();
         if(server == null || server.isEmpty())
             return text;
         
@@ -176,11 +180,11 @@ public class VelocityEventWrapper implements GenericEventWrapper<Favicon, Veloci
         if(registeredServer == null || registeredServer.getPlayersConnected().isEmpty())
             return text;
         
-        Player carrier = PingEventHandler.getPAPIUtil().getPlayer(registeredServer.getPlayersConnected());
+        Player carrier = PAPIUtil.get().getPlayer(registeredServer.getPlayersConnected());
         if(carrier == null)
             return text;
         
-        return PingEventHandler.getPAPIUtil().parse(text, carrier.getUniqueId(), player.getUUID());
+        return PAPIUtil.get().parse(text, carrier.getUniqueId(), player.getUUID());
     }
     
     @Override

velocity/src/main/java/ch/andre601/advancedserverlist/velocity/objects/impl/VelocityPlayerImpl.java

@@ -27,10 +27,15 @@ package ch.andre601.advancedserverlist.velocity.objects.impl;
 
 import ch.andre601.advancedserverlist.api.velocity.objects.VelocityPlayer;
 import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
-import ch.andre601.advancedserverlist.core.profiles.players.GenericPlayerImpl;
 import com.velocitypowered.api.network.ProtocolVersion;
 
-public class VelocityPlayerImpl extends GenericPlayerImpl implements VelocityPlayer{
+import java.util.UUID;
+
+public class VelocityPlayerImpl implements VelocityPlayer{
+    
+    private final String name;
+    private final int protocol;
+    private final UUID uuid;
     
     private final String version;
     
@@ -41,6 +46,21 @@ public class VelocityPlayerImpl extends GenericPlayerImpl implements VelocityPla
         this.version = ProtocolVersion.getProtocolVersion(protocol).getVersionIntroducedIn();
     }
     
+    @Override
+    public String getName(){
+        return name;
+    }
+    
+    @Override
+    public int getProtocol(){
+        return protocol;
+    }
+    
+    @Override
+    public UUID getUUID(){
+        return uuid;
+    }
+    
     @Override
     public String getVersion(){
         return version;

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

@@ -88,7 +88,7 @@ public class VelocityServerPlaceholders extends PlaceholderProvider{
                 if(args.length > 2)
                     yield null;
                 
-                if(args.length == 2){
+                if(args.length == 2 && args[1] != null && !args[1].isEmpty()){
                     RegisteredServer info = proxy.getServers().get(args[1]);
                     if(info == null)
                         yield null;

version-uploader/pom.xml

@@ -46,7 +46,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.10.1</version>
+            <version>2.11.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>dev.masecla</groupId>
             <artifactId>Modrinth4J</artifactId>
-            <version>2.0.0</version>
+            <version>2.2.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -101,7 +101,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.4.2</version>
                 <configuration>
                     <archive>
                         <manifest>
@@ -115,7 +115,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.3</version>
+                <version>3.6.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                 </configuration>

version-uploader/src/main/java/ch/andre601/advancedserverlist/versionuploader/hangar/HangarVersionUploader.java

@@ -130,8 +130,8 @@ public class HangarVersionUploader{
                 Platform.VELOCITY, velocityDependencies
             ),
             Map.of(
-                Platform.PAPER, List.of("1.20.x"),
-                Platform.WATERFALL, List.of("1.19.x", "1.20.x"),
+                Platform.PAPER, List.of("1.20.x", "1.21"),
+                Platform.WATERFALL, List.of("1.19.x", "1.20.x", "1.21"),
                 Platform.VELOCITY, Collections.singletonList("3.2")
             ),
             changelog.replaceAll("\r\n", "\n"),

version-uploader/src/main/java/ch/andre601/advancedserverlist/versionuploader/modrinth/ModrinthVersionUploader.java

@@ -55,7 +55,7 @@ public class ModrinthVersionUploader{
         PlatformInfo.VELOCITY
     );
     private final List<String> versions = List.of(
-        "1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6"
+        "1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6", "1.21"
     );
     
     private final ModrinthAPI api;