Bump version

Merge pull request 'Update dependency net.william278:papiproxybridge to v1.7.2' (#379 ) from renovate/net.william278-papiproxybridge-1.x into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/379
2026-11-05 17:02:34 -05:00 · 2024-12-10 14:09:34 +01:00 · 2024-12-09 12:05:22 +00:00 · 2024-12-09 12:05:12 +00:00 · 2024-12-09 12:02:16 +00:00 · 2024-12-09 12:02:05 +00:00
78 changed files with 1291 additions and 627 deletions
@@ -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
@@ -0,0 +1,115 @@
+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 }}"
+
+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    | ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}                      |
+          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    | ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} |
+          comment-id: "${{ steps.comment.outputs.comment-id }}"
+          issue-number: "${{ github.event.pull_request.number }}"
+          token: "${{ secrets.BOT_TOKEN }}"
+          edit-mode: replace
@@ -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>
@@ -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:
@@ -4,7 +4,7 @@ when:

 steps:
  - name: "Build Jar and Upload"
-    image: maven:3.9.6-eclipse-temurin-21
+    image: maven:3.9.9-eclipse-temurin-21
    secrets:
      - modrinth_api_token
      - hangar_api_token
@@ -34,7 +34,7 @@ steps:
    when:
      - status: ["success"]
    settings:
-      server_url: https://blobfox.coffee
+      server_url: https://swiss.social
      access_token:
        from_secret: mastodon_token
      status: |-
@@ -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:
@@ -86,8 +86,11 @@ Below can you find a collection of videos made for my plugin. If you made a vide
 <details><summary>Click to show/hide Videos</summary>
 <p>

-Spanish Video by Ajneb97
-<iframe width="560" height="auto" src="https://www.youtube.com/embed/rIbljm_4HVI" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
+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)

 </p>
 </details>
@@ -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>
@@ -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            | Yes**     |
+| v2            | No        |
+| v1            | No        |
+
+\*Only receives support but no updates or bug fixes.  
+\*\*Support ends at the end of 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.
@@ -52,7 +52,7 @@
        </repository>
        <repository>
            <id>papermc</id>
-            <url>https://papermc.io/repo/repository/maven-public/</url>
+            <url>https://repo.papermc.io/repository/maven-public/</url>
        </repository>
        <repository>
            <id>libertybans</id>
@@ -79,7 +79,7 @@
        <dependency>
            <groupId>io.papermc.paper</groupId>
            <artifactId>paper-api</artifactId>
-            <version>1.20-R0.1-SNAPSHOT</version>
+            <version>1.21-R0.1-SNAPSHOT</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
@@ -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');
+    }
 }
@@ -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:
@@ -105,7 +105,7 @@
        <dependency>
            <groupId>org.bstats</groupId>
            <artifactId>bstats-bungeecord</artifactId>
-            <version>3.0.2</version>
+            <version>3.1.0</version>
            <scope>compile</scope>
        </dependency>
        
@@ -151,7 +151,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.3</version>
+                <version>3.6.0</version>
                <configuration>
                    <createDependencyReducedPom>false</createDependencyReducedPom>
                    <relocations>
@@ -30,6 +30,7 @@ import ch.andre601.advancedserverlist.bungeecord.listeners.JoinEvent;
 import ch.andre601.advancedserverlist.bungeecord.listeners.PingEvent;
 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;
@@ -40,6 +41,7 @@ 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;
@@ -50,10 +52,14 @@ 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;

 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;
    
@@ -83,12 +89,14 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
        }
        
        this.audiences = BungeeAudiences.create(this);
-        this.core = AdvancedServerList.init(this, BungeePlayerPlaceholders.init(), BungeeServerPlaceholders.init(this));
+        this.core = AdvancedServerList.init(this,
+            BungeePlayerPlaceholders.init(), BungeeServerPlaceholders.init(this), BungeeProxyPlaceholders.init(this));
    }
    
    @Override
    public void onDisable(){
        core.disable();
+        getProxy().getScheduler().cancel(this);
    }
    
    @Override
@@ -140,6 +148,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;
@@ -198,6 +211,10 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
        return players.size();
    }
    
+    public Map<String, ServerPing> getFetchedServers(){
+        return fetchedServers;
+    }
+    
    private boolean loadLibs(){
        try{
            if(libraryManager == null){
@@ -213,4 +230,14 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
            return false;
        }
    }
+    
+    private void fetchServers(){
+        fetchedServers.clear();
+        getProxy().getServers().forEach((name, server) -> server.ping((ping, throwable) -> {
+            if(throwable != null)
+                return;
+            
+            fetchedServers.put(name, ping);
+        }));
+    }
 }
@@ -31,7 +31,8 @@ import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
 import ch.andre601.advancedserverlist.bungeecord.BungeeCordCore;
 import ch.andre601.advancedserverlist.bungeecord.objects.impl.BungeePlayerImpl;
 import ch.andre601.advancedserverlist.bungeecord.objects.impl.BungeeProxyImpl;
-import ch.andre601.advancedserverlist.core.events.PingEventHandler;
+import ch.andre601.advancedserverlist.core.compat.maintenance.MaintenanceUtil;
+import ch.andre601.advancedserverlist.core.compat.papi.PAPIUtil;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import ch.andre601.advancedserverlist.core.interfaces.events.GenericEventWrapper;
 import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
@@ -78,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)));
@@ -101,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());
@@ -137,7 +144,7 @@ public class BungeeEventWrapper implements GenericEventWrapper<Favicon, BungeePl
        if(plugin.getProxy().getPluginManager().getPlugin("Maintenance") == null)
            return false;
        
-        return PingEventHandler.getMaintenanceUtil().isMaintenanceEnabled();
+        return MaintenanceUtil.get().isMaintenanceEnabled();
    }
    
    @Override
@@ -165,10 +172,10 @@ public class BungeeEventWrapper implements GenericEventWrapper<Favicon, BungeePl
        if(plugin.getProxy().getPluginManager().getPlugin("PAPIProxyBridge") == null)
            return text;
        
-        if(!PingEventHandler.getPAPIUtil().isCompatible())
+        if(!PAPIUtil.get().isCompatible())
            return text;
        
-        String server = PingEventHandler.getPAPIUtil().getServer();
+        String server = PAPIUtil.get().getServer();
        if(server == null || server.isEmpty())
            return text;
        
@@ -176,11 +183,11 @@ public class BungeeEventWrapper implements GenericEventWrapper<Favicon, BungeePl
        if(serverInfo == null || serverInfo.getPlayers().isEmpty())
            return text;
        
-        ProxiedPlayer carrier = PingEventHandler.getPAPIUtil().getPlayer(serverInfo.getPlayers());
+        ProxiedPlayer carrier = PAPIUtil.get().getPlayer(serverInfo.getPlayers());
        if(carrier == null)
            return text;
        
-        return PingEventHandler.getPAPIUtil().parse(text, carrier.getUniqueId(), player.getUUID());
+        return PAPIUtil.get().parse(text, carrier.getUniqueId(), player.getUUID());
    }
    
    @Override
@@ -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;
+        };
+    }
+}
@@ -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){
+                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());
                }
@@ -41,7 +41,7 @@
    <properties>
        <maven.compiler.source>16</maven.compiler.source>
        <maven.compiler.target>16</maven.compiler.target>
-        <plugin.config.version>5</plugin.config.version>
+        <plugin.config.version>6</plugin.config.version>
    </properties>
    
    <repositories>
@@ -77,7 +77,7 @@
        <dependency>
            <groupId>ch.andre601</groupId>
            <artifactId>expressionparser</artifactId>
-            <version>1.4.2</version>
+            <version>1.4.3</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
@@ -129,7 +129,7 @@
        <dependency>
            <groupId>com.google.guava</groupId>
            <artifactId>guava</artifactId>
-            <version>33.2.0-jre</version>
+            <version>33.3.1-jre</version>
            <scope>provided</scope>
        </dependency>
        
@@ -137,7 +137,7 @@
        <dependency>
            <groupId>net.william278</groupId>
            <artifactId>papiproxybridge</artifactId>
-            <version>1.6.1</version>
+            <version>1.7.2</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
@@ -157,7 +157,7 @@
        <dependency>
            <groupId>org.junit.jupiter</groupId>
            <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.10.2</version>
+            <version>5.11.3</version>
            <scope>test</scope>
        </dependency>
    </dependencies>
@@ -179,7 +179,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.3</version>
+                <version>3.6.0</version>
                <configuration>
                    <createDependencyReducedPom>false</createDependencyReducedPom>
                    <filters>
@@ -29,6 +29,7 @@ import ch.andre601.advancedserverlist.api.AdvancedServerListAPI;
 import ch.andre601.advancedserverlist.api.PlaceholderProvider;
 import ch.andre601.advancedserverlist.core.check.UpdateChecker;
 import ch.andre601.advancedserverlist.core.commands.CommandHandler;
+import ch.andre601.advancedserverlist.core.compat.maintenance.MaintenancePlaceholder;
 import ch.andre601.advancedserverlist.core.file.FileHandler;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import ch.andre601.advancedserverlist.core.profiles.conditions.ProfileConditionParser;
@@ -59,7 +60,16 @@ public class AdvancedServerList<F>{
        this.commandHandler = new CommandHandler(this);
        this.playerHandler = new PlayerHandler(this);
        
-        placeholders.forEach(AdvancedServerList.getApi()::addPlaceholderProvider);
+        plugin.getPluginLogger().info("Registering internal Placeholders...");
+        
+        placeholders.forEach(this::addPlaceholder);
+        
+        if(plugin.isPluginEnabled("Maintenance")){
+            plugin.getPluginLogger().info("Found Maintenance Plugin. Registering extra Placeholder...");
+            addPlaceholder(new MaintenancePlaceholder(this));
+        }
+        
+        plugin.getPluginLogger().info("Completed internal Placeholder registration!");
        
        load();
    }
@@ -68,6 +78,10 @@ public class AdvancedServerList<F>{
        return new AdvancedServerList<>(plugin, Arrays.asList(placeholders));
    }
    
+    public static AdvancedServerListAPI getApi(){
+        return api;
+    }
+    
    public PluginCore<F> getPlugin(){
        return plugin;
    }
@@ -88,10 +102,6 @@ public class AdvancedServerList<F>{
        return version;
    }
    
-    public static AdvancedServerListAPI getApi(){
-        return api;
-    }
-    
    public ProfileConditionParser getParser(){
        return parser;
    }
@@ -167,6 +177,10 @@ public class AdvancedServerList<F>{
        getPlugin().getPluginLogger().info("Loading bStats metrics. Disable it in the global config under /plugins/bstats/");
        plugin.loadMetrics();
        getPlugin().getPluginLogger().info("Metrics loaded!");
+        
+        getPlugin().getPluginLogger().info("Enabling Schedulers...");
+        plugin.startScheduler();
+        getPlugin().getPluginLogger().info("Schedulers enabled.");
    
        getPlugin().getPluginLogger().info("AdvancedServerList is ready!");
        
@@ -195,4 +209,9 @@ public class AdvancedServerList<F>{
            version = "UNKNOWN";
        }
    }
+    
+    private void addPlaceholder(PlaceholderProvider placeholderProvider){
+        getPlugin().getPluginLogger().info("Registering %s Placeholders...", placeholderProvider.getIdentifier());
+        AdvancedServerList.getApi().addPlaceholderProvider(placeholderProvider);
+    }
 }
@@ -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;
@@ -51,57 +51,60 @@ import java.util.concurrent.TimeUnit;

 public class UpdateChecker{
    
-    @SuppressWarnings("FieldCanBeLocal")
-    // 'https://api.modrinth.com/v2/project/advancedserverlist/version?loaders=["%s"]' URL encoded.
-    private final String url = "https://api.modrinth.com/v2/project/advancedserverlist/version?loaders=%%5B%%22%s%%22%%5D";
-    private final HttpClient client = HttpClient.newHttpClient();
-    
    private final Type listType = new TypeToken<ArrayList<ModrinthVersion>>(){}.getType();
    private final Gson gson = new GsonBuilder()
        .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
        .setPrettyPrinting()
-        .setLenient()
        .create();
    
    private final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(new UpdateCheckThread());
    
-    private final CacheUtil<ModrinthVersion> cache = new CacheUtil<>(Duration.ofMinutes(5));
+    private final ValueCache<CompletableFuture<ModrinthVersion>> cache = new ValueCache<>(Duration.ofMinutes(5));
    
    private final AdvancedServerList<?> core;
    private final PluginLogger logger;
    private final String loader;
+    private final HttpClient client;
    
    public UpdateChecker(AdvancedServerList<?> core){
        this.core = core;
        this.logger = core.getPlugin().getPluginLogger();
        this.loader = core.getPlugin().getLoader();
+        this.client = HttpClient.newBuilder().executor(Executors.newSingleThreadExecutor(new UpdateCheckThread())).build();
        
        startUpdateChecker();
    }
    
    public void performCachedUpdateCheck(CmdSender sender){
-        ModrinthVersion version = cache.get(() -> {
-            try{
-                return performUpdateCheck().join();
-            }catch(Exception ex){
-                return null;
+        CompletableFuture<ModrinthVersion> modrinthVersion = cache.get(this::performUpdateCheck);
+        
+        modrinthVersion.whenComplete((version, throwable) -> {
+            if(throwable != null){
+                logger.warn("Encountered an Exception while checking for an update!", throwable);
+                sender.sendErrorMsg("There was an exception while checking for an update. Please check the console for details.");
+                return;
+            }
+            
+            if(version == null)
+                return;
+            
+            int result = version.compare(core.getVersion());
+            if(result == -1){
+                sender.sendPrefixedMsg("<green>A new Version of AdvancedServerList is available!");
+                sender.sendPrefixedMsg("<green>Your version: <white>%s", core.getVersion());
+                sender.sendPrefixedMsg("<green>Version on Modrinth: <white>%s", version.versionNumber());
+                sender.sendPrefixedMsg(
+                    "<click:open_url:'https://modrinth.com/plugin/advancedserverlist/version/%s'>" +
+                    "<green>[<white>Download Page</white>]" +
+                    "</click>",
+                    version.id()
+                );
+            }else
+            if(result == 1){
+                sender.sendPrefixedMsg("You seem to run a newer Version (<white>%</white>) than what is available on Modrinth (<white>%s</white>).", core.getVersion(), version.versionNumber());
+                sender.sendPrefixedMsg("Are you running a development build?");
            }
        });
-        
-        if(version == null)
-            return;
-        
-        int result = version.compare(core.getVersion());
-        if(result == -1){
-            sender.sendPrefixedMsg("<green>A new version of AdvancedServerList is available!");
-            sender.sendPrefixedMsg("<green>Your version: <white>%s", core.getVersion());
-            sender.sendPrefixedMsg("<green>Modrinth: <white>%s", version.versionNumber());
-            sender.sendPrefixedMsg("<click:open_url:'https://modrinth.com/plugin/advancedserverlist/version/%s'><green>[<white>Download Page</white>]</click>", version.id());
-        }else
-        if(result == 1){
-            sender.sendPrefixedMsg("Your version (<white>%s</white>) seems newer than the latest release on Modrinth (<white>%s</white>)", core.getVersion(), version.versionNumber);
-            sender.sendPrefixedMsg("Are you running a dev-build?");
-        }
    }
    
    public void disable(){
@@ -144,7 +147,11 @@ public class UpdateChecker{
    }
    
    private CompletableFuture<ModrinthVersion> performUpdateCheck(){
-        String finalUrl = String.format(url, loader);
+        String finalUrl = String.format(
+            // 'https://api.modrinth.com/v2/project/advancedserverlist/version?loaders=["%s"]' URL encoded.
+            "https://api.modrinth.com/v2/project/advancedserverlist/version?loaders=%%5B%%22%s%%22%%5D",
+            loader
+        );
        
        logger.debug(UpdateChecker.class, "Checking '%s' for updates...", finalUrl);
        
@@ -157,6 +164,7 @@ public class UpdateChecker{
        try{
            request = HttpRequest.newBuilder()
                .uri(new URI(finalUrl))
+                .timeout(Duration.ofSeconds(5))
                .header("User-Agent", "AdvancedServerList-" + loader + "/" + core.getVersion())
                .build();
        }catch(URISyntaxException ex){
@@ -297,14 +297,12 @@ public class CommandHandler{
            
            switch(args[0].toLowerCase(Locale.ROOT)){
                case "list" -> {
-                    List<ServerListProfile> profiles = core.getFileHandler().getProfiles().stream()
-                        .sorted(Comparator.comparing(ServerListProfile::priority).reversed())
-                        .toList();
-                    
                    sender.sendPrefixedMsg("Available Profiles:");
-                    for(ServerListProfile profile : profiles){
-                        sender.sendPrefixedMsg("- <white><hover:show_text:\"%s\">%s</hover></white>", getHover(profile), profile.file());
-                    }
+                    core.getFileHandler().getProfiles().stream()
+                        .sorted(Comparator.comparingInt(ServerListProfile::priority).reversed())
+                        .forEach(
+                            profile -> sender.sendPrefixedMsg("- <white><hover:show_text:\"%s\">%s</hover></white>", getHover(profile), profile.file())
+                        );
                }
                case "add" -> {
                    if(args.length == 1){
@@ -316,7 +314,7 @@ public class CommandHandler{
                    String name = getProfileName(args[1]);
                    
                    if(core.getFileHandler().getProfiles().stream().anyMatch(profile -> profile.file().equalsIgnoreCase(name))){
-                        sender.sendErrorMsg("<red>A profile with file name</red> %s <red>already exists!");
+                        sender.sendErrorMsg("<red>A profile with file name</red> %s <red>already exists!", name);
                        return;
                    }
                    
@@ -359,7 +357,7 @@ public class CommandHandler{
                    try{
                        Files.createFile(profilePath);
                    }catch(IOException ex){
-                        sender.sendErrorMsg("<red>There was an error while creating the file</red> %s<red>!");
+                        sender.sendErrorMsg("<red>There was an error while creating the file</red> %s<red>!", copy);
                        sender.sendErrorMsg("<red>Check console for further details.");
                        
                        core.getPlugin().getPluginLogger().warn("Encountered IOException while creating file %s", ex, copy);
@@ -377,7 +375,7 @@ public class CommandHandler{
                    try{
                        node = loader.load();
                    }catch(IOException ex){
-                        sender.sendErrorMsg("<red>There was an error while loading the file</red> %s<red>!");
+                        sender.sendErrorMsg("<red>There was an error while loading the file</red> %s<red>!", copy);
                        sender.sendErrorMsg("<red>Check console for further details.");
                        
                        core.getPlugin().getPluginLogger().warn("Encountered IOException while loading file %s", ex, copy);
@@ -399,6 +397,8 @@ public class CommandHandler{
                    }catch(SerializationException ex){
                        sender.sendErrorMsg("<red>There was an Error while copying values from</red> %s <red>to</red> %s<red>.", name, copy);
                        sender.sendErrorMsg("<red>Check console for details.");
+                        
+                        core.getPlugin().getPluginLogger().warn("Encountered SerializationException while set values for %s!", ex, copy);
                        return;
                    }
                    
@@ -409,6 +409,8 @@ public class CommandHandler{
                    }catch(IOException ex){
                        sender.sendErrorMsg("<red>There was an Error while trying to save</red> %s<red>!", copy);
                        sender.sendErrorMsg("<red>Check console for details.");
+                        
+                        core.getPlugin().getPluginLogger().warn("Encountered IOException while saving ConfigurationNode for %s!", ex, copy);
                    }
                }
                default -> {
@@ -420,9 +422,9 @@ public class CommandHandler{
        
        @Override
        public String usage(){
-            return "<aqua>/asl <white>profiles</white> <grey><" +
-                "<white>add</white> <<white>name</white>> | " +
-                "<white>copy</white> <<white>profile</white>> <<white>name</white>> | " +
+            return "<aqua>/asl <white>profiles</white> <grey>\\<" +
+                "<white>add</white> \\<<white>name</white>> | " +
+                "<white>copy</white> \\<<white>profile</white>> \\<<white>name</white>> | " +
                "<white>list</white>" +
                "></grey></aqua>";
        }
@@ -0,0 +1,24 @@
+package ch.andre601.advancedserverlist.core.compat.maintenance;
+
+import ch.andre601.advancedserverlist.api.PlaceholderProvider;
+import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
+import ch.andre601.advancedserverlist.api.objects.GenericServer;
+import ch.andre601.advancedserverlist.core.AdvancedServerList;
+
+public class MaintenancePlaceholder extends PlaceholderProvider{
+    
+    private final AdvancedServerList<?> plugin;
+    
+    public MaintenancePlaceholder(AdvancedServerList<?> plugin){
+        super("maintenance");
+        
+        this.plugin = plugin;
+    }
+    @Override
+    public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
+        if(!placeholder.equals("maintenanceEnabled") || !plugin.getPlugin().isPluginEnabled("Maintenance"))
+            return null;
+        
+        return String.valueOf(MaintenanceUtil.get().isMaintenanceEnabled());
+    }
+}
@@ -30,12 +30,21 @@ import eu.kennytv.maintenance.api.MaintenanceProvider;

 public class MaintenanceUtil{
    
+    private static MaintenanceUtil instance;
+    
    private final Maintenance api;
    
-    public MaintenanceUtil(){
+    private MaintenanceUtil(){
        this.api = MaintenanceProvider.get();
    }
    
+    public static MaintenanceUtil get(){
+        if(instance != null)
+            return instance;
+        
+        return (instance = new MaintenanceUtil());
+    }
+    
    public boolean isMaintenanceEnabled(){
        return api.isMaintenance();
    }
@@ -25,28 +25,37 @@

 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.*;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
+import java.util.concurrent.ExecutionException;

 public class PAPIUtil{
    
+    private static PAPIUtil instance;
+    
+    private final ValueCache<CompletableFuture<Set<String>>> serversCache = new ValueCache<>(Duration.ofSeconds(10));
+    private final Cache<UUID, CompletableFuture<String>> textCache = CacheBuilder.newBuilder()
+        .expireAfterWrite(Duration.ofSeconds(10))
+        .build();
    private final PlaceholderAPI papi;
    
-    private final CacheUtil<String> cache = new CacheUtil<>(Duration.ofSeconds(5));
-    
-    public PAPIUtil(){
+    private PAPIUtil(){
        this.papi = PlaceholderAPI.createInstance();
    }
    
+    public static PAPIUtil get(){
+        if(instance != null)
+            return instance;
+        
+        return (instance = new PAPIUtil());
+    }
+    
    // Make sure the version of PAPIProxyBridge we get has the required methods we need...
    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
    public boolean isCompatible(){
@@ -59,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){
@@ -88,9 +84,8 @@ public class PAPIUtil{
    
    public String parse(String text, UUID carrier, UUID player){
        try{
-            CompletableFuture<String> future = papi.formatPlaceholders(text, carrier, player);
-            return future.getNow(text);
-        }catch(IllegalArgumentException | CancellationException | CompletionException ex){
+            return textCache.get(player, () -> papi.formatPlaceholders(text, carrier, player)).getNow(text);
+        }catch(ExecutionException ex){
            return text;
        }
    }
@@ -29,8 +29,6 @@ import ch.andre601.advancedserverlist.api.events.GenericServerListEvent;
 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
 import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
-import ch.andre601.advancedserverlist.core.compat.maintenance.MaintenanceUtil;
-import ch.andre601.advancedserverlist.core.compat.papi.PAPIUtil;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import ch.andre601.advancedserverlist.core.interfaces.events.GenericEventWrapper;
@@ -41,9 +39,6 @@ import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;

 public class PingEventHandler{
    
-    private static PAPIUtil papiUtil = null;
-    private static MaintenanceUtil maintenanceUtil = null;
-    
    public static <F, P extends GenericPlayer> ProfileEntry handleEvent(GenericEventWrapper<F, P> event){
        event.getPlugin().getPluginLogger().debug(PingEventHandler.class, "Received ping event. Handling it...");
        if(event.isInvalidProtocol()){
@@ -75,42 +70,75 @@ 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("\\n", entry.motd()));
            
            event.setMotd(
                ComponentParser.list(entry.motd())
@@ -123,13 +151,13 @@ public class PingEventHandler{
        boolean hidePlayers = ProfileManager.checkOption(entry.hidePlayersEnabled());
        
        if(hidePlayers && ignoreMaintenance(event, "hidePlayers")){
-            logger.debug(PingEventHandler.class, "Hide Players enabled. Hiding player count...");
+            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())
@@ -140,13 +168,13 @@ 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()));
+            logger.debug(PingEventHandler.class, "'playerCount -> hover' option set. Applying '%s'...", String.join("\\n", 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);
            
@@ -169,20 +197,6 @@ public class PingEventHandler{
        return entry;
    }
    
-    public static PAPIUtil getPAPIUtil(){
-        if(papiUtil != null)
-            return papiUtil;
-        
-        return (papiUtil = new PAPIUtil());
-    }
-    
-    public static MaintenanceUtil getMaintenanceUtil(){
-        if(maintenanceUtil != null)
-            return maintenanceUtil;
-        
-        return (maintenanceUtil = new MaintenanceUtil());
-    }
-    
    private static <F, P extends GenericPlayer> boolean ignoreMaintenance(GenericEventWrapper<F, P> event, String option){
        if(!event.isMaintenanceModeActive())
            return true;
@@ -46,13 +46,24 @@ public class ConfigMigrator{
    public static ConfigurationTransformation.Versioned create(){
        return ConfigurationTransformation.versionedBuilder()
            .versionKey("configVersion")
-            .addVersion(LATEST, fourToFive())
+            .addVersion(LATEST, fiveToSix())
+            .addVersion(5, fourToFive())
            .addVersion(4, threeToFour())
            .addVersion(3, twoToThree())
            .addVersion(2, oneToTwo())
            .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) -> {
@@ -29,14 +29,14 @@ import java.util.Locale;

 public abstract class PluginCommand{
    
-    private final String argument;
+    private final String name;
    
-    public PluginCommand(String argument){
-        this.argument = argument;
+    public PluginCommand(String name){
+        this.name = name;
    }
    
    public String name(){
-        return argument;
+        return name;
    }
    
    public String permission(){
@@ -46,6 +46,8 @@ public interface PluginCore<F>{
    
    void downloadLibrary(String groupId, String artifactId, String version);
    
+    void startScheduler();
+    
    AdvancedServerList<F> getCore();
    
    Path getFolderPath();
@@ -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();
@@ -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();
@@ -145,7 +145,7 @@ public class MiniMOTDConfigMigrator{
            .map(ProfileEntry.Builder::build)
            .toList();
        
-        boolean profilesInvalid = profiles.isEmpty() || profiles.stream().anyMatch(ProfileEntry::isInvalid);
+        boolean profilesInvalid = profiles.isEmpty() || profiles.stream().allMatch(ProfileEntry::isInvalid);
        if(entry.isInvalid() && profilesInvalid){
            logger.warn("[Migrator - MiniMOTD] Main ProfileEntry was invalid and profiles were empty.");
            sender.sendErrorMsg(" -> <red>Received invalid configuration.");
@@ -187,7 +187,7 @@ public class MiniMOTDConfigMigrator{
        }
        
        if(migrated == null){
-            logger.warn("[Migrator - MiniMOTD] Cannot migrate Configuration. ConfiguationNode was null.");
+            logger.warn("[Migrator - MiniMOTD] Cannot migrate Configuration. ConfigurationNode was null.");
            sender.sendErrorMsg(" -> <red>File loading error.");
            
            return false;
@@ -129,7 +129,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);
@@ -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;
    }
    
@@ -65,6 +65,10 @@ 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());
@@ -28,8 +28,8 @@ package ch.andre601.advancedserverlist.core.profiles;
 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
 import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
+import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
-import ch.andre601.advancedserverlist.core.profiles.conditions.ProfileConditionParser;
 import ch.andre601.expressionparser.ParseWarnCollector;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
@@ -41,13 +41,14 @@ import java.util.Random;
 public record ServerListProfile(int priority, String condition, ProfileEntry defaultProfile, List<ProfileEntry> profiles, String file){
    private static final Random random = new Random();
    
-    public boolean evalConditions(ProfileConditionParser parser, PluginLogger logger, GenericPlayer player, GenericServer server){
+    public boolean evalConditions(AdvancedServerList<?> core, GenericPlayer player, GenericServer server){
        if(condition == null || condition.isEmpty())
            return true;
        
        ParseWarnCollector collector = new ParseWarnCollector(condition);
+        PluginLogger logger = core.getPlugin().getPluginLogger();
        
-        boolean result = parser.evaluate(condition, player, server, collector);
+        boolean result = core.getParser().evaluate(condition, player, server, collector);
        
        if(collector.hasWarnings()){
            logger.warn("Encountered %d Error(s) while parsing condition for file '%s':", collector.getWarnings().size(), file);
@@ -55,9 +56,8 @@ public record ServerListProfile(int priority, String condition, ProfileEntry def
            for(ParseWarnCollector.Context context : collector.getWarnings()){
                logger.warn("  - At position %s:", context.position() == -1 ? "Unknown" : context.position());
                logger.warn("    %s", condition);
-                logger.warn(" ".repeat(context.position() + 5) + "^");
+                logger.warn(" ".repeat(context.position() + 4) + "^");
                logger.warn("    -> %s", context.message());
-                
            }
        }
        
@@ -120,13 +120,6 @@ public record ServerListProfile(int priority, String condition, ProfileEntry def
            this.logger = logger;
        }
        
-        public Builder(String filename, int priority, PluginLogger logger){
-            this.fileName = filename;
-            this.node = null;
-            this.priority = priority;
-            this.logger = logger;
-        }
-        
        public static Builder resolve(String fileName, ConfigurationNode node, PluginLogger logger){
            return new Builder(fileName, node, logger)
                .resolveCondition()
@@ -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,11 +70,25 @@ 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);
@@ -92,15 +106,34 @@ 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();
        
@@ -134,7 +167,7 @@ public class FaviconHandler<F>{
                return;
            }
            
-            localFavicons.put(path.getFileName().toString().split("\\.")[0], favicon);
+            localFavicons.put(path.getFileName().toString().toLowerCase(Locale.ROOT), favicon);
            logger.info("Loaded file '%s' as Favicon.", path.getFileName().toString());
        }catch(IOException ex){
            logger.warn("Cannot create Favicon from file '%s'. Encountered IOException.", ex);
@@ -114,8 +114,6 @@ public class PlayerHandler{
        }catch(IOException ex){
            logger.warn("Encountered IOException while saving cached players to playercache.json!", ex);
        }
-        
-        
    }
    
    public void addPlayer(String ip, String name, UUID uuid){
@@ -36,6 +36,7 @@ import org.spongepowered.configurate.serialize.SerializationException;

 import java.util.Collections;
 import java.util.List;
+import java.util.function.Function;

 public class ProfileManager{
    
@@ -44,22 +45,34 @@ public class ProfileManager{
     * If the random profile's value is not null will it be used instead of the default one.
     */
    public static ProfileEntry merge(ServerListProfile profile){
-        ProfileEntry entry = profile.getRandomProfile();
        ProfileEntry defEntry = profile.defaultProfile();
+        ProfileEntry entry = profile.getRandomProfile();
        
-        List<String> motd = resolveMOTD(entry, defEntry);
-        List<String> players = resolvePlayers(entry, defEntry);
-        String playerCountText = resolvePlayerCountText(entry, defEntry);
-        String favicon = resolveFavicon(entry, defEntry);
-        boolean isHidePlayersEnabled = resolveHidePlayersEnabled(entry, defEntry);
-        boolean isExtraPlayersEnabled = resolveExtraPlayersEnabled(entry, defEntry);
-        boolean isMaxPlayersEnabled = resolveMaxPlayersEnabled(entry, defEntry);
-        Integer extraPlayersCount = resolveExtraPlayersCount(entry, defEntry);
-        Integer maxPlayersCount = resolveMaxPlayersCount(entry, defEntry);
+        List<String> motd = resolve(defEntry, entry, ProfileEntry::motd);
+        List<String> players = resolve(defEntry, entry, ProfileEntry::players);
+        String playerCountText = resolve(defEntry, entry, ProfileEntry::playerCountText);
+        String favicon = resolve(defEntry, entry, ProfileEntry::favicon);
+        NullBool hidePlayersEnabled = resolve(defEntry, entry, ProfileEntry::hidePlayersEnabled);
+        NullBool extraPlayersEnabled = resolve(defEntry, entry, ProfileEntry::extraPlayersEnabled);
+        NullBool maxPlayersEnabled = resolve(defEntry, entry, ProfileEntry::maxPlayersEnabled);
+        NullBool onlinePlayersEnabled = resolve(defEntry, entry, ProfileEntry::onlinePlayersEnabled);
+        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, 
-            NullBool.resolve(isHidePlayersEnabled), NullBool.resolve(isExtraPlayersEnabled), NullBool.resolve(isMaxPlayersEnabled),
-            extraPlayersCount, maxPlayersCount);
+        return new ProfileEntry.Builder()
+            .motd(motd)
+            .players(players)
+            .playerCountText(playerCountText)
+            .favicon(favicon)
+            .hidePlayersEnabled(hidePlayersEnabled)
+            .extraPlayersEnabled(extraPlayersEnabled)
+            .maxPlayersEnabled(maxPlayersEnabled)
+            .onlinePlayersEnabled(onlinePlayersEnabled)
+            .extraPlayersCount(extraPlayersCount)
+            .maxPlayersCount(maxPlayersCount)
+            .onlinePlayersCount(onlinePlayersCount)
+            .build();
    }
    
    public static ServerListProfile resolveProfile(AdvancedServerList<?> core, GenericPlayer player, GenericServer server){
@@ -67,7 +80,7 @@ public class ProfileManager{
            if(profile.isInvalidProfile())
                continue;
            
-            if(profile.evalConditions(core.getParser(), core.getPlugin().getPluginLogger(), player, server))
+            if(profile.evalConditions(core, player, server))
                return profile;
        }
        
@@ -82,8 +95,10 @@ 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");
+        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 +108,10 @@ public class ProfileManager{
            .hidePlayersEnabled(hidePlayers)
            .extraPlayersEnabled(extraPlayersEnabled)
            .maxPlayersEnabled(maxPlayersEnabled)
+            .onlinePlayersEnabled(onlinePlayersEnabled)
            .extraPlayersCount(extraPlayers)
            .maxPlayersCount(maxPlayers)
+            .onlinePlayersCount(onlinePlayers)
            .build();
    }
    
@@ -115,67 +132,11 @@ public class ProfileManager{
        return false;
    }
    
-    private static List<String> resolveMOTD(ProfileEntry profile, ProfileEntry defaultProfile){
-        if(profile == null || !checkOption(profile.motd()))
-            return defaultProfile.motd();
+    private static <T> T resolve(ProfileEntry defProfile, ProfileEntry profile, Function<ProfileEntry, T> function){
+        if(profile == null || !checkOption(function.apply(profile)))
+            return function.apply(defProfile);
        
-        return profile.motd();
-    }
-    
-    private static List<String> resolvePlayers(ProfileEntry profile, ProfileEntry defaultProfile){
-        if(profile == null || !checkOption(profile.players()))
-            return defaultProfile.players();
-        
-        return profile.players();
-    }
-    
-    private static String resolvePlayerCountText(ProfileEntry profile, ProfileEntry defaultProfile){
-        if(profile == null || !checkOption(profile.playerCountText()))
-            return defaultProfile.playerCountText();
-        
-        return profile.playerCountText();
-    }
-    
-    private static String resolveFavicon(ProfileEntry profile, ProfileEntry defaultProfile){
-        if(profile == null || !checkOption(profile.favicon()))
-            return defaultProfile.favicon();
-        
-        return profile.favicon();
-    }
-    
-    private static boolean resolveHidePlayersEnabled(ProfileEntry profile, ProfileEntry defaultProfile){
-        if(profile == null || !checkOption(profile.hidePlayersEnabled()))
-            return defaultProfile.hidePlayersEnabled().getOrDefault(false);
-        
-        return profile.hidePlayersEnabled().getOrDefault(false);
-    }
-    
-    private static boolean resolveExtraPlayersEnabled(ProfileEntry profile, ProfileEntry defaultProfile){
-        if(profile == null || !checkOption(profile.extraPlayersEnabled()))
-            return defaultProfile.extraPlayersEnabled().getOrDefault(false);
-        
-        return profile.extraPlayersEnabled().getOrDefault(false);
-    }
-    
-    private static boolean resolveMaxPlayersEnabled(ProfileEntry profile, ProfileEntry defaultProfile){
-        if(profile == null || !checkOption(profile.maxPlayersEnabled()))
-            return defaultProfile.maxPlayersEnabled().getOrDefault(false);
-        
-        return profile.maxPlayersEnabled().getOrDefault(false);
-    }
-    
-    private static Integer resolveExtraPlayersCount(ProfileEntry profile, ProfileEntry defaultProfile){
-        if(profile == null || profile.extraPlayersCount() == null)
-            return defaultProfile.extraPlayersCount() == null ? 0 : defaultProfile.extraPlayersCount();
-        
-        return profile.extraPlayersCount();
-    }
-    
-    private static Integer resolveMaxPlayersCount(ProfileEntry profile, ProfileEntry defaultProfile){
-        if(profile == null || profile.maxPlayersCount() == null)
-            return defaultProfile.maxPlayersCount() == null ? 0 : defaultProfile.maxPlayersCount();
-        
-        return profile.maxPlayersCount();
+        return function.apply(profile);
    }
    
    private static List<String> resolveList(ConfigurationNode node, Object... path){
@@ -193,10 +154,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();
    }
 }
@@ -54,8 +54,10 @@ public class ProfileSerializer implements TypeSerializer<ProfileEntry>{
        node.node("favicon").set(profile.favicon());
        node.node("playerCount", "hidePlayers").set(profile.hidePlayersEnabled().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());
    }
 }
@@ -64,8 +64,6 @@ public class StringReplacer{
    
    private static String parsePlaceholder0(String input, ParsePosition position, GenericPlayer player, GenericServer server, ParseWarnCollector collector){
        AdvancedServerListAPI api = AdvancedServerList.getApi();
-        
-        int placeholderStart = position.getIndex() - 2;
        int index = position.getIndex();
        
        StringBuilder identifier = new StringBuilder();
@@ -113,7 +111,7 @@ public class StringReplacer{
                raw.append(' ').append(valuesStr);
            
            if(collector != null)
-                collector.appendWarningFormatted(placeholderStart, "Placeholder '%s' does not have a closing bracket (})", raw.toString());
+                collector.appendWarningFormatted(index, "Placeholder '%s' does not have a closing bracket (})", raw.toString());
            
            return raw.toString();
        }
@@ -128,7 +126,7 @@ public class StringReplacer{
            raw.append('}');
            
            if(collector != null)
-                collector.appendWarningFormatted(placeholderStart, "Placeholder '%s' does not have any available PlaceholderProvider", raw.toString());
+                collector.appendWarningFormatted(index, "Placeholder '%s' does not have any available PlaceholderProvider", raw.toString());
            
            return raw.toString();
        }
@@ -143,7 +141,7 @@ public class StringReplacer{
            raw.append('}');
            
            if(collector != null)
-                collector.appendWarningFormatted(placeholderStart, "Placeholder '%s' has an invalid value String '%s'", raw.toString(), valuesStr);
+                collector.appendWarningFormatted(index, "Placeholder '%s' has an invalid value String '%s'", raw.toString(), valuesStr);
            
            return raw.toString();
        }
@@ -107,6 +107,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!
@@ -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.
 #
@@ -134,6 +139,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 +168,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
@@ -0,0 +1,6 @@
+{% extends "base.html" %}
+
+{% block announce %}
+  <span class="twemoji">{% include ".icons/octicons/info-24.svg" %}</span>
+  <b>NEW:</b> Added a <a href="{{ base_url | url }}/getting-started/tutorials">Tutorial Section</a> to the Wiki!
+{% endblock %}
@@ -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
@@ -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
@@ -7,6 +7,23 @@ icon: octicons/log-24
 This page lists the recent changes made towards the AdvancedServerListAPI.  
 They are ordered newest to oldest.

+## 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(integer)
+[onlinePlayersEnabled]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#onlineplayersenabled(nullbool)
+
 ## v3.3.0 { #v3.3.0 }

 ### :octicons-plus-circle-24:{ .changelog-added title="Added" } Added { #v3.3.0-added }
@@ -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/")
 }
@@ -96,11 +96,11 @@ To add your own placeholders, follow these steps:

 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
+```java { .annotate title="Creating PlaceholderProvider class" }
 public class MyPlaceholders extends PlaceholderProvider {
    
    public MyPlaceholders(String identifier) {
-        super(identifier);
+        super(identifier); // (1)
    }
    
    @Override
@@ -110,14 +110,12 @@ public class MyPlaceholders extends PlaceholderProvider {
 }
 ```

-/// 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");
-}
-```
-///
+1.  It is recommended to replace this constructor with a no-args Constructor and have the placeholder name set in the `super` directly:  
+    ```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.
@@ -128,7 +126,7 @@ What you return is completely up to you. Just keep in mind that returning `null`
 /// details | Example of final class
    type: example

-```java
+```java title="MyPlaceholders.java"
 public class MyPlaceholders extends PlaceholderProvider {
    
    public MyPlaceholders() {
@@ -119,6 +119,34 @@ methods:
    throws:
      - name: 'IllegalArgumentException'
        description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
+  - name: 'onlinePlayersCount'
+    description: |
+      Sets the value to resolve into a number by AdvancedServerList.<br>
+      Strings not resolving into valid numbers will be treated as this option not being set.
+    parameters:
+      - name: 'onlinePlayersCount'
+        description: 'The number of online players to set.'
+        type: 'String'
+        attribute:
+          - 'nullable'
+    returns: 'This Builder after the max player count has been set. Useful for chaining.'
+  - name: 'onlinePlayersEnabled'
+    description: |
+      Sets whether the online players feature should be enabled.<br>
+      <br>
+      Set to <a href="../../../objects/nullbool/#not_set"><code>NullBool.NOT_SET</code></a> to not set this.<br>
+      <br>
+      An <code>IllegalArgumentException</code> may be thrown by the <code>CheckUtil</code> should onlinePlayersEnabled be null.
+    parameters:
+      - name: 'onlinePlayersEnabled'
+        description: 'Whether the extra players feature should be enabled or not.'
+        type: 'NullBool'
+        attribute:
+          - '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.'
  - name: 'playerCountText'
    description: |
      Sets the text to override the player count with.<br>
@@ -155,192 +183,6 @@ methods:
      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'
 ---

 # <api__class></api__class> Builder
@@ -1,8 +1,10 @@
 document$.subscribe(async () => {
-    const url = 'https://codeberg-stats-proxy.vercel.app'
+    const url = 'https://api.allorigins.win/raw?url='
+    const apiUrl = `https://api.allorigins.win/raw?url=${encodeURIComponent('https://codeberg.org/api/v1/repos/Andre601/asl-api/releases/latest')}`
+
    const repo_stats = document.querySelector('[data-md-component="source"] .md-source__repository');
    
-    function loadCodebergInfo(data) {
+    async function loadCodebergInfo(data) {
        const facts = document.createElement("ul");
        facts.className = "md-source__facts";
        
@@ -26,29 +28,44 @@ document$.subscribe(async () => {
        repo_stats.appendChild(facts);
    }
    
-    function loadApiInfo(data) {
+    async function loadApiInfo(data) {
+        const codeBlocks = document.querySelectorAll('[data-md-component="api-version"] pre code')
+        if (codeBlocks === null)
+            return;
+        
        const version = data["version"];
-        const versionToken = '{apiVersion}';
-        const codeBlocks = document.querySelectorAll('.md-content pre code');
-        for(const codeBlock of codeBlocks) {
-            codeBlock.innerHTML = codeBlock.innerHTML.replace(new RegExp(versionToken, 'g'), version.substring(1));
-        }
+        const regex = new RegExp('{apiVersion}', 'g');
+        codeBlocks.forEach((codeBlock) => {
+            var walker = document.createTreeWalker(codeBlock, NodeFilter.SHOW_TEXT);
+            var node;
+            while (node = walker.nextNode()) {
+                node.nodeValue = node.nodeValue.replace(regex, version.substring(1));
+            }
+        });
    }
    
-    function loadPluginVersion(data) {
+    async function loadPluginVersion(data) {
+        const entries = document.querySelectorAll('code[data-md-component="plugin-version"]');
+        if(entries === null)
+            return;
+        
        const version = data["version"];
-        const versionToken = '{version}'
-        const entries = document.querySelectorAll('.md-content code');
-        for(const entry of entries) {
-            entry.innerHTML = entry.innerHTML.replace(new RegExp(versionToken, 'g'), version.substring(1));
-        }
+        const regex = new RegExp('{version}', 'g');
+        entries.forEach((entry) => {
+            var walker = document.createTreeWalker(entry, NodeFilter.SHOW_TEXT);
+            var node;
+            while (node = walker.nextNode()) {
+                node.nodeValue = node.nodeValue.replace(regex, version.substring(1));
+            }
+        })
    }
    
    async function fetchApiInfo() {
-        const tag = await fetch(`${url}/api/latest-release`).then(_ => _.json());
+        const tag = await fetch(`${apiUrl}`)
+            .then(_ => _.json());
        
        const data = {
-            "version": tag.name
+            "version": tag.tag_name
        };
        
        __md_set("__api_tag", data, sessionStorage);
@@ -57,14 +74,14 @@ document$.subscribe(async () => {
    
    async function fetchInfo() {
        const [release, repo] = await Promise.all([
-            fetch(`${url}/repo/latest-release`).then(_ => _.json()),
-            fetch(`${url}/repo/stats`).then(_ => _.json()),
+            fetch(`${url}${encodeURIComponent('https://codeberg.org/api/v1/repos/Andre601/AdvancedServerList/releases/latest')}`).then(_ => _.json()),
+            fetch(`${url}${encodeURIComponent('https://codeberg.org/api/v1/repos/Andre601/AdvancedServerList')}`).then(_ => _.json()),
        ]);
        
        const data = {
-            "version": release.name,
-            "stars": repo.stars,
-            "forks": repo.forks
+            "version": release.tag_name,
+            "stars": repo.stars_count,
+            "forks": repo.forks_count
        };
        
        __md_set("__git_repo", data, sessionStorage);
@@ -10,7 +10,7 @@ icon: octicons/list-unordered-24

 This page lists some examples you may want to use for your proxy or server.

-Feel free to suggest additional examples in the `advancedserverlist` category on the [M.O.S.S. Discord Server](https://discord.gg/MyPTjpsgGH){ target="_blank" rel="nofollow" }.
+Feel free to suggest additional examples in the `advancedserverlist` category on the [M.O.S.S. Discord Server][discord]{ target="_blank" rel="nofollow" }.

 ## Table of Contents

@@ -5,7 +5,7 @@ icon: octicons/milestone-24
 # Getting Started

 This page will explain how to set up AdvancedServerList and make it work for your server.  
-The guide is designed to be as easy to understand as possible. If you still have problems or questions, join the [M.O.S.S Discord Server](https://discord.gg/MyPTjpsgGH){ target="_blank" rel="nofollow" } for more help.
+The guide is designed to be as easy to understand as possible. If you still have problems or questions, join the [M.O.S.S Discord Server][discord]{ target="_blank" rel="nofollow" } for more help.

 ## 1. Download the plugin { #download-the-plugin }

@@ -109,10 +109,6 @@ The plugin also supports these additional plugins. They are all optional.

 </div>

-[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
 [addon]: ../addons/banplugins.md

 ## 2. Installation { #installation }
@@ -120,11 +116,11 @@ The plugin also supports these additional plugins. They are all optional.
 Installing the plugin is as simple as moving the jar file into the `plugins` folder. Just make sure to download the right version of AdvancedServerList for the right platform.  
 Here is a quick table showing the jar file name with the platforms it is made for:

-| Jar file name                                 | Platforms             |
-|-----------------------------------------------|-----------------------|
-| `AdvancedServerList-Paper-{version}.jar`      | Paper                 |
-| `AdvancedServerList-BungeeCord-{version}.jar` | BungeeCord, Waterfall |
-| `AdvancedServerList-Velocity-{version}.jar`   | Velocity              |
+| Jar file name                                                                       | Platforms             |
+|-------------------------------------------------------------------------------------|-----------------------|
+| `AdvancedServerList-Paper-{version}.jar`{ data-md-component="plugin-version" }      | Paper                 |
+| `AdvancedServerList-BungeeCord-{version}.jar`{ data-md-component="plugin-version" } | BungeeCord, Waterfall |
+| `AdvancedServerList-Velocity-{version}.jar`{ data-md-component="plugin-version" }   | Velocity              |

 After you added it to your plugins folder - alongside any other dependency you may want - (re)start your server or proxy to enable the plugin.  
 If everything goes well should AdvancedServerList create a folder named `AdvancedServerList` (`advancedserverlist` on Velocity) with additional files and folders inside of it.
@@ -214,12 +210,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.
 #
@@ -290,6 +291,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.
@@ -318,12 +320,37 @@ 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
 ```
 ///

@@ -502,16 +529,14 @@ motd:

 ### Additional profiles

-To add additional profiles, create a new YAML file inside the `profiles` folder. The name can be whatever you like, but it is recommended to keep it simple and only use alphanumeric characters (`a-z` and `0-9`), underlines and hyphens.
+Additional profiles can be created to display different content under specific situations. To create a new file, either manually create a YAML file in the `profiles` folder, or use [`/asl profiles add <name>`](../commands/index.md#profiles) to have one created for you. In either case is it recommended to only use alphanummeric (`a-z` abd `0-9`) characters, dashes and underscores for the file name. You should also choose a name that fits the purpose of the file (i.e. for a profile that displays stuff when someone is banned, name it `banned.yml`).

-Inside the file, add a priority and at least one setting, similar to the above shown example.  
-This would already be enough to have a valid profile, but depending on the priority and file name may the file not be used, or used over other profiles.
+In case you manually created a YAML file, make sure it contains the [`priority`](../profiles/index.md#priority) setting and one of the other settings, to have a valid profile.  
+You should also add a [`condition`](../profiles/index.md#condition) to ensure that the profile is only loaded when needed. The [Expressions page](../profiles/expressions.md) covers what counts as valid expressions and conditions.  
+Do note that the plugin goes through the profiles in order of priority, starting with the highest number first, picking the first one that returns a `condition` returning true.

-If you want to only show this file under specific situations can you use the [`condition`](../profiles/index.md#condition) option to apply conditions that need to be met to show the profile.  
-The condition option would have a single String containing one or multiple [Expressions](../profiles/expressions.md). Only if the condition would return true, would the profile be displayed, granted that it has a higher priority than any other valid file with a true condition output.
-
-/// info | Note
-Files without a condition or an empty condition will be treated as always having a true condition.
+/// info | Note about Condition
+The Condition option, if not set or empty, will always return true.
 ///

 Here is another example profile using conditions to show it when the player was banned on the server:
@@ -0,0 +1,37 @@
+---
+icon: octicons/project-roadmap-24
+---
+
+# Tutorials
+
+This page lists tutorials made by the community of AdvancedServerList.  
+Be aware that any info shown may be outdated.
+
+Can't find a tutorial that exists? Join the [M.O.S.S. Discord][discord]{ target="_blank" rel="nofollow" } and suggest it in `#asl-support` to be added.
+
+## Video Tutorials
+
+Below is a collection of video tutorials made.
+
+/// note
+For privacy reasons are only thumbnails of the videos displayed, as otherwise sensitive data would be sent via embedding the videos themself.  
+you can click the image to be sent to the actual video.
+///
+
+### KasaiSora
+
+**Video Language:** :flag_gb: English
+
+[![thumbnail](https://img.youtube.com/vi/9cU0uUWHOO0/0.jpg)](https://youtube.com/watch?v=9cU0uUWHOO0){ target="_blank" rel="nofollow" }
+
+### Ajneb97
+
+**Video Language:** :flag_es: Spanish
+
+[![thumbnail](https://img.youtube.com/vi/rIbljm_4HVI/0.jpg)](https://youtube.com/watch?v=rIbljm_4HVI){ target="_blank" rel="nofollow" }
+
+## Text Tutorials
+
+Text-based tutorials (Forum Posts, Blog Posts, etc).
+
+*No entries yet*
@@ -18,7 +18,7 @@ Execute the command [`/asl migrate minimotd`](../commands/index.md#migrate) to s
 Below can you find a full example of a `main.conf` file and the corresponding migrated files from AdvancedServerList:

 /// tab | :octicons-file-code-24: main.conf
-```conf
+```lighty
 icon-enabled=true
 motd-enabled=true
 motds=[
@@ -6,8 +6,6 @@ icon: material/percent

 AdvancedServerList provides support for [PlaceholderAPI] placeholders to be used, while also providing its own set of placeholders.

-[placeholderapi]: https://hangar.papermc.io/HelpChat/PlaceholderAPI
-
 ## Own placeholders

 The below listed placeholders can be used through PlaceholderAPI in other plugins.  
@@ -119,15 +119,28 @@ motd:

 The `favicon` option can be used to define an image to display in the server list.

-The Value can be one of three possible options, each being checked for in order:
+The Value can be one of the following:

- A URL pointing to an image file. The URL needs to start with `https://` to work.
- A PNG filename, including `.png` file extension, matching a PNG file in the `favicons` folder.
- A player name or UUID, or a [placeholder](placeholders.md) that resolves into one.
+- A URL pointing to a Image file. The URL needs to start with `https://` for it to work.
+- A filename matching a pre-existing file in the `favicons` folder of the Plugin.
+    - Only PNG files are supported for now and the provided filename needs to end with `.png`
+    - `random` can be used to have the plugin select a random image from the Favicons folder.
+- A player name or UUID.
+    - `${player name}`, `${player uuid}` or any [placeholder](placeholders.md) that resolves into a player name/UUID can be used.
+    - Uses [mc-heads.net](https://mc-heads.net) to resolve the Player Name/UUID.
+
+/// details | Why is the favicon from URL/Placeholder not showing?
+    type: question
+
+AdvancedServerList has to create a Favicon instance to use, as the Proxy/Server doesn't directly use PNG images.  
+This action takes time, so to not unnecessarely delay the Pinged Proxy/Server from showing is this done asynchrnously.  
+This has the issue that the Proxy/Server may be done with handling the Ping before AdvancedServerList is done creating the Favicon, resulting in no favicon being displayed.
+
+This issue is only present for when using either a URL or a Player name/uuid and not for local favicons, as those are created when the plugin loads.
+
+Favicons *should* display on the second ping, if pinged within the configured favicon cache time (Default: 1 minute).
+///

-Note that for the name/UUID, the site https://mc-heads.net is being used.  
-Use the URL option with the `${player uuid}` placeholder if you want to use another service.
- 
 /// details | Example
    type: example

@@ -161,7 +174,7 @@ When set to true will the player count be replaced with `???`.
 In addition are the [`playerCount -> text`](#text) and [`playerCount -> hover`](#hover) options ignored.

 If you want to not show any text at all, set this option to `false` (or remove it) and instead use the [`playerCount -> text`](#text) option.
- 
+
 /// details | Example
    type: example

@@ -227,7 +240,7 @@ Please take note of the following caveats:
 If you want to not show any text, just use a single color (i.e. `text: '<grey>'`) to do so.

 This option only supports basic colors and no HEX colors.
- 
+
 /// details | Example
    type: example

@@ -267,7 +280,9 @@ Use the [`playerCount -> extraPlayers -> amount`](#extraplayers-amount) option t
 The `playerCount -> extraPlayers -> amount` option defines how much should be added to the current online player count to then use as max player count.

 Example: Setting this option to `1` while currently 10 players are online will result in `10/11` being displayed on the player count (Assuming it is not being overriden by the [`playerCount -> text`](#text) option).
- 
+
+You can use placeholders that resolve into numbers for this option.
+
 /// details | Example
    type: example

@@ -309,7 +324,9 @@ Use the [`playerCount -> maxPlayers -> amount`](#maxplayers-amount) option to se

 The `playerCount -> maxPlayers -> amount` option defines the number to use as the server's max players count.  
 Unlike the [`playerCount -> extraPlayers -> amount`](#extraplayers-amount) option does this one not first add the current online player count to the number to then set.
- 
+
+You can use placeholders that resolve into numbers for this option.
+
 /// details | Example
    type: example

@@ -330,5 +347,44 @@ playerCount:

 ![maxplayers-example](../assets/images/examples/maxplayers-example.jpg){ loading="lazy" }

+</div>
+///
+
+### OnlinePlayers
+
+<!-- admo:warning Using this option alters the output of <code>playerCount -> extraPlayers</code> -->
+
+The `playerCount -> onlinePlayers` option contains settings to enable and set the number of players online on the server.
+
+#### Enabled { #onlineplayers-enabled }
+
+Enables the online players feature.  
+Use the [`playerCount -> onlinePlayers -> amount`](#onlineplayers-amount) option to set the online players value itself.
+
+#### Amount { #onlineplayers-amount }
+
+Sets the number to display as the server's only player count.  
+You can use placeholders that resolve into numbers for this option.
+
+/// details | Example
+    type: example
+
+```yaml title="YAML file"
+priority: 0
+
+# Hides the MOTD for demonstration purposes
+motd:
+  - '<grey>'
+  - '<grey>'
+
+playerCount:
+  onlinePlayers:
+    enabled: true
+    amount: 10
+```
+<div class="result" markdown>
+
+![onlineplayers-example](../assets/images/examples/onlineplayers-example.png)
+
 </div>
 ///
@@ -11,7 +11,7 @@ It also has built-in [PlaceholderAPI support](#placeholderapi) for Spigot and Pa

 The following placeholders are available in AdvancedServerList itself. Please note that not all placeholders are available on all platforms.

-### Player Placeholders
+### Player

 These placeholders use the player who pinged the server, to return values. They may require the player to be cached in order to work.

@@ -44,7 +44,8 @@ These placeholders use values given by the server/proxy AdvancedServerList runs

 [^4]:
    A comma-separated list of world (On Paper) or Server (On BungeeCord/Velocity) names can be provided to display the added numbers of players in these worlds/servers.  
-    **Example:** `${server playersOnline lobby1,lobby2}` will display the collective numbers of players in the servers `lobby1` and `lobby2`.
+    **Example:** `${server playersOnline lobby1,lobby2}` will display the collective numbers of players in the servers `lobby1` and `lobby2`.  
+    Using the [onlinePlayers' `amount`](index.md#onlineplayers-amount) option will modify the output of this placeholder, except when used in [`condition`](index.md#condition).
 [^5]:
    Using either the [extraPlayers' `amount`](index.md#extraplayers-amount) or [maxPlayers' `amount`](index.md#maxplayers-amount) option will make this placeholder return the modified max players count.  
    Only exception to this rule is when the placeholder is used in the [`condition`](index.md#condition) option in which case it returns the actual max player count of the proxy/server.
@@ -52,6 +53,31 @@ These placeholders use values given by the server/proxy AdvancedServerList runs
    An optional server name can be provided to display the IP/Domain associated with that server. This only works on BungeeCord or Velocity.  
    **Example:** `${server host survival}` would display the IP/Domain associated with the `survival` server.

+### Proxy
+
+These placeholders are only available on the BungeeCord and Velocity versions of AdvancedServerList.
+
+/// note
+Servers are pinged every 10 seconds by the plugin and cached for that time period.
+///
+
+| Placeholders                 | Description                                                       | Default[^7] |
+|------------------------------|-------------------------------------------------------------------|-------------|
+| `${proxy status <name>}`     | Returns `online` or `offline` based on the Server's availability. | `offline`   |
+| `${proxy motd <name>}`       | Returns the Server's MOTD as MiniMessage String.                  | `none`      |
+| `${proxy players <name>}`    | Returns the number of online Players on the Server.               | `0`         |
+| `${proxy maxPlayers <name>}` | Returns the max number of Players allowed to join the Server.     | `0`         |
+
+[^7]: The default value returned, should the Server or parts of it not be available.
+
+### Maintenance
+
+These placeholders require the [Maintenance](https://hangar.papermc.io/kennytv/Maintenance) plugin to work.
+
+| Placeholder                         | Description                                                    |
+|-------------------------------------|----------------------------------------------------------------|
+| `${maintenance maintenanceEnabled}` | Returns whether the Global maintenance mode is enabled or not. |
+
 ## PlaceholderAPI

 Please visit the [PlaceholderAPI page](../placeholderapi/index.md) for how AdvancedServerList works with PlaceholderAPI.
@@ -84,6 +84,8 @@ markdown_extensions:
  - pymdownx.superfences:
  - pymdownx.snippets:
      base_path: docs/.snippets
+      auto_append:
+        - links.md
  - pymdownx.blocks.admonition:
      types:
        - note
@@ -108,7 +110,9 @@ hooks:

 nav:
  - Home: index.md
-  - Getting Started: getting-started/index.md
+  - Getting Started:
+    - getting-started/index.md
+    - Tutorials: getting-started/tutorials.md
  - Commands: commands/index.md
  - Profiles:
    - profiles/index.md
@@ -148,7 +152,7 @@ nav:
            - api/reference/api/ch.andre601.advancedserverlist.api/objects/genericserver.md
            - api/reference/api/ch.andre601.advancedserverlist.api/objects/nullbool.md
          - profiles:
-            - '<api__record></api__record> ProfileEntry':
+            - ProfileEntry:
              - api/reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/index.md
              - api/reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md
      - platform-bukkit:
@@ -46,7 +46,7 @@
    <repositories>
        <repository>
            <id>papermc</id>
-            <url>https://papermc.io/repo/repository/maven-public/</url>
+            <url>https://repo.papermc.io/repository/maven-public/</url>
        </repository>
        <repository>
            <id>placeholderapi-repo</id>
@@ -77,7 +77,7 @@
        <dependency>
            <groupId>io.papermc.paper</groupId>
            <artifactId>paper-api</artifactId>
-            <version>1.20.6-R0.1-SNAPSHOT</version>
+            <version>1.21-R0.1-SNAPSHOT</version>
            <scope>provided</scope>
        </dependency>
        
@@ -85,7 +85,7 @@
        <dependency>
            <groupId>org.bstats</groupId>
            <artifactId>bstats-bukkit</artifactId>
-            <version>3.0.2</version>
+            <version>3.1.0</version>
            <scope>compile</scope>
        </dependency>

@@ -99,7 +99,7 @@
        <dependency>
            <groupId>com.viaversion</groupId>
            <artifactId>viaversion-api</artifactId>
-            <version>4.10.2</version>
+            <version>5.2.0</version>
            <scope>provided</scope>
        </dependency>

@@ -132,7 +132,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.3</version>
+                <version>3.6.0</version>
                <configuration>
                    <createDependencyReducedPom>false</createDependencyReducedPom>
                    <relocations>
@@ -149,6 +149,11 @@ public class PaperCore extends JavaPlugin implements PluginCore<CachedServerIcon
        libraryManager.loadLibrary(lib);
    }
    
+    @Override
+    public void startScheduler(){
+        // Unused
+    }
+    
    @Override
    public AdvancedServerList<CachedServerIcon> getCore(){
        return core;
@@ -28,7 +28,7 @@ package ch.andre601.advancedserverlist.paper.listeners;
 import ch.andre601.advancedserverlist.api.events.GenericServerListEvent;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
 import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
-import ch.andre601.advancedserverlist.core.events.PingEventHandler;
+import ch.andre601.advancedserverlist.core.compat.maintenance.MaintenanceUtil;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import ch.andre601.advancedserverlist.core.interfaces.events.GenericEventWrapper;
 import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
@@ -48,6 +48,8 @@ import org.bukkit.util.CachedServerIcon;

 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
+import java.util.function.Function;

 public class PaperEventWrapper implements GenericEventWrapper<CachedServerIcon, PaperPlayerImpl>{
    
@@ -72,6 +74,11 @@ public class PaperEventWrapper implements GenericEventWrapper<CachedServerIcon,
        event.setMaxPlayers(maxPlayers);
    }
    
+    @Override
+    public void setOnlinePlayers(int onlinePlayers){
+        event.setNumPlayers(onlinePlayers);
+    }
+    
    @Override
    public void setMotd(Component component){
        event.motd(component);
@@ -90,24 +97,13 @@ public class PaperEventWrapper implements GenericEventWrapper<CachedServerIcon,
    
    @Override
    public void setPlayers(List<String> lines, PaperPlayerImpl player, GenericServer server){
-        event.getPlayerSample().clear();
-        List<PlayerProfile> players = new ArrayList<>(lines.size());
-        
-        for(String line : lines){
-            String parsed = ComponentParser.text(line)
-                .modifyText(text -> StringReplacer.replace(text, player, server))
-                .modifyText(text -> {
-                    if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
-                        return PlaceholderAPI.setPlaceholders(player.getPlayer(), text);
-                    
-                    return text;
-                })
-                .toString();
-            
-            players.add(FakePlayerProfile.create(parsed));
+        try{
+            event.getListedPlayers();
+            setListedPlayers(lines, player, server);
+        }catch(NoSuchMethodError ex){
+            // Version before latest 1.20.6 builds(?)
+            setPlayerSample(lines, player, server);
        }
-        
-        event.getPlayerSample().addAll(players);
    }
    
    @Override
@@ -135,7 +131,7 @@ public class PaperEventWrapper implements GenericEventWrapper<CachedServerIcon,
        if(!Bukkit.getPluginManager().isPluginEnabled("Maintenance"))
            return false;
        
-        return PingEventHandler.getMaintenanceUtil().isMaintenanceEnabled();
+        return MaintenanceUtil.get().isMaintenanceEnabled();
    }
    
    @Override
@@ -187,4 +183,34 @@ public class PaperEventWrapper implements GenericEventWrapper<CachedServerIcon,
    public GenericServer createGenericServer(int playersOnline, int playersMax, String host){
        return new PaperServerImpl(plugin.getWorldCache().worlds(), playersOnline, playersMax, host);
    }
+    
+    private void setListedPlayers(List<String> lines, PaperPlayerImpl player, GenericServer server){
+        event.getListedPlayers().clear();
+        List<PaperServerListPingEvent.ListedPlayerInfo> playerList = getPlayerList(lines, player, server,
+            text -> new PaperServerListPingEvent.ListedPlayerInfo(text, UUID.randomUUID()));
+        
+        event.getListedPlayers().addAll(playerList);
+    }
+    
+    @SuppressWarnings({"Deprecation", "removal"})
+    private void setPlayerSample(List<String> lines, PaperPlayerImpl player, GenericServer server){
+        event.getPlayerSample().clear();
+        List<PlayerProfile> playerProfiles = getPlayerList(lines, player, server, FakePlayerProfile::create);
+        
+        event.getPlayerSample().addAll(playerProfiles);
+    }
+    
+    private <T> List<T> getPlayerList(List<String> lines, PaperPlayerImpl player, GenericServer server, Function<String, T> function){
+        List<T> playerList = new ArrayList<>(lines.size());
+        for(String line : lines){
+            String parsed = ComponentParser.text(line)
+                .modifyText(text -> StringReplacer.replace(text, player, server))
+                .modifyText(text -> parsePAPIPlaceholders(text, player))
+                .toString();
+            
+            playerList.add(function.apply(parsed));
+        }
+        
+        return playerList;
+    }
 }
@@ -70,7 +70,7 @@ public record FakePlayerProfile(String name, UUID uuid) implements PlayerProfile
    
    @Override
    public @NotNull PlayerTextures getTextures(){
-        return new FakePlayeerTextures();
+        return new FakePlayerTextures();
    }
    
    @Override
@@ -153,7 +153,7 @@ public record FakePlayerProfile(String name, UUID uuid) implements PlayerProfile
        return Collections.emptyMap();
    }
    
-    private static record FakePlayeerTextures() implements PlayerTextures{
+    private record FakePlayerTextures() implements PlayerTextures{
        
        @Override
        public boolean isEmpty(){
@@ -94,16 +94,22 @@ public class PAPIPlaceholders extends PlaceholderExpansion{
        
        ProfileEntry entry = ProfileManager.merge(profile);
        
+        Integer onlinePlayers = null;
+        if(ProfileManager.checkOption(entry.onlinePlayersEnabled())){
+            onlinePlayers = parseNumberOption(entry.onlinePlayersCount(), pl, player, server);
+            online = onlinePlayers == null ? online : onlinePlayers;
+        }
+        
        Integer maxPlayers = null;
        if(ProfileManager.checkOption(entry.maxPlayersEnabled())){
-            max = entry.maxPlayersCount() == null ? 0 : entry.maxPlayersCount();
-            maxPlayers = entry.maxPlayersCount();
+            maxPlayers = parseNumberOption(entry.maxPlayersCount(), pl, player, server);
+            max = maxPlayers == null ? 0 : maxPlayers;
        }
        
        Integer extraPlayers = null;
        if(ProfileManager.checkOption(entry.extraPlayersEnabled())){
-            max = online + (entry.extraPlayersCount() == null ? 0 : entry.extraPlayersCount());
-            extraPlayers = entry.extraPlayersCount();
+            extraPlayers = parseNumberOption(entry.extraPlayersCount(), pl, player, server);
+            max = online + (extraPlayers == null ? 0 : extraPlayers);
        }
        
        BukkitServer finalServer = new PaperServerImpl(plugin.getWorldCache().worlds(), online, max, host);
@@ -114,6 +120,7 @@ public class PAPIPlaceholders extends PlaceholderExpansion{
            case "playercount_text" -> getOption(entry.playerCountText(), pl, player, finalServer);
            case "playercount_extraplayers" -> extraPlayers == null ? "null" : String.valueOf(extraPlayers);
            case "playercount_maxplayers" -> maxPlayers == null ? "null" : String.valueOf(maxPlayers);
+            case "playercount_onlineplayers" -> onlinePlayers == null ? "null" : String.valueOf(onlinePlayers);
            case "server_playersmax" -> String.valueOf(max);
            default -> null;
        };
@@ -134,8 +141,21 @@ public class PAPIPlaceholders extends PlaceholderExpansion{
    
    private String getOption(List<String> list, Player pl, BukkitPlayer player, BukkitServer server){
        return ComponentParser.list(list)
-            .modifyText(text -> PlaceholderAPI.setPlaceholders(pl, text))
            .modifyText(text -> StringReplacer.replace(text, player, server))
+            .modifyText(text -> PlaceholderAPI.setPlaceholders(pl, text))
            .toString();
    }
+    
+    private Integer parseNumberOption(String option, Player pl, BukkitPlayer player, BukkitServer server){
+        String parsed = ComponentParser.text(option)
+            .modifyText(text -> StringReplacer.replace(text, player, server))
+            .modifyText(text -> PlaceholderAPI.setPlaceholders(pl, text))
+            .toString();
+        
+        try{
+            return Integer.parseInt(parsed);
+        }catch(NumberFormatException ex){
+            return null;
+        }
+    }
 }
@@ -73,19 +73,19 @@ public class PaperServerPlaceholders extends PlaceholderProvider{
            }
            case "playersMax" -> {
                if(args.length >= 2)
-                    yield null;
+                    yield "";
                
                yield String.valueOf(paperServer.getPlayersMax());
            }
            case "host" -> {
                if(args.length >= 2)
-                    yield null;
+                    yield "";
                
                yield paperServer.getHost();
            }
            case "whitelistEnabled" -> {
                if(args.length >= 2)
-                    yield null;
+                    yield "";
                
                yield String.valueOf(Bukkit.hasWhitelist());
            }
@@ -37,15 +37,15 @@
    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        
-        <plugin.version>4.11.0</plugin.version>
+        <plugin.version>5.1.1</plugin.version>
        <plugin.description>Create multiple Server lists based on conditions.</plugin.description>
        
-        <api.version>3.3.0</api.version>
+        <api.version>4.0.0</api.version>

        <dependency.adventure-api>4.17.0</dependency.adventure-api>
        <dependency.adventure-text-minimessage>4.17.0</dependency.adventure-text-minimessage>
        <dependency.adventure-text-serializer-legacy>4.17.0</dependency.adventure-text-serializer-legacy>
-        <dependency.adventure-platform-bungeecord>4.3.2</dependency.adventure-platform-bungeecord>
+        <dependency.adventure-platform-bungeecord>4.3.4</dependency.adventure-platform-bungeecord>
        <dependency.configurate-yaml>4.1.2</dependency.configurate-yaml>
        
        <maven.compiler.source>16</maven.compiler.source>
@@ -18,7 +18,7 @@
      ]
    },
    {
-      "description": "Use Codeberg packages for asl-api",
+      "description": "Use Codeberg packages for Own API stuff",
      "matchPackageNames": [
        "ch.andre601.asl-api:api",
        "ch.andre601.asl-api:parent",
@@ -31,6 +31,44 @@
        "https://codeberg.org/api/packages/Andre601/maven"
      ]
    },
+    {
+      "description": "Use Paper Repo for Paper API",
+      "matchPackageNames": [
+        "io.papermc.paper:paper-api"
+      ],
+      "registryUrls": [
+        "https://papermc.io/repo/repository/maven-public"
+      ]
+    },
+    {
+      "description": "Use PlaceholderAPI Repo for PlaceholderAPI",
+      "matchPackageNames": [
+        "me.clip:placeholderapi"
+      ],
+      "registryUrls": [
+        "https://repo.extendedclip.com/content/repositories/placeholderapi"
+      ]
+    },
+    {
+      "description": "Use ViaVersion Repo for ViaVersion",
+      "matchPackageNames": [
+        "com.viaversion:viaversion-api"
+      ],
+      "registryUrls": [
+        "https://repo.viaversion.com"
+      ]
+    },
+    {
+      "description": "Use Sonatype for Libby",
+      "matchPackageNames": [
+        "com.alessiodp.libby:libby-bungee",
+        "com.alessiodp.libby:libby-paper",
+        "com.alessiodp.libby:libby-velocity"
+      ],
+      "registryUrls": [
+        "https://s01.oss.sonatype.org/content/repositories/snapshots/"
+      ]
+    },
    {
      "description": "Apply label for Bukkit platform",
      "matchFileNames": ["bukkit/pom.xml"],
@@ -1,3 +1,3 @@
-mkdocs-material==9.5.24
+mkdocs-material==9.5.48
 mkdocs-glightbox==0.4.0
 git+https://github.com/Andre601/mkdocs-pagenav-generator
@@ -46,7 +46,7 @@
    <repositories>
        <repository>
            <id>velocity-repo</id>
-            <url>https://papermc.io/repo/repository/maven-public/</url>
+            <url>https://repo.papermc.io/repository/maven-public/</url>
        </repository>
    </repositories>
    
@@ -76,7 +76,7 @@
        <dependency>
            <groupId>org.bstats</groupId>
            <artifactId>bstats-velocity</artifactId>
-            <version>3.0.2</version>
+            <version>3.1.0</version>
            <scope>compile</scope>
        </dependency>
        
@@ -122,7 +122,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.3</version>
+                <version>3.6.0</version>
                <configuration>
                    <createDependencyReducedPom>false</createDependencyReducedPom>
                    <relocations>
@@ -34,6 +34,7 @@ import ch.andre601.advancedserverlist.velocity.listeners.JoinEvent;
 import ch.andre601.advancedserverlist.velocity.listeners.PingEvent;
 import ch.andre601.advancedserverlist.velocity.logging.VelocityLogger;
 import ch.andre601.advancedserverlist.velocity.objects.placeholders.VelocityPlayerPlaceholders;
+import ch.andre601.advancedserverlist.velocity.objects.placeholders.VelocityProxyPlaceholders;
 import ch.andre601.advancedserverlist.velocity.objects.placeholders.VelocityServerPlaceholders;
 import com.alessiodp.libby.Library;
 import com.alessiodp.libby.VelocityLibraryManager;
@@ -46,6 +47,8 @@ import com.velocitypowered.api.plugin.annotation.DataDirectory;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ProxyServer;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
+import com.velocitypowered.api.proxy.server.ServerPing;
+import com.velocitypowered.api.scheduler.ScheduledTask;
 import com.velocitypowered.api.util.Favicon;
 import de.myzelyam.api.vanish.VelocityVanishAPI;
 import org.bstats.charts.SimplePie;
@@ -58,10 +61,14 @@ import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;

 public class VelocityCore implements PluginCore<Favicon>{
    
    private final Logger logger = LoggerFactory.getLogger("AdvancedServerList");
+    private final Map<String, ServerPing> fetchedServers = new ConcurrentHashMap<>();
    
    private final PluginLogger pluginLogger;
    private final ProxyServer proxy;
@@ -73,6 +80,8 @@ public class VelocityCore implements PluginCore<Favicon>{
    
    private VelocityLibraryManager<VelocityCore> libraryManager = null;
    
+    private ScheduledTask scheduledTask = null;
+    
    @Inject
    public VelocityCore(ProxyServer proxy, @DataDirectory Path path, Metrics.Factory metrics){
        this.pluginLogger = new VelocityLogger(this, this.logger);
@@ -84,12 +93,15 @@ public class VelocityCore implements PluginCore<Favicon>{
    
    @Subscribe
    public void init(ProxyInitializeEvent event){
-        this.core = AdvancedServerList.init(this, VelocityPlayerPlaceholders.init(), VelocityServerPlaceholders.init(this));
+        this.core = AdvancedServerList.init(this,
+            VelocityPlayerPlaceholders.init(), VelocityServerPlaceholders.init(this), VelocityProxyPlaceholders.init(this));
    }
    
    @Subscribe
    public void pluginDisable(ProxyShutdownEvent event){
        core.disable();
+        if(scheduledTask != null)
+            scheduledTask.cancel();
    }
    
    @Override
@@ -145,6 +157,13 @@ public class VelocityCore implements PluginCore<Favicon>{
        libraryManager.loadLibrary(lib);
    }
    
+    @Override
+    public void startScheduler(){
+        scheduledTask = getProxy().getScheduler().buildTask(this, this::fetchServers)
+            .repeat(10, TimeUnit.SECONDS)
+            .schedule();
+    }
+    
    @Override
    public AdvancedServerList<Favicon> getCore(){
        return core;
@@ -208,4 +227,18 @@ public class VelocityCore implements PluginCore<Favicon>{
        
        return players.size();
    }
+    
+    public Map<String, ServerPing> getFetchedServers(){
+        return fetchedServers;
+    }
+    
+    private void fetchServers(){
+        fetchedServers.clear();
+        getProxy().getAllServers().forEach(server -> server.ping().whenComplete((ping, throwable) -> {
+            if(throwable != null)
+                return;
+            
+            fetchedServers.put(server.getServerInfo().getName(), ping);
+        }));
+    }
 }
@@ -28,7 +28,8 @@ package ch.andre601.advancedserverlist.velocity.listeners;
 import ch.andre601.advancedserverlist.api.events.GenericServerListEvent;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
 import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
-import ch.andre601.advancedserverlist.core.events.PingEventHandler;
+import ch.andre601.advancedserverlist.core.compat.maintenance.MaintenanceUtil;
+import ch.andre601.advancedserverlist.core.compat.papi.PAPIUtil;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import ch.andre601.advancedserverlist.core.interfaces.events.GenericEventWrapper;
 import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
@@ -44,7 +45,10 @@ import com.velocitypowered.api.proxy.server.ServerPing;
 import com.velocitypowered.api.util.Favicon;
 import net.kyori.adventure.text.Component;

-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import java.util.concurrent.ExecutionException;

 public class VelocityEventWrapper implements GenericEventWrapper<Favicon, VelocityPlayerImpl>{
@@ -78,6 +82,11 @@ public class VelocityEventWrapper implements GenericEventWrapper<Favicon, Veloci
        builder.maximumPlayers(maxPlayers);
    }
    
+    @Override
+    public void setOnlinePlayers(int onlinePlayers){
+        builder.onlinePlayers(onlinePlayers);
+    }
+    
    @Override
    public void setMotd(Component component){
        builder.description(component);
@@ -100,6 +109,7 @@ public class VelocityEventWrapper implements GenericEventWrapper<Favicon, Veloci
        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();
            
            players[i] = new ServerPing.SamplePlayer(parsed, UUID.randomUUID());
@@ -133,7 +143,7 @@ public class VelocityEventWrapper implements GenericEventWrapper<Favicon, Veloci
        if(!plugin.getProxy().getPluginManager().isLoaded("maintenance"))
            return false;
        
-        return PingEventHandler.getMaintenanceUtil().isMaintenanceEnabled();
+        return MaintenanceUtil.get().isMaintenanceEnabled();
    }
    
    @Override
@@ -165,10 +175,10 @@ public class VelocityEventWrapper implements GenericEventWrapper<Favicon, Veloci
        if(!plugin.getProxy().getPluginManager().isLoaded("papiproxybridge"))
            return text;
        
-        if(!PingEventHandler.getPAPIUtil().isCompatible())
+        if(!PAPIUtil.get().isCompatible())
            return text;
        
-        String server = PingEventHandler.getPAPIUtil().getServer();
+        String server = PAPIUtil.get().getServer();
        if(server == null || server.isEmpty())
            return text;
        
@@ -176,11 +186,11 @@ public class VelocityEventWrapper implements GenericEventWrapper<Favicon, Veloci
        if(registeredServer == null || registeredServer.getPlayersConnected().isEmpty())
            return text;
        
-        Player carrier = PingEventHandler.getPAPIUtil().getPlayer(registeredServer.getPlayersConnected());
+        Player carrier = PAPIUtil.get().getPlayer(registeredServer.getPlayersConnected());
        if(carrier == null)
            return text;
        
-        return PingEventHandler.getPAPIUtil().parse(text, carrier.getUniqueId(), player.getUUID());
+        return PAPIUtil.get().parse(text, carrier.getUniqueId(), player.getUUID());
    }
    
    @Override
@@ -0,0 +1,62 @@
+package ch.andre601.advancedserverlist.velocity.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.core.parsing.ComponentParser;
+import ch.andre601.advancedserverlist.velocity.VelocityCore;
+import com.velocitypowered.api.proxy.server.ServerPing;
+
+public class VelocityProxyPlaceholders extends PlaceholderProvider{
+    
+    private final VelocityCore plugin;
+    
+    private VelocityProxyPlaceholders(VelocityCore plugin){
+        super("proxy");
+        
+        this.plugin = plugin;
+    }
+    
+    public static VelocityProxyPlaceholders init(VelocityCore plugin){
+        return new VelocityProxyPlaceholders(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";
+                
+                yield ComponentParser.toMMString(ping.getDescriptionComponent());
+            }
+            case "players" -> {
+                if(ping == null)
+                    yield "0";
+                
+                ServerPing.Players players = ping.getPlayers().orElse(null);
+                if(players == null)
+                    yield "0";
+                
+                yield String.valueOf(players.getOnline());
+            }
+            case "maxPlayers" -> {
+                if(ping == null)
+                    yield "0";
+                
+                ServerPing.Players players = ping.getPlayers().orElse(null);
+                if(players == null)
+                    yield "0";
+                
+                yield String.valueOf(players.getMax());
+            }
+            default -> null;
+        };
+    }
+}
@@ -80,18 +80,18 @@ public class VelocityServerPlaceholders extends PlaceholderProvider{
            }
            case "playersMax" -> {
                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){
+                if(args.length == 2 && args[1] != null && !args[1].isEmpty()){
                    RegisteredServer info = proxy.getServers().get(args[1]);
                    if(info == null)
-                        yield null;
+                        yield "";
                    
                    yield info.getServerInfo().getAddress().getHostString();
                }
@@ -52,13 +52,13 @@
        <dependency>
            <groupId>ch.qos.logback</groupId>
            <artifactId>logback-classic</artifactId>
-            <version>1.5.6</version>
+            <version>1.5.12</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>org.apache.httpcomponents.client5</groupId>
            <artifactId>httpclient5</artifactId>
-            <version>5.3.1</version>
+            <version>5.4.1</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
@@ -70,7 +70,7 @@
        <dependency>
            <groupId>dev.masecla</groupId>
            <artifactId>Modrinth4J</artifactId>
-            <version>2.0.0</version>
+            <version>2.2.0</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
@@ -101,7 +101,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.4.2</version>
                <configuration>
                    <archive>
                        <manifest>
@@ -115,7 +115,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.3</version>
+                <version>3.6.0</version>
                <configuration>
                    <createDependencyReducedPom>false</createDependencyReducedPom>
                </configuration>
@@ -53,7 +53,7 @@ public class VersionUploader{
        
        if(args.length == 0){
            LOGGER.warn("MISSING ARGUMENT!");
-            LOGGER.warn("COMMAND USAGE: java -jar VersionUploader.jar [--dryrun] --all | --modrinth | --hangar");
+            LOGGER.warn("COMMAND USAGE: java -jar VersionUploader.jar --all | --modrinth | --hangar [--dryrun]");
            System.exit(1);
            return;
        }
@@ -84,7 +84,7 @@ public class VersionUploader{
            }
            default -> {
                LOGGER.warn("Unknown argument '{}' provided.", args[0]);
-                LOGGER.warn("COMMAND USAGE: java -jar VersionUploader.jar [--dryrun] --all | --modrinth | --hangar");
+                LOGGER.warn("COMMAND USAGE: java -jar VersionUploader.jar --all | --modrinth | --hangar [--dryrun]");
                System.exit(1);
                return;
            }
@@ -50,9 +50,9 @@ public class CodebergReleaseFetcher{
    
    public static CodebergRelease fetch(){
        String tag = System.getenv("CI_COMMIT_TAG");
-        String codbergToken = System.getenv("CODEBERG_API_TOKEN");
+        String codebergToken = System.getenv("CODEBERG_API_TOKEN");
        
-        if(tag == null || codbergToken == null || tag.isEmpty() || codbergToken.isEmpty()){
+        if(tag == null || codebergToken == null || tag.isEmpty() || codebergToken.isEmpty()){
            LOGGER.warn("Cannot fetch release data. Either Tag or Codeberg token was null/empty.");
            return null;
        }
@@ -64,7 +64,7 @@ public class CodebergReleaseFetcher{
            .url(url)
            .header("User-Agent", "VersionUploader-CodebergReleaseFetcher/v1.0.0")
            .header("Accept", "application/json")
-            .header("Authorization", "token " + codbergToken)
+            .header("Authorization", "token " + codebergToken)
            .build();
        
        try(Response response = CLIENT.newCall(request).execute()){
@@ -130,8 +130,8 @@ public class HangarVersionUploader{
                Platform.VELOCITY, velocityDependencies
            ),
            Map.of(
-                Platform.PAPER, List.of("1.20.x"),
-                Platform.WATERFALL, List.of("1.19.x", "1.20.x"),
+                Platform.PAPER, List.of("1.20.x", "1.21"),
+                Platform.WATERFALL, List.of("1.19.x", "1.20.x", "1.21"),
                Platform.VELOCITY, Collections.singletonList("3.2")
            ),
            changelog.replaceAll("\r\n", "\n"),
@@ -25,8 +25,8 @@

 package ch.andre601.advancedserverlist.versionuploader.modrinth;

-import ch.andre601.advancedserverlist.versionuploader.ReleaseHolder;
 import ch.andre601.advancedserverlist.versionuploader.PlatformInfo;
+import ch.andre601.advancedserverlist.versionuploader.ReleaseHolder;
 import ch.andre601.advancedserverlist.versionuploader.VersionUploader;
 import ch.andre601.advancedserverlist.versionuploader.data.CodebergRelease;
 import com.google.gson.Gson;
@@ -55,7 +55,7 @@ public class ModrinthVersionUploader{
        PlatformInfo.VELOCITY
    );
    private final List<String> versions = List.of(
-        "1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6"
+        "1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6", "1.21"
    );
    
    private final ModrinthAPI api;
@@ -143,7 +143,8 @@ public class ModrinthVersionUploader{
                String url = versionUrl + projectVersion.getId();
                
                logger.info("Created new release!");
-                logger.info("Link: {}", url);
+                logger.info("Link:     {}", url);
+                logger.info("Platform: {}", platforms.get(index).getPlatform());
                
                releaseHolder.addRelease(
                    "modrinth",