Fix bad cloud versions

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

.forgejo/workflows/deploy_wiki.yml

@@ -18,13 +18,13 @@ jobs:
     runs-on: codeberg-tiny
     steps:
       - name: "Checkout Source Repository"
-        uses: https://code.forgejo.org/actions/checkout@v4
+        uses: https://code.forgejo.org/actions/checkout@v6
         with:
           token: "${{ secrets.BOT_TOKEN }}"
       - name: "Checkout Target Repository"
         run: "git clone -b pages https://codeberg.org/Andre601/asl-docs site"
       - name: "Setup Python 3.x"
-        uses: https://code.forgejo.org/actions/setup-python@v5
+        uses: https://code.forgejo.org/actions/setup-python@v6
         with:
           python-version: 3.x
       - name: "Install Dependencies"

.forgejo/workflows/pr_preview.yml

@@ -28,13 +28,13 @@ jobs:
       #
       - name: "Find Comment"
         id: find-comment
-        uses: https://github.com/peter-evans/find-comment@v3
+        uses: https://github.com/peter-evans/find-comment@v4
         with:
           issue-number: "${{ github.event.pull_request.number }}"
           comment-author: "Andre_601-Bot"
       - name: "Create or update Comment"
         id: comment
-        uses: https://github.com/peter-evans/create-or-update-comment@v4
+        uses: https://github.com/peter-evans/create-or-update-comment@v5
         with:
           body: |-
             ## Pull request Preview
@@ -49,7 +49,7 @@ jobs:
       # Build website and push.
       #
       - name: "Checkout Source Repository"
-        uses: https://code.forgejo.org/actions/checkout@v4
+        uses: https://code.forgejo.org/actions/checkout@v6
         with:
           token: ${{ secrets.BOT_TOKEN }}
           fetch-depth: 0
@@ -60,7 +60,7 @@ jobs:
           cd site
           git switch ${{ env.BRANCH_NAME }} 2>/dev/null || git switch -c ${{ env.BRANCH_NAME }}
       - name: "Setup Python 3.x"
-        uses: https://code.forgejo.org/actions/setup-python@v5
+        uses: https://code.forgejo.org/actions/setup-python@v6
         with:
           python-version: 3.x
       - name: "Install Dependencies"
@@ -81,7 +81,7 @@ jobs:
       # Update comment on success or failure.
       #
       - name: "Comment Success"
-        uses: https://github.com/peter-evans/create-or-update-comment@v4
+        uses: https://github.com/peter-evans/create-or-update-comment@v5
         with:
           body: |-
             ## Pull request Preview
@@ -99,7 +99,7 @@ jobs:
           edit-mode: replace
       - name: "Comment Failure"
         if: ${{ failure() }}
-        uses: https://github.com/peter-evans/create-or-update-comment@v4
+        uses: https://github.com/peter-evans/create-or-update-comment@v5
         with:
           body: |-
             ## Pull request Preview
@@ -109,7 +109,7 @@ jobs:
             | Name    | Link                                      |
             |---------|-------------------------------------------|
             | Commit  | ${{ github.event.pull_request.head.sha }} |
-            | Logs    | ${{ RUN_URL }}                            |
+            | Logs    | ${{ env.RUN_URL }}                            |
           comment-id: "${{ steps.comment.outputs.comment-id }}"
           issue-number: "${{ github.event.pull_request.number }}"
           token: "${{ secrets.BOT_TOKEN }}"

.woodpecker/publish_assets.yml

@@ -4,7 +4,7 @@ when:
 
 steps:
   - name: "Build Jar and Upload"
-    image: maven:3.9.9-eclipse-temurin-21
+    image: maven:3.9.12-eclipse-temurin-21
     environment:
       CODEBERG_API_TOKEN:
         from_secret: cb_token
@@ -29,6 +29,7 @@ steps:
         - "paper/target/AdvancedServerList-*.jar"
         - "velocity/target/AdvancedServerList-*.jar"
         - "addons/banplugins/target/AdvancedServerList-*.jar"
+        - "addons/luckperms/target/AdvancedServerList-*.jar"
       api_key:
         from_secret: cb_token
   - name: "Create Post on Mastodon"
@@ -45,4 +46,19 @@ steps:
         Modrinth - https://modrinth.com/plugin/advancedserverlist
         Hangar - https://hangar.papermc.io/Andre_601/AdvancedServerList
         Codeberg - https://codeberg.org/Andre601/AdvancedServerList
-      visibility: public
+      visibility: public
+  - name: "Create Post on Bluesky"
+    image: woodpeckerci/plugin-bluesky-post
+    when:
+      - status: ["success"]
+    settings:
+      identifier: andre601.ch
+      app_password:
+        from_secret: bluesky_app_password
+      languages: english
+      text: |-
+        #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

README.md

@@ -40,7 +40,7 @@ A Server List Profile is a single YAML file located in the plugin's `profiles` f
 Each file has a priority and optional condition. The priority is used to determine what file AdvancedServerList should use first - starting from highest number to lowest - with conditions being used to set when the profile should be used.  
 Once a profile has been found with a condition returning true - which is the default should there be no condition - will AdvancedServerList use said profile.
 
-> *Read more about [Priority](https://asl.andre601.ch/profiles/#priority) and [Conditions](https://asl.andre601.ch/profiles/#condition)*
+> *Read more about [Priority](https://asl.andre601.ch/profiles/options/priority) and [Conditions](https://asl.andre601.ch/profiles/options/condition)*
 
 ### Placeholders
 
@@ -63,7 +63,7 @@ AdvancedServerList soft-depends on the following plugins, meaning their inclusio
 
 | Plugin                                                                  | Supported Platforms                    |
 |-------------------------------------------------------------------------|----------------------------------------|
-| [PlaceholderAPI](https://hangar.papermc.io/HelpChat/PlaceholderAPI)     | Paper                                  |
+| [PlaceholderAPI](https://modrinth.com/plugin/PlaceholderAPI)            | Paper                                  |
 | [ViaVersion](https://hangar.papermc.io/ViaVersion/ViaVersion)           | Paper                                  |
 | [PAPIProxyBridge](https://hangar.papermc.io/William278/PAPIProxyBridge) | BungeeCord, Waterfall, Velocity        |
 | [Maintenance](https://hangar.papermc.io/kennytv/Maintenance)            | Paper, BungeeCord, Waterfall, Velocity |
@@ -92,6 +92,12 @@ English Video by KasaiSora
 Spanish Video by Ajneb97  
 [![video thumbnail](https://img.youtube.com/vi/rIbljm_4HVI/0.jpg)](https://youtube.com/watch?v=rIbljm_4HVI)
 
+Indonesian Video by faajrikha  
+[![video thumbnail](https://img.youtube.com/vi/-p938rOmqy4/0.jpg)](https://www.youtube.com/watch?v=-p938rOmqy4)
+
+German Video by Finni Gamer  
+[![video thumbnail](https://img.youtube.com/vi/1Kh3cPMDd0c/0.jpg)](https://www.youtube.com/watch?v=1Kh3cPMDd0c)
+
 </p>
 </details>
 

addons/banplugins/pom.xml

@@ -40,8 +40,8 @@
     <version>${plugin.version}</version>
 
     <properties>
-        <maven.compiler.source>16</maven.compiler.source>
-        <maven.compiler.target>16</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     
@@ -65,14 +65,14 @@
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-api</artifactId>
-            <version>1.20-R0.2</version>
+            <version>1.21-R0.4</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-api</artifactId>
-            <version>1.20-R0.2</version>
+            <version>1.21-R0.4</version>
             <type>javadoc</type>
             <scope>provided</scope>
         </dependency>
@@ -99,13 +99,13 @@
         <dependency>
             <groupId>space.arim.libertybans</groupId>
             <artifactId>bans-api</artifactId>
-            <version>1.1.0-SNAPSHOT</version>
+            <version>1.1.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.gitlab.ruany</groupId>
             <artifactId>LiteBansAPI</artifactId>
-            <version>0.5.0</version>
+            <version>0.6.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -117,19 +117,12 @@
     </dependencies>
     
     <build>
-        <finalName>AdvancedServerList-BanPlugins-Addon-${plugin.version}</finalName>
+        <finalName>AdvancedServerList-BanPlugins-Addon-${plugin.version}${project.build.build_id}</finalName>
         <resources>
             <resource>
                 <filtering>true</filtering>
                 <directory>src/main/resources</directory>
             </resource>
         </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.13.0</version>
-            </plugin>
-        </plugins>
     </build>
 </project>

addons/luckperms/pom.xml

@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  ~
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>parent</artifactId>
+        <groupId>ch.andre601.advancedserverlist</groupId>
+        <version>parent</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>luckperms</artifactId>
+    <packaging>jar</packaging>
+    <version>${plugin.version}</version>
+
+    <properties>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <repositories>
+        <repository>
+            <id>sonatype</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+        </repository>
+        <repository>
+            <id>papermc</id>
+            <url>https://repo.papermc.io/repository/maven-public/</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <!-- Proxy/Server -->
+        <dependency>
+            <groupId>net.md-5</groupId>
+            <artifactId>bungeecord-api</artifactId>
+            <version>1.21-R0.4</version>
+            <type>jar</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.md-5</groupId>
+            <artifactId>bungeecord-api</artifactId>
+            <version>1.21-R0.4</version>
+            <type>javadoc</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.papermc.paper</groupId>
+            <artifactId>paper-api</artifactId>
+            <version>1.21-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.velocitypowered</groupId>
+            <artifactId>velocity-api</artifactId>
+            <version>3.3.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Plugin APIs -->
+        <dependency>
+            <groupId>ch.andre601.asl-api</groupId>
+            <artifactId>api</artifactId>
+            <version>${api.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.luckperms</groupId>
+            <artifactId>api</artifactId>
+            <version>5.4</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>AdvancedServerList-LuckPerms-Addon-${plugin.version}${project.build.build_id}</finalName>
+        <resources>
+            <resource>
+                <filtering>true</filtering>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
+</project>

addons/luckperms/src/main/java/ch/andre601/advancedserverlist/luckperms/bungee/LuckPermsAddon.java

@@ -0,0 +1,39 @@
+package ch.andre601.advancedserverlist.luckperms.bungee;
+
+import ch.andre601.advancedserverlist.api.AdvancedServerListAPI;
+import ch.andre601.advancedserverlist.api.exceptions.InvalidPlaceholderProviderException;
+import ch.andre601.advancedserverlist.luckperms.placeholders.LuckPermsPlaceholder;
+import net.luckperms.api.LuckPerms;
+import net.luckperms.api.LuckPermsProvider;
+import net.md_5.bungee.api.plugin.Plugin;
+
+public class LuckPermsAddon extends Plugin{
+    
+    @Override
+    public void onEnable(){
+        if(getProxy().getPluginManager().getPlugin("AdvancedServerList") == null){
+            getLogger().warning("AdvancedServerList not found. This plugin is required.");
+            return;
+        }
+        if(getProxy().getPluginManager().getPlugin("LuckPerms") == null){
+            getLogger().warning("LuckPerms not found. This plugin is required.");
+            return;
+        }
+        
+        LuckPerms luckPerms;
+        try{
+            luckPerms = LuckPermsProvider.get();
+        }catch(IllegalStateException ex){
+            getLogger().severe("Unable to obtain LuckPerms API instance! The Plugin won't work.");
+            return;
+        }
+        
+        getLogger().info("Registering LuckPerms Placeholders...");
+        try{
+            AdvancedServerListAPI.get().addPlaceholderProvider(new LuckPermsPlaceholder(luckPerms));
+            getLogger().info("Successfully registered Placeholder!");
+        }catch(InvalidPlaceholderProviderException ex){
+            getLogger().warning("Couldn't register Placeholder. The plugin won't work.");
+        }
+    }
+}

addons/luckperms/src/main/java/ch/andre601/advancedserverlist/luckperms/paper/LuckPermsAddon.java

@@ -0,0 +1,44 @@
+package ch.andre601.advancedserverlist.luckperms.paper;
+
+import ch.andre601.advancedserverlist.api.AdvancedServerListAPI;
+import ch.andre601.advancedserverlist.api.exceptions.InvalidPlaceholderProviderException;
+import ch.andre601.advancedserverlist.luckperms.placeholders.LuckPermsPlaceholder;
+import net.luckperms.api.LuckPerms;
+import net.luckperms.api.LuckPermsProvider;
+import org.bukkit.plugin.java.JavaPlugin;
+
+public class LuckPermsAddon extends JavaPlugin{
+    
+    @Override
+    public void onEnable(){
+        if(!this.getServer().getPluginManager().isPluginEnabled("AdvancedServerList")){
+            this.getSLF4JLogger().warn("AdvancedServerList not enabled. This plugin is required!");
+            this.getServer().getPluginManager().disablePlugin(this);
+            return;
+        }
+        
+        if(!this.getServer().getPluginManager().isPluginEnabled("LuckPerms")){
+            this.getSLF4JLogger().warn("LuckPerms not enabled. This plugin is required!");
+            this.getServer().getPluginManager().disablePlugin(this);
+            return;
+        }
+        
+        LuckPerms luckPerms;
+        try{
+            luckPerms = LuckPermsProvider.get();
+        }catch(IllegalStateException ex){
+            this.getSLF4JLogger().error("Unable to obtain LuckPerms API instance! Disabling plugin...");
+            this.getServer().getPluginManager().disablePlugin(this);
+            return;
+        }
+        
+        this.getSLF4JLogger().info("Registering LuckPerms Placeholder...");
+        try{
+            AdvancedServerListAPI.get().addPlaceholderProvider(new LuckPermsPlaceholder(luckPerms));
+            this.getSLF4JLogger().info("Successfully registered Placeholder!");
+        }catch(InvalidPlaceholderProviderException ex){
+            this.getSLF4JLogger().warn("Couldn't register Placeholder. Disabling Plugin...");
+            this.getServer().getPluginManager().disablePlugin(this);
+        }
+    }
+}

addons/luckperms/src/main/java/ch/andre601/advancedserverlist/luckperms/placeholders/LuckPermsPlaceholder.java

@@ -0,0 +1,66 @@
+package ch.andre601.advancedserverlist.luckperms.placeholders;
+
+import ch.andre601.advancedserverlist.api.PlaceholderProvider;
+import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
+import ch.andre601.advancedserverlist.api.objects.GenericServer;
+import net.luckperms.api.LuckPerms;
+import net.luckperms.api.model.user.User;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
+
+import java.util.HashMap;
+import java.util.UUID;
+
+public class LuckPermsPlaceholder extends PlaceholderProvider{
+    
+    private final LuckPerms luckPerms;
+    
+    private final HashMap<UUID, CacheValue> cache = new HashMap<>();
+    
+    public LuckPermsPlaceholder(LuckPerms luckPerms){
+        super("luckperms");
+        this.luckPerms = luckPerms;
+    }
+    
+    @Override
+    public @Nullable String parsePlaceholder(@NonNull String placholder, @NonNull GenericPlayer player, @NonNull GenericServer server){
+        if(luckPerms == null)
+            return "ERR: LuckPerms not available.";
+        
+        CacheValue cacheValue = cache.get(player.getUUID());
+        User user;
+        if(cacheValue == null || cacheValue.expired()){
+            // Can cause lag if on main thread.
+            // But the alternative would be a lot more annoying and error-prone.
+            user = luckPerms.getUserManager().loadUser(player.getUUID()).join();
+            cache.put(player.getUUID(), new CacheValue(System.currentTimeMillis(), user));
+        }else{
+            user = cacheValue.user();
+        }
+        
+        if(user == null)
+            return "ERR: Player not found.";
+        
+        String[] parts = placholder.split("\\s+");
+        if(parts.length == 1)
+            return "ERR: Missing argument for placeholder " + parts[0] + ".";
+        
+        return switch(parts[0]){
+            case "hasGroup" -> String.valueOf(
+                user.getCachedData().getPermissionData().checkPermission("group." + parts[1])
+            );
+            case "hasPermission" -> String.valueOf(
+                user.getCachedData().getPermissionData().checkPermission(parts[1]).asBoolean()
+            );
+            case "primaryGroup" -> user.getPrimaryGroup();
+            default -> null;
+        };
+    }
+    
+    private record CacheValue(long timestamp, User user){
+        public boolean expired(){
+            // Expired if current timestamp minus old one is more than 60k milliseconds (1 minute)
+            return (timestamp < 0L) || System.currentTimeMillis() - timestamp >= 60_000;
+        }
+    }
+}

addons/luckperms/src/main/java/ch/andre601/advancedserverlist/luckperms/velocity/LuckPermsAddon.java

@@ -0,0 +1,53 @@
+package ch.andre601.advancedserverlist.luckperms.velocity;
+
+import ch.andre601.advancedserverlist.api.AdvancedServerListAPI;
+import ch.andre601.advancedserverlist.api.exceptions.InvalidPlaceholderProviderException;
+import ch.andre601.advancedserverlist.luckperms.placeholders.LuckPermsPlaceholder;
+import com.google.inject.Inject;
+import com.velocitypowered.api.event.Subscribe;
+import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
+import com.velocitypowered.api.proxy.ProxyServer;
+import net.luckperms.api.LuckPerms;
+import net.luckperms.api.LuckPermsProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class LuckPermsAddon{
+    
+    private final ProxyServer proxy;
+    private final Logger logger = LoggerFactory.getLogger("ASLLuckPermsAddon");
+    
+    @Inject
+    public LuckPermsAddon(ProxyServer proxy){
+        this.proxy = proxy;
+    }
+    
+    @Subscribe
+    public void init(ProxyInitializeEvent event){
+        if(!proxy.getPluginManager().isLoaded("advancedserverlist")){
+            logger.warn("AdvancedServerList is not enabled. This plugin is required.");
+            return;
+        }
+        
+        if(!proxy.getPluginManager().isLoaded("luckperms")){
+            logger.warn("LuckPerms is not enabled. This plugin is required.");
+            return;
+        }
+        
+        LuckPerms luckPerms;
+        try{
+            luckPerms = LuckPermsProvider.get();
+        }catch(IllegalStateException ex){
+            logger.warn("Unable to obtain LuckPerms API instance. The plugin won't work.");
+            return;
+        }
+        
+        logger.info("Registering LuckPerms Placeholder...");
+        try{
+            AdvancedServerListAPI.get().addPlaceholderProvider(new LuckPermsPlaceholder(luckPerms));
+            logger.info("Successfully registered Placeholder!");
+        }catch(InvalidPlaceholderProviderException ex){
+            logger.warn("Unable to register LuckPerms Placeholder! The plugin won't work.");
+        }
+    }
+}

addons/luckperms/src/main/resources/bungee.yml

@@ -0,0 +1,10 @@
+name: 'ASLLuckPermsAddon'
+author: 'Andre_601'
+version: '${plugin.version}'
+description: 'LuckPerms Add-on for AdvancedServerList to add placeholders to use.'
+
+softDepends:
+  - AdvancedServerList
+  - LuckPerms
+
+main: 'ch.andre601.advancedserverlist.luckperms.bungee.LuckPermsAddon'

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

@@ -0,0 +1,16 @@
+name: 'ASLLuckPermsAddon'
+author: 'Andre_601'
+version: '${plugin.version}'
+
+main: 'ch.andre601.advancedserverlist.luckperms.paper.LuckPermsAddon'
+
+api-version: '1.19'
+
+dependencies: 
+  server: 
+    AdvancedServerList:
+      required: false
+      load: BEFORE
+    LuckPerms:
+      required: false
+      load: BEFORE

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

@@ -0,0 +1,20 @@
+{
+  "id": "aslluckpermsaddon",
+  "name": "ASLLuckPermsAddon",
+  "version": "${plugin.version}",
+  "description": "LuckPerms Add-on for AdvancedServerList to add placeholders to use.",
+  "authors": [
+    "Andre_601"
+  ],
+  "dependencies": [
+    {
+      "id": "advancedserverlist",
+      "optional": true
+    },
+    {
+      "id": "luckperms",
+      "optional": true
+    }
+  ],
+  "main": "ch.andre601.advancedserverlist.luckperms.velocity.LuckPermsAddon"
+}

addons/placeholderapi/pom.xml

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>parent</artifactId>
-        <groupId>ch.andre601.advancedserverlist</groupId>
-        <version>parent</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    
-    <artifactId>asl-placeholderapi</artifactId>
-    <packaging>jar</packaging>
-    <version>${plugin.version}</version>
-    
-    <properties>
-        <maven.compiler.source>16</maven.compiler.source>
-        <maven.compuler.target>16</maven.compuler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <repositories>
-        <repository>
-            <id>papermc-repo</id>
-            <url>https://repo.papermc.io/repository/maven-public/</url>
-        </repository>
-        <repository>
-            <id>placeholderapi-repo</id>
-            <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
-        </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.papermc.paper</groupId>
-            <artifactId>paper-api</artifactId>
-            <version>1.21-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>me.clip</groupId>
-            <artifactId>placeholderapi</artifactId>
-            <version>2.11.6</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>AdvancedServerList-PlaceholderAPI-Addon-${plugin.version}</finalName>
-        <resources>
-            <resource>
-                <filtering>true</filtering>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.13.0</version>
-            </plugin>
-        </plugins>
-    </build>
-</project>

addons/placeholderapi/src/main/java/ch/andre601/placeholderapi/ASLPlaceholderAPI.java

@@ -1,70 +0,0 @@
-package ch.andre601.placeholderapi;
-
-import ch.andre601.placeholderapi.messenger.ASLPluginMessageListener;
-import ch.andre601.placeholderapi.messenger.BungeeCordMessageListener;
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.java.JavaPlugin;
-
-import java.util.concurrent.Callable;
-import java.util.logging.Level;
-
-public final class ASLPlaceholderAPI extends JavaPlugin{
-    
-    private String serverName = null;
-    
-    @Override
-    public void onEnable(){
-        // Own Plugin Channel
-        getServer().getMessenger().registerOutgoingPluginChannel(this, pluginChannel());
-        getServer().getMessenger().registerIncomingPluginChannel(this, pluginChannel(), new ASLPluginMessageListener(this));
-        
-        // BungeeCord Plugin Channel
-        getServer().getMessenger().registerOutgoingPluginChannel(this, "BungeeCord");
-        getServer().getMessenger().registerIncomingPluginChannel(this, "BungeeCord", new BungeeCordMessageListener(this));
-        
-        requestServerName();
-    }
-    
-    @Override
-    public void onDisable(){
-        getServer().getMessenger().unregisterOutgoingPluginChannel(this);
-        getServer().getMessenger().unregisterIncomingPluginChannel(this);
-    }
-    
-    public void serverName(String serverName){
-        this.serverName = serverName;
-    }
-    
-    public String pluginChannel(){
-        return "advancedserverlist:action";
-    }
-    
-    public String serverName(){
-        return serverName;
-    }
-    
-    public void waitUntil(Callable<Boolean> condition, Runnable action){
-        Bukkit.getScheduler().runTaskTimer(this, (task) -> {
-            try{
-                if(condition.call()){
-                    action.run();
-                    task.cancel();
-                }
-            }catch(Exception ex){
-                getLogger().log(Level.WARNING, "Encountered Exception while waiting for a task to finish.", ex);
-            }
-        }, 0L, 1L);
-    }
-    
-    private void requestServerName(){
-        waitUntil(() -> !getServer().getOnlinePlayers().isEmpty(), () -> {
-            Player plmSender = Bukkit.getOnlinePlayers().iterator().next();
-            ByteArrayDataOutput out = ByteStreams.newDataOutput();
-            out.writeUTF("GetServer");
-            plmSender.sendPluginMessage(this, "BungeeCord", out.toByteArray());
-        });
-    }
-}

addons/placeholderapi/src/main/java/ch/andre601/placeholderapi/messenger/ASLPluginMessageListener.java

@@ -1,78 +0,0 @@
-package ch.andre601.placeholderapi.messenger;
-
-import ch.andre601.placeholderapi.ASLPlaceholderAPI;
-import me.clip.placeholderapi.PlaceholderAPI;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.messaging.PluginMessageListener;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.util.UUID;
-import java.util.logging.Level;
-
-public class ASLPluginMessageListener implements PluginMessageListener{
-    
-    private final ASLPlaceholderAPI plugin;
-    
-    public ASLPluginMessageListener(ASLPlaceholderAPI plugin){
-        this.plugin = plugin;
-    }
-    
-    @Override
-    public void onPluginMessageReceived(@NotNull String channel, @NotNull Player player, byte[] message){
-        if(!channel.equals(plugin.pluginChannel()))
-            return;
-        
-        if(plugin.serverName() == null)
-            return;
-        
-        ByteArrayInputStream stream = new ByteArrayInputStream(message);
-        DataInputStream in = new DataInputStream(stream);
-        try{
-            String action = in.readUTF();
-            switch(action){
-                case "findPlugins" -> sendPluginMessage("hasPlugin", plugin.serverName());
-                case "parsePlaceholder" -> {
-                    UUID playerUuid = UUID.fromString(in.readUTF());
-                    String text = in.readUTF();
-                    if(!Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")){
-                        sendPluginMessage("parsed", playerUuid.toString(), text);
-                        return;
-                    }
-                    
-                    OfflinePlayer targetPlayer = Bukkit.getOfflinePlayer(playerUuid);
-                    String parsed = PlaceholderAPI.setPlaceholders(targetPlayer, text);
-                    sendPluginMessage("parsed", playerUuid.toString(), parsed);
-                }
-                default -> plugin.getLogger().warning("Received unknown plugin Message sub channel: " + action);
-            }
-        }catch(Exception ex){
-            plugin.getLogger().log(Level.WARNING, "Encountered an Exception while handling a plugin message.", ex);
-        }
-    }
-    
-    private void sendPluginMessage(String channel, String... values){
-        plugin.waitUntil(
-            () -> !Bukkit.getOnlinePlayers().isEmpty() && plugin.serverName() != null,
-            () -> {
-                Player plmSender = Bukkit.getOnlinePlayers().iterator().next();
-                ByteArrayOutputStream outStream = new ByteArrayOutputStream();
-                DataOutputStream dataOut = new DataOutputStream(outStream);
-                try{
-                    dataOut.writeUTF(channel);
-                    for(String value : values){
-                        dataOut.writeUTF(value);
-                    }
-                }catch(Exception ex){
-                    plugin.getLogger().log(Level.WARNING, "Encountered an Exception while writiing data for plugin message.", ex);
-                }
-                plmSender.sendPluginMessage(plugin, plugin.pluginChannel(), outStream.toByteArray());
-            }
-        );
-    }
-}

addons/placeholderapi/src/main/java/ch/andre601/placeholderapi/messenger/BungeeCordMessageListener.java

@@ -1,34 +0,0 @@
-package ch.andre601.placeholderapi.messenger;
-
-import ch.andre601.placeholderapi.ASLPlaceholderAPI;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.messaging.PluginMessageListener;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.util.logging.Level;
-
-public class BungeeCordMessageListener implements PluginMessageListener{
-    
-    private final ASLPlaceholderAPI plugin;
-    
-    public BungeeCordMessageListener(ASLPlaceholderAPI plugin){
-        this.plugin = plugin;
-    }
-    
-    @Override
-    public void onPluginMessageReceived(@NotNull String channel, @NotNull Player player, byte[] message){
-        if(!channel.equals("BungeeCord"))
-            return;
-        
-        DataInputStream stream = new DataInputStream(new ByteArrayInputStream(message));
-        try{
-            String subChannel = stream.readUTF();
-            if("GetServer".equals(subChannel))
-                plugin.serverName(stream.readUTF());
-        }catch(Exception ex){
-            plugin.getLogger().log(Level.WARNING, "Encountered Exception while reading plugin message from Bungeecord channel.", ex);
-        }
-    }
-}

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

@@ -1,10 +0,0 @@
-name: ASL-PlaceholderAPI
-version: '${plugin.version}'
-main: ch.andre601.placeholderapi.ASLPlaceholderAPI
-api-version: '1.21'
-dependencies:
-  server: 
-    PlaceholderAPI:
-      load: BEFORE
-authors: [ Andre601 ]
-description: Addon to allow PlaceholderAPI placeholders on your Velocity/BungeeCord proxy.

bungeecord/pom.xml

@@ -40,8 +40,9 @@
     <description>${plugin.description}</description>
 
     <properties>
-        <maven.compiler.source>16</maven.compiler.source>
-        <maven.compiler.target>16</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     
     <repositories>
@@ -51,7 +52,7 @@
         </repository>
         <repository>
             <id>repo-sayandevelopment</id>
-            <url>https://repo.sayandev.org/snapshots</url>
+            <url>https://repo.sayandev.org/releases/</url>
         </repository>
     </repositories>
     
@@ -73,14 +74,14 @@
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-api</artifactId>
-            <version>1.21-R0.1-SNAPSHOT</version>
+            <version>1.21-R0.3</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-api</artifactId>
-            <version>1.21-R0.1-SNAPSHOT</version>
+            <version>1.21-R0.3</version>
             <type>javadoc</type>
             <scope>provided</scope>
         </dependency>
@@ -125,19 +126,19 @@
         <dependency>
             <groupId>com.github.LeonMangler</groupId>
             <artifactId>PremiumVanishAPI</artifactId>
-            <version>2.9.0-4</version>
+            <version>2.9.18-2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.sayandev</groupId>
             <artifactId>sayanvanish-api</artifactId>
-            <version>1.6.1</version>
+            <version>1.7.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.sayandev</groupId>
             <artifactId>sayanvanish-proxy-bungeecord</artifactId>
-            <version>1.6.1</version>
+            <version>1.7.2</version>
             <scope>provided</scope>
         </dependency>
         
@@ -148,10 +149,16 @@
             <version>2.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.incendo</groupId>
+            <artifactId>cloud-bungee</artifactId>
+            <version>${dependency.cloud-bungee}</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
-        <finalName>AdvancedServerList-BungeeCord-${plugin.version}</finalName>
+        <finalName>AdvancedServerList-BungeeCord-${plugin.version}${project.build.build_id}</finalName>
         <resources>
             <resource>
                 <filtering>true</filtering>
@@ -159,44 +166,51 @@
             </resource>
         </resources>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.13.0</version>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.6.0</version>
-                <configuration>
-                    <createDependencyReducedPom>false</createDependencyReducedPom>
-                    <relocations>
-                        <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>
-                            <artifact>*:*</artifact>
-                            <excludes>
-                                <exclude>META-INF/*.SF</exclude>
-                                <exclude>META-INF/*.DSA</exclude>
-                                <exclude>META-INF/*.RSA</exclude>
-                            </excludes>
-                        </filter>
-                    </filters>
-                </configuration>
+                <version>3.6.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
                         <goals>
                             <goal>shade</goal>
                         </goals>
+                        <configuration>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
+                            <relocations>
+                                <relocation>
+                                    <pattern>org.bstats</pattern>
+                                    <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.bstats</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.alessiodp.libby</pattern>
+                                    <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.libby</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>ch.andre601.expressionparser</pattern>
+                                    <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.expressionparser</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.unascribed.flexver</pattern>
+                                    <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.flexver</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.incendo.cloud</pattern>
+                                    <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.cloud</shadedPattern>
+                                </relocation>
+                            </relocations>
+                            <filters>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>

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

@@ -25,23 +25,23 @@
 
 package ch.andre601.advancedserverlist.bungeecord;
 
-import ch.andre601.advancedserverlist.bungeecord.commands.CmdAdvancedServerList;
-import ch.andre601.advancedserverlist.bungeecord.listeners.JoinListener;
-import ch.andre601.advancedserverlist.bungeecord.listeners.PingListener;
-import ch.andre601.advancedserverlist.bungeecord.listeners.PluginMessageListener;
+import ch.andre601.advancedserverlist.bungeecord.commands.BungeeCommandManagerInterface;
+import ch.andre601.advancedserverlist.bungeecord.listeners.PlayerJoinEventListener;
+import ch.andre601.advancedserverlist.bungeecord.listeners.ProxyPingEventListener;
 import ch.andre601.advancedserverlist.bungeecord.logging.BungeeLogger;
 import ch.andre601.advancedserverlist.bungeecord.objects.placeholders.BungeePlayerPlaceholders;
 import ch.andre601.advancedserverlist.bungeecord.objects.placeholders.BungeeProxyPlaceholders;
 import ch.andre601.advancedserverlist.bungeecord.objects.placeholders.BungeeServerPlaceholders;
 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.interfaces.core.PluginCore;
-import ch.andre601.advancedserverlist.core.objects.PluginMessageUtil;
+import ch.andre601.advancedserverlist.core.interfaces.dialogs.IDialog;
+import ch.andre601.advancedserverlist.core.interfaces.dialogs.IDialogList;
+import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
 import ch.andre601.advancedserverlist.core.profiles.handlers.FaviconHandler;
 import com.alessiodp.libby.BungeeLibraryManager;
 import com.alessiodp.libby.Library;
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
 import de.myzelyam.api.vanish.BungeeVanishAPI;
 import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
 import net.md_5.bungee.api.Favicon;
@@ -51,6 +51,7 @@ import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Plugin;
 import org.bstats.bungeecord.Metrics;
 import org.bstats.charts.SimplePie;
+import org.incendo.cloud.CommandManager;
 import org.sayandev.sayanvanish.bungeecord.api.SayanVanishBungeeAPI;
 
 import java.awt.image.BufferedImage;
@@ -64,8 +65,6 @@ import java.util.logging.Level;
 
 public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
     
-    public static final String ASL_PLUGIN_CHANNEL = "advancedserverlist:action";
-    
     private final PluginLogger logger = new BungeeLogger(this);
     private final Map<String, ServerPing> fetchedServers = new ConcurrentHashMap<>();
     
@@ -74,6 +73,7 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
     private AdvancedServerList<Favicon> core;
     private FaviconHandler<Favicon> faviconHandler = null;
     private BungeeAudiences audiences = null;
+    private BungeeCommandManagerInterface handler;
     
     private BungeeLibraryManager libraryManager = null;
     
@@ -98,8 +98,13 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
         }
         
         this.audiences = BungeeAudiences.create(this);
-        this.core = AdvancedServerList.init(this,
-            BungeePlayerPlaceholders.init(), BungeeServerPlaceholders.init(this), BungeeProxyPlaceholders.init(this));
+        this.handler = new BungeeCommandManagerInterface(this);
+        this.core = AdvancedServerList.init(
+            this,
+            BungeePlayerPlaceholders.init(),
+            BungeeServerPlaceholders.init(this),
+            BungeeProxyPlaceholders.init(this)
+        );
     }
     
     @Override
@@ -109,23 +114,16 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
         audiences.close();
     }
     
-    @Override
-    public void loadCommands(){
-        getProxy().getPluginManager().registerCommand(this, new CmdAdvancedServerList(this));
-        getPluginLogger().success("Registered <white>/advancedserverlist</white>!");
-    }
-    
     @Override
     public void loadEvents(){
-        new JoinListener(this);
-        new PingListener(this);
-        new PluginMessageListener(this);
+        new PlayerJoinEventListener(this);
+        new ProxyPingEventListener(this);
     }
     
     @Override
     public void loadMetrics(){
         new Metrics(this, 15585).addCustomChart(new SimplePie("profiles",
-            () -> String.valueOf(core.getFileHandler().getProfiles().size())
+            () -> String.valueOf(core.fileHandler().profiles().size())
         ));
         
     }
@@ -166,22 +164,22 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
     }
     
     @Override
-    public AdvancedServerList<Favicon> getCore(){
+    public AdvancedServerList<Favicon> core(){
         return core;
     }
     
     @Override
-    public Path getFolderPath(){
+    public Path folderPath(){
         return getDataFolder().toPath();
     }
     
     @Override
-    public PluginLogger getPluginLogger(){
+    public PluginLogger pluginLogger(){
         return logger;
     }
     
     @Override
-    public FaviconHandler<Favicon> getFaviconHandler(){
+    public FaviconHandler<Favicon> faviconHandler(){
         if(faviconHandler == null)
             faviconHandler = new FaviconHandler<>(core);
         
@@ -189,12 +187,17 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
     }
     
     @Override
-    public String getPlatformInfo(){
+    public CommandManager<CmdSender> commandManager(){
+        return handler.commandHandler();
+    }
+    
+    @Override
+    public String platformInfo(){
         return getProxy().getName() + " " + getProxy().getVersion();
     }
     
     @Override
-    public String getLoader(){
+    public String loader(){
         return "bungeecord";
     }
     
@@ -203,16 +206,31 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
         return getProxy().getPluginManager().getPlugin(plugin) != null;
     }
     
+    @Override
+    public boolean isDialogsSupported(){
+        return false;
+    }
+    
     @Override
     public Favicon createFavicon(BufferedImage image) throws IllegalArgumentException{
         return Favicon.create(image);
     }
     
-    public BungeeAudiences getAudiences(){
+    @Override
+    public IDialogList.IDialogListBuilder createDialogListBuilder(String title){
+        return null;
+    }
+    
+    @Override
+    public IDialog.IDialogBuilder createDialogBuilder(String title, ServerListProfile profile, int profilesPosition){
+        return null;
+    }
+    
+    public BungeeAudiences audiences(){
         return audiences;
     }
     
-    public int getOnlinePlayers(ServerInfo server){
+    public int onlinePlayers(ServerInfo server){
         List<ProxiedPlayer> players = new ArrayList<>(server == null ? getProxy().getPlayers() : server.getPlayers());
         
         // Exclude players when PremiumVanish is enabled and player is hidden.
@@ -226,7 +244,7 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
         return players.size();
     }
     
-    public Map<String, ServerPing> getFetchedServers(){
+    public Map<String, ServerPing> fetchedServers(){
         return fetchedServers;
     }
     
@@ -248,17 +266,11 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
     
     private void fetchServers(){
         fetchedServers.clear();
-        PluginMessageUtil.get().clear();
         getProxy().getServers().forEach((name, server) -> server.ping((ping, throwable) -> {
             if(throwable != null)
                 return;
             
             fetchedServers.put(name, ping);
-            
-            ByteArrayDataOutput out = ByteStreams.newDataOutput();
-            out.writeUTF("findPlugins");
-            
-            server.sendData(ASL_PLUGIN_CHANNEL, out.toByteArray());
         }));
     }
 }

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/commands/BungeeCmdSender.java

@@ -27,8 +27,10 @@ package ch.andre601.advancedserverlist.bungeecord.commands;
 
 import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
 import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
+import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
 import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
 
 public class BungeeCmdSender implements CmdSender{
     
@@ -40,13 +42,22 @@ public class BungeeCmdSender implements CmdSender{
         this.bungeeAudiences = bungeeAudiences;
     }
     
-    @Override
-    public boolean hasPermission(String permission){
-        return sender.hasPermission(permission) || sender.hasPermission("advancedserverlist.admin");
-    }
-    
     @Override
     public void sendMsg(String msg, Object... args){
         bungeeAudiences.sender(sender).sendMessage(ComponentParser.text(String.format(msg, args)).toComponent());
     }
+    
+    @Override
+    public Audience audience(){
+        return bungeeAudiences.sender(sender);
+    }
+    
+    @Override
+    public boolean isPlayer(){
+        return sender instanceof ProxiedPlayer;
+    }
+    
+    public CommandSender sender(){
+        return sender;
+    }
 }

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/commands/BungeeCommandManagerInterface.java

@@ -0,0 +1,60 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2025 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.bungeecord.commands;
+
+import ch.andre601.advancedserverlist.bungeecord.BungeeCordCore;
+import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
+import ch.andre601.advancedserverlist.core.interfaces.commands.CommandManagerInterface;
+import net.md_5.bungee.api.CommandSender;
+import org.incendo.cloud.CommandManager;
+import org.incendo.cloud.SenderMapper;
+import org.incendo.cloud.bungee.BungeeCommandManager;
+import org.incendo.cloud.execution.ExecutionCoordinator;
+
+public class BungeeCommandManagerInterface implements CommandManagerInterface<CommandSender>{
+    
+    private final BungeeCordCore plugin;
+    
+    public BungeeCommandManagerInterface(BungeeCordCore plugin){
+        this.plugin = plugin;
+    }
+    
+    @Override
+    public CommandManager<CmdSender> commandHandler(){
+        return new BungeeCommandManager<>(
+            plugin,
+            ExecutionCoordinator.asyncCoordinator(),
+            senderMapper()
+        );
+    }
+    
+    @Override
+    public SenderMapper<CommandSender, CmdSender> senderMapper(){
+        return SenderMapper.create(
+            cmdSender -> new BungeeCmdSender(cmdSender, plugin.audiences()),
+            sender -> ((BungeeCmdSender)sender).sender()
+        );
+    }
+}

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

@@ -32,20 +32,19 @@ 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.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;
-import ch.andre601.advancedserverlist.core.objects.PluginMessageUtil;
 import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
 import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer;
 import net.md_5.bungee.api.Favicon;
 import net.md_5.bungee.api.ServerPing;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.config.ServerInfo;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.ProxyPingEvent;
 
 import java.net.InetSocketAddress;
@@ -76,17 +75,17 @@ public class BungeeEventWrapper implements GenericEventWrapper<Favicon, BungeePl
     }
     
     @Override
-    public void setMaxPlayers(int maxPlayers){
+    public void maxPlayers(int maxPlayers){
         ping.getPlayers().setMax(maxPlayers);
     }
     
     @Override
-    public void setOnlinePlayers(int onlinePlayers){
+    public void onlinePlayers(int onlinePlayers){
         ping.getPlayers().setOnline(onlinePlayers);
     }
     
     @Override
-    public void setMotd(Component component){
+    public void motd(Component component){
         ping.setDescriptionComponent(new TextComponent(BungeeComponentSerializer.get().serialize(component)));
     }
     
@@ -96,13 +95,13 @@ public class BungeeEventWrapper implements GenericEventWrapper<Favicon, BungeePl
     }
     
     @Override
-    public void setPlayerCount(String name){
+    public void playerCount(String name){
         protocol.setName(name);
         protocol.setProtocol(-1);
     }
     
     @Override
-    public void setPlayers(List<String> lines, BungeePlayerImpl player, GenericServer server){
+    public void players(List<String> lines, BungeePlayerImpl player, GenericServer server){
         ServerPing.PlayerInfo[] players = new ServerPing.PlayerInfo[lines.size()];
         
         for(int i = 0; i < players.length; i++){
@@ -120,17 +119,17 @@ public class BungeeEventWrapper implements GenericEventWrapper<Favicon, BungeePl
     }
     
     @Override
-    public void setPlayersHidden(){
+    public void playersHidden(){
         ping.getPlayers().setSample(new ServerPing.PlayerInfo[0]);
     }
     
     @Override
-    public void setFavicon(Favicon favicon){
+    public void favicon(Favicon favicon){
         ping.setFavicon(favicon);
     }
     
     @Override
-    public void setDefaultFavicon(){
+    public void defaultFavicon(){
         ping.setFavicon(ping.getFaviconObject());
     }
     
@@ -154,55 +153,55 @@ public class BungeeEventWrapper implements GenericEventWrapper<Favicon, BungeePl
     }
     
     @Override
-    public int getProtocolVersion(){
+    public int protocolVersion(){
         return event.getConnection().getVersion();
     }
     
     @Override
-    public int getOnlinePlayers(){
-        return plugin.getOnlinePlayers(null);
+    public int onlinePlayers(){
+        return plugin.onlinePlayers(null);
     }
     
     @Override
-    public int getMaxPlayers(){
+    public int maxPlayers(){
         return ping.getPlayers().getMax();
     }
     
     @Override
-    public String getPlayerIP(){
+    public String playerIP(){
         return ((InetSocketAddress)event.getConnection().getSocketAddress()).getHostString();
     }
     
     @Override
     public String parsePAPIPlaceholders(String text, BungeePlayerImpl player){
-        return PluginMessageUtil.get().getOrExecute(player.getUUID().toString(), text, (uuid, textValue) -> {
-            List<String> servers = PluginMessageUtil.get().getKnownServers();
-            if(servers.isEmpty())
-                return textValue;
-            
-            ServerInfo serverInfo = plugin.getProxy().getServerInfo(servers.get(0));
-            if(serverInfo == null)
-                return textValue;
-            
-            ByteArrayDataOutput out = ByteStreams.newDataOutput();
-            out.writeUTF("parse");
-            out.writeUTF(uuid);
-            out.writeUTF(textValue);
-            
-            serverInfo.sendData(BungeeCordCore.ASL_PLUGIN_CHANNEL, out.toByteArray());
-            PluginMessageUtil.get().queue(uuid, textValue, false);
-            
-            return PluginMessageUtil.get().getOrDefault(uuid, textValue);
-        });
+        if(plugin.getProxy().getPluginManager().getPlugin("PAPIProxyBridge") == null)
+            return text;
+        
+        if(!PAPIUtil.get().isCompatible())
+            return text;
+        
+        String server = PAPIUtil.get().getServer();
+        if(server == null || server.isEmpty())
+            return text;
+        
+        ServerInfo serverInfo = plugin.getProxy().getServerInfo(server);
+        if(serverInfo == null || serverInfo.getPlayers().isEmpty())
+            return text;
+        
+        ProxiedPlayer carrier = PAPIUtil.get().getPlayer(serverInfo.getPlayers());
+        if(carrier == null)
+            return text;
+        
+        return PAPIUtil.get().parse(text, carrier.getUniqueId(), player.getUUID());
     }
     
     @Override
-    public String getVirtualHost(){
+    public String virtualHost(){
         return this.resolveHost(event.getConnection().getVirtualHost());
     }
     
     @Override
-    public PluginCore<Favicon> getPlugin(){
+    public PluginCore<Favicon> plugin(){
         return plugin;
     }
     
@@ -212,7 +211,7 @@ public class BungeeEventWrapper implements GenericEventWrapper<Favicon, BungeePl
     }
     
     @Override
-    public GenericServer createGenericServer(int playersOnline, int playersMax, String host){
+    public GenericServer createServer(int playersOnline, int playersMax, String host){
         Map<String, ServerInfo> servers = plugin.getProxy().getServers();
         
         return new BungeeProxyImpl(servers, playersOnline, playersMax, host);

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

@@ -34,10 +34,10 @@ import net.md_5.bungee.event.EventHandler;
 
 import java.net.InetSocketAddress;
 
-public class JoinListener implements Listener{
+public class PlayerJoinEventListener implements Listener{
     private final BungeeCordCore plugin;
     
-    public JoinListener(BungeeCordCore plugin){
+    public PlayerJoinEventListener(BungeeCordCore plugin){
         this.plugin = plugin;
         plugin.getProxy().getPluginManager().registerListener(plugin, this);
     }
@@ -47,15 +47,15 @@ public class JoinListener implements Listener{
         InetSocketAddress address = (InetSocketAddress)event.getPlayer().getPendingConnection().getSocketAddress();
         ProxiedPlayer player = event.getPlayer();
         
-        plugin.getCore().getPlayerHandler().addPlayer(address.getHostString(), player.getName(), player.getUniqueId());
+        plugin.core().playerHandler().addPlayer(address.getHostString(), player.getName(), player.getUniqueId());
         
         if(player.hasPermission("advancedserverlist.admin") || player.hasPermission("advancedserverlist.updatecheck")){
-            if(plugin.getAudiences() == null || plugin.getCore().getUpdateChecker() == null)
+            if(plugin.audiences() == null || plugin.core().updateChecker() == null)
                 return;
             
-            BungeeCmdSender sender = new BungeeCmdSender(player, plugin.getAudiences());
+            BungeeCmdSender sender = new BungeeCmdSender(player, plugin.audiences());
             
-            plugin.getCore().getUpdateChecker().performCachedUpdateCheck(sender);
+            plugin.core().updateChecker().performCachedUpdateCheck(sender);
         }
     }
 }

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

@@ -1,37 +0,0 @@
-package ch.andre601.advancedserverlist.bungeecord.listeners;
-
-import ch.andre601.advancedserverlist.bungeecord.BungeeCordCore;
-import ch.andre601.advancedserverlist.core.objects.PluginMessageUtil;
-import com.google.common.io.ByteArrayDataInput;
-import com.google.common.io.ByteStreams;
-import net.md_5.bungee.api.event.PluginMessageEvent;
-import net.md_5.bungee.api.plugin.Listener;
-import net.md_5.bungee.event.EventHandler;
-
-public class PluginMessageListener implements Listener{
-    
-    public PluginMessageListener(BungeeCordCore plugin){
-        plugin.getProxy().getPluginManager().registerListener(plugin, this);
-    }
-    
-    @EventHandler
-    public void onPluginMessage(PluginMessageEvent event){
-        if(!event.getTag().equals(BungeeCordCore.ASL_PLUGIN_CHANNEL))
-            return;
-        
-        ByteArrayDataInput input = ByteStreams.newDataInput(event.getData());
-        String subChannel = input.readUTF();
-        switch(subChannel){
-            case "hasPlugin" -> {
-                String serverName = input.readUTF();
-                PluginMessageUtil.get().addServer(serverName);
-            }
-            case "parsed" -> {
-                String uuid = input.readUTF();
-                String parsed = input.readUTF();
-                
-                PluginMessageUtil.get().queue(uuid, parsed, true);
-            }
-        }
-    }
-}

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

@@ -33,11 +33,11 @@ import net.md_5.bungee.api.event.ProxyPingEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
 
-public class PingListener implements Listener{
+public class ProxyPingEventListener implements Listener{
     
     private final BungeeCordCore plugin;
     
-    public PingListener(BungeeCordCore plugin){
+    public ProxyPingEventListener(BungeeCordCore plugin){
         this.plugin = plugin;
         plugin.getProxy().getPluginManager().registerListener(plugin, this);
     }

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

@@ -27,24 +27,16 @@ package ch.andre601.advancedserverlist.bungeecord.objects.impl;
 
 import ch.andre601.advancedserverlist.api.bungeecord.objects.BungeePlayer;
 import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
+import org.jspecify.annotations.NullMarked;
 
 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();
-    }
+@NullMarked
+public record BungeePlayerImpl(CachedPlayer player, int protocol) implements BungeePlayer{
     
     @Override
     public String getName(){
-        return name;
+        return player.name();
     }
     
     @Override
@@ -54,6 +46,6 @@ public class BungeePlayerImpl implements BungeePlayer{
     
     @Override
     public UUID getUUID(){
-        return uuid;
+        return player.uuid();
     }
 }

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

@@ -27,12 +27,13 @@ package ch.andre601.advancedserverlist.bungeecord.objects.impl;
 
 import ch.andre601.advancedserverlist.api.bungeecord.objects.BungeeProxy;
 import net.md_5.bungee.api.config.ServerInfo;
+import org.jspecify.annotations.NonNull;
 
 import java.util.Map;
 
 public record BungeeProxyImpl(Map<String, ServerInfo> servers, int playersOnline, int playersMax, String host) implements BungeeProxy{
     @Override
-    public Map<String, ServerInfo> getServers(){
+    public @NonNull Map<String, ServerInfo> getServers(){
         return servers;
     }
     

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

@@ -28,9 +28,12 @@ package ch.andre601.advancedserverlist.bungeecord.objects.placeholders;
 import ch.andre601.advancedserverlist.api.PlaceholderProvider;
 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Locale;
 
+@NullMarked
 public class BungeePlayerPlaceholders extends PlaceholderProvider{
     
     private BungeePlayerPlaceholders(){
@@ -42,7 +45,7 @@ public class BungeePlayerPlaceholders extends PlaceholderProvider{
     }
     
     @Override
-    public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
+    public @Nullable String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
         return switch(placeholder.toLowerCase(Locale.ROOT)){
             case "name" -> player.getName();
             case "protocol" -> String.valueOf(player.getProtocol());

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

@@ -9,7 +9,10 @@ import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer;
 import net.md_5.bungee.api.ServerPing;
 import net.md_5.bungee.api.chat.BaseComponent;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 public class BungeeProxyPlaceholders extends PlaceholderProvider{
     
     private final BungeeCordCore plugin;
@@ -25,12 +28,12 @@ public class BungeeProxyPlaceholders extends PlaceholderProvider{
     }
     
     @Override
-    public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
+    public @Nullable String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
         String[] args = placeholder.split("\\s", 2);
         if(args.length < 2)
             return null;
         
-        ServerPing ping = plugin.getFetchedServers().get(args[1]);
+        ServerPing ping = plugin.fetchedServers().get(args[1]);
         
         return switch(args[0]){
             case "status" -> ping == null ? "offline" : "online";

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

@@ -31,9 +31,12 @@ import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
 import ch.andre601.advancedserverlist.bungeecord.BungeeCordCore;
 import net.md_5.bungee.api.config.ServerInfo;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import java.net.InetSocketAddress;
 
+@NullMarked
 public class BungeeServerPlaceholders extends PlaceholderProvider{
     
     private final BungeeCordCore plugin;
@@ -48,7 +51,7 @@ public class BungeeServerPlaceholders extends PlaceholderProvider{
     }
     
     @Override
-    public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
+    public @Nullable String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
         if(!(server instanceof BungeeProxy proxy))
             return null;
         
@@ -68,7 +71,7 @@ public class BungeeServerPlaceholders extends PlaceholderProvider{
                         if(info == null)
                             continue;
                         
-                        players += plugin.getOnlinePlayers(info);
+                        players += plugin.onlinePlayers(info);
                     }
                     
                     yield String.valueOf(players);
@@ -87,7 +90,7 @@ public class BungeeServerPlaceholders extends PlaceholderProvider{
                 if(args.length > 2)
                     yield "";
                 
-                if(args.length == 2 && args[1] != null && !args[1].isEmpty()){
+                if(args.length == 2 && !args[1].isEmpty()){
                     ServerInfo info = proxy.getServers().get(args[1]);
                     if(info == null)
                         yield "";

core/pom.xml

@@ -39,9 +39,11 @@
     <version>${plugin.version}</version>
 
     <properties>
-        <maven.compiler.source>16</maven.compiler.source>
-        <maven.compiler.target>16</maven.compiler.target>
-        <plugin.config.version>8</plugin.config.version>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        
+        <plugin.config.version>10</plugin.config.version>
     </properties>
     
     <repositories>
@@ -77,7 +79,7 @@
         <dependency>
             <groupId>ch.andre601</groupId>
             <artifactId>expressionparser</artifactId>
-            <version>1.5.0</version>
+            <version>1.6.1</version>
             <scope>compile</scope>
         </dependency>
         
@@ -91,7 +93,7 @@
         <dependency>
             <groupId>org.spongepowered</groupId>
             <artifactId>configurate-hocon</artifactId>
-            <version>4.1.2</version>
+            <version>4.2.0</version>
             <scope>provided</scope>
         </dependency>
         
@@ -119,7 +121,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.11.0</version>
+            <version>2.13.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -131,15 +133,42 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>33.4.0-jre</version>
+            <version>33.5.0-jre</version>
             <scope>provided</scope>
         </dependency>
         
+        <!-- Command Framework -->
+        <dependency>
+            <groupId>org.incendo</groupId>
+            <artifactId>cloud-annotations</artifactId>
+            <version>${dependency.cloud-annotations}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.incendo</groupId>
+            <artifactId>cloud-minecraft-extras</artifactId>
+            <version>${dependency.cloud-minecraft-extras}</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>net.kyori</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        
+        <!-- Annotations -->
+        <dependency>
+            <groupId>org.jspecify</groupId>
+            <artifactId>jspecify</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        
         <!-- Plugins -->
         <dependency>
             <groupId>net.william278</groupId>
             <artifactId>papiproxybridge</artifactId>
-            <version>1.7.2</version>
+            <version>1.8.4</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -154,18 +183,24 @@
             <version>3.5.0</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>io.github.miniplaceholders</groupId>
+            <artifactId>miniplaceholders-api</artifactId>
+            <version>3.0.1</version>
+            <scope>provided</scope>
+        </dependency>
         
         <!-- Test dependencies -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.11.4</version>
+            <version>5.14.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
     <build>
-        <finalName>AdvancedServerList-Core-${plugin.version}</finalName>
+        <finalName>AdvancedServerList-Core-${plugin.version}${project.build.build_id}</finalName>
         <resources>
             <resource>
                 <filtering>true</filtering>
@@ -186,43 +221,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.13.0</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.14.1</version>
                 <configuration>
-                    <createDependencyReducedPom>false</createDependencyReducedPom>
-                    <filters>
-                        <filter>
-                            <artifact>*:*</artifact>
-                            <excludes>
-                                <exclude>META-INF/*.SF</exclude>
-                                <exclude>META-INF/*.DSA</exclude>
-                                <exclude>META-INF/*.RSA</exclude>
-                            </excludes>
-                        </filter>
-                    </filters>
-                    <relocations>
-                        <relocation>
-                            <pattern>com.unascribed</pattern>
-                            <shadedPattern>ch.andre601.advancedserverlist.core.depends.flexver</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>ch.andre601.expressionparser</pattern>
-                            <shadedPattern>ch.andre601.advancedserverlist.core.depends.expressionparser</shadedPattern>
-                        </relocation>
-                    </relocations>
+                    <compilerArgs>
+                        <arg>-parameters</arg>
+                    </compilerArgs>
                 </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
         </plugins>
     </build>

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

@@ -29,24 +29,48 @@ 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.commands.CommandTypePostprocessor;
 import ch.andre601.advancedserverlist.core.compat.maintenance.MaintenancePlaceholder;
 import ch.andre601.advancedserverlist.core.file.FileHandler;
+import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
+import ch.andre601.advancedserverlist.core.interfaces.commands.CommandType;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import ch.andre601.advancedserverlist.core.parsing.TextCenterUtil;
+import ch.andre601.advancedserverlist.core.placeholders.DatePlaceholder;
+import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
 import ch.andre601.advancedserverlist.core.profiles.conditions.ProfileConditionParser;
 import ch.andre601.advancedserverlist.core.profiles.handlers.PlayerHandler;
+import org.incendo.cloud.CommandManager;
+import org.incendo.cloud.annotations.AnnotationParser;
+import org.incendo.cloud.description.Description;
+import org.incendo.cloud.injection.ParameterInjector;
+import org.incendo.cloud.parser.ParserDescriptor;
+import org.incendo.cloud.parser.standard.BooleanParser;
+import org.incendo.cloud.parser.standard.IntegerParser;
+import org.incendo.cloud.parser.standard.StringParser;
+import org.incendo.cloud.permission.Permission;
+import org.incendo.cloud.suggestion.Suggestion;
+import org.incendo.cloud.suggestion.SuggestionProvider;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Properties;
 
 public class AdvancedServerList<F>{
     
+    public static <F> AdvancedServerList<F> init(PluginCore<F> plugin, PlaceholderProvider... placeholders){
+        List<PlaceholderProvider> providers = new ArrayList<>(Arrays.asList(placeholders));
+        providers.add(new DatePlaceholder());
+        
+        return new AdvancedServerList<>(plugin, providers);
+    }
+    
     private final PluginCore<F> plugin;
     private final FileHandler fileHandler;
-    private final CommandHandler commandHandler;
     private final PlayerHandler playerHandler;
     private final TextCenterUtil textCenterUtil;
     
@@ -60,11 +84,10 @@ public class AdvancedServerList<F>{
     private AdvancedServerList(PluginCore<F> plugin, List<PlaceholderProvider> placeholders){
         this.plugin = plugin;
         this.fileHandler = new FileHandler(this);
-        this.commandHandler = new CommandHandler(this);
         this.playerHandler = new PlayerHandler(this);
         this.textCenterUtil = new TextCenterUtil(this);
         
-        plugin.getPluginLogger().info("Registering internal Placeholders...");
+        plugin.pluginLogger().info("Registering internal Placeholders...");
         
         placeholders.forEach(this::addPlaceholder);
         
@@ -73,60 +96,52 @@ public class AdvancedServerList<F>{
         }
         
         resolveVersion();
-        getPlugin().getPluginLogger().info("Starting <white>AdvancedServerList v%s</white>...", version);
+        plugin().pluginLogger().info("Starting <white>AdvancedServerList v%s</white>...", version);
         load();
     }
     
-    public static <F> AdvancedServerList<F> init(PluginCore<F> plugin, PlaceholderProvider... placeholders){
-        return new AdvancedServerList<>(plugin, Arrays.asList(placeholders));
-    }
-    
-    public static AdvancedServerListAPI getApi(){
+    public static AdvancedServerListAPI api(){
         return api;
     }
     
-    public PluginCore<F> getPlugin(){
+    public PluginCore<F> plugin(){
         return plugin;
     }
     
-    public FileHandler getFileHandler(){
+    public FileHandler fileHandler(){
         return fileHandler;
     }
     
-    public CommandHandler getCommandHandler(){
-        return commandHandler;
-    }
-    
-    public PlayerHandler getPlayerHandler(){
+    public PlayerHandler playerHandler(){
         return playerHandler;
     }
     
-    public String getVersion(){
+    public String version(){
         return version;
     }
     
-    public ProfileConditionParser getParser(){
+    public ProfileConditionParser parser(){
         return parser;
     }
     
-    public UpdateChecker getUpdateChecker(){
+    public UpdateChecker updateChecker(){
         return updateChecker;
     }
     
-    public TextCenterUtil getTextCenterUtil(){
+    public TextCenterUtil textCenterUtil(){
         return textCenterUtil;
     }
     
     public void disable(){
-        getPlugin().getPluginLogger().info("[-] Saving <white>playercache.json</white> file...");
-        getPlayerHandler().save();
+        plugin().pluginLogger().info("[-] Saving <white>playercache.json</white> file...");
+        playerHandler().save();
         
         if(updateChecker != null){
-            getPlugin().getPluginLogger().info("[-] Disabling Update Checker...");
+            plugin().pluginLogger().info("[-] Disabling Update Checker...");
             updateChecker.disable();
         }
         
-        getPlugin().getPluginLogger().success("AdvancedServerList disabled!");
+        plugin().pluginLogger().success("AdvancedServerList disabled!");
     }
     
     public void clearFaviconCache(){
@@ -134,68 +149,69 @@ public class AdvancedServerList<F>{
     }
     
     public void clearPlayerCache(){
-        getPlayerHandler().clearCache();
+        playerHandler().clearCache();
     }
     
     private void load(){
-        if(!getFileHandler().loadConfig()){
-            getPlugin().getPluginLogger().failure("Unable to load <white>config.yml</white>! Check previous lines for errors.");
+        if(!fileHandler().loadConfig()){
+            plugin().pluginLogger().failure("Unable to load <white>config.yml</white>! Check previous lines for errors.");
             return;
         }
         
-        if(getFileHandler().isOldConfig()){
-            getPlugin().getPluginLogger().info("[-] Detected old <white>config.yml</white>. Attempting to migrate...");
-            if(getFileHandler().migrateConfig()){
-                getPlugin().getPluginLogger().success("Migration completed successfully!");
+        if(fileHandler().isOldConfig()){
+            plugin().pluginLogger().info("[-] Detected old <white>config.yml</white>. Attempting to migrate...");
+            if(fileHandler().migrateConfig()){
+                plugin().pluginLogger().success("Migration completed successfully!");
             }else{
-                getPlugin().getPluginLogger().failure("Couldn't migrate <white>config.yml</white>! Check previous lines for errors.");
+                plugin().pluginLogger().failure("Couldn't migrate <white>config.yml</white>! Check previous lines for errors.");
                 return;
             }
         }
         
-        if(getFileHandler().getBool(true, "printBanner")){
+        if(fileHandler().getBool(true, "printBanner")){
             printBanner();
         }
         
-        getPlugin().getPluginLogger().info("Platform: <white>%s</white>", plugin.getPlatformInfo());
-        getPlugin().getPluginLogger().info("");
+        plugin().pluginLogger().info("Platform: <white>%s</white>", plugin.platformInfo());
+        plugin().pluginLogger().info("");
         
-        if(getFileHandler().loadProfiles()){
-            getPlugin().getPluginLogger().success("Successfully loaded <white>%d</white> profile(s)!", getFileHandler().getProfiles().size());
+        if(fileHandler().loadProfiles()){
+            plugin().pluginLogger().success("Successfully loaded <white>%d</white> profile(s)!", fileHandler().profiles().size());
         }else{
-            getPlugin().getPluginLogger().failure("Unable to load profiles! Check previous lines for errors.");
+            plugin().pluginLogger().failure("Unable to load profiles! Check previous lines for errors.");
             return;
         }
         
-        getPlugin().loadFaviconHandler(this);
-    
-        plugin.loadCommands();
+        loadCommands();
+        
         plugin.loadEvents();
-        getPlayerHandler().load();
+        playerHandler().load();
         plugin.loadMetrics();
         plugin.startScheduler();
     
-        getPlugin().getPluginLogger().success("<green>AdvancedServerList is ready!");
+        plugin().pluginLogger().success("<green>AdvancedServerList is ready!");
         
-        if(getFileHandler().getBoolean("checkUpdates"))
+        if(fileHandler().getBoolean("checkUpdates"))
             this.updateChecker = new UpdateChecker(this);
     }
     
     private void printBanner(){
-        getPlugin().getPluginLogger().info("<#3b90ff>     __      _______ ___");
-        getPlugin().getPluginLogger().info("<#3b90ff>    /\\ \\    / ____|_| | |");
-        getPlugin().getPluginLogger().info("<#3b90ff>   /  \\ \\  | (_(___ | | |");
-        getPlugin().getPluginLogger().info("<#3b90ff>  / /\\ \\ \\  \\___ \\ \\| | |");
-        getPlugin().getPluginLogger().info("<#3b90ff> / ____ \\ \\ ____) | | |_|____");
-        getPlugin().getPluginLogger().info("<#3b90ff>/_/_/  \\_\\_\\_____/_/|______|_|");
-        getPlugin().getPluginLogger().info("");
+        plugin().pluginLogger().info("<#3b90ff>     __      _______ ___");
+        plugin().pluginLogger().info("<#3b90ff>    /\\ \\    / ____|_| | |");
+        plugin().pluginLogger().info("<#3b90ff>   /  \\ \\  | (_(___ | | |");
+        plugin().pluginLogger().info("<#3b90ff>  / /\\ \\ \\  \\___ \\ \\| | |");
+        plugin().pluginLogger().info("<#3b90ff> / ____ \\ \\ ____) | | |_|____");
+        plugin().pluginLogger().info("<#3b90ff>/_/_/  \\_\\_\\_____/_/|______|_|");
+        plugin().pluginLogger().info("");
+        
+        seasonalText();
     }
     
     private void resolveVersion(){
-        try(InputStream is = getClass().getResourceAsStream("/version.properties")){
+        try(InputStream stream = getClass().getResourceAsStream("/version.properties")){
             Properties properties = new Properties();
             
-            properties.load(is);
+            properties.load(stream);
             
             version = properties.getProperty("version");
         }catch(IOException ex){
@@ -204,6 +220,118 @@ public class AdvancedServerList<F>{
     }
     
     private void addPlaceholder(PlaceholderProvider placeholderProvider){
-        AdvancedServerList.getApi().addPlaceholderProvider(placeholderProvider);
+        AdvancedServerList.api().addPlaceholderProvider(placeholderProvider);
+    }
+    
+    private void loadCommands(){
+        plugin().loadFaviconHandler(this);
+        
+        CommandManager<CmdSender> commandManager = plugin().commandManager();
+        
+        commandManager.parameterInjectorRegistry().registerInjector(AdvancedServerList.class, ParameterInjector.constantInjector(this));
+        commandManager.registerCommandPostProcessor(new CommandTypePostprocessor());
+        
+        AnnotationParser<CmdSender> annotationParser = new AnnotationParser<>(commandManager, CmdSender.class);
+        annotationParser.registerBuilderModifier(
+            CommandType.class,
+            (annotation, builder) -> builder.meta(CommandHandler.COMMAND_TYPE, annotation.value())
+        );
+        annotationParser.parse(new CommandHandler(commandManager));
+        
+        for(String option : CommandHandler.PROFILE_OPTIONS){
+            commandManager.command(
+                commandManager.commandBuilder("advancedserverlist", "asl")
+                    .literal("profiles")
+                    .literal("set")
+                    .required(
+                        "profile",
+                        StringParser.stringParser(),
+                        Description.of("The profile to edit."),
+                        SuggestionProvider.suggesting(
+                            fileHandler().profiles().stream()
+                                .map(ServerListProfile::file)
+                                .map(Suggestion::suggestion)
+                                .toList()
+                        )
+                    )
+                    .literal(option)
+                    .optional("value", descriptor(option), description(option))
+                    .commandDescription(Description.of("Sets or resets profile values."))
+                    .handler(context -> CommandHandler.handleSet(this, context))
+                    .meta(CommandHandler.OPTION, option)
+                    .permission(
+                        Permission.anyOf(
+                            Permission.permission("advancedserverlist.admin"), 
+                            Permission.permission("advancedserverlist.command.profiles"),
+                            Permission.permission("advancedserverlist.command.profiles.set")
+                        )
+                    )
+            );
+        }
+        
+        plugin().pluginLogger().success("Loaded Command <white>/advancedserverlist</white>!");
+    }
+    
+    private ParserDescriptor<CmdSender, ?> descriptor(String option){
+        return switch(option){
+            case "playercount.hideplayers", "playercount.hideplayershover", "playercount.extraplayers.enabled",
+                "playercount.maxplayers.enabled", "playercount.onlineplayers.enabled" -> BooleanParser.booleanParser();
+            case "priority" -> IntegerParser.integerParser();
+            default -> StringParser.greedyStringParser();
+        };
+    }
+    
+    private Description description(String option){
+        return switch(option){
+            case "playercount.hideplayers", "playercount.hideplayershover", "playercount.extraplayers.enabled",
+                "playercount.maxplayers.enabled", "playercount.onlineplayers.enabled" -> Description.of(
+                "Whether this option should be enabled or not. Leave empty to unset it."
+            );
+            case "priority" -> Description.of("Priority this Profile should have. Leave empty to reset.");
+            case "motd", "playercount.hover" -> Description.of(
+                "Lines to set. Use \\n or <newline> to set a linebreak. Leave empty to reset."
+            );
+            default -> Description.of("The Value to use for this option. Leave empty to reset.");
+        };
+    }
+    
+    // Adding some seasonal messages
+    private void seasonalText(){
+        LocalDate date = LocalDate.now();
+        
+        switch(date.getMonth()){
+            case JANUARY -> {
+                if(date.getDayOfMonth() == 1){
+                    plugin().pluginLogger().info("Happy new Year!");
+                    plugin().pluginLogger().info("");
+                }
+            }
+            case JUNE -> {
+                plugin().pluginLogger().info("Happy Pride Month!");
+                plugin().pluginLogger().info("");
+            }
+            case AUGUST -> {
+                if(date.getDayOfMonth() == 1){
+                    plugin().pluginLogger().info("Happy Birthday Switzerland!");
+                    plugin().pluginLogger().info("");
+                }
+            }
+            case OCTOBER -> {
+                if(date.getDayOfMonth() == 31){
+                    plugin().pluginLogger().info("Happy Halloween!");
+                    plugin().pluginLogger().info("");
+                }
+            }
+            case DECEMBER -> {
+                if(date.getDayOfMonth() == 13){
+                    plugin().pluginLogger().info("Happy Birthday Andre_601!");
+                    plugin().pluginLogger().info("");
+                }else
+                if(date.getDayOfMonth() > 23 && date.getDayOfMonth() < 27){
+                    plugin().pluginLogger().info("Merry Christmas!");
+                    plugin().pluginLogger().info("");
+                }
+            }
+        }
     }
 }

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

@@ -28,7 +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 ch.andre601.advancedserverlist.core.objects.ValueCache;
 import com.google.gson.FieldNamingPolicy;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -59,7 +59,7 @@ public class UpdateChecker{
     
     private final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(new UpdateCheckThread());
     
-    private final CacheUtil.SingletonCache<CompletableFuture<ModrinthVersion>> cache = new CacheUtil.SingletonCache<>(Duration.ofMinutes(5));
+    private final ValueCache<CompletableFuture<ModrinthVersion>> cache = new ValueCache<>(Duration.ofMinutes(5));
     
     private final AdvancedServerList<?> core;
     private final PluginLogger logger;
@@ -68,8 +68,8 @@ public class UpdateChecker{
     
     public UpdateChecker(AdvancedServerList<?> core){
         this.core = core;
-        this.logger = core.getPlugin().getPluginLogger();
-        this.loader = core.getPlugin().getLoader();
+        this.logger = core.plugin().pluginLogger();
+        this.loader = core.plugin().loader();
         this.client = HttpClient.newBuilder().executor(Executors.newSingleThreadExecutor(new UpdateCheckThread())).build();
         
         startUpdateChecker();
@@ -88,10 +88,10 @@ public class UpdateChecker{
             if(version == null)
                 return;
             
-            int result = version.compare(core.getVersion());
+            int result = version.compare(core.version());
             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>Your version: <white>%s", core.version());
                 sender.sendPrefixedMsg("<green>Version on Modrinth: <white>%s", version.versionNumber());
                 sender.sendPrefixedMsg(
                     "<click:open_url:'https://modrinth.com/plugin/advancedserverlist/version/%s'>" +
@@ -101,8 +101,12 @@ public class UpdateChecker{
                 );
             }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?");
+                sender.sendPrefixedMsg(
+                    "Your version (<white>%</white>) is newer than what is available on Modrinth (<white>%s</white>).",
+                    core.version(),
+                    version.versionNumber()
+                );
+                sender.sendPrefixedMsg("Are you using a Development Version?");
             }
         });
     }
@@ -133,14 +137,18 @@ public class UpdateChecker{
                 
                 logger.debug(UpdateChecker.class, "Comparing versions...");
                 
-                int result = version.compare(core.getVersion());
+                int result = version.compare(core.version());
                 switch(result){
                     case -1 -> printUpdateBanner(version);
                     case 0 -> logger.success("You are running the latest version!");
-                    case 1 -> logger.info(
-                        "[?] Your version (<white>%s</white>) seems to be newer than the latest release (<white>%s</white>). Are you running a dev build?",
-                        core.getVersion(), version.versionNumber()
-                    );
+                    case 1 -> {
+                        logger.info(
+                            "[?] Your version (<white>%s</white>) is newer than what is available on Modrint (<white>%s</white>).",
+                            core.version(),
+                            version.versionNumber()
+                        );
+                        logger.info("    Are you using a Development Version?");
+                    }
                 }
             });
         }, 0L, 12L, TimeUnit.HOURS);
@@ -155,7 +163,7 @@ public class UpdateChecker{
         
         logger.debug(UpdateChecker.class, "Checking '%s' for updates...", finalUrl);
         
-        if(core.getVersion().equals("UNKNOWN")){
+        if(core.version().equals("UNKNOWN")){
             logger.warn("Cannot perform update check. Plugin version is 'UNKNOWN'!");
             return CompletableFuture.completedFuture(null);
         }
@@ -165,7 +173,7 @@ public class UpdateChecker{
             request = HttpRequest.newBuilder()
                 .uri(new URI(finalUrl))
                 .timeout(Duration.ofSeconds(5))
-                .header("User-Agent", "AdvancedServerList-" + loader + "/" + core.getVersion())
+                .header("User-Agent", "AdvancedServerList-" + loader + "/" + core.version())
                 .build();
         }catch(URISyntaxException ex){
             logger.warn("Cannot perform update check. URL '%s' is not a valid URI.", ex, finalUrl);
@@ -185,7 +193,7 @@ public class UpdateChecker{
         logger.warn("=======================================================================");
         logger.warn("You are running an outdated version of AdvancedServerList!");
         logger.warn("");
-        logger.warn("Your version: <white>%s</white>", core.getVersion());
+        logger.warn("Your version: <white>%s</white>", core.version());
         logger.warn("Modrinth:     <white>%s</white>", version.versionNumber());
         logger.warn("");
         

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

@@ -1,110 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2025 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.commands;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class CommandStringBuilder{
-    
-    private final List<CommandPart> commandParts = new ArrayList<>();
-    
-    public CommandStringBuilder(String subcommand, String description){
-        appendLiteralArgument(subcommand, description);
-    }
-    
-    public CommandStringBuilder appendArgument(Argument argument){
-        this.commandParts.add(argument);
-        return this;
-    }
-    
-    public CommandStringBuilder appendText(String text){
-        this.commandParts.add(new Text(text));
-        return this;
-    }
-    
-    public CommandStringBuilder appendLiteralArgument(String name, String description){
-        return appendText("<hover:show_text:\"<grey>" + description + "</grey>\"><white>" + name + "</white></hover>");
-    }
-    
-    public CommandStringBuilder appendSpace(){
-        return appendText(" ");
-    }
-    
-    public String build(){
-        StringBuilder builder = new StringBuilder("<aqua>/asl ");
-        for(CommandPart part : commandParts){
-            builder.append(part.build());
-        }
-        builder.append("</aqua>"); // Closing the first color tag.
-        
-        return builder.toString();
-    }
-    
-    public static class ArgumentBuilder{
-        private final String name;
-        
-        private String description = "No description provided.";
-        private boolean required = false;
-        
-        public ArgumentBuilder(String name){
-            this.name = name;
-        }
-        
-        public ArgumentBuilder description(String description){
-            this.description = description;
-            return this;
-        }
-        
-        public ArgumentBuilder required(){
-            this.required = true;
-            return this;
-        }
-        
-        public Argument build(){
-            return new Argument(name, description, required);
-        }
-    }
-    
-    private record Text(String text) implements CommandPart{
-        @Override
-        public String build(){
-            return text();
-        }
-    }
-    
-    private record Argument(String name, String description, boolean required) implements CommandPart{
-        @Override
-        public String build(){
-            return "<hover:show_text:\"<grey>" + description() + "</grey>\">" +
-                "<grey>" + (required() ? "\\<" : "[") + "<white>" + name() + "</white>" + (required() ? ">" : "]") +
-                "</grey></hover>";
-        }
-    }
-    
-    private interface CommandPart{
-        String build();
-    }
-}

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

@@ -0,0 +1,22 @@
+package ch.andre601.advancedserverlist.core.commands;
+
+import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
+import ch.andre601.advancedserverlist.core.interfaces.commands.CommandType;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.incendo.cloud.execution.postprocessor.CommandPostprocessingContext;
+import org.incendo.cloud.execution.postprocessor.CommandPostprocessor;
+import org.incendo.cloud.services.type.ConsumerService;
+
+public class CommandTypePostprocessor implements CommandPostprocessor<CmdSender>{
+    @Override
+    public void accept(@NonNull CommandPostprocessingContext<CmdSender> context){
+        CmdSender sender = context.commandContext().sender();
+        CommandType.Type type = context.commandContext().command().commandMeta().get(CommandHandler.COMMAND_TYPE);
+        
+        if(type == CommandType.Type.ALL || (type == CommandType.Type.PLAYER_ONLY && sender.isPlayer()))
+            return;
+        
+        sender.sendErrorMsg("<red>This command can only be executed by players!");
+        ConsumerService.interrupt();
+    }
+}

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

@@ -0,0 +1,172 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2025 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.commands;
+
+import ch.andre601.advancedserverlist.api.objects.NullBool;
+import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+public class ProfileOptionsSender{
+    
+    private final List<OptionStringBuilder> builders = new ArrayList<>();
+    private final String file;
+    
+    public ProfileOptionsSender(String file){
+        this.file = file;
+    }
+    
+    public ProfileOptionsSender append(OptionStringBuilder builder){
+        this.builders.add(builder.file(file));
+        return this;
+    }
+    
+    public void send(CmdSender sender){
+        sender.sendMsg();
+        sender.sendPrefixedMsg("Profile Info [<white>%s</white>]", file);
+        for(OptionStringBuilder builder : builders){
+            sender.sendMsg(builder.build());
+        }
+        sender.sendMsg();
+        sender.sendMsg("[<grey>Hover for info, click for command</grey>]");
+        sender.sendMsg();
+    }
+    
+    public static class OptionStringBuilder{
+        
+        public static OptionStringBuilder of(String displayName, String hover){
+            return new OptionStringBuilder(displayName)
+                .hover(hover == null || hover.isEmpty() ? "<i>Not set</i>" : hover)
+                .color(hover == null || hover.isEmpty() ? ColorName.RED : ColorName.GREEN);
+        }
+        
+        public static OptionStringBuilder of(String displayName, List<String> hover){
+            return new OptionStringBuilder(displayName)
+                .hover(hover == null || hover.isEmpty() ? "<i>Not set</i>" : String.join("\n<reset>", hover))
+                .color(hover == null || hover.isEmpty() ? ColorName.RED : ColorName.GREEN);
+        }
+        
+        public static OptionStringBuilder of(String displayName, NullBool hover){
+            return new OptionStringBuilder(displayName)
+                .hover(hover == null || !hover.getOrDefault(false) ? "<red>Disabled</red>" : "<green>Enabled</green>")
+                .color(hover == null || !hover.getOrDefault(false) ? ColorName.RED : ColorName.GREEN);
+        }
+        
+        public static OptionStringBuilder of(String displayName, int hover){
+            return new OptionStringBuilder(displayName)
+                .hover(String.valueOf(hover));
+        }
+        
+        public static OptionStringBuilder of(String displayName){
+            return new OptionStringBuilder(displayName).hover(null);
+        }
+        
+        private final String displayName;
+        private String file = null;
+        private String prefix = "├─";
+        private ColorName color = ColorName.AQUA;
+        private String hover = "<i>Not set</i>";
+        private String option = null;
+        
+        private OptionStringBuilder(String displayName){
+            this.displayName = displayName;
+        }
+        
+        public OptionStringBuilder file(String file){
+            this.file = file;
+            return this;
+        }
+        
+        public OptionStringBuilder prefix(String prefix){
+            this.prefix = prefix;
+            return this;
+        }
+        
+        public OptionStringBuilder color(ColorName color){
+            this.color = color;
+            return this;
+        }
+        
+        public OptionStringBuilder hover(String hover){
+            this.hover = hover;
+            return this;
+        }
+        
+        public OptionStringBuilder option(String option){
+            this.option = option;
+            return this;
+        }
+        
+        public String build(){
+            StringBuilder builder = new StringBuilder("<grey>")
+                .append(prefix)
+                .append(" <white>[")
+                .append('<')
+                .append(color)
+                .append('>');
+            
+            if(hover != null && !hover.isEmpty()){
+                builder.append("<hover:show_text:\"")
+                    .append(hover)
+                    .append("\">");
+            }
+            
+            if(option != null && !option.isEmpty() && file != null && !file.isEmpty()){
+                builder.append("<click:suggest_command:/asl profiles set ")
+                    .append(file)
+                    .append(" ")
+                    .append(option)
+                    .append(" >");
+            }
+            
+            builder.append(displayName);
+            
+            if(option != null && !option.isEmpty() && file != null && !file.isEmpty())
+                builder.append("</click>");
+            
+            if(hover != null && !hover.isEmpty())
+                builder.append("</hover>");
+            
+            builder.append("</")
+                .append(color)
+                .append(">]</white></grey>");
+            
+            return builder.toString();
+        }
+    }
+    
+    public enum ColorName{
+        RED,
+        GREEN,
+        AQUA;
+        
+        @Override
+        public String toString(){
+            return this.name().toLowerCase(Locale.ROOT);
+        }
+    }
+}

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

@@ -4,7 +4,10 @@ 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;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 public class MaintenancePlaceholder extends PlaceholderProvider{
     
     private final AdvancedServerList<?> plugin;
@@ -15,8 +18,8 @@ public class MaintenancePlaceholder extends PlaceholderProvider{
         this.plugin = plugin;
     }
     @Override
-    public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
-        if(!placeholder.equals("maintenanceEnabled") || !plugin.getPlugin().isPluginEnabled("Maintenance"))
+    public @Nullable String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
+        if(!placeholder.equals("maintenanceEnabled") || !plugin.plugin().isPluginEnabled("Maintenance"))
             return null;
         
         return String.valueOf(MaintenanceUtil.get().isMaintenanceEnabled());

core/src/main/java/ch/andre601/advancedserverlist/core/compat/miniplaceholders/MiniPlaceholdersUtil.java

@@ -0,0 +1,11 @@
+package ch.andre601.advancedserverlist.core.compat.miniplaceholders;
+
+import io.github.miniplaceholders.api.MiniPlaceholders;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+
+public class MiniPlaceholdersUtil{
+    
+    public static TagResolver tagResolvers(){
+        return MiniPlaceholders.globalPlaceholders();
+    }
+}

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

@@ -0,0 +1,92 @@
+/*
+ * 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 ch.andre601.advancedserverlist.core.objects.ValueCache;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import net.william278.papiproxybridge.api.PlaceholderAPI;
+
+import java.time.Duration;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+
+public class PAPIUtil{
+    
+    private static PAPIUtil instance;
+    
+    private final ValueCache<CompletableFuture<Set<String>>> serversCache = new ValueCache<>(Duration.ofSeconds(10));
+    private final Cache<UUID, CompletableFuture<String>> textCache = CacheBuilder.newBuilder()
+        .expireAfterWrite(Duration.ofSeconds(10))
+        .build();
+    private final PlaceholderAPI papi;
+    
+    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(){
+        try{
+            papi.getClass().getMethod("getServers");
+            return true;
+        }catch(NoSuchMethodException ex){
+            return false;
+        }
+    }
+    
+    public String getServer(){
+        Set<String> values = serversCache.get(papi::getServers).getNow(Collections.emptySet());
+        if(values.isEmpty())
+            return null;
+        
+        return List.copyOf(values).getFirst();
+    }
+    
+    public <P> P getPlayer(Collection<P> players){
+        if(players.isEmpty())
+            return null;
+        
+        return List.copyOf(players).getFirst();
+    }
+    
+    public String parse(String text, UUID carrier, UUID player){
+        try{
+            return textCache.get(player, () -> papi.formatPlaceholders(text, carrier, player)).getNow(text);
+        }catch(ExecutionException ex){
+            return text;
+        }
+    }
+}

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

@@ -44,28 +44,28 @@ import java.util.List;
 public class PingEventHandler{
     
     public static <F, P extends GenericPlayer> ProfileEntry handleEvent(GenericEventWrapper<F, P> event){
-        event.getPlugin().getPluginLogger().debug(PingEventHandler.class, "Received ping event. Handling it...");
+        event.plugin().pluginLogger().debug(PingEventHandler.class, "Received ping event. Handling it...");
         if(event.isInvalidProtocol()){
-            event.getPlugin().getPluginLogger().debug(PingEventHandler.class, "Not handling event. Protocol was invalid.");
+            event.plugin().pluginLogger().debug(PingEventHandler.class, "Not handling event. Protocol was invalid.");
             return null;
         }
         
-        PluginCore<F> plugin = event.getPlugin();
-        String host = event.getVirtualHost();
-        PluginLogger logger = plugin.getPluginLogger();
+        PluginCore<F> plugin = event.plugin();
+        String host = event.virtualHost();
+        PluginLogger logger = plugin.pluginLogger();
         
         logger.debug(PingEventHandler.class, "Protocol valid. Continue handling...");
         
-        int online = event.getOnlinePlayers();
-        int max = event.getMaxPlayers();
+        int online = event.onlinePlayers();
+        int max = event.maxPlayers();
         
         P player = event.createPlayer(
-            plugin.getCore().getPlayerHandler().getCachedPlayer(event.getPlayerIP()),
-            event.getProtocolVersion()
+            plugin.core().playerHandler().getCachedPlayer(event.playerIP()),
+            event.protocolVersion()
         );
-        GenericServer server = event.createGenericServer(online, max, host);
+        GenericServer server = event.createServer(online, max, host);
         
-        ServerListProfile profile = ProfileManager.resolveProfile(plugin.getCore(), player, server);
+        ServerListProfile profile = ProfileManager.resolveProfile(plugin.core(), player, server);
         
         if(profile == null){
             logger.debugWarn(PingEventHandler.class, "Server List Profile couldn't be resolved properly. Cancelling event handling...");
@@ -93,11 +93,12 @@ public class PingEventHandler{
             String onlinePlayers = ComponentParser.text(entry.onlinePlayersCount())
                 .modifyText(text -> StringReplacer.replace(text, player, server))
                 .modifyText(text -> event.parsePAPIPlaceholders(text, player))
+                .applyMMTags(event.plugin())
                 .toString();
             
             try{
                 online = onlinePlayers == null ? online : Integer.parseInt(onlinePlayers);
-                event.setOnlinePlayers(online);
+                event.onlinePlayers(online);
             }catch(NumberFormatException ex){
                 logger.warn("Option 'playerCount -> onlinePlayers -> amount' is not a valid Number!");
             }
@@ -110,13 +111,14 @@ public class PingEventHandler{
             String extraPlayers = ComponentParser.text(entry.extraPlayersCount())
                 .modifyText(text -> StringReplacer.replace(text, player, server))
                 .modifyText(text -> event.parsePAPIPlaceholders(text, player))
+                .applyMMTags(event.plugin())
                 .toString();
             
             try{
                 max = online + (extraPlayers == null ? 0 : Integer.parseInt(extraPlayers));
                 
                 logger.debug(PingEventHandler.class, "'playerCount -> extraPlayers -> amount' is a valid number. Applying it...");
-                event.setMaxPlayers(max);
+                event.maxPlayers(max);
             }catch(NumberFormatException ex){
                 logger.warn("Option 'playerCount -> extraPlayers -> amount' is not a valid Number!");
             }
@@ -127,19 +129,20 @@ public class PingEventHandler{
             String maxPlayers = ComponentParser.text(entry.maxPlayersCount())
                 .modifyText(text -> StringReplacer.replace(text, player, server))
                 .modifyText(text -> event.parsePAPIPlaceholders(text, player))
+                .applyMMTags(event.plugin())
                 .toString();
             
             try{
                 max = maxPlayers == null ? 0 : Integer.parseInt(maxPlayers);
                 
                 logger.debug(PingEventHandler.class, "'playerCount -> maxPlayers -> amount' is a valid number. Applying it...");
-                event.setMaxPlayers(max);
+                event.maxPlayers(max);
             }catch(NumberFormatException ex){
                 logger.warn("Option 'playerCount -> maxPlayers -> amount' is not a valid Number!");
             }
         }
         
-        GenericServer finalServer = event.createGenericServer(online, max, host);
+        GenericServer finalServer = event.createServer(online, max, host);
         
         if(ProfileManager.checkOption(entry.motd()) && ignoreMaintenance(event, "motd")){
             logger.debug(PingEventHandler.class, "'motd' option present. Applying ['%s']...", String.join("', '", entry.motd()));
@@ -148,12 +151,13 @@ public class PingEventHandler{
                 .map(line -> ComponentParser.text(line)
                     .modifyText(text -> StringReplacer.replace(text, player, finalServer))
                     .modifyText(text -> event.parsePAPIPlaceholders(text, player))
-                    .modifyText(text -> plugin.getCore().getTextCenterUtil().getCenteredText(text))
+                    .modifyText(text -> plugin.core().textCenterUtil().getCenteredText(text))
+                    .applyMMTags(event.plugin())
                     .toComponent()
                 )
                 .toList();
             
-            event.setMotd(Component.join(JoinConfiguration.separator(Component.newline()), motd));
+            event.motd(Component.join(JoinConfiguration.separator(Component.newline()), motd));
         }
         
         boolean hidePlayers = ProfileManager.checkOption(entry.hidePlayersEnabled());
@@ -167,10 +171,11 @@ public class PingEventHandler{
         if(ProfileManager.checkOption(entry.playerCountText()) && !hidePlayers && ignoreMaintenance(event, "playerCountText")){
             logger.debug(PingEventHandler.class, "'playerCount -> text' option set. Applying '%s'...", entry.playerCountText());
             
-            event.setPlayerCount(
+            event.playerCount(
                 ComponentParser.text(entry.playerCountText())
                     .modifyText(text -> StringReplacer.replace(text, player, finalServer))
                     .modifyText(text -> event.parsePAPIPlaceholders(text, player))
+                    .applyMMTags(event.plugin())
                     .toString()
             );
         }
@@ -178,30 +183,33 @@ public class PingEventHandler{
         boolean hidePlayersHover = ProfileManager.checkOption(entry.hidePlayersHoverEnabled());
         if(hidePlayersHover){
             logger.debug(PingEventHandler.class, "'playerCount -> hidePlayersHover' option set. Hiding Player Hover...");
-            event.setPlayersHidden();
+            event.playersHidden();
         }
         
         if(ProfileManager.checkOption(entry.players()) && !hidePlayers && !hidePlayersHover && ignoreMaintenance(event, "playerCountHover")){
             logger.debug(PingEventHandler.class, "'playerCount -> hover' option set. Applying ['%s']...", String.join("', '", entry.players()));
             
-            event.setPlayers(entry.players(), player, server);
+            event.players(entry.players(), player, server);
         }
         
         if(ProfileManager.checkOption(entry.favicon()) && ignoreMaintenance(event, "favicon")){
             logger.debug(PingEventHandler.class, "'favicon' option set. Resolving '%s'...", entry.favicon());
             
-            String faviconString = StringReplacer.replace(entry.favicon(), player, server);
+            String faviconString = StringReplacer.modifier(entry.favicon())
+                .modify(text -> StringReplacer.replace(text, player, server))
+                .modify(text -> event.parsePAPIPlaceholders(text, player))
+                .asString();
             
-            F favicon = plugin.getFaviconHandler().getFavicon(faviconString);
+            F favicon = plugin.faviconHandler().favicon(faviconString);
             
             if(favicon == null){
                 logger.debugWarn(PingEventHandler.class, "Favicon was invalid or not yet resolved! Using default favicon of Server/Proxy...");
                 
-                event.setDefaultFavicon();
+                event.defaultFavicon();
             }else{
                 logger.debug(PingEventHandler.class, "Applying favicon...");
                 
-                event.setFavicon(favicon);
+                event.favicon(favicon);
             }
         }
         
@@ -215,6 +223,6 @@ public class PingEventHandler{
         if(!event.isMaintenanceModeActive())
             return true;
         
-        return !event.getPlugin().getCore().getFileHandler().getBool(true, "disableDuringMaintenance", option);
+        return !event.plugin().core().fileHandler().getBool(true, "disableDuringMaintenance", option);
     }
 }

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

@@ -46,7 +46,9 @@ public class ConfigMigrator{
     public static ConfigurationTransformation.Versioned create(){
         return ConfigurationTransformation.versionedBuilder()
             .versionKey("configVersion")
-            .addVersion(LATEST, sevenToEight())
+            .addVersion(LATEST, nineToTen())
+            .addVersion(9, eightToNine())
+            .addVersion(8, sevenToEight())
             .addVersion(7, sixToSeven())
             .addVersion(6, fiveToSix())
             .addVersion(5, fourToFive())
@@ -56,6 +58,22 @@ public class ConfigMigrator{
             .build();
     }
     
+    public static ConfigurationTransformation nineToTen(){
+        return ConfigurationTransformation.builder()
+            .addAction(NodePath.path("faviconStrategy"), TransformAction.rename("faviconResizeStrategy"))
+            .build();
+    }
+    
+    public static ConfigurationTransformation eightToNine(){
+        return ConfigurationTransformation.builder()
+            .addAction(NodePath.path(), (path, value) -> {
+                value.node("faviconStrategy").set("resize");
+                
+                return null;
+            })
+            .build();
+    }
+    
     public static ConfigurationTransformation sevenToEight(){
         return ConfigurationTransformation.builder()
             .addAction(NodePath.path("disableDuringMaintenance"), (path, value) -> {

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

@@ -32,6 +32,7 @@ import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
 import ch.andre601.advancedserverlist.core.profiles.profile.ProfileSerializer;
 import org.spongepowered.configurate.ConfigurateException;
 import org.spongepowered.configurate.ConfigurationNode;
+import org.spongepowered.configurate.serialize.SerializationException;
 import org.spongepowered.configurate.yaml.NodeStyle;
 import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
 
@@ -46,6 +47,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Locale;
 
 public class FileHandler{
     
@@ -61,18 +63,27 @@ public class FileHandler{
     
     public FileHandler(AdvancedServerList<?> core){
         this.plugin = core;
-        this.logger = core.getPlugin().getPluginLogger();
+        this.logger = core.plugin().pluginLogger();
         
-        this.config = core.getPlugin().getFolderPath().resolve("config.yml");
-        this.profilesFolder = core.getPlugin().getFolderPath().resolve("profiles");
+        this.config = core.plugin().folderPath().resolve("config.yml");
+        this.profilesFolder = core.plugin().folderPath().resolve("profiles");
     }
     
-    public List<ServerListProfile> getProfiles(){
+    public List<ServerListProfile> profiles(){
         return profiles;
     }
     
+    public ServerListProfile profile(String file){
+        for(ServerListProfile profile : profiles){
+            if(profile.file().equalsIgnoreCase(file))
+                return profile;
+        }
+        
+        return null;
+    }
+    
     public boolean loadConfig(){
-        File folder = plugin.getPlugin().getFolderPath().toFile();
+        File folder = plugin.plugin().folderPath().toFile();
         if(!folder.exists() && !folder.mkdirs()){
             logger.warn("Couldn't create folder for plugin. Is it missing Write permissions?");
             return false;
@@ -106,6 +117,48 @@ public class FileHandler{
         }
     }
     
+    public boolean saveProfile(String file, int priority, String condition, List<ProfileEntry> profiles, ProfileEntry defaultProfile){
+        String filename = file.toLowerCase(Locale.ROOT);
+        Path filePath = profilesFolder.resolve(filename.endsWith(".yml") ? filename : filename + ".yml");
+        if(!Files.exists(filePath)){
+            logger.warn("Cannot find profile with file name '<white>%s</white>'", filename);
+            return false;
+        }
+        
+        YamlConfigurationLoader loader = YamlConfigurationLoader.builder()
+            .defaultOptions(opts -> opts.serializers(build -> build.register(ProfileEntry.class, ProfileSerializer.INSTANCE)))
+            .path(filePath)
+            .nodeStyle(NodeStyle.BLOCK)
+            .build();
+        
+        ConfigurationNode node;
+        try{
+            node = loader.load();
+        }catch(IOException ex){
+            logger.warn("Encountered an IOException while loading file '<white>%s</white>'", ex, filename);
+            return false;
+        }
+        
+        if(node == null)
+            return false;
+        
+        try{
+            node.node("priority").set(priority);
+            node.node("condition").set(condition);
+            node.node("profiles").setList(ProfileEntry.class, profiles);
+            node.set(ProfileEntry.class, defaultProfile);
+            
+            loader.save(node);
+            return true;
+        }catch(SerializationException ex){
+            logger.warn("Encountered a SerializationException while saving file '<white>%s</white>'", ex, filename);
+            return false;
+        }catch(IOException ex){
+            logger.warn("Encountered an IOException while saving file '<white>%s</white>'", ex, filename);
+            return false;
+        }
+    }
+    
     public boolean createFile(String name){
         if(Files.notExists(profilesFolder) && profilesFolder.toFile().mkdirs()){
             logger.debugSuccess(FileHandler.class, "Successfully created profiles folder.");
@@ -219,7 +272,7 @@ public class FileHandler{
     private boolean makeBackup(){
         logger.info("[-] Making backup of old config.yml...");
         
-        File backups = plugin.getPlugin().getFolderPath().resolve("backups").toFile();
+        File backups = plugin.plugin().folderPath().resolve("backups").toFile();
         if(!backups.exists() && !backups.mkdirs()){
             logger.failure("Cannot create backups folder for migration!");
             return false;

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

@@ -25,12 +25,12 @@
 
 package ch.andre601.advancedserverlist.core.interfaces.commands;
 
+import net.kyori.adventure.audience.Audience;
+
 public interface CmdSender{
     
-    String prefix = "<grey>[<gradient:aqua:white>AdvancedServerList</gradient>] ";
-    String errorPrefix = "<grey>[<gradient:dark_red:red>AdvancedServerList</gradient>] ";
-    
-    boolean hasPermission(String permission);
+    String prefix = "<grey>[<aqua>ASL</aqua>] ";
+    String errorPrefix = "<grey>[<red>ASL</red>] ";
     
     void sendMsg(String msg, Object... args);
     
@@ -45,4 +45,8 @@ public interface CmdSender{
     default void sendErrorMsg(String msg, Object... args){
         sendMsg(errorPrefix + msg, args);
     }
+    
+    Audience audience();
+    
+    boolean isPlayer();
 }

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

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022-2023 Andre_601
+ * Copyright (c) 2022-2025 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
@@ -20,24 +20,15 @@
  * 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.velocity.commands;
+package ch.andre601.advancedserverlist.core.interfaces.commands;
 
-import ch.andre601.advancedserverlist.velocity.VelocityCore;
-import com.velocitypowered.api.command.SimpleCommand;
+import org.incendo.cloud.CommandManager;
+import org.incendo.cloud.SenderMapper;
 
-public class CmdAdvancedServerList implements SimpleCommand{
+public interface CommandManagerInterface<S>{
+    CommandManager<CmdSender> commandHandler();
     
-    private final VelocityCore plugin;
-    
-    public CmdAdvancedServerList(VelocityCore plugin){
-        this.plugin = plugin;
-    }
-    
-    @Override
-    public void execute(Invocation invocation){
-        plugin.getCore().getCommandHandler().handle(new VelocityCmdSender(invocation.source()), invocation.arguments());
-    }
+    SenderMapper<S, CmdSender> senderMapper();
 }

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

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022-2023 Andre_601
+ * Copyright (c) 2022-2025 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
@@ -20,32 +20,22 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
  */
 
 package ch.andre601.advancedserverlist.core.interfaces.commands;
 
-import java.util.Locale;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
-public abstract class PluginCommand{
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD, ElementType.TYPE})
+public @interface CommandType{
+    Type value();
     
-    private final String name;
-    
-    public PluginCommand(String name){
-        this.name = name;
+    enum Type{
+        ALL,
+        PLAYER_ONLY
     }
-    
-    public String name(){
-        return name;
-    }
-    
-    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

@@ -26,16 +26,19 @@
 package ch.andre601.advancedserverlist.core.interfaces.core;
 
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
+import ch.andre601.advancedserverlist.core.interfaces.dialogs.IDialog;
+import ch.andre601.advancedserverlist.core.interfaces.dialogs.IDialogList;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
+import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
+import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
 import ch.andre601.advancedserverlist.core.profiles.handlers.FaviconHandler;
+import org.incendo.cloud.CommandManager;
 
 import java.awt.image.BufferedImage;
 import java.nio.file.Path;
 
 public interface PluginCore<F>{
     
-    void loadCommands();
-    
     void loadEvents();
     
     void loadMetrics();
@@ -48,26 +51,34 @@ public interface PluginCore<F>{
     
     void startScheduler();
     
-    AdvancedServerList<F> getCore();
+    AdvancedServerList<F> core();
     
-    Path getFolderPath();
+    Path folderPath();
     
-    PluginLogger getPluginLogger();
+    PluginLogger pluginLogger();
     
-    FaviconHandler<F> getFaviconHandler();
+    FaviconHandler<F> faviconHandler();
     
-    String getPlatformInfo();
+    CommandManager<CmdSender> commandManager();
     
-    String getLoader();
+    String platformInfo();
+    
+    String loader();
     
     boolean isPluginEnabled(String plugin);
     
+    boolean isDialogsSupported();
+    
     F createFavicon(BufferedImage image) throws Exception;
     
+    IDialogList.IDialogListBuilder createDialogListBuilder(String title);
+    
+    IDialog.IDialogBuilder createDialogBuilder(String title, ServerListProfile profile, int profilesPosition);
+    
     default boolean isDebugEnabled(){
-        if(getCore() == null)
+        if(core() == null)
             return false;
         
-        return getCore().getFileHandler().getBoolean("debug");
+        return core().fileHandler().getBoolean("debug");
     }
 }

core/src/main/java/ch/andre601/advancedserverlist/core/interfaces/dialogs/IDialog.java

@@ -0,0 +1,23 @@
+package ch.andre601.advancedserverlist.core.interfaces.dialogs;
+
+import ch.andre601.advancedserverlist.api.objects.NullBool;
+
+import java.util.List;
+
+public interface IDialog<T>{
+    T createDialog();
+    
+    interface IDialogBuilder{
+        IDialogBuilder appendBody(String body);
+        
+        IDialogBuilder appendTextInput(String key, String title, String initValue, int maxLength);
+        
+        IDialogBuilder appendTextbox(String key, String title, List<String> initValue, int maxLength, int rows);
+        
+        IDialogBuilder appendNumberRange(String key, String title, int initValue);
+        
+        IDialogBuilder appendBoolean(String key, String title, NullBool initValue);
+        
+        IDialog<?> build();
+    }
+}

core/src/main/java/ch/andre601/advancedserverlist/core/interfaces/dialogs/IDialogList.java

@@ -0,0 +1,16 @@
+package ch.andre601.advancedserverlist.core.interfaces.dialogs;
+
+import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
+
+public interface IDialogList{
+    
+    void show(CmdSender sender);
+    
+    interface IDialogListBuilder{
+        IDialogListBuilder appendBody(String body);
+        
+        IDialogListBuilder appendDialog(IDialog<?> dialog);
+        
+        IDialogList build();
+    }
+}

core/src/main/java/ch/andre601/advancedserverlist/core/interfaces/events/GenericEventWrapper.java

@@ -40,23 +40,23 @@ public interface GenericEventWrapper<F, P extends GenericPlayer>{
     
     GenericServerListEvent callEvent(ProfileEntry entry);
     
-    void setMaxPlayers(int maxPlayers);
+    void maxPlayers(int maxPlayers);
     
-    void setOnlinePlayers(int onlinePlayers);
+    void onlinePlayers(int onlinePlayers);
     
-    void setMotd(Component component);
+    void motd(Component component);
     
     void hidePlayers();
     
-    void setPlayerCount(String name);
+    void playerCount(String name);
     
-    void setPlayers(List<String> players, P player, GenericServer server);
+    void players(List<String> players, P player, GenericServer server);
     
-    void setPlayersHidden();
+    void playersHidden();
     
-    void setFavicon(F favicon);
+    void favicon(F favicon);
     
-    void setDefaultFavicon();
+    void defaultFavicon();
     
     void updateEvent();
     
@@ -64,23 +64,23 @@ public interface GenericEventWrapper<F, P extends GenericPlayer>{
     
     boolean isMaintenanceModeActive();
     
-    int getProtocolVersion();
+    int protocolVersion();
     
-    int getOnlinePlayers();
+    int onlinePlayers();
     
-    int getMaxPlayers();
+    int maxPlayers();
     
-    String getPlayerIP();
+    String playerIP();
     
     String parsePAPIPlaceholders(String text, P player);
     
-    String getVirtualHost();
+    String virtualHost();
     
-    PluginCore<F> getPlugin();
+    PluginCore<F> plugin();
     
     P createPlayer(CachedPlayer player, int protocol);
     
-    GenericServer createGenericServer(int playersOnline, int playersMax, String host);
+    GenericServer createServer(int playersOnline, int playersMax, String host);
     
     default String resolveHost(InetSocketAddress address){
         return address == null ? null : address.getHostString();

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

@@ -49,12 +49,14 @@ 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");
+        sender.sendMsg("Loading Configurate-Hocon library. This may take a while...");
+        core.plugin().downloadLibrary("org.spongepowered", "configurate-hocon", "4.1.2");
+        sender.sendMsg("<green>Library loaded!");
         
-        PluginLogger logger = core.getPlugin().getPluginLogger();
-        String folder = core.getPlugin().getLoader().equals("velocity") ? "minimotd-velocity" : "MiniMOTD";
+        PluginLogger logger = core.plugin().pluginLogger();
+        String folder = core.plugin().loader().equals("velocity") ? "minimotd-velocity" : "MiniMOTD";
         
-        Path mainConf = core.getPlugin().getFolderPath().getParent().resolve(folder).resolve("main.conf");
+        Path mainConf = core.plugin().folderPath().getParent().resolve(folder).resolve("main.conf");
         if(!Files.exists(mainConf)){
             logger.warn("[<white>Migrator - MiniMOTD</white>] Cannot find a main.conf file in <white>/plugins/%s/</white> folder.", folder);
             sender.sendErrorMsg(" -> <red>No main.conf file found.");
@@ -98,7 +100,7 @@ public class MiniMOTDConfigMigrator{
         
         if(config.motdEnabled()){
             if(config.motds().size() == 1){
-                applyMotd(profileBuilder, config.motds().get(0));
+                applyMotd(profileBuilder, config.motds().getFirst());
             }else
             if(config.motds().size() > 1){
                 for(int i = 0; i < config.motds().size(); i++){
@@ -109,7 +111,7 @@ public class MiniMOTDConfigMigrator{
         
         if(config.iconEnabled()){
             if(config.motds().size() == 1){
-                MiniMOTDConfig.Motd motd = config.motds().get(0);
+                MiniMOTDConfig.Motd motd = config.motds().getFirst();
                 if(!motd.icon().isEmpty()){
                     profileBuilder.favicon(motd.icon());
                 }
@@ -152,7 +154,7 @@ public class MiniMOTDConfigMigrator{
             return false;
         }
         
-        Path profile = core.getPlugin().getFolderPath().resolve("profiles").resolve("minimotd_migrated.yml");
+        Path profile = core.plugin().folderPath().resolve("profiles").resolve("minimotd_migrated.yml");
         if(Files.exists(profile)){
             logger.warn("[<white>Migrator - MiniMOTD</white>] 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.");

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

@@ -99,7 +99,7 @@ public class SLPConfigMigrator{
     
     public static int migrate(AdvancedServerList<?> core, CmdSender sender){
         ServerListPlusCore slpCore = ServerListPlusCore.getInstance();
-        PluginLogger logger = core.getPlugin().getPluginLogger();
+        PluginLogger logger = core.plugin().pluginLogger();
         if(slpCore == null){
             logger.warn("[<white>Migrator - ServerListPlus</white>] Cannot migrate ServerListPlus config. ServerListPlus is not active!");
             return 0;
@@ -128,7 +128,7 @@ public class SLPConfigMigrator{
     }
     
     private static int parseConf(AdvancedServerList<?> core, CmdSender sender, PersonalizedStatusConf.StatusConf conf, Type type){
-        PluginLogger logger = core.getPlugin().getPluginLogger();
+        PluginLogger logger = core.plugin().pluginLogger();
         if(conf == null){
             logger.info("[<white>Migrator - ServerListPlus</white>] No StatusConf found for type <white>%s</white>. Skipping...", type.getName());
             sender.sendPrefixedMsg(" -> Not found! Skipping...");
@@ -176,7 +176,7 @@ public class SLPConfigMigrator{
             return 0;
         }
         
-        Path profile = core.getPlugin().getFolderPath().resolve("profiles").resolve(type.getFile());
+        Path profile = core.plugin().folderPath().resolve("profiles").resolve(type.getFile());
         if(Files.exists(profile)){
             logger.warn("[<white>Migrator - ServerListPlus</white>] Cannot create new file <white>%s</white>. One with the same name is already present", type.getFile());
             sender.sendErrorMsg(" -> <red>File</red> %s <red>already present.", type.getFile());
@@ -223,7 +223,7 @@ public class SLPConfigMigrator{
             
             if(type == Type.PERSONALIZED){
                 node.node("condition")
-                    .set("${player name} != \"" + core.getFileHandler().getString("Anonymous", "unknownPlayer", "name") + "\"");
+                    .set("${player name} != \"" + core.fileHandler().getString("Anonymous", "unknownPlayer", "name") + "\"");
             }else
             if(type == Type.BANNED){
                 node.node("condition")

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

@@ -1,85 +0,0 @@
-/*
- * 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.objects;
-
-import java.time.Duration;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Supplier;
-
-public abstract class CacheUtil{
-    
-    protected final Duration duration;
-    
-    public CacheUtil(Duration duration){
-        this.duration = duration;
-    }
-    
-    public static class SingletonCache<T> extends CacheUtil{
-        
-        private CacheValue<T> cacheValue = null;
-        
-        public SingletonCache(Duration duration){
-            super(duration);
-        }
-        
-        public T get(Supplier<T> supplier){
-            if(cacheValue == null || cacheValue.expired())
-                cacheValue = new CacheValue<>(System.currentTimeMillis(), duration, supplier.get());
-            
-            return cacheValue.value();
-        }
-    }
-    
-    public static class IdentifiableCache<K, V> extends CacheUtil{
-        
-        private final Map<K, CacheValue<V>> cacheValues = new HashMap<>();
-        
-        public IdentifiableCache(Duration duration){
-            super(duration);
-        }
-        
-        public V get(K key, Supplier<V> supplier){
-            CacheValue<V> value = cacheValues.get(key);
-            if(value == null || value.expired()){
-                value = new CacheValue<>(System.currentTimeMillis(), duration, supplier.get());
-                cacheValues.put(key, value);
-            }
-            
-            return cacheValues.get(key).value();
-        }
-        
-        public void clear(){
-            cacheValues.clear();
-        }
-    }
-    
-    public 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/objects/PluginMessageUtil.java

@@ -1,57 +0,0 @@
-package ch.andre601.advancedserverlist.core.objects;
-
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.function.BiFunction;
-
-public class PluginMessageUtil{
-    
-    private static PluginMessageUtil instance;
-    
-    private final List<String> knownServers = new CopyOnWriteArrayList<>();
-    private final Map<String, ParsedText> text = new ConcurrentHashMap<>();
-    
-    private PluginMessageUtil(){}
-    
-    public static PluginMessageUtil get(){
-        if(instance != null)
-            return instance;
-        
-        return (instance = new PluginMessageUtil());
-    }
-    
-    public void addServer(String name){
-        this.knownServers.add(name);
-    }
-    
-    public List<String> getKnownServers(){
-        return knownServers;
-    }
-    
-    public void clear(){
-        knownServers.clear();
-    }
-    
-    public String getOrExecute(String key, String value, BiFunction<String, String, String> function){
-        if(text.get(key) != null){
-            return getOrDefault(key, value);
-        }
-        
-        return function.apply(key, value);
-    }
-    
-    public void queue(String key, String value, boolean parsed){
-        text.put(key, new ParsedText(value, parsed));
-    }
-    
-    public String getOrDefault(String key, String def){
-        if(text.get(key) == null)
-            return def;
-        
-        return text.get(key).parsed() ? text.remove(key).text() : text.get(key).text();
-    }
-    
-    private record ParsedText(String text, boolean parsed){}
-}

core/src/main/java/ch/andre601/advancedserverlist/core/objects/ValueCache.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,24 +23,30 @@
  *
  */
 
-package ch.andre601.advancedserverlist.bungeecord.commands;
+package ch.andre601.advancedserverlist.core.objects;
 
-import ch.andre601.advancedserverlist.bungeecord.BungeeCordCore;
-import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
-import net.md_5.bungee.api.CommandSender;
-import net.md_5.bungee.api.plugin.Command;
+import java.time.Duration;
+import java.util.function.Supplier;
 
-public class CmdAdvancedServerList extends Command{
+public class ValueCache<T>{
     
-    private final BungeeCordCore plugin;
+    private final Duration duration;
+    private CacheValue<T> cache = null;
     
-    public CmdAdvancedServerList(BungeeCordCore plugin){
-        super("advancedserverlist", "advancedserverlist.command.asl", "asl");
-        this.plugin = plugin;
+    public ValueCache(Duration duration){
+        this.duration = duration;
     }
     
-    @Override
-    public void execute(CommandSender sender, String[] args){
-        plugin.getCore().getCommandHandler().handle(new BungeeCmdSender(sender, plugin.getAudiences()), args);
+    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/parsing/ComponentParser.java

@@ -25,8 +25,11 @@
 
 package ch.andre601.advancedserverlist.core.parsing;
 
+import ch.andre601.advancedserverlist.core.compat.miniplaceholders.MiniPlaceholdersUtil;
+import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 
 import java.util.function.Function;
@@ -61,6 +64,17 @@ public class ComponentParser{
         return this;
     }
     
+    public ComponentParser applyMMTags(PluginCore<?> plugin){
+        if(!plugin.isPluginEnabled("MiniPlaceholders"))
+            return this;
+        
+        TagResolver resolver = MiniPlaceholdersUtil.tagResolvers();
+        Component component = mm.deserialize(this.text, resolver);
+        
+        this.text = mm.serialize(component);
+        return this;
+    }
+    
     public Component toComponent(){
         return mm.deserialize(text);
     }

core/src/main/java/ch/andre601/advancedserverlist/core/parsing/TextCenterUtil.java

@@ -77,8 +77,8 @@ public class TextCenterUtil{
     private Map<String, FontInfo> loadFontWidths(AdvancedServerList<?> plugin){
         try(InputStream stream = plugin.getClass().getResourceAsStream("/char-widths.json.gz")){
             if(stream == null){
-                plugin.getPlugin().getPluginLogger().warn("Internal char-widths.json.gz couldn't be retrieved.");
-                plugin.getPlugin().getPluginLogger().warn("The <center> Placeholder won't work.");
+                plugin.plugin().pluginLogger().warn("Internal char-widths.json.gz couldn't be retrieved.");
+                plugin.plugin().pluginLogger().warn("The <center> Placeholder won't work.");
                 return new HashMap<>();
             }
             
@@ -87,9 +87,9 @@ public class TextCenterUtil{
             
             return new Gson().fromJson(reader, new TypeToken<Map<String, FontInfo>>(){}.getType());
         }catch(IOException ex){
-            plugin.getPlugin().getPluginLogger().warn("Encountered IOException while loading font widths.");
-            plugin.getPlugin().getPluginLogger().warn("The <center> Placeholder won't work.");
-            plugin.getPlugin().getPluginLogger().warn("Cause: <white>%s</white>", ex.getMessage());
+            plugin.plugin().pluginLogger().warn("Encountered IOException while loading font widths.");
+            plugin.plugin().pluginLogger().warn("The <center> Placeholder won't work.");
+            plugin.plugin().pluginLogger().warn("Cause: <white>%s</white>", ex.getMessage());
             return new HashMap<>();
         }
     }

core/src/main/java/ch/andre601/advancedserverlist/core/placeholders/DatePlaceholder.java

@@ -0,0 +1,81 @@
+package ch.andre601.advancedserverlist.core.placeholders;
+
+import ch.andre601.advancedserverlist.api.PlaceholderProvider;
+import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
+import ch.andre601.advancedserverlist.api.objects.GenericServer;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.function.Function;
+
+public class DatePlaceholder extends PlaceholderProvider{
+    
+    public DatePlaceholder(){
+        super("date");
+    }
+    
+    @Override
+    public @Nullable String parsePlaceholder(@NonNull String placeholder, @NonNull GenericPlayer player, @NonNull GenericServer server){
+        String[] args = placeholder.split("\\s+");
+        
+        return switch(args[0]){
+            case "current" -> {
+                String format = "dd/MM/yyyy";
+                if(args.length > 1){
+                    format = format(Arrays.copyOfRange(args, 1, args.length));
+                }
+                
+                try{
+                    SimpleDateFormat dateFormat = new SimpleDateFormat(format);
+                    yield dateFormat.format(new Date());
+                }catch(IllegalArgumentException ex){
+                    yield "ERR: Invalid Date pattern " + format;
+                }
+            }
+            case "isBefore" -> compareDates(args, integer -> integer < 0);
+            case "isExactly" -> compareDates(args, integer -> integer == 0);
+            case "isAfter" -> compareDates(args, integer -> integer > 0);
+            default -> null;
+        };
+    }
+    
+    private String format(String... args){
+        if(args.length == 0)
+            return "dd/MM/yyyy";
+        
+        String format = String.join(" ", args);
+        if(format.trim().isEmpty()){
+            return "dd/MM/yyyy";
+        }else{
+            return format.trim();
+        }
+    }
+    
+    private String compareDates(String[] args, Function<Integer, Boolean> function){
+        if(args.length == 1)
+            return "ERR: No Date provided!";
+        
+        String targetDateStr = args[1];
+        String format = "dd/MM/yyyy";
+        if(args.length > 3){
+            format = format(Arrays.copyOfRange(args, 2, args.length));
+        }
+        
+        SimpleDateFormat dateFormat;
+        try{
+            dateFormat = new SimpleDateFormat(format);
+            Date targetDate = dateFormat.parse(targetDateStr);
+            int diff = new Date().compareTo(targetDate);
+            
+            return String.valueOf(function.apply(diff));
+        }catch(IllegalArgumentException ex){
+            return "ERR: Invalid Date format provided!";
+        }catch(ParseException ex){
+            return "ERR: Received invalid Date " + targetDateStr;
+        }
+    }
+}

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

@@ -46,9 +46,9 @@ public record ServerListProfile(int priority, String condition, ProfileEntry def
             return true;
         
         ParseWarnCollector collector = new ParseWarnCollector(condition);
-        PluginLogger logger = core.getPlugin().getPluginLogger();
+        PluginLogger logger = core.plugin().pluginLogger();
         
-        boolean result = core.getParser().evaluate(condition, player, server, collector);
+        boolean result = core.parser().evaluate(condition, player, server, collector);
         
         if(collector.hasWarnings()){
             logger.warn("Encountered <white>%d</white> Error(s) while parsing condition for file '<white>%s</white>':", collector.getWarnings().size(), file);

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

@@ -1,33 +1,9 @@
-/*
- * 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.profiles.handlers;
 
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
-import ch.andre601.advancedserverlist.core.objects.CacheUtil;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
 
 import javax.imageio.ImageIO;
 import java.awt.*;
@@ -41,9 +17,8 @@ import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.time.Duration;
-import java.util.List;
 import java.util.*;
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.LinkedBlockingDeque;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -55,175 +30,309 @@ public class FaviconHandler<F>{
     private final AdvancedServerList<F> core;
     private final PluginLogger logger;
     private final ThreadPoolExecutor faviconThreadPool;
-    private final CacheUtil.IdentifiableCache<String, CompletableFuture<F>> faviconCache;
+    private final Cache<String, CompletableFuture<F>> faviconCache;
     
-    private final Map<String, F> localFavicons = new HashMap<>();
-    private final HttpClient client = HttpClient.newHttpClient();
     private final Random random = new Random();
+    private final HttpClient client = HttpClient.newHttpClient();
+    private final Map<String, FaviconPair<F>> localFavicons = new HashMap<>();
     
     public FaviconHandler(AdvancedServerList<F> core){
         this.core = core;
-        this.logger = core.getPlugin().getPluginLogger();
-        this.faviconThreadPool = createFaviconThreadPool();
-        this.faviconCache = new CacheUtil.IdentifiableCache<>(Duration.ofMinutes(
-            core.getFileHandler().getLong(1, 1, "faviconCacheTime")
-        ));
+        this.logger = core.plugin().pluginLogger();
+        this.faviconThreadPool = createThreadPool();
+        this.faviconCache = CacheBuilder.newBuilder()
+                .expireAfterWrite(core.fileHandler().getLong(1, 1, "faviconCacheTime"), TimeUnit.MINUTES)
+                .build();
         
         loadLocalFavicons();
     }
     
-    public F getFavicon(String input){
-        if(!localFavicons.isEmpty()){
-            logger.debug(FaviconHandler.class, "Current Local Favicons:");
-            for(String key : localFavicons.keySet()){
-                logger.debug(FaviconHandler.class, "  - %s", key);
-            }
-        }
-        
+    public F favicon(String input){
         if(localFavicons.containsKey(input.toLowerCase(Locale.ROOT))){
-            logger.debug(FaviconHandler.class, "Input matches local favicon Image. Returning it...");
-            return localFavicons.get(input.toLowerCase(Locale.ROOT));
+            logger.debug(FaviconHandler.class, "Returning local Favicon '%s'.", input);
+            
+            return localFavicons.get(input.toLowerCase(Locale.ROOT)).favicon();
         }
         
-        logger.debug(FaviconHandler.class, "Getting Favicon image from cache...");
-        return faviconCache.get(input, () -> getFuture(input)).getNow(null);
+        if(input.equalsIgnoreCase("random")){
+            logger.debug(FaviconHandler.class, "Returning random local Favicon.");
+            
+            FaviconPair<F> pair = randomFavicon();
+            if(pair == null){
+                logger.warn("Cannot return random Favicon. Make sure PNGs are available in the Favicons folder!");
+                return null;
+            }
+            
+            return pair.favicon();
+        }
+        
+        CompletableFuture<F> favicon = faviconCache.getIfPresent(input);
+        if(favicon != null)
+            return favicon.getNow(null);
+        
+        logger.debug(FaviconHandler.class, "Processing '%s'", input);
+        if(input.contains(";")){
+            String[] parts = input.split(";");
+            logger.debug(FaviconHandler.class, "Handling multi-part Favicon: ['%s']", String.join("', '", parts));
+            favicon = CompletableFuture.supplyAsync(() -> {
+                List<BufferedImage> images = new ArrayList<>();
+                Arrays.stream(parts).forEach(part -> {
+                    logger.debug(FaviconHandler.class, "Creating BufferedImage for part '%s'...", part);
+                    images.add(create(part));
+                });
+                
+                if(images.isEmpty()){
+                    logger.debugWarn(FaviconHandler.class, "Unable to create Multi-part Favicon. List was empty.");
+                    return null;
+                }
+                
+                return composeFavicon(images);
+            }, faviconThreadPool);
+        }else{
+            logger.debug(FaviconHandler.class, "Handling Favicon input '%s'...", input);
+            
+            favicon = CompletableFuture.supplyAsync(() -> {
+                logger.debug(FaviconHandler.class, "Creating BufferedImage for '%s'...", input);
+                
+                BufferedImage image = create(input);
+                if(image == null){
+                    logger.warn("Cannot create Favicon for '%s'. BufferedImage was null!", input);
+                    return null;
+                }
+                
+                return createFavicon(image);
+            }, faviconThreadPool);
+        }
+        
+        faviconCache.put(input, favicon);
+        return favicon.getNow(null);
     }
     
     public void cleanCache(){
-        faviconCache.clear();
+        localFavicons.clear();
+        faviconCache.invalidateAll();
         loadLocalFavicons();
     }
     
-    private CompletableFuture<F> getFuture(String input){
+    private F composeFavicon(List<BufferedImage> images){
+        logger.debug(FaviconHandler.class, "Composing Favicon out of %d part(s)...", images.size());
+        BufferedImage image = new BufferedImage(64, 64, BufferedImage.TYPE_INT_ARGB);
+        Graphics2D graphics = image.createGraphics();
+        
+        String strategy = core.fileHandler().getString("resize", "faviconStrategy");
+        int layer = 0;
+        for(BufferedImage img : images){
+            layer++;
+            logger.debug(FaviconHandler.class, "Applying layer %d...", layer);
+            if(img == null){
+                logger.debugWarn(FaviconHandler.class, "Layer %d was null! Skipping...", layer);
+                continue;
+            }
+            
+            switch(strategy.toLowerCase(Locale.ROOT)){
+                case "center" -> {
+                    int height = img.getHeight();
+                    int width = img.getWidth();
+                    
+                    int posHeight = 0;
+                    int posWidth = 0;
+                    if(height != 64){
+                        posHeight = (64 - height) / 2;
+                    }
+                    
+                    // 64 - 128 = -64
+                    
+                    if(width != 64){
+                        posWidth = (64 - width) / 2;
+                    }
+                    
+                    graphics.drawImage(img, posWidth, posHeight, img.getWidth(), img.getHeight(), null);
+                }
+                case "none" -> graphics.drawImage(img, 0, 0, img.getWidth(), img.getHeight(), null);
+                default -> graphics.drawImage(img, 0, 0, 64, 64, null);
+            }
+            
+            logger.debug(FaviconHandler.class, "Applied layer %d!", layer);
+        }
+        
+        graphics.dispose();
+        
+        logger.debug(FaviconHandler.class, "Image Composing complete! Creating Favicon instance...");
+        return createFavicon(image);
+    }
+    
+    private BufferedImage create(String input){
         if(input.toLowerCase(Locale.ROOT).startsWith("https://")){
-            logger.debug(FaviconHandler.class, "Resolving URL '%s'...", input);
-            return CompletableFuture.supplyAsync(() -> fromURL(core, input), this.faviconThreadPool);
+            logger.debug(FaviconHandler.class, "Handling URL '%s'...", input);
+            return fromURL(input);
         }else
         if(input.equalsIgnoreCase("random")){
-            return CompletableFuture.completedFuture(getRandomized());
+            logger.debug(FaviconHandler.class, "Returning random local Favicon...");
+            FaviconPair<F> pair = randomFavicon();
+            return pair == null ? null : pair.image();
         }else
         if(input.toLowerCase(Locale.ROOT).endsWith(".png")){
-            logger.debug(FaviconHandler.class, "Resolving image file '%s'...", input);
-            return CompletableFuture.completedFuture(localFavicons.get(input.toLowerCase(Locale.ROOT)));
+            logger.debug(FaviconHandler.class, "Returning local Favicon '%s'...", input);
+            FaviconPair<F> pair = localFavicons.get(input.toLowerCase(Locale.ROOT));
+            return pair == null ? null : pair.image();
         }else{
-            logger.debug(FaviconHandler.class, "Resolving '%s' as 'https://mc-heads.net/avatar/%s/64'...", input, input);
-            return CompletableFuture.supplyAsync(() -> fromURL(core, "https://mc-heads.net/avatar/" + input + "/64"), this.faviconThreadPool);
+            logger.debug(FaviconHandler.class, "Handling Player Name/UUID '%s'...", input);
+            return fromURL("https://mc-heads.net/avatar/" + input + "/64");
         }
     }
     
-    private F getRandomized(){
-        logger.debug(FaviconHandler.class, "Obtaining random Favicon...");
+    private FaviconPair<F> randomFavicon(){
         if(localFavicons.isEmpty())
             return null;
         
-        List<F> faviconList = List.copyOf(localFavicons.values());
+        List<FaviconPair<F>> favicons = new ArrayList<>(localFavicons.values());
+        if(favicons.isEmpty())
+            return null;
         
-        // Don't use Random for just one entry.
-        if(faviconList.size() == 1)
-            return faviconList.get(0);
+        if(favicons.size() == 1)
+            return favicons.getFirst();
         
         synchronized(random){
-            return faviconList.get(random.nextInt(faviconList.size()));
+            return favicons.get(random.nextInt(favicons.size()));
         }
     }
     
     private void loadLocalFavicons(){
         this.localFavicons.clear();
         
-        logger.info("[-] Loading local image files as Favicons...");
+        logger.info("[-] Loading local images as Favicons...");
         
-        Path folder = core.getPlugin().getFolderPath().resolve("favicons");
+        Path folder = core.plugin().folderPath().resolve("favicons");
         if(!Files.exists(folder)){
             try{
                 Files.createDirectories(folder);
-                logger.debugSuccess(FaviconHandler.class, "Created favicons folder.");
+                logger.debugSuccess(FaviconHandler.class, "Created favicons folder");
             }catch(IOException ex){
-                logger.failure("Cannot create favicons folder. Encountered an IOException.", ex);
+                logger.warn("Encountered IOException while creating favicons folder.", ex);
                 return;
             }
         }
         
-        try(Stream<Path> pathStream = Files.list(folder)){
-            pathStream.filter(Files::isRegularFile)
-                .filter(file -> file.getFileName().toString().endsWith(".png"))
-                .forEach(this::loadFile);
+        try(Stream<Path> stream = Files.list(folder)){
+            stream.filter(Files::isRegularFile)
+                    .filter(file -> file.getFileName().toString().endsWith(".png"))
+                    .forEach(this::loadFile);
             
-            logger.success("Loaded <white>%d</white> local Favicons.", localFavicons.size());
+            logger.success("Loaded <white>%s</white> local Favicon(s).", localFavicons.size());
         }catch(IOException ex){
-            logger.failure("Cannot load files from favicons folder.", ex);
+            logger.warn("Encountered IOException while loading local favicons.", ex);
         }
     }
     
     private void loadFile(Path path){
         try(InputStream stream = Files.newInputStream(path)){
-            F favicon = createFavicon(stream);
-            if(favicon == null){
-                logger.failure("Cannot create Favicon from file '<white>%s</white>'. Received Favicon was null.", path.getFileName().toString());
+            BufferedImage image = createBufferedImage(stream);
+            if(image == null)
                 return;
-            }
             
-            localFavicons.put(path.getFileName().toString().toLowerCase(Locale.ROOT), favicon);
-            logger.debugSuccess(FaviconHandler.class, "Loaded file '<white>%s</white>' as Favicon.", path.getFileName().toString());
+            F favicon = core.plugin().createFavicon(image);
+            if(favicon == null)
+                return;
+            
+            localFavicons.put(path.getFileName().toString().toLowerCase(Locale.ROOT), new FaviconPair<>(image, favicon));
         }catch(IOException ex){
-            logger.failure("Cannot create Favicon from file '<white>%s</white>'. Encountered IOException.", ex);
+            logger.warn("Encountered IOException while creating a Favicon from '%s'.", ex, path.getFileName().toString());
+        }catch(Exception ex){
+            logger.warn("Encountered an Exceotion while creating a Favicon from '%s'.", ex, path.getFileName().toString());
         }
     }
     
-    private F fromURL(AdvancedServerList<F> core, String url){
+    private BufferedImage fromURL(String url){
         try{
-            logger.debug(FaviconHandler.class, "Creating Request for URL '%s'...", url);
+            logger.debug(FaviconHandler.class, "Creating request for URL '%s'...", url);
             HttpRequest request = HttpRequest.newBuilder()
-                .uri(new URI(url))
-                .header("User-Agent", "AdvancedServerList-" + core.getPlugin().getLoader() + "/" + core.getVersion())
-                .build();
+                    .uri(new URI(url))
+                    .header("User-Agent", "AdvancedServerList-" + core.plugin().loader() + "/" + core.version())
+                    .build();
             
             try(InputStream stream = client.send(request, HttpResponse.BodyHandlers.ofInputStream()).body()){
-                return createFavicon(stream);
-            }catch(InterruptedException | IOException ex){
-                logger.warn("Cannot create Favicon from URL '<white>%s</white>'. Encountered an Exception.", ex, url);
+                return createBufferedImage(stream);
+            }catch(IOException ex){
+                logger.warn("Encountered IOException while performing a web request for '%s'.", ex, url);
+                return null;
+            }catch(InterruptedException ex){
+                logger.warn("Encountered an InterruptedException while performing a web request for '%s'.", ex, url);
                 return null;
             }
         }catch(URISyntaxException ex){
-            logger.warn("Cannot create Favicon from URL '<white>%s</white>'. Encountered a URISyntaxException.", ex, url);
+            logger.warn("Received URISyntaxException for URL '%s'", ex, url);
             return null;
         }
     }
     
-    private F createFavicon(InputStream stream){
+    private BufferedImage createBufferedImage(InputStream stream){
+        logger.debug(FaviconHandler.class, "Creating BufferedImage from InputStream...");
         try{
-            logger.debug(FaviconHandler.class, "Creating BufferedImage from InputStream...");
             BufferedImage original = ImageIO.read(stream);
             if(original == null){
-                logger.warn("Cannot create Favicon. Received null BufferedImage.");
+                logger.warn("Cannot create Favicon. Received a null BufferedImage!");
                 return null;
             }
             
-            // Don't waste resources resizing images already having right size.
-            if(original.getWidth() == 64 && original.getHeight() == 64){
-                logger.debug(FaviconHandler.class, "BufferedImage is 64x64 pixels. No resizing needed.");
-                return core.getPlugin().createFavicon(original);
+            logger.debug(FaviconHandler.class, "Check image size for possible resizing...");
+            if(original.getHeight() == 64 && original.getWidth() == 64){
+                logger.debug(FaviconHandler.class, "Image is 64x64. No resizing needed!");
+                return original;
             }
             
-            logger.debug(FaviconHandler.class, "Resizing image to 64x64 pixels...");
+            logger.debug(FaviconHandler.class, "Applying Favicon resize strategy...");
             BufferedImage image = new BufferedImage(64, 64, BufferedImage.TYPE_INT_ARGB);
-            Graphics2D graphics2D = image.createGraphics();
+            Graphics2D graphics = image.createGraphics();
             
-            graphics2D.drawImage(original, 0, 0, 64, 64, null);
-            graphics2D.dispose();
+            String resizeMode = core.fileHandler().getString("resize", "faviconStrategy");
+            switch(resizeMode.toLowerCase(Locale.ROOT)){
+                case "center" -> {
+                    int height = original.getHeight();
+                    int width = original.getWidth();
+                    
+                    int posHeight = 0;
+                    int posWidth = 0;
+                    if(height != 64){
+                        posHeight = (64 - height) / 2;
+                    }
+                    
+                    if(width != 64){
+                        posWidth = (64 - width) / 2;
+                    }
+                    
+                    graphics.drawImage(original, posWidth, posHeight, original.getWidth(), original.getHeight(), null);
+                }
+                case "none" -> graphics.drawImage(original, 0, 0, original.getWidth(), original.getHeight(), null);
+                default -> graphics.drawImage(original, 0, 0, 64, 64, null);
+            }
             
-            logger.debug(FaviconHandler.class, "Image resized! Returning Favicon...");
-            return core.getPlugin().createFavicon(image);
-        }catch(Exception ex){
-            logger.warn("Unable to create Favicon. Received Exception.", ex);
+            graphics.dispose();
+            
+            logger.debug(FaviconHandler.class, "Image resized. Returning it...");
+            return image;
+        }catch(IOException ex){
+            logger.warn("Encountered an IOException while processing Favicon!", ex);
             return null;
         }
     }
     
-    private ThreadPoolExecutor createFaviconThreadPool(){
+    private F createFavicon(BufferedImage image){
+        try{
+            return core.plugin().createFavicon(image);
+        }catch(Exception ex){
+            logger.warn("Encountered an Exception while trying to create a Favicon instance.", ex);
+            return null;
+        }
+    }
+    
+    private ThreadPoolExecutor createThreadPool(){
         return new ThreadPoolExecutor(3, 3, 60L, TimeUnit.SECONDS, new LinkedBlockingDeque<>(1024), r -> {
             Thread t = new Thread(r, "AdvancedServerList-FaviconThread");
             t.setDaemon(true);
+            
             return t;
         });
     }
+    
+    private record FaviconPair<F>(BufferedImage image, F favicon){}
 }

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

@@ -61,8 +61,8 @@ public class PlayerHandler{
     
     public PlayerHandler(AdvancedServerList<?> core){
         this.core = core;
-        this.logger = core.getPlugin().getPluginLogger();
-        this.cache = core.getPlugin().getFolderPath().resolve("playercache.json");
+        this.logger = core.plugin().pluginLogger();
+        this.cache = core.plugin().folderPath().resolve("playercache.json");
     }
     
     public void load(){
@@ -71,7 +71,7 @@ public class PlayerHandler{
             return;
         }
         
-        if(core.getFileHandler().getBoolean("disableCache")){
+        if(core.fileHandler().getBoolean("disableCache")){
             logger.info("'disableCache' is set to true. Skipping playercache.json loading...");
             return;
         }
@@ -103,7 +103,7 @@ public class PlayerHandler{
             return;
         }
         
-        if(core.getFileHandler().getBoolean("disableCache")){
+        if(core.fileHandler().getBoolean("disableCache")){
             logger.debug(PlayerHandler.class, "[-] 'disable_cache' is set to true. Not saving cached players.");
             return;
         }
@@ -117,14 +117,14 @@ public class PlayerHandler{
     }
     
     public void addPlayer(String ip, String name, UUID uuid){
-        if(contains(ip) || core.getFileHandler().getBoolean("disableCache"))
+        if(contains(ip) || core.fileHandler().getBoolean("disableCache"))
             return;
         
         cachedPlayers.add(new CachedPlayer(ip, name, uuid));
     }
     
     public CachedPlayer getCachedPlayer(String key){
-        if(!contains(key) || core.getFileHandler().getBoolean("disableCache"))
+        if(!contains(key) || core.fileHandler().getBoolean("disableCache"))
             return getDefaultPlayer();
         
         for(CachedPlayer player : cachedPlayers){
@@ -164,8 +164,8 @@ public class PlayerHandler{
         
         return (defaultPlayer = new CachedPlayer(
             "0.0.0.0",
-            core.getFileHandler().getString("Anonymous", "unknownPlayer", "name"),
-            convertToUUID(core.getFileHandler().getString(defaultUUID.toString(), "unknownPlayer", "uuid"))
+            core.fileHandler().getString("Anonymous", "unknownPlayer", "name"),
+            convertToUUID(core.fileHandler().getString(defaultUUID.toString(), "unknownPlayer", "uuid"))
         ));
     }
     

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

@@ -78,7 +78,7 @@ public class ProfileManager{
     }
     
     public static ServerListProfile resolveProfile(AdvancedServerList<?> core, GenericPlayer player, GenericServer server){
-        for(ServerListProfile profile : core.getFileHandler().getProfiles()){
+        for(ServerListProfile profile : core.fileHandler().profiles()){
             if(profile.isInvalidProfile())
                 continue;
             
@@ -120,20 +120,13 @@ public class ProfileManager{
     }
     
     public static boolean checkOption(Object obj){
-        if(obj == null)
-            return false;
+        return switch(obj){
+            case List<?> list -> !list.isEmpty(); // Check if list isn't empty
+            case String str -> !str.isEmpty(); // Check if String is not empty
+            case NullBool nb -> nb.getOrDefault(false); // Return NullBool's value
+            case null, default -> false;
+        };
         
-        if(obj instanceof List<?> list){
-            return !list.isEmpty(); // Check if list isn't empty
-        }else
-        if(obj instanceof String str){
-            return !str.isEmpty(); // Check if String is not empty
-        }else
-        if(obj instanceof NullBool nb){
-            return nb.getOrDefault(false); // Return NullBool's value
-        }
-        
-        return false;
     }
     
     private static <T> T resolve(ProfileEntry defProfile, ProfileEntry profile, Function<ProfileEntry, T> function){

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

@@ -34,9 +34,14 @@ import ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.toke
 import ch.andre601.expressionparser.ParseWarnCollector;
 
 import java.text.ParsePosition;
+import java.util.function.Function;
 
 public class StringReplacer{
     
+    public static StringModifier modifier(String text){
+        return new StringModifier(text);
+    }
+    
     public static String replace(String input, GenericPlayer player, GenericServer server){
         if(input == null)
             return null;
@@ -63,7 +68,7 @@ public class StringReplacer{
     }
     
     private static String parsePlaceholder0(String input, ParsePosition position, GenericPlayer player, GenericServer server, ParseWarnCollector collector){
-        AdvancedServerListAPI api = AdvancedServerList.getApi();
+        AdvancedServerListAPI api = AdvancedServerList.api();
         int index = position.getIndex();
         
         StringBuilder identifier = new StringBuilder();
@@ -148,4 +153,22 @@ public class StringReplacer{
         
         return replacement;
     }
+    
+    public static class StringModifier{
+        private String value;
+        
+        public StringModifier(String value){
+            this.value = value;
+        }
+        
+        public StringModifier modify(Function<String, String> function){
+            this.value = function.apply(value);
+            
+            return this;
+        }
+        
+        public String asString(){
+            return value;
+        }
+    }
 }

core/src/main/resources/config.yml

@@ -66,6 +66,19 @@ printBanner: true
 #
 faviconCacheTime: 1
 
+#
+# Sets how AdvancedServerList should handle the size and positioning of images for favicons.
+#
+# Available options:
+#
+#   - resize: Resizes the image to 64x64 pixels if it isn't these dimensions already.
+#   - center: Doesn't resize the image, but instead tries to center it as good as possible in a 64x64 area.
+#   - none:   Doesn't resize the image and leaves it positioned at x 0 and y 0 (top-left) of the 64x64 area.
+#
+# Setting any not listed option or leaving this blank/removing it sets the option to resize.
+#
+faviconResizeStrategy: 'resize'
+
 #
 # Options to disable while the Maintenance Plugin is present and Maintenance Mode is active.
 #

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

@@ -2,7 +2,7 @@
 # Set the priority of this profile.
 # If there are multiple profiles (files) will they be sorted by priority, starting with highest.
 #
-# Read more: https://asl.andre601.ch/profiles/#priority
+# Read more: https://asl.andre601.ch/profiles/options/priority/
 #
 priority: 0
 
@@ -10,11 +10,11 @@ priority: 0
 # Set condition(s) that should return true to display this profile.
 # This allows you to create profiles to only show for specific scenarios (i.e. player is banned).
 #
-# Multiple conditions can be chaing with the keywords 'and', 'or', or their counterparts '&&' and '||'.
+# 'AND'/'&&' and 'OR'/'||' can be used to chain together multiple conditions.
 #
-# No condition or an empty condition will be treated as true by default.
+# Removing the condition option or setting it to an empty String will be treated as a true condition being returned.
 #
-# Read more: https://asl.andre601.ch/profiles/#condition
+# Read more: https://asl.andre601.ch/profiles/options/condition
 #
 condition: ''
 
@@ -30,7 +30,7 @@ condition: ''
 #
 # When not present or empty (profiles: []), no profiles will be used and global options from the file will be used instead.
 #
-# Read more: https://asl.andre601.ch/profiles/#profiles
+# Read more: https://asl.andre601.ch/profiles/options/profiles
 #
 profiles:
   - motd: ['<aqua>Line A', '<gold>Line B']
@@ -40,14 +40,17 @@ profiles:
 
 #
 # Set the "Message of the day" to display.
-# This option supports RGB colors for 1.16+ Servers and clients, including gradients using MiniMessage's <gradient>
-# option.
+# This option supports RGB colors for 1.16+ Servers and clients. More advanced MiniMessage features such as <gradient>
+# can be used for further styling the text.
+#
+# <center> can be put at the start of a line to have AdvancedServerList automatically center the text as good as
+# possible.
 #
 # Only the first two lines will be considered and any additional one is ignored.
 #
 # When not present or empty (motd: []), no MOTD will be set.
 #
-# Read more: https://asl.andre601.ch/profiles/#motd
+# Read more: https://asl.andre601.ch/profiles/options/motd
 #
 motd:
   - '<grey>First Line'
@@ -55,33 +58,36 @@ motd:
 
 #
 # Set the Favicon (image on the left of a server entry) to display.
-# This option supports three types of inputs:
+# This option supports three types of input:
 #
-#   1. Name, including .png extension, pointing to an image located in the plugin's favicons folder.
-#   2. "random" to display a random PNG from the favicons folder.
+#   1. Filename, including the .png extension, matching a filename in the favicons folder of the plugin.
+#      - 'random' can be used to have AdvancedServerList select a random image from the favicons folder every time
+#        the server is pinged.
 #   3. URL pointing to an image.
-#   4. Player name, UUID or placeholders returning one of these.
-#      https://mc-heads.net will be used to retrieve an image of the provided name/UUID.
+#   4. Player name, UUID or a placeholder that returns either.
+#      - https://mc-heads.net will be used to retrieve an image of the provided name/UUID.
 #
-# Note on favicons not showing:
-#   AdvancedServerList has to create a Favicon object for the Proxy/Server to use which takes time to do so.
-#   To not delay the Proxy/Server from being displayed (increase the loading time on the player end) is this creation
-#   done asynchronously for URL/Player name/UUID. This has the downside that the Proxy/Server may be done handling the
-#   ping before the Favicon is created, causing none to be displayed.
-#   Note that this won't happen with local favicons, as those are created during the plugin's startup.
-#
-# Any images above or below 64x64 pixels will be automatically resized to these dimensions.
+# Any image below or above 64x64 pixels will be resized according to the faviconResizeMode option in the config.yml.
 #
 # If not present or empty (favicon: ''), defaults to not modifying the favicon.
 #
-# Read more: https://asl.andre601.ch/profiles/#favicon
+# Read more: https://asl.andre601.ch/profiles/options/favicon
+#
+# "The favicon isn't showing!"
+#   This is a side effect of using either URLs or player names/UUIDs for the favicon.
+#   These types require AdvancedServerList to create a new favicon object from scratch. This action takes a significant
+#   amount of time, which can cause the server to show with a huge ping.
+#   To avoid this is this action performed asynchronously. This means that the plugin doesn't wait for the favicon to
+#   be created before continuing, which can result in no favicon being available when it is done handling the ping.
+#   This should only happen for the first ping of a player and subsequent pings should display the favicon, if the
+#   pings are done within the configured cache time (See 'faviconCacheTime' in the config.yml).
 #
 favicon: ''
 
 #
 # Contains options for modifying the player count (Text displaying <online>/<max>).
 #
-# Read more: https://asl.andre601.ch/profiles/#playercount
+# Read more: https://asl.andre601.ch/profiles/options/playercount
 #
 playerCount:
   #
@@ -91,7 +97,7 @@ playerCount:
   #
   # If not present, defaults to false.
   #
-  # Read more: https://asl.andre601.ch/profiles/#hideplayers
+  # Read more: https://asl.andre601.ch/profiles/options/playercount/hideplayers
   #
   hidePlayers: false
   #
@@ -100,17 +106,17 @@ playerCount:
   #
   # If not present, defaults to false.
   #
-  # Read more: https://asl.andre601.ch/profiles/#hideplayershover
+  # Read more: https://asl.andre601.ch/profiles/options/playercount/hideplayershover
   #
   hidePlayersHover: false
   #
   # Set the lines shown when the player hovers over the player count.
   # Unlike the MOTD option does this one only support basic color and formatting codes. Any RGB colors will be
-  # downsampled to the nearest matching color.
+  # down-sampled to the nearest matching color.
   #
   # If not present or empty (hover: []), defaults to not modifying the hover.
   #
-  # Read more: https://asl.andre601.ch/profiles/#hover
+  # Read more: https://asl.andre601.ch/profiles/options/playercount/hover
   #
   hover:
     - '<aqua>Line 1'
@@ -124,7 +130,7 @@ playerCount:
   #
   # If not present or empty (text: ''), defaults to not modifying the text.
   #
-  # Read more: https://asl.andre601.ch/profiles/#text
+  # Read more: https://asl.andre601.ch/profiles/options/playercount/text
   #
   text: ''
   #
@@ -133,7 +139,7 @@ playerCount:
   #
   # Using this feature will modify the ${server playersMax} placeholder, except for usage in the condition option.
   #
-  # Read more: https://asl.andre601.ch/profiles/#extraplayers
+  # Read more: https://asl.andre601.ch/profiles/options/playercount/extraplayers
   #
   extraPlayers:
     #
@@ -143,7 +149,7 @@ playerCount:
     #
     # If not present, defaults to false.
     #
-    # Read more: https://asl.andre601.ch/profiles/#extraplayers-enabled
+    # Read more: https://asl.andre601.ch/profiles/options/playercount/extraplayers#enabled
     #
     enabled: false
     #
@@ -155,7 +161,7 @@ playerCount:
     #
     # If not present, defaults to 0.
     #
-    # Read more: https://asl.andre601.ch/profiles/#extraplayers-amount
+    # Read more: https://asl.andre601.ch/profiles/options/playercount/extraplayers#amount
     #
     amount: 0
   #
@@ -163,7 +169,7 @@ playerCount:
   #
   # Using this feature will modify the ${server playersMax} placeholder, except for usage in the condition option.
   #
-  # Read more: https://asl.andre601.ch/profiles/#maxplayers
+  # Read more: https://asl.andre601.ch/profiles/options/playercount/maxplayers
   #
   maxPlayers:
     #
@@ -172,7 +178,7 @@ playerCount:
     #
     # If not present, defaults to false.
     #
-    # Read more: https://asl.andre601.ch/profiles/#maxplayers-enabled
+    # Read more: https://asl.andre601.ch/profiles/options/playercount/maxplayers#enabled
     #
     enabled: false
     #
@@ -181,13 +187,13 @@ playerCount:
     #
     # If not present, defaults to 0.
     #
-    # Read more: https://asl.andre601.ch/profiles/#maxplayers-amount
+    # Read more: https://asl.andre601.ch/profiles/options/playercount/maxplayers#amount
     #
     amount: 0
   #
   # The onlinePlayers feature allows to set a number to use as the online player count to display.
   #
-  # Read more: https://asl.andre601.ch/profiles/#onlineplayers
+  # Read more: https://asl.andre601.ch/profiles/options/playercount/onlineplayers
   #
   onlinePlayers:
     #
@@ -196,7 +202,7 @@ playerCount:
     #
     # If not present, defaults to false.
     #
-    # Read more: https://asl.andre601.ch/profiles/#onlineplayers-enabled
+    # Read more: https://asl.andre601.ch/profiles/options/playercount/onlineplayers#enabled
     #
     enabled: false
     #
@@ -205,6 +211,6 @@ playerCount:
     #
     # If not present, defaults to current online player count.
     #
-    # Read more: https://asl.andre601.ch/profiles/#onlineplayers-amount
+    # Read more: https://asl.andre601.ch/profiles/options/playercount/onlineplayers#amount
     #
     amount: 0

docs/.hooks/api_docs.py

@@ -0,0 +1,15 @@
+def on_pre_page_macros(env):
+    footer = """
+    
+    {% if page.meta and page.meta.api %}
+    {% include 'api_docs/constructor_summaries.md' %}
+    {% include 'api_docs/nested_class_summaries.md' %}
+    {% include 'api_docs/enum_summaries.md' %}
+    {% include 'api_docs/method_summaries.md' %}
+    
+    {% include 'api_docs/constructor_details.md' %}
+    {% include 'api_docs/enum_details.md' %}
+    {% include 'api_docs/method_details.md' %}
+    {% endif %}
+    """
+    env.markdown += footer

docs/.hooks/platforms.py

@@ -0,0 +1,23 @@
+import re
+
+from mkdocs.config.defaults import MkDocsConfig
+from mkdocs.structure.files import Files
+from mkdocs.structure.pages import Page
+from re import Match
+
+def on_page_markdown(
+    markdown: str, *, page: Page, config: MkDocsConfig, files: Files
+):
+    def replace(match: Match):
+        platform = match.group(1)
+        if platform == "paper":      return "[:fontawesome-solid-paper-plane:](https://papermc.io){ .md-button .md-button--icon title=\"PaperMC\" target=\"_blank\" rel=\"noopener\" }"
+        elif platform == "bungee":   return "[:simple-spigotmc:](https://spigotmc.org){ .md-button .md-button--icon title=\"BungeeCord\" target=\"_blank\" rel=\"noopener\" }"
+        elif platform == "velocity": return "[:simple-velocity:](https://velocitypowered.com){ .md-button .md-button--icon title=\"Velocity\" target=\"_blank\" rel=\"noopener\" }"
+        elif platform == "proxies":  return "[:simple-spigotmc:](https://spigotmc.org){ .md-button .md-button--icon title=\"BungeeCord\" target=\"_blank\" rel=\"noopener\" } [:simple-velocity:](https://velocitypowered.com){ .md-button .md-button--icon title=\"Velocity\" target=\"_blank\" rel=\"noopener\" }"
+        elif platform == "all":      return "[:fontawesome-solid-paper-plane:](https://papermc.io){ .md-button .md-button--icon title=\"PaperMC\" target=\"_blank\" rel=\"noopener\" } [:simple-spigotmc:](https://spigotmc.org){ .md-button .md-button--icon title=\"BungeeCord\" target=\"_blank\" rel=\"noopener\" } [:simple-velocity:](https://velocitypowered.com){ .md-button .md-button--icon title=\"Velocity\" target=\"_blank\" rel=\"noopener\" }"
+        else:                        return platform
+    
+    return re.sub(
+        r"<!-- icon:(paper|bungee|velocity|proxies|all) -->",
+        replace, markdown, flags = re.I | re.M
+    )

docs/.overrides/api-doc.html

@@ -1,35 +0,0 @@
-{% extends "base.html" %}
-{% import "api-objects/info-template.html" as info %}
-
-{% block content %}
-  {% include "partials/content.html" %}
-  {% if page.meta %}
-    <!--
-      Object summaries
-    -->
-    {% if page.meta.constructors %}
-      {{ info.summary('Constructor Summary', page.meta.constructors, details_type='constructor', defaults=page.meta.defaults) }}
-    {% endif %}
-    {% if page.meta.classes %}
-      {{ info.summary('Class Summary', page.meta.classes, details_type='class', defaults=page.meta.defaults) }}
-    {% endif %}
-    {% if page.meta.enums %}
-      {{ info.summary('Enum Constant Summary', page.meta.enums, details_type='enum', defaults=page.meta.defaults) }}
-    {% endif %}
-    {% if page.meta.methods or page.meta.inherits %}
-      {{ info.summary('Method Summary', page.meta.methods, page.meta.inherits, details_type='method', defaults=page.meta.defaults) }}
-    {% endif %}
-    <!--
-      Detailed object info
-    -->
-    {% if page.meta.constructors %}
-      {{ info.info('Constructor Detail', page.meta.constructors, 'constructor', defaults=page.meta.defaults) }}
-    {% endif %}
-    {% if page.meta.enums %}
-      {{ info.info('Enum Constant Detail', page.meta.enums, 'enum', defaults=page.meta.defaults) }}
-    {% endif %}
-    {% if page.meta.methods %}
-      {{ info.info('Method Detail', page.meta.methods, 'method', defaults=page.meta.defaults)}}
-    {% endif %}
-  {% endif %}
-{% endblock %}

docs/.overrides/api-objects/info-template.html

@@ -1,228 +0,0 @@
-{% macro summary(title, summaries, inherits, details_type = 'unknown', defaults = []) -%}
-  <h2 id="{{ title | lower() | replace(' ', '-') |  e}}">
-    {{ title }}
-  </h2>
-  <div class="md-typeset__scrollwrap">
-    <div class="md-typeset__table">
-      {% if summaries %}
-        <table>
-          <thead>
-            <tr>
-              {% if details_type and details_type == "method" %}
-                <th>Modifier and Type</th>
-              {% endif %}
-              <th>{{ details_type | capitalize() }}</th>
-              <th>Description</th>
-            </tr>
-          </thead>
-          <tbody>
-            {% for summary in summaries %}
-              <tr>
-                {% set modifiers = namespace(name = "") %}
-                {% for attribute in summary.attributes %}
-                  {% set modifiers.name = modifiers.name ~ attribute %}
-                  {% if loop.revindex > 0 %}{% set modifiers.name = modifiers.name ~ " " %}{% endif %}
-                {% endfor %}
-                
-                {% if modifiers.name %}{% set modifiers.name = modifiers.name ~ " " %}{% endif %}
-                
-                {% if summary.type and summary.type.name %}
-                  {% set modifiers.name = modifiers.name ~ summary.type.name %}
-                {% elif defaults and defaults.type and defaults.type.name %}
-                  {% set modifiers.name = modifiers.name ~ defaults.type.name %}
-                {% else %}
-                  {% set modifiers.name = modifiers.name ~ "void" %}
-                {% endif %}
-                
-                {% set desc = "" %}
-                {% if summary.deprecated %}
-                  {% set desc = "<api__deprecated></api__deprecated><br>" ~ summary.deprecated.split("<br>")[0] %}
-                {% elif summary.description %}
-                  {% set desc = summary.description.split("<br>")[0] %}
-                {% endif %}
-                
-                {% set final_name = namespace(name = "") %}
-                {% if details_type and details_type == "enum" %}
-                  {% set final_name.name = summary.name | upper() %}
-                {% else %}
-                  {% set final_name.name = summary.name ~ "(" %}
-                {% endif %}
-      
-                {% for parameter in summary.parameters %}
-                  {% set final_name.name = final_name.name ~ parameter.type %}
-                  {% if loop.revindex > 1 %}{% set final_name.name = final_name.name ~ ", " %}{% endif %}
-                {% endfor %}
-                
-                {% if details_type != "enum" %}
-                  {% set final_name.name = final_name.name ~ ")" %}
-                {% endif %}
-                
-                {% if details_type and details_type == "method" %}
-                  {% if modifiers.name  %}
-                    <td><code>{{ modifiers.name }}</code></td>
-                  {% else %}
-                    <td></td>
-                  {% endif %}
-                {% endif %}
-                <td>
-                  {% if summary.link %}
-                    <a href="{{ summary.link }}"><code>{{ final_name.name | e}}</code></a>
-                  {% else %}
-                    <a href="#{{ final_name.name | lower() | replace(' ', '-') | e }}"><code>{{ final_name.name | e}}</code></a>
-                  {% endif %}
-                </td>
-                <td>{{ desc }}</td>
-              </tr>
-            {% endfor %}
-          </tbody>
-        </table>
-      {% endif %}
-      
-      {% if inherits %}
-        {% for classpath, inherit in inherits.items() %}
-          <table>
-            <thead>
-              <tr>
-                <th>Methods inherited from <a href="{{ inherit.link }}"><code>{{ classpath }}</code></a></th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td>
-                  {% for inh in inherit.list %}
-                    <a href="{{ inherit.link }}#{{ inh | lower() | replace(' ', '-') | e }}">
-                      <code>{{- inh | e -}}</code>
-                    </a>
-                    {%- if loop.revindex > 1 %}, {% endif -%}
-                  {% endfor %}
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        {% endfor %}
-      {% endif %}
-    </div>
-  </div>
-{%- endmacro %}
-
-{% macro info(title, details, details_type = 'unknown', defaults = []) -%}
-  <h2 id="{{ title | lower() | replace(' ', '-') | e}}">
-    {{ title }}
-  </h2>
-  {% for detail in details %}
-    <div class="api-detail">
-      {% set final_name = namespace(name = "") %}
-      {% if details_type == "enum" %}
-        {% set final_name.name = detail.name | upper() %}
-      {% else %}
-        {% set final_name.name = detail.name ~ "(" %}
-      {% endif %}
-      
-      {% for parameter in detail.parameters %}
-        {% set final_name.name = final_name.name ~ parameter.type %}
-        {% if loop.revindex > 1 %}{% set final_name.name = final_name.name ~ ", " %}{% endif %}
-      {% endfor %}
-      
-      {% if details_type != "enum" %}
-        {% set final_name.name = final_name.name ~ ")" %}
-      {% endif %}
-      
-      <h3 id="{{ final_name.name | lower() | replace(' ', '-') | e }}">
-        {% if detail.deprecated %}
-          <api__deprecated></api__deprecated>
-        {% endif %}
-        
-        {% for attribute in detail.attributes %}
-          <api__{{- attribute -}}></api__{{- attribute -}}>
-        {% endfor %}
-        
-        {% if enum %}
-          <api__static></api__static> <api__final></api__final>
-        {% endif %}
-        
-        {% if detail.type and details_type == "method" %}
-          {% if detail.type.link %}
-            <a href="{{ detail.type.link }}" class="api-type__{{- detail.type.type | default('primitive') -}}">{{ detail.type.name | default('void') | e }}</a>
-          {% else %}
-            <span class="api-type__{{- detail.type.type | default('primitive') -}}">{{ detail.type.name | default('void') | e }}</span>
-          {% endif %}
-        {% elif defaults and defaults.type and details_type == "method" %}
-          {% if defaults.type.link %}
-            <a href="{{ defaults.type.link }}" class="api-type__{{- defaults.type.type | default('primitive') -}}">{{ defaults.type.name | default('void') | e }}</a>
-          {% else %}
-            <span class="api-type__{{- defaults.type.type | default('primitive') -}}">{{ defaults.type.name | default('void') }}</span>
-          {% endif %}
-        {% elif details_type == "method" %}
-          <span class="api-type__primitive">void</span>
-        {% endif %}
-        <code>{{ final_name.name | e }}</code><a href="#{{ final_name.name | lower() | replace(' ', '-') | e }}" class="headerlink" title="Permanent link">¶</a>
-      </h3>
-      
-      {% if detail.deprecated %}
-        <div class="admonition deprecated">
-          <div class="admonition-title">Deprecation Warning</div>
-          <p>
-            {{ detail.deprecated }}
-          </p>
-        </div>
-      {% endif %}
-      
-      {% if detail.description %}
-        <p class="api-detail__description">
-          {{ detail.description }}
-        </p>
-      {% endif %}
-      
-      {% if detail.parameters %}
-        <h4 id="{{ detail.name | lower() | replace(' ', '-')  | e }}-parameters">
-          Parameters:<a href="#{{ detail.name | lower() | replace(' ', '-')  | e }}-parameters" class="headerlink" title="Permanent link">¶</a>
-        </h4>
-        <ul>
-          {% for parameter in detail.parameters %}
-            <li>
-              {% for attribute in parameter.attribute %}
-                <api__{{- attribute -}}></api__{{- attribute -}}>
-              {% endfor %}
-              <code>{{ parameter.type | e }}: {{ parameter.name }}</code>{% if parameter.description %} - {{ parameter.description }}{% endif %}
-            </li>
-          {% endfor %}
-        </ul>
-      {% endif %}
-      
-      {% if detail.returns %}
-        <h4 id="{{ detail.name | lower() | replace(' ', '-') | e }}-returns">
-          Returns:<a href="#{{ detail.name | lower() | replace(' ', '-')  | e }}-returns" class="headerlink" title="Permanent link">¶</a>
-        </h4>
-        <p class="api-detail__description">
-          {{ detail.returns }}
-        </p>
-      {% endif %}
-      
-      {% if detail.throws %}
-        <h4 id="{{ detail.name | lower() | replace(' ', '-') | e }}-throws">
-          Throws:<a href="#{{ detail.name | lower() | replace(' ', '-') | e }}-throws" class="headerlink" title="Permanent link">¶</a>
-        </h4>
-        <ul>
-          {% for throw in detail.throws %}
-            <li>
-              <code>{{ throw.name }}</code>{% if throw.description %} - {{ throw.description }}{% endif %}
-            </li>
-          {% endfor %}
-        </ul>
-      {% endif %}
-      
-      {% if seealso %}
-        <h4 id="{{ detail.name | lower() | replace(' ', '-')  | e }}-see-also">
-          See also:<a href="#{{ detail.name | lower() | replace(' ', '-')  | e }}-see-also" class="headerlink" title="Permanent link">¶</a>
-        </h4>
-        <ul>
-          {% for see in detail.seealso %}
-            <li>
-              <a href="{{ see.link }}"><code>{{ see.name }}</code></a>
-            </li>
-          {% endfor %}
-        </ul>
-      {% endif %}
-    </div>
-  {% endfor %}
-{%- endmacro %}

docs/.overrides/api_docs/constructor_details.md

@@ -0,0 +1,61 @@
+{% if page.meta.constructors %}
+## Constructor Details
+
+{% for constructor in page.meta.constructors %}
+<div class="api-detail" markdown>
+
+{% set name = namespace(text = constructor.name ~ "(") %}
+{% for parameter in constructor.parameters %}
+  {% set name.text = name.text ~ parameter.type %}
+  {% if loop.revindex > 1 %}{% set name.text = name.text ~ ", " %}{% endif %}
+{% endfor %}
+{% set name.text = name.text ~ ")" %}
+
+{% if constructor.deprecated %}
+  {% set name.text = "<api__deprecated></api__deprecated> " ~ name.text %}
+{% endif %}
+
+{% for attribute in constructor.attributes %}
+  {% set name.text = "<api__{{- attribute -}}></api__{{- attribute -}}> " ~ name.text %}
+{% endfor %}
+
+### {{ name.text | e }} { #{{ constructor.name | lower() | replace(' ', '-') | e }} }
+
+{% if constructor.deprecated %}
+/// deprecated | Deprecation Warning
+{{ constructor.deprecated }}
+///
+{% endif %}
+
+{% if constructor.description %}
+<p class="api-detail__description">
+
+{{ constructor.description }}
+
+</p>
+{% endif %}
+
+{% if constructor.parameters %}
+#### Parameters: { #{{ constructor.name | lower() | replace(' ', '-') | e }}-parameters }
+
+{% for parameter in constructor.parameters %}
+- {% for attribute in parameter.attributes %}<api__{{- attribute -}}></api__{{- attribute -}}>{% endfor %} `{{ parameter.type | e}}: {{ parameter.name }}`{% if parameter.description %} - {{ parameter.description }}{% endif %}
+{% endfor %}
+{% endif %}
+
+{% if constructor.seealso %}
+#### See also: { #{{ constructor.name | lower() | replace(' ', '-') | e }}-see-also }
+
+<div class="api-detail__description" markdown>
+
+{% for see in constructor.seealso %}
+- [`{{ see.name }}`]({{ see.link }})
+{% endfor %}
+
+</div> 
+{% endif %}
+
+</div>
+{% endfor %}
+
+{% endif %}

docs/.overrides/api_docs/constructor_summaries.md

@@ -0,0 +1,14 @@
+{% if page.meta.constructors %}
+## Constructor Summary
+
+| Constructor | Description |
+|-------------|-------------|{% for constructor in page.meta.constructors %}
+| [`{{ constructor.name }}({% for parameter in constructor.parameters -%}
+{{ parameter.type }}{% if loop.revindex > 1 %}, {% endif %}
+{%- endfor %})`](#{{ constructor.name | lower() }}) | {% if constructor.deprecated -%}
+<api__deprecated></api__deprecated> {{ constructor.deprecated.split("\n")[0] }}
+{%- elif constructor.description -%}
+{{ constructor.description.split("\n")[0] }}
+{%- endif %} |
+{%- endfor %}
+{% endif %}

docs/.overrides/api_docs/enum_details.md

@@ -0,0 +1,32 @@
+{% if page.meta.enums %}
+## Enum Constant Details
+
+{% for enum in page.meta.enums %}
+<div class="api-detail" markdown>
+
+{% set modifiers = namespace(text = "<api__static></api__static> <api__final></api__final> ") %}
+
+{% if enum.deprecated %}
+  {% set modifiers.text = "<api__deprecated></api__deprecated> " ~ modifiers.text %}
+{% endif %}
+
+### {{ modifiers.text }} `{{ enum.name | upper() }}` { #{{ enum.name | lower() | replace(' ', '-') | e }} }
+
+{% if enum.deprecated %}
+/// deprecated | Deprecation Warning
+{{ enum.deprecated }}
+///
+{% endif %}
+
+{% if enum.description %}
+<div class="api-detail__description" markdown>
+
+{{ enum.description }}
+
+</div>
+{% endif %}
+
+</div>
+{% endfor %}
+
+{% endif %}

docs/.overrides/api_docs/enum_summaries.md

@@ -0,0 +1,8 @@
+{% if page.meta.enums %}
+## Enum Constant Summary
+
+| Enum | Description |
+|------|-------------|{% for enum in page.meta.enums %}
+| [`{{ enum.name | upper() }}`](#{{ enum.name | lower() }}) | {{ enum.description.split("\n")[0] }} |
+{%- endfor %}
+{% endif %}

docs/.overrides/api_docs/helpers.md

@@ -0,0 +1,3 @@
+{% macro render_name(method) -%}
+{{ method.name }}({% for parameter in method.parameters %}{{ parameter.type }}{% if loop.revindex > 1 %}, {% endif %}{% endfor %})
+{%- endmacro %}

docs/.overrides/api_docs/method_details.md

@@ -0,0 +1,109 @@
+{% if page.meta.methods %}
+## Method Details
+
+{% for method in page.meta.methods %}
+<div class="api-detail" markdown>
+
+{% set modifiers = namespace(text = "") %}
+
+{% if method.deprecated %}
+  {% set modifiers.text = "<api__deprecated></api__deprecated> " %}
+{% endif %}
+
+{% for attribute in method.attributes %}
+  {% set modifiers.text = modifiers.text ~ "<api__" ~ attribute ~ "></api__" ~ attribute ~ ">" %}
+  {% if loop.revindex > 0 %}{% set modifiers.text = modifiers.text ~ " " %}{% endif %}
+{% endfor %}
+
+{% if modifiers.text %}{% set modifiers.text = modifiers.text ~ " " %}{% endif %}
+
+{% set method_type = "" %}
+{% if method.type %}
+  {% if method.type.link %}
+    {% set method_type = '[' ~ method.type.name|default('void')|e ~ '](' ~ method.type.link ~ '){ .api-type__' ~ method.type.type|default('primitive') ~ '} ' %}
+  {% else %}
+    {% set method_type = '<span class="api-type__' ~ method.type.type|default('primitive') ~ '">' ~ method.type.name|default('void')|e ~ '</span> ' %}
+  {% endif %}
+{% elif page.meta.defaults and page.meta.defaults.type %}
+  {% if page.meta.defaults.type.link %}
+    {% set method_type = '[' ~ page.meta.defaults.type.name|default('void')|e ~ '](' ~ page.meta.defaults.type.link ~ '){ .api-type__' ~ page.meta.defaults.type.type|default('primitive') ~ '} ' %}
+  {% else %}
+    {% set method_type = '<span class="api-type__' ~ page.meta.defaults.type.type|default('primitive') ~ '">' ~ page.meta.defaults.type.name|default('void')|e ~ '</span> ' %}
+  {% endif %}
+{% else %}
+  {% set method_type = '<span class="api-type__primitive">void</span> ' %}
+{% endif %}
+
+{% set name = namespace(text = method.name ~ "(") %}
+{% for parameter in method.parameters %}
+  {% set name.text = name.text ~ parameter.type %}
+  {% if loop.revindex > 1 %}{% set name.text = name.text ~ ", " %}{% endif %}
+{% endfor %}
+{% set name.text = name.text ~ ")" %}
+
+### {{ modifiers.text }} {{ method_type }} `{{ name.text }}` { #{{ method.name | lower() | replace(' ', '-') | e }} }
+
+{% if method.deprecated %}
+/// deprecated | Deprecation Warning
+{{ method.deprecated }}
+///
+{% endif %}
+
+{% if method.description %}
+<div class="api-detail__description" markdown>
+
+{{ method.description }}
+
+</div>
+{% endif %}
+
+{% if method.parameters %}
+#### Parameters: { #{{ method.name | lower() | replace(' ', '-') | e }}-parameters }
+
+<div class="api-detail__description" markdown>
+
+{% for parameter in method.parameters %}
+- {% for attribute in parameter.attributes %}<api__{{- attribute -}}></api__{{- attribute -}}>{% endfor %} `{{ parameter.type | e}}: {{ parameter.name }}`{% if parameter.description %} - {{ parameter.description }}{% endif %}
+{% endfor %}
+
+</div>
+{% endif %}
+
+{% if method.returns %}
+#### Returns: { #{{ method.name | lower() | replace(' ', '-') | e }}-returns }
+
+<div class="api-detail__description" markdown>
+
+{{ method.returns }}
+
+</div>
+{% endif %}
+
+{% if method.throws %}
+#### Throws: { #{{ method.name | lower() | replace(' ', '-') | e }}-throws }
+
+<div class="api-detail__description" markdown>
+
+{% for throw in method.throws %}
+- `{{ throw.name }}`{% if throw.description %} - {{ throw.description }}{% endif %}
+{% endfor %}
+
+</div>
+{% endif %}
+
+{% if method.seealso %}
+#### See also: { #{{ method.name | lower() | replace(' ', '-') | e }}-see-also }
+
+<div class="api-detail__description" markdown>
+
+{% for see in method.seealso %}
+- [`{{ see.name }}`]({{ see.link }})
+{% endfor %}
+
+</div>
+{% endif %}
+
+</div>
+{% endfor %}
+
+{% endif %}

docs/.overrides/api_docs/method_summaries.md

@@ -0,0 +1,31 @@
+{% if page.meta.methods or page.meta.inherits %}
+## Method Summary
+
+{% if page.meta.methods %}
+| Modifier and Type | Method | Description |
+|-------------------|--------|-------------|{% for method in page.meta.methods %}
+| `{% if method.attributes -%}
+{% for attribute in method.attributes -%}
+{{ attribute }}{% if loop.revindex > 0 %} {% endif %}
+{%- endfor %} {%- endif %}{% if method.type and method.type.name -%}
+{{ method.type.name }}
+{%- elif page.meta.defaults and page.meta.defaults.type and page.meta.defaults.type.name -%}
+{{ page.meta.defaults.type.name }}
+{%- else -%}void{%- endif %}` | [`{{ method.name }}({% for parameter in method.parameters -%}
+{{ parameter.type }}{% if loop.revindex > 1 %}, {% endif %}
+{%- endfor %})`](#{{ method.name | lower() }}) | {% if method.deprecated -%}
+<api__deprecated></api__deprecated> {{ method.deprecated.split("\n")[0] }}
+{%- elif method.description -%}
+{{ method.description.split("\n")[0] }}
+{%- endif %} |
+{%- endfor %}
+{% endif %}
+
+{% if page.meta.inherits %}
+{% for classpath, inherit in page.meta.inherits.items() %}
+| Methods inherited from [`{{ classpath }}`]({{ inherit.link }}) |
+|----------------------------------------------------------------|
+| {% for entry in inherit.list -%}[`{{ entry.name | e }}`]({{ inherit.link }}#{{ entry.link | lower() | replace(' ', '-') | e }}){% if loop.revindex > 1 %}, {% endif %}{% endfor %} |
+{% endfor %}
+{% endif %}
+{% endif %}

docs/.overrides/api_docs/nested_class_summaries.md

@@ -0,0 +1,11 @@
+{% if page.meta.classes %}
+## Nested Class Summary
+
+| Modifier and Type | Class | Description |
+|-------------------|-------|-------------|{% for class in page.meta.classes %}
+| `{% if class.attributes -%}
+{% for attribute in class.attributes -%}
+{{ attribute }}{% if loop.revindex > 1 %} {% endif %}
+{%- endfor %} {%- endif %}{{ class.type }}` | [`{{ class.name }}`]({{ class.link }}) | {{ class.description.split("\n")[0] }} |
+{%- endfor %}
+{% endif %}

docs/.overrides/main.html

@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block announce %}
-  <span class="twemoji">{% include ".icons/material/party-popper.svg" %}</span>
-  Celebrating <a href="https://andre601.ch/blog/2024/12-13-history-of-asl/" target="_blank" rel="nofollow"><b>25,000 downloads!</b></a> Thank you!
-  <span class="twemoji">{% include ".icons/material/party-popper.svg" %}</span>
+  <span class="twemoji balloon">{% include ".icons/material/balloon.svg" %}</span>
+  <span class="rainbow">Celebrating <b>50,000 downloads</b> of AdvancedServerList! THANK YOU!</span>
+  <span class="twemoji balloon">{% include ".icons/material/balloon.svg" %}</span>
 {% endblock %}

docs/.snippets/links.md

@@ -1,6 +1,6 @@
 [discord]: https://discord.gg/MyPTjpsgGH
 
-[placeholderapi]: https://hangar.papermc.io/HelpChat/PlaceholderAPI
+[placeholderapi]: https://modrinth.com/plugin/PlaceholderAPI
 [viaversion]: https://hangar.papermc.io/ViaVersion/ViaVersion
 [papiproxybridge]: https://hangar.papermc.io/William278/PAPIProxyBridge
 [maintenance]: https://hangar.papermc.io/kennytv/Maintenance

docs/addons/first-party/banplugins.md

@@ -16,8 +16,7 @@ The BanPlugins Addon is available in downloads of AdvancedServerList on [:simple
 
 **Supported Platforms:**
 
-- :fontawesome-solid-paper-plane: Paper
-- :simple-spigotmc: BungeeCord
+<!-- icon:paper --> <!-- icon:bungee -->
 
 | Placeholder                     | Description                                                                              |
 |---------------------------------|------------------------------------------------------------------------------------------|
@@ -57,9 +56,7 @@ motd:
 
 **Supported Platforms:**
 
-- :fontawesome-solid-paper-plane: Paper
-- :simple-spigotmc: BungeeCord
-- :fontawesome-solid-paper-plane: Velocity
+<!-- icon:all -->
 
 | Placeholder                     | Description                                                                              |
 |---------------------------------|------------------------------------------------------------------------------------------|
@@ -95,9 +92,7 @@ motd:
 
 **Supported Platforms:**
 
-- :fontawesome-solid-paper-plane: Paper
-- :simple-spigotmc: BungeeCord
-- :fontawesome-solid-paper-plane: Velocity
+<!-- icon:all -->
 
 | Placeholder                  | Description                                                                              |
 |------------------------------|------------------------------------------------------------------------------------------|

docs/addons/first-party/luckperms.md

@@ -0,0 +1,39 @@
+---
+icon: octicons/checklist-24
+---
+# LuckPerms Addon
+
+The LuckPerms addon provides placeholders to return values from LuckPerms for a specific player.  
+This can be a players primary group, whether they have a specific group or whether they have a specific permission.
+
+/// note
+The Userdata retrieval is done asynchronously by LuckPerms.  
+However, this addon forces the thread for this to be blocked, which can cause lag, if done on the main thread.
+
+This was done due to possible downsides and issues with trying to keep it async and block-free.  
+To mitigate possible lag is the retrieved user data cached for 1 minute before being discarded.
+///
+
+## Placeholders
+
+**Supported Platforms:**
+
+<!-- icon:all -->
+
+| Placeholder                               | Description                                                                                                     |
+|-------------------------------------------|-----------------------------------------------------------------------------------------------------------------|
+| `${luckperms hasGroup <group>}`           | Returns whether the player has the specified group or not.                                                      |
+| `${luckperms hasPermission <permission>}` | Returns whether the player has the specified permission.<br/>No permission or one set to `false` returns false. |
+| `${luckperms primaryGroup}`               | Gives the name of the primary group the player has.                                                             |
+
+/// details | Example
+    type: example
+
+```yaml title="is_admin.yml
+priority: 1
+condition: "${luckperms hasGroup admin}"
+
+motd:
+  - "<yellow>Welcome Admin!"
+```
+///

docs/addons/index.md

@@ -13,16 +13,30 @@ These Addons are made by Andre601 and available together with the plugin downloa
 
 <div class="grid cards" markdown>
 
--   [**BanPlugins**](banplugins.md)
+-   [**BanPlugins**](first-party/banplugins.md)
 
     ----
     
     Addon for different Punishment plugins such as AdvancedBan, that add new placeholders to use in AdvancedServerList.
 
+-   [**LuckPerms**](first-party/luckperms.md)
+
+    ----
+    
+    Addon for adding LuckPerms-related placeholders to use in conditions.
+
 </div>
 
 ## Third-party
 
 Third-party addons made by other people not working on AdvancedServerList.
 
-*Currently no entries*
+<div class="grid cards" markdown>
+
+-   [**SayanVanish**](third-party/sayanvanish.md)
+    
+    ----
+    
+    SayanVanish adds additional placeholders to the Velocity version of AdvancedServerList to use.
+
+</div>

docs/addons/third-party/sayanvanish.md

@@ -0,0 +1,43 @@
+---
+icon: octicons/eye-closed-24
+---
+# SayanVanish
+
+The plugin [SayanVanish]{ target="_blank" rel="nofollow" } is hooking into AdvancedServerList to provide placeholders of its own to be used in conditions and text options.
+
+## Placeholders
+
+/// tab | :fontawesome-solid-paper-plane: Paper
+[:octicons-file-code-24: Source][source-paper]
+
+| Placeholder                      | Description                                                                                |
+|----------------------------------|--------------------------------------------------------------------------------------------|
+| `${sayanvanish vanished}`        | Returns true or false based on if the player is vanished.                                  |
+| `${sayanvanish level}`           | Returns the vanish level of the player.                                                    |
+| `${sayanvanish count}`           | Returns the number of online players that are vanished.                                    |
+| `${sayanvanish online_here}`     | Returns the number of online players on the same server that aren't vanished.              |
+| `${sayanvanish online_total}`    | Returns the number of online players on the entire network that aren't vanished.^[1](#n1)^ |
+| `${sayanvanish online_<server>}` | Returns the number of online players on `<server>` that aren't vanished.^[1](#n1)^         |
+| `${sayanvanish vanish_prefix}`   | Returns the prefix for the player while they are vanished or an empty String.              |
+| `${sayanvanish vanish_suffix}`   | Returns the suffix for the player while they are vanished or an empty String.              |
+
+<small>^1^{ #n1 } Only works when Proxy mode is enabled and will otherwise return `PROXY_MODE IS NOT ENABLED!`</small>
+///
+
+/// tab | :simple-velocity: Velocity
+[:octicons-file-code-24: Source][source-velocity]
+
+| Placeholder                      | Description                                                                      |
+|----------------------------------|----------------------------------------------------------------------------------|
+| `${sayanvanish vanished}`        | Returns true or false based on if the player is vanished.                        |
+| `${sayanvanish level}`           | Returns the vanish level of the player.                                          |
+| `${sayanvanish count}`           | Returns the number of online players that are vanished.                          |
+| `${sayanvanish online_total}`    | Returns the number of online players on the entire network that aren't vanished. |
+| `${sayanvanish online_<server>}` | Returns the number of online players on `<server>` that aren't vanished.         |
+| `${sayanvanish vanish_prefix}`   | Returns the prefix for the player while they are vanished or an empty String.    |
+| `${sayanvanish vanish_suffix}`   | Returns the suffix for the player while they are vanished or an empty String.    |
+///
+
+[SayanVanish]: https://modrinth.com/plugin/sayanvanish
+[source-paper]: https://github.com/Syrent/SayanVanish/blob/6e03b874464a7f07c0baba233c94cdfefab5d3e2/sayanvanish-bukkit/src/main/kotlin/org/sayandev/sayanvanish/bukkit/feature/features/hook/FeatureHookAdvancedServerList.kt
+[source-velocity]: https://github.com/Syrent/SayanVanish/blob/6e03b874464a7f07c0baba233c94cdfefab5d3e2/sayanvanish-proxy/sayanvanish-proxy-velocity/src/main/kotlin/org/sayandev/sayanvanish/velocity/feature/features/hook/FeatureHookAdvancedServerList.kt

docs/api/adding-placeholders.md

@@ -3,7 +3,7 @@ icon: octicons/plus-circle-24
 ---
 
 AdvancedServerList allows you to add your own Placeholders to be useable through its `${identifier value}` format.  
-The benefit of this method over alternatives such as using PlaceholderAPI placeholders is availability and the fact that these placeholders can be used within the [`condition` option](../profiles/index.md#condition) of the plugin.
+The benefit of this method over alternatives such as using PlaceholderAPI placeholders is availability and the fact that these placeholders can be used within the [`condition` option](../profiles/options/condition.md) of the plugin.
 
 Adding your own placeholder is relatively easy and only requires the main API module to be used in your dependencies, unless you need platform-specific values (Explained later on).
 
@@ -101,7 +101,7 @@ public class MyPlugin extends Plugin {
 ```
 ///
 
-/// tab | :fontawesome-solid-paper-plane: Velocity Example
+/// tab | :simple-velocity: Velocity Example
 ```java title="MyPlugin.java"
 @Plugin(
     id = "myplugin",

docs/api/changelog.md

@@ -14,7 +14,7 @@ They are ordered newest to oldest.
 - New setter method added to [`ProfileEntry.Builder`][profileentry.builder] class:
     - [`hidePlayersHoverEnabled(NullBool)`][hidePlayersHoverEnabled]
 
-[hidePlayersHoverEnabled]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#hideplayershoverenabled(nullbool)
+[hidePlayersHoverEnabled]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#hideplayershoverenabled
 
 ## v4.0.0 { #v4.0.0 }
 
@@ -30,8 +30,8 @@ They are ordered newest to oldest.
     - [`onlinePlayersCount(String)`][onlinePlayersCount]
     - [`onlinePlayersEnabled(NullBool)`][onlinePlayersEnabled]
 
-[onlinePlayersCount]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#onlineplayerscount(string)
-[onlinePlayersEnabled]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#onlineplayersenabled(nullbool)
+[onlinePlayersCount]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#onlineplayerscount
+[onlinePlayersEnabled]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#onlineplayersenabled
 
 ## v3.3.0 { #v3.3.0 }
 
@@ -62,15 +62,15 @@ They are ordered newest to oldest.
     - [`playerCountText(String)`][playercounttext]
     - [`players(List<String>)`][players]
 
-[extraplayerscount]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#extraplayerscount(string)
-[extraplayersenabled]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#extraplayersenabled(nullbool)
-[favicon]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#favicon(string)
-[hideplayersenabled]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#hideplayersenabled(nullbool)
-[maxplayerscount]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#maxplayerscount(string)
-[maxplayersenabled]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#maxplayersenabled(nullbool)
-[motd]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#motd(list<string>)
-[playercounttext]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#playercounttext(string)
-[players]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#players(list<string>)
+[extraplayerscount]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#extraplayerscount
+[extraplayersenabled]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#extraplayersenabled
+[favicon]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#favicon
+[hideplayersenabled]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#hideplayersenabled
+[maxplayerscount]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#maxplayerscount
+[maxplayersenabled]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#maxplayersenabled
+[motd]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#motd
+[playercounttext]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#playercounttext
+[players]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#players
 
 ### :octicons-pencil-24:{ .changelog-changed title="Changed" } Changed { #v3.2.0-changed }
 
@@ -137,8 +137,8 @@ They are ordered newest to oldest.
 - `setExtraPlayerEnabled(Integer)` in `ProfileEntry.Builder` - Typo in method name.
 
 [profileentry]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/index.md
-[maxplayersenabled]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/index.md#maxplayersenabled()
-[maxplayerscount]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/index.md#maxplayerscount()
+[maxplayersenabled]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/index.md#maxplayersenabled
+[maxplayerscount]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/index.md#maxplayerscount
 
 [profileentry.builder]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md
 

docs/api/index.md

@@ -88,12 +88,10 @@ dependencies {
 
 Dedicated pages to explain aspects of the API are available:
 
-<div class="grid cards" markdown>
-
+/// html | div.grid.cards
 - [:octicons-plus-circle-24: Adding Placeholders](adding-placeholders.md)
 - [:octicons-broadcast-24: Listening for Events](listening-for-events.md)
-
-</div>
+///
 
 ## Declare AdvancedServerList as (soft)depend
 
@@ -135,7 +133,7 @@ dependencies:
 ////
 ///
 
-/// tab | :octicons-git-merge-24: BungeeCord
+/// tab | :simple-spigotmc: BungeeCord
 //// tab | Softdepend
 ```yaml title="bungee.yml"
 name: "MyPlugin"
@@ -163,7 +161,7 @@ depends:
 ////
 ///
 
-/// tab | :octicons-git-merge-24: Velocity
+/// tab | :simple-velocity: Velocity
 //// tab | Softdepend (File)
 ```json title="velocity-plugin.json"
 {
@@ -251,50 +249,4 @@ public class MyPlugin {
 
 ### 4. You're done!
 
-Your plugin should now hook into AdvancedServerList and register its own custom placeholders to use.
-
-## Listening for events
-
-<!-- admo:info These events require the platform-specific APIs -->
-
-AdvancedServerList provides Events that your plugin can listen for specific situations.
-
-### PreServerListSetEvent
-
-This event is called **before** AdvancedServerList starts handling the PingEvent of the Server/Proxy.  
-It allows you to get and alter the [ProfileEntry][profileentry] used in the PingEvent, or even outright cancel the event itself.
-
-The event offers the following methods:
-
-- [`getEntry()`][getentry] - Gets the currently set [`ProfileEntry`][profileentry].
-- [`setEntry(ProfileEntry)`][setentry] - Sets a new [`ProfileEntry`][profileentry] to use.
-- [`isCancelled()`][iscancelled] - Gets the current cancelled state of the event.
-- [`setCancelled(boolean)`][setcancelled] - Sets the current cancelled state.
-
-Please check the server/proxy's documentation on how to listen for events with your plugin.
-
-[getentry]: reference/api/ch.andre601.advancedserverlist.api/events/genericserverlistevent.md#getentry()
-[setentry]: reference/api/ch.andre601.advancedserverlist.api/events/genericserverlistevent.md#setentry(profileentry)
-[iscancelled]: reference/api/ch.andre601.advancedserverlist.api/events/genericserverlistevent.md#iscancelled()
-[setcancelled]: reference/api/ch.andre601.advancedserverlist.api/events/genericserverlistevent.md#setcancelled(boolean)
-
-### PostServerListSetEvent
-
-This event is called **after** AdvancedServerList has completed its handling of the Server's/Proxy's PingEvent.
-
-It provides a method to retrieve the [ProfileEntry][profileentry] used during the PingEvent.  
-Do note that this ProfileEntry is **not** a representation of what is actually displayed in the server list, but rather what has been used by AdvancedServerList. It may also be `null` should the event handling get cancelled for any reason.
-
-[profileentry]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/index.md
-
-### ProfileEntry
-
-The ProfileEntry record is the core class used within the `PreServerListSetEvent`. It sets what values (MOTD, Favicon, Players, etc.) should be displayed.  
-Note that the record is - by nature - immutable and that the [`Builder`][builder] class should be used to create a new ProfileEntry instance to use.
-
-A convenience method ([`builder()`][builder()]) exists to create a `Builder` instance from an existing `ProfileEntry` in case you only want to alter certain options while everything else should remain unchanged.
-
-This allows you to customize the Server list using your plugin. Just keep in mind that other plugins may also do the same, overriding your changes.
-
-[builder]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md
-[builder()]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/index.md#builder()
+Your plugin should now hook into AdvancedServerList and register its own custom placeholders to use.

docs/api/listening-for-events.md

@@ -7,12 +7,10 @@ These events are structurally the same across all platforms, yet still require t
 
 The plugin currently offers the following events:
 
-<div class="grid cards" markdown>
-
+/// html | div.grid.cards
 - [PreServerListSetEvent](#preserverlistsetevent)
 - [PostServerListSetEvent](#postserverlistsetevent)
-
-</div>
+///
 
 ## PreServerListSetEvent
 
@@ -22,12 +20,16 @@ This event is executed before AdvancedServerList tries to modify the player list
 
 The following methods are available to use:
 
-| Method                   | Description                                                                    |
-|--------------------------|--------------------------------------------------------------------------------|
-| `getEntry()`             | Returns the [`ProfileEntry`][profileentry] that AdvancedServerList should use. |
-| `setEntry(ProfileEntry)` | Sets the [`ProfileEntry`][profileentry] that should be used.                   |
-| `isCancelled()`          | Returns wether this event was cancelled or not.                                |
-| `setCancelled(boolean)`  | Sets the event's cancelled state.                                              |
+| Method                                  | Description                                                                    |
+|-----------------------------------------|--------------------------------------------------------------------------------|
+| [`getEntry()`][getentry]                | Returns the [`ProfileEntry`][profileentry] that AdvancedServerList should use. |
+| [`setEntry(ProfileEntry)`][setentry]    | Sets the [`ProfileEntry`][profileentry] that should be used.                   |
+| [`isCancelled()`][iscancelled]          | Returns wether this event was cancelled or not.                                |
+| [`setCancelled(boolean)`][setcancelled] | Sets the event's cancelled state.                                              |
+
+[setentry]: reference/api/ch.andre601.advancedserverlist.api/events/genericserverlistevent.md#setentry
+[iscancelled]: reference/api/ch.andre601.advancedserverlist.api/events/genericserverlistevent.md#iscancelled
+[setcancelled]: reference/api/ch.andre601.advancedserverlist.api/events/genericserverlistevent.md#setcancelled
 
 ### Notes { #preserverlistsetevent-notes }
 
@@ -41,7 +43,9 @@ This event is executed after AdvancedServerList completed the server list modifi
 
 | Method                   | Description                                                              |
 |--------------------------|--------------------------------------------------------------------------|
-| `getEntry()`             | Returns the [`ProfileEntry`][profileentry] that AdvancedServerList used. |
+| [`getEntry()`][getentry] | Returns the [`ProfileEntry`][profileentry] that AdvancedServerList used. |
+
+[getentry]: reference/api/ch.andre601.advancedserverlist.api/events/genericserverlistevent.md#getentry
 
 ### Notes { #postserverlistsetevent-notes }
 
@@ -50,7 +54,107 @@ This event is executed after AdvancedServerList completed the server list modifi
 
 ## Registering the Events
 
-To register an event, please refer to our platforms documentation on how to do this.
+/// tab | :fontawesome-solid-paper-plane: Paper
+```java { title="MyPlugin.java" .annotate }
+public class MyPlugin extends JavaPlugin {
+    
+    @Override
+    public void onEnable() {
+        // (1)
+        Bukkit.getPluginManager().registerEvents(new ASLEventListener(), this);
+    }
+}
+```
+
+1. `getServer()` from the `JavaPlugin` class can be used here too instead of the `Bukkit` singleton.
+
+```java { title="ASLEventListener.java" }
+public class ASLEventListener implements Listener {
+    
+    @EventHandler
+    public void onPreServerListSet(PreServerListSetEvent event) {
+        System.out.println("PreServerListSetEvent fired!");
+    }
+    
+    @EventHandler
+    public void onPostServerListSetEvent(PostServerListSetEvent event) {
+        System.out.println("PostServerListSetEvent fired!");
+    }
+}
+```
+///
+
+/// tab | :simple-spigotmc: BungeeCord
+```java { title="MyPlugin.java" }
+public class MyPlugin extends Plugin {
+    
+    @Override
+    public void onEnable() {
+        getProxy().getPluginManager().registerListener(this, new ASLEventListener());
+    }
+}
+```
+
+```java { title="ASLEventListener.java" }
+public class ASLEventListener implements Listener {
+    
+    @EventHandler
+    public void onPreServerListSet(PreServerListSetEvent event) {
+        System.out.println("PreServerListSetEvent fired!");
+    }
+    
+    @EventHandler
+    public void onPostServerListSetEvent(PostServerListSetEvent event) {
+        System.out.println("PostServerListSetEvent fired!");
+    }
+}
+```
+///
+
+/// tab | :simple-velocity: Velocity
+```java { title="MyPlugin.java" }
+@Plugin(
+    id = "myplugin",
+    name = "MyPlugin",
+    version = "1.0.0",
+    authors = {"author"},
+    dependencies = {
+        @Dependency(
+            id = "advancedserverlist",
+        )
+    }
+)
+public class MyPlugin {
+    
+    private final ProxyServer proxy;
+    
+    @Inject
+    public MyPlugin(ProxyServer server) {
+        this.proxy = proxy;
+    }
+    
+    @Subscribe
+    public void init(ProxyInitializeEvent event) {
+        proxy.getEventManager().register(this, new ASLEventListener());
+    }
+}
+```
+
+```java { title="ASLEventListener.java" }
+public class ASLEventListener {
+    
+    @Subscribe
+    public void onPreServerListSet(PreServerListSetEvent event) {
+        System.out.println("PreServerListSetEvent fired!");
+    }
+    
+    @Subscribe
+    public void onPostServerListSetEvent(PostServerListSetEvent event) {
+        System.out.println("PostServerListSetEvent fired!");
+    }
+}
+```
+///
 
 ## What is a ProfileEntry?
 
@@ -60,6 +164,7 @@ The `ProfileEntry` is a record, representing the values of a [Server List Profil
 It is important to note, that the `ProfileEntry` can be a representation of the [`profiles` option](../profiles/index.md#profiles), the global options or a mixture of both.  
 If you want to create your own instance, you'll need to use the [`ProfileEntry.Builder` class](reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md) as the `ProfileEntry` is unmodifiable.
 
-A convenience method in the form of `builder()` exists to create a Builder instance of the ProfileEntry with its values already pre-set.
+A convenience method in the form of [`builder()`][builder] exists to create a Builder instance of the ProfileEntry with its values already pre-set.
 
-[profileentry]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/index.md
+[profileentry]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/index.md
+[builder]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/index.md#builder

docs/api/reference/api/ch.andre601.advancedserverlist.api/advancedserverlistapi.md

@@ -1,10 +1,10 @@
 ---
-template: api-doc.html
+api: true
 
 methods:
   - name: 'get'
     description: |
-      Retrieve the instance used of this API.<br>
+      Retrieve the instance used of this API.  
       If no instance has been made so far will a new one be created.
     returns: 'Instance of this API.'
     attributes:
@@ -14,38 +14,38 @@ methods:
       type: 'object'
   - name: 'addPlaceholderProvider'
     description: |
-      Adds the provided <a href="./../placeholderprovider/"><code>PlaceholderProvider</code></a> to the list, if it passes the following checks:<br>
-      <ul>
-        <li>Provided PlaceholderProvider instance is not null.</li>
-        <li>The identifier is not null nor empty.</li>
-        <li>The identifier does not contain any spaces.</li>
-        <li>A PlaceholderProvider with the same identifier doesn't exist already.</li>
-      </ul>
-      Not passing any of the above checks results in a <a href="./../exceptions/invalidplaceholderproviderexception/"><code>InvalidPlaceholderProviderException</code></a> being thrown.
+      Adds the provided [`PlaceholderAPIProvider`](placeholderprovider.md) to the list, if it passes the following checks:
+      
+      - Provided PlaceholderProvider instance is not null.
+      - The identifier is not null nor empty.
+      - The identifier does not contain any spaces.
+      - A PlaceholderProvider with the same identifier doesn't exist already.
+      
+      Not passing any of the above checks results in a [`InvalidPlaceholderProviderException`](exceptions/invalidplaceholderproviderexception.md) being thrown.
     parameters:
       - name: 'placeholderProvider'
-        description: 'The <a href="./../placeholderprovider/"><code>PlaceholderProvider</code></a> to add.'
+        description: 'The [`PlaceholderProvider`](placeholderprovider.md) to add.'
         type: PlaceholderProvider
         attributes:
           - notnull
     throws:
       - name: 'InvalidPlaceholderProviderException'
-        description: 'When the provided <a href="./../placeholderprovider/"><code>PlaceholderProvider</code> instance</a> is null, has a null or empty identifier, the identifier contains spaces, or another PlaceholderProvider with the same identifier is already in use.'
+        description: 'When the provided [`PlaceholderProvider`](placeholderprovider.md) is null, has a null or empty identifier, the identifier contains spaces, or another PlaceholderProvider with the same identifier is already in use.'
     type:
       name: 'void'
   - name: 'retrievePlaceholderProvider'
-    description: 'Retrieves the <a href="./../placeholderprovider/"><code>PlaceholderProvider</code></a> associated with the provided identifier, or <code>null</code> should no such entry exist.'
+    description: 'Retrieves the [`PlaceholderProvider`](placeholderprovider.md) associated with the provided identifier, or `null` should no such entry exist.'
     parameters:
       - name: 'identifier'
-        description: 'The identifier to find a matching <a href="./../placeholderprovider/"><code>PlaceholderProvider</code></a> for.'
+        description: 'The identifier to find a matching [`PlaceholderProvider`](placeholderprovider.md) for.'
         type: String
-    returns: 'Possibly-null <a href="./../placeholderprovider/"><code>PlaceholderProvider</code> instance</a>.'
+    returns: 'Possibly-null [`PlaceholderProvider` instance](placeholderprovider.md).'
     attributes:
       - nullable
     type:
       name: PlaceholderProvider
       type: object
-      link: './../placeholderprovider'
+      link: 'placeholderprovider.md'
 ---
 
 # <api__class></api__class> AdvancedServerListAPI

docs/api/reference/api/ch.andre601.advancedserverlist.api/events/genericserverlistevent.md

@@ -1,27 +1,27 @@
 ---
-template: api-doc.html
+api: true
 
 methods:
   - name: 'getEntry'
-    description: 'Gets the <a href="../../profiles/profileentry/"><code>ProfileEntry</code></a> currently set.'
+    description: 'Gets the [`ProfileEntry`](../profiles/profileentry/index.md) currently set.'
     returns: The currently used ProfileEntry.
     type:
       name: ProfileEntry
       type: object
-      link: '../../profiles/profileentry/'
+      link: '../profiles/profileentry/index.md'
   - name: 'setEntry'
     description: |-
-      Sets the new <a href="../../profiles/profileentry/"><code>ProfileEntry</code></a> to use.<br>
-      This may not be <code>null</code>.
+      Sets the new [`ProfileEntry`](../profiles/profileentry/index.md) to use.  
+      This may not be `null`.
     parameters:
       - name: 'entry'
-        description: 'The new <a href="../../profiles/profileentry/"><code>ProfileEntry</code></a> to use.'
+        description: 'The new [`ProfileEntry`](../profiles/profileentry/index.md) to use.'
         type: ProfileEntry
         attributes:
           - notnull
     throws:
       - name: 'IllegalArgumentException'
-        description: 'When the provided ProfileEntry is <code>null</code>'
+        description: 'When the provided ProfileEntry is `null`'
     type:
       name: 'void'
   - name: 'isCancelled'

docs/api/reference/api/ch.andre601.advancedserverlist.api/exceptions/invalidplaceholderproviderexception.md

@@ -1,11 +1,13 @@
 ---
-template: 'api-doc.html'
+api: true
 
 constructors:
   - name: 'InvalidPlaceholderProviderException'
+    description: Basic Constructor to create an instance of this Exception.
     parameters:
       - name: msg
         type: String
+        description: The reason of the exception.
 ---
 
 # <api__class></api__class> InvalidPlaceholderProviderException

docs/api/reference/api/ch.andre601.advancedserverlist.api/objects/genericplayer.md

@@ -1,29 +1,27 @@
 ---
-template: api-doc.html
+api: true
 
 methods:
   - name: 'getName'
     description: |
-      Returns the name of the player.<br>
-      Note that on Spigot, Paper and other forks can the name differ from the one cached by AdvancedServerList, if the plugin was able to retrieve an OfflinePlayer instance from the server. On BungeeCord and Velocity will the returned String always be the name from the cache.<br>
-      <br>
-      Name may be whatever has been defined in AdvancedServerList's config.yml, should the player not be cached yet by the plugin.
+      Returns the name of the player.  
+      On BungeeCord and Velocity is the returned value always what AdvancedServerList has cached, while on paper the value may differ, should the plugin be able to obtain a OfflinePlayer instance from the Server.
+      
+      Name may also be whatever has been defined in AdvancedServerList's `unknownPlayer -> name` config.yml Option.
     returns: 'String representing the player''s name'
     type:
       name: String
       type: object
   - name: 'getProtocol'
-    description: |
-      Returns the protocol ID the player is using.<br>
-      The protocol ID is an integer used by Minecraft to determine what version a server or client is running.
+    description: Returns the protocol ID the player is using. The protocol ID is a unique positive integer that is used in Minecraft to determine the Version used by the Client and Server.
     returns: 'Integer representing the protocol version of this player.'
     type:
       name: int
   - name: 'getUUID'
     description: |
-      Returns the unique ID associated with this player.<br>
-      <br>
-      UUID may be whatever has been defined in AdvancedServerList's config.yml, should the player not be cached yet by AdvancedServerList.
+      Returns the unique ID associated with this player.
+      
+      UUID may also be whatever has been defined in AdvancedServerList's `unknownPlayer -> uuid` config.yml Option.
     returns: 'UUID of the player'
     type:
       name: UUID
@@ -32,11 +30,11 @@ methods:
 
 # <api__interface></api__interface> GenericPlayer
 
-A basic interface used to store generic player data to use in placeholder resolving.  
-The different variants of AdvancedServerList implement this into their own class and may provide additional data not available through this interface.
+Interface used by the API to share common information across all platforms.
 
-The following values will always be present, no matter the platform this interface is used on:
+Platform-specific interfaces extending this interface are available and may offer additional features in addition to what this interface is offering.  
+This interface always offers data for the following:
 
-- [Name of the Player](#getname())
-- [Protocol version of the Player](#getprotocol())
-- [UUID of the Player](#getuuid())
+- [Name of the Player](#getname)
+- [Protocol version of the Player](#getprotocol)
+- [UUID of the Player](#getuuid)

docs/api/reference/api/ch.andre601.advancedserverlist.api/objects/genericserver.md

@@ -1,5 +1,5 @@
 ---
-template: api-doc.html
+api: true
 
 methods:
   - name: 'getPlayersOnline'
@@ -24,4 +24,11 @@ methods:
 
 # <api__interface></api__interface> GenericServer
 
-Simple class used to wrap around some generic server data such as online player count, number of total players that can join and the host (IP/Domain) that got pinged by the player.
+Interface used to share common information across all platforms.
+
+Platform-specific interfaces extending this interface are available and may offer additional features in addition to what this interface is offering.  
+This interface always offers data for the following:
+
+- [Players currently online on the Proxy/Server](#getplayersonline)
+- [Max Players allowed to join the Proxy/Server](#getplayersmax)
+- [IP/Domain pinged by the Player](#gethost)

docs/api/reference/api/ch.andre601.advancedserverlist.api/objects/nullbool.md

@@ -1,23 +1,23 @@
 ---
-template: api-doc.html
+api: true
 
 enums:
   - name: 'true'
-    description: 'Boolean value <code>true</code>'
+    description: 'Boolean value `true`'
   - name: 'false'
-    description: 'Boolean value <code>false</code>'
+    description: 'Boolean value `false`'
   - name: 'not_set'
-    description: 'Boolean value <code>null</code>'
+    description: 'Boolean value `null`'
 
 methods:
   - name: 'resolve'
     description: |
-      Returns a NullBool instance based on the provided <code>Boolean</code> value.<br>
-      In case of <code>null</code> being provided will <a href="#not_set"><code>NullBool.NOT_SET</code></a> be returned, otherwise will the corresponding NullBool instance matching the Boolean value be returned.
-    returns: 'NullBool instance based on the provided <code>Boolean</code> value.'
+      Returns a NullBool instance based on the provided `Boolean` value.  
+      In case of `null` being provided will [`NullBool.NOT_SET`](#not_set) be returned, otherwise will the corresponding NullBool instance matching the Boolean value be returned.
+    returns: 'NullBool instance based on the provided `Boolean` value.'
     parameters:
       - name: 'bool'
-        description: 'The <code>Boolean</code> value to receive a NullBool instance for.'
+        description: 'The `Boolean` value to receive a NullBool instance for.'
         type: Boolean
         attributes:
           - nullable
@@ -27,19 +27,19 @@ methods:
       name: 'NullBool'
       type: 'object'
   - name: 'isNotSet'
-    description: 'Returns whether the NullBool is <a href="#not_set"><code>NullBool.NOT_SET</code></a>.'
-    returns: 'True if the instance is <a href="#not_set"><code>NullBool.NOT_SET</code></a>, otherwise false.'
+    description: 'Returns whether the NullBool is [`NullBool.NOT_SET`](#not_set)'
+    returns: 'True if the instance is [`NullBool.NOT_SET`](#not_set), otherwise false.'
     type:
       name: 'boolean'
       type: 'primitive'
   - name: 'getOrDefault'
     description: |
-      Gets the corresponding boolean value associated with the NullBool instance.<br>
-      In the case of NullBool <a href="#isnotset()">not being set</a> will the provided default value be returned.
+      Gets the corresponding boolean value associated with the NullBool instance.  
+      In the case of NullBool [not being set](#isnotset) will the provided default value be returned.
     returns: 'True or false depending on the NullBool instance and the provided default value.'
     parameters:
       - name: 'def'
-        description: 'The default boolean value to return should the NullBool instance be <a href="#not_set"><code>NullBool.NOT_SET</code></a>.'
+        description: 'The default boolean value to return should the NullBool instance be [`NullBool.NOT_SET`](#not_set).'
         type: boolean
     type:
       name: 'boolean'
@@ -48,4 +48,4 @@ methods:
 
 # <api__enum></api__enum> NullBool
 
-Enum used to return a `Boolean` value with a default one should no value be set.
+Enum used to return a [`Boolean`](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html){ target="_blank" rel="noopener" } Value with a fallback, should the boolean be `null`.

docs/api/reference/api/ch.andre601.advancedserverlist.api/placeholderprovider.md

@@ -1,5 +1,5 @@
 ---
-template: api-doc.html
+api: true
 
 constructors:
   - name: 'PlaceholderProvider'
@@ -8,27 +8,27 @@ constructors:
       - name: 'identifier'
         description: 'The identifier to use for the placeholder. Cannot be empty.'
         type: String
-        attribute:
+        attributes:
           - notnull
 
 methods:
   - name: 'parsePlaceholder'
     description: |
-      Method called by AdvancedServerList's StringReplacer class to replace any appearances of <code>${&lt;identifier&gt; &lt;placeholder&gt;}</code> with whatever value a matching PlaceholderProvider may return.<br>
-      <br>
-      Returning <code>null</code> will be treated as an invalid placeholder by the plugin, making it return the placeholder as-is without any changes.
+      Method called by AdvancedServerList's StringReplacer class to replace any appearances of `${<identifier> <placeholder>}` with whatever value a matching PlaceholderProvider may return.
+      
+      Returning `null` will be treated as an invalid placeholder by the plugin, making it return the placeholder as-is without any changes.
     parameters:
       - name: 'placeholder'
         type: String
         description: 'The part of the Placeholder that comes after the identifier and before the closing curly bracket.'
       - name: 'player'
         type: GenericPlayer
-        description: 'The <a href="./../objects/genericplayer/"><code>GenericPlayer</code> instance</a> used.'
+        description: 'The [`GenericPlayer` instance](objects/genericplayer.md) used.'
       - name: 'server'
         type: GenericServer
-        description: 'The <a href="./../objects/genericserver/"><code>GenericServer</code> instance</a> used.'
+        description: 'The [`GenericServer` instance](objects/genericserver.md) used.'
     returns: 'Possibly-parsed or possibly-null String to replace the placeholder with.'
-    attribute:
+    attributes:
       - nullable
       - abstract
     type:
@@ -47,4 +47,4 @@ methods:
 Abstract class that is used to provide your own Placeholder patterns for AdvancedServerList to parse.
 
 In order for your class to be considered a valid PlaceholderProvider will you need to set the `identifier` to a non-null, non-empty value without having any spaces in it.  
-Once set, use [`AdvancedServerListAPI#addPlaceholderProvider(PlaceholderProvider)`](advancedserverlistapi.md#addplaceholderprovider(placeholderprovider)) to register your class for AdvancedServerList to use.
+Once set, use [`AdvancedServerListAPI#addPlaceholderProvider(PlaceholderProvider)`](advancedserverlistapi.md#addplaceholderprovider) to register your class for AdvancedServerList to use.

docs/api/reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md

@@ -1,5 +1,5 @@
 ---
-template: api-doc.html
+api: true
 
 defaults:
   type:
@@ -13,199 +13,199 @@ constructors:
 methods:
   - name: 'extraPlayersCount'
     description: |
-      Sets the value to resolve into a number by AdvancedServerList.<br>
-      Strings not resolving into valid numbers will be treated as this option not being set.<br>
-      <br>
-      This option has no effect when <a href="../#extraplayersenabled()"><code>extraPlayersEnabled</code></a> is set to <a href="../../../objects/nullbool/#false"><code>NullBool.FALSE</code></a> or <a href="../../objects/nullbool/#not_set"><code>NullBool.NOT_SET</code></a>.<br>
-      <br>
-      Set this to <code>null</code> to not alter the max player count. Alternatively <a href="#setextraplayersenabled(nullbool)"><code>disable extra Players</code></a>.
+      Sets the value to resolve into a number by AdvancedServerList.  
+      Strings not resolving into valid numbers will be treated as this option not being set.
+      
+      This option has no effect when [`extraPlayersEnabled()`](index.md#extraplayersenabled) is set to [`NullBool.FALSE`](../../objects/nullbool.md#false) or [`NullBool.NOT_SET`](../../objects/nullbool.md#not_set).
+      
+      Set this to `null` to not alter the max player count. Alternatively [disable extra Players](#extraplayersenabled).
     parameters:
       - name: 'extraPlayersCount'
         description: 'The number of extra players to add.'
         type: 'String'
-        attribute:
+        attributes:
           - 'nullable'
     returns: 'This Builder after the extra player count has been set. Useful for chaining.'
   - name: 'extraPlayersEnabled'
     description: |
-      Sets whether the extra players feature should be enabled or not.<br>
-      <br>
-      Set to <a href="../../../objects/nullbool#not_set"><code>NullBool.NOT_SET</code></a> to not set this.
+      Sets whether the extra players feature should be enabled or not.
+      
+      Set to [`NullBool.NOT_SET`](../../objects/nullbool.md#not_set) to not set this.
     parameters:
       - name: 'extraPlayersEnabled'
         description: 'Whether the extra players feature should be enabled or not.'
         type: 'NullBool'
-        attribute:
+        attributes:
           - 'notnull'
     returns: 'This Builder after the NullBool has been set. Useful for chaining.'
     throws:
       - name: 'IllegalArgumentException'
-        description: Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.
+        description: Thrown by the `CheckUtil` in case `null` has been provided as parameter.
   - name: 'favicon'
     description: |
-      Sets the value to use for the favicon.<br>
+      Sets the value to use for the favicon.  
       The following values are supported:
-      <ul>
-      <li>URL to a valid PNG file.</li>
-      <li>File name (with <code>.png</code> extension) matching a file saved in the favicons folder of AdvancedServerList.</li>
-      <li><code>${player uuid}</code> to display the avatar of the player.
-      </ul>
-      Set to an empty String or <code>null</code> to not alter the Favicon.
+      
+      - URL to a valid PNG file
+      - File name (with `.png` extension) matching a file saved in the favicons folder of AdvancedServerList
+      - `${player uuid}` to display the avatar of the player
+      
+      Set to an empty String or `null` to not alter the Favicon.
     parameters:
       - name: 'favicon'
         description: 'The favicon to set.'
         type: 'String'
-        attribute:
+        attributes:
           - 'nullable'
     returns: 'This Builder after the Favicon has been set. Useful for chaining.'
   - name: 'hidePlayersEnabled'
     description: |
-      Sets whether the player count should be hidden or not.<br>
-      <br>
-      Set to <a href="../../../objects/nullbool#not_set"><code>NullBool.NOT_SET</code></a> to not set this.
+      Sets whether the player count should be hidden or not.
+      
+      Set to [`NullBool.NOT_SET`](../../objects/nullbool.md#not_set) to not set this.
     parameters:
       - name: 'hidePlayersEnabled'
         description: 'Whether the player count should be hidden or not.'
         type: 'NullBool'
-        attribute:
+        attributes:
           - 'notnull'
     returns: 'This Builder after the NullBool has been set. Useful for chaining.'
     throws:
       - name: 'IllegalArgumentException'
-        description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
+        description: 'Thrown by the `CheckUtil` in case `null` has been provided as parameter.'
   - name: 'hidePlayersHoverEnabled'
     description: |
-      Sets ehther the Hover List of online Players should be hidden or not.<br>
-      <br>
-      Set to <a href="../../../objects/nullbool/#not_set"><code>NullBool.NOT_SET</code></a> to not set this.
+      Sets ehther the Hover List of online Players should be hidden or not.
+      
+      Set to [`NullBool.NOT_SET`](../../objects/nullbool.md#not_set) to not set this.
     parameters:
       - name: 'hidePlayersHoverEnabled'
         description: 'Whether the online players feature should be enabled or not.'
         type: 'NullBool'
-        attribute:
+        attributes:
           - 'notnull'
     returns: 'This Builder after the NullBool has been set. Useful for chaining.'
     throws:
       - name: 'IllegalArgumentException'
-        description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
+        description: 'Thrown by the `CheckUtil` in case `null` has been provided as parameter.'
   - name: 'maxPlayersCount'
     description: |
-      Sets the value to resolve into a number by AdvancedServerList.<br>
-      Strings not resolving into valid numbers will be treated as this option not being set.<br>
-      <br>
-      This option has no effect when <a href="#maxplayersenabled(nullbool)">maxPlayersEnabled</a> is set to <a href="../../../objects/nullbool/#false"><code>NullBool.FALSE</code></a> or <a href="../../../objects/nullbool/#not_set"><code>NullBool.NOT_SET</code></a>.<br>
-      <br>
-      Set this to <code>null</code> to not alter the max player count. Alternatively <a href="#maxplayersenabled(nullbool)">disable max Players</a>.
+      Sets the value to resolve into a number by AdvancedServerList.  
+      Strings not resolving into valid numbers will be treated as this option not being set.
+      
+      This option has no effect when [`maxPlayersEnabled(NullBool)`](#maxplayersenabled) is set to [`NullBool.FALSE`](../../objects/nullbool.md#false) or [`NullBool.NOT_SET`](../../objects/nullbool.md#not_set).
+      
+      Set this to `null` to not alter the max player count. Alternatively [disable max Players](#maxplayersenabled).
     parameters:
       - name: 'maxPlayersCount'
         description: 'The number of max players to set.'
         type: 'Integer'
-        attribute:
+        attributes:
           - 'nullable'
     returns: 'This Builder after the max player count has been set. Useful for chaining.'
   - name: 'maxPlayersEnabled'
     description: |
-      Sets whether the max players feature should be enabled.<br>
-      <br>
-      Set to <a href="../../../objects/nullbool/#not_set"><code>NullBool.NOT_SET</code></a> to not set this.<br>
-      <br>
-      An <code>IllegalArgumentException</code> may be thrown by the <code>CheckUtil</code> should maxPlayersEnabled be null.
+      Sets whether the max players feature should be enabled.
+      
+      Set to [`NullBool.NOT_SET`](../../objects/nullbool.md#not_set) to not set this.
+      
+      An `IllegalArgumentException` may be thrown by the `CheckUtil` should maxPlayersEnabled be null.
     parameters:
       - name: 'maxPlayersEnabled'
         description: 'Whether the extra players feature should be enabled or not.'
         type: 'NullBool'
-        attribute:
+        attributes:
           - 'notnull'
     returns: 'This Builder after the NullBool has been set. Useful for chaining.'
     throws:
       - name: 'IllegalArgumentException'
-        description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
+        description: 'Thrown by the `CheckUtil` in case `null` has been provided as parameter.'
   - name: 'motd'
     description: |
-      Sets a new MOTD to use.<br>
-      <br>
-      Set to an empty list to not change the MOTD.<br>
-      Only the first two entries of the list will be considered and any additional ones discarded.<br>
-      <br>
-      An <code>IllegalArgumentException</code> may be thrown by the <code>CheckUtil</code> should the provided motd list be null.
+      Sets a new MOTD to use.
+      
+      Set to an empty list to not change the MOTD.  
+      Only the first two entries of the list will be considered and any additional ones discarded.
+      
+      An `IllegalArgumentException` may be thrown by the `CheckUtil` should the provided motd list be null.
     parameters:
       - name: 'motd'
         description: 'The MOTD to use.'
         type: 'List<String>'
-        attribute:
+        attributes:
           - 'notnull'
     returns: 'This Builder after the motd has been set. Useful for chaining.'
     throws:
       - name: 'IllegalArgumentException'
-        description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
+        description: 'Thrown by the `CheckUtil` in case `null` has been provided as parameter.'
   - name: 'onlinePlayersCount'
     description: |
-      Sets the value to resolve into a number by AdvancedServerList.<br>
-      Strings not resolving into valid numbers will be treated as this option not being set.<br>
-      <br>
-      This option has no effect when <a href="#onlineplayersenabled(nullbool)">maxPlayersEnabled</a> is set to <a href="../../../objects/nullbool/#false"><code>NullBool.FALSE</code></a> or <a href="../../../objects/nullbool/#not_set"><code>NullBool.NOT_SET</code></a>.<br>
-      <br>
-      Set this to <code>null</code> to not alter the online player count. Alternatively <a href="#onlineplayersenabled(nullbool)">disable online Players</a>.
+      Sets the value to resolve into a number by AdvancedServerList.  
+      Strings not resolving into valid numbers will be treated as this option not being set.
+      
+      This option has no effect when [`onlinePlayersEnabled(NullBool)`](#onlineplayersenabled) is set to [`NullBool.FALSE`](../../objects/nullbool.md#false) or [`NullBool.NOT_SET`](../../objects/nullbool.md#not_set).
+      
+      Set this to `null` to not alter the online player count. Alternatively [disable online Players.](#onlineplayersenabled).
     parameters:
       - name: 'onlinePlayersCount'
         description: 'The number of online players to set.'
         type: 'String'
-        attribute:
+        attributes:
           - 'nullable'
     returns: 'This Builder after the max player count has been set. Useful for chaining.'
   - name: 'onlinePlayersEnabled'
     description: |
-      Sets whether the online players feature should be enabled.<br>
-      <br>
-      Set to <a href="../../../objects/nullbool/#not_set"><code>NullBool.NOT_SET</code></a> to not set this.<br>
-      <br>
-      An <code>IllegalArgumentException</code> may be thrown by the <code>CheckUtil</code> should onlinePlayersEnabled be null.
+      Sets whether the online players feature should be enabled.
+      
+      Set to [`NullBool.NOT_SET`](../../objects/nullbool.md#not_set) to not set this.
+      
+      An `IllegalArgumentException` may be thrown by the `CheckUtil` should onlinePlayersEnabled be null.
     parameters:
       - name: 'onlinePlayersEnabled'
         description: 'Whether the extra players feature should be enabled or not.'
         type: 'NullBool'
-        attribute:
+        attributes:
           - 'notnull'
     returns: 'This Builder after the NullBool has been set. Useful for chaining.'
     throws:
       - name: 'IllegalArgumentException'
-        description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
+        description: 'Thrown by the `CheckUtil` in case `null` has been provided as parameter.'
   - name: 'playerCountText'
     description: |
       Sets the text to override the player count with.<br>
       <br>
-      Set to an empty String or <code>null</code> to not alter the player count text.
+      Set to an empty String or `null` to not alter the player count text.
     parameters:
       - name: 'playerCountText'
         description: 'The text to show in the player count.'
         type: 'String'
-        attribute:
+        attributes:
           - 'nullable'
     returns: 'This Builder after the player count text has been set. Useful for chaining.'
   - name: 'players'
     description: |
-      Sets the players (lines) to use for the hover.<br>
-      <br>
+      Sets the players (lines) to use for the hover.
+      
       Set to an empty list to not change the hover text.
-      <br>
-      An <code>IllegalArgumentException</code> may be thrown by the <code>CheckUtil</code> should the provided okayersmotd list be null.
+      
+      An `IllegalArgumentException` may be thrown by the `CheckUtil` should the provided okayersmotd list be null.
     parameters:
       - name: 'players'
         description: 'The lines to set for the hover.'
         type: 'List<String>'
-        attribute:
+        attributes:
           - 'notnull'
     returns: 'This Builder after the players have been set. Useful for chaining.'
     throws:
       - name: 'IllegalArgumentException'
-        description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
+        description: 'Thrown by the `CheckUtil` in case `null` has been provided as parameter.'
   - name: 'build'
-    description: 'Creates a new <a href="./.."><code>ProfileEntry</code> instance</a> with the values set in this Builder.'
-    returns: 'New <a href="./.."><code>ProfileEntry</code> instance</a>.'
+    description: 'Creates a new [`ProfileEntry` instance](index.md) with the values set in this Builder.'
+    returns: 'New [`ProfileEntry` instance](index.md).'
     type:
       name: 'ProfileEntry'
       type: 'object'
-      link: './..'
+      link: 'index.md'
 ---
 
 # <api__class></api__class> Builder

docs/api/reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/index.md

@@ -1,11 +1,11 @@
 ---
-template: api-doc.html
+api: true
 
 constructors:
   - name: 'ProfileEntry'
     description: |
-      Creates a new instance of a ProfileEntry with the given values.<br>
-      It's recommended to use the <a href="./builder/"><code>Builder</code> class</a> for a more convenient configuration of the Settings.
+      Creates a new instance of a ProfileEntry with the given values.  
+      It's recommended to use the [`Builder` class](builder.md) for a more convenient configuration of the Settings.
     parameters:
       - name: 'motd'
         description: 'The MOTD to use.'
@@ -64,32 +64,31 @@ constructors:
           - nullable
     seealso:
       - name: 'ProfileEntry.Builder'
-        link: './builder/'
+        link: 'builder.md'
 
 classes:
   - name: 'Builder'
     description: 'Builder class to create a new ProfileEntry instance.'
     type: 'static class'
-    link: 'builder/'
+    link: 'builder.md'
 
 methods:
   - name: 'empty'
     description: |
-      Creates an "empty" PlayerEntry with the following values set:<br>
-      <ul>
-        <li><a href="#motd()"><code>motd</code></a>: Empty List</li>
-        <li><a href="#players()"><code>players</code></a>: Empty List</li>
-        <li><a href="#playercounttext()"><code>playerCountText</code></a>: Empty String</li>
-        <li><a href="#favicon()"><code>favicon</code></a>: Empty String</li>
-        <li><a href="#hideplayersenabled()"><code>hidePlayersEnabled</code></a>: <a href="../../objects/nullbool/#not_set"><code>NullBool.NOT_SET</code></a></li>
-        <li><a href="#extraplayersenabled()"><code>extraPlayersEnabled</code></a>: <a href="../../objects/nullbool/#not_set"><code>NullBool.NOT_SET</code></a></li>
-        <li><a href="#maxplayersenabled()"><code>maxPlayersEnabled</code></a>: <a href="../../objects/nullbool/#not_set"><code>NullBoo.NOT_SET</code></a></li>
-        <li><a href="#onlineplayersenabled()"><code>onlinePlayersEnabled</code></a>: <a href="../../objects/nullbool/#not_set"><code>NullBoo.NOT_SET</code></a></li>
-        <li><a href="#hideplayershoverenabled()"><code>hidePlayersHoverEnabled</code></a>: <a href="../../objects/nullbool/#not_set"><code>NullBoo.NOT_SET</code></a></li>
-        <li><a href="#extraplayerscount()"><code>extraPlayersCount</code></a>: <code>null</code></li>
-        <li><a href="#maxplayerscount()"><code>maxPlayersCount</code></a>: <code>null</code></li>
-        <li><a href="#onlineplayerscount()"><code>onlinePlayersCount</code></a>: <code>null</code></li>
-      </ul>
+      Creates an "empty" PlayerEntry with the following values set:  
+      
+      - [`motd`](#motd): Empty List
+      - [`players`](#players): Empty List
+      - [`playerCountText`](#playercounttext): Empty String
+      - [`favicon`](#favicon): Empty String
+      - [`hidePlayersEnabled`](#hideplayersenabled): [`NullBool.NOT_SET`](../../objects/nullbool.md#not_set)
+      - [`extraPlayersEnabled`](#extraplayersenabled): [`NullBool.NOT_SET`](../../objects/nullbool.md#not_set)
+      - [`maxPlayersEnabled`](#maxplayersenabled): [`NullBool.NOT_SET`](../../objects/nullbool.md#not_set)
+      - [`onlinePlayersEnabled`](#onlineplayersenabled): [`NullBool.NOT_SET`](../../objects/nullbool.md#not_set)
+      - [`hidePlayersHoverEnabled`](#hideplayershoverenabled): [`NullBool.NOT_SET`](../../objects/nullbool.md#not_set)
+      - [`extraPlayersCount`](#extraplayerscount): `null`
+      - [`maxPlayersCount`](#maxplayerscount): `null`
+      - [`onlinePlayersCount`](#onlineplayerscount): `null`
     returns: 'New ProfileEntry instance with empty/null values defined'
     attributes:
       - static
@@ -98,26 +97,32 @@ methods:
       type: 'object'
   - name: 'copy'
     description: |
-      Creates a copy of this ProfileEntry instance.<br>
-      <br>
-      This is simply a convenience method to not have to call <a href="#builder()"><code>builder()</code></a><code>.</code><a href="./builder/#build()"><code>build()</code></a>.<br>
-      If you want to modify the ProfileEntry <a href="#builder()"><code>builder()</code></a> is preferred.
+      Creates a copy of this ProfileEntry instance.
+      
+      This is a convenience method that avoids using [`builder()`](#builder) first followed by [`ProfileEntry.Builder.build()`](builder.md#build):
+      ```java
+      ProfileEntry entry = ProfileEntry.empty(); // Obtain ProfileEntry
+      
+      // Both do the same
+      ProfileEntry newEntry1 = entry.builder().build();
+      ProfileEntry newEntry2 = entry.copy();
+      ```
     returns: 'A copy of this ProfileEntry instance.'
     seealso:
       - name: 'builder()'
-        link: '#builder()'
+        link: '#builder'
     type:
       name: 'ProfileEntry'
       type: 'object'
   - name: 'builder'
     description: |
-      Creates a <a href="./builder/"><code>Builder</code> instance</a> with the values from this ProfileEntry set.<br>
+      Creates a [`Builder` instance](builder.md) with the values from this ProfileEntry set.  
       Use this method if you would like to modify the ProfileEntry.
-    returns: 'A new <a href="./builder/"><code>Builder</code> instance</a> with the values of this ProfileEntry set.'
+    returns: 'A new [`Builder` instance](builder.md) with the values of this ProfileEntry set.'
     type:
       name: 'Builder'
       type: 'object'
-      link: './builder/'
+      link: 'builder.md'
   - name: 'motd'
     description: 'Gets the currently set MOTD of this ProfileEntry.'
     returns: 'The current MOTD used by this ProfileEntry.'
@@ -138,64 +143,63 @@ methods:
       type: 'object'
   - name: 'favicon'
     description: |
-      Gets the currently set favicon of this ProfileEntry.<br>
+      Gets the currently set favicon of this ProfileEntry.  
       Note that the favicon usually is and supports one of the following options:
-      <ul>
-        <li>URL to a valid PNG file</li>
-        <li>File name (with <code>.png</code> extension) matching a file saved in the favicons folder of AdvancedServerList</li>
-        <li><code>${player uuid}</code> to display the avatar of the player</li>
-      </ul>
+      
+      - URL to a valid PNG file
+      - File name (with `.png` extension) matching a file saved in the favicons folder of AdvancedServerList
+      - `${player uuid}` to display the avatar of the player
     returns: 'The current favicon used by this ProfileEntry.'
     type:
       name: 'String'
       type: 'object'
   - name: 'hidePlayersEnabled'
     description: |
-      Whether the player count should be hidden or not in this ProfileEntry.<br>
-      To get the actual boolean value, append <a href="../../objects/nullbool/#getordefault(boolean)"><code>getOrDefault(boolean)</code></a>.
+      Whether the player count should be hidden or not in this ProfileEntry.  
+      To get the actual boolean value, append [`getOrDefault(boolean)`](../../objects/nullbool.md#getordefault).
     returns: 'Whether the player count should be hidden or not in this ProfileEntry.'
     type:
       name: 'NullBool'
       type: 'object'
-      link: '../../objects/nullbool/'
+      link: '../../objects/nullbool.md'
   - name: 'extraPlayersEnabled'
     description: |
-      Whether the extra players feature should be used or not in this ProfileEntry.<br>
-      To get the actual boolean value, append <a href="../../objects/nullbool/#getordefault(boolean)"><code>getOrDefault(boolean)</code></a>.
+      Whether the extra players feature should be used or not in this ProfileEntry.  
+      To get the actual boolean value, append [`getOrDefault(boolean)`](../../objects/nullbool.md#getordefault).
     returns: 'Whether the extra players feature should be used or not in this ProfileEntry.'
     type:
       name: 'NullBool'
       type: 'object'
-      link: '../../objects/nullbool/'
+      link: '../../objects/nullbool.md'
   - name: 'maxPlayersEnabled'
     description: |
-      Whether the max players feature should be used or not.<br>
-      To get the actual boolean value, append <a href="../../objects/nullbool/#getordefault(boolean)"><code>getOrDefault(boolean)</code></a>.
+      Whether the max players feature should be used or not.  
+      To get the actual boolean value, append [`getOrDefault(boolean)`](../../objects/nullbool.md#getordefault).
     returns: 'Whether the max players feature should be used or not.'
     type:
       name: 'NullBool'
       type: 'object'
-      link: '../../objects/nullbool/'
+      link: '../../objects/nullbool.md'
   - name: 'onlinePlayersEnabled'
     description: |
-      Whether the online players feature should be used or not.<br>
-      To get the actual boolean value, append <a href="../../objects/nullbool/#getordefault(boolean)"><code>getOrDefault(boolean)</code></a>.
+      Whether the online players feature should be used or not.  
+      To get the actual boolean value, append [`getOrDefault(boolean)`](../../objects/nullbool.md#getordefault).
     returns: 'Whether the online players feature should be used or not.'
     type:
       name: 'NullBool'
       type: 'object'
-      link: '../../objects/nullbool/'
+      link: '../../objects/nullbool.md'
   - name: 'hidePlayersHoverEnabled'
     description: |
-      Whether the Hover List of online players should be hidden or not.<br>
-      To get the actual boolean value, use <a href="../../objects/nullbool/#getordefault()"><code>getOrDefault(boolean)</code></a> of the returned <a href="../../objects/nullbool"><code>NullBool</code></a>.<br>
-      <br>
-      When true, this option will force the <a href="#players()"><code>players()</code></a> list to be ignored.
+      Whether the Hover List of online players should be hidden or not.  
+      To get the actual boolean value, append [`getOrDefault(boolean)`](../../objects/nullbool.md#getordefault).
+      
+      When true, this option will force the [`players()`](#players) list to be ignored.
     returns: 'Whether the Hover List of online players should be hidden or not.'
     type:
       name: 'NullBool'
       type: 'object'
-      link: '../../objects/nullbool/'
+      link: '../../objects/nullbool.md'
   - name: 'extraPlayersCount'
     description: 'Gets the currently set number of extra players of this ProfileEntry.'
     returns: 'The current number of extra players used by this ProfileEntry.'
@@ -222,15 +226,15 @@ methods:
       type: 'object'
   - name: 'isInvalid'
     description: |
-      Whether this ProfileEntry is considered invalid or not.<br>
+      Whether this ProfileEntry is considered invalid or not.  
       The ProfileEntry is considered invalid if all the following is true:
-      <ul>
-        <li><a href="#motd()"><code>motd()</code></a> is empty.</li>
-        <li><a href="#players()"><code>players()</code></a> is empty.</li>
-        <li><a href="#playercounttext()"><code>playerCountText()</code></a> is null/empty <b>and</b> <a href="#hideplayersenabled()"><code>hidePlayersEnabled()</code></a> is <code>false</code>.</li>
-        <li><a href="#favicon()"><code>favicon()</code></a> is null/empty.</li>
-      </ul>
-      As long as one of the above is <b>not</b> true is this ProfileEntry considered valid and <code>false</code> will be returned.
+      
+      - [`motd()`](#motd) is empty.
+      - [`players()`](#players) is empty.
+      - [`playerCountText()`](#playercounttext) is null/empty **and** [`hidePlayersEnabled()`](#hideplayersenabled) is `false`.
+      - [`favicon()`](#favicon) is null/empty.
+      
+      As long as one of the above is **not** true is this ProfileEntry considered valid and `false` will be returned.
     returns: 'Whether this ProfileEntry is invalid or not.'
     type:
       name: 'boolean'
@@ -242,4 +246,4 @@ methods:
 This record represents the content found in a server list profile YAML file.  
 The content may come from either the "profiles" list, the options in the file itself (global options) or a mix of both.
 
-This class is immutable. Use [`builder()`](#builder()) to get a [`Builder` instance](builder.md) with the values of this class added.
+This class is immutable. Use [`builder()`](#builder) to get a [`Builder` instance](builder.md) with the values of this class added.

docs/api/reference/platform-bukkit/ch.andre601.advancedserverlist.api.bukkit/events/postserverlistsetevent.md

@@ -1,20 +1,20 @@
 ---
-template: api-doc.html
+api: true
 
 constructors:
   - name: 'PostServerListSetEvent'
     description: 'Constructor for creating a new PostServerListSetEvent instance.'
     parameters:
       - name: 'entry'
-        description: 'The <a href="../../../../api/ch.andre601.advancedserverlist.api/profiles/profileentry/"><code>ProfileEntry</code></a> used during the PingEvent.'
+        description: 'The [`ProfileEntry`](../../../api/ch.andre601.advancedserverlist.api/profiles/profileentry/index.md) used during the PingEvent.'
         type: ProfileEntry
         attribute:
           - nullable
 
 methods:
   - name: 'getHandlerList'
-    description: 'Static <a href="https://hub.spigotmc.org/javadocs/spigot/org/bukkit/event/HandlerList.html" target="_blank" rel="nofollow"><code>HandlerList</code></a> getter. Required by Paper.'
-    returns: 'The static <a href="https://hub.spigotmc.org/javadocs/spigot/org/bukkit/event/HandlerList.html" target="_blank" rel="nofollow"><code>HandlerList instance</code></a> of this event.'
+    description: 'Static [`HandlerList`](https://hub.spigotmc.org/javadocs/spigot/org/bukkit/event/HandlerList.html){ target="_blank" rel="nofollow" } getter. Required by Paper.'
+    returns: 'The static [`HandlerList` instance](https://hub.spigotmc.org/javadocs/spigot/org/bukkit/event/HandlerList.html){ target="_blank" rel="nofollow" } of this event.'
     attributes:
       - static
     type:
@@ -22,9 +22,9 @@ methods:
       type: 'object'
   - name: 'getEntry'
     description: |
-      The <a href="../../../../api/ch.andre601.advancedserverlist.api/profiles/profileentry/"><code>ProfileEntry</code></a> that was used during the PingEvent handling.<br>
-      <br>
-      The returned value may be <code>null</code> should the PingEvent handling be cancelled at any point (i.e. due to an invalid protocol or because the <a href="../preserverlistsetevent/"><code>PreServerListSetEvent</code></a> has been cancelled).<br>
+      The [`ProfileEntry`](../../../api/ch.andre601.advancedserverlist.api/profiles/profileentry/index.md) that was used during the PingEvent handling.
+      
+      The returned value may be `null` should the PingEvent handling be cancelled at any point (i.e. due to an invalid protocol or because the [`PreServerListSetEvent`](preserverlistsetevent.md) has been cancelled).  
       The values within the ProfileEntry also do not represent what is actually used within the Server list itself, but only the values provided for the PingEvent handling.
     returns: 'Possibly-null ProfileEntry used for the PingEvent.'
     attributes:
@@ -32,18 +32,19 @@ methods:
     type:
       name: 'ProfileEntry'
       type: 'object'
-      link: '../../../../api/ch.andre601.advancedserverlist.api/profiles/profileentry/'
+      link: '../../../api/ch.andre601.advancedserverlist.api/profiles/profileentry/index.md'
 
 inherits:
   'org.bukkit.event.Event':
     link: 'https://hub.spigotmc.org/javadocs/spigot/org/bukkit/event/Event.html'
     list:
-      - 'getHandlers()'
+      - name: 'getHandlers()'
+        link: 'getHandlers()'
 ---
 
 # <api__class></api__class> PostServerListSetEvent
 
 Called **after** the plugin has updated the Server List.
 
-The provided [`ProfileEntry`](#getentry()) may be null due to the PingEvent handling being cancelled (i.e. due to a invalid protocol or due to the [`PreServerListSetEvent`](preserverlistsetevent.md) being cancelled).  
+The provided [`ProfileEntry`](#getentry) may be null due to the PingEvent handling being cancelled (i.e. due to a invalid protocol or due to the [`PreServerListSetEvent`](preserverlistsetevent.md) being cancelled).  
 The entry also only represents the values used during the PingEvent, not the actual content that is being displayed.

docs/api/reference/platform-bukkit/ch.andre601.advancedserverlist.api.bukkit/events/preserverlistsetevent.md

@@ -1,5 +1,5 @@
 ---
-template: api-doc.html
+api: true
 
 constructors:
   - name: 'PreServerListSetEvent'
@@ -9,7 +9,7 @@ constructors:
 
 methods:
   - name: 'getHandlerList'
-    returns: 'Static <code>HandlerList</code> instance.'
+    returns: 'Static `HandlerList` instance.'
     attributes:
       - static
     type:
@@ -18,19 +18,24 @@ methods:
 
 inherits:
   'ch.andre601.advancedserverlist.api.events.GenericServerListEvent':
-    link: '../../../../api/ch.andre601.advancedserverlist.api/events/genericserverlistevent/'
+    link: '../../../api/ch.andre601.advancedserverlist.api/events/genericserverlistevent.md'
     list:
-      - 'getEntry()'
-      - 'setEntry(ProfileEntry)'
-      - 'isCancelled()'
-      - 'setCancelled(boolean)'
+      - name: 'getEntry()'
+        link: 'getentry'
+      - name: 'setEntry(ProfileEntry)'
+        link: 'setentry'
+      - name: 'isCancelled()'
+        link: 'iscancelled'
+      - name: 'setCancelled(boolean)'
+        link: 'setcancelled'
   'org.bukkit.event.Event':
     link: 'https://hub.spigotmc.org/javadocs/spigot/org/bukkit/event/Event.html'
     list:
-      - 'getHandlers()'
+      - name: 'getHandlers()'
+        link: 'getHandlers()'
 ---
 
 # <api__class></api__class> PreServerListSetEvent
 
 Called **before** AdvancedServerList modifies the server list.  
-The provided [`ProfileEntry`](../../../api/ch.andre601.advancedserverlist.api/events/genericserverlistevent.md#getentry()) will be the one used for the server list.
+The provided [`ProfileEntry`](../../../api/ch.andre601.advancedserverlist.api/events/genericserverlistevent.md#getentry) will be the one used for the server list.

docs/api/reference/platform-bukkit/ch.andre601.advancedserverlist.api.bukkit/objects/bukkitplayer.md

@@ -1,5 +1,5 @@
 ---
-template: api-doc.html
+api: true
 
 methods:
   - name: 'getPlayer'
@@ -10,24 +10,24 @@ methods:
       type: 'object'
   - name: 'hasPlayedBefore'
     description: |
-      Returns whether this player has played on the server before.<br>
-      <br>
+      Returns whether this player has played on the server before.
+      
       The returned boolean may be inaccurate if AdvancedServerList was unable to obtain a valid OfflinePlayer instance.
     returns: 'Boolean indicating whether this player has played on the server before.'
     type:
       name: 'boolean'
   - name: 'isBanned'
     description: |
-      Returns whether this player has been banned from the server.<br>
-      <br>
+      Returns whether this player has been banned from the server.
+      
       The returned boolean may be inaccurate if AdvancedServerList was unable to obtain a valid OfflinePlayer instance.
     returns: 'Boolean indicating whether this player has been banned from the server.'
     type:
       name: 'boolean'
   - name: 'isWhitelisted'
     description: |
-      Returns whether this player is whitelisted on the server.<br>
-      <br>
+      Returns whether this player is whitelisted on the server.
+      
       The returned boolean may be inaccurate if AdvancedServerList was unable to obtain a valid OfflinePlayer instance.
     returns: 'Boolean indicating whether this player is whitelisted on the server.'
     type:
@@ -35,16 +35,19 @@ methods:
 
 inherits:
   'ch.andre601.advancedserverlist.api.objects.GenericPlayer':
-    link: '../../../../api/ch.andre601.advancedserverlist.api/objects/genericplayer/'
+    link: '../../../api/ch.andre601.advancedserverlist.api/objects/genericplayer.md'
     list:
-      - 'getName()'
-      - 'getProtocol()'
-      - 'getUUID()'
+      - name: 'getName()'
+        link: 'getname'
+      - name: 'getProtocol()'
+        link: 'getprotocol'
+      - name: 'getUUID()'
+        link: 'getuuid'
 ---
 
 # <api__interface></api__interface> BukkitPlayer
 
 [`GenericPlayer` instance](../../../api/ch.andre601.advancedserverlist.api/objects/genericplayer.md) for the SpigotMC/Paper server implementation of AdvancedServerList.  
-This interface includes a [`OfflinePlayer` instance](#getplayer()) obtained from the server the plugin runs on alongside some getters to get if the player [has played on the server before](#hasplayedbefore()), [is banned](#isbanned()) or [is whitelisted](#iswhitelisted()). These options actually require a proper OfflinePlayer instance to be present or will otherwise default to `false`.
+This interface includes a [`OfflinePlayer` instance](#getplayer) obtained from the server the plugin runs on alongside some getters to get if the player [has played on the server before](#hasplayedbefore), [is banned](#isbanned) or [is whitelisted](#iswhitelisted). These options actually require a proper OfflinePlayer instance to be present or will otherwise default to `false`.
 
 This class is useful for cases where you want to use the OfflinePlayer. Simply cast the GenericPlayer instance to a SpigotPlayer (Granted that it actually is an instance of it to begin with).