Fix cloud-paper not being compiled into project

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

.forgejo/workflows/deploy_wiki.yml

@@ -0,0 +1,43 @@
+name: "Deploy Wiki"
+
+on:
+  push:
+    branches:
+      - master
+    tags-ignore:
+      - "**"
+    paths:
+      - ".forgejo/workflows/deploy_wiki.yml"
+      - "docs/**"
+      - "domains"
+      - "mkdocs.yml"
+      - "requirements.txt"
+
+jobs:
+  deployWiki:
+    runs-on: codeberg-tiny
+    steps:
+      - name: "Checkout Source Repository"
+        uses: https://code.forgejo.org/actions/checkout@v4
+        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
+        with:
+          python-version: 3.x
+      - name: "Install Dependencies"
+        run: "pip install -r requirements.txt"
+      - name: "Build Website"
+        run: "mkdocs build"
+      - name: "Commit and Push"
+        run: |
+          git config --global user.email "andre_601-bot@noreply.codeberg.org"
+          git config --global user.name "ASL Wiki Builder"
+          mv domains site/.domains
+          cd site
+          git remote set-url origin https://${{ secrets.BOT_TOKEN }}@codeberg.org/Andre601/asl-docs
+          git add --all
+          git commit -m "Update Wiki ($( env TZ=Europe/Zurich date +"%d.%m.%Y %Z" ))"
+          git push

.forgejo/workflows/pr_preview.yml

@@ -0,0 +1,116 @@
+name: Pull Request Preview
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - reopened
+      - synchronize
+    paths:
+      - ".forgejo/workflows/pr_preview.yml"
+      - "docs/**"
+      - "mkdocs.yml"
+      - "preview_domains"
+      - "requirements.txt"
+  workflow_dispatch:
+
+env:
+  BRANCH_NAME: "${{ github.event.repository.name }}/${{ github.event.pull_request.number }}"
+  RUN_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_number }}"
+
+jobs:
+  createPreview:
+    runs-on: codeberg-tiny
+    steps:
+      #
+      # Finding and updating comment in Pull request.
+      # If not found, have one created instead.
+      #
+      - name: "Find Comment"
+        id: find-comment
+        uses: https://github.com/peter-evans/find-comment@v3
+        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
+        with:
+          body: |-
+            ## Pull request Preview
+
+            Creating Preview for Pull request. Please wait...
+          comment-id: "${{ steps.find-comment.outputs.comment-id }}"
+          issue-number: "${{ github.event.pull_request.number }}"
+          token: "${{ secrets.BOT_TOKEN }}"
+          edit-mode: replace
+      #
+      # Setup source and target repository.
+      # Build website and push.
+      #
+      - name: "Checkout Source Repository"
+        uses: https://code.forgejo.org/actions/checkout@v4
+        with:
+          token: ${{ secrets.BOT_TOKEN }}
+          fetch-depth: 0
+          ref: "${{ github.event.pull_request.head.sha }}"
+      - name: "Checkout Target Repository"
+        run: |
+          git clone https://codeberg.org/Andre601/preview site
+          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
+        with:
+          python-version: 3.x
+      - name: "Install Dependencies"
+        run: "pip install -r requirements.txt"
+      - name: "Build Website"
+        run: "mkdocs build"
+      - name: "Commit and Push"
+        run: |
+          git config --global user.email "andre_601-bot@noreply.codeberg.org"
+          git config --global user.name "PR Docs Preview Builder"
+          mv preview_domains site/.domains
+          cd site
+          git remote add upstream https://${{ secrets.BOT_TOKEN }}@codeberg.org/Andre601/preview.git
+          git add --all
+          git commit -m "Update Preview for ${{ env.BRANCH_NAME }} ($( env TZ=Europe/Zurich date +"%d.%m.%Y %Z" ))"
+          git push --set-upstream upstream ${{ env.BRANCH_NAME }} -f
+      #
+      # Update comment on success or failure.
+      #
+      - name: "Comment Success"
+        uses: https://github.com/peter-evans/create-or-update-comment@v4
+        with:
+          body: |-
+            ## Pull request Preview
+
+            Pull request Preview created successfully!
+
+            | Name    | Link                                                                                                     |
+            |---------|----------------------------------------------------------------------------------------------------------|
+            | Commit  | ${{ github.event.pull_request.head.sha }}                                                                |
+            | Preview | https://preview.andre601.ch/@${{ github.event.repository.name }}~${{ github.event.pull_request.number }} |
+            | Logs    | ${{ env.RUN_URL }}                                                                                       |
+          comment-id: "${{ steps.comment.outputs.comment-id }}"
+          issue-number: "${{ github.event.pull_request.number }}"
+          token: "${{ secrets.BOT_TOKEN }}"
+          edit-mode: replace
+      - name: "Comment Failure"
+        if: ${{ failure() }}
+        uses: https://github.com/peter-evans/create-or-update-comment@v4
+        with:
+          body: |-
+            ## Pull request Preview
+
+            Pull request Preview failed! Check the logs for details.
+
+            | Name    | Link                                      |
+            |---------|-------------------------------------------|
+            | Commit  | ${{ github.event.pull_request.head.sha }} |
+            | Logs    | ${{ RUN_URL }}                            |
+          comment-id: "${{ steps.comment.outputs.comment-id }}"
+          issue-number: "${{ github.event.pull_request.number }}"
+          token: "${{ secrets.BOT_TOKEN }}"
+          edit-mode: replace

.gitea/assets/MODRINTH.md

@@ -98,6 +98,6 @@ Spanish Video by Ajneb97
   <img src="https://wsrv.nl/?url=https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/social/revolt-singular_vector.svg&h=48" alt="revolt" title="Join my Revolt Server">
 </a>
 <br>
-<a href="https://blobfox.coffee/@andre_601" target="_blank">
+<a href="https://swiss.social/@andre_601" target="_blank">
   <img src="https://wsrv.nl/?url=https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/social/mastodon-singular_vector.svg&h=48" alt="revolt" title="Chat with me on Mastodon">
 </a>

.woodpecker/pr_preview.yml.disabled

@@ -11,7 +11,7 @@ variables:
 
 steps:
   - name: "Clone Preview Repository"
-    image: alpine:3.18.4
+    image: alpine:3.20.3
     commands:
       - chmod -R a+w .
       - <<: *setup_git
@@ -24,7 +24,7 @@ steps:
     settings:
       pip_install_file: requirements.txt
   - name: "Commit and Push"
-    image: alpine:3.18.4
+    image: alpine:3.20.3
     secrets:
       - bot_token
     commands:

.woodpecker/publish_assets.yml

@@ -4,21 +4,23 @@ when:
 
 steps:
   - name: "Build Jar and Upload"
-    image: maven:3.9.8-eclipse-temurin-21
-    secrets:
-      - modrinth_api_token
-      - hangar_api_token
-      - discord_webhook_url
+    image: maven:3.9.9-eclipse-temurin-21
     environment:
       CODEBERG_API_TOKEN:
         from_secret: cb_token
+      MODRINTH_API_TOKEN:
+        from_secret: modrinth_api_token
+      HANGAR_API_TOKEN:
+        from_secret: hangar_api_token
+      DISCORD_WEBHOOK_URL:
+        from_secret: discord_webhook_url
     commands:
       - mvn clean install
       - cd version-uploader/target
       - mv VersionUploader.jar ../../
       - cd ../../
       - java -jar VersionUploader.jar --all
-  - name: "Upload Jars to Codeber"
+  - name: "Upload Jars to Codeberg"
     image: woodpeckerci/plugin-gitea-release
     settings:
       base_url: https://codeberg.org
@@ -34,7 +36,7 @@ steps:
     when:
       - status: ["success"]
     settings:
-      server_url: https://blobfox.coffee
+      server_url: https://swiss.social
       access_token:
         from_secret: mastodon_token
       status: |-

.woodpecker/publish_docs.yml.disabled

@@ -12,7 +12,7 @@ variables:
 
 steps:
   - name: "Clone target Repository"
-    image: alpine:3.18.4
+    image: alpine:3.20.3
     commands:
       - chmod -R a+w .
       - <<: *setup_git
@@ -23,7 +23,7 @@ steps:
     settings:
       pip_install_file: requirements.txt
   - name: "Commit and Push"
-    image: alpine:3.18.4
+    image: alpine:3.20.3
     secrets:
       - bot_token
     commands:

README.md

@@ -86,6 +86,9 @@ Below can you find a collection of videos made for my plugin. If you made a vide
 <details><summary>Click to show/hide Videos</summary>
 <p>
 
+English Video by KasaiSora  
+[![video thumbnail](https://img.youtube.com/vi/9cU0uUWHOO0/0.jpg)](https://youtube.com/watch?v=9cU0uUWHOO0)
+
 Spanish Video by Ajneb97  
 [![video thumbnail](https://img.youtube.com/vi/rIbljm_4HVI/0.jpg)](https://youtube.com/watch?v=rIbljm_4HVI)
 
@@ -108,6 +111,6 @@ Spanish Video by Ajneb97
   <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/social/revolt-singular_vector.svg" height="48" alt="revolt" title="Join my Revolt Server">
 </a>
 <br>
-<a href="https://blobfox.coffee/@andre_601" target="_blank">
+<a href="https://swiss.social/@andre_601" target="_blank">
   <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/social/mastodon-singular_vector.svg" height="48" alt="revolt" title="Chat with me on Mastodon">
 </a>

SECURITY.md

@@ -0,0 +1,60 @@
+# Supported Versions
+
+To ensure proper safety and support are only certain versions and Platforms of AdvancedServerList maintained and supported.
+
+## Supported Plugin Versions
+
+| Major Version | Supported |
+|---------------|-----------|
+| v5            | Yes       |
+| v4            | Yes*      |
+| v3            | No**      |
+| v2            | No        |
+| v1            | No        |
+
+\*Only receives support but no updates or bug fixes.  
+\*\*Support ended on December 31st, 2024.
+
+## Supported Server/Proxy Versions
+
+| Server/Proxy Version* | Supported |
+|-----------------------|-----------|
+| 1.21.x                | Yes       |
+| 1.20.x                | Yes       |
+| 1.19.x                | No        |
+| 1.18.x                | No        |
+| 1.17.x                | No        |
+| 1.16.x                | No        |
+| 1.15.x                | No        |
+| 1.14.x                | No        |
+| 1.13.x                | No        |
+| 1.12.x                | No        |
+| 1.11.x                | No        |
+| 1.10.x                | No        |
+| 1.19.x                | No        |
+| 1.8.x                 | No        |
+
+\*Only the latest patch version is actively supported should "Supported" have "Yes".
+
+## Supported Platforms
+
+### Servers
+
+| Server | Supported |
+|--------|-----------|
+| Spigot | No        |
+| Paper  | Yes       |
+| Purpur | Yes*      |
+| Mohist | No        |
+
+\*Support hasn't actively been tested, but should work without issues.
+
+### Proxies
+
+| Proxy      | Supported |
+|------------|-----------|
+| BungeeCord | Yes**     |
+| Waterfall  | Yes**     |
+| Velocity   | Yes       |
+
+\*\*Platform version of this plugin is maintenance only, not receiving any bug fixes for major breaking changes anymore.

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>
     
@@ -99,7 +99,7 @@
         <dependency>
             <groupId>space.arim.libertybans</groupId>
             <artifactId>bans-api</artifactId>
-            <version>1.1.0-RC1</version>
+            <version>1.1.0-SNAPSHOT</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/banplugins/src/main/java/ch/andre601/advancedserverlist/banplugins/providers/AdvancedBanProvider.java

@@ -31,32 +31,10 @@ import com.google.common.primitives.UnsignedLongs;
 import me.leoko.advancedban.manager.PunishmentManager;
 import me.leoko.advancedban.utils.Punishment;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.UUID;
 
 public class AdvancedBanProvider implements PunishmentProvider{
     
-    private static PunishmentManager getAPI(){
-        return PunishmentManager.get();
-    }
-    
-    private static String noDashesUUID(UUID uuid){
-        return hexString(uuid.getMostSignificantBits()) + hexString(uuid.getLeastSignificantBits());
-    }
-    
-    private static Punishment mute(GenericPlayer player){
-        return getAPI().getMute(noDashesUUID(player.getUUID()));
-    }
-    
-    private static Punishment ban(GenericPlayer player){
-        return getAPI().getBan(noDashesUUID(player.getUUID()));
-    }
-    
-    private static String hexString(long unsigned){
-        return Strings.padStart(UnsignedLongs.toString(unsigned, 16), 16, '0');
-    }
-    
     @Override
     public String muted(GenericPlayer player){
         return String.valueOf(getAPI().isMuted(noDashesUUID(player.getUUID())));
@@ -136,4 +114,24 @@ public class AdvancedBanProvider implements PunishmentProvider{
         
         return ban.getDuration(fromStart);
     }
+    
+    private PunishmentManager getAPI(){
+        return PunishmentManager.get();
+    }
+    
+    private String noDashesUUID(UUID uuid){
+        return hexString(uuid.getMostSignificantBits()) + hexString(uuid.getLeastSignificantBits());
+    }
+    
+    private Punishment mute(GenericPlayer player){
+        return getAPI().getMute(noDashesUUID(player.getUUID()));
+    }
+    
+    private Punishment ban(GenericPlayer player){
+        return getAPI().getBan(noDashesUUID(player.getUUID()));
+    }
+    
+    private String hexString(long unsigned){
+        return Strings.padStart(UnsignedLongs.toString(unsigned, 16), 16, '0');
+    }
 }

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

@@ -2,7 +2,7 @@ name: 'ASLBanPluginsAddon'
 author: 'Andre_601'
 version: '${plugin.version}'
 
-main: 'ch.andre601.advancedserverlist.banplugins.paper.AdvancedBanPlaceholders'
+main: 'ch.andre601.advancedserverlist.banplugins.paper.PaperBanPluginsAddon'
 
 api-version: '1.19'
 
@@ -11,7 +11,7 @@ dependencies:
     AdvancedServerList:
       required: false
       load: BEFORE
-    AdvancedBans:
+    AdvancedBan:
       required: false
       load: BEFORE
     LibertyBans:

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>
@@ -49,6 +50,10 @@
             <id>sonatype</id>
             <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
         </repository>
+        <repository>
+            <id>repo-sayandevelopment</id>
+            <url>https://repo.sayandev.org/releases/</url>
+        </repository>
     </repositories>
     
     <dependencies>
@@ -69,14 +74,14 @@
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-api</artifactId>
-            <version>1.20-R0.2</version>
+            <version>1.21-R0.1-SNAPSHOT</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.1-SNAPSHOT</version>
             <type>javadoc</type>
             <scope>provided</scope>
         </dependency>
@@ -105,7 +110,7 @@
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bungeecord</artifactId>
-            <version>3.0.2</version>
+            <version>3.1.0</version>
             <scope>compile</scope>
         </dependency>
         
@@ -124,6 +129,18 @@
             <version>2.9.0-4</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.sayandev</groupId>
+            <artifactId>sayanvanish-api</artifactId>
+            <version>1.6.4</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.sayandev</groupId>
+            <artifactId>sayanvanish-proxy-bungeecord</artifactId>
+            <version>1.6.4</version>
+            <scope>provided</scope>
+        </dependency>
         
         <!-- Other -->
         <dependency>
@@ -132,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>
@@ -143,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>
                 <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,14 +25,16 @@
 
 package ch.andre601.advancedserverlist.bungeecord;
 
-import ch.andre601.advancedserverlist.bungeecord.commands.CmdAdvancedServerList;
-import ch.andre601.advancedserverlist.bungeecord.listeners.JoinEvent;
-import ch.andre601.advancedserverlist.bungeecord.listeners.PingEvent;
+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.profiles.handlers.FaviconHandler;
 import com.alessiodp.libby.BungeeLibraryManager;
@@ -40,37 +42,47 @@ import com.alessiodp.libby.Library;
 import de.myzelyam.api.vanish.BungeeVanishAPI;
 import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
 import net.md_5.bungee.api.Favicon;
+import net.md_5.bungee.api.ServerPing;
 import net.md_5.bungee.api.config.ServerInfo;
 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;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
 
 public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
     
     private final PluginLogger logger = new BungeeLogger(this);
+    private final Map<String, ServerPing> fetchedServers = new ConcurrentHashMap<>();
     
     private boolean successfulLoad = false;
     
     private AdvancedServerList<Favicon> core;
     private FaviconHandler<Favicon> faviconHandler = null;
     private BungeeAudiences audiences = null;
+    private BungeeCommandManagerInterface handler;
     
     private BungeeLibraryManager libraryManager = null;
     
     @Override
     public void onLoad(){
-        logger.info("Loading libraries. This may take a while...");
+        // Using getLogger() here, because PluginLogger requires MiniMessage, which isn't loaded at this stage.
+        getLogger().info("Loading libraries. This may take a while...");
         successfulLoad = loadLibs();
         if(successfulLoad){
-            logger.info("Library loading completed successfully!");
+            getLogger().info("Library loading completed successfully!");
         }else{
-            logger.warn("Library loading completed with errors!");
+            getLogger().warning("Library loading completed with errors!");
         }
     }
     
@@ -78,28 +90,27 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
     public void onEnable(){
         if(!successfulLoad){
             logger.warn("There were issues during the plugins Loading-phase! Please see the console for possible reasons.");
-            logger.warn("The plugin won't be enabled to avoid problems.");
+            logger.warn("Aborting further enabling of the plugin to avoid errors.");
             return;
         }
         
         this.audiences = BungeeAudiences.create(this);
-        this.core = AdvancedServerList.init(this, BungeePlayerPlaceholders.init(), BungeeServerPlaceholders.init(this));
+        this.handler = new BungeeCommandManagerInterface(this);
+        this.core = AdvancedServerList.init(this,
+            BungeePlayerPlaceholders.init(), BungeeServerPlaceholders.init(this), BungeeProxyPlaceholders.init(this));
     }
     
     @Override
     public void onDisable(){
         core.disable();
-    }
-    
-    @Override
-    public void loadCommands(){
-        getProxy().getPluginManager().registerCommand(this, new CmdAdvancedServerList(this));
+        getProxy().getScheduler().cancel(this);
+        audiences.close();
     }
     
     @Override
     public void loadEvents(){
-        new JoinEvent(this);
-        new PingEvent(this);
+        new PlayerJoinEventListener(this);
+        new ProxyPingEventListener(this);
     }
     
     @Override
@@ -140,6 +151,11 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
         libraryManager.loadLibrary(lib);
     }
     
+    @Override
+    public void startScheduler(){
+        getProxy().getScheduler().schedule(this, this::fetchServers, 0, 10, TimeUnit.SECONDS);
+    }
+    
     @Override
     public AdvancedServerList<Favicon> getCore(){
         return core;
@@ -163,6 +179,11 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
         return faviconHandler;
     }
     
+    @Override
+    public CommandManager<CmdSender> getCommandManager(){
+        return handler.commandHandler();
+    }
+    
     @Override
     public String getPlatformInfo(){
         return getProxy().getName() + " " + getProxy().getVersion();
@@ -193,11 +214,18 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
         // Exclude players when PremiumVanish is enabled and player is hidden.
         if(getProxy().getPluginManager().getPlugin("PremiumVanish") != null){
             players.removeIf(BungeeVanishAPI::isInvisible);
+        }else // Do the same if SayanVanish is enabled.
+        if(getProxy().getPluginManager().getPlugin("SayanVanish") != null){
+            players.removeIf(player -> SayanVanishBungeeAPI.getInstance().isVanished(player.getUniqueId()));
         }
         
         return players.size();
     }
     
+    public Map<String, ServerPing> getFetchedServers(){
+        return fetchedServers;
+    }
+    
     private boolean loadLibs(){
         try{
             if(libraryManager == null){
@@ -209,8 +237,18 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
             
             return true;
         }catch(Exception ex){
-            logger.warn("Encountered an Exception while trying to load dependencies.", ex);
+            getLogger().log(Level.WARNING, "Encountered an Exception while trying to load dependencies.", ex);
             return false;
         }
     }
+    
+    private void fetchServers(){
+        fetchedServers.clear();
+        getProxy().getServers().forEach((name, server) -> server.ping((ping, throwable) -> {
+            if(throwable != null)
+                return;
+            
+            fetchedServers.put(name, ping);
+        }));
+    }
 }

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

@@ -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,27 +20,41 @@
  * 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 net.kyori.adventure.platform.bungeecord.BungeeAudiences;
+import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
+import ch.andre601.advancedserverlist.core.interfaces.commands.CommandManagerInterface;
 import net.md_5.bungee.api.CommandSender;
-import net.md_5.bungee.api.plugin.Command;
+import org.incendo.cloud.CommandManager;
+import org.incendo.cloud.SenderMapper;
+import org.incendo.cloud.bungee.BungeeCommandManager;
+import org.incendo.cloud.execution.ExecutionCoordinator;
 
-public class CmdAdvancedServerList extends Command{
+public class BungeeCommandManagerInterface implements CommandManagerInterface<CommandSender>{
     
     private final BungeeCordCore plugin;
     
-    public CmdAdvancedServerList(BungeeCordCore plugin){
-        super("advancedserverlist", "advancedserverlist.command.asl", "asl");
+    public BungeeCommandManagerInterface(BungeeCordCore plugin){
         this.plugin = plugin;
     }
     
     @Override
-    public void execute(CommandSender sender, String[] args){
-        plugin.getCore().getCommandHandler().handle(new BungeeCmdSender(sender, plugin.getAudiences()), args);
+    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.getAudiences()),
+            sender -> ((BungeeCmdSender)sender).sender()
+        );
     }
 }

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

@@ -79,6 +79,11 @@ public class BungeeEventWrapper implements GenericEventWrapper<Favicon, BungeePl
         ping.getPlayers().setMax(maxPlayers);
     }
     
+    @Override
+    public void setOnlinePlayers(int onlinePlayers){
+        ping.getPlayers().setOnline(onlinePlayers);
+    }
+    
     @Override
     public void setMotd(Component component){
         ping.setDescriptionComponent(new TextComponent(BungeeComponentSerializer.get().serialize(component)));
@@ -102,6 +107,7 @@ public class BungeeEventWrapper implements GenericEventWrapper<Favicon, BungeePl
         for(int i = 0; i < players.length; i++){
             String parsed = ComponentParser.text(lines.get(i))
                 .modifyText(text -> StringReplacer.replace(text, player, server))
+                .modifyText(text -> parsePAPIPlaceholders(text, player))
                 .toString();
             
             ServerPing.PlayerInfo pi = new ServerPing.PlayerInfo(parsed, UUID.randomUUID());
@@ -112,6 +118,11 @@ public class BungeeEventWrapper implements GenericEventWrapper<Favicon, BungeePl
             ping.getPlayers().setSample(players);
     }
     
+    @Override
+    public void setPlayersHidden(){
+        ping.getPlayers().setSample(new ServerPing.PlayerInfo[0]);
+    }
+    
     @Override
     public void setFavicon(Favicon favicon){
         ping.setFavicon(favicon);

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 JoinEvent implements Listener{
+public class PlayerJoinEventListener implements Listener{
     private final BungeeCordCore plugin;
     
-    public JoinEvent(BungeeCordCore plugin){
+    public PlayerJoinEventListener(BungeeCordCore plugin){
         this.plugin = plugin;
         plugin.getProxy().getPluginManager().registerListener(plugin, this);
     }

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 PingEvent implements Listener{
+public class ProxyPingEventListener implements Listener{
     
     private final BungeeCordCore plugin;
     
-    public PingEvent(BungeeCordCore plugin){
+    public ProxyPingEventListener(BungeeCordCore plugin){
         this.plugin = plugin;
         plugin.getProxy().getPluginManager().registerListener(plugin, this);
     }

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/logging/BungeeLogger.java

@@ -27,6 +27,7 @@ package ch.andre601.advancedserverlist.bungeecord.logging;
 
 import ch.andre601.advancedserverlist.bungeecord.BungeeCordCore;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
+import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -55,21 +56,21 @@ public class BungeeLogger implements PluginLogger{
     
     @Override
     public void info(String msg, Object... args){
-        logger.info(String.format(msg, args));
+        logger.info(ComponentParser.textFormatted(msg, args).toStringStriped());
     }
     
     @Override
     public void warn(String msg, Object... args){
-        logger.warning(String.format(msg, args));
+        logger.warning(ComponentParser.textFormatted(msg, args).toStringStriped());
     }
     
     @Override
     public void warn(String msg, Throwable throwable){
-        logger.log(Level.WARNING, msg, throwable);
+        logger.log(Level.WARNING, ComponentParser.text(msg).toStringStriped(), throwable);
     }
     
     @Override
     public void warn(String msg, Throwable throwable, Object... args){
-        logger.log(Level.WARNING, String.format(msg, args), throwable);
+        logger.log(Level.WARNING, ComponentParser.textFormatted(msg, args).toStringStriped(), throwable);
     }
 }

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

@@ -30,21 +30,11 @@ import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
 
 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();
-    }
+public record BungeePlayerImpl(CachedPlayer player, int protocol) implements BungeePlayer{
     
     @Override
     public String getName(){
-        return name;
+        return player.name();
     }
     
     @Override
@@ -54,6 +44,6 @@ public class BungeePlayerImpl implements BungeePlayer{
     
     @Override
     public UUID getUUID(){
-        return uuid;
+        return player.uuid();
     }
 }

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

@@ -0,0 +1,61 @@
+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 ch.andre601.advancedserverlist.bungeecord.BungeeCordCore;
+import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
+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;
+
+public class BungeeProxyPlaceholders extends PlaceholderProvider{
+    
+    private final BungeeCordCore plugin;
+    
+    private BungeeProxyPlaceholders(BungeeCordCore plugin){
+        super("proxy");
+        
+        this.plugin = plugin;
+    }
+    
+    public static BungeeProxyPlaceholders init(BungeeCordCore plugin){
+        return new BungeeProxyPlaceholders(plugin);
+    }
+    
+    @Override
+    public 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]);
+        
+        return switch(args[0]){
+            case "status" -> ping == null ? "offline" : "online";
+            case "motd" -> {
+                if(ping == null)
+                    yield "none";
+                
+                BaseComponent[] components = new BaseComponent[]{ping.getDescriptionComponent()};
+                Component component = BungeeComponentSerializer.get().deserialize(components);
+                
+                yield ComponentParser.toMMString(component);
+            }
+            case "players" -> {
+                if(ping == null)
+                    yield "0";
+                
+                yield String.valueOf(ping.getPlayers().getOnline());
+            }
+            case "maxPlayers" -> {
+                if(ping == null)
+                    yield "0";
+                
+                yield String.valueOf(ping.getPlayers().getMax());
+            }
+            default -> null;
+        };
+    }
+}

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

@@ -79,18 +79,18 @@ public class BungeeServerPlaceholders extends PlaceholderProvider{
             case "playersMax" -> {
                 // ServerInfo doesn't provide the max players that could join, so we won't allow an extra argument
                 if(args.length >= 2)
-                    yield null;
+                    yield "";
                 
                 yield String.valueOf(proxy.getPlayersMax());
             }
             case "host" -> {
                 if(args.length > 2)
-                    yield null;
+                    yield "";
                 
                 if(args.length == 2 && args[1] != null && !args[1].isEmpty()){
                     ServerInfo info = proxy.getServers().get(args[1]);
                     if(info == null)
-                        yield null;
+                        yield "";
                     
                     yield String.valueOf(((InetSocketAddress)info.getSocketAddress()).getHostString());
                 }

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>5</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>8</plugin.config.version>
     </properties>
     
     <repositories>
@@ -77,9 +79,11 @@
         <dependency>
             <groupId>ch.andre601</groupId>
             <artifactId>expressionparser</artifactId>
-            <version>1.4.3</version>
+            <version>1.6.0</version>
             <scope>compile</scope>
         </dependency>
+        
+        <!-- Configuration -->
         <dependency>
             <groupId>org.spongepowered</groupId>
             <artifactId>configurate-yaml</artifactId>
@@ -117,7 +121,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.11.0</version>
+            <version>2.12.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -129,15 +133,33 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>33.2.1-jre</version>
+            <version>33.4.0-jre</version>
             <scope>provided</scope>
         </dependency>
+        <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>
         
         <!-- Plugins -->
         <dependency>
             <groupId>net.william278</groupId>
             <artifactId>papiproxybridge</artifactId>
-            <version>1.6.2</version>
+            <version>1.7.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -157,17 +179,27 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.10.3</version>
+            <version>5.11.4</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>
                 <directory>${project.basedir}/src/main/resources</directory>
+                <excludes>
+                    <exclude>char-widths.json.gz</exclude>
+                </excludes>
+            </resource>
+            <resource>
+                <filtering>false</filtering>
+                <directory>${project.basedir}/src/main/resources</directory>
+                <includes>
+                    <include>char-widths.json.gz</include>
+                </includes>
             </resource>
         </resources>
         <plugins>
@@ -175,42 +207,11 @@
                 <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>
-                    <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

@@ -31,9 +31,24 @@ import ch.andre601.advancedserverlist.core.check.UpdateChecker;
 import ch.andre601.advancedserverlist.core.commands.CommandHandler;
 import ch.andre601.advancedserverlist.core.compat.maintenance.MaintenancePlaceholder;
 import ch.andre601.advancedserverlist.core.file.FileHandler;
+import ch.andre601.advancedserverlist.core.interfaces.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.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;
@@ -43,10 +58,15 @@ import java.util.Properties;
 
 public class AdvancedServerList<F>{
     
+    public static <F> AdvancedServerList<F> init(PluginCore<F> plugin, PlaceholderProvider... placeholders){
+        return new AdvancedServerList<>(plugin, Arrays.asList(placeholders));
+    }
+    
     private final PluginCore<F> plugin;
     private final FileHandler fileHandler;
-    private final CommandHandler commandHandler;
     private final PlayerHandler playerHandler;
+    private final TextCenterUtil textCenterUtil;
+    
     private static final AdvancedServerListAPI api = AdvancedServerListAPI.get();
     private final ProfileConditionParser parser = ProfileConditionParser.create();
     
@@ -57,27 +77,22 @@ 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...");
         
         placeholders.forEach(this::addPlaceholder);
         
         if(plugin.isPluginEnabled("Maintenance")){
-            plugin.getPluginLogger().info("Found Maintenance Plugin. Registering extra Placeholder...");
             addPlaceholder(new MaintenancePlaceholder(this));
         }
         
-        plugin.getPluginLogger().info("Completed internal Placeholder registration!");
-        
+        resolveVersion();
+        getPlugin().getPluginLogger().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(){
         return api;
     }
@@ -90,10 +105,6 @@ public class AdvancedServerList<F>{
         return fileHandler;
     }
     
-    public CommandHandler getCommandHandler(){
-        return commandHandler;
-    }
-    
     public PlayerHandler getPlayerHandler(){
         return playerHandler;
     }
@@ -110,16 +121,20 @@ public class AdvancedServerList<F>{
         return updateChecker;
     }
     
+    public TextCenterUtil getTextCenterUtil(){
+        return textCenterUtil;
+    }
+    
     public void disable(){
-        getPlugin().getPluginLogger().info("Saving playercache.json file...");
+        getPlugin().getPluginLogger().info("[-] Saving <white>playercache.json</white> file...");
         getPlayerHandler().save();
         
         if(updateChecker != null){
-            getPlugin().getPluginLogger().info("Disabling Update Checker...");
+            getPlugin().getPluginLogger().info("[-] Disabling Update Checker...");
             updateChecker.disable();
         }
         
-        getPlugin().getPluginLogger().info("AdvancedServerList disabled!");
+        getPlugin().getPluginLogger().success("AdvancedServerList disabled!");
     }
     
     public void clearFaviconCache(){
@@ -131,66 +146,55 @@ public class AdvancedServerList<F>{
     }
     
     private void load(){
-        printBanner();
-        resolveVersion();
-    
-        getPlugin().getPluginLogger().info("Starting AdvancedServerList v%s...", version);
-        getPlugin().getPluginLogger().info("Platform: %s", plugin.getPlatformInfo());
-        
-        if(getFileHandler().loadConfig()){
-            getPlugin().getPluginLogger().info("Successfully loaded config.yml!");
-        }else{
-            getPlugin().getPluginLogger().warn("Unable to load config.yml! Check previous lines for errors.");
+        if(!getFileHandler().loadConfig()){
+            getPlugin().getPluginLogger().failure("Unable to load <white>config.yml</white>! Check previous lines for errors.");
             return;
         }
         
         if(getFileHandler().isOldConfig()){
-            getPlugin().getPluginLogger().info("Detected old config.yml. Attempting to migrate...");
+            getPlugin().getPluginLogger().info("[-] Detected old <white>config.yml</white>. Attempting to migrate...");
             if(getFileHandler().migrateConfig()){
-                getPlugin().getPluginLogger().info("Migration completed successfully!");
+                getPlugin().getPluginLogger().success("Migration completed successfully!");
             }else{
-                getPlugin().getPluginLogger().warn("Couldn't migrate config.yml! Check previous lines for errors.");
+                getPlugin().getPluginLogger().failure("Couldn't migrate <white>config.yml</white>! Check previous lines for errors.");
                 return;
             }
         }
         
+        if(getFileHandler().getBool(true, "printBanner")){
+            printBanner();
+        }
+        
+        getPlugin().getPluginLogger().info("Platform: <white>%s</white>", plugin.getPlatformInfo());
+        getPlugin().getPluginLogger().info("");
+        
         if(getFileHandler().loadProfiles()){
-            getPlugin().getPluginLogger().info("Successfully loaded %d profile(s)!", getFileHandler().getProfiles().size());
+            getPlugin().getPluginLogger().success("Successfully loaded <white>%d</white> profile(s)!", getFileHandler().getProfiles().size());
         }else{
-            getPlugin().getPluginLogger().warn("Unable to load profiles! Check previous lines for errors.");
+            getPlugin().getPluginLogger().failure("Unable to load profiles! Check previous lines for errors.");
             return;
         }
         
-        getPlugin().loadFaviconHandler(this);
-    
-        getPlugin().getPluginLogger().info("Loading Commands...");
-        plugin.loadCommands();
-        getPlugin().getPluginLogger().info("Commands loaded!");
-    
-        getPlugin().getPluginLogger().info("Loading events...");
+        loadCommands();
+        
         plugin.loadEvents();
-        getPlugin().getPluginLogger().info("Events loaded!");
-    
-        getPlugin().getPluginLogger().info("Loading playercache.json...");
         getPlayerHandler().load();
-    
-        getPlugin().getPluginLogger().info("Loading bStats metrics. Disable it in the global config under /plugins/bstats/");
         plugin.loadMetrics();
-        getPlugin().getPluginLogger().info("Metrics loaded!");
+        plugin.startScheduler();
     
-        getPlugin().getPluginLogger().info("AdvancedServerList is ready!");
+        getPlugin().getPluginLogger().success("<green>AdvancedServerList is ready!");
         
         if(getFileHandler().getBoolean("checkUpdates"))
             this.updateChecker = new UpdateChecker(this);
     }
     
     private void printBanner(){
-        getPlugin().getPluginLogger().info("           _____ _");
-        getPlugin().getPluginLogger().info("    /\\    / ____| |");
-        getPlugin().getPluginLogger().info("   /  \\  | (___ | |");
-        getPlugin().getPluginLogger().info("  / /\\ \\  \\___ \\| |");
-        getPlugin().getPluginLogger().info(" / ____ \\ ____) | |____");
-        getPlugin().getPluginLogger().info("/_/    \\_\\_____/|______|");
+        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("");
     }
     
@@ -207,7 +211,76 @@ public class AdvancedServerList<F>{
     }
     
     private void addPlaceholder(PlaceholderProvider placeholderProvider){
-        getPlugin().getPluginLogger().info("Registering %s Placeholders...", placeholderProvider.getIdentifier());
         AdvancedServerList.getApi().addPlaceholderProvider(placeholderProvider);
     }
+    
+    private void loadCommands(){
+        getPlugin().loadFaviconHandler(this);
+        
+        CommandManager<CmdSender> commandManager = plugin.getCommandManager();
+        
+        commandManager.parameterInjectorRegistry().registerInjector(AdvancedServerList.class, ParameterInjector.constantInjector(this));
+        
+        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(
+                            getFileHandler().getProfiles().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")
+                        )
+                    )
+            );
+        }
+        
+        getPlugin().getPluginLogger().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.");
+        };
+    }
 }

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<CompletableFuture<ModrinthVersion>> cache = new CacheUtil<>(Duration.ofMinutes(5));
+    private final ValueCache<CompletableFuture<ModrinthVersion>> cache = new ValueCache<>(Duration.ofMinutes(5));
     
     private final AdvancedServerList<?> core;
     private final PluginLogger logger;
@@ -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.getVersion(),
+                    version.versionNumber()
+                );
+                sender.sendPrefixedMsg("Are you using a Development Version?");
             }
         });
     }
@@ -123,11 +127,11 @@ public class UpdateChecker{
     
     private void startUpdateChecker(){
         executor.scheduleAtFixedRate(() -> {
-            logger.info("Looking for an update...");
+            logger.info("[-] Looking for an update...");
             
             performUpdateCheck().whenComplete((version, throwable) -> {
                 if(version == null || throwable != null){
-                    logger.warn("Failed to look for any updates. Check previous messages for causes.");
+                    logger.failure("Failed to look for any updates. Check previous messages for causes.");
                     return;
                 }
                 
@@ -136,11 +140,15 @@ public class UpdateChecker{
                 int result = version.compare(core.getVersion());
                 switch(result){
                     case -1 -> printUpdateBanner(version);
-                    case 0 -> logger.info("You are running the latest version!");
-                    case 1 -> logger.info(
-                        "Your version (%s) seems to be newer than the latest release (%s). Are you running a dev build?",
-                        core.getVersion(), version.versionNumber()
-                    );
+                    case 0 -> logger.success("You are running the latest version!");
+                    case 1 -> {
+                        logger.info(
+                            "[?] Your version (<white>%s</white>) is newer than what is available on Modrint (<white>%s</white>).",
+                            core.getVersion(),
+                            version.versionNumber()
+                        );
+                        logger.info("    Are you using a Development Version?");
+                    }
                 }
             });
         }, 0L, 12L, TimeUnit.HOURS);
@@ -185,18 +193,18 @@ public class UpdateChecker{
         logger.warn("=======================================================================");
         logger.warn("You are running an outdated version of AdvancedServerList!");
         logger.warn("");
-        logger.warn("Your version: %s", core.getVersion());
-        logger.warn("Modrinth:     %s", version.versionNumber());
+        logger.warn("Your version: <white>%s</white>", core.getVersion());
+        logger.warn("Modrinth:     <white>%s</white>", version.versionNumber());
         logger.warn("");
         
         if(!version.isRelease()){
-            logger.warn("WARNING!");
+            logger.warn("<bold>WARNING!</bold>");
             logger.warn("This is a %s version and may contain breaking changes and/or bugs!", version.versionType());
             logger.warn("");
         }
         
         logger.warn("Download the latest version from here:");
-        logger.warn("https://modrinth.com/plugin/advancedserverlist/version/%s", version.id());
+        logger.warn("<white>https://modrinth.com/plugin/advancedserverlist/version/%s</white>", version.id());
         logger.warn("=======================================================================");
     }
     

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())
+                builder.append("</click>");
+            
+            if(hover != null && !hover.isEmpty())
+                builder.append("</hover>");
+            
+            builder.append("</")
+                .append(color)
+                .append(">]</white></grey>");
+            
+            return builder.toString();
+        }
+    }
+    
+    enum ColorName{
+        RED,
+        GREEN,
+        AQUA;
+        
+        @Override
+        public String toString(){
+            return this.name().toLowerCase(Locale.ROOT);
+        }
+    }
+}

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

@@ -25,22 +25,24 @@
 
 package ch.andre601.advancedserverlist.core.compat.papi;
 
-import ch.andre601.advancedserverlist.core.objects.CacheUtil;
+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.Collection;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.CompletionException;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
 
 public class PAPIUtil{
     
     private static PAPIUtil instance;
     
-    private final CacheUtil<String> cache = new CacheUtil<>(Duration.ofSeconds(5));
+    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(){
@@ -66,24 +68,11 @@ public class PAPIUtil{
     }
     
     public String getServer(){
-        return cache.get(() -> {
-            List<String> servers;
-            
-            try{
-                Set<String> value = papi.getServers().getNow(null);
-                if(value == null)
-                    return null;
-                
-                servers = List.copyOf(value);
-            }catch(CancellationException | CompletionException ex){
-                return null;
-            }
-            
-            if(servers == null || servers.isEmpty())
-                return null;
-            
-            return servers.get(0);
-        });
+        Set<String> values = serversCache.get(papi::getServers).getNow(Collections.emptySet());
+        if(values.isEmpty())
+            return null;
+        
+        return List.copyOf(values).get(0);
     }
     
     public <P> P getPlayer(Collection<P> players){
@@ -95,8 +84,8 @@ public class PAPIUtil{
     
     public String parse(String text, UUID carrier, UUID player){
         try{
-            return papi.formatPlaceholders(text, carrier, player).getNow(text);
-        }catch(IllegalArgumentException | CancellationException | CompletionException ex){
+            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

@@ -36,6 +36,10 @@ import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
 import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
 import ch.andre601.advancedserverlist.core.profiles.profile.ProfileManager;
 import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.JoinConfiguration;
+
+import java.util.List;
 
 public class PingEventHandler{
     
@@ -70,61 +74,98 @@ public class PingEventHandler{
         
         logger.debug(PingEventHandler.class, "Received valid Server List Profile. Calling PreServerListSetEvent...");
         
-        GenericServerListEvent e = event.callEvent(ProfileManager.merge(profile));
-        if(e == null || e.isCancelled()){
+        GenericServerListEvent slEvent = event.callEvent(ProfileManager.merge(profile));
+        if(slEvent == null || slEvent.isCancelled()){
             logger.debug(PingEventHandler.class, "PreServerListSetEvent was cancelled. Stopping ping handling...");
             return null;
         }
         
         logger.debug(PingEventHandler.class, "PreServerListSetEvent completed. Proceeding with ping handling...");
         
-        ProfileEntry entry = e.getEntry();
+        ProfileEntry entry = slEvent.getEntry();
         if(entry.isInvalid()){
             logger.debugWarn(PingEventHandler.class, "No valid ProfileEntry retrieved. Cancelling ping handling...");
             return null;
         }
         
-        boolean extraPlayers = ProfileManager.checkOption(entry.extraPlayersEnabled());
-        
-        if(extraPlayers && ignoreMaintenance(event, "extraPlayers")){
-            max = online + (entry.extraPlayersCount() == null ? 0 : entry.extraPlayersCount());
+        if(ProfileManager.checkOption(entry.onlinePlayersEnabled()) && ignoreMaintenance(event, "onlinePlayers")){
+            logger.debug(PingEventHandler.class, "'playerCount -> onlinePlayers -> enabled' option is true. Trying to apply '%s'...", entry.onlinePlayersCount());
+            String onlinePlayers = ComponentParser.text(entry.onlinePlayersCount())
+                .modifyText(text -> StringReplacer.replace(text, player, server))
+                .modifyText(text -> event.parsePAPIPlaceholders(text, player))
+                .toString();
             
-            logger.debug(PingEventHandler.class, "Extra Players enabled. Applying '%d' as max player count...", max);
-            
-            event.setMaxPlayers(max);
+            try{
+                online = onlinePlayers == null ? online : Integer.parseInt(onlinePlayers);
+                event.setOnlinePlayers(online);
+            }catch(NumberFormatException ex){
+                logger.warn("Option 'playerCount -> onlinePlayers -> amount' is not a valid Number!");
+            }
         }
         
-        if(ProfileManager.checkOption(entry.maxPlayersEnabled()) && !extraPlayers && ignoreMaintenance(event, "maxPlayers")){
-            max = (entry.maxPlayersCount() == null) ? 0 : entry.maxPlayersCount();
+        boolean extraPlayersEnabled = ProfileManager.checkOption(entry.extraPlayersEnabled());
+        
+        if(extraPlayersEnabled && ignoreMaintenance(event, "extraPlayers")){
+            logger.debug(PingEventHandler.class, "'playerCount -> extraPlayers -> enabled' option is true. Trying to apply '%s'...", entry.extraPlayersCount());
+            String extraPlayers = ComponentParser.text(entry.extraPlayersCount())
+                .modifyText(text -> StringReplacer.replace(text, player, server))
+                .modifyText(text -> event.parsePAPIPlaceholders(text, player))
+                .toString();
             
-            logger.debug(PingEventHandler.class, "Max Players enabled. Applying '%d' as max player count...", max);
+            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);
+            }catch(NumberFormatException ex){
+                logger.warn("Option 'playerCount -> extraPlayers -> amount' is not a valid Number!");
+            }
+        }
+        
+        if(ProfileManager.checkOption(entry.maxPlayersEnabled()) && !extraPlayersEnabled && ignoreMaintenance(event, "maxPlayers")){
+            logger.debug(PingEventHandler.class, "'playerCount -> maxPlayers -> enabled' option is true. Trying to apply '%s'...", entry.maxPlayersCount());
+            String maxPlayers = ComponentParser.text(entry.maxPlayersCount())
+                .modifyText(text -> StringReplacer.replace(text, player, server))
+                .modifyText(text -> event.parsePAPIPlaceholders(text, player))
+                .toString();
             
-            event.setMaxPlayers(max);
+            try{
+                max = maxPlayers == null ? 0 : Integer.parseInt(maxPlayers);
+                
+                logger.debug(PingEventHandler.class, "'playerCount -> maxPlayers -> amount' is a valid number. Applying it...");
+                event.setMaxPlayers(max);
+            }catch(NumberFormatException ex){
+                logger.warn("Option 'playerCount -> maxPlayers -> amount' is not a valid Number!");
+            }
         }
         
         GenericServer finalServer = event.createGenericServer(online, max, host);
         
         if(ProfileManager.checkOption(entry.motd()) && ignoreMaintenance(event, "motd")){
-            logger.debug(PingEventHandler.class, "MOTD set. Applying '%s'...", String.join("\\n", entry.motd()));
+            logger.debug(PingEventHandler.class, "'motd' option present. Applying ['%s']...", String.join("', '", entry.motd()));
             
-            event.setMotd(
-                ComponentParser.list(entry.motd())
+            List<Component> motd = entry.motd().stream()
+                .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))
                     .toComponent()
-            );
+                )
+                .toList();
+            
+            event.setMotd(Component.join(JoinConfiguration.separator(Component.newline()), motd));
         }
         
         boolean hidePlayers = ProfileManager.checkOption(entry.hidePlayersEnabled());
         
-        if(hidePlayers && ignoreMaintenance(event, "hidePlayers")){
-            logger.debug(PingEventHandler.class, "Hide Players enabled. Hiding player count...");
+        if(hidePlayers && ignoreMaintenance(event, "hidePlayers") && ignoreMaintenance(event, "hidePlayersHover")){
+            logger.debug(PingEventHandler.class, "'playerCount -> hidePlayers' enabled. Hiding player count...");
             
             event.hidePlayers();
         }
         
         if(ProfileManager.checkOption(entry.playerCountText()) && !hidePlayers && ignoreMaintenance(event, "playerCountText")){
-            logger.debug(PingEventHandler.class, "Player Count Text set. Applying '%s'...", entry.playerCountText());
+            logger.debug(PingEventHandler.class, "'playerCount -> text' option set. Applying '%s'...", entry.playerCountText());
             
             event.setPlayerCount(
                 ComponentParser.text(entry.playerCountText())
@@ -134,14 +175,20 @@ public class PingEventHandler{
             );
         }
         
-        if(ProfileManager.checkOption(entry.players()) && !hidePlayers && ignoreMaintenance(event, "playerCountHover")){
-            logger.debug(PingEventHandler.class, "Player Count Hover set. Applying '%s'...", String.join("\\n", entry.players()));
+        boolean hidePlayersHover = ProfileManager.checkOption(entry.hidePlayersHoverEnabled());
+        if(hidePlayersHover){
+            logger.debug(PingEventHandler.class, "'playerCount -> hidePlayersHover' option set. Hiding Player Hover...");
+            event.setPlayersHidden();
+        }
+        
+        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);
         }
         
         if(ProfileManager.checkOption(entry.favicon()) && ignoreMaintenance(event, "favicon")){
-            logger.debug(PingEventHandler.class, "Favicon set. Resolving '%s'...", entry.favicon());
+            logger.debug(PingEventHandler.class, "'favicon' option set. Resolving '%s'...", entry.favicon());
             
             String faviconString = StringReplacer.replace(entry.favicon(), player, server);
             

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

@@ -46,13 +46,46 @@ public class ConfigMigrator{
     public static ConfigurationTransformation.Versioned create(){
         return ConfigurationTransformation.versionedBuilder()
             .versionKey("configVersion")
-            .addVersion(LATEST, fourToFive())
+            .addVersion(LATEST, sevenToEight())
+            .addVersion(7, sixToSeven())
+            .addVersion(6, fiveToSix())
+            .addVersion(5, fourToFive())
             .addVersion(4, threeToFour())
             .addVersion(3, twoToThree())
             .addVersion(2, oneToTwo())
             .build();
     }
     
+    public static ConfigurationTransformation sevenToEight(){
+        return ConfigurationTransformation.builder()
+            .addAction(NodePath.path("disableDuringMaintenance"), (path, value) -> {
+                value.node("hidePlayersHover").set(true);
+                
+                return null;
+            })
+            .build();
+    }
+    
+    public static ConfigurationTransformation sixToSeven(){
+        return ConfigurationTransformation.builder()
+            .addAction(NodePath.path(), (path, value) -> {
+                value.node("printBanner").set(true);
+                
+                return null;
+            })
+            .build();
+    }
+    
+    public static ConfigurationTransformation fiveToSix(){
+        return ConfigurationTransformation.builder()
+            .addAction(NodePath.path("disableDuringMaintenance"), (path, value) -> {
+                value.node("onlinePlayers").set(true);
+                
+                return null;
+            })
+            .build();
+    }
+    
     public static ConfigurationTransformation fourToFive(){
         return ConfigurationTransformation.builder()
             .addAction(NodePath.path(), (path, value) -> {
@@ -111,7 +144,7 @@ public class ConfigMigrator{
             versioned.apply(node);
             final int endVersion = versioned.version(node);
             if(startVersion < endVersion)
-                logger.info("Migrated config.yml from v" + startVersion + " to v" + endVersion);
+                logger.success("Successfully migrated config from <white>v%d</white> to <white>v%d</white>", startVersion, endVersion);
         }
         
         return node;

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

@@ -72,7 +72,6 @@ public class FileHandler{
     }
     
     public boolean loadConfig(){
-        logger.info("Loading config.yml...");
         File folder = plugin.getPlugin().getFolderPath().toFile();
         if(!folder.exists() && !folder.mkdirs()){
             logger.warn("Couldn't create folder for plugin. Is it missing Write permissions?");
@@ -87,7 +86,7 @@ public class FileHandler{
                 }
                 
                 Files.copy(stream, config);
-                logger.info("Created new config.yml!");
+                logger.success("Created new config.yml!");
             }catch(IOException ex){
                 logger.warn("Cannot create config.yml for plugin.", ex);
                 return false;
@@ -98,7 +97,7 @@ public class FileHandler{
     }
     
     public boolean loadProfiles(){
-        logger.info("Loading profiles...");
+        logger.info("[-] Loading profiles...");
         
         if(createFile("default.yml")){
             return reloadProfiles();
@@ -109,7 +108,7 @@ public class FileHandler{
     
     public boolean createFile(String name){
         if(Files.notExists(profilesFolder) && profilesFolder.toFile().mkdirs()){
-            logger.info("Successfully created profiles folder.");
+            logger.debugSuccess(FileHandler.class, "Successfully created profiles folder.");
         }
         
         File file = new File(profilesFolder.toFile(), name);
@@ -126,7 +125,7 @@ public class FileHandler{
             Files.copy(stream, profilesFolder.resolve(name));
             return true;
         }catch(IOException ex){
-            logger.warn("Encountered IOException while trying to create file %s", ex, name);
+            logger.warn("Encountered IOException while trying to create file <white>%s</white>", ex, name);
             return false;
         }
     }
@@ -160,7 +159,7 @@ public class FileHandler{
         
         File[] files = profilesFolder.toFile().listFiles(((dir, name) -> name.endsWith(".yml")));
         if(files == null || files.length == 0){
-            logger.warn("Cannot load files from profiles folder! No valid YAML files present.");
+            logger.failure("Cannot load files from profiles folder! No valid YAML files present.");
             return false;
         }
         
@@ -170,11 +169,11 @@ public class FileHandler{
                 continue;
             
             profiles.add(ServerListProfile.Builder.resolve(file.getName(), tmp, logger).build());
-            logger.info("Loaded '%s'!", file.getName());
+            logger.debugSuccess(FileHandler.class, "Loaded '<white>%s</white>'!", file.getName());
         }
         
         if(profiles.isEmpty()){
-            logger.warn("Couldn't load any profile from profiles folder!");
+            logger.failure("Couldn't load any profile from profiles folder!");
             return false;
         }
         
@@ -191,7 +190,7 @@ public class FileHandler{
         try{
             return loader.load();
         }catch(IOException ex){
-            logger.warn("Cannot load '%s' due to an IOException!", ex, path.toFile().getName());
+            logger.warn("Cannot load '<white>%s</white>' due to an IOException!", ex, path.toFile().getName());
             return null;
         }
     }
@@ -218,11 +217,11 @@ public class FileHandler{
     }
     
     private boolean makeBackup(){
-        logger.info("Making backup of old config.yml...");
+        logger.info("[-] Making backup of old config.yml...");
         
         File backups = plugin.getPlugin().getFolderPath().resolve("backups").toFile();
         if(!backups.exists() && !backups.mkdirs()){
-            logger.warn("Cannot create backups folder for migration!");
+            logger.failure("Cannot create backups folder for migration!");
             return false;
         }
         
@@ -231,16 +230,16 @@ public class FileHandler{
         File configBackup = new File(backups, "config_" + date.replace(":", "_") + ".yml");
         try{
             if(!configBackup.exists() && !configBackup.createNewFile()){
-                logger.warn("Cannot create backup file for config.yml!");
+                logger.failure("Cannot create backup file for config.yml!");
                 return false;
             }
             
             Files.copy(config, configBackup.toPath(), StandardCopyOption.REPLACE_EXISTING);
-            logger.info("Saved backup as '%s'!", configBackup.getName());
+            logger.success("Saved backup as '<white>%s</white>'!", configBackup.getName());
             
             return true;
         }catch(IOException ex){
-            logger.warn("Encountered IOException while trying to create a backup.", ex);
+            logger.failure("Encountered IOException while trying to create a backup.", ex);
             return false;
         }
     }

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

@@ -27,10 +27,18 @@ package ch.andre601.advancedserverlist.core.interfaces;
 
 public interface PluginLogger{
     
+    default void debugSuccess(Class<?> clazz, String msg, Object... args){
+        debug(clazz, "[<green>✓</green>] " + msg, args);
+    }
+    
     void debug(Class<?> clazz, String msg, Object... args);
     
     void debugWarn(Class<?> clazz, String msg, Object... args);
     
+    default void success(String msg, Object... args){
+        info("[<green>✓</green>] " + msg, args);
+    }
+    
     void info(String msg, Object... args);
     
     void warn(String msg, Object... args);
@@ -38,4 +46,8 @@ public interface PluginLogger{
     void warn(String msg, Throwable throwable);
     
     void warn(String msg, Throwable throwable, Object... args);
+    
+    default void failure(String msg, Object... args){
+        warn("[<red>x</red>] " + msg, args);
+    }
 }

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 argument;
-    
-    public PluginCommand(String argument){
-        this.argument = argument;
+    enum Type{
+        ALL,
+        PLAYER_ONLY
     }
-    
-    public String name(){
-        return argument;
-    }
-    
-    public String permission(){
-        return "advancedserverlist.command." + name().toLowerCase(Locale.ROOT);
-    }
-    
-    public abstract void handle(CmdSender sender, String[] args);
-    
-    public abstract String usage();
-    
-    public abstract String description();
 }

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

@@ -27,15 +27,15 @@ package ch.andre601.advancedserverlist.core.interfaces.core;
 
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
+import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
 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();
@@ -46,6 +46,8 @@ public interface PluginCore<F>{
     
     void downloadLibrary(String groupId, String artifactId, String version);
     
+    void startScheduler();
+    
     AdvancedServerList<F> getCore();
     
     Path getFolderPath();
@@ -54,6 +56,8 @@ public interface PluginCore<F>{
     
     FaviconHandler<F> getFaviconHandler();
     
+    CommandManager<CmdSender> getCommandManager();
+    
     String getPlatformInfo();
     
     String getLoader();

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

@@ -42,6 +42,8 @@ public interface GenericEventWrapper<F, P extends GenericPlayer>{
     
     void setMaxPlayers(int maxPlayers);
     
+    void setOnlinePlayers(int onlinePlayers);
+    
     void setMotd(Component component);
     
     void hidePlayers();
@@ -50,6 +52,8 @@ public interface GenericEventWrapper<F, P extends GenericPlayer>{
     
     void setPlayers(List<String> players, P player, GenericServer server);
     
+    void setPlayersHidden();
+    
     void setFavicon(F favicon);
     
     void setDefaultFavicon();

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

@@ -56,7 +56,7 @@ public class MiniMOTDConfigMigrator{
         
         Path mainConf = core.getPlugin().getFolderPath().getParent().resolve(folder).resolve("main.conf");
         if(!Files.exists(mainConf)){
-            logger.warn("[Migrator - MiniMOTD] Cannot find a main.conf file in /plugins/%s/ folder.", folder);
+            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.");
             return false;
         }
@@ -76,13 +76,13 @@ public class MiniMOTDConfigMigrator{
             
             config = node.get(MiniMOTDConfig.class);
         }catch(IOException ex){
-            logger.warn("[Migrator - MiniMOTD] Encountered IOException while loading main.conf file.", ex);
+            logger.warn("[<white>Migrator - MiniMOTD</white>] Encountered IOException while loading main.conf file.", ex);
             sender.sendErrorMsg(" -> <red>IOException while loading</red> main.conf <red>file.");
             return false;
         }
         
         if(config == null){
-            logger.warn("[Migrator - MiniMOTD] Retrieved main.conf file returned null.");
+            logger.warn("[<white>Migrator - MiniMOTD</white>] Retrieved main.conf file returned null.");
             sender.sendErrorMsg(" -> <red>Received invalid</red> main.conf <red>file.");
             return false;
         }
@@ -110,14 +110,14 @@ public class MiniMOTDConfigMigrator{
         if(config.iconEnabled()){
             if(config.motds().size() == 1){
                 MiniMOTDConfig.Motd motd = config.motds().get(0);
-                if(!motd.icon().isEmpty() && !motd.icon().equalsIgnoreCase("random")){
+                if(!motd.icon().isEmpty()){
                     profileBuilder.favicon(motd.icon());
                 }
             }else
             if(config.motds().size() > 1){
                 for(int i = 0; i < config.motds().size(); i++){
                     MiniMOTDConfig.Motd motd = config.motds().get(i);
-                    if(!motd.icon().isEmpty() && !motd.icon().equalsIgnoreCase("random")){
+                    if(!motd.icon().isEmpty()){
                         profilesBuilders.get(i).favicon(motd.icon());
                     }
                 }
@@ -135,9 +135,9 @@ public class MiniMOTDConfigMigrator{
             
             profileBuilder.hidePlayersEnabled(hidePlayers)
                 .extraPlayersEnabled(xMoreEnabled)
-                .extraPlayersCount(xMore)
+                .extraPlayersCount(String.valueOf(xMore))
                 .maxPlayersEnabled(maxPlayersEnabled)
-                .maxPlayersCount(maxPlayers);
+                .maxPlayersCount(String.valueOf(maxPlayers));
         }
         
         ProfileEntry entry = profileBuilder.build();
@@ -147,14 +147,14 @@ public class MiniMOTDConfigMigrator{
         
         boolean profilesInvalid = profiles.isEmpty() || profiles.stream().allMatch(ProfileEntry::isInvalid);
         if(entry.isInvalid() && profilesInvalid){
-            logger.warn("[Migrator - MiniMOTD] Main ProfileEntry was invalid and profiles were empty.");
+            logger.warn("[<white>Migrator - MiniMOTD</white>] Main ProfileEntry was invalid and profiles were empty.");
             sender.sendErrorMsg(" -> <red>Received invalid configuration.");
             return false;
         }
         
         Path profile = core.getPlugin().getFolderPath().resolve("profiles").resolve("minimotd_migrated.yml");
         if(Files.exists(profile)){
-            logger.warn("[Migrator - MiniMOTD] Cannot create new file minimotd_migrated.yml. One with the same name is already present.");
+            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.");
             
             return false;
@@ -163,7 +163,7 @@ public class MiniMOTDConfigMigrator{
         try{
             Files.createFile(profile);
         }catch(IOException ex){
-            logger.warn("[Migrator - MiniMOTD] Encountered an IOException while trying to create file minimotd_migrated.yml.", ex);
+            logger.warn("[<white>Migrator - MiniMOTD</white>] Encountered an IOException while trying to create file minimotd_migrated.yml.", ex);
             sender.sendErrorMsg(" -> <red>File creation error.");
             
             return false;
@@ -180,14 +180,14 @@ public class MiniMOTDConfigMigrator{
         try{
             migrated = yamlLoader.load();
         }catch(IOException ex){
-            logger.warn("[Migrator - MiniMOTD] Encountered an IOException while trying to load file minimotd_migrated.yml.", ex);
+            logger.warn("[<white>Migrator - MiniMOTD</white>] Encountered an IOException while trying to load file minimotd_migrated.yml.", ex);
             sender.sendErrorMsg(" -> <red>File loading error.");
             
             return false;
         }
         
         if(migrated == null){
-            logger.warn("[Migrator - MiniMOTD] Cannot migrate Configuration. ConfigurationNode was null.");
+            logger.warn("[<white>Migrator - MiniMOTD</white>] Cannot migrate Configuration. ConfigurationNode was null.");
             sender.sendErrorMsg(" -> <red>File loading error.");
             
             return false;
@@ -202,7 +202,7 @@ public class MiniMOTDConfigMigrator{
             
             migrated.set(entry);
         }catch(SerializationException ex){
-            logger.warn("[Migrator - MiniMOTD] Encountered a SerializationException while setting values.", ex);
+            logger.warn("[<white>Migrator - MiniMOTD</white>] Encountered a SerializationException while setting values.", ex);
             sender.sendErrorMsg(" -> <red>Error while updating file</red> minimotd_migrated.yml<red>.");
             
             return false;
@@ -214,7 +214,7 @@ public class MiniMOTDConfigMigrator{
             
             return true;
         }catch(IOException ex){
-            logger.warn("[Migrator - MiniMOTD] Encountered an IOException while trying to save new file minimotd_migrated.yml.", ex);
+            logger.warn("[<white>Migrator - MiniMOTD</white>] Encountered an IOException while trying to save new file minimotd_migrated.yml.", ex);
             sender.sendErrorMsg(" -> <red>File saving error.");
             
             return false;

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

@@ -59,26 +59,55 @@ public class SLPConfigMigrator{
         "(?<end>#[a-fA-F0-9]{6})" +   // Ending color
         "%" +
         "(?<text>.+?)" +              // Text
-        "%gradient%");
+        "%gradient%"
+    );
     
     private static final Map<String, String> STATIC_REPLACEMENTS = Map.of(
         "%player%", "${player name}",
         "%uuid%", "${player uuid}",
         "%_uuid_%", "${player uuid}",
         "%online%", "${server playersOnline}",
-        "%max%", "${server playersMax}");
+        "%max%", "${server playersMax}"
+    );
+    private static final Map<String, String> COLOR_TO_MINIMESSAGE_TAG = new HashMap<>(){{
+        // Color Codes.
+        put("a", "<green>");
+        put("b", "<aqua>");
+        put("c", "<red>");
+        put("d", "<light_purple>");
+        put("e", "<yellow>");
+        put("f", "<white>");
+        put("0", "<black>");
+        put("1", "<dark_blue>");
+        put("2", "<dark_green>");
+        put("3", "<dark_aqua>");
+        put("4", "<dark_red>");
+        put("5", "<dark_purple>");
+        put("6", "<gold>");
+        put("7", "<grey>");
+        put("8", "<dark_grey>");
+        put("9", "<blue>");
+        
+        // Formatting Codes
+        put("k", "<obfuscated>");
+        put("l", "<bold>");
+        put("m", "<strikethrough>");
+        put("n", "<underlined>");
+        put("o", "<italic>");
+        put("r", "<reset>");
+    }};
     
     public static int migrate(AdvancedServerList<?> core, CmdSender sender){
         ServerListPlusCore slpCore = ServerListPlusCore.getInstance();
         PluginLogger logger = core.getPlugin().getPluginLogger();
         if(slpCore == null){
-            logger.warn("[Migrator - ServerListPlus] Cannot migrate ServerListPlus config. ServerListPlus is not active!");
+            logger.warn("[<white>Migrator - ServerListPlus</white>] Cannot migrate ServerListPlus config. ServerListPlus is not active!");
             return 0;
         }
         
         ServerStatusConf conf = slpCore.getConf(ServerStatusConf.class);
         if(conf == null){
-            logger.warn("[Migrator - ServerListPlus] Cannot migrate ServerListPlus configuration. Received configuration was null.");
+            logger.warn("[<white>Migrator - ServerListPlus</white>] Cannot migrate ServerListPlus configuration. Received configuration was null.");
             return 0;
         }
         
@@ -101,7 +130,7 @@ public class SLPConfigMigrator{
     private static int parseConf(AdvancedServerList<?> core, CmdSender sender, PersonalizedStatusConf.StatusConf conf, Type type){
         PluginLogger logger = core.getPlugin().getPluginLogger();
         if(conf == null){
-            logger.info("[Migrator - ServerListPlus] No StatusConf found for type %s. Skipping...", type.getName());
+            logger.info("[<white>Migrator - ServerListPlus</white>] No StatusConf found for type <white>%s</white>. Skipping...", type.getName());
             sender.sendPrefixedMsg(" -> Not found! Skipping...");
             
             return 0;
@@ -129,7 +158,7 @@ public class SLPConfigMigrator{
         apply(motds, builder, profiles, ProfileEntry.Builder::motd);
         apply(favicons, builder, profiles, ProfileEntry.Builder::favicon);
         apply(hovers, builder, profiles, ProfileEntry.Builder::players);
-        apply(maxPlayers, builder, profiles, (build, count) -> build.maxPlayersEnabled(NullBool.TRUE).maxPlayersCount(count));
+        apply(maxPlayers, builder, profiles, (build, count) -> build.maxPlayersEnabled(NullBool.TRUE).maxPlayersCount(String.valueOf(count)));
         apply(playerCount, builder, profiles, ProfileEntry.Builder::playerCountText);
         
         builder.hidePlayersEnabled(hidePlayers);
@@ -141,7 +170,7 @@ public class SLPConfigMigrator{
         
         boolean profilesInvalid = profileEntries.isEmpty() || profileEntries.stream().anyMatch(ProfileEntry::isInvalid);
         if(entry.isInvalid() && profilesInvalid){
-            logger.warn("[Migrator - ServerListPlus] Unable to parse ServerListPlus configuration of type %s. Generated ProfileEntry was invalid.", type.getName());
+            logger.warn("[<white>Migrator - ServerListPlus</white>] Unable to parse ServerListPlus configuration of type <white>%s</white>. Generated ProfileEntry was invalid.", type.getName());
             sender.sendErrorMsg(" -> <red>Received invalid Configuration.");
             
             return 0;
@@ -149,7 +178,7 @@ public class SLPConfigMigrator{
         
         Path profile = core.getPlugin().getFolderPath().resolve("profiles").resolve(type.getFile());
         if(Files.exists(profile)){
-            logger.warn("[Migrator - ServerListPlus] Cannot create new file %s. One with the same name is already present", type.getFile());
+            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());
             
             return 0;
@@ -158,7 +187,7 @@ public class SLPConfigMigrator{
         try{
             Files.createFile(profile);
         }catch(IOException ex){
-            logger.warn("[Migrator - ServerListPlus] Encountered an IOException while trying to create file %s.", ex, type.getFile());
+            logger.warn("[<white>Migrator - ServerListPlus</white>] Encountered an IOException while trying to create file <white>%s</white>.", ex, type.getFile());
             sender.sendErrorMsg(" -> <red>File creation error.");
             
             return 0;
@@ -175,14 +204,14 @@ public class SLPConfigMigrator{
         try{
             node = loader.load();
         }catch(IOException ex){
-            logger.warn("[Migrator - ServerListPlus] Encountered an IOException while trying to load file %s.", ex, type.getFile());
+            logger.warn("[<white>Migrator - ServerListPlus</white>] Encountered an IOException while trying to load file <white>%s</white>.", ex, type.getFile());
             sender.sendErrorMsg(" -> <red>File loading error.");
             
             return 0;
         }
         
         if(node == null){
-            logger.warn("[Migrator - ServerListPlus] Cannot migrate Configuration of type %s. ConfigurationNode was null.", type.getName());
+            logger.warn("[<white>Migrator - ServerListPlus</white>] Cannot migrate Configuration of type <white>%s</white>. ConfigurationNode was null.", type.getName());
             sender.sendErrorMsg(" -> <red>File loading error.");
             
             return 0;
@@ -194,9 +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.getFileHandler().getString("Anonymous", "unknownPlayer", "name") + "\"");
             }else
             if(type == Type.BANNED){
                 node.node("condition")
@@ -209,7 +236,7 @@ public class SLPConfigMigrator{
             
             node.set(entry);
         }catch(SerializationException ex){
-            logger.warn("[Migrator - ServerListPlus] Encountered a SerializationException while setting values.", ex);
+            logger.warn("[<white>Migrator - ServerListPlus</white>] Encountered a SerializationException while setting values.", ex);
             sender.sendErrorMsg(" -> <red>Error while updating file</red> %s<red>.", type.getFile());
             
             return 0;
@@ -221,7 +248,7 @@ public class SLPConfigMigrator{
             
             return 1;
         }catch(IOException ex){
-            logger.warn("[Migrator - ServerListPlus] Encountered an IOException while trying to save new file %s.", ex, type.getFile());
+            logger.warn("[<white>Migrator - ServerListPlus</white>] Encountered an IOException while trying to save new file <white>%s</white>.", ex, type.getFile());
             sender.sendErrorMsg(" -> <red>File saving error.");
             
             return 0;
@@ -372,32 +399,11 @@ public class SLPConfigMigrator{
         if(colorCodeMatcher.find()){
             builder.setLength(0);
             do{
-                String color = colorCodeMatcher.group("color").toLowerCase(Locale.ROOT); 
-                switch(color){
-                    case "a" -> colorCodeMatcher.appendReplacement(builder, "<green>");
-                    case "b" -> colorCodeMatcher.appendReplacement(builder, "<aqua>");
-                    case "c" -> colorCodeMatcher.appendReplacement(builder, "<red>");
-                    case "d" -> colorCodeMatcher.appendReplacement(builder, "<light_purple>");
-                    case "e" -> colorCodeMatcher.appendReplacement(builder, "<yellow>");
-                    case "f" -> colorCodeMatcher.appendReplacement(builder, "<white>");
-                    case "k" -> colorCodeMatcher.appendReplacement(builder, "<obfuscated>");
-                    case "l" -> colorCodeMatcher.appendReplacement(builder, "<bold>");
-                    case "m" -> colorCodeMatcher.appendReplacement(builder, "<strikethrough>");
-                    case "n" -> colorCodeMatcher.appendReplacement(builder, "<underlined>");
-                    case "o" -> colorCodeMatcher.appendReplacement(builder, "<italic>");
-                    case "r" -> colorCodeMatcher.appendReplacement(builder, "<reset>");
-                    case "0" -> colorCodeMatcher.appendReplacement(builder, "<black>");
-                    case "1" -> colorCodeMatcher.appendReplacement(builder, "<dark_blue>");
-                    case "2" -> colorCodeMatcher.appendReplacement(builder, "<dark_green>");
-                    case "3" -> colorCodeMatcher.appendReplacement(builder, "<dark_aqua>");
-                    case "4" -> colorCodeMatcher.appendReplacement(builder, "<dark_red>");
-                    case "5" -> colorCodeMatcher.appendReplacement(builder, "<dark_purple>");
-                    case "6" -> colorCodeMatcher.appendReplacement(builder, "<gold>");
-                    case "7" -> colorCodeMatcher.appendReplacement(builder, "<grey>");
-                    case "8" -> colorCodeMatcher.appendReplacement(builder, "<dark_grey>");
-                    case "9" -> colorCodeMatcher.appendReplacement(builder, "<blue>");
-                    // This one shouldn't be reachable given the pattern, but you never know...
-                    default -> colorCodeMatcher.appendReplacement(builder, "&" + color);
+                for(Map.Entry<String, String> colorCodes : COLOR_TO_MINIMESSAGE_TAG.entrySet()){
+                    if(!colorCodeMatcher.group("color").equalsIgnoreCase(colorCodes.getKey()))
+                        continue;
+                    
+                    colorCodeMatcher.appendReplacement(builder, colorCodes.getValue());
                 }
             }while(colorCodeMatcher.find());
             

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

@@ -28,12 +28,12 @@ package ch.andre601.advancedserverlist.core.objects;
 import java.time.Duration;
 import java.util.function.Supplier;
 
-public class CacheUtil<T>{
+public class ValueCache<T>{
     
     private final Duration duration;
     private CacheValue<T> cache = null;
     
-    public CacheUtil(Duration duration){
+    public ValueCache(Duration duration){
         this.duration = duration;
     }
     

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

@@ -29,7 +29,6 @@ import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 
-import java.util.List;
 import java.util.function.Function;
 
 public class ComponentParser{
@@ -52,12 +51,13 @@ public class ComponentParser{
         return new ComponentParser(text);
     }
     
-    public static ComponentParser list(List<String> lines){
-        return new ComponentParser(String.join("\n", lines));
+    public static ComponentParser textFormatted(String text, Object... args){
+        return text(String.format(text, args));
     }
     
     public ComponentParser modifyText(Function<String, String> function){
         this.text = function.apply(text);
+        
         return this;
     }
     
@@ -65,8 +65,16 @@ public class ComponentParser{
         return mm.deserialize(text);
     }
     
+    public static String toMMString(Component component){
+        return mm.serialize(component);
+    }
+    
     @Override
     public String toString(){
         return legacy.serialize(toComponent());
     }
+    
+    public String toStringStriped(){
+        return mm.stripTags(text);
+    }
 }

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

@@ -0,0 +1,136 @@
+package ch.andre601.advancedserverlist.core.parsing;
+
+import ch.andre601.advancedserverlist.core.AdvancedServerList;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import net.kyori.adventure.text.flattener.ComponentFlattener;
+import net.kyori.adventure.text.flattener.FlattenerListener;
+import net.kyori.adventure.text.format.Style;
+import net.kyori.adventure.text.format.TextDecoration;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.zip.GZIPInputStream;
+
+public class TextCenterUtil{
+    private final ComponentFlattener COMPONENT_FLATTENER = ComponentFlattener.textOnly();
+    
+    private final double MAX_WIDTH = 270.0; // Max width of the MOTD
+    private final int SPACE_WIDTH = 4;
+    
+    private final Map<String, FontInfo> charWidths;
+    
+    public TextCenterUtil(AdvancedServerList<?> plugin){
+        charWidths = loadFontWidths(plugin);
+    }
+    
+    public String getCenteredText(String text){
+        if(!text.toLowerCase(Locale.ROOT).startsWith("<center>"))
+            return text;
+        
+        if(getDefault() == null)
+            return text;
+        
+        text = text.substring("<center>".length());
+        TextFlattenerListener listener = new TextFlattenerListener(this);
+        
+        COMPONENT_FLATTENER.flatten(ComponentParser.text(text).toComponent(), listener);
+        
+        double width = listener.getWidth();
+        if(width >= MAX_WIDTH)
+            return text;
+        
+        return createSpaces(width) + text;
+    }
+    
+    private double getCharWidth(int codePoint, boolean isBold, String fontName){
+        FontInfo font = charWidths.getOrDefault(fontName, getDefault());
+        if(font == null)
+            return -1.0;
+        
+        int index = Arrays.binarySearch(font.codePoints, codePoint);
+        if(index < 0){
+            return isBold ? 7.0 : 6.0;
+        }else{
+            return isBold ? font.advanceBf[index] : font.advance[index];
+        }
+    }
+    
+    private FontInfo getDefault(){
+        return charWidths.get("minecraft:default");
+    }
+    
+    private String createSpaces(double length){
+        double remainder = MAX_WIDTH - length;
+        int padding = (int)Math.max(0, Math.floor(remainder / 2.0) - 1);
+        
+        return " ".repeat(Math.floorDiv(padding, SPACE_WIDTH));
+    }
+    
+    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.");
+                return new HashMap<>();
+            }
+            
+            GZIPInputStream gzipStream = new GZIPInputStream(stream);
+            BufferedReader reader = new BufferedReader(new InputStreamReader(gzipStream));
+            
+            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());
+            return new HashMap<>();
+        }
+    }
+    
+    private static class TextFlattenerListener implements FlattenerListener{
+        private double width = 0.0;
+        private boolean isBold = false;
+        private String font = "minecraft:default";
+        
+        private final TextCenterUtil instance;
+        
+        public TextFlattenerListener(TextCenterUtil instance){
+            this.instance = instance;
+        }
+        
+        @Override
+        public void pushStyle(@NotNull Style style){
+            if(style.hasDecoration(TextDecoration.BOLD))
+                isBold = true;
+            
+            if(style.font() != null)
+                font = style.font().asString();
+        }
+        
+        @Override
+        public void component(@NotNull String text){
+            for(int i = 0; i < text.length(); i++){
+                width += instance.getCharWidth(text.codePointAt(i), isBold, font);
+            }
+        }
+        
+        @Override
+        public void popStyle(@NotNull Style style){
+            if(style.hasDecoration(TextDecoration.BOLD))
+                isBold = false;
+        }
+        
+        public double getWidth(){
+            return width;
+        }
+    }
+    
+    private record FontInfo(int[] codePoints, float[] advance, float[] advanceBf){}
+}

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

@@ -51,13 +51,13 @@ public record ServerListProfile(int priority, String condition, ProfileEntry def
         boolean result = core.getParser().evaluate(condition, player, server, collector);
         
         if(collector.hasWarnings()){
-            logger.warn("Encountered %d Error(s) while parsing condition for file '%s':", collector.getWarnings().size(), file);
+            logger.warn("Encountered <white>%d</white> Error(s) while parsing condition for file '<white>%s</white>':", collector.getWarnings().size(), file);
             
             for(ParseWarnCollector.Context context : collector.getWarnings()){
-                logger.warn("  - At position %s:", context.position() == -1 ? "Unknown" : context.position());
-                logger.warn("    %s", condition);
-                logger.warn(" ".repeat(context.position() + 4) + "^");
-                logger.warn("    -> %s", context.message());
+                logger.warn("  - At position <white>%s</white>:", context.position() == -1 ? "<italic>Unknown</italic>" : context.position());
+                logger.warn("    <white>%s</white>", condition);
+                logger.warn(" ".repeat(context.position() + 3) + "<red>^</red>");
+                logger.warn("    <grey>-></grey> %s", context.message());
             }
         }
         
@@ -146,7 +146,7 @@ public record ServerListProfile(int priority, String condition, ProfileEntry def
             try{
                 this.profiles = node.node("profiles").getList(ProfileEntry.class);
             }catch(SerializationException ex){
-                logger.warn("Encountered a SerializationException while resolving the profiles entry for %s", ex, fileName);
+                logger.warn("Encountered a SerializationException while resolving the profiles entry for <white>%s</white>", ex, fileName);
             }
             
             return this;
@@ -159,7 +159,7 @@ public record ServerListProfile(int priority, String condition, ProfileEntry def
             try{
                 this.defaultProfile = node.get(ProfileEntry.class);
             }catch(SerializationException ex){
-                logger.warn("Encountered a SerializationException while resolving the global profile for %s", ex, fileName);
+                logger.warn("Encountered a SerializationException while resolving the global profile for <white>%s</white>", ex, fileName);
             }
             return this;
         }

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/placeholders/tokens/CustomExpressionTokenizer.java

@@ -76,7 +76,14 @@ public class CustomExpressionTokenizer{
                 }
             }
             
-            collector.appendWarningFormatted(position.getIndex(), "Illegal Token '%c'.", text.charAt(position.getIndex()));
+            if(position.getIndex() >= text.length()){
+                collector.appendWarningFormatted(
+                    "Current index position (%d) is larger or equal to Text length (%d) for condition '%s'",
+                    position.getIndex(), text.length(), text
+                );
+            }else{
+                collector.appendWarningFormatted(position.getIndex(), "Illegal Token '%c'.", text.charAt(position.getIndex()));
+            }
             break;
         }
         

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

@@ -42,9 +42,8 @@ import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
+import java.util.List;
+import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Stream;
 
@@ -57,6 +56,7 @@ public class FaviconHandler<F>{
     
     private final Map<String, F> localFavicons = new HashMap<>();
     private final HttpClient client = HttpClient.newHttpClient();
+    private final Random random = new Random();
     
     public FaviconHandler(AdvancedServerList<F> core){
         this.core = core;
@@ -70,14 +70,28 @@ public class FaviconHandler<F>{
     }
     
     public F getFavicon(String input){
-        if(localFavicons.containsKey(input.toLowerCase(Locale.ROOT).split("\\.")[0])){
-            return localFavicons.get(input.toLowerCase(Locale.ROOT).split("\\.")[0]);
+        if(localFavicons.size() > 0){
+            logger.debug(FaviconHandler.class, "Current Local Favicons:");
+            for(String key : localFavicons.keySet()){
+                logger.debug(FaviconHandler.class, "  - %s", key);
+            }
+        }
+        
+        if(input.equalsIgnoreCase("random")){
+            logger.debug(FaviconHandler.class, "Input matches 'random'. Returning random Favicon...");
+            return getRandomized();
+        }
+        
+        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));
         }
         
         try{
+            logger.debug(FaviconHandler.class, "Getting Favicon image from cache...");
             return faviconCache.get(input, () -> getFuture(input)).getNow(null);
         }catch(ExecutionException ex){
-            logger.warn("Received ExecutionException while retrieving Favicon for '%s'.", ex, input);
+            logger.warn("Received ExecutionException while retrieving Favicon for '<white>%s</white>'.", ex, input);
             return null;
         }
     }
@@ -92,27 +106,46 @@ public class FaviconHandler<F>{
             logger.debug(FaviconHandler.class, "Resolving URL '%s'...", input);
             return CompletableFuture.supplyAsync(() -> fromURL(core, input), this.faviconThreadPool);
         }else
+        if(input.equalsIgnoreCase("random")){
+            return CompletableFuture.completedFuture(getRandomized());
+        }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).split("\\.")[0]));
+            return CompletableFuture.completedFuture(localFavicons.get(input.toLowerCase(Locale.ROOT)));
         }else{
             logger.debug(FaviconHandler.class, "Resolving Name/UUID as https://mc-heads.net/avatar/%s/64...", input);
             return CompletableFuture.supplyAsync(() -> fromURL(core, "https://mc-heads.net/avatar/" + input + "/64"), this.faviconThreadPool);
         }
     }
     
+    private F getRandomized(){
+        logger.debug(FaviconHandler.class, "Obtaining random Favicon...");
+        if(localFavicons.isEmpty())
+            return null;
+        
+        List<F> faviconList = List.copyOf(localFavicons.values());
+        
+        // Don't use Random for just one entry.
+        if(faviconList.size() == 1)
+            return faviconList.get(0);
+        
+        synchronized(random){
+            return faviconList.get(random.nextInt(faviconList.size()));
+        }
+    }
+    
     private void loadLocalFavicons(){
         this.localFavicons.clear();
         
-        logger.info("Loading local image files as Favicons...");
+        logger.info("[-] Loading local image files as Favicons...");
         
         Path folder = core.getPlugin().getFolderPath().resolve("favicons");
         if(!Files.exists(folder)){
             try{
                 Files.createDirectories(folder);
-                logger.info("Created favicons folder.");
+                logger.debugSuccess(FaviconHandler.class, "Created favicons folder.");
             }catch(IOException ex){
-                logger.warn("Cannot create favicons folder. Encountered an IOException.", ex);
+                logger.failure("Cannot create favicons folder. Encountered an IOException.", ex);
                 return;
             }
         }
@@ -121,8 +154,10 @@ public class FaviconHandler<F>{
             pathStream.filter(Files::isRegularFile)
                 .filter(file -> file.getFileName().toString().endsWith(".png"))
                 .forEach(this::loadFile);
+            
+            logger.success("Loaded <white>%d</white> local Favicons.", localFavicons.size());
         }catch(IOException ex){
-            logger.warn("Cannot load files from Favicons folder.", ex);
+            logger.failure("Cannot load files from favicons folder.", ex);
         }
     }
     
@@ -130,14 +165,14 @@ public class FaviconHandler<F>{
         try(InputStream stream = Files.newInputStream(path)){
             F favicon = createFavicon(stream);
             if(favicon == null){
-                logger.warn("Cannot create Favicon from file '%s'. Received Favicon was null.", path.getFileName().toString());
+                logger.failure("Cannot create Favicon from file '<white>%s</white>'. Received Favicon was null.", path.getFileName().toString());
                 return;
             }
             
-            localFavicons.put(path.getFileName().toString().split("\\.")[0], favicon);
-            logger.info("Loaded file '%s' as Favicon.", path.getFileName().toString());
+            localFavicons.put(path.getFileName().toString().toLowerCase(Locale.ROOT), favicon);
+            logger.debugSuccess(FaviconHandler.class, "Loaded file '<white>%s</white>' as Favicon.", path.getFileName().toString());
         }catch(IOException ex){
-            logger.warn("Cannot create Favicon from file '%s'. Encountered IOException.", ex);
+            logger.failure("Cannot create Favicon from file '<white>%s</white>'. Encountered IOException.", ex);
         }
     }
     
@@ -152,11 +187,11 @@ public class FaviconHandler<F>{
             try(InputStream stream = client.send(request, HttpResponse.BodyHandlers.ofInputStream()).body()){
                 return createFavicon(stream);
             }catch(InterruptedException | IOException ex){
-                logger.warn("Cannot create Favicon from URL '%s'. Encountered an Exception.", ex, url);
+                logger.warn("Cannot create Favicon from URL '<white>%s</white>'. Encountered an Exception.", ex, url);
                 return null;
             }
         }catch(URISyntaxException ex){
-            logger.warn("Cannot create Favicon from URL '%s'. Encountered an IOException.", ex, url);
+            logger.warn("Cannot create Favicon from URL '<white>%s</white>'. Encountered a URISyntaxException.", ex, url);
             return null;
         }
     }

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

@@ -79,43 +79,41 @@ public class PlayerHandler{
         try(BufferedReader reader = Files.newBufferedReader(cache)){
             cachedPlayers = gson.fromJson(reader, listType);
         }catch(IOException ex){
-            logger.warn("Encountered IOException while reading the playercache.json file!", ex);
+            logger.warn("Encountered IOException while reading the <white>playercache.json</white> file!", ex);
             return;
         }catch(JsonIOException | JsonSyntaxException ex){
-            logger.warn("Encountered JsonSyntaxException while parsing playercache.json file!", ex);
+            logger.warn("Encountered JsonSyntaxException while parsing <white>playercache.json</white> file!", ex);
             return;
         }
         
         // In case Gson messes up... I guess.
         if(cachedPlayers == null){
-            logger.warn("Couldn't load players from playercache.json file. Is the JSON valid?");
+            logger.warn("Couldn't load players from <white>playercache.json</white> file. Is the JSON valid?");
             // Create new ArrayList instance to avoid further issues.
             cachedPlayers = new ArrayList<>();
             return;
         }
         
-        logger.info("Loaded %d players into cache!", cachedPlayers.size());
+        logger.success("Loaded <white>%d</white> players into cache!", cachedPlayers.size());
     }
     
     public void save(){
         if(cachedPlayers.isEmpty()){
-            logger.info("No players in cache to save. Skipping...");
+            logger.debug(PlayerHandler.class, "No players in cache to save. Skipping...");
             return;
         }
         
         if(core.getFileHandler().getBoolean("disableCache")){
-            logger.info("'disable_cache' is set to true. Skipping saving of cached players...");
+            logger.debug(PlayerHandler.class, "[-] 'disable_cache' is set to true. Not saving cached players.");
             return;
         }
         
         try(BufferedWriter writer = Files.newBufferedWriter(cache, StandardCharsets.UTF_8)){
             gson.toJson(cachedPlayers, listType, writer);
-            logger.info("Successfully saved playercache.json file.");
+            logger.success("Successfully saved <white>playercache.json</white> file.");
         }catch(IOException ex){
-            logger.warn("Encountered IOException while saving cached players to playercache.json!", ex);
+            logger.failure("Encountered IOException while saving cached players to <white>playercache.json</white>!", ex);
         }
-        
-        
     }
     
     public void addPlayer(String ip, String name, UUID uuid){

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

@@ -55,11 +55,26 @@ public class ProfileManager{
         NullBool hidePlayersEnabled = resolve(defEntry, entry, ProfileEntry::hidePlayersEnabled);
         NullBool extraPlayersEnabled = resolve(defEntry, entry, ProfileEntry::extraPlayersEnabled);
         NullBool maxPlayersEnabled = resolve(defEntry, entry, ProfileEntry::maxPlayersEnabled);
-        Integer extraPlayersCount = resolve(defEntry, entry, ProfileEntry::extraPlayersCount);
-        Integer maxPlayersCount = resolve(defEntry, entry, ProfileEntry::maxPlayersCount);
+        NullBool onlinePlayersEnabled = resolve(defEntry, entry, ProfileEntry::onlinePlayersEnabled);
+        NullBool hidePlayersHoverEnabled = resolve(defEntry, entry, ProfileEntry::hidePlayersHoverEnabled);
+        String extraPlayersCount = resolve(defEntry, entry, ProfileEntry::extraPlayersCount);
+        String maxPlayersCount = resolve(defEntry, entry, ProfileEntry::maxPlayersCount);
+        String onlinePlayersCount = resolve(defEntry, entry, ProfileEntry::onlinePlayersCount);
         
-        return new ProfileEntry(motd, players, playerCountText, favicon, hidePlayersEnabled, extraPlayersEnabled,
-            maxPlayersEnabled, extraPlayersCount, maxPlayersCount);
+        return new ProfileEntry.Builder()
+            .motd(motd)
+            .players(players)
+            .playerCountText(playerCountText)
+            .favicon(favicon)
+            .hidePlayersEnabled(hidePlayersEnabled)
+            .extraPlayersEnabled(extraPlayersEnabled)
+            .maxPlayersEnabled(maxPlayersEnabled)
+            .onlinePlayersEnabled(onlinePlayersEnabled)
+            .hidePlayersHoverEnabled(hidePlayersHoverEnabled)
+            .extraPlayersCount(extraPlayersCount)
+            .maxPlayersCount(maxPlayersCount)
+            .onlinePlayersCount(onlinePlayersCount)
+            .build();
     }
     
     public static ServerListProfile resolveProfile(AdvancedServerList<?> core, GenericPlayer player, GenericServer server){
@@ -82,8 +97,11 @@ public class ProfileManager{
         NullBool hidePlayers = resolveNullBool(node, "playerCount", "hidePlayers");
         NullBool extraPlayersEnabled = resolveNullBool(node, "playerCount", "extraPlayers", "enabled");
         NullBool maxPlayersEnabled = resolveNullBool(node, "playerCount", "maxPlayers", "enabled");
-        Integer extraPlayers = resolveNullableInt(node, "playerCount", "extraPlayers", "amount");
-        Integer maxPlayers = resolveNullableInt(node, "playerCount", "maxPlayers", "amount");
+        NullBool onlinePlayersEnabled = resolveNullBool(node, "playerCount", "onlinePlayers", "enabled");
+        NullBool hidePlayersHoverEnabled = resolveNullBool(node, "playerCount", "hidePlayersHover");
+        String extraPlayers = resolveNullableString(node, "playerCount", "extraPlayers", "amount");
+        String maxPlayers = resolveNullableString(node, "playerCount", "maxPlayers", "amount");
+        String onlinePlayers = resolveNullableString(node, "playerCount", "onlinePlayers", "amount");
         
         return new ProfileEntry.Builder()
             .motd(motd)
@@ -93,8 +111,11 @@ public class ProfileManager{
             .hidePlayersEnabled(hidePlayers)
             .extraPlayersEnabled(extraPlayersEnabled)
             .maxPlayersEnabled(maxPlayersEnabled)
+            .onlinePlayersEnabled(onlinePlayersEnabled)
+            .hidePlayersHoverEnabled(hidePlayersHoverEnabled)
             .extraPlayersCount(extraPlayers)
             .maxPlayersCount(maxPlayers)
+            .onlinePlayersCount(onlinePlayers)
             .build();
     }
     
@@ -137,10 +158,10 @@ public class ProfileManager{
         return NullBool.resolve(node.node(path).getBoolean());
     }
     
-    private static Integer resolveNullableInt(ConfigurationNode node, Object... path){
+    private static String resolveNullableString(ConfigurationNode node, Object... path){
         if(node.node(path).virtual())
             return null;
         
-        return node.node(path).getInt();
+        return node.node(path).getString();
     }
 }

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

@@ -53,9 +53,12 @@ public class ProfileSerializer implements TypeSerializer<ProfileEntry>{
         node.node("playerCount", "text").set(profile.playerCountText());
         node.node("favicon").set(profile.favicon());
         node.node("playerCount", "hidePlayers").set(profile.hidePlayersEnabled().getOrDefault(false));
+        node.node("playerCount", "hidePlayersHover").set(profile.hidePlayersHoverEnabled().getOrDefault(false));
         node.node("playerCount", "extraPlayers", "enabled").set(profile.extraPlayersEnabled().getOrDefault(false));
-        node.node("playerCount", "extraPlayers", "amount").set((profile.extraPlayersCount() == null) ? 0 : profile.extraPlayersCount());
+        node.node("playerCount", "extraPlayers", "amount").set((profile.extraPlayersCount() == null) ? "0" : profile.extraPlayersCount());
         node.node("playerCount", "maxPlayers", "enabled").set(profile.maxPlayersEnabled().getOrDefault(false));
-        node.node("playerCount", "maxPlayers", "amount").set((profile.maxPlayersCount() == null) ? 0 : profile.maxPlayersCount());
+        node.node("playerCount", "maxPlayers", "amount").set((profile.maxPlayersCount() == null) ? "0" : profile.maxPlayersCount());
+        node.node("playerCount", "onlinePlayers", "enabled").set(profile.onlinePlayersEnabled().getOrDefault(false));
+        node.node("playerCount", "onlinePlayers", "amount").set(profile.onlinePlayersCount() == null ? "0" : profile.onlinePlayersCount());
     }
 }

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

@@ -72,6 +72,9 @@ public class StringReplacer{
         boolean identified = false;
         boolean invalid = true;
         
+        int placeholderStart = position.getIndex() - 1;
+        int valueStart = position.getIndex() - 1;
+        
         char[] chars = input.substring(index).toCharArray();
         for(final char c : chars){
             index++;
@@ -83,6 +86,7 @@ public class StringReplacer{
             
             if(c == ' ' && !identified){
                 identified = true;
+                valueStart = index + 1;
                 continue;
             }
             
@@ -98,10 +102,6 @@ public class StringReplacer{
         
         StringBuilder raw = new StringBuilder();
         
-        // Condition parsing needs one extra increase of index... for some reason
-        if(collector != null)
-            index++;
-        
         position.setIndex(index);
         
         if(invalid){
@@ -111,7 +111,7 @@ public class StringReplacer{
                 raw.append(' ').append(valuesStr);
             
             if(collector != null)
-                collector.appendWarningFormatted(index, "Placeholder '%s' does not have a closing bracket (})", raw.toString());
+                collector.appendWarningFormatted(index, "Placeholder '<white>%s</white>' does not have a closing bracket (})", raw.toString());
             
             return raw.toString();
         }
@@ -126,7 +126,7 @@ public class StringReplacer{
             raw.append('}');
             
             if(collector != null)
-                collector.appendWarningFormatted(index, "Placeholder '%s' does not have any available PlaceholderProvider", raw.toString());
+                collector.appendWarningFormatted(placeholderStart, "Placeholder '<white>%s</white>' does not have any available PlaceholderProvider", raw.toString());
             
             return raw.toString();
         }
@@ -141,7 +141,7 @@ public class StringReplacer{
             raw.append('}');
             
             if(collector != null)
-                collector.appendWarningFormatted(index, "Placeholder '%s' has an invalid value String '%s'", raw.toString(), valuesStr);
+                collector.appendWarningFormatted(valueStart, "Placeholder '<white>%s</white>' has an invalid value String '<white>%s</white>'", raw.toString(), valuesStr);
             
             return raw.toString();
         }

core/src/main/resources/config.yml

@@ -48,6 +48,14 @@ checkUpdates: true
 #
 debug: false
 
+#
+# Should the "ASL" ASCI art be displayed on plugin startup?
+# Setting this to false will hide the banner.
+#
+# Default: true
+#
+printBanner: true
+
 #
 # Sets how long Favicons should be cached. Value is in minutes with the lowest possible value being 1.
 #
@@ -84,6 +92,12 @@ disableDuringMaintenance:
   #
   hidePlayers: true
   #
+  # Whether hiding player list on hover should be disabled while Maintenance mode is active.
+  #
+  # Default: true
+  #
+  hidePlayersHover: true
+  #
   # Whether player count text changing should be disabled while Maintenance mode is active.
   #
   # Default: true
@@ -107,6 +121,12 @@ disableDuringMaintenance:
   # Default: true
   #
   maxPlayers: true
+  #
+  # Whether the online players feature should be disabled while Maintenance mode is active.
+  #
+  # Default: true
+  #
+  onlinePlayers: true
 
 #
 # DO NOT EDIT!

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

@@ -58,12 +58,17 @@ motd:
 # This option supports three types of inputs:
 #
 #   1. Name, including .png extension, pointing to an image located in the plugin's favicons folder.
-#   2. URL pointing to an image.*
-#   3. Player name, UUID or placeholders returning one of these.*
+#   2. "random" to display a random PNG from the favicons folder.
+#   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.
 #
-# * These images are loaded asynchronously, meaning they may not yet be "ready" when AdvancedServerList is done with
-#   the event, requiring a refresh of the server list by the player to have it shown.
+# 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.
 #
@@ -90,6 +95,15 @@ playerCount:
   #
   hidePlayers: false
   #
+  # Set whether the List of players is shown when hovering over the player count.
+  # Setting this to true will also make the plugin ignore the hover option below.
+  #
+  # If not present, defaults to false.
+  #
+  # Read more: https://asl.andre601.ch/profiles/#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.
@@ -134,6 +148,7 @@ playerCount:
     enabled: false
     #
     # Set the number that should be added to the online player count to then use as the new max player count.
+    # Placeholders resolving to numbers can be used here.
     #
     # Example: Setting this to 1 will result in ${server playersMax} displaying 11 while 10 players are online,
     #          9 when 8 are online and so on.
@@ -162,9 +177,34 @@ playerCount:
     enabled: false
     #
     # Set the number that should be used as the new max players count.
+    # Placeholders resolving to numbers can be used here.
     #
     # If not present, defaults to 0.
     #
     # Read more: https://asl.andre601.ch/profiles/#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
+  #
+  onlinePlayers:
+    #
+    # Set whether the onlinePlayers feature should be enabled or not.
+    # When set to true, the max player count will be set to the 'amount' value.
+    #
+    # If not present, defaults to false.
+    #
+    # Read more: https://asl.andre601.ch/profiles/#onlineplayers-enabled
+    #
+    enabled: false
+    #
+    # Set the number that should be used as the new online players count.
+    # Placeholders resolving to numbers can be used here.
+    #
+    # If not present, defaults to current online player count.
+    #
+    # Read more: https://asl.andre601.ch/profiles/#onlineplayers-amount
+    #
     amount: 0

core/src/test/java/ch/andre601/advancedserverlist/core/DummyPluginLogger.java

@@ -23,7 +23,7 @@
  *
  */
 
-package ch.andre601.advancedserverlist.test;
+package ch.andre601.advancedserverlist.core;
 
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
 

core/src/test/java/ch/andre601/advancedserverlist/core/ExpressionParserTests.java

@@ -23,7 +23,7 @@
  *
  */
 
-package ch.andre601.advancedserverlist.test;
+package ch.andre601.advancedserverlist.core;
 
 import ch.andre601.advancedserverlist.core.profiles.conditions.ProfileConditionParser;
 import ch.andre601.expressionparser.ParseWarnCollector;

core/src/test/java/ch/andre601/advancedserverlist/core/FlexVerTests.java

@@ -23,7 +23,7 @@
  *
  */
 
-package ch.andre601.advancedserverlist.test;
+package ch.andre601.advancedserverlist.core;
 
 import com.unascribed.flexver.FlexVerComparator;
 import org.junit.jupiter.api.Test;

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/replacer.py

@@ -17,7 +17,7 @@
 import re
 
 from mkdocs.config.defaults import MkDocsConfig
-from mkdocs.structure.files import File, Files
+from mkdocs.structure.files import Files
 from mkdocs.structure.pages import Page
 
 def on_page_markdown(

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 %}
+<p class="api-detail__description">
+
+{{ enum.description }}
+
+</p>
+{% 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

@@ -0,0 +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>
+{% endblock %}

docs/.snippets/links.md

@@ -0,0 +1,10 @@
+[discord]: https://discord.gg/MyPTjpsgGH
+
+[placeholderapi]: https://hangar.papermc.io/HelpChat/PlaceholderAPI
+[viaversion]: https://hangar.papermc.io/ViaVersion/ViaVersion
+[papiproxybridge]: https://hangar.papermc.io/William278/PAPIProxyBridge
+[maintenance]: https://hangar.papermc.io/kennytv/Maintenance
+
+[modrinth]: https://modrinth.com/plugin/advancedserverlist
+[hangar]: https://hangar.papermc.io/Andre_601/AdvancedServerList
+[codeberg]: https://codeberg.org/Andre601/AdvancedServerList

docs/addons/first-party/banplugins.md

@@ -1,7 +1,14 @@
+---
+icon: octicons/stop-24
+---
 # BanPlugins Addon
 
 The BanPlugins Addon was made to provide placeholders for different punishment plugins to use in AdvancedServerList.
 
+/// info
+The BanPlugins Addon is available in downloads of AdvancedServerList on [:simple-modrinth: Modrinth](https://modrinth.com/plugin/advancedserverlist) and in [Releases on :simple-codeberg: Codeberg](https://codeberg.org/Andre601/AdvancedServerList/releases).
+///
+
 ## Placeholders
 
 /// tab | AdvancedBan

docs/addons/index.md

@@ -13,7 +13,7 @@ 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)
 
     ----
     
@@ -25,4 +25,12 @@ These Addons are made by Andre601 and available together with the plugin downloa
 
 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,39 @@
+---
+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)^         |
+
+<small>^1^{ #n1 } Only works when Proxy mode is enabled and will otherwise return `PROXY_MODE IS NOT ENABLED!`</small>
+///
+
+/// tab | :fontawesome-solid-paper-plane: 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]: https://modrinth.com/plugin/sayanvanish
+[source-paper]: https://github.com/Syrent/SayanVanish/blob/ffd740832fd914c6462c41917a91f575f43ee778/sayanvanish-bukkit/src/main/kotlin/org/sayandev/sayanvanish/bukkit/feature/features/hook/FeatureHookAdvancedServerList.kt
+[source-velocity]: https://github.com/Syrent/SayanVanish/blob/585279bf5480542858a9d3d91cfc4d844982aa0f/sayanvanish-proxy/sayanvanish-proxy-velocity/src/main/kotlin/org/sayandev/sayanvanish/velocity/feature/features/hook/FeatureHookAdvancedServerList.kt

docs/api/adding-placeholders.md

@@ -0,0 +1,183 @@
+---
+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.
+
+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).
+
+## Create your PlaceholderProvider class
+
+AdvancedServerList's placeholder system uses a dedicated [`PlaceholderProvider`](reference/api/ch.andre601.advancedserverlist.api/placeholderprovider.md) class where the placeholder gets defined and its values parsed.  
+In order to add your own, you'll need to first create a new class and make it extend the `PlaceholderProvider` class:
+
+```java title="MyPlaceholder.java"
+public class MyPlaceholder extends PlaceholderProvider {
+    
+}
+```
+
+Your IDE should now report issues, namely a missing method to override and a missing Constructor to match the extended class' one. Your IDE should allow you to easily implement those, if not, then manually add the constructor with a `String` argument and the `public String parsePlaceholder` method with `String`, [`GenericPlayer`](reference/api/ch.andre601.advancedserverlist.api/objects/genericplayer.md) and [`GenericServer`](reference/api/ch.andre601.advancedserverlist.api/objects/genericserver.md) arguments:
+
+```java { title="MyPlaceholder.java" .annotate }
+public class MyPlaceholder extends PlaceholderProvider {
+    
+    public MyPlaceholder(String identifier) {
+        super(identifier); // (1)
+    }
+    
+    @Override
+    public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server) {
+        return null;
+    }
+}
+```
+
+1.  It is recommended to replace the Constructor with a No-Args Constructor and set the placeholder name directly in the `super` call:  
+    ```java
+    public MyPlaceholder() {
+        super("myplaceholder");
+    }
+    ```
+
+## Parsing placeholders
+
+To now parse your placeholders, all you need to do is edit the `parsePlaceholder` method.  
+AdvancedServerList calls this method whenever it finds a matching identifier of a PlaceholderProvider, with the `String` argument being the actual value after the identifier and the `GenericPlayer` and `GenericServer` arguments holding the Player and server values respectively.
+
+As an example, assuming you simply want to return `Hello` for the placeholder `${myplaceholder sayHello}`, this would be the code for it:
+
+```java { title="MyPlaceholder.java" .annotate }
+public class MyPlaceholder extends PlaceholderProvider {
+    
+    public MyPlaceholder() {
+        super("myplaceholder");
+    }
+    
+    @Override
+    public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server) {
+        if (placeholder.equals("sayHello")) {
+            return "Hello";
+        }
+        
+        return null; // (1)
+    }
+}
+```
+
+1. Returning `null` tells AdvancedServerList that the placeholder was invalid, making it return the placeholder unchanged, while also reporting an error, if used in `condition`.
+
+## Registering the Placeholder
+
+The final step now would be to register your placeholder for AdvancedServerList to use.  
+To do this, obtain an instance of the [`AdvancedServerListAPI`](reference/api/ch.andre601.advancedserverlist.api/advancedserverlistapi.md) through its static `get()` method and then call `addPlaceholderProvider(PlaceholderProvider)` through it:
+
+/// tab | :fontawesome-solid-paper-plane: Paper Example
+```java title="MyPlugin.java"
+public class MyPlugin extends JavaPlugin {
+    
+    @Override
+    public void onEnable() {
+        AdvancedServerListAPI api = AdvancedServerListAPI.get();
+        api.addPlaceholderProvider(new MyPlaceholder());
+        getLogger().info("Hooked into AdvancedServerList!");
+    }
+}
+```
+///
+
+/// tab | :octicons-git-merge-24: BungeeCord Example
+```java title="MyPlugin.java"
+public class MyPlugin extends Plugin {
+    
+    @Override
+    public void onEnable() {
+        AdvancedServerListAPI api = AdvancedServerListAPI.get();
+        api.addPlaceholderProvider(new MyPlaceholder());
+        getLogger().info("Hooked into AdvancedServerList!");
+    }
+}
+```
+///
+
+/// tab | :fontawesome-solid-paper-plane: Velocity Example
+```java title="MyPlugin.java"
+@Plugin(
+    id = "myplugin",
+    version = "1.0.0",
+    authors = {"You?"},
+    dependencies = {
+        @Dependency(id = "advancedserverlist")
+    }
+)
+public class MyPlugin {
+    
+    private final ProxyServer proxy;
+    private final Logger logger;
+    
+    @Inject
+    public MyPlugin(ProxyServer proxy, Logger logger) {
+        this.proxy = proxy;
+        this.logger = logger;
+    }
+    
+    @Subscribe
+    public void onProxyInitialization(ProxyInitializeEvent event) {
+        AdvancedServerListAPI api = AdvancedServerListAPI.get();
+        api.addPlaceholderProvider(new MyPlaceholder());
+        logger.info("Hooked into AdvancedServerList!");
+    }
+}
+```
+///
+
+## You're done
+
+Your Placeholders should now be registered successfully if they check the following:
+
+- The provided identifier is not `null` nor empty.
+- The provided identifier does not contain spaces.
+- The provided identifier is not already registered in the API.
+
+## Note on `GenericPlayer` and `GenericServer`
+
+The different platform APIs of AdvancedServerList provide extended versions of the `GenericPlayer` and `GenericServer` instances used, providing additional methods otherwise not available.  
+Should you want to use these specific instances will you need to add the platform API as an additional dependency to your project and then cast the `GenericPlayer` and/or `GenericServer` instance to the platform specific version.
+
+Below is an example using the `platform-bukkit` API (This assumes your plugin is one running on Paper):
+
+```java { title="MyPlaceholder.java" .annotate }
+public class MyPlaceholder extends PlaceholderProvider {
+    
+    public MyPlaceholder() {
+        super("myplaceholder");
+    }
+    
+    @Override
+    public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server) {
+        if (!(player instanceof BukkitPlayer bukkitPlayer)) {
+            return null; // (1)
+        }
+        
+        return switch (placeholder) {
+            case "playedBefore" -> String.valueOf(bukkitPlayer.hasPlayedBefore());
+            case "whitelisted" -> String.valueOf(bukkitPlayer.isWhitelisted());
+            case "banned" -> String.valueOf(bukkitPlayer.isBanned());
+            default -> null;
+        };
+    }
+}
+```
+
+1.  Depending on the Java version you use will you need to alter the code:  
+    ```java
+    if (!(player instanceof BukkitPlayer)) {
+        return null;
+    }
+    
+    // You need to cast it separately.
+    BukkitPlayer bukkitPlayer = (BukkitPlayer) player;
+    
+    // ...use bukkitPlayer here.
+    ```

docs/api/changelog.md

@@ -7,6 +7,32 @@ icon: octicons/log-24
 This page lists the recent changes made towards the AdvancedServerListAPI.  
 They are ordered newest to oldest.
 
+## v4.1.0 { #v4.1.0 }
+
+### :octicons-plus-circle-24:{ .changelog-added title="Added" } Added { #v-added }
+
+- 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
+
+## v4.0.0 { #v4.0.0 }
+
+### :octicons-alert-24:{ .changelog-breaking title="Breaking Changes" } Breaking Changes { #v4.0.0-breaking }
+
+- Changed `extraPlayersCount()` and `maxPlayersCount()` from using an Integer to using a String instead.
+    - This also affects their corresponding `ProfileEntry.Builder` methods.
+- Removed all previously deprecated methods.
+
+### :octicons-plus-circle-24:{ .changelog-added title="Added" } Added { #v4.0.0-added }
+
+- New setter methods added to [`ProfileEntry.Builder`][profileentry.builder] class:
+    - [`onlinePlayersCount(String)`][onlinePlayersCount]
+    - [`onlinePlayersEnabled(NullBool)`][onlinePlayersEnabled]
+
+[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 }
 
 ### :octicons-plus-circle-24:{ .changelog-added title="Added" } Added { #v3.3.0-added }
@@ -36,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(integer)
-[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(integer)
-[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 }
 
@@ -102,22 +128,19 @@ They are ordered newest to oldest.
     - [`maxPlayersEnabled()`][maxplayersenabled] - Returns the value for `playerCount -> maxPlayers -> enabled` as `NullBool`
     - [`maxPlayersCount()`][maxplayerscount] - Returns the value of `playerCount -> maxPlayers -> amount` as nullable `Integer`
 - New setters in [`ProfileEntry.Builder`][profileentry.builder]:
-    - [`setMaxPlayersEnabled(NullBool)`][setmaxplayersenabled] - Sets whether the max players feature is enabled or not.
-    - [`setMaxPlayersCount(Integer)`][setmaxplayerscount] - Sets the number to use for the max players count.
-    - [`setExtraPlayersCount(Integer)`][setextraplayersecount] - Replacement for [deprecated `setExtraPlayerCount(Integer)` method](#v3.1.0-deprecated).
+    - `setMaxPlayersEnabled(NullBool)`- Sets whether the max players feature is enabled or not.
+    - `setMaxPlayersCount(Integer)` - Sets the number to use for the max players count.
+    - `setExtraPlayersCount(Integer)` - Replacement for [deprecated `setExtraPlayerCount(Integer)` method](#v3.1.0-deprecated).
 
 ### :octicons-zap-24:{ .changelog-breaking title="Deprecated" } Deprecated { #v3.1.0-deprecated }
 
 - `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
-[setmaxplayersenabled]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#setmaxplayersenabled(nullbool)
-[setmaxplayerscount]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#setmaxplayerscount(integer)
-[setextraplayersecount]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#setextraplayerscount(integer)
 
 ----
 

docs/api/index.md

@@ -11,7 +11,7 @@ AdvancedServerList offers an API that other plugins can use to add their own pla
 Add the following to your `pom.xml`, `build.gradle` or `build.gradle.kts` depending on what you use:
 
 /// tab | :simple-apachemaven: Maven 
-```xml title="pom.xml"
+```xml { data-md-component="api-version" title="pom.xml" }
 <repositories>
   <repository>
     <id>codeberg</id>
@@ -51,7 +51,7 @@ Add the following to your `pom.xml`, `build.gradle` or `build.gradle.kts` depend
 ///
 
 /// tab | :simple-gradle: Gradle
-```groovy title="build.gradle"
+```groovy { data-md-component="api-version" title="build.gradle" }
 repositorories {
     maven { url = 'https://codeberg.org/api/packages/Andre601/maven/' }
 }
@@ -68,7 +68,7 @@ dependencies {
 ///
 
 /// tab | :simple-gradle: Gradle (KTS)
-```kotlin title="build.gradle.kts"
+```kotlin { data-md-component="api-version" title="build.gradle.kts" }
 repositories {
     maven("https://codeberg.org/api/packages/Andre601/maven/")
 }
@@ -84,129 +84,23 @@ dependencies {
 ```
 ///
 
-## Adding your own Placeholders
+## Tutorials
 
-<!-- admo:info This requires the main api module -->
+Dedicated pages to explain aspects of the API are available:
 
-The API allows you to add your own placeholders which would be available through the `${<identifier> <values>}` placeholder Pattern in a Server List profile.
+<div class="grid cards" markdown>
 
-To add your own placeholders, follow these steps:
+- [:octicons-plus-circle-24: Adding Placeholders](adding-placeholders.md)
+- [:octicons-broadcast-24: Listening for Events](listening-for-events.md)
 
-### 1. Create a Placeholder class
+</div>
 
-You should first create a new class and make it extend the abstract [`PlaceholderProvider`][placeholderprovider]. This class includes a constructor and a method you need to add, so do that:
-
-```java
-public class MyPlaceholders extends PlaceholderProvider {
-    
-    public MyPlaceholders(String identifier) {
-        super(identifier);
-    }
-    
-    @Override
-    public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server) {
-        return null;
-    }
-}
-```
-
-/// tip
-You can replace the Constructor with a String argument with a no-args constructor and set the identifier directly in the `super`:
-```java
-public MyPlaceholders() {
-    super("myplaceholders");
-}
-```
-///
-
-The [`parsePlaceholder(String, GenericPlayer, GenericServer)`][parseplaceholder] method is used by AdvancedServerList to replace a matching placeholder with a value.  
-What you return is completely up to you. Just keep in mind that returning `null` will be treated as an invalid placeholder by AdvancedServerList, resulting in the placeholder being returned as-is without any changes.
-
-[placeholderprovider]: reference/api/ch.andre601.advancedserverlist.api/placeholderprovider.md
-[parseplaceholder]: reference/api/ch.andre601.advancedserverlist.api/placeholderprovider.md#parseplaceholder(string,-genericplayer,-genericserver)
-
-/// details | Example of final class
-    type: example
-
-```java
-public class MyPlaceholders extends PlaceholderProvider {
-    
-    public MyPlaceholders() {
-        super("myplaceholders");
-    }
-    
-    @Override
-    public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server) {
-        if(placeholder.equalsIgnoreCase("hello"))
-            return "Hello " + player.getName();
-        
-        return null;
-    }
-}
-```
-///
-
-### 2. Register the Placeholders
-
-Next step should be to register the placeholder. To achieve this, first obtain an instance of the [`AdvancedServerListAPI`][advancedserverlistapi] by using the static [`get()`][get] method. After that call [`addPlaceholderProvider(PlaceholderProvider placeholderProvider)`][addplaceholderprovider].  
-Your code may look similar to this:
-
-```java title="Registering PlaceholderProvider class"
-public class MyPlugin extends JavaPlugin {
-    
-    @Override
-    public void onEnable() {
-        AdvancedServerListAPI api = AdvancedServerListAPI.get();
-        
-        api.addPlaceholderProvider(new MyPlaceholders());
-    }
-}
-```
-
-[advancedserverlistapi]: reference/api/ch.andre601.advancedserverlist.api/advancedserverlistapi.md
-[get]: reference/api/ch.andre601.advancedserverlist.api/advancedserverlistapi.md#get()
-[addplaceholderprovider]: reference/api/ch.andre601.advancedserverlist.api/advancedserverlistapi.md#addplaceholderprovider(placeholderprovider)
-
-This should register your PlaceholderExpansion as long as it is valid, meaning that the identifier...
-
-- ...is not `null`
-- ...is not containing spaces
-- ...is not using a name already registered in the API
-
-### 3. Declare AdvancedServerList as (soft)depend
+## Declare AdvancedServerList as (soft)depend
 
 The final thing you should make sure is to define AdvancedServerList as a depend or soft-depend for your plugin, to make sure it loads after AdvancedServerList.
 
 Below are example setups for Spigot, Paper, BungeeCord and Velocity:
 
-/// tab | :simple-spigotmc: Spigot
-//// tab | Softdepend
-```yaml title="plugin.yml"
-name: "MyPlugin"
-author: "author"
-version: "1.0.0"
-
-main: "com.example.plugin.ExamplePlugin"
-
-softdepend:
-  - AdvancedServerList
-```
-////
-
-//// tab | Depend
-```yaml title="plugin.yml"
-name: "MyPlugin"
-author: "author"
-version: "1.0.0"
-
-main: "com.example.plugin.ExamplePlugin"
-
-depend:
-  - AdvancedServerList
-```
-////
-///
-
 /// tab | :fontawesome-solid-paper-plane: Paper
 //// tab | Softdepend
 ```yaml title="paper-plugin.yml"
@@ -379,10 +273,10 @@ The event offers the following methods:
 
 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)
+[getentry]: reference/api/ch.andre601.advancedserverlist.api/events/genericserverlistevent.md#getentry
+[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
 
 ### PostServerListSetEvent
 
@@ -403,4 +297,4 @@ A convenience method ([`builder()`][builder()]) exists to create a `Builder` ins
 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()
+[builder()]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/index.md#builder

docs/api/listening-for-events.md

@@ -0,0 +1,65 @@
+---
+icon: octicons/broadcast-24
+---
+
+AdvancedServerList provides some events that your plugin can listen to.  
+These events are structurally the same across all platforms, yet still require the usage of Platform-specific APIs due to how some events are registered and handled on some platforms.
+
+The plugin currently offers the following events:
+
+<div class="grid cards" markdown>
+
+- [PreServerListSetEvent](#preserverlistsetevent)
+- [PostServerListSetEvent](#postserverlistsetevent)
+
+</div>
+
+## PreServerListSetEvent
+
+This event is executed before AdvancedServerList tries to modify the player list.  
+
+### Methods { #preserverlistsetevent-methods }
+
+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.                                              |
+
+### Notes { #preserverlistsetevent-notes }
+
+- Providing `null` as the `ProfileEntry` for `setEntry(ProfileEntry)` is not allowed. Also, a copy of the provided `ProfileEntry` is made and used.
+
+## PostServerListSetEvent
+
+This event is executed after AdvancedServerList completed the server list modifications.
+
+### Methods { #postserverlistsetevent-methods }
+
+| Method                   | Description                                                              |
+|--------------------------|--------------------------------------------------------------------------|
+| `getEntry()`             | Returns the [`ProfileEntry`][profileentry] that AdvancedServerList used. |
+
+### Notes { #postserverlistsetevent-notes }
+
+-   The returned `ProfileEntry` is not an actual representation of what is being displayed to the player and rather an instance of values the plugin received.
+    The returned value may also be `null` should the Ping Event be cancelled due to things such as an invalid Protocol or the [`PreServerListSetEvent`](#preserverlistsetevent) being cancelled.
+
+## Registering the Events
+
+To register an event, please refer to our platforms documentation on how to do this.
+
+## What is a ProfileEntry?
+
+Both events provide and use a so called [`ProfileEntry`][profileentry].  
+The `ProfileEntry` is a record, representing the values of a [Server List Profile](../profiles/index.md), meaning all values you can set in the profile configuration (Except condition and priority) will be available as a `ProfileEntry`.
+
+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.
+
+[profileentry]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/index.md

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,5 +1,5 @@
 ---
-template: 'api-doc.html'
+api: true
 
 constructors:
   - name: 'InvalidPlaceholderProviderException'

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

@@ -1,12 +1,12 @@
 ---
-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>
+      Returns the name of the player.  
+      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.
+      
       Name may be whatever has been defined in AdvancedServerList's config.yml, should the player not be cached yet by the plugin.
     returns: 'String representing the player''s name'
     type:
@@ -14,15 +14,15 @@ methods:
       type: object
   - name: 'getProtocol'
     description: |
-      Returns the protocol ID the player is using.<br>
+      Returns the protocol ID the player is using.  
       The protocol ID is an integer used by Minecraft to determine what version a server or client is running.
     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>
+      Returns the unique ID associated with this player.
+      
       UUID may be whatever has been defined in AdvancedServerList's config.yml, should the player not be cached yet by AdvancedServerList.
     returns: 'UUID of the player'
     type:
@@ -37,6 +37,6 @@ The different variants of AdvancedServerList implement this into their own class
 
 The following values will always be present, no matter the platform this interface is used on:
 
-- [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'

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'

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,334 +13,199 @@ constructors:
 methods:
   - name: 'extraPlayersCount'
     description: |
-      Sets the number of players to add to the online players to use as the new max players value.<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, set <a href="#setextraplayersenabled(nullbool)"><code>setExtraPlayersEnabled(NullBool)</code></a> to <a href="../../../objects/nullbool/#false"><code>NullBool.FALSE</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: 'Integer'
-        attribute:
+        type: 'String'
+        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.
+      
+      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'
+        attributes:
+          - 'notnull'
+    returns: 'This Builder after the NullBool has been set. Useful for chaining.'
+    throws:
+      - name: 'IllegalArgumentException'
+        description: 'Thrown by the `CheckUtil` in case `null` has been provided as parameter.'
   - name: 'maxPlayersCount'
     description: |
-      Sets the number of max players allowed to join this server.<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.  
+      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'
+        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.
+      
+      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'
+        attributes:
+          - 'notnull'
+    returns: 'This Builder after the NullBool has been set. Useful for chaining.'
+    throws:
+      - name: 'IllegalArgumentException'
+        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: './..'
-  #
-  # Deprecated stuff
-  #
-  - name: 'setExtraPlayerCount'
-    description: |
-      Sets the number of players to add to the online players to use as the new max players value.<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, set <a href="#setextraplayersenabled(nullbool)"><code>setExtraPlayersEnabled(NullBool)</code></a> to <a href="../../objects/nullbool/#false"><code>NullBool.FALSE</code></a>.
-    returns: 'This Builder after the extra player count has been set. Useful for chaining.'
-    parameters:
-      - name: 'extraPlayersCount'
-        description: 'The number of extra players to add.'
-        type: Integer
-        attribute:
-          - nullable
-    deprecated: 'Typo in the name. Use <a href="#setextraplayerscount(integer)">setExtraPlayersCount(Integer)</a> instead.'
-    type:
-      name: 'Builder'
-      type: 'object'
-  - name: 'setExtraPlayersCount'
-    description: |
-      Sets the number of players to add to the online players to use as the new max players value.<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, set <a href="#setextraplayersenabled(nullbool)"><code>setExtraPlayersEnabled(NullBool)</code></a> to <a href="../../objects/nullbool/#false"><code>NullBool.FALSE</code></a>.
-    returns: 'This Builder after the extra player count has been set. Useful for chaining.'
-    parameters:
-      - name: 'extraPlayersCount'
-        description: 'The number of extra players to add.'
-        type: Integer
-        attribute:
-          - nullable
-    deprecated: 'Method renamed to fit <a href="..">ProfileEntry</a> record more closely. Use <a href="#extraplayerscount(integer)">extraPlayersCount(Integer)</a> instead.'
-    type:
-      name: 'Builder'
-      type: 'object'
-  - name: 'setExtraPlayersEnabled'
-    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.
-    returns: 'This Builder after the NullBool has been set. Useful for chaining.'
-    parameters:
-      - name: 'extraPlayersEnabled'
-        description: 'Whether the extra players feature should be enabled or not.'
-        type: NullBool
-        attribute:
-          - notnull
-    deprecated: 'Method renamed to fit <a href="..">ProfileEntry</a> record more closely. Use <a href="#extraplayersenabled(nullbool)">extraPlayersEnabled(NullBool)</a> instead.'
-    throws:
-      - name: 'IllegalArgumentException'
-        description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
-    type:
-      name: 'Builder'
-      type: 'object'
-  - name: 'setFavicon'
-    description: |
-      Sets the value to use for the favicon.<br>
-      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.</li>
-      </ul>
-    returns: 'This Builder after the favicon has been set. Useful for chaining.'
-    parameters:
-      - name: 'favicon'
-        description: 'The favicon to set'
-        type: String
-        attribute:
-          - nullable
-    deprecated: 'Method renamed to fit <a href="..">ProfileEntry</a> record more closely. Use <a href="#favicon(string)">favicon(String)</a> instead.'
-    type:
-      name: 'Builder'
-      type: 'object'
-  - name: 'setHidePlayersEnabled'
-    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.
-    returns: 'This Builder after the NullBool has been set. Useful for chaining.'
-    parameters:
-      - name: 'hidePlayersEnabled'
-        description: 'Whether the player count should be hidden or not.'
-        type: NullBool
-        attribute:
-          - notnull
-    deprecated: 'Method renamed to fit <a href="..">ProfileEntry</a> record more closely. Use <a href="#hideplayersenabled(nullbool)">hidePlayersEnabled(NullBool)</a> instead.'
-    throws:
-      - name: 'IllegalArgumentException'
-        description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
-    type:
-      name: 'Builder'
-      type: 'object'
-  - name: 'setMaxPlayersCount'
-    description: |
-      Sets the number of max players allowed to join this server.<br>
-      This option has no effect when <a href="../#maxplayersenabled()"><code>maxPlayersEnabled</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, set <a href="#setmaxplayersenabled(nullbool)"><code>setMaxPlayersEnabled(NullBool)</code></a> to <a href="../../objects/nullbool/#false"><code>NullBool.FALSE</code></a>.
-    returns: 'This Builder after the extra player count has been set. Useful for chaining.'
-    parameters:
-      - name: 'maxPlayersCount'
-        description: 'The number of max players to set.'
-        type: Integer
-        attribute:
-          - nullable
-    deprecated: 'Method renamed to fit <a href="..">ProfileEntry</a> record more closely. Use <a href="#maxplayerscount(integer)">maxPlayersCount(Integer)</a> instead.'
-    type:
-      name: 'Builder'
-      type: 'object'
-  - name: 'setMaxPlayersEnabled'
-    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.
-    returns: 'This Builder after the NullBool has been set. Useful for chaining.'
-    parameters:
-      - name: 'maxPlayersEnabled'
-        description: 'Whether the extra players feature should be enabled or not.'
-        type: NullBool
-        attribute:
-          - notnull
-    deprecated: 'Method renamed to fit <a href="..">ProfileEntry</a> record more closely. Use <a href="#maxplayersenabled(nullbool)">maxPlayersEnabled(NullBool)</a> instead.'
-    throws:
-      - name: 'IllegalArgumentException'
-        description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
-    type:
-      name: 'Builder'
-      type: 'object'
-  - name: 'setMotd'
-    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.
-    returns: 'This Builder after the motd has been set. Useful for chaining.'
-    parameters:
-      - name: 'motd'
-        description: 'The MOTD to use.'
-        type: 'List<String>'
-        attribute:
-          - notnull
-    deprecated: 'Method renamed to fit <a href="..">ProfileEntry</a> record more closely. Use <a href="#motd(string)">motd(String)</a> instead.'
-    throws:
-      - name: 'IllegalArgumentException'
-        description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
-    type:
-      name: 'Builder'
-      type: 'object'
-  - name: 'setPlayerCountText'
-    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.
-    returns: 'This Builder after the player count text has been set. Useful for chaining.'
-    parameters:
-      - name: 'playerCountText'
-        description: 'The text to show in the player count.'
-        type: String
-        attribute:
-          - nullable
-    deprecated: 'Method renamed to fit <a href="..">ProfileEntry</a> record more closely. Use <a href="#playercounttext(string)">playerCountText(String)</a> instead.'
-    type:
-      name: 'Builder'
-      type: 'object'
-  - name: 'setPlayers'
-    description: |
-      Sets the players (lines) to use for the hover.<br>
-      <br>
-      Set to an empty list to not change the hover text.
-    returns: 'This Builder after the players have been set. Useful for chaining.'
-    parameters:
-      - name: 'players'
-        description: 'The lines to set for the hover.'
-        type: 'List<String>'
-        attribute:
-          - notnull
-    deprecated: 'Method renamed to fit <a href="..">ProfileEntry</a> record more closely. Use <a href="#players(list<string>)">players(List&lt;String&gt;)</a> instead.'
-    throws:
-      - name: 'IllegalArgumentException'
-        description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
-    type:
-      name: 'Builder'
-      type: 'object'
+      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.'
@@ -42,41 +42,53 @@ constructors:
         type: NullBool
         attributes:
           - notnull
+      - name: 'onlinePlayersCount'
+        description: 'The number to set for the Online Players count.'
+        type: String
+        attributes:
+          - nullable
+      - name: 'hidePlayersHoverEnabled'
+        description: 'Whether the online Players Hover should beenabled.'
+        type: NullBool
+        attributes:
+          - notnull
       - name: 'extraPlayersCount'
-        description: 'The number to add to the online players for the max players number.'
-        type: Integer
+        description: 'The number to add to the online Players for the extra Players.'
+        type: String
         attributes:
           - nullable
       - name: 'maxPlayersCount'
-        description: 'The number to use for the max players count.'
-        type: Integer
+        description: 'The number to set for the max Players count.'
+        type: String
         attributes:
           - 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="#extraplayerscount()"><code>extraPlayersCount</code></a>: <code>null</code></li>
-        <li><a href="#maxplayerscount()"><code>maxPlayersCount</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
@@ -85,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.'
@@ -125,51 +143,70 @@ 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()"><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()"><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()"><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.  
+      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.md'
+  - name: 'hidePlayersHoverEnabled'
+    description: |
+      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.md'
   - name: 'extraPlayersCount'
-    description: 'Gets the currently set number of extra players to use by this ProfileEntry. May be <code>null</code>.'
-    returns: 'Possibly-null integer number of extra players used by this ProfileEntry.'
+    description: 'Gets the currently set number of extra players of this ProfileEntry.'
+    returns: 'The current number of extra players used by this ProfileEntry.'
     attributes:
       - nullable
     type:
-      name: 'Integer'
+      name: 'String'
       type: 'object'
   - name: 'maxPlayersCount'
     description: 'Gets the currently set number of max players of this ProfileEntry.'
@@ -177,19 +214,27 @@ methods:
     attributes:
       - nullable
     type:
-      name: 'Integer'
+      name: 'String'
+      type: 'object'
+  - name: 'onlinePlayersCount'
+    description: 'Gets the currently set number of online players of this ProfileEntry.'
+    returns: 'The current number of online players used by this ProfileEntry.'
+    attributes:
+      - nullable
+    type:
+      name: 'String'
       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'
@@ -201,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).

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

@@ -1,9 +1,9 @@
 ---
-template: api-doc.html
+api: true
 
 methods:
   - name: 'getWorlds'
-    description: 'Returns a <code>Map&lt;String, World&gt;</code> where the key is the name of the World and the value the world of the server.'
+    description: 'Returns a `Map<String, World>` where the key is the name of the World and the value the world of the server.'
     returns: 'Possibly-empty Map containing pairs of Strings and Worlds.'
     type:
       name: 'Map<String, World>'
@@ -11,16 +11,19 @@ methods:
 
 inherits:
   'ch.andre601.advancedserverlist.api.objects.GenericServer':
-    link: '../../../../api/ch.andre601.advancedserverlist.api/objects/genericserver/'
+    link: '../../../api/ch.andre601.advancedserverlist.api/objects/genericserver.md'
     list:
-      - 'getPlayersOnline()'
-      - 'getPlayersMax()'
-      - 'getHost()'
+      - name: 'getPlayersOnline()'
+        link: 'getplayersonline'
+      - name: 'getPlayersMax()'
+        link: 'getplayersmax'
+      - name: 'getHost()'
+        link: 'gethost'
 ---
 
 # <api__interface></api__interface> BukkitServer
 
 Spigot/Paper specific instance of a [`GenericServer`](../../../api/ch.andre601.advancedserverlist.api/objects/genericserver.md).  
-This interface includes a [Map of Worlds](#getworlds()) the server currently has.
+This interface includes a [Map of Worlds](#getworlds) the server currently has.
 
 This interface is useful for cases where you want to get the worlds of the Server itself, by simply casting your GenericServer instance to a BukkitServer one. Make sure to do proper instanceof checks first before attempting to cast.

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

@@ -1,12 +1,12 @@
 ---
-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
@@ -14,9 +14,9 @@ constructors:
 methods:
   - 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:
@@ -24,12 +24,12 @@ methods:
     type:
       name: 'ProfileEntry'
       type: 'object'
-      link: '../../../../api/ch.andre601.advancedserverlist.api/profiles/profileentry/'
+      link: '../../../api/ch.andre601.advancedserverlist.api/profiles/profileentry/index.md'
 ---
 
 # <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-bungeecord/ch.andre601.advancedserverlist.api.bungeecord/events/preserverlistsetevent.md

@@ -1,5 +1,5 @@
 ---
-template: api-doc.html
+api: true
 
 constructors:
   - name: 'PreServerListSetEvent'
@@ -10,15 +10,19 @@ constructors:
 
 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'
 ---
 
 # <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-bungeecord/ch.andre601.advancedserverlist.api.bungeecord/objects/bungeeplayer.md

@@ -1,13 +1,16 @@
 ---
-template: api-doc.html
+api: true
 
 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> BungeePlayer

docs/api/reference/platform-bungeecord/ch.andre601.advancedserverlist.api.bungeecord/objects/bungeeproxy.md

@@ -1,5 +1,5 @@
 ---
-template: api-doc.html
+api: true
 
 methods:
   - name: 'getServers'
@@ -11,11 +11,14 @@ methods:
 
 inherits:
   'ch.andre601.advancedserverlist.api.objects.GenericServer':
-    link: '../../../../api/ch.andre601.advancedserverlist.api/objects/genericserver/'
+    link: '../../../api/ch.andre601.advancedserverlist.api/objects/genericserver.md'
     list:
-      - 'getPlayersOnline()'
-      - 'getPlayersMax()'
-      - 'getHost()'
+      - name: 'getPlayersOnline()'
+        link: 'getplayersonline'
+      - name: 'getPlayersMax()'
+        link: 'getplayersmax'
+      - name: 'getHost()'
+        link: 'gethost'
 ---
 
 # <api__interface></api__interface> BungeeProxy

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

@@ -1,12 +1,12 @@
 ---
-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
@@ -14,9 +14,9 @@ constructors:
 methods:
   - 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:
@@ -24,12 +24,12 @@ methods:
     type:
       name: 'ProfileEntry'
       type: 'object'
-      link: '../../../../api/ch.andre601.advancedserverlist.api/profiles/profileentry/'
+      link: '../../../api/ch.andre601.advancedserverlist.api/profiles/profileentry/index.md'
 ---
 
 # <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-velocity/ch.andre601.advancedserverlist.api.velocity/events/preserverlistsetevent.md

@@ -1,5 +1,5 @@
 ---
-template: api-doc.html
+api: true
 
 constructors:
   - name: 'PreServerListSetEvent'
@@ -9,15 +9,19 @@ constructors:
 
 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'
 ---
 
 # <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-velocity/ch.andre601.advancedserverlist.api.velocity/objects/velocityplayer.md

@@ -1,9 +1,9 @@
 ---
-template: api-doc.html
+api: true
 
 methods:
   - name: 'getVersion'
-    description: 'Returns the <a href="../../../../api/ch.andre601.advancedserverlist.api/objects/genericplayer/#getprotocol()">protocol version</a> of the player in a readable MC version format (i.e. 1.19.3).'
+    description: 'Returns the [protocol version](../../../api/ch.andre601.advancedserverlist.api/objects/genericplayer.md#getprotocol) of the player in a readable MC version format (i.e. 1.19.3).'
     returns: 'The readable MC version the player uses.'
     type:
       name: 'String'
@@ -11,16 +11,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> VelocityPlayer
 
 [`GenericPlayer` instance](../../../api/ch.andre601.advancedserverlist.api/objects/genericplayer.md) for the Velocity proxy implementation of AdvancedServerList.  
-Provides a [`getVersion()` method](#getversion()) to get the MC version used as a readable String (i.e. 1.19.3) rather than just the protocol version.
+Provides a [`getVersion()` method](#getversion) to get the MC version used as a readable String (i.e. 1.19.3) rather than just the protocol version.
 
 To get an instance of this class from a GenericPlayer instance, simply cast it to a VelocityPlayer (Granted that the GenericPlayer instance actually is a VelocityPlayer instance).

docs/api/reference/platform-velocity/ch.andre601.advancedserverlist.api.velocity/objects/velocityproxy.md

@@ -1,5 +1,5 @@
 ---
-template: api-doc.html
+api: true
 
 methods:
   - name: 'getServers'
@@ -11,11 +11,14 @@ methods:
 
 inherits:
   'ch.andre601.advancedserverlist.api.objects.GenericServer':
-    link: '../../../api/objects/genericserver/'
+    link: '../../../api/ch.andre601.advancedserverlist.api/objects/genericserver.md'
     list:
-      - 'getPlayersOnline()'
-      - 'getPlayersMax()'
-      - 'getHost()'
+      - name: 'getPlayersOnline()'
+        link: 'getplayersonline'
+      - name: 'getPlayersMax()'
+        link: 'getplayersmax'
+      - name: 'getHost()'
+        link: 'gethost'
 ---
 
 # <api__interface></api__interface> VelocityProxy