Bump version to 4.8.0

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

.woodpecker/pr_preview.yml

@@ -1,63 +1,64 @@
 when:
   - event: pull_request
     path:
-      include: ['.woodpecker/pr_preview.yml', 'requirements.txt', 'mkdocs.yml', 'docs/**']
+      include: [".woodpecker/pr_preview.yml", "docs/**", "mkdocs.yml", "requirements.txt"]
 
 variables:
   setup_git: &setup_git
     - apk add git
-    - git config --global user.email "andre@andre601.ch"
-    - git config --global user.name "ASL Docs Builder"
+    - git config --global user.email "andre_601-bot@noreply.codeberg.org"
+    - git config --global user.name "PR Docs Preview Builder"
 
 steps:
-  cloneTargetRepo:
+  - name: "Clone Preview Repository"
     image: alpine:3.18.4
     commands:
       - chmod -R a+w .
       - <<: *setup_git
-      - git clone https://codeberg.org/Andre601/asl-docs.git site
+      - git clone https://codeberg.org/Andre601/preview.git site
       - chmod -R a+w site
       - cd site
-      - git switch pr-${CI_COMMIT_PULL_REQUEST} 2>/dev/null || git switch -c pr-${CI_COMMIT_PULL_REQUEST}
-  buildDocs:
+      - git switch ${CI_REPO_NAME,,}/${CI_COMMIT_PULL_REQUEST} 2>/dev/null || git switch -c ${CI_REPO_NAME,,}/${CI_COMMIT_PULL_REQUEST}
+  - name: "Build Docs"
     image: woodpeckerci/plugin-mkdocs:latest
     settings:
       pip_install_file: requirements.txt
-  commitAndPush:
+  - name: "Commit and Push"
     image: alpine:3.18.4
     secrets:
       - bot_token
     commands:
       - <<: *setup_git
-      - mv domains site/.domains
+      - mv preview-domains site/.domains
       - cd site
-      - git remote add upstream https://$BOT_TOKEN@codeberg.org/Andre601/asl-docs.git
+      - git remote add upstream https://$BOT_TOKEN@codeberg.org/Andre601/preview.git
       - git add --all
-      - git commit -m "Update Preview for PR ${CI_COMMIT_PULL_REQUEST} ($( env TZ=Europe/Zurich date +"%d.%m.%Y %Z" )) [SKIP CI]"
-      - git push --set-upstream upstream pr-${CI_COMMIT_PULL_REQUEST} -f
-  commentOnSuccess:
+      - git commit -m "Update Preview for ${CI_REPO_NAME}/${CI_COMMIT_PULL_REQUEST} ($( env TZ=Europe/Zurich date +"%d.%m.%Y %Z" )) [SKIP CI]"
+      - git push --set-upstream upstream ${CI_REPO_NAME,,}/${CI_COMMIT_PULL_REQUEST} -f
+  - name: "Comment on Success"
     image: mcs94/gitea-comment
     when:
-      - status: ['success']
+      - status: ["success"]
     settings:
       gitea_address: https://codeberg.org
       gitea_token:
         from_secret: BOT_TOKEN
       comment: |-
-        Pull request Preview ready!
-
-        | Name   | Value                                                 |
-        |--------|-------------------------------------------------------|
-        | Commit | ${CI_COMMIT_SHA}                                      |
-        | Link   | https://asl.andre601.ch/@pr-${CI_COMMIT_PULL_REQUEST} |
-  commentOnFailure:
+        Pull request Preview Ready!
+        
+        | Name   | Value                                                                    |
+        |--------|--------------------------------------------------------------------------|
+        | Commit | ${CI_COMMIT_SHA}                                                         |
+        | Link   | https://preview.andre601.ch/@${CI_REPO_NAME,,}~${CI_COMMIT_PULL_REQUEST} |
+  - name: "Comment on Failure"
     image: mcs94/gitea-comment
     when:
-      - status: ['failure']
+      - status: ["failure"]
     settings:
       gitea_address: https://codeberg.org
       gitea_token:
         from_secret: BOT_TOKEN
       comment: |-
-        Issue while creating Pull request preview.
-        Please check the CI logs for any reasons: ${CI_PIPELINE_URL}
+        Pull request Preview **failed**!
+        
+        Please check the CI logs for details: ${CI_PIPELINE_URL}

.woodpecker/publish_assets.yml

@@ -1,9 +1,9 @@
 when:
   - event: tag
-    branch: master
+    branch: ${CI_REPO_DEFAULT_BRANCH}
 
 steps:
-  createFiles:
+  - name: "Build Jar and Upload"
     image: maven:3.9.6-eclipse-temurin-17
     secrets:
       - modrinth_api_token
@@ -13,15 +13,12 @@ steps:
       CODEBERG_API_TOKEN:
         from_secret: cb_token
     commands:
-      # Create the jar files.
       - mvn clean install
-      # Move VersionUploader jar file
-      - cd version-uploader/target/
+      - cd version-uploader/target
       - mv VersionUploader.jar ../../
       - cd ../../
-      # Execute Jar file
       - java -jar VersionUploader.jar --all
-  uploadToCodeberg:
+  - name: "Upload Jars to Codeber"
     image: woodpeckerci/plugin-gitea-release
     settings:
       base_url: https://codeberg.org
@@ -32,13 +29,18 @@ steps:
         - "addons/banplugins/target/AdvancedServerList-*.jar"
       api_key:
         from_secret: cb_token
-  postOnMastodon:
+  - name: "Create Post on Mastodon"
     image: woodpeckerci/plugin-mastodon-post
     when:
-      - status: ['success']
+      - status: ["success"]
     settings:
       server_url: https://blobfox.coffee
       access_token:
         from_secret: mastodon_token
-      status: '${CI_COMMIT_TAG} of #AdvancedServerList has been released and can be found on Modrinth (https://modrinth.com/plugin/AdvancedServerList), Hangar (https://hangar.papermc.io/Andre_601/AdvancedServerList) and Codeberg (https://codeberg.org/Andre601/AdvancedServerList).'
+      status: |-
+        #AdvancedServerList was updated to ${CI_COMMIT_TAG} and can be downloaded from #Modrinth, #Hangar and #Codeberg!
+        
+        Modrinth - https://modrinth.com/plugin/advancedserverlist
+        Hangar - https://hangar.papermc.io/Andre_601/AdvancedServerList
+        Codeberg - https://codeberg.org/Andre601/AdvancedServerList
       visibility: public

.woodpecker/publish_docs.yml

@@ -1,28 +1,28 @@
 when:
-  - branch: '${CI_REPO_DEFAULT_BRANCH}'
-    event: push
+  - event: push
+    branch: ${CI_REPO_DEFAULT_BRANCH}
     path:
-      include: ['.woodpecker/publish_docs.yml', 'requirements.txt', 'mkdocs.yml', 'docs/**']
+      include: [".woodpecker/publish_docs.yml", "docs/**", "mkdocs.yml", "requirements.txt"]
 
 variables:
   setup_git: &setup_git
     - apk add git
-    - git config --global user.email "github@andre601.ch"
+    - git config --global user.email "andre_601-bot@noreply.codeberg.org"
     - git config --global user.name "ASL Docs Builder"
 
 steps:
-  cloneTargetRepo:
+  - name: "Clone target Repository"
     image: alpine:3.18.4
     commands:
       - chmod -R a+w .
       - <<: *setup_git
-      - git clone -b pages https://codeberg.org/Andre601/asl-docs site
+      - git clone -b pages https://codeberg.org/Andre601/asl-docs.git site
       - chmod -R a+w site
-  buildDocs:
+  - name: "Build Docs"
     image: woodpeckerci/plugin-mkdocs:latest
     settings:
       pip_install_file: requirements.txt
-  commitAndPush:
+  - name: "Commit and Push"
     image: alpine:3.18.4
     secrets:
       - bot_token

bungeecord/pom.xml

@@ -49,6 +49,10 @@
             <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,20 +89,20 @@
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-api</artifactId>
-            <version>4.16.0</version>
-            <scope>compile</scope>
+            <version>${dependency.adventure-api}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-minimessage</artifactId>
-            <version>4.16.0</version>
-            <scope>compile</scope>
+            <version>${dependency.adventure-text-minimessage}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-bungeecord</artifactId>
-            <version>4.3.2</version>
-            <scope>compile</scope>
+            <version>${dependency.adventure-platform-bungeecord}</version>
+            <scope>provided</scope>
         </dependency>
         
         <!-- Metrics -->
@@ -113,8 +117,8 @@
         <dependency>
             <groupId>org.spongepowered</groupId>
             <artifactId>configurate-yaml</artifactId>
-            <version>4.1.2</version>
-            <scope>compile</scope>
+            <version>${dependency.configurate-yaml}</version>
+            <scope>provided</scope>
         </dependency>
         
         <!-- Plugins -->
@@ -124,6 +128,14 @@
             <version>2.9.0-4</version>
             <scope>provided</scope>
         </dependency>
+        
+        <!-- Other -->
+        <dependency>
+            <groupId>com.alessiodp.libby</groupId>
+            <artifactId>libby-bungee</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -147,18 +159,14 @@
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <relocations>
-                        <relocation>
-                            <pattern>org.spongepowered.configurate</pattern>
-                            <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.configurate</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>net.kyori</pattern>
-                            <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.kyori</shadedPattern>
-                        </relocation>
                         <relocation>
                             <pattern>org.bstats</pattern>
                             <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.bstats</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>net.byteflux.libby</pattern>
+                            <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.libby</shadedPattern>
+                        </relocation>
                     </relocations>
                     <filters>
                         <filter>

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

@@ -35,6 +35,7 @@ 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 com.alessiodp.libby.BungeeLibraryManager;
 import de.myzelyam.api.vanish.BungeeVanishAPI;
 import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
 import net.md_5.bungee.api.Favicon;
@@ -51,13 +52,32 @@ import java.util.List;
 
 public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
     
+    private boolean successfulLoad = false;
+    
     private AdvancedServerList<Favicon> core;
     private FaviconHandler<Favicon> faviconHandler = null;
     private BungeeAudiences audiences = null;
     private final PluginLogger logger = new BungeeLogger(this);
     
+    @Override
+    public void onLoad(){
+        logger.info("Loading libraries. This may take a while...");
+        successfulLoad = loadLibs();
+        if(successfulLoad){
+            logger.info("Library loading completed successfully!");
+        }else{
+            logger.warn("Library loading completed with errors!");
+        }
+    }
+    
     @Override
     public void onEnable(){
+        if(!successfulLoad){
+            logger.warn("There were issues during the plugins Loading-phase! Please see the console for possible reasons.");
+            logger.warn("The plugin won't be enabled to avoid problems.");
+            return;
+        }
+        
         this.audiences = BungeeAudiences.create(this);
         this.core = AdvancedServerList.init(this, BungeePlayerPlaceholders.init(), BungeeServerPlaceholders.init(this));
     }
@@ -137,6 +157,11 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
         return "bungeecord";
     }
     
+    @Override
+    public boolean isPluginEnabled(String plugin){
+        return getProxy().getPluginManager().getPlugin(plugin) != null;
+    }
+    
     @Override
     public Favicon createFavicon(BufferedImage image) throws IllegalArgumentException{
         return Favicon.create(image);
@@ -156,4 +181,16 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
         
         return players.size();
     }
+    
+    private boolean loadLibs(){
+        try{
+            BungeeLibraryManager libraryManager = new BungeeLibraryManager(this);
+            libraryManager.configureFromJSON("dependencies.json");
+            
+            return true;
+        }catch(Exception ex){
+            logger.warn("Encountered an Exception while trying to load dependencies.", ex);
+            return false;
+        }
+    }
 }

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

@@ -102,7 +102,7 @@ public class BungeeEventWrapper implements GenericEventWrapper<Favicon, BungeePl
             String parsed = ComponentParser.text(lines.get(i))
                 .modifyText(text -> StringReplacer.replace(text, player, server))
                 .toString();
-    
+            
             ServerPing.PlayerInfo pi = new ServerPing.PlayerInfo(parsed, UUID.randomUUID());
             players[i] = pi;
         }

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

@@ -55,7 +55,7 @@ public class JoinEvent implements Listener{
             
             BungeeCmdSender sender = new BungeeCmdSender(player, plugin.getAudiences());
             
-            plugin.getCore().getUpdateChecker().performeCachedUpdateCheck(sender);
+            plugin.getCore().getUpdateChecker().performCachedUpdateCheck(sender);
         }
     }
 }

bungeecord/src/main/resources/bungee.yml

@@ -6,5 +6,6 @@ description: '${plugin.description}'
 softDepends:
   - PAPIProxyBridge
   - Maintenance
+  - ServerListPlus
 
 main: 'ch.andre601.advancedserverlist.bungeecord.BungeeCordCore'

bungeecord/src/main/resources/dependencies.json

@@ -0,0 +1,31 @@
+{
+  "repositories": [
+    "https://repo.papermc.io/repository/maven-public"
+  ],
+  "libraries": [
+    {
+      "groupId": "net{}kyori",
+      "artifactId": "adventure-api",
+      "version": "${dependency.adventure-api}",
+      "resolveTransitiveDependencies": true
+    },
+    {
+      "groupId": "net{}kyori",
+      "artifactId": "adventure-text-minimessage",
+      "version": "${dependency.adventure-text-minimessage}",
+      "resolveTransitiveDependencies": true
+    },
+    {
+      "groupId": "net{}kyori",
+      "artifactId": "adventure-platform-bungeecord",
+      "version": "${dependency.adventure-platform-bungeecord}",
+      "resolveTransitiveDependencies": true
+    },
+    {
+      "groupId": "org{}spongepowered",
+      "artifactId": "configurate-yaml",
+      "version": "${dependency.configurate-yaml}",
+      "resolveTransitiveDependencies": true
+    }
+  ]
+}

core/pom.xml

@@ -61,6 +61,10 @@
             <id>codeberg</id>
             <url>https://codeberg.org/api/packages/Andre601/maven/</url>
         </repository>
+        <repository>
+            <id>codemc</id>
+            <url>https://repo.codemc.io/repository/maven-releases/</url>
+        </repository>
     </repositories>
     
     <dependencies>
@@ -73,13 +77,13 @@
         <dependency>
             <groupId>ch.andre601</groupId>
             <artifactId>expressionparser</artifactId>
-            <version>1.4.1</version>
+            <version>1.4.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.spongepowered</groupId>
             <artifactId>configurate-yaml</artifactId>
-            <version>4.1.2</version>
+            <version>${dependency.configurate-yaml}</version>
             <scope>provided</scope>
         </dependency>
         
@@ -87,19 +91,19 @@
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-api</artifactId>
-            <version>4.16.0</version>
+            <version>${dependency.adventure-api}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-minimessage</artifactId>
-            <version>4.16.0</version>
+            <version>${dependency.adventure-text-minimessage}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-serializer-legacy</artifactId>
-            <version>4.16.0</version>
+            <version>${dependency.adventure-text-serializer-legacy}</version>
             <scope>provided</scope>
         </dependency>
         
@@ -119,7 +123,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>33.1.0-jre</version>
+            <version>33.2.0-jre</version>
             <scope>provided</scope>
         </dependency>
         
@@ -127,7 +131,7 @@
         <dependency>
             <groupId>net.william278</groupId>
             <artifactId>papiproxybridge</artifactId>
-            <version>1.5</version>
+            <version>1.6.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -136,6 +140,12 @@
             <version>4.2.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>net.minecrell</groupId>
+            <artifactId>ServerListPlus</artifactId>
+            <version>3.5.0</version>
+            <scope>provided</scope>
+        </dependency>
         
         <!-- Test dependencies -->
         <dependency>

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

@@ -28,6 +28,7 @@ package ch.andre601.advancedserverlist.core.check;
 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.objects.CacheUtil;
 import com.google.gson.FieldNamingPolicy;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -41,6 +42,7 @@ import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.nio.charset.StandardCharsets;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executors;
@@ -63,7 +65,7 @@ public class UpdateChecker{
     
     private final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(new UpdateCheckThread());
     
-    private final VersionCache cache = new VersionCache();
+    private final CacheUtil<ModrinthVersion> cache = new CacheUtil<>(Duration.ofMinutes(5));
     
     private final AdvancedServerList<?> core;
     private final PluginLogger logger;
@@ -77,7 +79,7 @@ public class UpdateChecker{
         startUpdateChecker();
     }
     
-    public void performeCachedUpdateCheck(CmdSender sender){
+    public void performCachedUpdateCheck(CmdSender sender){
         ModrinthVersion version = cache.get(() -> {
             try{
                 return performUpdateCheck().join();
@@ -172,7 +174,7 @@ public class UpdateChecker{
     }
     
     private void printUpdateBanner(ModrinthVersion version){
-        logger.warn("==================================================================");
+        logger.warn("=======================================================================");
         logger.warn("You are running an outdated version of AdvancedServerList!");
         logger.warn("");
         logger.warn("Your version: %s", core.getVersion());
@@ -187,7 +189,7 @@ public class UpdateChecker{
         
         logger.warn("Download the latest version from here:");
         logger.warn("https://modrinth.com/plugin/advancedserverlist/version/%s", version.id());
-        logger.warn("==================================================================");
+        logger.warn("=======================================================================");
     }
     
     public record ModrinthVersion(String id, String versionNumber, String versionType){
@@ -199,10 +201,5 @@ public class UpdateChecker{
         public int compare(String version){
             return FlexVerComparator.compare(version, versionNumber());
         }
-        
-        @Override
-        public String toString(){
-            return String.format("ModrinthVersion{id=%s,versionNumber=%s,versionType=%s}", id, versionNumber, versionType);
-        }
     }
 }

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

@@ -28,18 +28,22 @@ package ch.andre601.advancedserverlist.core.commands;
 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.serverlistplus.SLPConfigMigrator;
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 public class CommandHandler{
     
-    private final List<PluginCommand> subCommands = new ArrayList<>();
+    private final List<PluginCommand> subCommands;
     
     public CommandHandler(AdvancedServerList<?> core){
-        subCommands.add(new Help());
-        subCommands.add(new Reload(core));
-        subCommands.add(new ClearCache(core));
+        subCommands = List.of(
+            new Help(),
+            new Reload(core),
+            new ClearCache(core),
+            new Migrate(core)
+        );
     }
     
     public void handle(CmdSender sender, String[] args){
@@ -58,7 +62,7 @@ public class CommandHandler{
                     return;
                 }
                 
-                subCommand.handle(sender);
+                subCommand.handle(sender, Arrays.copyOfRange(args, 1, args.length));
                 return;
             }
         }
@@ -73,7 +77,7 @@ public class CommandHandler{
         }
     
         @Override
-        public void handle(CmdSender sender){
+        public void handle(CmdSender sender, String[] args){
             sender.sendPrefixedMsg("- Commands");
             sender.sendMsg();
             sender.sendMsg("<aqua>/asl <white>help <grey>- Shows this help");
@@ -81,6 +85,8 @@ public class CommandHandler{
             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");
         }
     }
     
@@ -95,7 +101,7 @@ public class CommandHandler{
         }
         
         @Override
-        public void handle(CmdSender sender){
+        public void handle(CmdSender sender, String[] args){
             sender.sendPrefixedMsg("Reloading plugin...");
             
             if(core.getFileHandler().reloadConfig()){
@@ -125,7 +131,7 @@ public class CommandHandler{
         }
     
         @Override
-        public void handle(CmdSender sender){
+        public void handle(CmdSender sender, String[] args){
             sender.sendPrefixedMsg("Clearing caches...");
             
             core.clearFaviconCache();
@@ -137,4 +143,45 @@ public class CommandHandler{
             sender.sendPrefixedMsg("<green>Cache clearing complete!");
         }
     }
+    
+    private static class Migrate extends PluginCommand{
+        
+        private final AdvancedServerList<?> core;
+        
+        public Migrate(AdvancedServerList<?> core){
+            super("migrate");
+            
+            this.core = core;
+        }
+        
+        @Override
+        public void handle(CmdSender sender, String[] args){
+            if(args.length == 0){
+                sender.sendErrorMsg("<red>Insufficient arguments! Please provide a plugin to migrate from.");
+                sender.sendErrorMsg("<red>Available options:");
+                sender.sendErrorMsg(" - ServerListPlus");
+                return;
+            }
+            
+            if(args[0].equalsIgnoreCase("serverlistplus")){
+                if(!core.getPlugin().isPluginEnabled("ServerListPlus")){
+                    sender.sendErrorMsg("<red>Plugin ServerListPlus is not enabled.");
+                    sender.sendErrorMsg("<red>It needs to be active for the migration to work!");
+                    return;
+                }
+                
+                sender.sendPrefixedMsg("Migrating ServerListPlus configuration file...");
+                
+                int migrated = SLPConfigMigrator.migrate(core, sender);
+                if(migrated == 0){
+                    sender.sendErrorMsg("<red>Unable to migrate any ServerListPlus configuration. Check console for details!");
+                }else{
+                    sender.sendPrefixedMsg("<green>Migration complete!");
+                }
+            }else{
+                sender.sendErrorMsg("<red>Unknown plugin <grey>%s</grey>. Available Options:", args[0]);
+                sender.sendErrorMsg(" - ServerListPlus");
+            }
+        }
+    }
 }

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

@@ -1,49 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2023 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.compat.papi;
-
-import java.util.function.Supplier;
-
-public class PAPICache{
-    
-    private CacheValue cache = null;
-    
-    public PAPICache(){}
-    
-    public String get(Supplier<String> supplier){
-        if(cache == null || cache.isExpired())
-            cache = new CacheValue(supplier.get(), System.currentTimeMillis());
-        
-        return cache.server();
-    }
-    
-    private record CacheValue(String server, long timestamp){
-        // Consider the cache expired if it is older than 5 seconds.
-        public boolean isExpired(){
-            return (timestamp < 0L) || System.currentTimeMillis() - timestamp >= 5000L;
-        }
-    }
-}

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

@@ -25,11 +25,13 @@
 
 package ch.andre601.advancedserverlist.core.compat.papi;
 
+import ch.andre601.advancedserverlist.core.objects.CacheUtil;
 import net.william278.papiproxybridge.api.PlaceholderAPI;
 
+import java.time.Duration;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.CompletableFuture;
@@ -39,7 +41,7 @@ public class PAPIUtil{
     
     private final PlaceholderAPI papi;
     
-    private final PAPICache cache = new PAPICache();
+    private final CacheUtil<String> cache = new CacheUtil<>(Duration.ofSeconds(5));
     
     public PAPIUtil(){
         this.papi = PlaceholderAPI.createInstance();
@@ -49,7 +51,7 @@ public class PAPIUtil{
     @SuppressWarnings("BooleanMethodIsAlwaysInverted")
     public boolean isCompatible(){
         try{
-            papi.getClass().getMethod("findServers");
+            papi.getClass().getMethod("getServers");
             return true;
         }catch(NoSuchMethodException ex){
             return false;
@@ -59,8 +61,13 @@ public class PAPIUtil{
     public String getServer(){
         return cache.get(() -> {
             List<String> servers;
+            
             try{
-                servers = papi.findServers().getNow(Collections.emptyList());
+                Set<String> value = papi.getServers().getNow(null);
+                if(value == null)
+                    return null;
+                
+                servers = List.copyOf(value);
             }catch(CancellationException | CompletionException ex){
                 return null;
             }

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

@@ -43,5 +43,5 @@ public abstract class PluginCommand{
         return "advancedserverlist.command." + getArgument().toLowerCase(Locale.ROOT);
     }
     
-    public abstract void handle(CmdSender sender);
+    public abstract void handle(CmdSender sender, String[] args);
 }

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

@@ -58,6 +58,8 @@ public interface PluginCore<F>{
     
     String getLoader();
     
+    boolean isPluginEnabled(String plugin);
+    
     F createFavicon(BufferedImage image) throws Exception;
     
     default boolean isDebugEnabled(){

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

@@ -0,0 +1,460 @@
+/*
+ * 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.serverlistplus;
+
+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.profiles.profile.ProfileSerializer;
+import net.minecrell.serverlistplus.core.ServerListPlusCore;
+import net.minecrell.serverlistplus.core.config.PersonalizedStatusConf;
+import net.minecrell.serverlistplus.core.config.ServerStatusConf;
+import net.minecrell.serverlistplus.core.util.BooleanOrList;
+import net.minecrell.serverlistplus.core.util.IntegerRange;
+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.*;
+import java.util.function.BiConsumer;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class SLPConfigMigrator{
+    
+    private static final Pattern RGB_COLOR_PATTERN = Pattern.compile("&(?<color>#[a-fA-F0-9]{6})");
+    private static final Pattern COLOR_CODE_PATTERN = Pattern.compile("&(?<color>[abcdefklmnorABCDEFKLMNOR0123456789])");
+    private static final Pattern RGB_GRADIENT_PATTERN = Pattern.compile(
+        "%gradient" +
+        "(?<start>#[a-fA-F0-9]{6})" + // Starting color
+        "(?<end>#[a-fA-F0-9]{6})" +   // Ending color
+        "%" +
+        "(?<text>.+?)" +              // Text
+        "%gradient%");
+    
+    private static final Map<String, String> STATIC_REPLACEMENTS = Map.of(
+        "%player%", "${player name}",
+        "%uuid%", "${player uuid}",
+        "%_uuid_%", "${player uuid}",
+        "%online%", "${server playersOnline}",
+        "%max%", "${server playersMax}");
+    
+    public static int migrate(AdvancedServerList<?> core, CmdSender sender){
+        ServerListPlusCore slpCore = ServerListPlusCore.getInstance();
+        PluginLogger logger = core.getPlugin().getPluginLogger();
+        if(slpCore == null){
+            logger.warn("[Migrator - ServerListPlus] Cannot migrate ServerListPlus config. ServerListPlus is not active!");
+            return 0;
+        }
+        
+        ServerStatusConf conf = slpCore.getConf(ServerStatusConf.class);
+        if(conf == null){
+            logger.warn("[Migrator - ServerListPlus] Cannot migrate ServerListPlus configuration. Received configuration was null.");
+            return 0;
+        }
+        
+        PersonalizedStatusConf.StatusConf defConf = conf.Default;
+        PersonalizedStatusConf.StatusConf personalizedConf = conf.Personalized;
+        PersonalizedStatusConf.StatusConf banned = conf.Banned;
+        
+        sender.sendPrefixedMsg("Migrating <white>Default</white>...");
+        int defConfParsed = parseConf(core, sender, defConf, Type.DEFAULT);
+        
+        sender.sendPrefixedMsg("Migrating <white>Personalized</white>...");
+        int personalizedParsed = parseConf(core, sender, personalizedConf, Type.PERSONALIZED);
+        
+        sender.sendPrefixedMsg("Migrating <white>Banned</white>...");
+        int bannedParsed = parseConf(core, sender, banned, Type.BANNED);
+        
+        return defConfParsed + personalizedParsed + bannedParsed;
+    }
+    
+    private static int parseConf(AdvancedServerList<?> core, CmdSender sender, PersonalizedStatusConf.StatusConf conf, Type type){
+        PluginLogger logger = core.getPlugin().getPluginLogger();
+        if(conf == null){
+            logger.info("[Migrator - ServerListPlus] No StatusConf found for type %s. Skipping...", type.getName());
+            sender.sendPrefixedMsg(" -> Not found! Skipping...");
+            
+            return 0;
+        }
+        
+        ProfileEntry.Builder builder = ProfileEntry.empty().builder();
+        List<ProfileEntry.Builder> profiles = new ArrayList<>();
+        
+        List<List<String>> motds = resolveMotds(conf.Description);
+        List<String> favicons = resolveFavicons(conf.Favicon);
+        List<List<String>> hovers = resolveHover(conf.Players);
+        NullBool hidePlayers = conf.Players != null ? NullBool.resolve(conf.Players.Hidden) : NullBool.NOT_SET;
+        List<Integer> maxPlayers = resolveMaxPlayers(conf.Players);
+        List<String> playerCount = resolvePlayerCounts(conf.Players);
+        
+        int size = getMaxListSize(motds, favicons, hovers, maxPlayers, playerCount);
+        // Only add profiles entries when there are more than 2 entries of an option.
+        // Avoids a profiles option with a single entry that has no options whatsoever.
+        if(size > 1){
+            for(int i = 0; i < size; i++){
+                profiles.add(ProfileEntry.empty().builder());
+            }
+        }
+        
+        apply(motds, builder, profiles, ProfileEntry.Builder::motd);
+        apply(favicons, builder, profiles, ProfileEntry.Builder::favicon);
+        apply(hovers, builder, profiles, ProfileEntry.Builder::players);
+        apply(maxPlayers, builder, profiles, (build, count) -> build.maxPlayersEnabled(NullBool.TRUE).maxPlayersCount(count));
+        apply(playerCount, builder, profiles, ProfileEntry.Builder::playerCountText);
+        
+        builder.hidePlayersEnabled(hidePlayers);
+        
+        ProfileEntry entry = builder.build();
+        List<ProfileEntry> profileEntries = profiles.stream()
+            .map(ProfileEntry.Builder::build)
+            .toList();
+        
+        if(entry.isInvalid() && profileEntries.isEmpty()){
+            logger.warn("[Migrator - ServerListPlus] Unable to parse ServerListPlus configuration of type %s. Generated ProfileEntry was invalid.", type.getName());
+            sender.sendErrorMsg(" -> <red>Received invalid Configuration.");
+            
+            return 0;
+        }
+        
+        Path profile = core.getPlugin().getFolderPath().resolve("profiles").resolve(type.getFile());
+        if(Files.exists(profile)){
+            logger.warn("[Migrator - ServerListPlus] Cannot create new file %s. One with the same name is already present", type.getFile());
+            sender.sendErrorMsg(" -> <red>File</red> %s <red>already present.", type.getFile());
+            
+            return 0;
+        }
+        
+        try{
+            Files.createFile(profile);
+        }catch(IOException ex){
+            logger.warn("[Migrator - ServerListPlus] Encountered an IOException while trying to create file %s.", ex, type.getFile());
+            sender.sendErrorMsg(" -> <red>File creation error.");
+            
+            return 0;
+        }
+        
+        YamlConfigurationLoader loader = YamlConfigurationLoader.builder()
+            .path(profile)
+            .indent(2)
+            .nodeStyle(NodeStyle.BLOCK)
+            .defaultOptions(opt -> opt.serializers(build -> build.register(ProfileEntry.class, ProfileSerializer.INSTANCE)))
+            .build();
+        
+        ConfigurationNode node;
+        try{
+            node = loader.load();
+        }catch(IOException ex){
+            logger.warn("[Migrator - ServerListPlus] Encountered an IOException while trying to load file %s.", ex, type.getFile());
+            sender.sendErrorMsg(" -> <red>File loading error.");
+            
+            return 0;
+        }
+        
+        if(node == null){
+            logger.warn("[Migrator - ServerListPlus] Cannot migrate Configuration of type %s. ConfigurationNode was null.", type.getName());
+            sender.sendErrorMsg(" -> <red>File loading error.");
+            
+            return 0;
+        }
+        
+        try{
+            node.node("priority")
+                .set(type != Type.DEFAULT ? 1 : 0);
+            
+            if(type == Type.PERSONALIZED){
+                node.node("condition")
+                    .set("${player name} != \"" +
+                        core.getFileHandler().getString("Anonymous", "unknownPlayer", "name") +
+                        "\"");
+            }else
+            if(type == Type.BANNED){
+                node.node("condition")
+                    .set("${player isBanned}");
+            }
+            
+            if(!profiles.isEmpty()){
+                node.node("profiles").setList(ProfileEntry.class, profileEntries);
+            }
+            
+            node.set(entry);
+        }catch(SerializationException ex){
+            logger.warn("Encountered a SerializationException while setting values.", ex);
+            sender.sendErrorMsg(" -> <red>Error while updating file</red> %s<red>.", type.getFile());
+            
+            return 0;
+        }
+        
+        try{
+            loader.save(node);
+            sender.sendPrefixedMsg(" -> <green>Completed!");
+            
+            return 1;
+        }catch(IOException ex){
+            logger.warn("[Migrator - ServerListPlus] Encountered an IOException while trying to save new file %s.", ex, type.getFile());
+            sender.sendErrorMsg(" -> <red>File saving error.");
+            
+            return 0;
+        }
+    }
+    
+    private static int getMaxListSize(List<?>... lists){
+        int size = 0;
+        for(List<?> list : lists){
+            if(list.size() > size)
+                size = list.size();
+        }
+        
+        return size;
+    }
+    
+    private static List<List<String>> resolveMotds(List<String> descriptions){
+        if(descriptions == null || descriptions.isEmpty())
+            return Collections.emptyList();
+        
+        List<List<String>> motds = new ArrayList<>();
+        for(String line : descriptions){
+            motds.add(getList(line));
+        }
+        
+        return motds;
+    }
+    
+    private static List<String> resolveFavicons(PersonalizedStatusConf.StatusConf.FaviconConf faviconConf){
+        if(faviconConf == null || faviconConf.Disabled != null && faviconConf.Disabled)
+            return Collections.emptyList();
+        
+        List<String> list = new ArrayList<>();
+        
+        if(faviconConf.Heads != null){
+            for(String head : faviconConf.Heads){
+                list.add(
+                    "https://mc-heads.net/avatar/" +
+                        replacePlaceholders(head) +
+                        "/64/nohelm"
+                );
+            }
+        }
+        
+        if(faviconConf.Helms != null){
+            for(String helm : faviconConf.Helms){
+                list.add(replacePlaceholders(helm));
+            }
+        }
+        
+        if(faviconConf.Files != null){
+            for(String file : faviconConf.Files){
+                if(!file.toLowerCase(Locale.ROOT).endsWith(".png"))
+                    continue;
+                
+                list.add(replacePlaceholders(file));
+            }
+        }
+        
+        return list;
+    }
+    
+    private static List<List<String>> resolveHover(PersonalizedStatusConf.StatusConf.PlayersConf playersConf){
+        if(playersConf == null)
+            return Collections.emptyList();
+        
+        BooleanOrList<String> booleanOrList = playersConf.Hover;
+        if(booleanOrList == null)
+            return Collections.emptyList();
+        
+        if(booleanOrList.getList() != null){
+            List<List<String>> hovers = new ArrayList<>();
+            for(String line : booleanOrList.getList()){
+                if(line == null)
+                    continue;
+                
+                hovers.add(getList(line));
+            }
+            
+            return hovers;
+        }
+        
+        return Collections.emptyList();
+    }
+    
+    private static List<Integer> resolveMaxPlayers(PersonalizedStatusConf.StatusConf.PlayersConf playersConf){
+        if(playersConf == null)
+            return Collections.emptyList();
+        
+        List<IntegerRange> maxPlayers = playersConf.Max;
+        if(maxPlayers == null)
+            return Collections.emptyList();
+        
+        List<Integer> values = new ArrayList<>();
+        for(IntegerRange range : maxPlayers){
+            if(range == null)
+                continue;
+            
+            values.add(range.to());
+        }
+        
+        return values;
+    }
+    
+    private static List<String> resolvePlayerCounts(PersonalizedStatusConf.StatusConf.PlayersConf playersConf){
+        if(playersConf == null)
+            return Collections.emptyList();
+        
+        if(playersConf.Slots == null)
+            return Collections.emptyList();
+        
+        return playersConf.Slots.stream()
+            .map(SLPConfigMigrator::replacePlaceholders)
+            .toList();
+    }
+    
+    private static <T> void apply(List<T> list, ProfileEntry.Builder builder, List<ProfileEntry.Builder> profiles,
+                                  BiConsumer<ProfileEntry.Builder, T> builderConsumer){
+        if(list.size() == 1){
+            builderConsumer.accept(builder, list.get(0));
+        }else
+        if(list.size() > 1){
+            for(int i = 0; i < list.size(); i++){
+                builderConsumer.accept(profiles.get(i), list.get(i));
+            }
+        }
+    }
+    
+    private static List<String> getList(String line){
+        return Arrays.asList(replacePlaceholders(line).split("\n"));
+    }
+    
+    private static String replacePlaceholders(String input){
+        StringBuilder parsed = new StringBuilder(input);
+        StringBuilder builder = new StringBuilder();
+        
+        Matcher rgbColorMatcher = RGB_COLOR_PATTERN.matcher(parsed.toString());
+        if(rgbColorMatcher.find()){
+            do{
+                rgbColorMatcher.appendReplacement(builder, "<" + rgbColorMatcher.group("color") + ">");
+            }while(rgbColorMatcher.find());
+            
+            rgbColorMatcher.appendTail(builder);
+            parsed = builder;
+        }
+        
+        Matcher colorCodeMatcher = COLOR_CODE_PATTERN.matcher(parsed.toString());
+        if(colorCodeMatcher.find()){
+            builder.setLength(0);
+            do{
+                String color = colorCodeMatcher.group("color").toLowerCase(Locale.ROOT); 
+                switch(color){
+                    case "a" -> colorCodeMatcher.appendReplacement(builder, "<green>");
+                    case "b" -> colorCodeMatcher.appendReplacement(builder, "<aqua>");
+                    case "c" -> colorCodeMatcher.appendReplacement(builder, "<red>");
+                    case "d" -> colorCodeMatcher.appendReplacement(builder, "<light_purple>");
+                    case "e" -> colorCodeMatcher.appendReplacement(builder, "<yellow>");
+                    case "f" -> colorCodeMatcher.appendReplacement(builder, "<white>");
+                    case "k" -> colorCodeMatcher.appendReplacement(builder, "<obfuscated>");
+                    case "l" -> colorCodeMatcher.appendReplacement(builder, "<bold>");
+                    case "m" -> colorCodeMatcher.appendReplacement(builder, "<strikethrough>");
+                    case "n" -> colorCodeMatcher.appendReplacement(builder, "<underlined>");
+                    case "o" -> colorCodeMatcher.appendReplacement(builder, "<italic>");
+                    case "r" -> colorCodeMatcher.appendReplacement(builder, "<reset>");
+                    case "0" -> colorCodeMatcher.appendReplacement(builder, "<black>");
+                    case "1" -> colorCodeMatcher.appendReplacement(builder, "<dark_blue>");
+                    case "2" -> colorCodeMatcher.appendReplacement(builder, "<dark_green>");
+                    case "3" -> colorCodeMatcher.appendReplacement(builder, "<dark_aqua>");
+                    case "4" -> colorCodeMatcher.appendReplacement(builder, "<dark_red>");
+                    case "5" -> colorCodeMatcher.appendReplacement(builder, "<dark_purple>");
+                    case "6" -> colorCodeMatcher.appendReplacement(builder, "<gold>");
+                    case "7" -> colorCodeMatcher.appendReplacement(builder, "<grey>");
+                    case "8" -> colorCodeMatcher.appendReplacement(builder, "<dark_grey>");
+                    case "9" -> colorCodeMatcher.appendReplacement(builder, "<blue>");
+                    // This one shouldn't be reachable given the pattern, but you never know...
+                    default -> colorCodeMatcher.appendReplacement(builder, "&" + color);
+                }
+            }while(colorCodeMatcher.find());
+            
+            colorCodeMatcher.appendTail(builder);
+            parsed = builder;
+        }
+        
+        Matcher rgbGradientMatcher = RGB_GRADIENT_PATTERN.matcher(parsed.toString());
+        if(rgbGradientMatcher.find()){
+            builder.setLength(0);
+            do{
+                String start = rgbGradientMatcher.group("start");
+                String end = rgbGradientMatcher.group("end");
+                String text = rgbGradientMatcher.group("text");
+                
+                rgbGradientMatcher.appendReplacement(builder, "<gradient:" + start + ":" + end + ">" + text + "</gradient>");
+            }while(rgbGradientMatcher.find());
+            
+            rgbGradientMatcher.appendTail(builder);
+            parsed = builder;
+        }
+        
+        return replaceStaticPlaceholders(parsed);
+    }
+    
+    private static String replaceStaticPlaceholders(StringBuilder input){
+        if(input.isEmpty())
+            return "";
+        
+        for(Map.Entry<String, String> entry : STATIC_REPLACEMENTS.entrySet()){
+            int index = 0;
+            while((index = input.indexOf(entry.getKey(), index)) != -1){
+                input.replace(index, index + entry.getKey().length(), entry.getValue());
+                index += entry.getValue().length();
+            }
+        }
+        
+        return input.toString();
+    }
+    
+    private enum Type{
+        DEFAULT("Default", "slp_default.yml"),
+        PERSONALIZED("Personalized", "slp_personalized.yml"),
+        BANNED("Banned", "slp_banned.yml");
+        
+        private final String name, file;
+        
+        Type(String name, String file){
+            this.name = name;
+            this.file = file;
+        }
+        
+        public String getName(){
+            return name;
+        }
+        
+        public String getFile(){
+            return file;
+        }
+    }
+}

core/src/main/java/ch/andre601/advancedserverlist/core/objects/CacheUtil.java

@@ -23,26 +23,30 @@
  *
  */
 
-package ch.andre601.advancedserverlist.core.check;
+package ch.andre601.advancedserverlist.core.objects;
 
+import java.time.Duration;
 import java.util.function.Supplier;
 
-public class VersionCache{
+public class CacheUtil<T>{
     
-    private CachedValue cachedValue = null;
+    private final Duration duration;
+    private CacheValue<T> cache = null;
     
-    public VersionCache(){}
-    
-    public UpdateChecker.ModrinthVersion get(Supplier<UpdateChecker.ModrinthVersion> supplier){
-        if(cachedValue == null || cachedValue.hasExpired())
-            cachedValue = new CachedValue(System.currentTimeMillis(), supplier.get());
-        
-        return cachedValue.version();
+    public CacheUtil(Duration duration){
+        this.duration = duration;
     }
     
-    private record CachedValue(long timestamp, UpdateChecker.ModrinthVersion version){
-        public boolean hasExpired(){
-            return (timestamp < 0L) || System.currentTimeMillis() - timestamp >= 300_000L;
+    public T get(Supplier<T> supplier){
+        if(cache == null || cache.expired())
+            cache = new CacheValue<>(System.currentTimeMillis(), duration, supplier.get());
+        
+        return cache.value();
+    }
+    
+    private record CacheValue<T>(long timestamp, Duration duration, T value){
+        public boolean expired(){
+            return (timestamp < 0L) || System.currentTimeMillis() - timestamp >= duration.toMillis();
         }
     }
 }

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

@@ -120,6 +120,13 @@ 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()
@@ -128,6 +135,9 @@ public record ServerListProfile(int priority, String condition, ProfileEntry def
         }
         
         private Builder resolveCondition(){
+            if(node == null)
+                throw new IllegalStateException("ConfigurationNode was null!");
+            
             String condition = node.node("condition").getString();
             if(condition == null || condition.isEmpty())
                 return this;
@@ -137,6 +147,9 @@ public record ServerListProfile(int priority, String condition, ProfileEntry def
         }
         
         private Builder resolveProfiles(){
+            if(node == null)
+                throw new IllegalStateException("ConfigurationNode was null!");
+            
             try{
                 this.profiles = node.node("profiles").getList(ProfileEntry.class);
             }catch(SerializationException ex){
@@ -147,6 +160,9 @@ public record ServerListProfile(int priority, String condition, ProfileEntry def
         }
         
         private Builder resolveDefaultProfile(){
+            if(node == null)
+                throw new IllegalStateException("ConfigurationNode was null!");
+            
             try{
                 this.defaultProfile = node.get(ProfileEntry.class);
             }catch(SerializationException ex){

core/src/main/resources/config.yml

@@ -3,86 +3,108 @@
 #
 unknownPlayer:
   #
-  # The name to use. Defaults to Anonymous.
+  # The name to use.
+  #
+  # Default: Anonymous
   #
   name: "Anonymous"
   #
-  # The UUID to use. Defaults to 606e2ff0-ed77-4842-9d6c-e1d3321c7838 (UUID of MHF_Question).
+  # The UUID to use.
+  #
+  # Default: 606e2ff0-ed77-4842-9d6c-e1d3321c7838 (UUID of MHF_Question).
   #
   uuid: "606e2ff0-ed77-4842-9d6c-e1d3321c7838"
 
 #
 # Should the Caching of players be disabled?
 #
-# When set to true will AdvancedServerList not load any players from the cache.data file (if present) nor save any to it.
-# Placeholders that rely on the player being cached (such as ${player name}) will not work while this option is enabled.
+# When set to true will no player joining the server be cached and saved to the playercache.json file.
+# This will also cause placeholders using a cached player such as ${player name} to no longer work.
 #
-# Defaults to false when not present.
+# Default: false
 #
 disableCache: false
 
 #
 # Should AdvancedServerList check for new versions?
 #
-# When set to true will AdvancedServerList check for a new version on modrinth.com every 12 hours and inform you in the
-# console about whether it found any new update or not.
+# When set to true will AdvancedServerList look for a new update on startup and repeat that check
+# every 12 hours after that.
+# It uses Modrinth to check for updates.
 #
-# Defaults to false when not present.
+# Default: true
 #
 checkUpdates: true
 
 #
 # Should debug mode be enabled?
 #
-# When set to true will AdvancedServerList print additional messages to the console prefixed with "[DEBUG]".
-# It is recommended to only enable this when having problems or when being told to by the plugin dev, as it could
-# otherwise cause significant spam in your console.
+# Additional messages prefixed with [DEBUG] will be printed in the console when this option is set
+# to true.
+# Enabling this option is only recommended for when you have problems, or have been told to enable
+# it by the plugin developer, as it can otherwise spam your console.
 #
-# Defaults to false when not present.
+# Default: false
 #
 debug: false
 
 #
-# Sets the time in minutes for favicons to be cached.
-# The number cannot be less than 1.
+# Sets how long Favicons should be cached. Value is in minutes with the lowest possible value being 1.
 #
-# Defaults to 1 if not set.
+# This option only affects dynamic favicons created from a placeholder or URL. Local favicons will
+# not be affected.
+#
+# Default: 1
 #
 faviconCacheTime: 1
 
 #
-# List of options that should be disabled while the Maintenance Mode of the plugin Maintenance is active.
-# Any option not listed here will NOT be disabled, meaning AdvancedServerList will continue to handle it.
+# Options to disable while the Maintenance Plugin is present and Maintenance Mode is active.
 #
-# Each option defaults to true when not present, disabling said option while Maintenance is active.
+# Should an option be removed from this section will AdvancedServerList continue to set it, as if
+# the Maintenance plugin isn't active.
 #
 disableDuringMaintenance:
   #
-  # When true (Default), disables handling of MOTD while Maintenance is enabled.
+  # Whether MOTD changing should be disabled while Maintenance mode is active.
+  #
+  # Default: true
   #
   motd: true
   #
-  # When true (Default), disables handling of Favicon while Maintenance is enabled.
+  # Whether favicon changing should be disabled while Maintenance mode is active.
+  #
+  # Default: true
   #
   favicon: true
   #
-  # When true (Default), disables hiding of player count while Maintenance is enabled.
+  # Whether player hiding should be disabled while Maintenance mode is active.
+  #
+  # Default: true
   #
   hidePlayers: true
   #
-  # When true (Default), disables handling of player count text while Maintenance is enabled.
+  # Whether player count text changing should be disabled while Maintenance mode is active.
+  #
+  # Default: true
   #
   playerCountText: true
   #
-  # When true (Default), disables handling of player count hover while Maintenance is enabled.
+  # Whether player count hover changing should be disabled while Maintenance mode is active.
+  #
+  # Default: true
   #
   playerCountHover: true
   #
-  # When true (Default), disables use of extra players feature while Maintenance is enabled.
+  # Whether the extra players feature should be disabled while Maintenance mode is active.
+  #
+  # Default: true
   #
   extraPlayers: true
   #
-  # When true (Default), disables use of max players feature while Maintenance is enabled.
+  # Whether the max players feature should be disabled while Maintenance mode is active.
+  #
+  # Default: true
   #
   maxPlayers: true
 

docs/commands/index.md

@@ -18,6 +18,7 @@ The following subcommands are available (Subcommands are case-insensitive):
 - [`help`](#help)
 - [`reload`](#reload)
 - [`clearCache`](#clearcache)
+- [`migrate <plugin>`](#migrate)
 
 ### help
 
@@ -41,4 +42,17 @@ Reloads the plugin's `config.yml` and all available YAML files in the `profiles`
 **Permission:** `advancedserverlist.command.clearcache`
 
 Clears the currently cached favicons and players.
+///
+
+### migrate &lt;plugin&gt; { #migrate }
+
+/// info |
+**Permission:** `advancedserverlist.command.migrate`
+
+**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.
 ///

docs/getting-started/index.md

@@ -352,86 +352,108 @@ Note that the config can get migrated to newer versions, adding missing options
 #
 unknownPlayer:
   #
-  # The name to use. Defaults to Anonymous.
+  # The name to use.
+  #
+  # Default: Anonymous
   #
   name: "Anonymous"
   #
-  # The UUID to use. Defaults to 606e2ff0-ed77-4842-9d6c-e1d3321c7838 (UUID of MHF_Question).
+  # The UUID to use.
+  #
+  # Default: 606e2ff0-ed77-4842-9d6c-e1d3321c7838 (UUID of MHF_Question).
   #
   uuid: "606e2ff0-ed77-4842-9d6c-e1d3321c7838"
 
 #
 # Should the Caching of players be disabled?
 #
-# When set to true will AdvancedServerList not load any players from the cache.data file (if present) nor save any to it.
-# Placeholders that rely on the player being cached (such as ${player name}) will not work while this option is enabled.
+# When set to true will no player joining the server be cached and saved to the playercache.json file.
+# This will also cause placeholders using a cached player such as ${player name} to no longer work.
 #
-# Defaults to false when not present.
+# Default: false
 #
 disableCache: false
 
 #
 # Should AdvancedServerList check for new versions?
 #
-# When set to true will AdvancedServerList check for a new version on modrinth.com every 12 hours and inform you in the
-# console about whether it found any new update or not.
+# When set to true will AdvancedServerList look for a new update on startup and repeat that check
+# every 12 hours after that.
+# It uses Modrinth to check for updates.
 #
-# Defaults to false when not present.
+# Default: true
 #
 checkUpdates: true
 
 #
 # Should debug mode be enabled?
 #
-# When set to true will AdvancedServerList print additional messages to the console prefixed with "[DEBUG]".
-# It is recommended to only enable this when having problems or when being told to by the plugin dev, as it could
-# otherwise cause significant spam in your console.
+# Additional messages prefixed with [DEBUG] will be printed in the console when this option is set
+# to true.
+# Enabling this option is only recommended for when you have problems, or have been told to enable
+# it by the plugin developer, as it can otherwise spam your console.
 #
-# Defaults to false when not present.
+# Default: false
 #
 debug: false
 
 #
-# Sets the time in minutes for favicons to be cached.
-# The number cannot be less than 1.
+# Sets how long Favicons should be cached. Value is in minutes with the lowest possible value being 1.
 #
-# Defaults to 1 if not set.
+# This option only affects dynamic favicons created from a placeholder or URL. Local favicons will
+# not be affected.
+#
+# Default: 1
 #
 faviconCacheTime: 1
 
 #
-# List of options that should be disabled while the Maintenance Mode of the plugin Maintenance is active.
-# Any option not listed here will NOT be disabled, meaning AdvancedServerList will continue to handle it.
+# Options to disable while the Maintenance Plugin is present and Maintenance Mode is active.
 #
-# Each option defaults to true when not present, disabling said option while Maintenance is active.
+# Should an option be removed from this section will AdvancedServerList continue to set it, as if
+# the Maintenance plugin isn't active.
 #
 disableDuringMaintenance:
   #
-  # When true (Default), disables handling of MOTD while Maintenance is enabled.
+  # Whether MOTD changing should be disabled while Maintenance mode is active.
+  #
+  # Default: true
   #
   motd: true
   #
-  # When true (Default), disables handling of Favicon while Maintenance is enabled.
+  # Whether favicon changing should be disabled while Maintenance mode is active.
+  #
+  # Default: true
   #
   favicon: true
   #
-  # When true (Default), disables hiding of player count while Maintenance is enabled.
+  # Whether player hiding should be disabled while Maintenance mode is active.
+  #
+  # Default: true
   #
   hidePlayers: true
   #
-  # When true (Default), disables handling of player count text while Maintenance is enabled.
+  # Whether player count text changing should be disabled while Maintenance mode is active.
+  #
+  # Default: true
   #
   playerCountText: true
   #
-  # When true (Default), disables handling of player count hover while Maintenance is enabled.
+  # Whether player count hover changing should be disabled while Maintenance mode is active.
+  #
+  # Default: true
   #
   playerCountHover: true
   #
-  # When true (Default), disables use of extra players feature while Maintenance is enabled.
+  # Whether the extra players feature should be disabled while Maintenance mode is active.
+  #
+  # Default: true
   #
   extraPlayers: true
   #
-  # When true (Default), disables use of max players feature while Maintenance is enabled.
+  # Whether the max players feature should be disabled while Maintenance mode is active.
+  #
+  # Default: true
   #
   maxPlayers: true
 

docs/migration/index.md

@@ -4,11 +4,25 @@ icon: octicons/file-directory-symlink-24
 
 # Migration
 
-This page lists all migration guides for specific AdvancedServerList versions.
+## Other Plugins
 
-Note that these pages only cover server list profile files. The config.yml is automatically being migrated (Feature since v3.1.0).
+The below pages show guides on how to migrate from another plugin to AdvancedServerList.  
+These pages may include important information about the migration process and what you may have to do before, during or after the process.
 
-## Pages
+<div class="grid cards" markdown>
+
+-   [**ServerListPlus**](serverlistplus.md)
+    
+    ----
+    
+    Migrate from the Plugin [ServerListPlus](https://github.com/Minecrell/ServerListPlus).
+
+</div>
+
+## AdvancedServerList
+
+The below pages show guides on how to migrate from one version to another of AdvancedServerList.  
+These guides are only for the Server List Profile files, as the config.yml gets automatically migrated (Feature since v3.1.0).
 
 <div class="grid cards" markdown>
 

docs/migration/serverlistplus.md

@@ -0,0 +1,282 @@
+---
+icon: octicons/arrow-right-24
+---
+
+# ServerListPlus
+
+Version `v4.8.0-b1` added support for migrating your existing `ServerListPlus.yml` configuration to AdvancedServerList.
+
+## Important notes
+
+Migration requires that ServerListPlus is present and running on the server.  
+This is due to AdvancedServerList using the internal API of ServerListPlus to retrieve the Configuration used.
+
+## Conversions
+
+Specific values within the ServerListPlus configuration will be converted into equivalents supported by AdvancedServerListPlus.
+
+### Placeholders
+
+The following placeholders get converted:
+
+| Placeholder             | Conversion                                                                        |
+|-------------------------|-----------------------------------------------------------------------------------|
+| `%player%`              | `${player name}`                                                                  |
+| `%uuid%` and `%_uuid_%` | `${player uuid}`                                                                  |
+| `%online%`              | `${server playersOnline}`                                                         |
+| `%max%`                 | `${server playersMax}`                                                            |
+
+### Colors/Formatting
+
+The following color and formatting codes get converted[^1]:
+
+| Color/Formatting code                      | Conversion                                                                    |
+|--------------------------------------------|-------------------------------------------------------------------------------|
+| `&<color/format>`                          | Corresponding color/formatting code in MiniMessage (i.e. `&1 -> <dark_blue>`) |
+| `&#<hexcode>`                              | `<#<hexcode>>`                                                                |
+| `%gradient#<start>#<end>%<text>%gradient%` | `<gradient:#<start>:#<end>><text></gradient>`                                 |
+
+### Favicon options
+
+The following Favicon options get converted into an equivalent one:
+
+| Option  | Conversion                                                                      |
+|---------|---------------------------------------------------------------------------------|
+| `Heads` | `https://mc-heads.net/avatar/<entry>/64/nohelm`                                 |
+| `Helms` | Returned as-is with [placeholders replaced](#placeholders).                     |
+| `Files` | Only `.png` files will be included with [placeholders replaced](#placeholders). |
+
+## How to Migrate
+
+Execute the command [`/asl migrate serverlistplus`](../commands/index.md#migrate) to start the migration process. Make sure that ServerListPlus is present and enabled.
+
+## Example
+
+Below can you find a full example of a ServerListPlus.yml file and the corresponding migrated files from AdvancedServerList:
+
+/// tab | :octicons-file-code-24: ServerListPlus.yml
+```yaml
+--- !Status
+Default:
+  Description:
+  - |-
+    &aA Minecraft Server.
+    &7Now with [&a&lPvP&7], [&a&lMinigames&7], and much more!
+  - |-
+    &aA Minecraft Server.
+    &eNow running the latest &lMinecraft &eversion!
+  - |-
+    &a&#45bf55A Minecraft &#0288d1Server.
+    &e%gradient#ffbe00#f4511e%Now with RGB colors. Nice!%gradient%
+  Players:
+    Hover:
+    - |-
+      &aWelcome to &lA Minecraft Server&a!
+      &aCurrently &e&l%online%/%max% &aplayers are playing on our server!
+Personalized:
+  Description:
+  - |-
+    &aA Minecraft Server. &7|  &eHello, &l%player%!
+    &7Now with [&a&lPvP&7], [&a&lMinigames&7], and much more!
+  - |-
+    &aA Minecraft Server. &7|  &eHello, &l%player%!
+    &eNow running the latest &lMinecraft &eversion!
+  - |-
+    &a&#45bf55A Minecraft &#0288d1Server.
+    &e%gradient#ffbe00#f4511e%Now with RGB colors. Hello %player%!%gradient%
+  Players:
+    Hover:
+    - |-
+      &aWelcome back, &l%player%&a!
+      &aCurrently &e&l%online%/%max% &aplayers are playing on our server!
+  Favicon:
+    Files:
+    - favicon1.png
+    - favicon2.png
+Banned:
+  Description:
+  - |-
+    &cYou are &4&lBANNED!
+    &cGo away!
+  Players:
+    Hidden: true
+ 
+--- !Plugin
+PlayerTracking:
+  Enabled: true
+  Storage: !JSONStorage
+    Enabled: true
+    SaveDelay: 5m
+StripRGBIfOutdated: true
+Unknown:
+  PlayerName: player
+  PlayerCount: ???
+  Date: ???
+  BanReason: some reason
+  BanOperator: somebody
+  BanExpirationDate: never
+Favicon:
+  Timeout: 10s
+  RecursiveFolderSearch: true
+  ResizeStrategy: SCALE
+
+--- !Bukkit
+ProtocolLib: DISABLE
+```
+///
+
+/// tab | :octicons-file-code-24: slp_default.yml
+```yaml
+priority: 0
+profiles:
+- motd:
+  - <green>A Minecraft Server.
+  - <grey>Now with [<green><bold>PvP<grey>], [<green><bold>Minigames<grey>], and much
+    more!
+  playerCount:
+    hover: []
+    text: ''
+    hidePlayers: false
+    extraPlayers:
+      enabled: false
+      amount: 0
+    maxPlayers:
+      enabled: false
+      amount: 0
+  favicon: ''
+- motd:
+  - <green>A Minecraft Server.
+  - <yellow>Now running the latest <bold>Minecraft <yellow>version!
+  playerCount:
+    hover: []
+    text: ''
+    hidePlayers: false
+    extraPlayers:
+      enabled: false
+      amount: 0
+    maxPlayers:
+      enabled: false
+      amount: 0
+  favicon: ''
+- motd:
+  - <green><#45bf55>A Minecraft <#0288d1>Server.
+  - <yellow><gradient:#ffbe00:#f4511e>Now with RGB colors. Nice!</gradient>
+  playerCount:
+    hover: []
+    text: ''
+    hidePlayers: false
+    extraPlayers:
+      enabled: false
+      amount: 0
+    maxPlayers:
+      enabled: false
+      amount: 0
+  favicon: ''
+motd: []
+playerCount:
+  hover:
+  - <green>Welcome to <bold>A Minecraft Server<green>!
+  - <green>Currently <yellow><bold>${server playersOnline}/${server playersMax} <green>players
+    are playing on our server!
+  text: ''
+  hidePlayers: false
+  extraPlayers:
+    enabled: false
+    amount: 0
+  maxPlayers:
+    enabled: false
+    amount: 0
+favicon: ''
+```
+///
+
+/// tab | :octicons-file-code-24: slp_personalized.yml
+```yaml
+priority: 1
+condition: ${player name} != "Someone"
+profiles:
+- motd:
+  - <green>A Minecraft Server. <grey>|  <yellow>Hello, <bold>${player name}!
+  - <grey>Now with [<green><bold>PvP<grey>], [<green><bold>Minigames<grey>], and much
+    more!
+  playerCount:
+    hover: []
+    text: ''
+    hidePlayers: false
+    extraPlayers:
+      enabled: false
+      amount: 0
+    maxPlayers:
+      enabled: false
+      amount: 0
+  favicon: favicon1.png
+- motd:
+  - <green>A Minecraft Server. <grey>|  <yellow>Hello, <bold>${player name}!
+  - <yellow>Now running the latest <bold>Minecraft <yellow>version!
+  playerCount:
+    hover: []
+    text: ''
+    hidePlayers: false
+    extraPlayers:
+      enabled: false
+      amount: 0
+    maxPlayers:
+      enabled: false
+      amount: 0
+  favicon: favicon2.png
+- motd:
+  - <green><#45bf55>A Minecraft <#0288d1>Server.
+  - <yellow><gradient:#ffbe00:#f4511e>Now with RGB colors. Hello ${player name}!</gradient>
+  playerCount:
+    hover: []
+    text: ''
+    hidePlayers: false
+    extraPlayers:
+      enabled: false
+      amount: 0
+    maxPlayers:
+      enabled: false
+      amount: 0
+  favicon: ''
+motd: []
+playerCount:
+  hover:
+  - <green>Welcome back, <bold>${player name}<green>!
+  - <green>Currently <yellow><bold>${server playersOnline}/${server playersMax} <green>players
+    are playing on our server!
+  text: ''
+  hidePlayers: false
+  extraPlayers:
+    enabled: false
+    amount: 0
+  maxPlayers:
+    enabled: false
+    amount: 0
+favicon: ''
+```
+///
+
+/// tab | :octicons-file-code-24: slp_banned.yml
+```yaml
+priority: 1
+condition: ${player isBanned}
+motd:
+- <red>You are <dark_red><bold>BANNED!
+- <red>Go away!
+playerCount:
+  hover: []
+  text: ''
+  hidePlayers: true
+  extraPlayers:
+    enabled: false
+    amount: 0
+  maxPlayers:
+    enabled: false
+    amount: 0
+favicon: ''
+```
+///
+
+[^1]:
+    Converting of color and formatting codes is done lazely and without context.  
+    This means that a text such as `&aHello &l%player%&a!` gets converted into `<aqua>Hello <bold>${player name}<aqua>!` when it actually should be `<aqua>Hello <bold>${player name}</bold>!`

docs/profiles/index.md

@@ -187,8 +187,10 @@ playerCount:
 
 The `playerCount -> hover` option allows you to define lines of text to show when a player hovers over the player count with their cursor.
 
-Note that this option only accepts basic colors such as `<blue>` or `<grey>` and that HEX colors are not supported.
- 
+/// info | Notes 
+Only basic color and formatting codes such as `<aqua>` and `<bold>` are accepted. Hex colors will be downsampled to the closest supported color.
+///
+
 /// details | Example
     type: example
 

mkdocs.yml

@@ -118,11 +118,14 @@ nav:
   - Examples: examples/index.md
   - Migration:
     - migration/index.md
-    - v3.8.0 to v3.9.0: migration/v3_8_0-to-v3_9_0.md
-    - v3.7.0 to v3.8.0: migration/v3_7_0-to-v3_8_0.md
-    - '< v3.7.0 to v3.7.0': migration/pre-v3_7_0-to-v3_7_0.md
-    - v1.9.0 to v1.10.0: migration/v1_9_0-to-v1_10_0.md
-    - v1.5.3 to v1.6.0: migration/v1_5_3-to-v1_6_0.md
+    - Other Plugins:
+      - ServerListPlus: migration/serverlistplus.md
+    - AdvancedServerList:
+      - v3.8.0 to v3.9.0: migration/v3_8_0-to-v3_9_0.md
+      - v3.7.0 to v3.8.0: migration/v3_7_0-to-v3_8_0.md
+      - '< v3.7.0 to v3.7.0': migration/pre-v3_7_0-to-v3_7_0.md
+      - v1.9.0 to v1.10.0: migration/v1_9_0-to-v1_10_0.md
+      - v1.5.3 to v1.6.0: migration/v1_5_3-to-v1_6_0.md
   - API:
     - api/index.md
     - Changelog: api/changelog.md

paper/pom.xml

@@ -92,7 +92,7 @@
         <dependency>
             <groupId>com.viaversion</groupId>
             <artifactId>viaversion-api</artifactId>
-            <version>4.10.0</version>
+            <version>4.10.2</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

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

@@ -164,6 +164,11 @@ public class PaperCore extends JavaPlugin implements PluginCore<CachedServerIcon
         return "paper";
     }
     
+    @Override
+    public boolean isPluginEnabled(String plugin){
+        return Bukkit.getPluginManager().isPluginEnabled(plugin);
+    }
+    
     @Override
     public CachedServerIcon createFavicon(BufferedImage image) throws Exception{
         return Bukkit.loadServerIcon(image);

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

@@ -59,7 +59,7 @@ public class JoinEvent implements Listener{
             
             PaperCmdSender sender = new PaperCmdSender(player);
             
-            plugin.getCore().getUpdateChecker().performeCachedUpdateCheck(sender);
+            plugin.getCore().getUpdateChecker().performCachedUpdateCheck(sender);
         }
     }
 }

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

@@ -35,6 +35,7 @@ import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
 import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
 import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
 import ch.andre601.advancedserverlist.paper.PaperCore;
+import ch.andre601.advancedserverlist.paper.objects.FakePlayerProfile;
 import ch.andre601.advancedserverlist.paper.objects.impl.PaperPlayerImpl;
 import ch.andre601.advancedserverlist.paper.objects.impl.PaperServerImpl;
 import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
@@ -47,7 +48,6 @@ import org.bukkit.util.CachedServerIcon;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.UUID;
 
 public class PaperEventWrapper implements GenericEventWrapper<CachedServerIcon, PaperPlayerImpl>{
     
@@ -104,7 +104,7 @@ public class PaperEventWrapper implements GenericEventWrapper<CachedServerIcon,
                 })
                 .toString();
             
-            players.add(Bukkit.createProfile(UUID.randomUUID(), parsed));
+            players.add(FakePlayerProfile.create(parsed));
         }
         
         event.getPlayerSample().addAll(players);

paper/src/main/java/ch/andre601/advancedserverlist/paper/objects/FakePlayerProfile.java

@@ -0,0 +1,208 @@
+/*
+ * 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.paper.objects;
+
+import com.destroystokyo.paper.profile.PlayerProfile;
+import com.destroystokyo.paper.profile.ProfileProperty;
+import org.bukkit.profile.PlayerTextures;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.net.URL;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+
+public record FakePlayerProfile(String name, UUID uuid) implements PlayerProfile{
+    
+    public static FakePlayerProfile create(String name){
+        return new FakePlayerProfile(name, UUID.randomUUID());
+    }
+    
+    @Override
+    public @Nullable UUID getUniqueId(){
+        return uuid();
+    }
+    
+    @Override
+    public @Nullable String getName(){
+        return name();
+    }
+    
+    @SuppressWarnings("removal")
+    @Override
+    public @NotNull String setName(@Nullable String name){
+        return name;
+    }
+    
+    @Override
+    public @Nullable UUID getId(){
+        return null;
+    }
+    
+    @SuppressWarnings("removal")
+    @Override
+    public @Nullable UUID setId(@Nullable UUID uuid){
+        return null;
+    }
+    
+    @Override
+    public @NotNull PlayerTextures getTextures(){
+        return new FakePlayeerTextures();
+    }
+    
+    @Override
+    public void setTextures(@Nullable PlayerTextures textures){
+        
+    }
+    
+    @Override
+    public @NotNull Set<ProfileProperty> getProperties(){
+        return Collections.emptySet();
+    }
+    
+    @Override
+    public boolean hasProperty(@Nullable String property){
+        return false;
+    }
+    
+    @Override
+    public void setProperty(@NotNull ProfileProperty property){
+        
+    }
+    
+    @Override
+    public void setProperties(@NotNull Collection<ProfileProperty> properties){
+        
+    }
+    
+    @Override
+    public boolean removeProperty(@Nullable String property){
+        return false;
+    }
+    
+    @Override
+    public void clearProperties(){
+        
+    }
+    
+    @Override
+    public boolean isComplete(){
+        return false;
+    }
+    
+    @Override
+    public boolean completeFromCache(){
+        return false;
+    }
+    
+    @Override
+    public boolean completeFromCache(boolean onlineMode){
+        return false;
+    }
+    
+    @Override
+    public boolean completeFromCache(boolean lookupUUID, boolean onlineMode){
+        return false;
+    }
+    
+    @Override
+    public boolean complete(boolean textures){
+        return false;
+    }
+    
+    @Override
+    public boolean complete(boolean textures, boolean onlineMode){
+        return false;
+    }
+    
+    @Override
+    public @NotNull CompletableFuture<PlayerProfile> update(){
+        return null;
+    }
+    
+    @Override
+    public org.bukkit.profile.@NotNull PlayerProfile clone(){
+        return null;
+    }
+    
+    @Override
+    public @NotNull Map<String, Object> serialize(){
+        return Collections.emptyMap();
+    }
+    
+    private static record FakePlayeerTextures() implements PlayerTextures{
+        
+        @Override
+        public boolean isEmpty(){
+            return false;
+        }
+        
+        @Override
+        public void clear(){
+            
+        }
+        
+        @Override
+        public @Nullable URL getSkin(){
+            return null;
+        }
+        
+        @Override
+        public void setSkin(@Nullable URL skinUrl){
+            
+        }
+        
+        @Override
+        public void setSkin(@Nullable URL skinUrl, @Nullable SkinModel skinModel){
+            
+        }
+        
+        @Override
+        public @NotNull SkinModel getSkinModel(){
+            return SkinModel.CLASSIC;
+        }
+        
+        @Override
+        public @Nullable URL getCape(){
+            return null;
+        }
+        
+        @Override
+        public void setCape(@Nullable URL capeUrl){
+            
+        }
+        
+        @Override
+        public long getTimestamp(){
+            return 0;
+        }
+        
+        @Override
+        public boolean isSigned(){
+            return false;
+        }
+    }
+}

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

@@ -20,6 +20,9 @@ dependencies:
     Maintenance:
       load: BEFORE
       required: false
+    ServerListPlus:
+      load: BEFORE
+      required: false
 
 # The below stuff is NOT used by Paper plugin.
 commands:

pom.xml

@@ -37,10 +37,16 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         
-        <plugin.version>4.6.4</plugin.version>
+        <plugin.version>4.8.0</plugin.version>
         <plugin.description>Create multiple Server lists based on conditions.</plugin.description>
         
         <api.version>3.3.0</api.version>
+
+        <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.configurate-yaml>4.1.2</dependency.configurate-yaml>
         
         <maven.compiler.source>16</maven.compiler.source>
         <maven.compiler.target>16</maven.compiler.target>

preview-domains

@@ -0,0 +1 @@
+preview.andre601.ch

requirements.txt

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

velocity/pom.xml

@@ -84,7 +84,7 @@
         <dependency>
             <groupId>org.spongepowered</groupId>
             <artifactId>configurate-yaml</artifactId>
-            <version>4.1.2</version>
+            <version>${dependency.configurate-yaml}</version>
             <scope>provided</scope>
         </dependency>
         

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

@@ -54,6 +54,7 @@ import java.awt.image.BufferedImage;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 public class VelocityCore implements PluginCore<Favicon>{
     
@@ -158,6 +159,14 @@ public class VelocityCore implements PluginCore<Favicon>{
         return "velocity";
     }
     
+    @Override
+    public boolean isPluginEnabled(String plugin){
+        if(getProxy() == null)
+            return false;
+        
+        return getProxy().getPluginManager().isLoaded(plugin.toLowerCase(Locale.ROOT));
+    }
+    
     @Override
     public Favicon createFavicon(BufferedImage image){
         return Favicon.create(image);

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

@@ -55,7 +55,7 @@ public class JoinEvent{
             
             VelocityCmdSender sender = new VelocityCmdSender(player);
             
-            plugin.getCore().getUpdateChecker().performeCachedUpdateCheck(sender);
+            plugin.getCore().getUpdateChecker().performCachedUpdateCheck(sender);
         }
     }
 }

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

@@ -14,6 +14,10 @@
     {
       "id": "maintenance",
       "optional": true
+    },
+    {
+      "id": "serverlistplus",
+      "optional": true
     }
   ],
   "main": "ch.andre601.advancedserverlist.velocity.VelocityCore"

version-uploader/src/main/java/ch/andre601/advancedserverlist/versionuploader/data/CodebergReleaseFetcher.java

@@ -57,10 +57,6 @@ public class CodebergReleaseFetcher{
             return null;
         }
         
-        // Forgejo broke tags returned, causing CI_COMMIT_TAG to return refs/tags/<tag>, so we check for this and filter it...
-        if(tag.startsWith("refs/tags/"))
-            tag = tag.substring("ref/tags/".length());
-        
         String url = "https://codeberg.org/api/v1/repos/Andre601/AdvancedServerList/releases/tags/" + tag;
         LOGGER.info("Fetching Release data from {}...", url);
         

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

@@ -102,15 +102,18 @@ public class HangarVersionUploader{
         final List<Dependency> paperDependencies = List.of(
             Dependency.fromNamespace("ViaVersion", false),
             Dependency.fromNamespace("Maintenance", false),
-            Dependency.fromNamespace("PlaceholderAPI", false)
+            Dependency.fromNamespace("PlaceholderAPI", false),
+            Dependency.fromUrl("ServerListPlus", "https://github.com/Minecrell/ServerListPlus", false)
         );
         final List<Dependency> bungeeDependencies = List.of(
             Dependency.fromNamespace("PapiProxyBridge", false),
-            Dependency.fromNamespace("Maintenance", false)
+            Dependency.fromNamespace("Maintenance", false),
+            Dependency.fromUrl("ServerListPlus", "https://github.com/Minecrell/ServerListPlus", false)
         );
         final List<Dependency> velocityDependencies = List.of(
             Dependency.fromNamespace("PapiProxyBridge", false),
-            Dependency.fromNamespace("Maintenance", false)
+            Dependency.fromNamespace("Maintenance", false),
+            Dependency.fromUrl("ServerListPlus", "https://github.com/Minecrell/ServerListPlus", false)
         );
         
         final List<MultipartObject> fileInfo = List.of(
@@ -171,8 +174,13 @@ public class HangarVersionUploader{
                 LOGGER.info("Uploading release...");
                 return client.execute(post, response -> {
                     if(response.getCode() != 200){
+                        String body = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
+                        
                         throw new RuntimeException(String.format(
-                            "Received non-successful response while uploading release. Code: %d, Message: %s", response.getCode(), response.getReasonPhrase()
+                            "Received non-successful response while uploading release.\nCode: %d\nMessage: %s\nBody: %s",
+                            response.getCode(),
+                            response.getReasonPhrase(),
+                            body
                         ));
                     }
                     LOGGER.info("Successfully uploaded new release on Hangar!");

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

@@ -36,7 +36,7 @@ public record Dependency(String name, String externalUrl, boolean required){
         return new Dependency(name, null, required);
     }
     
-    public static Dependency fromUrl(String url, boolean required){
-        return new Dependency(null, url, required);
+    public static Dependency fromUrl(String name, String url, boolean required){
+        return new Dependency(name, url, required);
     }
 }

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", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6"
     );
     
     private final ModrinthAPI api;